Merge remote-tracking branch 'origin/main' into host/rehydration-cs-9977

Author: backspace

packages/ai-bot/lib/code-patch-correctness.ts

@@ -67,6 +67,7 @@ export function buildCheckCorrectnessCommandRequests(
     if (correctnessCheckAttempt > MAX_CORRECTNESS_FIX_ATTEMPTS) {
       continue;
     }
+    let lintIssues = file.lintIssues;
     requests.push({
       id: `check-${uuidv4()}`,
       name: CHECK_CORRECTNESS_COMMAND_NAME,
@@ -78,6 +79,7 @@ export function buildCheckCorrectnessCommandRequests(
           roomId: summary.roomId,
           targetEventId: summary.targetEventId,
           correctnessCheckAttempt,
+          ...(lintIssues !== undefined ? { lintIssues } : {}),
         },
       },
     });

packages/base/command.gts

@@ -117,13 +117,19 @@ export class FileContents extends CardDef {
 export class SwitchSubmodeInput extends CardDef {
   @field submode = contains(StringField);
   @field codePath = contains(StringField);
+  @field createFile = contains(BooleanField);
+}
+
+export class SwitchSubmodeResult extends CardDef {
+  @field codePath = contains(StringField);
 }
 
 export class WriteTextFileInput extends CardDef {
   @field content = contains(StringField);
   @field realm = contains(StringField);
   @field path = contains(StringField);
   @field overwrite = contains(BooleanField);
+  @field useNonConflictingFilename = contains(BooleanField);
 }
 
 export class CreateInstanceInput extends CardDef {
@@ -198,6 +204,7 @@ export class LintAndFixInput extends CardDef {
 
 export class LintAndFixResult extends CardDef {
   @field output = contains(StringField);
+  @field lintIssues = containsMany(StringField);
 }
 
 export class PatchCodeResultField extends FieldDef {
@@ -208,6 +215,7 @@ export class PatchCodeResultField extends FieldDef {
 export class PatchCodeCommandResult extends CardDef {
   @field patchedContent = contains(StringField);
   @field finalFileUrl = contains(StringField);
+  @field lintIssues = containsMany(StringField);
   @field results = containsMany(PatchCodeResultField);
 }
 
@@ -221,6 +229,7 @@ export class CheckCorrectnessInput extends CardDef {
   @field targetType = contains(StringField);
   @field targetRef = contains(StringField);
   @field roomId = contains(StringField);
+  @field lintIssues = containsMany(StringField);
 }
 
 export class CorrectnessResultCard extends CardDef {
@@ -355,7 +364,8 @@ export class CreateListingPRResult extends CardDef {
 
 export class ListingCreateInput extends CardDef {
   @field openCardId = contains(StringField);
-  @field targetRealm = contains(StringField);
+  @field codeRef = contains(CodeRefField);
+  @field targetRealm = contains(RealmField);
 }
 
 export class ListingCreateResult extends CardDef {

packages/base/matrix-event.gts

@@ -354,6 +354,7 @@ export interface CodePatchResultContent {
     context?: BoxelContext;
     attachedFiles?: (SerializedFile & { content?: string; error?: string })[];
     attachedCards?: (SerializedFile & { content?: string; error?: string })[];
+    lintIssues?: string[];
   };
 }
 

packages/base/menu-items.ts

@@ -22,6 +22,7 @@ import {
   isResolvedCodeRef,
   realmURL,
 } from '@cardstack/runtime-common';
+import { resolveAdoptsFrom } from '@cardstack/runtime-common';
 
 import CodeIcon from '@cardstack/boxel-icons/code';
 import ArrowLeft from '@cardstack/boxel-icons/arrow-left';
@@ -156,8 +157,18 @@ export function getDefaultCardMenuItems(
     menuItems.push({
       label: `Create listing with AI`,
       action: async () => {
+        const codeRef = resolveAdoptsFrom(card);
+        if (!codeRef) {
+          throw new Error('Unable to resolve codeRef from card');
+        }
+        const targetRealm = card[realmURL]?.href;
+        if (!targetRealm) {
+          throw new Error('Unable to determine target realm from card');
+        }
         await new ListingCreateCommand(params.commandContext).execute({
           openCardId: cardId,
+          codeRef,
+          targetRealm,
         });
       },
       icon: Wand,

packages/catalog-realm/components/post-composer.gts

@@ -2,7 +2,11 @@ import GlimmerComponent from '@glimmer/component';
 import { type BaseDef } from 'https://cardstack.com/base/card-api';
 import { on } from '@ember/modifier';
 import { BoxelSelect, BoxelButton } from '@cardstack/boxel-ui/components';
-import { type PostType } from '../news-feed/communication-log';
+
+export interface PostType {
+  value: string;
+  label: string;
+}
 
 interface PostComposerArgs {
   Args: {

packages/catalog-realm/news-feed/communication-log.gts

@@ -19,16 +19,11 @@ import StringField from 'https://cardstack.com/base/string';
 import { not } from '@cardstack/boxel-ui/helpers';
 
 import { Post, EventPost, ReminderPost } from './post';
-import { PostComposer } from '../components/post-composer';
+import { PostComposer, PostType } from '../components/post-composer';
 import { CardList } from '../components/card-list';
 import { Author } from './author';
 import ProfileEditButton from './components/profile-edit-button';
 
-export interface PostType {
-  value: string;
-  label: string;
-}
-
 export const POST_TYPES: PostType[] = [
   { value: 'post', label: 'Default' },
   { value: 'event', label: 'Event' },

packages/host/app/commands/check-correctness.ts

@@ -3,9 +3,7 @@ import { service } from '@ember/service';
 import {
   isCardDocumentString,
   isCardErrorJSONAPI,
-  SupportedMimeType,
   type CardErrorJSONAPI,
-  type LintResult,
 } from '@cardstack/runtime-common';
 
 import ENV from '@cardstack/host/config/environment';
@@ -16,7 +14,6 @@ import HostBaseCommand from '../lib/host-base-command';
 
 import type CardService from '../services/card-service';
 import type CommandService from '../services/command-service';
-import type NetworkService from '../services/network';
 import type RealmService from '../services/realm';
 import type RealmServerService from '../services/realm-server';
 import type StoreService from '../services/store';
@@ -32,7 +29,6 @@ export default class CheckCorrectnessCommand extends HostBaseCommand<
   @service declare private commandService: CommandService;
   @service declare private cardService: CardService;
   @service declare private realmServer: RealmServerService;
-  @service declare private network: NetworkService;
 
   description =
     'Run post-change correctness checks for a specific file or card instance.';
@@ -76,7 +72,7 @@ export default class CheckCorrectnessCommand extends HostBaseCommand<
     let commandModule = await this.loadCommandModule();
     const { CorrectnessResultCard } = commandModule;
     let errors: string[] = [];
-    let lintIssues: string[] = [];
+    let lintIssues: string[] = input.lintIssues ?? [];
 
     let sizeLimitError = this.cardService.getSizeLimitError(input.targetRef);
     if (sizeLimitError) {
@@ -100,9 +96,6 @@ export default class CheckCorrectnessCommand extends HostBaseCommand<
 
     if (targetType === 'file' && input.targetRef.endsWith('.gts')) {
       errors = await this.collectModuleErrors(input.targetRef, roomId);
-      lintIssues = await this.collectLintIssues(input.targetRef);
-    } else if (targetType === 'file' && this.isLintableFile(input.targetRef)) {
-      lintIssues = await this.collectLintIssues(input.targetRef);
     } else if (targetType === 'card') {
       if (!cardId) {
         throw new Error('Card correctness checks require a targetRef.');
@@ -268,81 +261,6 @@ export default class CheckCorrectnessCommand extends HostBaseCommand<
     }
   }
 
-  private isLintableFile(targetRef: string): boolean {
-    let path = targetRef;
-    try {
-      path = new URL(targetRef).pathname;
-    } catch {
-      // fall back to original targetRef when it's not a URL
-    }
-    return /\.(gts|ts)$/.test(path);
-  }
-
-  private async collectLintIssues(targetRef: string): Promise<string[]> {
-    try {
-      if (!this.isLintableFile(targetRef)) {
-        return [];
-      }
-
-      let fileUrl = new URL(targetRef);
-      let realmURL = this.realm.realmOfURL(fileUrl);
-      if (!realmURL) {
-        return [];
-      }
-
-      let { status, content } = await this.cardService.getSource(fileUrl);
-      if (status !== 200 || !content.trim()) {
-        return [];
-      }
-
-      let filename = fileUrl.pathname.split('/').pop() || 'input.gts';
-      let response = await this.network.authedFetch(
-        `${realmURL.href}_lint?lintMode=lint`,
-        {
-          method: 'POST',
-          body: content,
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': SupportedMimeType.CardSource,
-            'X-HTTP-Method-Override': 'QUERY',
-            'X-Filename': filename,
-          },
-        },
-      );
-
-      if (!response.ok) {
-        console.warn(
-          `CheckCorrectnessCommand: lint request failed for ${targetRef} (${response.status})`,
-        );
-        return [];
-      }
-
-      let lintResult: LintResult;
-      try {
-        lintResult = (await response.json()) as LintResult;
-      } catch (error) {
-        console.warn(
-          `CheckCorrectnessCommand: unable to parse lint response for ${targetRef}`,
-          error,
-        );
-        return [];
-      }
-
-      let messages = Array.isArray(lintResult?.messages)
-        ? lintResult.messages
-        : [];
-      return messages
-        .map((message) => this.formatLintIssue(message))
-        .filter((warning) => warning.length > 0);
-    } catch (error) {
-      console.warn(
-        `CheckCorrectnessCommand: lint warning collection failed for ${targetRef}`,
-        error,
-      );
-      return [];
-    }
-  }
-
   private async isEmptyFileContent(targetRef: string): Promise<boolean> {
     try {
       let fileUrl = new URL(targetRef);
@@ -353,31 +271,6 @@ export default class CheckCorrectnessCommand extends HostBaseCommand<
     }
   }
 
-  private formatLintIssue(message: LintResult['messages'][number]): string {
-    if (!message || typeof message.message !== 'string') {
-      return '';
-    }
-    let trimmedMessage = message.message.trim();
-    if (!trimmedMessage) {
-      return '';
-    }
-
-    let location = '';
-    if (typeof message.line === 'number') {
-      if (typeof message.column === 'number') {
-        location = `line ${message.line}:${message.column}`;
-      } else {
-        location = `line ${message.line}`;
-      }
-    }
-
-    let ruleId = message.ruleId ? ` (${message.ruleId})` : '';
-    if (location) {
-      return `${location} ${trimmedMessage}${ruleId}`.trim();
-    }
-    return `${trimmedMessage}${ruleId}`.trim();
-  }
-
   private describeCardError(cardId: string, error: CardErrorJSONAPI): string {
     let pieces = [error.title, error.message]
       .filter((part): part is string => typeof part === 'string')

packages/host/app/commands/lint-and-fix.ts

@@ -5,6 +5,7 @@ import { SupportedMimeType } from '@cardstack/runtime-common';
 import type * as BaseCommandModule from 'https://cardstack.com/base/command';
 
 import HostBaseCommand from '../lib/host-base-command';
+import { formatLintIssues } from '../utils/lint-formatting';
 
 import type NetworkService from '../services/network';
 
@@ -29,23 +30,21 @@ export default class LintAndFixCommand extends HostBaseCommand<
   ): Promise<BaseCommandModule.LintAndFixResult> {
     let commandModule = await this.loadCommandModule();
     const { LintAndFixResult } = commandModule;
-    let response = await this.network.authedFetch(
-      `${input.realm}_lint?lintMode=lintAndAutofix`,
-      {
-        method: 'POST',
-        body: input.fileContent,
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': SupportedMimeType.CardSource,
-          'X-HTTP-Method-Override': 'QUERY',
-          'X-Filename': input.filename || 'input.gts',
-        },
+    let response = await this.network.authedFetch(`${input.realm}_lint`, {
+      method: 'POST',
+      body: input.fileContent,
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': SupportedMimeType.CardSource,
+        'X-HTTP-Method-Override': 'QUERY',
+        'X-Filename': input.filename || 'input.gts',
       },
-    );
+    });
     if (response.status === 200) {
       let result = await response.json();
       return new LintAndFixResult({
         output: result.output,
+        lintIssues: formatLintIssues(result?.messages),
       });
     }
     let result = await response.json();