diff --git a/packages/ai-bot/tests/prompt-construction-test.ts b/packages/ai-bot/tests/prompt-construction-test.ts
index a8a457be9f..9590786c9f 100644
--- a/packages/ai-bot/tests/prompt-construction-test.ts
+++ b/packages/ai-bot/tests/prompt-construction-test.ts
@@ -7343,7 +7343,7 @@ module('markdown skills', () => {
   });
 });
 
-module('markdown skill commands', (hooks) => {
+module('markdown skill tools', (hooks) => {
   let fakeMatrixClient: FakeMatrixClient;
   let mockResponses: Map<string, { ok: boolean; text: string }>;
   let originalFetch: any;
diff --git a/packages/base/ai-app-generator.gts b/packages/base/ai-app-generator.gts
index 42725144f6..5280bd76d1 100644
--- a/packages/base/ai-app-generator.gts
+++ b/packages/base/ai-app-generator.gts
@@ -49,12 +49,12 @@ export class AiAppGenerator extends CardDef {
     };
 
     askAi = restartableTask(async () => {
-      let commandContext = this.args.context?.commandContext;
-      if (!commandContext) {
+      let toolContext = this.args.context?.toolContext;
+      if (!toolContext) {
         throw new Error('No command context found');
       }
 
-      let command = new AskAiTool(commandContext);
+      let command = new AskAiTool(toolContext);
       await command.execute(
         new AskAiInput({
           prompt: this.args.model.promptValue,
diff --git a/packages/base/card-api.gts b/packages/base/card-api.gts
index eac330aeba..30786ec08c 100644
--- a/packages/base/card-api.gts
+++ b/packages/base/card-api.gts
@@ -348,6 +348,10 @@ interface RelationshipOptions extends Options {
 }
 
 export interface CardContext<T extends CardDef = CardDef> {
+  toolContext?: ToolContext;
+  // Pre-rename spelling of `toolContext`. Realm content reads
+  // `@context.commandContext`; populated with the same value until no
+  // deployed content references it.
   commandContext?: ToolContext;
   cardComponentModifier?: typeof Modifier<{
     Args: {
@@ -3280,16 +3284,16 @@ export class Theme extends CardDef {
 
   [getMenuItems](params: GetMenuItemParams): MenuItemOptions[] {
     let menuItems = super[getMenuItems](params);
-    if (params.menuContext === 'interact' && params.commandContext && this.id) {
+    if (params.menuContext === 'interact' && params.toolContext && this.id) {
       menuItems = [
         ...menuItems,
         {
           label: 'Copy and Edit',
           action: async () => {
-            if (!params.commandContext || !this.id) {
+            if (!params.toolContext || !this.id) {
               return;
             }
-            let cmd = new CopyAndEditTool(params.commandContext);
+            let cmd = new CopyAndEditTool(params.toolContext);
             await cmd.execute({
               card: this,
             });
@@ -3300,7 +3304,7 @@ export class Theme extends CardDef {
         {
           label: 'Modify Theme via AI',
           action: async () => {
-            let cmd = new PatchThemeTool(params.commandContext);
+            let cmd = new PatchThemeTool(params.toolContext);
             await cmd.execute({
               cardId: this.id as unknown as string,
             });
diff --git a/packages/base/commands/search-card-result.gts b/packages/base/commands/search-card-result.gts
index c62267eb11..013f7ec7ce 100644
--- a/packages/base/commands/search-card-result.gts
+++ b/packages/base/commands/search-card-result.gts
@@ -181,7 +181,7 @@ class SearchCardsResultEmbeddedView extends Component<
   }
 
   <template>
-    <div class='command-result'>
+    <div class='tool-call-result'>
       <CardList
         @cardIds={{this.cardIdsToDisplay}}
         @format='atom'
@@ -207,7 +207,7 @@ class SearchCardsResultEmbeddedView extends Component<
       </div>
     </div>
     <style scoped>
-      .command-result {
+      .tool-call-result {
         color: var(--boxel-dark);
         background-color: var(--boxel-light);
         border-radius: var(--boxel-border-radius);
@@ -251,7 +251,7 @@ class SearchCardsResultEmbeddedView extends Component<
 
 class SearchCardsResultIsolatedView extends SearchCardsResultEmbeddedView {
   <template>
-    <section class='command-result' data-test-tool-result-isolated>
+    <section class='tool-call-result' data-test-tool-result-isolated>
       <header>
         <h3>Search Results</h3>
         <p class='result-count'>
@@ -273,10 +273,10 @@ class SearchCardsResultIsolatedView extends SearchCardsResultEmbeddedView {
       </div>
     </section>
     <style scoped>
-      .command-result {
+      .tool-call-result {
         padding: var(--boxel-sp-lg) var(--boxel-sp-xl);
       }
-      .command-result > * + * {
+      .tool-call-result > * + * {
         margin-top: var(--boxel-sp-lg);
       }
       h3 {
diff --git a/packages/base/default-templates/missing-template.gts b/packages/base/default-templates/missing-template.gts
index e9a21e947d..e1e92f5a79 100644
--- a/packages/base/default-templates/missing-template.gts
+++ b/packages/base/default-templates/missing-template.gts
@@ -87,8 +87,8 @@ export default class MissingTemplate extends GlimmerComponent<{
       return;
     }
     let moduleId = moduleFrom(ref);
-    let commandContext = this.args.context?.commandContext;
-    await new SwitchSubmodeTool(commandContext!).execute({
+    let toolContext = this.args.context?.toolContext;
+    await new SwitchSubmodeTool(toolContext!).execute({
       codePath: moduleId,
       submode: 'code',
     });
diff --git a/packages/base/field-component.gts b/packages/base/field-component.gts
index 6763e28599..e8a279acc1 100644
--- a/packages/base/field-component.gts
+++ b/packages/base/field-component.gts
@@ -86,7 +86,7 @@ const DEFAULT_CARD_CONTEXT = {
     modify() {}
   },
   actions: undefined,
-  commandContext: undefined,
+  toolContext: undefined,
   getCard: () => {},
   getCards: () => {},
   getCardCollection: () => {},
diff --git a/packages/base/file-menu-items.ts b/packages/base/file-menu-items.ts
index 82975195c0..efe366185c 100644
--- a/packages/base/file-menu-items.ts
+++ b/packages/base/file-menu-items.ts
@@ -48,7 +48,7 @@ export function getDefaultFileMenuItems(
       menuItems.push({
         label: 'Copy as Markdown',
         action: () =>
-          new CopyCardAsMarkdownTool(params.commandContext).execute({
+          new CopyCardAsMarkdownTool(params.toolContext).execute({
             cardId: fileDefInstanceId,
           }),
         icon: ClipboardCopy,
@@ -59,7 +59,7 @@ export function getDefaultFileMenuItems(
       menuItems.push({
         label: 'Open in Code Mode',
         action: async () => {
-          await new SwitchSubmodeTool(params.commandContext).execute({
+          await new SwitchSubmodeTool(params.toolContext).execute({
             submode: 'code',
             codePath: fileDefInstanceId,
           });
@@ -89,13 +89,13 @@ export function getDefaultFileMenuItems(
       label: 'Copy to Workspace',
       action: async () => {
         let { newFileIdentifier } = await new CopyFileToRealmTool(
-          params.commandContext,
+          params.toolContext,
         ).execute({
           sourceFileIdentifier: fileDefInstance.sourceUrl,
           targetRealm: params.menuContextParams.activeRealmURL,
         });
 
-        await new ShowFileTool(params.commandContext).execute({
+        await new ShowFileTool(params.toolContext).execute({
           fileIdentifier: newFileIdentifier,
         });
       },
@@ -108,7 +108,7 @@ export function getDefaultFileMenuItems(
     menuItems.push({
       label: 'Open in Interact Mode',
       action: () => {
-        new OpenInInteractModeTool(params.commandContext).execute({
+        new OpenInInteractModeTool(params.toolContext).execute({
           cardId: fileDefInstanceId,
           format: params.format === 'edit' ? 'edit' : 'isolated',
         });
@@ -120,7 +120,7 @@ export function getDefaultFileMenuItems(
     menuItems.push({
       label: 'Open in Code Mode',
       action: async () => {
-        await new SwitchSubmodeTool(params.commandContext).execute({
+        await new SwitchSubmodeTool(params.toolContext).execute({
           submode: 'code',
           codePath: fileDefInstanceId,
         });
diff --git a/packages/base/menu-items.ts b/packages/base/menu-items.ts
index 971a381508..9ade6a09aa 100644
--- a/packages/base/menu-items.ts
+++ b/packages/base/menu-items.ts
@@ -51,7 +51,7 @@ type MenuContext =
 export type GetMenuItemParams = {
   canEdit: boolean;
   cardCrudFunctions: Partial<CardCrudFunctions>;
-  commandContext: ToolContext;
+  toolContext: ToolContext;
   format?: Format;
   useBaseTemplate?: boolean;
 } & MenuContext;
@@ -92,7 +92,7 @@ export function getDefaultCardMenuItems(
     menuItems.push({
       label: 'Copy as Markdown',
       action: () =>
-        new CopyCardAsMarkdownTool(params.commandContext).execute({
+        new CopyCardAsMarkdownTool(params.toolContext).execute({
           cardId,
         }),
       icon: ClipboardCopy,
@@ -170,13 +170,13 @@ export function getDefaultCardMenuItems(
       label: 'Copy to Workspace',
       action: async () => {
         const { newCardId } = await new CopyCardCommand(
-          params.commandContext,
+          params.toolContext,
         ).execute({
           sourceCard: card,
           targetRealm: params.menuContextParams.activeRealmURL,
         });
 
-        let showCardCommand = new ShowCardTool(params.commandContext);
+        let showCardCommand = new ShowCardTool(params.toolContext);
         await showCardCommand.execute({
           cardId: newCardId,
         });
@@ -190,7 +190,7 @@ export function getDefaultCardMenuItems(
     menuItems.push({
       label: 'Open in Interact Mode',
       action: () => {
-        new OpenInInteractModeTool(params.commandContext).execute({
+        new OpenInInteractModeTool(params.toolContext).execute({
           cardId,
           format: params.format === 'edit' ? 'edit' : 'isolated',
         });
@@ -203,7 +203,7 @@ export function getDefaultCardMenuItems(
     menuItems.push({
       label: 'Open in Code Mode',
       action: async () => {
-        await new SwitchSubmodeTool(params.commandContext).execute({
+        await new SwitchSubmodeTool(params.toolContext).execute({
           submode: 'code',
           codePath: cardId,
         });
@@ -224,7 +224,7 @@ export function getDefaultCardMenuItems(
           if (!targetRealm) {
             throw new Error('Unable to determine target realm from card');
           }
-          await new OpenCreateListingModalTool(params.commandContext).execute({
+          await new OpenCreateListingModalTool(params.toolContext).execute({
             codeRef,
             openCardIds: [cardId],
             targetRealm,
@@ -240,7 +240,7 @@ export function getDefaultCardMenuItems(
 
 function getSampleDataMenuItems(
   card: CardDef,
-  { commandContext }: Pick<GetMenuItemParams, 'commandContext'>,
+  { toolContext }: Pick<GetMenuItemParams, 'toolContext'>,
 ): MenuItemOptions[] {
   let cardId = card.id as unknown as string;
   let menuItems: MenuItemOptions[] = [];
@@ -248,7 +248,7 @@ function getSampleDataMenuItems(
     menuItems.push({
       label: `Fill in Sample Data with AI`,
       action: async () =>
-        await new PopulateWithSampleDataTool(commandContext).execute({
+        await new PopulateWithSampleDataTool(toolContext).execute({
           cardId: card.id,
         }),
       icon: Wand,
@@ -260,7 +260,7 @@ function getSampleDataMenuItems(
     menuItems.push({
       label: `Generate ${GENERATED_EXAMPLE_COUNT} examples with AI`,
       action: async () => {
-        await new GenerateExampleCardsTool(commandContext).execute({
+        await new GenerateExampleCardsTool(toolContext).execute({
           count: GENERATED_EXAMPLE_COUNT,
           codeRef: codeRef as ResolvedCodeRef,
           realm: card[realmURL]?.href,
diff --git a/packages/base/resources/command-data.ts b/packages/base/resources/command-data.ts
index cdc7f9ca53..d538424357 100644
--- a/packages/base/resources/command-data.ts
+++ b/packages/base/resources/command-data.ts
@@ -100,13 +100,13 @@ export function commandData<
     const state = new CommandExecutionState<
       CardResultType extends CardDefConstructor ? CardResultType : never
     >();
-    let commandContext = parent.args.context?.commandContext;
-    if (!commandContext) {
+    let toolContext = parent.args.context?.toolContext;
+    if (!toolContext) {
       state.setError(new Error('no context'));
       return state;
     }
 
-    const command = new commandClass(commandContext);
+    const command = new commandClass(toolContext);
 
     state.setLoading();
     (executeArgs ? command.execute(executeArgs()) : command.execute())
diff --git a/packages/base/spec.gts b/packages/base/spec.gts
index 9b370c4786..214e6ad62a 100644
--- a/packages/base/spec.gts
+++ b/packages/base/spec.gts
@@ -68,8 +68,8 @@ import {
 export type SpecType = 'card' | 'field' | 'component' | 'app' | 'command';
 
 class PopulateFieldSpecExampleCommand extends PopulateWithSampleDataTool {
-  constructor(commandContext: ToolContext) {
-    super(commandContext);
+  constructor(toolContext: ToolContext) {
+    super(toolContext);
   }
   protected get prompt() {
     return `Fill in sample data for this example on the card's spec.`;
@@ -98,8 +98,8 @@ class PopulateFieldSpecExampleCommand extends PopulateWithSampleDataTool {
 }
 
 class GenerateExamplesForFieldSpecCommand extends GenerateExampleCardsTool {
-  constructor(commandContext: ToolContext) {
-    super(commandContext);
+  constructor(toolContext: ToolContext) {
+    super(toolContext);
   }
   protected getPrompt(count: number) {
     return `Generate ${count} additional examples on this card's spec.`;
@@ -279,15 +279,15 @@ export class SpecReadmeSection extends GlimmerComponent<SpecReadmeSectionSignatu
       return;
     }
 
-    let commandContext = this.args.context?.commandContext;
-    if (!commandContext) {
+    let toolContext = this.args.context?.toolContext;
+    if (!toolContext) {
       console.error('Command context not available');
       return;
     }
 
     try {
       const generateReadmeSpecCommand = new GenerateReadmeSpecTool(
-        commandContext,
+        toolContext,
       );
       await generateReadmeSpecCommand.execute({
         spec: this.args.model as Spec,
@@ -966,7 +966,7 @@ export class Spec extends CardDef {
           label: 'Fill in Sample Data with AI',
           action: async () => {
             await new PopulateFieldSpecExampleCommand(
-              params.commandContext,
+              params.toolContext,
             ).execute({
               cardId: this.id,
             });
@@ -978,7 +978,7 @@ export class Spec extends CardDef {
           label: `Generate ${GENERATED_EXAMPLE_COUNT} examples with AI`,
           action: async () => {
             await new GenerateExamplesForFieldSpecCommand(
-              params.commandContext,
+              params.toolContext,
             ).execute({
               count: GENERATED_EXAMPLE_COUNT,
               codeRef: codeRefWithAbsoluteIdentifier(
diff --git a/packages/base/system-card.gts b/packages/base/system-card.gts
index 775915cce9..34402c495c 100644
--- a/packages/base/system-card.gts
+++ b/packages/base/system-card.gts
@@ -109,7 +109,7 @@ export class SystemCard extends CardDef {
       {
         label: 'Set as My System Card',
         action: async () => {
-          await new SetUserSystemCardTool(params.commandContext).execute({
+          await new SetUserSystemCardTool(params.toolContext).execute({
             cardId: this.id,
           });
         },
@@ -136,14 +136,14 @@ class SystemCardIsolated extends Component<typeof SystemCard> {
   }
 
   loadActiveSystemCard = restartableTask(async () => {
-    let commandContext = this.args.context?.commandContext;
-    if (!commandContext) {
+    let toolContext = this.args.context?.toolContext;
+    if (!toolContext) {
       this.hasLoaded = true;
       return;
     }
     try {
       let result =
-        await new GetUserSystemCardTool(commandContext).execute();
+        await new GetUserSystemCardTool(toolContext).execute();
       this.activeSystemCardId = result.cardId ?? undefined;
       this.activeIsDefault = result.isDefault ?? false;
     } finally {
@@ -210,20 +210,20 @@ class SystemCardIsolated extends Component<typeof SystemCard> {
 
   cloneTask = task(async (targetRealmUrl: string, realmName: string) => {
     this.cloningToRealmName = realmName;
-    let commandContext = this.args.context?.commandContext;
-    if (!commandContext || !this.args.model.id) {
+    let toolContext = this.args.context?.toolContext;
+    if (!toolContext || !this.args.model.id) {
       this.cloningToRealmName = undefined;
       return;
     }
     try {
       let copyResult = await new CopyCardToRealmTool(
-        commandContext,
+        toolContext,
       ).execute({
         sourceCard: this.args.model as CardDef,
         targetRealm: targetRealmUrl,
       });
       if (copyResult.newCardId) {
-        await new ShowCardTool(commandContext).execute({
+        await new ShowCardTool(toolContext).execute({
           cardId: copyResult.newCardId,
           format: 'isolated',
         });
@@ -248,17 +248,17 @@ class SystemCardIsolated extends Component<typeof SystemCard> {
   };
 
   setAsActiveTask = restartableTask(async () => {
-    let commandContext = this.args.context?.commandContext;
-    if (!commandContext || !this.args.model.id) {
+    let toolContext = this.args.context?.toolContext;
+    if (!toolContext || !this.args.model.id) {
       return;
     }
-    await new SetUserSystemCardTool(commandContext).execute({
+    await new SetUserSystemCardTool(toolContext).execute({
       cardId: this.args.model.id,
     });
     this.activeSystemCardId = this.args.model.id;
     // Re-check default status after setting active
     let result =
-      await new GetUserSystemCardTool(commandContext).execute();
+      await new GetUserSystemCardTool(toolContext).execute();
     this.activeIsDefault = result.isDefault ?? false;
     this.isExpanded = false;
   });
@@ -268,14 +268,14 @@ class SystemCardIsolated extends Component<typeof SystemCard> {
   };
 
   restoreDefaultTask = restartableTask(async () => {
-    let commandContext = this.args.context?.commandContext;
-    if (!commandContext) {
+    let toolContext = this.args.context?.toolContext;
+    if (!toolContext) {
       return;
     }
-    await new SetUserSystemCardTool(commandContext).execute({});
+    await new SetUserSystemCardTool(toolContext).execute({});
     // Reload to pick up the new active system card (the default)
     let result =
-      await new GetUserSystemCardTool(commandContext).execute();
+      await new GetUserSystemCardTool(toolContext).execute();
     this.activeSystemCardId = result.cardId ?? undefined;
     this.activeIsDefault = result.isDefault ?? false;
     this.isExpanded = false;
diff --git a/packages/base/tool-field.gts b/packages/base/tool-field.gts
index bce9470325..1f719c86b9 100644
--- a/packages/base/tool-field.gts
+++ b/packages/base/tool-field.gts
@@ -52,24 +52,24 @@ export class ToolField extends FieldDef {
 
   static embedded = class Embedded extends Component<typeof this> {
     <template>
-      <div class='command-compact'>
-        <CommandIcon class='command-icon' />
-        <div class='command-info'>
-          <div class='command-title'>{{@model.cardTitle}}</div>
-          <div class='command-meta'>
+      <div class='tool-compact'>
+        <CommandIcon class='tool-icon' />
+        <div class='tool-info'>
+          <div class='tool-title'>{{@model.cardTitle}}</div>
+          <div class='tool-meta'>
             <code
-              class='command-path'
+              class='tool-path'
             >{{@model.codeRef.module}}/{{@model.codeRef.name}}</code>
           </div>
           {{#if @model.requiresApproval}}
             <div>
-              <Pill class='command-label'>Requires Approval</Pill>
+              <Pill class='tool-label'>Requires Approval</Pill>
             </div>
           {{/if}}
         </div>
       </div>
       <style scoped>
-        .command-compact {
+        .tool-compact {
           --muted-color: color-mix(in lab, var(--muted) 60%, var(--foreground));
           display: flex;
           gap: var(--boxel-sp-3xs);
@@ -79,11 +79,11 @@ export class ToolField extends FieldDef {
           border: 1px solid var(--border, var(--boxel-border-color));
           border-radius: var(--radius, var(--boxel-border-radius));
         }
-        .command-icon {
+        .tool-icon {
           color: var(--muted-color, var(--boxel-400));
           flex-shrink: 0;
         }
-        .command-info {
+        .tool-info {
           flex: 1;
           min-width: 0;
           display: flex;
@@ -92,19 +92,19 @@ export class ToolField extends FieldDef {
           padding-left: var(--boxel-sp-2xs);
           border-left: 3px solid var(--muted-color, var(--boxel-400));
         }
-        .command-title {
+        .tool-title {
           font-size: var(--boxel-font-size-sm);
           font-weight: 500;
         }
-        .command-meta {
+        .tool-meta {
           font-size: var(--boxel-font-size-xs);
           font-weight: 500;
           color: var(--muted-foreground, var(--boxel-700));
         }
-        .command-path {
+        .tool-path {
           word-break: break-all;
         }
-        .command-label {
+        .tool-label {
           font-size: var(--boxel-font-size-2xs);
           letter-spacing: var(--boxel-lsp-lg);
         }
diff --git a/packages/experiments-realm/bot-request-demo.gts b/packages/experiments-realm/bot-request-demo.gts
index bf49dec181..beef385f45 100644
--- a/packages/experiments-realm/bot-request-demo.gts
+++ b/packages/experiments-realm/bot-request-demo.gts
@@ -19,7 +19,7 @@ class Isolated extends Component<typeof BotRequestDemo> {
   @tracked activeTab: CommandTab = 'show-card';
 
   get hasCommandContext() {
-    return Boolean(this.args.context?.commandContext);
+    return Boolean(this.args.context?.toolContext);
   }
 
   get isSubmitDisabled() {
@@ -246,14 +246,14 @@ class Isolated extends Component<typeof BotRequestDemo> {
 
   @action
   async requestShowCard() {
-    let commandContext = this.args.context?.commandContext;
-    if (!commandContext) {
+    let toolContext = this.args.context?.toolContext;
+    if (!toolContext) {
       this.errorMessage =
         'Command context is unavailable. Open this card in host interact mode.';
       return;
     }
 
-    await new CreateShowCardRequestCommand(commandContext).execute({
+    await new CreateShowCardRequestCommand(toolContext).execute({
       cardId: this.showCardId,
       format: this.showCardFormat,
       realm: this.showCardTargetRealm,
@@ -262,14 +262,14 @@ class Isolated extends Component<typeof BotRequestDemo> {
 
   @action
   async requestCreateListingPR() {
-    let commandContext = this.args.context?.commandContext;
-    if (!commandContext) {
+    let toolContext = this.args.context?.toolContext;
+    if (!toolContext) {
       this.errorMessage =
         'Command context is unavailable. Open this card in host interact mode.';
       return;
     }
 
-    await new CreateListingPRRequestTool(commandContext).execute({
+    await new CreateListingPRRequestTool(toolContext).execute({
       realm: this.createListingPRTargetRealm,
       listingId: this.listingId,
     });
@@ -277,14 +277,14 @@ class Isolated extends Component<typeof BotRequestDemo> {
 
   @action
   async requestPatchCardInstance() {
-    let commandContext = this.args.context?.commandContext;
-    if (!commandContext) {
+    let toolContext = this.args.context?.toolContext;
+    if (!toolContext) {
       this.errorMessage =
         'Command context is unavailable. Open this card in host interact mode.';
       return;
     }
 
-    await new CreatePatchCardInstanceRequestCommand(commandContext).execute({
+    await new CreatePatchCardInstanceRequestCommand(toolContext).execute({
       cardId: this.showCardId,
       patch: this.patchCardPatch,
       realm: this.showCardTargetRealm,
diff --git a/packages/experiments-realm/commands/bot-request-utils.ts b/packages/experiments-realm/commands/bot-request-utils.ts
index 33d3404aad..fb0c5e904e 100644
--- a/packages/experiments-realm/commands/bot-request-utils.ts
+++ b/packages/experiments-realm/commands/bot-request-utils.ts
@@ -3,11 +3,11 @@ import type { CommandContext } from '@cardstack/runtime-common';
 import InviteUserToRoomTool from '@cardstack/boxel-host/commands/invite-user-to-room';
 
 export async function ensureSubmissionBotIsInRoom(
-  commandContext: CommandContext,
+  toolContext: CommandContext,
   roomId: string,
 ) {
   try {
-    await new InviteUserToRoomTool(commandContext).execute({
+    await new InviteUserToRoomTool(toolContext).execute({
       roomId,
       userId: 'submissionbot',
     });
diff --git a/packages/experiments-realm/commands/create-patch-card-instance-request.ts b/packages/experiments-realm/commands/create-patch-card-instance-request.ts
index ea248db7b0..877b997b03 100644
--- a/packages/experiments-realm/commands/create-patch-card-instance-request.ts
+++ b/packages/experiments-realm/commands/create-patch-card-instance-request.ts
@@ -43,7 +43,7 @@ export default class CreatePatchCardInstanceRequestCommand extends Command<
     let roomId = input.roomId?.trim();
     if (!roomId) {
       let createRoomResult = await new UseAiAssistantTool(
-        this.commandContext,
+        this.toolContext,
       ).execute({
         roomId: 'new',
         roomName: `Patch Card: ${cardId}`,
@@ -52,9 +52,9 @@ export default class CreatePatchCardInstanceRequestCommand extends Command<
       roomId = createRoomResult.roomId;
     }
 
-    await ensureSubmissionBotIsInRoom(this.commandContext, roomId);
+    await ensureSubmissionBotIsInRoom(this.toolContext, roomId);
 
-    await new SendBotTriggerEventTool(this.commandContext).execute({
+    await new SendBotTriggerEventTool(this.toolContext).execute({
       roomId,
       realm,
       type: 'patch-card-instance',
diff --git a/packages/experiments-realm/commands/create-show-card-request.ts b/packages/experiments-realm/commands/create-show-card-request.ts
index 04c1a5c44b..33e89dc79b 100644
--- a/packages/experiments-realm/commands/create-show-card-request.ts
+++ b/packages/experiments-realm/commands/create-show-card-request.ts
@@ -38,7 +38,7 @@ export default class CreateShowCardRequestCommand extends Command<
     }
 
     let createRoomResult = await new UseAiAssistantTool(
-      this.commandContext,
+      this.toolContext,
     ).execute({
       roomId: 'new',
       roomName: `Show Card: ${cardId}`,
@@ -46,9 +46,9 @@ export default class CreateShowCardRequestCommand extends Command<
     });
     let roomId = createRoomResult.roomId;
 
-    await ensureSubmissionBotIsInRoom(this.commandContext, roomId);
+    await ensureSubmissionBotIsInRoom(this.toolContext, roomId);
 
-    await new SendBotTriggerEventTool(this.commandContext).execute({
+    await new SendBotTriggerEventTool(this.toolContext).execute({
       roomId,
       realm,
       type: 'show-card',
diff --git a/packages/experiments-realm/screenshot-card-demo.gts b/packages/experiments-realm/screenshot-card-demo.gts
index 7c2fef5d70..fabfe4f04f 100644
--- a/packages/experiments-realm/screenshot-card-demo.gts
+++ b/packages/experiments-realm/screenshot-card-demo.gts
@@ -29,7 +29,7 @@ class Isolated extends Component<typeof ScreenshotCardDemo> {
   @tracked imageDefUrl: string | null = null;
 
   get hasCommandContext() {
-    return Boolean(this.args.context?.commandContext);
+    return Boolean(this.args.context?.toolContext);
   }
 
   get hasLinkedCard() {
@@ -47,9 +47,9 @@ class Isolated extends Component<typeof ScreenshotCardDemo> {
 
   @action
   async takeScreenshot() {
-    let commandContext = this.args.context?.commandContext;
+    let toolContext = this.args.context?.toolContext;
     let card = (this.args.model as any)?.card;
-    if (!commandContext) {
+    if (!toolContext) {
       this.errorMessage =
         'Command context is unavailable. Open this card in host interact mode.';
       return;
@@ -63,7 +63,7 @@ class Isolated extends Component<typeof ScreenshotCardDemo> {
     this.errorMessage = null;
     this.imageDefUrl = null;
     try {
-      let result = await new ScreenshotCardTool(commandContext).execute({
+      let result = await new ScreenshotCardTool(toolContext).execute({
         card,
         format: this.effectiveFormat,
       });
diff --git a/packages/experiments-realm/set-llm-example.gts b/packages/experiments-realm/set-llm-example.gts
index 7230bfd3e4..2461bd3396 100644
--- a/packages/experiments-realm/set-llm-example.gts
+++ b/packages/experiments-realm/set-llm-example.gts
@@ -13,18 +13,18 @@ class IsolatedTemplate extends Component<typeof SetLlmExample> {
 
   @action
   async createRoom() {
-    let commandContext = this.args.context?.commandContext;
-    if (!commandContext) return;
+    let toolContext = this.args.context?.toolContext;
+    if (!toolContext) return;
 
     let createAIAssistantRoomCommand = new CreateAiAssistantRoomTool(
-      commandContext,
+      toolContext,
     );
     let { roomId } = await createAIAssistantRoomCommand.execute({
       name: `Chat with ${this.modelId}`,
     });
 
     let openAiAssistantRoomCommand = new OpenAiAssistantRoomTool(
-      commandContext,
+      toolContext,
     );
     await openAiAssistantRoomCommand.execute({
       roomId,
@@ -37,10 +37,10 @@ class IsolatedTemplate extends Component<typeof SetLlmExample> {
   async setLLM() {
     if (!this.currentRoomId) return;
 
-    let commandContext = this.args.context?.commandContext;
-    if (!commandContext) return;
+    let toolContext = this.args.context?.toolContext;
+    if (!toolContext) return;
 
-    let setActiveLLMCommand = new SetActiveLLMTool(commandContext);
+    let setActiveLLMCommand = new SetActiveLLMTool(toolContext);
 
     await setActiveLLMCommand.execute({
       model: this.modelId,
diff --git a/packages/experiments-realm/update-room-skills-example.gts b/packages/experiments-realm/update-room-skills-example.gts
index 0e7356a07a..c89b321c0a 100644
--- a/packages/experiments-realm/update-room-skills-example.gts
+++ b/packages/experiments-realm/update-room-skills-example.gts
@@ -99,7 +99,7 @@ class Isolated extends Component<typeof UpdateRoomSkillsExample> {
   @tracked isExecuting = false;
 
   get hasCommandContext() {
-    return Boolean(this.args.context?.commandContext);
+    return Boolean(this.args.context?.toolContext);
   }
 
   get finalSkillsRealmURL() {
@@ -239,8 +239,8 @@ class Isolated extends Component<typeof UpdateRoomSkillsExample> {
       return;
     }
 
-    let commandContext = this.args.context?.commandContext;
-    if (!commandContext) {
+    let toolContext = this.args.context?.toolContext;
+    if (!toolContext) {
       this.errorMessage =
         'Command context is not available. Open this card inside the host app.';
       return;
@@ -270,7 +270,7 @@ class Isolated extends Component<typeof UpdateRoomSkillsExample> {
     this.errorMessage = null;
 
     try {
-      let command = new UpdateRoomSkillsTool(commandContext);
+      let command = new UpdateRoomSkillsTool(toolContext);
       await command.execute({
         roomId,
         skillCardIdsToActivate,
diff --git a/packages/host/app/components/ai-assistant/code-block/tool-call-header.gts b/packages/host/app/components/ai-assistant/code-block/tool-call-header.gts
index db41cd6791..c5517baca4 100644
--- a/packages/host/app/components/ai-assistant/code-block/tool-call-header.gts
+++ b/packages/host/app/components/ai-assistant/code-block/tool-call-header.gts
@@ -32,7 +32,7 @@ export default class CodeBlockToolCallHeader extends Component<CodeBlockToolCall
 
   <template>
     <header class={{cn 'code-block-header' compact=@isCompact}}>
-      <div class='command-description'>{{@commandDescription}}</div>
+      <div class='tool-description'>{{@commandDescription}}</div>
       <div class='actions'>
         {{#unless @hideCodeActions}}
           {{#if @isDisplayingCode}}
@@ -49,7 +49,7 @@ export default class CodeBlockToolCallHeader extends Component<CodeBlockToolCall
           {{/if}}
         {{/unless}}
         <ApplyButton
-          class='command-action'
+          class='tool-action'
           @actionVerb={{@actionVerb}}
           @isCompact={{@isCompact}}
           @state={{@toolCallState}}
@@ -81,14 +81,14 @@ export default class CodeBlockToolCallHeader extends Component<CodeBlockToolCall
         padding: 2px 0;
         background-color: transparent;
       }
-      .command-description {
+      .tool-description {
         font: 400 var(--boxel-font-sm);
         letter-spacing: var(--boxel-lsp-xs);
         line-height: 1.5em;
         text-wrap: pretty;
         overflow-wrap: break-word;
       }
-      .code-block-header.compact .command-description {
+      .code-block-header.compact .tool-description {
         order: 2;
         flex: 1;
         min-width: 0;
@@ -107,7 +107,7 @@ export default class CodeBlockToolCallHeader extends Component<CodeBlockToolCall
         display: contents;
         margin-left: 0;
       }
-      .command-action {
+      .tool-action {
         margin-left: var(--boxel-sp-5xs);
       }
     </style>
diff --git a/packages/host/app/components/ai-assistant/skill-menu/skill-toggle.gts b/packages/host/app/components/ai-assistant/skill-menu/skill-toggle.gts
index 18c56b9c81..1b764aeb24 100644
--- a/packages/host/app/components/ai-assistant/skill-menu/skill-toggle.gts
+++ b/packages/host/app/components/ai-assistant/skill-menu/skill-toggle.gts
@@ -100,7 +100,7 @@ export default class SkillToggle extends Component<SkillToggleSignature> {
   }
 
   private async openSkillCard() {
-    let showCardCommand = new ShowCardTool(this.toolService.commandContext);
+    let showCardCommand = new ShowCardTool(this.toolService.toolContext);
     await showCardCommand.execute({
       cardId: this.args.cardId,
     });
diff --git a/packages/host/app/components/matrix/room-message-tool.gts b/packages/host/app/components/matrix/room-message-tool.gts
index 25b2638c36..15d8727476 100644
--- a/packages/host/app/components/matrix/room-message-tool.gts
+++ b/packages/host/app/components/matrix/room-message-tool.gts
@@ -27,7 +27,7 @@ import {
 import type { ToolRequest } from '@cardstack/runtime-common/commands';
 
 import type MessageTool from '@cardstack/host/lib/matrix-classes/message-tool';
-import { isAutoExecutableCommand } from '@cardstack/host/lib/tool-auto-execute';
+import { isAutoExecutableTool } from '@cardstack/host/lib/tool-auto-execute';
 
 import type { RoomResource } from '@cardstack/host/resources/room';
 import type MatrixService from '@cardstack/host/services/matrix-service';
@@ -47,7 +47,7 @@ interface Signature {
   Element: HTMLDivElement;
   Args: {
     roomResource: RoomResource;
-    messageCommand: MessageTool;
+    messageTool: MessageTool;
     roomId: string;
     runCommand: () => void;
     isError?: boolean;
@@ -65,7 +65,7 @@ export default class RoomMessageTool extends Component<Signature> {
   @service declare private operatorModeStateService: OperatorModeStateService;
 
   private get previewCommandCode() {
-    let { name, arguments: payload } = this.args.messageCommand;
+    let { name, arguments: payload } = this.args.messageTool;
     return JSON.stringify({ name, payload }, null, 2);
   }
 
@@ -77,7 +77,7 @@ export default class RoomMessageTool extends Component<Signature> {
     if (this.didFailCorrectnessCheck) {
       return 'applied-with-error';
     }
-    let status = this.args.messageCommand?.status;
+    let status = this.args.messageTool?.status;
     // Mirror the Accept All bar fix: for any command the host will
     // auto-execute (checkCorrectness, requiresApproval=false, LLM mode
     // 'act'), present the applying spinner immediately on message-landed
@@ -95,12 +95,12 @@ export default class RoomMessageTool extends Component<Signature> {
 
   private get willAutoExecute() {
     let activeMode = this.args.roomResource.getActiveLLMModeForMessage(
-      this.args.messageCommand.eventId,
+      this.args.messageTool.eventId,
     );
     let isOwnedByCurrentAgent =
-      this.args.messageCommand.message.agentId === this.matrixService.agentId;
-    return isAutoExecutableCommand(
-      this.args.messageCommand,
+      this.args.messageTool.message.agentId === this.matrixService.agentId;
+    return isAutoExecutableTool(
+      this.args.messageTool,
       activeMode,
       isOwnedByCurrentAgent,
     );
@@ -109,8 +109,8 @@ export default class RoomMessageTool extends Component<Signature> {
   @use private toolResultCard = resource(() => {
     let initialState = { card: undefined } as { card: CardDef | undefined };
     let state = new TrackedObject(initialState);
-    if (this.args.messageCommand.toolResultFileDef) {
-      this.args.messageCommand.getCommandResultCard().then((card) => {
+    if (this.args.messageTool.toolResultFileDef) {
+      this.args.messageTool.getCommandResultCard().then((card) => {
         state.card = card;
       });
     }
@@ -119,13 +119,13 @@ export default class RoomMessageTool extends Component<Signature> {
 
   private get isDisplayingCode() {
     return this.args.roomResource.isDisplayingCode(
-      this.args.messageCommand.toolRequest as ToolRequest,
+      this.args.messageTool.toolRequest as ToolRequest,
     );
   }
 
   private toggleViewCode = () => {
     this.args.roomResource.toggleViewCode(
-      this.args.messageCommand.toolRequest as ToolRequest,
+      this.args.messageTool.toolRequest as ToolRequest,
     );
   };
 
@@ -161,7 +161,7 @@ export default class RoomMessageTool extends Component<Signature> {
   }
 
   private get shouldDisplayResultCard() {
-    let commandName = this.args.messageCommand.name ?? '';
+    let commandName = this.args.messageTool.name ?? '';
     return (
       !!this.toolResultCard.card &&
       commandName !== 'checkCorrectness' &&
@@ -170,7 +170,7 @@ export default class RoomMessageTool extends Component<Signature> {
   }
 
   private get didFailCorrectnessCheck() {
-    if (this.args.messageCommand.name !== 'checkCorrectness') {
+    if (this.args.messageTool.name !== 'checkCorrectness') {
       return false;
     }
     let card = this.toolResultCard.card as
@@ -195,7 +195,7 @@ export default class RoomMessageTool extends Component<Signature> {
           activeRealmURL: this.activeRealmURL,
           canEditActiveRealm: this.canEditActiveRealm,
         },
-        commandContext: this.toolService.commandContext,
+        toolContext: this.toolService.toolContext,
       }) ?? [];
     return toMenuItems(menuItems);
   }
@@ -218,7 +218,7 @@ export default class RoomMessageTool extends Component<Signature> {
 
   @cached
   private get failedToolState() {
-    let toolRequest = this.args.messageCommand.toolRequest as ToolRequest;
+    let toolRequest = this.args.messageTool.toolRequest as ToolRequest;
     if (!toolRequest.id) {
       return undefined;
     }
@@ -227,13 +227,13 @@ export default class RoomMessageTool extends Component<Signature> {
 
   private get invalidToolCallState() {
     return (
-      this.args.messageCommand.status === 'invalid' &&
-      !!this.args.messageCommand.failureReason
+      this.args.messageTool.status === 'invalid' &&
+      !!this.args.messageTool.failureReason
     );
   }
 
   private get commandDescription() {
-    return this.args.messageCommand.description ?? 'Preparing tool call...';
+    return this.args.messageTool.description ?? 'Preparing tool call...';
   }
 
   private get hasFailedState() {
@@ -249,12 +249,12 @@ export default class RoomMessageTool extends Component<Signature> {
         is-failed=(bool this.hasFailedState)
         compact=@isCompact
       }}
-      data-test-tool-call-id={{@messageCommand.toolRequest.id}}
+      data-test-tool-call-id={{@messageTool.toolRequest.id}}
       ...attributes
     >
       {{#if @isStreaming}}
         <CodeBlock
-          class={{cn 'command-code-block' compact=@isCompact}}
+          class={{cn 'tool-code-block' compact=@isCompact}}
           @monacoSDK={{@monacoSDK}}
           @codeData={{hash code=this.previewCommandCode language='json'}}
           data-test-tool-call-card-idle={{not
@@ -265,7 +265,7 @@ export default class RoomMessageTool extends Component<Signature> {
           <codeBlock.commandHeader
             @commandDescription={{this.commandDescription}}
             @action={{@runCommand}}
-            @actionVerb={{@messageCommand.actionVerb}}
+            @actionVerb={{@messageTool.actionVerb}}
             @code={{this.previewCommandCode}}
             @isCompact={{@isCompact}}
             @toolCallState='preparing'
@@ -273,7 +273,7 @@ export default class RoomMessageTool extends Component<Signature> {
         </CodeBlock>
       {{else}}
         <CodeBlock
-          class={{cn 'command-code-block' compact=@isCompact}}
+          class={{cn 'tool-code-block' compact=@isCompact}}
           {{this.scrollBottomIntoView}}
           @monacoSDK={{@monacoSDK}}
           @codeData={{hash code=this.previewCommandCode language='json'}}
@@ -283,9 +283,9 @@ export default class RoomMessageTool extends Component<Signature> {
           as |codeBlock|
         >
           <codeBlock.commandHeader
-            @commandDescription={{@messageCommand.description}}
+            @commandDescription={{@messageTool.description}}
             @action={{@runCommand}}
-            @actionVerb={{@messageCommand.actionVerb}}
+            @actionVerb={{@messageTool.actionVerb}}
             @code={{this.previewCommandCode}}
             @toolCallState={{this.applyButtonState}}
             @isCompact={{@isCompact}}
@@ -303,28 +303,28 @@ export default class RoomMessageTool extends Component<Signature> {
           </Alert>
         {{else if this.invalidToolCallState}}
           <Alert @type='warning' as |Alert|>
-            <Alert.Messages @messages={{array @messageCommand.failureReason}} />
+            <Alert.Messages @messages={{array @messageTool.failureReason}} />
             <Alert.Action @action={{@runCommand}} @actionName='Try Anyway' />
           </Alert>
         {{/if}}
         {{#if this.shouldDisplayResultCard}}
           <CardContainer
             @displayBoundaries={{false}}
-            class='command-result-card-preview'
+            class='tool-result-card-preview'
             data-test-tool-result-container
           >
             <CardHeader
               @cardTypeDisplayName={{this.headerTitle}}
               @cardTypeIcon={{cardTypeIcon this.commandResultCardForRendering}}
               @moreOptionsMenuItems={{this.moreOptionsMenuItems}}
-              class='command-result-card-header'
+              class='tool-result-card-header'
               data-test-tool-result-header
             />
             <CardRenderer
               @card={{this.commandResultCardForRendering}}
               @format='embedded'
               @displayContainer={{false}}
-              data-test-boxel-command-result
+              data-test-boxel-tool-call-result
             />
           </CardContainer>
         {{/if}}
@@ -335,17 +335,17 @@ export default class RoomMessageTool extends Component<Signature> {
       .room-message-tool > * + * {
         margin-top: var(--boxel-sp-xs);
       }
-      .command-result-card-preview {
+      .tool-result-card-preview {
         margin-top: var(--boxel-sp);
       }
-      .command-result-card-header {
+      .tool-result-card-header {
         --boxel-label-color: var(--boxel-450);
         --boxel-label-font-size: var(--boxel-font-size-xs);
         --boxel-label-line-height: calc(15 / 11);
         --boxel-header-padding: var(--boxel-sp-xxxs) var(--boxel-sp-xxxs) 0
           var(--left-padding);
       }
-      .command-result-card-header :deep(.content) {
+      .tool-result-card-header :deep(.content) {
         gap: 0;
       }
     </style>
diff --git a/packages/host/app/components/matrix/room-message.gts b/packages/host/app/components/matrix/room-message.gts
index 95cb0c1356..83685e3478 100644
--- a/packages/host/app/components/matrix/room-message.gts
+++ b/packages/host/app/components/matrix/room-message.gts
@@ -217,7 +217,7 @@ export default class RoomMessage extends Component<Signature> {
       >
         {{#each this.message.tools as |command|}}
           <RoomMessageTool
-            @messageCommand={{command}}
+            @messageTool={{command}}
             @roomResource={{@roomResource}}
             @runCommand={{fn (perform this.run) command}}
             @roomId={{@roomId}}
diff --git a/packages/host/app/components/matrix/room.gts b/packages/host/app/components/matrix/room.gts
index a26f74d1ff..5d291023b5 100644
--- a/packages/host/app/components/matrix/room.gts
+++ b/packages/host/app/components/matrix/room.gts
@@ -57,7 +57,7 @@ import ENV from '@cardstack/host/config/environment';
 import type { FileUploadState } from '@cardstack/host/lib/file-upload-state';
 import type { Message } from '@cardstack/host/lib/matrix-classes/message';
 import type { StackItem } from '@cardstack/host/lib/stack-item';
-import { isAutoExecutableCommand } from '@cardstack/host/lib/tool-auto-execute';
+import { isAutoExecutableTool } from '@cardstack/host/lib/tool-auto-execute';
 import { getAutoAttachment } from '@cardstack/host/resources/auto-attached-card';
 import { isReady } from '@cardstack/host/resources/file';
 import type { RoomResource } from '@cardstack/host/resources/room';
@@ -1759,7 +1759,7 @@ export default class Room extends Component<Signature> {
 
   private updateSkillIsActiveTask = task(
     async (isActive: boolean, skillCardId?: string) => {
-      await new UpdateRoomSkillsTool(this.toolService.commandContext).execute({
+      await new UpdateRoomSkillsTool(this.toolService.toolContext).execute({
         roomId: this.args.roomId,
         skillCardIdsToActivate: isActive ? [skillCardId!] : [],
         skillCardIdsToDeactivate: isActive ? [] : [skillCardId!],
@@ -1809,7 +1809,7 @@ export default class Room extends Component<Signature> {
 
   private attachSkillTask = task(async (cardId: string) => {
     let updateRoomSkillsCommand = new UpdateRoomSkillsTool(
-      this.toolService.commandContext,
+      this.toolService.toolContext,
     );
 
     await updateRoomSkillsCommand.execute({
@@ -1856,7 +1856,7 @@ export default class Room extends Component<Signature> {
   }
 
   @cached
-  private get readyCommands() {
+  private get readyTools() {
     let lastMessage = this.messages[this.messages.length - 1];
 
     if (!lastMessage || !lastMessage.tools) {
@@ -1878,7 +1878,7 @@ export default class Room extends Component<Signature> {
         // tool-service flips `acceptingAllRoomIds`. Without this filter,
         // the bar paints and then yanks itself once auto-execution starts,
         // which is the CS-11647 glitch.
-        !isAutoExecutableCommand(command, activeMode, isOwnedByCurrentAgent),
+        !isAutoExecutableTool(command, activeMode, isOwnedByCurrentAgent),
     );
   }
 
@@ -1919,14 +1919,14 @@ export default class Room extends Component<Signature> {
     return (
       this.showUnreadIndicator ||
       this.generatingResults ||
-      this.readyCommands.length > 0 ||
+      this.readyTools.length > 0 ||
       this.readyCodePatches.length > 0 ||
       this.isAcceptingAll
     );
   }
 
   private async executeReadyCommands() {
-    for (let command of this.readyCommands) {
+    for (let command of this.readyTools) {
       this.acceptingAllLabel = command.actionVerb;
       await this.toolService.run.unlinked().perform(command);
       this.acceptingAllLabel = undefined;
diff --git a/packages/host/app/components/operator-mode/code-editor.gts b/packages/host/app/components/operator-mode/code-editor.gts
index cdafaad624..bfd5a3c711 100644
--- a/packages/host/app/components/operator-mode/code-editor.gts
+++ b/packages/host/app/components/operator-mode/code-editor.gts
@@ -587,7 +587,7 @@ export default class CodeEditor extends Component<Signature> {
     this.updateFormatActionAvailability();
 
     try {
-      let lintCommand = new LintAndFixTool(this.toolService.commandContext);
+      let lintCommand = new LintAndFixTool(this.toolService.toolContext);
       await applyBoxelFormatting({
         lintAndFix: (input) => lintCommand.execute(input),
         realm: readyFile.realmURL,
diff --git a/packages/host/app/components/operator-mode/code-submode/module-inspector.gts b/packages/host/app/components/operator-mode/code-submode/module-inspector.gts
index 513362d13a..ad40f078f4 100644
--- a/packages/host/app/components/operator-mode/code-submode/module-inspector.gts
+++ b/packages/host/app/components/operator-mode/code-submode/module-inspector.gts
@@ -517,7 +517,7 @@ export default class ModuleInspector extends Component<ModuleInspectorSignature>
   private createSpecTask = task(async (ref: ResolvedCodeRef) => {
     try {
       const createSpecCommand = new CreateSpecTool(
-        this.toolService.commandContext,
+        this.toolService.toolContext,
       );
       let currentRealm = this.operatorModeStateService.realmURL;
       const result = await createSpecCommand.execute({
diff --git a/packages/host/app/components/operator-mode/code-submode/playground/playground-panel.gts b/packages/host/app/components/operator-mode/code-submode/playground/playground-panel.gts
index c08ea4c2a4..87992a7c67 100644
--- a/packages/host/app/components/operator-mode/code-submode/playground/playground-panel.gts
+++ b/packages/host/app/components/operator-mode/code-submode/playground/playground-panel.gts
@@ -223,7 +223,7 @@ export default class PlaygroundPanel extends Component<Signature> {
         canEdit: this.canEditCard,
         cardCrudFunctions: {},
         menuContext: 'code-mode-playground',
-        commandContext: this.toolService.commandContext,
+        toolContext: this.toolService.toolContext,
         format: this.format,
       }) || [],
     );
diff --git a/packages/host/app/components/operator-mode/container.gts b/packages/host/app/components/operator-mode/container.gts
index d08c6aef89..b03921a80a 100644
--- a/packages/host/app/components/operator-mode/container.gts
+++ b/packages/host/app/components/operator-mode/container.gts
@@ -94,8 +94,8 @@ export default class OperatorModeContainer extends Component<Signature> {
   }
 
   @provide(CommandContextName)
-  private get commandContext() {
-    return this.toolService.commandContext;
+  private get toolContext() {
+    return this.toolService.toolContext;
   }
 
   @provide(CardContextName)
@@ -106,7 +106,10 @@ export default class OperatorModeContainer extends Component<Signature> {
       getCards: this.getCards,
       getCardCollection: this.getCardCollection,
       store: this.store,
-      commandContext: this.commandContext,
+      toolContext: this.toolContext,
+      // populated alongside toolContext for content still reading the
+      // pre-rename spelling
+      commandContext: this.toolContext,
       searchResultsComponent: SearchResults,
       mode: 'operator',
       submode: this.operatorModeStateService.state?.submode,
diff --git a/packages/host/app/components/operator-mode/create-file-modal.gts b/packages/host/app/components/operator-mode/create-file-modal.gts
index 240824aae6..d2e092d258 100644
--- a/packages/host/app/components/operator-mode/create-file-modal.gts
+++ b/packages/host/app/components/operator-mode/create-file-modal.gts
@@ -929,7 +929,7 @@ export class ${className} extends ${exportName} {
       );
     }
     let { newCardId } = await new CopyCardToRealmTool(
-      this.toolService.commandContext,
+      this.toolService.toolContext,
     ).execute({
       sourceCard: this.currentRequest.sourceInstance,
       targetRealm: this.selectedRealmURL,
diff --git a/packages/host/app/components/operator-mode/create-listing-modal.gts b/packages/host/app/components/operator-mode/create-listing-modal.gts
index ccbba27ece..5cdb0eb203 100644
--- a/packages/host/app/components/operator-mode/create-listing-modal.gts
+++ b/packages/host/app/components/operator-mode/create-listing-modal.gts
@@ -180,7 +180,7 @@ export default class CreateListingModal extends Component<Signature> {
     // specifiers, so the catalog file isn't independently buildable. Going
     // through the loader is the only path that resolves both correctly.
     let module = await this.loaderService.loader.import<{
-      default: new (commandContext: ToolContext) => {
+      default: new (toolContext: ToolContext) => {
         execute: (input: {
           codeRef: ResolvedCodeRef;
           targetRealm: string;
@@ -194,7 +194,7 @@ export default class CreateListingModal extends Component<Signature> {
     let ListingCreateCommand = module.default;
 
     let result = await new ListingCreateCommand(
-      this.toolService.commandContext,
+      this.toolService.toolContext,
     ).execute({
       codeRef,
       targetRealm,
diff --git a/packages/host/app/components/operator-mode/detail-panel.gts b/packages/host/app/components/operator-mode/detail-panel.gts
index f4e981539d..ebb510f6f0 100644
--- a/packages/host/app/components/operator-mode/detail-panel.gts
+++ b/packages/host/app/components/operator-mode/detail-panel.gts
@@ -455,7 +455,7 @@ export default class DetailPanel extends Component<Signature> {
 
   @action private async createListing() {
     const command = new OpenCreateListingModalTool(
-      this.toolService.commandContext,
+      this.toolService.toolContext,
     );
     const targetRealm = this.operatorModeStateService.realmURL;
     if (!targetRealm) {
diff --git a/packages/host/app/components/operator-mode/error-display.gts b/packages/host/app/components/operator-mode/error-display.gts
index 9d33bffd27..246257d2f3 100644
--- a/packages/host/app/components/operator-mode/error-display.gts
+++ b/packages/host/app/components/operator-mode/error-display.gts
@@ -99,7 +99,7 @@ export default class ErrorDisplay
 
   private viewInCodeMode = dropTask(async () => {
     let switchSubmodeCommand = new SwitchSubmodeTool(
-      this.toolService.commandContext,
+      this.toolService.toolContext,
     );
     await switchSubmodeCommand.execute({
       submode: 'code',
diff --git a/packages/host/app/components/operator-mode/host-submode.gts b/packages/host/app/components/operator-mode/host-submode.gts
index d316f95d4c..3b0a5b3f2a 100644
--- a/packages/host/app/components/operator-mode/host-submode.gts
+++ b/packages/host/app/components/operator-mode/host-submode.gts
@@ -100,7 +100,7 @@ export default class HostSubmode extends Component<HostSubmodeSignature> {
     // Publish through the same command exposed to boxel-cli so the UI and
     // headless callers share one path. The modal already enforces the
     // publishability gate, so force past the command's redundant re-check.
-    let command = new PublishRealmTool(this.toolService.commandContext);
+    let command = new PublishRealmTool(this.toolService.toolContext);
     let result = await command.execute({
       realmURL: this.realmURL,
       publishedRealmURLs,
@@ -145,7 +145,7 @@ export default class HostSubmode extends Component<HostSubmodeSignature> {
   handleUnpublish = restartableTask(async (publishedRealmURL: string) => {
     // Unpublish through the same command exposed to boxel-cli so the UI and
     // headless callers share one path.
-    let command = new UnpublishRealmTool(this.toolService.commandContext);
+    let command = new UnpublishRealmTool(this.toolService.toolContext);
     await command.execute({ realmURL: this.realmURL, publishedRealmURL });
   });
 
diff --git a/packages/host/app/components/operator-mode/interact-submode.gts b/packages/host/app/components/operator-mode/interact-submode.gts
index d2f0f990ca..f0a885e943 100644
--- a/packages/host/app/components/operator-mode/interact-submode.gts
+++ b/packages/host/app/components/operator-mode/interact-submode.gts
@@ -499,7 +499,7 @@ export default class InteractSubmode extends Component {
         let targetStackIndex = destinationItem.stackIndex;
         for (let [index, card] of sources.entries()) {
           ({ newCardId } = await new CopyCardToStackTool(
-            this.toolService.commandContext,
+            this.toolService.toolContext,
           ).execute({
             sourceCard: card,
             targetStackIndex,
@@ -921,7 +921,7 @@ export default class InteractSubmode extends Component {
                 @saveCard={{this.saveCard}}
                 @editCard={{fn this.editCard stackIndex}}
                 @deleteCard={{this.requestDeleteCard}}
-                @commandContext={{this.toolService.commandContext}}
+                @toolContext={{this.toolService.toolContext}}
                 @close={{this.close}}
                 @onSelectedCards={{this.onSelectedCards}}
                 @setupStackItem={{this.setupStackItem}}
diff --git a/packages/host/app/components/operator-mode/operator-mode-overlays.gts b/packages/host/app/components/operator-mode/operator-mode-overlays.gts
index 4fcd5ebcc8..10da49ec57 100644
--- a/packages/host/app/components/operator-mode/operator-mode-overlays.gts
+++ b/packages/host/app/components/operator-mode/operator-mode-overlays.gts
@@ -85,7 +85,7 @@ export default class OperatorModeOverlays extends Overlays {
   declare private cardCrudFunctions: CardCrudFunctions;
 
   @consume(CommandContextName)
-  declare private commandContext: ToolContext;
+  declare private toolContext: ToolContext;
 
   get renderedCardsForOverlayActionsWithEvents() {
     return super
@@ -625,7 +625,7 @@ export default class OperatorModeOverlays extends Overlays {
         canEdit: this.realm.canWrite(cardId),
         cardCrudFunctions: this.cardCrudFunctions,
         menuContext: 'interact',
-        commandContext: this.commandContext,
+        toolContext: this.toolContext,
       }) ?? [];
 
     // Delete and New Card of This Type don't make sense from an embedded field
diff --git a/packages/host/app/components/operator-mode/preview-panel/index.gts b/packages/host/app/components/operator-mode/preview-panel/index.gts
index db4247547a..a2089b278d 100644
--- a/packages/host/app/components/operator-mode/preview-panel/index.gts
+++ b/packages/host/app/components/operator-mode/preview-panel/index.gts
@@ -152,7 +152,7 @@ export default class PreviewPanel extends Component<Signature> {
         canEdit: this.cardId ? this.realm.canWrite(this.cardId) : false,
         cardCrudFunctions: {},
         menuContext: 'code-mode-preview',
-        commandContext: this.toolService.commandContext,
+        toolContext: this.toolService.toolContext,
       }),
     );
   }
diff --git a/packages/host/app/components/operator-mode/preview-panel/rendered-markdown.gts b/packages/host/app/components/operator-mode/preview-panel/rendered-markdown.gts
index 3719a2fd10..8a3f1f8ee1 100644
--- a/packages/host/app/components/operator-mode/preview-panel/rendered-markdown.gts
+++ b/packages/host/app/components/operator-mode/preview-panel/rendered-markdown.gts
@@ -107,7 +107,7 @@ const DEFAULT_CARD_CONTEXT: Partial<CardContext> = {
   cardComponentModifier: class NoOpModifier extends Modifier<any> {
     modify() {}
   },
-  commandContext: undefined,
+  toolContext: undefined,
 };
 
 export default class RenderedMarkdown extends Component<Signature> {
diff --git a/packages/host/app/components/operator-mode/publish-realm-modal.gts b/packages/host/app/components/operator-mode/publish-realm-modal.gts
index ec7fb4dabf..f110ca8a3b 100644
--- a/packages/host/app/components/operator-mode/publish-realm-modal.gts
+++ b/packages/host/app/components/operator-mode/publish-realm-modal.gts
@@ -803,7 +803,7 @@ export default class PublishRealmModal extends Component<Signature> {
         // Check availability through the same command exposed to boxel-cli so
         // the UI and headless callers share one path.
         let command = new CheckDomainAvailabilityTool(
-          this.toolService.commandContext,
+          this.toolService.toolContext,
         );
         let result = await command.execute({ type: 'custom', name: subdomain });
         this.customSubdomainAvailability = {
diff --git a/packages/host/app/components/operator-mode/send-error-to-ai-assistant.gts b/packages/host/app/components/operator-mode/send-error-to-ai-assistant.gts
index 496a991504..cd2472a093 100644
--- a/packages/host/app/components/operator-mode/send-error-to-ai-assistant.gts
+++ b/packages/host/app/components/operator-mode/send-error-to-ai-assistant.gts
@@ -126,15 +126,15 @@ export default class SendErrorToAIAssistant extends Component<Signature> {
     return truncateForAi(assembled, AI_PROMPT_TOTAL_MAX_CHARS) ?? assembled;
   }
 
-  get commandContext() {
-    return this.toolService.commandContext;
+  get toolContext() {
+    return this.toolService.toolContext;
   }
 
   private sendToAiAssistant = restartableTask(async () => {
-    await new OpenAiAssistantRoomTool(this.commandContext).execute({
+    await new OpenAiAssistantRoomTool(this.toolContext).execute({
       roomId: this.matrixService.currentRoomId,
     });
-    await new SendAiAssistantMessageTool(this.commandContext).execute({
+    await new SendAiAssistantMessageTool(this.toolContext).execute({
       roomId: this.matrixService.currentRoomId,
       prompt: `In the attachment file, I encountered an error that needs fixing:\n\n${this.errorMessage}.`,
       attachedFileIdentifiers: this.args.fileToAttach
diff --git a/packages/host/app/components/operator-mode/stack-item.gts b/packages/host/app/components/operator-mode/stack-item.gts
index c6960a1419..f2e4ed16fb 100644
--- a/packages/host/app/components/operator-mode/stack-item.gts
+++ b/packages/host/app/components/operator-mode/stack-item.gts
@@ -105,7 +105,7 @@ interface Signature {
     stackItems: StackItem[];
     index: number;
     requestDeleteCard?: (card: CardDef | URL | string) => Promise<void>;
-    commandContext: ToolContext;
+    toolContext: ToolContext;
     close: (item: StackItem) => void;
     dismissStackedCardsAbove: (stackIndex: number) => Promise<void>;
     onSelectedCards: (
@@ -670,7 +670,7 @@ export default class OperatorModeStackItem extends Component<Signature> {
         canEdit: this.url ? this.realm.canWrite(this.url as string) : false,
         cardCrudFunctions: this.cardCrudFunctions,
         menuContext: 'interact',
-        commandContext: this.args.commandContext,
+        toolContext: this.args.toolContext,
         format: this.cardFormat,
         useBaseTemplate: this.args.item.useBaseTemplate,
       }) ?? [],
diff --git a/packages/host/app/components/operator-mode/stack.gts b/packages/host/app/components/operator-mode/stack.gts
index 9842678200..c2cf8be3f5 100644
--- a/packages/host/app/components/operator-mode/stack.gts
+++ b/packages/host/app/components/operator-mode/stack.gts
@@ -38,7 +38,7 @@ interface Signature {
     editCard: EditCardFn;
     saveCard: SaveCardFn;
     deleteCard: DeleteCardFn;
-    commandContext: ToolContext;
+    toolContext: ToolContext;
     close: (stackItem: StackItem) => void;
     onSelectedCards: (
       selectedCards: CardDefOrId[],
@@ -120,7 +120,7 @@ export default class OperatorModeStack extends Component<Signature> {
             @item={{item}}
             @index={{i}}
             @stackItems={{@stackItems}}
-            @commandContext={{@commandContext}}
+            @toolContext={{@toolContext}}
             @dismissStackedCardsAbove={{perform this.dismissStackedCardsAbove}}
             @requestDeleteCard={{@deleteCard}}
             @close={{@close}}
diff --git a/packages/host/app/lib/file-def-manager.ts b/packages/host/app/lib/file-def-manager.ts
index c8dbdc6f7b..4598690eb7 100644
--- a/packages/host/app/lib/file-def-manager.ts
+++ b/packages/host/app/lib/file-def-manager.ts
@@ -355,13 +355,13 @@ export default class FileDefManagerImpl
     }
 
     // Create the command defs to get the json schema
-    let commandDefinitionSchemas: ToolDefinitionSchema[] = [];
+    let toolDefinitionSchemas: ToolDefinitionSchema[] = [];
     const mappings = await basicMappings(this.loaderService.loader);
 
-    for (let commandDef of toolDefinitionFileDefs) {
+    for (let toolDef of toolDefinitionFileDefs) {
       let absoluteCodeRef = codeRefWithAbsoluteIdentifier(
-        commandDef.codeRef,
-        commandDef[relativeTo],
+        toolDef.codeRef,
+        toolDef[relativeTo],
         undefined,
         this.network.virtualNetwork,
       ) as ResolvedCodeRef;
@@ -369,8 +369,8 @@ export default class FileDefManagerImpl
         absoluteCodeRef,
         this.loaderService.loader,
       );
-      const command = new Command(this.toolService.commandContext);
-      const name = commandDef.functionName;
+      const command = new Command(this.toolService.toolContext);
+      const name = toolDef.functionName;
       const schema: ToolDefinitionSchema = {
         codeRef: absoluteCodeRef,
         tool: {
@@ -394,12 +394,12 @@ export default class FileDefManagerImpl
           },
         },
       };
-      commandDefinitionSchemas.push(schema);
+      toolDefinitionSchemas.push(schema);
     }
 
     // Upload each command definition schema as a file
     let fileDefs = await Promise.all(
-      commandDefinitionSchemas.map(async (schema) => {
+      toolDefinitionSchemas.map(async (schema) => {
         const name = schema.tool.function.name;
         const content = JSON.stringify(schema);
         const contentHash = await this.getContentHash(content);
diff --git a/packages/host/app/lib/host-base-tool.ts b/packages/host/app/lib/host-base-tool.ts
index 7197e104d6..633baefe34 100644
--- a/packages/host/app/lib/host-base-tool.ts
+++ b/packages/host/app/lib/host-base-tool.ts
@@ -13,9 +13,9 @@ export default abstract class HostBaseTool<
   CardInputType extends CardDefConstructor | undefined,
   CardResultType extends CardDefConstructor | undefined = undefined,
 > extends Command<CardInputType, CardResultType> {
-  constructor(commandContext: ToolContext) {
-    super(commandContext);
-    setOwner(this, getOwner(commandContext)!);
+  constructor(toolContext: ToolContext) {
+    super(toolContext);
+    setOwner(this, getOwner(toolContext)!);
   }
 
   @service declare protected loaderService: LoaderService;
diff --git a/packages/host/app/lib/matrix-classes/message-builder.ts b/packages/host/app/lib/matrix-classes/message-builder.ts
index 1e8e4b5708..987bf14e64 100644
--- a/packages/host/app/lib/matrix-classes/message-builder.ts
+++ b/packages/host/app/lib/matrix-classes/message-builder.ts
@@ -277,18 +277,18 @@ export default class MessageBuilder {
         isToolResultWithNoOutputMsgtype(event.content.msgtype)
       ) {
         let commandRequestId = event.content.commandRequestId;
-        let messageCommand = message.tools.find(
+        let messageTool = message.tools.find(
           (c) => c.toolRequest.id === commandRequestId,
         );
-        if (messageCommand) {
-          messageCommand.toolCallStatus = event.content['m.relates_to']
+        if (messageTool) {
+          messageTool.toolCallStatus = event.content['m.relates_to']
             .key as ToolCallStatus;
-          messageCommand.toolResultFileDef = isToolResultWithOutputContent(
+          messageTool.toolResultFileDef = isToolResultWithOutputContent(
             event.content,
           )
             ? event.content.data.card
             : undefined;
-          messageCommand.failureReason = event.content.failureReason;
+          messageTool.failureReason = event.content.failureReason;
         }
       }
     }
@@ -363,7 +363,7 @@ export default class MessageBuilder {
 
     // Find command in skills. loadSkillSource handles both legacy Skill
     // cards and markdown skills (tools in boxel.tools frontmatter).
-    let skillCommand:
+    let skillTool:
       | { codeRef: ResolvedCodeRef; requiresApproval: boolean }
       | undefined;
     findCommand: for (let skill of this.builderContext.skills) {
@@ -371,18 +371,18 @@ export default class MessageBuilder {
       if (!source) {
         continue;
       }
-      for (let candidateSkillCommand of getSkillSourceTools(source)) {
-        if (toolRequest.name === candidateSkillCommand.functionName) {
-          skillCommand = candidateSkillCommand;
+      for (let candidateSkillTool of getSkillSourceTools(source)) {
+        if (toolRequest.name === candidateSkillTool.functionName) {
+          skillTool = candidateSkillTool;
           break findCommand;
         }
       }
     }
 
     let actionVerb = 'Apply';
-    if (skillCommand?.codeRef) {
+    if (skillTool?.codeRef) {
       let CommandKlass = (await getClass(
-        skillCommand?.codeRef,
+        skillTool?.codeRef,
         this.loaderService.loader,
       )) as { actionVerb: string };
       if (CommandKlass?.actionVerb) {
@@ -390,16 +390,16 @@ export default class MessageBuilder {
       }
     }
 
-    let requiresApproval = skillCommand?.requiresApproval ?? true;
+    let requiresApproval = skillTool?.requiresApproval ?? true;
 
     let toolCallStatus: ToolCallStatus = (toolResultEvent?.content[
       'm.relates_to'
     ]?.key || 'ready') as ToolCallStatus;
 
-    let messageCommand = new MessageTool(
+    let messageTool = new MessageTool(
       message,
       toolRequest,
-      skillCommand?.codeRef,
+      skillTool?.codeRef,
       this.builderContext.effectiveEventId,
       requiresApproval,
       actionVerb,
@@ -410,7 +410,7 @@ export default class MessageBuilder {
       getOwner(this)!,
       toolResultEvent?.content.failureReason,
     );
-    return messageCommand;
+    return messageTool;
   }
 
   private buildMessageCodePatchResults(message: Message) {
diff --git a/packages/host/app/lib/tool-auto-execute.ts b/packages/host/app/lib/tool-auto-execute.ts
index c9ad22a08c..6daf195da5 100644
--- a/packages/host/app/lib/tool-auto-execute.ts
+++ b/packages/host/app/lib/tool-auto-execute.ts
@@ -18,7 +18,7 @@ export const CHECK_CORRECTNESS_COMMAND_NAME = 'checkCorrectness';
 // satisfy one of the three branches below. Callers that don't track
 // agents (e.g. unit tests) can pass `true` to focus on the other
 // conditions.
-export function isAutoExecutableCommand(
+export function isAutoExecutableTool(
   command: Pick<MessageTool, 'name' | 'requiresApproval' | 'executedBy'>,
   activeLLMMode: LLMMode | undefined,
   isOwnedByCurrentAgent: boolean,
diff --git a/packages/host/app/resources/code-diff.ts b/packages/host/app/resources/code-diff.ts
index 06eea42834..d99208b780 100644
--- a/packages/host/app/resources/code-diff.ts
+++ b/packages/host/app/resources/code-diff.ts
@@ -108,7 +108,7 @@ export class CodeDiffResource extends Resource<CodeDiffResourceArgs> {
     }
 
     let applySearchReplaceBlockCommand = new ApplySearchReplaceBlockTool(
-      this.toolService.commandContext,
+      this.toolService.toolContext,
     );
 
     try {
diff --git a/packages/host/app/routes/command-runner.ts b/packages/host/app/routes/command-runner.ts
index 218da2078f..ffaa49dc4e 100644
--- a/packages/host/app/routes/command-runner.ts
+++ b/packages/host/app/routes/command-runner.ts
@@ -103,7 +103,7 @@ export default class CommandRunnerRoute extends Route<CommandRunnerModel> {
       params.nonce,
     );
     let command = parseCommandParam(request?.command);
-    let commandInput = parseCommandInputValue(request?.input);
+    let toolInput = parseCommandInputValue(request?.input);
 
     if (!command) {
       model.status = 'error';
@@ -111,11 +111,11 @@ export default class CommandRunnerRoute extends Route<CommandRunnerModel> {
       return model;
     }
 
-    void this.#runCommand(model, command, commandInput);
+    void this.#runCommand(model, command, toolInput);
     return model;
   }
 
-  get commandContext(): ToolContext {
+  get toolContext(): ToolContext {
     let result = {
       [ToolContextStamp]: true,
     } as ToolContext;
@@ -126,7 +126,7 @@ export default class CommandRunnerRoute extends Route<CommandRunnerModel> {
   async #runCommand(
     model: CommandRunState,
     command: ResolvedCodeRef,
-    commandInput: Record<string, unknown> | undefined,
+    toolInput: Record<string, unknown> | undefined,
   ) {
     try {
       let ToolConstructor = (await getClass(
@@ -137,12 +137,12 @@ export default class CommandRunnerRoute extends Route<CommandRunnerModel> {
         throw new Error('Command not found for provided CodeRef');
       }
 
-      let commandInstance = new ToolConstructor(this.commandContext);
+      let toolInstance = new ToolConstructor(this.toolContext);
       let resultCard: CardDef | undefined;
-      if (commandInput) {
-        resultCard = await commandInstance.execute(commandInput);
+      if (toolInput) {
+        resultCard = await toolInstance.execute(toolInput);
       } else {
-        resultCard = await commandInstance.execute();
+        resultCard = await toolInstance.execute();
       }
 
       model.cardResult = resultCard ?? null;
diff --git a/packages/host/app/services/ai-assistant-panel-service.ts b/packages/host/app/services/ai-assistant-panel-service.ts
index 1bf461517e..984b228776 100644
--- a/packages/host/app/services/ai-assistant-panel-service.ts
+++ b/packages/host/app/services/ai-assistant-panel-service.ts
@@ -399,7 +399,7 @@ export default class AiAssistantPanelService extends Service {
           roomId = await this.createFallbackRoom(name);
         } else {
           let createRoomCommand = new CreateAiAssistantRoomTool(
-            this.toolService.commandContext,
+            this.toolService.toolContext,
           );
 
           let input: any = { name };
@@ -524,7 +524,7 @@ export default class AiAssistantPanelService extends Service {
       // skill file or a legacy `Skill` card, uploads it, and populates the
       // room's skills config + command definitions.
       let updateRoomSkillsCommand = new UpdateRoomSkillsTool(
-        this.toolService.commandContext,
+        this.toolService.toolContext,
       );
       await updateRoomSkillsCommand.execute({
         roomId,
@@ -540,7 +540,7 @@ export default class AiAssistantPanelService extends Service {
     async (oldRoomId: string, newRoomId: string) => {
       try {
         const summarizeCommand = new SummarizeSessionTool(
-          this.toolService.commandContext,
+          this.toolService.toolContext,
         );
         const result = await summarizeCommand.execute({
           roomId: oldRoomId,
diff --git a/packages/host/app/services/matrix-service.ts b/packages/host/app/services/matrix-service.ts
index c29c4559a0..67b6e36465 100644
--- a/packages/host/app/services/matrix-service.ts
+++ b/packages/host/app/services/matrix-service.ts
@@ -1421,10 +1421,10 @@ export default class MatrixService extends Service {
     if (validCommandDefinitions.length === 0) {
       return [];
     }
-    let commandFileDefs = await this.client.uploadToolDefinitions(
+    let toolFileDefs = await this.client.uploadToolDefinitions(
       validCommandDefinitions,
     );
-    return commandFileDefs;
+    return toolFileDefs;
   }
 
   async cacheContentHashIfNeeded(event: DiscreteMatrixEvent) {
@@ -1744,7 +1744,7 @@ export default class MatrixService extends Service {
     // Generate tool calls for patching currently open cards permitted for modification
     tools = tools.concat(
       await addPatchTools(
-        this.toolService.commandContext,
+        this.toolService.toolContext,
         patchableCards,
         this.cardAPI,
       ),
@@ -2815,7 +2815,7 @@ export default class MatrixService extends Service {
     }
 
     let updateRoomSkillsCommand = new UpdateRoomSkillsTool(
-      this.toolService.commandContext,
+      this.toolService.toolContext,
     );
     let defaultSkillIds = await this.loadDefaultSkills('code');
     await updateRoomSkillsCommand.execute({
diff --git a/packages/host/app/services/tool-service.ts b/packages/host/app/services/tool-service.ts
index 47a0ffab91..093ffdcdd1 100644
--- a/packages/host/app/services/tool-service.ts
+++ b/packages/host/app/services/tool-service.ts
@@ -36,7 +36,7 @@ import PatchCodeTool from '@cardstack/host/tools/patch-code';
 import LimitedSet from '../lib/limited-set';
 import {
   CHECK_CORRECTNESS_COMMAND_NAME,
-  isAutoExecutableCommand,
+  isAutoExecutableTool,
 } from '../lib/tool-auto-execute';
 
 import type LoaderService from './loader-service';
@@ -65,7 +65,7 @@ type GenericCommand = Command<
   typeof CardDef | undefined
 >;
 
-const commandProcessingWaiter = buildWaiter('tool-service:command-processing');
+const toolProcessingWaiter = buildWaiter('tool-service:command-processing');
 
 export default class ToolService extends Service {
   @service declare private loaderService: LoaderService;
@@ -96,9 +96,9 @@ export default class ToolService extends Service {
     string,
     { unsubscribe: () => void; timeoutId: ReturnType<typeof setTimeout> }
   >();
-  private commandProcessingEventQueue: string[] = [];
+  private toolProcessingEventQueue: string[] = [];
   private codePatchProcessingEventQueue: string[] = [];
-  private flushCommandProcessingQueue: Promise<void> | undefined;
+  private flushToolProcessingQueue: Promise<void> | undefined;
   private flushCodePatchProcessingQueue: Promise<void> | undefined;
 
   constructor(owner: Owner) {
@@ -118,9 +118,9 @@ export default class ToolService extends Service {
     for (let key of this.aiAssistantInvalidationWaiters.keys()) {
       this.cleanupInvalidationWaiter(key);
     }
-    this.commandProcessingEventQueue = [];
+    this.toolProcessingEventQueue = [];
     this.codePatchProcessingEventQueue = [];
-    this.flushCommandProcessingQueue = undefined;
+    this.flushToolProcessingQueue = undefined;
     this.flushCodePatchProcessingQueue = undefined;
   }
 
@@ -269,11 +269,11 @@ export default class ToolService extends Service {
       );
     }
     let compoundKey = `${roomId}|${eventId}`;
-    if (this.commandProcessingEventQueue.includes(compoundKey)) {
+    if (this.toolProcessingEventQueue.includes(compoundKey)) {
       return;
     }
 
-    this.commandProcessingEventQueue.push(compoundKey);
+    this.toolProcessingEventQueue.push(compoundKey);
 
     debounce(this, this.drainToolProcessingQueue, 100);
   }
@@ -305,20 +305,20 @@ export default class ToolService extends Service {
   }
 
   private async drainToolProcessingQueue() {
-    let waiterToken = commandProcessingWaiter.beginAsync();
+    let waiterToken = toolProcessingWaiter.beginAsync();
     try {
-      await this.flushCommandProcessingQueue;
+      await this.flushToolProcessingQueue;
 
-      let finishedProcessingCommands: () => void;
-      this.flushCommandProcessingQueue = new Promise(
-        (res) => (finishedProcessingCommands = res),
+      let finishedProcessingTools: () => void;
+      this.flushToolProcessingQueue = new Promise(
+        (res) => (finishedProcessingTools = res),
       );
 
-      let commandSpecs = [...this.commandProcessingEventQueue];
-      this.commandProcessingEventQueue = [];
+      let toolSpecs = [...this.toolProcessingEventQueue];
+      this.toolProcessingEventQueue = [];
 
-      while (commandSpecs.length > 0) {
-        let [roomId, eventId] = commandSpecs.shift()!.split('|');
+      while (toolSpecs.length > 0) {
+        let [roomId, eventId] = toolSpecs.shift()!.split('|');
 
         let roomResource = this.matrixService.roomResources.get(roomId!);
         if (!roomResource) {
@@ -356,7 +356,7 @@ export default class ToolService extends Service {
           console.error(
             `Room resource for room ${roomId} seems to be stuck processing, invalidating auto-executable commands on event ${eventId}`,
           );
-          await this.invalidateAutoExecutableCommandsForStuckProcessing(
+          await this.invalidateAutoExecutableToolsForStuckProcessing(
             roomResource,
             roomId!,
             eventId!,
@@ -374,32 +374,32 @@ export default class ToolService extends Service {
         }
 
         // Collect all ready commands for this message
-        let readyCommands: any[] = [];
-        for (let messageCommand of message.tools) {
+        let readyTools: any[] = [];
+        for (let messageTool of message.tools) {
           // ai-bot ran this one itself (e.g. readRealmFile). The host neither
           // validates nor runs it — it has no command class to resolve, and the
           // bot posts its own result. Must come before validate(), which would
           // otherwise mark it "No command found".
-          if (messageCommand.executedBy === AI_BOT_EXECUTOR) {
+          if (messageTool.executedBy === AI_BOT_EXECUTOR) {
             continue;
           }
-          if (this.currentlyExecutingToolRequestIds.has(messageCommand.id!)) {
+          if (this.currentlyExecutingToolRequestIds.has(messageTool.id!)) {
             continue;
           }
-          if (this.executedToolRequestIds.has(messageCommand.id!)) {
+          if (this.executedToolRequestIds.has(messageTool.id!)) {
             continue;
           }
           if (
-            messageCommand.status === 'applied' ||
-            messageCommand.status === 'invalid'
+            messageTool.status === 'applied' ||
+            messageTool.status === 'invalid'
           ) {
             continue;
           }
-          if (!messageCommand.name) {
+          if (!messageTool.name) {
             continue;
           }
 
-          let isValid = await this.validate(messageCommand);
+          let isValid = await this.validate(messageTool);
           if (!isValid) {
             continue;
           }
@@ -413,22 +413,18 @@ export default class ToolService extends Service {
           // every command reaching this point is owned by the current
           // agent.
           if (
-            isAutoExecutableCommand(
-              messageCommand,
-              activeModeAtMessageTime,
-              true,
-            )
+            isAutoExecutableTool(messageTool, activeModeAtMessageTime, true)
           ) {
-            readyCommands.push(messageCommand);
+            readyTools.push(messageTool);
           }
         }
 
         // Execute ready commands, tracking accept-all state if multiple commands
-        if (readyCommands.length > 0) {
+        if (readyTools.length > 0) {
           // This is an "accept all" operation - multiple commands ready for execution
           this.acceptingAllRoomIds.add(roomId!);
           try {
-            for (let command of readyCommands) {
+            for (let command of readyTools) {
               this.run.perform(command);
             }
           } finally {
@@ -436,13 +432,13 @@ export default class ToolService extends Service {
           }
         }
       }
-      finishedProcessingCommands!();
+      finishedProcessingTools!();
     } finally {
-      commandProcessingWaiter.endAsync(waiterToken);
+      toolProcessingWaiter.endAsync(waiterToken);
     }
   }
 
-  private async invalidateAutoExecutableCommandsForStuckProcessing(
+  private async invalidateAutoExecutableToolsForStuckProcessing(
     roomResource: RoomResource,
     roomId: string,
     eventId: string,
@@ -457,13 +453,13 @@ export default class ToolService extends Service {
     let activeModeAtMessageTime = roomResource.getActiveLLMModeForMessage(
       message.eventId,
     );
-    for (let messageCommand of message.tools) {
+    for (let messageTool of message.tools) {
       // ai-bot ran this one itself (e.g. readRealmFile): not the host's to run,
       // so not the host's to invalidate when processing wedges.
-      if (messageCommand.executedBy === AI_BOT_EXECUTOR) {
+      if (messageTool.executedBy === AI_BOT_EXECUTOR) {
         continue;
       }
-      let commandRequestId = messageCommand.toolRequest.id;
+      let commandRequestId = messageTool.toolRequest.id;
       // Without a tool call id we can't address a command result event, so
       // there's nothing to invalidate.
       if (!commandRequestId) {
@@ -476,26 +472,24 @@ export default class ToolService extends Service {
         continue;
       }
       if (
-        messageCommand.status === 'applied' ||
-        messageCommand.status === 'invalid'
+        messageTool.status === 'applied' ||
+        messageTool.status === 'invalid'
       ) {
         continue;
       }
-      if (!messageCommand.name) {
+      if (!messageTool.name) {
         continue;
       }
       // The outer agentId gate already verified ownership, so this command
       // is owned by the current agent.
-      if (
-        !isAutoExecutableCommand(messageCommand, activeModeAtMessageTime, true)
-      ) {
+      if (!isAutoExecutableTool(messageTool, activeModeAtMessageTime, true)) {
         // Manual-approval commands stay 'ready' — the action bar's Run
         // button is still the user's fallback for those.
         continue;
       }
       let invokedToolFromEventId =
         this.getCurrentEventIdForCommandRequest(roomId, commandRequestId) ??
-        messageCommand.eventId;
+        messageTool.eventId;
       await this.matrixService.sendToolResultEvent({
         roomId,
         invokedToolFromEventId,
@@ -510,7 +504,7 @@ export default class ToolService extends Service {
   }
 
   private async drainCodePatchProcessingQueue() {
-    let waiterToken = commandProcessingWaiter.beginAsync();
+    let waiterToken = toolProcessingWaiter.beginAsync();
     try {
       await this.flushCodePatchProcessingQueue;
 
@@ -619,11 +613,18 @@ export default class ToolService extends Service {
       }
       finishedProcessingCodePatches!();
     } finally {
-      commandProcessingWaiter.endAsync(waiterToken);
+      toolProcessingWaiter.endAsync(waiterToken);
     }
   }
 
+  // Pre-rename spelling of `toolContext`: realm content constructs tools with
+  // `getService('tool-service').commandContext` (and via the command-service
+  // registration alias). Stays until no deployed content references it.
   get commandContext(): ToolContext {
+    return this.toolContext;
+  }
+
+  get toolContext(): ToolContext {
     let result = {
       [ToolContextStamp]: true,
     };
@@ -697,32 +698,32 @@ export default class ToolService extends Service {
       this.matrixService.failedToolState.delete(commandRequestId!);
       this.currentlyExecutingToolRequestIds.add(commandRequestId!);
 
-      let commandToRun;
+      let toolToRun;
 
       // If we don't find it in the one-offs, start searching for
       // one in the skills we can construct
-      let commandCodeRef = command.codeRef;
-      if (commandCodeRef) {
+      let toolCodeRef = command.codeRef;
+      if (toolCodeRef) {
         let ToolConstructor = (await getClass(
-          commandCodeRef,
+          toolCodeRef,
           this.loaderService.loader,
         )) as { new (context: ToolContext): Command<any, any> };
-        commandToRun = new ToolConstructor(this.commandContext);
+        toolToRun = new ToolConstructor(this.toolContext);
       }
 
-      if (!commandToRun && command.name === CHECK_CORRECTNESS_COMMAND_NAME) {
-        commandToRun = new CheckCorrectnessTool(this.commandContext);
+      if (!toolToRun && command.name === CHECK_CORRECTNESS_COMMAND_NAME) {
+        toolToRun = new CheckCorrectnessTool(this.toolContext);
       }
 
-      if (commandToRun) {
-        let typedInput = await this.instantiateCommandInput(
-          commandToRun,
+      if (toolToRun) {
+        let typedInput = await this.instantiateToolInput(
+          toolToRun,
           payload?.attributes,
           payload?.relationships,
         );
 
         [resultCard] = await all([
-          await commandToRun.execute(typedInput as any),
+          await toolToRun.execute(typedInput as any),
           await timeout(DELAY_FOR_APPLYING_UI), // leave a beat for the "applying" state of the UI to be shown
         ]);
       } else if (command.name === 'patchCardInstance') {
@@ -803,28 +804,28 @@ export default class ToolService extends Service {
       return true;
     }
 
-    let commandCodeRef = command.codeRef;
-    let commandInstance: GenericCommand | undefined;
+    let toolCodeRef = command.codeRef;
+    let toolInstance: GenericCommand | undefined;
 
     if (command.name === CHECK_CORRECTNESS_COMMAND_NAME) {
-      commandInstance = new CheckCorrectnessTool(this.commandContext);
-    } else if (!commandCodeRef) {
+      toolInstance = new CheckCorrectnessTool(this.toolContext);
+    } else if (!toolCodeRef) {
       error = `No command for the name "${command.name}" was found`;
     } else {
       let ToolConstructor = (await getClass(
-        commandCodeRef,
+        toolCodeRef,
         this.loaderService.loader,
       )) as { new (context: ToolContext): Command<any, any> };
       if (!ToolConstructor) {
         error = `No command for the name "${command.name}" was found`;
       } else {
-        commandInstance = new ToolConstructor(this.commandContext);
+        toolInstance = new ToolConstructor(this.toolContext);
       }
     }
 
-    if (commandInstance && !error) {
+    if (toolInstance && !error) {
       let loader = (
-        getOwner(this.commandContext)!.lookup(
+        getOwner(this.toolContext)!.lookup(
           'service:loader-service',
         ) as LoaderService
       ).loader;
@@ -835,7 +836,7 @@ export default class ToolService extends Service {
           description: {
             type: 'string',
           },
-          ...(await commandInstance.getInputJsonSchema(
+          ...(await toolInstance.getInputJsonSchema(
             this.matrixService.cardAPI,
             mappings,
           )),
@@ -875,7 +876,7 @@ export default class ToolService extends Service {
 
   // Construct a new instance of the input type with the
   // The input is undefined if the command has no input type
-  private async instantiateCommandInput(
+  private async instantiateToolInput(
     command: GenericCommand,
     attributes: Record<string, any> | undefined,
     relationships: Record<string, any> | undefined,
@@ -931,7 +932,7 @@ export default class ToolService extends Service {
     let finalFileIdentifier: string | undefined;
 
     try {
-      let patchCodeCommand = new PatchCodeTool(this.commandContext);
+      let patchCodeCommand = new PatchCodeTool(this.toolContext);
 
       let patchCodeResult = await patchCodeCommand.execute({
         fileIdentifier: fileUrl,
diff --git a/packages/host/app/templates/host-freestyle.gts b/packages/host/app/templates/host-freestyle.gts
index 437231c090..9fc71d441d 100644
--- a/packages/host/app/templates/host-freestyle.gts
+++ b/packages/host/app/templates/host-freestyle.gts
@@ -85,7 +85,8 @@ class HostFreestyleComponent extends Component<HostFreestyleSignature> {
       getCards: this.store.getSearchResource.bind(this.store),
       getCardCollection,
       store: this.store,
-      commandContext: this.toolService.commandContext,
+      toolContext: this.toolService.toolContext,
+      commandContext: this.toolService.toolContext,
       searchResultsComponent: SearchResults,
     };
   }
diff --git a/packages/host/app/templates/index.gts b/packages/host/app/templates/index.gts
index 4aa649f3ee..547827b0fd 100644
--- a/packages/host/app/templates/index.gts
+++ b/packages/host/app/templates/index.gts
@@ -81,8 +81,8 @@ export class IndexComponent extends Component<IndexComponentComponentSignature>
   }
 
   @provide(CommandContextName)
-  private get commandContext() {
-    return this.toolService.commandContext;
+  private get toolContext() {
+    return this.toolService.toolContext;
   }
 
   // Remove this and onClose argument in OperatorModeContainer once we remove host mode and the card route, where closing operator mode will not be a thing anymore
@@ -143,7 +143,8 @@ export class IndexComponent extends Component<IndexComponentComponentSignature>
       getCards: this.getCards,
       getCardCollection: this.getCardCollection,
       store: this.store,
-      commandContext: this.commandContext,
+      toolContext: this.toolContext,
+      commandContext: this.toolContext,
       searchResultsComponent: SearchResults,
       mode: this.hostModeService.isActive ? 'host' : 'operator',
       submode: this.hostModeService.isActive
diff --git a/packages/host/app/tools/add-field-to-card-definition.ts b/packages/host/app/tools/add-field-to-card-definition.ts
index 56e6472241..eae56b146b 100644
--- a/packages/host/app/tools/add-field-to-card-definition.ts
+++ b/packages/host/app/tools/add-field-to-card-definition.ts
@@ -65,7 +65,7 @@ export default class AddFieldToCardDefinitionTool extends HostBaseTool<
       computedFieldFunctionSourceCode: input.computedFieldFunctionSourceCode,
     });
 
-    let writeTextFileCommand = new WriteTextFileTool(this.commandContext);
+    let writeTextFileCommand = new WriteTextFileTool(this.toolContext);
     await writeTextFileCommand.execute({
       content: moduleSyntax.code(),
       realm: input.realm,
diff --git a/packages/host/app/tools/ai-assistant.ts b/packages/host/app/tools/ai-assistant.ts
index 9cd59623e1..8d39b9ecf0 100644
--- a/packages/host/app/tools/ai-assistant.ts
+++ b/packages/host/app/tools/ai-assistant.ts
@@ -65,9 +65,7 @@ export default class UseAiAssistantTool extends HostBaseTool<
 
     // Only send message if prompt is provided
     if (input.prompt && input.prompt.trim() !== '') {
-      let sendMessageCommand = new SendAiAssistantMessageTool(
-        this.commandContext,
-      );
+      let sendMessageCommand = new SendAiAssistantMessageTool(this.toolContext);
       let sendMessageResult = await sendMessageCommand.execute({
         roomId,
         prompt: input.prompt,
@@ -103,7 +101,7 @@ export default class UseAiAssistantTool extends HostBaseTool<
 
     // Create a new room if no roomId is provided and no current room exists
     let createAIAssistantRoomCommand = new CreateAiAssistantRoomTool(
-      this.commandContext,
+      this.toolContext,
     );
     let createRoomResult = await createAIAssistantRoomCommand.execute({
       name: input.roomName,
@@ -117,7 +115,7 @@ export default class UseAiAssistantTool extends HostBaseTool<
   ): Promise<void> {
     if (input.openRoom) {
       let openAiAssistantRoomCommand = new OpenAiAssistantRoomTool(
-        this.commandContext,
+        this.toolContext,
       );
       await openAiAssistantRoomCommand.execute({
         roomId,
@@ -141,7 +139,7 @@ export default class UseAiAssistantTool extends HostBaseTool<
       return;
     }
 
-    let updateRoomSkillsCommand = new UpdateRoomSkillsTool(this.commandContext);
+    let updateRoomSkillsCommand = new UpdateRoomSkillsTool(this.toolContext);
     await updateRoomSkillsCommand.execute({
       roomId,
       skillCardIdsToActivate: [...skillCardIds],
@@ -180,7 +178,7 @@ export default class UseAiAssistantTool extends HostBaseTool<
     roomId: string,
   ): Promise<void> {
     if (input.llmModel) {
-      let setActiveLLMCommand = new SetActiveLLMTool(this.commandContext);
+      let setActiveLLMCommand = new SetActiveLLMTool(this.toolContext);
       await setActiveLLMCommand.execute({
         roomId,
         model: input.llmModel,
diff --git a/packages/host/app/tools/apply-markdown-edit.ts b/packages/host/app/tools/apply-markdown-edit.ts
index 25403e29c5..0afcaeab1f 100644
--- a/packages/host/app/tools/apply-markdown-edit.ts
+++ b/packages/host/app/tools/apply-markdown-edit.ts
@@ -43,7 +43,7 @@ export default class ApplyMarkdownEditTool extends HostBaseTool<
     }
 
     // Get the card
-    const getCard = new GetCardTool(this.commandContext);
+    const getCard = new GetCardTool(this.toolContext);
     const card = await getCard.execute({ cardId: input.cardId });
 
     if (!card) {
@@ -130,7 +130,7 @@ export default class ApplyMarkdownEditTool extends HostBaseTool<
     };
 
     const response = await new SendRequestViaProxyTool(
-      this.commandContext,
+      this.toolContext,
     ).execute({
       url: 'https://openrouter.ai/api/v1/chat/completions',
       method: 'POST',
@@ -191,7 +191,7 @@ export default class ApplyMarkdownEditTool extends HostBaseTool<
     }
 
     // Patch only the specific markdown field
-    await new PatchFieldsTool(this.commandContext).execute({
+    await new PatchFieldsTool(this.toolContext).execute({
       cardId: input.cardId,
       fieldUpdates: {
         [input.fieldPath]: finalContent,
diff --git a/packages/host/app/tools/ask-ai.ts b/packages/host/app/tools/ask-ai.ts
index 21e3408859..9f97a86bd9 100644
--- a/packages/host/app/tools/ask-ai.ts
+++ b/packages/host/app/tools/ask-ai.ts
@@ -28,11 +28,9 @@ export default class AskAiTool extends HostBaseTool<
   protected async run(
     input: BaseToolModule.AskAiInput,
   ): Promise<BaseToolModule.AskAiOutput> {
-    let createRoomCommand = new CreateAiAssistantRoomTool(this.commandContext);
-    let openRoomCommand = new OpenAiAssistantRoomTool(this.commandContext);
-    let sendMessageCommand = new SendAiAssistantMessageTool(
-      this.commandContext,
-    );
+    let createRoomCommand = new CreateAiAssistantRoomTool(this.toolContext);
+    let openRoomCommand = new OpenAiAssistantRoomTool(this.toolContext);
+    let sendMessageCommand = new SendAiAssistantMessageTool(this.toolContext);
 
     let [skillIds, openCards] = await Promise.all([
       this.matrixService.loadDefaultSkills('code') || Promise.resolve([]),
diff --git a/packages/host/app/tools/bot-requests/create-listing-pr-request.ts b/packages/host/app/tools/bot-requests/create-listing-pr-request.ts
index 6863fd4783..d0ba8b9180 100644
--- a/packages/host/app/tools/bot-requests/create-listing-pr-request.ts
+++ b/packages/host/app/tools/bot-requests/create-listing-pr-request.ts
@@ -45,7 +45,7 @@ export default class CreateListingPRRequestTool extends HostBaseTool<
       listingSummary = listing.summary ?? undefined;
     }
 
-    let useAiAssistantCommand = new UseAiAssistantTool(this.commandContext);
+    let useAiAssistantCommand = new UseAiAssistantTool(this.toolContext);
     let createRoomResult = await useAiAssistantCommand.execute({
       roomId: 'new',
       roomName: `PR: ${listingName ?? listingId ?? 'Listing'}`,
@@ -60,7 +60,7 @@ export default class CreateListingPRRequestTool extends HostBaseTool<
 
     let submittedBy = this.matrixService.userId ?? undefined;
 
-    await new SendBotTriggerEventTool(this.commandContext).execute({
+    await new SendBotTriggerEventTool(this.toolContext).execute({
       roomId,
       realm,
       type: 'pr-listing-create',
diff --git a/packages/host/app/tools/copy-and-edit.ts b/packages/host/app/tools/copy-and-edit.ts
index ccf369ff29..2965cb412c 100644
--- a/packages/host/app/tools/copy-and-edit.ts
+++ b/packages/host/app/tools/copy-and-edit.ts
@@ -57,7 +57,7 @@ export default class CopyAndEditTool extends HostBaseTool<
       throw new Error(`Do not have write permissions to ${targetRealm}`);
     }
 
-    let copyCardCommand = new CopyCardToRealmTool(this.commandContext);
+    let copyCardCommand = new CopyCardToRealmTool(this.toolContext);
     let { newCardId } = await copyCardCommand.execute({
       sourceCard: input.card,
       targetRealm,
diff --git a/packages/host/app/tools/copy-card-to-stack.ts b/packages/host/app/tools/copy-card-to-stack.ts
index db26850a67..b332dea9e0 100644
--- a/packages/host/app/tools/copy-card-to-stack.ts
+++ b/packages/host/app/tools/copy-card-to-stack.ts
@@ -39,7 +39,7 @@ export default class CopyCardToStackTool extends HostBaseTool<
     if (!realmToCopyTo) {
       throw new Error('Cannot determine target realm to copy card to');
     }
-    let copyCardToRealmCommand = new CopyCardToRealmTool(this.commandContext);
+    let copyCardToRealmCommand = new CopyCardToRealmTool(this.toolContext);
     return await copyCardToRealmCommand.execute({
       sourceCard: input.sourceCard,
       targetRealm: realmToCopyTo,
diff --git a/packages/host/app/tools/create-ai-assistant-room.ts b/packages/host/app/tools/create-ai-assistant-room.ts
index 209fb927d4..611e1af0e9 100644
--- a/packages/host/app/tools/create-ai-assistant-room.ts
+++ b/packages/host/app/tools/create-ai-assistant-room.ts
@@ -156,9 +156,9 @@ export default class CreateAiAssistantRoomTool extends HostBaseTool<
       ...enabled.sources,
       ...disabled.sources,
     ].flatMap((source) => getSkillSourceTools(source));
-    let commandFileDefs: FileDef[] = [];
+    let toolFileDefs: FileDef[] = [];
     if (toolDefinitionFileDefs.length) {
-      commandFileDefs = await matrixService.uploadToolDefinitions(
+      toolFileDefs = await matrixService.uploadToolDefinitions(
         matrixService.getUniqueToolDefinitions(toolDefinitionFileDefs),
       );
     }
@@ -203,7 +203,7 @@ export default class CreateAiAssistantRoomTool extends HostBaseTool<
               disabledSkillCards: disabled.fileDefs.map((fileDef) =>
                 fileDef.serialize(),
               ),
-              toolDefinitions: commandFileDefs.map((commandFileDef) =>
+              toolDefinitions: toolFileDefs.map((commandFileDef) =>
                 commandFileDef.serialize(),
               ),
             },
diff --git a/packages/host/app/tools/create-and-open-submission-workflow-card.ts b/packages/host/app/tools/create-and-open-submission-workflow-card.ts
index fa6b1a1e16..3cca840273 100644
--- a/packages/host/app/tools/create-and-open-submission-workflow-card.ts
+++ b/packages/host/app/tools/create-and-open-submission-workflow-card.ts
@@ -21,7 +21,7 @@ export default class CreateAndOpenSubmissionWorkflowCardTool extends HostBaseToo
   protected async run(
     input: BaseToolModule.CreateListingPRRequestInput,
   ): Promise<undefined> {
-    await new CreateSubmissionWorkflowTool(this.commandContext).execute({
+    await new CreateSubmissionWorkflowTool(this.toolContext).execute({
       realm: input.realm,
       listingId: input.listingId,
       listingName: input.listingName,
diff --git a/packages/host/app/tools/create-specs.ts b/packages/host/app/tools/create-specs.ts
index beb403ec7b..aba6b7a854 100644
--- a/packages/host/app/tools/create-specs.ts
+++ b/packages/host/app/tools/create-specs.ts
@@ -226,7 +226,7 @@ export default class CreateSpecTool extends HostBaseTool<
     if (autoGenerateReadme && !createdSpecRes.spec.readMe) {
       // we populate the readme when is not already set even when spec is already created
       let generateReadmeSpecCommand = new GenerateReadmeSpecTool(
-        this.commandContext,
+        this.toolContext,
       );
       await generateReadmeSpecCommand.execute({
         spec: createdSpecRes.spec,
diff --git a/packages/host/app/tools/create-submission-workflow.ts b/packages/host/app/tools/create-submission-workflow.ts
index 4057f88653..4eb440ca41 100644
--- a/packages/host/app/tools/create-submission-workflow.ts
+++ b/packages/host/app/tools/create-submission-workflow.ts
@@ -71,7 +71,7 @@ export default class CreateSubmissionWorkflowTool extends HostBaseTool<
     // Create the Matrix room first so its id can be persisted on the workflow
     // card — the retry flow reads roomId off the card to re-emit the bot
     // trigger event without losing the original conversation.
-    let useAiAssistantCommand = new UseAiAssistantTool(this.commandContext);
+    let useAiAssistantCommand = new UseAiAssistantTool(this.toolContext);
     let createRoomResult = await useAiAssistantCommand.execute({
       roomId: 'new',
       roomName: `PR: ${listingName ?? listingId ?? 'Listing'}`,
@@ -142,11 +142,11 @@ export default class CreateSubmissionWorkflowTool extends HostBaseTool<
       throw err;
     }
 
-    await new OpenInInteractModeTool(this.commandContext).execute({
+    await new OpenInInteractModeTool(this.toolContext).execute({
       cardId: workflowCardId,
     });
 
-    await new SendBotTriggerEventTool(this.commandContext).execute({
+    await new SendBotTriggerEventTool(this.toolContext).execute({
       roomId,
       realm,
       type: 'pr-listing-create',
diff --git a/packages/host/app/tools/generate-example-cards.ts b/packages/host/app/tools/generate-example-cards.ts
index 99ef18c64b..ef039b95dc 100644
--- a/packages/host/app/tools/generate-example-cards.ts
+++ b/packages/host/app/tools/generate-example-cards.ts
@@ -76,9 +76,7 @@ export default class GenerateExampleCardsTool extends HostBaseTool<
       }),
     );
 
-    let sendMessageCommand = new SendAiAssistantMessageTool(
-      this.commandContext,
-    );
+    let sendMessageCommand = new SendAiAssistantMessageTool(this.toolContext);
 
     await sendMessageCommand.execute({
       roomId: this.matrixService.currentRoomId,
@@ -158,7 +156,7 @@ export class GenerateExampleCardsOneShotTool extends HostBaseTool<
       }),
     );
 
-    const oneShot = new OneShotLlmRequestTool(this.commandContext);
+    const oneShot = new OneShotLlmRequestTool(this.toolContext);
     const attachedFileIdentifiers = buildAttachedFileURLs(input.codeRef.module);
     const llmResult = await oneShot.execute({
       codeRef: input.codeRef,
diff --git a/packages/host/app/tools/generate-readme-spec.ts b/packages/host/app/tools/generate-readme-spec.ts
index c11c76feb7..0578b79b52 100644
--- a/packages/host/app/tools/generate-readme-spec.ts
+++ b/packages/host/app/tools/generate-readme-spec.ts
@@ -61,7 +61,7 @@ Requirements:
 
     // Generate the README using the existing command
     const generateReadmeCommand = new OneShotLlmRequestTool(
-      this.toolService.commandContext,
+      this.toolService.toolContext,
     );
 
     let userPrompt = GenerateReadmeSpecTool.getUserPrompt(
@@ -85,7 +85,7 @@ Requirements:
     if (input.spec.id) {
       try {
         const patchCardInstanceCommand = new PatchCardInstanceTool(
-          this.toolService.commandContext,
+          this.toolService.toolContext,
           { cardType: input.spec.constructor as typeof CardDef }, //is this correct?
         );
 
diff --git a/packages/host/app/tools/generate-theme-example.ts b/packages/host/app/tools/generate-theme-example.ts
index 3787d51012..ef29b78736 100644
--- a/packages/host/app/tools/generate-theme-example.ts
+++ b/packages/host/app/tools/generate-theme-example.ts
@@ -69,7 +69,7 @@ export default class GenerateThemeExampleTool extends HostBaseTool<
       ),
     );
 
-    const oneShot = new OneShotLlmRequestTool(this.commandContext);
+    const oneShot = new OneShotLlmRequestTool(this.toolContext);
     const llmResult = await oneShot.execute({
       codeRef: input.codeRef,
       systemPrompt: ONE_SHOT_SYSTEM_PROMPT,
diff --git a/packages/host/app/tools/generate-thumbnail.ts b/packages/host/app/tools/generate-thumbnail.ts
index fda5340151..1f4c12dbe6 100644
--- a/packages/host/app/tools/generate-thumbnail.ts
+++ b/packages/host/app/tools/generate-thumbnail.ts
@@ -146,9 +146,7 @@ export default class GenerateThumbnailTool extends HostBaseTool<
 
     const model = input.llmModel?.trim() || DEFAULT_IMAGE_GENERATION_LLM;
 
-    const result = await new SendRequestViaProxyTool(
-      this.commandContext,
-    ).execute({
+    const result = await new SendRequestViaProxyTool(this.toolContext).execute({
       url: 'https://openrouter.ai/api/v1/chat/completions',
       method: 'POST',
       requestBody: JSON.stringify({
@@ -205,15 +203,15 @@ export default class GenerateThumbnailTool extends HostBaseTool<
       : filename;
 
     // Write binary to realm → realm indexes as PngDef/ImageDef automatically
-    const writeResult = await new WriteBinaryFileTool(
-      this.commandContext,
-    ).execute({
-      path: filePath,
-      realm: targetRealmIdentifier,
-      base64Content,
-      contentType: mimeType,
-      useNonConflictingFilename: true,
-    });
+    const writeResult = await new WriteBinaryFileTool(this.toolContext).execute(
+      {
+        path: filePath,
+        realm: targetRealmIdentifier,
+        base64Content,
+        contentType: mimeType,
+        useNonConflictingFilename: true,
+      },
+    );
 
     if (!writeResult?.fileIdentifier) {
       throw new Error('Failed to write binary file to realm.');
@@ -226,7 +224,7 @@ export default class GenerateThumbnailTool extends HostBaseTool<
         typeof CardAPI
       >('https://cardstack.com/base/card-api');
 
-      await new PatchCardInstanceTool(this.commandContext, {
+      await new PatchCardInstanceTool(this.toolContext, {
         cardType: cardApiModule.CardDef as unknown as typeof CardDef,
       }).execute({
         cardId: targetCardId,
diff --git a/packages/host/app/tools/listing-action-build.ts b/packages/host/app/tools/listing-action-build.ts
index 31567f2284..8c80f2cbea 100644
--- a/packages/host/app/tools/listing-action-build.ts
+++ b/packages/host/app/tools/listing-action-build.ts
@@ -36,7 +36,7 @@ export default class ListingActionBuildTool extends HostBaseTool<
     const prompt = `Generate .gts card definition for "${listing.name}" implementing all requirements from the attached listing specification. Then preview the final code in playground panel.`;
 
     const { roomId } = await new CreateAiAssistantRoomTool(
-      this.commandContext,
+      this.toolContext,
     ).execute({
       name: `Build ${listing.name}`,
     });
@@ -48,29 +48,29 @@ export default class ListingActionBuildTool extends HostBaseTool<
     ];
 
     if (roomId) {
-      await new SetActiveLLMTool(this.commandContext).execute({
+      await new SetActiveLLMTool(this.toolContext).execute({
         roomId,
         model: DEFAULT_CODING_LLM,
         mode: 'act',
       });
 
-      await new UpdateRoomSkillsTool(this.commandContext).execute({
+      await new UpdateRoomSkillsTool(this.toolContext).execute({
         roomId,
         skillCardIdsToActivate: defaultSkills,
       });
 
-      await new SwitchSubmodeTool(this.commandContext).execute({
+      await new SwitchSubmodeTool(this.toolContext).execute({
         submode: 'code',
         codePath: `${realmUrl}index.json`,
       });
 
-      await new SendAiAssistantMessageTool(this.commandContext).execute({
+      await new SendAiAssistantMessageTool(this.toolContext).execute({
         roomId,
         prompt,
         attachedCards: [listing],
       });
 
-      await new OpenAiAssistantRoomTool(this.commandContext).execute({
+      await new OpenAiAssistantRoomTool(this.toolContext).execute({
         roomId,
       });
     }
diff --git a/packages/host/app/tools/one-shot-llm-request.ts b/packages/host/app/tools/one-shot-llm-request.ts
index b8604e2a17..880205964b 100644
--- a/packages/host/app/tools/one-shot-llm-request.ts
+++ b/packages/host/app/tools/one-shot-llm-request.ts
@@ -64,7 +64,7 @@ export default class OneShotLlmRequestTool extends HostBaseTool<
       let fileContent = '';
       if (input.codeRef?.module) {
         const readSourceCommand = new ReadSourceTool(
-          this.toolService.commandContext,
+          this.toolService.toolContext,
         );
         const fileContents = await readSourceCommand.execute({
           path: input.codeRef.module,
@@ -79,7 +79,7 @@ export default class OneShotLlmRequestTool extends HostBaseTool<
         input.attachedFileIdentifiers.length > 0
       ) {
         const readTextFileCommand = new ReadTextFileTool(
-          this.toolService.commandContext,
+          this.toolService.toolContext,
         );
 
         const attachedFilePromises = input.attachedFileIdentifiers.map(
@@ -163,7 +163,7 @@ export default class OneShotLlmRequestTool extends HostBaseTool<
       });
 
       const sendRequestViaProxyCommand = new SendRequestViaProxyTool(
-        this.toolService.commandContext,
+        this.toolService.toolContext,
       );
       const result = await sendRequestViaProxyCommand.execute({
         url: 'https://openrouter.ai/api/v1/chat/completions',
diff --git a/packages/host/app/tools/patch-card-instance.ts b/packages/host/app/tools/patch-card-instance.ts
index e9ee493bdd..01b7a58c4b 100644
--- a/packages/host/app/tools/patch-card-instance.ts
+++ b/packages/host/app/tools/patch-card-instance.ts
@@ -31,10 +31,10 @@ export default class PatchCardInstanceTool extends HostBaseTool<
   static actionVerb = 'Update Card';
 
   constructor(
-    commandContext: ToolContext,
+    toolContext: ToolContext,
     private readonly configuration: Configuration,
   ) {
-    super(commandContext);
+    super(toolContext);
   }
 
   async getInputType() {
diff --git a/packages/host/app/tools/patch-code.ts b/packages/host/app/tools/patch-code.ts
index b4717ed583..8f4583064a 100644
--- a/packages/host/app/tools/patch-code.ts
+++ b/packages/host/app/tools/patch-code.ts
@@ -174,7 +174,7 @@ export default class PatchCodeTool extends HostBaseTool<
     patchedCode: string;
     results: { status: 'applied' | 'failed'; failureReason?: string }[];
   }> {
-    let applyCommand = new ApplySearchReplaceBlockTool(this.commandContext);
+    let applyCommand = new ApplySearchReplaceBlockTool(this.toolContext);
     let content = initialContent;
     let results: { status: 'applied' | 'failed'; failureReason?: string }[] =
       [];
@@ -202,7 +202,7 @@ export default class PatchCodeTool extends HostBaseTool<
     fileUrl: string,
     content: string,
   ): Promise<BaseToolModule.LintAndFixResult> {
-    let lintCommand = new LintAndFixTool(this.commandContext);
+    let lintCommand = new LintAndFixTool(this.toolContext);
     let realmURL = this.realm.url(fileUrl);
     let filename = new URL(fileUrl).pathname.split('/').pop() || 'input.gts';
 
diff --git a/packages/host/app/tools/patch-fields.ts b/packages/host/app/tools/patch-fields.ts
index b8c46084c3..eda77b117e 100644
--- a/packages/host/app/tools/patch-fields.ts
+++ b/packages/host/app/tools/patch-fields.ts
@@ -34,10 +34,10 @@ export default class PatchFieldsTool extends HostBaseTool<
   requireInputFields = ['cardId', 'fieldUpdates'];
 
   constructor(
-    commandContext: ToolContext,
+    toolContext: ToolContext,
     private readonly configuration?: Configuration,
   ) {
-    super(commandContext);
+    super(toolContext);
   }
 
   async getInputType() {
diff --git a/packages/host/app/tools/patch-theme.ts b/packages/host/app/tools/patch-theme.ts
index e2a645b900..c06e534e48 100644
--- a/packages/host/app/tools/patch-theme.ts
+++ b/packages/host/app/tools/patch-theme.ts
@@ -39,7 +39,7 @@ export default class PatchThemeTool extends HostBaseTool<
         ? linkedSkill.id
         : undefined;
 
-    let useAssistant = new UseAiAssistantTool(this.commandContext);
+    let useAssistant = new UseAiAssistantTool(this.toolContext);
     return await useAssistant.execute({
       roomId: 'new',
       openRoom: true,
diff --git a/packages/host/app/tools/populate-with-sample-data.ts b/packages/host/app/tools/populate-with-sample-data.ts
index 576bf15f18..454d5eecb8 100644
--- a/packages/host/app/tools/populate-with-sample-data.ts
+++ b/packages/host/app/tools/populate-with-sample-data.ts
@@ -60,9 +60,7 @@ export default class PopulateWithSampleDataTool extends HostBaseTool<
       throw new Error(`Could not load card: ${card.message}`);
     }
 
-    let sendMessageCommand = new SendAiAssistantMessageTool(
-      this.commandContext,
-    );
+    let sendMessageCommand = new SendAiAssistantMessageTool(this.toolContext);
 
     await sendMessageCommand.execute({
       roomId: this.matrixService.currentRoomId,
diff --git a/packages/host/app/tools/preview-format.ts b/packages/host/app/tools/preview-format.ts
index 9c51d6df48..a992eb0264 100644
--- a/packages/host/app/tools/preview-format.ts
+++ b/packages/host/app/tools/preview-format.ts
@@ -30,7 +30,7 @@ export default class PreviewFormatTool extends HostBaseTool<
     input: BaseToolModule.PreviewFormatInput,
   ): Promise<undefined> {
     // 1. Switch to code submode
-    await new SwitchSubmodeTool(this.commandContext).execute({
+    await new SwitchSubmodeTool(this.toolContext).execute({
       submode: 'code',
       codePath: input.modulePath,
     });
@@ -42,7 +42,7 @@ export default class PreviewFormatTool extends HostBaseTool<
     );
 
     // 3. Show the card in the specified format using ShowCardTool
-    let showCardCommand = new ShowCardTool(this.commandContext);
+    let showCardCommand = new ShowCardTool(this.toolContext);
     await showCardCommand.execute({
       cardId: input.cardId,
       format: input.format,
diff --git a/packages/host/app/tools/retry-submission-workflow.ts b/packages/host/app/tools/retry-submission-workflow.ts
index 6443a51498..16bde48e0e 100644
--- a/packages/host/app/tools/retry-submission-workflow.ts
+++ b/packages/host/app/tools/retry-submission-workflow.ts
@@ -87,7 +87,7 @@ export default class RetrySubmissionWorkflowTool extends HostBaseTool<
     );
 
     try {
-      await new SendBotTriggerEventTool(this.commandContext).execute({
+      await new SendBotTriggerEventTool(this.toolContext).execute({
         roomId,
         realm: listingRealm,
         type: 'pr-listing-retry',
diff --git a/packages/host/app/tools/sanitize-module-list.ts b/packages/host/app/tools/sanitize-module-list.ts
index 4a9ed873f9..f554ef975d 100644
--- a/packages/host/app/tools/sanitize-module-list.ts
+++ b/packages/host/app/tools/sanitize-module-list.ts
@@ -59,13 +59,13 @@ export default class SanitizeModuleListTool extends HostBaseTool<
 
         // Only allow modules that belong to a realm we can read
         const { realmIdentifier } = await new GetRealmOfResourceIdentifierTool(
-          this.commandContext,
+          this.toolContext,
         ).execute({ resourceIdentifier: dep });
         if (!realmIdentifier) {
           return null;
         }
         const { canRead } = await new CanReadRealmTool(
-          this.commandContext,
+          this.toolContext,
         ).execute({ realmIdentifier });
         return canRead ? dep : null;
       }),
diff --git a/packages/host/app/tools/screenshot-card.ts b/packages/host/app/tools/screenshot-card.ts
index a2cfdb93b8..4e7ca67a64 100644
--- a/packages/host/app/tools/screenshot-card.ts
+++ b/packages/host/app/tools/screenshot-card.ts
@@ -129,9 +129,7 @@ export default class ScreenshotCardTool extends HostBaseTool<
     // promotes the PNG into a PngDef / ImageDef card automatically.
     let filename = `${generateFilenameFromCard(cardURL)}.png`;
     let filePath = `Screenshots/${filename}`;
-    let writeResult = await new WriteBinaryFileTool(
-      this.commandContext,
-    ).execute({
+    let writeResult = await new WriteBinaryFileTool(this.toolContext).execute({
       path: filePath,
       realm: cardRealm,
       base64Content: attrs.base64,
diff --git a/packages/host/app/tools/search-and-choose.ts b/packages/host/app/tools/search-and-choose.ts
index eae4d7262f..947b617c48 100644
--- a/packages/host/app/tools/search-and-choose.ts
+++ b/packages/host/app/tools/search-and-choose.ts
@@ -50,7 +50,7 @@ export default class SearchAndChooseTool extends HostBaseTool<
     const { SearchAndChooseResult } = await this.loadToolModule();
 
     // 1. Gather candidates via existing search command
-    const search = new SearchCardsByTypeAndTitleTool(this.commandContext);
+    const search = new SearchCardsByTypeAndTitleTool(this.toolContext);
     const searchResult = await search.execute({ type: candidateTypeCodeRef });
     const instances = searchResult.instances ?? [];
 
@@ -91,7 +91,7 @@ export default class SearchAndChooseTool extends HostBaseTool<
       .join('\n\n');
 
     // 3. LLM selection
-    const oneShot = new OneShotLlmRequestTool(this.commandContext);
+    const oneShot = new OneShotLlmRequestTool(this.toolContext);
 
     const res = await oneShot.execute({
       systemPrompt,
diff --git a/packages/host/app/tools/search-cards.ts b/packages/host/app/tools/search-cards.ts
index add8b352c0..5ee7d4e1f0 100644
--- a/packages/host/app/tools/search-cards.ts
+++ b/packages/host/app/tools/search-cards.ts
@@ -42,7 +42,7 @@ export class SearchCardsByTypeAndTitleTool extends HostBaseTool<
     if (input.type) {
       filter.type = input.type;
     }
-    return new SearchCardsByQueryTool(this.commandContext).execute({
+    return new SearchCardsByQueryTool(this.toolContext).execute({
       query: {
         filter: filter as Filter,
       },
diff --git a/packages/host/app/tools/search-google-images.ts b/packages/host/app/tools/search-google-images.ts
index 5c84862ddf..507be7d628 100644
--- a/packages/host/app/tools/search-google-images.ts
+++ b/packages/host/app/tools/search-google-images.ts
@@ -34,7 +34,7 @@ export default class SearchGoogleImagesTool extends HostBaseTool<
       const searchUrl = `https://www.googleapis.com/customsearch/v1?q=${searchQuery}&searchType=image&num=${Math.min(maxResults, 10)}&start=${startIndex}&cx=064501294a5c9430a`;
 
       const sendRequestViaProxyCommand = new SendRequestViaProxyTool(
-        this.commandContext,
+        this.toolContext,
       );
 
       const result = await sendRequestViaProxyCommand.execute({
diff --git a/packages/host/app/tools/send-ai-assistant-message.ts b/packages/host/app/tools/send-ai-assistant-message.ts
index 34a9bbec75..e80041f8a9 100644
--- a/packages/host/app/tools/send-ai-assistant-message.ts
+++ b/packages/host/app/tools/send-ai-assistant-message.ts
@@ -60,7 +60,7 @@ export default class SendAiAssistantMessageTool extends HostBaseTool<
       this.realm.canWrite(c.id),
     );
     let tools: Tool[] = await addPatchTools(
-      this.commandContext,
+      this.toolContext,
       patchableCards,
       cardAPI,
     );
diff --git a/packages/host/app/tools/summarize-session.ts b/packages/host/app/tools/summarize-session.ts
index 160007bc45..286445c85c 100644
--- a/packages/host/app/tools/summarize-session.ts
+++ b/packages/host/app/tools/summarize-session.ts
@@ -49,7 +49,7 @@ export default class SummarizeSessionTool extends HostBaseTool<
         },
       ];
       const sendRequestViaProxyCommand = new SendRequestViaProxyTool(
-        this.toolService.commandContext,
+        this.toolService.toolContext,
       );
       const result = await sendRequestViaProxyCommand.execute({
         url: 'https://openrouter.ai/api/v1/chat/completions',
diff --git a/packages/host/app/tools/switch-submode.ts b/packages/host/app/tools/switch-submode.ts
index c76dde3d63..d91b16cbaa 100644
--- a/packages/host/app/tools/switch-submode.ts
+++ b/packages/host/app/tools/switch-submode.ts
@@ -76,7 +76,7 @@ export default class SwitchSubmodeTool extends HostBaseTool<
           input.createFile &&
           currentSubmode === Submodes.Interact
         ) {
-          let writeTextFileCommand = new WriteTextFileTool(this.commandContext);
+          let writeTextFileCommand = new WriteTextFileTool(this.toolContext);
           let writeResult = await writeTextFileCommand.execute({
             path: codeRRI,
             content: '',
diff --git a/packages/host/app/tools/transform-cards.ts b/packages/host/app/tools/transform-cards.ts
index c9f68681b3..32256d45e6 100644
--- a/packages/host/app/tools/transform-cards.ts
+++ b/packages/host/app/tools/transform-cards.ts
@@ -26,7 +26,7 @@ export default class TransformCardsTool extends HostBaseTool<
 
   protected async run(input: VisitCardsInput): Promise<undefined> {
     let { cardIds } = await new SearchCardsByQueryTool(
-      this.commandContext,
+      this.toolContext,
     ).execute({
       query: input.query,
     });
@@ -35,17 +35,17 @@ export default class TransformCardsTool extends HostBaseTool<
       this.loaderService.loader,
     );
     let visitPromises = cardIds.map(async (cardId: string) => {
-      let readSourceCommand = new ReadSourceTool(this.commandContext);
+      let readSourceCommand = new ReadSourceTool(this.toolContext);
       let { content } = await readSourceCommand.execute({
         path: cardId + '.json',
       });
 
-      let { json } = await new CommandClass(this.commandContext).execute({
+      let { json } = await new CommandClass(this.toolContext).execute({
         json: JSON.parse(content),
       });
 
       let updatedContent = JSON.stringify(json, null, 2);
-      let writeTextFileCommand = new WriteTextFileTool(this.commandContext);
+      let writeTextFileCommand = new WriteTextFileTool(this.toolContext);
       return writeTextFileCommand.execute({
         content: updatedContent,
         path: cardId + '.json',
diff --git a/packages/host/app/tools/utils.ts b/packages/host/app/tools/utils.ts
index 25de4864b9..f42fa76708 100644
--- a/packages/host/app/tools/utils.ts
+++ b/packages/host/app/tools/utils.ts
@@ -31,13 +31,13 @@ import type {
 } from '@cardstack/base/matrix-event';
 
 export async function waitForMatrixEvent(
-  commandContext: ToolContext,
+  toolContext: ToolContext,
   roomId: string,
   callback: (matrixEvents: MatrixEvent[]) => boolean,
   options: { timeoutMs?: number } = {},
 ): Promise<void> {
   let timeoutMs = options.timeoutMs ?? 1000 * 60 * 20; // default to 20 minutes
-  let getEventsFromRoomCommand = new GetEventsFromRoomTool(commandContext);
+  let getEventsFromRoomCommand = new GetEventsFromRoomTool(toolContext);
   let done = false;
   let allMatrixEvents: MatrixEvent[] = [];
   let lastEventId: string | undefined = undefined;
@@ -63,14 +63,14 @@ export async function waitForMatrixEvent(
 }
 
 export async function waitForCompletedCommandRequest(
-  commandContext: ToolContext,
+  toolContext: ToolContext,
   roomId: string,
   commandRequestPredicate: (toolRequest: Partial<ToolRequest>) => boolean,
   options: { timeoutMs?: number; afterEventId?: string } = {},
 ): Promise<ToolResultEvent | undefined> {
   let result: ToolResultEvent | undefined = undefined;
   await waitForMatrixEvent(
-    commandContext,
+    toolContext,
     roomId,
     (matrixEvents: MatrixEvent[]) => {
       let events = options.afterEventId
@@ -119,13 +119,13 @@ export async function waitForCompletedCommandRequest(
 }
 
 export async function addPatchTools(
-  commandContext: ToolContext,
+  toolContext: ToolContext,
   patchableCards: CardDef[],
   cardAPI: typeof CardAPI,
 ): Promise<Tool[]> {
   let results: Tool[] = [];
   let loader = (
-    getOwner(commandContext)!.lookup('service:loader-service') as LoaderService
+    getOwner(toolContext)!.lookup('service:loader-service') as LoaderService
   ).loader;
   let mappings = await basicMappings(loader);
   for (const patchableCard of patchableCards) {
@@ -140,7 +140,7 @@ export async function addPatchTools(
 }
 
 export async function waitForRealmState(
-  commandContext: ToolContext,
+  toolContext: ToolContext,
   realmId: string,
   predicate: (ev: RealmEventContent | undefined) => boolean,
   options: { timeoutMs?: number; keepRealmSubscription?: boolean } = {},
@@ -156,7 +156,7 @@ export async function waitForRealmState(
     }, timeoutMs);
   });
 
-  const messageService = getOwner(commandContext)?.lookup(
+  const messageService = getOwner(toolContext)?.lookup(
     'service:message-service',
   ) as MessageService | undefined;
   if (!messageService) {
diff --git a/packages/host/app/tools/validate-realm.ts b/packages/host/app/tools/validate-realm.ts
index 72d77dca29..1b017b9b42 100644
--- a/packages/host/app/tools/validate-realm.ts
+++ b/packages/host/app/tools/validate-realm.ts
@@ -26,7 +26,7 @@ export default class ValidateRealmTool extends HostBaseTool<
     let realmIdentifier = new RealmPaths(new URL(input.realmIdentifier)).url;
 
     let { realmIdentifiers } = await new GetAvailableRealmIdentifiersTool(
-      this.commandContext,
+      this.toolContext,
     ).execute();
 
     if (!realmIdentifiers.includes(realmIdentifier)) {
diff --git a/packages/host/tests/acceptance/code-submode/file-tree-test.ts b/packages/host/tests/acceptance/code-submode/file-tree-test.ts
index 2f227d006b..0883b452a3 100644
--- a/packages/host/tests/acceptance/code-submode/file-tree-test.ts
+++ b/packages/host/tests/acceptance/code-submode/file-tree-test.ts
@@ -1085,9 +1085,7 @@ module('Acceptance | code submode | file-tree tests', function (hooks) {
     let newFileName = 'new-file.gts';
 
     let toolService = getService('tool-service');
-    let writeTextFileCommand = new WriteTextFileTool(
-      toolService.commandContext,
-    );
+    let writeTextFileCommand = new WriteTextFileTool(toolService.toolContext);
     await writeTextFileCommand.execute({
       path: `${newDirName}/${newFileName}`,
       content:
diff --git a/packages/host/tests/acceptance/commands-test.gts b/packages/host/tests/acceptance/tools-test.gts
similarity index 97%
rename from packages/host/tests/acceptance/commands-test.gts
rename to packages/host/tests/acceptance/tools-test.gts
index 8a4df2bbd5..f133e683a1 100644
--- a/packages/host/tests/acceptance/commands-test.gts
+++ b/packages/host/tests/acceptance/tools-test.gts
@@ -84,7 +84,7 @@ let matrixRoomId = '';
 let maybeBoomShouldBoom = true;
 let savedMeetingCardId: string | undefined;
 
-module('Acceptance | Commands tests', function (hooks) {
+module('Acceptance | Tools tests', function (hooks) {
   setupApplicationTest(hooks);
   setupLocalIndexing(hooks);
   setupOnSave(hooks);
@@ -174,7 +174,7 @@ module('Acceptance | Commands tests', function (hooks) {
           topic: 'unset topic',
           participants: input.participants,
         });
-        let saveCardCommand = new SaveCardTool(this.commandContext);
+        let saveCardCommand = new SaveCardTool(this.toolContext);
         let savedMeeting = await saveCardCommand.execute({
           card: meeting,
           realm: testRealmURL,
@@ -182,13 +182,13 @@ module('Acceptance | Commands tests', function (hooks) {
         savedMeetingCardId = savedMeeting?.id;
 
         let createAIAssistantRoomCommand = new CreateAiAssistantRoomTool(
-          this.commandContext,
+          this.toolContext,
         );
         let { roomId } = await createAIAssistantRoomCommand.execute({
           name: 'AI Assistant Room',
         });
         let sendAiAssistantMessageCommand = new SendAiAssistantMessageTool(
-          this.commandContext,
+          this.toolContext,
         );
         let { eventId } = await sendAiAssistantMessageCommand.execute({
           roomId,
@@ -197,19 +197,19 @@ module('Acceptance | Commands tests', function (hooks) {
         });
 
         await waitForCompletedCommandRequest(
-          this.commandContext,
+          this.toolContext,
           roomId,
           (toolRequest) => toolRequest.name === 'patchCardInstance',
           { afterEventId: eventId },
         );
 
         await waitForRealmState(
-          this.commandContext,
+          this.toolContext,
           testRealmURL,
           () => meeting.topic === input.topic,
         );
 
-        let showCardCommand = new ShowCardTool(this.commandContext);
+        let showCardCommand = new ShowCardTool(this.toolContext);
         await showCardCommand.execute({
           cardId: meeting.id,
         });
@@ -240,18 +240,16 @@ module('Acceptance | Commands tests', function (hooks) {
       static actionVerb = 'Search';
       async getInputType() {
         return new SearchCardsByTypeAndTitleTool(
-          this.commandContext,
+          this.toolContext,
         ).getInputType();
       }
       protected async run(
         input: SearchCardsByTypeAndTitleInput,
       ): Promise<undefined> {
-        let searchCommand = new SearchCardsByTypeAndTitleTool(
-          this.commandContext,
-        );
+        let searchCommand = new SearchCardsByTypeAndTitleTool(this.toolContext);
         let searchResult = await searchCommand.execute(input);
         if (searchResult.cardIds.length > 0) {
-          let showCardCommand = new ShowCardTool(this.commandContext);
+          let showCardCommand = new ShowCardTool(this.toolContext);
           await showCardCommand.execute({
             cardId: searchResult.cardIds[0],
           });
@@ -302,12 +300,12 @@ module('Acceptance | Commands tests', function (hooks) {
 
       static isolated = class Isolated extends Component<typeof this> {
         runScheduleMeetingCommand = async () => {
-          let commandContext = this.args.context?.commandContext;
-          if (!commandContext) {
+          let toolContext = this.args.context?.toolContext;
+          if (!toolContext) {
             console.error('No command context found');
             return;
           }
-          let scheduleMeeting = new ScheduleMeetingCommand(commandContext);
+          let scheduleMeeting = new ScheduleMeetingCommand(toolContext);
           setOwner(scheduleMeeting, getOwner(this)!);
           await scheduleMeeting.execute({
             topic: 'Meeting with Hassan',
@@ -316,14 +314,14 @@ module('Acceptance | Commands tests', function (hooks) {
         };
 
         runOpenAiAssistantRoomCommand = async () => {
-          let commandContext = this.args.context?.commandContext;
-          if (!commandContext) {
+          let toolContext = this.args.context?.toolContext;
+          if (!toolContext) {
             console.error('No command context found');
             return;
           }
 
           let openAiAssistantRoomCommand = new OpenAiAssistantRoomTool(
-            commandContext,
+            toolContext,
           );
           await openAiAssistantRoomCommand.execute({
             roomId: getRoomIds().pop()!,
@@ -331,13 +329,13 @@ module('Acceptance | Commands tests', function (hooks) {
         };
 
         runMaybeBoomCommandViaAiAssistant = async () => {
-          let commandContext = this.args.context?.commandContext;
-          if (!commandContext) {
+          let toolContext = this.args.context?.toolContext;
+          if (!toolContext) {
             console.error('No command context found');
             return;
           }
           let createAIAssistantRoomCommand = new CreateAiAssistantRoomTool(
-            commandContext,
+            toolContext,
           );
           let { roomId } = await createAIAssistantRoomCommand.execute({
             name: 'AI Assistant Room',
@@ -348,7 +346,7 @@ module('Acceptance | Commands tests', function (hooks) {
             ],
           });
           let sendAiAssistantMessageCommand = new SendAiAssistantMessageTool(
-            commandContext,
+            toolContext,
           );
           await sendAiAssistantMessageCommand.execute({
             prompt: "Let's find out if it will boom",
@@ -799,7 +797,7 @@ module('Acceptance | Commands tests', function (hooks) {
     await waitFor('[data-test-message-idx="0"]');
     await settled();
     assert
-      .dom('[data-test-message-idx="0"] .command-description')
+      .dom('[data-test-message-idx="0"] .tool-description')
       .containsText('Switching to code submode');
 
     await click('[data-test-message-idx="0"] [data-test-tool-call-apply]');
@@ -880,7 +878,7 @@ module('Acceptance | Commands tests', function (hooks) {
     // Click on the apply button
     await waitFor('[data-test-message-idx="0"]');
     assert
-      .dom('[data-test-message-idx="0"] .command-description')
+      .dom('[data-test-message-idx="0"] .tool-description')
       .containsText('Finding and opening Hassan card');
     assert
       .dom('[data-test-message-idx="0"] [data-test-tool-call-apply]')
@@ -954,7 +952,7 @@ module('Acceptance | Commands tests', function (hooks) {
     // Click on the apply button
     await waitFor('[data-test-message-idx="0"]');
     assert
-      .dom('[data-test-message-idx="0"] .command-description')
+      .dom('[data-test-message-idx="0"] .tool-description')
       .containsText('Finding and opening Hassan card');
   });
 
@@ -996,7 +994,7 @@ module('Acceptance | Commands tests', function (hooks) {
 
     await waitFor('[data-test-message-idx="0"]');
     assert
-      .dom('[data-test-message-idx="0"] .command-description')
+      .dom('[data-test-message-idx="0"] .tool-description')
       .containsText(description);
     assert
       .dom(
diff --git a/packages/host/tests/helpers/index.gts b/packages/host/tests/helpers/index.gts
index 80dbca1633..919d7a7d22 100644
--- a/packages/host/tests/helpers/index.gts
+++ b/packages/host/tests/helpers/index.gts
@@ -2015,7 +2015,7 @@ export async function addSkillToAiAssistant(
   }
 
   let command = new UpdateRoomSkillsTool(
-    getService('tool-service').commandContext,
+    getService('tool-service').toolContext,
   );
   await command.execute({
     roomId: resolvedRoomId,
@@ -2067,7 +2067,7 @@ export async function addSkillToAiAssistant(
         snapshot?.enabledSkillCards?.map((f) => f.sourceUrl) ?? null,
       disabledSkillCards:
         snapshot?.disabledSkillCards?.map((f) => f.sourceUrl) ?? null,
-      commandDefinitionsCount: snapshot?.toolDefinitionFileDefs?.length ?? null,
+      toolDefinitionsCount: snapshot?.toolDefinitionFileDefs?.length ?? null,
     };
     let originalMessage = err instanceof Error ? err.message : String(err);
     let enriched = new Error(
@@ -2141,7 +2141,7 @@ export async function waitForNewRoomSkillsLoaded(roomId: string) {
       disabledSkillCards:
         roomData?.skillsConfig?.disabledSkillCards?.map((f) => f.sourceUrl) ??
         null,
-      commandDefinitionsCount:
+      toolDefinitionsCount:
         roomData?.skillsConfig?.toolDefinitionFileDefs?.length ?? null,
       roomResourceSkillIds: roomResource?.skills?.map((s) => s.cardId) ?? null,
       roomResourceCommandCount: roomResource?.tools?.length ?? null,
diff --git a/packages/host/tests/integration/commands/add-field-to-card-definition-command-test.gts b/packages/host/tests/integration/commands/add-field-to-card-definition-command-test.gts
deleted file mode 100644
index ef77a3d3af..0000000000
--- a/packages/host/tests/integration/commands/add-field-to-card-definition-command-test.gts
+++ /dev/null
@@ -1,156 +0,0 @@
-import { getOwner } from '@ember/owner';
-import type { RenderingTestContext } from '@ember/test-helpers';
-
-import { getService } from '@universal-ember/test-support';
-import { module, test } from 'qunit';
-
-import { rri } from '@cardstack/runtime-common';
-
-import RealmService from '@cardstack/host/services/realm';
-import AddFieldToCardDefinitionTool from '@cardstack/host/tools/add-field-to-card-definition';
-
-import {
-  setupIntegrationTestRealm,
-  setupLocalIndexing,
-  testRealmURL,
-  testRealmInfo,
-  setupRealmCacheTeardown,
-  withCachedRealmSetup,
-} from '../../helpers';
-import { setupMockMatrix } from '../../helpers/mock-matrix';
-import { setupRenderingTest } from '../../helpers/setup';
-
-class StubRealmService extends RealmService {
-  get defaultReadableRealm() {
-    return {
-      path: testRealmURL,
-      info: testRealmInfo,
-    };
-  }
-}
-
-module(
-  'Integration | commands | add-field-to-card-definition',
-  function (hooks) {
-    setupRenderingTest(hooks);
-    setupLocalIndexing(hooks);
-    let mockMatrixUtils = setupMockMatrix(hooks);
-
-    hooks.beforeEach(function (this: RenderingTestContext) {
-      getOwner(this)!.register('service:realm', StubRealmService);
-    });
-
-    setupRealmCacheTeardown(hooks);
-
-    hooks.beforeEach(async function () {
-      await withCachedRealmSetup(async () =>
-        setupIntegrationTestRealm({
-          mockMatrixUtils,
-          contents: {
-            'person.gts': `
-          import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
-          import StringField from "@cardstack/base/string";
-          export class Person extends CardDef {
-            static displayName = 'Person';
-            @field firstName = contains(StringField);
-          }
-        `,
-          },
-          realmURL: 'http://test-realm/test/',
-        }),
-      );
-    });
-
-    test('adds a field to a card definition', async function (assert) {
-      let toolService = getService('tool-service');
-      let cardService = getService('card-service');
-      let addFieldToCardDefinitionCommand = new AddFieldToCardDefinitionTool(
-        toolService.commandContext,
-      );
-
-      await addFieldToCardDefinitionCommand.execute({
-        cardDefinitionToModify: {
-          module: rri('http://test-realm/test/person'),
-          name: 'Person',
-        },
-        fieldName: 'lastName',
-        fieldDefinitionType: 'field',
-        fieldRef: {
-          module: rri('@cardstack/base/string'),
-          name: 'default',
-        },
-        fieldType: 'contains',
-      });
-      let response = (
-        await cardService.getSource(new URL('person.gts', testRealmURL))
-      ).content;
-      assert.strictEqual(
-        response,
-        `
-          import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
-          import StringField from "@cardstack/base/string";
-          export class Person extends CardDef {
-            static displayName = 'Person';
-            @field firstName = contains(StringField);
-            @field lastName = contains(StringField);
-          }
-        `,
-        'lastName field was added to the card definition',
-      );
-    });
-
-    test('can add a computed field', async function (assert) {
-      let toolService = getService('tool-service');
-      let cardService = getService('card-service');
-      let addFieldToCardDefinitionCommand = new AddFieldToCardDefinitionTool(
-        toolService.commandContext,
-      );
-
-      await addFieldToCardDefinitionCommand.execute({
-        cardDefinitionToModify: {
-          module: rri('http://test-realm/test/person'),
-          name: 'Person',
-        },
-        fieldName: 'rapName',
-        fieldDefinitionType: 'field',
-        fieldType: 'contains',
-        fieldRef: {
-          module: rri('@cardstack/base/string'),
-          name: 'default',
-        },
-        incomingRelativeTo: undefined,
-        outgoingRelativeTo: undefined,
-        outgoingRealmURL: undefined,
-        computedFieldFunctionSourceCode: `
-          function () {
-            let prefix = this.firstName.length > 5 ? 'Big' : 'Lil';
-            let nickname = this.firstName.toUpperCase();
-            return \`\${prefix} \${nickname}\`;
-          }`,
-      });
-
-      let response = (
-        await cardService.getSource(new URL('person.gts', testRealmURL))
-      ).content;
-      assert.strictEqual(
-        response,
-        `
-          import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
-          import StringField from "@cardstack/base/string";
-          export class Person extends CardDef {
-            static displayName = 'Person';
-            @field firstName = contains(StringField);
-            @field rapName = contains(StringField, {
-              computeVia: function () {
-                let prefix = this.firstName.length > 5 ? 'Big' : 'Lil';
-                let nickname = this.firstName.toUpperCase();
-                return \`\${prefix} \${nickname}\`;
-              }
-            });
-          }
-        `,
-        'computed field was added to the card definition',
-      );
-    });
-  },
-);
diff --git a/packages/host/tests/integration/commands/get-catalog-realm-identifiers-test.gts b/packages/host/tests/integration/commands/get-catalog-realm-identifiers-test.gts
deleted file mode 100644
index 9c405aadf6..0000000000
--- a/packages/host/tests/integration/commands/get-catalog-realm-identifiers-test.gts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { getOwner } from '@ember/owner';
-import type { RenderingTestContext } from '@ember/test-helpers';
-
-import { getService } from '@universal-ember/test-support';
-import { module, test } from 'qunit';
-
-import RealmService from '@cardstack/host/services/realm';
-import type RealmServerService from '@cardstack/host/services/realm-server';
-import GetCatalogRealmIdentifiersTool from '@cardstack/host/tools/get-catalog-realm-identifiers';
-
-import {
-  setupIntegrationTestRealm,
-  setupLocalIndexing,
-  setupRealmServerEndpoints,
-  testRealmURL,
-  testRealmInfo,
-  setupRealmCacheTeardown,
-  withCachedRealmSetup,
-} from '../../helpers';
-import { setupBaseRealm } from '../../helpers/base-realm';
-import { setupMockMatrix } from '../../helpers/mock-matrix';
-import { setupRenderingTest } from '../../helpers/setup';
-
-class StubRealmService extends RealmService {
-  get defaultReadableRealm() {
-    return {
-      path: testRealmURL,
-      info: testRealmInfo,
-    };
-  }
-}
-
-module(
-  'Integration | commands | get-catalog-realm-identifiers',
-  function (hooks) {
-    setupRenderingTest(hooks);
-    setupBaseRealm(hooks);
-    setupLocalIndexing(hooks);
-
-    let mockMatrixUtils = setupMockMatrix(hooks, {
-      loggedInAs: '@testuser:localhost',
-      activeRealms: [testRealmURL],
-      autostart: true,
-    });
-
-    setupRealmServerEndpoints(hooks);
-
-    setupRealmCacheTeardown(hooks);
-
-    hooks.beforeEach(async function (this: RenderingTestContext) {
-      getOwner(this)!.register('service:realm', StubRealmService);
-
-      await withCachedRealmSetup(async () =>
-        setupIntegrationTestRealm({
-          mockMatrixUtils,
-          realmURL: testRealmURL,
-          contents: {},
-        }),
-      );
-
-      let realmServer = getService('realm-server') as RealmServerService;
-      Object.defineProperty(realmServer, 'catalogRealmIdentifiers', {
-        get: () => ['https://example.com/catalog/'],
-        configurable: true,
-      });
-    });
-
-    test('returns the list of catalog realm identifiers', async function (assert) {
-      let toolService = getService('tool-service');
-      let command = new GetCatalogRealmIdentifiersTool(
-        toolService.commandContext,
-      );
-      let result = await command.execute();
-      assert.deepEqual(result.realmIdentifiers, [
-        'https://example.com/catalog/',
-      ]);
-    });
-  },
-);
diff --git a/packages/host/tests/integration/commands/invalidate-realm-identifiers-test.gts b/packages/host/tests/integration/commands/invalidate-realm-identifiers-test.gts
deleted file mode 100644
index 07e68e2171..0000000000
--- a/packages/host/tests/integration/commands/invalidate-realm-identifiers-test.gts
+++ /dev/null
@@ -1,179 +0,0 @@
-import { getOwner } from '@ember/owner';
-import type { RenderingTestContext } from '@ember/test-helpers';
-
-import { getService } from '@universal-ember/test-support';
-import { module, test } from 'qunit';
-
-import RealmService from '@cardstack/host/services/realm';
-import InvalidateRealmIdentifiersTool from '@cardstack/host/tools/invalidate-realm-identifiers';
-
-import {
-  setupIntegrationTestRealm,
-  setupLocalIndexing,
-  setupRealmServerEndpoints,
-  testRealmInfo,
-  testRealmURL,
-  setupRealmCacheTeardown,
-  withCachedRealmSetup,
-} from '../../helpers';
-import { setupBaseRealm } from '../../helpers/base-realm';
-import { setupMockMatrix } from '../../helpers/mock-matrix';
-import { setupRenderingTest } from '../../helpers/setup';
-
-class StubRealmService extends RealmService {
-  get defaultReadableRealm() {
-    return {
-      path: testRealmURL,
-      info: testRealmInfo,
-    };
-  }
-}
-
-module(
-  'Integration | commands | invalidate-realm-identifiers',
-  function (hooks) {
-    setupRenderingTest(hooks);
-    setupBaseRealm(hooks);
-    setupLocalIndexing(hooks);
-
-    let receivedAuthorizationHeader: string | null = null;
-    let receivedMethod: string | null = null;
-    let receivedPathname: string | null = null;
-    let responseStatus = 204;
-    let responseBody: string | null = null;
-    let receivedBody: {
-      data?: {
-        type?: string;
-        attributes?: {
-          urls?: string[];
-        };
-      };
-    } | null = null;
-
-    let mockMatrixUtils = setupMockMatrix(hooks, {
-      loggedInAs: '@testuser:localhost',
-      activeRealms: [testRealmURL],
-      autostart: true,
-    });
-
-    setupRealmServerEndpoints(hooks, [
-      {
-        route: 'test/_invalidate',
-        getResponse: async (req: Request) => {
-          receivedAuthorizationHeader = req.headers.get('Authorization');
-          receivedMethod = req.method;
-          receivedPathname = new URL(req.url).pathname;
-          receivedBody = (await req.json()) as typeof receivedBody;
-          return new Response(responseBody, { status: responseStatus });
-        },
-      },
-    ]);
-
-    setupRealmCacheTeardown(hooks);
-
-    hooks.beforeEach(async function (this: RenderingTestContext) {
-      getOwner(this)!.register('service:realm', StubRealmService);
-      receivedAuthorizationHeader = null;
-      receivedMethod = null;
-      receivedPathname = null;
-      receivedBody = null;
-      responseStatus = 204;
-      responseBody = null;
-
-      await withCachedRealmSetup(async () =>
-        setupIntegrationTestRealm({
-          mockMatrixUtils,
-          realmURL: testRealmURL,
-          contents: {},
-        }),
-      );
-    });
-
-    test('calls realm endpoint with expected auth header and payload', async function (assert) {
-      let toolService = getService('tool-service');
-      let realmServer = getService('realm-server');
-      let command = new InvalidateRealmIdentifiersTool(
-        toolService.commandContext,
-      );
-      let realmURL = new URL('test/', realmServer.url).href;
-
-      let result = await command.execute({
-        realmIdentifier: realmURL,
-        resourceIdentifiers: [
-          `${realmURL}mango`,
-          `${realmURL}mango`,
-          `${realmURL}person.gts`,
-        ],
-      });
-
-      assert.strictEqual(result, undefined, 'command has no result card');
-      assert.strictEqual(receivedMethod, 'POST', 'uses POST');
-      assert.strictEqual(
-        receivedPathname,
-        '/test/_invalidate',
-        'calls endpoint',
-      );
-      assert.ok(receivedAuthorizationHeader, 'authorization header is present');
-      assert.true(
-        receivedAuthorizationHeader?.startsWith('Bearer '),
-        'authorization header uses Bearer scheme',
-      );
-
-      let authToken = receivedAuthorizationHeader!.replace('Bearer ', '');
-      let [_header, payload] = authToken.split('.');
-      let tokenClaims = JSON.parse(atob(payload)) as {
-        realm?: string;
-        permissions?: string[];
-      };
-
-      assert.strictEqual(
-        tokenClaims.realm,
-        realmURL,
-        'authorization token is realm-scoped',
-      );
-      assert.deepEqual(
-        tokenClaims.permissions,
-        ['read', 'write'],
-        'authorization token contains realm permissions',
-      );
-      assert.notStrictEqual(
-        receivedAuthorizationHeader,
-        `Bearer ${realmServer.token}`,
-        'authorization header does not use realm-server session token',
-      );
-
-      assert.deepEqual(
-        receivedBody,
-        {
-          data: {
-            type: 'invalidation-request',
-            attributes: {
-              urls: [`${realmURL}mango`, `${realmURL}person.gts`],
-            },
-          },
-        },
-        'sends JSON:API payload with deduped urls',
-      );
-    });
-
-    test('throws when realm invalidation endpoint returns non-204', async function (assert) {
-      let toolService = getService('tool-service');
-      let realmServer = getService('realm-server');
-      let command = new InvalidateRealmIdentifiersTool(
-        toolService.commandContext,
-      );
-      let realmURL = new URL('test/', realmServer.url).href;
-      responseStatus = 500;
-      responseBody = 'boom';
-
-      await assert.rejects(
-        command.execute({
-          realmIdentifier: realmURL,
-          resourceIdentifiers: [`${realmURL}mango`],
-        }),
-        /Invalidate urls failed: 500 - boom/,
-        'propagates non-204 failure as an error',
-      );
-    });
-  },
-);
diff --git a/packages/host/tests/integration/commands/persist-module-inspector-view-test.gts b/packages/host/tests/integration/commands/persist-module-inspector-view-test.gts
deleted file mode 100644
index 5ee1fc76d1..0000000000
--- a/packages/host/tests/integration/commands/persist-module-inspector-view-test.gts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { getOwner } from '@ember/owner';
-import Service from '@ember/service';
-import type { RenderingTestContext } from '@ember/test-helpers';
-
-import { getService } from '@universal-ember/test-support';
-import { module, test } from 'qunit';
-
-import RealmService from '@cardstack/host/services/realm';
-import PersistModuleInspectorViewTool from '@cardstack/host/tools/persist-module-inspector-view';
-
-import {
-  setupIntegrationTestRealm,
-  setupLocalIndexing,
-  testRealmURL,
-  testRealmInfo,
-  setupRealmCacheTeardown,
-  withCachedRealmSetup,
-} from '../../helpers';
-import { setupBaseRealm } from '../../helpers/base-realm';
-import { setupMockMatrix } from '../../helpers/mock-matrix';
-import { setupRenderingTest } from '../../helpers/setup';
-
-let persistedCalls: Array<{ codePath: string; view: string }>;
-
-class StubRealmService extends RealmService {
-  get defaultReadableRealm() {
-    return {
-      path: testRealmURL,
-      info: testRealmInfo,
-    };
-  }
-}
-
-class StubOperatorModeStateService extends Service {
-  persistModuleInspectorView(codePath: string, view: string) {
-    persistedCalls.push({ codePath, view });
-  }
-}
-
-module(
-  'Integration | commands | persist-module-inspector-view',
-  function (hooks) {
-    setupRenderingTest(hooks);
-    setupBaseRealm(hooks);
-    setupLocalIndexing(hooks);
-
-    let mockMatrixUtils = setupMockMatrix(hooks, {
-      loggedInAs: '@testuser:localhost',
-      activeRealms: [testRealmURL],
-      autostart: true,
-    });
-
-    hooks.beforeEach(function (this: RenderingTestContext) {
-      persistedCalls = [];
-      getOwner(this)!.register('service:realm', StubRealmService);
-      getOwner(this)!.register(
-        'service:operator-mode-state-service',
-        StubOperatorModeStateService,
-      );
-    });
-
-    setupRealmCacheTeardown(hooks);
-
-    hooks.beforeEach(async function () {
-      await withCachedRealmSetup(async () =>
-        setupIntegrationTestRealm({
-          mockMatrixUtils,
-          contents: {},
-        }),
-      );
-    });
-
-    test('persists the module inspector view selection', async function (assert) {
-      let toolService = getService('tool-service');
-      let command = new PersistModuleInspectorViewTool(
-        toolService.commandContext,
-      );
-      let result = await command.execute({
-        codePath: `${testRealmURL}my-module.gts`,
-        moduleInspectorView: 'schema',
-      });
-      assert.strictEqual(result, undefined);
-      assert.strictEqual(persistedCalls.length, 1);
-      assert.strictEqual(
-        persistedCalls[0].codePath,
-        `${testRealmURL}my-module.gts`,
-      );
-      assert.strictEqual(persistedCalls[0].view, 'schema');
-    });
-  },
-);
diff --git a/packages/host/tests/integration/components/ai-assistant-panel/skills-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/skills-test.gts
index 9642c46bee..98a7823889 100644
--- a/packages/host/tests/integration/components/ai-assistant-panel/skills-test.gts
+++ b/packages/host/tests/integration/components/ai-assistant-panel/skills-test.gts
@@ -195,18 +195,18 @@ module('Integration | ai-assistant-panel | skills', function (hooks) {
               static actionVerb = 'Search';
               async getInputType() {
                 return new SearchCardsByTypeAndTitleTool(
-                  this.commandContext,
+                  this.toolContext,
                 ).getInputType();
               }
               protected async run(
                 input: SearchCardsByTitleInput,
               ): Promise<undefined> {
                 let searchCommand = new SearchCardsByTypeAndTitleTool(
-                  this.commandContext,
+                  this.toolContext,
                 );
                 let searchResult = await searchCommand.execute(input);
                 if (searchResult.cardIds.length > 0) {
-                  let showCardCommand = new ShowCardTool(this.commandContext);
+                  let showCardCommand = new ShowCardTool(this.toolContext);
                   await showCardCommand.execute({
                     cardId: searchResult.cardIds[0],
                   });
diff --git a/packages/host/tests/integration/components/ai-assistant-panel/commands-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/tools-test.gts
similarity index 99%
rename from packages/host/tests/integration/components/ai-assistant-panel/commands-test.gts
rename to packages/host/tests/integration/components/ai-assistant-panel/tools-test.gts
index 8d4e26e881..ff3dd6e146 100644
--- a/packages/host/tests/integration/components/ai-assistant-panel/commands-test.gts
+++ b/packages/host/tests/integration/components/ai-assistant-panel/tools-test.gts
@@ -50,7 +50,7 @@ import { setupMockMatrix } from '../../../helpers/mock-matrix';
 import { renderComponent } from '../../../helpers/render-component';
 import { setupRenderingTest } from '../../../helpers/setup';
 
-module('Integration | ai-assistant-panel | commands', function (hooks) {
+module('Integration | ai-assistant-panel | tools', function (hooks) {
   const realmName = 'Operator Mode Workspace';
   const readOnlyRealmName = 'Read Only Workspace';
   const readOnlyRealmURL = 'http://test-realm/read-only/';
@@ -1827,7 +1827,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     let roomId = await renderAiAssistantPanel();
 
     // checkCorrectness is on the always-auto-execute list (one of three
-    // branches in isAutoExecutableCommand). Before the fix, the manual
+    // branches in isAutoExecutableTool). Before the fix, the manual
     // approval bar painted for the ~100ms debounce window before
     // tool-service flipped `acceptingAllRoomIds`; the user saw
     // Accept All / Cancel briefly appear then disappear. The bar must
@@ -1835,7 +1835,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     // command, regardless of which condition triggers auto-execute.
     //
     // agentId must match the host's matrix service so the
-    // agent-ownership gate in isAutoExecutableCommand passes — otherwise
+    // agent-ownership gate in isAutoExecutableTool passes — otherwise
     // the predicate short-circuits to false (the not-our-agent case
     // exercised by acceptance/commands-test.gts) and the bar would show
     // for an unrelated reason.
@@ -1894,7 +1894,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     // The boxel-environment skill declares read-file-for-ai-assistant with
     // requiresApproval=false (see the skill JSON earlier in this module),
     // so MessageTool.requiresApproval is false here — the second
-    // isAutoExecutableCommand branch. The fix must also suppress the
+    // isAutoExecutableTool branch. The fix must also suppress the
     // Accept All bar for this path.
     await addSkillToAiAssistant(`${testRealmURL}Skill/boxel-environment`);
 
@@ -2045,7 +2045,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     try {
       await (
         toolService as any
-      ).invalidateAutoExecutableCommandsForStuckProcessing(
+      ).invalidateAutoExecutableToolsForStuckProcessing(
         roomResource,
         roomId,
         message!.eventId,
diff --git a/packages/host/tests/integration/components/realm-field-test.gts b/packages/host/tests/integration/components/realm-field-test.gts
index c07cf1eac6..e859a1453b 100644
--- a/packages/host/tests/integration/components/realm-field-test.gts
+++ b/packages/host/tests/integration/components/realm-field-test.gts
@@ -73,7 +73,7 @@ module('Integration | components | realm field', function (hooks) {
   setupBaseRealm(hooks);
 
   let loader: Loader;
-  let commandContext: CommandContext;
+  let toolContext: CommandContext;
 
   setupCardLogs(hooks, async () => {
     return await getService('loader-service').loader.import(
@@ -85,12 +85,12 @@ module('Integration | components | realm field', function (hooks) {
     loader = getService('loader-service').loader;
 
     const toolService = getService('tool-service');
-    commandContext = toolService.commandContext;
+    toolContext = toolService.toolContext;
 
     const store = getService('store');
 
     provideConsumeContext(CardContextName, {
-      commandContext,
+      toolContext,
       getCard: () => undefined,
       getCards: () => [],
       getCardCollection: () => undefined,
diff --git a/packages/host/tests/integration/tools/add-field-to-card-definition-tool-test.gts b/packages/host/tests/integration/tools/add-field-to-card-definition-tool-test.gts
new file mode 100644
index 0000000000..d370085b6f
--- /dev/null
+++ b/packages/host/tests/integration/tools/add-field-to-card-definition-tool-test.gts
@@ -0,0 +1,153 @@
+import { getOwner } from '@ember/owner';
+import type { RenderingTestContext } from '@ember/test-helpers';
+
+import { getService } from '@universal-ember/test-support';
+import { module, test } from 'qunit';
+
+import { rri } from '@cardstack/runtime-common';
+
+import RealmService from '@cardstack/host/services/realm';
+import AddFieldToCardDefinitionTool from '@cardstack/host/tools/add-field-to-card-definition';
+
+import {
+  setupIntegrationTestRealm,
+  setupLocalIndexing,
+  testRealmURL,
+  testRealmInfo,
+  setupRealmCacheTeardown,
+  withCachedRealmSetup,
+} from '../../helpers';
+import { setupMockMatrix } from '../../helpers/mock-matrix';
+import { setupRenderingTest } from '../../helpers/setup';
+
+class StubRealmService extends RealmService {
+  get defaultReadableRealm() {
+    return {
+      path: testRealmURL,
+      info: testRealmInfo,
+    };
+  }
+}
+
+module('Integration | tools | add-field-to-card-definition', function (hooks) {
+  setupRenderingTest(hooks);
+  setupLocalIndexing(hooks);
+  let mockMatrixUtils = setupMockMatrix(hooks);
+
+  hooks.beforeEach(function (this: RenderingTestContext) {
+    getOwner(this)!.register('service:realm', StubRealmService);
+  });
+
+  setupRealmCacheTeardown(hooks);
+
+  hooks.beforeEach(async function () {
+    await withCachedRealmSetup(async () =>
+      setupIntegrationTestRealm({
+        mockMatrixUtils,
+        contents: {
+          'person.gts': `
+          import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
+          export class Person extends CardDef {
+            static displayName = 'Person';
+            @field firstName = contains(StringField);
+          }
+        `,
+        },
+        realmURL: 'http://test-realm/test/',
+      }),
+    );
+  });
+
+  test('adds a field to a card definition', async function (assert) {
+    let toolService = getService('tool-service');
+    let cardService = getService('card-service');
+    let addFieldToCardDefinitionCommand = new AddFieldToCardDefinitionTool(
+      toolService.toolContext,
+    );
+
+    await addFieldToCardDefinitionCommand.execute({
+      cardDefinitionToModify: {
+        module: rri('http://test-realm/test/person'),
+        name: 'Person',
+      },
+      fieldName: 'lastName',
+      fieldDefinitionType: 'field',
+      fieldRef: {
+        module: rri('@cardstack/base/string'),
+        name: 'default',
+      },
+      fieldType: 'contains',
+    });
+    let response = (
+      await cardService.getSource(new URL('person.gts', testRealmURL))
+    ).content;
+    assert.strictEqual(
+      response,
+      `
+          import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
+          export class Person extends CardDef {
+            static displayName = 'Person';
+            @field firstName = contains(StringField);
+            @field lastName = contains(StringField);
+          }
+        `,
+      'lastName field was added to the card definition',
+    );
+  });
+
+  test('can add a computed field', async function (assert) {
+    let toolService = getService('tool-service');
+    let cardService = getService('card-service');
+    let addFieldToCardDefinitionCommand = new AddFieldToCardDefinitionTool(
+      toolService.toolContext,
+    );
+
+    await addFieldToCardDefinitionCommand.execute({
+      cardDefinitionToModify: {
+        module: rri('http://test-realm/test/person'),
+        name: 'Person',
+      },
+      fieldName: 'rapName',
+      fieldDefinitionType: 'field',
+      fieldType: 'contains',
+      fieldRef: {
+        module: rri('@cardstack/base/string'),
+        name: 'default',
+      },
+      incomingRelativeTo: undefined,
+      outgoingRelativeTo: undefined,
+      outgoingRealmURL: undefined,
+      computedFieldFunctionSourceCode: `
+          function () {
+            let prefix = this.firstName.length > 5 ? 'Big' : 'Lil';
+            let nickname = this.firstName.toUpperCase();
+            return \`\${prefix} \${nickname}\`;
+          }`,
+    });
+
+    let response = (
+      await cardService.getSource(new URL('person.gts', testRealmURL))
+    ).content;
+    assert.strictEqual(
+      response,
+      `
+          import { contains, field, Component, CardDef } from "@cardstack/base/card-api";
+          import StringField from "@cardstack/base/string";
+          export class Person extends CardDef {
+            static displayName = 'Person';
+            @field firstName = contains(StringField);
+            @field rapName = contains(StringField, {
+              computeVia: function () {
+                let prefix = this.firstName.length > 5 ? 'Big' : 'Lil';
+                let nickname = this.firstName.toUpperCase();
+                return \`\${prefix} \${nickname}\`;
+              }
+            });
+          }
+        `,
+      'computed field was added to the card definition',
+    );
+  });
+});
diff --git a/packages/host/tests/integration/commands/apply-markdown-edit-test.gts b/packages/host/tests/integration/tools/apply-markdown-edit-test.gts
similarity index 98%
rename from packages/host/tests/integration/commands/apply-markdown-edit-test.gts
rename to packages/host/tests/integration/tools/apply-markdown-edit-test.gts
index 447d9f8806..099e17336a 100644
--- a/packages/host/tests/integration/commands/apply-markdown-edit-test.gts
+++ b/packages/host/tests/integration/tools/apply-markdown-edit-test.gts
@@ -35,7 +35,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | apply-markdown-edit', function (hooks) {
+module('Integration | tools | apply-markdown-edit', function (hooks) {
   setupRenderingTest(hooks);
 
   const realmName = 'Markdown Editing Test Realm';
@@ -171,9 +171,7 @@ module('Integration | commands | apply-markdown-edit', function (hooks) {
       }),
     );
 
-    command = new ApplyMarkdownEditTool(
-      getService('tool-service').commandContext,
-    );
+    command = new ApplyMarkdownEditTool(getService('tool-service').toolContext);
   });
 
   test('can apply requested content change', async function (assert) {
diff --git a/packages/host/tests/integration/commands/apply-search-replace-block-test.gts b/packages/host/tests/integration/tools/apply-search-replace-block-test.gts
similarity index 93%
rename from packages/host/tests/integration/commands/apply-search-replace-block-test.gts
rename to packages/host/tests/integration/tools/apply-search-replace-block-test.gts
index 3385c4f831..a935920eae 100644
--- a/packages/host/tests/integration/commands/apply-search-replace-block-test.gts
+++ b/packages/host/tests/integration/tools/apply-search-replace-block-test.gts
@@ -11,14 +11,12 @@ import ApplySearchReplaceBlockTool from '@cardstack/host/tools/apply-search-repl
 
 import { setupRenderingTest } from '../../helpers/setup';
 
-module('Integration | commands | apply-search-replace-block', function (hooks) {
+module('Integration | tools | apply-search-replace-block', function (hooks) {
   setupRenderingTest(hooks);
 
   test('handles basic search and replace pattern', async function (assert) {
     let toolService = getService('tool-service');
-    let applyCommand = new ApplySearchReplaceBlockTool(
-      toolService.commandContext,
-    );
+    let applyCommand = new ApplySearchReplaceBlockTool(toolService.toolContext);
 
     const fileContent = `import {
   contains,
@@ -72,9 +70,7 @@ export class Task extends CardDef {
 
   test('handles multiple occurrences of the search pattern, only replacing the first', async function (assert) {
     let toolService = getService('tool-service');
-    let applyCommand = new ApplySearchReplaceBlockTool(
-      toolService.commandContext,
-    );
+    let applyCommand = new ApplySearchReplaceBlockTool(toolService.toolContext);
 
     const fileContent = `class BlogPost extends CardDef {
   @field cardTitle = contains(StringField);
@@ -136,9 +132,7 @@ class EmbeddedTemplate extends Component<typeof BlogPost> {
 
   test('handles search pattern with whitespace differences', async function (assert) {
     let toolService = getService('tool-service');
-    let applyCommand = new ApplySearchReplaceBlockTool(
-      toolService.commandContext,
-    );
+    let applyCommand = new ApplySearchReplaceBlockTool(toolService.toolContext);
 
     const fileContent = `export class Product extends CardDef {
   static displayName = 'Product';
@@ -174,9 +168,7 @@ ${REPLACE_MARKER}`;
 
   test('handles no match found', async function (assert) {
     let toolService = getService('tool-service');
-    let applyCommand = new ApplySearchReplaceBlockTool(
-      toolService.commandContext,
-    );
+    let applyCommand = new ApplySearchReplaceBlockTool(toolService.toolContext);
 
     const fileContent = `export class Review extends CardDef {
   static displayName = 'Review';
@@ -217,9 +209,7 @@ ${REPLACE_MARKER}`;
   // Skipping this test for now as throwing errors causes issues
   skip('handles malformed search/replace block', async function (assert) {
     let toolService = getService('tool-service');
-    let applyCommand = new ApplySearchReplaceBlockTool(
-      toolService.commandContext,
-    );
+    let applyCommand = new ApplySearchReplaceBlockTool(toolService.toolContext);
 
     const fileContent = `export class Contact extends CardDef {
   static displayName = 'Contact';
@@ -254,9 +244,7 @@ ${REPLACE_MARKER}`;
 
   test('handles search with additional context for clarity', async function (assert) {
     let toolService = getService('tool-service');
-    let applyCommand = new ApplySearchReplaceBlockTool(
-      toolService.commandContext,
-    );
+    let applyCommand = new ApplySearchReplaceBlockTool(toolService.toolContext);
 
     const fileContent = `class WeatherDisplay extends Component<typeof Weather> {
   <template>
@@ -320,9 +308,7 @@ ${REPLACE_MARKER}`;
 
   test('handles different indentation in search pattern', async function (assert) {
     let toolService = getService('tool-service');
-    let applyCommand = new ApplySearchReplaceBlockTool(
-      toolService.commandContext,
-    );
+    let applyCommand = new ApplySearchReplaceBlockTool(toolService.toolContext);
 
     const fileContent = `class ContactCard extends CardDef {
   static displayName = 'Contact Card';
@@ -416,9 +402,7 @@ class CardTemplate extends Component<typeof ContactCard> {
 
   test('handles tabs vs spaces in search pattern', async function (assert) {
     let toolService = getService('tool-service');
-    let applyCommand = new ApplySearchReplaceBlockTool(
-      toolService.commandContext,
-    );
+    let applyCommand = new ApplySearchReplaceBlockTool(toolService.toolContext);
 
     // File uses spaces for indentation
     const fileContent = `export class Task extends CardDef {
@@ -471,9 +455,7 @@ ${REPLACE_MARKER}`;
 
   test('handles spurious blank lines in search pattern', async function (assert) {
     let toolService = getService('tool-service');
-    let applyCommand = new ApplySearchReplaceBlockTool(
-      toolService.commandContext,
-    );
+    let applyCommand = new ApplySearchReplaceBlockTool(toolService.toolContext);
 
     const fileContent = `class UserProfile extends CardDef {
   static displayName = 'User Profile';
@@ -531,9 +513,7 @@ ${REPLACE_MARKER}`;
 
   test('handles spurious blank lines in the middle of the search pattern', async function (assert) {
     let toolService = getService('tool-service');
-    let applyCommand = new ApplySearchReplaceBlockTool(
-      toolService.commandContext,
-    );
+    let applyCommand = new ApplySearchReplaceBlockTool(toolService.toolContext);
 
     const fileContent = `class UserProfile extends CardDef {
   static displayName = 'User Profile';
@@ -590,9 +570,7 @@ ${REPLACE_MARKER}`;
 
   test('handles carriage return differences in search pattern', async function (assert) {
     let toolService = getService('tool-service');
-    let applyCommand = new ApplySearchReplaceBlockTool(
-      toolService.commandContext,
-    );
+    let applyCommand = new ApplySearchReplaceBlockTool(toolService.toolContext);
 
     // File uses LF line endings
     const fileContent = `class ProductCard extends CardDef {
@@ -634,9 +612,7 @@ ${REPLACE_MARKER}`;
 
   test('handles trailing whitespace differences', async function (assert) {
     let toolService = getService('tool-service');
-    let applyCommand = new ApplySearchReplaceBlockTool(
-      toolService.commandContext,
-    );
+    let applyCommand = new ApplySearchReplaceBlockTool(toolService.toolContext);
 
     const fileContent = `class BookingForm extends Component<typeof Booking> {
   <template>
@@ -700,9 +676,7 @@ ${REPLACE_MARKER}`;
 
   test('it applies search/replace block when replace block is empty', async function (assert) {
     let toolService = getService('tool-service');
-    let applyCommand = new ApplySearchReplaceBlockTool(
-      toolService.commandContext,
-    );
+    let applyCommand = new ApplySearchReplaceBlockTool(toolService.toolContext);
 
     const fileContent = `class Task extends CardDef {
   static displayName = 'Task';
@@ -730,9 +704,7 @@ ${REPLACE_MARKER}`;
 
   test('it allows empty search and replace blocks on empty content', async function (assert) {
     let toolService = getService('tool-service');
-    let applyCommand = new ApplySearchReplaceBlockTool(
-      toolService.commandContext,
-    );
+    let applyCommand = new ApplySearchReplaceBlockTool(toolService.toolContext);
 
     const fileContent = '';
     const codeBlock = `${SEARCH_MARKER}
@@ -749,9 +721,7 @@ ${REPLACE_MARKER}`;
 
   test('it rejects empty search blocks on non-empty content', async function (assert) {
     let toolService = getService('tool-service');
-    let applyCommand = new ApplySearchReplaceBlockTool(
-      toolService.commandContext,
-    );
+    let applyCommand = new ApplySearchReplaceBlockTool(toolService.toolContext);
 
     const fileContent = `export class Task extends CardDef {
   static displayName = 'Task';
@@ -782,9 +752,7 @@ ${REPLACE_MARKER}`;
     // marker; applying the block must strip it rather than write it into the
     // file as a trailing line of box-drawing characters.
     let toolService = getService('tool-service');
-    let applyCommand = new ApplySearchReplaceBlockTool(
-      toolService.commandContext,
-    );
+    let applyCommand = new ApplySearchReplaceBlockTool(toolService.toolContext);
 
     const fileContent = `{ "old": true }`;
     const codeBlock = `${SEARCH_MARKER}
diff --git a/packages/host/tests/integration/commands/authed-fetch-test.gts b/packages/host/tests/integration/tools/authed-fetch-test.gts
similarity index 93%
rename from packages/host/tests/integration/commands/authed-fetch-test.gts
rename to packages/host/tests/integration/tools/authed-fetch-test.gts
index 9db0867ec8..46c5faad19 100644
--- a/packages/host/tests/integration/commands/authed-fetch-test.gts
+++ b/packages/host/tests/integration/tools/authed-fetch-test.gts
@@ -36,7 +36,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | authed-fetch', function (hooks) {
+module('Integration | tools | authed-fetch', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -84,7 +84,7 @@ module('Integration | commands | authed-fetch', function (hooks) {
       text: async () => JSON.stringify({ data: 'hello' }),
     };
     let toolService = getService('tool-service');
-    let command = new AuthedFetchTool(toolService.commandContext);
+    let command = new AuthedFetchTool(toolService.toolContext);
     let result = await command.execute({
       url: 'https://example.com/api/resource',
     });
@@ -100,7 +100,7 @@ module('Integration | commands | authed-fetch', function (hooks) {
       text: async () => 'not found',
     };
     let toolService = getService('tool-service');
-    let command = new AuthedFetchTool(toolService.commandContext);
+    let command = new AuthedFetchTool(toolService.toolContext);
     let result = await command.execute({
       url: 'https://example.com/api/missing',
     });
diff --git a/packages/host/tests/integration/commands/bot-registration-test.gts b/packages/host/tests/integration/tools/bot-registration-test.gts
similarity index 93%
rename from packages/host/tests/integration/commands/bot-registration-test.gts
rename to packages/host/tests/integration/tools/bot-registration-test.gts
index 5b97d20b3f..cde5876faa 100644
--- a/packages/host/tests/integration/commands/bot-registration-test.gts
+++ b/packages/host/tests/integration/tools/bot-registration-test.gts
@@ -30,7 +30,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | bot-registration', function (hooks) {
+module('Integration | tools | bot-registration', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -128,7 +128,7 @@ module('Integration | commands | bot-registration', function (hooks) {
 
   test('register-bot returns botRegistrationId', async function (assert) {
     let toolService = getService('tool-service');
-    let registerBotCommand = new RegisterBotTool(toolService.commandContext);
+    let registerBotCommand = new RegisterBotTool(toolService.toolContext);
 
     let result = await registerBotCommand.execute({
       username: '@testuser:localhost',
@@ -140,10 +140,8 @@ module('Integration | commands | bot-registration', function (hooks) {
   test('unregister-bot removes the bot registration', async function (assert) {
     let toolService = getService('tool-service');
     let realmServer = getService('realm-server');
-    let registerBotCommand = new RegisterBotTool(toolService.commandContext);
-    let unregisterBotCommand = new UnregisterBotTool(
-      toolService.commandContext,
-    );
+    let registerBotCommand = new RegisterBotTool(toolService.toolContext);
+    let unregisterBotCommand = new UnregisterBotTool(toolService.toolContext);
 
     let registerResult = await registerBotCommand.execute({
       username: '@testuser:localhost',
diff --git a/packages/host/tests/integration/commands/can-read-realm-test.gts b/packages/host/tests/integration/tools/can-read-realm-test.gts
similarity index 91%
rename from packages/host/tests/integration/commands/can-read-realm-test.gts
rename to packages/host/tests/integration/tools/can-read-realm-test.gts
index 0d64b15f02..fb38f5aaed 100644
--- a/packages/host/tests/integration/commands/can-read-realm-test.gts
+++ b/packages/host/tests/integration/tools/can-read-realm-test.gts
@@ -31,7 +31,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | can-read-realm', function (hooks) {
+module('Integration | tools | can-read-realm', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -67,7 +67,7 @@ module('Integration | commands | can-read-realm', function (hooks) {
   test('returns true for a readable realm', async function (assert) {
     readableUrls = ['https://example.com/readable/'];
     let toolService = getService('tool-service');
-    let command = new CanReadRealmTool(toolService.commandContext);
+    let command = new CanReadRealmTool(toolService.toolContext);
     let result = await command.execute({
       realmIdentifier: 'https://example.com/readable/',
     });
@@ -77,7 +77,7 @@ module('Integration | commands | can-read-realm', function (hooks) {
   test('returns false for an unreadable realm', async function (assert) {
     readableUrls = [];
     let toolService = getService('tool-service');
-    let command = new CanReadRealmTool(toolService.commandContext);
+    let command = new CanReadRealmTool(toolService.toolContext);
     let result = await command.execute({
       realmIdentifier: 'https://example.com/private/',
     });
diff --git a/packages/host/tests/integration/commands/cancel-indexing-job-test.gts b/packages/host/tests/integration/tools/cancel-indexing-job-test.gts
similarity index 96%
rename from packages/host/tests/integration/commands/cancel-indexing-job-test.gts
rename to packages/host/tests/integration/tools/cancel-indexing-job-test.gts
index f07004766d..a74bea01fa 100644
--- a/packages/host/tests/integration/commands/cancel-indexing-job-test.gts
+++ b/packages/host/tests/integration/tools/cancel-indexing-job-test.gts
@@ -29,7 +29,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | cancel-indexing-job', function (hooks) {
+module('Integration | tools | cancel-indexing-job', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -76,7 +76,7 @@ module('Integration | commands | cancel-indexing-job', function (hooks) {
   test('calls realm endpoint with expected auth header', async function (assert) {
     let toolService = getService('tool-service');
     let realmServer = getService('realm-server');
-    let command = new CancelIndexingJobTool(toolService.commandContext);
+    let command = new CancelIndexingJobTool(toolService.toolContext);
     let realmURL = new URL('test/', realmServer.url).href;
 
     let result = await command.execute({
diff --git a/packages/host/tests/integration/commands/check-correctness-test.gts b/packages/host/tests/integration/tools/check-correctness-test.gts
similarity index 90%
rename from packages/host/tests/integration/commands/check-correctness-test.gts
rename to packages/host/tests/integration/tools/check-correctness-test.gts
index 686eeba89b..8b23293de9 100644
--- a/packages/host/tests/integration/commands/check-correctness-test.gts
+++ b/packages/host/tests/integration/tools/check-correctness-test.gts
@@ -26,7 +26,7 @@ import { setupBaseRealm } from '../../helpers/base-realm';
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
-module('Integration | commands | check-correctness', function (hooks) {
+module('Integration | tools | check-correctness', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -87,7 +87,7 @@ module('Integration | commands | check-correctness', function (hooks) {
 
   test('reports card instance correctness when PatchCardInstanceTool is used', async function (assert) {
     let toolService = getService('tool-service') as {
-      commandContext: CommandContext;
+      toolContext: CommandContext;
     };
     let store = getService('store') as any;
     let loader = getService('loader-service').loader as any;
@@ -97,8 +97,8 @@ module('Integration | commands | check-correctness', function (hooks) {
     store.addReference(cardId);
     await store.waitForCardLoad(cardId);
 
-    let command = new CheckCorrectnessTool(toolService.commandContext);
-    let patchCodeCommand = new PatchCodeTool(toolService.commandContext);
+    let command = new CheckCorrectnessTool(toolService.toolContext);
+    let patchCodeCommand = new PatchCodeTool(toolService.toolContext);
     let roomId = '!room:example.com';
 
     let firstResult = await command.execute({
@@ -109,7 +109,7 @@ module('Integration | commands | check-correctness', function (hooks) {
 
     assert.true(firstResult.correct, 'initial run reports no errors');
 
-    let patchCommand = new PatchCardInstanceTool(toolService.commandContext, {
+    let patchCommand = new PatchCardInstanceTool(toolService.toolContext, {
       cardType: Pet,
     });
     await patchCommand.execute({
@@ -174,12 +174,12 @@ module('Integration | commands | check-correctness', function (hooks) {
 
   test('reports card instance correctness when PatchCodeTool is used', async function (assert) {
     let toolService = getService('tool-service') as {
-      commandContext: CommandContext;
+      toolContext: CommandContext;
     };
     let store = getService('store') as any;
 
-    let command = new CheckCorrectnessTool(toolService.commandContext);
-    let patchCodeCommand = new PatchCodeTool(toolService.commandContext);
+    let command = new CheckCorrectnessTool(toolService.toolContext);
+    let patchCodeCommand = new PatchCodeTool(toolService.toolContext);
     let cardId = `${testRealmURL}Pet/billy`;
     let fileUrl = `${cardId}.json`;
     let roomId = '!room:example.com';
@@ -254,10 +254,10 @@ module('Integration | commands | check-correctness', function (hooks) {
 
   test('skips correctness checks for empty files', async function (assert) {
     let toolService = getService('tool-service') as {
-      commandContext: CommandContext;
+      toolContext: CommandContext;
     };
-    let patchCodeCommand = new PatchCodeTool(toolService.commandContext);
-    let command = new CheckCorrectnessTool(toolService.commandContext);
+    let patchCodeCommand = new PatchCodeTool(toolService.toolContext);
+    let command = new CheckCorrectnessTool(toolService.toolContext);
     let roomId = '!room:example.com';
     let emptyFileUrl = `${testRealmURL}empty.gts`;
     let cardService = getService('card-service');
@@ -291,12 +291,12 @@ ${REPLACE_MARKER}`;
 
   test('reports size limit errors for file writes', async function (assert) {
     let toolService = getService('tool-service') as {
-      commandContext: CommandContext;
+      toolContext: CommandContext;
     };
     let environmentService = getService('environment-service') as any;
     let cardService = getService('card-service');
-    let patchCodeCommand = new PatchCodeTool(toolService.commandContext);
-    let command = new CheckCorrectnessTool(toolService.commandContext);
+    let patchCodeCommand = new PatchCodeTool(toolService.toolContext);
+    let command = new CheckCorrectnessTool(toolService.toolContext);
     let roomId = '!room:example.com';
     let fileUrl = `${testRealmURL}pet.gts`;
 
@@ -334,12 +334,12 @@ ${REPLACE_MARKER}`;
 
   test('reports size limit errors for card writes via PatchCardInstanceTool', async function (assert) {
     let toolService = getService('tool-service') as {
-      commandContext: CommandContext;
+      toolContext: CommandContext;
     };
     let environmentService = getService('environment-service') as any;
     let loader = getService('loader-service').loader as any;
     let store = getService('store') as any;
-    let command = new CheckCorrectnessTool(toolService.commandContext);
+    let command = new CheckCorrectnessTool(toolService.toolContext);
     let roomId = '!room:example.com';
     let { Pet } = await loader.import(`${testRealmURL}pet`);
     let cardId = `${testRealmURL}Pet/billy`;
@@ -351,7 +351,7 @@ ${REPLACE_MARKER}`;
     environmentService.cardSizeLimitBytes = 1000;
 
     try {
-      let patchCommand = new PatchCardInstanceTool(toolService.commandContext, {
+      let patchCommand = new PatchCardInstanceTool(toolService.toolContext, {
         cardType: Pet,
       });
 
diff --git a/packages/host/tests/integration/commands/check-domain-availability-test.gts b/packages/host/tests/integration/tools/check-domain-availability-test.gts
similarity index 96%
rename from packages/host/tests/integration/commands/check-domain-availability-test.gts
rename to packages/host/tests/integration/tools/check-domain-availability-test.gts
index 1eff16a1ed..6b08ff501d 100644
--- a/packages/host/tests/integration/commands/check-domain-availability-test.gts
+++ b/packages/host/tests/integration/tools/check-domain-availability-test.gts
@@ -37,7 +37,7 @@ let availabilityResponse: {
 };
 let checkedSubdomains: string[];
 
-module('Integration | commands | check-domain-availability', function (hooks) {
+module('Integration | tools | check-domain-availability', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -80,7 +80,7 @@ module('Integration | commands | check-domain-availability', function (hooks) {
 
   function makeCommand() {
     let toolService = getService('tool-service');
-    return new CheckDomainAvailabilityTool(toolService.commandContext);
+    return new CheckDomainAvailabilityTool(toolService.toolContext);
   }
 
   test('reports an available custom subdomain, deriving the URL from the server hostname', async function (assert) {
diff --git a/packages/host/tests/integration/commands/copy-and-edit-test.gts b/packages/host/tests/integration/tools/copy-and-edit-test.gts
similarity index 96%
rename from packages/host/tests/integration/commands/copy-and-edit-test.gts
rename to packages/host/tests/integration/tools/copy-and-edit-test.gts
index dd0a4112fb..ae0329052b 100644
--- a/packages/host/tests/integration/commands/copy-and-edit-test.gts
+++ b/packages/host/tests/integration/tools/copy-and-edit-test.gts
@@ -22,7 +22,7 @@ import type { CardDef } from '@cardstack/base/card-api';
 
 const otherRealmURL = 'http://other-realm/test2/';
 
-module('Integration | commands | copy-and-edit', function (hooks) {
+module('Integration | tools | copy-and-edit', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
 
@@ -209,7 +209,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
       }),
     );
 
-    let command = new CopyAndEditTool(toolService.commandContext);
+    let command = new CopyAndEditTool(toolService.toolContext);
     await command.execute({
       card: childCard,
     });
@@ -266,7 +266,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
       }),
     );
 
-    let command = new CopyAndEditTool(toolService.commandContext);
+    let command = new CopyAndEditTool(toolService.toolContext);
     await command.execute({
       card: originalTheme,
     });
@@ -303,7 +303,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
       ),
     );
 
-    let command = new CopyAndEditTool(toolService.commandContext);
+    let command = new CopyAndEditTool(toolService.toolContext);
     await command.execute({
       card: childCard,
     });
@@ -328,7 +328,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
       }),
     );
 
-    let command = new CopyAndEditTool(toolService.commandContext);
+    let command = new CopyAndEditTool(toolService.toolContext);
     await command.execute({
       card: simpleCard,
     });
@@ -373,7 +373,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
       }),
     );
 
-    let command = new CopyAndEditTool(toolService.commandContext);
+    let command = new CopyAndEditTool(toolService.toolContext);
     await command.execute({
       card: childCard,
     });
@@ -419,7 +419,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
       }),
     );
 
-    let command = new CopyAndEditTool(toolService.commandContext);
+    let command = new CopyAndEditTool(toolService.toolContext);
     await command.execute({
       card: remoteChild,
     });
@@ -477,7 +477,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
       }),
     );
 
-    let command = new CopyAndEditTool(toolService.commandContext);
+    let command = new CopyAndEditTool(toolService.toolContext);
     await command.execute({
       card: remoteChild,
     });
diff --git a/packages/host/tests/integration/commands/copy-card-test.gts b/packages/host/tests/integration/tools/copy-card-test.gts
similarity index 97%
rename from packages/host/tests/integration/commands/copy-card-test.gts
rename to packages/host/tests/integration/tools/copy-card-test.gts
index f8278c5d9e..1433d4a262 100644
--- a/packages/host/tests/integration/commands/copy-card-test.gts
+++ b/packages/host/tests/integration/tools/copy-card-test.gts
@@ -21,7 +21,7 @@ import type { CardDef } from '@cardstack/base/card-api';
 
 const testRealm2URL = 'http://test-realm/test2/';
 
-module('Integration | commands | copy-card', function (hooks) {
+module('Integration | tools | copy-card', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
 
@@ -105,7 +105,7 @@ module('Integration | commands | copy-card', function (hooks) {
   module('CopyCardToRealmTool', function () {
     test('copies card to target realm', async function (assert) {
       let toolService = getService('tool-service');
-      let copyCardCommand = new CopyCardToRealmTool(toolService.commandContext);
+      let copyCardCommand = new CopyCardToRealmTool(toolService.toolContext);
 
       let sourceCardUrl = `${testRealmURL}Pet/mango`;
       let targetRealm = testRealm2URL;
@@ -148,7 +148,7 @@ module('Integration | commands | copy-card', function (hooks) {
 
     test('errors when user does not have write permissions to target realm', async function (assert) {
       let toolService = getService('tool-service');
-      let copyCardCommand = new CopyCardToRealmTool(toolService.commandContext);
+      let copyCardCommand = new CopyCardToRealmTool(toolService.toolContext);
 
       let sourceCardUrl = `${testRealmURL}Pet/mango`;
       let targetRealm = testRealm2URL;
@@ -184,7 +184,7 @@ module('Integration | commands | copy-card', function (hooks) {
     test('copies card to stack when valid targetStackIndex is provided', async function (assert) {
       let toolService = getService('tool-service');
       let copyCardToStackCommand = new CopyCardToStackTool(
-        toolService.commandContext,
+        toolService.toolContext,
       );
 
       let sourceCardUrl = `${testRealmURL}Pet/mango`;
@@ -239,7 +239,7 @@ module('Integration | commands | copy-card', function (hooks) {
     test('errors when targetStackIndex does not exist', async function (assert) {
       let toolService = getService('tool-service');
       let copyCardToStackCommand = new CopyCardToStackTool(
-        toolService.commandContext,
+        toolService.toolContext,
       );
 
       let sourceCardUrl = `${testRealmURL}Pet/mango`;
diff --git a/packages/host/tests/integration/commands/copy-file-to-realm-test.gts b/packages/host/tests/integration/tools/copy-file-to-realm-test.gts
similarity index 91%
rename from packages/host/tests/integration/commands/copy-file-to-realm-test.gts
rename to packages/host/tests/integration/tools/copy-file-to-realm-test.gts
index a203abe8af..7899a08192 100644
--- a/packages/host/tests/integration/commands/copy-file-to-realm-test.gts
+++ b/packages/host/tests/integration/tools/copy-file-to-realm-test.gts
@@ -16,7 +16,7 @@ import { setupRenderingTest } from '../../helpers/setup';
 
 const testRealm2URL = 'http://test-realm/test2/';
 
-module('Integration | commands | copy-file-to-realm', function (hooks) {
+module('Integration | tools | copy-file-to-realm', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
 
@@ -54,7 +54,7 @@ module('Integration | commands | copy-file-to-realm', function (hooks) {
 
   test('copies file to target realm', async function (assert) {
     let toolService = getService('tool-service');
-    let copyFileCommand = new CopyFileToRealmTool(toolService.commandContext);
+    let copyFileCommand = new CopyFileToRealmTool(toolService.toolContext);
 
     let result = await copyFileCommand.execute({
       sourceFileIdentifier: `${testRealmURL}hello.txt`,
@@ -75,7 +75,7 @@ module('Integration | commands | copy-file-to-realm', function (hooks) {
 
   test('handles filename conflicts by creating non-conflicting name', async function (assert) {
     let toolService = getService('tool-service');
-    let copyFileCommand = new CopyFileToRealmTool(toolService.commandContext);
+    let copyFileCommand = new CopyFileToRealmTool(toolService.toolContext);
 
     // First, copy hello.txt to test2 realm so there is a conflict on the second copy
     await copyFileCommand.execute({
@@ -115,7 +115,7 @@ module('Integration | commands | copy-file-to-realm', function (hooks) {
       submode: 'interact',
     });
 
-    let copyFileCommand = new CopyFileToRealmTool(toolService.commandContext);
+    let copyFileCommand = new CopyFileToRealmTool(toolService.toolContext);
 
     let result = await copyFileCommand.execute({
       sourceFileIdentifier: `${testRealmURL}hello.txt`,
@@ -124,7 +124,7 @@ module('Integration | commands | copy-file-to-realm', function (hooks) {
 
     assert.ok(result.newFileIdentifier, 'new file URL is returned');
 
-    let showFileCommand = new ShowFileTool(toolService.commandContext);
+    let showFileCommand = new ShowFileTool(toolService.toolContext);
     await showFileCommand.execute({
       fileIdentifier: result.newFileIdentifier,
     });
@@ -143,7 +143,7 @@ module('Integration | commands | copy-file-to-realm', function (hooks) {
 
   test('errors when user does not have write permissions to target realm', async function (assert) {
     let toolService = getService('tool-service');
-    let copyFileCommand = new CopyFileToRealmTool(toolService.commandContext);
+    let copyFileCommand = new CopyFileToRealmTool(toolService.toolContext);
 
     let realmService = getService('realm');
     realmService.logout();
diff --git a/packages/host/tests/integration/commands/copy-source-test.gts b/packages/host/tests/integration/tools/copy-source-test.gts
similarity index 94%
rename from packages/host/tests/integration/commands/copy-source-test.gts
rename to packages/host/tests/integration/tools/copy-source-test.gts
index 3aa9055e84..5a9b79c2b7 100644
--- a/packages/host/tests/integration/commands/copy-source-test.gts
+++ b/packages/host/tests/integration/tools/copy-source-test.gts
@@ -31,7 +31,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | copy-source', function (hooks) {
+module('Integration | tools | copy-source', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
 
@@ -65,7 +65,7 @@ module('Integration | commands | copy-source', function (hooks) {
 
   test('able to copy source or file', async function (assert) {
     let toolService = getService('tool-service');
-    let copySourceCommand = new CopySourceTool(toolService.commandContext);
+    let copySourceCommand = new CopySourceTool(toolService.toolContext);
     const originSourceIdentifier = testRealmURL + 'person.gts';
     const destinationSourceIdentifier = testRealmURL + 'person-copy.gts';
     await copySourceCommand.execute({
diff --git a/packages/host/tests/integration/commands/create-listing-pr-request-test.gts b/packages/host/tests/integration/tools/create-listing-pr-request-test.gts
similarity index 95%
rename from packages/host/tests/integration/commands/create-listing-pr-request-test.gts
rename to packages/host/tests/integration/tools/create-listing-pr-request-test.gts
index e0efd72978..897f365a8f 100644
--- a/packages/host/tests/integration/commands/create-listing-pr-request-test.gts
+++ b/packages/host/tests/integration/tools/create-listing-pr-request-test.gts
@@ -35,7 +35,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | create-listing-pr-request', function (hooks) {
+module('Integration | tools | create-listing-pr-request', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
   setupBaseRealm(hooks);
@@ -74,7 +74,7 @@ module('Integration | commands | create-listing-pr-request', function (hooks) {
     let toolService = getService('tool-service');
     let matrixService = getService('matrix-service') as MatrixService;
 
-    let command = new CreateListingPRRequestTool(toolService.commandContext);
+    let command = new CreateListingPRRequestTool(toolService.toolContext);
     await command.execute({
       realm: testRealmURL,
       listingId: `${testRealmURL}Listing/test-listing`,
@@ -130,7 +130,7 @@ module('Integration | commands | create-listing-pr-request', function (hooks) {
     let matrixService = getService('matrix-service') as MatrixService;
     let previousCurrentRoomId = matrixService.currentRoomId;
 
-    let command = new CreateListingPRRequestTool(toolService.commandContext);
+    let command = new CreateListingPRRequestTool(toolService.toolContext);
     await command.execute({
       realm: testRealmURL,
       listingId: `${testRealmURL}Listing/test-listing`,
diff --git a/packages/host/tests/integration/commands/create-spec-test.gts b/packages/host/tests/integration/tools/create-spec-test.gts
similarity index 99%
rename from packages/host/tests/integration/commands/create-spec-test.gts
rename to packages/host/tests/integration/tools/create-spec-test.gts
index c8c469e3cb..3b04465224 100644
--- a/packages/host/tests/integration/commands/create-spec-test.gts
+++ b/packages/host/tests/integration/tools/create-spec-test.gts
@@ -63,7 +63,7 @@ module('Integration | Command | create-specs', function (hooks) {
   hooks.beforeEach(function () {
     loader = getService('loader-service').loader;
     let toolService = getService('tool-service');
-    createSpecCommand = new CreateSpecTool(toolService.commandContext);
+    createSpecCommand = new CreateSpecTool(toolService.toolContext);
   });
 
   setupLocalIndexing(hooks);
diff --git a/packages/host/tests/integration/commands/evaluate-module-test.gts b/packages/host/tests/integration/tools/evaluate-module-test.gts
similarity index 92%
rename from packages/host/tests/integration/commands/evaluate-module-test.gts
rename to packages/host/tests/integration/tools/evaluate-module-test.gts
index f62c840bfe..4af69fc9e1 100644
--- a/packages/host/tests/integration/commands/evaluate-module-test.gts
+++ b/packages/host/tests/integration/tools/evaluate-module-test.gts
@@ -31,7 +31,7 @@ const BROKEN_IMPORT_MODULE = `
   }
 `;
 
-module('Integration | commands | evaluate-module', function (hooks) {
+module('Integration | tools | evaluate-module', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
 
@@ -57,7 +57,7 @@ module('Integration | commands | evaluate-module', function (hooks) {
 
   test('valid module passes evaluation', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new EvaluateModuleTool(toolService.commandContext);
+    let command = new EvaluateModuleTool(toolService.toolContext);
 
     let InputType = await command.getInputType();
     let input = new InputType({
@@ -73,7 +73,7 @@ module('Integration | commands | evaluate-module', function (hooks) {
 
   test('module with broken import fails evaluation', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new EvaluateModuleTool(toolService.commandContext);
+    let command = new EvaluateModuleTool(toolService.toolContext);
 
     let InputType = await command.getInputType();
     let input = new InputType({
diff --git a/packages/host/tests/integration/commands/execute-atomic-operations-test.gts b/packages/host/tests/integration/tools/execute-atomic-operations-test.gts
similarity index 92%
rename from packages/host/tests/integration/commands/execute-atomic-operations-test.gts
rename to packages/host/tests/integration/tools/execute-atomic-operations-test.gts
index dd327ed2fd..1fe3c461d5 100644
--- a/packages/host/tests/integration/commands/execute-atomic-operations-test.gts
+++ b/packages/host/tests/integration/tools/execute-atomic-operations-test.gts
@@ -37,7 +37,7 @@ class StubCardService extends CardService {
   }
 }
 
-module('Integration | commands | execute-atomic-operations', function (hooks) {
+module('Integration | tools | execute-atomic-operations', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -69,7 +69,7 @@ module('Integration | commands | execute-atomic-operations', function (hooks) {
       'atomic:results': [{ id: 'card-1' }, { id: 'card-2' }],
     };
     let toolService = getService('tool-service');
-    let command = new ExecuteAtomicOperationsTool(toolService.commandContext);
+    let command = new ExecuteAtomicOperationsTool(toolService.toolContext);
     let result = await command.execute({
       realmIdentifier: testRealmURL,
       operations: [{ op: 'add', path: 'card-1' }] as any,
@@ -82,7 +82,7 @@ module('Integration | commands | execute-atomic-operations', function (hooks) {
       errors: [{ detail: 'Something went wrong' }],
     };
     let toolService = getService('tool-service');
-    let command = new ExecuteAtomicOperationsTool(toolService.commandContext);
+    let command = new ExecuteAtomicOperationsTool(toolService.toolContext);
     try {
       await command.execute({
         realmIdentifier: testRealmURL,
diff --git a/packages/host/tests/integration/commands/fetch-card-json-test.gts b/packages/host/tests/integration/tools/fetch-card-json-test.gts
similarity index 94%
rename from packages/host/tests/integration/commands/fetch-card-json-test.gts
rename to packages/host/tests/integration/tools/fetch-card-json-test.gts
index 05257d8a84..f6aab7f327 100644
--- a/packages/host/tests/integration/commands/fetch-card-json-test.gts
+++ b/packages/host/tests/integration/tools/fetch-card-json-test.gts
@@ -28,7 +28,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | fetch-card-json', function (hooks) {
+module('Integration | tools | fetch-card-json', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -80,7 +80,7 @@ module('Integration | commands | fetch-card-json', function (hooks) {
 
   test('fetches card JSON for an existing card', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new FetchCardJsonTool(toolService.commandContext);
+    let command = new FetchCardJsonTool(toolService.toolContext);
     let result = await command.execute({
       cardIdentifier: `${testRealmURL}Person/alice`,
     });
diff --git a/packages/host/tests/integration/commands/full-reindex-realm-test.gts b/packages/host/tests/integration/tools/full-reindex-realm-test.gts
similarity index 95%
rename from packages/host/tests/integration/commands/full-reindex-realm-test.gts
rename to packages/host/tests/integration/tools/full-reindex-realm-test.gts
index e55bf3e230..174a8e8793 100644
--- a/packages/host/tests/integration/commands/full-reindex-realm-test.gts
+++ b/packages/host/tests/integration/tools/full-reindex-realm-test.gts
@@ -31,7 +31,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | full-reindex-realm', function (hooks) {
+module('Integration | tools | full-reindex-realm', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -83,7 +83,7 @@ module('Integration | commands | full-reindex-realm', function (hooks) {
     let toolService = getService('tool-service');
     let realmServer = getService('realm-server');
     let realmService = getService('realm') as RealmService;
-    let command = new FullReindexRealmTool(toolService.commandContext);
+    let command = new FullReindexRealmTool(toolService.toolContext);
     let realmURL = new URL('test/', realmServer.url).href;
 
     assert.false(
@@ -158,7 +158,7 @@ module('Integration | commands | full-reindex-realm', function (hooks) {
     let toolService = getService('tool-service');
     let realmServer = getService('realm-server');
     let realmService = getService('realm') as RealmService;
-    let command = new FullReindexRealmTool(toolService.commandContext);
+    let command = new FullReindexRealmTool(toolService.toolContext);
     let realmURL = new URL('test/', realmServer.url).href;
     responseStatus = 500;
     responseBody = 'boom';
@@ -178,7 +178,7 @@ module('Integration | commands | full-reindex-realm', function (hooks) {
 
   test('description explains forced full reindex semantics', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new FullReindexRealmTool(toolService.commandContext);
+    let command = new FullReindexRealmTool(toolService.toolContext);
 
     assert.true(
       command.description.includes('every file in the realm is revisited'),
diff --git a/packages/host/tests/integration/commands/generate-example-cards-one-shot-test.gts b/packages/host/tests/integration/tools/generate-example-cards-one-shot-test.gts
similarity index 99%
rename from packages/host/tests/integration/commands/generate-example-cards-one-shot-test.gts
rename to packages/host/tests/integration/tools/generate-example-cards-one-shot-test.gts
index 5d3ca88c27..ff879e73e3 100644
--- a/packages/host/tests/integration/commands/generate-example-cards-one-shot-test.gts
+++ b/packages/host/tests/integration/tools/generate-example-cards-one-shot-test.gts
@@ -92,7 +92,7 @@ export class TestCard extends CardDef {
 
       const toolService = getService('tool-service');
       generateExampleCommand = new GenerateExampleCardsOneShotTool(
-        toolService.commandContext,
+        toolService.toolContext,
       );
     });
 
diff --git a/packages/host/tests/integration/commands/get-available-realm-identifiers-test.gts b/packages/host/tests/integration/tools/get-available-realm-identifiers-test.gts
similarity index 96%
rename from packages/host/tests/integration/commands/get-available-realm-identifiers-test.gts
rename to packages/host/tests/integration/tools/get-available-realm-identifiers-test.gts
index 3eacfcb1e9..4723ec10b5 100644
--- a/packages/host/tests/integration/commands/get-available-realm-identifiers-test.gts
+++ b/packages/host/tests/integration/tools/get-available-realm-identifiers-test.gts
@@ -31,7 +31,7 @@ class StubRealmService extends RealmService {
 }
 
 module(
-  'Integration | commands | get-available-realm-identifiers',
+  'Integration | tools | get-available-realm-identifiers',
   function (hooks) {
     setupRenderingTest(hooks);
     setupBaseRealm(hooks);
@@ -71,7 +71,7 @@ module(
     test('returns the list of available realm identifiers', async function (assert) {
       let toolService = getService('tool-service');
       let command = new GetAvailableRealmIdentifiersTool(
-        toolService.commandContext,
+        toolService.toolContext,
       );
       let result = await command.execute();
       assert.deepEqual(result.realmIdentifiers, [
diff --git a/packages/host/tests/integration/tools/get-catalog-realm-identifiers-test.gts b/packages/host/tests/integration/tools/get-catalog-realm-identifiers-test.gts
new file mode 100644
index 0000000000..2a7e4b2742
--- /dev/null
+++ b/packages/host/tests/integration/tools/get-catalog-realm-identifiers-test.gts
@@ -0,0 +1,72 @@
+import { getOwner } from '@ember/owner';
+import type { RenderingTestContext } from '@ember/test-helpers';
+
+import { getService } from '@universal-ember/test-support';
+import { module, test } from 'qunit';
+
+import RealmService from '@cardstack/host/services/realm';
+import type RealmServerService from '@cardstack/host/services/realm-server';
+import GetCatalogRealmIdentifiersTool from '@cardstack/host/tools/get-catalog-realm-identifiers';
+
+import {
+  setupIntegrationTestRealm,
+  setupLocalIndexing,
+  setupRealmServerEndpoints,
+  testRealmURL,
+  testRealmInfo,
+  setupRealmCacheTeardown,
+  withCachedRealmSetup,
+} from '../../helpers';
+import { setupBaseRealm } from '../../helpers/base-realm';
+import { setupMockMatrix } from '../../helpers/mock-matrix';
+import { setupRenderingTest } from '../../helpers/setup';
+
+class StubRealmService extends RealmService {
+  get defaultReadableRealm() {
+    return {
+      path: testRealmURL,
+      info: testRealmInfo,
+    };
+  }
+}
+
+module('Integration | tools | get-catalog-realm-identifiers', function (hooks) {
+  setupRenderingTest(hooks);
+  setupBaseRealm(hooks);
+  setupLocalIndexing(hooks);
+
+  let mockMatrixUtils = setupMockMatrix(hooks, {
+    loggedInAs: '@testuser:localhost',
+    activeRealms: [testRealmURL],
+    autostart: true,
+  });
+
+  setupRealmServerEndpoints(hooks);
+
+  setupRealmCacheTeardown(hooks);
+
+  hooks.beforeEach(async function (this: RenderingTestContext) {
+    getOwner(this)!.register('service:realm', StubRealmService);
+
+    await withCachedRealmSetup(async () =>
+      setupIntegrationTestRealm({
+        mockMatrixUtils,
+        realmURL: testRealmURL,
+        contents: {},
+      }),
+    );
+
+    let realmServer = getService('realm-server') as RealmServerService;
+    Object.defineProperty(realmServer, 'catalogRealmIdentifiers', {
+      get: () => ['https://example.com/catalog/'],
+      configurable: true,
+    });
+  });
+
+  test('returns the list of catalog realm identifiers', async function (assert) {
+    let toolService = getService('tool-service');
+    let command = new GetCatalogRealmIdentifiersTool(toolService.toolContext);
+    let result = await command.execute();
+    assert.deepEqual(result.realmIdentifiers, ['https://example.com/catalog/']);
+  });
+});
diff --git a/packages/host/tests/integration/commands/get-default-writable-realm-test.gts b/packages/host/tests/integration/tools/get-default-writable-realm-test.gts
similarity index 90%
rename from packages/host/tests/integration/commands/get-default-writable-realm-test.gts
rename to packages/host/tests/integration/tools/get-default-writable-realm-test.gts
index 2fbd1047b9..3435e2ce30 100644
--- a/packages/host/tests/integration/commands/get-default-writable-realm-test.gts
+++ b/packages/host/tests/integration/tools/get-default-writable-realm-test.gts
@@ -29,7 +29,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | get-default-writable-realm', function (hooks) {
+module('Integration | tools | get-default-writable-realm', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -57,7 +57,7 @@ module('Integration | commands | get-default-writable-realm', function (hooks) {
 
   test('returns realm path when a default writable realm exists', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new GetDefaultWritableRealmTool(toolService.commandContext);
+    let command = new GetDefaultWritableRealmTool(toolService.toolContext);
     let result = await command.execute();
     assert.strictEqual(result.realmIdentifier, testRealmURL);
   });
@@ -71,7 +71,7 @@ module('Integration | commands | get-default-writable-realm', function (hooks) {
       configurable: true,
     });
     let toolService = getService('tool-service');
-    let command = new GetDefaultWritableRealmTool(toolService.commandContext);
+    let command = new GetDefaultWritableRealmTool(toolService.toolContext);
     let result = await command.execute();
     assert.strictEqual(result.realmIdentifier, '');
   });
diff --git a/packages/host/tests/integration/commands/get-published-realms-test.gts b/packages/host/tests/integration/tools/get-published-realms-test.gts
similarity index 96%
rename from packages/host/tests/integration/commands/get-published-realms-test.gts
rename to packages/host/tests/integration/tools/get-published-realms-test.gts
index 5b65049098..512c583d27 100644
--- a/packages/host/tests/integration/commands/get-published-realms-test.gts
+++ b/packages/host/tests/integration/tools/get-published-realms-test.gts
@@ -25,7 +25,7 @@ import { setupRenderingTest } from '../../helpers/setup';
 // patches the resolved service's info to serve the fixture directly.
 let lastPublishedAtFixture: string | Record<string, string> | null;
 
-module('Integration | commands | get-published-realms', function (hooks) {
+module('Integration | tools | get-published-realms', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -64,7 +64,7 @@ module('Integration | commands | get-published-realms', function (hooks) {
 
   function makeCommand() {
     let toolService = getService('tool-service');
-    return new GetPublishedRealmsTool(toolService.commandContext);
+    return new GetPublishedRealmsTool(toolService.toolContext);
   }
 
   test('returns each published destination from the lastPublishedAt map', async function (assert) {
diff --git a/packages/host/tests/integration/commands/get-realm-of-resource-identifier-test.gts b/packages/host/tests/integration/tools/get-realm-of-resource-identifier-test.gts
similarity index 95%
rename from packages/host/tests/integration/commands/get-realm-of-resource-identifier-test.gts
rename to packages/host/tests/integration/tools/get-realm-of-resource-identifier-test.gts
index 75456ce8e5..af8369b7dc 100644
--- a/packages/host/tests/integration/commands/get-realm-of-resource-identifier-test.gts
+++ b/packages/host/tests/integration/tools/get-realm-of-resource-identifier-test.gts
@@ -42,7 +42,7 @@ class StubRealmService extends RealmService {
 }
 
 module(
-  'Integration | commands | get-realm-of-resource-identifier',
+  'Integration | tools | get-realm-of-resource-identifier',
   function (hooks) {
     setupRenderingTest(hooks);
     setupBaseRealm(hooks);
@@ -73,7 +73,7 @@ module(
       realmOfURLMap = new Map([[testRealmURL, new URL(testRealmURL)]]);
       let toolService = getService('tool-service');
       let command = new GetRealmOfResourceIdentifierTool(
-        toolService.commandContext,
+        toolService.toolContext,
       );
       let result = await command.execute({
         resourceIdentifier: `${testRealmURL}some-card`,
@@ -85,7 +85,7 @@ module(
       realmOfURLMap = new Map();
       let toolService = getService('tool-service');
       let command = new GetRealmOfResourceIdentifierTool(
-        toolService.commandContext,
+        toolService.toolContext,
       );
       let result = await command.execute({
         resourceIdentifier: 'https://unknown.example.com/card',
diff --git a/packages/host/tests/integration/commands/get-user-system-card-test.gts b/packages/host/tests/integration/tools/get-user-system-card-test.gts
similarity index 91%
rename from packages/host/tests/integration/commands/get-user-system-card-test.gts
rename to packages/host/tests/integration/tools/get-user-system-card-test.gts
index c25bf02ca5..c6450b668f 100644
--- a/packages/host/tests/integration/commands/get-user-system-card-test.gts
+++ b/packages/host/tests/integration/tools/get-user-system-card-test.gts
@@ -28,7 +28,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | get-user-system-card', function (hooks) {
+module('Integration | tools | get-user-system-card', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
   setupBaseRealm(hooks);
@@ -55,7 +55,7 @@ module('Integration | commands | get-user-system-card', function (hooks) {
 
   test('returns undefined cardId when no system card is set', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new GetUserSystemCardTool(toolService.commandContext);
+    let command = new GetUserSystemCardTool(toolService.toolContext);
 
     let result = await command.execute();
     assert.strictEqual(
@@ -77,7 +77,7 @@ module('Integration | commands | get-user-system-card', function (hooks) {
     matrixService._systemCard = new SystemCard({ id: systemCardId });
 
     let toolService = getService('tool-service');
-    let command = new GetUserSystemCardTool(toolService.commandContext);
+    let command = new GetUserSystemCardTool(toolService.toolContext);
 
     let result = await command.execute();
     assert.strictEqual(result.cardId, systemCardId);
diff --git a/packages/host/tests/integration/commands/instantiate-card-test.gts b/packages/host/tests/integration/tools/instantiate-card-test.gts
similarity index 93%
rename from packages/host/tests/integration/commands/instantiate-card-test.gts
rename to packages/host/tests/integration/tools/instantiate-card-test.gts
index bd21632964..171fd81b32 100644
--- a/packages/host/tests/integration/commands/instantiate-card-test.gts
+++ b/packages/host/tests/integration/tools/instantiate-card-test.gts
@@ -32,7 +32,7 @@ const TAGS_MODULE = `
   }
 `;
 
-module('Integration | commands | instantiate-card', function (hooks) {
+module('Integration | tools | instantiate-card', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
 
@@ -58,7 +58,7 @@ module('Integration | commands | instantiate-card', function (hooks) {
 
   test('valid card with instance data passes instantiation', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new InstantiateCardTool(toolService.commandContext);
+    let command = new InstantiateCardTool(toolService.toolContext);
 
     let InputType = await command.getInputType();
     let instanceDoc = {
@@ -88,7 +88,7 @@ module('Integration | commands | instantiate-card', function (hooks) {
 
   test('valid card with no instance data passes instantiation', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new InstantiateCardTool(toolService.commandContext);
+    let command = new InstantiateCardTool(toolService.toolContext);
 
     let InputType = await command.getInputType();
     let input = new InputType({
@@ -105,7 +105,7 @@ module('Integration | commands | instantiate-card', function (hooks) {
 
   test('containsMany field with non-array value fails instantiation', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new InstantiateCardTool(toolService.commandContext);
+    let command = new InstantiateCardTool(toolService.toolContext);
 
     let InputType = await command.getInputType();
     // Provide a string instead of an array for the containsMany field.
diff --git a/packages/host/tests/integration/tools/invalidate-realm-identifiers-test.gts b/packages/host/tests/integration/tools/invalidate-realm-identifiers-test.gts
new file mode 100644
index 0000000000..d4fe348be3
--- /dev/null
+++ b/packages/host/tests/integration/tools/invalidate-realm-identifiers-test.gts
@@ -0,0 +1,168 @@
+import { getOwner } from '@ember/owner';
+import type { RenderingTestContext } from '@ember/test-helpers';
+
+import { getService } from '@universal-ember/test-support';
+import { module, test } from 'qunit';
+
+import RealmService from '@cardstack/host/services/realm';
+import InvalidateRealmIdentifiersTool from '@cardstack/host/tools/invalidate-realm-identifiers';
+
+import {
+  setupIntegrationTestRealm,
+  setupLocalIndexing,
+  setupRealmServerEndpoints,
+  testRealmInfo,
+  testRealmURL,
+  setupRealmCacheTeardown,
+  withCachedRealmSetup,
+} from '../../helpers';
+import { setupBaseRealm } from '../../helpers/base-realm';
+import { setupMockMatrix } from '../../helpers/mock-matrix';
+import { setupRenderingTest } from '../../helpers/setup';
+
+class StubRealmService extends RealmService {
+  get defaultReadableRealm() {
+    return {
+      path: testRealmURL,
+      info: testRealmInfo,
+    };
+  }
+}
+
+module('Integration | tools | invalidate-realm-identifiers', function (hooks) {
+  setupRenderingTest(hooks);
+  setupBaseRealm(hooks);
+  setupLocalIndexing(hooks);
+
+  let receivedAuthorizationHeader: string | null = null;
+  let receivedMethod: string | null = null;
+  let receivedPathname: string | null = null;
+  let responseStatus = 204;
+  let responseBody: string | null = null;
+  let receivedBody: {
+    data?: {
+      type?: string;
+      attributes?: {
+        urls?: string[];
+      };
+    };
+  } | null = null;
+
+  let mockMatrixUtils = setupMockMatrix(hooks, {
+    loggedInAs: '@testuser:localhost',
+    activeRealms: [testRealmURL],
+    autostart: true,
+  });
+
+  setupRealmServerEndpoints(hooks, [
+    {
+      route: 'test/_invalidate',
+      getResponse: async (req: Request) => {
+        receivedAuthorizationHeader = req.headers.get('Authorization');
+        receivedMethod = req.method;
+        receivedPathname = new URL(req.url).pathname;
+        receivedBody = (await req.json()) as typeof receivedBody;
+        return new Response(responseBody, { status: responseStatus });
+      },
+    },
+  ]);
+
+  setupRealmCacheTeardown(hooks);
+
+  hooks.beforeEach(async function (this: RenderingTestContext) {
+    getOwner(this)!.register('service:realm', StubRealmService);
+    receivedAuthorizationHeader = null;
+    receivedMethod = null;
+    receivedPathname = null;
+    receivedBody = null;
+    responseStatus = 204;
+    responseBody = null;
+
+    await withCachedRealmSetup(async () =>
+      setupIntegrationTestRealm({
+        mockMatrixUtils,
+        realmURL: testRealmURL,
+        contents: {},
+      }),
+    );
+  });
+
+  test('calls realm endpoint with expected auth header and payload', async function (assert) {
+    let toolService = getService('tool-service');
+    let realmServer = getService('realm-server');
+    let command = new InvalidateRealmIdentifiersTool(toolService.toolContext);
+    let realmURL = new URL('test/', realmServer.url).href;
+
+    let result = await command.execute({
+      realmIdentifier: realmURL,
+      resourceIdentifiers: [
+        `${realmURL}mango`,
+        `${realmURL}mango`,
+        `${realmURL}person.gts`,
+      ],
+    });
+
+    assert.strictEqual(result, undefined, 'command has no result card');
+    assert.strictEqual(receivedMethod, 'POST', 'uses POST');
+    assert.strictEqual(receivedPathname, '/test/_invalidate', 'calls endpoint');
+    assert.ok(receivedAuthorizationHeader, 'authorization header is present');
+    assert.true(
+      receivedAuthorizationHeader?.startsWith('Bearer '),
+      'authorization header uses Bearer scheme',
+    );
+
+    let authToken = receivedAuthorizationHeader!.replace('Bearer ', '');
+    let [_header, payload] = authToken.split('.');
+    let tokenClaims = JSON.parse(atob(payload)) as {
+      realm?: string;
+      permissions?: string[];
+    };
+
+    assert.strictEqual(
+      tokenClaims.realm,
+      realmURL,
+      'authorization token is realm-scoped',
+    );
+    assert.deepEqual(
+      tokenClaims.permissions,
+      ['read', 'write'],
+      'authorization token contains realm permissions',
+    );
+    assert.notStrictEqual(
+      receivedAuthorizationHeader,
+      `Bearer ${realmServer.token}`,
+      'authorization header does not use realm-server session token',
+    );
+
+    assert.deepEqual(
+      receivedBody,
+      {
+        data: {
+          type: 'invalidation-request',
+          attributes: {
+            urls: [`${realmURL}mango`, `${realmURL}person.gts`],
+          },
+        },
+      },
+      'sends JSON:API payload with deduped urls',
+    );
+  });
+
+  test('throws when realm invalidation endpoint returns non-204', async function (assert) {
+    let toolService = getService('tool-service');
+    let realmServer = getService('realm-server');
+    let command = new InvalidateRealmIdentifiersTool(toolService.toolContext);
+    let realmURL = new URL('test/', realmServer.url).href;
+    responseStatus = 500;
+    responseBody = 'boom';
+
+    await assert.rejects(
+      command.execute({
+        realmIdentifier: realmURL,
+        resourceIdentifiers: [`${realmURL}mango`],
+      }),
+      /Invalidate urls failed: 500 - boom/,
+      'propagates non-204 failure as an error',
+    );
+  });
+});
diff --git a/packages/host/tests/integration/commands/invite-user-to-room-test.gts b/packages/host/tests/integration/tools/invite-user-to-room-test.gts
similarity index 92%
rename from packages/host/tests/integration/commands/invite-user-to-room-test.gts
rename to packages/host/tests/integration/tools/invite-user-to-room-test.gts
index 6dd25e4cc7..1ba2811628 100644
--- a/packages/host/tests/integration/commands/invite-user-to-room-test.gts
+++ b/packages/host/tests/integration/tools/invite-user-to-room-test.gts
@@ -29,7 +29,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | invite-user-to-room', function (hooks) {
+module('Integration | tools | invite-user-to-room', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
 
@@ -63,7 +63,7 @@ module('Integration | commands | invite-user-to-room', function (hooks) {
     let toolService = getService('tool-service');
     let matrixService = getService('matrix-service') as MatrixService;
 
-    let command = new InviteUserToRoomTool(toolService.commandContext);
+    let command = new InviteUserToRoomTool(toolService.toolContext);
     await command.execute({
       roomId,
       userId: 'submissionbot',
@@ -89,7 +89,7 @@ module('Integration | commands | invite-user-to-room', function (hooks) {
     });
     let toolService = getService('tool-service');
 
-    let command = new InviteUserToRoomTool(toolService.commandContext);
+    let command = new InviteUserToRoomTool(toolService.toolContext);
     await command.execute({
       roomId,
       userId: 'submissionbot',
diff --git a/packages/host/tests/integration/commands/load-default-skills-test.gts b/packages/host/tests/integration/tools/load-default-skills-test.gts
similarity index 98%
rename from packages/host/tests/integration/commands/load-default-skills-test.gts
rename to packages/host/tests/integration/tools/load-default-skills-test.gts
index 87a2170f84..2318784add 100644
--- a/packages/host/tests/integration/commands/load-default-skills-test.gts
+++ b/packages/host/tests/integration/tools/load-default-skills-test.gts
@@ -29,7 +29,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | load-default-skills', function (hooks) {
+module('Integration | tools | load-default-skills', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
   setupBaseRealm(hooks);
diff --git a/packages/host/tests/integration/commands/migrate-skill-test.gts b/packages/host/tests/integration/tools/migrate-skill-test.gts
similarity index 93%
rename from packages/host/tests/integration/commands/migrate-skill-test.gts
rename to packages/host/tests/integration/tools/migrate-skill-test.gts
index 338509efc2..2227874125 100644
--- a/packages/host/tests/integration/commands/migrate-skill-test.gts
+++ b/packages/host/tests/integration/tools/migrate-skill-test.gts
@@ -62,7 +62,7 @@ function readFrontmatter(content: string): {
 
 const COMMAND_MODULE = `${testRealmURL}test-command.gts`;
 
-module('Integration | commands | migrate-skill', function (hooks) {
+module('Integration | tools | migrate-skill', function (hooks) {
   let loader: Loader;
 
   setupRenderingTest(hooks);
@@ -141,9 +141,9 @@ export class DoThingQuietly extends Command {
   });
 
   test('migrates a Skill card with commands into a SKILL.md', async function (assert) {
-    let commandContext = getService('tool-service').commandContext;
+    let toolContext = getService('tool-service').toolContext;
     let cardService = getService('card-service');
-    let command = new MigrateSkillTool(commandContext);
+    let command = new MigrateSkillTool(toolContext);
 
     let result = await command.execute({ realm: testRealmURL });
 
@@ -185,9 +185,9 @@ export class DoThingQuietly extends Command {
   });
 
   test('omits boxel.tools when the skill has none', async function (assert) {
-    let commandContext = getService('tool-service').commandContext;
+    let toolContext = getService('tool-service').toolContext;
     let cardService = getService('card-service');
-    let command = new MigrateSkillTool(commandContext);
+    let command = new MigrateSkillTool(toolContext);
 
     await command.execute({ realm: testRealmURL });
 
@@ -203,9 +203,9 @@ export class DoThingQuietly extends Command {
   });
 
   test('reports skills with no instructions instead of writing an empty file', async function (assert) {
-    let commandContext = getService('tool-service').commandContext;
+    let toolContext = getService('tool-service').toolContext;
     let cardService = getService('card-service');
-    let command = new MigrateSkillTool(commandContext);
+    let command = new MigrateSkillTool(toolContext);
 
     let result = await command.execute({ realm: testRealmURL });
 
@@ -224,9 +224,9 @@ export class DoThingQuietly extends Command {
   });
 
   test('skips existing targets unless overwrite is set', async function (assert) {
-    let commandContext = getService('tool-service').commandContext;
+    let toolContext = getService('tool-service').toolContext;
     let cardService = getService('card-service');
-    let command = new MigrateSkillTool(commandContext);
+    let command = new MigrateSkillTool(toolContext);
 
     let first = await command.execute({ realm: testRealmURL });
     assert.strictEqual(
diff --git a/packages/host/tests/integration/commands/open-create-listing-modal-test.gts b/packages/host/tests/integration/tools/open-create-listing-modal-test.gts
similarity index 92%
rename from packages/host/tests/integration/commands/open-create-listing-modal-test.gts
rename to packages/host/tests/integration/tools/open-create-listing-modal-test.gts
index fbbd8dcb9d..e4d24bd336 100644
--- a/packages/host/tests/integration/commands/open-create-listing-modal-test.gts
+++ b/packages/host/tests/integration/tools/open-create-listing-modal-test.gts
@@ -17,7 +17,7 @@ import { setupBaseRealm } from '../../helpers/base-realm';
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
-module('Integration | commands | open-create-listing-modal', function (hooks) {
+module('Integration | tools | open-create-listing-modal', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -68,7 +68,7 @@ module('Integration | commands | open-create-listing-modal', function (hooks) {
     let toolService = getService('tool-service');
     let operatorModeStateService = getService('operator-mode-state-service');
 
-    let command = new OpenCreateListingModalTool(toolService.commandContext);
+    let command = new OpenCreateListingModalTool(toolService.toolContext);
 
     await command.execute({
       codeRef: {
@@ -94,7 +94,7 @@ module('Integration | commands | open-create-listing-modal', function (hooks) {
     let toolService = getService('tool-service');
     let operatorModeStateService = getService('operator-mode-state-service');
 
-    let command = new OpenCreateListingModalTool(toolService.commandContext);
+    let command = new OpenCreateListingModalTool(toolService.toolContext);
 
     await command.execute({
       codeRef: {
@@ -126,7 +126,7 @@ module('Integration | commands | open-create-listing-modal', function (hooks) {
     let toolService = getService('tool-service');
     let operatorModeStateService = getService('operator-mode-state-service');
 
-    let command = new OpenCreateListingModalTool(toolService.commandContext);
+    let command = new OpenCreateListingModalTool(toolService.toolContext);
 
     await command.execute({
       codeRef: {
@@ -147,7 +147,7 @@ module('Integration | commands | open-create-listing-modal', function (hooks) {
     let toolService = getService('tool-service');
     let operatorModeStateService = getService('operator-mode-state-service');
 
-    let command = new OpenCreateListingModalTool(toolService.commandContext);
+    let command = new OpenCreateListingModalTool(toolService.toolContext);
 
     await command.execute({
       codeRef: {
diff --git a/packages/host/tests/integration/commands/open-workspace-test.gts b/packages/host/tests/integration/tools/open-workspace-test.gts
similarity index 93%
rename from packages/host/tests/integration/commands/open-workspace-test.gts
rename to packages/host/tests/integration/tools/open-workspace-test.gts
index 03e1c98fd2..ec8755ba70 100644
--- a/packages/host/tests/integration/commands/open-workspace-test.gts
+++ b/packages/host/tests/integration/tools/open-workspace-test.gts
@@ -14,7 +14,7 @@ import { setupBaseRealm } from '../../helpers/base-realm';
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
-module('Integration | commands | open-workspace', function (hooks) {
+module('Integration | tools | open-workspace', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -44,9 +44,7 @@ module('Integration | commands | open-workspace', function (hooks) {
       submode: 'interact',
       workspaceChooserOpened: true,
     });
-    let openWorkspaceCommand = new OpenWorkspaceTool(
-      toolService.commandContext,
-    );
+    let openWorkspaceCommand = new OpenWorkspaceTool(toolService.toolContext);
     assert.strictEqual(operatorModeStateService.state?.submode, 'interact');
     await openWorkspaceCommand.execute({
       realmIdentifier: testRealmURL,
diff --git a/packages/host/tests/integration/commands/patch-code-test.gts b/packages/host/tests/integration/tools/patch-code-test.gts
similarity index 95%
rename from packages/host/tests/integration/commands/patch-code-test.gts
rename to packages/host/tests/integration/tools/patch-code-test.gts
index 9d90c6a40c..bfdd875cd5 100644
--- a/packages/host/tests/integration/commands/patch-code-test.gts
+++ b/packages/host/tests/integration/tools/patch-code-test.gts
@@ -27,7 +27,7 @@ import { setupBaseRealm } from '../../helpers/base-realm';
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
-module('Integration | commands | patch-code', function (hooks) {
+module('Integration | tools | patch-code', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
 
@@ -88,7 +88,7 @@ export class Task extends CardDef {
 
   test('lint-fixes contents before returning them', async function (assert) {
     let toolService = getService('tool-service');
-    let patchCodeCommand = new PatchCodeTool(toolService.commandContext);
+    let patchCodeCommand = new PatchCodeTool(toolService.toolContext);
 
     // Set up a custom lintStub that verifies the filename header
     adapter.lintStub = async (
@@ -156,7 +156,7 @@ export class Task extends CardDef {
     assert.expect(7);
 
     let toolService = getService('tool-service');
-    let patchCodeCommand = new PatchCodeTool(toolService.commandContext);
+    let patchCodeCommand = new PatchCodeTool(toolService.toolContext);
     let operatorModeStateService = getService('operator-mode-state-service');
     let cardService = getService('card-service');
 
@@ -228,7 +228,7 @@ ${REPLACE_MARKER}`;
 
   test('allows empty search and replace blocks via patch-code for new files', async function (assert) {
     let toolService = getService('tool-service');
-    let patchCodeCommand = new PatchCodeTool(toolService.commandContext);
+    let patchCodeCommand = new PatchCodeTool(toolService.toolContext);
     let emptyFileUrl = `${testRealmURL}empty.gts`;
 
     adapter.lintStub = async (request: Request): Promise<LintResult> => {
@@ -255,7 +255,7 @@ ${REPLACE_MARKER}`;
 
   test('skips linting for non-gts/ts files', async function (assert) {
     let toolService = getService('tool-service');
-    let patchCodeCommand = new PatchCodeTool(toolService.commandContext);
+    let patchCodeCommand = new PatchCodeTool(toolService.toolContext);
 
     adapter.lintStub = async () => {
       assert.ok(false, 'lint should not run for json files');
diff --git a/packages/host/tests/integration/commands/patch-fields-test.gts b/packages/host/tests/integration/tools/patch-fields-test.gts
similarity index 93%
rename from packages/host/tests/integration/commands/patch-fields-test.gts
rename to packages/host/tests/integration/tools/patch-fields-test.gts
index 503908ec02..51ccfa6dbd 100644
--- a/packages/host/tests/integration/commands/patch-fields-test.gts
+++ b/packages/host/tests/integration/tools/patch-fields-test.gts
@@ -161,7 +161,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     test<TestContextWithSave>('patches do not await persistence', async function (assert) {
       assert.expect(6);
 
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
       let cardId = `${testRealmURL}Author/john`;
@@ -242,12 +242,9 @@ module('Integration | Command | patch-fields', function (hooks) {
   module('Simple Field Update Tests', function () {
     module('Relationship Update Tests', function () {
       test('should update a linksTo relationship field', async function (assert) {
-        let patchFieldsCommand = new PatchFieldsTool(
-          toolService.commandContext,
-          {
-            cardType: AuthorDef,
-          },
-        );
+        let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
+          cardType: AuthorDef,
+        });
         let bookId = `${testRealmURL}Book/relationship-book`;
         let result = await patchFieldsCommand.execute({
           cardId: `${testRealmURL}Author/john`,
@@ -278,9 +275,7 @@ module('Integration | Command | patch-fields', function (hooks) {
         }
       });
       test('should update a linksToMany relationship field', async function (assert) {
-        let patchFieldsCommand = new PatchFieldsTool(
-          toolService.commandContext,
-        );
+        let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext);
         let bookId1 = `${testRealmURL}Book/book-1`;
         let bookId2 = `${testRealmURL}Book/book-2`;
         let result = await patchFieldsCommand.execute({
@@ -328,9 +323,7 @@ module('Integration | Command | patch-fields', function (hooks) {
         }
       });
       test('should update a nested relationship field (e.g., address.country)', async function (assert) {
-        let patchFieldsCommand = new PatchFieldsTool(
-          toolService.commandContext,
-        );
+        let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext);
         let result = await patchFieldsCommand.execute({
           cardId: `${testRealmURL}Author/john`,
           fieldUpdates: {
@@ -370,7 +363,7 @@ module('Integration | Command | patch-fields', function (hooks) {
       });
     });
     test('should update single primitive field', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -392,7 +385,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should update multiple primitive fields', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -415,7 +408,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should return success with updated field list', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -439,7 +432,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should preserve unchanged fields', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -501,7 +494,7 @@ module('Integration | Command | patch-fields', function (hooks) {
 
   module('Nested Field Update Tests', function () {
     test('should update nested object field using dot notation', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -540,7 +533,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should update multiple nested fields', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -592,7 +585,7 @@ module('Integration | Command | patch-fields', function (hooks) {
 
     test("should create nested objects if they don't exist", async function (assert) {
       // Test using the existing john card but targeting a nested field that would be null
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -641,7 +634,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should handle deep nesting (3+ levels)', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -695,7 +688,7 @@ module('Integration | Command | patch-fields', function (hooks) {
 
   module('Array Field Update Tests', function () {
     test('should update array element by index', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -732,7 +725,7 @@ module('Integration | Command | patch-fields', function (hooks) {
       // We need to add a contacts field to our test data setup
 
       // For now, let's test nested field in the address object
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -772,7 +765,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should replace entire array', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -805,7 +798,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should add new item to array using push syntax', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -838,7 +831,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should add new item to array at specific index', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -871,7 +864,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should handle mixed array and object updates', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -924,7 +917,7 @@ module('Integration | Command | patch-fields', function (hooks) {
 
   module('Validation Tests', function () {
     test('should reject non-existent field paths', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -945,7 +938,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should reject invalid field types', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -969,7 +962,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should validate array bounds for existing arrays', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1001,7 +994,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should validate relationship field constraints', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1034,7 +1027,7 @@ module('Integration | Command | patch-fields', function (hooks) {
 
   module('Partial Success Tests', function () {
     test('should update valid fields when some fields fail', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1088,7 +1081,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should report successful and failed fields separately', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1140,7 +1133,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should return success=true for partial success', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1169,7 +1162,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should return success=false when no fields update', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1206,7 +1199,7 @@ module('Integration | Command | patch-fields', function (hooks) {
 
   module('Error Handling Tests', function () {
     test('should handle card not found error', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1231,7 +1224,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should provide detailed error messages for invalid fields', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1263,7 +1256,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should handle array index out of bounds when updating existing items', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1293,7 +1286,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should allow adding beyond current array bounds (append behavior)', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1332,7 +1325,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should handle null reference in field paths', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1380,7 +1373,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should handle malformed field paths', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1428,7 +1421,7 @@ module('Integration | Command | patch-fields', function (hooks) {
 
   module('Field Path Parsing Tests', function () {
     test('should parse simple field paths', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1456,7 +1449,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should parse dot notation paths', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1490,7 +1483,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should parse array index paths', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1518,7 +1511,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should parse array append operations (e.g., "tags[]" or "tags[-1]")', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1560,7 +1553,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should parse complex mixed paths', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1594,7 +1587,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should handle edge cases in parsing', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1624,7 +1617,7 @@ module('Integration | Command | patch-fields', function (hooks) {
 
   module('Schema Generation Tests', function () {
     test('should generate correct JSON schema for card type', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1666,7 +1659,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should include field descriptions in schema', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1693,7 +1686,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should support nested field schemas', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1714,7 +1707,7 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should handle array field schemas', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
@@ -1738,7 +1731,7 @@ module('Integration | Command | patch-fields', function (hooks) {
   module('Dynamic Field Validation Tests', function () {
     test('should work with different card types (not just hardcoded Author fields)', async function (assert) {
       // Create command instance configured for Book card type
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: BookDef,
       });
 
@@ -1775,7 +1768,7 @@ module('Integration | Command | patch-fields', function (hooks) {
       // but trying to update fields that wouldn't have been in a hardcoded list
 
       // Let's test with a field that exists on Author but might not be in every hardcoded list
-      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+      let patchFieldsCommand = new PatchFieldsTool(toolService.toolContext, {
         cardType: AuthorDef,
       });
 
diff --git a/packages/host/tests/integration/commands/patch-instance-test.gts b/packages/host/tests/integration/tools/patch-instance-test.gts
similarity index 97%
rename from packages/host/tests/integration/commands/patch-instance-test.gts
rename to packages/host/tests/integration/tools/patch-instance-test.gts
index 2ec81bb88b..9bdd986338 100644
--- a/packages/host/tests/integration/commands/patch-instance-test.gts
+++ b/packages/host/tests/integration/tools/patch-instance-test.gts
@@ -39,7 +39,7 @@ import { setupRenderingTest } from '../../helpers/setup';
 
 import type { CardDef as CardDefType } from '@cardstack/base/card-api';
 
-module('Integration | commands | patch-instance', function (hooks) {
+module('Integration | tools | patch-instance', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
 
@@ -90,7 +90,7 @@ module('Integration | commands | patch-instance', function (hooks) {
 
   test<TestContextWithSave>('can patch a contains field', async function (assert) {
     let patchInstanceCommand = new PatchCardInstanceTool(
-      toolService.commandContext,
+      toolService.toolContext,
       {
         cardType: PersonDef,
       },
@@ -148,7 +148,7 @@ module('Integration | commands | patch-instance', function (hooks) {
 
   test<TestContextWithSave>('can patch a containsMany field', async function (assert) {
     let patchInstanceCommand = new PatchCardInstanceTool(
-      toolService.commandContext,
+      toolService.toolContext,
       {
         cardType: PersonDef,
       },
@@ -206,7 +206,7 @@ module('Integration | commands | patch-instance', function (hooks) {
 
   test<TestContextWithSave>('patching a containsMany field with a shorter array fully replaces it (no stale trailing items)', async function (assert) {
     let patchInstanceCommand = new PatchCardInstanceTool(
-      toolService.commandContext,
+      toolService.toolContext,
       {
         cardType: PersonDef,
       },
@@ -254,7 +254,7 @@ module('Integration | commands | patch-instance', function (hooks) {
 
   test<TestContextWithSave>('patching a polymorphic containsMany field clears stale field metadata', async function (assert) {
     let patchInstanceCommand = new PatchCardInstanceTool(
-      toolService.commandContext,
+      toolService.toolContext,
       {
         cardType: PersonDef,
       },
@@ -318,7 +318,7 @@ module('Integration | commands | patch-instance', function (hooks) {
 
   test<TestContextWithSave>('can patch a linksTo field', async function (assert) {
     let patchInstanceCommand = new PatchCardInstanceTool(
-      toolService.commandContext,
+      toolService.toolContext,
       {
         cardType: PersonDef,
       },
@@ -382,7 +382,7 @@ module('Integration | commands | patch-instance', function (hooks) {
 
   test<TestContextWithSave>('can patch a linksToMany field', async function (assert) {
     let patchInstanceCommand = new PatchCardInstanceTool(
-      toolService.commandContext,
+      toolService.toolContext,
       {
         cardType: PersonDef,
       },
@@ -448,7 +448,7 @@ module('Integration | commands | patch-instance', function (hooks) {
     let storeService = getService('store');
     let cardId = `${testRealmURL}Person/hassan`;
     let patchInstanceCommand = new PatchCardInstanceTool(
-      toolService.commandContext,
+      toolService.toolContext,
       {
         cardType: PersonDef,
       },
@@ -536,7 +536,7 @@ module('Integration | commands | patch-instance', function (hooks) {
     await store.add(andrea, { realm: testRealmURL, doNotPersist: true });
 
     let patchInstanceCommand = new PatchCardInstanceTool(
-      toolService.commandContext,
+      toolService.toolContext,
       {
         cardType: PersonDef,
       },
diff --git a/packages/host/tests/integration/tools/persist-module-inspector-view-test.gts b/packages/host/tests/integration/tools/persist-module-inspector-view-test.gts
new file mode 100644
index 0000000000..349e2472ae
--- /dev/null
+++ b/packages/host/tests/integration/tools/persist-module-inspector-view-test.gts
@@ -0,0 +1,86 @@
+import { getOwner } from '@ember/owner';
+import Service from '@ember/service';
+import type { RenderingTestContext } from '@ember/test-helpers';
+
+import { getService } from '@universal-ember/test-support';
+import { module, test } from 'qunit';
+
+import RealmService from '@cardstack/host/services/realm';
+import PersistModuleInspectorViewTool from '@cardstack/host/tools/persist-module-inspector-view';
+
+import {
+  setupIntegrationTestRealm,
+  setupLocalIndexing,
+  testRealmURL,
+  testRealmInfo,
+  setupRealmCacheTeardown,
+  withCachedRealmSetup,
+} from '../../helpers';
+import { setupBaseRealm } from '../../helpers/base-realm';
+import { setupMockMatrix } from '../../helpers/mock-matrix';
+import { setupRenderingTest } from '../../helpers/setup';
+
+let persistedCalls: Array<{ codePath: string; view: string }>;
+
+class StubRealmService extends RealmService {
+  get defaultReadableRealm() {
+    return {
+      path: testRealmURL,
+      info: testRealmInfo,
+    };
+  }
+}
+
+class StubOperatorModeStateService extends Service {
+  persistModuleInspectorView(codePath: string, view: string) {
+    persistedCalls.push({ codePath, view });
+  }
+}
+
+module('Integration | tools | persist-module-inspector-view', function (hooks) {
+  setupRenderingTest(hooks);
+  setupBaseRealm(hooks);
+  setupLocalIndexing(hooks);
+
+  let mockMatrixUtils = setupMockMatrix(hooks, {
+    loggedInAs: '@testuser:localhost',
+    activeRealms: [testRealmURL],
+    autostart: true,
+  });
+
+  hooks.beforeEach(function (this: RenderingTestContext) {
+    persistedCalls = [];
+    getOwner(this)!.register('service:realm', StubRealmService);
+    getOwner(this)!.register(
+      'service:operator-mode-state-service',
+      StubOperatorModeStateService,
+    );
+  });
+
+  setupRealmCacheTeardown(hooks);
+
+  hooks.beforeEach(async function () {
+    await withCachedRealmSetup(async () =>
+      setupIntegrationTestRealm({
+        mockMatrixUtils,
+        contents: {},
+      }),
+    );
+  });
+
+  test('persists the module inspector view selection', async function (assert) {
+    let toolService = getService('tool-service');
+    let command = new PersistModuleInspectorViewTool(toolService.toolContext);
+    let result = await command.execute({
+      codePath: `${testRealmURL}my-module.gts`,
+      moduleInspectorView: 'schema',
+    });
+    assert.strictEqual(result, undefined);
+    assert.strictEqual(persistedCalls.length, 1);
+    assert.strictEqual(
+      persistedCalls[0].codePath,
+      `${testRealmURL}my-module.gts`,
+    );
+    assert.strictEqual(persistedCalls[0].view, 'schema');
+  });
+});
diff --git a/packages/host/tests/integration/commands/preview-format-test.gts b/packages/host/tests/integration/tools/preview-format-test.gts
similarity index 98%
rename from packages/host/tests/integration/commands/preview-format-test.gts
rename to packages/host/tests/integration/tools/preview-format-test.gts
index f970da3583..1ddb7b7a26 100644
--- a/packages/host/tests/integration/commands/preview-format-test.gts
+++ b/packages/host/tests/integration/tools/preview-format-test.gts
@@ -110,7 +110,7 @@ module('Integration | Command | preview-format', function (hooks) {
       }),
     );
 
-    command = new PreviewFormatTool(getService('tool-service').commandContext);
+    command = new PreviewFormatTool(getService('tool-service').toolContext);
   });
 
   test('switches to code submode and sets up preview', async function (assert) {
diff --git a/packages/host/tests/integration/commands/publish-realm-test.gts b/packages/host/tests/integration/tools/publish-realm-test.gts
similarity index 98%
rename from packages/host/tests/integration/commands/publish-realm-test.gts
rename to packages/host/tests/integration/tools/publish-realm-test.gts
index 5ba84c92b1..33baed9a4f 100644
--- a/packages/host/tests/integration/commands/publish-realm-test.gts
+++ b/packages/host/tests/integration/tools/publish-realm-test.gts
@@ -44,7 +44,7 @@ let publishedURLs: string[];
 let loader: Loader;
 let PublishTarget: typeof BaseToolModule.PublishTarget;
 
-module('Integration | commands | publish-realm', function (hooks) {
+module('Integration | tools | publish-realm', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -135,7 +135,7 @@ module('Integration | commands | publish-realm', function (hooks) {
 
   function makeCommand() {
     let toolService = getService('tool-service');
-    return new PublishRealmTool(toolService.commandContext);
+    return new PublishRealmTool(toolService.toolContext);
   }
 
   test('publishes a custom-domain target and reports it published', async function (assert) {
diff --git a/packages/host/tests/integration/commands/read-card-for-ai-assistant-test.gts b/packages/host/tests/integration/tools/read-card-for-ai-assistant-test.gts
similarity index 97%
rename from packages/host/tests/integration/commands/read-card-for-ai-assistant-test.gts
rename to packages/host/tests/integration/tools/read-card-for-ai-assistant-test.gts
index 81d92f410b..82653d82ad 100644
--- a/packages/host/tests/integration/commands/read-card-for-ai-assistant-test.gts
+++ b/packages/host/tests/integration/tools/read-card-for-ai-assistant-test.gts
@@ -30,7 +30,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | read-card-for-ai-assistant', function (hooks) {
+module('Integration | tools | read-card-for-ai-assistant', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
 
@@ -109,7 +109,7 @@ module('Integration | commands | read-card-for-ai-assistant', function (hooks) {
   test('read card', async function (assert) {
     let toolService = getService('tool-service');
 
-    let command = new ReadCardForAiAssistantCommand(toolService.commandContext);
+    let command = new ReadCardForAiAssistantCommand(toolService.toolContext);
     let result = await command.execute({
       cardId: `${testRealmURL}mango`,
     });
diff --git a/packages/host/tests/integration/commands/read-file-for-ai-assistant-test.gts b/packages/host/tests/integration/tools/read-file-for-ai-assistant-test.gts
similarity index 95%
rename from packages/host/tests/integration/commands/read-file-for-ai-assistant-test.gts
rename to packages/host/tests/integration/tools/read-file-for-ai-assistant-test.gts
index 098504b660..8f49da5ffe 100644
--- a/packages/host/tests/integration/commands/read-file-for-ai-assistant-test.gts
+++ b/packages/host/tests/integration/tools/read-file-for-ai-assistant-test.gts
@@ -28,7 +28,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | read-file-for-ai-assistant', function (hooks) {
+module('Integration | tools | read-file-for-ai-assistant', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
 
@@ -57,7 +57,7 @@ module('Integration | commands | read-file-for-ai-assistant', function (hooks) {
   test('read file', async function (assert) {
     let toolService = getService('tool-service');
 
-    let command = new ReadFileForAiAssistantCommand(toolService.commandContext);
+    let command = new ReadFileForAiAssistantCommand(toolService.toolContext);
     let result = await command.execute({
       fileIdentifier: `${testRealmURL}files/test.txt`,
     });
diff --git a/packages/host/tests/integration/commands/read-source-test.gts b/packages/host/tests/integration/tools/read-source-test.gts
similarity index 95%
rename from packages/host/tests/integration/commands/read-source-test.gts
rename to packages/host/tests/integration/tools/read-source-test.gts
index 9d2044a97d..0c16ec564e 100644
--- a/packages/host/tests/integration/commands/read-source-test.gts
+++ b/packages/host/tests/integration/tools/read-source-test.gts
@@ -27,7 +27,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | read-source', function (hooks) {
+module('Integration | tools | read-source', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
 
@@ -50,7 +50,7 @@ module('Integration | commands | read-source', function (hooks) {
       }),
     );
     let toolService = getService('tool-service');
-    readSourceCommand = new ReadSourceTool(toolService.commandContext);
+    readSourceCommand = new ReadSourceTool(toolService.toolContext);
   });
 
   test('reads a GTS file as card source', async function (assert) {
diff --git a/packages/host/tests/integration/commands/read-text-file-test.gts b/packages/host/tests/integration/tools/read-text-file-test.gts
similarity index 97%
rename from packages/host/tests/integration/commands/read-text-file-test.gts
rename to packages/host/tests/integration/tools/read-text-file-test.gts
index a07b1f40c5..c670e2edb1 100644
--- a/packages/host/tests/integration/commands/read-text-file-test.gts
+++ b/packages/host/tests/integration/tools/read-text-file-test.gts
@@ -27,7 +27,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | read-text-file', function (hooks) {
+module('Integration | tools | read-text-file', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
 
@@ -54,7 +54,7 @@ module('Integration | commands | read-text-file', function (hooks) {
       }),
     );
     let toolService = getService('tool-service');
-    readTextFileCommand = new ReadTextFileTool(toolService.commandContext);
+    readTextFileCommand = new ReadTextFileTool(toolService.toolContext);
   });
 
   test('reads an existing text file', async function (assert) {
diff --git a/packages/host/tests/integration/commands/reindex-realm-test.gts b/packages/host/tests/integration/tools/reindex-realm-test.gts
similarity index 95%
rename from packages/host/tests/integration/commands/reindex-realm-test.gts
rename to packages/host/tests/integration/tools/reindex-realm-test.gts
index 202bf210b8..ff0f5a2dea 100644
--- a/packages/host/tests/integration/commands/reindex-realm-test.gts
+++ b/packages/host/tests/integration/tools/reindex-realm-test.gts
@@ -31,7 +31,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | reindex-realm', function (hooks) {
+module('Integration | tools | reindex-realm', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -83,7 +83,7 @@ module('Integration | commands | reindex-realm', function (hooks) {
     let toolService = getService('tool-service');
     let realmServer = getService('realm-server');
     let realmService = getService('realm') as RealmService;
-    let command = new ReindexRealmTool(toolService.commandContext);
+    let command = new ReindexRealmTool(toolService.toolContext);
     let realmURL = new URL('test/', realmServer.url).href;
 
     assert.false(
@@ -154,7 +154,7 @@ module('Integration | commands | reindex-realm', function (hooks) {
     let toolService = getService('tool-service');
     let realmServer = getService('realm-server');
     let realmService = getService('realm') as RealmService;
-    let command = new ReindexRealmTool(toolService.commandContext);
+    let command = new ReindexRealmTool(toolService.toolContext);
     let realmURL = new URL('test/', realmServer.url).href;
     responseStatus = 500;
     responseBody = 'boom';
@@ -176,7 +176,7 @@ module('Integration | commands | reindex-realm', function (hooks) {
     let toolService = getService('tool-service');
     let realmServer = getService('realm-server');
     let realmService = getService('realm') as RealmService;
-    let command = new ReindexRealmTool(toolService.commandContext);
+    let command = new ReindexRealmTool(toolService.toolContext);
     let realmURL = new URL('test/', realmServer.url).href;
 
     await command.execute({
@@ -208,7 +208,7 @@ module('Integration | commands | reindex-realm', function (hooks) {
 
   test('description explains lighter reindex semantics', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new ReindexRealmTool(toolService.commandContext);
+    let command = new ReindexRealmTool(toolService.toolContext);
 
     assert.true(
       command.description.includes('lighter/default mode'),
diff --git a/packages/host/tests/integration/commands/sanitize-module-list-test.gts b/packages/host/tests/integration/tools/sanitize-module-list-test.gts
similarity index 91%
rename from packages/host/tests/integration/commands/sanitize-module-list-test.gts
rename to packages/host/tests/integration/tools/sanitize-module-list-test.gts
index f25c1d6351..39033e2f6d 100644
--- a/packages/host/tests/integration/commands/sanitize-module-list-test.gts
+++ b/packages/host/tests/integration/tools/sanitize-module-list-test.gts
@@ -44,7 +44,7 @@ class StubRealmService extends RealmService {
   };
 }
 
-module('Integration | commands | sanitize-module-list', function (hooks) {
+module('Integration | tools | sanitize-module-list', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -73,7 +73,7 @@ module('Integration | commands | sanitize-module-list', function (hooks) {
 
   test('filters out global URLs and keeps realm modules', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new SanitizeModuleListTool(toolService.commandContext);
+    let command = new SanitizeModuleListTool(toolService.toolContext);
     let result = await command.execute({
       moduleIdentifiers: [
         `${testRealmURL}my-module.gts`,
@@ -89,7 +89,7 @@ module('Integration | commands | sanitize-module-list', function (hooks) {
 
   test('deduplicates modules by normalized URL', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new SanitizeModuleListTool(toolService.commandContext);
+    let command = new SanitizeModuleListTool(toolService.toolContext);
     let result = await command.execute({
       moduleIdentifiers: [
         `${testRealmURL}my-module.gts`,
@@ -106,7 +106,7 @@ module('Integration | commands | sanitize-module-list', function (hooks) {
   test('excludes modules from unreadable realms', async function (assert) {
     readableRealms = new Set([testRealmURL]);
     let toolService = getService('tool-service');
-    let command = new SanitizeModuleListTool(toolService.commandContext);
+    let command = new SanitizeModuleListTool(toolService.toolContext);
     let result = await command.execute({
       moduleIdentifiers: [
         `${testRealmURL}my-module.gts`,
diff --git a/packages/host/tests/integration/commands/schema-generation-test.gts b/packages/host/tests/integration/tools/schema-generation-test.gts
similarity index 97%
rename from packages/host/tests/integration/commands/schema-generation-test.gts
rename to packages/host/tests/integration/tools/schema-generation-test.gts
index 61d41117ba..17174fa374 100644
--- a/packages/host/tests/integration/commands/schema-generation-test.gts
+++ b/packages/host/tests/integration/tools/schema-generation-test.gts
@@ -41,7 +41,7 @@ module(
               ...args: any[]
             ) => HostBaseTool<any, any>;
             let command = new TypedCommandClass(
-              getService('tool-service').commandContext,
+              getService('tool-service').toolContext,
             );
             const inputSchema = await command.getInputJsonSchema(
               cardAPI,
diff --git a/packages/host/tests/integration/commands/search-and-choose-test.gts b/packages/host/tests/integration/tools/search-and-choose-test.gts
similarity index 97%
rename from packages/host/tests/integration/commands/search-and-choose-test.gts
rename to packages/host/tests/integration/tools/search-and-choose-test.gts
index 17a1d8e866..fe20bdcc02 100644
--- a/packages/host/tests/integration/commands/search-and-choose-test.gts
+++ b/packages/host/tests/integration/tools/search-and-choose-test.gts
@@ -30,7 +30,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | search-and-choose', function (hooks) {
+module('Integration | tools | search-and-choose', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -142,9 +142,7 @@ export class ContextCard extends CardDef {
     );
 
     const toolService = getService('tool-service');
-    searchAndChooseCommand = new SearchAndChooseTool(
-      toolService.commandContext,
-    );
+    searchAndChooseCommand = new SearchAndChooseTool(toolService.toolContext);
   });
 
   test('LLM index selection uses sourceContextCodeRef as context', async function (assert) {
diff --git a/packages/host/tests/integration/commands/search-google-images-test.gts b/packages/host/tests/integration/tools/search-google-images-test.gts
similarity index 95%
rename from packages/host/tests/integration/commands/search-google-images-test.gts
rename to packages/host/tests/integration/tools/search-google-images-test.gts
index 99decc4dd1..fe63ebe75c 100644
--- a/packages/host/tests/integration/commands/search-google-images-test.gts
+++ b/packages/host/tests/integration/tools/search-google-images-test.gts
@@ -15,7 +15,7 @@ import { setupBaseRealm } from '../../helpers/base-realm';
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
-module('Integration | commands | search-google-images', function (hooks) {
+module('Integration | tools | search-google-images', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -152,9 +152,7 @@ module('Integration | commands | search-google-images', function (hooks) {
 
   test('successfully searches Google Images and returns results', async function (assert) {
     const toolService = getService('tool-service');
-    const searchCommand = new SearchGoogleImagesTool(
-      toolService.commandContext,
-    );
+    const searchCommand = new SearchGoogleImagesTool(toolService.toolContext);
 
     const input = {
       query: 'test images',
@@ -256,9 +254,7 @@ module('Integration | commands | search-google-images', function (hooks) {
 
   test('uses default maxResults when not provided', async function (assert) {
     const toolService = getService('tool-service');
-    const searchCommand = new SearchGoogleImagesTool(
-      toolService.commandContext,
-    );
+    const searchCommand = new SearchGoogleImagesTool(toolService.toolContext);
 
     const input = {
       query: 'test images',
@@ -273,9 +269,7 @@ module('Integration | commands | search-google-images', function (hooks) {
 
   test('limits maxResults to 10', async function (assert) {
     const toolService = getService('tool-service');
-    const searchCommand = new SearchGoogleImagesTool(
-      toolService.commandContext,
-    );
+    const searchCommand = new SearchGoogleImagesTool(toolService.toolContext);
 
     const input = {
       query: 'test images',
@@ -295,9 +289,7 @@ module('Integration | commands | search-google-images', function (hooks) {
 
   test('supports pagination with startIndex parameter', async function (assert) {
     const toolService = getService('tool-service');
-    const searchCommand = new SearchGoogleImagesTool(
-      toolService.commandContext,
-    );
+    const searchCommand = new SearchGoogleImagesTool(toolService.toolContext);
 
     const input = {
       query: 'test images',
diff --git a/packages/host/tests/integration/commands/search-command-test.gts b/packages/host/tests/integration/tools/search-tool-test.gts
similarity index 96%
rename from packages/host/tests/integration/commands/search-command-test.gts
rename to packages/host/tests/integration/tools/search-tool-test.gts
index 33e249a95d..73d6d225f3 100644
--- a/packages/host/tests/integration/commands/search-command-test.gts
+++ b/packages/host/tests/integration/tools/search-tool-test.gts
@@ -22,7 +22,7 @@ import {
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
-module('Integration | commands | search', function (hooks) {
+module('Integration | tools | search', function (hooks) {
   setupRenderingTest(hooks);
 
   const realmName = 'Operator Mode Workspace';
@@ -52,14 +52,14 @@ module('Integration | commands | search', function (hooks) {
   }) {
     let toolService = getService('tool-service');
     let searchCommand = new SearchCardsByTypeAndTitleTool(
-      toolService.commandContext,
+      toolService.toolContext,
     );
     return searchCommand.execute(input);
   }
 
   function runQuerySearch(query: Query) {
     let toolService = getService('tool-service');
-    let searchCommand = new SearchCardsByQueryTool(toolService.commandContext);
+    let searchCommand = new SearchCardsByQueryTool(toolService.toolContext);
     return searchCommand.execute({ query });
   }
 
diff --git a/packages/host/tests/integration/commands/send-ai-assistant-message-test.gts b/packages/host/tests/integration/tools/send-ai-assistant-message-test.gts
similarity index 94%
rename from packages/host/tests/integration/commands/send-ai-assistant-message-test.gts
rename to packages/host/tests/integration/tools/send-ai-assistant-message-test.gts
index d47fbbf7c9..90ccbea048 100644
--- a/packages/host/tests/integration/commands/send-ai-assistant-message-test.gts
+++ b/packages/host/tests/integration/tools/send-ai-assistant-message-test.gts
@@ -30,7 +30,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | send-ai-assistant-message', function (hooks) {
+module('Integration | tools | send-ai-assistant-message', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
 
@@ -64,7 +64,7 @@ module('Integration | commands | send-ai-assistant-message', function (hooks) {
     let toolService = getService('tool-service');
 
     let sendAiAssistantMessageCommand = new SendAiAssistantMessageTool(
-      toolService.commandContext,
+      toolService.toolContext,
     );
     await sendAiAssistantMessageCommand.execute({
       roomId,
diff --git a/packages/host/tests/integration/commands/send-bot-trigger-event-test.gts b/packages/host/tests/integration/tools/send-bot-trigger-event-test.gts
similarity index 93%
rename from packages/host/tests/integration/commands/send-bot-trigger-event-test.gts
rename to packages/host/tests/integration/tools/send-bot-trigger-event-test.gts
index e412201837..f306e295d6 100644
--- a/packages/host/tests/integration/commands/send-bot-trigger-event-test.gts
+++ b/packages/host/tests/integration/tools/send-bot-trigger-event-test.gts
@@ -29,7 +29,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | send-bot-trigger-event', function (hooks) {
+module('Integration | tools | send-bot-trigger-event', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
 
@@ -62,7 +62,7 @@ module('Integration | commands | send-bot-trigger-event', function (hooks) {
     });
     let toolService = getService('tool-service');
 
-    let command = new SendBotTriggerEventTool(toolService.commandContext);
+    let command = new SendBotTriggerEventTool(toolService.toolContext);
     await command.execute({
       roomId,
       type: 'pr-listing-create',
diff --git a/packages/host/tests/integration/commands/send-request-via-proxy-test.gts b/packages/host/tests/integration/tools/send-request-via-proxy-test.gts
similarity index 96%
rename from packages/host/tests/integration/commands/send-request-via-proxy-test.gts
rename to packages/host/tests/integration/tools/send-request-via-proxy-test.gts
index 71b3b8723f..e5646434f7 100644
--- a/packages/host/tests/integration/commands/send-request-via-proxy-test.gts
+++ b/packages/host/tests/integration/tools/send-request-via-proxy-test.gts
@@ -29,7 +29,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | send-request-via-proxy', function (hooks) {
+module('Integration | tools | send-request-via-proxy', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -188,7 +188,7 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
   test('successfully sends request and returns JSON response', async function (assert) {
     const toolService = getService('tool-service');
     const requestForwardCommand = new SendRequestViaProxyTool(
-      toolService.commandContext,
+      toolService.toolContext,
     );
 
     const input = createMockSendRequestViaProxyInput();
@@ -209,7 +209,7 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
   test('successfully sends request and returns text response', async function (assert) {
     const toolService = getService('tool-service');
     const requestForwardCommand = new SendRequestViaProxyTool(
-      toolService.commandContext,
+      toolService.toolContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -230,7 +230,7 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
 
     const toolService = getService('tool-service');
     const requestForwardCommand = new SendRequestViaProxyTool(
-      toolService.commandContext,
+      toolService.toolContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -263,7 +263,7 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
 
     const toolService = getService('tool-service');
     const requestForwardCommand = new SendRequestViaProxyTool(
-      toolService.commandContext,
+      toolService.toolContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -287,7 +287,7 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
   test('handles 4xx error responses from external API', async function (assert) {
     const toolService = getService('tool-service');
     const requestForwardCommand = new SendRequestViaProxyTool(
-      toolService.commandContext,
+      toolService.toolContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -311,7 +311,7 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
   test('handles 5xx error responses from external API', async function (assert) {
     const toolService = getService('tool-service');
     const requestForwardCommand = new SendRequestViaProxyTool(
-      toolService.commandContext,
+      toolService.toolContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -335,7 +335,7 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
   test('handles realm server errors gracefully', async function (assert) {
     const toolService = getService('tool-service');
     const requestForwardCommand = new SendRequestViaProxyTool(
-      toolService.commandContext,
+      toolService.toolContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -355,7 +355,7 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
   test('handles network errors gracefully', async function (assert) {
     const toolService = getService('tool-service');
     const requestForwardCommand = new SendRequestViaProxyTool(
-      toolService.commandContext,
+      toolService.toolContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -378,7 +378,7 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
     for (const method of methods) {
       const toolService = getService('tool-service');
       const requestForwardCommand = new SendRequestViaProxyTool(
-        toolService.commandContext,
+        toolService.toolContext,
       );
 
       const input = createMockSendRequestViaProxyInput({ method });
@@ -404,7 +404,7 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
     for (const testCase of testCases) {
       const toolService = getService('tool-service');
       const requestForwardCommand = new SendRequestViaProxyTool(
-        toolService.commandContext,
+        toolService.toolContext,
       );
 
       const input = createMockSendRequestViaProxyInput({
@@ -428,7 +428,7 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
   test('handles large response data', async function (assert) {
     const toolService = getService('tool-service');
     const requestForwardCommand = new SendRequestViaProxyTool(
-      toolService.commandContext,
+      toolService.toolContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -456,7 +456,7 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
 
     const toolService = getService('tool-service');
     const requestForwardCommand = new SendRequestViaProxyTool(
-      toolService.commandContext,
+      toolService.toolContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -473,7 +473,7 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
   test('handles empty request body', async function (assert) {
     const toolService = getService('tool-service');
     const requestForwardCommand = new SendRequestViaProxyTool(
-      toolService.commandContext,
+      toolService.toolContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -490,7 +490,7 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
   test('handles null/undefined headers', async function (assert) {
     const toolService = getService('tool-service');
     const requestForwardCommand = new SendRequestViaProxyTool(
-      toolService.commandContext,
+      toolService.toolContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
diff --git a/packages/host/tests/integration/commands/set-user-system-card-test.gts b/packages/host/tests/integration/tools/set-user-system-card-test.gts
similarity index 91%
rename from packages/host/tests/integration/commands/set-user-system-card-test.gts
rename to packages/host/tests/integration/tools/set-user-system-card-test.gts
index 12059a456c..c555512376 100644
--- a/packages/host/tests/integration/commands/set-user-system-card-test.gts
+++ b/packages/host/tests/integration/tools/set-user-system-card-test.gts
@@ -28,7 +28,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | set-user-system-card', function (hooks) {
+module('Integration | tools | set-user-system-card', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
 
@@ -54,7 +54,7 @@ module('Integration | commands | set-user-system-card', function (hooks) {
 
   test('sets the system card account data', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new SetUserSystemCardTool(toolService.commandContext);
+    let command = new SetUserSystemCardTool(toolService.toolContext);
 
     let systemCardId = `${testRealmURL}SystemCard/default`;
 
@@ -69,7 +69,7 @@ module('Integration | commands | set-user-system-card', function (hooks) {
 
   test('clears system card account data when cardId is empty', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new SetUserSystemCardTool(toolService.commandContext);
+    let command = new SetUserSystemCardTool(toolService.toolContext);
 
     // First set a system card
     let systemCardId = `${testRealmURL}SystemCard/default`;
@@ -95,7 +95,7 @@ module('Integration | commands | set-user-system-card', function (hooks) {
 
   test('clears system card account data when cardId is omitted', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new SetUserSystemCardTool(toolService.commandContext);
+    let command = new SetUserSystemCardTool(toolService.toolContext);
 
     // First set a system card
     let systemCardId = `${testRealmURL}SystemCard/default`;
diff --git a/packages/host/tests/integration/commands/show-card-test.gts b/packages/host/tests/integration/tools/show-card-test.gts
similarity index 99%
rename from packages/host/tests/integration/commands/show-card-test.gts
rename to packages/host/tests/integration/tools/show-card-test.gts
index b50a310f78..7c15594695 100644
--- a/packages/host/tests/integration/commands/show-card-test.gts
+++ b/packages/host/tests/integration/tools/show-card-test.gts
@@ -251,7 +251,7 @@ module('Integration | Command | show-card', function (hooks) {
       { instantiate: false },
     );
 
-    command = new ShowCardTool(getService('tool-service').commandContext);
+    command = new ShowCardTool(getService('tool-service').toolContext);
   });
 
   hooks.afterEach(function () {
diff --git a/packages/host/tests/integration/commands/store-add-test.gts b/packages/host/tests/integration/tools/store-add-test.gts
similarity index 93%
rename from packages/host/tests/integration/commands/store-add-test.gts
rename to packages/host/tests/integration/tools/store-add-test.gts
index af576a0198..1453c18797 100644
--- a/packages/host/tests/integration/commands/store-add-test.gts
+++ b/packages/host/tests/integration/tools/store-add-test.gts
@@ -28,7 +28,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | store-add', function (hooks) {
+module('Integration | tools | store-add', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -56,7 +56,7 @@ module('Integration | commands | store-add', function (hooks) {
 
   test('adds a card document to the store and returns a CardDef', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new StoreAddTool(toolService.commandContext);
+    let command = new StoreAddTool(toolService.toolContext);
     let result = await command.execute({
       document: {
         data: {
diff --git a/packages/host/tests/integration/commands/summarize-session-test.gts b/packages/host/tests/integration/tools/summarize-session-test.gts
similarity index 94%
rename from packages/host/tests/integration/commands/summarize-session-test.gts
rename to packages/host/tests/integration/tools/summarize-session-test.gts
index 195be44430..0f54ed0a1d 100644
--- a/packages/host/tests/integration/commands/summarize-session-test.gts
+++ b/packages/host/tests/integration/tools/summarize-session-test.gts
@@ -29,7 +29,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | summarize-session', function (hooks) {
+module('Integration | tools | summarize-session', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -171,9 +171,7 @@ module('Integration | commands | summarize-session', function (hooks) {
 
   test('successfully summarizes a conversation with project help content', async function (assert) {
     const toolService = getService('tool-service');
-    const summarizeCommand = new SummarizeSessionTool(
-      toolService.commandContext,
-    );
+    const summarizeCommand = new SummarizeSessionTool(toolService.toolContext);
 
     // Create a room with project-related conversation
     const roomId = await createRoomWithHistory('Project Help Room', [
@@ -203,9 +201,7 @@ module('Integration | commands | summarize-session', function (hooks) {
 
   test('successfully summarizes a conversation with cards and files', async function (assert) {
     const toolService = getService('tool-service');
-    const summarizeCommand = new SummarizeSessionTool(
-      toolService.commandContext,
-    );
+    const summarizeCommand = new SummarizeSessionTool(toolService.toolContext);
 
     // Create a room with card and file discussion
     const roomId = await createRoomWithHistory('Card Discussion Room', [
@@ -235,9 +231,7 @@ module('Integration | commands | summarize-session', function (hooks) {
 
   test('handles empty room gracefully', async function (assert) {
     const toolService = getService('tool-service');
-    const summarizeCommand = new SummarizeSessionTool(
-      toolService.commandContext,
-    );
+    const summarizeCommand = new SummarizeSessionTool(toolService.toolContext);
 
     // Create an empty room
     const roomId = createAndJoinRoom({
@@ -255,9 +249,7 @@ module('Integration | commands | summarize-session', function (hooks) {
 
   test('handles API errors gracefully', async function (assert) {
     const toolService = getService('tool-service');
-    const summarizeCommand = new SummarizeSessionTool(
-      toolService.commandContext,
-    );
+    const summarizeCommand = new SummarizeSessionTool(toolService.toolContext);
 
     // Create a room with error-triggering content
     const roomId = await createRoomWithHistory('Error Room', [
@@ -283,9 +275,7 @@ module('Integration | commands | summarize-session', function (hooks) {
 
   test('handles room not found gracefully', async function (assert) {
     const toolService = getService('tool-service');
-    const summarizeCommand = new SummarizeSessionTool(
-      toolService.commandContext,
-    );
+    const summarizeCommand = new SummarizeSessionTool(toolService.toolContext);
 
     const input = createMockSummarizeSessionInput('non-existent-room-id');
 
@@ -306,9 +296,7 @@ module('Integration | commands | summarize-session', function (hooks) {
 
   test('includes conversation context in summary request', async function (assert) {
     const toolService = getService('tool-service');
-    const summarizeCommand = new SummarizeSessionTool(
-      toolService.commandContext,
-    );
+    const summarizeCommand = new SummarizeSessionTool(toolService.toolContext);
 
     // Create a room with specific conversation
     const roomId = await createRoomWithHistory('Context Room', [
diff --git a/packages/host/tests/integration/commands/switch-submode-test.gts b/packages/host/tests/integration/tools/switch-submode-test.gts
similarity index 92%
rename from packages/host/tests/integration/commands/switch-submode-test.gts
rename to packages/host/tests/integration/tools/switch-submode-test.gts
index f7977636fe..ab46f1edb8 100644
--- a/packages/host/tests/integration/commands/switch-submode-test.gts
+++ b/packages/host/tests/integration/tools/switch-submode-test.gts
@@ -35,7 +35,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | switch-submode', function (hooks) {
+module('Integration | tools | switch-submode', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -70,9 +70,7 @@ module('Integration | commands | switch-submode', function (hooks) {
       stacks: [[{ id: instance[localId], format: 'isolated' }]],
       submode: 'interact',
     });
-    let switchSubmodeCommand = new SwitchSubmodeTool(
-      toolService.commandContext,
-    );
+    let switchSubmodeCommand = new SwitchSubmodeTool(toolService.toolContext);
     assert.strictEqual(operatorModeStateService.state?.submode, 'interact');
     await switchSubmodeCommand.execute({
       submode: 'code',
@@ -92,9 +90,7 @@ module('Integration | commands | switch-submode', function (hooks) {
       stacks: [[{ id: instance.id!, format: 'isolated' }]],
       submode: 'interact',
     });
-    let switchSubmodeCommand = new SwitchSubmodeTool(
-      toolService.commandContext,
-    );
+    let switchSubmodeCommand = new SwitchSubmodeTool(toolService.toolContext);
     assert.strictEqual(operatorModeStateService.state?.submode, 'interact');
     await switchSubmodeCommand.execute({
       submode: 'code',
@@ -115,9 +111,7 @@ module('Integration | commands | switch-submode', function (hooks) {
       submode: 'interact',
       workspaceChooserOpened: true,
     });
-    let switchSubmodeCommand = new SwitchSubmodeTool(
-      toolService.commandContext,
-    );
+    let switchSubmodeCommand = new SwitchSubmodeTool(toolService.toolContext);
     assert.strictEqual(operatorModeStateService.state?.submode, 'interact');
     assert.true(operatorModeStateService.workspaceChooserOpened);
     await switchSubmodeCommand.execute({
@@ -140,9 +134,7 @@ module('Integration | commands | switch-submode', function (hooks) {
       stacks: [[]],
       submode: 'interact',
     });
-    let switchSubmodeCommand = new SwitchSubmodeTool(
-      toolService.commandContext,
-    );
+    let switchSubmodeCommand = new SwitchSubmodeTool(toolService.toolContext);
     let fileUrl = `${testRealmURL}new-file.gts`;
 
     let result = await switchSubmodeCommand.execute({
@@ -170,9 +162,7 @@ module('Integration | commands | switch-submode', function (hooks) {
       stacks: [[]],
       submode: 'interact',
     });
-    let switchSubmodeCommand = new SwitchSubmodeTool(
-      toolService.commandContext,
-    );
+    let switchSubmodeCommand = new SwitchSubmodeTool(toolService.toolContext);
     let fileUrl = `${testRealmURL}existing-file.gts`;
     let newFileIdentifier = `${testRealmURL}existing-file-1.gts`;
 
@@ -212,9 +202,7 @@ module('Integration | commands | switch-submode', function (hooks) {
       stacks: [[]],
       submode: 'interact',
     });
-    let switchSubmodeCommand = new SwitchSubmodeTool(
-      toolService.commandContext,
-    );
+    let switchSubmodeCommand = new SwitchSubmodeTool(toolService.toolContext);
     let fileUrl = `${testRealmURL}empty-file.gts`;
 
     await cardService.saveSource(new URL(fileUrl), '', 'create-file');
diff --git a/packages/host/tests/integration/commands/sync-openrouter-models-test.gts b/packages/host/tests/integration/tools/sync-openrouter-models-test.gts
similarity index 97%
rename from packages/host/tests/integration/commands/sync-openrouter-models-test.gts
rename to packages/host/tests/integration/tools/sync-openrouter-models-test.gts
index cb30f4790c..1f6e8d728e 100644
--- a/packages/host/tests/integration/commands/sync-openrouter-models-test.gts
+++ b/packages/host/tests/integration/tools/sync-openrouter-models-test.gts
@@ -42,7 +42,7 @@ class CapturingCardService extends CardService {
   }
 }
 
-module('Integration | commands | sync-openrouter-models', function (hooks) {
+module('Integration | tools | sync-openrouter-models', function (hooks) {
   setupRenderingTest(hooks);
 
   let loader: Loader;
@@ -130,7 +130,7 @@ module('Integration | commands | sync-openrouter-models', function (hooks) {
 
   function runSync() {
     let toolService = getService('tool-service');
-    let command = new SyncOpenRouterModelsTool(toolService.commandContext);
+    let command = new SyncOpenRouterModelsTool(toolService.toolContext);
     return command.execute({ realmIdentifier: testRealmURL });
   }
 
diff --git a/packages/host/tests/integration/commands/commands-calling-test.gts b/packages/host/tests/integration/tools/tools-calling-test.gts
similarity index 91%
rename from packages/host/tests/integration/commands/commands-calling-test.gts
rename to packages/host/tests/integration/tools/tools-calling-test.gts
index 68c2af4899..73e9595c79 100644
--- a/packages/host/tests/integration/commands/commands-calling-test.gts
+++ b/packages/host/tests/integration/tools/tools-calling-test.gts
@@ -28,16 +28,16 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | commands-calling', function (hooks) {
+module('Integration | tools | commands-calling', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
-  let commandContext: CommandContext;
+  let toolContext: CommandContext;
 
   hooks.beforeEach(function (this: RenderingTestContext) {
     getOwner(this)!.register('service:realm', StubRealmService);
 
     let toolService = getService('tool-service');
-    commandContext = toolService.commandContext;
+    toolContext = toolService.toolContext;
   });
 
   test('can be called with a card as input', async function (assert) {
@@ -65,7 +65,7 @@ module('Integration | commands | commands-calling', function (hooks) {
         });
       }
     }
-    let exampleCommand = new ExampleCommand(commandContext);
+    let exampleCommand = new ExampleCommand(toolContext);
 
     const InputType = await exampleCommand.getInputType();
     let input = new InputType({
@@ -101,7 +101,7 @@ module('Integration | commands | commands-calling', function (hooks) {
         });
       }
     }
-    let exampleCommand = new ExampleCommand(commandContext);
+    let exampleCommand = new ExampleCommand(toolContext);
     let output = await exampleCommand.execute({
       inputField1: 'World',
       inputField2: '!',
@@ -134,7 +134,7 @@ module('Integration | commands | commands-calling', function (hooks) {
         });
       }
     }
-    let exampleCommand = new ExampleCommand(commandContext);
+    let exampleCommand = new ExampleCommand(toolContext);
 
     let output = await exampleCommand.execute({
       inputField1: 'World',
@@ -167,7 +167,7 @@ module('Integration | commands | commands-calling', function (hooks) {
         });
       }
     }
-    let exampleCommand = new ExampleCommand(commandContext);
+    let exampleCommand = new ExampleCommand(toolContext);
 
     let output = await exampleCommand.execute({
       inputField1: 'World',
@@ -195,7 +195,7 @@ module('Integration | commands | commands-calling', function (hooks) {
         });
       }
     }
-    let exampleCommand = new ExampleCommand(commandContext);
+    let exampleCommand = new ExampleCommand(toolContext);
 
     let output = await exampleCommand.execute();
     assert.strictEqual(output.outputField, 'Hello');
diff --git a/packages/host/tests/integration/commands/transform-cards-test.gts b/packages/host/tests/integration/tools/transform-cards-test.gts
similarity index 95%
rename from packages/host/tests/integration/commands/transform-cards-test.gts
rename to packages/host/tests/integration/tools/transform-cards-test.gts
index d3fbe8db62..9f89a7d5e0 100644
--- a/packages/host/tests/integration/commands/transform-cards-test.gts
+++ b/packages/host/tests/integration/tools/transform-cards-test.gts
@@ -35,7 +35,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | transform-cards', function (hooks) {
+module('Integration | tools | transform-cards', function (hooks) {
   setupRenderingTest(hooks);
 
   const realmName = 'Transform Cards Test Realm';
@@ -242,7 +242,7 @@ module('Integration | commands | transform-cards', function (hooks) {
 
   test('transforms all cards matching a query', async function (assert) {
     let toolService = getService('tool-service');
-    let transformCommand = new TransformCardsTool(toolService.commandContext);
+    let transformCommand = new TransformCardsTool(toolService.toolContext);
 
     await transformCommand.execute({
       query: {
@@ -264,7 +264,7 @@ module('Integration | commands | transform-cards', function (hooks) {
       // @ts-expect-error tsconfig paths not resolved for dynamic import()
       '@cardstack/host/tools/search-cards'
     )) as { SearchCardsByQueryTool: typeof SearchCardsByQueryCommandType };
-    let searchCommand = new SearchCardsByQueryTool(toolService.commandContext);
+    let searchCommand = new SearchCardsByQueryTool(toolService.toolContext);
     let { cardIds } = await searchCommand.execute({
       query: {
         filter: {
@@ -292,7 +292,7 @@ module('Integration | commands | transform-cards', function (hooks) {
 
   test('transforms specific cards using title filter', async function (assert) {
     let toolService = getService('tool-service');
-    let transformCommand = new TransformCardsTool(toolService.commandContext);
+    let transformCommand = new TransformCardsTool(toolService.toolContext);
 
     await transformCommand.execute({
       query: {
@@ -331,7 +331,7 @@ module('Integration | commands | transform-cards', function (hooks) {
 
   test('transforms Pet cards with different command', async function (assert) {
     let toolService = getService('tool-service');
-    let transformCommand = new TransformCardsTool(toolService.commandContext);
+    let transformCommand = new TransformCardsTool(toolService.toolContext);
 
     await transformCommand.execute({
       query: {
@@ -374,7 +374,7 @@ module('Integration | commands | transform-cards', function (hooks) {
 
   test('handles empty search results gracefully', async function (assert) {
     let toolService = getService('tool-service');
-    let transformCommand = new TransformCardsTool(toolService.commandContext);
+    let transformCommand = new TransformCardsTool(toolService.toolContext);
 
     // Search for non-existent cards
     await transformCommand.execute({
@@ -395,7 +395,7 @@ module('Integration | commands | transform-cards', function (hooks) {
 
   test('preserves JSON structure while transforming', async function (assert) {
     let toolService = getService('tool-service');
-    let transformCommand = new TransformCardsTool(toolService.commandContext);
+    let transformCommand = new TransformCardsTool(toolService.toolContext);
 
     // Get original structure first
     let networkService = getService('network');
@@ -444,7 +444,7 @@ module('Integration | commands | transform-cards', function (hooks) {
   // Skipped because we don't have the ability to capture command errors in the current test setup
   skip('handles malformed command references gracefully', async function (assert) {
     let toolService = getService('tool-service');
-    let transformCommand = new TransformCardsTool(toolService.commandContext);
+    let transformCommand = new TransformCardsTool(toolService.toolContext);
 
     try {
       await transformCommand.execute({
diff --git a/packages/host/tests/integration/commands/unpublish-realm-test.gts b/packages/host/tests/integration/tools/unpublish-realm-test.gts
similarity index 97%
rename from packages/host/tests/integration/commands/unpublish-realm-test.gts
rename to packages/host/tests/integration/tools/unpublish-realm-test.gts
index 829476dcd3..01261d4d03 100644
--- a/packages/host/tests/integration/commands/unpublish-realm-test.gts
+++ b/packages/host/tests/integration/tools/unpublish-realm-test.gts
@@ -38,7 +38,7 @@ let unpublishedURLs: string[];
 let loader: Loader;
 let PublishTarget: typeof BaseToolModule.PublishTarget;
 
-module('Integration | commands | unpublish-realm', function (hooks) {
+module('Integration | tools | unpublish-realm', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -93,7 +93,7 @@ module('Integration | commands | unpublish-realm', function (hooks) {
 
   function makeCommand() {
     let toolService = getService('tool-service');
-    return new UnpublishRealmTool(toolService.commandContext);
+    return new UnpublishRealmTool(toolService.toolContext);
   }
 
   test('unpublishes an explicit published-realm URL', async function (assert) {
diff --git a/packages/host/tests/integration/commands/update-room-skills-test.gts b/packages/host/tests/integration/tools/update-room-skills-test.gts
similarity index 96%
rename from packages/host/tests/integration/commands/update-room-skills-test.gts
rename to packages/host/tests/integration/tools/update-room-skills-test.gts
index 3e2baeef5c..e603139666 100644
--- a/packages/host/tests/integration/commands/update-room-skills-test.gts
+++ b/packages/host/tests/integration/tools/update-room-skills-test.gts
@@ -69,7 +69,7 @@ module('Integration | Command | update-room-skills', function (hooks) {
   module('command metadata', function () {
     test('has correct description and action verb', function (assert) {
       let command = new UpdateRoomSkillsTool(
-        getService('tool-service').commandContext,
+        getService('tool-service').toolContext,
       );
       assert.strictEqual(
         command.description,
@@ -85,7 +85,7 @@ module('Integration | Command | update-room-skills', function (hooks) {
 
     test('getInputType returns UpdateRoomSkillsInput', async function (assert) {
       let command = new UpdateRoomSkillsTool(
-        getService('tool-service').commandContext,
+        getService('tool-service').toolContext,
       );
       const inputType = await command.getInputType();
       assert.ok(inputType, 'Input type is defined');
@@ -93,7 +93,7 @@ module('Integration | Command | update-room-skills', function (hooks) {
 
     test('getInputJsonSchema', async function (assert) {
       let command = new UpdateRoomSkillsTool(
-        getService('tool-service').commandContext,
+        getService('tool-service').toolContext,
       );
       let loader = getService('loader-service').loader;
       let mappings = await basicMappings(loader);
@@ -204,7 +204,7 @@ Instructions live in the markdown body.
     });
     test('activates new skills and uploads command definitions', async function (assert) {
       let command = new UpdateRoomSkillsTool(
-        getService('tool-service').commandContext,
+        getService('tool-service').toolContext,
       );
       let skillCardId = `${testRealmURL}Skill/boxel-environment`;
       await command.execute({
@@ -247,7 +247,7 @@ Instructions live in the markdown body.
 
     test('deactivates existing skills without reuploading cards', async function (assert) {
       let command = new UpdateRoomSkillsTool(
-        getService('tool-service').commandContext,
+        getService('tool-service').toolContext,
       );
       let skillCardId = `${testRealmURL}Skill/boxel-environment`;
       mockMatrixUtils.setRoomState(
@@ -297,7 +297,7 @@ Instructions live in the markdown body.
 
     test('reactivates skills already present in room', async function (assert) {
       let command = new UpdateRoomSkillsTool(
-        getService('tool-service').commandContext,
+        getService('tool-service').toolContext,
       );
       let skillCardId = `${testRealmURL}Skill/boxel-environment`;
       await command.execute({
@@ -349,7 +349,7 @@ Instructions live in the markdown body.
 
     test('skips invalid command definitions when uploading skills', async function (assert) {
       let command = new UpdateRoomSkillsTool(
-        getService('tool-service').commandContext,
+        getService('tool-service').toolContext,
       );
 
       await command.execute({
@@ -376,7 +376,7 @@ Instructions live in the markdown body.
 
     test('activates a skill markdown file and uploads its command definitions', async function (assert) {
       let command = new UpdateRoomSkillsTool(
-        getService('tool-service').commandContext,
+        getService('tool-service').toolContext,
       );
       let skillId = `${testRealmURL}skills/markdown-skill/SKILL.md`;
       await command.execute({
@@ -412,7 +412,7 @@ Instructions live in the markdown body.
 
     test('gathers commands from both a skill card and a skill markdown file', async function (assert) {
       let command = new UpdateRoomSkillsTool(
-        getService('tool-service').commandContext,
+        getService('tool-service').toolContext,
       );
       let cardSkillId = `${testRealmURL}Skill/boxel-environment`;
       let markdownSkillId = `${testRealmURL}skills/markdown-skill/SKILL.md`;
diff --git a/packages/host/tests/integration/commands/use-ai-assistant-test.gts b/packages/host/tests/integration/tools/use-ai-assistant-test.gts
similarity index 97%
rename from packages/host/tests/integration/commands/use-ai-assistant-test.gts
rename to packages/host/tests/integration/tools/use-ai-assistant-test.gts
index 095774712a..27484fc729 100644
--- a/packages/host/tests/integration/commands/use-ai-assistant-test.gts
+++ b/packages/host/tests/integration/tools/use-ai-assistant-test.gts
@@ -43,7 +43,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | ai-assistant', function (hooks) {
+module('Integration | tools | ai-assistant', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
 
@@ -136,7 +136,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
   test('creates a new room when no roomId is provided', async function (assert) {
     let initialRoomCount = Object.keys(getRoomIds()).length;
 
-    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.toolContext);
     let result = await aiAssistantCommand.execute({
       prompt: 'Hello, new room!',
       roomName: 'My Test Room',
@@ -177,7 +177,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
       (event) => event.type === 'm.room.message',
     ).length;
 
-    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.toolContext);
     await aiAssistantCommand.execute({
       prompt: 'Hello, existing room!',
       roomId,
@@ -212,7 +212,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
     const card1 = (await store.get(`${testRealmURL}empty1.json`)) as CardDef;
     const card2 = (await store.get(`${testRealmURL}empty2.json`)) as CardDef;
 
-    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.toolContext);
     await aiAssistantCommand.execute({
       prompt: 'Hello with attached cards!',
       roomId,
@@ -238,7 +238,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
   test('handles "new" as roomId to create new room', async function (assert) {
     let initialRoomCount = Object.keys(getRoomIds()).length;
 
-    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.toolContext);
     let result = await aiAssistantCommand.execute({
       prompt: 'Hello, new room with "new"!',
       roomId: 'new',
@@ -276,7 +276,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
       (event) => event.type === 'm.room.message',
     ).length;
 
-    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.toolContext);
 
     let clientGeneratedId = 'unique-client-id-123';
     await aiAssistantCommand.execute({
@@ -317,7 +317,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
       name: 'room-with-llm-model',
     });
 
-    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.toolContext);
     await aiAssistantCommand.execute({
       prompt: 'Hello with custom LLM!',
       roomId,
@@ -346,7 +346,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
     const skillCard1 = (await store.get(`${testRealmURL}skill1.json`)) as Skill;
     const skillCard2 = (await store.get(`${testRealmURL}skill2.json`)) as Skill;
 
-    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.toolContext);
     await aiAssistantCommand.execute({
       prompt: 'Hello with skill cards!',
       roomId,
@@ -384,7 +384,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
       (event) => event.type === 'm.room.message',
     ).length;
 
-    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.toolContext);
     await aiAssistantCommand.execute({
       roomId,
       skillCards: [skillCard1, skillCard2],
@@ -420,7 +420,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
       name: 'room-with-skill-ids',
     });
 
-    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.toolContext);
     await aiAssistantCommand.execute({
       prompt: 'Hello with skill card IDs!',
       roomId,
@@ -447,7 +447,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
       name: 'room-with-attached-card-ids',
     });
 
-    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.toolContext);
     await aiAssistantCommand.execute({
       prompt: 'Hello with attached card IDs!',
       roomId,
@@ -487,9 +487,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
         assert.strictEqual(input.roomId, roomId, 'Room ID should match');
       };
 
-      let aiAssistantCommand = new UseAiAssistantTool(
-        toolService.commandContext,
-      );
+      let aiAssistantCommand = new UseAiAssistantTool(toolService.toolContext);
       await aiAssistantCommand.execute({
         prompt: 'Hello, open this room!',
         roomId,
@@ -513,7 +511,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
 
     const fileURLs = [`${testRealmURL}file1.gts`, `${testRealmURL}file2.gts`];
 
-    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.toolContext);
     await aiAssistantCommand.execute({
       prompt: 'Hello with attached files!',
       roomId,
@@ -547,7 +545,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
     const card1 = (await store.get(`${testRealmURL}empty1.json`)) as CardDef;
     const card2 = (await store.get(`${testRealmURL}empty2.json`)) as CardDef;
 
-    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.toolContext);
     await aiAssistantCommand.execute({
       prompt: 'Hello with open cards!',
       roomId,
@@ -574,7 +572,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
       name: 'room-for-llm-mode-test',
     });
 
-    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.toolContext);
 
     // Test setting LLM mode to 'act'
     await aiAssistantCommand.execute({
diff --git a/packages/host/tests/integration/commands/validate-realm-test.gts b/packages/host/tests/integration/tools/validate-realm-test.gts
similarity index 91%
rename from packages/host/tests/integration/commands/validate-realm-test.gts
rename to packages/host/tests/integration/tools/validate-realm-test.gts
index d8cbd548cc..9d396d857d 100644
--- a/packages/host/tests/integration/commands/validate-realm-test.gts
+++ b/packages/host/tests/integration/tools/validate-realm-test.gts
@@ -29,7 +29,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | validate-realm', function (hooks) {
+module('Integration | tools | validate-realm', function (hooks) {
   setupRenderingTest(hooks);
   setupBaseRealm(hooks);
   setupLocalIndexing(hooks);
@@ -58,14 +58,14 @@ module('Integration | commands | validate-realm', function (hooks) {
 
   test('returns normalized realm URL for a valid realm', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new ValidateRealmTool(toolService.commandContext);
+    let command = new ValidateRealmTool(toolService.toolContext);
     let result = await command.execute({ realmIdentifier: testRealmURL });
     assert.strictEqual(result.realmIdentifier, testRealmURL);
   });
 
   test('throws error for an invalid realm URL', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new ValidateRealmTool(toolService.commandContext);
+    let command = new ValidateRealmTool(toolService.toolContext);
     try {
       await command.execute({
         realmIdentifier: 'https://invalid.example.com/realm/',
diff --git a/packages/host/tests/integration/commands/write-binary-file-test.gts b/packages/host/tests/integration/tools/write-binary-file-test.gts
similarity index 93%
rename from packages/host/tests/integration/commands/write-binary-file-test.gts
rename to packages/host/tests/integration/tools/write-binary-file-test.gts
index f8b6e9f27e..c4df0baa02 100644
--- a/packages/host/tests/integration/commands/write-binary-file-test.gts
+++ b/packages/host/tests/integration/tools/write-binary-file-test.gts
@@ -43,7 +43,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | write-binary-file', function (hooks) {
+module('Integration | tools | write-binary-file', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
 
@@ -67,7 +67,7 @@ module('Integration | commands | write-binary-file', function (hooks) {
 
   test('writes a binary file', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new WriteBinaryFileTool(toolService.commandContext);
+    let command = new WriteBinaryFileTool(toolService.toolContext);
     let result = await command.execute({
       path: 'test-image.png',
       realm: testRealmURL,
@@ -118,7 +118,7 @@ module('Integration | commands | write-binary-file', function (hooks) {
     );
 
     let toolService = getService('tool-service');
-    let command = new WriteBinaryFileTool(toolService.commandContext);
+    let command = new WriteBinaryFileTool(toolService.toolContext);
     try {
       await command.execute({
         path: 'waf-blocked.png',
@@ -148,7 +148,7 @@ module('Integration | commands | write-binary-file', function (hooks) {
 
   test('handles a leading slash in the path', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new WriteBinaryFileTool(toolService.commandContext);
+    let command = new WriteBinaryFileTool(toolService.toolContext);
     let result = await command.execute({
       path: '/test-image.png',
       realm: testRealmURL,
@@ -163,7 +163,7 @@ module('Integration | commands | write-binary-file', function (hooks) {
 
   test('throws an error when an invalid realm is provided', async function (assert) {
     let toolService = getService('tool-service');
-    let command = new WriteBinaryFileTool(toolService.commandContext);
+    let command = new WriteBinaryFileTool(toolService.toolContext);
     try {
       await command.execute({
         path: 'bad.png',
diff --git a/packages/host/tests/integration/commands/write-text-file-test.gts b/packages/host/tests/integration/tools/write-text-file-test.gts
similarity index 89%
rename from packages/host/tests/integration/commands/write-text-file-test.gts
rename to packages/host/tests/integration/tools/write-text-file-test.gts
index d13e83d473..acf0896f11 100644
--- a/packages/host/tests/integration/commands/write-text-file-test.gts
+++ b/packages/host/tests/integration/tools/write-text-file-test.gts
@@ -39,7 +39,7 @@ class StubRealmService extends RealmService {
   }
 }
 
-module('Integration | commands | write-text-file', function (hooks) {
+module('Integration | tools | write-text-file', function (hooks) {
   setupRenderingTest(hooks);
   setupLocalIndexing(hooks);
 
@@ -63,9 +63,7 @@ module('Integration | commands | write-text-file', function (hooks) {
 
   test('writes a text file', async function (assert) {
     let toolService = getService('tool-service');
-    let writeTextFileCommand = new WriteTextFileTool(
-      toolService.commandContext,
-    );
+    let writeTextFileCommand = new WriteTextFileTool(toolService.toolContext);
     await writeTextFileCommand.execute({
       path: 'test.txt',
       content: 'Hello!',
@@ -78,9 +76,7 @@ module('Integration | commands | write-text-file', function (hooks) {
 
   test('fails if the file already exists', async function (assert) {
     let toolService = getService('tool-service');
-    let writeTextFileCommand = new WriteTextFileTool(
-      toolService.commandContext,
-    );
+    let writeTextFileCommand = new WriteTextFileTool(toolService.toolContext);
     await writeTextFileCommand.execute({
       path: 'test.txt',
       content: 'Hello!',
@@ -106,9 +102,7 @@ module('Integration | commands | write-text-file', function (hooks) {
 
   test('is able to overwrite a file', async function (assert) {
     let toolService = getService('tool-service');
-    let writeTextFileCommand = new WriteTextFileTool(
-      toolService.commandContext,
-    );
+    let writeTextFileCommand = new WriteTextFileTool(toolService.toolContext);
     await writeTextFileCommand.execute({
       path: 'test.txt',
       content: 'Hello!',
@@ -127,9 +121,7 @@ module('Integration | commands | write-text-file', function (hooks) {
 
   test('handles a leading slash in the path', async function (assert) {
     let toolService = getService('tool-service');
-    let writeTextFileCommand = new WriteTextFileTool(
-      toolService.commandContext,
-    );
+    let writeTextFileCommand = new WriteTextFileTool(toolService.toolContext);
     await writeTextFileCommand.execute({
       path: '/test.txt',
       content: 'Hello with slash!',
@@ -143,9 +135,7 @@ module('Integration | commands | write-text-file', function (hooks) {
   test('useNonConflictingFilename writes to a new file when content exists', async function (assert) {
     let toolService = getService('tool-service');
     let cardService = getService('card-service');
-    let writeTextFileCommand = new WriteTextFileTool(
-      toolService.commandContext,
-    );
+    let writeTextFileCommand = new WriteTextFileTool(toolService.toolContext);
     await cardService.saveSource(
       new URL('test.txt', testRealmURL),
       'Already here',
@@ -173,9 +163,7 @@ module('Integration | commands | write-text-file', function (hooks) {
   test('useNonConflictingFilename reuses an existing blank file', async function (assert) {
     let toolService = getService('tool-service');
     let cardService = getService('card-service');
-    let writeTextFileCommand = new WriteTextFileTool(
-      toolService.commandContext,
-    );
+    let writeTextFileCommand = new WriteTextFileTool(toolService.toolContext);
     await cardService.saveSource(
       new URL('empty.txt', testRealmURL),
       '',
@@ -206,9 +194,7 @@ module('Integration | commands | write-text-file', function (hooks) {
   test('useNonConflictingFilename writes into an existing blank file when content is provided', async function (assert) {
     let toolService = getService('tool-service');
     let cardService = getService('card-service');
-    let writeTextFileCommand = new WriteTextFileTool(
-      toolService.commandContext,
-    );
+    let writeTextFileCommand = new WriteTextFileTool(toolService.toolContext);
     await cardService.saveSource(
       new URL('empty.txt', testRealmURL),
       '',
@@ -233,9 +219,7 @@ module('Integration | commands | write-text-file', function (hooks) {
 
   test('throws an error when an invalid realm is provided', async function (assert) {
     let toolService = getService('tool-service');
-    let writeTextFileCommand = new WriteTextFileTool(
-      toolService.commandContext,
-    );
+    let writeTextFileCommand = new WriteTextFileTool(toolService.toolContext);
     try {
       await writeTextFileCommand.execute({
         path: 'bad.txt',
@@ -253,9 +237,7 @@ module('Integration | commands | write-text-file', function (hooks) {
 
   test('throws when overwrite and useNonConflictingFilename are both true', async function (assert) {
     let toolService = getService('tool-service');
-    let writeTextFileCommand = new WriteTextFileTool(
-      toolService.commandContext,
-    );
+    let writeTextFileCommand = new WriteTextFileTool(toolService.toolContext);
     try {
       await writeTextFileCommand.execute({
         path: 'test.txt',
diff --git a/packages/host/tests/unit/card-def-menu-items-test.ts b/packages/host/tests/unit/card-def-menu-items-test.ts
index 35cfd0d0ba..5c2d5975cc 100644
--- a/packages/host/tests/unit/card-def-menu-items-test.ts
+++ b/packages/host/tests/unit/card-def-menu-items-test.ts
@@ -52,7 +52,7 @@ module('Unit | CardDef menu items', function (hooks) {
       canEdit: true,
       cardCrudFunctions: {},
       menuContext: 'interact',
-      commandContext: {} as any,
+      toolContext: {} as any,
     });
 
     let texts = items.map((i: MenuItemOptions) => i.label);
@@ -74,7 +74,7 @@ module('Unit | CardDef menu items', function (hooks) {
       canEdit: true,
       cardCrudFunctions: {},
       menuContext: 'interact',
-      commandContext: {} as any,
+      toolContext: {} as any,
       format: 'edit',
     });
 
@@ -97,7 +97,7 @@ module('Unit | CardDef menu items', function (hooks) {
       canEdit: true,
       cardCrudFunctions: {},
       menuContext: 'interact',
-      commandContext: {} as any,
+      toolContext: {} as any,
       format: 'edit',
     });
 
@@ -117,7 +117,7 @@ module('Unit | CardDef menu items', function (hooks) {
       canEdit: false,
       cardCrudFunctions: {},
       menuContext: 'interact',
-      commandContext: {} as any,
+      toolContext: {} as any,
       format: 'edit',
     });
 
@@ -137,7 +137,7 @@ module('Unit | CardDef menu items', function (hooks) {
       canEdit: true,
       cardCrudFunctions: {},
       menuContext: 'interact',
-      commandContext: {} as any,
+      toolContext: {} as any,
       format: 'isolated',
     });
 
@@ -160,7 +160,7 @@ module('Unit | CardDef menu items', function (hooks) {
       canEdit: true,
       cardCrudFunctions: {},
       menuContext: 'interact',
-      commandContext: {} as any,
+      toolContext: {} as any,
       format: 'isolated',
       useBaseTemplate: true,
     });
@@ -184,7 +184,7 @@ module('Unit | CardDef menu items', function (hooks) {
       canEdit: true,
       cardCrudFunctions: {},
       menuContext: 'interact',
-      commandContext: {} as any,
+      toolContext: {} as any,
       format: 'isolated',
     });
 
@@ -208,7 +208,7 @@ module('Unit | CardDef menu items', function (hooks) {
         canEditActiveRealm: true,
         activeRealmURL: testRealmURL,
       },
-      commandContext: {} as any,
+      toolContext: {} as any,
     });
 
     let texts = items.map((i: MenuItemOptions) => i.label);
@@ -231,7 +231,7 @@ module('Unit | CardDef menu items', function (hooks) {
         canEditActiveRealm: false,
         activeRealmURL: testRealmURL,
       },
-      commandContext: {} as any,
+      toolContext: {} as any,
     });
 
     let texts = items.map((i: MenuItemOptions) => i.label);
@@ -250,7 +250,7 @@ module('Unit | CardDef menu items', function (hooks) {
       canEdit: true,
       cardCrudFunctions: {},
       menuContext: 'code-mode-playground',
-      commandContext: {} as any,
+      toolContext: {} as any,
       format: 'isolated',
     });
 
@@ -279,7 +279,7 @@ module('Unit | CardDef menu items', function (hooks) {
       canEdit: true,
       cardCrudFunctions: {},
       menuContext: 'code-mode-playground',
-      commandContext: {} as any,
+      toolContext: {} as any,
       format: 'isolated',
     });
 
@@ -298,7 +298,7 @@ module('Unit | CardDef menu items', function (hooks) {
       canEdit: true,
       cardCrudFunctions: {},
       menuContext: 'code-mode-preview',
-      commandContext: {} as any,
+      toolContext: {} as any,
       format: 'isolated',
     });
 
diff --git a/packages/host/tests/unit/file-def-menu-items-test.ts b/packages/host/tests/unit/file-def-menu-items-test.ts
index 263ae46244..aca9377821 100644
--- a/packages/host/tests/unit/file-def-menu-items-test.ts
+++ b/packages/host/tests/unit/file-def-menu-items-test.ts
@@ -39,7 +39,7 @@ module('Unit | FileDef menu items', function (hooks) {
       canEdit: true,
       cardCrudFunctions: {},
       menuContext: 'interact',
-      commandContext: {} as any,
+      toolContext: {} as any,
     });
 
     let texts = items.map((i: MenuItemOptions) => i.label);
@@ -54,7 +54,7 @@ module('Unit | FileDef menu items', function (hooks) {
       canEdit: true,
       cardCrudFunctions: {},
       menuContext: 'interact',
-      commandContext: {} as any,
+      toolContext: {} as any,
     });
 
     let texts = items.map((i: MenuItemOptions) => i.label);
@@ -79,7 +79,7 @@ module('Unit | FileDef menu items', function (hooks) {
       canEdit: false,
       cardCrudFunctions: {},
       menuContext: 'interact',
-      commandContext: {} as any,
+      toolContext: {} as any,
     });
 
     let texts = items.map((i: MenuItemOptions) => i.label);
@@ -107,7 +107,7 @@ module('Unit | FileDef menu items', function (hooks) {
       canEdit: true,
       cardCrudFunctions: {},
       menuContext: 'code-mode-preview',
-      commandContext: {} as any,
+      toolContext: {} as any,
       format: 'isolated',
     });
 
@@ -127,7 +127,7 @@ module('Unit | FileDef menu items', function (hooks) {
       canEdit: true,
       cardCrudFunctions: {},
       menuContext: 'ai-assistant',
-      commandContext: {} as any,
+      toolContext: {} as any,
       menuContextParams: {
         canEditActiveRealm: true,
         activeRealmURL: 'https://example.com/my-realm/',
@@ -149,7 +149,7 @@ module('Unit | FileDef menu items', function (hooks) {
       canEdit: false,
       cardCrudFunctions: {},
       menuContext: 'ai-assistant',
-      commandContext: {} as any,
+      toolContext: {} as any,
       menuContextParams: {
         canEditActiveRealm: false,
         activeRealmURL: 'https://example.com/my-realm/',
@@ -171,7 +171,7 @@ module('Unit | FileDef menu items', function (hooks) {
       canEdit: true,
       cardCrudFunctions: {},
       menuContext: 'code-mode-playground',
-      commandContext: {} as any,
+      toolContext: {} as any,
       format: 'isolated',
     });
 
diff --git a/packages/host/tests/unit/lib/command-auto-execute-test.ts b/packages/host/tests/unit/lib/command-auto-execute-test.ts
index 49a5ec3d71..dd30fe7fdf 100644
--- a/packages/host/tests/unit/lib/command-auto-execute-test.ts
+++ b/packages/host/tests/unit/lib/command-auto-execute-test.ts
@@ -2,10 +2,10 @@ import { module, test } from 'qunit';
 
 import {
   CHECK_CORRECTNESS_COMMAND_NAME,
-  isAutoExecutableCommand,
+  isAutoExecutableTool,
 } from '@cardstack/host/lib/tool-auto-execute';
 
-type AutoExecCommandInput = Parameters<typeof isAutoExecutableCommand>[0];
+type AutoExecCommandInput = Parameters<typeof isAutoExecutableTool>[0];
 
 function cmd(
   name: string | undefined,
@@ -18,7 +18,7 @@ function cmd(
 module('Unit | Lib | tool-auto-execute', function () {
   test('check-correctness commands auto-execute regardless of mode or approval flag', function (assert) {
     assert.true(
-      isAutoExecutableCommand(
+      isAutoExecutableTool(
         cmd(CHECK_CORRECTNESS_COMMAND_NAME, true),
         'ask',
         true,
@@ -26,7 +26,7 @@ module('Unit | Lib | tool-auto-execute', function () {
       'checkCorrectness in ask mode with requiresApproval=true still auto-executes',
     );
     assert.true(
-      isAutoExecutableCommand(
+      isAutoExecutableTool(
         cmd(CHECK_CORRECTNESS_COMMAND_NAME, true),
         undefined,
         true,
@@ -37,25 +37,25 @@ module('Unit | Lib | tool-auto-execute', function () {
 
   test('commands with requiresApproval=false auto-execute', function (assert) {
     assert.true(
-      isAutoExecutableCommand(cmd('searchCard', false), 'ask', true),
+      isAutoExecutableTool(cmd('searchCard', false), 'ask', true),
       'requiresApproval=false bypasses approval even in ask mode',
     );
   });
 
   test('act mode auto-executes commands that would otherwise require approval', function (assert) {
     assert.true(
-      isAutoExecutableCommand(cmd('patchCardInstance', true), 'act', true),
+      isAutoExecutableTool(cmd('patchCardInstance', true), 'act', true),
       'patchCardInstance in act mode auto-executes',
     );
   });
 
   test('ask mode with requiresApproval=true does not auto-execute', function (assert) {
     assert.false(
-      isAutoExecutableCommand(cmd('patchCardInstance', true), 'ask', true),
+      isAutoExecutableTool(cmd('patchCardInstance', true), 'ask', true),
       'manual approval is required in ask mode',
     );
     assert.false(
-      isAutoExecutableCommand(cmd('patchCardInstance', true), undefined, true),
+      isAutoExecutableTool(cmd('patchCardInstance', true), undefined, true),
       'manual approval is required when mode is unknown',
     );
   });
@@ -65,19 +65,11 @@ module('Unit | Lib | tool-auto-execute', function () {
     // in the timeline but must never execute them, even in act mode or with
     // requiresApproval=false.
     assert.false(
-      isAutoExecutableCommand(
-        cmd('readRealmFile', false, 'ai-bot'),
-        'act',
-        true,
-      ),
+      isAutoExecutableTool(cmd('readRealmFile', false, 'ai-bot'), 'act', true),
       'executedBy overrides requiresApproval=false',
     );
     assert.false(
-      isAutoExecutableCommand(
-        cmd('readRealmFile', true, 'ai-bot'),
-        'act',
-        true,
-      ),
+      isAutoExecutableTool(cmd('readRealmFile', true, 'ai-bot'), 'act', true),
       'executedBy overrides act mode',
     );
   });
@@ -86,11 +78,7 @@ module('Unit | Lib | tool-auto-execute', function () {
     // The guard matches ai-bot's own executor explicitly, not any value — a
     // command executed by the host (or any other actor) is evaluated normally.
     assert.true(
-      isAutoExecutableCommand(
-        cmd('patchCardInstance', true, 'host'),
-        'act',
-        true,
-      ),
+      isAutoExecutableTool(cmd('patchCardInstance', true, 'host'), 'act', true),
       "executedBy: 'host' does not short-circuit; act mode still auto-executes",
     );
   });
@@ -102,7 +90,7 @@ module('Unit | Lib | tool-auto-execute', function () {
     // branches. UI callers rely on this so the manual approval bar / per-
     // command Apply button stay clickable for non-current-agent commands.
     assert.false(
-      isAutoExecutableCommand(
+      isAutoExecutableTool(
         cmd(CHECK_CORRECTNESS_COMMAND_NAME, true),
         'act',
         false,
@@ -110,11 +98,11 @@ module('Unit | Lib | tool-auto-execute', function () {
       'checkCorrectness from another agent does not auto-execute',
     );
     assert.false(
-      isAutoExecutableCommand(cmd('searchCard', false), 'act', false),
+      isAutoExecutableTool(cmd('searchCard', false), 'act', false),
       'requiresApproval=false from another agent does not auto-execute',
     );
     assert.false(
-      isAutoExecutableCommand(cmd('patchCardInstance', true), 'act', false),
+      isAutoExecutableTool(cmd('patchCardInstance', true), 'act', false),
       'act mode from another agent does not auto-execute',
     );
   });
diff --git a/packages/matrix/tests/correctness-checks.spec.ts b/packages/matrix/tests/correctness-checks.spec.ts
index 899d094826..1e5d4f60ee 100644
--- a/packages/matrix/tests/correctness-checks.spec.ts
+++ b/packages/matrix/tests/correctness-checks.spec.ts
@@ -149,9 +149,9 @@ test.describe('Correctness Checks', () => {
     await expect(commandContainer).not.toHaveClass(/is-failed/);
 
     // Verify the command description is displayed
-    await expect(
-      commandContainer.locator('.command-description'),
-    ).toContainText('Check correctness');
+    await expect(commandContainer.locator('.tool-description')).toContainText(
+      'Check correctness',
+    );
 
     // Verify the command result event was dispatched with correct data
     let toolResultEvent: any;
diff --git a/packages/matrix/tests/commands.spec.ts b/packages/matrix/tests/tools.spec.ts
similarity index 99%
rename from packages/matrix/tests/commands.spec.ts
rename to packages/matrix/tests/tools.spec.ts
index 160b41b2ea..705c535302 100644
--- a/packages/matrix/tests/commands.spec.ts
+++ b/packages/matrix/tests/tools.spec.ts
@@ -144,10 +144,10 @@ test.describe('Commands', () => {
     const { username, password, credentials } =
       await createSubscribedUserAndLogin(
         page,
-        'commands-command-result',
+        'commands-tool-call-result',
         serverIndexUrl,
       );
-    const realmName = uniqueRealmName('commands-command-result');
+    const realmName = uniqueRealmName('commands-tool-call-result');
     await createRealm(page, realmName);
     const realmURL = new URL(`${username}/${realmName}/`, serverIndexUrl).href;
     const cardId = await postNewCard(page, realmURL, {
diff --git a/packages/runtime-common/commands.ts b/packages/runtime-common/commands.ts
index f43b3071e4..04f14df31e 100644
--- a/packages/runtime-common/commands.ts
+++ b/packages/runtime-common/commands.ts
@@ -60,10 +60,17 @@ export abstract class Tool<
   name: string = this.constructor.name;
   description = '';
 
-  protected readonly commandContext: ToolContext;
+  protected readonly toolContext: ToolContext;
 
-  constructor(commandContext: ToolContext) {
-    this.commandContext = commandContext;
+  constructor(toolContext: ToolContext) {
+    this.toolContext = toolContext;
+  }
+
+  // Pre-rename spelling of `toolContext`. Realm-content tool classes read
+  // `this.commandContext` inside run(); it stays until the content window
+  // confirms nothing does.
+  protected get commandContext(): ToolContext {
+    return this.toolContext;
   }
 
   async execute(): Promise<CardInstance<CardResultType>>;