Merge branch 'main' into cs-7993-support-multiple-tool-calls-per-ai-response

Author: lukemelia

packages/host/app/components/ai-assistant/formatted-message.gts

@@ -125,5 +125,6 @@ export default class FormattedMessage extends Component<FormattedMessageSignatur
     scrollbar: {
       alwaysConsumeMouseWheel: false,
     },
+    lineNumbers: 'off',
   };
 }

packages/host/app/components/matrix/room-message-command.gts

@@ -69,6 +69,7 @@ export default class RoomMessageCommand extends Component<Signature> {
     scrollbar: {
       alwaysConsumeMouseWheel: false,
     },
+    lineNumbers: 'off',
   };
 
   private get previewCommandCode() {

packages/host/app/components/operator-mode/code-editor.gts

@@ -32,6 +32,8 @@ import type { MonacoSDK } from '@cardstack/host/services/monaco-service';
 
 import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service';
 
+import RecentFilesService from '@cardstack/host/services/recent-files-service';
+
 import BinaryFileInfo from './binary-file-info';
 
 interface Signature {
@@ -54,6 +56,7 @@ export default class CodeEditor extends Component<Signature> {
   @service private declare operatorModeStateService: OperatorModeStateService;
   @service private declare cardService: CardService;
   @service private declare environmentService: EnvironmentService;
+  @service private declare recentFilesService: RecentFilesService;
 
   @tracked private maybeMonacoSDK: MonacoSDK | undefined;
 
@@ -122,6 +125,18 @@ export default class CodeEditor extends Component<Signature> {
 
   @cached
   private get initialMonacoCursorPosition() {
+    if (this.codePath) {
+      let recentFile = this.recentFilesService.findRecentFileByURL(
+        this.codePath.toString(),
+      );
+      if (recentFile?.cursorPosition) {
+        return new Position(
+          recentFile.cursorPosition.line,
+          recentFile.cursorPosition.column,
+        );
+      }
+    }
+
     let loc =
       this.args.selectedDeclaration?.path?.node &&
       'body' in this.args.selectedDeclaration.path.node &&
@@ -195,6 +210,22 @@ export default class CodeEditor extends Component<Signature> {
     }
   }
 
+  @action
+  private onCursorPositionChange(position: Position) {
+    this.selectDeclarationByMonacoCursorPosition(position);
+
+    if (!this.codePath) {
+      return;
+    }
+    this.recentFilesService.updateCursorPositionByURL(
+      this.codePath.toString(),
+      {
+        line: position.lineNumber,
+        column: position.column,
+      },
+    );
+  }
+
   @action
   private selectDeclarationByMonacoCursorPosition(position: Position) {
     let declarationCursorOn = this.declarations.find(
@@ -303,7 +334,7 @@ export default class CodeEditor extends Component<Signature> {
             monacoSDK=this.monacoSDK
             language=this.language
             initialCursorPosition=this.initialMonacoCursorPosition
-            onCursorPositionChange=this.selectDeclarationByMonacoCursorPosition
+            onCursorPositionChange=this.onCursorPositionChange
             readOnly=@isReadOnly
             editorDisplayOptions=(hash lineNumbersMinChars=3 fontSize=13)
           }}

packages/host/app/components/operator-mode/code-submode.gts

@@ -28,10 +28,12 @@ import { and, not, bool, eq } from '@cardstack/boxel-ui/helpers';
 import { File } from '@cardstack/boxel-ui/icons';
 
 import {
+  identifyCard,
   isCardDef,
   isCardDocumentString,
   hasExecutableExtension,
   RealmPaths,
+  isResolvedCodeRef,
   type ResolvedCodeRef,
   PermissionsContextName,
 } from '@cardstack/runtime-common';
@@ -464,15 +466,20 @@ export default class CodeSubmode extends Component<Signature> {
     return undefined;
   }
 
-  private get shouldDisplayPlayground() {
-    return isCardDef(this.selectedCardOrField?.cardOrField);
+  private get selectedCardRef(): ResolvedCodeRef | undefined {
+    let baseDefType = this.selectedCardOrField?.cardOrField;
+    if (!isCardDef(baseDefType)) {
+      return undefined;
+    }
+    let codeRef = identifyCard(baseDefType);
+    if (!isResolvedCodeRef(codeRef)) {
+      return undefined;
+    }
+    return codeRef;
   }
 
   get showSpecPreview() {
-    return (
-      !this.moduleContentsResource.isLoading &&
-      this.selectedDeclaration?.exportName
-    );
+    return this.selectedCardOrField?.exportName;
   }
 
   private get itemToDeleteAsCard() {
@@ -489,7 +496,22 @@ export default class CodeSubmode extends Component<Signature> {
   }
 
   @action
-  goToDefinition(
+  private goToDefinitionAndResetCursorPosition(
+    codeRef: ResolvedCodeRef | undefined,
+    localName: string | undefined,
+  ) {
+    this.goToDefinition(codeRef, localName);
+    if (this.codePath) {
+      let urlString = this.codePath.toString();
+      this.recentFilesService.updateCursorPositionByURL(
+        urlString.endsWith('gts') ? urlString : `${urlString}.gts`,
+        undefined,
+      );
+    }
+  }
+
+  @action
+  private goToDefinition(
     codeRef: ResolvedCodeRef | undefined,
     localName: string | undefined,
   ) {
@@ -808,7 +830,7 @@ export default class CodeSubmode extends Component<Signature> {
                           @selectedDeclaration={{this.selectedDeclaration}}
                           @selectDeclaration={{this.selectDeclaration}}
                           @delete={{this.setItemToDelete}}
-                          @goToDefinition={{this.goToDefinition}}
+                          @goToDefinition={{this.goToDefinitionAndResetCursorPosition}}
                           @createFile={{perform this.createFile}}
                           @openSearch={{search.openSearchToResults}}
                         />
@@ -932,7 +954,7 @@ export default class CodeSubmode extends Component<Signature> {
                         @moduleContentsResource={{this.moduleContentsResource}}
                         @card={{this.selectedCardOrField.cardOrField}}
                         @cardTypeResource={{this.selectedCardOrField.cardType}}
-                        @goToDefinition={{this.goToDefinition}}
+                        @goToDefinition={{this.goToDefinitionAndResetCursorPosition}}
                         @isReadOnly={{this.isReadOnly}}
                         as |SchemaEditorTitle SchemaEditorPanel|
                       >
@@ -957,7 +979,7 @@ export default class CodeSubmode extends Component<Signature> {
                           </:content>
                         </A.Item>
                       </SchemaEditor>
-                      {{#if this.shouldDisplayPlayground}}
+                      {{#if this.selectedCardRef}}
                         <A.Item
                           class='accordion-item'
                           @contentClass='accordion-item-content'
@@ -968,8 +990,8 @@ export default class CodeSubmode extends Component<Signature> {
                           <:title>Playground</:title>
                           <:content>
                             <PlaygroundPanel
-                              @moduleContentsResource={{this.moduleContentsResource}}
-                              @cardType={{this.selectedCardOrField.cardType}}
+                              @codeRef={{this.selectedCardRef}}
+                              @isLoadingNewModule={{this.moduleContentsResource.isLoadingNewModule}}
                             />
                           </:content>
                         </A.Item>