diff --git a/packages/ai-bot/tests/prompt-construction-test.ts b/packages/ai-bot/tests/prompt-construction-test.ts
index 146bafdbfc2..d5a6d91a4fb 100644
--- a/packages/ai-bot/tests/prompt-construction-test.ts
+++ b/packages/ai-bot/tests/prompt-construction-test.ts
@@ -3224,7 +3224,7 @@ Attached Files (files with newer versions don't show their content):
           id: 'http://localhost:4201/admin/custom-embedded/Skill/72d005b5-1a6b-4c6d-995f-2411c5948e74',
           attributes: {
             instructions:
-              'Use the tool SwitchSubmodeCommand with "code" to go to codemode and "interact" to go to interact mode.',
+              'Use the tool SwitchSubmodeTool with "code" to go to codemode and "interact" to go to interact mode.',
             commands: [
               {
                 codeRef: {
@@ -3323,7 +3323,7 @@ Attached Files (files with newer versions don't show their content):
     );
     assert.ok(
       switchSubmodeTool,
-      'Should have SwitchSubmodeCommand function available',
+      'Should have SwitchSubmodeTool function available',
     );
   });
 
diff --git a/packages/base/ai-app-generator.gts b/packages/base/ai-app-generator.gts
index fc234da0070..42725144f6c 100644
--- a/packages/base/ai-app-generator.gts
+++ b/packages/base/ai-app-generator.gts
@@ -12,7 +12,7 @@ import { fn } from '@ember/helper';
 import { on } from '@ember/modifier';
 import { restartableTask } from 'ember-concurrency';
 
-import AskAiCommand from '@cardstack/boxel-host/commands/ask-ai';
+import AskAiTool from '@cardstack/boxel-host/commands/ask-ai';
 import { AskAiInput } from './command';
 import { tracked } from '@glimmer/tracking';
 
@@ -54,7 +54,7 @@ export class AiAppGenerator extends CardDef {
         throw new Error('No command context found');
       }
 
-      let command = new AskAiCommand(commandContext);
+      let command = new AskAiTool(commandContext);
       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 831c259ad1e..92bfd6b1cf3 100644
--- a/packages/base/card-api.gts
+++ b/packages/base/card-api.gts
@@ -138,8 +138,8 @@ import FilePencilIcon from '@cardstack/boxel-icons/file-pencil';
 import WandIcon from '@cardstack/boxel-icons/wand';
 import HashIcon from '@cardstack/boxel-icons/hash';
 // normalizeEnumOptions used by enum moved to packages/base/enum.gts
-import PatchThemeCommand from '@cardstack/boxel-host/commands/patch-theme';
-import CopyAndEditCommand from '@cardstack/boxel-host/commands/copy-and-edit';
+import PatchThemeTool from '@cardstack/boxel-host/commands/patch-theme';
+import CopyAndEditTool from '@cardstack/boxel-host/commands/copy-and-edit';
 import { md5 } from 'super-fast-md5';
 
 import {
@@ -3289,7 +3289,7 @@ export class Theme extends CardDef {
             if (!params.commandContext || !this.id) {
               return;
             }
-            let cmd = new CopyAndEditCommand(params.commandContext);
+            let cmd = new CopyAndEditTool(params.commandContext);
             await cmd.execute({
               card: this,
             });
@@ -3300,7 +3300,7 @@ export class Theme extends CardDef {
         {
           label: 'Modify Theme via AI',
           action: async () => {
-            let cmd = new PatchThemeCommand(params.commandContext);
+            let cmd = new PatchThemeTool(params.commandContext);
             await cmd.execute({
               cardId: this.id as unknown as string,
             });
diff --git a/packages/base/command.gts b/packages/base/command.gts
index ab754538859..da0fcc8505c 100644
--- a/packages/base/command.gts
+++ b/packages/base/command.gts
@@ -27,7 +27,9 @@ import {
 } from './commands/search-card-result';
 import { eq, gt } from '@cardstack/boxel-ui/helpers';
 
-export type CommandStatus = 'applied' | 'ready' | 'applying';
+export type ToolCallStatus = 'applied' | 'ready' | 'applying';
+// Pre-rename spelling; new code imports `ToolCallStatus`.
+export type CommandStatus = ToolCallStatus;
 
 export class ApplyMarkdownEditInput extends CardDef {
   @field cardId = contains(StringField);
diff --git a/packages/base/commands/search-card-result.gts b/packages/base/commands/search-card-result.gts
index c1192732166..c62267eb117 100644
--- a/packages/base/commands/search-card-result.gts
+++ b/packages/base/commands/search-card-result.gts
@@ -251,7 +251,7 @@ class SearchCardsResultEmbeddedView extends Component<
 
 class SearchCardsResultIsolatedView extends SearchCardsResultEmbeddedView {
   <template>
-    <section class='command-result' data-test-command-result-isolated>
+    <section class='command-result' data-test-tool-result-isolated>
       <header>
         <h3>Search Results</h3>
         <p class='result-count'>
diff --git a/packages/base/default-templates/missing-template.gts b/packages/base/default-templates/missing-template.gts
index 0a735273122..e9a21e947df 100644
--- a/packages/base/default-templates/missing-template.gts
+++ b/packages/base/default-templates/missing-template.gts
@@ -7,7 +7,7 @@ import { on } from '@ember/modifier';
 import { action } from '@ember/object';
 import { Button } from '@cardstack/boxel-ui/components';
 // @ts-ignore can't include this in tuntime-common tsconfig until we
-import SwitchSubmodeCommand from '@cardstack/boxel-host/commands/switch-submode';
+import SwitchSubmodeTool from '@cardstack/boxel-host/commands/switch-submode';
 
 export default class MissingTemplate extends GlimmerComponent<{
   Args: {
@@ -88,7 +88,7 @@ export default class MissingTemplate extends GlimmerComponent<{
     }
     let moduleId = moduleFrom(ref);
     let commandContext = this.args.context?.commandContext;
-    await new SwitchSubmodeCommand(commandContext!).execute({
+    await new SwitchSubmodeTool(commandContext!).execute({
       codePath: moduleId,
       submode: 'code',
     });
diff --git a/packages/base/file-menu-items.ts b/packages/base/file-menu-items.ts
index 97b39b8c2b4..82975195c05 100644
--- a/packages/base/file-menu-items.ts
+++ b/packages/base/file-menu-items.ts
@@ -10,11 +10,11 @@ import Eye from '@cardstack/boxel-icons/eye';
 import LinkIcon from '@cardstack/boxel-icons/link';
 import Trash2Icon from '@cardstack/boxel-icons/trash-2';
 
-import CopyCardAsMarkdownCommand from '@cardstack/boxel-host/commands/copy-card-as-markdown';
-import CopyFileToRealmCommand from '@cardstack/boxel-host/commands/copy-file-to-realm';
-import OpenInInteractModeCommand from '@cardstack/boxel-host/commands/open-in-interact-mode';
-import ShowFileCommand from '@cardstack/boxel-host/commands/show-file';
-import SwitchSubmodeCommand from '@cardstack/boxel-host/commands/switch-submode';
+import CopyCardAsMarkdownTool from '@cardstack/boxel-host/commands/copy-card-as-markdown';
+import CopyFileToRealmTool from '@cardstack/boxel-host/commands/copy-file-to-realm';
+import OpenInInteractModeTool from '@cardstack/boxel-host/commands/open-in-interact-mode';
+import ShowFileTool from '@cardstack/boxel-host/commands/show-file';
+import SwitchSubmodeTool from '@cardstack/boxel-host/commands/switch-submode';
 
 import type { FileDef } from './card-api';
 import type { GetMenuItemParams } from './menu-items';
@@ -40,7 +40,7 @@ export function getDefaultFileMenuItems(
   if (params.menuContext === 'interact') {
     if (fileDefInstanceId) {
       // Mirror the CardDef menu so users get a consistent set of actions on
-      // file rows. `CopyCardAsMarkdownCommand` is generic — it fetches the
+      // file rows. `CopyCardAsMarkdownTool` is generic — it fetches the
       // URL with `Accept: text/markdown` — so a file URL works the same way
       // a card URL does, returning whatever the file row's `markdown`
       // column holds (populated by the FileRender pass; null today for
@@ -48,7 +48,7 @@ export function getDefaultFileMenuItems(
       menuItems.push({
         label: 'Copy as Markdown',
         action: () =>
-          new CopyCardAsMarkdownCommand(params.commandContext).execute({
+          new CopyCardAsMarkdownTool(params.commandContext).execute({
             cardId: fileDefInstanceId,
           }),
         icon: ClipboardCopy,
@@ -59,7 +59,7 @@ export function getDefaultFileMenuItems(
       menuItems.push({
         label: 'Open in Code Mode',
         action: async () => {
-          await new SwitchSubmodeCommand(params.commandContext).execute({
+          await new SwitchSubmodeTool(params.commandContext).execute({
             submode: 'code',
             codePath: fileDefInstanceId,
           });
@@ -88,14 +88,14 @@ export function getDefaultFileMenuItems(
     menuItems.push({
       label: 'Copy to Workspace',
       action: async () => {
-        let { newFileIdentifier } = await new CopyFileToRealmCommand(
+        let { newFileIdentifier } = await new CopyFileToRealmTool(
           params.commandContext,
         ).execute({
           sourceFileIdentifier: fileDefInstance.sourceUrl,
           targetRealm: params.menuContextParams.activeRealmURL,
         });
 
-        await new ShowFileCommand(params.commandContext).execute({
+        await new ShowFileTool(params.commandContext).execute({
           fileIdentifier: newFileIdentifier,
         });
       },
@@ -108,7 +108,7 @@ export function getDefaultFileMenuItems(
     menuItems.push({
       label: 'Open in Interact Mode',
       action: () => {
-        new OpenInInteractModeCommand(params.commandContext).execute({
+        new OpenInInteractModeTool(params.commandContext).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 SwitchSubmodeCommand(params.commandContext).execute({
+        await new SwitchSubmodeTool(params.commandContext).execute({
           submode: 'code',
           codePath: fileDefInstanceId,
         });
diff --git a/packages/base/matrix-event.gts b/packages/base/matrix-event.gts
index e20738613e9..e41e54b6b56 100644
--- a/packages/base/matrix-event.gts
+++ b/packages/base/matrix-event.gts
@@ -172,7 +172,7 @@ export interface DebugMessageEvent extends BaseMatrixEvent {
 }
 
 // Synapse JSON does not support decimals, so we encode all arguments as stringified JSON
-export type EncodedCommandRequest = Omit<CommandRequest, 'arguments'> & {
+export type EncodedToolRequest = Omit<CommandRequest, 'arguments'> & {
   arguments: string;
 };
 
@@ -250,10 +250,10 @@ export interface CardMessageContent {
   [APP_BOXEL_HAS_CONTINUATION_CONTENT_KEY]?: boolean;
   [APP_BOXEL_CONTINUATION_OF_CONTENT_KEY]?: string; // event_id of the message we are continuing
   [APP_BOXEL_REASONING_CONTENT_KEY]?: string;
-  [APP_BOXEL_TOOL_REQUESTS_KEY]?: Partial<EncodedCommandRequest>[];
+  [APP_BOXEL_TOOL_REQUESTS_KEY]?: Partial<EncodedToolRequest>[];
   // Replay-only: messages written before the command → tool rename carry
   // their requests under this key. Read via `getToolRequests`; never write.
-  [LEGACY_APP_BOXEL_COMMAND_REQUESTS_KEY]?: Partial<EncodedCommandRequest>[];
+  [LEGACY_APP_BOXEL_COMMAND_REQUESTS_KEY]?: Partial<EncodedToolRequest>[];
   errorMessage?: string;
   // ID from the client and can be used by client
   // to verify whether the message is already sent or not.
@@ -295,9 +295,9 @@ export interface LLMModeEvent extends RoomStateEvent {
   };
 }
 
-export interface CommandResultEvent extends BaseMatrixEvent {
+export interface ToolResultEvent extends BaseMatrixEvent {
   type: ToolResultEventType;
-  content: CommandResultWithOutputContent | CommandResultWithNoOutputContent;
+  content: ToolResultWithOutputContent | ToolResultWithNoOutputContent;
   unsigned: {
     age: number;
     transaction_id: string;
@@ -331,7 +331,7 @@ export interface CodePatchResultEvent extends BaseMatrixEvent {
   };
 }
 
-export interface CommandDefinitionSchema {
+export interface ToolDefinitionSchema {
   codeRef: {
     module: string;
     name: string;
@@ -339,12 +339,12 @@ export interface CommandDefinitionSchema {
   tool: Tool;
 }
 
-export type CommandResultStatus = 'applied' | 'failed' | 'invalid';
+export type ToolResultStatus = 'applied' | 'failed' | 'invalid';
 
-export interface CommandResultWithOutputContent {
+export interface ToolResultWithOutputContent {
   'm.relates_to': {
     rel_type: ToolResultRelType;
-    key: CommandResultStatus;
+    key: ToolResultStatus;
     event_id: string;
   };
   commandRequestId: string;
@@ -362,10 +362,10 @@ export interface CommandResultWithOutputContent {
   msgtype: ToolResultWithOutputMsgtype;
 }
 
-export interface CommandResultWithNoOutputContent {
+export interface ToolResultWithNoOutputContent {
   'm.relates_to': {
     rel_type: ToolResultRelType;
-    key: CommandResultStatus;
+    key: ToolResultStatus;
     event_id: string;
   };
   msgtype: ToolResultWithNoOutputMsgtype;
@@ -487,7 +487,7 @@ export interface StopGeneratingEvent extends BaseMatrixEvent {
 
 export type MatrixEventWithBoxelContext =
   | CardMessageEvent
-  | CommandResultEvent
+  | ToolResultEvent
   | CodePatchResultEvent;
 
 export type MatrixEvent =
@@ -495,7 +495,7 @@ export type MatrixEvent =
   | BotTriggerEvent
   | CardMessageEvent
   | CodePatchResultEvent
-  | CommandResultEvent
+  | ToolResultEvent
   | DebugMessageEvent
   | InviteEvent
   | JoinEvent
@@ -510,3 +510,13 @@ export type MatrixEvent =
   | RoomPowerLevels
   | RoomTopicEvent
   | SkillsConfigEvent;
+
+// Pre-rename spellings; new code imports the Tool-named types. These stay
+// until the ai-bot / prompt-assembly sweep (and out-of-tree content) stops
+// importing them.
+export type EncodedCommandRequest = EncodedToolRequest;
+export type CommandDefinitionSchema = ToolDefinitionSchema;
+export type CommandResultEvent = ToolResultEvent;
+export type CommandResultWithOutputContent = ToolResultWithOutputContent;
+export type CommandResultWithNoOutputContent = ToolResultWithNoOutputContent;
+export type CommandResultStatus = ToolResultStatus;
diff --git a/packages/base/menu-items.ts b/packages/base/menu-items.ts
index b627eba0e68..9101c9f752a 100644
--- a/packages/base/menu-items.ts
+++ b/packages/base/menu-items.ts
@@ -4,14 +4,14 @@ import {
   type MenuItemOptions,
 } from '@cardstack/boxel-ui/helpers';
 
-import CopyCardAsMarkdownCommand from '@cardstack/boxel-host/commands/copy-card-as-markdown';
+import CopyCardAsMarkdownTool from '@cardstack/boxel-host/commands/copy-card-as-markdown';
 import CopyCardCommand from '@cardstack/boxel-host/commands/copy-card';
-import GenerateExampleCardsCommand from '@cardstack/boxel-host/commands/generate-example-cards';
-import OpenCreateListingModalCommand from '@cardstack/boxel-host/commands/open-create-listing-modal';
-import OpenInInteractModeCommand from '@cardstack/boxel-host/commands/open-in-interact-mode';
-import PopulateWithSampleDataCommand from '@cardstack/boxel-host/commands/populate-with-sample-data';
-import ShowCardCommand from '@cardstack/boxel-host/commands/show-card';
-import SwitchSubmodeCommand from '@cardstack/boxel-host/commands/switch-submode';
+import GenerateExampleCardsTool from '@cardstack/boxel-host/commands/generate-example-cards';
+import OpenCreateListingModalTool from '@cardstack/boxel-host/commands/open-create-listing-modal';
+import OpenInInteractModeTool from '@cardstack/boxel-host/commands/open-in-interact-mode';
+import PopulateWithSampleDataTool from '@cardstack/boxel-host/commands/populate-with-sample-data';
+import ShowCardTool from '@cardstack/boxel-host/commands/show-card';
+import SwitchSubmodeTool from '@cardstack/boxel-host/commands/switch-submode';
 import type {
   CommandContext,
   Format,
@@ -92,7 +92,7 @@ export function getDefaultCardMenuItems(
     menuItems.push({
       label: 'Copy as Markdown',
       action: () =>
-        new CopyCardAsMarkdownCommand(params.commandContext).execute({
+        new CopyCardAsMarkdownTool(params.commandContext).execute({
           cardId,
         }),
       icon: ClipboardCopy,
@@ -176,7 +176,7 @@ export function getDefaultCardMenuItems(
           targetRealm: params.menuContextParams.activeRealmURL,
         });
 
-        let showCardCommand = new ShowCardCommand(params.commandContext);
+        let showCardCommand = new ShowCardTool(params.commandContext);
         await showCardCommand.execute({
           cardId: newCardId,
         });
@@ -190,7 +190,7 @@ export function getDefaultCardMenuItems(
     menuItems.push({
       label: 'Open in Interact Mode',
       action: () => {
-        new OpenInInteractModeCommand(params.commandContext).execute({
+        new OpenInInteractModeTool(params.commandContext).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 SwitchSubmodeCommand(params.commandContext).execute({
+        await new SwitchSubmodeTool(params.commandContext).execute({
           submode: 'code',
           codePath: cardId,
         });
@@ -224,9 +224,7 @@ export function getDefaultCardMenuItems(
           if (!targetRealm) {
             throw new Error('Unable to determine target realm from card');
           }
-          await new OpenCreateListingModalCommand(
-            params.commandContext,
-          ).execute({
+          await new OpenCreateListingModalTool(params.commandContext).execute({
             codeRef,
             openCardIds: [cardId],
             targetRealm,
@@ -250,7 +248,7 @@ function getSampleDataMenuItems(
     menuItems.push({
       label: `Fill in Sample Data with AI`,
       action: async () =>
-        await new PopulateWithSampleDataCommand(commandContext).execute({
+        await new PopulateWithSampleDataTool(commandContext).execute({
           cardId: card.id,
         }),
       icon: Wand,
@@ -262,7 +260,7 @@ function getSampleDataMenuItems(
     menuItems.push({
       label: `Generate ${GENERATED_EXAMPLE_COUNT} examples with AI`,
       action: async () => {
-        await new GenerateExampleCardsCommand(commandContext).execute({
+        await new GenerateExampleCardsTool(commandContext).execute({
           count: GENERATED_EXAMPLE_COUNT,
           codeRef: codeRef as ResolvedCodeRef,
           realm: card[realmURL]?.href,
diff --git a/packages/base/realm.gts b/packages/base/realm.gts
index 020669732d6..24c8e1ccf86 100644
--- a/packages/base/realm.gts
+++ b/packages/base/realm.gts
@@ -14,7 +14,7 @@ import World from '@cardstack/boxel-icons/world';
 import { action } from '@ember/object';
 import { commandData } from './resources/command-data';
 import type { GetAllRealmMetasResult } from './command';
-import GetAllRealmMetasCommand from '@cardstack/boxel-host/commands/get-all-realm-metas';
+import GetAllRealmMetasTool from '@cardstack/boxel-host/commands/get-all-realm-metas';
 
 type RealmMeta = {
   realmIdentifier: string;
@@ -28,7 +28,7 @@ type RealmMeta = {
 class EditComponent extends Component<typeof RealmField> {
   allRealmsInfoResource = commandData<typeof GetAllRealmMetasResult>(
     this,
-    GetAllRealmMetasCommand,
+    GetAllRealmMetasTool,
   );
 
   get writableRealms(): RealmMeta[] {
diff --git a/packages/base/resources/command-data.ts b/packages/base/resources/command-data.ts
index 700360ec02c..2b1f620c727 100644
--- a/packages/base/resources/command-data.ts
+++ b/packages/base/resources/command-data.ts
@@ -1,20 +1,20 @@
 import { tracked } from '@glimmer/tracking';
 
-import {
-  type CommandInvocation,
-  type Command,
-  type CardInstance,
+import type {
+  CommandInvocation,
+  Command,
+  CardInstance,
 } from '@cardstack/runtime-common';
 
-import { CommandContext } from '@cardstack/runtime-common';
+import type { CommandContext } from '@cardstack/runtime-common';
 
-import { CardContext, CardDefConstructor } from '../card-api';
+import type { CardContext, CardDefConstructor } from '../card-api';
 
 import { resource } from 'ember-resources';
 
-export class CommandExecutionState<CardResultType extends CardDefConstructor>
-  implements CommandInvocation<CardResultType>
-{
+export class CommandExecutionState<
+  CardResultType extends CardDefConstructor,
+> implements CommandInvocation<CardResultType> {
   @tracked status: 'pending' | 'success' | 'error' = 'pending';
   @tracked cardResult: CardInstance<CardResultType> | null = null;
   @tracked error: Error | null = null;
@@ -53,13 +53,13 @@ export class CommandExecutionState<CardResultType extends CardDefConstructor>
  * // call example no input
  * allRealmsInfoResource = commandData<typeof GetAllRealmMetasResult>(
  *   this,
- *   GetAllRealmMetasCommand,
+ *   GetAllRealmMetasTool,
  * );
  * // call example with reactive arg
  * searchResource = commandData<
  *   typeof SearchCardsByTypeAndTitleInput,
  *   typeof SearchCardsResult
- * >(this, SearchCardsByTypeAndTitleCommand, () => {
+ * >(this, SearchCardsByTypeAndTitleTool, () => {
  *   return {
  *     title: this.args.model.cardTitleSearch,
  *   };
diff --git a/packages/base/skill-frontmatter-field.gts b/packages/base/skill-frontmatter-field.gts
index 726fd330ba1..9e39039dd99 100644
--- a/packages/base/skill-frontmatter-field.gts
+++ b/packages/base/skill-frontmatter-field.gts
@@ -24,7 +24,7 @@ export class SkillFrontmatterField extends FrontmatterField {
   // Legacy spelling of `tools`. Index rows extracted before the
   // command -> tool rename persist the value under a `commands` attribute;
   // this field lets those rows rehydrate without a reindex. Consumers read
-  // `tools` and fall back to this (see the host's `getSkillSourceCommands`).
+  // `tools` and fall back to this (see the host's `getSkillSourceTools`).
   // Remove once all realms have reindexed post-rename.
   @field commands = containsMany(ToolField);
 
diff --git a/packages/base/skill.gts b/packages/base/skill.gts
index ff7b3867d4d..0eb56743b6f 100644
--- a/packages/base/skill.gts
+++ b/packages/base/skill.gts
@@ -9,14 +9,14 @@ import {
 import MarkdownField from './markdown';
 import StringField from './string';
 import RobotIcon from '@cardstack/boxel-icons/robot';
-import { CommandField } from './tool-field';
+import { CommandField, ToolField } from './tool-field';
 
 export const isSkillCard = Symbol.for('is-skill-card');
 
 // `CommandField` lives in its own module so `SkillFrontmatterField` (skill
 // markdown frontmatter) can reuse it without importing the `Skill` card.
 // Re-exported here so it is importable from this module too.
-export { CommandField };
+export { CommandField, ToolField };
 
 export class Skill extends CardDef {
   static displayName = 'Skill';
diff --git a/packages/base/spec.gts b/packages/base/spec.gts
index 23c390dc289..1045c4a184c 100644
--- a/packages/base/spec.gts
+++ b/packages/base/spec.gts
@@ -55,9 +55,9 @@ import AppsIcon from '@cardstack/boxel-icons/apps';
 import LayoutList from '@cardstack/boxel-icons/layout-list';
 import { use, resource } from 'ember-resources';
 import { TrackedObject } from 'tracked-built-ins';
-import GenerateReadmeSpecCommand from '@cardstack/boxel-host/commands/generate-readme-spec';
-import PopulateWithSampleDataCommand from '@cardstack/boxel-host/commands/populate-with-sample-data';
-import GenerateExampleCardsCommand from '@cardstack/boxel-host/commands/generate-example-cards';
+import GenerateReadmeSpecTool from '@cardstack/boxel-host/commands/generate-readme-spec';
+import PopulateWithSampleDataTool from '@cardstack/boxel-host/commands/populate-with-sample-data';
+import GenerateExampleCardsTool from '@cardstack/boxel-host/commands/generate-example-cards';
 import { type GetMenuItemParams } from './menu-items';
 import { provide } from 'ember-provide-consume-context';
 import {
@@ -67,7 +67,7 @@ import {
 
 export type SpecType = 'card' | 'field' | 'component' | 'app' | 'command';
 
-class PopulateFieldSpecExampleCommand extends PopulateWithSampleDataCommand {
+class PopulateFieldSpecExampleCommand extends PopulateWithSampleDataTool {
   constructor(commandContext: CommandContext) {
     super(commandContext);
   }
@@ -97,7 +97,7 @@ class PopulateFieldSpecExampleCommand extends PopulateWithSampleDataCommand {
   }
 }
 
-class GenerateExamplesForFieldSpecCommand extends GenerateExampleCardsCommand {
+class GenerateExamplesForFieldSpecCommand extends GenerateExampleCardsTool {
   constructor(commandContext: CommandContext) {
     super(commandContext);
   }
@@ -286,7 +286,7 @@ export class SpecReadmeSection extends GlimmerComponent<SpecReadmeSectionSignatu
     }
 
     try {
-      const generateReadmeSpecCommand = new GenerateReadmeSpecCommand(
+      const generateReadmeSpecCommand = new GenerateReadmeSpecTool(
         commandContext,
       );
       await generateReadmeSpecCommand.execute({
diff --git a/packages/base/system-card.gts b/packages/base/system-card.gts
index f2f3f9ed04e..775915cce93 100644
--- a/packages/base/system-card.gts
+++ b/packages/base/system-card.gts
@@ -15,17 +15,17 @@ import { Skill } from './skill';
 import { getMenuItems, rri } from '@cardstack/runtime-common';
 import { type GetMenuItemParams } from './menu-items';
 import { type MenuItemOptions, MenuItem } from '@cardstack/boxel-ui/helpers';
-import SetUserSystemCardCommand from '@cardstack/boxel-host/commands/set-user-system-card';
-import GetUserSystemCardCommand from '@cardstack/boxel-host/commands/get-user-system-card';
+import SetUserSystemCardTool from '@cardstack/boxel-host/commands/set-user-system-card';
+import GetUserSystemCardTool from '@cardstack/boxel-host/commands/get-user-system-card';
 import {
   BoxelButton,
   BoxelDropdown,
   Menu as BoxelMenu,
 } from '@cardstack/boxel-ui/components';
 import AppsIcon from '@cardstack/boxel-icons/apps';
-import CopyCardToRealmCommand from '@cardstack/boxel-host/commands/copy-card';
-import GetAllRealmMetasCommand from '@cardstack/boxel-host/commands/get-all-realm-metas';
-import ShowCardCommand from '@cardstack/boxel-host/commands/show-card';
+import CopyCardToRealmTool from '@cardstack/boxel-host/commands/copy-card';
+import GetAllRealmMetasTool from '@cardstack/boxel-host/commands/get-all-realm-metas';
+import ShowCardTool from '@cardstack/boxel-host/commands/show-card';
 import { on } from '@ember/modifier';
 import { restartableTask, task } from 'ember-concurrency';
 import { tracked } from '@glimmer/tracking';
@@ -109,7 +109,7 @@ export class SystemCard extends CardDef {
       {
         label: 'Set as My System Card',
         action: async () => {
-          await new SetUserSystemCardCommand(params.commandContext).execute({
+          await new SetUserSystemCardTool(params.commandContext).execute({
             cardId: this.id,
           });
         },
@@ -143,7 +143,7 @@ class SystemCardIsolated extends Component<typeof SystemCard> {
     }
     try {
       let result =
-        await new GetUserSystemCardCommand(commandContext).execute();
+        await new GetUserSystemCardTool(commandContext).execute();
       this.activeSystemCardId = result.cardId ?? undefined;
       this.activeIsDefault = result.isDefault ?? false;
     } finally {
@@ -169,7 +169,7 @@ class SystemCardIsolated extends Component<typeof SystemCard> {
 
   allRealmsInfoResource = commandData<typeof GetAllRealmMetasResult>(
     this,
-    GetAllRealmMetasCommand,
+    GetAllRealmMetasTool,
   );
 
   get writableRealms(): { name: string; url: string; iconURL?: string }[] {
@@ -216,14 +216,14 @@ class SystemCardIsolated extends Component<typeof SystemCard> {
       return;
     }
     try {
-      let copyResult = await new CopyCardToRealmCommand(
+      let copyResult = await new CopyCardToRealmTool(
         commandContext,
       ).execute({
         sourceCard: this.args.model as CardDef,
         targetRealm: targetRealmUrl,
       });
       if (copyResult.newCardId) {
-        await new ShowCardCommand(commandContext).execute({
+        await new ShowCardTool(commandContext).execute({
           cardId: copyResult.newCardId,
           format: 'isolated',
         });
@@ -252,13 +252,13 @@ class SystemCardIsolated extends Component<typeof SystemCard> {
     if (!commandContext || !this.args.model.id) {
       return;
     }
-    await new SetUserSystemCardCommand(commandContext).execute({
+    await new SetUserSystemCardTool(commandContext).execute({
       cardId: this.args.model.id,
     });
     this.activeSystemCardId = this.args.model.id;
     // Re-check default status after setting active
     let result =
-      await new GetUserSystemCardCommand(commandContext).execute();
+      await new GetUserSystemCardTool(commandContext).execute();
     this.activeIsDefault = result.isDefault ?? false;
     this.isExpanded = false;
   });
@@ -272,10 +272,10 @@ class SystemCardIsolated extends Component<typeof SystemCard> {
     if (!commandContext) {
       return;
     }
-    await new SetUserSystemCardCommand(commandContext).execute({});
+    await new SetUserSystemCardTool(commandContext).execute({});
     // Reload to pick up the new active system card (the default)
     let result =
-      await new GetUserSystemCardCommand(commandContext).execute();
+      await new GetUserSystemCardTool(commandContext).execute();
     this.activeSystemCardId = result.cardId ?? undefined;
     this.activeIsDefault = result.isDefault ?? false;
     this.isExpanded = false;
diff --git a/packages/eslint-plugin-cardstack-host/lib/rules/host-tools-registered.js b/packages/eslint-plugin-cardstack-host/lib/rules/host-tools-registered.js
index c1d999f8ad0..bf42b51193c 100644
--- a/packages/eslint-plugin-cardstack-host/lib/rules/host-tools-registered.js
+++ b/packages/eslint-plugin-cardstack-host/lib/rules/host-tools-registered.js
@@ -112,7 +112,7 @@ module.exports = {
           node.declaration.declarations.forEach((declaration) => {
             if (
               declaration.id.type === 'Identifier' &&
-              declaration.id.name === 'HostCommandClasses' &&
+              declaration.id.name === 'HostToolClasses' &&
               declaration.init &&
               declaration.init.type === 'ArrayExpression'
             ) {
@@ -152,7 +152,7 @@ module.exports = {
           if (moduleInfo.requiresHostClass && !hostClassReferences.has(alias)) {
             context.report({
               node,
-              message: `Tool module "${moduleName}" is imported but not referenced in HostCommandClasses.`,
+              message: `Tool module "${moduleName}" is imported but not referenced in HostToolClasses.`,
             });
           }
         }
@@ -175,7 +175,7 @@ function listCommandModules(commandsDir) {
 
       try {
         const source = fs.readFileSync(fullPath, 'utf8');
-        requiresHostClass = /extends\s+HostBaseCommand/.test(source);
+        requiresHostClass = /extends\s+HostBaseTool/.test(source);
 
         if (requiresHostClass) {
           const constructorMatch = source.match(/constructor\s*\(([^)]*)\)/m);
diff --git a/packages/experiments-realm/bot-request-demo.gts b/packages/experiments-realm/bot-request-demo.gts
index 7d9b0db76c1..cc59c779004 100644
--- a/packages/experiments-realm/bot-request-demo.gts
+++ b/packages/experiments-realm/bot-request-demo.gts
@@ -3,7 +3,7 @@ import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 import { on } from '@ember/modifier';
 
-import CreateListingPRRequestCommand from '@cardstack/boxel-host/commands/create-listing-pr-request';
+import CreateListingPRRequestTool from '@cardstack/boxel-host/commands/create-listing-pr-request';
 import CreateShowCardRequestCommand from './commands/create-show-card-request';
 import CreatePatchCardInstanceRequestCommand from './commands/create-patch-card-instance-request';
 import { Button } from '@cardstack/boxel-ui/components';
@@ -269,7 +269,7 @@ class Isolated extends Component<typeof BotRequestDemo> {
       return;
     }
 
-    await new CreateListingPRRequestCommand(commandContext).execute({
+    await new CreateListingPRRequestTool(commandContext).execute({
       realm: this.createListingPRTargetRealm,
       listingId: this.listingId,
     });
diff --git a/packages/experiments-realm/commands/bot-request-utils.ts b/packages/experiments-realm/commands/bot-request-utils.ts
index 19b91c27d83..33d3404aadc 100644
--- a/packages/experiments-realm/commands/bot-request-utils.ts
+++ b/packages/experiments-realm/commands/bot-request-utils.ts
@@ -1,13 +1,13 @@
 import type { CommandContext } from '@cardstack/runtime-common';
 
-import InviteUserToRoomCommand from '@cardstack/boxel-host/commands/invite-user-to-room';
+import InviteUserToRoomTool from '@cardstack/boxel-host/commands/invite-user-to-room';
 
 export async function ensureSubmissionBotIsInRoom(
   commandContext: CommandContext,
   roomId: string,
 ) {
   try {
-    await new InviteUserToRoomCommand(commandContext).execute({
+    await new InviteUserToRoomTool(commandContext).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 5ad64a1725b..b5c19ab9ff2 100644
--- a/packages/experiments-realm/commands/create-patch-card-instance-request.ts
+++ b/packages/experiments-realm/commands/create-patch-card-instance-request.ts
@@ -1,10 +1,14 @@
 import { Command } from '@cardstack/runtime-common';
 
 import { PatchCardInput } from 'https://cardstack.com/base/command';
-import { StringField, contains, field } from 'https://cardstack.com/base/card-api';
+import {
+  StringField,
+  contains,
+  field,
+} from 'https://cardstack.com/base/card-api';
 
-import UseAiAssistantCommand from '@cardstack/boxel-host/commands/ai-assistant';
-import SendBotTriggerEventCommand from '@cardstack/boxel-host/commands/send-bot-trigger-event';
+import UseAiAssistantTool from '@cardstack/boxel-host/commands/ai-assistant';
+import SendBotTriggerEventTool from '@cardstack/boxel-host/commands/send-bot-trigger-event';
 import { ensureSubmissionBotIsInRoom } from './bot-request-utils';
 
 export class CreatePatchCardInstanceRequestInput extends PatchCardInput {
@@ -38,7 +42,7 @@ export default class CreatePatchCardInstanceRequestCommand extends Command<
 
     let roomId = input.roomId?.trim();
     if (!roomId) {
-      let createRoomResult = await new UseAiAssistantCommand(
+      let createRoomResult = await new UseAiAssistantTool(
         this.commandContext,
       ).execute({
         roomId: 'new',
@@ -50,7 +54,7 @@ export default class CreatePatchCardInstanceRequestCommand extends Command<
 
     await ensureSubmissionBotIsInRoom(this.commandContext, roomId);
 
-    await new SendBotTriggerEventCommand(this.commandContext).execute({
+    await new SendBotTriggerEventTool(this.commandContext).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 ae7229e948f..b01ff151932 100644
--- a/packages/experiments-realm/commands/create-show-card-request.ts
+++ b/packages/experiments-realm/commands/create-show-card-request.ts
@@ -1,9 +1,14 @@
 import { Command } from '@cardstack/runtime-common';
 
-import { CardDef, StringField, contains, field } from 'https://cardstack.com/base/card-api';
-
-import UseAiAssistantCommand from '@cardstack/boxel-host/commands/ai-assistant';
-import SendBotTriggerEventCommand from '@cardstack/boxel-host/commands/send-bot-trigger-event';
+import {
+  CardDef,
+  StringField,
+  contains,
+  field,
+} from 'https://cardstack.com/base/card-api';
+
+import UseAiAssistantTool from '@cardstack/boxel-host/commands/ai-assistant';
+import SendBotTriggerEventTool from '@cardstack/boxel-host/commands/send-bot-trigger-event';
 import { ensureSubmissionBotIsInRoom } from './bot-request-utils';
 
 export class CreateShowCardRequestInput extends CardDef {
@@ -32,7 +37,7 @@ export default class CreateShowCardRequestCommand extends Command<
       throw new Error('realm is required');
     }
 
-    let createRoomResult = await new UseAiAssistantCommand(
+    let createRoomResult = await new UseAiAssistantTool(
       this.commandContext,
     ).execute({
       roomId: 'new',
@@ -43,7 +48,7 @@ export default class CreateShowCardRequestCommand extends Command<
 
     await ensureSubmissionBotIsInRoom(this.commandContext, roomId);
 
-    await new SendBotTriggerEventCommand(this.commandContext).execute({
+    await new SendBotTriggerEventTool(this.commandContext).execute({
       roomId,
       realm,
       type: 'show-card',
diff --git a/packages/experiments-realm/google-image-search.gts b/packages/experiments-realm/google-image-search.gts
index 4957306633a..1ec6fc4168e 100644
--- a/packages/experiments-realm/google-image-search.gts
+++ b/packages/experiments-realm/google-image-search.gts
@@ -11,7 +11,7 @@ import {
   SearchGoogleImagesInput,
   SearchGoogleImagesResult,
 } from 'https://cardstack.com/base/command';
-import SearchGoogleImagesCommand from '@cardstack/boxel-host/commands/search-google-images';
+import SearchGoogleImagesTool from '@cardstack/boxel-host/commands/search-google-images';
 import { Button, FieldContainer } from '@cardstack/boxel-ui/components';
 import { IconSearchThick } from '@cardstack/boxel-ui/icons';
 import ArrowRight from '@cardstack/boxel-icons/arrow-right';
@@ -34,7 +34,7 @@ export class GoogleImageSearch extends CardDef {
     searchResource = commandData<
       typeof SearchGoogleImagesInput,
       typeof SearchGoogleImagesResult
-    >(this, SearchGoogleImagesCommand, () => {
+    >(this, SearchGoogleImagesTool, () => {
       return {
         query: this.args.model.searchQuery,
         maxResults: this.args.model.maxResults || 10,
diff --git a/packages/experiments-realm/screenshot-card-demo.gts b/packages/experiments-realm/screenshot-card-demo.gts
index 305895ee66a..216e5b267b6 100644
--- a/packages/experiments-realm/screenshot-card-demo.gts
+++ b/packages/experiments-realm/screenshot-card-demo.gts
@@ -11,7 +11,7 @@ import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 import { on } from '@ember/modifier';
 
-import ScreenshotCardCommand from '@cardstack/boxel-host/commands/screenshot-card';
+import ScreenshotCardTool from '@cardstack/boxel-host/commands/screenshot-card';
 import { Button } from '@cardstack/boxel-ui/components';
 
 type ScreenshotFormat = 'isolated' | 'embedded';
@@ -63,7 +63,7 @@ class Isolated extends Component<typeof ScreenshotCardDemo> {
     this.errorMessage = null;
     this.imageDefUrl = null;
     try {
-      let result = await new ScreenshotCardCommand(commandContext).execute({
+      let result = await new ScreenshotCardTool(commandContext).execute({
         card,
         format: this.effectiveFormat,
       });
diff --git a/packages/experiments-realm/set-llm-example.gts b/packages/experiments-realm/set-llm-example.gts
index 3ca2f435064..2bd7f98a40c 100644
--- a/packages/experiments-realm/set-llm-example.gts
+++ b/packages/experiments-realm/set-llm-example.gts
@@ -2,9 +2,9 @@ import { CardDef, Component } from 'https://cardstack.com/base/card-api';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { on } from '@ember/modifier';
-import SetActiveLLMCommand from '@cardstack/boxel-host/commands/set-active-llm';
-import CreateAiAssistantRoomCommand from '@cardstack/boxel-host/commands/create-ai-assistant-room';
-import OpenAiAssistantRoomCommand from '@cardstack/boxel-host/commands/open-ai-assistant-room';
+import SetActiveLLMTool from '@cardstack/boxel-host/commands/set-active-llm';
+import CreateAiAssistantRoomTool from '@cardstack/boxel-host/commands/create-ai-assistant-room';
+import OpenAiAssistantRoomTool from '@cardstack/boxel-host/commands/open-ai-assistant-room';
 import { Button } from '@cardstack/boxel-ui/components';
 
 class IsolatedTemplate extends Component<typeof SetLlmExample> {
@@ -16,14 +16,14 @@ class IsolatedTemplate extends Component<typeof SetLlmExample> {
     let commandContext = this.args.context?.commandContext;
     if (!commandContext) return;
 
-    let createAIAssistantRoomCommand = new CreateAiAssistantRoomCommand(
+    let createAIAssistantRoomCommand = new CreateAiAssistantRoomTool(
       commandContext,
     );
     let { roomId } = await createAIAssistantRoomCommand.execute({
       name: `Chat with ${this.modelId}`,
     });
 
-    let openAiAssistantRoomCommand = new OpenAiAssistantRoomCommand(
+    let openAiAssistantRoomCommand = new OpenAiAssistantRoomTool(
       commandContext,
     );
     await openAiAssistantRoomCommand.execute({
@@ -40,7 +40,7 @@ class IsolatedTemplate extends Component<typeof SetLlmExample> {
     let commandContext = this.args.context?.commandContext;
     if (!commandContext) return;
 
-    let setActiveLLMCommand = new SetActiveLLMCommand(commandContext);
+    let setActiveLLMCommand = new SetActiveLLMTool(commandContext);
 
     await setActiveLLMCommand.execute({
       model: this.modelId,
diff --git a/packages/experiments-realm/simple-search-card.gts b/packages/experiments-realm/simple-search-card.gts
index cd3e863a587..8ad2f2da4af 100644
--- a/packages/experiments-realm/simple-search-card.gts
+++ b/packages/experiments-realm/simple-search-card.gts
@@ -10,7 +10,7 @@ import {
   SearchCardsResult,
   SearchCardsByTypeAndTitleInput,
 } from 'https://cardstack.com/base/commands/search-card-result';
-import { SearchCardsByTypeAndTitleCommand } from '@cardstack/boxel-host/commands/search-cards';
+import { SearchCardsByTypeAndTitleTool } from '@cardstack/boxel-host/commands/search-cards';
 
 export class SimpleSearchCard extends CardDef {
   static displayName = 'Simple Search';
@@ -20,7 +20,7 @@ export class SimpleSearchCard extends CardDef {
     searchResource = commandData<
       typeof SearchCardsByTypeAndTitleInput,
       typeof SearchCardsResult
-    >(this, SearchCardsByTypeAndTitleCommand, () => {
+    >(this, SearchCardsByTypeAndTitleTool, () => {
       return {
         cardTitle: this.args.model.titleSearch,
       };
diff --git a/packages/experiments-realm/update-room-skills-example.gts b/packages/experiments-realm/update-room-skills-example.gts
index dbcb2493296..fdcd7ab5b03 100644
--- a/packages/experiments-realm/update-room-skills-example.gts
+++ b/packages/experiments-realm/update-room-skills-example.gts
@@ -10,7 +10,7 @@ import { fn } from '@ember/helper';
 import { on } from '@ember/modifier';
 import { tracked } from '@glimmer/tracking';
 
-import UpdateRoomSkillsCommand from '@cardstack/boxel-host/commands/update-room-skills';
+import UpdateRoomSkillsTool from '@cardstack/boxel-host/commands/update-room-skills';
 
 import { Button, FieldContainer } from '@cardstack/boxel-ui/components';
 
@@ -270,7 +270,7 @@ class Isolated extends Component<typeof UpdateRoomSkillsExample> {
     this.errorMessage = null;
 
     try {
-      let command = new UpdateRoomSkillsCommand(commandContext);
+      let command = new UpdateRoomSkillsTool(commandContext);
       await command.execute({
         roomId,
         skillCardIdsToActivate,
@@ -299,7 +299,7 @@ class Isolated extends Component<typeof UpdateRoomSkillsExample> {
       <h1>Update Room Skills Command</h1>
       <p class='intro'>
         Use this card to experiment with
-        <code>UpdateRoomSkillsCommand</code>. Provide a Matrix room ID, pick the
+        <code>UpdateRoomSkillsTool</code>. Provide a Matrix room ID, pick the
         skills you want to toggle, then run the command to publish the new
         configuration.
       </p>
@@ -452,7 +452,7 @@ class Isolated extends Component<typeof UpdateRoomSkillsExample> {
         disabled={{this.isApplyDisabled}}
         {{on 'click' this.applySkills}}
       >
-        {{if this.isExecuting 'Updating skills…' 'Run UpdateRoomSkillsCommand'}}
+        {{if this.isExecuting 'Updating skills…' 'Run UpdateRoomSkillsTool'}}
       </Button>
     </div>
 
diff --git a/packages/host/app/components/ai-assistant/code-block/index.gts b/packages/host/app/components/ai-assistant/code-block/index.gts
index 0b92ac64485..2e51fa2333a 100644
--- a/packages/host/app/components/ai-assistant/code-block/index.gts
+++ b/packages/host/app/components/ai-assistant/code-block/index.gts
@@ -18,15 +18,15 @@ import type { MonacoSDK } from '@cardstack/host/services/monaco-service';
 import CodeBlockActionsComponent, {
   type CodeBlockActionsSignature,
 } from './actions';
-import CodeBlockCommandHeader, {
-  type CodeBlockCommandHeaderSignature,
-} from './command-header';
 import CodeBlockDiffEditorHeader, {
   type CodeBlockDiffEditorHeaderSignature,
 } from './diff-editor-header';
 import CodeBlockPatchFooterComponent, {
   type CodeBlockPatchFooterSignature,
 } from './patch-footer';
+import CodeBlockToolCallHeader, {
+  type CodeBlockToolCallHeaderSignature,
+} from './tool-call-header';
 
 import type { ComponentLike } from '@glint/template';
 
@@ -70,7 +70,7 @@ interface Signature {
   Blocks: {
     default: [
       {
-        commandHeader: ComponentLike<CodeBlockCommandHeaderSignature>;
+        commandHeader: ComponentLike<CodeBlockToolCallHeaderSignature>;
         diffEditorHeader: ComponentLike<CodeBlockDiffEditorHeaderSignature>;
         editor: ComponentLike<CodeBlockEditorSignature>;
         diffEditor: ComponentLike<CodeBlockDiffEditorSignature>;
@@ -86,7 +86,7 @@ const CodeBlockComponent: TemplateOnlyComponent<Signature> = <template>
   <section class='code-block' ...attributes>
     {{yield
       (hash
-        commandHeader=(component CodeBlockCommandHeader)
+        commandHeader=(component CodeBlockToolCallHeader)
         diffEditorHeader=(component
           CodeBlockDiffEditorHeader
           codeData=@codeData
diff --git a/packages/host/app/components/ai-assistant/code-block/command-header.gts b/packages/host/app/components/ai-assistant/code-block/tool-call-header.gts
similarity index 91%
rename from packages/host/app/components/ai-assistant/code-block/command-header.gts
rename to packages/host/app/components/ai-assistant/code-block/tool-call-header.gts
index 2c0343f3f62..db41cd67919 100644
--- a/packages/host/app/components/ai-assistant/code-block/command-header.gts
+++ b/packages/host/app/components/ai-assistant/code-block/tool-call-header.gts
@@ -9,13 +9,13 @@ import ApplyButton, { type ApplyButtonState } from '../apply-button';
 
 import ViewCodeButton from './view-code-button';
 
-export interface CodeBlockCommandHeaderSignature {
+export interface CodeBlockToolCallHeaderSignature {
   Args: {
     action: () => void;
     actionVerb: string;
     code: string;
     commandDescription: string;
-    commandState: ApplyButtonState;
+    toolCallState: ApplyButtonState;
     hideCodeActions?: boolean;
     isDisplayingCode?: boolean;
     isCompact?: boolean;
@@ -25,7 +25,7 @@ export interface CodeBlockCommandHeaderSignature {
   Element: HTMLElement;
 }
 
-export default class CodeBlockCommandHeader extends Component<CodeBlockCommandHeaderSignature> {
+export default class CodeBlockToolCallHeader extends Component<CodeBlockToolCallHeaderSignature> {
   get isDisplayingCode() {
     return this.args.isDisplayingCode ?? false;
   }
@@ -52,9 +52,9 @@ export default class CodeBlockCommandHeader extends Component<CodeBlockCommandHe
           class='command-action'
           @actionVerb={{@actionVerb}}
           @isCompact={{@isCompact}}
-          @state={{@commandState}}
+          @state={{@toolCallState}}
           {{on 'click' @action}}
-          data-test-command-apply={{@commandState}}
+          data-test-tool-call-apply={{@toolCallState}}
         />
       </div>
     </header>
diff --git a/packages/host/app/components/ai-assistant/message/aibot-message.gts b/packages/host/app/components/ai-assistant/message/aibot-message.gts
index 9123c7d1e94..e40731e475b 100644
--- a/packages/host/app/components/ai-assistant/message/aibot-message.gts
+++ b/packages/host/app/components/ai-assistant/message/aibot-message.gts
@@ -31,8 +31,8 @@ import { parseSearchReplace } from '@cardstack/host/lib/search-replace-block-par
 
 import { getCodeDiffResultResource } from '@cardstack/host/resources/code-diff';
 
-import type CommandService from '@cardstack/host/services/command-service';
 import type { MonacoSDK } from '@cardstack/host/services/monaco-service';
+import type ToolService from '@cardstack/host/services/tool-service';
 
 import type { CodePatchStatus } from 'https://cardstack.com/base/matrix-event';
 
@@ -60,7 +60,7 @@ interface Signature {
 }
 
 export default class FormattedAiBotMessage extends Component<Signature> {
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
 
   @cached
   private get reasoningHtml() {
@@ -80,7 +80,7 @@ export default class FormattedAiBotMessage extends Component<Signature> {
   };
 
   private codePatchStatus = (codeData: CodeData) => {
-    return this.commandService.getCodePatchStatus(codeData);
+    return this.toolService.getCodePatchStatus(codeData);
   };
 
   <template>
@@ -122,11 +122,11 @@ export default class FormattedAiBotMessage extends Component<Signature> {
         {{#if (isHtmlPreTagGroup htmlPart)}}
           <HtmlGroupCodeBlock
             @codeData={{htmlPart.codeData}}
-            @codePatchResult={{this.commandService.getCodePatchResult
+            @codePatchResult={{this.toolService.getCodePatchResult
               htmlPart.codeData
             }}
             @onPatchCode={{fn
-              this.commandService.patchCode
+              this.toolService.patchCode
               htmlPart.codeData.roomId
               htmlPart.codeData.fileUrl
               (array htmlPart.codeData)
diff --git a/packages/host/app/components/ai-assistant/message/index.gts b/packages/host/app/components/ai-assistant/message/index.gts
index 21aad7c2cbe..0eac9e84158 100644
--- a/packages/host/app/components/ai-assistant/message/index.gts
+++ b/packages/host/app/components/ai-assistant/message/index.gts
@@ -23,7 +23,7 @@ import {
 
 import type { HtmlTagGroup } from '@cardstack/host/lib/formatted-message/utils';
 import type { Message } from '@cardstack/host/lib/matrix-classes/message';
-import type MessageCommand from '@cardstack/host/lib/matrix-classes/message-command';
+import type MessageTool from '@cardstack/host/lib/matrix-classes/message-tool';
 import type BillingService from '@cardstack/host/services/billing-service';
 import type MatrixService from '@cardstack/host/services/matrix-service';
 import type { MonacoSDK } from '@cardstack/host/services/monaco-service';
@@ -75,7 +75,7 @@ interface Signature {
     waitAction?: () => void;
     hideMeta?: boolean;
     isCodePatchCorrectness?: boolean;
-    commands?: MessageCommand[];
+    commands?: MessageTool[];
   };
   Blocks: { default: [] };
 }
@@ -508,7 +508,7 @@ export default class AiAssistantMessage extends Component<Signature> {
       }
       .ai-assistant-message.code-patch-correctness
         .content
-        > :deep(.room-message-command.compact + .room-message-command.compact) {
+        > :deep(.room-message-tool.compact + .room-message-tool.compact) {
         margin-top: 0;
       }
       :deep(pre) {
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 117da2ea614..18c56b9c812 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
@@ -20,11 +20,11 @@ import { MenuItem } from '@cardstack/boxel-ui/helpers';
 import { type getCard, GetCardContextName } from '@cardstack/runtime-common';
 
 import consumeContext from '@cardstack/host/helpers/consume-context';
-import { isMarkdownSkillId } from '@cardstack/host/lib/skill-commands';
-import type CommandService from '@cardstack/host/services/command-service';
+import { isMarkdownSkillId } from '@cardstack/host/lib/skill-tools';
 import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service';
 import type RealmService from '@cardstack/host/services/realm';
-import ShowCardCommand from '@cardstack/host/tools/show-card';
+import type ToolService from '@cardstack/host/services/tool-service';
+import ShowCardTool from '@cardstack/host/tools/show-card';
 
 interface SkillToggleSignature {
   Element: HTMLDivElement | HTMLButtonElement;
@@ -40,7 +40,7 @@ interface SkillToggleSignature {
 export default class SkillToggle extends Component<SkillToggleSignature> {
   @consume(GetCardContextName) declare private getCard: getCard;
   @service declare private realm: RealmService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private operatorModeStateService: OperatorModeStateService;
   @tracked private cardResource: ReturnType<getCard> | undefined;
 
@@ -100,15 +100,13 @@ export default class SkillToggle extends Component<SkillToggleSignature> {
   }
 
   private async openSkillCard() {
-    let showCardCommand = new ShowCardCommand(
-      this.commandService.commandContext,
-    );
+    let showCardCommand = new ShowCardTool(this.toolService.commandContext);
     await showCardCommand.execute({
       cardId: this.args.cardId,
     });
   }
 
-  // A skill markdown file is not a card, so `ShowCardCommand` can't open it.
+  // A skill markdown file is not a card, so `ShowCardTool` can't open it.
   // Open it the way any file opens: a file stack item in interact mode, or by
   // pointing the code editor at it in code mode.
   private async openSkillFile() {
diff --git a/packages/host/app/components/matrix/room-message-command.gts b/packages/host/app/components/matrix/room-message-tool.gts
similarity index 81%
rename from packages/host/app/components/matrix/room-message-command.gts
rename to packages/host/app/components/matrix/room-message-tool.gts
index 1327bc15d2a..96ea326670d 100644
--- a/packages/host/app/components/matrix/room-message-command.gts
+++ b/packages/host/app/components/matrix/room-message-tool.gts
@@ -24,18 +24,18 @@ import {
   getMenuItems,
 } from '@cardstack/runtime-common';
 
-import type { CommandRequest } from '@cardstack/runtime-common/commands';
+import type { ToolRequest } from '@cardstack/runtime-common/commands';
 
-import { isAutoExecutableCommand } from '@cardstack/host/lib/command-auto-execute';
-import type MessageCommand from '@cardstack/host/lib/matrix-classes/message-command';
+import type MessageTool from '@cardstack/host/lib/matrix-classes/message-tool';
+import { isAutoExecutableCommand } from '@cardstack/host/lib/tool-auto-execute';
 
 import type { RoomResource } from '@cardstack/host/resources/room';
-import type CommandService from '@cardstack/host/services/command-service';
 import type MatrixService from '@cardstack/host/services/matrix-service';
 
 import type { MonacoSDK } from '@cardstack/host/services/monaco-service';
 import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service';
 import type RealmService from '@cardstack/host/services/realm';
+import type ToolService from '@cardstack/host/services/tool-service';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
 
@@ -48,7 +48,7 @@ interface Signature {
   Element: HTMLDivElement;
   Args: {
     roomResource: RoomResource;
-    messageCommand: MessageCommand;
+    messageCommand: MessageTool;
     roomId: string;
     runCommand: () => void;
     isError?: boolean;
@@ -59,8 +59,8 @@ interface Signature {
   };
 }
 
-export default class RoomMessageCommand extends Component<Signature> {
-  @service declare private commandService: CommandService;
+export default class RoomMessageTool extends Component<Signature> {
+  @service declare private toolService: ToolService;
   @service declare private matrixService: MatrixService;
   @service declare private realm: RealmService;
   @service declare private operatorModeStateService: OperatorModeStateService;
@@ -72,7 +72,7 @@ export default class RoomMessageCommand extends Component<Signature> {
 
   @cached
   private get applyButtonState(): ApplyButtonState {
-    if (this.failedCommandState) {
+    if (this.failedToolState) {
       return 'failed';
     }
     if (this.didFailCorrectnessCheck) {
@@ -84,8 +84,8 @@ export default class RoomMessageCommand extends Component<Signature> {
     // 'act'), present the applying spinner immediately on message-landed
     // instead of the clickable Run button. Without this, the per-command
     // Apply button flashes through 'ready' for the ~100ms debounce window
-    // before command-service starts the run. If validation later fails
-    // in the drain, command-service dispatches an `invalid` commandResult
+    // before tool-service starts the run. If validation later fails
+    // in the drain, tool-service dispatches an `invalid` commandResult
     // event and the button transitions to its invalid state — no risk of
     // the spinner sticking.
     if ((status === 'ready' || status === undefined) && this.willAutoExecute) {
@@ -107,10 +107,10 @@ export default class RoomMessageCommand extends Component<Signature> {
     );
   }
 
-  @use private commandResultCard = resource(() => {
+  @use private toolResultCard = resource(() => {
     let initialState = { card: undefined } as { card: CardDef | undefined };
     let state = new TrackedObject(initialState);
-    if (this.args.messageCommand.commandResultFileDef) {
+    if (this.args.messageCommand.toolResultFileDef) {
       this.args.messageCommand.getCommandResultCard().then((card) => {
         state.card = card;
       });
@@ -120,13 +120,13 @@ export default class RoomMessageCommand extends Component<Signature> {
 
   private get isDisplayingCode() {
     return this.args.roomResource.isDisplayingCode(
-      this.args.messageCommand.commandRequest as CommandRequest,
+      this.args.messageCommand.toolRequest as ToolRequest,
     );
   }
 
   private toggleViewCode = () => {
     this.args.roomResource.toggleViewCode(
-      this.args.messageCommand.commandRequest as CommandRequest,
+      this.args.messageCommand.toolRequest as ToolRequest,
     );
   };
 
@@ -155,8 +155,8 @@ export default class RoomMessageCommand extends Component<Signature> {
   }
 
   private get headerTitle() {
-    if (this.commandResultCard.card) {
-      return cardTypeDisplayName(this.commandResultCard.card);
+    if (this.toolResultCard.card) {
+      return cardTypeDisplayName(this.toolResultCard.card);
     }
     return '';
   }
@@ -164,7 +164,7 @@ export default class RoomMessageCommand extends Component<Signature> {
   private get shouldDisplayResultCard() {
     let commandName = this.args.messageCommand.name ?? '';
     return (
-      !!this.commandResultCard.card &&
+      !!this.toolResultCard.card &&
       commandName !== 'checkCorrectness' &&
       !commandName.startsWith('switch-submode')
     );
@@ -174,7 +174,7 @@ export default class RoomMessageCommand extends Component<Signature> {
     if (this.args.messageCommand.name !== 'checkCorrectness') {
       return false;
     }
-    let card = this.commandResultCard.card as
+    let card = this.toolResultCard.card as
       | { correct?: boolean; errors?: unknown[] }
       | undefined;
     if (!card) {
@@ -188,7 +188,7 @@ export default class RoomMessageCommand extends Component<Signature> {
 
   private get moreOptionsMenuItems() {
     let menuItems =
-      this.commandResultCard.card?.[getMenuItems]?.({
+      this.toolResultCard.card?.[getMenuItems]?.({
         canEdit: false,
         cardCrudFunctions: {},
         menuContext: 'ai-assistant',
@@ -196,7 +196,7 @@ export default class RoomMessageCommand extends Component<Signature> {
           activeRealmURL: this.activeRealmURL,
           canEditActiveRealm: this.canEditActiveRealm,
         },
-        commandContext: this.commandService.commandContext,
+        commandContext: this.toolService.commandContext,
       }) ?? [];
     return toMenuItems(menuItems);
   }
@@ -211,23 +211,22 @@ export default class RoomMessageCommand extends Component<Signature> {
   }
 
   private get commandResultCardForRendering(): CardDef {
-    if (!this.commandResultCard.card) {
+    if (!this.toolResultCard.card) {
       throw new Error('Command result card is not available');
     }
-    return this.commandResultCard.card;
+    return this.toolResultCard.card;
   }
 
   @cached
-  private get failedCommandState() {
-    let commandRequest = this.args.messageCommand
-      .commandRequest as CommandRequest;
-    if (!commandRequest.id) {
+  private get failedToolState() {
+    let toolRequest = this.args.messageCommand.toolRequest as ToolRequest;
+    if (!toolRequest.id) {
       return undefined;
     }
-    return this.matrixService.failedCommandState.get(commandRequest.id);
+    return this.matrixService.failedToolState.get(toolRequest.id);
   }
 
-  private get invalidCommandState() {
+  private get invalidToolCallState() {
     return (
       this.args.messageCommand.status === 'invalid' &&
       !!this.args.messageCommand.failureReason
@@ -239,19 +238,19 @@ export default class RoomMessageCommand extends Component<Signature> {
   }
 
   private get hasFailedState() {
-    return !!(this.failedCommandState || this.didFailCorrectnessCheck);
+    return !!(this.failedToolState || this.didFailCorrectnessCheck);
   }
 
   <template>
     <div
       class={{cn
-        'room-message-command'
+        'room-message-tool'
         is-pending=@isPending
         is-error=@isError
         is-failed=(bool this.hasFailedState)
         compact=@isCompact
       }}
-      data-test-command-id={{@messageCommand.commandRequest.id}}
+      data-test-tool-call-id={{@messageCommand.toolRequest.id}}
       ...attributes
     >
       {{#if @isStreaming}}
@@ -259,7 +258,7 @@ export default class RoomMessageCommand extends Component<Signature> {
           class={{cn 'command-code-block' compact=@isCompact}}
           @monacoSDK={{@monacoSDK}}
           @codeData={{hash code=this.previewCommandCode language='json'}}
-          data-test-command-card-idle={{not
+          data-test-tool-call-card-idle={{not
             (eq this.applyButtonState 'applying')
           }}
           as |codeBlock|
@@ -270,7 +269,7 @@ export default class RoomMessageCommand extends Component<Signature> {
             @actionVerb={{@messageCommand.actionVerb}}
             @code={{this.previewCommandCode}}
             @isCompact={{@isCompact}}
-            @commandState='preparing'
+            @toolCallState='preparing'
           />
         </CodeBlock>
       {{else}}
@@ -279,7 +278,7 @@ export default class RoomMessageCommand extends Component<Signature> {
           {{this.scrollBottomIntoView}}
           @monacoSDK={{@monacoSDK}}
           @codeData={{hash code=this.previewCommandCode language='json'}}
-          data-test-command-card-idle={{not
+          data-test-tool-call-card-idle={{not
             (eq this.applyButtonState 'applying')
           }}
           as |codeBlock|
@@ -289,7 +288,7 @@ export default class RoomMessageCommand extends Component<Signature> {
             @action={{@runCommand}}
             @actionVerb={{@messageCommand.actionVerb}}
             @code={{this.previewCommandCode}}
-            @commandState={{this.applyButtonState}}
+            @toolCallState={{this.applyButtonState}}
             @isCompact={{@isCompact}}
             @isDisplayingCode={{this.isDisplayingCode}}
             @toggleCode={{this.toggleViewCode}}
@@ -298,14 +297,12 @@ export default class RoomMessageCommand extends Component<Signature> {
             <codeBlock.editor />
           {{/if}}
         </CodeBlock>
-        {{#if this.failedCommandState}}
+        {{#if this.failedToolState}}
           <Alert @type='error' as |Alert|>
-            <Alert.Messages
-              @messages={{array this.failedCommandState.message}}
-            />
+            <Alert.Messages @messages={{array this.failedToolState.message}} />
             <Alert.Action @action={{@runCommand}} @actionName='Retry' />
           </Alert>
-        {{else if this.invalidCommandState}}
+        {{else if this.invalidToolCallState}}
           <Alert @type='warning' as |Alert|>
             <Alert.Messages @messages={{array @messageCommand.failureReason}} />
             <Alert.Action @action={{@runCommand}} @actionName='Try Anyway' />
@@ -315,14 +312,14 @@ export default class RoomMessageCommand extends Component<Signature> {
           <CardContainer
             @displayBoundaries={{false}}
             class='command-result-card-preview'
-            data-test-command-result-container
+            data-test-tool-result-container
           >
             <CardHeader
               @cardTypeDisplayName={{this.headerTitle}}
               @cardTypeIcon={{cardTypeIcon this.commandResultCardForRendering}}
               @moreOptionsMenuItems={{this.moreOptionsMenuItems}}
               class='command-result-card-header'
-              data-test-command-result-header
+              data-test-tool-result-header
             />
             <CardRenderer
               @card={{this.commandResultCardForRendering}}
@@ -336,7 +333,7 @@ export default class RoomMessageCommand extends Component<Signature> {
     </div>
 
     <style scoped>
-      .room-message-command > * + * {
+      .room-message-tool > * + * {
         margin-top: var(--boxel-sp-xs);
       }
       .command-result-card-preview {
diff --git a/packages/host/app/components/matrix/room-message.gts b/packages/host/app/components/matrix/room-message.gts
index b8c4c608d8f..95cb0c1356b 100644
--- a/packages/host/app/components/matrix/room-message.gts
+++ b/packages/host/app/components/matrix/room-message.gts
@@ -19,15 +19,15 @@ import {
   GetCardCollectionContextName,
 } from '@cardstack/runtime-common';
 
-import type MessageCommand from '@cardstack/host/lib/matrix-classes/message-command';
+import type MessageTool from '@cardstack/host/lib/matrix-classes/message-tool';
 import type { RoomResource } from '@cardstack/host/resources/room';
-import type CommandService from '@cardstack/host/services/command-service';
 import type { MonacoSDK } from '@cardstack/host/services/monaco-service';
+import type ToolService from '@cardstack/host/services/tool-service';
 
 import AiAssistantMessage from '../ai-assistant/message';
 import { aiBotUserId } from '../ai-assistant/panel';
 
-import RoomMessageCommand from './room-message-command';
+import RoomMessageTool from './room-message-tool';
 
 interface Signature {
   Element: HTMLElement;
@@ -163,8 +163,8 @@ export default class RoomMessage extends Component<Signature> {
     return undefined;
   }
 
-  private run = task(async (command: MessageCommand) => {
-    return this.commandService.run.unlinked().perform(command);
+  private run = task(async (command: MessageTool) => {
+    return this.toolService.run.unlinked().perform(command);
   });
 
   <template>
@@ -210,13 +210,13 @@ export default class RoomMessage extends Component<Signature> {
         @isPending={{@isPending}}
         @hideMeta={{this.message.isCodePatchCorrectness}}
         @isCodePatchCorrectness={{this.message.isCodePatchCorrectness}}
-        @commands={{this.message.commands}}
+        @commands={{this.message.tools}}
         data-test-boxel-message-from={{this.message.author.name}}
         data-test-boxel-message-instance-id={{this.message.instanceId}}
         ...attributes
       >
-        {{#each this.message.commands as |command|}}
-          <RoomMessageCommand
+        {{#each this.message.tools as |command|}}
+          <RoomMessageTool
             @messageCommand={{command}}
             @roomResource={{@roomResource}}
             @runCommand={{fn (perform this.run) command}}
@@ -232,7 +232,7 @@ export default class RoomMessage extends Component<Signature> {
     {{/if}}
   </template>
 
-  @service declare commandService: CommandService;
+  @service declare toolService: ToolService;
 
   knownErrorMessagePrefixes: { [errorMessagePrefix: string]: string }[] = [
     {
diff --git a/packages/host/app/components/matrix/room.gts b/packages/host/app/components/matrix/room.gts
index 96f77569c61..c6cbac2a9c9 100644
--- a/packages/host/app/components/matrix/room.gts
+++ b/packages/host/app/components/matrix/room.gts
@@ -54,17 +54,16 @@ import {
 import { DEFAULT_FALLBACK_MODELS } from '@cardstack/runtime-common/matrix-constants';
 
 import ENV from '@cardstack/host/config/environment';
-import { isAutoExecutableCommand } from '@cardstack/host/lib/command-auto-execute';
 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 { getAutoAttachment } from '@cardstack/host/resources/auto-attached-card';
 import { isReady } from '@cardstack/host/resources/file';
 import type { RoomResource } from '@cardstack/host/resources/room';
 
 import type AiAssistantPanelService from '@cardstack/host/services/ai-assistant-panel-service';
 import type CardService from '@cardstack/host/services/card-service';
-import type CommandService from '@cardstack/host/services/command-service';
 import type FileUploadService from '@cardstack/host/services/file-upload';
 import type LoaderService from '@cardstack/host/services/loader-service';
 import type MatrixService from '@cardstack/host/services/matrix-service';
@@ -74,7 +73,8 @@ import type OperatorModeStateService from '@cardstack/host/services/operator-mod
 import type PlaygroundPanelService from '@cardstack/host/services/playground-panel-service';
 import type SpecPanelService from '@cardstack/host/services/spec-panel-service';
 import type StoreService from '@cardstack/host/services/store';
-import UpdateRoomSkillsCommand from '@cardstack/host/tools/update-room-skills';
+import type ToolService from '@cardstack/host/services/tool-service';
+import UpdateRoomSkillsTool from '@cardstack/host/tools/update-room-skills';
 import { FileDefAttributesExtractor } from '@cardstack/host/utils/file-def-attributes-extractor';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
@@ -566,7 +566,7 @@ export default class Room extends Component<Signature> {
 
   @service declare private store: StoreService;
   @service declare private cardService: CardService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service('file-upload') declare private fileUpload: FileUploadService;
   @service('loader-service') declare private loaderService: LoaderService;
   @service declare private matrixService: MatrixService;
@@ -1015,7 +1015,7 @@ export default class Room extends Component<Signature> {
   private get isAcceptingAll() {
     return (
       this.executeAllReadyActionsTask.isRunning ||
-      this.commandService.isPerformingAcceptAllForRoom(this.args.roomId)
+      this.toolService.isPerformingAcceptAllForRoom(this.args.roomId)
     );
   }
 
@@ -1760,9 +1760,7 @@ export default class Room extends Component<Signature> {
 
   private updateSkillIsActiveTask = task(
     async (isActive: boolean, skillCardId?: string) => {
-      await new UpdateRoomSkillsCommand(
-        this.commandService.commandContext,
-      ).execute({
+      await new UpdateRoomSkillsTool(this.toolService.commandContext).execute({
         roomId: this.args.roomId,
         skillCardIdsToActivate: isActive ? [skillCardId!] : [],
         skillCardIdsToDeactivate: isActive ? [] : [skillCardId!],
@@ -1811,8 +1809,8 @@ export default class Room extends Component<Signature> {
   }
 
   private attachSkillTask = task(async (cardId: string) => {
-    let updateRoomSkillsCommand = new UpdateRoomSkillsCommand(
-      this.commandService.commandContext,
+    let updateRoomSkillsCommand = new UpdateRoomSkillsTool(
+      this.toolService.commandContext,
     );
 
     await updateRoomSkillsCommand.execute({
@@ -1862,7 +1860,7 @@ export default class Room extends Component<Signature> {
   private get readyCommands() {
     let lastMessage = this.messages[this.messages.length - 1];
 
-    if (!lastMessage || !lastMessage.commands) {
+    if (!lastMessage || !lastMessage.tools) {
       return [];
     }
     let roomResource = this.matrixService.roomResources.get(this.args.roomId);
@@ -1871,16 +1869,14 @@ export default class Room extends Component<Signature> {
     );
     let isOwnedByCurrentAgent =
       lastMessage.agentId === this.matrixService.agentId;
-    return lastMessage.commands.filter(
+    return lastMessage.tools.filter(
       (command) =>
         (command.status === 'ready' || command.status === undefined) &&
-        !this.commandService.currentlyExecutingCommandRequestIds.has(
-          command.id!,
-        ) &&
-        !this.commandService.executedCommandRequestIds.has(command.id!) &&
+        !this.toolService.currentlyExecutingToolRequestIds.has(command.id!) &&
+        !this.toolService.executedToolRequestIds.has(command.id!) &&
         // Commands destined for auto-execution must not surface the manual
         // Accept All / Cancel bar, even during the ~100ms debounce before
-        // command-service flips `acceptingAllRoomIds`. Without this filter,
+        // 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),
@@ -1891,7 +1887,7 @@ export default class Room extends Component<Signature> {
   private get readyCodePatches() {
     let lastMessage = this.messages[this.messages.length - 1];
     if (!lastMessage || !lastMessage.htmlParts) return [];
-    return this.commandService.getReadyCodePatches(lastMessage.htmlParts);
+    return this.toolService.getReadyCodePatches(lastMessage.htmlParts);
   }
 
   private get generatingResults() {
@@ -1933,7 +1929,7 @@ export default class Room extends Component<Signature> {
   private async executeReadyCommands() {
     for (let command of this.readyCommands) {
       this.acceptingAllLabel = command.actionVerb;
-      await this.commandService.run.unlinked().perform(command);
+      await this.toolService.run.unlinked().perform(command);
       this.acceptingAllLabel = undefined;
     }
   }
@@ -1942,7 +1938,7 @@ export default class Room extends Component<Signature> {
     let lastMessage = this.messages[this.messages.length - 1];
     if (!lastMessage || !lastMessage.htmlParts) return;
 
-    await this.commandService.executeReadyCodePatches(
+    await this.toolService.executeReadyCodePatches(
       this.args.roomId,
       lastMessage.htmlParts,
     );
diff --git a/packages/host/app/components/operator-mode/code-editor.gts b/packages/host/app/components/operator-mode/code-editor.gts
index dd58857cd7f..cdafaad6246 100644
--- a/packages/host/app/components/operator-mode/code-editor.gts
+++ b/packages/host/app/components/operator-mode/code-editor.gts
@@ -45,7 +45,6 @@ import type {
   ModuleDeclaration,
 } from '@cardstack/host/resources/module-contents';
 import type { SaveType } from '@cardstack/host/services/card-service';
-import type CommandService from '@cardstack/host/services/command-service';
 import type EnvironmentService from '@cardstack/host/services/environment-service';
 import { findDeclarationByName } from '@cardstack/host/services/module-contents-service';
 import type MonacoService from '@cardstack/host/services/monaco-service';
@@ -54,7 +53,8 @@ import type NetworkService from '@cardstack/host/services/network';
 import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service';
 import type RecentFilesService from '@cardstack/host/services/recent-files-service';
 import type StoreService from '@cardstack/host/services/store';
-import LintAndFixCommand from '@cardstack/host/tools/lint-and-fix';
+import type ToolService from '@cardstack/host/services/tool-service';
+import LintAndFixTool from '@cardstack/host/tools/lint-and-fix';
 import { applyBoxelFormatting } from '@cardstack/host/utils/editor/boxel-formatter';
 
 import BinaryFileInfo from './binary-file-info';
@@ -83,7 +83,7 @@ export default class CodeEditor extends Component<Signature> {
   @service declare private environmentService: EnvironmentService;
   @service declare private recentFilesService: RecentFilesService;
   @service declare private store: StoreService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private network: NetworkService;
 
   @tracked private maybeMonacoSDK: MonacoSDK | undefined;
@@ -587,9 +587,7 @@ export default class CodeEditor extends Component<Signature> {
     this.updateFormatActionAvailability();
 
     try {
-      let lintCommand = new LintAndFixCommand(
-        this.commandService.commandContext,
-      );
+      let lintCommand = new LintAndFixTool(this.toolService.commandContext);
       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 56d3b51d41f..341109bd967 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
@@ -68,7 +68,6 @@ import {
   type ModuleDeclaration,
 } from '@cardstack/host/resources/module-contents';
 
-import type CommandService from '@cardstack/host/services/command-service';
 import type LoaderService from '@cardstack/host/services/loader-service';
 import type MatrixService from '@cardstack/host/services/matrix-service';
 import type NetworkService from '@cardstack/host/services/network';
@@ -80,7 +79,8 @@ import type RealmService from '@cardstack/host/services/realm';
 import type RealmServerService from '@cardstack/host/services/realm-server';
 import type SpecPanelService from '@cardstack/host/services/spec-panel-service';
 import type StoreService from '@cardstack/host/services/store';
-import CreateSpecCommand from '@cardstack/host/tools/create-specs';
+import type ToolService from '@cardstack/host/services/tool-service';
+import CreateSpecTool from '@cardstack/host/tools/create-specs';
 
 import { idFromCardOrURL } from '@cardstack/host/utils/id-from-card-or-url';
 import { PlaygroundSelections } from '@cardstack/host/utils/local-storage-keys';
@@ -130,7 +130,7 @@ interface ModuleInspectorSignature {
 }
 
 export default class ModuleInspector extends Component<ModuleInspectorSignature> {
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private loaderService: LoaderService;
   @service declare private matrixService: MatrixService;
   @service declare private network: NetworkService;
@@ -293,7 +293,7 @@ export default class ModuleInspector extends Component<ModuleInspectorSignature>
           return false;
         }
 
-        return this.commandService.getCodePatchStatus(codeData) === 'ready';
+        return this.toolService.getCodePatchStatus(codeData) === 'ready';
       });
     }
 
@@ -520,8 +520,8 @@ export default class ModuleInspector extends Component<ModuleInspectorSignature>
 
   private createSpecTask = task(async (ref: ResolvedCodeRef) => {
     try {
-      const createSpecCommand = new CreateSpecCommand(
-        this.commandService.commandContext,
+      const createSpecCommand = new CreateSpecTool(
+        this.toolService.commandContext,
       );
       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 c25d9233a31..45ce34f80b8 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
@@ -67,7 +67,6 @@ import ElementTracker, {
 } from '@cardstack/host/resources/element-tracker';
 
 import type AiAssistantPanelService from '@cardstack/host/services/ai-assistant-panel-service';
-import type CommandService from '@cardstack/host/services/command-service';
 import type LoaderService from '@cardstack/host/services/loader-service';
 import type MatrixService from '@cardstack/host/services/matrix-service';
 import type NetworkService from '@cardstack/host/services/network';
@@ -79,6 +78,7 @@ import type { RecentCard } from '@cardstack/host/services/recent-cards-service';
 import type RecentCardsService from '@cardstack/host/services/recent-cards-service';
 import type RecentFilesService from '@cardstack/host/services/recent-files-service';
 import type StoreService from '@cardstack/host/services/store';
+import type ToolService from '@cardstack/host/services/tool-service';
 
 import type {
   CardContext,
@@ -127,7 +127,7 @@ export default class PlaygroundPanel extends Component<Signature> {
   @consume(GetCardsContextName) declare private getCards: getCards;
   @consume(CardContextName) declare private cardContext: CardContext;
   @service declare private aiAssistantPanelService: AiAssistantPanelService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private loaderService: LoaderService;
   @service declare private matrixService: MatrixService;
   @service declare private network: NetworkService;
@@ -223,7 +223,7 @@ export default class PlaygroundPanel extends Component<Signature> {
         canEdit: this.canEditCard,
         cardCrudFunctions: {},
         menuContext: 'code-mode-playground',
-        commandContext: this.commandService.commandContext,
+        commandContext: this.toolService.commandContext,
         format: this.format,
       }) || [],
     );
diff --git a/packages/host/app/components/operator-mode/container.gts b/packages/host/app/components/operator-mode/container.gts
index 898d40ec603..83a01e73d5d 100644
--- a/packages/host/app/components/operator-mode/container.gts
+++ b/packages/host/app/components/operator-mode/container.gts
@@ -45,11 +45,11 @@ import { Submodes } from '../submode-switcher';
 import CreateListingModal from './create-listing-modal';
 
 import type CardService from '../../services/card-service';
-import type CommandService from '../../services/command-service';
 import type MatrixService from '../../services/matrix-service';
 import type OperatorModeStateService from '../../services/operator-mode-state-service';
 import type RealmServerService from '../../services/realm-server';
 import type StoreService from '../../services/store';
+import type ToolService from '../../services/tool-service';
 const waiter = buildWaiter('operator-mode-container:saveCard-waiter');
 
 interface Signature {
@@ -65,7 +65,7 @@ export default class OperatorModeContainer extends Component<Signature> {
   @service declare private operatorModeStateService: OperatorModeStateService;
   @service declare private messageService: MessageService;
   @service declare realmServer: RealmServerService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private store: StoreService;
 
   constructor(owner: Owner, args: Signature['Args']) {
@@ -96,7 +96,7 @@ export default class OperatorModeContainer extends Component<Signature> {
 
   @provide(CommandContextName)
   private get commandContext() {
-    return this.commandService.commandContext;
+    return this.toolService.commandContext;
   }
 
   @provide(CardContextName)
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 6970aa8106a..872b4c8680a 100644
--- a/packages/host/app/components/operator-mode/create-file-modal.gts
+++ b/packages/host/app/components/operator-mode/create-file-modal.gts
@@ -55,7 +55,7 @@ import { codeRefWithAbsoluteIdentifier } from '@cardstack/runtime-common/code-re
 import config from '@cardstack/host/config/environment';
 
 import type RealmService from '@cardstack/host/services/realm';
-import CopyCardToRealmCommand from '@cardstack/host/tools/copy-card';
+import CopyCardToRealmTool from '@cardstack/host/tools/copy-card';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
 import type { Spec } from 'https://cardstack.com/base/spec';
@@ -72,9 +72,9 @@ import WithKnownRealmsLoaded from '../with-known-realms-loaded';
 import CardErrorDetail from './card-error-detail';
 
 import type CardService from '../../services/card-service';
-import type CommandService from '../../services/command-service';
 import type NetworkService from '../../services/network';
 import type StoreService from '../../services/store';
+import type ToolService from '../../services/tool-service';
 
 export type NewFileType =
   | 'duplicate-instance'
@@ -462,7 +462,7 @@ export default class CreateFileModal extends Component<Signature> {
   @consume(GetCardContextName) declare private getCard: getCard<Spec>;
 
   @service declare private cardService: CardService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private network: NetworkService;
   @service declare private store: StoreService;
 
@@ -929,8 +929,8 @@ export class ${className} extends ${exportName} {
         `Cannot duplicateCardInstance where where is no selected realm URL`,
       );
     }
-    let { newCardId } = await new CopyCardToRealmCommand(
-      this.commandService.commandContext,
+    let { newCardId } = await new CopyCardToRealmTool(
+      this.toolService.commandContext,
     ).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 d983d4891ff..efce3cf7b41 100644
--- a/packages/host/app/components/operator-mode/create-listing-modal.gts
+++ b/packages/host/app/components/operator-mode/create-listing-modal.gts
@@ -33,17 +33,17 @@ import ModalContainer from '@cardstack/host/components/modal-container';
 import { SelectedTypePill } from '@cardstack/host/components/operator-mode/create-file-modal';
 import { Submodes } from '@cardstack/host/components/submode-switcher';
 
-import type CommandService from '@cardstack/host/services/command-service';
 import type LoaderService from '@cardstack/host/services/loader-service';
 import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service';
 import type RealmService from '@cardstack/host/services/realm';
+import type ToolService from '@cardstack/host/services/tool-service';
 
 interface Signature {
   Args: {};
 }
 
 export default class CreateListingModal extends Component<Signature> {
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private loaderService: LoaderService;
   @service declare private operatorModeStateService: OperatorModeStateService;
   @service declare private realm: RealmService;
@@ -194,7 +194,7 @@ export default class CreateListingModal extends Component<Signature> {
     let ListingCreateCommand = module.default;
 
     let result = await new ListingCreateCommand(
-      this.commandService.commandContext,
+      this.toolService.commandContext,
     ).execute({
       codeRef,
       targetRealm,
diff --git a/packages/host/app/components/operator-mode/detail-panel-selector.gts b/packages/host/app/components/operator-mode/detail-panel-selector.gts
index 1b878b6f41c..dc6ed07c86b 100644
--- a/packages/host/app/components/operator-mode/detail-panel-selector.gts
+++ b/packages/host/app/components/operator-mode/detail-panel-selector.gts
@@ -18,7 +18,7 @@ import scrollIntoViewModifier from '@cardstack/host/modifiers/scroll-into-view';
 import {
   type ModuleDeclaration,
   isCardOrFieldDeclaration,
-  isCommandDeclaration,
+  isToolDeclaration,
   isReexportCardOrField,
 } from '@cardstack/host/resources/module-contents';
 
@@ -113,8 +113,8 @@ export default class Selector extends Component<Signature> {
       return typeOfCardOrField(declaration.cardOrField);
     } else if (isReexportCardOrField(declaration)) {
       return typeOfCardOrField(declaration.cardOrField);
-    } else if (isCommandDeclaration(declaration)) {
-      return 'command';
+    } else if (isToolDeclaration(declaration)) {
+      return 'tool';
     } else if (declaration.type === 'class') {
       return 'class';
     } else if (declaration.type === 'function') {
diff --git a/packages/host/app/components/operator-mode/detail-panel.gts b/packages/host/app/components/operator-mode/detail-panel.gts
index c45bb976795..83ab14e6c41 100644
--- a/packages/host/app/components/operator-mode/detail-panel.gts
+++ b/packages/host/app/components/operator-mode/detail-panel.gts
@@ -48,17 +48,17 @@ import type { Ready } from '@cardstack/host/resources/file';
 import {
   type ModuleDeclaration,
   isCardOrFieldDeclaration,
-  isCommandDeclaration,
+  isToolDeclaration,
   isComponentDeclaration,
   isReexportCardOrField,
 } from '@cardstack/host/resources/module-contents';
 
 import { getResolvedCodeRefFromType } from '@cardstack/host/services/card-type-service';
-import type CommandService from '@cardstack/host/services/command-service';
 import type NetworkService from '@cardstack/host/services/network';
 import type RealmService from '@cardstack/host/services/realm';
 import type StoreService from '@cardstack/host/services/store';
-import OpenCreateListingModalCommand from '@cardstack/host/tools/open-create-listing-modal';
+import type ToolService from '@cardstack/host/services/tool-service';
+import OpenCreateListingModalTool from '@cardstack/host/tools/open-create-listing-modal';
 
 import type { CardDef, BaseDef } from 'https://cardstack.com/base/card-api';
 
@@ -116,7 +116,7 @@ export default class DetailPanel extends Component<Signature> {
   @service declare private network: NetworkService;
   @service declare private operatorModeStateService: OperatorModeStateService;
   @service declare private realm: RealmService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private store: StoreService;
 
   private lastModified = lastModifiedDate(this, () => this.args.readyFile);
@@ -212,11 +212,11 @@ export default class DetailPanel extends Component<Signature> {
     );
   }
 
-  private get showCommandPanel() {
+  private get showToolPanel() {
     return (
       this.isModule &&
       this.args.selectedDeclaration &&
-      isCommandDeclaration(this.args.selectedDeclaration)
+      isToolDeclaration(this.args.selectedDeclaration)
     );
   }
 
@@ -455,8 +455,8 @@ export default class DetailPanel extends Component<Signature> {
   }
 
   @action private async createListing() {
-    const command = new OpenCreateListingModalCommand(
-      this.commandService.commandContext,
+    const command = new OpenCreateListingModalTool(
+      this.toolService.commandContext,
     );
     const targetRealm = this.operatorModeStateService.realmURL;
     if (!targetRealm) {
@@ -791,16 +791,16 @@ export default class DetailPanel extends Component<Signature> {
             {{/let}}
           {{/if}}
         </PanelSection>
-      {{else if this.showCommandPanel}}
+      {{else if this.showToolPanel}}
         <PanelSection as |PanelHeader|>
           <PanelHeader
-            aria-label='Command Panel Header'
-            data-test-command-panel-header
+            aria-label='Tool Panel Header'
+            data-test-tool-panel-header
           >
-            Command
+            Tool
           </PanelHeader>
           <ModuleDefinitionContainer
-            @title='Command'
+            @title='Tool'
             @fileURL={{@readyFile.url}}
             @name={{this.selectedDeclarationName}}
             @fileExtension={{this.fileExtension}}
diff --git a/packages/host/app/components/operator-mode/error-display.gts b/packages/host/app/components/operator-mode/error-display.gts
index ca8c5a22804..7133772e9e0 100644
--- a/packages/host/app/components/operator-mode/error-display.gts
+++ b/packages/host/app/components/operator-mode/error-display.gts
@@ -15,11 +15,10 @@ import {
   Warning,
 } from '@cardstack/boxel-ui/icons';
 
-import type CommandService from '@cardstack/host/services/command-service';
-
 import type ErrorDisplayService from '@cardstack/host/services/error-display';
 import type { DisplayedErrorProvider } from '@cardstack/host/services/error-display';
-import SwitchSubmodeCommand from '@cardstack/host/tools/switch-submode';
+import type ToolService from '@cardstack/host/services/tool-service';
+import SwitchSubmodeTool from '@cardstack/host/tools/switch-submode';
 
 import type { FileDef } from 'https://cardstack.com/base/file-api';
 import type { BoxelErrorForContext } from 'https://cardstack.com/base/matrix-event';
@@ -89,7 +88,7 @@ export default class ErrorDisplay
 {
   @tracked private showDetails = this.args.openDetails ?? false;
 
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private errorDisplay: ErrorDisplayService;
 
   constructor(owner: any, args: any) {
@@ -99,8 +98,8 @@ export default class ErrorDisplay
   }
 
   private viewInCodeMode = dropTask(async () => {
-    let switchSubmodeCommand = new SwitchSubmodeCommand(
-      this.commandService.commandContext,
+    let switchSubmodeCommand = new SwitchSubmodeTool(
+      this.toolService.commandContext,
     );
     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 5e8d4cd31c2..d83ffea0bea 100644
--- a/packages/host/app/components/operator-mode/host-submode.gts
+++ b/packages/host/app/components/operator-mode/host-submode.gts
@@ -19,13 +19,13 @@ import OpenSitePopover from '@cardstack/host/components/operator-mode/host-submo
 import PublishingRealmPopover from '@cardstack/host/components/operator-mode/host-submode/publishing-realm-popover';
 import PublishRealmModal from '@cardstack/host/components/operator-mode/publish-realm-modal';
 
-import type CommandService from '@cardstack/host/services/command-service';
 import type HostModeService from '@cardstack/host/services/host-mode-service';
 import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service';
 import type RealmService from '@cardstack/host/services/realm';
 import type StoreService from '@cardstack/host/services/store';
-import PublishRealmCommand from '@cardstack/host/tools/publish-realm';
-import UnpublishRealmCommand from '@cardstack/host/tools/unpublish-realm';
+import type ToolService from '@cardstack/host/services/tool-service';
+import PublishRealmTool from '@cardstack/host/tools/publish-realm';
+import UnpublishRealmTool from '@cardstack/host/tools/unpublish-realm';
 
 import { idFromCardOrURL } from '@cardstack/host/utils/id-from-card-or-url';
 
@@ -47,7 +47,7 @@ export default class HostSubmode extends Component<HostSubmodeSignature> {
   @service declare private store: StoreService;
   @service declare private realm: RealmService;
   @service declare private hostModeService: HostModeService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
 
   @tracked isPublishRealmModalOpen = false;
   @tracked isPublishingRealmPopoverOpen = false;
@@ -101,7 +101,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 PublishRealmCommand(this.commandService.commandContext);
+    let command = new PublishRealmTool(this.toolService.commandContext);
     let result = await command.execute({
       realmURL: this.realmURL,
       publishedRealmURLs,
@@ -146,7 +146,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 UnpublishRealmCommand(this.commandService.commandContext);
+    let command = new UnpublishRealmTool(this.toolService.commandContext);
     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 f03f54a07ad..b14f9bd52c8 100644
--- a/packages/host/app/components/operator-mode/interact-submode.gts
+++ b/packages/host/app/components/operator-mode/interact-submode.gts
@@ -55,7 +55,7 @@ import {
 } from '@cardstack/host/lib/stack-item';
 
 import { stackBackgroundsResource } from '@cardstack/host/resources/stack-backgrounds';
-import CopyCardToStackCommand from '@cardstack/host/tools/copy-card-to-stack';
+import CopyCardToStackTool from '@cardstack/host/tools/copy-card-to-stack';
 
 import { idFromCardOrURL } from '@cardstack/host/utils/id-from-card-or-url';
 
@@ -86,7 +86,6 @@ import type { CardDefOrId } from './stack-item';
 import type { StackItemComponentAPI } from './stack-item';
 
 import type CardService from '../../services/card-service';
-import type CommandService from '../../services/command-service';
 import type LoaderService from '../../services/loader-service';
 import type NetworkService from '../../services/network';
 import type OperatorModeStateService from '../../services/operator-mode-state-service';
@@ -94,6 +93,7 @@ import type Realm from '../../services/realm';
 import type RealmServer from '../../services/realm-server';
 import type RecentCardsService from '../../services/recent-cards-service';
 import type StoreService from '../../services/store';
+import type ToolService from '../../services/tool-service';
 
 const waiter = buildWaiter('operator-mode:interact-submode-waiter');
 
@@ -142,7 +142,7 @@ export default class InteractSubmode extends Component {
   @consume(CardContextName) declare private cardContext: CardContext;
 
   @service declare private cardService: CardService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private operatorModeStateService: OperatorModeStateService;
   @service declare private store: StoreService;
   @service declare private realm: Realm;
@@ -503,8 +503,8 @@ export default class InteractSubmode extends Component {
         let newCardId: string | undefined;
         let targetStackIndex = destinationItem.stackIndex;
         for (let [index, card] of sources.entries()) {
-          ({ newCardId } = await new CopyCardToStackCommand(
-            this.commandService.commandContext,
+          ({ newCardId } = await new CopyCardToStackTool(
+            this.toolService.commandContext,
           ).execute({
             sourceCard: card,
             targetStackIndex,
@@ -926,7 +926,7 @@ export default class InteractSubmode extends Component {
                 @saveCard={{this.saveCard}}
                 @editCard={{fn this.editCard stackIndex}}
                 @deleteCard={{this.requestDeleteCard}}
-                @commandContext={{this.commandService.commandContext}}
+                @commandContext={{this.toolService.commandContext}}
                 @close={{this.close}}
                 @onSelectedCards={{this.onSelectedCards}}
                 @setupStackItem={{this.setupStackItem}}
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 9ed4341bfa2..1548daf76ad 100644
--- a/packages/host/app/components/operator-mode/preview-panel/index.gts
+++ b/packages/host/app/components/operator-mode/preview-panel/index.gts
@@ -40,10 +40,10 @@ import Overlays from '@cardstack/host/components/operator-mode/overlays';
 import ElementTracker, {
   type RenderedCardForOverlayActions,
 } from '@cardstack/host/resources/element-tracker';
-import type CommandService from '@cardstack/host/services/command-service';
 import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service';
 
 import type RealmService from '@cardstack/host/services/realm';
+import type ToolService from '@cardstack/host/services/tool-service';
 
 import type {
   BaseDef,
@@ -71,7 +71,7 @@ interface Signature {
 
 export default class PreviewPanel extends Component<Signature> {
   @consume(CardContextName) declare private cardContext: CardContext;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private operatorModeStateService: OperatorModeStateService;
   @service declare private realm: RealmService;
 
@@ -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.commandService.commandContext,
+        commandContext: this.toolService.commandContext,
       }),
     );
   }
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 d9a237d9de5..3fb56d2e01e 100644
--- a/packages/host/app/components/operator-mode/publish-realm-modal.gts
+++ b/packages/host/app/components/operator-mode/publish-realm-modal.gts
@@ -39,7 +39,6 @@ import WithLoadedRealm from '@cardstack/host/components/with-loaded-realm';
 
 import config from '@cardstack/host/config/environment';
 
-import type CommandService from '@cardstack/host/services/command-service';
 import type HostModeService from '@cardstack/host/services/host-mode-service';
 import type LoaderService from '@cardstack/host/services/loader-service';
 import type MatrixService from '@cardstack/host/services/matrix-service';
@@ -55,7 +54,8 @@ import type {
   SubdomainAvailabilityResult,
 } from '@cardstack/host/services/realm-server';
 import type StoreService from '@cardstack/host/services/store';
-import CheckDomainAvailabilityCommand from '@cardstack/host/tools/check-domain-availability';
+import type ToolService from '@cardstack/host/services/tool-service';
+import CheckDomainAvailabilityTool from '@cardstack/host/tools/check-domain-availability';
 
 import type * as CardAPI from 'https://cardstack.com/base/card-api';
 
@@ -85,7 +85,7 @@ export default class PublishRealmModal extends Component<Signature> {
   @service declare private matrixService: MatrixService;
   @service declare private realm: RealmService;
   @service declare private realmServer: RealmServerService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private store: StoreService;
 
   #cardAPI?: typeof CardAPI;
@@ -802,8 +802,8 @@ export default class PublishRealmModal extends Component<Signature> {
       try {
         // Check availability through the same command exposed to boxel-cli so
         // the UI and headless callers share one path.
-        let command = new CheckDomainAvailabilityCommand(
-          this.commandService.commandContext,
+        let command = new CheckDomainAvailabilityTool(
+          this.toolService.commandContext,
         );
         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 696aba655e6..c2e0377031a 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
@@ -6,14 +6,14 @@ import { restartableTask } from 'ember-concurrency';
 
 import { Button } from '@cardstack/boxel-ui/components';
 
-import OpenAiAssistantRoomCommand from '@cardstack/host/tools/open-ai-assistant-room';
-import SendAiAssistantMessageCommand from '@cardstack/host/tools/send-ai-assistant-message';
+import OpenAiAssistantRoomTool from '@cardstack/host/tools/open-ai-assistant-room';
+import SendAiAssistantMessageTool from '@cardstack/host/tools/send-ai-assistant-message';
 
 import type { FileDef } from 'https://cardstack.com/base/file-api';
 
 import type AiAssistantPanelService from '../../services/ai-assistant-panel-service';
-import type CommandService from '../../services/command-service';
 import type MatrixService from '../../services/matrix-service';
+import type ToolService from '../../services/tool-service';
 
 interface Signature {
   Element: HTMLButtonElement;
@@ -63,7 +63,7 @@ function truncateForAi(s: string | undefined, max: number): string | undefined {
 export default class SendErrorToAIAssistant extends Component<Signature> {
   @service declare private matrixService: MatrixService;
   @service declare private aiAssistantPanelService: AiAssistantPanelService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
 
   private get errorMessage() {
     let { error, errorType } = this.args;
@@ -128,14 +128,14 @@ export default class SendErrorToAIAssistant extends Component<Signature> {
   }
 
   get commandContext() {
-    return this.commandService.commandContext;
+    return this.toolService.commandContext;
   }
 
   private sendToAiAssistant = restartableTask(async () => {
-    await new OpenAiAssistantRoomCommand(this.commandContext).execute({
+    await new OpenAiAssistantRoomTool(this.commandContext).execute({
       roomId: this.matrixService.currentRoomId,
     });
-    await new SendAiAssistantMessageCommand(this.commandContext).execute({
+    await new SendAiAssistantMessageTool(this.commandContext).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/instance-initializers/legacy-tool-service-alias.ts b/packages/host/app/instance-initializers/legacy-tool-service-alias.ts
new file mode 100644
index 00000000000..568653652c5
--- /dev/null
+++ b/packages/host/app/instance-initializers/legacy-tool-service-alias.ts
@@ -0,0 +1,19 @@
+import type ApplicationInstance from '@ember/application/instance';
+
+// `command-service` is a legacy lookup key for `tool-service`: realm
+// content can look services up by string (e.g.
+// `getService('command-service')` in catalog test cards), so the old key
+// resolves to the SAME tool-service singleton — not a second instance,
+// which would fork the service's execution-tracking state. Removable only
+// when no deployed content references the old key.
+export function initialize(appInstance: ApplicationInstance): void {
+  appInstance.register('service:command-service', {
+    create() {
+      return appInstance.lookup('service:tool-service');
+    },
+  } as any);
+}
+
+export default {
+  initialize,
+};
diff --git a/packages/host/app/lib/file-def-manager.ts b/packages/host/app/lib/file-def-manager.ts
index a468f30f703..9c4914a7a3d 100644
--- a/packages/host/app/lib/file-def-manager.ts
+++ b/packages/host/app/lib/file-def-manager.ts
@@ -31,7 +31,7 @@ import type {
   SerializedFile,
 } from 'https://cardstack.com/base/file-api';
 import type {
-  CommandDefinitionSchema,
+  ToolDefinitionSchema,
   Tool,
 } from 'https://cardstack.com/base/matrix-event';
 
@@ -39,10 +39,10 @@ import type { MatrixEvent } from 'https://cardstack.com/base/matrix-event';
 import type * as SkillModule from 'https://cardstack.com/base/skill';
 
 import type CardService from '../services/card-service';
-import type CommandService from '../services/command-service';
 import type LoaderService from '../services/loader-service';
 import type { ExtendedClient } from '../services/matrix-sdk-loader';
 import type NetworkService from '../services/network';
+import type ToolService from '../services/tool-service';
 
 export const isSkillCard = Symbol.for('is-skill-card');
 
@@ -64,11 +64,11 @@ export interface FileDefManager {
 
   /**
    * Uploads command definitions and returns their file definitions
-   * @param commandDefinitions Array of command definitions to upload
+   * @param toolDefinitionFileDefs Array of command definitions to upload
    * @returns Promise resolving to array of file definitions
    */
-  uploadCommandDefinitions(
-    commandDefinitions: SkillModule.CommandField[],
+  uploadToolDefinitions(
+    toolDefinitionFileDefs: SkillModule.ToolField[],
   ): Promise<FileDef[]>;
 
   /**
@@ -136,7 +136,7 @@ export default class FileDefManagerImpl
   private getFileAPI: () => typeof FileAPI;
 
   @service declare private cardService: CardService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private loaderService: LoaderService;
   @service declare private network: NetworkService;
 
@@ -354,18 +354,18 @@ export default class FileDefManagerImpl
     );
   }
 
-  async uploadCommandDefinitions(
-    commandDefinitions: SkillModule.CommandField[],
+  async uploadToolDefinitions(
+    toolDefinitionFileDefs: SkillModule.ToolField[],
   ): Promise<FileDef[]> {
-    if (!commandDefinitions.length) {
+    if (!toolDefinitionFileDefs.length) {
       return [];
     }
 
     // Create the command defs to get the json schema
-    let commandDefinitionSchemas: CommandDefinitionSchema[] = [];
+    let commandDefinitionSchemas: ToolDefinitionSchema[] = [];
     const mappings = await basicMappings(this.loaderService.loader);
 
-    for (let commandDef of commandDefinitions) {
+    for (let commandDef of toolDefinitionFileDefs) {
       let absoluteCodeRef = codeRefWithAbsoluteIdentifier(
         commandDef.codeRef,
         commandDef[relativeTo],
@@ -376,9 +376,9 @@ export default class FileDefManagerImpl
         absoluteCodeRef,
         this.loaderService.loader,
       );
-      const command = new Command(this.commandService.commandContext);
+      const command = new Command(this.toolService.commandContext);
       const name = commandDef.functionName;
-      const schema: CommandDefinitionSchema = {
+      const schema: ToolDefinitionSchema = {
         codeRef: absoluteCodeRef,
         tool: {
           type: 'function' as Tool['type'],
diff --git a/packages/host/app/lib/host-base-command.ts b/packages/host/app/lib/host-base-tool.ts
similarity index 74%
rename from packages/host/app/lib/host-base-command.ts
rename to packages/host/app/lib/host-base-tool.ts
index d1edb1bb320..9a1bff973be 100644
--- a/packages/host/app/lib/host-base-command.ts
+++ b/packages/host/app/lib/host-base-tool.ts
@@ -6,11 +6,11 @@ import { Command, type CommandContext } from '@cardstack/runtime-common';
 import { baseRealm } from '@cardstack/runtime-common';
 
 import type { CardDefConstructor } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
 import type LoaderService from '../services/loader-service';
 
-export default abstract class HostBaseCommand<
+export default abstract class HostBaseTool<
   CardInputType extends CardDefConstructor | undefined,
   CardResultType extends CardDefConstructor | undefined = undefined,
 > extends Command<CardInputType, CardResultType> {
@@ -21,8 +21,8 @@ export default abstract class HostBaseCommand<
 
   @service declare protected loaderService: LoaderService;
 
-  protected loadCommandModule(): Promise<typeof BaseCommandModule> {
-    return this.loaderService.loader.import<typeof BaseCommandModule>(
+  protected loadToolModule(): Promise<typeof BaseToolModule> {
+    return this.loaderService.loader.import<typeof BaseToolModule>(
       `${baseRealm.url}command`,
     );
   }
diff --git a/packages/host/app/lib/matrix-classes/message-builder.ts b/packages/host/app/lib/matrix-classes/message-builder.ts
index 85984ee03e9..0b31dca5079 100644
--- a/packages/host/app/lib/matrix-classes/message-builder.ts
+++ b/packages/host/app/lib/matrix-classes/message-builder.ts
@@ -8,7 +8,7 @@ import { TrackedArray } from 'tracked-built-ins';
 
 import { type ResolvedCodeRef, getClass } from '@cardstack/runtime-common';
 
-import type { CommandRequest } from '@cardstack/runtime-common/commands';
+import type { ToolRequest } from '@cardstack/runtime-common/commands';
 import {
   AI_BOT_EXECUTOR,
   decodeCommandRequest,
@@ -32,32 +32,32 @@ import {
 } from '@cardstack/runtime-common/matrix-constants';
 
 import {
-  getSkillSourceCommands,
+  getSkillSourceTools,
   loadSkillSource,
-} from '@cardstack/host/lib/skill-commands';
+} from '@cardstack/host/lib/skill-tools';
 import type { RoomSkill } from '@cardstack/host/resources/room';
 
-import type CommandService from '@cardstack/host/services/command-service';
 import type LoaderService from '@cardstack/host/services/loader-service';
 import type MatrixService from '@cardstack/host/services/matrix-service';
 import type StoreService from '@cardstack/host/services/store';
+import type ToolService from '@cardstack/host/services/tool-service';
 
-import type { CommandStatus } from 'https://cardstack.com/base/command';
+import type { ToolCallStatus } from 'https://cardstack.com/base/command';
 import type { SerializedFile } from 'https://cardstack.com/base/file-api';
 import type {
   CardMessageContent,
   CardMessageEvent,
   CodePatchResultEvent,
   DebugMessageEvent,
-  CommandResultEvent,
-  EncodedCommandRequest,
+  ToolResultEvent,
+  EncodedToolRequest,
   MatrixEvent as DiscreteMatrixEvent,
   MessageEvent,
 } from 'https://cardstack.com/base/matrix-event';
 
 import { Message } from './message';
 import MessageCodePatchResult from './message-code-patch-result';
-import MessageCommand from './message-command';
+import MessageTool from './message-tool';
 
 import type { RoomMember } from './member';
 
@@ -85,13 +85,13 @@ export default class MessageBuilder {
       skills: RoomSkill[];
       events: DiscreteMatrixEvent[];
       codePatchResultEvent?: CodePatchResultEvent;
-      commandResultEvent?: CommandResultEvent;
+      toolResultEvent?: ToolResultEvent;
     },
   ) {
     setOwner(this, owner);
   }
 
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private loaderService: LoaderService;
   @service declare private matrixService: MatrixService;
   @service declare private store: StoreService;
@@ -186,7 +186,7 @@ export default class MessageBuilder {
       message.attachedCardIds = this.attachedCardIds;
       message.attachedCardsAsFiles = this.attachedCardsAsFiles;
       if (getToolRequests(event.content)) {
-        message.setCommands(await this.buildMessageCommands(message));
+        message.setTools(await this.buildMessageCommands(message));
       }
       message.codePatchResults = this.buildMessageCodePatchResults(message);
     } else if (event.content.msgtype === 'm.text') {
@@ -246,17 +246,17 @@ export default class MessageBuilder {
     }
 
     let encodedCommandRequests =
-      getToolRequests<Partial<EncodedCommandRequest>>(
+      getToolRequests<Partial<EncodedToolRequest>>(
         this.event.content as CardMessageContent,
       ) ?? [];
     for (let encodedCommandRequest of encodedCommandRequests) {
-      let command = message.commands.find(
-        (c) => c.commandRequest.id === encodedCommandRequest.id,
+      let command = message.tools.find(
+        (c) => c.toolRequest.id === encodedCommandRequest.id,
       );
       if (command) {
-        command.commandRequest = decodeCommandRequest(encodedCommandRequest);
+        command.toolRequest = decodeCommandRequest(encodedCommandRequest);
       } else {
-        message.commands.push(
+        message.tools.push(
           await this.buildMessageCommand(
             message,
             decodeCommandRequest(encodedCommandRequest),
@@ -267,24 +267,24 @@ export default class MessageBuilder {
   }
 
   async updateMessageCommandResult(message: Message) {
-    if (message.commands.length === 0) {
-      message.setCommands(await this.buildMessageCommands(message));
+    if (message.tools.length === 0) {
+      message.setTools(await this.buildMessageCommands(message));
     }
 
-    if (this.builderContext.commandResultEvent && message.commands.length > 0) {
-      let event = this.builderContext.commandResultEvent;
+    if (this.builderContext.toolResultEvent && message.tools.length > 0) {
+      let event = this.builderContext.toolResultEvent;
       if (
         isToolResultWithOutputMsgtype(event.content.msgtype) ||
         isToolResultWithNoOutputMsgtype(event.content.msgtype)
       ) {
         let commandRequestId = event.content.commandRequestId;
-        let messageCommand = message.commands.find(
-          (c) => c.commandRequest.id === commandRequestId,
+        let messageCommand = message.tools.find(
+          (c) => c.toolRequest.id === commandRequestId,
         );
         if (messageCommand) {
-          messageCommand.commandStatus = event.content['m.relates_to']
-            .key as CommandStatus;
-          messageCommand.commandResultFileDef = isToolResultWithOutputContent(
+          messageCommand.toolCallStatus = event.content['m.relates_to']
+            .key as ToolCallStatus;
+          messageCommand.toolResultFileDef = isToolResultWithOutputContent(
             event.content,
           )
             ? event.content.data.card
@@ -301,16 +301,16 @@ export default class MessageBuilder {
 
   private async buildMessageCommands(message: Message) {
     let eventContent = this.event.content as CardMessageContent;
-    let commandRequests =
-      getToolRequests<Partial<EncodedCommandRequest>>(eventContent);
-    if (!commandRequests) {
-      return new TrackedArray<MessageCommand>();
+    let toolRequests =
+      getToolRequests<Partial<EncodedToolRequest>>(eventContent);
+    if (!toolRequests) {
+      return new TrackedArray<MessageTool>();
     }
-    let commands = new TrackedArray<MessageCommand>();
-    for (let commandRequest of commandRequests) {
+    let commands = new TrackedArray<MessageTool>();
+    for (let toolRequest of toolRequests) {
       let command = await this.buildMessageCommand(
         message,
-        decodeCommandRequest(commandRequest),
+        decodeCommandRequest(toolRequest),
       );
       commands.push(command);
     }
@@ -319,10 +319,10 @@ export default class MessageBuilder {
 
   private async buildMessageCommand(
     message: Message,
-    commandRequest: Partial<CommandRequest>,
+    toolRequest: Partial<ToolRequest>,
   ) {
-    let commandResultEvent =
-      this.builderContext.commandResultEvent ??
+    let toolResultEvent =
+      this.builderContext.toolResultEvent ??
       (this.builderContext.events.find((e: any) => {
         let r = e.content['m.relates_to'];
         // Correlate the result to its command by commandRequestId (the
@@ -335,9 +335,9 @@ export default class MessageBuilder {
         return (
           isToolResultEventType(e.type) &&
           isToolResultRelType(r?.rel_type) &&
-          e.content.commandRequestId === commandRequest.id
+          e.content.commandRequestId === toolRequest.id
         );
-      }) as CommandResultEvent | undefined);
+      }) as ToolResultEvent | undefined);
 
     // ai-bot ran this one itself (e.g. readRealmFile), so the host never
     // resolves a command class or runs it. Skip the skill lookup below — it's
@@ -345,20 +345,20 @@ export default class MessageBuilder {
     // leave the indicator blank for a beat while it runs. Build the command
     // synchronously: 'applying' (loading) until the result event lands, then
     // applied (success) or invalid + reason (failure).
-    if (commandRequest.executedBy === AI_BOT_EXECUTOR) {
-      return new MessageCommand(
+    if (toolRequest.executedBy === AI_BOT_EXECUTOR) {
+      return new MessageTool(
         message,
-        commandRequest,
+        toolRequest,
         undefined, // no codeRef — never run on the host
         this.builderContext.effectiveEventId,
         false, // requiresApproval — never prompts or runs
         'Apply', // actionVerb — unused; the indicator shows status, not a Run button
-        (commandResultEvent
-          ? commandResultEvent.content['m.relates_to']?.key || 'applied'
-          : 'applying') as CommandStatus,
+        (toolResultEvent
+          ? toolResultEvent.content['m.relates_to']?.key || 'applied'
+          : 'applying') as ToolCallStatus,
         undefined, // no result card (server-handled results carry no output)
         getOwner(this)!,
-        commandResultEvent?.content.failureReason,
+        toolResultEvent?.content.failureReason,
       );
     }
 
@@ -372,8 +372,8 @@ export default class MessageBuilder {
       if (!source) {
         continue;
       }
-      for (let candidateSkillCommand of getSkillSourceCommands(source)) {
-        if (commandRequest.name === candidateSkillCommand.functionName) {
+      for (let candidateSkillCommand of getSkillSourceTools(source)) {
+        if (toolRequest.name === candidateSkillCommand.functionName) {
           skillCommand = candidateSkillCommand;
           break findCommand;
         }
@@ -393,24 +393,23 @@ export default class MessageBuilder {
 
     let requiresApproval = skillCommand?.requiresApproval ?? true;
 
-    let commandStatus: CommandStatus = (commandResultEvent?.content[
+    let toolCallStatus: ToolCallStatus = (toolResultEvent?.content[
       'm.relates_to'
-    ]?.key || 'ready') as CommandStatus;
+    ]?.key || 'ready') as ToolCallStatus;
 
-    let messageCommand = new MessageCommand(
+    let messageCommand = new MessageTool(
       message,
-      commandRequest,
+      toolRequest,
       skillCommand?.codeRef,
       this.builderContext.effectiveEventId,
       requiresApproval,
       actionVerb,
-      commandStatus,
-      commandResultEvent &&
-        isToolResultWithOutputContent(commandResultEvent.content)
-        ? commandResultEvent.content.data.card
+      toolCallStatus,
+      toolResultEvent && isToolResultWithOutputContent(toolResultEvent.content)
+        ? toolResultEvent.content.data.card
         : undefined,
       getOwner(this)!,
-      commandResultEvent?.content.failureReason,
+      toolResultEvent?.content.failureReason,
     );
     return messageCommand;
   }
diff --git a/packages/host/app/lib/matrix-classes/message-code-patch-result.ts b/packages/host/app/lib/matrix-classes/message-code-patch-result.ts
index 62d875383e9..a8b1a0506e4 100644
--- a/packages/host/app/lib/matrix-classes/message-code-patch-result.ts
+++ b/packages/host/app/lib/matrix-classes/message-code-patch-result.ts
@@ -4,9 +4,9 @@ import { service } from '@ember/service';
 
 import { tracked } from '@glimmer/tracking';
 
-import type CommandService from '@cardstack/host/services/command-service';
 import type MatrixService from '@cardstack/host/services/matrix-service';
 import type StoreService from '@cardstack/host/services/store';
+import type ToolService from '@cardstack/host/services/tool-service';
 
 import type { CodePatchStatus } from 'https://cardstack.com/base/matrix-event';
 
@@ -38,7 +38,7 @@ export default class MessageCodePatchResult {
     this.failureReason = failureReason;
   }
 
-  @service declare commandService: CommandService;
+  @service declare toolService: ToolService;
   @service declare matrixService: MatrixService;
   @service declare store: StoreService;
 }
diff --git a/packages/host/app/lib/matrix-classes/message-command.ts b/packages/host/app/lib/matrix-classes/message-tool.ts
similarity index 67%
rename from packages/host/app/lib/matrix-classes/message-command.ts
rename to packages/host/app/lib/matrix-classes/message-tool.ts
index 2cbd5dfe7ff..a48f0771d81 100644
--- a/packages/host/app/lib/matrix-classes/message-command.ts
+++ b/packages/host/app/lib/matrix-classes/message-tool.ts
@@ -5,63 +5,63 @@ import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 
 import type { ResolvedCodeRef } from '@cardstack/runtime-common';
-import type { CommandRequest } from '@cardstack/runtime-common/commands';
+import type { ToolRequest } from '@cardstack/runtime-common/commands';
 
-import type CommandService from '@cardstack/host/services/command-service';
 import type MatrixService from '@cardstack/host/services/matrix-service';
 import type StoreService from '@cardstack/host/services/store';
+import type ToolService from '@cardstack/host/services/tool-service';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
 import type { SerializedFile } from 'https://cardstack.com/base/file-api';
 
 import type { Message } from './message';
 
-type CommandStatus = 'applied' | 'ready' | 'applying' | 'invalid';
+type ToolCallStatus = 'applied' | 'ready' | 'applying' | 'invalid';
 
-export default class MessageCommand {
-  @tracked commandRequest: Partial<CommandRequest>;
-  @tracked commandStatus?: CommandStatus;
-  @tracked commandResultFileDef?: SerializedFile;
+export default class MessageTool {
+  @tracked toolRequest: Partial<ToolRequest>;
+  @tracked toolCallStatus?: ToolCallStatus;
+  @tracked toolResultFileDef?: SerializedFile;
 
   constructor(
     public message: Message,
-    commandRequest: Partial<CommandRequest>,
+    toolRequest: Partial<ToolRequest>,
     public codeRef: ResolvedCodeRef | undefined,
     public eventId: string,
     public requiresApproval: boolean,
     public actionVerb: string,
-    commandStatus: CommandStatus,
-    commandResultFileDef: SerializedFile | undefined,
+    toolCallStatus: ToolCallStatus,
+    toolResultFileDef: SerializedFile | undefined,
     owner: Owner,
     public failureReason?: string | undefined,
   ) {
     setOwner(this, owner);
 
-    this.commandRequest = commandRequest;
-    this.commandStatus = commandStatus;
-    this.commandResultFileDef = commandResultFileDef;
+    this.toolRequest = toolRequest;
+    this.toolCallStatus = toolCallStatus;
+    this.toolResultFileDef = toolResultFileDef;
   }
 
-  @service declare commandService: CommandService;
+  @service declare toolService: ToolService;
   @service declare matrixService: MatrixService;
   @service declare store: StoreService;
 
   get id() {
-    return this.commandRequest.id;
+    return this.toolRequest.id;
   }
 
   get name() {
-    return this.commandRequest.name;
+    return this.toolRequest.name;
   }
 
   // The actor that already executed this tool call (e.g. 'ai-bot' for
   // readRealmFile). When set, the host records it in the timeline but never runs it.
   get executedBy() {
-    return this.commandRequest.executedBy;
+    return this.toolRequest.executedBy;
   }
 
   get arguments() {
-    return this.commandRequest.arguments;
+    return this.toolRequest.arguments;
   }
 
   get description() {
@@ -73,15 +73,15 @@ export default class MessageCommand {
   }
 
   get status() {
-    if (this.commandService.currentlyExecutingCommandRequestIds.has(this.id!)) {
+    if (this.toolService.currentlyExecutingToolRequestIds.has(this.id!)) {
       return 'applying';
     }
 
-    return this.commandStatus;
+    return this.toolCallStatus;
   }
 
   async commandResultCardDoc() {
-    if (!this.commandResultFileDef) {
+    if (!this.toolResultFileDef) {
       return undefined;
     }
     let roomResource = this.matrixService.roomResources.get(
@@ -91,11 +91,11 @@ export default class MessageCommand {
       return undefined;
     }
     try {
-      if (!this.commandResultFileDef) {
+      if (!this.toolResultFileDef) {
         return undefined;
       }
       let cardDoc = await this.matrixService.downloadCardFileDef(
-        this.commandResultFileDef,
+        this.toolResultFileDef,
       );
       return cardDoc;
     } catch {
diff --git a/packages/host/app/lib/matrix-classes/message.ts b/packages/host/app/lib/matrix-classes/message.ts
index 28ad47cf864..8f0ebee5702 100644
--- a/packages/host/app/lib/matrix-classes/message.ts
+++ b/packages/host/app/lib/matrix-classes/message.ts
@@ -17,7 +17,7 @@ import type { RoomMember } from './member';
 
 import type MessageCodePatchResult from './message-code-patch-result';
 
-import type MessageCommand from './message-command';
+import type MessageTool from './message-tool';
 import type { EventStatus } from 'matrix-js-sdk';
 
 const ErrorMessage: Record<string, string> = {
@@ -56,7 +56,7 @@ interface RoomMessageOptional {
 export class Message implements RoomMessageInterface {
   @tracked _body: string;
   @tracked _reasoningContent?: string | null;
-  @tracked _commands: TrackedArray<MessageCommand>;
+  @tracked _tools: TrackedArray<MessageTool>;
   @tracked codePatchResults: TrackedArray<MessageCodePatchResult>;
   @tracked created: Date;
   @tracked _isStreamingFinished?: boolean;
@@ -90,7 +90,7 @@ export class Message implements RoomMessageInterface {
   constructor(init: RoomMessageInterface) {
     this._body = init.body;
     this._reasoningContent = init.reasoningContent;
-    this._commands = new TrackedArray<MessageCommand>();
+    this._tools = new TrackedArray<MessageTool>();
     this.author = init.author;
     this.eventId = init.eventId;
     this.created = init.created;
@@ -102,7 +102,7 @@ export class Message implements RoomMessageInterface {
     this.hasContinuation = init.hasContinuation;
     this.continuationOf = init.continuationOf;
     this._reasoningContent = init.reasoningContent;
-    this._commands = new TrackedArray<MessageCommand>();
+    this._tools = new TrackedArray<MessageTool>();
     this.codePatchResults = new TrackedArray<MessageCodePatchResult>();
     this.instanceId = guidFor(this);
     this.isCodePatchCorrectness = false;
@@ -145,18 +145,18 @@ export class Message implements RoomMessageInterface {
     return this.continuedInMessage?.body;
   }
 
-  get commands(): MessageCommand[] {
-    return (this.continuedInMessage?.commands?.length ?? 0) > 0
-      ? this.continuedInMessage!.commands
-      : (this._commands ?? []);
+  get tools(): MessageTool[] {
+    return (this.continuedInMessage?.tools?.length ?? 0) > 0
+      ? this.continuedInMessage!.tools
+      : (this._tools ?? []);
   }
 
-  setCommands(commands: MessageCommand[]) {
-    this._commands = new TrackedArray<MessageCommand>(commands);
+  setTools(tools: MessageTool[]) {
+    this._tools = new TrackedArray<MessageTool>(tools);
   }
 
   get continuedCommands() {
-    return this.continuedInMessage?.commands;
+    return this.continuedInMessage?.tools;
   }
 
   setIsStreamingFinished(isStreamingFinished: boolean | undefined) {
diff --git a/packages/host/app/lib/matrix-classes/room.ts b/packages/host/app/lib/matrix-classes/room.ts
index 1c2590c57a6..f9fdc0cddd5 100644
--- a/packages/host/app/lib/matrix-classes/room.ts
+++ b/packages/host/app/lib/matrix-classes/room.ts
@@ -30,7 +30,7 @@ export type TempEvent = Partial<IEvent> & {
 export type SkillsConfig = {
   enabledSkillCards: SerializedFile[];
   disabledSkillCards: SerializedFile[];
-  commandDefinitions: SerializedFile[];
+  toolDefinitionFileDefs: SerializedFile[];
 };
 
 export default class Room {
@@ -86,7 +86,6 @@ export default class Room {
       ?.get('')?.event.content ?? {
       enabledSkillCards: [],
       disabledSkillCards: [],
-      commandDefinitions: [],
     };
 
     return {
@@ -96,11 +95,11 @@ export default class Room {
       disabledSkillCards: content.disabledSkillCards
         ? content.disabledSkillCards
         : [],
-      commandDefinitions: getToolDefinitions<SerializedFile>(content) ?? [],
+      toolDefinitionFileDefs: getToolDefinitions<SerializedFile>(content) ?? [],
     } as {
       enabledSkillCards: SerializedFile[];
       disabledSkillCards: SerializedFile[];
-      commandDefinitions: SerializedFile[];
+      toolDefinitionFileDefs: SerializedFile[];
     };
   }
 
diff --git a/packages/host/app/lib/skill-commands.ts b/packages/host/app/lib/skill-tools.ts
similarity index 88%
rename from packages/host/app/lib/skill-commands.ts
rename to packages/host/app/lib/skill-tools.ts
index e7dc79938a2..b591303621b 100644
--- a/packages/host/app/lib/skill-commands.ts
+++ b/packages/host/app/lib/skill-tools.ts
@@ -10,8 +10,8 @@ import type StoreService from '../services/store';
 // A skill is either a `Skill` card (commands on `Skill.commands`) or a
 // markdown file whose `boxel.kind: skill` frontmatter rehydrates as a
 // `SkillFrontmatterField` (tools on `MarkdownDef.frontmatter.tools`).
-// Both fields are `containsMany(CommandField)`, so once gathered the
-// `CommandField` instances feed the command-definition upload flow identically.
+// Both fields are `containsMany(ToolField)`, so once gathered the
+// `ToolField` instances feed the command-definition upload flow identically.
 export type SkillSource = SkillModule.Skill | MarkdownDef;
 
 const MARKDOWN_EXTENSION = /\.(md|markdown)$/i;
@@ -37,23 +37,23 @@ export function isSkillSource(instance: unknown): instance is SkillSource {
   return isSkillCardInstance(instance) || isSkillMarkdown(instance);
 }
 
-// Returns the `CommandField` instances a skill source contributes, regardless
+// Returns the `ToolField` instances a skill source contributes, regardless
 // of whether the source is a `Skill` card or a skill-bearing markdown file.
-export function getSkillSourceCommands(
+export function getSkillSourceTools(
   instance: SkillSource | null | undefined,
-): SkillModule.CommandField[] {
+): SkillModule.ToolField[] {
   if (isSkillCardInstance(instance)) {
     return instance.commands ?? [];
   }
   if (isSkillMarkdown(instance)) {
     // For `boxel.kind: skill`, `frontmatter` is a `SkillFrontmatterField` whose
-    // `tools` is the same `containsMany(CommandField)` as `Skill.commands`.
+    // `tools` is the same `containsMany(ToolField)` as `Skill.commands`.
     // Index rows extracted before the command → tool rename carry the value
     // under the legacy `commands` field instead; fall back until all realms
     // have reindexed.
     let frontmatter = instance.frontmatter as {
-      tools?: SkillModule.CommandField[];
-      commands?: SkillModule.CommandField[];
+      tools?: SkillModule.ToolField[];
+      commands?: SkillModule.ToolField[];
     } | null;
     // `tools` is a containsMany, so a rehydrated pre-rename row yields [] (not
     // undefined) — an empty-check, not `??`, is what routes to the fallback.
diff --git a/packages/host/app/lib/command-auto-execute.ts b/packages/host/app/lib/tool-auto-execute.ts
similarity index 78%
rename from packages/host/app/lib/command-auto-execute.ts
rename to packages/host/app/lib/tool-auto-execute.ts
index 242e9a8cded..c9ad22a08c9 100644
--- a/packages/host/app/lib/command-auto-execute.ts
+++ b/packages/host/app/lib/tool-auto-execute.ts
@@ -1,25 +1,25 @@
 import { AI_BOT_EXECUTOR } from '@cardstack/runtime-common/commands';
 import type { LLMMode } from '@cardstack/runtime-common/matrix-constants';
 
-import type MessageCommand from './matrix-classes/message-command';
+import type MessageTool from './matrix-classes/message-tool';
 
 export const CHECK_CORRECTNESS_COMMAND_NAME = 'checkCorrectness';
 
 // Single source of truth for "this command runs without user approval".
-// Used by command-service (to decide whether to auto-run) and by the
-// room / room-message-command components (to decide whether to render
+// Used by tool-service (to decide whether to auto-run) and by the
+// room / room-message-tool components (to decide whether to render
 // the Accept All bar and the per-command Apply button). Keeping all
 // call sites on the same predicate prevents them from drifting and
 // reintroducing the action-bar flash that prompted CS-11647.
 //
 // `isOwnedByCurrentAgent` mirrors the agentId gate in
-// command-service.drainCommandProcessingQueue: a command sent by
+// tool-service.drainToolProcessingQueue: a command sent by
 // another agent is never auto-executed, even if it would otherwise
 // 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(
-  command: Pick<MessageCommand, 'name' | 'requiresApproval' | 'executedBy'>,
+  command: Pick<MessageTool, 'name' | 'requiresApproval' | 'executedBy'>,
   activeLLMMode: LLMMode | undefined,
   isOwnedByCurrentAgent: boolean,
 ): boolean {
diff --git a/packages/host/app/lib/command-definitions.ts b/packages/host/app/lib/tool-definitions.ts
similarity index 72%
rename from packages/host/app/lib/command-definitions.ts
rename to packages/host/app/lib/tool-definitions.ts
index 397272d88f5..e582bdae743 100644
--- a/packages/host/app/lib/command-definitions.ts
+++ b/packages/host/app/lib/tool-definitions.ts
@@ -1,8 +1,8 @@
 import type * as SkillModule from 'https://cardstack.com/base/skill';
 
 export function isValidCommandDefinition(
-  commandDefinition?: SkillModule.CommandField,
-): commandDefinition is SkillModule.CommandField {
+  commandDefinition?: SkillModule.ToolField,
+): commandDefinition is SkillModule.ToolField {
   if (!commandDefinition) {
     return false;
   }
@@ -23,12 +23,12 @@ export function isValidCommandDefinition(
   return Boolean(module && name && functionName);
 }
 
-export function getUniqueValidCommandDefinitions(
-  commandDefinitions: SkillModule.CommandField[] = [],
-): SkillModule.CommandField[] {
+export function getUniqueValidToolDefinitions(
+  toolDefinitionFileDefs: SkillModule.ToolField[] = [],
+): SkillModule.ToolField[] {
   let seen = new Set<string>();
 
-  return commandDefinitions.filter((command) => {
+  return toolDefinitionFileDefs.filter((command) => {
     if (!isValidCommandDefinition(command)) {
       return false;
     }
diff --git a/packages/host/app/resources/code-diff.ts b/packages/host/app/resources/code-diff.ts
index 7b686909281..3fa8c863b4c 100644
--- a/packages/host/app/resources/code-diff.ts
+++ b/packages/host/app/resources/code-diff.ts
@@ -5,11 +5,11 @@ import { restartableTask } from 'ember-concurrency';
 import { Resource } from 'ember-modify-based-class-resource';
 
 import type CardService from '@cardstack/host/services/card-service';
-import type CommandService from '@cardstack/host/services/command-service';
+import type ToolService from '@cardstack/host/services/tool-service';
 
 import type { CodePatchStatus } from 'https://cardstack.com/base/matrix-event';
 
-import ApplySearchReplaceBlockCommand from '../tools/apply-search-replace-block';
+import ApplySearchReplaceBlockTool from '../tools/apply-search-replace-block';
 
 interface CodeDiffResourceArgs {
   named: {
@@ -28,7 +28,7 @@ export class CodeDiffResource extends Resource<CodeDiffResourceArgs> {
   codePatchStatus: CodePatchStatus | undefined | null = null;
 
   @service declare private cardService: CardService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
 
   modify(_positional: never[], named: CodeDiffResourceArgs['named']) {
     let { fileUrl, searchReplaceBlock, codePatchStatus } = named;
@@ -107,8 +107,8 @@ export class CodeDiffResource extends Resource<CodeDiffResourceArgs> {
       return;
     }
 
-    let applySearchReplaceBlockCommand = new ApplySearchReplaceBlockCommand(
-      this.commandService.commandContext,
+    let applySearchReplaceBlockCommand = new ApplySearchReplaceBlockTool(
+      this.toolService.commandContext,
     );
 
     try {
diff --git a/packages/host/app/resources/file.ts b/packages/host/app/resources/file.ts
index f62f22f2fb4..4a36b9003f1 100644
--- a/packages/host/app/resources/file.ts
+++ b/packages/host/app/resources/file.ts
@@ -385,7 +385,7 @@ class _FileResource extends Resource<Args> {
       } else if (
         clientRequestId.startsWith('bot-patch:') ||
         // create-file writes originate from this host (cardService.saveSource
-        // with saveType 'create-file' — the path WriteTextFileCommand uses)
+        // with saveType 'create-file' — the path WriteTextFileTool uses)
         // but the FileResource may not yet have any content because its first
         // fetch raced indexing and 404'd. The clientRequestId being in
         // cardService.clientRequestIds does NOT imply we already have the
diff --git a/packages/host/app/resources/module-contents.ts b/packages/host/app/resources/module-contents.ts
index 5af2eda13c1..13204e3f669 100644
--- a/packages/host/app/resources/module-contents.ts
+++ b/packages/host/app/resources/module-contents.ts
@@ -17,9 +17,9 @@ import {
   type ModuleDeclaration,
   type CardOrFieldDeclaration,
   type CardOrFieldReexport,
-  type CommandDeclaration,
+  type ToolDeclaration,
   isCardOrFieldDeclaration,
-  isCommandDeclaration,
+  isToolDeclaration,
   isComponentDeclaration,
   isReexportCardOrField,
 } from '@cardstack/host/services/module-contents-service';
@@ -27,13 +27,13 @@ import type NetworkService from '@cardstack/host/services/network';
 
 export {
   isCardOrFieldDeclaration,
-  isCommandDeclaration,
+  isToolDeclaration,
   isComponentDeclaration,
   isReexportCardOrField,
   type ModuleDeclaration,
   type CardOrFieldDeclaration,
   type CardOrFieldReexport,
-  type CommandDeclaration,
+  type ToolDeclaration,
 };
 
 interface Args {
diff --git a/packages/host/app/resources/room.ts b/packages/host/app/resources/room.ts
index 7aec5a021a2..22ddcae3fe8 100644
--- a/packages/host/app/resources/room.ts
+++ b/packages/host/app/resources/room.ts
@@ -16,7 +16,7 @@ import {
   type LooseSingleCardDocument,
 } from '@cardstack/runtime-common';
 
-import type { CommandRequest } from '@cardstack/runtime-common/commands';
+import type { ToolRequest } from '@cardstack/runtime-common/commands';
 import {
   APP_BOXEL_ACTIVE_LLM,
   APP_BOXEL_CODE_PATCH_RESULT_EVENT_TYPE,
@@ -42,7 +42,7 @@ import type {
   CardMessageEvent,
   DebugMessageEvent,
   MessageEvent,
-  CommandResultEvent,
+  ToolResultEvent,
   RealmServerEvent,
   CodePatchResultEvent,
   ActiveLLMEvent,
@@ -58,21 +58,21 @@ import {
 import MessageBuilder from '../lib/matrix-classes/message-builder';
 
 import {
-  getSkillSourceCommands,
+  getSkillSourceTools,
   isMarkdownSkillId,
   loadSkillSource,
   peekSkillSource,
-} from '../lib/skill-commands';
+} from '../lib/skill-tools';
 
 import type { Message } from '../lib/matrix-classes/message';
 
 import type Room from '../lib/matrix-classes/room';
 
-import type CommandService from '../services/command-service';
 import type MatrixService from '../services/matrix-service';
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type RealmService from '../services/realm';
 import type StoreService from '../services/store';
+import type ToolService from '../services/tool-service';
 import type { TaskInstance } from 'ember-concurrency';
 import type { IRoomEvent } from 'matrix-js-sdk';
 
@@ -113,7 +113,7 @@ export class RoomResource extends Resource<Args> {
   @tracked private llmModeBeingActivated: LLMMode | undefined;
   @service declare private matrixService: MatrixService;
   @service declare private operatorModeStateService: OperatorModeStateService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private store: StoreService;
   @service declare private realm: RealmService;
 
@@ -341,8 +341,8 @@ export class RoomResource extends Resource<Args> {
     return result;
   }
 
-  get commands() {
-    // Usable commands are all commands on *active* skills, whether the skill is
+  get tools() {
+    // Usable tools are all tools on *active* skills, whether the skill is
     // a Skill card or a skill-bearing markdown file.
     let commands = [];
     for (let skill of this.skills) {
@@ -351,7 +351,7 @@ export class RoomResource extends Resource<Args> {
       }
       let skillSource = peekSkillSource(this.store, skill.cardId);
       if (skillSource) {
-        commands.push(...getSkillSourceCommands(skillSource));
+        commands.push(...getSkillSourceTools(skillSource));
       }
     }
     return commands;
@@ -723,7 +723,7 @@ export class RoomResource extends Resource<Args> {
     index,
   }: {
     roomId: string;
-    event: CommandResultEvent;
+    event: ToolResultEvent;
     index: number;
   }) {
     // Locate the owning bot message by commandRequestId. The commandResult's
@@ -769,7 +769,7 @@ export class RoomResource extends Resource<Args> {
         index,
         events: this.events,
         skills: this.skills,
-        commandResultEvent: event,
+        toolResultEvent: event,
       },
     );
     await messageBuilder.updateMessageCommandResult(message);
@@ -813,7 +813,7 @@ export class RoomResource extends Resource<Args> {
     event:
       | MessageEvent
       | CardMessageEvent
-      | CommandResultEvent
+      | ToolResultEvent
       | CodePatchResultEvent
       | DebugMessageEvent,
   ) {
@@ -875,14 +875,14 @@ export class RoomResource extends Resource<Args> {
     return member;
   }
 
-  public isDisplayingCode(commandRequest: CommandRequest) {
-    return this._isDisplayingViewCodeMap.get(commandRequest.id) ?? false;
+  public isDisplayingCode(toolRequest: ToolRequest) {
+    return this._isDisplayingViewCodeMap.get(toolRequest.id) ?? false;
   }
 
-  public toggleViewCode(commandRequest: CommandRequest) {
+  public toggleViewCode(toolRequest: ToolRequest) {
     this._isDisplayingViewCodeMap.set(
-      commandRequest.id,
-      !this.isDisplayingCode(commandRequest),
+      toolRequest.id,
+      !this.isDisplayingCode(toolRequest),
     );
   }
 }
diff --git a/packages/host/app/routes/command-runner.ts b/packages/host/app/routes/command-runner.ts
index 185ee03369c..c29960f9776 100644
--- a/packages/host/app/routes/command-runner.ts
+++ b/packages/host/app/routes/command-runner.ts
@@ -133,15 +133,15 @@ export default class CommandRunnerRoute extends Route<CommandRunnerModel> {
     commandInput: Record<string, unknown> | undefined,
   ) {
     try {
-      let CommandConstructor = (await getClass(
+      let ToolConstructor = (await getClass(
         command,
         this.loaderService.loader,
       )) as GenericCommandConstructor | undefined;
-      if (!CommandConstructor) {
+      if (!ToolConstructor) {
         throw new Error('Command not found for provided CodeRef');
       }
 
-      let commandInstance = new CommandConstructor(this.commandContext);
+      let commandInstance = new ToolConstructor(this.commandContext);
       let resultCard: CardDef | undefined;
       if (commandInput) {
         resultCard = await commandInstance.execute(commandInput);
diff --git a/packages/host/app/services/ai-assistant-panel-service.ts b/packages/host/app/services/ai-assistant-panel-service.ts
index b4c9b744711..b35db7f0a3a 100644
--- a/packages/host/app/services/ai-assistant-panel-service.ts
+++ b/packages/host/app/services/ai-assistant-panel-service.ts
@@ -25,9 +25,9 @@ import type { FileDef } from 'https://cardstack.com/base/file-api';
 import { Submodes } from '../components/submode-switcher';
 import { isMatrixError } from '../lib/matrix-utils';
 import { importResource } from '../resources/import';
-import CreateAiAssistantRoomCommand from '../tools/create-ai-assistant-room';
-import SummarizeSessionCommand from '../tools/summarize-session';
-import UpdateRoomSkillsCommand from '../tools/update-room-skills';
+import CreateAiAssistantRoomTool from '../tools/create-ai-assistant-room';
+import SummarizeSessionTool from '../tools/summarize-session';
+import UpdateRoomSkillsTool from '../tools/update-room-skills';
 
 import { NewSessionIdPersistenceKey } from '../utils/local-storage-keys';
 
@@ -36,13 +36,13 @@ import { titleize } from '../utils/titleize';
 import { DEFAULT_MODULE_INSPECTOR_VIEW } from './operator-mode-state-service';
 
 import type CodeSemanticsService from './code-semantics-service';
-import type CommandService from './command-service';
 import type LocalPersistenceService from './local-persistence-service';
 import type MatrixService from './matrix-service';
 import type MonacoService from './monaco-service';
 import type OperatorModeStateService from './operator-mode-state-service';
 import type ResetService from './reset';
 import type StoreService from './store';
+import type ToolService from './tool-service';
 import type { Message } from '../lib/matrix-classes/message';
 
 export interface SessionRoomData {
@@ -55,7 +55,7 @@ export interface SessionRoomData {
 
 export default class AiAssistantPanelService extends Service {
   @service declare private codeSemanticsService: CodeSemanticsService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private matrixService: MatrixService;
   @service declare private monacoService: MonacoService;
   @service declare private operatorModeStateService: OperatorModeStateService;
@@ -399,8 +399,8 @@ export default class AiAssistantPanelService extends Service {
           // that can hang on 404s). Skills are applied in the background.
           roomId = await this.createFallbackRoom(name);
         } else {
-          let createRoomCommand = new CreateAiAssistantRoomCommand(
-            this.commandService.commandContext,
+          let createRoomCommand = new CreateAiAssistantRoomTool(
+            this.toolService.commandContext,
           );
 
           let input: any = { name };
@@ -521,11 +521,11 @@ export default class AiAssistantPanelService extends Service {
       if (!skillIds.length) {
         return;
       }
-      // Kind-agnostic: `UpdateRoomSkillsCommand` resolves each id to a `.md`
+      // Kind-agnostic: `UpdateRoomSkillsTool` resolves each id to a `.md`
       // skill file or a legacy `Skill` card, uploads it, and populates the
       // room's skills config + command definitions.
-      let updateRoomSkillsCommand = new UpdateRoomSkillsCommand(
-        this.commandService.commandContext,
+      let updateRoomSkillsCommand = new UpdateRoomSkillsTool(
+        this.toolService.commandContext,
       );
       await updateRoomSkillsCommand.execute({
         roomId,
@@ -540,8 +540,8 @@ export default class AiAssistantPanelService extends Service {
   private summarizeSessionTask = restartableTask(
     async (oldRoomId: string, newRoomId: string) => {
       try {
-        const summarizeCommand = new SummarizeSessionCommand(
-          this.commandService.commandContext,
+        const summarizeCommand = new SummarizeSessionTool(
+          this.toolService.commandContext,
         );
         const result = await summarizeCommand.execute({
           roomId: oldRoomId,
diff --git a/packages/host/app/services/matrix-sdk-loader.ts b/packages/host/app/services/matrix-sdk-loader.ts
index b2d496b9d32..044a4ebe230 100644
--- a/packages/host/app/services/matrix-sdk-loader.ts
+++ b/packages/host/app/services/matrix-sdk-loader.ts
@@ -311,8 +311,8 @@ function extendedClient({
           return getJoinedRoomsWithCache.bind(null, target);
         case 'uploadCards':
           return fileDefManager.uploadCards.bind(fileDefManager);
-        case 'uploadCommandDefinitions':
-          return fileDefManager.uploadCommandDefinitions.bind(fileDefManager);
+        case 'uploadToolDefinitions':
+          return fileDefManager.uploadToolDefinitions.bind(fileDefManager);
         case 'uploadFiles':
           return fileDefManager.uploadFiles.bind(fileDefManager);
         case 'prefetchFileContent':
diff --git a/packages/host/app/services/matrix-service.ts b/packages/host/app/services/matrix-service.ts
index 9aa2c440a7c..7e171b5b4cb 100644
--- a/packages/host/app/services/matrix-service.ts
+++ b/packages/host/app/services/matrix-service.ts
@@ -110,19 +110,19 @@ import type {
   MatrixEvent as DiscreteMatrixEvent,
   CodePatchResultContent,
   CodePatchStatus,
-  CommandResultWithNoOutputContent,
-  CommandResultWithOutputContent,
+  ToolResultWithNoOutputContent,
+  ToolResultWithOutputContent,
   RealmEventContent,
   Tool,
-  CommandResultStatus,
+  ToolResultStatus,
 } from 'https://cardstack.com/base/matrix-event';
 
 import type * as SkillModule from 'https://cardstack.com/base/skill';
 import type { SystemCard } from 'https://cardstack.com/base/system-card';
 
-import { getUniqueValidCommandDefinitions } from '../lib/command-definitions';
 import { isSkillCard } from '../lib/file-def-manager';
-import { getSkillSourceCommands, loadSkillSource } from '../lib/skill-commands';
+import { getSkillSourceTools, loadSkillSource } from '../lib/skill-tools';
+import { getUniqueValidToolDefinitions } from '../lib/tool-definitions';
 import {
   sourceCodeEditingSkillUrl,
   devSkillId,
@@ -131,11 +131,10 @@ import {
 import { importResource } from '../resources/import';
 
 import { getRoom } from '../resources/room';
-import UpdateRoomSkillsCommand from '../tools/update-room-skills';
+import UpdateRoomSkillsTool from '../tools/update-room-skills';
 import { addPatchTools } from '../tools/utils';
 
 import type CardService from './card-service';
-import type CommandService from './command-service';
 import type LoaderService from './loader-service';
 import type LocalPersistenceService from './local-persistence-service';
 import type {
@@ -152,6 +151,7 @@ import type RealmService from './realm';
 import type RealmServerService from './realm-server';
 import type ResetService from './reset';
 import type StoreService from './store';
+import type ToolService from './tool-service';
 import type { RoomResource } from '../resources/room';
 import type { MatrixClient } from 'matrix-js-sdk';
 import type {
@@ -176,7 +176,7 @@ export default class MatrixService extends Service {
   @service declare private loaderService: LoaderService;
   @service declare private loggerService: LoggerService;
   @service declare private cardService: CardService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private realm: RealmService;
   @service declare private matrixSdkLoader: MatrixSDKLoader;
   @service declare private messageService: MessageService;
@@ -222,7 +222,7 @@ export default class MatrixService extends Service {
   messagesToSend: TrackedMap<string, string | undefined> = new TrackedMap();
   cardsToSend: TrackedMap<string, string[] | undefined> = new TrackedMap();
   filesToSend: TrackedMap<string, FileDef[] | undefined> = new TrackedMap();
-  failedCommandState: TrackedMap<string, Error> = new TrackedMap();
+  failedToolState: TrackedMap<string, Error> = new TrackedMap();
   reasoningExpandedState: TrackedMap<string, boolean> = new TrackedMap();
   flushTimeline: Promise<void> | undefined;
   flushMembership: Promise<void> | undefined;
@@ -1321,8 +1321,8 @@ export default class MatrixService extends Service {
       | BotTriggerContent
       | CardMessageContent
       | CodePatchResultContent
-      | CommandResultWithNoOutputContent
-      | CommandResultWithOutputContent,
+      | ToolResultWithNoOutputContent
+      | ToolResultWithOutputContent,
   ) {
     let roomData = this.ensureRoomData(roomId);
     return roomData.mutex.dispatch(async () => {
@@ -1344,7 +1344,7 @@ export default class MatrixService extends Service {
 
   // Re-upload skills and commands. FileDefManager's cache will ensure we don't re-upload the same content.
   // If there are new urls and content hashes for skills or commands, The room state will be updated.
-  async updateSkillsAndCommandsIfNeeded(roomId: string) {
+  async updateSkillsAndToolsIfNeeded(roomId: string) {
     await this.updateStateEvent(
       roomId,
       APP_BOXEL_ROOM_SKILLS_EVENT_TYPE,
@@ -1353,7 +1353,7 @@ export default class MatrixService extends Service {
         let enabledSkillCardFileDefs =
           (currentSkillsConfig?.enabledSkillCards ??
             []) as FileAPI.SerializedFile[];
-        let enabledCommandDefinitions: SkillModule.CommandField[] = [];
+        let enabledCommandDefinitions: SkillModule.ToolField[] = [];
         // Skill cards re-upload their serialized card content; skill markdown
         // files re-upload their file content. Both contribute commands.
         let skillCardsToReupload: SkillModule.Skill[] = [];
@@ -1365,7 +1365,7 @@ export default class MatrixService extends Service {
               return;
             }
             enabledCommandDefinitions = enabledCommandDefinitions.concat(
-              getSkillSourceCommands(source),
+              getSkillSourceTools(source),
             );
             if (isSkillCard in source) {
               skillCardsToReupload.push(source as SkillModule.Skill);
@@ -1381,10 +1381,10 @@ export default class MatrixService extends Service {
           ? await this.uploadFiles(markdownSkillFileDefs)
           : [];
         // get the unique subset of enabledCommandDefinitions by functionName
-        enabledCommandDefinitions = this.getUniqueCommandDefinitions(
+        enabledCommandDefinitions = this.getUniqueToolDefinitions(
           enabledCommandDefinitions,
         );
-        let enabledCommandDefFileDefs = await this.uploadCommandDefinitions(
+        let enabledCommandDefFileDefs = await this.uploadToolDefinitions(
           enabledCommandDefinitions,
         );
         return {
@@ -1405,10 +1405,10 @@ export default class MatrixService extends Service {
     return await this.client.downloadAsFileInBrowser(serializedFile);
   }
 
-  public getUniqueCommandDefinitions(
-    commandDefinitions: SkillModule.CommandField[],
-  ): SkillModule.CommandField[] {
-    return getUniqueValidCommandDefinitions(commandDefinitions);
+  public getUniqueToolDefinitions(
+    toolDefinitionFileDefs: SkillModule.ToolField[],
+  ): SkillModule.ToolField[] {
+    return getUniqueValidToolDefinitions(toolDefinitionFileDefs);
   }
 
   async uploadCards(cards: CardDef[]) {
@@ -1416,15 +1416,14 @@ export default class MatrixService extends Service {
     return cardFileDefs;
   }
 
-  async uploadCommandDefinitions(
-    commandDefinitions: SkillModule.CommandField[],
-  ) {
-    let validCommandDefinitions =
-      getUniqueValidCommandDefinitions(commandDefinitions);
+  async uploadToolDefinitions(toolDefinitionFileDefs: SkillModule.ToolField[]) {
+    let validCommandDefinitions = getUniqueValidToolDefinitions(
+      toolDefinitionFileDefs,
+    );
     if (validCommandDefinitions.length === 0) {
       return [];
     }
-    let commandFileDefs = await this.client.uploadCommandDefinitions(
+    let commandFileDefs = await this.client.uploadToolDefinitions(
       validCommandDefinitions,
     );
     return commandFileDefs;
@@ -1442,11 +1441,11 @@ export default class MatrixService extends Service {
     );
   }
 
-  async sendCommandResultEvent(params: {
+  async sendToolResultEvent(params: {
     roomId: string;
     invokedToolFromEventId: string;
     toolCallId: string;
-    status: CommandResultStatus;
+    status: ToolResultStatus;
     resultCard?: CardDef;
     failureReason?: string;
     attachedCards?: CardDef[];
@@ -1480,9 +1479,7 @@ export default class MatrixService extends Service {
       );
       resultCardFileDef = undefined; // don't send the card as a result if the card is attached
     }
-    let content:
-      | CommandResultWithNoOutputContent
-      | CommandResultWithOutputContent;
+    let content: ToolResultWithNoOutputContent | ToolResultWithOutputContent;
     if (resultCardFileDef === undefined) {
       content = {
         msgtype: APP_BOXEL_TOOL_RESULT_WITH_NO_OUTPUT_MSGTYPE,
@@ -1749,13 +1746,13 @@ export default class MatrixService extends Service {
     // Generate tool calls for patching currently open cards permitted for modification
     tools = tools.concat(
       await addPatchTools(
-        this.commandService.commandContext,
+        this.toolService.commandContext,
         patchableCards,
         this.cardAPI,
       ),
     );
 
-    await this.updateSkillsAndCommandsIfNeeded(roomId);
+    await this.updateSkillsAndToolsIfNeeded(roomId);
     let contentData = await this.withContextAndAttachments(
       context,
       attachedCards,
@@ -1982,7 +1979,7 @@ export default class MatrixService extends Service {
     }
     this.roomResourcesCache.clear();
     this.canceledActionMessageIdByRoom.clear();
-    this.failedCommandState.clear();
+    this.failedToolState.clear();
     this.reasoningExpandedState.clear();
     this.timelineQueue = [];
     this.flushMembership = undefined;
@@ -2748,7 +2745,7 @@ export default class MatrixService extends Service {
       getToolRequests(event.content)?.length &&
       event.content?.isStreamingFinished
     ) {
-      this.commandService.queueEventForCommandProcessing(event);
+      this.toolService.queueEventForToolProcessing(event);
     }
 
     // Queue code patches for processing
@@ -2764,7 +2761,7 @@ export default class MatrixService extends Service {
         body.includes(SEPARATOR_MARKER) &&
         body.includes(REPLACE_MARKER)
       ) {
-        this.commandService.queueEventForCodePatchProcessing(event);
+        this.toolService.queueEventForCodePatchProcessing(event);
       }
     }
   }
@@ -2819,8 +2816,8 @@ export default class MatrixService extends Service {
       return;
     }
 
-    let updateRoomSkillsCommand = new UpdateRoomSkillsCommand(
-      this.commandService.commandContext,
+    let updateRoomSkillsCommand = new UpdateRoomSkillsTool(
+      this.toolService.commandContext,
     );
     let defaultSkillIds = await this.loadDefaultSkills('code');
     await updateRoomSkillsCommand.execute({
diff --git a/packages/host/app/services/module-contents-service.ts b/packages/host/app/services/module-contents-service.ts
index 71c8cccf504..159ec58242a 100644
--- a/packages/host/app/services/module-contents-service.ts
+++ b/packages/host/app/services/module-contents-service.ts
@@ -42,14 +42,14 @@ export type CardOrFieldReexport = CardOrField &
     displayName?: string;
   };
 
-export type CommandDeclaration = Omit<ClassDeclaration, 'type'> & {
+export type ToolDeclaration = Omit<ClassDeclaration, 'type'> & {
   type: 'command';
   command: typeof Command;
 };
 
 export type ModuleDeclaration =
   | CardOrFieldDeclaration
-  | CommandDeclaration
+  | ToolDeclaration
   | ClassDeclaration
   | FunctionDeclaration
   | CardOrFieldReexport;
@@ -63,9 +63,9 @@ export function isCardOrFieldDeclaration(
   );
 }
 
-export function isCommandDeclaration(
+export function isToolDeclaration(
   declaration: ModuleDeclaration,
-): declaration is CommandDeclaration {
+): declaration is ToolDeclaration {
   return declaration.type === 'command';
 }
 
@@ -342,7 +342,7 @@ function isCommandConstructor(
 function asCommandDeclaration(
   declaration: PossibleCardOrFieldDeclaration | ClassDeclaration,
   command: typeof Command,
-): CommandDeclaration {
+): ToolDeclaration {
   return {
     ...('super' in declaration ? { super: declaration.super } : {}),
     localName: declaration.localName,
diff --git a/packages/host/app/services/realm.ts b/packages/host/app/services/realm.ts
index 299fb8c5295..648569912e8 100644
--- a/packages/host/app/services/realm.ts
+++ b/packages/host/app/services/realm.ts
@@ -708,7 +708,7 @@ class RealmResource {
       }
     } catch (error) {
       // Log for observability, then propagate so callers (e.g.
-      // UnpublishRealmCommand) can report the failure.
+      // UnpublishRealmTool) can report the failure.
       console.error(`Error unpublishing from URL ${url}:`, error);
       throw error;
     } finally {
diff --git a/packages/host/app/services/store.ts b/packages/host/app/services/store.ts
index e368fe9f0ad..ae19dcca26f 100644
--- a/packages/host/app/services/store.ts
+++ b/packages/host/app/services/store.ts
@@ -110,7 +110,6 @@ import {
 
 import type { CardSaveSubscriber } from './card-service';
 import type CardService from './card-service';
-import type CommandService from './command-service';
 import type EnvironmentService from './environment-service';
 
 import type HostModeService from './host-mode-service';
@@ -121,6 +120,7 @@ import type OperatorModeStateService from './operator-mode-state-service';
 import type RealmService from './realm';
 import type RealmServerService from './realm-server';
 import type ResetService from './reset';
+import type ToolService from './tool-service';
 import type { SearchResource } from '../resources/search';
 
 export { CardErrorJSONAPI, CardSaveSubscriber };
@@ -217,7 +217,7 @@ export default class StoreService extends Service implements StoreInterface {
   @service declare private loaderService: LoaderService;
   @service declare private messageService: MessageService;
   @service declare private cardService: CardService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private hostModeService: HostModeService;
   @service declare private network: NetworkService;
   @service declare private environmentService: EnvironmentService;
diff --git a/packages/host/app/services/command-service.ts b/packages/host/app/services/tool-service.ts
similarity index 90%
rename from packages/host/app/services/command-service.ts
rename to packages/host/app/services/tool-service.ts
index 1df31eff3c5..d0cefa043f9 100644
--- a/packages/host/app/services/command-service.ts
+++ b/packages/host/app/services/tool-service.ts
@@ -30,17 +30,17 @@ import { getToolRequests } from '@cardstack/runtime-common/matrix-constants';
 
 import type MatrixService from '@cardstack/host/services/matrix-service';
 import type Realm from '@cardstack/host/services/realm';
-import CheckCorrectnessCommand from '@cardstack/host/tools/check-correctness';
-import PatchCodeCommand from '@cardstack/host/tools/patch-code';
+import CheckCorrectnessTool from '@cardstack/host/tools/check-correctness';
+import PatchCodeTool from '@cardstack/host/tools/patch-code';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
 import type { CodePatchStatus } from 'https://cardstack.com/base/matrix-event';
 
+import LimitedSet from '../lib/limited-set';
 import {
   CHECK_CORRECTNESS_COMMAND_NAME,
   isAutoExecutableCommand,
-} from '../lib/command-auto-execute';
-import LimitedSet from '../lib/limited-set';
+} from '../lib/tool-auto-execute';
 
 import type LoaderService from './loader-service';
 import type MessageService from './message-service';
@@ -50,12 +50,12 @@ import type ResetService from './reset';
 import type StoreService from './store';
 import type { CodeData } from '../lib/formatted-message/utils';
 import type MessageCodePatchResult from '../lib/matrix-classes/message-code-patch-result';
-import type MessageCommand from '../lib/matrix-classes/message-command';
+import type MessageTool from '../lib/matrix-classes/message-tool';
 import type { RoomResource } from '../resources/room';
 import type { IEvent } from 'matrix-js-sdk';
 
 const DELAY_FOR_APPLYING_UI = isTesting() ? 50 : 500;
-// How long drainCommandProcessingQueue and drainCodePatchProcessingQueue wait
+// How long drainToolProcessingQueue and drainCodePatchProcessingQueue wait
 // for a room resource that's still processing before giving up on the event.
 // In tests we shorten this so the stuck-timeout invalidation path can be
 // exercised in a single test without holding a real test open for a minute.
@@ -66,11 +66,9 @@ type GenericCommand = Command<
   typeof CardDef | undefined
 >;
 
-const commandProcessingWaiter = buildWaiter(
-  'command-service:command-processing',
-);
+const commandProcessingWaiter = buildWaiter('tool-service:command-processing');
 
-export default class CommandService extends Service {
+export default class ToolService extends Service {
   @service declare private loaderService: LoaderService;
   @service declare private matrixService: MatrixService;
   @service declare private messageService: MessageService;
@@ -79,8 +77,8 @@ export default class CommandService extends Service {
   @service declare private realmServer: RealmServerService;
   @service declare private reset: ResetService;
   @service declare private store: StoreService;
-  currentlyExecutingCommandRequestIds = new TrackedSet<string>();
-  executedCommandRequestIds = new TrackedSet<string>();
+  currentlyExecutingToolRequestIds = new TrackedSet<string>();
+  executedToolRequestIds = new TrackedSet<string>();
   acceptingAllRoomIds = new TrackedSet<string>();
   private aiAssistantClientRequestIdsByRoom = new Map<
     string,
@@ -110,8 +108,8 @@ export default class CommandService extends Service {
   }
 
   resetState() {
-    this.currentlyExecutingCommandRequestIds.clear();
-    this.executedCommandRequestIds.clear();
+    this.currentlyExecutingToolRequestIds.clear();
+    this.executedToolRequestIds.clear();
     this.acceptingAllRoomIds.clear();
     this.aiAssistantClientRequestIdsByRoom.clear();
     for (let invalidation of this.aiAssistantInvalidations.values()) {
@@ -255,7 +253,7 @@ export default class CommandService extends Service {
     this.aiAssistantInvalidations.delete(key);
   }
 
-  public queueEventForCommandProcessing(event: Partial<IEvent>) {
+  public queueEventForToolProcessing(event: Partial<IEvent>) {
     let eventId = event.event_id;
     if (event.content?.['m.relates_to']?.rel_type === 'm.replace') {
       eventId = event.content?.['m.relates_to']!.event_id;
@@ -278,7 +276,7 @@ export default class CommandService extends Service {
 
     this.commandProcessingEventQueue.push(compoundKey);
 
-    debounce(this, this.drainCommandProcessingQueue, 100);
+    debounce(this, this.drainToolProcessingQueue, 100);
   }
 
   public queueEventForCodePatchProcessing(event: Partial<IEvent>) {
@@ -307,7 +305,7 @@ export default class CommandService extends Service {
     debounce(this, this.drainCodePatchProcessingQueue, 100);
   }
 
-  private async drainCommandProcessingQueue() {
+  private async drainToolProcessingQueue() {
     let waiterToken = commandProcessingWaiter.beginAsync();
     try {
       await this.flushCommandProcessingQueue;
@@ -347,13 +345,13 @@ export default class CommandService extends Service {
             roomResource.processingLastStartedAt
         ) {
           // Room processing is wedged. The synthetic 'applying' state in
-          // room-message-command.gts shows the spinner the moment an
+          // room-message-tool.gts shows the spinner the moment an
           // auto-executable command lands and only clears when we dispatch
           // a terminal commandResult ('applied' or 'invalid'). If we just
           // logged and continued, the spinner would hang indefinitely with
           // no manual Run fallback. Mark each auto-executable command on
           // this message invalid so the UI falls through to the
-          // invalidCommandState "Try Anyway" branch; manual-approval
+          // invalidToolCallState "Try Anyway" branch; manual-approval
           // commands are left in 'ready' so the action bar's Run button
           // remains the user's fallback.
           console.error(
@@ -378,7 +376,7 @@ export default class CommandService extends Service {
 
         // Collect all ready commands for this message
         let readyCommands: any[] = [];
-        for (let messageCommand of message.commands) {
+        for (let messageCommand 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
@@ -386,12 +384,10 @@ export default class CommandService extends Service {
           if (messageCommand.executedBy === AI_BOT_EXECUTOR) {
             continue;
           }
-          if (
-            this.currentlyExecutingCommandRequestIds.has(messageCommand.id!)
-          ) {
+          if (this.currentlyExecutingToolRequestIds.has(messageCommand.id!)) {
             continue;
           }
-          if (this.executedCommandRequestIds.has(messageCommand.id!)) {
+          if (this.executedToolRequestIds.has(messageCommand.id!)) {
             continue;
           }
           if (
@@ -462,22 +458,22 @@ export default class CommandService extends Service {
     let activeModeAtMessageTime = roomResource.getActiveLLMModeForMessage(
       message.eventId,
     );
-    for (let messageCommand of message.commands) {
+    for (let messageCommand 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) {
         continue;
       }
-      let commandRequestId = messageCommand.commandRequest.id;
+      let commandRequestId = messageCommand.toolRequest.id;
       // Without a tool call id we can't address a command result event, so
       // there's nothing to invalidate.
       if (!commandRequestId) {
         continue;
       }
-      if (this.currentlyExecutingCommandRequestIds.has(commandRequestId)) {
+      if (this.currentlyExecutingToolRequestIds.has(commandRequestId)) {
         continue;
       }
-      if (this.executedCommandRequestIds.has(commandRequestId)) {
+      if (this.executedToolRequestIds.has(commandRequestId)) {
         continue;
       }
       if (
@@ -501,7 +497,7 @@ export default class CommandService extends Service {
       let invokedToolFromEventId =
         this.getCurrentEventIdForCommandRequest(roomId, commandRequestId) ??
         messageCommand.eventId;
-      await this.matrixService.sendCommandResultEvent({
+      await this.matrixService.sendToolResultEvent({
         roomId,
         invokedToolFromEventId,
         toolCallId: commandRequestId,
@@ -640,7 +636,7 @@ export default class CommandService extends Service {
   // CS-11045: Find the bot message in current room state that currently owns
   // the given commandRequestId. Walks events newest-first so the latest event
   // wins (handles the streaming → m.replace shape: the original streaming
-  // event and later replace events both carry the commandRequests array; the
+  // event and later replace events both carry the toolRequests array; the
   // latest replace is the one ai-bot's /messages view agrees on).
   private getCurrentEventIdForCommandRequest(
     roomId: string | undefined,
@@ -671,7 +667,7 @@ export default class CommandService extends Service {
   }
 
   //TODO: Convert to non-EC async method after fixing CS-6987
-  run = task(async (command: MessageCommand) => {
+  run = task(async (command: MessageTool) => {
     // ai-bot ran this one itself (e.g. readRealmFile): nothing for the host to
     // run. Guards the manual "Try Anyway" path as well as any auto-execution.
     if (command.executedBy === AI_BOT_EXECUTOR) {
@@ -679,9 +675,9 @@ export default class CommandService extends Service {
     }
     let { arguments: payload, id: commandRequestId } = command;
     // CS-11045: Source the bot-message event_id from current room state at
-    // execute time rather than the snapshot taken when the MessageCommand was
+    // execute time rather than the snapshot taken when the MessageTool was
     // constructed. The snapshot is the streaming/original event_id; once a
-    // later m.replace event in room.events owns the commandRequest, that
+    // later m.replace event in room.events owns the toolRequest, that
     // event's id is the canonical link the rest of the system (including
     // ai-bot's view of /messages) will agree on. Fall back to the snapshot if
     // no matching event is found in current room state.
@@ -693,14 +689,14 @@ export default class CommandService extends Service {
     let resultCard: CardDef | undefined;
     // There may be some race conditions where the command is already being executed when this task starts
     if (
-      this.currentlyExecutingCommandRequestIds.has(commandRequestId!) ||
-      this.executedCommandRequestIds.has(commandRequestId!)
+      this.currentlyExecutingToolRequestIds.has(commandRequestId!) ||
+      this.executedToolRequestIds.has(commandRequestId!)
     ) {
       return; // already executing this command
     }
     try {
-      this.matrixService.failedCommandState.delete(commandRequestId!);
-      this.currentlyExecutingCommandRequestIds.add(commandRequestId!);
+      this.matrixService.failedToolState.delete(commandRequestId!);
+      this.currentlyExecutingToolRequestIds.add(commandRequestId!);
 
       let commandToRun;
 
@@ -708,15 +704,15 @@ export default class CommandService extends Service {
       // one in the skills we can construct
       let commandCodeRef = command.codeRef;
       if (commandCodeRef) {
-        let CommandConstructor = (await getClass(
+        let ToolConstructor = (await getClass(
           commandCodeRef,
           this.loaderService.loader,
         )) as { new (context: CommandContext): Command<any, any> };
-        commandToRun = new CommandConstructor(this.commandContext);
+        commandToRun = new ToolConstructor(this.commandContext);
       }
 
       if (!commandToRun && command.name === CHECK_CORRECTNESS_COMMAND_NAME) {
-        commandToRun = new CheckCorrectnessCommand(this.commandContext);
+        commandToRun = new CheckCorrectnessTool(this.commandContext);
       }
 
       if (commandToRun) {
@@ -753,19 +749,20 @@ export default class CommandService extends Service {
           { doNotWaitForPersist: true, clientRequestId },
         );
       } else {
-        // Unrecognized command. This can happen if a programmatically-provided command is no longer available due to a browser refresh.
+        // Unrecognized tool. This can happen if a programmatically-provided
+        // tool is no longer available due to a browser refresh.
         throw new Error(
-          `Unrecognized command: ${command.name}. This command may have been associated with a previous browser session.`,
+          `Unrecognized tool: ${command.name}. This tool may have been associated with a previous browser session.`,
         );
       }
-      this.executedCommandRequestIds.add(commandRequestId!);
-      await this.matrixService.updateSkillsAndCommandsIfNeeded(
+      this.executedToolRequestIds.add(commandRequestId!);
+      await this.matrixService.updateSkillsAndToolsIfNeeded(
         command.message.roomId,
       );
       let userContextForAiBot =
         await this.operatorModeStateService.getSummaryForAIBot();
 
-      await this.matrixService.sendCommandResultEvent({
+      await this.matrixService.sendToolResultEvent({
         roomId: command.message.roomId,
         invokedToolFromEventId: eventId,
         toolCallId: commandRequestId!,
@@ -779,16 +776,16 @@ export default class CommandService extends Service {
           ? new Error(e)
           : e instanceof Error
             ? e
-            : new Error('Command failed.');
+            : new Error('Tool call failed.');
       console.error(error);
       await timeout(DELAY_FOR_APPLYING_UI); // leave a beat for the "applying" state of the UI to be shown
-      this.matrixService.failedCommandState.set(commandRequestId!, error);
+      this.matrixService.failedToolState.set(commandRequestId!, error);
     } finally {
-      this.currentlyExecutingCommandRequestIds.delete(commandRequestId!);
+      this.currentlyExecutingToolRequestIds.delete(commandRequestId!);
     }
   });
 
-  async validate(command: MessageCommand): Promise<boolean> {
+  async validate(command: MessageTool): Promise<boolean> {
     let error: string | undefined;
     // ai-bot ran this one itself (e.g. readRealmFile): the host has no command
     // class to resolve, and never runs it, so there is nothing to validate.
@@ -811,18 +808,18 @@ export default class CommandService extends Service {
     let commandInstance: GenericCommand | undefined;
 
     if (command.name === CHECK_CORRECTNESS_COMMAND_NAME) {
-      commandInstance = new CheckCorrectnessCommand(this.commandContext);
+      commandInstance = new CheckCorrectnessTool(this.commandContext);
     } else if (!commandCodeRef) {
       error = `No command for the name "${command.name}" was found`;
     } else {
-      let CommandConstructor = (await getClass(
+      let ToolConstructor = (await getClass(
         commandCodeRef,
         this.loaderService.loader,
       )) as { new (context: CommandContext): Command<any, any> };
-      if (!CommandConstructor) {
+      if (!ToolConstructor) {
         error = `No command for the name "${command.name}" was found`;
       } else {
-        commandInstance = new CommandConstructor(this.commandContext);
+        commandInstance = new ToolConstructor(this.commandContext);
       }
     }
 
@@ -856,17 +853,17 @@ export default class CommandService extends Service {
     if (error) {
       // CS-11045: Same canonical-event-id resolution as the run task — emit
       // the invalid commandResult linked to the bot-message event currently
-      // owning the commandRequest in room state, so ai-bot's /messages view
+      // owning the toolRequest in room state, so ai-bot's /messages view
       // and the host's own m.replace-aware bookkeeping agree on the linkage.
       let invokedToolFromEventId =
         this.getCurrentEventIdForCommandRequest(
           command.message.roomId,
-          command.commandRequest.id,
+          command.toolRequest.id,
         ) ?? command.eventId;
-      await this.matrixService.sendCommandResultEvent({
+      await this.matrixService.sendToolResultEvent({
         roomId: command.message.roomId,
         invokedToolFromEventId,
-        toolCallId: command.commandRequest.id!,
+        toolCallId: command.toolRequest.id!,
         status: 'invalid',
         failureReason: error,
         context: await this.operatorModeStateService.getSummaryForAIBot(),
@@ -925,7 +922,7 @@ export default class CommandService extends Service {
       throw new Error('File URL is required to patch code');
     }
     for (const codeData of codeDataItems) {
-      this.currentlyExecutingCommandRequestIds.add(
+      this.currentlyExecutingToolRequestIds.add(
         `${codeData.eventId}:${codeData.codeBlockIndex}`,
       );
     }
@@ -935,7 +932,7 @@ export default class CommandService extends Service {
     let finalFileIdentifier: string | undefined;
 
     try {
-      let patchCodeCommand = new PatchCodeCommand(this.commandContext);
+      let patchCodeCommand = new PatchCodeTool(this.commandContext);
 
       let patchCodeResult = await patchCodeCommand.execute({
         fileIdentifier: fileUrl,
@@ -950,7 +947,7 @@ export default class CommandService extends Service {
         const codeData = codeDataItems[i];
         const patchResult = patchCodeResult.results[i];
         if (patchResult.status === 'applied') {
-          this.executedCommandRequestIds.add(
+          this.executedToolRequestIds.add(
             `${codeData.eventId}:${codeData.codeBlockIndex}`,
           );
         } else if (isTesting() && this.acceptingAllRoomIds.has(roomId)) {
@@ -968,7 +965,7 @@ export default class CommandService extends Service {
         }
       }
 
-      await this.matrixService.updateSkillsAndCommandsIfNeeded(roomId);
+      await this.matrixService.updateSkillsAndToolsIfNeeded(roomId);
       let fileDef = this.matrixService.fileAPI.createFileDef({
         sourceUrl: finalFileIdentifier ?? fileUrl,
         name: fileUrl.split('/').pop(),
@@ -998,7 +995,7 @@ export default class CommandService extends Service {
     } finally {
       // remove the code blocks from the currently executing command request ids
       for (const codeData of codeDataItems) {
-        this.currentlyExecutingCommandRequestIds.delete(
+        this.currentlyExecutingToolRequestIds.delete(
           `${codeData.eventId}:${codeData.codeBlockIndex}`,
         );
       }
@@ -1049,7 +1046,7 @@ export default class CommandService extends Service {
     eventId: string;
     codeBlockIndex: number;
   }) {
-    return this.currentlyExecutingCommandRequestIds.has(
+    return this.currentlyExecutingToolRequestIds.has(
       `${codeData.eventId}:${codeData.codeBlockIndex}`,
     );
   }
@@ -1058,7 +1055,7 @@ export default class CommandService extends Service {
     eventId: string;
     codeBlockIndex: number;
   }) {
-    return this.executedCommandRequestIds.has(
+    return this.executedToolRequestIds.has(
       `${codeBlock.eventId}:${codeBlock.codeBlockIndex}`,
     );
   }
@@ -1111,6 +1108,6 @@ function hasPatchData(payload: any): payload is PatchPayload {
 
 declare module '@ember/service' {
   interface Registry {
-    'command-service': CommandService;
+    'tool-service': ToolService;
   }
 }
diff --git a/packages/host/app/templates/host-freestyle.gts b/packages/host/app/templates/host-freestyle.gts
index 0771c125116..c8424ad63ce 100644
--- a/packages/host/app/templates/host-freestyle.gts
+++ b/packages/host/app/templates/host-freestyle.gts
@@ -40,8 +40,8 @@ import type { CardContext } from 'https://cardstack.com/base/card-api';
 
 import formatComponentName from '../helpers/format-component-name';
 
-import type CommandService from '../services/command-service';
 import type StoreService from '../services/store';
+import type ToolService from '../services/tool-service';
 import type { ComponentLike } from '@glint/template';
 
 interface UsageComponent {
@@ -55,7 +55,7 @@ interface HostFreestyleSignature {
 
 class HostFreestyleComponent extends Component<HostFreestyleSignature> {
   @service declare private store: StoreService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   formatComponentName = formatComponentName;
 
   @provide(GetCardContextName)
@@ -86,7 +86,7 @@ class HostFreestyleComponent extends Component<HostFreestyleSignature> {
       getCards: this.store.getSearchResource.bind(this.store),
       getCardCollection,
       store: this.store,
-      commandContext: this.commandService.commandContext,
+      commandContext: this.toolService.commandContext,
       searchResultsComponent: SearchResults,
     };
   }
diff --git a/packages/host/app/templates/index.gts b/packages/host/app/templates/index.gts
index ad242829dba..59d0c60690a 100644
--- a/packages/host/app/templates/index.gts
+++ b/packages/host/app/templates/index.gts
@@ -35,11 +35,10 @@ import type IndexController from '@cardstack/host/controllers/index';
 import { getCardCollection } from '@cardstack/host/resources/card-collection';
 import { getCard } from '@cardstack/host/resources/card-resource';
 
-import type CommandService from '@cardstack/host/services/command-service';
-
 import type HostModeStateService from '@cardstack/host/services/host-mode-state-service';
 import type MatrixService from '@cardstack/host/services/matrix-service';
 import type StoreService from '@cardstack/host/services/store';
+import type ToolService from '@cardstack/host/services/tool-service';
 
 import { idFromCardOrURL } from '@cardstack/host/utils/id-from-card-or-url';
 
@@ -59,7 +58,7 @@ export interface IndexComponentComponentSignature {
 }
 
 export class IndexComponent extends Component<IndexComponentComponentSignature> {
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private hostModeService: HostModeService;
   @service declare private hostModeStateService: HostModeStateService;
   @service declare private matrixService: MatrixService;
@@ -84,7 +83,7 @@ export class IndexComponent extends Component<IndexComponentComponentSignature>
 
   @provide(CommandContextName)
   private get commandContext() {
-    return this.commandService.commandContext;
+    return this.toolService.commandContext;
   }
 
   // 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
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 b49c4575f04..b51321e9ae6 100644
--- a/packages/host/app/tools/add-field-to-card-definition.ts
+++ b/packages/host/app/tools/add-field-to-card-definition.ts
@@ -4,17 +4,17 @@ import { rri } from '@cardstack/runtime-common';
 import { ModuleSyntax } from '@cardstack/runtime-common/module-syntax';
 
 import type { FieldType } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import WriteTextFileCommand from './write-text-file';
+import WriteTextFileTool from './write-text-file';
 
 import type CardService from '../services/card-service';
 import type NetworkService from '../services/network';
 
-export default class AddFieldToCardDefinitionCommand extends HostBaseCommand<
-  typeof BaseCommandModule.AddFieldToCardDefinitionInput
+export default class AddFieldToCardDefinitionTool extends HostBaseTool<
+  typeof BaseToolModule.AddFieldToCardDefinitionInput
 > {
   @service declare private cardService: CardService;
   @service declare private network: NetworkService;
@@ -22,7 +22,7 @@ export default class AddFieldToCardDefinitionCommand extends HostBaseCommand<
   static actionVerb = 'Add';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { AddFieldToCardDefinitionInput } = commandModule;
     return AddFieldToCardDefinitionInput;
   }
@@ -35,7 +35,7 @@ export default class AddFieldToCardDefinitionCommand extends HostBaseCommand<
   ];
 
   protected async run(
-    input: BaseCommandModule.AddFieldToCardDefinitionInput,
+    input: BaseToolModule.AddFieldToCardDefinitionInput,
   ): Promise<undefined> {
     let moduleSource = (
       await this.cardService.getSource(input.cardDefinitionToModify.module)
@@ -66,7 +66,7 @@ export default class AddFieldToCardDefinitionCommand extends HostBaseCommand<
       computedFieldFunctionSourceCode: input.computedFieldFunctionSourceCode,
     });
 
-    let writeTextFileCommand = new WriteTextFileCommand(this.commandContext);
+    let writeTextFileCommand = new WriteTextFileTool(this.commandContext);
     await writeTextFileCommand.execute({
       content: moduleSyntax.code(),
       realm: input.realm,
@@ -75,3 +75,7 @@ export default class AddFieldToCardDefinitionCommand extends HostBaseCommand<
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { AddFieldToCardDefinitionTool as AddFieldToCardDefinitionCommand };
diff --git a/packages/host/app/tools/ai-assistant.ts b/packages/host/app/tools/ai-assistant.ts
index 894018f9a31..2e855415c7a 100644
--- a/packages/host/app/tools/ai-assistant.ts
+++ b/packages/host/app/tools/ai-assistant.ts
@@ -3,26 +3,26 @@ import { service } from '@ember/service';
 import { isCardInstance } from '@cardstack/runtime-common';
 
 import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
 import type { Skill } from 'https://cardstack.com/base/skill';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import CreateAiAssistantRoomCommand from './create-ai-assistant-room';
-import OpenAiAssistantRoomCommand from './open-ai-assistant-room';
+import CreateAiAssistantRoomTool from './create-ai-assistant-room';
+import OpenAiAssistantRoomTool from './open-ai-assistant-room';
 
-import SendAiAssistantMessageCommand from './send-ai-assistant-message';
-import SetActiveLLMCommand from './set-active-llm';
-import UpdateRoomSkillsCommand from './update-room-skills';
+import SendAiAssistantMessageTool from './send-ai-assistant-message';
+import SetActiveLLMTool from './set-active-llm';
+import UpdateRoomSkillsTool from './update-room-skills';
 
 import type MatrixService from '../services/matrix-service';
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type StoreService from '../services/store';
 
-export default class UseAiAssistantCommand extends HostBaseCommand<
-  typeof BaseCommandModule.UseAiAssistantInput,
-  typeof BaseCommandModule.SendAiAssistantMessageResult
+export default class UseAiAssistantTool extends HostBaseTool<
+  typeof BaseToolModule.UseAiAssistantInput,
+  typeof BaseToolModule.SendAiAssistantMessageResult
 > {
   @service declare private store: StoreService;
   @service declare private operatorModeStateService: OperatorModeStateService;
@@ -33,7 +33,7 @@ export default class UseAiAssistantCommand extends HostBaseCommand<
   static actionVerb = 'Send';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { UseAiAssistantInput } = commandModule;
     return UseAiAssistantInput;
   }
@@ -48,8 +48,8 @@ export default class UseAiAssistantCommand extends HostBaseCommand<
   }
 
   protected async run(
-    input: BaseCommandModule.UseAiAssistantInput,
-  ): Promise<BaseCommandModule.SendAiAssistantMessageResult> {
+    input: BaseToolModule.UseAiAssistantInput,
+  ): Promise<BaseToolModule.SendAiAssistantMessageResult> {
     let roomId = await this.createRoomIfNeeded(input);
 
     let openRoomPromise = this.maybeOpenRoom(input, roomId);
@@ -67,7 +67,7 @@ export default class UseAiAssistantCommand extends HostBaseCommand<
 
     // Only send message if prompt is provided
     if (input.prompt && input.prompt.trim() !== '') {
-      let sendMessageCommand = new SendAiAssistantMessageCommand(
+      let sendMessageCommand = new SendAiAssistantMessageTool(
         this.commandContext,
       );
       let sendMessageResult = await sendMessageCommand.execute({
@@ -84,13 +84,13 @@ export default class UseAiAssistantCommand extends HostBaseCommand<
     }
 
     // Return a result indicating no message was sent
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { SendAiAssistantMessageResult } = commandModule;
     return new SendAiAssistantMessageResult({ roomId });
   }
 
   async createRoomIfNeeded(
-    input: BaseCommandModule.UseAiAssistantInput,
+    input: BaseToolModule.UseAiAssistantInput,
   ): Promise<string> {
     // If a specific roomId is provided and it's not 'new', use that room
     if (input.roomId && input.roomId !== 'new') {
@@ -104,7 +104,7 @@ export default class UseAiAssistantCommand extends HostBaseCommand<
     }
 
     // Create a new room if no roomId is provided and no current room exists
-    let createAIAssistantRoomCommand = new CreateAiAssistantRoomCommand(
+    let createAIAssistantRoomCommand = new CreateAiAssistantRoomTool(
       this.commandContext,
     );
     let createRoomResult = await createAIAssistantRoomCommand.execute({
@@ -114,11 +114,11 @@ export default class UseAiAssistantCommand extends HostBaseCommand<
   }
 
   async maybeOpenRoom(
-    input: BaseCommandModule.UseAiAssistantInput,
+    input: BaseToolModule.UseAiAssistantInput,
     roomId: string,
   ): Promise<void> {
     if (input.openRoom) {
-      let openAiAssistantRoomCommand = new OpenAiAssistantRoomCommand(
+      let openAiAssistantRoomCommand = new OpenAiAssistantRoomTool(
         this.commandContext,
       );
       await openAiAssistantRoomCommand.execute({
@@ -128,7 +128,7 @@ export default class UseAiAssistantCommand extends HostBaseCommand<
   }
 
   async maybeLoadSkillCards(
-    input: BaseCommandModule.UseAiAssistantInput,
+    input: BaseToolModule.UseAiAssistantInput,
     roomId: string,
   ): Promise<void> {
     let skillCards = new Set<Skill>(input.skillCards ?? []);
@@ -143,9 +143,7 @@ export default class UseAiAssistantCommand extends HostBaseCommand<
       return;
     }
 
-    let updateRoomSkillsCommand = new UpdateRoomSkillsCommand(
-      this.commandContext,
-    );
+    let updateRoomSkillsCommand = new UpdateRoomSkillsTool(this.commandContext);
     await updateRoomSkillsCommand.execute({
       roomId,
       skillCardIdsToActivate: [...skillCardIds],
@@ -153,7 +151,7 @@ export default class UseAiAssistantCommand extends HostBaseCommand<
   }
 
   async ensureAttachedCardsLoaded(
-    input: BaseCommandModule.UseAiAssistantInput,
+    input: BaseToolModule.UseAiAssistantInput,
   ): Promise<Set<CardAPI.CardDef>> {
     let attachedCards = new Set<CardAPI.CardDef>(input.attachedCards ?? []);
     let attachedCardIds = input.attachedCardIds ?? [];
@@ -180,11 +178,11 @@ export default class UseAiAssistantCommand extends HostBaseCommand<
   }
 
   async maybeSetActiveLLM(
-    input: BaseCommandModule.UseAiAssistantInput,
+    input: BaseToolModule.UseAiAssistantInput,
     roomId: string,
   ): Promise<void> {
     if (input.llmModel) {
-      let setActiveLLMCommand = new SetActiveLLMCommand(this.commandContext);
+      let setActiveLLMCommand = new SetActiveLLMTool(this.commandContext);
       await setActiveLLMCommand.execute({
         roomId,
         model: input.llmModel,
@@ -193,7 +191,7 @@ export default class UseAiAssistantCommand extends HostBaseCommand<
   }
 
   async maybeSetLLMMode(
-    input: BaseCommandModule.UseAiAssistantInput,
+    input: BaseToolModule.UseAiAssistantInput,
     roomId: string,
   ): Promise<void> {
     if (input.llmMode) {
@@ -201,3 +199,7 @@ export default class UseAiAssistantCommand extends HostBaseCommand<
     }
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { UseAiAssistantTool as UseAiAssistantCommand };
diff --git a/packages/host/app/tools/apply-markdown-edit.ts b/packages/host/app/tools/apply-markdown-edit.ts
index b1b8a76dab4..c1be202725f 100644
--- a/packages/host/app/tools/apply-markdown-edit.ts
+++ b/packages/host/app/tools/apply-markdown-edit.ts
@@ -1,18 +1,18 @@
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
 import { FieldPathParser } from '../lib/field-path-parser';
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import GetCardCommand from './get-card';
-import PatchFieldsCommand from './patch-fields';
-import SendRequestViaProxyCommand from './send-request-via-proxy';
+import GetCardTool from './get-card';
+import PatchFieldsTool from './patch-fields';
+import SendRequestViaProxyTool from './send-request-via-proxy';
 
 const escapeForTag = (value: string) =>
   value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 
 // Command to apply markdown edits using relace/relace-apply-3 model
-export default class ApplyMarkdownEditCommand extends HostBaseCommand<
-  typeof BaseCommandModule.ApplyMarkdownEditInput,
+export default class ApplyMarkdownEditTool extends HostBaseTool<
+  typeof BaseToolModule.ApplyMarkdownEditInput,
   undefined
 > {
   static actionVerb = 'Apply Markdown Edit';
@@ -20,13 +20,13 @@ export default class ApplyMarkdownEditCommand extends HostBaseCommand<
     'Apply a targeted edit to markdown content only (for example .md/.markdown text). This command is not for source code edits such as .gts/.ts/.js/.json files.';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { ApplyMarkdownEditInput } = commandModule;
     return ApplyMarkdownEditInput;
   }
 
   protected async run(
-    input: BaseCommandModule.ApplyMarkdownEditInput,
+    input: BaseToolModule.ApplyMarkdownEditInput,
   ): Promise<undefined> {
     // Validate inputs
     if (!input.cardId?.trim()) {
@@ -43,7 +43,7 @@ export default class ApplyMarkdownEditCommand extends HostBaseCommand<
     }
 
     // Get the card
-    const getCard = new GetCardCommand(this.commandContext);
+    const getCard = new GetCardTool(this.commandContext);
     const card = await getCard.execute({ cardId: input.cardId });
 
     if (!card) {
@@ -129,7 +129,7 @@ export default class ApplyMarkdownEditCommand extends HostBaseCommand<
       ],
     };
 
-    const response = await new SendRequestViaProxyCommand(
+    const response = await new SendRequestViaProxyTool(
       this.commandContext,
     ).execute({
       url: 'https://openrouter.ai/api/v1/chat/completions',
@@ -191,7 +191,7 @@ export default class ApplyMarkdownEditCommand extends HostBaseCommand<
     }
 
     // Patch only the specific markdown field
-    await new PatchFieldsCommand(this.commandContext).execute({
+    await new PatchFieldsTool(this.commandContext).execute({
       cardId: input.cardId,
       fieldUpdates: {
         [input.fieldPath]: finalContent,
@@ -201,3 +201,7 @@ export default class ApplyMarkdownEditCommand extends HostBaseCommand<
     return undefined;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { ApplyMarkdownEditTool as ApplyMarkdownEditCommand };
diff --git a/packages/host/app/tools/apply-search-replace-block.ts b/packages/host/app/tools/apply-search-replace-block.ts
index a584355f70d..5708aa460d9 100644
--- a/packages/host/app/tools/apply-search-replace-block.ts
+++ b/packages/host/app/tools/apply-search-replace-block.ts
@@ -4,9 +4,9 @@ import {
   SEPARATOR_MARKER,
 } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 import { stripTrailingSeparatorMarker } from '../lib/search-replace-block-parsing';
 
 let standardErrorMessage =
@@ -18,9 +18,9 @@ export const APPLY_SEARCH_REPLACE_BLOCK_ERROR_MESSAGES = {
   EMPTY_SEARCH_PATTERN_ON_NONEMPTY_FILE: `${standardErrorMessage} (empty search pattern for non-empty file)`,
 } as const;
 
-export default class ApplySearchReplaceBlockCommand extends HostBaseCommand<
-  typeof BaseCommandModule.ApplySearchReplaceBlockInput,
-  typeof BaseCommandModule.ApplySearchReplaceBlockResult
+export default class ApplySearchReplaceBlockTool extends HostBaseTool<
+  typeof BaseToolModule.ApplySearchReplaceBlockInput,
+  typeof BaseToolModule.ApplySearchReplaceBlockResult
 > {
   description = `Apply search/replace blocks to file contents. The format is:
 ╔═══ SEARCH ════╗
@@ -32,7 +32,7 @@ export default class ApplySearchReplaceBlockCommand extends HostBaseCommand<
   static actionVerb = 'Apply';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { ApplySearchReplaceBlockInput } = commandModule;
     return ApplySearchReplaceBlockInput;
   }
@@ -40,9 +40,9 @@ export default class ApplySearchReplaceBlockCommand extends HostBaseCommand<
   requireInputFields = ['codeBlock', 'fileContent'];
 
   protected async run(
-    input: BaseCommandModule.ApplySearchReplaceBlockInput,
-  ): Promise<BaseCommandModule.ApplySearchReplaceBlockResult> {
-    let commandModule = await this.loadCommandModule();
+    input: BaseToolModule.ApplySearchReplaceBlockInput,
+  ): Promise<BaseToolModule.ApplySearchReplaceBlockResult> {
+    let commandModule = await this.loadToolModule();
     const { ApplySearchReplaceBlockResult } = commandModule;
 
     // Parse the search and replace blocks from the provided code block
@@ -229,3 +229,7 @@ export default class ApplySearchReplaceBlockCommand extends HostBaseCommand<
     return { matched: true, matchLength: contentLineIndex - startIndex };
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { ApplySearchReplaceBlockTool as ApplySearchReplaceBlockCommand };
diff --git a/packages/host/app/tools/ask-ai.ts b/packages/host/app/tools/ask-ai.ts
index 927bccf3f87..1e824101715 100644
--- a/packages/host/app/tools/ask-ai.ts
+++ b/packages/host/app/tools/ask-ai.ts
@@ -1,19 +1,19 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import CreateAiAssistantRoomCommand from './create-ai-assistant-room';
-import OpenAiAssistantRoomCommand from './open-ai-assistant-room';
-import SendAiAssistantMessageCommand from './send-ai-assistant-message';
+import CreateAiAssistantRoomTool from './create-ai-assistant-room';
+import OpenAiAssistantRoomTool from './open-ai-assistant-room';
+import SendAiAssistantMessageTool from './send-ai-assistant-message';
 
 import type MatrixService from '../services/matrix-service';
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 
-export default class AskAiCommand extends HostBaseCommand<
-  typeof BaseCommandModule.AskAiInput,
-  typeof BaseCommandModule.AskAiOutput
+export default class AskAiTool extends HostBaseTool<
+  typeof BaseToolModule.AskAiInput,
+  typeof BaseToolModule.AskAiOutput
 > {
   @service declare private matrixService: MatrixService;
   @service declare private operatorModeStateService: OperatorModeStateService;
@@ -21,19 +21,17 @@ export default class AskAiCommand extends HostBaseCommand<
   static actionVerb = 'Ask';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { AskAiInput } = commandModule;
     return AskAiInput;
   }
 
   protected async run(
-    input: BaseCommandModule.AskAiInput,
-  ): Promise<BaseCommandModule.AskAiOutput> {
-    let createRoomCommand = new CreateAiAssistantRoomCommand(
-      this.commandContext,
-    );
-    let openRoomCommand = new OpenAiAssistantRoomCommand(this.commandContext);
-    let sendMessageCommand = new SendAiAssistantMessageCommand(
+    input: BaseToolModule.AskAiInput,
+  ): Promise<BaseToolModule.AskAiOutput> {
+    let createRoomCommand = new CreateAiAssistantRoomTool(this.commandContext);
+    let openRoomCommand = new OpenAiAssistantRoomTool(this.commandContext);
+    let sendMessageCommand = new SendAiAssistantMessageTool(
       this.commandContext,
     );
 
@@ -57,10 +55,14 @@ export default class AskAiCommand extends HostBaseCommand<
 
     await openRoomCommand.execute({ roomId });
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     return new commandModule.AskAiOutput({
       response:
         'AI assistant room created and opened successfully. You can now interact with the AI assistant.',
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { AskAiTool as AskAiCommand };
diff --git a/packages/host/app/tools/authed-fetch.ts b/packages/host/app/tools/authed-fetch.ts
index d8b2611a176..3ebeb9af2c9 100644
--- a/packages/host/app/tools/authed-fetch.ts
+++ b/packages/host/app/tools/authed-fetch.ts
@@ -1,21 +1,21 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type NetworkService from '../services/network';
 
-export default class AuthedFetchCommand extends HostBaseCommand<
-  typeof BaseCommandModule.AuthedFetchInput,
-  typeof BaseCommandModule.AuthedFetchResult
+export default class AuthedFetchTool extends HostBaseTool<
+  typeof BaseToolModule.AuthedFetchInput,
+  typeof BaseToolModule.AuthedFetchResult
 > {
   @service declare private network: NetworkService;
 
   description = 'Perform an authenticated HTTP fetch';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { AuthedFetchInput } = commandModule;
     return AuthedFetchInput;
   }
@@ -23,9 +23,9 @@ export default class AuthedFetchCommand extends HostBaseCommand<
   requireInputFields = ['url'];
 
   protected async run(
-    input: BaseCommandModule.AuthedFetchInput,
-  ): Promise<BaseCommandModule.AuthedFetchResult> {
-    let commandModule = await this.loadCommandModule();
+    input: BaseToolModule.AuthedFetchInput,
+  ): Promise<BaseToolModule.AuthedFetchResult> {
+    let commandModule = await this.loadToolModule();
     const { AuthedFetchResult } = commandModule;
     const headers: Record<string, string> = {};
     if (input.acceptHeader) {
@@ -51,3 +51,7 @@ export default class AuthedFetchCommand extends HostBaseCommand<
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { AuthedFetchTool as AuthedFetchCommand };
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 5d857a9423f..74681969b09 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
@@ -4,19 +4,19 @@ import { isCardInstance } from '@cardstack/runtime-common';
 
 import type { Listing } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../../lib/host-base-command';
+import HostBaseTool from '../../lib/host-base-tool';
 
-import UseAiAssistantCommand from '../ai-assistant';
+import UseAiAssistantTool from '../ai-assistant';
 
-import SendBotTriggerEventCommand from './send-bot-trigger-event';
+import SendBotTriggerEventTool from './send-bot-trigger-event';
 
 import type MatrixService from '../../services/matrix-service';
 import type StoreService from '../../services/store';
 
-export default class CreateListingPRRequestCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CreateListingPRRequestInput
+export default class CreateListingPRRequestTool extends HostBaseTool<
+  typeof BaseToolModule.CreateListingPRRequestInput
 > {
   @service declare private matrixService: MatrixService;
   @service declare private store: StoreService;
@@ -25,7 +25,7 @@ export default class CreateListingPRRequestCommand extends HostBaseCommand<
     'Request a GitHub PR from a catalog listing and notify the bot runner.';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CreateListingPRRequestInput } = commandModule;
     return CreateListingPRRequestInput;
   }
@@ -33,7 +33,7 @@ export default class CreateListingPRRequestCommand extends HostBaseCommand<
   requireInputFields = ['realm', 'listingId'];
 
   protected async run(
-    input: BaseCommandModule.CreateListingPRRequestInput,
+    input: BaseToolModule.CreateListingPRRequestInput,
   ): Promise<undefined> {
     await this.matrixService.ready;
 
@@ -46,7 +46,7 @@ export default class CreateListingPRRequestCommand extends HostBaseCommand<
       listingSummary = listing.summary ?? undefined;
     }
 
-    let useAiAssistantCommand = new UseAiAssistantCommand(this.commandContext);
+    let useAiAssistantCommand = new UseAiAssistantTool(this.commandContext);
     let createRoomResult = await useAiAssistantCommand.execute({
       roomId: 'new',
       roomName: `PR: ${listingName ?? listingId ?? 'Listing'}`,
@@ -61,7 +61,7 @@ export default class CreateListingPRRequestCommand extends HostBaseCommand<
 
     let submittedBy = this.matrixService.userId ?? undefined;
 
-    await new SendBotTriggerEventCommand(this.commandContext).execute({
+    await new SendBotTriggerEventTool(this.commandContext).execute({
       roomId,
       realm,
       type: 'pr-listing-create',
@@ -76,3 +76,7 @@ export default class CreateListingPRRequestCommand extends HostBaseCommand<
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { CreateListingPRRequestTool as CreateListingPRRequestCommand };
diff --git a/packages/host/app/tools/bot-requests/send-bot-trigger-event.ts b/packages/host/app/tools/bot-requests/send-bot-trigger-event.ts
index 213befd6bb8..f8f91010376 100644
--- a/packages/host/app/tools/bot-requests/send-bot-trigger-event.ts
+++ b/packages/host/app/tools/bot-requests/send-bot-trigger-event.ts
@@ -2,22 +2,22 @@ import { service } from '@ember/service';
 
 import { isBotTriggerEvent } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 import type { BotTriggerEvent } from 'https://cardstack.com/base/matrix-event';
 
-import HostBaseCommand from '../../lib/host-base-command';
+import HostBaseTool from '../../lib/host-base-tool';
 
 import type MatrixService from '../../services/matrix-service';
 
-export default class SendBotTriggerEventCommand extends HostBaseCommand<
-  typeof BaseCommandModule.SendBotTriggerEventInput
+export default class SendBotTriggerEventTool extends HostBaseTool<
+  typeof BaseToolModule.SendBotTriggerEventInput
 > {
   @service declare private matrixService: MatrixService;
 
   static actionVerb = 'Send';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { SendBotTriggerEventInput } = commandModule;
     return SendBotTriggerEventInput;
   }
@@ -25,7 +25,7 @@ export default class SendBotTriggerEventCommand extends HostBaseCommand<
   requireInputFields = ['roomId', 'type', 'input', 'realm'];
 
   protected async run(
-    input: BaseCommandModule.SendBotTriggerEventInput,
+    input: BaseToolModule.SendBotTriggerEventInput,
   ): Promise<undefined> {
     await this.matrixService.ready;
     let userId = this.matrixService.userId;
@@ -51,3 +51,7 @@ export default class SendBotTriggerEventCommand extends HostBaseCommand<
     await this.matrixService.sendEvent(input.roomId, event.type, event.content);
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { SendBotTriggerEventTool as SendBotTriggerEventCommand };
diff --git a/packages/host/app/tools/can-read-realm.ts b/packages/host/app/tools/can-read-realm.ts
index 8871d78e373..cc4a5ae669a 100644
--- a/packages/host/app/tools/can-read-realm.ts
+++ b/packages/host/app/tools/can-read-realm.ts
@@ -1,21 +1,21 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type RealmService from '../services/realm';
 
-export default class CanReadRealmCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CanReadRealmInput,
-  typeof BaseCommandModule.CanReadRealmResult
+export default class CanReadRealmTool extends HostBaseTool<
+  typeof BaseToolModule.CanReadRealmInput,
+  typeof BaseToolModule.CanReadRealmResult
 > {
   @service declare private realm: RealmService;
 
   description = 'Check whether the current user can read a realm';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CanReadRealmInput } = commandModule;
     return CanReadRealmInput;
   }
@@ -23,12 +23,16 @@ export default class CanReadRealmCommand extends HostBaseCommand<
   requireInputFields = ['realmIdentifier'];
 
   protected async run(
-    input: BaseCommandModule.CanReadRealmInput,
-  ): Promise<BaseCommandModule.CanReadRealmResult> {
-    let commandModule = await this.loadCommandModule();
+    input: BaseToolModule.CanReadRealmInput,
+  ): Promise<BaseToolModule.CanReadRealmResult> {
+    let commandModule = await this.loadToolModule();
     const { CanReadRealmResult } = commandModule;
     return new CanReadRealmResult({
       canRead: this.realm.canRead(input.realmIdentifier),
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { CanReadRealmTool as CanReadRealmCommand };
diff --git a/packages/host/app/tools/cancel-indexing-job.ts b/packages/host/app/tools/cancel-indexing-job.ts
index bc56a00d901..60404ceddfd 100644
--- a/packages/host/app/tools/cancel-indexing-job.ts
+++ b/packages/host/app/tools/cancel-indexing-job.ts
@@ -1,13 +1,13 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type RealmService from '../services/realm';
 
-export default class CancelIndexingJobCommand extends HostBaseCommand<
-  typeof BaseCommandModule.RealmIdentifierCard,
+export default class CancelIndexingJobTool extends HostBaseTool<
+  typeof BaseToolModule.RealmIdentifierCard,
   undefined
 > {
   @service declare private realm: RealmService;
@@ -16,14 +16,18 @@ export default class CancelIndexingJobCommand extends HostBaseCommand<
   description = 'Cancel any currently running indexing job for a realm';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { RealmIdentifierCard } = commandModule;
     return RealmIdentifierCard;
   }
 
   protected async run(
-    input: BaseCommandModule.RealmIdentifierCard,
+    input: BaseToolModule.RealmIdentifierCard,
   ): Promise<undefined> {
     await this.realm.cancelIndexingJob(input.realmIdentifier);
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { CancelIndexingJobTool as CancelIndexingJobCommand };
diff --git a/packages/host/app/tools/check-correctness.ts b/packages/host/app/tools/check-correctness.ts
index 014ee4e06d0..fb36a3b10ed 100644
--- a/packages/host/app/tools/check-correctness.ts
+++ b/packages/host/app/tools/check-correctness.ts
@@ -9,25 +9,25 @@ import {
 
 import ENV from '@cardstack/host/config/environment';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type CardService from '../services/card-service';
-import type CommandService from '../services/command-service';
 import type RealmService from '../services/realm';
 import type RealmServerService from '../services/realm-server';
 import type StoreService from '../services/store';
+import type ToolService from '../services/tool-service';
 
 const cardIndexingTimeout = ENV.cardRenderTimeout;
 
-export default class CheckCorrectnessCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CheckCorrectnessInput,
-  typeof BaseCommandModule.CorrectnessResultCard
+export default class CheckCorrectnessTool extends HostBaseTool<
+  typeof BaseToolModule.CheckCorrectnessInput,
+  typeof BaseToolModule.CorrectnessResultCard
 > {
   @service declare private store: StoreService;
   @service declare private realm: RealmService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private cardService: CardService;
   @service declare private realmServer: RealmServerService;
 
@@ -36,15 +36,15 @@ export default class CheckCorrectnessCommand extends HostBaseCommand<
   static actionVerb = 'Check';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     return commandModule.CheckCorrectnessInput;
   }
 
   requireInputFields = ['targetType', 'targetRef', 'roomId'];
 
   protected async run(
-    input: BaseCommandModule.CheckCorrectnessInput,
-  ): Promise<BaseCommandModule.CorrectnessResultCard> {
+    input: BaseToolModule.CheckCorrectnessInput,
+  ): Promise<BaseToolModule.CorrectnessResultCard> {
     if (!input.targetType || !input.targetRef) {
       throw new Error(
         'Target type and reference are required to run correctness checks.',
@@ -70,7 +70,7 @@ export default class CheckCorrectnessCommand extends HostBaseCommand<
       }
     }
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CorrectnessResultCard } = commandModule;
     let errors: string[] = [];
     let lintIssues: string[] = input.lintIssues ?? [];
@@ -119,7 +119,7 @@ export default class CheckCorrectnessCommand extends HostBaseCommand<
     cardId: string,
     roomId: string,
   ): Promise<string[]> {
-    await this.commandService.waitForInvalidationAfterAIAssistantRequest(
+    await this.toolService.waitForInvalidationAfterAIAssistantRequest(
       roomId,
       cardId,
       cardIndexingTimeout,
@@ -148,7 +148,7 @@ export default class CheckCorrectnessCommand extends HostBaseCommand<
       }
     } catch (error) {
       console.warn(
-        `CheckCorrectnessCommand: failed to refresh card ${cardId}`,
+        `CheckCorrectnessTool: failed to refresh card ${cardId}`,
         error,
       );
     } finally {
@@ -170,7 +170,7 @@ export default class CheckCorrectnessCommand extends HostBaseCommand<
 
     let { moduleURL, realmURL, fileURL } = moduleInfo;
 
-    await this.commandService.waitForInvalidationAfterAIAssistantRequest(
+    await this.toolService.waitForInvalidationAfterAIAssistantRequest(
       roomId,
       fileURL.href,
       cardIndexingTimeout,
@@ -300,10 +300,14 @@ export default class CheckCorrectnessCommand extends HostBaseCommand<
       return fileUrl.replace(/\.json$/, '');
     } catch (error) {
       console.warn(
-        `CheckCorrectnessCommand: unable to inspect file ${fileUrl} for card content`,
+        `CheckCorrectnessTool: unable to inspect file ${fileUrl} for card content`,
         error,
       );
       return undefined;
     }
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { CheckCorrectnessTool as CheckCorrectnessCommand };
diff --git a/packages/host/app/tools/check-domain-availability.ts b/packages/host/app/tools/check-domain-availability.ts
index f437e7a6748..df899c80e2e 100644
--- a/packages/host/app/tools/check-domain-availability.ts
+++ b/packages/host/app/tools/check-domain-availability.ts
@@ -4,9 +4,9 @@ import { resolvePublishedRealmUrl } from '@cardstack/runtime-common';
 
 import config from '@cardstack/host/config/environment';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type RealmServerService from '../services/realm-server';
 
@@ -15,9 +15,9 @@ import type RealmServerService from '../services/realm-server';
 // subdomains have a server-side availability check; subdirectory Boxel Spaces
 // are namespaced to the owner and have no contention, so they are not checked
 // here.
-export default class CheckDomainAvailabilityCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CheckDomainAvailabilityInput,
-  typeof BaseCommandModule.CheckDomainAvailabilityResult
+export default class CheckDomainAvailabilityTool extends HostBaseTool<
+  typeof BaseToolModule.CheckDomainAvailabilityInput,
+  typeof BaseToolModule.CheckDomainAvailabilityResult
 > {
   @service declare private realmServer: RealmServerService;
 
@@ -26,16 +26,16 @@ export default class CheckDomainAvailabilityCommand extends HostBaseCommand<
     'Check whether a custom published-realm domain is available to claim';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     return commandModule.CheckDomainAvailabilityInput;
   }
 
   requireInputFields = ['type', 'name'];
 
   protected async run(
-    input: BaseCommandModule.CheckDomainAvailabilityInput,
-  ): Promise<BaseCommandModule.CheckDomainAvailabilityResult> {
-    let commandModule = await this.loadCommandModule();
+    input: BaseToolModule.CheckDomainAvailabilityInput,
+  ): Promise<BaseToolModule.CheckDomainAvailabilityResult> {
+    let commandModule = await this.loadToolModule();
     let { CheckDomainAvailabilityResult } = commandModule;
 
     if (input.type !== 'custom') {
@@ -66,3 +66,7 @@ export default class CheckDomainAvailabilityCommand extends HostBaseCommand<
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { CheckDomainAvailabilityTool as CheckDomainAvailabilityCommand };
diff --git a/packages/host/app/tools/copy-and-edit.ts b/packages/host/app/tools/copy-and-edit.ts
index 026636751d9..c018da40562 100644
--- a/packages/host/app/tools/copy-and-edit.ts
+++ b/packages/host/app/tools/copy-and-edit.ts
@@ -3,18 +3,18 @@ import { service } from '@ember/service';
 import { isCardInstance } from '@cardstack/runtime-common';
 
 import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import CopyCardToRealmCommand from './copy-card';
+import CopyCardToRealmTool from './copy-card';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type RealmService from '../services/realm';
 import type StoreService from '../services/store';
 
-export default class CopyAndEditCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CopyAndEditInput,
+export default class CopyAndEditTool extends HostBaseTool<
+  typeof BaseToolModule.CopyAndEditInput,
   undefined
 > {
   @service operatorModeStateService!: OperatorModeStateService;
@@ -26,7 +26,7 @@ export default class CopyAndEditCommand extends HostBaseCommand<
   static actionVerb = 'Copy and Edit';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CopyAndEditInput } = commandModule;
     return CopyAndEditInput;
   }
@@ -41,7 +41,7 @@ export default class CopyAndEditCommand extends HostBaseCommand<
   }
 
   protected async run(
-    input: BaseCommandModule.CopyAndEditInput,
+    input: BaseToolModule.CopyAndEditInput,
   ): Promise<undefined> {
     if (!input.card?.id) {
       throw new Error('copy-and-edit requires a card with an id');
@@ -58,7 +58,7 @@ export default class CopyAndEditCommand extends HostBaseCommand<
       throw new Error(`Do not have write permissions to ${targetRealm}`);
     }
 
-    let copyCardCommand = new CopyCardToRealmCommand(this.commandContext);
+    let copyCardCommand = new CopyCardToRealmTool(this.commandContext);
     let { newCardId } = await copyCardCommand.execute({
       sourceCard: input.card,
       targetRealm,
@@ -349,3 +349,7 @@ export default class CopyAndEditCommand extends HostBaseCommand<
     return this.dotGetter(parentPath, base);
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { CopyAndEditTool as CopyAndEditCommand };
diff --git a/packages/host/app/tools/copy-card-as-markdown.ts b/packages/host/app/tools/copy-card-as-markdown.ts
index 6e535cddce6..8a03f8ce2bd 100644
--- a/packages/host/app/tools/copy-card-as-markdown.ts
+++ b/packages/host/app/tools/copy-card-as-markdown.ts
@@ -4,14 +4,14 @@ import { isTesting } from '@embroider/macros';
 
 import { SupportedMimeType } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type NetworkService from '../services/network';
 
-export default class CopyCardAsMarkdownCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CardIdCard,
+export default class CopyCardAsMarkdownTool extends HostBaseTool<
+  typeof BaseToolModule.CardIdCard,
   undefined
 > {
   @service declare private network: NetworkService;
@@ -20,13 +20,13 @@ export default class CopyCardAsMarkdownCommand extends HostBaseCommand<
   static actionVerb = 'Copy';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     return commandModule.CardIdCard;
   }
 
   requireInputFields = ['cardId'];
 
-  protected async run(input: BaseCommandModule.CardIdCard): Promise<undefined> {
+  protected async run(input: BaseToolModule.CardIdCard): Promise<undefined> {
     let response = await this.network.authedFetch(input.cardId, {
       headers: { Accept: SupportedMimeType.Markdown },
     });
@@ -39,3 +39,7 @@ export default class CopyCardAsMarkdownCommand extends HostBaseCommand<
     return undefined;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { CopyCardAsMarkdownTool as CopyCardAsMarkdownCommand };
diff --git a/packages/host/app/tools/copy-card-to-stack.ts b/packages/host/app/tools/copy-card-to-stack.ts
index 432c096918a..bfbc903d37e 100644
--- a/packages/host/app/tools/copy-card-to-stack.ts
+++ b/packages/host/app/tools/copy-card-to-stack.ts
@@ -2,20 +2,20 @@ import { service } from '@ember/service';
 
 import { isCardInstance, realmURL } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import CopyCardToRealmCommand from './copy-card';
+import CopyCardToRealmTool from './copy-card';
 
 import type CardService from '../services/card-service';
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type RealmService from '../services/realm';
 import type StoreService from '../services/store';
 
-export default class CopyCardToStackCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CopyCardToStackInput,
-  typeof BaseCommandModule.CopyCardResult
+export default class CopyCardToStackTool extends HostBaseTool<
+  typeof BaseToolModule.CopyCardToStackInput,
+  typeof BaseToolModule.CopyCardResult
 > {
   @service declare private cardService: CardService;
   @service declare private operatorModeStateService: OperatorModeStateService;
@@ -26,7 +26,7 @@ export default class CopyCardToStackCommand extends HostBaseCommand<
   static actionVerb = 'Copy';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CopyCardToStackInput } = commandModule;
     return CopyCardToStackInput;
   }
@@ -34,15 +34,13 @@ export default class CopyCardToStackCommand extends HostBaseCommand<
   requireInputFields = ['sourceCard', 'targetStackIndex'];
 
   protected async run(
-    input: BaseCommandModule.CopyCardToStackInput,
-  ): Promise<BaseCommandModule.CopyCardResult> {
+    input: BaseToolModule.CopyCardToStackInput,
+  ): Promise<BaseToolModule.CopyCardResult> {
     let realmToCopyTo = await this.determineTargetRealm(input.targetStackIndex);
     if (!realmToCopyTo) {
       throw new Error('Cannot determine target realm to copy card to');
     }
-    let copyCardToRealmCommand = new CopyCardToRealmCommand(
-      this.commandContext,
-    );
+    let copyCardToRealmCommand = new CopyCardToRealmTool(this.commandContext);
     return await copyCardToRealmCommand.execute({
       sourceCard: input.sourceCard,
       targetRealm: realmToCopyTo,
@@ -68,3 +66,7 @@ export default class CopyCardToStackCommand extends HostBaseCommand<
     return;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { CopyCardToStackTool as CopyCardToStackCommand };
diff --git a/packages/host/app/tools/copy-card.ts b/packages/host/app/tools/copy-card.ts
index 3e890e10d72..ef52f21db56 100644
--- a/packages/host/app/tools/copy-card.ts
+++ b/packages/host/app/tools/copy-card.ts
@@ -1,16 +1,16 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type CardService from '../services/card-service';
 import type RealmService from '../services/realm';
 import type StoreService from '../services/store';
 
-export default class CopyCardToRealmCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CopyCardToRealmInput,
-  typeof BaseCommandModule.CopyCardResult
+export default class CopyCardToRealmTool extends HostBaseTool<
+  typeof BaseToolModule.CopyCardToRealmInput,
+  typeof BaseToolModule.CopyCardResult
 > {
   @service declare private cardService: CardService;
   @service declare private realm: RealmService;
@@ -20,7 +20,7 @@ export default class CopyCardToRealmCommand extends HostBaseCommand<
   static actionVerb = 'Copy';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CopyCardToRealmInput } = commandModule;
     return CopyCardToRealmInput;
   }
@@ -32,8 +32,8 @@ export default class CopyCardToRealmCommand extends HostBaseCommand<
   // MUST consume the instance IMMEDIATELY! it should not live in the state of
   // the consumer.
   protected async run(
-    input: BaseCommandModule.CopyCardToRealmInput,
-  ): Promise<BaseCommandModule.CopyCardResult> {
+    input: BaseToolModule.CopyCardToRealmInput,
+  ): Promise<BaseToolModule.CopyCardResult> {
     let targetRealm =
       input.targetRealm || this.realm.defaultWritableRealm?.path;
     if (!targetRealm) {
@@ -60,8 +60,12 @@ export default class CopyCardToRealmCommand extends HostBaseCommand<
         )}`,
       );
     }
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CopyCardResult } = commandModule;
     return new CopyCardResult({ newCardId });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { CopyCardToRealmTool as CopyCardToRealmCommand };
diff --git a/packages/host/app/tools/copy-file-to-realm.ts b/packages/host/app/tools/copy-file-to-realm.ts
index 635f01fb88f..879cf232c1d 100644
--- a/packages/host/app/tools/copy-file-to-realm.ts
+++ b/packages/host/app/tools/copy-file-to-realm.ts
@@ -2,17 +2,17 @@ import { service } from '@ember/service';
 
 import { rri } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 import { findNonConflictingFilename } from '../utils/file-name';
 
 import type CardService from '../services/card-service';
 import type RealmService from '../services/realm';
 
-export default class CopyFileToRealmCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CopyFileToRealmInput,
-  typeof BaseCommandModule.CopyFileToRealmResult
+export default class CopyFileToRealmTool extends HostBaseTool<
+  typeof BaseToolModule.CopyFileToRealmInput,
+  typeof BaseToolModule.CopyFileToRealmResult
 > {
   @service declare private cardService: CardService;
   @service declare private realm: RealmService;
@@ -21,7 +21,7 @@ export default class CopyFileToRealmCommand extends HostBaseCommand<
   static actionVerb = 'Copy';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CopyFileToRealmInput } = commandModule;
     return CopyFileToRealmInput;
   }
@@ -29,8 +29,8 @@ export default class CopyFileToRealmCommand extends HostBaseCommand<
   requireInputFields = ['sourceFileIdentifier', 'targetRealm'];
 
   protected async run(
-    input: BaseCommandModule.CopyFileToRealmInput,
-  ): Promise<BaseCommandModule.CopyFileToRealmResult> {
+    input: BaseToolModule.CopyFileToRealmInput,
+  ): Promise<BaseToolModule.CopyFileToRealmResult> {
     let targetRealm =
       input.targetRealm || this.realm.defaultWritableRealm?.path;
     if (!targetRealm) {
@@ -68,7 +68,7 @@ export default class CopyFileToRealmCommand extends HostBaseCommand<
       );
     }
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CopyFileToRealmResult } = commandModule;
     return new CopyFileToRealmResult({
       newFileIdentifier: destinationUrl.href,
@@ -80,3 +80,7 @@ export default class CopyFileToRealmCommand extends HostBaseCommand<
     return getSourceResult.status !== 404;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { CopyFileToRealmTool as CopyFileToRealmCommand };
diff --git a/packages/host/app/tools/copy-source.ts b/packages/host/app/tools/copy-source.ts
index f85831d9e9d..ee5a9e593e5 100644
--- a/packages/host/app/tools/copy-source.ts
+++ b/packages/host/app/tools/copy-source.ts
@@ -1,21 +1,21 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type CardService from '../services/card-service';
 
-export default class CopySourceCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CopySourceInput,
-  typeof BaseCommandModule.CopySourceResult
+export default class CopySourceTool extends HostBaseTool<
+  typeof BaseToolModule.CopySourceInput,
+  typeof BaseToolModule.CopySourceResult
 > {
   @service declare private cardService: CardService;
 
   static actionVerb = 'Copy';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CopySourceInput } = commandModule;
     return CopySourceInput;
   }
@@ -26,8 +26,8 @@ export default class CopySourceCommand extends HostBaseCommand<
   ];
 
   protected async run(
-    input: BaseCommandModule.CopySourceInput,
-  ): Promise<BaseCommandModule.CopySourceResult> {
+    input: BaseToolModule.CopySourceInput,
+  ): Promise<BaseToolModule.CopySourceResult> {
     const originSourceIdentifier = new URL(input.originSourceIdentifier);
     const destinationSourceIdentifier = new URL(
       input.destinationSourceIdentifier,
@@ -36,7 +36,7 @@ export default class CopySourceCommand extends HostBaseCommand<
       originSourceIdentifier,
       destinationSourceIdentifier,
     );
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CopySourceResult } = commandModule;
     if (r.ok && r.url) {
       return new CopySourceResult({ identifier: r.url });
@@ -44,3 +44,7 @@ export default class CopySourceCommand extends HostBaseCommand<
     return new CopySourceResult({});
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { CopySourceTool as CopySourceCommand };
diff --git a/packages/host/app/tools/create-ai-assistant-room.ts b/packages/host/app/tools/create-ai-assistant-room.ts
index 9397d2950b2..ed22987b09c 100644
--- a/packages/host/app/tools/create-ai-assistant-room.ts
+++ b/packages/host/app/tools/create-ai-assistant-room.ts
@@ -10,26 +10,26 @@ import {
 } from '@cardstack/runtime-common/matrix-constants';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
 import type { FileDef } from 'https://cardstack.com/base/file-api';
 import type * as SkillModule from 'https://cardstack.com/base/skill';
 
 import { isSkillCard } from '../lib/file-def-manager';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 import {
-  getSkillSourceCommands,
+  getSkillSourceTools,
   loadSkillSource,
   type SkillSource,
-} from '../lib/skill-commands';
+} from '../lib/skill-tools';
 
 import type MatrixService from '../services/matrix-service';
 import type StoreService from '../services/store';
 
-export default class CreateAiAssistantRoomCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CreateAIAssistantRoomInput,
-  typeof BaseCommandModule.CreateAIAssistantRoomResult
+export default class CreateAiAssistantRoomTool extends HostBaseTool<
+  typeof BaseToolModule.CreateAIAssistantRoomInput,
+  typeof BaseToolModule.CreateAIAssistantRoomResult
 > {
   @service declare private matrixService: MatrixService;
   @service declare private store: StoreService;
@@ -54,7 +54,7 @@ export default class CreateAiAssistantRoomCommand extends HostBaseCommand<
   }
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CreateAIAssistantRoomInput } = commandModule;
     return CreateAIAssistantRoomInput;
   }
@@ -62,9 +62,10 @@ export default class CreateAiAssistantRoomCommand extends HostBaseCommand<
   // Collect skill ids from both the id fields (preferred, kind-agnostic) and
   // the legacy loaded-`Skill`-card fields, de-duped. A skill listed as both
   // enabled and disabled is treated as enabled.
-  private collectSkillIds(
-    input: BaseCommandModule.CreateAIAssistantRoomInput,
-  ): { enabledIds: string[]; disabledIds: string[] } {
+  private collectSkillIds(input: BaseToolModule.CreateAIAssistantRoomInput): {
+    enabledIds: string[];
+    disabledIds: string[];
+  } {
     let idsOf = (
       ids: string[] | undefined,
       cards: SkillModule.Skill[] | undefined,
@@ -88,7 +89,7 @@ export default class CreateAiAssistantRoomCommand extends HostBaseCommand<
 
   // Resolve skill ids to their room-skills-config file defs, uploading skill
   // cards and `.md` skill files by their respective paths (mirrors the split in
-  // `UpdateRoomSkillsCommand`). Returns the uploaded FileDefs plus the resolved
+  // `UpdateRoomSkillsTool`). Returns the uploaded FileDefs plus the resolved
   // skill sources so the caller can gather commands.
   private async resolveSkills(ids: string[]): Promise<{
     fileDefs: FileDef[];
@@ -104,7 +105,7 @@ export default class CreateAiAssistantRoomCommand extends HostBaseCommand<
           let source = await loadSkillSource(this.store, id);
           if (!source) {
             console.warn(
-              `[CreateAiAssistantRoomCommand] skipping skill "${id}": not a skill card or skill markdown file`,
+              `[CreateAiAssistantRoomTool] skipping skill "${id}": not a skill card or skill markdown file`,
             );
             return;
           }
@@ -116,7 +117,7 @@ export default class CreateAiAssistantRoomCommand extends HostBaseCommand<
           }
         } catch (e) {
           console.warn(
-            `[CreateAiAssistantRoomCommand] skipping skill "${id}": ${e}`,
+            `[CreateAiAssistantRoomTool] skipping skill "${id}": ${e}`,
           );
         }
       }),
@@ -137,16 +138,14 @@ export default class CreateAiAssistantRoomCommand extends HostBaseCommand<
   }
 
   protected async run(
-    input: BaseCommandModule.CreateAIAssistantRoomInput,
-  ): Promise<BaseCommandModule.CreateAIAssistantRoomResult> {
+    input: BaseToolModule.CreateAIAssistantRoomInput,
+  ): Promise<BaseToolModule.CreateAIAssistantRoomResult> {
     let { matrixService } = this;
     let userId = matrixService.userId;
     let aiBotFullId = matrixService.aiBotUserId;
 
     if (!userId) {
-      throw new Error(
-        'Requires userId to execute CreateAiAssistantRoomCommand',
-      );
+      throw new Error('Requires userId to execute CreateAiAssistantRoomTool');
     }
 
     let { enabledIds, disabledIds } = this.collectSkillIds(input);
@@ -155,13 +154,14 @@ export default class CreateAiAssistantRoomCommand extends HostBaseCommand<
       this.resolveSkills(disabledIds),
     ]);
 
-    let commandDefinitions = [...enabled.sources, ...disabled.sources].flatMap(
-      (source) => getSkillSourceCommands(source),
-    );
+    let toolDefinitionFileDefs = [
+      ...enabled.sources,
+      ...disabled.sources,
+    ].flatMap((source) => getSkillSourceTools(source));
     let commandFileDefs: FileDef[] = [];
-    if (commandDefinitions.length) {
-      commandFileDefs = await matrixService.uploadCommandDefinitions(
-        matrixService.getUniqueCommandDefinitions(commandDefinitions),
+    if (toolDefinitionFileDefs.length) {
+      commandFileDefs = await matrixService.uploadToolDefinitions(
+        matrixService.getUniqueToolDefinitions(toolDefinitionFileDefs),
       );
     }
 
@@ -212,7 +212,7 @@ export default class CreateAiAssistantRoomCommand extends HostBaseCommand<
           },
         ],
       }),
-      this.loadCommandModule(),
+      this.loadToolModule(),
     ]);
 
     const { room_id: roomId } = roomResult;
@@ -220,3 +220,7 @@ export default class CreateAiAssistantRoomCommand extends HostBaseCommand<
     return new CreateAIAssistantRoomResult({ roomId });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { CreateAiAssistantRoomTool as CreateAiAssistantRoomCommand };
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 5bd72a341b2..5594490d1b6 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
@@ -1,17 +1,17 @@
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import CreateSubmissionWorkflowCommand from './create-submission-workflow';
+import CreateSubmissionWorkflowTool from './create-submission-workflow';
 
-export default class CreateAndOpenSubmissionWorkflowCardCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CreateListingPRRequestInput
+export default class CreateAndOpenSubmissionWorkflowCardTool extends HostBaseTool<
+  typeof BaseToolModule.CreateListingPRRequestInput
 > {
   description =
     'Create a submission workflow card and open it in interact mode to track PR creation.';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CreateListingPRRequestInput } = commandModule;
     return CreateListingPRRequestInput;
   }
@@ -19,12 +19,16 @@ export default class CreateAndOpenSubmissionWorkflowCardCommand extends HostBase
   requireInputFields = ['realm', 'listingId'];
 
   protected async run(
-    input: BaseCommandModule.CreateListingPRRequestInput,
+    input: BaseToolModule.CreateListingPRRequestInput,
   ): Promise<undefined> {
-    await new CreateSubmissionWorkflowCommand(this.commandContext).execute({
+    await new CreateSubmissionWorkflowTool(this.commandContext).execute({
       realm: input.realm,
       listingId: input.listingId,
       listingName: input.listingName,
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { CreateAndOpenSubmissionWorkflowCardTool as CreateAndOpenSubmissionWorkflowCardCommand };
diff --git a/packages/host/app/tools/create-specs.ts b/packages/host/app/tools/create-specs.ts
index 8cde554054b..edd0a180b94 100644
--- a/packages/host/app/tools/create-specs.ts
+++ b/packages/host/app/tools/create-specs.ts
@@ -19,11 +19,11 @@ import {
 } from '@cardstack/runtime-common/code-ref';
 
 import type { BaseDef, CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 import type { Spec } from 'https://cardstack.com/base/spec';
 import type { SpecType } from 'https://cardstack.com/base/spec';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 import {
   type CardOrFieldDeclaration,
   type ModuleDeclaration,
@@ -31,7 +31,7 @@ import {
   isReexportCardOrField,
 } from '../services/module-contents-service';
 
-import GenerateReadmeSpecCommand from './generate-readme-spec';
+import GenerateReadmeSpecTool from './generate-readme-spec';
 
 import type CardService from '../services/card-service';
 import type ModuleContentsService from '../services/module-contents-service';
@@ -119,7 +119,7 @@ class SpecTypeGuesser {
     const superName = declaration.super.name;
     return (
       superName === 'Command' ||
-      superName === 'HostBaseCommand' ||
+      superName === 'HostBaseTool' ||
       superName?.includes('Command')
     );
   }
@@ -129,9 +129,9 @@ interface CreateSpecResult {
   new: boolean;
 }
 
-export default class CreateSpecCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CreateSpecsInput,
-  typeof BaseCommandModule.CreateSpecsResult
+export default class CreateSpecTool extends HostBaseTool<
+  typeof BaseToolModule.CreateSpecsInput,
+  typeof BaseToolModule.CreateSpecsResult
 > {
   @service declare private store: StoreService;
   @service declare private cardService: CardService;
@@ -143,7 +143,7 @@ export default class CreateSpecCommand extends HostBaseCommand<
   requireInputFields = ['targetRealm'];
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CreateSpecsInput } = commandModule;
     return CreateSpecsInput;
   }
@@ -226,7 +226,7 @@ export default class CreateSpecCommand extends HostBaseCommand<
     }
     if (autoGenerateReadme && !createdSpecRes.spec.readMe) {
       // we populate the readme when is not already set even when spec is already created
-      let generateReadmeSpecCommand = new GenerateReadmeSpecCommand(
+      let generateReadmeSpecCommand = new GenerateReadmeSpecTool(
         this.commandContext,
       );
       await generateReadmeSpecCommand.execute({
@@ -252,8 +252,8 @@ export default class CreateSpecCommand extends HostBaseCommand<
   }
 
   protected async run(
-    input: BaseCommandModule.CreateSpecsInput,
-  ): Promise<BaseCommandModule.CreateSpecsResult> {
+    input: BaseToolModule.CreateSpecsInput,
+  ): Promise<BaseToolModule.CreateSpecsResult> {
     let { codeRef, targetRealm, module, autoGenerateReadme } = input;
 
     if (!targetRealm) {
@@ -355,7 +355,7 @@ export default class CreateSpecCommand extends HostBaseCommand<
     }
 
     try {
-      let commandModule = await this.loadCommandModule();
+      let commandModule = await this.loadToolModule();
       const { CreateSpecsResult } = commandModule;
       return new CreateSpecsResult({
         newSpecs,
@@ -427,3 +427,7 @@ function isSpecSubclass(
   }
   return false;
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { CreateSpecTool as CreateSpecCommand };
diff --git a/packages/host/app/tools/create-submission-workflow.ts b/packages/host/app/tools/create-submission-workflow.ts
index f06d251b42e..b8f82c0f4c3 100644
--- a/packages/host/app/tools/create-submission-workflow.ts
+++ b/packages/host/app/tools/create-submission-workflow.ts
@@ -5,21 +5,21 @@ import type { LooseSingleCardDocument } from '@cardstack/runtime-common';
 
 import type { Listing } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import UseAiAssistantCommand from './ai-assistant';
-import SendBotTriggerEventCommand from './bot-requests/send-bot-trigger-event';
-import OpenInInteractModeCommand from './open-in-interact-mode';
+import UseAiAssistantTool from './ai-assistant';
+import SendBotTriggerEventTool from './bot-requests/send-bot-trigger-event';
+import OpenInInteractModeTool from './open-in-interact-mode';
 
 import type MatrixService from '../services/matrix-service';
 import type RealmService from '../services/realm';
 import type RealmServerService from '../services/realm-server';
 import type StoreService from '../services/store';
 
-export default class CreateSubmissionWorkflowCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CreateListingPRRequestInput
+export default class CreateSubmissionWorkflowTool extends HostBaseTool<
+  typeof BaseToolModule.CreateListingPRRequestInput
 > {
   @service declare private matrixService: MatrixService;
   @service declare private store: StoreService;
@@ -30,7 +30,7 @@ export default class CreateSubmissionWorkflowCommand extends HostBaseCommand<
     'Create a submission workflow card for a catalog listing, open it in interact mode, and trigger the PR creation process.';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CreateListingPRRequestInput } = commandModule;
     return CreateListingPRRequestInput;
   }
@@ -44,7 +44,7 @@ export default class CreateSubmissionWorkflowCommand extends HostBaseCommand<
   }
 
   protected async run(
-    input: BaseCommandModule.CreateListingPRRequestInput,
+    input: BaseToolModule.CreateListingPRRequestInput,
   ): Promise<undefined> {
     await this.matrixService.ready;
 
@@ -72,7 +72,7 @@ export default class CreateSubmissionWorkflowCommand extends HostBaseCommand<
     // 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 UseAiAssistantCommand(this.commandContext);
+    let useAiAssistantCommand = new UseAiAssistantTool(this.commandContext);
     let createRoomResult = await useAiAssistantCommand.execute({
       roomId: 'new',
       roomName: `PR: ${listingName ?? listingId ?? 'Listing'}`,
@@ -143,11 +143,11 @@ export default class CreateSubmissionWorkflowCommand extends HostBaseCommand<
       throw err;
     }
 
-    await new OpenInInteractModeCommand(this.commandContext).execute({
+    await new OpenInInteractModeTool(this.commandContext).execute({
       cardId: workflowCardId,
     });
 
-    await new SendBotTriggerEventCommand(this.commandContext).execute({
+    await new SendBotTriggerEventTool(this.commandContext).execute({
       roomId,
       realm,
       type: 'pr-listing-create',
@@ -171,3 +171,7 @@ export default class CreateSubmissionWorkflowCommand extends HostBaseCommand<
     );
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { CreateSubmissionWorkflowTool as CreateSubmissionWorkflowCommand };
diff --git a/packages/host/app/tools/evaluate-module.ts b/packages/host/app/tools/evaluate-module.ts
index 61582b32192..1ec17ba40c0 100644
--- a/packages/host/app/tools/evaluate-module.ts
+++ b/packages/host/app/tools/evaluate-module.ts
@@ -10,27 +10,27 @@
  * Used by the software-factory's EvalValidationStep via `_run-command`.
  */
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-export default class EvaluateModuleCommand extends HostBaseCommand<
-  typeof BaseCommandModule.EvaluateModuleInput,
-  typeof BaseCommandModule.EvaluateModuleResult
+export default class EvaluateModuleTool extends HostBaseTool<
+  typeof BaseToolModule.EvaluateModuleInput,
+  typeof BaseToolModule.EvaluateModuleResult
 > {
   description = 'Evaluate a .gts module via the Loader in the prerenderer';
   static actionVerb = 'Evaluate';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     return commandModule.EvaluateModuleInput;
   }
 
   requireInputFields = ['moduleIdentifier'];
 
   protected async run(
-    input: BaseCommandModule.EvaluateModuleInput,
-  ): Promise<BaseCommandModule.EvaluateModuleResult> {
+    input: BaseToolModule.EvaluateModuleInput,
+  ): Promise<BaseToolModule.EvaluateModuleResult> {
     let moduleUrl = input.moduleIdentifier;
     let realmUrl = input.realmIdentifier;
 
@@ -42,7 +42,7 @@ export default class EvaluateModuleCommand extends HostBaseCommand<
       this.validateModuleUrl(moduleUrl, realmUrl);
     }
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
 
     try {
       // Reset the loader to clear cached modules from prior eval runs.
@@ -117,3 +117,7 @@ export default class EvaluateModuleCommand extends HostBaseCommand<
     return pathname.endsWith('/') ? pathname : `${pathname}/`;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { EvaluateModuleTool as EvaluateModuleCommand };
diff --git a/packages/host/app/tools/execute-atomic-operations.ts b/packages/host/app/tools/execute-atomic-operations.ts
index 8dd78fa211b..f723dafc45a 100644
--- a/packages/host/app/tools/execute-atomic-operations.ts
+++ b/packages/host/app/tools/execute-atomic-operations.ts
@@ -2,22 +2,22 @@ import { service } from '@ember/service';
 
 import type { AtomicOperation } from '@cardstack/runtime-common/atomic-document';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type CardService from '../services/card-service';
 
-export default class ExecuteAtomicOperationsCommand extends HostBaseCommand<
-  typeof BaseCommandModule.ExecuteAtomicOperationsInput,
-  typeof BaseCommandModule.ExecuteAtomicOperationsResult
+export default class ExecuteAtomicOperationsTool extends HostBaseTool<
+  typeof BaseToolModule.ExecuteAtomicOperationsInput,
+  typeof BaseToolModule.ExecuteAtomicOperationsResult
 > {
   @service declare private cardService: CardService;
 
   description = 'Execute atomic operations against a realm';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { ExecuteAtomicOperationsInput } = commandModule;
     return ExecuteAtomicOperationsInput;
   }
@@ -25,9 +25,9 @@ export default class ExecuteAtomicOperationsCommand extends HostBaseCommand<
   requireInputFields = ['realmIdentifier', 'operations'];
 
   protected async run(
-    input: BaseCommandModule.ExecuteAtomicOperationsInput,
-  ): Promise<BaseCommandModule.ExecuteAtomicOperationsResult> {
-    let commandModule = await this.loadCommandModule();
+    input: BaseToolModule.ExecuteAtomicOperationsInput,
+  ): Promise<BaseToolModule.ExecuteAtomicOperationsResult> {
+    let commandModule = await this.loadToolModule();
     const { ExecuteAtomicOperationsResult } = commandModule;
     const results = await this.cardService.executeAtomicOperations(
       input.operations as AtomicOperation[],
@@ -42,3 +42,7 @@ export default class ExecuteAtomicOperationsCommand extends HostBaseCommand<
     return new ExecuteAtomicOperationsResult({ results: atomicResults });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { ExecuteAtomicOperationsTool as ExecuteAtomicOperationsCommand };
diff --git a/packages/host/app/tools/fetch-card-json.ts b/packages/host/app/tools/fetch-card-json.ts
index d015042fdac..0bc75ff2156 100644
--- a/packages/host/app/tools/fetch-card-json.ts
+++ b/packages/host/app/tools/fetch-card-json.ts
@@ -1,21 +1,21 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type CardService from '../services/card-service';
 
-export default class FetchCardJsonCommand extends HostBaseCommand<
-  typeof BaseCommandModule.FetchCardJsonInput,
-  typeof BaseCommandModule.FetchCardJsonResult
+export default class FetchCardJsonTool extends HostBaseTool<
+  typeof BaseToolModule.FetchCardJsonInput,
+  typeof BaseToolModule.FetchCardJsonResult
 > {
   @service declare private cardService: CardService;
 
   description = 'Fetch a card as a JSON document by URL';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { FetchCardJsonInput } = commandModule;
     return FetchCardJsonInput;
   }
@@ -23,11 +23,15 @@ export default class FetchCardJsonCommand extends HostBaseCommand<
   requireInputFields = ['cardIdentifier'];
 
   protected async run(
-    input: BaseCommandModule.FetchCardJsonInput,
-  ): Promise<BaseCommandModule.FetchCardJsonResult> {
-    let commandModule = await this.loadCommandModule();
+    input: BaseToolModule.FetchCardJsonInput,
+  ): Promise<BaseToolModule.FetchCardJsonResult> {
+    let commandModule = await this.loadToolModule();
     const { FetchCardJsonResult } = commandModule;
     const doc = await this.cardService.fetchJSON(input.cardIdentifier);
     return new FetchCardJsonResult({ document: doc });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { FetchCardJsonTool as FetchCardJsonCommand };
diff --git a/packages/host/app/tools/full-reindex-realm.ts b/packages/host/app/tools/full-reindex-realm.ts
index fbae191a151..c05fcbe14aa 100644
--- a/packages/host/app/tools/full-reindex-realm.ts
+++ b/packages/host/app/tools/full-reindex-realm.ts
@@ -1,13 +1,13 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type RealmService from '../services/realm';
 
-export default class FullReindexRealmCommand extends HostBaseCommand<
-  typeof BaseCommandModule.RealmIdentifierCard,
+export default class FullReindexRealmTool extends HostBaseTool<
+  typeof BaseToolModule.RealmIdentifierCard,
   undefined
 > {
   @service declare private realm: RealmService;
@@ -17,14 +17,18 @@ export default class FullReindexRealmCommand extends HostBaseCommand<
     'Force a full realm reindex. This republishes a from-scratch indexing job after clearing indexed mtimes, so every file in the realm is revisited even if mtimes have not changed. Use this when the user suspects indexing drift, stale cached results, or wants a full rebuild instead of the lighter default reindex. A user may request that they want to perform a full or deep reload/refresh of a realm in order to fully reindex it.';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { RealmIdentifierCard } = commandModule;
     return RealmIdentifierCard;
   }
 
   protected async run(
-    input: BaseCommandModule.RealmIdentifierCard,
+    input: BaseToolModule.RealmIdentifierCard,
   ): Promise<undefined> {
     await this.realm.fullReindex(input.realmIdentifier);
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { FullReindexRealmTool as FullReindexRealmCommand };
diff --git a/packages/host/app/tools/generate-example-cards.ts b/packages/host/app/tools/generate-example-cards.ts
index dfb54c8844b..0749692d10c 100644
--- a/packages/host/app/tools/generate-example-cards.ts
+++ b/packages/host/app/tools/generate-example-cards.ts
@@ -11,7 +11,7 @@ import {
 } from '@cardstack/runtime-common/code-ref';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
 import {
   buildAttachedFileURLs,
@@ -19,12 +19,12 @@ import {
   ONE_SHOT_SYSTEM_PROMPT,
   parseExamplePayloadFromOutput,
 } from '../lib/example-card-helpers';
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import { prettifyPrompts } from '../utils/prettify-prompts';
 
-import OneShotLlmRequestCommand from './one-shot-llm-request';
-import SendAiAssistantMessageCommand from './send-ai-assistant-message';
+import OneShotLlmRequestTool from './one-shot-llm-request';
+import SendAiAssistantMessageTool from './send-ai-assistant-message';
 
 import type AiAssistantPanelService from '../services/ai-assistant-panel-service';
 import type CardService from '../services/card-service';
@@ -33,8 +33,8 @@ import type NetworkService from '../services/network';
 import type RealmService from '../services/realm';
 import type StoreService from '../services/store';
 
-export default class GenerateExampleCardsCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CreateInstancesInput,
+export default class GenerateExampleCardsTool extends HostBaseTool<
+  typeof BaseToolModule.CreateInstancesInput,
   undefined
 > {
   @service declare private aiAssistantPanelService: AiAssistantPanelService;
@@ -45,7 +45,7 @@ export default class GenerateExampleCardsCommand extends HostBaseCommand<
   description = 'Create new cards populated with sample data';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CreateInstancesInput } = commandModule;
     return CreateInstancesInput;
   }
@@ -54,12 +54,12 @@ export default class GenerateExampleCardsCommand extends HostBaseCommand<
     return `Generate ${count} additional instances of the specified card definition, populated with sample data.`;
   }
 
-  protected getAttachedFileURLs(input: BaseCommandModule.CreateInstancesInput) {
+  protected getAttachedFileURLs(input: BaseToolModule.CreateInstancesInput) {
     return buildAttachedFileURLs(input.codeRef?.module);
   }
 
   protected async run(
-    input: BaseCommandModule.CreateInstancesInput,
+    input: BaseToolModule.CreateInstancesInput,
   ): Promise<undefined> {
     if (!input.codeRef) {
       throw new Error('Module is required');
@@ -77,7 +77,7 @@ export default class GenerateExampleCardsCommand extends HostBaseCommand<
       }),
     );
 
-    let sendMessageCommand = new SendAiAssistantMessageCommand(
+    let sendMessageCommand = new SendAiAssistantMessageTool(
       this.commandContext,
     );
 
@@ -91,9 +91,9 @@ export default class GenerateExampleCardsCommand extends HostBaseCommand<
   }
 }
 
-export class GenerateExampleCardsOneShotCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CreateInstancesInput,
-  typeof BaseCommandModule.CreateInstanceResult
+export class GenerateExampleCardsOneShotTool extends HostBaseTool<
+  typeof BaseToolModule.CreateInstancesInput,
+  typeof BaseToolModule.CreateInstanceResult
 > {
   @service declare private realm: RealmService;
   @service declare private store: StoreService;
@@ -106,14 +106,14 @@ export class GenerateExampleCardsOneShotCommand extends HostBaseCommand<
     'Create a new card instance populated with sample data via a direct LLM request';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CreateInstancesInput } = commandModule;
     return CreateInstancesInput;
   }
 
   protected async run(
-    input: BaseCommandModule.CreateInstancesInput,
-  ): Promise<BaseCommandModule.CreateInstanceResult> {
+    input: BaseToolModule.CreateInstancesInput,
+  ): Promise<BaseToolModule.CreateInstanceResult> {
     if (!input.codeRef) {
       throw new Error('Module is required');
     }
@@ -159,7 +159,7 @@ export class GenerateExampleCardsOneShotCommand extends HostBaseCommand<
       }),
     );
 
-    const oneShot = new OneShotLlmRequestCommand(this.commandContext);
+    const oneShot = new OneShotLlmRequestTool(this.commandContext);
     const attachedFileIdentifiers = buildAttachedFileURLs(input.codeRef.module);
     const llmResult = await oneShot.execute({
       codeRef: input.codeRef,
@@ -198,14 +198,14 @@ export class GenerateExampleCardsOneShotCommand extends HostBaseCommand<
       throw new Error('Failed to create generated example card');
     }
 
-    const commandModule = await this.loadCommandModule();
+    const commandModule = await this.loadToolModule();
     const { CreateInstanceResult } = commandModule;
     return new CreateInstanceResult({ createdCard });
   }
 }
 
 export async function createExampleInstanceFromPayload(opts: {
-  codeRef: BaseCommandModule.CreateInstancesInput['codeRef'];
+  codeRef: BaseToolModule.CreateInstancesInput['codeRef'];
   examplePayload: Record<string, unknown>;
   realm: string | undefined;
   store: StoreService;
@@ -287,7 +287,7 @@ function normalizeExampleAttributes(
 }
 
 function resolveExampleCodeRef(
-  codeRef: BaseCommandModule.CreateInstancesInput['codeRef'],
+  codeRef: BaseToolModule.CreateInstancesInput['codeRef'],
   realm: string | undefined,
   network: NetworkService,
 ): ResolvedCodeRef | undefined {
@@ -307,3 +307,8 @@ function resolveExampleCodeRef(
     return undefined;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { GenerateExampleCardsTool as GenerateExampleCardsCommand };
+export { GenerateExampleCardsOneShotTool as GenerateExampleCardsOneShotCommand };
diff --git a/packages/host/app/tools/generate-readme-spec.ts b/packages/host/app/tools/generate-readme-spec.ts
index 972bbd6a092..f03d0a39c5e 100644
--- a/packages/host/app/tools/generate-readme-spec.ts
+++ b/packages/host/app/tools/generate-readme-spec.ts
@@ -3,22 +3,22 @@ import { service } from '@ember/service';
 import type { RealmResourceIdentifier } from '@cardstack/runtime-common';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 import type { SpecType } from 'https://cardstack.com/base/spec';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 import { devSkillId } from '../lib/utils';
 
-import OneShotLlmRequestCommand from './one-shot-llm-request';
-import PatchCardInstanceCommand from './patch-card-instance';
+import OneShotLlmRequestTool from './one-shot-llm-request';
+import PatchCardInstanceTool from './patch-card-instance';
 
-import type CommandService from '../services/command-service';
+import type ToolService from '../services/tool-service';
 
-export default class GenerateReadmeSpecCommand extends HostBaseCommand<
-  typeof BaseCommandModule.GenerateReadmeSpecInput,
-  typeof BaseCommandModule.GenerateReadmeSpecResult
+export default class GenerateReadmeSpecTool extends HostBaseTool<
+  typeof BaseToolModule.GenerateReadmeSpecInput,
+  typeof BaseToolModule.GenerateReadmeSpecResult
 > {
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
 
   private static getUserPrompt(
     ref: {
@@ -48,28 +48,28 @@ Requirements:
     'Generate a README for a spec and patch it to the spec readMe field';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { GenerateReadmeSpecInput } = commandModule;
     return GenerateReadmeSpecInput;
   }
 
   protected async run(
-    input: BaseCommandModule.GenerateReadmeSpecInput,
-  ): Promise<BaseCommandModule.GenerateReadmeSpecResult> {
+    input: BaseToolModule.GenerateReadmeSpecInput,
+  ): Promise<BaseToolModule.GenerateReadmeSpecResult> {
     if (!input.spec) {
       throw new Error('Spec is required');
     }
 
     // Generate the README using the existing command
-    const generateReadmeCommand = new OneShotLlmRequestCommand(
-      this.commandService.commandContext,
+    const generateReadmeCommand = new OneShotLlmRequestTool(
+      this.toolService.commandContext,
     );
 
-    let userPrompt = GenerateReadmeSpecCommand.getUserPrompt(
+    let userPrompt = GenerateReadmeSpecTool.getUserPrompt(
       input.spec.ref,
       input.spec.specType as SpecType,
     );
-    let systemPrompt = GenerateReadmeSpecCommand.SYSTEM_PROMPT;
+    let systemPrompt = GenerateReadmeSpecTool.SYSTEM_PROMPT;
 
     const result = await generateReadmeCommand.execute({
       codeRef: {
@@ -85,8 +85,8 @@ Requirements:
     // Patch the spec's readMe field
     if (input.spec.id) {
       try {
-        const patchCardInstanceCommand = new PatchCardInstanceCommand(
-          this.commandService.commandContext,
+        const patchCardInstanceCommand = new PatchCardInstanceTool(
+          this.toolService.commandContext,
           { cardType: input.spec.constructor as typeof CardDef }, //is this correct?
         );
 
@@ -106,7 +106,7 @@ Requirements:
       }
     }
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { GenerateReadmeSpecResult } = commandModule;
 
     return new GenerateReadmeSpecResult({
@@ -114,3 +114,7 @@ Requirements:
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { GenerateReadmeSpecTool as GenerateReadmeSpecCommand };
diff --git a/packages/host/app/tools/generate-theme-example.ts b/packages/host/app/tools/generate-theme-example.ts
index 34626ef41f0..eba4d7eaf5a 100644
--- a/packages/host/app/tools/generate-theme-example.ts
+++ b/packages/host/app/tools/generate-theme-example.ts
@@ -1,7 +1,7 @@
 import { service } from '@ember/service';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
 import {
   buildAttachedFileURLs,
@@ -9,18 +9,18 @@ import {
   ONE_SHOT_SYSTEM_PROMPT,
   parseExamplePayloadFromOutput,
 } from '../lib/example-card-helpers';
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import { createExampleInstanceFromPayload } from './generate-example-cards';
-import OneShotLlmRequestCommand from './one-shot-llm-request';
+import OneShotLlmRequestTool from './one-shot-llm-request';
 
 import type NetworkService from '../services/network';
 import type RealmService from '../services/realm';
 import type StoreService from '../services/store';
 
-export default class GenerateThemeExampleCommand extends HostBaseCommand<
-  typeof BaseCommandModule.GenerateThemeExampleInput,
-  typeof BaseCommandModule.CreateInstanceResult
+export default class GenerateThemeExampleTool extends HostBaseTool<
+  typeof BaseToolModule.GenerateThemeExampleInput,
+  typeof BaseToolModule.CreateInstanceResult
 > {
   @service declare private store: StoreService;
   @service declare private realm: RealmService;
@@ -29,14 +29,14 @@ export default class GenerateThemeExampleCommand extends HostBaseCommand<
   static actionVerb = 'Create Theme Example';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { GenerateThemeExampleInput } = commandModule;
     return GenerateThemeExampleInput;
   }
 
   protected async run(
-    input: BaseCommandModule.GenerateThemeExampleInput,
-  ): Promise<BaseCommandModule.CreateInstanceResult> {
+    input: BaseToolModule.GenerateThemeExampleInput,
+  ): Promise<BaseToolModule.CreateInstanceResult> {
     if (!input.codeRef) {
       throw new Error('codeRef is required to create a card');
     }
@@ -70,7 +70,7 @@ export default class GenerateThemeExampleCommand extends HostBaseCommand<
       ),
     );
 
-    const oneShot = new OneShotLlmRequestCommand(this.commandContext);
+    const oneShot = new OneShotLlmRequestTool(this.commandContext);
     const llmResult = await oneShot.execute({
       codeRef: input.codeRef,
       systemPrompt: ONE_SHOT_SYSTEM_PROMPT,
@@ -103,7 +103,7 @@ export default class GenerateThemeExampleCommand extends HostBaseCommand<
       throw new Error('Failed to create theme example card');
     }
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CreateInstanceResult } = commandModule;
     return new CreateInstanceResult({
       createdCard: createdCard as CardDef,
@@ -148,3 +148,7 @@ export default class GenerateThemeExampleCommand extends HostBaseCommand<
     ].join('\n');
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { GenerateThemeExampleTool as GenerateThemeExampleCommand };
diff --git a/packages/host/app/tools/generate-thumbnail.ts b/packages/host/app/tools/generate-thumbnail.ts
index 511831c1734..15dc0f4cb7d 100644
--- a/packages/host/app/tools/generate-thumbnail.ts
+++ b/packages/host/app/tools/generate-thumbnail.ts
@@ -4,13 +4,13 @@ import { DEFAULT_IMAGE_GENERATION_LLM } from '@cardstack/runtime-common/matrix-c
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
 import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import PatchCardInstanceCommand from './patch-card-instance';
-import SendRequestViaProxyCommand from './send-request-via-proxy';
-import WriteBinaryFileCommand from './write-binary-file';
+import PatchCardInstanceTool from './patch-card-instance';
+import SendRequestViaProxyTool from './send-request-via-proxy';
+import WriteBinaryFileTool from './write-binary-file';
 
 function arrayBufferToBase64(buffer: ArrayBuffer): string {
   const maybeBuffer = (globalThis as any).Buffer;
@@ -68,16 +68,16 @@ function generateFilenameFromCardName(cardName: string | undefined): string {
   return `${words.join('-')}-${uniqueId}`;
 }
 
-export default class GenerateThumbnailCommand extends HostBaseCommand<
-  typeof BaseCommandModule.GenerateThumbnailInput,
-  typeof BaseCommandModule.GenerateThumbnailOutput
+export default class GenerateThumbnailTool extends HostBaseTool<
+  typeof BaseToolModule.GenerateThumbnailInput,
+  typeof BaseToolModule.GenerateThumbnailOutput
 > {
   static actionVerb = 'Generate';
   description =
     'Generate an AI thumbnail image and save it as an ImageDef in the realm';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { GenerateThumbnailInput } = commandModule;
     return GenerateThumbnailInput;
   }
@@ -85,8 +85,8 @@ export default class GenerateThumbnailCommand extends HostBaseCommand<
   requireInputFields = ['prompt', 'targetRealmIdentifier'];
 
   protected async run(
-    input: BaseCommandModule.GenerateThumbnailInput,
-  ): Promise<BaseCommandModule.GenerateThumbnailOutput> {
+    input: BaseToolModule.GenerateThumbnailInput,
+  ): Promise<BaseToolModule.GenerateThumbnailOutput> {
     const {
       prompt,
       sourceImageUrl,
@@ -146,7 +146,7 @@ export default class GenerateThumbnailCommand extends HostBaseCommand<
 
     const model = input.llmModel?.trim() || DEFAULT_IMAGE_GENERATION_LLM;
 
-    const result = await new SendRequestViaProxyCommand(
+    const result = await new SendRequestViaProxyTool(
       this.commandContext,
     ).execute({
       url: 'https://openrouter.ai/api/v1/chat/completions',
@@ -205,7 +205,7 @@ export default class GenerateThumbnailCommand extends HostBaseCommand<
       : filename;
 
     // Write binary to realm → realm indexes as PngDef/ImageDef automatically
-    const writeResult = await new WriteBinaryFileCommand(
+    const writeResult = await new WriteBinaryFileTool(
       this.commandContext,
     ).execute({
       path: filePath,
@@ -226,7 +226,7 @@ export default class GenerateThumbnailCommand extends HostBaseCommand<
         typeof CardAPI
       >('https://cardstack.com/base/card-api');
 
-      await new PatchCardInstanceCommand(this.commandContext, {
+      await new PatchCardInstanceTool(this.commandContext, {
         cardType: cardApiModule.CardDef as unknown as typeof CardDef,
       }).execute({
         cardId: targetCardId,
@@ -240,8 +240,12 @@ export default class GenerateThumbnailCommand extends HostBaseCommand<
       });
     }
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { GenerateThumbnailOutput } = commandModule;
     return new GenerateThumbnailOutput({ imageDefIdentifier });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { GenerateThumbnailTool as GenerateThumbnailCommand };
diff --git a/packages/host/app/tools/get-all-realm-metas.ts b/packages/host/app/tools/get-all-realm-metas.ts
index be213e81e76..1b508c25da7 100644
--- a/packages/host/app/tools/get-all-realm-metas.ts
+++ b/packages/host/app/tools/get-all-realm-metas.ts
@@ -1,14 +1,14 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type Realm from '../services/realm';
 
-export default class GetAllRealmMetasCommand extends HostBaseCommand<
+export default class GetAllRealmMetasTool extends HostBaseTool<
   undefined,
-  typeof BaseCommandModule.GetAllRealmMetasResult
+  typeof BaseToolModule.GetAllRealmMetasResult
 > {
   @service declare private realm: Realm;
 
@@ -19,9 +19,9 @@ export default class GetAllRealmMetasCommand extends HostBaseCommand<
     return undefined;
   }
 
-  protected async run(): Promise<BaseCommandModule.GetAllRealmMetasResult> {
+  protected async run(): Promise<BaseToolModule.GetAllRealmMetasResult> {
     let realmMetas = this.realm.allRealmsInfo;
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { GetAllRealmMetasResult, RealmInfoField, RealmMetaField } =
       commandModule;
 
@@ -36,3 +36,7 @@ export default class GetAllRealmMetasCommand extends HostBaseCommand<
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { GetAllRealmMetasTool as GetAllRealmMetasCommand };
diff --git a/packages/host/app/tools/get-available-realm-identifiers.ts b/packages/host/app/tools/get-available-realm-identifiers.ts
index 00259add053..98b44a9e198 100644
--- a/packages/host/app/tools/get-available-realm-identifiers.ts
+++ b/packages/host/app/tools/get-available-realm-identifiers.ts
@@ -1,14 +1,14 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type RealmServerService from '../services/realm-server';
 
-export default class GetAvailableRealmIdentifiersCommand extends HostBaseCommand<
+export default class GetAvailableRealmIdentifiersTool extends HostBaseTool<
   undefined,
-  typeof BaseCommandModule.GetAvailableRealmIdentifiersResult
+  typeof BaseToolModule.GetAvailableRealmIdentifiersResult
 > {
   @service declare private realmServer: RealmServerService;
 
@@ -19,11 +19,15 @@ export default class GetAvailableRealmIdentifiersCommand extends HostBaseCommand
     return undefined;
   }
 
-  protected async run(): Promise<BaseCommandModule.GetAvailableRealmIdentifiersResult> {
-    let commandModule = await this.loadCommandModule();
+  protected async run(): Promise<BaseToolModule.GetAvailableRealmIdentifiersResult> {
+    let commandModule = await this.loadToolModule();
     const { GetAvailableRealmIdentifiersResult } = commandModule;
     return new GetAvailableRealmIdentifiersResult({
       realmIdentifiers: this.realmServer.availableRealmIdentifiers,
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { GetAvailableRealmIdentifiersTool as GetAvailableRealmIdentifiersCommand };
diff --git a/packages/host/app/tools/get-card-type-schema.ts b/packages/host/app/tools/get-card-type-schema.ts
index 54a27a36568..a81ae1617a0 100644
--- a/packages/host/app/tools/get-card-type-schema.ts
+++ b/packages/host/app/tools/get-card-type-schema.ts
@@ -9,27 +9,27 @@ import {
 } from '@cardstack/runtime-common/helpers/ai';
 
 import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-export default class GetCardTypeSchemaCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CardTypeSchemaInput,
-  typeof BaseCommandModule.JsonCard
+export default class GetCardTypeSchemaTool extends HostBaseTool<
+  typeof BaseToolModule.CardTypeSchemaInput,
+  typeof BaseToolModule.JsonCard
 > {
   static actionVerb = 'Generate';
   description = 'Generate JSON schema for a card type definition';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     return commandModule.CardTypeSchemaInput;
   }
 
   requireInputFields = ['codeRef'];
 
   protected async run(
-    input: BaseCommandModule.CardTypeSchemaInput,
-  ): Promise<BaseCommandModule.JsonCard> {
+    input: BaseToolModule.CardTypeSchemaInput,
+  ): Promise<BaseToolModule.JsonCard> {
     let codeRef = input.codeRef as unknown as ResolvedCodeRef;
     if (!codeRef?.module || !codeRef?.name) {
       throw new Error('codeRef must be a ResolvedCodeRef with module and name');
@@ -53,7 +53,11 @@ export default class GetCardTypeSchemaCommand extends HostBaseCommand<
       mappings,
     );
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     return new commandModule.JsonCard({ json: schema });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { GetCardTypeSchemaTool as GetCardTypeSchemaCommand };
diff --git a/packages/host/app/tools/get-card.ts b/packages/host/app/tools/get-card.ts
index 04d89d27dcc..09dc6f0c440 100644
--- a/packages/host/app/tools/get-card.ts
+++ b/packages/host/app/tools/get-card.ts
@@ -1,14 +1,14 @@
 import { service } from '@ember/service';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type StoreService from '../services/store';
 
-export default class GetCardCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CardIdCard,
+export default class GetCardTool extends HostBaseTool<
+  typeof BaseToolModule.CardIdCard,
   typeof CardDef
 > {
   @service declare private store: StoreService;
@@ -17,14 +17,14 @@ export default class GetCardCommand extends HostBaseCommand<
   description = 'Get a card from the store by its ID';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CardIdCard } = commandModule;
     return CardIdCard;
   }
 
   requireInputFields = ['cardId'];
 
-  protected async run(input: BaseCommandModule.CardIdCard): Promise<CardDef> {
+  protected async run(input: BaseToolModule.CardIdCard): Promise<CardDef> {
     let card = await this.store.get(input.cardId);
     if (!card || !('id' in card)) {
       throw new Error(`Card not found for id: ${input.cardId}`);
@@ -32,3 +32,7 @@ export default class GetCardCommand extends HostBaseCommand<
     return card as CardDef;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { GetCardTool as GetCardCommand };
diff --git a/packages/host/app/tools/get-catalog-realm-identifiers.ts b/packages/host/app/tools/get-catalog-realm-identifiers.ts
index a559d6866b2..7d02f7b9dcc 100644
--- a/packages/host/app/tools/get-catalog-realm-identifiers.ts
+++ b/packages/host/app/tools/get-catalog-realm-identifiers.ts
@@ -1,14 +1,14 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type RealmServerService from '../services/realm-server';
 
-export default class GetCatalogRealmIdentifiersCommand extends HostBaseCommand<
+export default class GetCatalogRealmIdentifiersTool extends HostBaseTool<
   undefined,
-  typeof BaseCommandModule.GetCatalogRealmIdentifiersResult
+  typeof BaseToolModule.GetCatalogRealmIdentifiersResult
 > {
   @service declare private realmServer: RealmServerService;
 
@@ -19,11 +19,15 @@ export default class GetCatalogRealmIdentifiersCommand extends HostBaseCommand<
     return undefined;
   }
 
-  protected async run(): Promise<BaseCommandModule.GetCatalogRealmIdentifiersResult> {
-    let commandModule = await this.loadCommandModule();
+  protected async run(): Promise<BaseToolModule.GetCatalogRealmIdentifiersResult> {
+    let commandModule = await this.loadToolModule();
     const { GetCatalogRealmIdentifiersResult } = commandModule;
     return new GetCatalogRealmIdentifiersResult({
       realmIdentifiers: this.realmServer.catalogRealmIdentifiers,
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { GetCatalogRealmIdentifiersTool as GetCatalogRealmIdentifiersCommand };
diff --git a/packages/host/app/tools/get-default-writable-realm.ts b/packages/host/app/tools/get-default-writable-realm.ts
index c497a59adf5..bf21f015c0d 100644
--- a/packages/host/app/tools/get-default-writable-realm.ts
+++ b/packages/host/app/tools/get-default-writable-realm.ts
@@ -1,14 +1,14 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type RealmService from '../services/realm';
 
-export default class GetDefaultWritableRealmCommand extends HostBaseCommand<
+export default class GetDefaultWritableRealmTool extends HostBaseTool<
   undefined,
-  typeof BaseCommandModule.GetDefaultWritableRealmResult
+  typeof BaseToolModule.GetDefaultWritableRealmResult
 > {
   @service declare private realm: RealmService;
 
@@ -18,11 +18,15 @@ export default class GetDefaultWritableRealmCommand extends HostBaseCommand<
     return undefined;
   }
 
-  protected async run(): Promise<BaseCommandModule.GetDefaultWritableRealmResult> {
-    let commandModule = await this.loadCommandModule();
+  protected async run(): Promise<BaseToolModule.GetDefaultWritableRealmResult> {
+    let commandModule = await this.loadToolModule();
     const { GetDefaultWritableRealmResult } = commandModule;
     return new GetDefaultWritableRealmResult({
       realmIdentifier: this.realm.defaultWritableRealm?.path ?? '',
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { GetDefaultWritableRealmTool as GetDefaultWritableRealmCommand };
diff --git a/packages/host/app/tools/get-events-from-room.ts b/packages/host/app/tools/get-events-from-room.ts
index 2d2981c0151..58bda22676f 100644
--- a/packages/host/app/tools/get-events-from-room.ts
+++ b/packages/host/app/tools/get-events-from-room.ts
@@ -1,18 +1,18 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
 import type { MatrixEvent } from 'https://cardstack.com/base/matrix-event';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type { RoomResource } from '../resources/room';
 import type MatrixService from '../services/matrix-service';
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 
-export default class GetEventsFromRoomCommand extends HostBaseCommand<
-  typeof BaseCommandModule.GetEventsFromRoomInput,
-  typeof BaseCommandModule.GetEventsFromRoomResult
+export default class GetEventsFromRoomTool extends HostBaseTool<
+  typeof BaseToolModule.GetEventsFromRoomInput,
+  typeof BaseToolModule.GetEventsFromRoomResult
 > {
   @service declare private operatorModeStateService: OperatorModeStateService;
   @service declare private matrixService: MatrixService;
@@ -20,7 +20,7 @@ export default class GetEventsFromRoomCommand extends HostBaseCommand<
   static actionVerb = 'Listen';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { GetEventsFromRoomInput } = commandModule;
     return GetEventsFromRoomInput;
   }
@@ -28,13 +28,13 @@ export default class GetEventsFromRoomCommand extends HostBaseCommand<
   requireInputFields = ['roomId'];
 
   protected async run(
-    input: BaseCommandModule.GetEventsFromRoomInput,
-  ): Promise<BaseCommandModule.GetEventsFromRoomResult> {
+    input: BaseToolModule.GetEventsFromRoomInput,
+  ): Promise<BaseToolModule.GetEventsFromRoomResult> {
     let { matrixService } = this;
     let roomId = input.roomId;
     let sinceEventId = input.sinceEventId;
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { GetEventsFromRoomResult } = commandModule;
 
     let roomResource = matrixService.roomResources.get(roomId);
@@ -68,3 +68,7 @@ function getEventsSince(
   }
   return matrixEvents;
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { GetEventsFromRoomTool as GetEventsFromRoomCommand };
diff --git a/packages/host/app/tools/get-published-realms.ts b/packages/host/app/tools/get-published-realms.ts
index 4d039c4e985..c768a343944 100644
--- a/packages/host/app/tools/get-published-realms.ts
+++ b/packages/host/app/tools/get-published-realms.ts
@@ -2,9 +2,9 @@ import { service } from '@ember/service';
 
 import { ensureTrailingSlash } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type RealmService from '../services/realm';
 
@@ -12,9 +12,9 @@ import type RealmService from '../services/realm';
 // published. The data comes from the source realm's `_info` response, whose
 // `lastPublishedAt` is a { publishedRealmURL: lastPublishedAt } map populated
 // server-side from the realm_registry.
-export default class GetPublishedRealmsCommand extends HostBaseCommand<
-  typeof BaseCommandModule.GetPublishedRealmsInput,
-  typeof BaseCommandModule.GetPublishedRealmsResult
+export default class GetPublishedRealmsTool extends HostBaseTool<
+  typeof BaseToolModule.GetPublishedRealmsInput,
+  typeof BaseToolModule.GetPublishedRealmsResult
 > {
   @service declare private realm: RealmService;
 
@@ -23,16 +23,16 @@ export default class GetPublishedRealmsCommand extends HostBaseCommand<
     "Get a source realm's published destinations and when each was last published";
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     return commandModule.GetPublishedRealmsInput;
   }
 
   requireInputFields = ['realmURL'];
 
   protected async run(
-    input: BaseCommandModule.GetPublishedRealmsInput,
-  ): Promise<BaseCommandModule.GetPublishedRealmsResult> {
-    let commandModule = await this.loadCommandModule();
+    input: BaseToolModule.GetPublishedRealmsInput,
+  ): Promise<BaseToolModule.GetPublishedRealmsResult> {
+    let commandModule = await this.loadToolModule();
     let { GetPublishedRealmsResult, PublishedRealmInfo } = commandModule;
 
     let realmURL = ensureTrailingSlash(input.realmURL);
@@ -59,3 +59,7 @@ export default class GetPublishedRealmsCommand extends HostBaseCommand<
     return new GetPublishedRealmsResult({ results });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { GetPublishedRealmsTool as GetPublishedRealmsCommand };
diff --git a/packages/host/app/tools/get-realm-of-resource-identifier.ts b/packages/host/app/tools/get-realm-of-resource-identifier.ts
index d0795dd1c45..4c8359fa4d9 100644
--- a/packages/host/app/tools/get-realm-of-resource-identifier.ts
+++ b/packages/host/app/tools/get-realm-of-resource-identifier.ts
@@ -2,22 +2,22 @@ import { service } from '@ember/service';
 
 import { rri } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type RealmService from '../services/realm';
 
-export default class GetRealmOfResourceIdentifierCommand extends HostBaseCommand<
-  typeof BaseCommandModule.GetRealmOfResourceIdentifierInput,
-  typeof BaseCommandModule.GetRealmOfResourceIdentifierResult
+export default class GetRealmOfResourceIdentifierTool extends HostBaseTool<
+  typeof BaseToolModule.GetRealmOfResourceIdentifierInput,
+  typeof BaseToolModule.GetRealmOfResourceIdentifierResult
 > {
   @service declare private realm: RealmService;
 
   description = 'Get the realm that contains a given resource';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { GetRealmOfResourceIdentifierInput } = commandModule;
     return GetRealmOfResourceIdentifierInput;
   }
@@ -25,9 +25,9 @@ export default class GetRealmOfResourceIdentifierCommand extends HostBaseCommand
   requireInputFields = ['resourceIdentifier'];
 
   protected async run(
-    input: BaseCommandModule.GetRealmOfResourceIdentifierInput,
-  ): Promise<BaseCommandModule.GetRealmOfResourceIdentifierResult> {
-    let commandModule = await this.loadCommandModule();
+    input: BaseToolModule.GetRealmOfResourceIdentifierInput,
+  ): Promise<BaseToolModule.GetRealmOfResourceIdentifierResult> {
+    let commandModule = await this.loadToolModule();
     const { GetRealmOfResourceIdentifierResult } = commandModule;
     const realmIdentifier = this.realm.realmOf(rri(input.resourceIdentifier));
     return new GetRealmOfResourceIdentifierResult({
@@ -35,3 +35,7 @@ export default class GetRealmOfResourceIdentifierCommand extends HostBaseCommand
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { GetRealmOfResourceIdentifierTool as GetRealmOfResourceIdentifierCommand };
diff --git a/packages/host/app/tools/get-user-system-card.ts b/packages/host/app/tools/get-user-system-card.ts
index 01e4e5ff0fd..ccfda6e979e 100644
--- a/packages/host/app/tools/get-user-system-card.ts
+++ b/packages/host/app/tools/get-user-system-card.ts
@@ -2,17 +2,17 @@ import { service } from '@ember/service';
 
 import ENV from '@cardstack/host/config/environment';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type MatrixService from '../services/matrix-service';
 
 const { defaultSystemCardId } = ENV;
 
-export default class GetUserSystemCardCommand extends HostBaseCommand<
+export default class GetUserSystemCardTool extends HostBaseTool<
   undefined,
-  typeof BaseCommandModule.GetUserSystemCardResult
+  typeof BaseToolModule.GetUserSystemCardResult
 > {
   @service declare private matrixService: MatrixService;
 
@@ -23,9 +23,9 @@ export default class GetUserSystemCardCommand extends HostBaseCommand<
     return undefined;
   }
 
-  protected async run(): Promise<BaseCommandModule.GetUserSystemCardResult> {
+  protected async run(): Promise<BaseToolModule.GetUserSystemCardResult> {
     await this.matrixService.ready;
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { GetUserSystemCardResult } = commandModule;
 
     const systemCard = this.matrixService.systemCard;
@@ -36,3 +36,7 @@ export default class GetUserSystemCardCommand extends HostBaseCommand<
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { GetUserSystemCardTool as GetUserSystemCardCommand };
diff --git a/packages/host/app/tools/index.ts b/packages/host/app/tools/index.ts
index 478975a0c49..d625762f76f 100644
--- a/packages/host/app/tools/index.ts
+++ b/packages/host/app/tools/index.ts
@@ -1,101 +1,101 @@
 import type { VirtualNetwork } from '@cardstack/runtime-common';
 
-import * as AddFieldToCardDefinitionCommandModule from './add-field-to-card-definition';
-import * as UseAiAssistantCommandModule from './ai-assistant';
-import * as ApplyMarkdownEditCommandModule from './apply-markdown-edit';
-import * as ApplySearchReplaceBlockCommandModule from './apply-search-replace-block';
-import * as AskAiCommandModule from './ask-ai';
-import * as AuthedFetchCommandModule from './authed-fetch';
-import * as CreateListingPRRequestCommandModule from './bot-requests/create-listing-pr-request';
-import * as SendBotTriggerEventCommandModule from './bot-requests/send-bot-trigger-event';
-import * as CanReadRealmCommandModule from './can-read-realm';
-import * as CancelIndexingJobCommandModule from './cancel-indexing-job';
-import * as CheckCorrectnessCommandModule from './check-correctness';
-import * as CheckDomainAvailabilityCommandModule from './check-domain-availability';
-import * as CopyAndEditCommandModule from './copy-and-edit';
+import * as AddFieldToCardDefinitionToolModule from './add-field-to-card-definition';
+import * as UseAiAssistantToolModule from './ai-assistant';
+import * as ApplyMarkdownEditToolModule from './apply-markdown-edit';
+import * as ApplySearchReplaceBlockToolModule from './apply-search-replace-block';
+import * as AskAiToolModule from './ask-ai';
+import * as AuthedFetchToolModule from './authed-fetch';
+import * as CreateListingPRRequestToolModule from './bot-requests/create-listing-pr-request';
+import * as SendBotTriggerEventToolModule from './bot-requests/send-bot-trigger-event';
+import * as CanReadRealmToolModule from './can-read-realm';
+import * as CancelIndexingJobToolModule from './cancel-indexing-job';
+import * as CheckCorrectnessToolModule from './check-correctness';
+import * as CheckDomainAvailabilityToolModule from './check-domain-availability';
+import * as CopyAndEditToolModule from './copy-and-edit';
 import * as CopyCardToRealmModule from './copy-card';
-import * as CopyCardAsMarkdownCommandModule from './copy-card-as-markdown';
-import * as CopyCardToStackCommandModule from './copy-card-to-stack';
-import * as CopyFileToRealmCommandModule from './copy-file-to-realm';
-import * as CopySourceCommandModule from './copy-source';
-import * as CreateAIAssistantRoomCommandModule from './create-ai-assistant-room';
+import * as CopyCardAsMarkdownToolModule from './copy-card-as-markdown';
+import * as CopyCardToStackToolModule from './copy-card-to-stack';
+import * as CopyFileToRealmToolModule from './copy-file-to-realm';
+import * as CopySourceToolModule from './copy-source';
+import * as CreateAIAssistantRoomToolModule from './create-ai-assistant-room';
 import * as CreateAndOpenSubmissionWorkflowCard from './create-and-open-submission-workflow-card';
-import * as CreateSpecCommandModule from './create-specs';
-import * as CreateSubmissionWorkflowCommandModule from './create-submission-workflow';
-import * as EvaluateModuleCommandModule from './evaluate-module';
-import * as ExecuteAtomicOperationsCommandModule from './execute-atomic-operations';
-import * as FetchCardJsonCommandModule from './fetch-card-json';
-import * as FullReindexRealmCommandModule from './full-reindex-realm';
-import * as GenerateExampleCardsCommandModule from './generate-example-cards';
-import * as GenerateReadmeSpecCommandModule from './generate-readme-spec';
-import * as GenerateThemeExampleCommandModule from './generate-theme-example';
-import * as GenerateThumbnailCommandModule from './generate-thumbnail';
-import * as GetAllRealmMetasCommandModule from './get-all-realm-metas';
-import * as GetAvailableRealmIdentifiersCommandModule from './get-available-realm-identifiers';
-import * as GetCardCommandModule from './get-card';
-import * as GetCardTypeSchemaCommandModule from './get-card-type-schema';
-import * as GetCatalogRealmIdentifiersCommandModule from './get-catalog-realm-identifiers';
-import * as GetDefaultWritableRealmCommandModule from './get-default-writable-realm';
-import * as GetEventsFromRoomCommandModule from './get-events-from-room';
-import * as GetPublishedRealmsCommandModule from './get-published-realms';
-import * as GetRealmOfResourceIdentifierCommandModule from './get-realm-of-resource-identifier';
-import * as GetUserSystemCardCommandModule from './get-user-system-card';
-import * as InstantiateCardCommandModule from './instantiate-card';
-import * as InvalidateRealmIdentifiersCommandModule from './invalidate-realm-identifiers';
-import * as InviteUserToRoomCommandModule from './invite-user-to-room';
-import * as LintAndFixCommandModule from './lint-and-fix';
-import * as ListingBuildCommandModule from './listing-action-build';
-import * as MigrateSkillCommandModule from './migrate-skill';
-import * as OneShotLlmRequestCommandModule from './one-shot-llm-request';
-import * as OpenAiAssistantRoomCommandModule from './open-ai-assistant-room';
-import * as OpenCreateListingModalCommandModule from './open-create-listing-modal';
+import * as CreateSpecToolModule from './create-specs';
+import * as CreateSubmissionWorkflowToolModule from './create-submission-workflow';
+import * as EvaluateModuleToolModule from './evaluate-module';
+import * as ExecuteAtomicOperationsToolModule from './execute-atomic-operations';
+import * as FetchCardJsonToolModule from './fetch-card-json';
+import * as FullReindexRealmToolModule from './full-reindex-realm';
+import * as GenerateExampleCardsToolModule from './generate-example-cards';
+import * as GenerateReadmeSpecToolModule from './generate-readme-spec';
+import * as GenerateThemeExampleToolModule from './generate-theme-example';
+import * as GenerateThumbnailToolModule from './generate-thumbnail';
+import * as GetAllRealmMetasToolModule from './get-all-realm-metas';
+import * as GetAvailableRealmIdentifiersToolModule from './get-available-realm-identifiers';
+import * as GetCardToolModule from './get-card';
+import * as GetCardTypeSchemaToolModule from './get-card-type-schema';
+import * as GetCatalogRealmIdentifiersToolModule from './get-catalog-realm-identifiers';
+import * as GetDefaultWritableRealmToolModule from './get-default-writable-realm';
+import * as GetEventsFromRoomToolModule from './get-events-from-room';
+import * as GetPublishedRealmsToolModule from './get-published-realms';
+import * as GetRealmOfResourceIdentifierToolModule from './get-realm-of-resource-identifier';
+import * as GetUserSystemCardToolModule from './get-user-system-card';
+import * as InstantiateCardToolModule from './instantiate-card';
+import * as InvalidateRealmIdentifiersToolModule from './invalidate-realm-identifiers';
+import * as InviteUserToRoomToolModule from './invite-user-to-room';
+import * as LintAndFixToolModule from './lint-and-fix';
+import * as ListingBuildToolModule from './listing-action-build';
+import * as MigrateSkillToolModule from './migrate-skill';
+import * as OneShotLlmRequestToolModule from './one-shot-llm-request';
+import * as OpenAiAssistantRoomToolModule from './open-ai-assistant-room';
+import * as OpenCreateListingModalToolModule from './open-create-listing-modal';
 import * as OpenInInteractModeModule from './open-in-interact-mode';
-import * as OpenWorkspaceCommandModule from './open-workspace';
-import * as PatchCardInstanceCommandModule from './patch-card-instance';
-import * as PatchCodeCommandModule from './patch-code';
-import * as PatchFieldsCommandModule from './patch-fields';
-import * as PatchThemeCommandModule from './patch-theme';
-import * as PersistModuleInspectorViewCommandModule from './persist-module-inspector-view';
-import * as PopulateWithSampleDataCommandModule from './populate-with-sample-data';
-import * as PreviewFormatCommandModule from './preview-format';
-import * as PublishRealmCommandModule from './publish-realm';
-import * as ReadBinaryFileCommandModule from './read-binary-file';
-import * as ReadCardForAiAssistantCommandModule from './read-card-for-ai-assistant';
-import * as ReadFileForAiAssistantCommandModule from './read-file-for-ai-assistant';
-import * as ReadSourceCommandModule from './read-source';
-import * as ReadTextFileCommandModule from './read-text-file';
-import * as RegisterBotCommandModule from './register-bot';
-import * as ReindexRealmCommandModule from './reindex-realm';
-import * as RetrySubmissionWorkflowCommandModule from './retry-submission-workflow';
-import * as SanitizeModuleListCommandModule from './sanitize-module-list';
-import * as SaveCardCommandModule from './save-card';
-import * as ScreenshotCardCommandModule from './screenshot-card';
-import * as SearchAndChooseCommandModule from './search-and-choose';
-import * as SearchCardsCommandModule from './search-cards';
-import * as SearchGoogleImagesCommandModule from './search-google-images';
+import * as OpenWorkspaceToolModule from './open-workspace';
+import * as PatchCardInstanceToolModule from './patch-card-instance';
+import * as PatchCodeToolModule from './patch-code';
+import * as PatchFieldsToolModule from './patch-fields';
+import * as PatchThemeToolModule from './patch-theme';
+import * as PersistModuleInspectorViewToolModule from './persist-module-inspector-view';
+import * as PopulateWithSampleDataToolModule from './populate-with-sample-data';
+import * as PreviewFormatToolModule from './preview-format';
+import * as PublishRealmToolModule from './publish-realm';
+import * as ReadBinaryFileToolModule from './read-binary-file';
+import * as ReadCardForAiAssistantToolModule from './read-card-for-ai-assistant';
+import * as ReadFileForAiAssistantToolModule from './read-file-for-ai-assistant';
+import * as ReadSourceToolModule from './read-source';
+import * as ReadTextFileToolModule from './read-text-file';
+import * as RegisterBotToolModule from './register-bot';
+import * as ReindexRealmToolModule from './reindex-realm';
+import * as RetrySubmissionWorkflowToolModule from './retry-submission-workflow';
+import * as SanitizeModuleListToolModule from './sanitize-module-list';
+import * as SaveCardToolModule from './save-card';
+import * as ScreenshotCardToolModule from './screenshot-card';
+import * as SearchAndChooseToolModule from './search-and-choose';
+import * as SearchCardsToolModule from './search-cards';
+import * as SearchGoogleImagesToolModule from './search-google-images';
 import * as SendAiAssistantMessageModule from './send-ai-assistant-message';
-import * as SendRequestViaProxyCommandModule from './send-request-via-proxy';
-import * as SerializeCardCommandModule from './serialize-card';
+import * as SendRequestViaProxyToolModule from './send-request-via-proxy';
+import * as SerializeCardToolModule from './serialize-card';
 import * as SetActiveLlmModule from './set-active-llm';
-import * as SetUserSystemCardCommandModule from './set-user-system-card';
-import * as ShowCardCommandModule from './show-card';
-import * as ShowFileCommandModule from './show-file';
-import * as StoreAddCommandModule from './store-add';
-import * as SummarizeSessionCommandModule from './summarize-session';
-import * as SwitchSubmodeCommandModule from './switch-submode';
-import * as SyncOpenRouterModelsCommandModule from './sync-openrouter-models';
-import * as TransformCardsCommandModule from './transform-cards';
-import * as UnpublishRealmCommandModule from './unpublish-realm';
-import * as UnregisterBotCommandModule from './unregister-bot';
-import * as UpdateCodePathWithSelectionCommandModule from './update-code-path-with-selection';
-import * as UpdatePlaygroundSelectionCommandModule from './update-playground-selection';
-import * as UpdateRoomSkillsCommandModule from './update-room-skills';
+import * as SetUserSystemCardToolModule from './set-user-system-card';
+import * as ShowCardToolModule from './show-card';
+import * as ShowFileToolModule from './show-file';
+import * as StoreAddToolModule from './store-add';
+import * as SummarizeSessionToolModule from './summarize-session';
+import * as SwitchSubmodeToolModule from './switch-submode';
+import * as SyncOpenRouterModelsToolModule from './sync-openrouter-models';
+import * as TransformCardsToolModule from './transform-cards';
+import * as UnpublishRealmToolModule from './unpublish-realm';
+import * as UnregisterBotToolModule from './unregister-bot';
+import * as UpdateCodePathWithSelectionToolModule from './update-code-path-with-selection';
+import * as UpdatePlaygroundSelectionToolModule from './update-playground-selection';
+import * as UpdateRoomSkillsToolModule from './update-room-skills';
 import * as CommandUtilsModule from './utils';
-import * as ValidateRealmCommandModule from './validate-realm';
-import * as WriteBinaryFileCommandModule from './write-binary-file';
-import * as WriteTextFileCommandModule from './write-text-file';
+import * as ValidateRealmToolModule from './validate-realm';
+import * as WriteBinaryFileToolModule from './write-binary-file';
+import * as WriteTextFileToolModule from './write-text-file';
 
-import type HostBaseCommand from '../lib/host-base-command';
+import type HostBaseTool from '../lib/host-base-tool';
 
 // Registers a host tool module under its `@cardstack/boxel-host/tools/*`
 // specifier and the pre-rename `@cardstack/boxel-host/commands/*` spelling.
@@ -116,124 +116,120 @@ export function shimHostTools(virtualNetwork: VirtualNetwork) {
   shimHostToolModule(
     virtualNetwork,
     'add-field-to-card-definition',
-    AddFieldToCardDefinitionCommandModule,
+    AddFieldToCardDefinitionToolModule,
   );
-  shimHostToolModule(virtualNetwork, 'ask-ai', AskAiCommandModule);
-  shimHostToolModule(virtualNetwork, 'authed-fetch', AuthedFetchCommandModule);
+  shimHostToolModule(virtualNetwork, 'ask-ai', AskAiToolModule);
+  shimHostToolModule(virtualNetwork, 'authed-fetch', AuthedFetchToolModule);
   shimHostToolModule(
     virtualNetwork,
     'apply-markdown-edit',
-    ApplyMarkdownEditCommandModule,
+    ApplyMarkdownEditToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'apply-search-replace-block',
-    ApplySearchReplaceBlockCommandModule,
+    ApplySearchReplaceBlockToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'copy-card-as-markdown',
-    CopyCardAsMarkdownCommandModule,
+    CopyCardAsMarkdownToolModule,
   );
   shimHostToolModule(virtualNetwork, 'copy-card', CopyCardToRealmModule);
   shimHostToolModule(
     virtualNetwork,
     'copy-card-to-stack',
-    CopyCardToStackCommandModule,
+    CopyCardToStackToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'copy-file-to-realm',
-    CopyFileToRealmCommandModule,
+    CopyFileToRealmToolModule,
   );
-  shimHostToolModule(virtualNetwork, 'copy-source', CopySourceCommandModule);
-  shimHostToolModule(virtualNetwork, 'copy-and-edit', CopyAndEditCommandModule);
+  shimHostToolModule(virtualNetwork, 'copy-source', CopySourceToolModule);
+  shimHostToolModule(virtualNetwork, 'copy-and-edit', CopyAndEditToolModule);
   shimHostToolModule(
     virtualNetwork,
     'create-ai-assistant-room',
-    CreateAIAssistantRoomCommandModule,
+    CreateAIAssistantRoomToolModule,
   );
-  shimHostToolModule(virtualNetwork, 'create-specs', CreateSpecCommandModule);
+  shimHostToolModule(virtualNetwork, 'create-specs', CreateSpecToolModule);
   shimHostToolModule(
     virtualNetwork,
     'check-correctness',
-    CheckCorrectnessCommandModule,
+    CheckCorrectnessToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'check-domain-availability',
-    CheckDomainAvailabilityCommandModule,
+    CheckDomainAvailabilityToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'evaluate-module',
-    EvaluateModuleCommandModule,
+    EvaluateModuleToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'instantiate-card',
-    InstantiateCardCommandModule,
+    InstantiateCardToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'cancel-indexing-job',
-    CancelIndexingJobCommandModule,
+    CancelIndexingJobToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'generate-theme-example',
-    GenerateThemeExampleCommandModule,
+    GenerateThemeExampleToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'execute-atomic-operations',
-    ExecuteAtomicOperationsCommandModule,
+    ExecuteAtomicOperationsToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'fetch-card-json',
-    FetchCardJsonCommandModule,
+    FetchCardJsonToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'full-reindex-realm',
-    FullReindexRealmCommandModule,
+    FullReindexRealmToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'get-events-from-room',
-    GetEventsFromRoomCommandModule,
+    GetEventsFromRoomToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'get-published-realms',
-    GetPublishedRealmsCommandModule,
+    GetPublishedRealmsToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'invite-user-to-room',
-    InviteUserToRoomCommandModule,
+    InviteUserToRoomToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'invalidate-realm-identifiers',
-    InvalidateRealmIdentifiersCommandModule,
+    InvalidateRealmIdentifiersToolModule,
   );
-  shimHostToolModule(virtualNetwork, 'lint-and-fix', LintAndFixCommandModule);
+  shimHostToolModule(virtualNetwork, 'lint-and-fix', LintAndFixToolModule);
   shimHostToolModule(
     virtualNetwork,
     'listing-action-build',
-    ListingBuildCommandModule,
-  );
-  shimHostToolModule(
-    virtualNetwork,
-    'migrate-skill',
-    MigrateSkillCommandModule,
+    ListingBuildToolModule,
   );
+  shimHostToolModule(virtualNetwork, 'migrate-skill', MigrateSkillToolModule);
   shimHostToolModule(
     virtualNetwork,
     'create-listing-pr-request',
-    CreateListingPRRequestCommandModule,
+    CreateListingPRRequestToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
@@ -243,74 +239,54 @@ export function shimHostTools(virtualNetwork: VirtualNetwork) {
   shimHostToolModule(
     virtualNetwork,
     'patch-card-instance',
-    PatchCardInstanceCommandModule,
+    PatchCardInstanceToolModule,
   );
-  shimHostToolModule(virtualNetwork, 'patch-code', PatchCodeCommandModule);
-  shimHostToolModule(virtualNetwork, 'patch-fields', PatchFieldsCommandModule);
-  shimHostToolModule(virtualNetwork, 'patch-theme', PatchThemeCommandModule);
+  shimHostToolModule(virtualNetwork, 'patch-code', PatchCodeToolModule);
+  shimHostToolModule(virtualNetwork, 'patch-fields', PatchFieldsToolModule);
+  shimHostToolModule(virtualNetwork, 'patch-theme', PatchThemeToolModule);
   shimHostToolModule(
     virtualNetwork,
     'persist-module-inspector-view',
-    PersistModuleInspectorViewCommandModule,
-  );
-  shimHostToolModule(
-    virtualNetwork,
-    'preview-format',
-    PreviewFormatCommandModule,
-  );
-  shimHostToolModule(
-    virtualNetwork,
-    'publish-realm',
-    PublishRealmCommandModule,
+    PersistModuleInspectorViewToolModule,
   );
+  shimHostToolModule(virtualNetwork, 'preview-format', PreviewFormatToolModule);
+  shimHostToolModule(virtualNetwork, 'publish-realm', PublishRealmToolModule);
   shimHostToolModule(
     virtualNetwork,
     'read-binary-file',
-    ReadBinaryFileCommandModule,
+    ReadBinaryFileToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'read-card-for-ai-assistant',
-    ReadCardForAiAssistantCommandModule,
+    ReadCardForAiAssistantToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'read-file-for-ai-assistant',
-    ReadFileForAiAssistantCommandModule,
-  );
-  shimHostToolModule(virtualNetwork, 'read-source', ReadSourceCommandModule);
-  shimHostToolModule(
-    virtualNetwork,
-    'read-text-file',
-    ReadTextFileCommandModule,
-  );
-  shimHostToolModule(
-    virtualNetwork,
-    'reindex-realm',
-    ReindexRealmCommandModule,
+    ReadFileForAiAssistantToolModule,
   );
-  shimHostToolModule(virtualNetwork, 'register-bot', RegisterBotCommandModule);
-  shimHostToolModule(virtualNetwork, 'save-card', SaveCardCommandModule);
-  shimHostToolModule(
-    virtualNetwork,
-    'serialize-card',
-    SerializeCardCommandModule,
-  );
-  shimHostToolModule(virtualNetwork, 'search-cards', SearchCardsCommandModule);
+  shimHostToolModule(virtualNetwork, 'read-source', ReadSourceToolModule);
+  shimHostToolModule(virtualNetwork, 'read-text-file', ReadTextFileToolModule);
+  shimHostToolModule(virtualNetwork, 'reindex-realm', ReindexRealmToolModule);
+  shimHostToolModule(virtualNetwork, 'register-bot', RegisterBotToolModule);
+  shimHostToolModule(virtualNetwork, 'save-card', SaveCardToolModule);
+  shimHostToolModule(virtualNetwork, 'serialize-card', SerializeCardToolModule);
+  shimHostToolModule(virtualNetwork, 'search-cards', SearchCardsToolModule);
   shimHostToolModule(
     virtualNetwork,
     'search-and-choose',
-    SearchAndChooseCommandModule,
+    SearchAndChooseToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'open-ai-assistant-room',
-    OpenAiAssistantRoomCommandModule,
+    OpenAiAssistantRoomToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'open-create-listing-modal',
-    OpenCreateListingModalCommandModule,
+    OpenCreateListingModalToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
@@ -320,18 +296,14 @@ export function shimHostTools(virtualNetwork: VirtualNetwork) {
   shimHostToolModule(
     virtualNetwork,
     'create-submission-workflow',
-    CreateSubmissionWorkflowCommandModule,
+    CreateSubmissionWorkflowToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'retry-submission-workflow',
-    RetrySubmissionWorkflowCommandModule,
-  );
-  shimHostToolModule(
-    virtualNetwork,
-    'open-workspace',
-    OpenWorkspaceCommandModule,
+    RetrySubmissionWorkflowToolModule,
   );
+  shimHostToolModule(virtualNetwork, 'open-workspace', OpenWorkspaceToolModule);
   shimHostToolModule(
     virtualNetwork,
     'send-ai-assistant-message',
@@ -340,269 +312,245 @@ export function shimHostTools(virtualNetwork: VirtualNetwork) {
   shimHostToolModule(
     virtualNetwork,
     'send-bot-trigger-event',
-    SendBotTriggerEventCommandModule,
+    SendBotTriggerEventToolModule,
   );
   shimHostToolModule(virtualNetwork, 'set-active-llm', SetActiveLlmModule);
-  shimHostToolModule(virtualNetwork, 'show-card', ShowCardCommandModule);
-  shimHostToolModule(virtualNetwork, 'show-file', ShowFileCommandModule);
-  shimHostToolModule(
-    virtualNetwork,
-    'switch-submode',
-    SwitchSubmodeCommandModule,
-  );
+  shimHostToolModule(virtualNetwork, 'show-card', ShowCardToolModule);
+  shimHostToolModule(virtualNetwork, 'show-file', ShowFileToolModule);
+  shimHostToolModule(virtualNetwork, 'switch-submode', SwitchSubmodeToolModule);
   shimHostToolModule(
     virtualNetwork,
     'transform-cards',
-    TransformCardsCommandModule,
+    TransformCardsToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'unpublish-realm',
-    UnpublishRealmCommandModule,
-  );
-  shimHostToolModule(
-    virtualNetwork,
-    'unregister-bot',
-    UnregisterBotCommandModule,
+    UnpublishRealmToolModule,
   );
+  shimHostToolModule(virtualNetwork, 'unregister-bot', UnregisterBotToolModule);
   shimHostToolModule(
     virtualNetwork,
     'update-code-path-with-selection',
-    UpdateCodePathWithSelectionCommandModule,
+    UpdateCodePathWithSelectionToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'update-playground-selection',
-    UpdatePlaygroundSelectionCommandModule,
+    UpdatePlaygroundSelectionToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'update-room-skills',
-    UpdateRoomSkillsCommandModule,
+    UpdateRoomSkillsToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'send-request-via-proxy',
-    SendRequestViaProxyCommandModule,
+    SendRequestViaProxyToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'summarize-session',
-    SummarizeSessionCommandModule,
+    SummarizeSessionToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'sync-openrouter-models',
-    SyncOpenRouterModelsCommandModule,
-  );
-  shimHostToolModule(
-    virtualNetwork,
-    'ai-assistant',
-    UseAiAssistantCommandModule,
+    SyncOpenRouterModelsToolModule,
   );
+  shimHostToolModule(virtualNetwork, 'ai-assistant', UseAiAssistantToolModule);
   shimHostToolModule(virtualNetwork, 'utils', CommandUtilsModule);
   shimHostToolModule(
     virtualNetwork,
     'write-binary-file',
-    WriteBinaryFileCommandModule,
+    WriteBinaryFileToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'write-text-file',
-    WriteTextFileCommandModule,
-  );
-  shimHostToolModule(
-    virtualNetwork,
-    'ai-assistant',
-    UseAiAssistantCommandModule,
+    WriteTextFileToolModule,
   );
+  shimHostToolModule(virtualNetwork, 'ai-assistant', UseAiAssistantToolModule);
   shimHostToolModule(
     virtualNetwork,
     'generate-example-cards',
-    GenerateExampleCardsCommandModule,
+    GenerateExampleCardsToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'generate-readme-spec',
-    GenerateReadmeSpecCommandModule,
+    GenerateReadmeSpecToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'generate-thumbnail',
-    GenerateThumbnailCommandModule,
+    GenerateThumbnailToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'screenshot-card',
-    ScreenshotCardCommandModule,
+    ScreenshotCardToolModule,
   );
-  shimHostToolModule(virtualNetwork, 'get-card', GetCardCommandModule);
+  shimHostToolModule(virtualNetwork, 'get-card', GetCardToolModule);
   shimHostToolModule(
     virtualNetwork,
     'get-card-type-schema',
-    GetCardTypeSchemaCommandModule,
+    GetCardTypeSchemaToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'get-all-realm-metas',
-    GetAllRealmMetasCommandModule,
+    GetAllRealmMetasToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'get-available-realm-identifiers',
-    GetAvailableRealmIdentifiersCommandModule,
+    GetAvailableRealmIdentifiersToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'get-catalog-realm-identifiers',
-    GetCatalogRealmIdentifiersCommandModule,
-  );
-  shimHostToolModule(
-    virtualNetwork,
-    'can-read-realm',
-    CanReadRealmCommandModule,
+    GetCatalogRealmIdentifiersToolModule,
   );
+  shimHostToolModule(virtualNetwork, 'can-read-realm', CanReadRealmToolModule);
   shimHostToolModule(
     virtualNetwork,
     'get-default-writable-realm',
-    GetDefaultWritableRealmCommandModule,
+    GetDefaultWritableRealmToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'get-realm-of-resource-identifier',
-    GetRealmOfResourceIdentifierCommandModule,
+    GetRealmOfResourceIdentifierToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'sanitize-module-list',
-    SanitizeModuleListCommandModule,
-  );
-  shimHostToolModule(virtualNetwork, 'store-add', StoreAddCommandModule);
-  shimHostToolModule(
-    virtualNetwork,
-    'validate-realm',
-    ValidateRealmCommandModule,
+    SanitizeModuleListToolModule,
   );
+  shimHostToolModule(virtualNetwork, 'store-add', StoreAddToolModule);
+  shimHostToolModule(virtualNetwork, 'validate-realm', ValidateRealmToolModule);
   shimHostToolModule(
     virtualNetwork,
     'get-user-system-card',
-    GetUserSystemCardCommandModule,
+    GetUserSystemCardToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'search-google-images',
-    SearchGoogleImagesCommandModule,
+    SearchGoogleImagesToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'one-shot-llm-request',
-    OneShotLlmRequestCommandModule,
+    OneShotLlmRequestToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'populate-with-sample-data',
-    PopulateWithSampleDataCommandModule,
+    PopulateWithSampleDataToolModule,
   );
   shimHostToolModule(
     virtualNetwork,
     'set-user-system-card',
-    SetUserSystemCardCommandModule,
+    SetUserSystemCardToolModule,
   );
 }
 
 // Note - this is used for the tests
-export const HostCommandClasses: (typeof HostBaseCommand<any, any>)[] = [
-  AddFieldToCardDefinitionCommandModule.default,
-  ApplySearchReplaceBlockCommandModule.default,
-  ApplyMarkdownEditCommandModule.default,
-  AskAiCommandModule.default,
-  CopyCardAsMarkdownCommandModule.default,
+export const HostToolClasses: (typeof HostBaseTool<any, any>)[] = [
+  AddFieldToCardDefinitionToolModule.default,
+  ApplySearchReplaceBlockToolModule.default,
+  ApplyMarkdownEditToolModule.default,
+  AskAiToolModule.default,
+  CopyCardAsMarkdownToolModule.default,
   CopyCardToRealmModule.default,
-  CopyCardToStackCommandModule.default,
-  CopyFileToRealmCommandModule.default,
-  CopySourceCommandModule.default,
-  AuthedFetchCommandModule.default,
-  CanReadRealmCommandModule.default,
-  CreateAIAssistantRoomCommandModule.default,
-  CopyAndEditCommandModule.default,
-  CreateSpecCommandModule.default,
-  ExecuteAtomicOperationsCommandModule.default,
-  FetchCardJsonCommandModule.default,
-  FullReindexRealmCommandModule.default,
-  GenerateExampleCardsCommandModule.default,
-  GenerateReadmeSpecCommandModule.default,
-  GenerateThumbnailCommandModule.default,
-  ScreenshotCardCommandModule.default,
-  GetAllRealmMetasCommandModule.default,
-  GetAvailableRealmIdentifiersCommandModule.default,
-  GetDefaultWritableRealmCommandModule.default,
-  GetCatalogRealmIdentifiersCommandModule.default,
-  GetCardCommandModule.default,
-  GetRealmOfResourceIdentifierCommandModule.default,
-  GetCardTypeSchemaCommandModule.default,
-  GetUserSystemCardCommandModule.default,
-  GetEventsFromRoomCommandModule.default,
-  GetPublishedRealmsCommandModule.default,
-  InviteUserToRoomCommandModule.default,
-  InvalidateRealmIdentifiersCommandModule.default,
-  LintAndFixCommandModule.default,
-  ListingBuildCommandModule.default,
-  CreateListingPRRequestCommandModule.default,
-  OneShotLlmRequestCommandModule.default,
-  OpenAiAssistantRoomCommandModule.default,
-  OpenCreateListingModalCommandModule.default,
+  CopyCardToStackToolModule.default,
+  CopyFileToRealmToolModule.default,
+  CopySourceToolModule.default,
+  AuthedFetchToolModule.default,
+  CanReadRealmToolModule.default,
+  CreateAIAssistantRoomToolModule.default,
+  CopyAndEditToolModule.default,
+  CreateSpecToolModule.default,
+  ExecuteAtomicOperationsToolModule.default,
+  FetchCardJsonToolModule.default,
+  FullReindexRealmToolModule.default,
+  GenerateExampleCardsToolModule.default,
+  GenerateReadmeSpecToolModule.default,
+  GenerateThumbnailToolModule.default,
+  ScreenshotCardToolModule.default,
+  GetAllRealmMetasToolModule.default,
+  GetAvailableRealmIdentifiersToolModule.default,
+  GetDefaultWritableRealmToolModule.default,
+  GetCatalogRealmIdentifiersToolModule.default,
+  GetCardToolModule.default,
+  GetRealmOfResourceIdentifierToolModule.default,
+  GetCardTypeSchemaToolModule.default,
+  GetUserSystemCardToolModule.default,
+  GetEventsFromRoomToolModule.default,
+  GetPublishedRealmsToolModule.default,
+  InviteUserToRoomToolModule.default,
+  InvalidateRealmIdentifiersToolModule.default,
+  LintAndFixToolModule.default,
+  ListingBuildToolModule.default,
+  CreateListingPRRequestToolModule.default,
+  OneShotLlmRequestToolModule.default,
+  OpenAiAssistantRoomToolModule.default,
+  OpenCreateListingModalToolModule.default,
   CreateAndOpenSubmissionWorkflowCard.default,
-  CreateSubmissionWorkflowCommandModule.default,
-  RetrySubmissionWorkflowCommandModule.default,
+  CreateSubmissionWorkflowToolModule.default,
+  RetrySubmissionWorkflowToolModule.default,
   OpenInInteractModeModule.default,
-  OpenWorkspaceCommandModule.default,
-  GenerateThemeExampleCommandModule.default,
-  PatchCodeCommandModule.default,
-  PatchFieldsCommandModule.default,
-  PatchThemeCommandModule.default,
-  PersistModuleInspectorViewCommandModule.default,
-  PopulateWithSampleDataCommandModule.default,
-  PreviewFormatCommandModule.default,
-  PublishRealmCommandModule.default,
-  ReadBinaryFileCommandModule.default,
-  ReadCardForAiAssistantCommandModule.default,
-  ReadFileForAiAssistantCommandModule.default,
-  ReadSourceCommandModule.default,
-  ReadTextFileCommandModule.default,
-  RegisterBotCommandModule.default,
-  ReindexRealmCommandModule.default,
-  SaveCardCommandModule.default,
-  SanitizeModuleListCommandModule.default,
-  StoreAddCommandModule.default,
-  SerializeCardCommandModule.default,
-  SearchAndChooseCommandModule.default,
-  SearchCardsCommandModule.SearchCardsByQueryCommand,
-  SearchCardsCommandModule.SearchCardsByTypeAndTitleCommand,
-  SearchGoogleImagesCommandModule.default,
+  OpenWorkspaceToolModule.default,
+  GenerateThemeExampleToolModule.default,
+  PatchCodeToolModule.default,
+  PatchFieldsToolModule.default,
+  PatchThemeToolModule.default,
+  PersistModuleInspectorViewToolModule.default,
+  PopulateWithSampleDataToolModule.default,
+  PreviewFormatToolModule.default,
+  PublishRealmToolModule.default,
+  ReadBinaryFileToolModule.default,
+  ReadCardForAiAssistantToolModule.default,
+  ReadFileForAiAssistantToolModule.default,
+  ReadSourceToolModule.default,
+  ReadTextFileToolModule.default,
+  RegisterBotToolModule.default,
+  ReindexRealmToolModule.default,
+  SaveCardToolModule.default,
+  SanitizeModuleListToolModule.default,
+  StoreAddToolModule.default,
+  SerializeCardToolModule.default,
+  SearchAndChooseToolModule.default,
+  SearchCardsToolModule.SearchCardsByQueryTool,
+  SearchCardsToolModule.SearchCardsByTypeAndTitleTool,
+  SearchGoogleImagesToolModule.default,
   SendAiAssistantMessageModule.default,
-  SendBotTriggerEventCommandModule.default,
-  SendRequestViaProxyCommandModule.default,
+  SendBotTriggerEventToolModule.default,
+  SendRequestViaProxyToolModule.default,
   SetActiveLlmModule.default,
-  SetUserSystemCardCommandModule.default,
-  ShowCardCommandModule.default,
-  ShowFileCommandModule.default,
-  SummarizeSessionCommandModule.default,
-  SwitchSubmodeCommandModule.default,
-  SyncOpenRouterModelsCommandModule.default,
-  TransformCardsCommandModule.default,
-  UnpublishRealmCommandModule.default,
-  UnregisterBotCommandModule.default,
-  CancelIndexingJobCommandModule.default,
-  CheckCorrectnessCommandModule.default,
-  CheckDomainAvailabilityCommandModule.default,
-  EvaluateModuleCommandModule.default,
-  InstantiateCardCommandModule.default,
-  UpdateCodePathWithSelectionCommandModule.default,
-  UpdatePlaygroundSelectionCommandModule.default,
-  UpdateRoomSkillsCommandModule.default,
-  UseAiAssistantCommandModule.default,
-  ValidateRealmCommandModule.default,
-  MigrateSkillCommandModule.default,
-  WriteBinaryFileCommandModule.default,
-  WriteTextFileCommandModule.default,
+  SetUserSystemCardToolModule.default,
+  ShowCardToolModule.default,
+  ShowFileToolModule.default,
+  SummarizeSessionToolModule.default,
+  SwitchSubmodeToolModule.default,
+  SyncOpenRouterModelsToolModule.default,
+  TransformCardsToolModule.default,
+  UnpublishRealmToolModule.default,
+  UnregisterBotToolModule.default,
+  CancelIndexingJobToolModule.default,
+  CheckCorrectnessToolModule.default,
+  CheckDomainAvailabilityToolModule.default,
+  EvaluateModuleToolModule.default,
+  InstantiateCardToolModule.default,
+  UpdateCodePathWithSelectionToolModule.default,
+  UpdatePlaygroundSelectionToolModule.default,
+  UpdateRoomSkillsToolModule.default,
+  UseAiAssistantToolModule.default,
+  ValidateRealmToolModule.default,
+  MigrateSkillToolModule.default,
+  WriteBinaryFileToolModule.default,
+  WriteTextFileToolModule.default,
 ];
diff --git a/packages/host/app/tools/instantiate-card.ts b/packages/host/app/tools/instantiate-card.ts
index 5d3c6cc4ab5..91d595fb5df 100644
--- a/packages/host/app/tools/instantiate-card.ts
+++ b/packages/host/app/tools/instantiate-card.ts
@@ -16,15 +16,15 @@
 
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type StoreService from '../services/store';
 
-export default class InstantiateCardCommand extends HostBaseCommand<
-  typeof BaseCommandModule.InstantiateCardInput,
-  typeof BaseCommandModule.InstantiateCardResult
+export default class InstantiateCardTool extends HostBaseTool<
+  typeof BaseToolModule.InstantiateCardInput,
+  typeof BaseToolModule.InstantiateCardResult
 > {
   description = 'Instantiate a card from JSON via the store in the prerenderer';
   static actionVerb = 'Instantiate';
@@ -32,15 +32,15 @@ export default class InstantiateCardCommand extends HostBaseCommand<
   @service declare private store: StoreService;
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     return commandModule.InstantiateCardInput;
   }
 
   requireInputFields = ['moduleIdentifier', 'cardName', 'realmIdentifier'];
 
   protected async run(
-    input: BaseCommandModule.InstantiateCardInput,
-  ): Promise<BaseCommandModule.InstantiateCardResult> {
+    input: BaseToolModule.InstantiateCardInput,
+  ): Promise<BaseToolModule.InstantiateCardResult> {
     let moduleUrl = input.moduleIdentifier;
     let cardName = input.cardName;
     let realmUrl = input.realmIdentifier;
@@ -59,7 +59,7 @@ export default class InstantiateCardCommand extends HostBaseCommand<
 
     this.validateModuleUrl(moduleUrl, realmUrl);
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
 
     try {
       // Reset the loader to clear cached modules from prior runs.
@@ -183,3 +183,7 @@ export default class InstantiateCardCommand extends HostBaseCommand<
     return pathname.endsWith('/') ? pathname : `${pathname}/`;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { InstantiateCardTool as InstantiateCardCommand };
diff --git a/packages/host/app/tools/invalidate-realm-identifiers.ts b/packages/host/app/tools/invalidate-realm-identifiers.ts
index 3161fde0139..066b68d1349 100644
--- a/packages/host/app/tools/invalidate-realm-identifiers.ts
+++ b/packages/host/app/tools/invalidate-realm-identifiers.ts
@@ -1,13 +1,13 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type RealmService from '../services/realm';
 
-export default class InvalidateRealmIdentifiersCommand extends HostBaseCommand<
-  typeof BaseCommandModule.InvalidateRealmIdentifiersInput,
+export default class InvalidateRealmIdentifiersTool extends HostBaseTool<
+  typeof BaseToolModule.InvalidateRealmIdentifiersInput,
   undefined
 > {
   @service declare private realm: RealmService;
@@ -17,13 +17,13 @@ export default class InvalidateRealmIdentifiersCommand extends HostBaseCommand<
     'Invalidate files in a realm to trigger re-indexing. A user may request that they want to reload or refresh a card in order to re-index it.';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { InvalidateRealmIdentifiersInput } = commandModule;
     return InvalidateRealmIdentifiersInput;
   }
 
   protected async run(
-    input: BaseCommandModule.InvalidateRealmIdentifiersInput,
+    input: BaseToolModule.InvalidateRealmIdentifiersInput,
   ): Promise<undefined> {
     await this.realm.invalidateUrls(
       input.realmIdentifier,
@@ -31,3 +31,7 @@ export default class InvalidateRealmIdentifiersCommand extends HostBaseCommand<
     );
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { InvalidateRealmIdentifiersTool as InvalidateRealmIdentifiersCommand };
diff --git a/packages/host/app/tools/invite-user-to-room.ts b/packages/host/app/tools/invite-user-to-room.ts
index 8804fb894e9..f0f57ea9c5b 100644
--- a/packages/host/app/tools/invite-user-to-room.ts
+++ b/packages/host/app/tools/invite-user-to-room.ts
@@ -1,20 +1,20 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type MatrixService from '../services/matrix-service';
 
-export default class InviteUserToRoomCommand extends HostBaseCommand<
-  typeof BaseCommandModule.InviteUserToRoomInput
+export default class InviteUserToRoomTool extends HostBaseTool<
+  typeof BaseToolModule.InviteUserToRoomInput
 > {
   @service declare private matrixService: MatrixService;
 
   static actionVerb = 'Invite';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { InviteUserToRoomInput } = commandModule;
     return InviteUserToRoomInput;
   }
@@ -22,7 +22,7 @@ export default class InviteUserToRoomCommand extends HostBaseCommand<
   requireInputFields = ['roomId', 'userId'];
 
   protected async run(
-    input: BaseCommandModule.InviteUserToRoomInput,
+    input: BaseToolModule.InviteUserToRoomInput,
   ): Promise<undefined> {
     await this.matrixService.ready;
     let userId = this.matrixService.getFullUserId(input.userId);
@@ -32,3 +32,7 @@ export default class InviteUserToRoomCommand extends HostBaseCommand<
     await this.matrixService.inviteUserToRoom(input.roomId, userId);
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { InviteUserToRoomTool as InviteUserToRoomCommand };
diff --git a/packages/host/app/tools/lint-and-fix.ts b/packages/host/app/tools/lint-and-fix.ts
index 11cdb46766d..035a4243f78 100644
--- a/packages/host/app/tools/lint-and-fix.ts
+++ b/packages/host/app/tools/lint-and-fix.ts
@@ -2,9 +2,9 @@ import { service } from '@ember/service';
 
 import { SupportedMimeType } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 import {
   formatLintIssues,
   formatLintIssuesBySeverity,
@@ -12,16 +12,16 @@ import {
 
 import type NetworkService from '../services/network';
 
-export default class LintAndFixCommand extends HostBaseCommand<
-  typeof BaseCommandModule.LintAndFixInput,
-  typeof BaseCommandModule.LintAndFixResult
+export default class LintAndFixTool extends HostBaseTool<
+  typeof BaseToolModule.LintAndFixInput,
+  typeof BaseToolModule.LintAndFixResult
 > {
   @service declare private network: NetworkService;
   description = `Pass file content through linting endpoint`;
   static actionVerb = 'Autofix';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { LintAndFixInput } = commandModule;
     return LintAndFixInput;
   }
@@ -29,9 +29,9 @@ export default class LintAndFixCommand extends HostBaseCommand<
   requireInputFields = ['fileContent', 'realm'];
 
   protected async run(
-    input: BaseCommandModule.LintAndFixInput,
-  ): Promise<BaseCommandModule.LintAndFixResult> {
-    let commandModule = await this.loadCommandModule();
+    input: BaseToolModule.LintAndFixInput,
+  ): Promise<BaseToolModule.LintAndFixResult> {
+    let commandModule = await this.loadToolModule();
     const { LintAndFixResult } = commandModule;
     let response = await this.network.authedFetch(`${input.realm}_lint`, {
       method: 'POST',
@@ -58,3 +58,7 @@ export default class LintAndFixCommand extends HostBaseCommand<
     throw new Error(result.message);
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { LintAndFixTool as LintAndFixCommand };
diff --git a/packages/host/app/tools/listing-action-build.ts b/packages/host/app/tools/listing-action-build.ts
index 1a95f4e8024..d9ec3603d03 100644
--- a/packages/host/app/tools/listing-action-build.ts
+++ b/packages/host/app/tools/listing-action-build.ts
@@ -1,25 +1,25 @@
 import type { Listing } from '@cardstack/runtime-common';
 import { DEFAULT_CODING_LLM } from '@cardstack/runtime-common/matrix-constants';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 import { devSkillId, skillCardURL } from '../lib/utils';
 
-import CreateAiAssistantRoomCommand from './create-ai-assistant-room';
-import OpenAiAssistantRoomCommand from './open-ai-assistant-room';
-import SendAiAssistantMessageCommand from './send-ai-assistant-message';
-import SetActiveLLMCommand from './set-active-llm';
-import SwitchSubmodeCommand from './switch-submode';
-import UpdateRoomSkillsCommand from './update-room-skills';
+import CreateAiAssistantRoomTool from './create-ai-assistant-room';
+import OpenAiAssistantRoomTool from './open-ai-assistant-room';
+import SendAiAssistantMessageTool from './send-ai-assistant-message';
+import SetActiveLLMTool from './set-active-llm';
+import SwitchSubmodeTool from './switch-submode';
+import UpdateRoomSkillsTool from './update-room-skills';
 
-export default class ListingActionBuildCommand extends HostBaseCommand<
-  typeof BaseCommandModule.ListingBuildInput
+export default class ListingActionBuildTool extends HostBaseTool<
+  typeof BaseToolModule.ListingBuildInput
 > {
   description = 'Catalog listing build command';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { ListingBuildInput } = commandModule;
     return ListingBuildInput;
   }
@@ -27,7 +27,7 @@ export default class ListingActionBuildCommand extends HostBaseCommand<
   requireInputFields = ['realm', 'listing'];
 
   protected async run(
-    input: BaseCommandModule.ListingBuildInput,
+    input: BaseToolModule.ListingBuildInput,
   ): Promise<undefined> {
     let { realm: realmUrl, listing: listingInput } = input;
 
@@ -35,7 +35,7 @@ export default class ListingActionBuildCommand extends HostBaseCommand<
 
     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 CreateAiAssistantRoomCommand(
+    const { roomId } = await new CreateAiAssistantRoomTool(
       this.commandContext,
     ).execute({
       name: `Build ${listing.name}`,
@@ -48,31 +48,35 @@ export default class ListingActionBuildCommand extends HostBaseCommand<
     ];
 
     if (roomId) {
-      await new SetActiveLLMCommand(this.commandContext).execute({
+      await new SetActiveLLMTool(this.commandContext).execute({
         roomId,
         model: DEFAULT_CODING_LLM,
         mode: 'act',
       });
 
-      await new UpdateRoomSkillsCommand(this.commandContext).execute({
+      await new UpdateRoomSkillsTool(this.commandContext).execute({
         roomId,
         skillCardIdsToActivate: defaultSkills,
       });
 
-      await new SwitchSubmodeCommand(this.commandContext).execute({
+      await new SwitchSubmodeTool(this.commandContext).execute({
         submode: 'code',
         codePath: `${realmUrl}index.json`,
       });
 
-      await new SendAiAssistantMessageCommand(this.commandContext).execute({
+      await new SendAiAssistantMessageTool(this.commandContext).execute({
         roomId,
         prompt,
         attachedCards: [listing],
       });
 
-      await new OpenAiAssistantRoomCommand(this.commandContext).execute({
+      await new OpenAiAssistantRoomTool(this.commandContext).execute({
         roomId,
       });
     }
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { ListingActionBuildTool as ListingActionBuildCommand };
diff --git a/packages/host/app/tools/migrate-skill.ts b/packages/host/app/tools/migrate-skill.ts
index ecc9fc0c665..73a72dad1c8 100644
--- a/packages/host/app/tools/migrate-skill.ts
+++ b/packages/host/app/tools/migrate-skill.ts
@@ -4,22 +4,22 @@ import { stringify as stringifyYaml } from 'yaml';
 
 import { rri, skillCardRef } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 import type { Skill } from 'https://cardstack.com/base/skill';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type CardService from '../services/card-service';
 import type RealmService from '../services/realm';
 import type StoreService from '../services/store';
 
 // A single command in the migrated frontmatter — the same shape
-// `SkillFrontmatterField.tools` (a `containsMany(CommandField)`) parses back
+// `SkillFrontmatterField.tools` (a `containsMany(ToolField)`) parses back
 // out of `boxel.tools`.
 interface FrontmatterCommand {
   codeRef: { module: string; name: string };
   // Always emitted explicitly. The host auto-executes a command only when
-  // `requiresApproval === false` (`command-auto-execute.ts`) and otherwise
+  // `requiresApproval === false` (`tool-auto-execute.ts`) and otherwise
   // treats a missing value as `true` (`message-builder.ts`), so dropping an
   // explicit `false` would silently flip an auto-executing command back to
   // approval-required. Preserve the source value, defaulting a missing one to
@@ -51,9 +51,9 @@ function basenameSlug(id: string): string {
   return slugify(name.replace(/\.[^/.]+$/, ''));
 }
 
-export default class MigrateSkillCommand extends HostBaseCommand<
-  typeof BaseCommandModule.MigrateSkillInput,
-  typeof BaseCommandModule.MigrateSkillResult
+export default class MigrateSkillTool extends HostBaseTool<
+  typeof BaseToolModule.MigrateSkillInput,
+  typeof BaseToolModule.MigrateSkillResult
 > {
   @service declare private cardService: CardService;
   @service declare private realm: RealmService;
@@ -64,7 +64,7 @@ files with boxel.kind: skill frontmatter.`;
   static actionVerb = 'Migrate';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { MigrateSkillInput } = commandModule;
     return MigrateSkillInput;
   }
@@ -72,8 +72,8 @@ files with boxel.kind: skill frontmatter.`;
   requireInputFields = ['realm'];
 
   protected async run(
-    input: BaseCommandModule.MigrateSkillInput,
-  ): Promise<BaseCommandModule.MigrateSkillResult> {
+    input: BaseToolModule.MigrateSkillInput,
+  ): Promise<BaseToolModule.MigrateSkillResult> {
     let realmUrl = this.realm.realmOf(rri(input.realm));
     if (!realmUrl) {
       throw new Error(`Invalid or unknown realm provided: ${input.realm}`);
@@ -131,7 +131,7 @@ files with boxel.kind: skill frontmatter.`;
       migratedFiles.push(url.href);
     }
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { MigrateSkillResult } = commandModule;
     return new MigrateSkillResult({
       migratedFiles,
@@ -192,3 +192,7 @@ files with boxel.kind: skill frontmatter.`;
     throw new Error(`Error checking if file exists at ${url}: ${status}`);
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { MigrateSkillTool as MigrateSkillCommand };
diff --git a/packages/host/app/tools/one-shot-llm-request.ts b/packages/host/app/tools/one-shot-llm-request.ts
index 6d4549f4f6c..3befeab6061 100644
--- a/packages/host/app/tools/one-shot-llm-request.ts
+++ b/packages/host/app/tools/one-shot-llm-request.ts
@@ -4,29 +4,29 @@ import { isCardInstance, logger } from '@cardstack/runtime-common';
 // Conventional module-scoped logger (pattern used elsewhere like store & realm events)
 const oneShotLogger = logger('llm:oneshot');
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 import type { Skill } from 'https://cardstack.com/base/skill';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import { prettifyMessages } from '../utils/prettify-messages';
 import { prettifyPrompts } from '../utils/prettify-prompts';
 
-import ReadSourceCommand from './read-source';
-import ReadTextFileCommand from './read-text-file';
-import SendRequestViaProxyCommand from './send-request-via-proxy';
+import ReadSourceTool from './read-source';
+import ReadTextFileTool from './read-text-file';
+import SendRequestViaProxyTool from './send-request-via-proxy';
 
-import type CommandService from '../services/command-service';
 import type MatrixService from '../services/matrix-service';
 import type RealmServerService from '../services/realm-server';
 import type StoreService from '../services/store';
+import type ToolService from '../services/tool-service';
 
-export default class OneShotLlmRequestCommand extends HostBaseCommand<
-  typeof BaseCommandModule.OneShotLLMRequestInput,
-  typeof BaseCommandModule.OneShotLLMRequestResult
+export default class OneShotLlmRequestTool extends HostBaseTool<
+  typeof BaseToolModule.OneShotLLMRequestInput,
+  typeof BaseToolModule.OneShotLLMRequestResult
 > {
   @service declare private matrixService: MatrixService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private realmServer: RealmServerService;
   @service declare private store: StoreService;
 
@@ -34,15 +34,15 @@ export default class OneShotLlmRequestCommand extends HostBaseCommand<
   description = 'Execute a one-shot LLM request with custom prompts';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { OneShotLLMRequestInput } = commandModule;
     return OneShotLLMRequestInput;
   }
 
   protected async run(
-    input: BaseCommandModule.OneShotLLMRequestInput,
-  ): Promise<BaseCommandModule.OneShotLLMRequestResult> {
-    const commandModule = await this.loadCommandModule();
+    input: BaseToolModule.OneShotLLMRequestInput,
+  ): Promise<BaseToolModule.OneShotLLMRequestResult> {
+    const commandModule = await this.loadToolModule();
     const { OneShotLLMRequestResult } = commandModule;
 
     if (!input.systemPrompt) {
@@ -64,8 +64,8 @@ export default class OneShotLlmRequestCommand extends HostBaseCommand<
       // Read the file contents using the codeRef
       let fileContent = '';
       if (input.codeRef?.module) {
-        const readSourceCommand = new ReadSourceCommand(
-          this.commandService.commandContext,
+        const readSourceCommand = new ReadSourceTool(
+          this.toolService.commandContext,
         );
         const fileContents = await readSourceCommand.execute({
           path: input.codeRef.module,
@@ -79,8 +79,8 @@ export default class OneShotLlmRequestCommand extends HostBaseCommand<
         input.attachedFileIdentifiers &&
         input.attachedFileIdentifiers.length > 0
       ) {
-        const readTextFileCommand = new ReadTextFileCommand(
-          this.commandService.commandContext,
+        const readTextFileCommand = new ReadTextFileTool(
+          this.toolService.commandContext,
         );
 
         const attachedFilePromises = input.attachedFileIdentifiers.map(
@@ -163,8 +163,8 @@ export default class OneShotLlmRequestCommand extends HostBaseCommand<
         skillCards: loadedSkillCards.map((c) => c.id),
       });
 
-      const sendRequestViaProxyCommand = new SendRequestViaProxyCommand(
-        this.commandService.commandContext,
+      const sendRequestViaProxyCommand = new SendRequestViaProxyTool(
+        this.toolService.commandContext,
       );
       const result = await sendRequestViaProxyCommand.execute({
         url: 'https://openrouter.ai/api/v1/chat/completions',
@@ -207,3 +207,7 @@ const skillsToMessage = (cards: Skill[]) => {
     })
     .join('\n\n');
 };
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { OneShotLlmRequestTool as OneShotLlmRequestCommand };
diff --git a/packages/host/app/tools/open-ai-assistant-room.ts b/packages/host/app/tools/open-ai-assistant-room.ts
index 4fbfabe81d9..b921c5f6178 100644
--- a/packages/host/app/tools/open-ai-assistant-room.ts
+++ b/packages/host/app/tools/open-ai-assistant-room.ts
@@ -1,15 +1,15 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type AiAssistantPanelService from '../services/ai-assistant-panel-service';
 import type MatrixService from '../services/matrix-service';
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 
-export default class OpenAiAssistantRoomCommand extends HostBaseCommand<
-  typeof BaseCommandModule.OpenAiAssistantRoomInput
+export default class OpenAiAssistantRoomTool extends HostBaseTool<
+  typeof BaseToolModule.OpenAiAssistantRoomInput
 > {
   @service declare private aiAssistantPanelService: AiAssistantPanelService;
   @service declare private operatorModeStateService: OperatorModeStateService;
@@ -18,7 +18,7 @@ export default class OpenAiAssistantRoomCommand extends HostBaseCommand<
   static actionVerb = 'Open';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { OpenAiAssistantRoomInput } = commandModule;
     return OpenAiAssistantRoomInput;
   }
@@ -26,7 +26,7 @@ export default class OpenAiAssistantRoomCommand extends HostBaseCommand<
   requireInputFields = ['roomId'];
 
   protected async run(
-    input: BaseCommandModule.OpenAiAssistantRoomInput,
+    input: BaseToolModule.OpenAiAssistantRoomInput,
   ): Promise<undefined> {
     if (input.roomId) {
       this.operatorModeStateService.openAiAssistant();
@@ -36,3 +36,7 @@ export default class OpenAiAssistantRoomCommand extends HostBaseCommand<
     }
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { OpenAiAssistantRoomTool as OpenAiAssistantRoomCommand };
diff --git a/packages/host/app/tools/open-create-listing-modal.ts b/packages/host/app/tools/open-create-listing-modal.ts
index 1db180e7db4..b5e568fd2ed 100644
--- a/packages/host/app/tools/open-create-listing-modal.ts
+++ b/packages/host/app/tools/open-create-listing-modal.ts
@@ -6,21 +6,21 @@ import {
 } from '@cardstack/runtime-common';
 import { loadCardDef } from '@cardstack/runtime-common/code-ref';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 
-export default class OpenCreateListingModalCommand extends HostBaseCommand<
-  typeof BaseCommandModule.ListingCreateInput
+export default class OpenCreateListingModalTool extends HostBaseTool<
+  typeof BaseToolModule.ListingCreateInput
 > {
   @service declare private operatorModeStateService: OperatorModeStateService;
 
   description = 'Open create listing confirmation modal';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { ListingCreateInput } = commandModule;
     return ListingCreateInput;
   }
@@ -28,7 +28,7 @@ export default class OpenCreateListingModalCommand extends HostBaseCommand<
   requireInputFields = ['codeRef', 'targetRealm'];
 
   protected async run(
-    input: BaseCommandModule.ListingCreateInput,
+    input: BaseToolModule.ListingCreateInput,
   ): Promise<undefined> {
     let declarationKind: 'card' | 'field' = 'card';
     if (input.codeRef) {
@@ -50,3 +50,7 @@ export default class OpenCreateListingModalCommand extends HostBaseCommand<
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { OpenCreateListingModalTool as OpenCreateListingModalCommand };
diff --git a/packages/host/app/tools/open-in-interact-mode.ts b/packages/host/app/tools/open-in-interact-mode.ts
index 451f08da977..4204d4b4961 100644
--- a/packages/host/app/tools/open-in-interact-mode.ts
+++ b/packages/host/app/tools/open-in-interact-mode.ts
@@ -2,14 +2,14 @@ import { service } from '@ember/service';
 
 import type { Format } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 
-export default class OpenInInteractModeCommand extends HostBaseCommand<
-  typeof BaseCommandModule.ShowCardInput
+export default class OpenInInteractModeTool extends HostBaseTool<
+  typeof BaseToolModule.ShowCardInput
 > {
   @service declare private operatorModeStateService: OperatorModeStateService;
 
@@ -19,18 +19,20 @@ export default class OpenInInteractModeCommand extends HostBaseCommand<
   static actionVerb = 'Open Card';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { ShowCardInput } = commandModule;
     return ShowCardInput;
   }
 
   requireInputFields = ['cardId'];
 
-  protected async run(
-    input: BaseCommandModule.ShowCardInput,
-  ): Promise<undefined> {
+  protected async run(input: BaseToolModule.ShowCardInput): Promise<undefined> {
     let { operatorModeStateService } = this;
     let format = (input.format ?? 'isolated') as Format;
     operatorModeStateService.openCardInInteractMode(input.cardId, format);
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { OpenInInteractModeTool as OpenInInteractModeCommand };
diff --git a/packages/host/app/tools/open-workspace.ts b/packages/host/app/tools/open-workspace.ts
index 5046f068caa..06dbbd94d5b 100644
--- a/packages/host/app/tools/open-workspace.ts
+++ b/packages/host/app/tools/open-workspace.ts
@@ -1,13 +1,13 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 
-export default class OpenWorkspaceCommand extends HostBaseCommand<
-  typeof BaseCommandModule.RealmIdentifierCard
+export default class OpenWorkspaceTool extends HostBaseTool<
+  typeof BaseToolModule.RealmIdentifierCard
 > {
   @service declare private operatorModeStateService: OperatorModeStateService;
 
@@ -16,7 +16,7 @@ export default class OpenWorkspaceCommand extends HostBaseCommand<
   description = 'Open the main index card of a workspace.';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { RealmIdentifierCard } = commandModule;
     return RealmIdentifierCard;
   }
@@ -24,7 +24,7 @@ export default class OpenWorkspaceCommand extends HostBaseCommand<
   requireInputFields = ['realmIdentifier'];
 
   protected async run(
-    input: BaseCommandModule.RealmIdentifierCard,
+    input: BaseToolModule.RealmIdentifierCard,
   ): Promise<undefined> {
     let { realmIdentifier } = input;
     if (!realmIdentifier) {
@@ -36,3 +36,7 @@ export default class OpenWorkspaceCommand extends HostBaseCommand<
     return undefined;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { OpenWorkspaceTool as OpenWorkspaceCommand };
diff --git a/packages/host/app/tools/patch-card-instance.ts b/packages/host/app/tools/patch-card-instance.ts
index c16a004c061..1fc0832cb21 100644
--- a/packages/host/app/tools/patch-card-instance.ts
+++ b/packages/host/app/tools/patch-card-instance.ts
@@ -11,23 +11,22 @@ import {
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
 import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
-
-import type CommandService from '../services/command-service';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type StoreService from '../services/store';
+import type ToolService from '../services/tool-service';
 
 interface Configuration {
   cardType: typeof CardDef;
 }
-export default class PatchCardInstanceCommand extends HostBaseCommand<
-  typeof BaseCommandModule.PatchCardInput,
+export default class PatchCardInstanceTool extends HostBaseTool<
+  typeof BaseToolModule.PatchCardInput,
   undefined
 > {
   @service declare private store: StoreService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
 
   description = `Propose a patch to an existing card instance to change its contents. Any attributes specified will be fully replaced, return the minimum required to make the change. If a relationship field value is removed, set the self property of the specific item to null. When editing a relationship array, display the full array in the patch code. Ensure the description explains what change you are making. Do NOT leave out the cardId or patch fields or this tool will not work.`;
   static actionVerb = 'Update Card';
@@ -40,7 +39,7 @@ export default class PatchCardInstanceCommand extends HostBaseCommand<
   }
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { PatchCardInput } = commandModule;
     return PatchCardInput;
   }
@@ -48,7 +47,7 @@ export default class PatchCardInstanceCommand extends HostBaseCommand<
   requireInputFields = ['cardId', 'patch'];
 
   protected async run(
-    input: BaseCommandModule.PatchCardInput,
+    input: BaseToolModule.PatchCardInput,
   ): Promise<undefined> {
     if (!input.cardId || !input.patch) {
       throw new Error(
@@ -56,7 +55,7 @@ export default class PatchCardInstanceCommand extends HostBaseCommand<
       );
     }
 
-    let clientRequestId = this.commandService.trackAiAssistantCardRequest({
+    let clientRequestId = this.toolService.trackAiAssistantCardRequest({
       action: 'patch-instance',
       roomId: input.roomId,
       fileUrl: input.cardId.endsWith('.json')
@@ -106,3 +105,7 @@ export default class PatchCardInstanceCommand extends HostBaseCommand<
     return inputTypeCardSchema;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { PatchCardInstanceTool as PatchCardInstanceCommand };
diff --git a/packages/host/app/tools/patch-code.ts b/packages/host/app/tools/patch-code.ts
index ca5171abc63..f78a9db4e3d 100644
--- a/packages/host/app/tools/patch-code.ts
+++ b/packages/host/app/tools/patch-code.ts
@@ -2,22 +2,22 @@ import { service } from '@ember/service';
 
 import { hasExecutableExtension, rri } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 import { parseSearchReplace } from '../lib/search-replace-block-parsing';
 import { isReady } from '../resources/file';
 
 import { findNonConflictingFilename } from '../utils/file-name';
 
-import ApplySearchReplaceBlockCommand from './apply-search-replace-block';
-import LintAndFixCommand from './lint-and-fix';
+import ApplySearchReplaceBlockTool from './apply-search-replace-block';
+import LintAndFixTool from './lint-and-fix';
 
 import type CardService from '../services/card-service';
-import type CommandService from '../services/command-service';
 import type MonacoService from '../services/monaco-service';
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type RealmService from '../services/realm';
+import type ToolService from '../services/tool-service';
 
 interface FileInfo {
   exists: boolean;
@@ -25,21 +25,21 @@ interface FileInfo {
   content: string;
 }
 
-export default class PatchCodeCommand extends HostBaseCommand<
-  typeof BaseCommandModule.PatchCodeInput,
-  typeof BaseCommandModule.PatchCodeCommandResult
+export default class PatchCodeTool extends HostBaseTool<
+  typeof BaseToolModule.PatchCodeInput,
+  typeof BaseToolModule.PatchCodeCommandResult
 > {
   @service declare private cardService: CardService;
   @service declare private realm: RealmService;
   @service declare private monacoService: MonacoService;
   @service declare private operatorModeStateService: OperatorModeStateService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
 
   description = `Apply code changes to file and then apply lint fixes`;
   static actionVerb = 'Apply';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { PatchCodeInput } = commandModule;
     return PatchCodeInput;
   }
@@ -47,8 +47,8 @@ export default class PatchCodeCommand extends HostBaseCommand<
   requireInputFields = ['fileIdentifier', 'codeBlocks'];
 
   protected async run(
-    input: BaseCommandModule.PatchCodeInput,
-  ): Promise<BaseCommandModule.PatchCodeCommandResult> {
+    input: BaseToolModule.PatchCodeInput,
+  ): Promise<BaseToolModule.PatchCodeCommandResult> {
     let { fileIdentifier: fileUrl, codeBlocks, roomId } = input;
 
     let fileInfo = await this.getFileInfo(fileUrl);
@@ -73,7 +73,7 @@ export default class PatchCodeCommand extends HostBaseCommand<
         hasEmptySearchPortion,
       );
 
-      let clientRequestId = this.commandService.trackAiAssistantCardRequest({
+      let clientRequestId = this.toolService.trackAiAssistantCardRequest({
         action: 'patch-code',
         roomId,
         fileUrl: finalFileIdentifier,
@@ -91,12 +91,12 @@ export default class PatchCodeCommand extends HostBaseCommand<
             clientRequestId,
           })
           .catch((error: unknown) => {
-            console.error('PatchCodeCommand: failed to save source', error);
+            console.error('PatchCodeTool: failed to save source', error);
           });
       }
     }
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { PatchCodeCommandResult, PatchCodeResultField } = commandModule;
 
     return new PatchCodeCommandResult({
@@ -135,14 +135,14 @@ export default class PatchCodeCommand extends HostBaseCommand<
         })
         .catch((error: unknown) => {
           console.error(
-            'PatchCodeCommand: failed to write through FileResource',
+            'PatchCodeTool: failed to write through FileResource',
             error,
           );
         });
       return true;
     } catch (error) {
       console.error(
-        'PatchCodeCommand: unable to save through FileResource',
+        'PatchCodeTool: unable to save through FileResource',
         error,
       );
       return false;
@@ -175,7 +175,7 @@ export default class PatchCodeCommand extends HostBaseCommand<
     patchedCode: string;
     results: { status: 'applied' | 'failed'; failureReason?: string }[];
   }> {
-    let applyCommand = new ApplySearchReplaceBlockCommand(this.commandContext);
+    let applyCommand = new ApplySearchReplaceBlockTool(this.commandContext);
     let content = initialContent;
     let results: { status: 'applied' | 'failed'; failureReason?: string }[] =
       [];
@@ -202,8 +202,8 @@ export default class PatchCodeCommand extends HostBaseCommand<
   private async lintAndFix(
     fileUrl: string,
     content: string,
-  ): Promise<BaseCommandModule.LintAndFixResult> {
-    let lintCommand = new LintAndFixCommand(this.commandContext);
+  ): Promise<BaseToolModule.LintAndFixResult> {
+    let lintCommand = new LintAndFixTool(this.commandContext);
     let realmURL = this.realm.url(fileUrl);
     let filename = new URL(fileUrl).pathname.split('/').pop() || 'input.gts';
 
@@ -241,3 +241,7 @@ export default class PatchCodeCommand extends HostBaseCommand<
     return getSourceResult.status !== 404;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { PatchCodeTool as PatchCodeCommand };
diff --git a/packages/host/app/tools/patch-fields.ts b/packages/host/app/tools/patch-fields.ts
index 6ec4292995d..47fa7a4d7ff 100644
--- a/packages/host/app/tools/patch-fields.ts
+++ b/packages/host/app/tools/patch-fields.ts
@@ -8,10 +8,10 @@ import {
 import { Loader } from '@cardstack/runtime-common/loader';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
 import { FieldPathParser } from '../lib/field-path-parser';
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type { ValidateFieldPathResult } from '../lib/field-path-parser';
 
@@ -22,9 +22,9 @@ interface Configuration {
   cardType: typeof CardDef;
 }
 
-export default class PatchFieldsCommand extends HostBaseCommand<
-  typeof BaseCommandModule.PatchFieldsInput,
-  typeof BaseCommandModule.PatchFieldsOutput
+export default class PatchFieldsTool extends HostBaseTool<
+  typeof BaseToolModule.PatchFieldsInput,
+  typeof BaseToolModule.PatchFieldsOutput
 > {
   @service declare private store: StoreService;
   @service declare private cardService: CardService;
@@ -42,7 +42,7 @@ export default class PatchFieldsCommand extends HostBaseCommand<
   }
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { PatchFieldsInput } = commandModule;
     return PatchFieldsInput;
   }
@@ -87,11 +87,11 @@ export default class PatchFieldsCommand extends HostBaseCommand<
   }
 
   protected async run(
-    input: BaseCommandModule.PatchFieldsInput,
-  ): Promise<BaseCommandModule.PatchFieldsOutput> {
+    input: BaseToolModule.PatchFieldsInput,
+  ): Promise<BaseToolModule.PatchFieldsOutput> {
     if (!input.cardId || !input.fieldUpdates) {
       throw new Error(
-        "PatchFieldsCommand can't run because it doesn't have all the required fields",
+        "PatchFieldsTool can't run because it doesn't have all the required fields",
       );
     }
 
@@ -183,7 +183,7 @@ export default class PatchFieldsCommand extends HostBaseCommand<
       Object.assign(errors, fieldErrors);
 
       // Create and return the output
-      let commandModule = await this.loadCommandModule();
+      let commandModule = await this.loadToolModule();
       const { PatchFieldsOutput } = commandModule;
 
       return new PatchFieldsOutput({
@@ -192,13 +192,13 @@ export default class PatchFieldsCommand extends HostBaseCommand<
         errors,
       });
     } catch (error: any) {
-      console.log('PatchFieldsCommand: Caught error:', error.message);
+      console.log('PatchFieldsTool: Caught error:', error.message);
       // If the whole operation fails, mark all fields as failed
       Object.keys(input.fieldUpdates).forEach((fieldPath) => {
         errors[fieldPath] = error.message || 'Update failed';
       });
 
-      let commandModule = await this.loadCommandModule();
+      let commandModule = await this.loadToolModule();
       const { PatchFieldsOutput } = commandModule;
 
       return new PatchFieldsOutput({
@@ -302,3 +302,7 @@ export default class PatchFieldsCommand extends HostBaseCommand<
     };
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { PatchFieldsTool as PatchFieldsCommand };
diff --git a/packages/host/app/tools/patch-theme.ts b/packages/host/app/tools/patch-theme.ts
index c22b6ceb4d8..b9606bde9de 100644
--- a/packages/host/app/tools/patch-theme.ts
+++ b/packages/host/app/tools/patch-theme.ts
@@ -1,13 +1,13 @@
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 import type { Skill } from 'https://cardstack.com/base/skill';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import UseAiAssistantCommand from './ai-assistant';
+import UseAiAssistantTool from './ai-assistant';
 
-export default class PatchThemeCommand extends HostBaseCommand<
-  typeof BaseCommandModule.PatchThemeInput,
-  typeof BaseCommandModule.SendAiAssistantMessageResult
+export default class PatchThemeTool extends HostBaseTool<
+  typeof BaseToolModule.PatchThemeInput,
+  typeof BaseToolModule.SendAiAssistantMessageResult
 > {
   description =
     'Open the AI assistant to suggest improvements to a theme card and generate a patch.';
@@ -17,14 +17,14 @@ export default class PatchThemeCommand extends HostBaseCommand<
   requireInputFields = ['cardId'];
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { PatchThemeInput } = commandModule;
     return PatchThemeInput;
   }
 
   protected async run(
-    input: BaseCommandModule.PatchThemeInput,
-  ): Promise<BaseCommandModule.SendAiAssistantMessageResult> {
+    input: BaseToolModule.PatchThemeInput,
+  ): Promise<BaseToolModule.SendAiAssistantMessageResult> {
     if (!input.cardId) {
       throw new Error('patch-theme command requires a cardId');
     }
@@ -39,7 +39,7 @@ export default class PatchThemeCommand extends HostBaseCommand<
         ? linkedSkill.id
         : undefined;
 
-    let useAssistant = new UseAiAssistantCommand(this.commandContext);
+    let useAssistant = new UseAiAssistantTool(this.commandContext);
     return await useAssistant.execute({
       roomId: 'new',
       openRoom: true,
@@ -50,3 +50,7 @@ export default class PatchThemeCommand extends HostBaseCommand<
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { PatchThemeTool as PatchThemeCommand };
diff --git a/packages/host/app/tools/persist-module-inspector-view.ts b/packages/host/app/tools/persist-module-inspector-view.ts
index 76ab1020c56..09e9db10354 100644
--- a/packages/host/app/tools/persist-module-inspector-view.ts
+++ b/packages/host/app/tools/persist-module-inspector-view.ts
@@ -1,13 +1,13 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 
-export default class PersistModuleInspectorViewCommand extends HostBaseCommand<
-  typeof BaseCommandModule.PersistModuleInspectorViewInput,
+export default class PersistModuleInspectorViewTool extends HostBaseTool<
+  typeof BaseToolModule.PersistModuleInspectorViewInput,
   undefined
 > {
   @service declare private operatorModeStateService: OperatorModeStateService;
@@ -15,7 +15,7 @@ export default class PersistModuleInspectorViewCommand extends HostBaseCommand<
   description = 'Persist the module inspector view selection to local storage';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { PersistModuleInspectorViewInput } = commandModule;
     return PersistModuleInspectorViewInput;
   }
@@ -23,7 +23,7 @@ export default class PersistModuleInspectorViewCommand extends HostBaseCommand<
   requireInputFields = ['codePath', 'moduleInspectorView'];
 
   protected async run(
-    input: BaseCommandModule.PersistModuleInspectorViewInput,
+    input: BaseToolModule.PersistModuleInspectorViewInput,
   ): Promise<undefined> {
     let view = input.moduleInspectorView;
     let allowedViews: Set<string> = new Set(['schema', 'spec', 'preview']);
@@ -39,3 +39,7 @@ export default class PersistModuleInspectorViewCommand extends HostBaseCommand<
     return undefined;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { PersistModuleInspectorViewTool as PersistModuleInspectorViewCommand };
diff --git a/packages/host/app/tools/populate-with-sample-data.ts b/packages/host/app/tools/populate-with-sample-data.ts
index d116310cecb..4a090cb7ccf 100644
--- a/packages/host/app/tools/populate-with-sample-data.ts
+++ b/packages/host/app/tools/populate-with-sample-data.ts
@@ -9,23 +9,23 @@ import {
 import { isBaseInstance, realmURL } from '@cardstack/runtime-common/constants';
 
 import type { CardDef, FieldDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import SendAiAssistantMessageCommand from './send-ai-assistant-message';
+import SendAiAssistantMessageTool from './send-ai-assistant-message';
 
 import type AiAssistantPanelService from '../services/ai-assistant-panel-service';
-import type CommandService from '../services/command-service';
 import type MatrixService from '../services/matrix-service';
 import type StoreService from '../services/store';
+import type ToolService from '../services/tool-service';
 
-export default class PopulateWithSampleDataCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CardIdCard,
+export default class PopulateWithSampleDataTool extends HostBaseTool<
+  typeof BaseToolModule.CardIdCard,
   undefined
 > {
   @service declare private aiAssistantPanelService: AiAssistantPanelService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private matrixService: MatrixService;
   @service declare private store: StoreService;
 
@@ -33,7 +33,7 @@ export default class PopulateWithSampleDataCommand extends HostBaseCommand<
   description = 'Fill in the card with sample data';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CardIdCard } = commandModule;
     return CardIdCard;
   }
@@ -50,7 +50,7 @@ export default class PopulateWithSampleDataCommand extends HostBaseCommand<
     return cardModuleURL ? [cardModuleURL] : [];
   }
 
-  protected async run(input: BaseCommandModule.CardIdCard): Promise<undefined> {
+  protected async run(input: BaseToolModule.CardIdCard): Promise<undefined> {
     if (!input.cardId) {
       throw new Error('Card is required');
     }
@@ -61,7 +61,7 @@ export default class PopulateWithSampleDataCommand extends HostBaseCommand<
       throw new Error(`Could not load card: ${card.message}`);
     }
 
-    let sendMessageCommand = new SendAiAssistantMessageCommand(
+    let sendMessageCommand = new SendAiAssistantMessageTool(
       this.commandContext,
     );
 
@@ -82,3 +82,7 @@ function isCardOrField(card: any): card is CardDef | FieldDef {
 function isCard(card: any): card is CardDef {
   return isCardOrField(card) && !('isFieldDef' in card.constructor);
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { PopulateWithSampleDataTool as PopulateWithSampleDataCommand };
diff --git a/packages/host/app/tools/preview-format.ts b/packages/host/app/tools/preview-format.ts
index dbbc998e05e..629098204cb 100644
--- a/packages/host/app/tools/preview-format.ts
+++ b/packages/host/app/tools/preview-format.ts
@@ -1,16 +1,16 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import ShowCardCommand from './show-card';
-import SwitchSubmodeCommand from './switch-submode';
+import ShowCardTool from './show-card';
+import SwitchSubmodeTool from './switch-submode';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 
-export default class PreviewFormatCommand extends HostBaseCommand<
-  typeof BaseCommandModule.PreviewFormatInput
+export default class PreviewFormatTool extends HostBaseTool<
+  typeof BaseToolModule.PreviewFormatInput
 > {
   @service declare private operatorModeStateService: OperatorModeStateService;
 
@@ -20,7 +20,7 @@ export default class PreviewFormatCommand extends HostBaseCommand<
   static actionVerb = 'Preview Format';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { PreviewFormatInput } = commandModule;
     return PreviewFormatInput;
   }
@@ -28,10 +28,10 @@ export default class PreviewFormatCommand extends HostBaseCommand<
   requireInputFields = ['cardId', 'format', 'modulePath'];
 
   protected async run(
-    input: BaseCommandModule.PreviewFormatInput,
+    input: BaseToolModule.PreviewFormatInput,
   ): Promise<undefined> {
     // 1. Switch to code submode
-    await new SwitchSubmodeCommand(this.commandContext).execute({
+    await new SwitchSubmodeTool(this.commandContext).execute({
       submode: 'code',
       codePath: input.modulePath,
     });
@@ -42,11 +42,15 @@ export default class PreviewFormatCommand extends HostBaseCommand<
       'preview',
     );
 
-    // 3. Show the card in the specified format using ShowCardCommand
-    let showCardCommand = new ShowCardCommand(this.commandContext);
+    // 3. Show the card in the specified format using ShowCardTool
+    let showCardCommand = new ShowCardTool(this.commandContext);
     await showCardCommand.execute({
       cardId: input.cardId,
       format: input.format,
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { PreviewFormatTool as PreviewFormatCommand };
diff --git a/packages/host/app/tools/publish-realm.ts b/packages/host/app/tools/publish-realm.ts
index 007f6bdceb3..6315f07a8b7 100644
--- a/packages/host/app/tools/publish-realm.ts
+++ b/packages/host/app/tools/publish-realm.ts
@@ -9,9 +9,9 @@ import { getMatrixUsername } from '@cardstack/runtime-common/matrix-client';
 
 import config from '@cardstack/host/config/environment';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type RealmService from '../services/realm';
 import type { PublishabilityViolation } from '../services/realm';
@@ -23,9 +23,9 @@ import type { PublishabilityViolation } from '../services/realm';
 // thus completes only once every published realm is indexed and viewable.
 // (Readiness is polled over HTTP rather than awaited via realm `index` events,
 // which aren't delivered to the run-command/prerender context.)
-export default class PublishRealmCommand extends HostBaseCommand<
-  typeof BaseCommandModule.PublishRealmInput,
-  typeof BaseCommandModule.PublishRealmResult
+export default class PublishRealmTool extends HostBaseTool<
+  typeof BaseToolModule.PublishRealmInput,
+  typeof BaseToolModule.PublishRealmResult
 > {
   @service declare private realm: RealmService;
 
@@ -33,16 +33,16 @@ export default class PublishRealmCommand extends HostBaseCommand<
   description = 'Publish a realm to one or more destinations';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     return commandModule.PublishRealmInput;
   }
 
   requireInputFields = ['realmURL'];
 
   protected async run(
-    input: BaseCommandModule.PublishRealmInput,
-  ): Promise<BaseCommandModule.PublishRealmResult> {
-    let commandModule = await this.loadCommandModule();
+    input: BaseToolModule.PublishRealmInput,
+  ): Promise<BaseToolModule.PublishRealmResult> {
+    let commandModule = await this.loadToolModule();
     let { PublishRealmResult, PublishTargetResult } = commandModule;
 
     // Normalize so endpoint URLs like `${realmURL}_publishability` are well
@@ -145,3 +145,7 @@ function describeViolations(violations: PublishabilityViolation[]): string {
 function errorMessage(reason: unknown): string {
   return reason instanceof Error ? reason.message : String(reason);
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { PublishRealmTool as PublishRealmCommand };
diff --git a/packages/host/app/tools/read-binary-file.ts b/packages/host/app/tools/read-binary-file.ts
index 8e9379b4c01..0e461758f0d 100644
--- a/packages/host/app/tools/read-binary-file.ts
+++ b/packages/host/app/tools/read-binary-file.ts
@@ -1,8 +1,8 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type NetworkService from '../services/network';
 
@@ -22,9 +22,9 @@ function uint8ArrayToBase64(bytes: Uint8Array): string {
   return btoa(binary);
 }
 
-export default class ReadBinaryFileCommand extends HostBaseCommand<
-  typeof BaseCommandModule.ReadBinaryFileInput,
-  typeof BaseCommandModule.ReadBinaryFileResult
+export default class ReadBinaryFileTool extends HostBaseTool<
+  typeof BaseToolModule.ReadBinaryFileInput,
+  typeof BaseToolModule.ReadBinaryFileResult
 > {
   @service declare private network: NetworkService;
 
@@ -33,7 +33,7 @@ export default class ReadBinaryFileCommand extends HostBaseCommand<
   static actionVerb = 'Read';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { ReadBinaryFileInput } = commandModule;
     return ReadBinaryFileInput;
   }
@@ -41,10 +41,10 @@ export default class ReadBinaryFileCommand extends HostBaseCommand<
   requireInputFields = ['fileIdentifier'];
 
   protected async run(
-    input: BaseCommandModule.ReadBinaryFileInput,
-  ): Promise<BaseCommandModule.ReadBinaryFileResult> {
+    input: BaseToolModule.ReadBinaryFileInput,
+  ): Promise<BaseToolModule.ReadBinaryFileResult> {
     let response = await this.network.authedFetch(input.fileIdentifier);
-    let { ReadBinaryFileResult } = await this.loadCommandModule();
+    let { ReadBinaryFileResult } = await this.loadToolModule();
 
     if (!response.ok) {
       throw new Error(
@@ -60,3 +60,7 @@ export default class ReadBinaryFileCommand extends HostBaseCommand<
     return new ReadBinaryFileResult({ base64Content, contentType });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { ReadBinaryFileTool as ReadBinaryFileCommand };
diff --git a/packages/host/app/tools/read-card-for-ai-assistant.ts b/packages/host/app/tools/read-card-for-ai-assistant.ts
index e6d68a182d3..0430f12a31a 100644
--- a/packages/host/app/tools/read-card-for-ai-assistant.ts
+++ b/packages/host/app/tools/read-card-for-ai-assistant.ts
@@ -3,17 +3,17 @@ import { service } from '@ember/service';
 import { isCardInstance } from '@cardstack/runtime-common';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 import type { FileDef } from 'https://cardstack.com/base/file-api';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type MatrixService from '../services/matrix-service';
 import type StoreService from '../services/store';
 
-export default class ReadCardForAssistantCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CardIdCard,
-  typeof BaseCommandModule.CardForAttachmentCard
+export default class ReadCardForAssistantTool extends HostBaseTool<
+  typeof BaseToolModule.CardIdCard,
+  typeof BaseToolModule.CardForAttachmentCard
 > {
   @service declare private matrixService: MatrixService;
   @service declare private store: StoreService;
@@ -21,7 +21,7 @@ export default class ReadCardForAssistantCommand extends HostBaseCommand<
   static actionVerb = 'Send';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CardIdCard } = commandModule;
     return CardIdCard;
   }
@@ -29,8 +29,8 @@ export default class ReadCardForAssistantCommand extends HostBaseCommand<
   requireInputFields = ['cardId'];
 
   protected async run(
-    input: BaseCommandModule.CardIdCard,
-  ): Promise<BaseCommandModule.CardForAttachmentCard> {
+    input: BaseToolModule.CardIdCard,
+  ): Promise<BaseToolModule.CardForAttachmentCard> {
     let { matrixService } = this;
 
     await matrixService.ready;
@@ -39,7 +39,7 @@ export default class ReadCardForAssistantCommand extends HostBaseCommand<
       let cardFileDef = (
         await matrixService.uploadCards([maybeCard])
       )[0] as FileDef;
-      let commandModule = await this.loadCommandModule();
+      let commandModule = await this.loadToolModule();
       const { CardForAttachmentCard } = commandModule;
       return new CardForAttachmentCard({ cardForAttachment: cardFileDef });
     } else {
@@ -48,3 +48,7 @@ export default class ReadCardForAssistantCommand extends HostBaseCommand<
     }
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { ReadCardForAssistantTool as ReadCardForAssistantCommand };
diff --git a/packages/host/app/tools/read-file-for-ai-assistant.ts b/packages/host/app/tools/read-file-for-ai-assistant.ts
index 0bafc6ea955..1f6b75e46a2 100644
--- a/packages/host/app/tools/read-file-for-ai-assistant.ts
+++ b/packages/host/app/tools/read-file-for-ai-assistant.ts
@@ -1,22 +1,22 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 import type { FileDef } from 'https://cardstack.com/base/file-api';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type MatrixService from '../services/matrix-service';
 
-export default class ReadFileForAssistantCommand extends HostBaseCommand<
-  typeof BaseCommandModule.FileIdentifierCard,
-  typeof BaseCommandModule.FileForAttachmentCard
+export default class ReadFileForAssistantTool extends HostBaseTool<
+  typeof BaseToolModule.FileIdentifierCard,
+  typeof BaseToolModule.FileForAttachmentCard
 > {
   @service declare private matrixService: MatrixService;
 
   static actionVerb = 'Send';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { FileIdentifierCard } = commandModule;
     return FileIdentifierCard;
   }
@@ -24,8 +24,8 @@ export default class ReadFileForAssistantCommand extends HostBaseCommand<
   requireInputFields = ['fileIdentifier'];
 
   protected async run(
-    input: BaseCommandModule.FileIdentifierCard,
-  ): Promise<BaseCommandModule.FileForAttachmentCard> {
+    input: BaseToolModule.FileIdentifierCard,
+  ): Promise<BaseToolModule.FileForAttachmentCard> {
     let { matrixService } = this;
 
     let fileUrl = input.fileIdentifier;
@@ -39,8 +39,12 @@ export default class ReadFileForAssistantCommand extends HostBaseCommand<
     if (file) {
       file = (await matrixService.uploadFiles([file]))[0] as FileDef;
     }
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { FileForAttachmentCard } = commandModule;
     return new FileForAttachmentCard({ fileForAttachment: file });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { ReadFileForAssistantTool as ReadFileForAssistantCommand };
diff --git a/packages/host/app/tools/read-source.ts b/packages/host/app/tools/read-source.ts
index b0e87d84f3d..31774c2997b 100644
--- a/packages/host/app/tools/read-source.ts
+++ b/packages/host/app/tools/read-source.ts
@@ -2,15 +2,15 @@ import { service } from '@ember/service';
 
 import { SupportedMimeType } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type NetworkService from '../services/network';
 
-export default class ReadSourceCommand extends HostBaseCommand<
-  typeof BaseCommandModule.ReadSourceInput,
-  typeof BaseCommandModule.FileContents
+export default class ReadSourceTool extends HostBaseTool<
+  typeof BaseToolModule.ReadSourceInput,
+  typeof BaseToolModule.FileContents
 > {
   @service declare private network: NetworkService;
 
@@ -18,7 +18,7 @@ export default class ReadSourceCommand extends HostBaseCommand<
   static actionVerb = 'Read';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { ReadSourceInput } = commandModule;
     return ReadSourceInput;
   }
@@ -26,8 +26,8 @@ export default class ReadSourceCommand extends HostBaseCommand<
   requireInputFields = ['path'];
 
   protected async run(
-    input: BaseCommandModule.ReadSourceInput,
-  ): Promise<BaseCommandModule.FileContents> {
+    input: BaseToolModule.ReadSourceInput,
+  ): Promise<BaseToolModule.FileContents> {
     let url = input.realm
       ? new URL(input.path, input.realm)
       : new URL(input.path);
@@ -35,7 +35,7 @@ export default class ReadSourceCommand extends HostBaseCommand<
       headers: { Accept: SupportedMimeType.CardSource },
     });
 
-    let { FileContents } = await this.loadCommandModule();
+    let { FileContents } = await this.loadToolModule();
     if (response.ok) {
       return new FileContents({
         content: await response.text(),
@@ -44,3 +44,7 @@ export default class ReadSourceCommand extends HostBaseCommand<
     throw new Error(`Error reading file ${url}: ${response.statusText}`);
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { ReadSourceTool as ReadSourceCommand };
diff --git a/packages/host/app/tools/read-text-file.ts b/packages/host/app/tools/read-text-file.ts
index 345f8239038..2f70ffbf2e2 100644
--- a/packages/host/app/tools/read-text-file.ts
+++ b/packages/host/app/tools/read-text-file.ts
@@ -1,14 +1,14 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type NetworkService from '../services/network';
 
-export default class ReadTextFileCommand extends HostBaseCommand<
-  typeof BaseCommandModule.ReadTextFileInput,
-  typeof BaseCommandModule.FileContents
+export default class ReadTextFileTool extends HostBaseTool<
+  typeof BaseToolModule.ReadTextFileInput,
+  typeof BaseToolModule.FileContents
 > {
   @service declare private network: NetworkService;
 
@@ -16,7 +16,7 @@ export default class ReadTextFileCommand extends HostBaseCommand<
   static actionVerb = 'Read';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { ReadTextFileInput } = commandModule;
     return ReadTextFileInput;
   }
@@ -24,8 +24,8 @@ export default class ReadTextFileCommand extends HostBaseCommand<
   requireInputFields = ['path'];
 
   protected async run(
-    input: BaseCommandModule.ReadTextFileInput,
-  ): Promise<BaseCommandModule.FileContents> {
+    input: BaseToolModule.ReadTextFileInput,
+  ): Promise<BaseToolModule.FileContents> {
     let url = input.realm
       ? new URL(input.path, input.realm)
       : new URL(input.path);
@@ -33,7 +33,7 @@ export default class ReadTextFileCommand extends HostBaseCommand<
       headers: { Accept: 'text/plain' },
     });
 
-    let { FileContents } = await this.loadCommandModule();
+    let { FileContents } = await this.loadToolModule();
     if (response.ok) {
       return new FileContents({
         content: await response.text(),
@@ -42,3 +42,7 @@ export default class ReadTextFileCommand extends HostBaseCommand<
     throw new Error(`Error reading file ${url}: ${response.statusText}`);
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { ReadTextFileTool as ReadTextFileCommand };
diff --git a/packages/host/app/tools/register-bot.ts b/packages/host/app/tools/register-bot.ts
index ad06581eb39..eabc25c40dd 100644
--- a/packages/host/app/tools/register-bot.ts
+++ b/packages/host/app/tools/register-bot.ts
@@ -1,8 +1,8 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type RealmServerService from '../services/realm-server';
 
@@ -10,9 +10,9 @@ type RegisterBotResult = {
   botRegistrationId: string;
 };
 
-export default class RegisterBotCommand extends HostBaseCommand<
-  typeof BaseCommandModule.RegisterBotInput,
-  typeof BaseCommandModule.RegisterBotResult
+export default class RegisterBotTool extends HostBaseTool<
+  typeof BaseToolModule.RegisterBotInput,
+  typeof BaseToolModule.RegisterBotResult
 > {
   @service declare private realmServer: RealmServerService;
 
@@ -20,15 +20,15 @@ export default class RegisterBotCommand extends HostBaseCommand<
   description = 'Register bot';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { RegisterBotInput } = commandModule;
     return RegisterBotInput;
   }
 
   protected async run(
-    input: BaseCommandModule.RegisterBotInput,
-  ): Promise<BaseCommandModule.RegisterBotResult> {
-    const commandModule = await this.loadCommandModule();
+    input: BaseToolModule.RegisterBotInput,
+  ): Promise<BaseToolModule.RegisterBotResult> {
+    const commandModule = await this.loadToolModule();
     const { RegisterBotResult } = commandModule;
 
     let registration = (await this.realmServer.registerBot(
@@ -40,3 +40,7 @@ export default class RegisterBotCommand extends HostBaseCommand<
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { RegisterBotTool as RegisterBotCommand };
diff --git a/packages/host/app/tools/reindex-realm.ts b/packages/host/app/tools/reindex-realm.ts
index 61252ab3e49..a383761017e 100644
--- a/packages/host/app/tools/reindex-realm.ts
+++ b/packages/host/app/tools/reindex-realm.ts
@@ -1,13 +1,13 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type RealmService from '../services/realm';
 
-export default class ReindexRealmCommand extends HostBaseCommand<
-  typeof BaseCommandModule.RealmIdentifierCard,
+export default class ReindexRealmTool extends HostBaseTool<
+  typeof BaseToolModule.RealmIdentifierCard,
   undefined
 > {
   @service declare private realm: RealmService;
@@ -17,14 +17,18 @@ export default class ReindexRealmCommand extends HostBaseCommand<
     'Reindex a realm using the lighter/default mode. This republishes a from-scratch indexing job but only revisits files whose indexed state appears stale based on current mtime, deletion, or error semantics. Use this when a user wants to pick up normal recent changes or refresh a realm without performing a full reindex.';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { RealmIdentifierCard } = commandModule;
     return RealmIdentifierCard;
   }
 
   protected async run(
-    input: BaseCommandModule.RealmIdentifierCard,
+    input: BaseToolModule.RealmIdentifierCard,
   ): Promise<undefined> {
     await this.realm.reindex(input.realmIdentifier);
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { ReindexRealmTool as ReindexRealmCommand };
diff --git a/packages/host/app/tools/retry-submission-workflow.ts b/packages/host/app/tools/retry-submission-workflow.ts
index 6a00f7ee6f5..e2e1b46a8d1 100644
--- a/packages/host/app/tools/retry-submission-workflow.ts
+++ b/packages/host/app/tools/retry-submission-workflow.ts
@@ -2,11 +2,11 @@ import { service } from '@ember/service';
 
 import { isCardInstance, rri } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import SendBotTriggerEventCommand from './bot-requests/send-bot-trigger-event';
+import SendBotTriggerEventTool from './bot-requests/send-bot-trigger-event';
 
 import type RealmService from '../services/realm';
 import type StoreService from '../services/store';
@@ -22,8 +22,8 @@ interface WorkflowCardView {
 // SubmissionWorkflowCard that ended in a failed state. Reads roomId + listing
 // off the card so the same Matrix room is reused (preserving the prior
 // conversation and the bot-runner's view of the workflow).
-export default class RetrySubmissionWorkflowCommand extends HostBaseCommand<
-  typeof BaseCommandModule.RetrySubmissionWorkflowInput
+export default class RetrySubmissionWorkflowTool extends HostBaseTool<
+  typeof BaseToolModule.RetrySubmissionWorkflowInput
 > {
   @service declare private store: StoreService;
   @service declare private realm: RealmService;
@@ -32,7 +32,7 @@ export default class RetrySubmissionWorkflowCommand extends HostBaseCommand<
     'Retry a failed submission workflow by re-emitting the bot trigger event into the original room.';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { RetrySubmissionWorkflowInput } = commandModule;
     return RetrySubmissionWorkflowInput;
   }
@@ -40,7 +40,7 @@ export default class RetrySubmissionWorkflowCommand extends HostBaseCommand<
   requireInputFields = ['workflowCardId'];
 
   protected async run(
-    input: BaseCommandModule.RetrySubmissionWorkflowInput,
+    input: BaseToolModule.RetrySubmissionWorkflowInput,
   ): Promise<undefined> {
     let { workflowCardId } = input;
 
@@ -88,7 +88,7 @@ export default class RetrySubmissionWorkflowCommand extends HostBaseCommand<
     );
 
     try {
-      await new SendBotTriggerEventCommand(this.commandContext).execute({
+      await new SendBotTriggerEventTool(this.commandContext).execute({
         roomId,
         realm: listingRealm,
         type: 'pr-listing-retry',
@@ -115,3 +115,7 @@ export default class RetrySubmissionWorkflowCommand extends HostBaseCommand<
     }
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { RetrySubmissionWorkflowTool as RetrySubmissionWorkflowCommand };
diff --git a/packages/host/app/tools/sanitize-module-list.ts b/packages/host/app/tools/sanitize-module-list.ts
index a146b8bd4b6..826c592e428 100644
--- a/packages/host/app/tools/sanitize-module-list.ts
+++ b/packages/host/app/tools/sanitize-module-list.ts
@@ -4,12 +4,12 @@ import {
   trimExecutableExtension,
 } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import CanReadRealmCommand from './can-read-realm';
-import GetRealmOfResourceIdentifierCommand from './get-realm-of-resource-identifier';
+import CanReadRealmTool from './can-read-realm';
+import GetRealmOfResourceIdentifierTool from './get-realm-of-resource-identifier';
 
 const GLOBAL_URL_STEMS = [
   'https://cardstack.com',
@@ -17,15 +17,15 @@ const GLOBAL_URL_STEMS = [
   'https://boxel-icons.boxel.ai',
 ];
 
-export default class SanitizeModuleListCommand extends HostBaseCommand<
-  typeof BaseCommandModule.SanitizeModuleListInput,
-  typeof BaseCommandModule.SanitizeModuleListResult
+export default class SanitizeModuleListTool extends HostBaseTool<
+  typeof BaseToolModule.SanitizeModuleListInput,
+  typeof BaseToolModule.SanitizeModuleListResult
 > {
   description =
     'Filter and deduplicate a list of module URLs, removing globals and unreadable realms';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { SanitizeModuleListInput } = commandModule;
     return SanitizeModuleListInput;
   }
@@ -33,8 +33,8 @@ export default class SanitizeModuleListCommand extends HostBaseCommand<
   requireInputFields = ['moduleIdentifiers'];
 
   protected async run(
-    input: BaseCommandModule.SanitizeModuleListInput,
-  ): Promise<BaseCommandModule.SanitizeModuleListResult> {
+    input: BaseToolModule.SanitizeModuleListInput,
+  ): Promise<BaseToolModule.SanitizeModuleListResult> {
     // Normalize to extensionless URLs before deduplication so that e.g.
     // "https://…/foo.gts" and "https://…/foo" don't produce separate entries.
     const seen = new Map<string, string>(); // normalized → original
@@ -58,14 +58,13 @@ export default class SanitizeModuleListCommand extends HostBaseCommand<
         }
 
         // Only allow modules that belong to a realm we can read
-        const { realmIdentifier } =
-          await new GetRealmOfResourceIdentifierCommand(
-            this.commandContext,
-          ).execute({ resourceIdentifier: dep });
+        const { realmIdentifier } = await new GetRealmOfResourceIdentifierTool(
+          this.commandContext,
+        ).execute({ resourceIdentifier: dep });
         if (!realmIdentifier) {
           return null;
         }
-        const { canRead } = await new CanReadRealmCommand(
+        const { canRead } = await new CanReadRealmTool(
           this.commandContext,
         ).execute({ realmIdentifier });
         return canRead ? dep : null;
@@ -76,8 +75,12 @@ export default class SanitizeModuleListCommand extends HostBaseCommand<
       (dep): dep is string => dep !== null,
     );
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { SanitizeModuleListResult } = commandModule;
     return new SanitizeModuleListResult({ moduleIdentifiers });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { SanitizeModuleListTool as SanitizeModuleListCommand };
diff --git a/packages/host/app/tools/save-card.ts b/packages/host/app/tools/save-card.ts
index f7e94887854..0b3a9bbba73 100644
--- a/packages/host/app/tools/save-card.ts
+++ b/packages/host/app/tools/save-card.ts
@@ -3,14 +3,14 @@ import { service } from '@ember/service';
 import { isCardInstance } from '@cardstack/runtime-common';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type StoreService from '../services/store';
 
-export default class SaveCardCommand extends HostBaseCommand<
-  typeof BaseCommandModule.SaveCardInput,
+export default class SaveCardTool extends HostBaseTool<
+  typeof BaseToolModule.SaveCardInput,
   typeof CardDef
 > {
   @service declare private store: StoreService;
@@ -18,7 +18,7 @@ export default class SaveCardCommand extends HostBaseCommand<
   static actionVerb = 'Save';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { SaveCardInput } = commandModule;
     return SaveCardInput;
   }
@@ -29,9 +29,7 @@ export default class SaveCardCommand extends HostBaseCommand<
   // collection--meaning that it will be detached from the store. This means you
   // MUST consume the instance IMMEDIATELY! it should not live in the state of
   // the consumer.
-  protected async run(
-    input: BaseCommandModule.SaveCardInput,
-  ): Promise<CardDef> {
+  protected async run(input: BaseToolModule.SaveCardInput): Promise<CardDef> {
     let result = await this.store.add(input.card, {
       realm: input.realm,
       localDir: input.localDir,
@@ -42,3 +40,7 @@ export default class SaveCardCommand extends HostBaseCommand<
     return result;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { SaveCardTool as SaveCardCommand };
diff --git a/packages/host/app/tools/screenshot-card.ts b/packages/host/app/tools/screenshot-card.ts
index 3718ae065cd..a8c0d345a79 100644
--- a/packages/host/app/tools/screenshot-card.ts
+++ b/packages/host/app/tools/screenshot-card.ts
@@ -4,11 +4,11 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { rri } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import WriteBinaryFileCommand from './write-binary-file';
+import WriteBinaryFileTool from './write-binary-file';
 
 import type RealmService from '../services/realm';
 import type RealmServerService from '../services/realm-server';
@@ -31,9 +31,9 @@ function generateFilenameFromCard(cardId: string): string {
   return slug ? `${slug}-${uniqueId}` : `screenshot-${uniqueId}`;
 }
 
-export default class ScreenshotCardCommand extends HostBaseCommand<
-  typeof BaseCommandModule.ScreenshotCardInput,
-  typeof BaseCommandModule.ScreenshotCardOutput
+export default class ScreenshotCardTool extends HostBaseTool<
+  typeof BaseToolModule.ScreenshotCardInput,
+  typeof BaseToolModule.ScreenshotCardOutput
 > {
   @service declare private realm: RealmService;
   @service declare private realmServer: RealmServerService;
@@ -43,7 +43,7 @@ export default class ScreenshotCardCommand extends HostBaseCommand<
     "Screenshot a rendered card and save it as an ImageDef in the card's own realm";
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { ScreenshotCardInput } = commandModule;
     return ScreenshotCardInput;
   }
@@ -51,8 +51,8 @@ export default class ScreenshotCardCommand extends HostBaseCommand<
   requireInputFields = ['card', 'format'];
 
   protected async run(
-    input: BaseCommandModule.ScreenshotCardInput,
-  ): Promise<BaseCommandModule.ScreenshotCardOutput> {
+    input: BaseToolModule.ScreenshotCardInput,
+  ): Promise<BaseToolModule.ScreenshotCardOutput> {
     let { card, format } = input;
     let normalizedFormat = format?.trim();
     if (!card) {
@@ -130,7 +130,7 @@ export default class ScreenshotCardCommand extends HostBaseCommand<
     // promotes the PNG into a PngDef / ImageDef card automatically.
     let filename = `${generateFilenameFromCard(cardURL)}.png`;
     let filePath = `Screenshots/${filename}`;
-    let writeResult = await new WriteBinaryFileCommand(
+    let writeResult = await new WriteBinaryFileTool(
       this.commandContext,
     ).execute({
       path: filePath,
@@ -144,10 +144,14 @@ export default class ScreenshotCardCommand extends HostBaseCommand<
       throw new Error('Failed to write screenshot PNG to realm.');
     }
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { ScreenshotCardOutput } = commandModule;
     return new ScreenshotCardOutput({
       imageDefUrl: writeResult.fileIdentifier,
     });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { ScreenshotCardTool as ScreenshotCardCommand };
diff --git a/packages/host/app/tools/search-and-choose.ts b/packages/host/app/tools/search-and-choose.ts
index 8af46d846c1..2ad012f06e0 100644
--- a/packages/host/app/tools/search-and-choose.ts
+++ b/packages/host/app/tools/search-and-choose.ts
@@ -2,19 +2,19 @@ import { logger } from '@cardstack/runtime-common';
 import type { ResolvedCodeRef } from '@cardstack/runtime-common';
 import { isResolvedCodeRef } from '@cardstack/runtime-common/code-ref';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import OneShotLlmRequestCommand from './one-shot-llm-request';
-import { SearchCardsByTypeAndTitleCommand } from './search-cards';
+import OneShotLlmRequestTool from './one-shot-llm-request';
+import { SearchCardsByTypeAndTitleTool } from './search-cards';
 
 // Command-level logger (general lifecycle + decisions)
 const log = logger('commands:search-and-choose');
 
-export default class SearchAndChooseCommand extends HostBaseCommand<
-  typeof BaseCommandModule.SearchAndChooseInput,
-  typeof BaseCommandModule.SearchAndChooseResult
+export default class SearchAndChooseTool extends HostBaseTool<
+  typeof BaseToolModule.SearchAndChooseInput,
+  typeof BaseToolModule.SearchAndChooseResult
 > {
   static actionVerb = 'Select';
   description =
@@ -22,14 +22,14 @@ export default class SearchAndChooseCommand extends HostBaseCommand<
   requireInputFields = ['candidateTypeCodeRef'];
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { SearchAndChooseInput } = commandModule;
     return SearchAndChooseInput;
   }
 
   protected async run(
-    input: BaseCommandModule.SearchAndChooseInput,
-  ): Promise<BaseCommandModule.SearchAndChooseResult> {
+    input: BaseToolModule.SearchAndChooseInput,
+  ): Promise<BaseToolModule.SearchAndChooseResult> {
     let {
       sourceContextCodeRef,
       max = 1,
@@ -47,10 +47,10 @@ export default class SearchAndChooseCommand extends HostBaseCommand<
       throw new Error('max must be at least 1');
     }
 
-    const { SearchAndChooseResult } = await this.loadCommandModule();
+    const { SearchAndChooseResult } = await this.loadToolModule();
 
     // 1. Gather candidates via existing search command
-    const search = new SearchCardsByTypeAndTitleCommand(this.commandContext);
+    const search = new SearchCardsByTypeAndTitleTool(this.commandContext);
     const searchResult = await search.execute({ type: candidateTypeCodeRef });
     const instances = searchResult.instances ?? [];
 
@@ -91,7 +91,7 @@ export default class SearchAndChooseCommand extends HostBaseCommand<
       .join('\n\n');
 
     // 3. LLM selection
-    const oneShot = new OneShotLlmRequestCommand(this.commandContext);
+    const oneShot = new OneShotLlmRequestTool(this.commandContext);
 
     const res = await oneShot.execute({
       systemPrompt,
@@ -122,7 +122,7 @@ export default class SearchAndChooseCommand extends HostBaseCommand<
   }
 
   private assertResolvedCodeRef(
-    codeRef: BaseCommandModule.SearchAndChooseInput['candidateTypeCodeRef'],
+    codeRef: BaseToolModule.SearchAndChooseInput['candidateTypeCodeRef'],
     fieldName: 'candidateTypeCodeRef' | 'sourceContextCodeRef',
   ): ResolvedCodeRef {
     if (!codeRef) {
@@ -178,3 +178,7 @@ export default class SearchAndChooseCommand extends HostBaseCommand<
       .join('\n');
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { SearchAndChooseTool as SearchAndChooseCommand };
diff --git a/packages/host/app/tools/search-cards.ts b/packages/host/app/tools/search-cards.ts
index 34ad89faacb..1e7c2ac4946 100644
--- a/packages/host/app/tools/search-cards.ts
+++ b/packages/host/app/tools/search-cards.ts
@@ -4,30 +4,30 @@ import type { Filter } from '@cardstack/runtime-common';
 import { assertQuery } from '@cardstack/runtime-common';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type RealmServerService from '../services/realm-server';
 import type StoreService from '../services/store';
 
-export class SearchCardsByTypeAndTitleCommand extends HostBaseCommand<
-  typeof BaseCommandModule.SearchCardsByTypeAndTitleInput,
-  typeof BaseCommandModule.SearchCardsResult
+export class SearchCardsByTypeAndTitleTool extends HostBaseTool<
+  typeof BaseToolModule.SearchCardsByTypeAndTitleInput,
+  typeof BaseToolModule.SearchCardsResult
 > {
   description = 'Search for card instances by type and/or title';
 
   static actionVerb = 'Search';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { SearchCardsByTypeAndTitleInput } = commandModule;
     return SearchCardsByTypeAndTitleInput;
   }
 
   protected async run(
-    input: BaseCommandModule.SearchCardsByTypeAndTitleInput,
-  ): Promise<BaseCommandModule.SearchCardsResult> {
+    input: BaseToolModule.SearchCardsByTypeAndTitleInput,
+  ): Promise<BaseToolModule.SearchCardsResult> {
     if (!input.cardTitle && !input.cardType && !input.type) {
       throw new Error(
         'At least one of cardTitle, cardType, or type must be provided',
@@ -43,7 +43,7 @@ export class SearchCardsByTypeAndTitleCommand extends HostBaseCommand<
     if (input.type) {
       filter.type = input.type;
     }
-    return new SearchCardsByQueryCommand(this.commandContext).execute({
+    return new SearchCardsByQueryTool(this.commandContext).execute({
       query: {
         filter: filter as Filter,
       },
@@ -51,9 +51,9 @@ export class SearchCardsByTypeAndTitleCommand extends HostBaseCommand<
   }
 }
 
-export class SearchCardsByQueryCommand extends HostBaseCommand<
-  typeof BaseCommandModule.SearchCardsByQueryInput,
-  typeof BaseCommandModule.SearchCardsResult
+export class SearchCardsByQueryTool extends HostBaseTool<
+  typeof BaseToolModule.SearchCardsByQueryInput,
+  typeof BaseToolModule.SearchCardsResult
 > {
   @service declare private store: StoreService;
   @service declare private realmServer: RealmServerService;
@@ -64,7 +64,7 @@ export class SearchCardsByQueryCommand extends HostBaseCommand<
   If you do not have information on card module and name, do the search using the `_cardType` attribute.';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { SearchCardsByQueryInput } = commandModule;
     return SearchCardsByQueryInput;
   }
@@ -72,8 +72,8 @@ export class SearchCardsByQueryCommand extends HostBaseCommand<
   requireInputFields = ['query'];
 
   protected async run(
-    input: BaseCommandModule.SearchCardsByQueryInput,
-  ): Promise<BaseCommandModule.SearchCardsResult> {
+    input: BaseToolModule.SearchCardsByQueryInput,
+  ): Promise<BaseToolModule.SearchCardsResult> {
     assertQuery(input.query);
     let realmUrls = this.realmServer.availableRealmIdentifiers;
     let instances: CardDef[] = [];
@@ -83,7 +83,7 @@ export class SearchCardsByQueryCommand extends HostBaseCommand<
       console.error(`Error searching in realms:`, e, input.query);
     }
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { SearchCardsResult, SearchCardSummaryField } = commandModule;
     let resultCard = new SearchCardsResult({
       cardIds: instances.map((c) => c.id),
@@ -100,3 +100,8 @@ export class SearchCardsByQueryCommand extends HostBaseCommand<
     return resultCard;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { SearchCardsByTypeAndTitleTool as SearchCardsByTypeAndTitleCommand };
+export { SearchCardsByQueryTool as SearchCardsByQueryCommand };
diff --git a/packages/host/app/tools/search-google-images.ts b/packages/host/app/tools/search-google-images.ts
index 7a65527d345..60f88912d02 100644
--- a/packages/host/app/tools/search-google-images.ts
+++ b/packages/host/app/tools/search-google-images.ts
@@ -1,27 +1,27 @@
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import SendRequestViaProxyCommand from './send-request-via-proxy';
+import SendRequestViaProxyTool from './send-request-via-proxy';
 
-export default class SearchGoogleImagesCommand extends HostBaseCommand<
-  typeof BaseCommandModule.SearchGoogleImagesInput,
-  typeof BaseCommandModule.SearchGoogleImagesResult
+export default class SearchGoogleImagesTool extends HostBaseTool<
+  typeof BaseToolModule.SearchGoogleImagesInput,
+  typeof BaseToolModule.SearchGoogleImagesResult
 > {
   static actionVerb = 'Search Google Images';
   description = 'Search for images on Google using the Custom Search API';
   requireInputFields = ['query'];
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { SearchGoogleImagesInput } = commandModule;
     return SearchGoogleImagesInput;
   }
 
   protected async run(
-    input: BaseCommandModule.SearchGoogleImagesInput,
-  ): Promise<BaseCommandModule.SearchGoogleImagesResult> {
-    const commandModule = await this.loadCommandModule();
+    input: BaseToolModule.SearchGoogleImagesInput,
+  ): Promise<BaseToolModule.SearchGoogleImagesResult> {
+    const commandModule = await this.loadToolModule();
     const { SearchGoogleImagesResult } = commandModule;
 
     try {
@@ -33,7 +33,7 @@ export default class SearchGoogleImagesCommand extends HostBaseCommand<
       // The API key will be handled by the proxy endpoint
       const searchUrl = `https://www.googleapis.com/customsearch/v1?q=${searchQuery}&searchType=image&num=${Math.min(maxResults, 10)}&start=${startIndex}&cx=064501294a5c9430a`;
 
-      const sendRequestViaProxyCommand = new SendRequestViaProxyCommand(
+      const sendRequestViaProxyCommand = new SendRequestViaProxyTool(
         this.commandContext,
       );
 
@@ -98,3 +98,7 @@ export default class SearchGoogleImagesCommand extends HostBaseCommand<
     }
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { SearchGoogleImagesTool as SearchGoogleImagesCommand };
diff --git a/packages/host/app/tools/send-ai-assistant-message.ts b/packages/host/app/tools/send-ai-assistant-message.ts
index d9d7a03b3ef..8d00d92adef 100644
--- a/packages/host/app/tools/send-ai-assistant-message.ts
+++ b/packages/host/app/tools/send-ai-assistant-message.ts
@@ -5,28 +5,28 @@ import { v4 as uuidv4 } from 'uuid';
 import { APP_BOXEL_MESSAGE_MSGTYPE } from '@cardstack/runtime-common/matrix-constants';
 
 import type * as CardAPI from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 import type { FileDef } from 'https://cardstack.com/base/file-api';
 import type {
   CardMessageContent,
   Tool,
 } from 'https://cardstack.com/base/matrix-event';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 import { addPatchTools } from '../tools/utils';
 
 import type CardService from '../services/card-service';
-import type CommandService from '../services/command-service';
 import type MatrixService from '../services/matrix-service';
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type RealmService from '../services/realm';
+import type ToolService from '../services/tool-service';
 
-export default class SendAiAssistantMessageCommand extends HostBaseCommand<
-  typeof BaseCommandModule.SendAiAssistantMessageInput,
-  typeof BaseCommandModule.SendAiAssistantMessageResult
+export default class SendAiAssistantMessageTool extends HostBaseTool<
+  typeof BaseToolModule.SendAiAssistantMessageInput,
+  typeof BaseToolModule.SendAiAssistantMessageResult
 > {
   @service declare private cardService: CardService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private matrixService: MatrixService;
   @service declare private operatorModeStateService: OperatorModeStateService;
   @service declare private realm: RealmService;
@@ -36,7 +36,7 @@ export default class SendAiAssistantMessageCommand extends HostBaseCommand<
   static actionVerb = 'Send';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { SendAiAssistantMessageInput } = commandModule;
     return SendAiAssistantMessageInput;
   }
@@ -53,8 +53,8 @@ export default class SendAiAssistantMessageCommand extends HostBaseCommand<
   }
 
   protected async run(
-    input: BaseCommandModule.SendAiAssistantMessageInput,
-  ): Promise<BaseCommandModule.SendAiAssistantMessageResult> {
+    input: BaseToolModule.SendAiAssistantMessageInput,
+  ): Promise<BaseToolModule.SendAiAssistantMessageResult> {
     let { matrixService, operatorModeStateService } = this;
     let roomId = input.roomId;
     let requireToolCall = input.requireCommandCall ?? false;
@@ -88,7 +88,7 @@ export default class SendAiAssistantMessageCommand extends HostBaseCommand<
     if (files?.length) {
       files = await matrixService.uploadFiles(files);
     }
-    await matrixService.updateSkillsAndCommandsIfNeeded(roomId);
+    await matrixService.updateSkillsAndToolsIfNeeded(roomId);
     let cardFileDefs = await matrixService.uploadCards(
       input.attachedCards ?? [],
     );
@@ -115,8 +115,12 @@ export default class SendAiAssistantMessageCommand extends HostBaseCommand<
         context,
       },
     } as CardMessageContent);
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { SendAiAssistantMessageResult } = commandModule;
     return new SendAiAssistantMessageResult({ roomId, eventId: event_id });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { SendAiAssistantMessageTool as SendAiAssistantMessageCommand };
diff --git a/packages/host/app/tools/send-request-via-proxy.ts b/packages/host/app/tools/send-request-via-proxy.ts
index 8d636fc8b5f..c9e1b2d9ffe 100644
--- a/packages/host/app/tools/send-request-via-proxy.ts
+++ b/packages/host/app/tools/send-request-via-proxy.ts
@@ -1,14 +1,14 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type RealmServerService from '../services/realm-server';
 
-export default class SendRequestViaProxyCommand extends HostBaseCommand<
-  typeof BaseCommandModule.SendRequestViaProxyInput,
-  typeof BaseCommandModule.SendRequestViaProxyResult
+export default class SendRequestViaProxyTool extends HostBaseTool<
+  typeof BaseToolModule.SendRequestViaProxyInput,
+  typeof BaseToolModule.SendRequestViaProxyResult
 > {
   @service declare private realmServer: RealmServerService;
 
@@ -16,15 +16,15 @@ export default class SendRequestViaProxyCommand extends HostBaseCommand<
   description = 'Make a request to an external API through the Boxel proxy';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { SendRequestViaProxyInput } = commandModule;
     return SendRequestViaProxyInput;
   }
 
   protected async run(
-    input: BaseCommandModule.SendRequestViaProxyInput,
-  ): Promise<BaseCommandModule.SendRequestViaProxyResult> {
-    const commandModule = await this.loadCommandModule();
+    input: BaseToolModule.SendRequestViaProxyInput,
+  ): Promise<BaseToolModule.SendRequestViaProxyResult> {
+    const commandModule = await this.loadToolModule();
     const { SendRequestViaProxyResult } = commandModule;
 
     try {
@@ -68,3 +68,7 @@ export default class SendRequestViaProxyCommand extends HostBaseCommand<
     }
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { SendRequestViaProxyTool as SendRequestViaProxyCommand };
diff --git a/packages/host/app/tools/serialize-card.ts b/packages/host/app/tools/serialize-card.ts
index b894f9324ef..ee07c79b21c 100644
--- a/packages/host/app/tools/serialize-card.ts
+++ b/packages/host/app/tools/serialize-card.ts
@@ -1,16 +1,16 @@
 import { service } from '@ember/service';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type CardService from '../services/card-service';
 import type StoreService from '../services/store';
 
-export default class SerializeCardCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CardIdCard,
-  typeof BaseCommandModule.JsonCard
+export default class SerializeCardTool extends HostBaseTool<
+  typeof BaseToolModule.CardIdCard,
+  typeof BaseToolModule.JsonCard
 > {
   @service declare private store: StoreService;
   @service declare private cardService: CardService;
@@ -19,7 +19,7 @@ export default class SerializeCardCommand extends HostBaseCommand<
   description = 'Serialize a card by id';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CardIdCard } = commandModule;
     return CardIdCard;
   }
@@ -27,8 +27,8 @@ export default class SerializeCardCommand extends HostBaseCommand<
   requireInputFields = ['cardId'];
 
   protected async run(
-    input: BaseCommandModule.CardIdCard,
-  ): Promise<BaseCommandModule.JsonCard> {
+    input: BaseToolModule.CardIdCard,
+  ): Promise<BaseToolModule.JsonCard> {
     let card = await this.store.get(input.cardId);
     if (!card || !('id' in card)) {
       throw new Error(`Card not found for id: ${input.cardId}`);
@@ -38,8 +38,12 @@ export default class SerializeCardCommand extends HostBaseCommand<
       omitQueryFields: true,
     });
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { JsonCard } = commandModule;
     return new JsonCard({ json: serialized });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { SerializeCardTool as SerializeCardCommand };
diff --git a/packages/host/app/tools/set-active-llm.ts b/packages/host/app/tools/set-active-llm.ts
index 570f250b283..6e06de61330 100644
--- a/packages/host/app/tools/set-active-llm.ts
+++ b/packages/host/app/tools/set-active-llm.ts
@@ -1,13 +1,13 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type MatrixService from '../services/matrix-service';
 
-export default class SetActiveLLMCommand extends HostBaseCommand<
-  typeof BaseCommandModule.SetActiveLLMInput,
+export default class SetActiveLLMTool extends HostBaseTool<
+  typeof BaseToolModule.SetActiveLLMInput,
   undefined
 > {
   @service declare private matrixService: MatrixService;
@@ -15,7 +15,7 @@ export default class SetActiveLLMCommand extends HostBaseCommand<
   static actionVerb = 'Set';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { SetActiveLLMInput } = commandModule;
     return SetActiveLLMInput;
   }
@@ -23,7 +23,7 @@ export default class SetActiveLLMCommand extends HostBaseCommand<
   requireInputFields = ['roomId'];
 
   protected async run(
-    input: BaseCommandModule.SetActiveLLMInput,
+    input: BaseToolModule.SetActiveLLMInput,
   ): Promise<undefined> {
     if (input.model) {
       await this.matrixService.sendActiveLLMEvent(input.roomId, input.model);
@@ -37,3 +37,7 @@ export default class SetActiveLLMCommand extends HostBaseCommand<
     return undefined;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { SetActiveLLMTool as SetActiveLLMCommand };
diff --git a/packages/host/app/tools/set-user-system-card.ts b/packages/host/app/tools/set-user-system-card.ts
index 09d7fdbb44f..7b88a8345a0 100644
--- a/packages/host/app/tools/set-user-system-card.ts
+++ b/packages/host/app/tools/set-user-system-card.ts
@@ -1,13 +1,13 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type MatrixService from '../services/matrix-service';
 
-export default class SetUserSystemCardCommand extends HostBaseCommand<
-  typeof BaseCommandModule.CardIdCard,
+export default class SetUserSystemCardTool extends HostBaseTool<
+  typeof BaseToolModule.CardIdCard,
   undefined
 > {
   @service declare private matrixService: MatrixService;
@@ -16,14 +16,18 @@ export default class SetUserSystemCardCommand extends HostBaseCommand<
   description = "Sets the current user's preferred system card";
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { CardIdCard } = commandModule;
     return CardIdCard;
   }
 
-  protected async run(input: BaseCommandModule.CardIdCard): Promise<undefined> {
+  protected async run(input: BaseToolModule.CardIdCard): Promise<undefined> {
     await this.matrixService.ready;
     await this.matrixService.setUserSystemCard(input.cardId || undefined);
     return undefined;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { SetUserSystemCardTool as SetUserSystemCardCommand };
diff --git a/packages/host/app/tools/show-card.ts b/packages/host/app/tools/show-card.ts
index a0bf1498ec1..af021709a82 100644
--- a/packages/host/app/tools/show-card.ts
+++ b/packages/host/app/tools/show-card.ts
@@ -9,17 +9,17 @@ import {
 } from '@cardstack/runtime-common';
 
 import type { CardDef, Format } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type NetworkService from '../services/network';
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type PlaygroundPanelService from '../services/playground-panel-service';
 import type StoreService from '../services/store';
 
-export default class ShowCardCommand extends HostBaseCommand<
-  typeof BaseCommandModule.ShowCardInput,
+export default class ShowCardTool extends HostBaseTool<
+  typeof BaseToolModule.ShowCardInput,
   typeof CardDef
 > {
   @service declare private network: NetworkService;
@@ -33,16 +33,14 @@ export default class ShowCardCommand extends HostBaseCommand<
   static actionVerb = 'Show Card';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { ShowCardInput } = commandModule;
     return ShowCardInput;
   }
 
   requireInputFields = ['cardId'];
 
-  protected async run(
-    input: BaseCommandModule.ShowCardInput,
-  ): Promise<CardDef> {
+  protected async run(input: BaseToolModule.ShowCardInput): Promise<CardDef> {
     let { operatorModeStateService } = this;
     if (operatorModeStateService.workspaceChooserOpened) {
       operatorModeStateService.closeWorkspaceChooser();
@@ -102,3 +100,7 @@ export default class ShowCardCommand extends HostBaseCommand<
     return maybeCard;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { ShowCardTool as ShowCardCommand };
diff --git a/packages/host/app/tools/show-file.ts b/packages/host/app/tools/show-file.ts
index 56b9c7e8dba..4e3238d29e0 100644
--- a/packages/host/app/tools/show-file.ts
+++ b/packages/host/app/tools/show-file.ts
@@ -1,13 +1,13 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 
-export default class ShowFileCommand extends HostBaseCommand<
-  typeof BaseCommandModule.FileIdentifierCard
+export default class ShowFileTool extends HostBaseTool<
+  typeof BaseToolModule.FileIdentifierCard
 > {
   @service declare private operatorModeStateService: OperatorModeStateService;
 
@@ -17,7 +17,7 @@ export default class ShowFileCommand extends HostBaseCommand<
   static actionVerb = 'Show File';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { FileIdentifierCard } = commandModule;
     return FileIdentifierCard;
   }
@@ -25,7 +25,7 @@ export default class ShowFileCommand extends HostBaseCommand<
   requireInputFields = ['fileIdentifier'];
 
   protected async run(
-    input: BaseCommandModule.FileIdentifierCard,
+    input: BaseToolModule.FileIdentifierCard,
   ): Promise<undefined> {
     let { operatorModeStateService } = this;
     if (operatorModeStateService.workspaceChooserOpened) {
@@ -37,3 +37,7 @@ export default class ShowFileCommand extends HostBaseCommand<
     await operatorModeStateService.updateSubmode('code');
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { ShowFileTool as ShowFileCommand };
diff --git a/packages/host/app/tools/store-add.ts b/packages/host/app/tools/store-add.ts
index 0688abc80e1..df64c5988ea 100644
--- a/packages/host/app/tools/store-add.ts
+++ b/packages/host/app/tools/store-add.ts
@@ -3,14 +3,14 @@ import { service } from '@ember/service';
 import type { LooseSingleCardDocument } from '@cardstack/runtime-common';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type StoreService from '../services/store';
 
-export default class StoreAddCommand extends HostBaseCommand<
-  typeof BaseCommandModule.StoreAddInput,
+export default class StoreAddTool extends HostBaseTool<
+  typeof BaseToolModule.StoreAddInput,
   typeof CardDef
 > {
   @service declare private store: StoreService;
@@ -18,16 +18,14 @@ export default class StoreAddCommand extends HostBaseCommand<
   description = 'Add a card document to the store';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { StoreAddInput } = commandModule;
     return StoreAddInput;
   }
 
   requireInputFields = ['document'];
 
-  protected async run(
-    input: BaseCommandModule.StoreAddInput,
-  ): Promise<CardDef> {
+  protected async run(input: BaseToolModule.StoreAddInput): Promise<CardDef> {
     const result = await this.store.add(
       input.document as LooseSingleCardDocument,
       input.realm ? { realm: input.realm } : undefined,
@@ -35,3 +33,7 @@ export default class StoreAddCommand extends HostBaseCommand<
     return result as CardDef;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { StoreAddTool as StoreAddCommand };
diff --git a/packages/host/app/tools/summarize-session.ts b/packages/host/app/tools/summarize-session.ts
index 281e20d3ead..63a42811a46 100644
--- a/packages/host/app/tools/summarize-session.ts
+++ b/packages/host/app/tools/summarize-session.ts
@@ -1,36 +1,36 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import SendRequestViaProxyCommand from './send-request-via-proxy';
+import SendRequestViaProxyTool from './send-request-via-proxy';
 
-import type CommandService from '../services/command-service';
 import type MatrixService from '../services/matrix-service';
 import type RealmServerService from '../services/realm-server';
+import type ToolService from '../services/tool-service';
 
-export default class SummarizeSessionCommand extends HostBaseCommand<
-  typeof BaseCommandModule.SummarizeSessionInput,
-  typeof BaseCommandModule.SummarizeSessionResult
+export default class SummarizeSessionTool extends HostBaseTool<
+  typeof BaseToolModule.SummarizeSessionInput,
+  typeof BaseToolModule.SummarizeSessionResult
 > {
   @service declare private matrixService: MatrixService;
-  @service declare private commandService: CommandService;
+  @service declare private toolService: ToolService;
   @service declare private realmServer: RealmServerService;
 
   static actionVerb = 'Summarize Session';
   description = 'Summarize the current session conversation';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { SummarizeSessionInput } = commandModule;
     return SummarizeSessionInput;
   }
 
   protected async run(
-    input: BaseCommandModule.SummarizeSessionInput,
-  ): Promise<BaseCommandModule.SummarizeSessionResult> {
-    const commandModule = await this.loadCommandModule();
+    input: BaseToolModule.SummarizeSessionInput,
+  ): Promise<BaseToolModule.SummarizeSessionResult> {
+    const commandModule = await this.loadToolModule();
     const { SummarizeSessionResult } = commandModule;
 
     try {
@@ -49,8 +49,8 @@ export default class SummarizeSessionCommand extends HostBaseCommand<
             'Please provide a concise summary of this conversation. Focus on the key points, decisions made, and any important outcomes.',
         },
       ];
-      const sendRequestViaProxyCommand = new SendRequestViaProxyCommand(
-        this.commandService.commandContext,
+      const sendRequestViaProxyCommand = new SendRequestViaProxyTool(
+        this.toolService.commandContext,
       );
       const result = await sendRequestViaProxyCommand.execute({
         url: 'https://openrouter.ai/api/v1/chat/completions',
@@ -80,3 +80,7 @@ export default class SummarizeSessionCommand extends HostBaseCommand<
     }
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { SummarizeSessionTool as SummarizeSessionCommand };
diff --git a/packages/host/app/tools/switch-submode.ts b/packages/host/app/tools/switch-submode.ts
index e5244a4f871..b28442b9e14 100644
--- a/packages/host/app/tools/switch-submode.ts
+++ b/packages/host/app/tools/switch-submode.ts
@@ -2,20 +2,20 @@ import { service } from '@ember/service';
 
 import { rri } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
 import { Submodes } from '../components/submode-switcher';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import WriteTextFileCommand from './write-text-file';
+import WriteTextFileTool from './write-text-file';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type StoreService from '../services/store';
 
-export default class SwitchSubmodeCommand extends HostBaseCommand<
-  typeof BaseCommandModule.SwitchSubmodeInput,
-  typeof BaseCommandModule.SwitchSubmodeResult | undefined
+export default class SwitchSubmodeTool extends HostBaseTool<
+  typeof BaseToolModule.SwitchSubmodeInput,
+  typeof BaseToolModule.SwitchSubmodeResult | undefined
 > {
   @service declare private operatorModeStateService: OperatorModeStateService;
   @service declare private store: StoreService;
@@ -26,7 +26,7 @@ export default class SwitchSubmodeCommand extends HostBaseCommand<
     'Navigate the UI to another submode. Possible values for submode are "interact" and "code".';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { SwitchSubmodeInput } = commandModule;
     return SwitchSubmodeInput;
   }
@@ -53,9 +53,9 @@ export default class SwitchSubmodeCommand extends HostBaseCommand<
   }
 
   protected async run(
-    input: BaseCommandModule.SwitchSubmodeInput,
-  ): Promise<BaseCommandModule.SwitchSubmodeResult | undefined> {
-    let resultCard: BaseCommandModule.SwitchSubmodeResult | undefined;
+    input: BaseToolModule.SwitchSubmodeInput,
+  ): Promise<BaseToolModule.SwitchSubmodeResult | undefined> {
+    let resultCard: BaseToolModule.SwitchSubmodeResult | undefined;
     switch (input.submode) {
       case Submodes.Interact:
         await this.operatorModeStateService.updateCodePath(null);
@@ -77,9 +77,7 @@ export default class SwitchSubmodeCommand extends HostBaseCommand<
           input.createFile &&
           currentSubmode === Submodes.Interact
         ) {
-          let writeTextFileCommand = new WriteTextFileCommand(
-            this.commandContext,
-          );
+          let writeTextFileCommand = new WriteTextFileTool(this.commandContext);
           let writeResult = await writeTextFileCommand.execute({
             path: codeRRI,
             content: '',
@@ -88,7 +86,7 @@ export default class SwitchSubmodeCommand extends HostBaseCommand<
           if (writeResult.fileIdentifier !== codeRRI) {
             finalCodePath = rri(writeResult.fileIdentifier);
 
-            let commandModule = await this.loadCommandModule();
+            let commandModule = await this.loadToolModule();
             const { SwitchSubmodeResult } = commandModule;
             resultCard = new SwitchSubmodeResult({
               codePath: finalCodePath,
@@ -110,3 +108,7 @@ export default class SwitchSubmodeCommand extends HostBaseCommand<
     return resultCard;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { SwitchSubmodeTool as SwitchSubmodeCommand };
diff --git a/packages/host/app/tools/sync-openrouter-models.ts b/packages/host/app/tools/sync-openrouter-models.ts
index f58d80d49a0..414b8d05d84 100644
--- a/packages/host/app/tools/sync-openrouter-models.ts
+++ b/packages/host/app/tools/sync-openrouter-models.ts
@@ -8,9 +8,9 @@ import {
 } from '@cardstack/runtime-common';
 import type { AtomicOperation } from '@cardstack/runtime-common/atomic-document';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type CardService from '../services/card-service';
 import type NetworkService from '../services/network';
@@ -145,9 +145,9 @@ function buildCardJson(model: OpenRouterApiModel) {
   };
 }
 
-export default class SyncOpenRouterModelsCommand extends HostBaseCommand<
-  typeof BaseCommandModule.RealmIdentifierCard,
-  typeof BaseCommandModule.SyncOpenRouterModelsResult
+export default class SyncOpenRouterModelsTool extends HostBaseTool<
+  typeof BaseToolModule.RealmIdentifierCard,
+  typeof BaseToolModule.SyncOpenRouterModelsResult
 > {
   @service declare private cardService: CardService;
   @service declare private network: NetworkService;
@@ -156,14 +156,14 @@ export default class SyncOpenRouterModelsCommand extends HostBaseCommand<
   description = 'Sync OpenRouter model data from the OpenRouter API';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     return commandModule.RealmIdentifierCard;
   }
 
   protected async run(
-    input: BaseCommandModule.RealmIdentifierCard,
-  ): Promise<BaseCommandModule.SyncOpenRouterModelsResult> {
-    let commandModule = await this.loadCommandModule();
+    input: BaseToolModule.RealmIdentifierCard,
+  ): Promise<BaseToolModule.SyncOpenRouterModelsResult> {
+    let commandModule = await this.loadToolModule();
     let realmURL = input.realmIdentifier;
     if (!realmURL) {
       throw new Error('realmIdentifier is required');
@@ -396,3 +396,7 @@ export default class SyncOpenRouterModelsCommand extends HostBaseCommand<
     return slugs;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { SyncOpenRouterModelsTool as SyncOpenRouterModelsCommand };
diff --git a/packages/host/app/tools/transform-cards.ts b/packages/host/app/tools/transform-cards.ts
index 56494ec9de8..9fe546afe2a 100644
--- a/packages/host/app/tools/transform-cards.ts
+++ b/packages/host/app/tools/transform-cards.ts
@@ -2,13 +2,13 @@ import { getClass } from '@cardstack/runtime-common';
 
 import type { VisitCardsInput } from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import ReadSourceCommand from './read-source';
-import { SearchCardsByQueryCommand } from './search-cards';
-import WriteTextFileCommand from './write-text-file';
+import ReadSourceTool from './read-source';
+import { SearchCardsByQueryTool } from './search-cards';
+import WriteTextFileTool from './write-text-file';
 
-export default class TransformCardsCommand extends HostBaseCommand<
+export default class TransformCardsTool extends HostBaseTool<
   typeof VisitCardsInput
 > {
   description =
@@ -17,7 +17,7 @@ export default class TransformCardsCommand extends HostBaseCommand<
   static actionVerb = 'Transform';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { VisitCardsInput } = commandModule;
     return VisitCardsInput;
   }
@@ -25,7 +25,7 @@ export default class TransformCardsCommand extends HostBaseCommand<
   requireInputFields = ['query', 'commandRef'];
 
   protected async run(input: VisitCardsInput): Promise<undefined> {
-    let { cardIds } = await new SearchCardsByQueryCommand(
+    let { cardIds } = await new SearchCardsByQueryTool(
       this.commandContext,
     ).execute({
       query: input.query,
@@ -35,7 +35,7 @@ export default class TransformCardsCommand extends HostBaseCommand<
       this.loaderService.loader,
     );
     let visitPromises = cardIds.map(async (cardId: string) => {
-      let readSourceCommand = new ReadSourceCommand(this.commandContext);
+      let readSourceCommand = new ReadSourceTool(this.commandContext);
       let { content } = await readSourceCommand.execute({
         path: cardId + '.json',
       });
@@ -45,7 +45,7 @@ export default class TransformCardsCommand extends HostBaseCommand<
       });
 
       let updatedContent = JSON.stringify(json, null, 2);
-      let writeTextFileCommand = new WriteTextFileCommand(this.commandContext);
+      let writeTextFileCommand = new WriteTextFileTool(this.commandContext);
       return writeTextFileCommand.execute({
         content: updatedContent,
         path: cardId + '.json',
@@ -57,3 +57,7 @@ export default class TransformCardsCommand extends HostBaseCommand<
     // In the future, we might want to return some kind of summary card
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { TransformCardsTool as TransformCardsCommand };
diff --git a/packages/host/app/tools/unpublish-realm.ts b/packages/host/app/tools/unpublish-realm.ts
index edea56c746b..f9cecfde3bb 100644
--- a/packages/host/app/tools/unpublish-realm.ts
+++ b/packages/host/app/tools/unpublish-realm.ts
@@ -9,18 +9,18 @@ import { getMatrixUsername } from '@cardstack/runtime-common/matrix-client';
 
 import config from '@cardstack/host/config/environment';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type RealmService from '../services/realm';
 
 // Unpublishes a realm from a single published destination. Resolves once the
 // realm-server accepts the request; there is no reindex on unpublish (the
 // published realm is removed), so v1 has no completion-wait.
-export default class UnpublishRealmCommand extends HostBaseCommand<
-  typeof BaseCommandModule.UnpublishRealmInput,
-  typeof BaseCommandModule.UnpublishRealmResult
+export default class UnpublishRealmTool extends HostBaseTool<
+  typeof BaseToolModule.UnpublishRealmInput,
+  typeof BaseToolModule.UnpublishRealmResult
 > {
   @service declare private realm: RealmService;
 
@@ -28,16 +28,16 @@ export default class UnpublishRealmCommand extends HostBaseCommand<
   description = 'Unpublish a realm from a published destination';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     return commandModule.UnpublishRealmInput;
   }
 
   requireInputFields = ['realmURL'];
 
   protected async run(
-    input: BaseCommandModule.UnpublishRealmInput,
-  ): Promise<BaseCommandModule.UnpublishRealmResult> {
-    let commandModule = await this.loadCommandModule();
+    input: BaseToolModule.UnpublishRealmInput,
+  ): Promise<BaseToolModule.UnpublishRealmResult> {
+    let commandModule = await this.loadToolModule();
     let { UnpublishRealmResult } = commandModule;
 
     // Normalize so the cached RealmResource (token/claims, _unPublishingRealms
@@ -64,7 +64,7 @@ export default class UnpublishRealmCommand extends HostBaseCommand<
   }
 
   private resolvePublishedRealmURL(
-    input: BaseCommandModule.UnpublishRealmInput,
+    input: BaseToolModule.UnpublishRealmInput,
     realmURL: string,
   ): string {
     if (input.publishedRealmURL) {
@@ -94,3 +94,7 @@ export default class UnpublishRealmCommand extends HostBaseCommand<
     );
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { UnpublishRealmTool as UnpublishRealmCommand };
diff --git a/packages/host/app/tools/unregister-bot.ts b/packages/host/app/tools/unregister-bot.ts
index 31e99b19e8e..15f1073a0ba 100644
--- a/packages/host/app/tools/unregister-bot.ts
+++ b/packages/host/app/tools/unregister-bot.ts
@@ -1,13 +1,13 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type RealmServerService from '../services/realm-server';
 
-export default class UnregisterBotCommand extends HostBaseCommand<
-  typeof BaseCommandModule.UnregisterBotInput,
+export default class UnregisterBotTool extends HostBaseTool<
+  typeof BaseToolModule.UnregisterBotInput,
   undefined
 > {
   @service declare private realmServer: RealmServerService;
@@ -16,14 +16,18 @@ export default class UnregisterBotCommand extends HostBaseCommand<
   description = 'Unregister bot';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { UnregisterBotInput } = commandModule;
     return UnregisterBotInput;
   }
 
   protected async run(
-    input: BaseCommandModule.UnregisterBotInput,
+    input: BaseToolModule.UnregisterBotInput,
   ): Promise<undefined> {
     await this.realmServer.unregisterBot(input.botRegistrationId);
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { UnregisterBotTool as UnregisterBotCommand };
diff --git a/packages/host/app/tools/update-code-path-with-selection.ts b/packages/host/app/tools/update-code-path-with-selection.ts
index 40f5409b5ef..70bb7190824 100644
--- a/packages/host/app/tools/update-code-path-with-selection.ts
+++ b/packages/host/app/tools/update-code-path-with-selection.ts
@@ -1,14 +1,14 @@
 import { service } from '@ember/service';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type OperatorModeStateService from '../services/operator-mode-state-service';
 import type RecentFilesService from '../services/recent-files-service';
 
-export default class UpdateCodePathWithSelectionCommand extends HostBaseCommand<
-  typeof BaseCommandModule.UpdateCodePathWithSelectionInput
+export default class UpdateCodePathWithSelectionTool extends HostBaseTool<
+  typeof BaseToolModule.UpdateCodePathWithSelectionInput
 > {
   @service declare private operatorModeStateService: OperatorModeStateService;
   @service declare private recentFilesService: RecentFilesService;
@@ -17,7 +17,7 @@ export default class UpdateCodePathWithSelectionCommand extends HostBaseCommand<
   static actionVerb = 'Open';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { UpdateCodePathWithSelectionInput } = commandModule;
     return UpdateCodePathWithSelectionInput;
   }
@@ -27,7 +27,7 @@ export default class UpdateCodePathWithSelectionCommand extends HostBaseCommand<
   }
 
   protected async run(
-    input: BaseCommandModule.UpdateCodePathWithSelectionInput,
+    input: BaseToolModule.UpdateCodePathWithSelectionInput,
   ): Promise<undefined> {
     await this.operatorModeStateService.updateCodePathWithSelection({
       codeRef: input.codeRef,
@@ -43,3 +43,7 @@ export default class UpdateCodePathWithSelectionCommand extends HostBaseCommand<
     }
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { UpdateCodePathWithSelectionTool as UpdateCodePathWithSelectionCommand };
diff --git a/packages/host/app/tools/update-playground-selection.ts b/packages/host/app/tools/update-playground-selection.ts
index f86f0b0202d..8fc4a50c065 100644
--- a/packages/host/app/tools/update-playground-selection.ts
+++ b/packages/host/app/tools/update-playground-selection.ts
@@ -3,21 +3,21 @@ import { service } from '@ember/service';
 import { rri } from '@cardstack/runtime-common';
 
 import type { Format } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
 import type PlaygroundPanelService from '../services/playground-panel-service';
 
-export default class UpdatePlaygroundSelectionCommand extends HostBaseCommand<
-  typeof BaseCommandModule.UpdatePlaygroundSelectionInput
+export default class UpdatePlaygroundSelectionTool extends HostBaseTool<
+  typeof BaseToolModule.UpdatePlaygroundSelectionInput
 > {
   @service declare private playgroundPanelService: PlaygroundPanelService;
   description = 'Persist the playground selections.';
   static actionVerb = 'Save';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { UpdatePlaygroundSelectionInput } = commandModule;
     return UpdatePlaygroundSelectionInput;
   }
@@ -25,7 +25,7 @@ export default class UpdatePlaygroundSelectionCommand extends HostBaseCommand<
   requireInputFields = ['moduleId', 'cardId', 'format'];
 
   protected async run(
-    input: BaseCommandModule.UpdatePlaygroundSelectionInput,
+    input: BaseToolModule.UpdatePlaygroundSelectionInput,
   ): Promise<undefined> {
     this.playgroundPanelService.persistSelections(
       input.moduleId,
@@ -35,3 +35,7 @@ export default class UpdatePlaygroundSelectionCommand extends HostBaseCommand<
     );
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { UpdatePlaygroundSelectionTool as UpdatePlaygroundSelectionCommand };
diff --git a/packages/host/app/tools/update-room-skills.ts b/packages/host/app/tools/update-room-skills.ts
index a575c1d4c35..5eba15ac13b 100644
--- a/packages/host/app/tools/update-room-skills.ts
+++ b/packages/host/app/tools/update-room-skills.ts
@@ -6,7 +6,7 @@ import {
 } from '@cardstack/runtime-common/matrix-constants';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 import type {
   FileDef,
   SerializedFile,
@@ -16,18 +16,18 @@ import type * as SkillModule from 'https://cardstack.com/base/skill';
 
 import { isSkillCard } from '../lib/file-def-manager';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 import {
-  getSkillSourceCommands,
+  getSkillSourceTools,
   loadSkillSource,
   type SkillSource,
-} from '../lib/skill-commands';
+} from '../lib/skill-tools';
 
 import type MatrixService from '../services/matrix-service';
 import type StoreService from '../services/store';
 
-export default class UpdateRoomSkillsCommand extends HostBaseCommand<
-  typeof BaseCommandModule.UpdateRoomSkillsInput
+export default class UpdateRoomSkillsTool extends HostBaseTool<
+  typeof BaseToolModule.UpdateRoomSkillsInput
 > {
   @service declare private matrixService: MatrixService;
   @service declare private store: StoreService;
@@ -36,7 +36,7 @@ export default class UpdateRoomSkillsCommand extends HostBaseCommand<
   description = 'Updates the enabled and disabled skills for a room';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { UpdateRoomSkillsInput } = commandModule;
     return UpdateRoomSkillsInput;
   }
@@ -44,7 +44,7 @@ export default class UpdateRoomSkillsCommand extends HostBaseCommand<
   requireInputFields = ['roomId'];
 
   protected async run(
-    input: BaseCommandModule.UpdateRoomSkillsInput,
+    input: BaseToolModule.UpdateRoomSkillsInput,
   ): Promise<undefined> {
     let {
       roomId,
@@ -111,12 +111,12 @@ export default class UpdateRoomSkillsCommand extends HostBaseCommand<
               }
             } else {
               console.warn(
-                `[UpdateRoomSkillsCommand] skipping activation of "${skillId}": not a skill card or skill markdown file`,
+                `[UpdateRoomSkillsTool] skipping activation of "${skillId}": not a skill card or skill markdown file`,
               );
             }
           } catch (err) {
             console.warn(
-              `[UpdateRoomSkillsCommand] skipping activation of "${skillId}": store.get threw: ${errorSummary(err)}`,
+              `[UpdateRoomSkillsTool] skipping activation of "${skillId}": store.get threw: ${errorSummary(err)}`,
             );
           }
         }
@@ -160,11 +160,11 @@ export default class UpdateRoomSkillsCommand extends HostBaseCommand<
                 return source;
               }
               console.warn(
-                `[UpdateRoomSkillsCommand] cannot rehydrate enabled skill "${skillId}": not a skill card or skill markdown file`,
+                `[UpdateRoomSkillsTool] cannot rehydrate enabled skill "${skillId}": not a skill card or skill markdown file`,
               );
             } catch (err) {
               console.warn(
-                `[UpdateRoomSkillsCommand] cannot rehydrate enabled skill "${skillId}": store.get threw: ${errorSummary(err)}`,
+                `[UpdateRoomSkillsTool] cannot rehydrate enabled skill "${skillId}": store.get threw: ${errorSummary(err)}`,
               );
             }
             return undefined;
@@ -184,16 +184,16 @@ export default class UpdateRoomSkillsCommand extends HostBaseCommand<
 
         if (validEnabledSkills.length > 0) {
           let allCommandDefinitions = validEnabledSkills.flatMap((skill) =>
-            getSkillSourceCommands(skill),
+            getSkillSourceTools(skill),
           );
 
           if (allCommandDefinitions.length > 0) {
             let uniqueCommandDefinitions =
-              this.matrixService.getUniqueCommandDefinitions(
+              this.matrixService.getUniqueToolDefinitions(
                 allCommandDefinitions,
               );
             let uploadedCommandDefs =
-              await this.matrixService.uploadCommandDefinitions(
+              await this.matrixService.uploadToolDefinitions(
                 uniqueCommandDefinitions,
               );
             serializedCommandDefinitions = uploadedCommandDefs.map((fileDef) =>
@@ -207,10 +207,12 @@ export default class UpdateRoomSkillsCommand extends HostBaseCommand<
         }
 
         // Write only the tool-named key; a pre-rename room's state may carry
-        // `commandDefinitions`, which must not survive the rewrite or it would
+        // `toolDefinitionFileDefs`, which must not survive the rewrite or it would
         // shadow nothing but confuse readers of raw state.
-        let { commandDefinitions: _legacyDefinitions, ...restOfSkillsConfig } =
-          currentSkillsConfig;
+        let {
+          toolDefinitionFileDefs: _legacyDefinitions,
+          ...restOfSkillsConfig
+        } = currentSkillsConfig;
         return {
           ...restOfSkillsConfig,
           enabledSkillCards: Array.from(enabledSkillCardMap.values()),
@@ -228,3 +230,7 @@ function errorSummary(err: unknown): string {
   }
   return typeof err === 'string' ? err : `<${typeof err}>`;
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { UpdateRoomSkillsTool as UpdateRoomSkillsCommand };
diff --git a/packages/host/app/tools/utils.ts b/packages/host/app/tools/utils.ts
index bd87e0ab363..90a63f64429 100644
--- a/packages/host/app/tools/utils.ts
+++ b/packages/host/app/tools/utils.ts
@@ -6,7 +6,7 @@ import {
   isToolResultRelType,
   decodeCommandRequest,
   type CommandContext,
-  type CommandRequest,
+  type ToolRequest,
 } from '@cardstack/runtime-common';
 
 import {
@@ -19,14 +19,14 @@ import type { CardDef } from 'https://cardstack.com/base/card-api';
 import type * as CardAPI from 'https://cardstack.com/base/card-api';
 import type {
   CardMessageEvent,
-  CommandResultEvent,
-  EncodedCommandRequest,
+  ToolResultEvent,
+  EncodedToolRequest,
   MatrixEvent,
   RealmEventContent,
   Tool,
 } from 'https://cardstack.com/base/matrix-event';
 
-import GetEventsFromRoomCommand from './get-events-from-room';
+import GetEventsFromRoomTool from './get-events-from-room';
 
 import type LoaderService from '../services/loader-service';
 import type MessageService from '../services/message-service';
@@ -38,7 +38,7 @@ export async function waitForMatrixEvent(
   options: { timeoutMs?: number } = {},
 ): Promise<void> {
   let timeoutMs = options.timeoutMs ?? 1000 * 60 * 20; // default to 20 minutes
-  let getEventsFromRoomCommand = new GetEventsFromRoomCommand(commandContext);
+  let getEventsFromRoomCommand = new GetEventsFromRoomTool(commandContext);
   let done = false;
   let allMatrixEvents: MatrixEvent[] = [];
   let lastEventId: string | undefined = undefined;
@@ -66,10 +66,10 @@ export async function waitForMatrixEvent(
 export async function waitForCompletedCommandRequest(
   commandContext: CommandContext,
   roomId: string,
-  commandRequestPredicate: (commandRequest: Partial<CommandRequest>) => boolean,
+  commandRequestPredicate: (toolRequest: Partial<ToolRequest>) => boolean,
   options: { timeoutMs?: number; afterEventId?: string } = {},
-): Promise<CommandResultEvent | undefined> {
-  let result: CommandResultEvent | undefined = undefined;
+): Promise<ToolResultEvent | undefined> {
+  let result: ToolResultEvent | undefined = undefined;
   await waitForMatrixEvent(
     commandContext,
     roomId,
@@ -84,31 +84,31 @@ export async function waitForCompletedCommandRequest(
         (e) =>
           isToolResultEventType(e.type) &&
           isToolResultRelType(
-            (e as CommandResultEvent).content['m.relates_to']?.rel_type,
+            (e as ToolResultEvent).content['m.relates_to']?.rel_type,
           ) &&
-          (e as CommandResultEvent).content['m.relates_to']?.key === 'applied',
-      ) as CommandResultEvent[];
-      return commandResultEvents.some((commandResultEvent) => {
+          (e as ToolResultEvent).content['m.relates_to']?.key === 'applied',
+      ) as ToolResultEvent[];
+      return commandResultEvents.some((toolResultEvent) => {
         let eventWithRequest = events.find(
           (e) =>
-            e.event_id === commandResultEvent.content['m.relates_to']?.event_id,
+            e.event_id === toolResultEvent.content['m.relates_to']?.event_id,
         ) as CardMessageEvent | undefined;
         if (!eventWithRequest) {
           return false;
         }
-        let commandRequests =
-          getToolRequests<Partial<EncodedCommandRequest>>(
+        let toolRequests =
+          getToolRequests<Partial<EncodedToolRequest>>(
             eventWithRequest.content,
           ) ?? [];
-        let commandRequest = commandRequests.find(
-          (commandRequest) =>
-            commandRequest.id === commandResultEvent.content.commandRequestId,
+        let toolRequest = toolRequests.find(
+          (toolRequest) =>
+            toolRequest.id === toolResultEvent.content.commandRequestId,
         );
         if (
-          commandRequest &&
-          commandRequestPredicate(decodeCommandRequest(commandRequest))
+          toolRequest &&
+          commandRequestPredicate(decodeCommandRequest(toolRequest))
         ) {
-          result = commandResultEvent;
+          result = toolResultEvent;
           return true;
         }
         return false;
diff --git a/packages/host/app/tools/validate-realm.ts b/packages/host/app/tools/validate-realm.ts
index 865809bdaf6..006512efb35 100644
--- a/packages/host/app/tools/validate-realm.ts
+++ b/packages/host/app/tools/validate-realm.ts
@@ -1,19 +1,19 @@
 import { RealmPaths } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 
-import GetAvailableRealmIdentifiersCommand from './get-available-realm-identifiers';
+import GetAvailableRealmIdentifiersTool from './get-available-realm-identifiers';
 
-export default class ValidateRealmCommand extends HostBaseCommand<
-  typeof BaseCommandModule.ValidateRealmInput,
-  typeof BaseCommandModule.ValidateRealmResult
+export default class ValidateRealmTool extends HostBaseTool<
+  typeof BaseToolModule.ValidateRealmInput,
+  typeof BaseToolModule.ValidateRealmResult
 > {
   description = 'Validate that a realm URL is available and normalize it';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { ValidateRealmInput } = commandModule;
     return ValidateRealmInput;
   }
@@ -21,11 +21,11 @@ export default class ValidateRealmCommand extends HostBaseCommand<
   requireInputFields = ['realmIdentifier'];
 
   protected async run(
-    input: BaseCommandModule.ValidateRealmInput,
-  ): Promise<BaseCommandModule.ValidateRealmResult> {
+    input: BaseToolModule.ValidateRealmInput,
+  ): Promise<BaseToolModule.ValidateRealmResult> {
     let realmIdentifier = new RealmPaths(new URL(input.realmIdentifier)).url;
 
-    let { realmIdentifiers } = await new GetAvailableRealmIdentifiersCommand(
+    let { realmIdentifiers } = await new GetAvailableRealmIdentifiersTool(
       this.commandContext,
     ).execute();
 
@@ -33,8 +33,12 @@ export default class ValidateRealmCommand extends HostBaseCommand<
       throw new Error(`Invalid realm: ${realmIdentifier}`);
     }
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { ValidateRealmResult } = commandModule;
     return new ValidateRealmResult({ realmIdentifier });
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { ValidateRealmTool as ValidateRealmCommand };
diff --git a/packages/host/app/tools/write-binary-file.ts b/packages/host/app/tools/write-binary-file.ts
index ac24a4f8811..c04ffbfd7d8 100644
--- a/packages/host/app/tools/write-binary-file.ts
+++ b/packages/host/app/tools/write-binary-file.ts
@@ -4,9 +4,9 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { rri } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 import { findNonConflictingFilename } from '../utils/file-name';
 
 import type CardService from '../services/card-service';
@@ -34,9 +34,9 @@ function base64ToUint8Array(base64: string): Uint8Array {
   throw new Error('No base64 decoder available in this environment');
 }
 
-export default class WriteBinaryFileCommand extends HostBaseCommand<
-  typeof BaseCommandModule.WriteBinaryFileInput,
-  typeof BaseCommandModule.WriteBinaryFileResult
+export default class WriteBinaryFileTool extends HostBaseTool<
+  typeof BaseToolModule.WriteBinaryFileInput,
+  typeof BaseToolModule.WriteBinaryFileResult
 > {
   @service declare private cardService: CardService;
   @service declare private realm: RealmService;
@@ -46,7 +46,7 @@ export default class WriteBinaryFileCommand extends HostBaseCommand<
   static actionVerb = 'Write';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { WriteBinaryFileInput } = commandModule;
     return WriteBinaryFileInput;
   }
@@ -54,8 +54,8 @@ export default class WriteBinaryFileCommand extends HostBaseCommand<
   requireInputFields = ['path', 'base64Content'];
 
   protected async run(
-    input: BaseCommandModule.WriteBinaryFileInput,
-  ): Promise<BaseCommandModule.WriteBinaryFileResult> {
+    input: BaseToolModule.WriteBinaryFileInput,
+  ): Promise<BaseToolModule.WriteBinaryFileResult> {
     let realm;
     if (input.realm) {
       realm = this.realm.realmOf(rri(input.realm));
@@ -130,7 +130,7 @@ export default class WriteBinaryFileCommand extends HostBaseCommand<
       throw new Error(details);
     }
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { WriteBinaryFileResult } = commandModule;
     return new WriteBinaryFileResult({ fileIdentifier: finalUrl.href });
   }
@@ -140,3 +140,7 @@ export default class WriteBinaryFileCommand extends HostBaseCommand<
     return getSourceResult.status !== 404;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { WriteBinaryFileTool as WriteBinaryFileCommand };
diff --git a/packages/host/app/tools/write-text-file.ts b/packages/host/app/tools/write-text-file.ts
index 9ca9e1ee445..aaf04e534f8 100644
--- a/packages/host/app/tools/write-text-file.ts
+++ b/packages/host/app/tools/write-text-file.ts
@@ -2,18 +2,18 @@ import { service } from '@ember/service';
 
 import { rri } from '@cardstack/runtime-common';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
-import HostBaseCommand from '../lib/host-base-command';
+import HostBaseTool from '../lib/host-base-tool';
 import { findNonConflictingFilename } from '../utils/file-name';
 
 import type CardService from '../services/card-service';
 import type { SaveType } from '../services/card-service';
 import type RealmService from '../services/realm';
 
-export default class WriteTextFileCommand extends HostBaseCommand<
-  typeof BaseCommandModule.WriteTextFileInput,
-  typeof BaseCommandModule.FileIdentifierCard
+export default class WriteTextFileTool extends HostBaseTool<
+  typeof BaseToolModule.WriteTextFileInput,
+  typeof BaseToolModule.FileIdentifierCard
 > {
   @service declare private cardService: CardService;
   @service declare private realm: RealmService;
@@ -22,7 +22,7 @@ export default class WriteTextFileCommand extends HostBaseCommand<
   static actionVerb = 'Write';
 
   async getInputType() {
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { WriteTextFileInput } = commandModule;
     return WriteTextFileInput;
   }
@@ -30,8 +30,8 @@ export default class WriteTextFileCommand extends HostBaseCommand<
   requireInputFields = ['path', 'content'];
 
   protected async run(
-    input: BaseCommandModule.WriteTextFileInput,
-  ): Promise<BaseCommandModule.FileIdentifierCard> {
+    input: BaseToolModule.WriteTextFileInput,
+  ): Promise<BaseToolModule.FileIdentifierCard> {
     if (input.overwrite && input.useNonConflictingFilename) {
       throw new Error(
         'Cannot use both overwrite and useNonConflictingFilename.',
@@ -92,7 +92,7 @@ export default class WriteTextFileCommand extends HostBaseCommand<
       await this.cardService.saveSource(finalUrl, input.content, saveType);
     }
 
-    let commandModule = await this.loadCommandModule();
+    let commandModule = await this.loadToolModule();
     const { FileIdentifierCard } = commandModule;
     return new FileIdentifierCard({ fileIdentifier: finalUrl.href });
   }
@@ -102,3 +102,7 @@ export default class WriteTextFileCommand extends HostBaseCommand<
     return getSourceResult.status !== 404;
   }
 }
+
+// Pre-rename spellings: realm content references these classes by named
+// export in imports and codeRefs, so the old names stay importable.
+export { WriteTextFileTool as WriteTextFileCommand };
diff --git a/packages/host/tests/acceptance/code-patches-test.gts b/packages/host/tests/acceptance/code-patches-test.gts
index 28fc3bb757d..dec8d170d98 100644
--- a/packages/host/tests/acceptance/code-patches-test.gts
+++ b/packages/host/tests/acceptance/code-patches-test.gts
@@ -131,7 +131,7 @@ module('Acceptance | Code patches tests', function (hooks) {
                 commands: [
                   {
                     codeRef: {
-                      name: 'SearchCardsByTypeAndTitleCommand',
+                      name: 'SearchCardsByTypeAndTitleTool',
                       module: '@cardstack/boxel-host/commands/search-cards',
                     },
                     requiresApproval: true,
@@ -283,9 +283,11 @@ ${REPLACE_MARKER}\n\`\`\``;
       'updated file should be attached 2',
     );
 
-    let commandService = getService('command-service') as any;
-    let requestIdsByRoom =
-      commandService.aiAssistantClientRequestIdsByRoom as Map<string, any>;
+    let toolService = getService('tool-service') as any;
+    let requestIdsByRoom = toolService.aiAssistantClientRequestIdsByRoom as Map<
+      string,
+      any
+    >;
     let roomRequestIds = requestIdsByRoom?.get(roomId);
     assert.ok(
       roomRequestIds,
@@ -1726,7 +1728,7 @@ ${REPLACE_MARKER}
     });
 
     // Wait for the patches to be processed - the spinner should appear during automatic execution
-    // This test should FAIL until we implement the CommandService state tracking
+    // This test should FAIL until we implement the ToolService state tracking
     await waitFor(
       '[data-test-ai-assistant-action-bar] [data-test-loading-indicator]',
       {
diff --git a/packages/host/tests/acceptance/code-submode/create-file-test.gts b/packages/host/tests/acceptance/code-submode/create-file-test.gts
index a6d96e81ff6..0eb1d62b8e3 100644
--- a/packages/host/tests/acceptance/code-submode/create-file-test.gts
+++ b/packages/host/tests/acceptance/code-submode/create-file-test.gts
@@ -1597,7 +1597,7 @@ export class TestCard extends Animal {
         },
       );
 
-      // Mirror WriteTextFileCommand exactly. `cardService.saveSource` with
+      // Mirror WriteTextFileTool exactly. `cardService.saveSource` with
       // saveType 'create-file' POSTs the new source to the realm and tags
       // the request with `X-Boxel-Client-Request-Id: create-file:<uuid>`,
       // which the realm echoes back in the `index/incremental` event.
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 9619fe2fce6..d2efe50a6ac 100644
--- a/packages/host/tests/acceptance/code-submode/file-tree-test.ts
+++ b/packages/host/tests/acceptance/code-submode/file-tree-test.ts
@@ -15,7 +15,7 @@ import { module, test } from 'qunit';
 
 import { baseRealmRRI } from '@cardstack/runtime-common';
 
-import WriteTextFileCommand from '@cardstack/host/tools/write-text-file';
+import WriteTextFileTool from '@cardstack/host/tools/write-text-file';
 import { ScrollPositions } from '@cardstack/host/utils/local-storage-keys';
 
 import {
@@ -55,7 +55,7 @@ const indexCardSource = `
 const personCardSource = `
   import { contains, containsMany, field, linksToMany, CardDef, Component } from "https://cardstack.com/base/card-api";
   import StringField from "https://cardstack.com/base/string";
-import WriteTextFileCommand from '../../../app/commands/write-text-file';
+import WriteTextFileTool from '../../../app/tools/write-text-file';
   import { Friend } from './friend';
 
   export class Person extends CardDef {
@@ -1084,9 +1084,9 @@ module('Acceptance | code submode | file-tree tests', function (hooks) {
     let newDirName = 'new-dir';
     let newFileName = 'new-file.gts';
 
-    let commandService = getService('command-service');
-    let writeTextFileCommand = new WriteTextFileCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let writeTextFileCommand = new WriteTextFileTool(
+      toolService.commandContext,
     );
     await writeTextFileCommand.execute({
       path: `${newDirName}/${newFileName}`,
diff --git a/packages/host/tests/acceptance/code-submode/inspector-test.ts b/packages/host/tests/acceptance/code-submode/inspector-test.ts
index 5bdee1d7fb7..b4c706ffc55 100644
--- a/packages/host/tests/acceptance/code-submode/inspector-test.ts
+++ b/packages/host/tests/acceptance/code-submode/inspector-test.ts
@@ -1278,16 +1278,16 @@ module('Acceptance | code submode | inspector tests', function (hooks) {
       codePath: `${testRealmURL}command-module.gts`,
     });
 
-    await waitFor('[data-test-command-panel-header]');
+    await waitFor('[data-test-tool-panel-header]');
     assert
-      .dom('[data-test-command-panel-header]')
-      .hasText('Command', 'renders command panel');
+      .dom('[data-test-tool-panel-header]')
+      .hasText('Tool', 'renders tool panel');
     assert
       .dom('[data-test-card-module-definition]')
-      .hasTextContaining('SampleCommand', 'shows command definition details');
+      .hasTextContaining('SampleCommand', 'shows tool definition details');
     assert
       .dom('[data-test-boxel-selector-item-selected]')
-      .hasText('SampleCommand command', 'selector shows command type');
+      .hasText('SampleCommand tool', 'selector shows tool type');
   });
 
   test('shows component panel and Create Listing action for component declarations', async function (assert) {
diff --git a/packages/host/tests/acceptance/commands-test.gts b/packages/host/tests/acceptance/commands-test.gts
index 984e303388d..ddb425b7d12 100644
--- a/packages/host/tests/acceptance/commands-test.gts
+++ b/packages/host/tests/acceptance/commands-test.gts
@@ -34,12 +34,12 @@ import {
   APP_BOXEL_LLM_MODE,
 } from '@cardstack/runtime-common/matrix-constants';
 
-import CreateAiAssistantRoomCommand from '@cardstack/host/tools/create-ai-assistant-room';
-import OpenAiAssistantRoomCommand from '@cardstack/host/tools/open-ai-assistant-room';
-import SaveCardCommand from '@cardstack/host/tools/save-card';
-import { SearchCardsByTypeAndTitleCommand } from '@cardstack/host/tools/search-cards';
-import SendAiAssistantMessageCommand from '@cardstack/host/tools/send-ai-assistant-message';
-import ShowCardCommand from '@cardstack/host/tools/show-card';
+import CreateAiAssistantRoomTool from '@cardstack/host/tools/create-ai-assistant-room';
+import OpenAiAssistantRoomTool from '@cardstack/host/tools/open-ai-assistant-room';
+import SaveCardTool from '@cardstack/host/tools/save-card';
+import { SearchCardsByTypeAndTitleTool } from '@cardstack/host/tools/search-cards';
+import SendAiAssistantMessageTool from '@cardstack/host/tools/send-ai-assistant-message';
+import ShowCardTool from '@cardstack/host/tools/show-card';
 import {
   waitForCompletedCommandRequest,
   waitForRealmState,
@@ -175,20 +175,20 @@ module('Acceptance | Commands tests', function (hooks) {
           topic: 'unset topic',
           participants: input.participants,
         });
-        let saveCardCommand = new SaveCardCommand(this.commandContext);
+        let saveCardCommand = new SaveCardTool(this.commandContext);
         let savedMeeting = await saveCardCommand.execute({
           card: meeting,
           realm: testRealmURL,
         });
         savedMeetingCardId = savedMeeting?.id;
 
-        let createAIAssistantRoomCommand = new CreateAiAssistantRoomCommand(
+        let createAIAssistantRoomCommand = new CreateAiAssistantRoomTool(
           this.commandContext,
         );
         let { roomId } = await createAIAssistantRoomCommand.execute({
           name: 'AI Assistant Room',
         });
-        let sendAiAssistantMessageCommand = new SendAiAssistantMessageCommand(
+        let sendAiAssistantMessageCommand = new SendAiAssistantMessageTool(
           this.commandContext,
         );
         let { eventId } = await sendAiAssistantMessageCommand.execute({
@@ -200,7 +200,7 @@ module('Acceptance | Commands tests', function (hooks) {
         await waitForCompletedCommandRequest(
           this.commandContext,
           roomId,
-          (commandRequest) => commandRequest.name === 'patchCardInstance',
+          (toolRequest) => toolRequest.name === 'patchCardInstance',
           { afterEventId: eventId },
         );
 
@@ -210,7 +210,7 @@ module('Acceptance | Commands tests', function (hooks) {
           () => meeting.topic === input.topic,
         );
 
-        let showCardCommand = new ShowCardCommand(this.commandContext);
+        let showCardCommand = new ShowCardTool(this.commandContext);
         await showCardCommand.execute({
           cardId: meeting.id,
         });
@@ -240,19 +240,19 @@ module('Acceptance | Commands tests', function (hooks) {
       static displayName = 'SearchAndOpenCardCommand';
       static actionVerb = 'Search';
       async getInputType() {
-        return new SearchCardsByTypeAndTitleCommand(
+        return new SearchCardsByTypeAndTitleTool(
           this.commandContext,
         ).getInputType();
       }
       protected async run(
         input: SearchCardsByTypeAndTitleInput,
       ): Promise<undefined> {
-        let searchCommand = new SearchCardsByTypeAndTitleCommand(
+        let searchCommand = new SearchCardsByTypeAndTitleTool(
           this.commandContext,
         );
         let searchResult = await searchCommand.execute(input);
         if (searchResult.cardIds.length > 0) {
-          let showCardCommand = new ShowCardCommand(this.commandContext);
+          let showCardCommand = new ShowCardTool(this.commandContext);
           await showCardCommand.execute({
             cardId: searchResult.cardIds[0],
           });
@@ -323,7 +323,7 @@ module('Acceptance | Commands tests', function (hooks) {
             return;
           }
 
-          let openAiAssistantRoomCommand = new OpenAiAssistantRoomCommand(
+          let openAiAssistantRoomCommand = new OpenAiAssistantRoomTool(
             commandContext,
           );
           await openAiAssistantRoomCommand.execute({
@@ -337,7 +337,7 @@ module('Acceptance | Commands tests', function (hooks) {
             console.error('No command context found');
             return;
           }
-          let createAIAssistantRoomCommand = new CreateAiAssistantRoomCommand(
+          let createAIAssistantRoomCommand = new CreateAiAssistantRoomTool(
             commandContext,
           );
           let { roomId } = await createAIAssistantRoomCommand.execute({
@@ -348,7 +348,7 @@ module('Acceptance | Commands tests', function (hooks) {
               )) as Skill,
             ],
           });
-          let sendAiAssistantMessageCommand = new SendAiAssistantMessageCommand(
+          let sendAiAssistantMessageCommand = new SendAiAssistantMessageTool(
             commandContext,
           );
           await sendAiAssistantMessageCommand.execute({
@@ -436,7 +436,7 @@ module('Acceptance | Commands tests', function (hooks) {
               commands: [
                 {
                   codeRef: {
-                    name: 'SearchCardsByTypeAndTitleCommand',
+                    name: 'SearchCardsByTypeAndTitleTool',
                     module: '@cardstack/boxel-host/commands/search-cards',
                   },
                   requiresApproval: true,
@@ -484,7 +484,7 @@ module('Acceptance | Commands tests', function (hooks) {
     });
   });
 
-  test('OpenAiAssistantRoomCommand opens the AI assistant room', async function (assert) {
+  test('OpenAiAssistantRoomTool opens the AI assistant room', async function (assert) {
     await visitOperatorMode({
       stacks: [[{ id: `${testRealmURL}Person/hassan`, format: 'isolated' }]],
     });
@@ -553,7 +553,7 @@ module('Acceptance | Commands tests', function (hooks) {
     });
   });
 
-  test('SaveCardCommand returns the saved card with its id set', async function (assert) {
+  test('SaveCardTool returns the saved card with its id set', async function (assert) {
     await visitOperatorMode({
       stacks: [[{ id: `${testRealmURL}index`, format: 'isolated' }]],
     });
@@ -564,7 +564,7 @@ module('Acceptance | Commands tests', function (hooks) {
     );
     await click('[data-test-schedule-meeting-button]');
     await waitUntil(() => savedMeetingCardId !== undefined);
-    assert.ok(savedMeetingCardId, 'SaveCardCommand returned the saved card');
+    assert.ok(savedMeetingCardId, 'SaveCardTool returned the saved card');
     assert.true(
       savedMeetingCardId!.startsWith(testRealmURL),
       'saved card id is a URL within the test realm',
@@ -641,7 +641,7 @@ module('Acceptance | Commands tests', function (hooks) {
     // and otherwise picks aiSessionRooms[0]. The beforeEach createAndJoinRoom
     // also marks aibot as a member (mock createRoom auto-invites), so both
     // rooms qualify — and a stale sessionStorage entry from a prior test
-    // (e.g. OpenAiAssistantRoomCommand racing schedule-meeting and persisting
+    // (e.g. OpenAiAssistantRoomTool racing schedule-meeting and persisting
     // the beforeEach room) can land us in the wrong one. Be explicit instead.
     await click('[data-test-open-ai-assistant]');
     getService('ai-assistant-panel-service').enterRoom(roomId);
@@ -655,15 +655,16 @@ module('Acceptance | Commands tests', function (hooks) {
     // processRoomTask returned early on a memberIds-without-aiBot read, and
     // never re-ran because _events alone didn't change after _roomState was
     // populated.
-    let applySelector = '[data-test-message-idx="1"] [data-test-command-apply]';
+    let applySelector =
+      '[data-test-message-idx="1"] [data-test-tool-call-apply]';
     try {
       await waitFor(applySelector, { timeout: 10_000 });
     } catch (err) {
       let messageIdxs = findAll('[data-test-message-idx]').map((el) =>
         el.getAttribute('data-test-message-idx'),
       );
-      let applyButtons = findAll('[data-test-command-apply]').map((el) =>
-        el.getAttribute('data-test-command-apply'),
+      let applyButtons = findAll('[data-test-tool-call-apply]').map((el) =>
+        el.getAttribute('data-test-tool-call-apply'),
       );
       let roomElements = findAll('[data-room-id]').map((el) => ({
         roomId: el.getAttribute('data-room-id'),
@@ -802,7 +803,7 @@ module('Acceptance | Commands tests', function (hooks) {
       .dom('[data-test-message-idx="0"] .command-description')
       .containsText('Switching to code submode');
 
-    await click('[data-test-message-idx="0"] [data-test-command-apply]');
+    await click('[data-test-message-idx="0"] [data-test-tool-call-apply]');
 
     // check we're in code mode
     await waitFor('[data-test-submode-switcher=code]', { timeout: 5000 });
@@ -883,9 +884,9 @@ module('Acceptance | Commands tests', function (hooks) {
       .dom('[data-test-message-idx="0"] .command-description')
       .containsText('Finding and opening Hassan card');
     assert
-      .dom('[data-test-message-idx="0"] [data-test-command-apply]')
+      .dom('[data-test-message-idx="0"] [data-test-tool-call-apply]')
       .containsText('Search');
-    await click('[data-test-message-idx="0"] [data-test-command-apply]');
+    await click('[data-test-message-idx="0"] [data-test-tool-call-apply]');
     assert
       .dom(
         '[data-test-operator-mode-stack="1"] [data-test-stack-card-index="0"]',
@@ -999,7 +1000,9 @@ module('Acceptance | Commands tests', function (hooks) {
       .dom('[data-test-message-idx="0"] .command-description')
       .containsText(description);
     assert
-      .dom('[data-test-message-idx="0"] [data-test-command-apply="preparing"]')
+      .dom(
+        '[data-test-message-idx="0"] [data-test-tool-call-apply="preparing"]',
+      )
       .exists();
   });
 
@@ -1069,11 +1072,11 @@ module('Acceptance | Commands tests', function (hooks) {
         '[data-test-message-idx="0"] [data-test-apply-state="applied"]',
       );
     } catch (err) {
-      let applyButtons = findAll('[data-test-command-apply]').map((el) => ({
+      let applyButtons = findAll('[data-test-tool-call-apply]').map((el) => ({
         idx: el
           .closest('[data-test-message-idx]')
           ?.getAttribute('data-test-message-idx'),
-        state: el.getAttribute('data-test-command-apply'),
+        state: el.getAttribute('data-test-tool-call-apply'),
       }));
       let applyStates = findAll('[data-test-apply-state]').map((el) =>
         el.getAttribute('data-test-apply-state'),
@@ -1095,7 +1098,7 @@ module('Acceptance | Commands tests', function (hooks) {
               roomData?.skillsConfig?.enabledSkillCards?.map(
                 (f) => f.sourceUrl,
               ) ?? null,
-            roomResourceCommandCount: roomResource?.commands?.length ?? null,
+            roomResourceCommandCount: roomResource?.tools?.length ?? null,
           },
           null,
           2,
@@ -1104,7 +1107,7 @@ module('Acceptance | Commands tests', function (hooks) {
       throw err;
     }
 
-    assert.dom('[data-test-command-id]').doesNotHaveClass('is-failed');
+    assert.dom('[data-test-tool-call-id]').doesNotHaveClass('is-failed');
 
     // check we're in interact mode
     await waitFor('[data-test-submode-switcher=interact]');
@@ -1195,7 +1198,7 @@ module('Acceptance | Commands tests', function (hooks) {
       '[data-test-message-idx="0"] [data-test-apply-state="ready"]',
     );
 
-    assert.dom('[data-test-command-id]').doesNotHaveClass('is-failed');
+    assert.dom('[data-test-tool-call-id]').doesNotHaveClass('is-failed');
     assert.dom('[data-test-submode-switcher=interact]').exists();
   });
 
@@ -1232,7 +1235,7 @@ module('Acceptance | Commands tests', function (hooks) {
     });
     await waitFor('[data-test-message-idx="0"]');
     assert
-      .dom('[data-test-message-idx="0"] [data-test-command-apply]')
+      .dom('[data-test-message-idx="0"] [data-test-tool-call-apply]')
       .exists({ count: 2 });
   });
 
@@ -1287,7 +1290,7 @@ module('Acceptance | Commands tests', function (hooks) {
     await waitFor('[data-test-message-idx="0"]');
     // In 'ask' mode, the apply button should be visible and not auto-applied
     assert
-      .dom('[data-test-command-apply]')
+      .dom('[data-test-tool-call-apply]')
       .exists('Apply button is shown in ask mode');
     assert
       .dom('[data-test-apply-state="applied"]')
@@ -1363,7 +1366,7 @@ module('Acceptance | Commands tests', function (hooks) {
     await waitFor('[data-test-message-idx="2"]');
     // In 'ask' mode, the apply button should be visible and not auto-applied
     assert
-      .dom('[data-test-message-idx="2"] [data-test-command-apply]')
+      .dom('[data-test-message-idx="2"] [data-test-tool-call-apply]')
       .exists('Apply button is shown in ask mode');
     assert
       .dom('[data-test-message-idx="2"] [data-test-apply-state="applied"]')
@@ -1378,7 +1381,7 @@ module('Acceptance | Commands tests', function (hooks) {
 
     // The command from message idx 2 should still not be auto-applied because it was sent before act mode
     assert
-      .dom('[data-test-message-idx="2"] [data-test-command-apply]')
+      .dom('[data-test-message-idx="2"] [data-test-tool-call-apply]')
       .exists('Apply button is still shown for command sent before act mode');
     assert
       .dom('[data-test-message-idx="2"] [data-test-apply-state="applied"]')
@@ -1474,7 +1477,7 @@ module('Acceptance | Commands tests', function (hooks) {
       .dom('[data-test-boxel-alert="warning"]')
       .containsText('No command for the name "no-such-command" was found');
 
-    assert.dom('[data-test-command-id]').doesNotHaveClass('is-failed');
+    assert.dom('[data-test-tool-call-id]').doesNotHaveClass('is-failed');
 
     // verify that command result event was created correctly
     let message = getRoomEvents(roomId).pop()!;
@@ -1578,7 +1581,7 @@ module('Acceptance | Commands tests', function (hooks) {
               roomData?.skillsConfig?.enabledSkillCards?.map(
                 (f) => f.sourceUrl,
               ) ?? null,
-            roomResourceCommandCount: roomResource?.commands?.length ?? null,
+            roomResourceCommandCount: roomResource?.tools?.length ?? null,
           },
           null,
           2,
@@ -1589,7 +1592,7 @@ module('Acceptance | Commands tests', function (hooks) {
       .dom('[data-test-boxel-alert="warning"]')
       .containsText(expectedValidationText);
 
-    assert.dom('[data-test-command-id]').doesNotHaveClass('is-failed');
+    assert.dom('[data-test-tool-call-id]').doesNotHaveClass('is-failed');
 
     // verify that command result event was created correctly
     let message = getRoomEvents(roomId).pop()!;
diff --git a/packages/host/tests/helpers/base-realm.ts b/packages/host/tests/helpers/base-realm.ts
index a4c93021b95..8c4b05adb88 100644
--- a/packages/host/tests/helpers/base-realm.ts
+++ b/packages/host/tests/helpers/base-realm.ts
@@ -132,8 +132,8 @@ let CardsGrid: CardsGrid;
 type Skill = (typeof SkillModule)['Skill'];
 let Skill: Skill;
 
-type CommandField = (typeof SkillModule)['CommandField'];
-let CommandField: CommandField;
+type ToolField = (typeof SkillModule)['ToolField'];
+let ToolField: ToolField;
 
 type ModelConfiguration = (typeof SystemCardModule)['ModelConfiguration'];
 let ModelConfiguration: ModelConfiguration;
@@ -304,9 +304,8 @@ async function initialize() {
     await loader.import<typeof CodeRefModule>(`${baseRealm.url}code-ref`)
   ).default;
 
-  CommandField = (
-    await loader.import<typeof SkillModule>(`${baseRealm.url}skill`)
-  ).CommandField;
+  ToolField = (await loader.import<typeof SkillModule>(`${baseRealm.url}skill`))
+    .ToolField;
 
   BigIntegerField = (
     await loader.import<typeof BigIntegerModule>(`${baseRealm.url}big-integer`)
@@ -445,7 +444,7 @@ export {
   EmailField,
   Base64ImageField,
   CodeRefField,
-  CommandField,
+  ToolField,
   BigIntegerField,
   EthereumAddressField,
   BooleanField,
diff --git a/packages/host/tests/helpers/index.gts b/packages/host/tests/helpers/index.gts
index 81bd171aef3..51562f3ab4d 100644
--- a/packages/host/tests/helpers/index.gts
+++ b/packages/host/tests/helpers/index.gts
@@ -57,7 +57,7 @@ import {
 import SQLiteAdapter from '@cardstack/host/lib/sqlite-adapter';
 import type QueueService from '@cardstack/host/services/queue';
 import type { CardSaveSubscriber } from '@cardstack/host/services/store';
-import UpdateRoomSkillsCommand from '@cardstack/host/tools/update-room-skills';
+import UpdateRoomSkillsTool from '@cardstack/host/tools/update-room-skills';
 
 import {
   coerceRenderError,
@@ -2019,8 +2019,8 @@ export async function addSkillToAiAssistant(
     );
   }
 
-  let command = new UpdateRoomSkillsCommand(
-    getService('command-service').commandContext,
+  let command = new UpdateRoomSkillsTool(
+    getService('tool-service').commandContext,
   );
   await command.execute({
     roomId: resolvedRoomId,
@@ -2037,7 +2037,7 @@ export async function addSkillToAiAssistant(
       skillsConfig: {
         enabledSkillCards?: Array<{ sourceUrl?: string }>;
         disabledSkillCards?: Array<{ sourceUrl?: string }>;
-        commandDefinitions?: Array<{ sourceUrl?: string }>;
+        toolDefinitionFileDefs?: Array<{ sourceUrl?: string }>;
       };
     } | null;
   };
@@ -2072,7 +2072,7 @@ export async function addSkillToAiAssistant(
         snapshot?.enabledSkillCards?.map((f) => f.sourceUrl) ?? null,
       disabledSkillCards:
         snapshot?.disabledSkillCards?.map((f) => f.sourceUrl) ?? null,
-      commandDefinitionsCount: snapshot?.commandDefinitions?.length ?? null,
+      commandDefinitionsCount: snapshot?.toolDefinitionFileDefs?.length ?? null,
     };
     let originalMessage = err instanceof Error ? err.message : String(err);
     let enriched = new Error(
@@ -2101,14 +2101,14 @@ export async function waitForNewRoomSkillsLoaded(roomId: string) {
       skillsConfig: {
         enabledSkillCards?: Array<{ sourceUrl?: string }>;
         disabledSkillCards?: Array<{ sourceUrl?: string }>;
-        commandDefinitions?: Array<{ sourceUrl?: string }>;
+        toolDefinitionFileDefs?: Array<{ sourceUrl?: string }>;
       };
     } | null;
     roomResources: Map<
       string,
       {
         skills?: Array<{ cardId: string }>;
-        commands?: Array<unknown>;
+        tools?: Array<unknown>;
       }
     >;
   };
@@ -2126,9 +2126,7 @@ export async function waitForNewRoomSkillsLoaded(roomId: string) {
         // a non-empty list proves that loadSkills finished and the skill
         // card's @field commands is populated — i.e. message-builder will be
         // able to resolve the request's functionName.
-        return Boolean(
-          roomResource && (roomResource.commands?.length ?? 0) > 0,
-        );
+        return Boolean(roomResource && (roomResource.tools?.length ?? 0) > 0);
       },
       {
         timeout: 5000,
@@ -2149,9 +2147,9 @@ export async function waitForNewRoomSkillsLoaded(roomId: string) {
         roomData?.skillsConfig?.disabledSkillCards?.map((f) => f.sourceUrl) ??
         null,
       commandDefinitionsCount:
-        roomData?.skillsConfig?.commandDefinitions?.length ?? null,
+        roomData?.skillsConfig?.toolDefinitionFileDefs?.length ?? null,
       roomResourceSkillIds: roomResource?.skills?.map((s) => s.cardId) ?? null,
-      roomResourceCommandCount: roomResource?.commands?.length ?? null,
+      roomResourceCommandCount: roomResource?.tools?.length ?? null,
     };
     let originalMessage = err instanceof Error ? err.message : String(err);
     let enriched = new Error(
diff --git a/packages/host/tests/helpers/mock-matrix/_client.ts b/packages/host/tests/helpers/mock-matrix/_client.ts
index 14d372c384e..9621bdc075d 100644
--- a/packages/host/tests/helpers/mock-matrix/_client.ts
+++ b/packages/host/tests/helpers/mock-matrix/_client.ts
@@ -37,7 +37,7 @@ import type { CardDef } from 'https://cardstack.com/base/card-api';
 import type { SerializedFile } from 'https://cardstack.com/base/file-api';
 import type { FileDef } from 'https://cardstack.com/base/file-api';
 import type { MatrixEvent as DiscreteMatrixEvent } from 'https://cardstack.com/base/matrix-event';
-import type { CommandField } from 'https://cardstack.com/base/skill';
+import type { ToolField } from 'https://cardstack.com/base/skill';
 
 import type { MockSDK } from './_sdk';
 
@@ -894,11 +894,11 @@ export class MockClient implements ExtendedClient {
     return await this.fileDefManager.uploadCards(cards);
   }
 
-  async uploadCommandDefinitions(
-    commandDefinitions: CommandField[],
+  async uploadToolDefinitions(
+    toolDefinitionFileDefs: ToolField[],
   ): Promise<FileDef[]> {
-    return await this.fileDefManager.uploadCommandDefinitions(
-      commandDefinitions,
+    return await this.fileDefManager.uploadToolDefinitions(
+      toolDefinitionFileDefs,
     );
   }
 
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
index afe51b0af35..d07d07a4ca2 100644
--- 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
@@ -7,7 +7,7 @@ import { module, test } from 'qunit';
 import { rri } from '@cardstack/runtime-common';
 
 import RealmService from '@cardstack/host/services/realm';
-import AddFieldToCardDefinitionCommand from '@cardstack/host/tools/add-field-to-card-definition';
+import AddFieldToCardDefinitionTool from '@cardstack/host/tools/add-field-to-card-definition';
 
 import {
   setupIntegrationTestRealm,
@@ -62,10 +62,10 @@ module(
     });
 
     test('adds a field to a card definition', async function (assert) {
-      let commandService = getService('command-service');
+      let toolService = getService('tool-service');
       let cardService = getService('card-service');
-      let addFieldToCardDefinitionCommand = new AddFieldToCardDefinitionCommand(
-        commandService.commandContext,
+      let addFieldToCardDefinitionCommand = new AddFieldToCardDefinitionTool(
+        toolService.commandContext,
       );
 
       await addFieldToCardDefinitionCommand.execute({
@@ -100,10 +100,10 @@ module(
     });
 
     test('can add a computed field', async function (assert) {
-      let commandService = getService('command-service');
+      let toolService = getService('tool-service');
       let cardService = getService('card-service');
-      let addFieldToCardDefinitionCommand = new AddFieldToCardDefinitionCommand(
-        commandService.commandContext,
+      let addFieldToCardDefinitionCommand = new AddFieldToCardDefinitionTool(
+        toolService.commandContext,
       );
 
       await addFieldToCardDefinitionCommand.execute({
diff --git a/packages/host/tests/integration/commands/apply-markdown-edit-test.gts b/packages/host/tests/integration/commands/apply-markdown-edit-test.gts
index 017196e7411..ce205fbab71 100644
--- a/packages/host/tests/integration/commands/apply-markdown-edit-test.gts
+++ b/packages/host/tests/integration/commands/apply-markdown-edit-test.gts
@@ -7,7 +7,7 @@ import { module, test } from 'qunit';
 import { baseRealm, type Loader } from '@cardstack/runtime-common';
 
 import RealmService from '@cardstack/host/services/realm';
-import ApplyMarkdownEditCommand from '@cardstack/host/tools/apply-markdown-edit';
+import ApplyMarkdownEditTool from '@cardstack/host/tools/apply-markdown-edit';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
 
@@ -82,7 +82,7 @@ module('Integration | commands | apply-markdown-edit', function (hooks) {
     autostart: true,
   });
 
-  let command: ApplyMarkdownEditCommand;
+  let command: ApplyMarkdownEditTool;
 
   setupRealmServerEndpoints(hooks, [
     {
@@ -171,8 +171,8 @@ module('Integration | commands | apply-markdown-edit', function (hooks) {
       }),
     );
 
-    command = new ApplyMarkdownEditCommand(
-      getService('command-service').commandContext,
+    command = new ApplyMarkdownEditTool(
+      getService('tool-service').commandContext,
     );
   });
 
diff --git a/packages/host/tests/integration/commands/apply-search-replace-block-test.gts b/packages/host/tests/integration/commands/apply-search-replace-block-test.gts
index 6ed5e3aa7ff..92f77c5998d 100644
--- a/packages/host/tests/integration/commands/apply-search-replace-block-test.gts
+++ b/packages/host/tests/integration/commands/apply-search-replace-block-test.gts
@@ -7,7 +7,7 @@ import {
   SEPARATOR_MARKER,
 } from '@cardstack/runtime-common';
 
-import ApplySearchReplaceBlockCommand from '@cardstack/host/tools/apply-search-replace-block';
+import ApplySearchReplaceBlockTool from '@cardstack/host/tools/apply-search-replace-block';
 
 import { setupRenderingTest } from '../../helpers/setup';
 
@@ -15,9 +15,9 @@ module('Integration | commands | apply-search-replace-block', function (hooks) {
   setupRenderingTest(hooks);
 
   test('handles basic search and replace pattern', async function (assert) {
-    let commandService = getService('command-service');
-    let applyCommand = new ApplySearchReplaceBlockCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let applyCommand = new ApplySearchReplaceBlockTool(
+      toolService.commandContext,
     );
 
     const fileContent = `import {
@@ -71,9 +71,9 @@ export class Task extends CardDef {
   });
 
   test('handles multiple occurrences of the search pattern, only replacing the first', async function (assert) {
-    let commandService = getService('command-service');
-    let applyCommand = new ApplySearchReplaceBlockCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let applyCommand = new ApplySearchReplaceBlockTool(
+      toolService.commandContext,
     );
 
     const fileContent = `class BlogPost extends CardDef {
@@ -135,9 +135,9 @@ class EmbeddedTemplate extends Component<typeof BlogPost> {
   });
 
   test('handles search pattern with whitespace differences', async function (assert) {
-    let commandService = getService('command-service');
-    let applyCommand = new ApplySearchReplaceBlockCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let applyCommand = new ApplySearchReplaceBlockTool(
+      toolService.commandContext,
     );
 
     const fileContent = `export class Product extends CardDef {
@@ -173,9 +173,9 @@ ${REPLACE_MARKER}`;
   });
 
   test('handles no match found', async function (assert) {
-    let commandService = getService('command-service');
-    let applyCommand = new ApplySearchReplaceBlockCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let applyCommand = new ApplySearchReplaceBlockTool(
+      toolService.commandContext,
     );
 
     const fileContent = `export class Review extends CardDef {
@@ -216,9 +216,9 @@ ${REPLACE_MARKER}`;
 
   // Skipping this test for now as throwing errors causes issues
   skip('handles malformed search/replace block', async function (assert) {
-    let commandService = getService('command-service');
-    let applyCommand = new ApplySearchReplaceBlockCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let applyCommand = new ApplySearchReplaceBlockTool(
+      toolService.commandContext,
     );
 
     const fileContent = `export class Contact extends CardDef {
@@ -253,9 +253,9 @@ ${REPLACE_MARKER}`;
   });
 
   test('handles search with additional context for clarity', async function (assert) {
-    let commandService = getService('command-service');
-    let applyCommand = new ApplySearchReplaceBlockCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let applyCommand = new ApplySearchReplaceBlockTool(
+      toolService.commandContext,
     );
 
     const fileContent = `class WeatherDisplay extends Component<typeof Weather> {
@@ -319,9 +319,9 @@ ${REPLACE_MARKER}`;
   });
 
   test('handles different indentation in search pattern', async function (assert) {
-    let commandService = getService('command-service');
-    let applyCommand = new ApplySearchReplaceBlockCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let applyCommand = new ApplySearchReplaceBlockTool(
+      toolService.commandContext,
     );
 
     const fileContent = `class ContactCard extends CardDef {
@@ -415,9 +415,9 @@ class CardTemplate extends Component<typeof ContactCard> {
   });
 
   test('handles tabs vs spaces in search pattern', async function (assert) {
-    let commandService = getService('command-service');
-    let applyCommand = new ApplySearchReplaceBlockCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let applyCommand = new ApplySearchReplaceBlockTool(
+      toolService.commandContext,
     );
 
     // File uses spaces for indentation
@@ -470,9 +470,9 @@ ${REPLACE_MARKER}`;
   });
 
   test('handles spurious blank lines in search pattern', async function (assert) {
-    let commandService = getService('command-service');
-    let applyCommand = new ApplySearchReplaceBlockCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let applyCommand = new ApplySearchReplaceBlockTool(
+      toolService.commandContext,
     );
 
     const fileContent = `class UserProfile extends CardDef {
@@ -530,9 +530,9 @@ ${REPLACE_MARKER}`;
   });
 
   test('handles spurious blank lines in the middle of the search pattern', async function (assert) {
-    let commandService = getService('command-service');
-    let applyCommand = new ApplySearchReplaceBlockCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let applyCommand = new ApplySearchReplaceBlockTool(
+      toolService.commandContext,
     );
 
     const fileContent = `class UserProfile extends CardDef {
@@ -589,9 +589,9 @@ ${REPLACE_MARKER}`;
   });
 
   test('handles carriage return differences in search pattern', async function (assert) {
-    let commandService = getService('command-service');
-    let applyCommand = new ApplySearchReplaceBlockCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let applyCommand = new ApplySearchReplaceBlockTool(
+      toolService.commandContext,
     );
 
     // File uses LF line endings
@@ -633,9 +633,9 @@ ${REPLACE_MARKER}`;
   });
 
   test('handles trailing whitespace differences', async function (assert) {
-    let commandService = getService('command-service');
-    let applyCommand = new ApplySearchReplaceBlockCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let applyCommand = new ApplySearchReplaceBlockTool(
+      toolService.commandContext,
     );
 
     const fileContent = `class BookingForm extends Component<typeof Booking> {
@@ -699,9 +699,9 @@ ${REPLACE_MARKER}`;
   });
 
   test('it applies search/replace block when replace block is empty', async function (assert) {
-    let commandService = getService('command-service');
-    let applyCommand = new ApplySearchReplaceBlockCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let applyCommand = new ApplySearchReplaceBlockTool(
+      toolService.commandContext,
     );
 
     const fileContent = `class Task extends CardDef {
@@ -729,9 +729,9 @@ ${REPLACE_MARKER}`;
   });
 
   test('it allows empty search and replace blocks on empty content', async function (assert) {
-    let commandService = getService('command-service');
-    let applyCommand = new ApplySearchReplaceBlockCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let applyCommand = new ApplySearchReplaceBlockTool(
+      toolService.commandContext,
     );
 
     const fileContent = '';
@@ -748,9 +748,9 @@ ${REPLACE_MARKER}`;
   });
 
   test('it rejects empty search blocks on non-empty content', async function (assert) {
-    let commandService = getService('command-service');
-    let applyCommand = new ApplySearchReplaceBlockCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let applyCommand = new ApplySearchReplaceBlockTool(
+      toolService.commandContext,
     );
 
     const fileContent = `export class Task extends CardDef {
@@ -781,9 +781,9 @@ ${REPLACE_MARKER}`;
     // Models sometimes duplicate the separator right before the REPLACE
     // marker; applying the block must strip it rather than write it into the
     // file as a trailing line of box-drawing characters.
-    let commandService = getService('command-service');
-    let applyCommand = new ApplySearchReplaceBlockCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let applyCommand = new ApplySearchReplaceBlockTool(
+      toolService.commandContext,
     );
 
     const fileContent = `{ "old": true }`;
diff --git a/packages/host/tests/integration/commands/authed-fetch-test.gts b/packages/host/tests/integration/commands/authed-fetch-test.gts
index 963571327c1..9db0867ec85 100644
--- a/packages/host/tests/integration/commands/authed-fetch-test.gts
+++ b/packages/host/tests/integration/commands/authed-fetch-test.gts
@@ -6,7 +6,7 @@ import { module, test } from 'qunit';
 
 import type NetworkService from '@cardstack/host/services/network';
 import RealmService from '@cardstack/host/services/realm';
-import AuthedFetchCommand from '@cardstack/host/tools/authed-fetch';
+import AuthedFetchTool from '@cardstack/host/tools/authed-fetch';
 
 import {
   setupIntegrationTestRealm,
@@ -83,8 +83,8 @@ module('Integration | commands | authed-fetch', function (hooks) {
       status: 200,
       text: async () => JSON.stringify({ data: 'hello' }),
     };
-    let commandService = getService('command-service');
-    let command = new AuthedFetchCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new AuthedFetchTool(toolService.commandContext);
     let result = await command.execute({
       url: 'https://example.com/api/resource',
     });
@@ -99,8 +99,8 @@ module('Integration | commands | authed-fetch', function (hooks) {
       status: 404,
       text: async () => 'not found',
     };
-    let commandService = getService('command-service');
-    let command = new AuthedFetchCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new AuthedFetchTool(toolService.commandContext);
     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/commands/bot-registration-test.gts
index 65dcbc8aa35..5b97d20b3f8 100644
--- a/packages/host/tests/integration/commands/bot-registration-test.gts
+++ b/packages/host/tests/integration/commands/bot-registration-test.gts
@@ -5,8 +5,8 @@ import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
-import RegisterBotCommand from '@cardstack/host/tools/register-bot';
-import UnregisterBotCommand from '@cardstack/host/tools/unregister-bot';
+import RegisterBotTool from '@cardstack/host/tools/register-bot';
+import UnregisterBotTool from '@cardstack/host/tools/unregister-bot';
 
 import {
   setupIntegrationTestRealm,
@@ -127,10 +127,8 @@ module('Integration | commands | bot-registration', function (hooks) {
   });
 
   test('register-bot returns botRegistrationId', async function (assert) {
-    let commandService = getService('command-service');
-    let registerBotCommand = new RegisterBotCommand(
-      commandService.commandContext,
-    );
+    let toolService = getService('tool-service');
+    let registerBotCommand = new RegisterBotTool(toolService.commandContext);
 
     let result = await registerBotCommand.execute({
       username: '@testuser:localhost',
@@ -140,13 +138,11 @@ module('Integration | commands | bot-registration', function (hooks) {
   });
 
   test('unregister-bot removes the bot registration', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let realmServer = getService('realm-server');
-    let registerBotCommand = new RegisterBotCommand(
-      commandService.commandContext,
-    );
-    let unregisterBotCommand = new UnregisterBotCommand(
-      commandService.commandContext,
+    let registerBotCommand = new RegisterBotTool(toolService.commandContext);
+    let unregisterBotCommand = new UnregisterBotTool(
+      toolService.commandContext,
     );
 
     let registerResult = await registerBotCommand.execute({
diff --git a/packages/host/tests/integration/commands/can-read-realm-test.gts b/packages/host/tests/integration/commands/can-read-realm-test.gts
index 01ce533df87..0d64b15f02d 100644
--- a/packages/host/tests/integration/commands/can-read-realm-test.gts
+++ b/packages/host/tests/integration/commands/can-read-realm-test.gts
@@ -5,7 +5,7 @@ import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
-import CanReadRealmCommand from '@cardstack/host/tools/can-read-realm';
+import CanReadRealmTool from '@cardstack/host/tools/can-read-realm';
 
 import {
   setupIntegrationTestRealm,
@@ -66,8 +66,8 @@ module('Integration | commands | can-read-realm', function (hooks) {
 
   test('returns true for a readable realm', async function (assert) {
     readableUrls = ['https://example.com/readable/'];
-    let commandService = getService('command-service');
-    let command = new CanReadRealmCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new CanReadRealmTool(toolService.commandContext);
     let result = await command.execute({
       realmIdentifier: 'https://example.com/readable/',
     });
@@ -76,8 +76,8 @@ module('Integration | commands | can-read-realm', function (hooks) {
 
   test('returns false for an unreadable realm', async function (assert) {
     readableUrls = [];
-    let commandService = getService('command-service');
-    let command = new CanReadRealmCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new CanReadRealmTool(toolService.commandContext);
     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/commands/cancel-indexing-job-test.gts
index 756a215cdc3..f07004766d8 100644
--- a/packages/host/tests/integration/commands/cancel-indexing-job-test.gts
+++ b/packages/host/tests/integration/commands/cancel-indexing-job-test.gts
@@ -5,7 +5,7 @@ import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
-import CancelIndexingJobCommand from '@cardstack/host/tools/cancel-indexing-job';
+import CancelIndexingJobTool from '@cardstack/host/tools/cancel-indexing-job';
 
 import {
   setupIntegrationTestRealm,
@@ -74,9 +74,9 @@ module('Integration | commands | cancel-indexing-job', function (hooks) {
   });
 
   test('calls realm endpoint with expected auth header', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let realmServer = getService('realm-server');
-    let command = new CancelIndexingJobCommand(commandService.commandContext);
+    let command = new CancelIndexingJobTool(toolService.commandContext);
     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/commands/check-correctness-test.gts
index d094c75f763..4d308a2da76 100644
--- a/packages/host/tests/integration/commands/check-correctness-test.gts
+++ b/packages/host/tests/integration/commands/check-correctness-test.gts
@@ -11,9 +11,9 @@ import {
   SEPARATOR_MARKER,
 } from '@cardstack/runtime-common';
 
-import CheckCorrectnessCommand from '@cardstack/host/tools/check-correctness';
-import PatchCardInstanceCommand from '@cardstack/host/tools/patch-card-instance';
-import PatchCodeCommand from '@cardstack/host/tools/patch-code';
+import CheckCorrectnessTool from '@cardstack/host/tools/check-correctness';
+import PatchCardInstanceTool from '@cardstack/host/tools/patch-card-instance';
+import PatchCodeTool from '@cardstack/host/tools/patch-code';
 
 import {
   testRealmURL,
@@ -85,8 +85,8 @@ module('Integration | commands | check-correctness', function (hooks) {
     await realmService.login(testRealmURL);
   });
 
-  test('reports card instance correctness when PatchCardInstanceCommand is used', async function (assert) {
-    let commandService = getService('command-service') as {
+  test('reports card instance correctness when PatchCardInstanceTool is used', async function (assert) {
+    let toolService = getService('tool-service') as {
       commandContext: CommandContext;
     };
     let store = getService('store') as any;
@@ -97,8 +97,8 @@ module('Integration | commands | check-correctness', function (hooks) {
     store.addReference(cardId);
     await store.waitForCardLoad(cardId);
 
-    let command = new CheckCorrectnessCommand(commandService.commandContext);
-    let patchCodeCommand = new PatchCodeCommand(commandService.commandContext);
+    let command = new CheckCorrectnessTool(toolService.commandContext);
+    let patchCodeCommand = new PatchCodeTool(toolService.commandContext);
     let roomId = '!room:example.com';
 
     let firstResult = await command.execute({
@@ -109,10 +109,9 @@ module('Integration | commands | check-correctness', function (hooks) {
 
     assert.true(firstResult.correct, 'initial run reports no errors');
 
-    let patchCommand = new PatchCardInstanceCommand(
-      commandService.commandContext,
-      { cardType: Pet },
-    );
+    let patchCommand = new PatchCardInstanceTool(toolService.commandContext, {
+      cardType: Pet,
+    });
     await patchCommand.execute({
       cardId,
       patch: {
@@ -141,7 +140,7 @@ module('Integration | commands | check-correctness', function (hooks) {
       'reports the validation error from the card constructor',
     );
 
-    // Put the card back to its working state. We can't use PatchCardInstanceCommand, because the instance
+    // Put the card back to its working state. We can't use PatchCardInstanceTool, because the instance
     // is broken and patching won't work. Instead, we need to patch the code directly.
 
     let revertResult = await patchCodeCommand.execute({
@@ -173,14 +172,14 @@ module('Integration | commands | check-correctness', function (hooks) {
     assert.true(thirdResult.correct, 'third run reports no errors');
   });
 
-  test('reports card instance correctness when PatchCodeCommand is used', async function (assert) {
-    let commandService = getService('command-service') as {
+  test('reports card instance correctness when PatchCodeTool is used', async function (assert) {
+    let toolService = getService('tool-service') as {
       commandContext: CommandContext;
     };
     let store = getService('store') as any;
 
-    let command = new CheckCorrectnessCommand(commandService.commandContext);
-    let patchCodeCommand = new PatchCodeCommand(commandService.commandContext);
+    let command = new CheckCorrectnessTool(toolService.commandContext);
+    let patchCodeCommand = new PatchCodeTool(toolService.commandContext);
     let cardId = `${testRealmURL}Pet/billy`;
     let fileUrl = `${cardId}.json`;
     let roomId = '!room:example.com';
@@ -254,11 +253,11 @@ module('Integration | commands | check-correctness', function (hooks) {
   });
 
   test('skips correctness checks for empty files', async function (assert) {
-    let commandService = getService('command-service') as {
+    let toolService = getService('tool-service') as {
       commandContext: CommandContext;
     };
-    let patchCodeCommand = new PatchCodeCommand(commandService.commandContext);
-    let command = new CheckCorrectnessCommand(commandService.commandContext);
+    let patchCodeCommand = new PatchCodeTool(toolService.commandContext);
+    let command = new CheckCorrectnessTool(toolService.commandContext);
     let roomId = '!room:example.com';
     let emptyFileUrl = `${testRealmURL}empty.gts`;
     let cardService = getService('card-service');
@@ -291,13 +290,13 @@ ${REPLACE_MARKER}`;
   });
 
   test('reports size limit errors for file writes', async function (assert) {
-    let commandService = getService('command-service') as {
+    let toolService = getService('tool-service') as {
       commandContext: CommandContext;
     };
     let environmentService = getService('environment-service') as any;
     let cardService = getService('card-service');
-    let patchCodeCommand = new PatchCodeCommand(commandService.commandContext);
-    let command = new CheckCorrectnessCommand(commandService.commandContext);
+    let patchCodeCommand = new PatchCodeTool(toolService.commandContext);
+    let command = new CheckCorrectnessTool(toolService.commandContext);
     let roomId = '!room:example.com';
     let fileUrl = `${testRealmURL}pet.gts`;
 
@@ -333,14 +332,14 @@ ${REPLACE_MARKER}`;
     }
   });
 
-  test('reports size limit errors for card writes via PatchCardInstanceCommand', async function (assert) {
-    let commandService = getService('command-service') as {
+  test('reports size limit errors for card writes via PatchCardInstanceTool', async function (assert) {
+    let toolService = getService('tool-service') as {
       commandContext: 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 CheckCorrectnessCommand(commandService.commandContext);
+    let command = new CheckCorrectnessTool(toolService.commandContext);
     let roomId = '!room:example.com';
     let { Pet } = await loader.import(`${testRealmURL}pet`);
     let cardId = `${testRealmURL}Pet/billy`;
@@ -352,10 +351,9 @@ ${REPLACE_MARKER}`;
     environmentService.cardSizeLimitBytes = 1000;
 
     try {
-      let patchCommand = new PatchCardInstanceCommand(
-        commandService.commandContext,
-        { cardType: Pet },
-      );
+      let patchCommand = new PatchCardInstanceTool(toolService.commandContext, {
+        cardType: Pet,
+      });
 
       await patchCommand.execute({
         cardId,
diff --git a/packages/host/tests/integration/commands/check-domain-availability-test.gts b/packages/host/tests/integration/commands/check-domain-availability-test.gts
index 978f71e31af..1eff16a1ed5 100644
--- a/packages/host/tests/integration/commands/check-domain-availability-test.gts
+++ b/packages/host/tests/integration/commands/check-domain-availability-test.gts
@@ -5,7 +5,7 @@ import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
-import CheckDomainAvailabilityCommand from '@cardstack/host/tools/check-domain-availability';
+import CheckDomainAvailabilityTool from '@cardstack/host/tools/check-domain-availability';
 
 import {
   setupIntegrationTestRealm,
@@ -79,8 +79,8 @@ module('Integration | commands | check-domain-availability', function (hooks) {
   });
 
   function makeCommand() {
-    let commandService = getService('command-service');
-    return new CheckDomainAvailabilityCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    return new CheckDomainAvailabilityTool(toolService.commandContext);
   }
 
   test('reports an available custom subdomain, deriving the URL from the server hostname', async function (assert) {
diff --git a/packages/host/tests/integration/commands/commands-calling-test.gts b/packages/host/tests/integration/commands/commands-calling-test.gts
index a118eec8975..68c2af48999 100644
--- a/packages/host/tests/integration/commands/commands-calling-test.gts
+++ b/packages/host/tests/integration/commands/commands-calling-test.gts
@@ -36,8 +36,8 @@ module('Integration | commands | commands-calling', function (hooks) {
   hooks.beforeEach(function (this: RenderingTestContext) {
     getOwner(this)!.register('service:realm', StubRealmService);
 
-    let commandService = getService('command-service');
-    commandContext = commandService.commandContext;
+    let toolService = getService('tool-service');
+    commandContext = toolService.commandContext;
   });
 
   test('can be called with a card as input', async function (assert) {
diff --git a/packages/host/tests/integration/commands/copy-and-edit-test.gts b/packages/host/tests/integration/commands/copy-and-edit-test.gts
index 94b2c725abf..95943487e1c 100644
--- a/packages/host/tests/integration/commands/copy-and-edit-test.gts
+++ b/packages/host/tests/integration/commands/copy-and-edit-test.gts
@@ -6,7 +6,7 @@ import { module, test } from 'qunit';
 import { realmURL as realmURLSymbol } from '@cardstack/runtime-common';
 
 import { StackItem } from '@cardstack/host/lib/stack-item';
-import CopyAndEditCommand from '@cardstack/host/tools/copy-and-edit';
+import CopyAndEditTool from '@cardstack/host/tools/copy-and-edit';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
 
@@ -182,7 +182,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
   });
 
   test('copies card and relinks linksTo parent (same realm)', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let store = getService('store');
     let operatorModeStateService = getService('operator-mode-state-service');
 
@@ -209,7 +209,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
       }),
     );
 
-    let command = new CopyAndEditCommand(commandService.commandContext);
+    let command = new CopyAndEditTool(toolService.commandContext);
     await command.execute({
       card: childCard,
     });
@@ -237,7 +237,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
   });
 
   test('copies card and relinks nested linksTo parent when only leaf field name is provided', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let store = getService('store');
     let operatorModeStateService = getService('operator-mode-state-service');
 
@@ -266,7 +266,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
       }),
     );
 
-    let command = new CopyAndEditCommand(commandService.commandContext);
+    let command = new CopyAndEditTool(toolService.commandContext);
     await command.execute({
       card: originalTheme,
     });
@@ -287,7 +287,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
   });
 
   test('copies card without linked parent (query-derived stack) and does not throw', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let store = getService('store');
     let operatorModeStateService = getService('operator-mode-state-service');
 
@@ -303,7 +303,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
       ),
     );
 
-    let command = new CopyAndEditCommand(commandService.commandContext);
+    let command = new CopyAndEditTool(toolService.commandContext);
     await command.execute({
       card: childCard,
     });
@@ -312,7 +312,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
   });
 
   test('copies card in single stack and replaces current item', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let store = getService('store');
     let operatorModeStateService = getService('operator-mode-state-service');
 
@@ -328,7 +328,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
       }),
     );
 
-    let command = new CopyAndEditCommand(commandService.commandContext);
+    let command = new CopyAndEditTool(toolService.commandContext);
     await command.execute({
       card: simpleCard,
     });
@@ -346,7 +346,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
   });
 
   test('copies card and relinks linksToMany parent (same realm)', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let store = getService('store');
     let operatorModeStateService = getService('operator-mode-state-service');
 
@@ -373,7 +373,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
       }),
     );
 
-    let command = new CopyAndEditCommand(commandService.commandContext);
+    let command = new CopyAndEditTool(toolService.commandContext);
     await command.execute({
       card: childCard,
     });
@@ -391,7 +391,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
   });
 
   test('copies linked card and relinks linksTo parent (cross realm)', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let store = getService('store');
     let operatorModeStateService = getService('operator-mode-state-service');
 
@@ -419,7 +419,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
       }),
     );
 
-    let command = new CopyAndEditCommand(commandService.commandContext);
+    let command = new CopyAndEditTool(toolService.commandContext);
     await command.execute({
       card: remoteChild,
     });
@@ -443,7 +443,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
   });
 
   test('copies card and relinks linksToMany parent (cross realm)', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let store = getService('store');
     let operatorModeStateService = getService('operator-mode-state-service');
 
@@ -477,7 +477,7 @@ module('Integration | commands | copy-and-edit', function (hooks) {
       }),
     );
 
-    let command = new CopyAndEditCommand(commandService.commandContext);
+    let command = new CopyAndEditTool(toolService.commandContext);
     await command.execute({
       card: remoteChild,
     });
diff --git a/packages/host/tests/integration/commands/copy-card-test.gts b/packages/host/tests/integration/commands/copy-card-test.gts
index a6afbbc5f9e..2948fd64a3b 100644
--- a/packages/host/tests/integration/commands/copy-card-test.gts
+++ b/packages/host/tests/integration/commands/copy-card-test.gts
@@ -4,8 +4,8 @@ import { module, test } from 'qunit';
 import { realmURL as realmURLSymbol } from '@cardstack/runtime-common';
 
 import { StackItem } from '@cardstack/host/lib/stack-item';
-import CopyCardToRealmCommand from '@cardstack/host/tools/copy-card';
-import CopyCardToStackCommand from '@cardstack/host/tools/copy-card-to-stack';
+import CopyCardToRealmTool from '@cardstack/host/tools/copy-card';
+import CopyCardToStackTool from '@cardstack/host/tools/copy-card-to-stack';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
 
@@ -102,12 +102,10 @@ module('Integration | commands | copy-card', function (hooks) {
     await realmService.login(testRealm2URL);
   });
 
-  module('CopyCardToRealmCommand', function () {
+  module('CopyCardToRealmTool', function () {
     test('copies card to target realm', async function (assert) {
-      let commandService = getService('command-service');
-      let copyCardCommand = new CopyCardToRealmCommand(
-        commandService.commandContext,
-      );
+      let toolService = getService('tool-service');
+      let copyCardCommand = new CopyCardToRealmTool(toolService.commandContext);
 
       let sourceCardUrl = `${testRealmURL}Pet/mango`;
       let targetRealm = testRealm2URL;
@@ -149,10 +147,8 @@ module('Integration | commands | copy-card', function (hooks) {
     });
 
     test('errors when user does not have write permissions to target realm', async function (assert) {
-      let commandService = getService('command-service');
-      let copyCardCommand = new CopyCardToRealmCommand(
-        commandService.commandContext,
-      );
+      let toolService = getService('tool-service');
+      let copyCardCommand = new CopyCardToRealmTool(toolService.commandContext);
 
       let sourceCardUrl = `${testRealmURL}Pet/mango`;
       let targetRealm = testRealm2URL;
@@ -184,11 +180,11 @@ module('Integration | commands | copy-card', function (hooks) {
     });
   });
 
-  module('CopyCardToStackCommand', function () {
+  module('CopyCardToStackTool', function () {
     test('copies card to stack when valid targetStackIndex is provided', async function (assert) {
-      let commandService = getService('command-service');
-      let copyCardToStackCommand = new CopyCardToStackCommand(
-        commandService.commandContext,
+      let toolService = getService('tool-service');
+      let copyCardToStackCommand = new CopyCardToStackTool(
+        toolService.commandContext,
       );
 
       let sourceCardUrl = `${testRealmURL}Pet/mango`;
@@ -241,9 +237,9 @@ module('Integration | commands | copy-card', function (hooks) {
       );
     });
     test('errors when targetStackIndex does not exist', async function (assert) {
-      let commandService = getService('command-service');
-      let copyCardToStackCommand = new CopyCardToStackCommand(
-        commandService.commandContext,
+      let toolService = getService('tool-service');
+      let copyCardToStackCommand = new CopyCardToStackTool(
+        toolService.commandContext,
       );
 
       let sourceCardUrl = `${testRealmURL}Pet/mango`;
diff --git a/packages/host/tests/integration/commands/copy-file-to-realm-test.gts b/packages/host/tests/integration/commands/copy-file-to-realm-test.gts
index 12f0f0339e8..a203abe8afd 100644
--- a/packages/host/tests/integration/commands/copy-file-to-realm-test.gts
+++ b/packages/host/tests/integration/commands/copy-file-to-realm-test.gts
@@ -1,8 +1,8 @@
 import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
-import CopyFileToRealmCommand from '@cardstack/host/tools/copy-file-to-realm';
-import ShowFileCommand from '@cardstack/host/tools/show-file';
+import CopyFileToRealmTool from '@cardstack/host/tools/copy-file-to-realm';
+import ShowFileTool from '@cardstack/host/tools/show-file';
 
 import {
   setupIntegrationTestRealm,
@@ -53,10 +53,8 @@ module('Integration | commands | copy-file-to-realm', function (hooks) {
   });
 
   test('copies file to target realm', async function (assert) {
-    let commandService = getService('command-service');
-    let copyFileCommand = new CopyFileToRealmCommand(
-      commandService.commandContext,
-    );
+    let toolService = getService('tool-service');
+    let copyFileCommand = new CopyFileToRealmTool(toolService.commandContext);
 
     let result = await copyFileCommand.execute({
       sourceFileIdentifier: `${testRealmURL}hello.txt`,
@@ -76,10 +74,8 @@ module('Integration | commands | copy-file-to-realm', function (hooks) {
   });
 
   test('handles filename conflicts by creating non-conflicting name', async function (assert) {
-    let commandService = getService('command-service');
-    let copyFileCommand = new CopyFileToRealmCommand(
-      commandService.commandContext,
-    );
+    let toolService = getService('tool-service');
+    let copyFileCommand = new CopyFileToRealmTool(toolService.commandContext);
 
     // First, copy hello.txt to test2 realm so there is a conflict on the second copy
     await copyFileCommand.execute({
@@ -111,7 +107,7 @@ module('Integration | commands | copy-file-to-realm', function (hooks) {
   });
 
   test('after copying, show file command switches to code submode with correct file URL', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let operatorModeStateService = getService('operator-mode-state-service');
 
     operatorModeStateService.restore({
@@ -119,9 +115,7 @@ module('Integration | commands | copy-file-to-realm', function (hooks) {
       submode: 'interact',
     });
 
-    let copyFileCommand = new CopyFileToRealmCommand(
-      commandService.commandContext,
-    );
+    let copyFileCommand = new CopyFileToRealmTool(toolService.commandContext);
 
     let result = await copyFileCommand.execute({
       sourceFileIdentifier: `${testRealmURL}hello.txt`,
@@ -130,7 +124,7 @@ module('Integration | commands | copy-file-to-realm', function (hooks) {
 
     assert.ok(result.newFileIdentifier, 'new file URL is returned');
 
-    let showFileCommand = new ShowFileCommand(commandService.commandContext);
+    let showFileCommand = new ShowFileTool(toolService.commandContext);
     await showFileCommand.execute({
       fileIdentifier: result.newFileIdentifier,
     });
@@ -148,10 +142,8 @@ 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 commandService = getService('command-service');
-    let copyFileCommand = new CopyFileToRealmCommand(
-      commandService.commandContext,
-    );
+    let toolService = getService('tool-service');
+    let copyFileCommand = new CopyFileToRealmTool(toolService.commandContext);
 
     let realmService = getService('realm');
     realmService.logout();
diff --git a/packages/host/tests/integration/commands/copy-source-test.gts b/packages/host/tests/integration/commands/copy-source-test.gts
index 8733c38af68..3be3050c340 100644
--- a/packages/host/tests/integration/commands/copy-source-test.gts
+++ b/packages/host/tests/integration/commands/copy-source-test.gts
@@ -7,7 +7,7 @@ import { module, test } from 'qunit';
 import type NetworkService from '@cardstack/host/services/network';
 
 import RealmService from '@cardstack/host/services/realm';
-import CopySourceCommand from '@cardstack/host/tools/copy-source';
+import CopySourceTool from '@cardstack/host/tools/copy-source';
 
 import {
   setupIntegrationTestRealm,
@@ -64,10 +64,8 @@ module('Integration | commands | copy-source', function (hooks) {
   });
 
   test('able to copy source or file', async function (assert) {
-    let commandService = getService('command-service');
-    let copySourceCommand = new CopySourceCommand(
-      commandService.commandContext,
-    );
+    let toolService = getService('tool-service');
+    let copySourceCommand = new CopySourceTool(toolService.commandContext);
     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/commands/create-listing-pr-request-test.gts
index 727c5b020f0..e0efd729785 100644
--- a/packages/host/tests/integration/commands/create-listing-pr-request-test.gts
+++ b/packages/host/tests/integration/commands/create-listing-pr-request-test.gts
@@ -8,7 +8,7 @@ import { isBotTriggerEvent } from '@cardstack/runtime-common';
 
 import type MatrixService from '@cardstack/host/services/matrix-service';
 import RealmService from '@cardstack/host/services/realm';
-import CreateListingPRRequestCommand from '@cardstack/host/tools/bot-requests/create-listing-pr-request';
+import CreateListingPRRequestTool from '@cardstack/host/tools/bot-requests/create-listing-pr-request';
 
 import {
   setupIntegrationTestRealm,
@@ -71,12 +71,10 @@ module('Integration | commands | create-listing-pr-request', function (hooks) {
       sender: '@testuser:localhost',
       name: 'room-test',
     });
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let matrixService = getService('matrix-service') as MatrixService;
 
-    let command = new CreateListingPRRequestCommand(
-      commandService.commandContext,
-    );
+    let command = new CreateListingPRRequestTool(toolService.commandContext);
     await command.execute({
       realm: testRealmURL,
       listingId: `${testRealmURL}Listing/test-listing`,
@@ -128,13 +126,11 @@ module('Integration | commands | create-listing-pr-request', function (hooks) {
       sender: '@testuser:localhost',
       name: 'current-room',
     });
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let matrixService = getService('matrix-service') as MatrixService;
     let previousCurrentRoomId = matrixService.currentRoomId;
 
-    let command = new CreateListingPRRequestCommand(
-      commandService.commandContext,
-    );
+    let command = new CreateListingPRRequestTool(toolService.commandContext);
     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/commands/create-spec-test.gts
index eb5a3dfa28d..824ad30a77b 100644
--- a/packages/host/tests/integration/commands/create-spec-test.gts
+++ b/packages/host/tests/integration/commands/create-spec-test.gts
@@ -4,7 +4,7 @@ import { module, test } from 'qunit';
 import { baseRealm } from '@cardstack/runtime-common';
 import type { Loader } from '@cardstack/runtime-common/loader';
 
-import CreateSpecCommand from '@cardstack/host/tools/create-specs';
+import CreateSpecTool from '@cardstack/host/tools/create-specs';
 
 import type { Spec } from 'https://cardstack.com/base/spec';
 
@@ -29,7 +29,7 @@ module('Integration | Command | create-specs', function (hooks) {
   setupBaseRealm(hooks);
   const realmName = 'Create Spec Test Realm';
   let loader: Loader;
-  let createSpecCommand: CreateSpecCommand;
+  let createSpecCommand: CreateSpecTool;
 
   // Provide proxy endpoint for any AI-based README generation that create-specs may invoke
   setupRealmServerEndpoints(hooks, [
@@ -62,8 +62,8 @@ module('Integration | Command | create-specs', function (hooks) {
 
   hooks.beforeEach(function () {
     loader = getService('loader-service').loader;
-    let commandService = getService('command-service');
-    createSpecCommand = new CreateSpecCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    createSpecCommand = new CreateSpecTool(toolService.commandContext);
   });
 
   setupLocalIndexing(hooks);
diff --git a/packages/host/tests/integration/commands/evaluate-module-test.gts b/packages/host/tests/integration/commands/evaluate-module-test.gts
index 2f4bce72cf8..5311cb01c5e 100644
--- a/packages/host/tests/integration/commands/evaluate-module-test.gts
+++ b/packages/host/tests/integration/commands/evaluate-module-test.gts
@@ -1,7 +1,7 @@
 import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
-import EvaluateModuleCommand from '@cardstack/host/tools/evaluate-module';
+import EvaluateModuleTool from '@cardstack/host/tools/evaluate-module';
 
 import {
   setupIntegrationTestRealm,
@@ -56,8 +56,8 @@ module('Integration | commands | evaluate-module', function (hooks) {
   });
 
   test('valid module passes evaluation', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new EvaluateModuleCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new EvaluateModuleTool(toolService.commandContext);
 
     let InputType = await command.getInputType();
     let input = new InputType({
@@ -72,8 +72,8 @@ module('Integration | commands | evaluate-module', function (hooks) {
   });
 
   test('module with broken import fails evaluation', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new EvaluateModuleCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new EvaluateModuleTool(toolService.commandContext);
 
     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/commands/execute-atomic-operations-test.gts
index c1489bb9b09..dd327ed2fd6 100644
--- a/packages/host/tests/integration/commands/execute-atomic-operations-test.gts
+++ b/packages/host/tests/integration/commands/execute-atomic-operations-test.gts
@@ -6,7 +6,7 @@ import { module, test } from 'qunit';
 
 import CardService from '@cardstack/host/services/card-service';
 import RealmService from '@cardstack/host/services/realm';
-import ExecuteAtomicOperationsCommand from '@cardstack/host/tools/execute-atomic-operations';
+import ExecuteAtomicOperationsTool from '@cardstack/host/tools/execute-atomic-operations';
 
 import {
   setupIntegrationTestRealm,
@@ -68,10 +68,8 @@ module('Integration | commands | execute-atomic-operations', function (hooks) {
     mockAtomicResponse = {
       'atomic:results': [{ id: 'card-1' }, { id: 'card-2' }],
     };
-    let commandService = getService('command-service');
-    let command = new ExecuteAtomicOperationsCommand(
-      commandService.commandContext,
-    );
+    let toolService = getService('tool-service');
+    let command = new ExecuteAtomicOperationsTool(toolService.commandContext);
     let result = await command.execute({
       realmIdentifier: testRealmURL,
       operations: [{ op: 'add', path: 'card-1' }] as any,
@@ -83,10 +81,8 @@ module('Integration | commands | execute-atomic-operations', function (hooks) {
     mockAtomicResponse = {
       errors: [{ detail: 'Something went wrong' }],
     };
-    let commandService = getService('command-service');
-    let command = new ExecuteAtomicOperationsCommand(
-      commandService.commandContext,
-    );
+    let toolService = getService('tool-service');
+    let command = new ExecuteAtomicOperationsTool(toolService.commandContext);
     try {
       await command.execute({
         realmIdentifier: testRealmURL,
diff --git a/packages/host/tests/integration/commands/fetch-card-json-test.gts b/packages/host/tests/integration/commands/fetch-card-json-test.gts
index 2f63bbfe704..1c6e1bcc886 100644
--- a/packages/host/tests/integration/commands/fetch-card-json-test.gts
+++ b/packages/host/tests/integration/commands/fetch-card-json-test.gts
@@ -5,7 +5,7 @@ import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
-import FetchCardJsonCommand from '@cardstack/host/tools/fetch-card-json';
+import FetchCardJsonTool from '@cardstack/host/tools/fetch-card-json';
 
 import {
   setupIntegrationTestRealm,
@@ -79,8 +79,8 @@ module('Integration | commands | fetch-card-json', function (hooks) {
   });
 
   test('fetches card JSON for an existing card', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new FetchCardJsonCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new FetchCardJsonTool(toolService.commandContext);
     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/commands/full-reindex-realm-test.gts
index 4d8ed32c005..e55bf3e2305 100644
--- a/packages/host/tests/integration/commands/full-reindex-realm-test.gts
+++ b/packages/host/tests/integration/commands/full-reindex-realm-test.gts
@@ -7,7 +7,7 @@ import { module, test } from 'qunit';
 import { APP_BOXEL_REALM_EVENT_TYPE } from '@cardstack/runtime-common/matrix-constants';
 
 import RealmService from '@cardstack/host/services/realm';
-import FullReindexRealmCommand from '@cardstack/host/tools/full-reindex-realm';
+import FullReindexRealmTool from '@cardstack/host/tools/full-reindex-realm';
 
 import {
   setupIntegrationTestRealm,
@@ -80,10 +80,10 @@ module('Integration | commands | full-reindex-realm', function (hooks) {
   });
 
   test('calls realm endpoint with expected auth header', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let realmServer = getService('realm-server');
     let realmService = getService('realm') as RealmService;
-    let command = new FullReindexRealmCommand(commandService.commandContext);
+    let command = new FullReindexRealmTool(toolService.commandContext);
     let realmURL = new URL('test/', realmServer.url).href;
 
     assert.false(
@@ -155,10 +155,10 @@ module('Integration | commands | full-reindex-realm', function (hooks) {
   });
 
   test('throws when full reindex endpoint returns non-204', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let realmServer = getService('realm-server');
     let realmService = getService('realm') as RealmService;
-    let command = new FullReindexRealmCommand(commandService.commandContext);
+    let command = new FullReindexRealmTool(toolService.commandContext);
     let realmURL = new URL('test/', realmServer.url).href;
     responseStatus = 500;
     responseBody = 'boom';
@@ -177,8 +177,8 @@ module('Integration | commands | full-reindex-realm', function (hooks) {
   });
 
   test('description explains forced full reindex semantics', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new FullReindexRealmCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new FullReindexRealmTool(toolService.commandContext);
 
     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/commands/generate-example-cards-one-shot-test.gts
index 77a6d0bb7f1..34cb8c18daf 100644
--- a/packages/host/tests/integration/commands/generate-example-cards-one-shot-test.gts
+++ b/packages/host/tests/integration/commands/generate-example-cards-one-shot-test.gts
@@ -1,7 +1,7 @@
 import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
-import { GenerateExampleCardsOneShotCommand } from '@cardstack/host/tools/generate-example-cards';
+import { GenerateExampleCardsOneShotTool } from '@cardstack/host/tools/generate-example-cards';
 
 import {
   setupIntegrationTestRealm,
@@ -68,7 +68,7 @@ module(
     ]);
 
     let generateExampleCommand: InstanceType<
-      typeof GenerateExampleCardsOneShotCommand
+      typeof GenerateExampleCardsOneShotTool
     >;
 
     setupRealmCacheTeardown(hooks);
@@ -90,9 +90,9 @@ export class TestCard extends CardDef {
         }),
       );
 
-      const commandService = getService('command-service');
-      generateExampleCommand = new GenerateExampleCardsOneShotCommand(
-        commandService.commandContext,
+      const toolService = getService('tool-service');
+      generateExampleCommand = new GenerateExampleCardsOneShotTool(
+        toolService.commandContext,
       );
     });
 
diff --git a/packages/host/tests/integration/commands/get-available-realm-identifiers-test.gts b/packages/host/tests/integration/commands/get-available-realm-identifiers-test.gts
index 9f3fb7fb6b9..3eacfcb1e9a 100644
--- a/packages/host/tests/integration/commands/get-available-realm-identifiers-test.gts
+++ b/packages/host/tests/integration/commands/get-available-realm-identifiers-test.gts
@@ -6,7 +6,7 @@ import { module, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
 import type RealmServerService from '@cardstack/host/services/realm-server';
-import GetAvailableRealmIdentifiersCommand from '@cardstack/host/tools/get-available-realm-identifiers';
+import GetAvailableRealmIdentifiersTool from '@cardstack/host/tools/get-available-realm-identifiers';
 
 import {
   setupIntegrationTestRealm,
@@ -69,9 +69,9 @@ module(
     });
 
     test('returns the list of available realm identifiers', async function (assert) {
-      let commandService = getService('command-service');
-      let command = new GetAvailableRealmIdentifiersCommand(
-        commandService.commandContext,
+      let toolService = getService('tool-service');
+      let command = new GetAvailableRealmIdentifiersTool(
+        toolService.commandContext,
       );
       let result = await command.execute();
       assert.deepEqual(result.realmIdentifiers, [
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
index 907248ec3e6..9c405aadf62 100644
--- a/packages/host/tests/integration/commands/get-catalog-realm-identifiers-test.gts
+++ b/packages/host/tests/integration/commands/get-catalog-realm-identifiers-test.gts
@@ -6,7 +6,7 @@ import { module, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
 import type RealmServerService from '@cardstack/host/services/realm-server';
-import GetCatalogRealmIdentifiersCommand from '@cardstack/host/tools/get-catalog-realm-identifiers';
+import GetCatalogRealmIdentifiersTool from '@cardstack/host/tools/get-catalog-realm-identifiers';
 
 import {
   setupIntegrationTestRealm,
@@ -66,9 +66,9 @@ module(
     });
 
     test('returns the list of catalog realm identifiers', async function (assert) {
-      let commandService = getService('command-service');
-      let command = new GetCatalogRealmIdentifiersCommand(
-        commandService.commandContext,
+      let toolService = getService('tool-service');
+      let command = new GetCatalogRealmIdentifiersTool(
+        toolService.commandContext,
       );
       let result = await command.execute();
       assert.deepEqual(result.realmIdentifiers, [
diff --git a/packages/host/tests/integration/commands/get-default-writable-realm-test.gts b/packages/host/tests/integration/commands/get-default-writable-realm-test.gts
index e9ad6321208..2fbd1047b99 100644
--- a/packages/host/tests/integration/commands/get-default-writable-realm-test.gts
+++ b/packages/host/tests/integration/commands/get-default-writable-realm-test.gts
@@ -5,7 +5,7 @@ import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
-import GetDefaultWritableRealmCommand from '@cardstack/host/tools/get-default-writable-realm';
+import GetDefaultWritableRealmTool from '@cardstack/host/tools/get-default-writable-realm';
 
 import {
   setupIntegrationTestRealm,
@@ -56,10 +56,8 @@ module('Integration | commands | get-default-writable-realm', function (hooks) {
   });
 
   test('returns realm path when a default writable realm exists', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new GetDefaultWritableRealmCommand(
-      commandService.commandContext,
-    );
+    let toolService = getService('tool-service');
+    let command = new GetDefaultWritableRealmTool(toolService.commandContext);
     let result = await command.execute();
     assert.strictEqual(result.realmIdentifier, testRealmURL);
   });
@@ -72,10 +70,8 @@ module('Integration | commands | get-default-writable-realm', function (hooks) {
       },
       configurable: true,
     });
-    let commandService = getService('command-service');
-    let command = new GetDefaultWritableRealmCommand(
-      commandService.commandContext,
-    );
+    let toolService = getService('tool-service');
+    let command = new GetDefaultWritableRealmTool(toolService.commandContext);
     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/commands/get-published-realms-test.gts
index 048ec6cc1d2..5b650490986 100644
--- a/packages/host/tests/integration/commands/get-published-realms-test.gts
+++ b/packages/host/tests/integration/commands/get-published-realms-test.gts
@@ -4,7 +4,7 @@ import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
 import type RealmService from '@cardstack/host/services/realm';
-import GetPublishedRealmsCommand from '@cardstack/host/tools/get-published-realms';
+import GetPublishedRealmsTool from '@cardstack/host/tools/get-published-realms';
 
 import {
   setupIntegrationTestRealm,
@@ -63,8 +63,8 @@ module('Integration | commands | get-published-realms', function (hooks) {
   });
 
   function makeCommand() {
-    let commandService = getService('command-service');
-    return new GetPublishedRealmsCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    return new GetPublishedRealmsTool(toolService.commandContext);
   }
 
   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/commands/get-realm-of-resource-identifier-test.gts
index 1c95dd9c94f..75456ce8e50 100644
--- a/packages/host/tests/integration/commands/get-realm-of-resource-identifier-test.gts
+++ b/packages/host/tests/integration/commands/get-realm-of-resource-identifier-test.gts
@@ -7,7 +7,7 @@ import { module, test } from 'qunit';
 import { ri } from '@cardstack/runtime-common';
 
 import RealmService from '@cardstack/host/services/realm';
-import GetRealmOfResourceIdentifierCommand from '@cardstack/host/tools/get-realm-of-resource-identifier';
+import GetRealmOfResourceIdentifierTool from '@cardstack/host/tools/get-realm-of-resource-identifier';
 
 import {
   setupIntegrationTestRealm,
@@ -71,9 +71,9 @@ module(
 
     test('returns the realm identifier containing a given resource', async function (assert) {
       realmOfURLMap = new Map([[testRealmURL, new URL(testRealmURL)]]);
-      let commandService = getService('command-service');
-      let command = new GetRealmOfResourceIdentifierCommand(
-        commandService.commandContext,
+      let toolService = getService('tool-service');
+      let command = new GetRealmOfResourceIdentifierTool(
+        toolService.commandContext,
       );
       let result = await command.execute({
         resourceIdentifier: `${testRealmURL}some-card`,
@@ -83,9 +83,9 @@ module(
 
     test('returns empty string when resource is not in any realm', async function (assert) {
       realmOfURLMap = new Map();
-      let commandService = getService('command-service');
-      let command = new GetRealmOfResourceIdentifierCommand(
-        commandService.commandContext,
+      let toolService = getService('tool-service');
+      let command = new GetRealmOfResourceIdentifierTool(
+        toolService.commandContext,
       );
       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/commands/get-user-system-card-test.gts
index 3074542104f..c25bf02ca5f 100644
--- a/packages/host/tests/integration/commands/get-user-system-card-test.gts
+++ b/packages/host/tests/integration/commands/get-user-system-card-test.gts
@@ -5,7 +5,7 @@ import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
-import GetUserSystemCardCommand from '@cardstack/host/tools/get-user-system-card';
+import GetUserSystemCardTool from '@cardstack/host/tools/get-user-system-card';
 
 import {
   setupIntegrationTestRealm,
@@ -54,8 +54,8 @@ module('Integration | commands | get-user-system-card', function (hooks) {
   });
 
   test('returns undefined cardId when no system card is set', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new GetUserSystemCardCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new GetUserSystemCardTool(toolService.commandContext);
 
     let result = await command.execute();
     assert.strictEqual(
@@ -76,8 +76,8 @@ module('Integration | commands | get-user-system-card', function (hooks) {
     let matrixService = getService('matrix-service') as any;
     matrixService._systemCard = new SystemCard({ id: systemCardId });
 
-    let commandService = getService('command-service');
-    let command = new GetUserSystemCardCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new GetUserSystemCardTool(toolService.commandContext);
 
     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/commands/instantiate-card-test.gts
index 90fc2d59176..f37a0f70f34 100644
--- a/packages/host/tests/integration/commands/instantiate-card-test.gts
+++ b/packages/host/tests/integration/commands/instantiate-card-test.gts
@@ -1,7 +1,7 @@
 import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
-import InstantiateCardCommand from '@cardstack/host/tools/instantiate-card';
+import InstantiateCardTool from '@cardstack/host/tools/instantiate-card';
 
 import {
   setupIntegrationTestRealm,
@@ -57,8 +57,8 @@ module('Integration | commands | instantiate-card', function (hooks) {
   });
 
   test('valid card with instance data passes instantiation', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new InstantiateCardCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new InstantiateCardTool(toolService.commandContext);
 
     let InputType = await command.getInputType();
     let instanceDoc = {
@@ -87,8 +87,8 @@ module('Integration | commands | instantiate-card', function (hooks) {
   });
 
   test('valid card with no instance data passes instantiation', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new InstantiateCardCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new InstantiateCardTool(toolService.commandContext);
 
     let InputType = await command.getInputType();
     let input = new InputType({
@@ -104,8 +104,8 @@ module('Integration | commands | instantiate-card', function (hooks) {
   });
 
   test('containsMany field with non-array value fails instantiation', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new InstantiateCardCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new InstantiateCardTool(toolService.commandContext);
 
     let InputType = await command.getInputType();
     // Provide a string instead of an array for the containsMany field.
diff --git a/packages/host/tests/integration/commands/invalidate-realm-identifiers-test.gts b/packages/host/tests/integration/commands/invalidate-realm-identifiers-test.gts
index 80fda633dff..07e68e2171b 100644
--- a/packages/host/tests/integration/commands/invalidate-realm-identifiers-test.gts
+++ b/packages/host/tests/integration/commands/invalidate-realm-identifiers-test.gts
@@ -5,7 +5,7 @@ import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
-import InvalidateRealmIdentifiersCommand from '@cardstack/host/tools/invalidate-realm-identifiers';
+import InvalidateRealmIdentifiersTool from '@cardstack/host/tools/invalidate-realm-identifiers';
 
 import {
   setupIntegrationTestRealm,
@@ -90,10 +90,10 @@ module(
     });
 
     test('calls realm endpoint with expected auth header and payload', async function (assert) {
-      let commandService = getService('command-service');
+      let toolService = getService('tool-service');
       let realmServer = getService('realm-server');
-      let command = new InvalidateRealmIdentifiersCommand(
-        commandService.commandContext,
+      let command = new InvalidateRealmIdentifiersTool(
+        toolService.commandContext,
       );
       let realmURL = new URL('test/', realmServer.url).href;
 
@@ -157,10 +157,10 @@ module(
     });
 
     test('throws when realm invalidation endpoint returns non-204', async function (assert) {
-      let commandService = getService('command-service');
+      let toolService = getService('tool-service');
       let realmServer = getService('realm-server');
-      let command = new InvalidateRealmIdentifiersCommand(
-        commandService.commandContext,
+      let command = new InvalidateRealmIdentifiersTool(
+        toolService.commandContext,
       );
       let realmURL = new URL('test/', realmServer.url).href;
       responseStatus = 500;
diff --git a/packages/host/tests/integration/commands/invite-user-to-room-test.gts b/packages/host/tests/integration/commands/invite-user-to-room-test.gts
index 9784e876174..6dd25e4cc7f 100644
--- a/packages/host/tests/integration/commands/invite-user-to-room-test.gts
+++ b/packages/host/tests/integration/commands/invite-user-to-room-test.gts
@@ -6,7 +6,7 @@ import { module, test } from 'qunit';
 
 import type MatrixService from '@cardstack/host/services/matrix-service';
 import RealmService from '@cardstack/host/services/realm';
-import InviteUserToRoomCommand from '@cardstack/host/tools/invite-user-to-room';
+import InviteUserToRoomTool from '@cardstack/host/tools/invite-user-to-room';
 
 import {
   setupIntegrationTestRealm,
@@ -60,10 +60,10 @@ module('Integration | commands | invite-user-to-room', function (hooks) {
       sender: '@testuser:localhost',
       name: 'room-test',
     });
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let matrixService = getService('matrix-service') as MatrixService;
 
-    let command = new InviteUserToRoomCommand(commandService.commandContext);
+    let command = new InviteUserToRoomTool(toolService.commandContext);
     await command.execute({
       roomId,
       userId: 'submissionbot',
@@ -87,9 +87,9 @@ module('Integration | commands | invite-user-to-room', function (hooks) {
       sender: '@testuser:localhost',
       name: 'room-test',
     });
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
 
-    let command = new InviteUserToRoomCommand(commandService.commandContext);
+    let command = new InviteUserToRoomTool(toolService.commandContext);
     await command.execute({
       roomId,
       userId: 'submissionbot',
diff --git a/packages/host/tests/integration/commands/migrate-skill-test.gts b/packages/host/tests/integration/commands/migrate-skill-test.gts
index 13001caf398..338509efc2d 100644
--- a/packages/host/tests/integration/commands/migrate-skill-test.gts
+++ b/packages/host/tests/integration/commands/migrate-skill-test.gts
@@ -10,7 +10,7 @@ import { baseRealm } from '@cardstack/runtime-common';
 import type { Loader } from '@cardstack/runtime-common/loader';
 
 import RealmService from '@cardstack/host/services/realm';
-import MigrateSkillCommand from '@cardstack/host/tools/migrate-skill';
+import MigrateSkillTool from '@cardstack/host/tools/migrate-skill';
 
 import {
   setupCardLogs,
@@ -22,7 +22,7 @@ import {
   setupRealmCacheTeardown,
   withCachedRealmSetup,
 } from '../../helpers';
-import { setupBaseRealm, CommandField, Skill } from '../../helpers/base-realm';
+import { setupBaseRealm, ToolField, Skill } from '../../helpers/base-realm';
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
@@ -114,12 +114,12 @@ export class DoThingQuietly extends Command {
             cardDescription: 'Manage data in a realm',
             instructions: '# Data\n\nDo data things.',
             commands: [
-              new CommandField({
+              new ToolField({
                 codeRef: { module: COMMAND_MODULE, name: 'DoThing' },
                 requiresApproval: true,
               }),
               // requiresApproval: false must survive migration — see assertion.
-              new CommandField({
+              new ToolField({
                 codeRef: { module: COMMAND_MODULE, name: 'DoThingQuietly' },
                 requiresApproval: false,
               }),
@@ -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('command-service').commandContext;
+    let commandContext = getService('tool-service').commandContext;
     let cardService = getService('card-service');
-    let command = new MigrateSkillCommand(commandContext);
+    let command = new MigrateSkillTool(commandContext);
 
     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('command-service').commandContext;
+    let commandContext = getService('tool-service').commandContext;
     let cardService = getService('card-service');
-    let command = new MigrateSkillCommand(commandContext);
+    let command = new MigrateSkillTool(commandContext);
 
     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('command-service').commandContext;
+    let commandContext = getService('tool-service').commandContext;
     let cardService = getService('card-service');
-    let command = new MigrateSkillCommand(commandContext);
+    let command = new MigrateSkillTool(commandContext);
 
     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('command-service').commandContext;
+    let commandContext = getService('tool-service').commandContext;
     let cardService = getService('card-service');
-    let command = new MigrateSkillCommand(commandContext);
+    let command = new MigrateSkillTool(commandContext);
 
     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/commands/open-create-listing-modal-test.gts
index ea6a582399c..5fa63248c00 100644
--- a/packages/host/tests/integration/commands/open-create-listing-modal-test.gts
+++ b/packages/host/tests/integration/commands/open-create-listing-modal-test.gts
@@ -3,7 +3,7 @@ import { module, test } from 'qunit';
 
 import { rri } from '@cardstack/runtime-common';
 
-import OpenCreateListingModalCommand from '@cardstack/host/tools/open-create-listing-modal';
+import OpenCreateListingModalTool from '@cardstack/host/tools/open-create-listing-modal';
 
 import {
   setupIntegrationTestRealm,
@@ -65,12 +65,10 @@ module('Integration | commands | open-create-listing-modal', function (hooks) {
   });
 
   test('stores modal payload in operator mode state', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let operatorModeStateService = getService('operator-mode-state-service');
 
-    let command = new OpenCreateListingModalCommand(
-      commandService.commandContext,
-    );
+    let command = new OpenCreateListingModalTool(toolService.commandContext);
 
     await command.execute({
       codeRef: {
@@ -93,12 +91,10 @@ module('Integration | commands | open-create-listing-modal', function (hooks) {
   });
 
   test('stores modal payload without openCardIds', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let operatorModeStateService = getService('operator-mode-state-service');
 
-    let command = new OpenCreateListingModalCommand(
-      commandService.commandContext,
-    );
+    let command = new OpenCreateListingModalTool(toolService.commandContext);
 
     await command.execute({
       codeRef: {
@@ -127,12 +123,10 @@ module('Integration | commands | open-create-listing-modal', function (hooks) {
   });
 
   test('stores modal payload with examples hidden for field defs', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let operatorModeStateService = getService('operator-mode-state-service');
 
-    let command = new OpenCreateListingModalCommand(
-      commandService.commandContext,
-    );
+    let command = new OpenCreateListingModalTool(toolService.commandContext);
 
     await command.execute({
       codeRef: {
@@ -150,12 +144,10 @@ module('Integration | commands | open-create-listing-modal', function (hooks) {
   });
 
   test('dismissCreateListingModal clears the payload', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let operatorModeStateService = getService('operator-mode-state-service');
 
-    let command = new OpenCreateListingModalCommand(
-      commandService.commandContext,
-    );
+    let command = new OpenCreateListingModalTool(toolService.commandContext);
 
     await command.execute({
       codeRef: {
diff --git a/packages/host/tests/integration/commands/open-workspace-test.gts b/packages/host/tests/integration/commands/open-workspace-test.gts
index 2a7df8effec..03e1c98fd20 100644
--- a/packages/host/tests/integration/commands/open-workspace-test.gts
+++ b/packages/host/tests/integration/commands/open-workspace-test.gts
@@ -1,7 +1,7 @@
 import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
-import OpenWorkspaceCommand from '@cardstack/host/tools/open-workspace';
+import OpenWorkspaceTool from '@cardstack/host/tools/open-workspace';
 
 import {
   setupIntegrationTestRealm,
@@ -37,15 +37,15 @@ module('Integration | commands | open-workspace', function (hooks) {
   });
 
   test('opens specified workspace in interact submode', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let operatorModeStateService = getService('operator-mode-state-service');
     operatorModeStateService.restore({
       stacks: [],
       submode: 'interact',
       workspaceChooserOpened: true,
     });
-    let openWorkspaceCommand = new OpenWorkspaceCommand(
-      commandService.commandContext,
+    let openWorkspaceCommand = new OpenWorkspaceTool(
+      toolService.commandContext,
     );
     assert.strictEqual(operatorModeStateService.state?.submode, 'interact');
     await openWorkspaceCommand.execute({
diff --git a/packages/host/tests/integration/commands/patch-code-test.gts b/packages/host/tests/integration/commands/patch-code-test.gts
index 5a8abdbe719..30478f94b75 100644
--- a/packages/host/tests/integration/commands/patch-code-test.gts
+++ b/packages/host/tests/integration/commands/patch-code-test.gts
@@ -14,7 +14,7 @@ import {
 
 import { Submodes } from '@cardstack/host/components/submode-switcher';
 import { isReady, type Ready } from '@cardstack/host/resources/file';
-import PatchCodeCommand from '@cardstack/host/tools/patch-code';
+import PatchCodeTool from '@cardstack/host/tools/patch-code';
 
 import {
   testRealmURL,
@@ -87,8 +87,8 @@ export class Task extends CardDef {
   });
 
   test('lint-fixes contents before returning them', async function (assert) {
-    let commandService = getService('command-service');
-    let patchCodeCommand = new PatchCodeCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let patchCodeCommand = new PatchCodeTool(toolService.commandContext);
 
     // Set up a custom lintStub that verifies the filename header
     adapter.lintStub = async (
@@ -155,8 +155,8 @@ export class Task extends CardDef {
   test('uses the open file resource when the target file is open', async function (assert) {
     assert.expect(7);
 
-    let commandService = getService('command-service');
-    let patchCodeCommand = new PatchCodeCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let patchCodeCommand = new PatchCodeTool(toolService.commandContext);
     let operatorModeStateService = getService('operator-mode-state-service');
     let cardService = getService('card-service');
 
@@ -227,8 +227,8 @@ ${REPLACE_MARKER}`;
   });
 
   test('allows empty search and replace blocks via patch-code for new files', async function (assert) {
-    let commandService = getService('command-service');
-    let patchCodeCommand = new PatchCodeCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let patchCodeCommand = new PatchCodeTool(toolService.commandContext);
     let emptyFileUrl = `${testRealmURL}empty.gts`;
 
     adapter.lintStub = async (request: Request): Promise<LintResult> => {
@@ -254,8 +254,8 @@ ${REPLACE_MARKER}`;
   });
 
   test('skips linting for non-gts/ts files', async function (assert) {
-    let commandService = getService('command-service');
-    let patchCodeCommand = new PatchCodeCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let patchCodeCommand = new PatchCodeTool(toolService.commandContext);
 
     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/commands/patch-fields-test.gts
index 6f354f78c33..503908ec029 100644
--- a/packages/host/tests/integration/commands/patch-fields-test.gts
+++ b/packages/host/tests/integration/commands/patch-fields-test.gts
@@ -3,9 +3,9 @@ import { waitUntil } from '@ember/test-helpers';
 import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
-import type CommandService from '@cardstack/host/services/command-service';
 import type StoreService from '@cardstack/host/services/store';
-import PatchFieldsCommand from '@cardstack/host/tools/patch-fields';
+import type ToolService from '@cardstack/host/services/tool-service';
+import PatchFieldsTool from '@cardstack/host/tools/patch-fields';
 
 import {
   testRealmURL,
@@ -39,13 +39,13 @@ module('Integration | Command | patch-fields', function (hooks) {
   setupOnSave(hooks);
   let mockMatrixUtils = setupMockMatrix(hooks, { autostart: true });
 
-  let commandService: CommandService;
+  let toolService: ToolService;
   let AuthorDef: typeof CardDef;
   let BookDef: typeof CardDef;
   let store: StoreService;
 
   hooks.beforeEach(async function () {
-    commandService = getService('command-service');
+    toolService = getService('tool-service');
 
     class Coordinates extends FieldDef {
       @field latitude = contains(NumberField);
@@ -161,12 +161,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     test<TestContextWithSave>('patches do not await persistence', async function (assert) {
       assert.expect(6);
 
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
       let cardId = `${testRealmURL}Author/john`;
       let store = getService('store');
 
@@ -245,8 +242,8 @@ 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 PatchFieldsCommand(
-          commandService.commandContext,
+        let patchFieldsCommand = new PatchFieldsTool(
+          toolService.commandContext,
           {
             cardType: AuthorDef,
           },
@@ -281,8 +278,8 @@ module('Integration | Command | patch-fields', function (hooks) {
         }
       });
       test('should update a linksToMany relationship field', async function (assert) {
-        let patchFieldsCommand = new PatchFieldsCommand(
-          commandService.commandContext,
+        let patchFieldsCommand = new PatchFieldsTool(
+          toolService.commandContext,
         );
         let bookId1 = `${testRealmURL}Book/book-1`;
         let bookId2 = `${testRealmURL}Book/book-2`;
@@ -331,8 +328,8 @@ module('Integration | Command | patch-fields', function (hooks) {
         }
       });
       test('should update a nested relationship field (e.g., address.country)', async function (assert) {
-        let patchFieldsCommand = new PatchFieldsCommand(
-          commandService.commandContext,
+        let patchFieldsCommand = new PatchFieldsTool(
+          toolService.commandContext,
         );
         let result = await patchFieldsCommand.execute({
           cardId: `${testRealmURL}Author/john`,
@@ -373,12 +370,9 @@ module('Integration | Command | patch-fields', function (hooks) {
       });
     });
     test('should update single primitive field', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -398,12 +392,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should update multiple primitive fields', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -424,12 +415,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should return success with updated field list', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -451,12 +439,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should preserve unchanged fields', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       // First verify the original state
       let originalCard = await store.get(`${testRealmURL}Author/john`);
@@ -516,12 +501,9 @@ 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 PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -558,12 +540,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should update multiple nested fields', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -613,12 +592,9 @@ 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 PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       // First, let's create a scenario where we set the address to null
       await patchFieldsCommand.execute({
@@ -665,12 +641,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should handle deep nesting (3+ levels)', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       // Test deep nesting on the existing john card
       let result = await patchFieldsCommand.execute({
@@ -722,12 +695,9 @@ 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 PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -762,12 +732,9 @@ 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 PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -805,12 +772,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should replace entire array', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -841,12 +805,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should add new item to array using push syntax', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -877,12 +838,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should add new item to array at specific index', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -913,12 +871,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should handle mixed array and object updates', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -969,12 +924,9 @@ module('Integration | Command | patch-fields', function (hooks) {
 
   module('Validation Tests', function () {
     test('should reject non-existent field paths', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -993,12 +945,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should reject invalid field types', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -1020,12 +969,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should validate array bounds for existing arrays', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       // Try to access an array index that's way beyond reasonable bounds
       let result = await patchFieldsCommand.execute({
@@ -1055,12 +1001,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should validate relationship field constraints', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       // Try to update fields that would be relationship fields (but don't exist in our schema)
       let result = await patchFieldsCommand.execute({
@@ -1091,12 +1034,9 @@ 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 PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -1148,12 +1088,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should report successful and failed fields separately', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -1203,12 +1140,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should return success=true for partial success', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -1235,12 +1169,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should return success=false when no fields update', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -1275,12 +1206,9 @@ 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 PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/nonexistent`,
@@ -1303,12 +1231,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should provide detailed error messages for invalid fields', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -1338,12 +1263,9 @@ 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 PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       // Try to access a very high index that should trigger bounds checking
       let result = await patchFieldsCommand.execute({
@@ -1371,12 +1293,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should allow adding beyond current array bounds (append behavior)', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       // Add at an index just beyond current bounds (should work with null padding)
       let result = await patchFieldsCommand.execute({
@@ -1413,12 +1332,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should handle null reference in field paths', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       // Test updating a path where intermediate objects might be null/undefined
       // This should create nested objects as needed
@@ -1464,12 +1380,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should handle malformed field paths', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let result = await patchFieldsCommand.execute({
         cardId: `${testRealmURL}Author/john`,
@@ -1515,12 +1428,9 @@ 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 PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       // Test parsing of simple field paths by successfully updating them
       let result = await patchFieldsCommand.execute({
@@ -1546,12 +1456,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should parse dot notation paths', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       // Test parsing of dot notation paths
       let result = await patchFieldsCommand.execute({
@@ -1583,12 +1490,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should parse array index paths', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       // Test parsing of array index paths
       let result = await patchFieldsCommand.execute({
@@ -1614,12 +1518,9 @@ 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 PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       // Test parsing of array append operations
       let result = await patchFieldsCommand.execute({
@@ -1659,12 +1560,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should parse complex mixed paths', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       // Test parsing of complex mixed paths (combining dots and arrays)
       let result = await patchFieldsCommand.execute({
@@ -1696,12 +1594,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should handle edge cases in parsing', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       // Test edge cases that should work
       let result = await patchFieldsCommand.execute({
@@ -1729,12 +1624,9 @@ 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 PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let schema = await patchFieldsCommand.getInputJsonSchema();
 
@@ -1774,12 +1666,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should include field descriptions in schema', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let schema = await patchFieldsCommand.getInputJsonSchema();
 
@@ -1804,12 +1693,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should support nested field schemas', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let schema = await patchFieldsCommand.getInputJsonSchema();
       let fieldUpdatesSchema = schema.attributes.properties.fieldUpdates;
@@ -1828,12 +1714,9 @@ module('Integration | Command | patch-fields', function (hooks) {
     });
 
     test('should handle array field schemas', async function (assert) {
-      let patchFieldsCommand = new PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       let schema = await patchFieldsCommand.getInputJsonSchema();
       let fieldUpdatesSchema = schema.attributes.properties.fieldUpdates;
@@ -1855,12 +1738,9 @@ 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 PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: BookDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: BookDef,
+      });
 
       // This should now work since we've implemented dynamic field validation
       let result = await patchFieldsCommand.execute({
@@ -1895,12 +1775,9 @@ 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 PatchFieldsCommand(
-        commandService.commandContext,
-        {
-          cardType: AuthorDef,
-        },
-      );
+      let patchFieldsCommand = new PatchFieldsTool(toolService.commandContext, {
+        cardType: AuthorDef,
+      });
 
       // Try to update fields that should work with dynamic validation
       let result = await patchFieldsCommand.execute({
diff --git a/packages/host/tests/integration/commands/patch-instance-test.gts b/packages/host/tests/integration/commands/patch-instance-test.gts
index 2875d874ff7..dde7d3e925f 100644
--- a/packages/host/tests/integration/commands/patch-instance-test.gts
+++ b/packages/host/tests/integration/commands/patch-instance-test.gts
@@ -10,8 +10,8 @@ import {
 } from '@cardstack/runtime-common';
 import type { RealmIndexQueryEngine } from '@cardstack/runtime-common/realm-index-query-engine';
 
-import type CommandService from '@cardstack/host/services/command-service';
-import PatchCardInstanceCommand from '@cardstack/host/tools/patch-card-instance';
+import type ToolService from '@cardstack/host/services/tool-service';
+import PatchCardInstanceTool from '@cardstack/host/tools/patch-card-instance';
 
 import type { CardDef as CardDefType } from 'https://cardstack.com/base/card-api';
 
@@ -47,14 +47,14 @@ module('Integration | commands | patch-instance', function (hooks) {
   setupOnSave(hooks);
   const saveWaitTimeoutMs = 5000;
   let mockMatrixUtils = setupMockMatrix(hooks, { autostart: true });
-  let commandService: CommandService;
+  let toolService: ToolService;
   let PersonDef: typeof CardDefType;
   let indexQuery: RealmIndexQueryEngine;
 
   setupRealmCacheTeardown(hooks);
 
   hooks.beforeEach(async function () {
-    commandService = getService('command-service');
+    toolService = getService('tool-service');
     class SpecialStringA extends StringField {}
     class SpecialStringB extends StringField {}
     class Person extends CardDef {
@@ -89,8 +89,8 @@ module('Integration | commands | patch-instance', function (hooks) {
   });
 
   test<TestContextWithSave>('can patch a contains field', async function (assert) {
-    let patchInstanceCommand = new PatchCardInstanceCommand(
-      commandService.commandContext,
+    let patchInstanceCommand = new PatchCardInstanceTool(
+      toolService.commandContext,
       {
         cardType: PersonDef,
       },
@@ -147,8 +147,8 @@ module('Integration | commands | patch-instance', function (hooks) {
   });
 
   test<TestContextWithSave>('can patch a containsMany field', async function (assert) {
-    let patchInstanceCommand = new PatchCardInstanceCommand(
-      commandService.commandContext,
+    let patchInstanceCommand = new PatchCardInstanceTool(
+      toolService.commandContext,
       {
         cardType: PersonDef,
       },
@@ -205,8 +205,8 @@ 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 PatchCardInstanceCommand(
-      commandService.commandContext,
+    let patchInstanceCommand = new PatchCardInstanceTool(
+      toolService.commandContext,
       {
         cardType: PersonDef,
       },
@@ -253,8 +253,8 @@ module('Integration | commands | patch-instance', function (hooks) {
   });
 
   test<TestContextWithSave>('patching a polymorphic containsMany field clears stale field metadata', async function (assert) {
-    let patchInstanceCommand = new PatchCardInstanceCommand(
-      commandService.commandContext,
+    let patchInstanceCommand = new PatchCardInstanceTool(
+      toolService.commandContext,
       {
         cardType: PersonDef,
       },
@@ -317,8 +317,8 @@ module('Integration | commands | patch-instance', function (hooks) {
   });
 
   test<TestContextWithSave>('can patch a linksTo field', async function (assert) {
-    let patchInstanceCommand = new PatchCardInstanceCommand(
-      commandService.commandContext,
+    let patchInstanceCommand = new PatchCardInstanceTool(
+      toolService.commandContext,
       {
         cardType: PersonDef,
       },
@@ -381,8 +381,8 @@ module('Integration | commands | patch-instance', function (hooks) {
   });
 
   test<TestContextWithSave>('can patch a linksToMany field', async function (assert) {
-    let patchInstanceCommand = new PatchCardInstanceCommand(
-      commandService.commandContext,
+    let patchInstanceCommand = new PatchCardInstanceTool(
+      toolService.commandContext,
       {
         cardType: PersonDef,
       },
@@ -447,8 +447,8 @@ module('Integration | commands | patch-instance', function (hooks) {
 
     let storeService = getService('store');
     let cardId = `${testRealmURL}Person/hassan`;
-    let patchInstanceCommand = new PatchCardInstanceCommand(
-      commandService.commandContext,
+    let patchInstanceCommand = new PatchCardInstanceTool(
+      toolService.commandContext,
       {
         cardType: PersonDef,
       },
@@ -535,8 +535,8 @@ module('Integration | commands | patch-instance', function (hooks) {
     let andrea = new PersonDef({ name: 'Andrea' });
     await store.add(andrea, { realm: testRealmURL, doNotPersist: true });
 
-    let patchInstanceCommand = new PatchCardInstanceCommand(
-      commandService.commandContext,
+    let patchInstanceCommand = new PatchCardInstanceTool(
+      toolService.commandContext,
       {
         cardType: PersonDef,
       },
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
index 285a465aef7..5ee1fc76d14 100644
--- a/packages/host/tests/integration/commands/persist-module-inspector-view-test.gts
+++ b/packages/host/tests/integration/commands/persist-module-inspector-view-test.gts
@@ -6,7 +6,7 @@ import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
-import PersistModuleInspectorViewCommand from '@cardstack/host/tools/persist-module-inspector-view';
+import PersistModuleInspectorViewTool from '@cardstack/host/tools/persist-module-inspector-view';
 
 import {
   setupIntegrationTestRealm,
@@ -71,9 +71,9 @@ module(
     });
 
     test('persists the module inspector view selection', async function (assert) {
-      let commandService = getService('command-service');
-      let command = new PersistModuleInspectorViewCommand(
-        commandService.commandContext,
+      let toolService = getService('tool-service');
+      let command = new PersistModuleInspectorViewTool(
+        toolService.commandContext,
       );
       let result = await command.execute({
         codePath: `${testRealmURL}my-module.gts`,
diff --git a/packages/host/tests/integration/commands/preview-format-test.gts b/packages/host/tests/integration/commands/preview-format-test.gts
index 7c83dced5d9..9bf8914ee6e 100644
--- a/packages/host/tests/integration/commands/preview-format-test.gts
+++ b/packages/host/tests/integration/commands/preview-format-test.gts
@@ -10,7 +10,7 @@ import { baseRealm } from '@cardstack/runtime-common';
 import type { Loader } from '@cardstack/runtime-common/loader';
 
 import RealmService from '@cardstack/host/services/realm';
-import PreviewFormatCommand from '@cardstack/host/tools/preview-format';
+import PreviewFormatTool from '@cardstack/host/tools/preview-format';
 
 import {
   setupCardLogs,
@@ -60,7 +60,7 @@ module('Integration | Command | preview-format', function (hooks) {
     autostart: true,
   });
 
-  let command: PreviewFormatCommand;
+  let command: PreviewFormatTool;
 
   setupRealmCacheTeardown(hooks);
 
@@ -110,9 +110,7 @@ module('Integration | Command | preview-format', function (hooks) {
       }),
     );
 
-    command = new PreviewFormatCommand(
-      getService('command-service').commandContext,
-    );
+    command = new PreviewFormatTool(getService('tool-service').commandContext);
   });
 
   test('switches to code submode and sets up preview', async function (assert) {
@@ -164,7 +162,7 @@ module('Integration | Command | preview-format', function (hooks) {
       'Command has correct description',
     );
     assert.strictEqual(
-      PreviewFormatCommand.actionVerb,
+      PreviewFormatTool.actionVerb,
       'Preview Format',
       'Command has correct action verb',
     );
diff --git a/packages/host/tests/integration/commands/publish-realm-test.gts b/packages/host/tests/integration/commands/publish-realm-test.gts
index 6d3e6411bc4..0963fc96929 100644
--- a/packages/host/tests/integration/commands/publish-realm-test.gts
+++ b/packages/host/tests/integration/commands/publish-realm-test.gts
@@ -7,9 +7,9 @@ import { module, test } from 'qunit';
 import { baseRealm, type Loader } from '@cardstack/runtime-common';
 
 import RealmService from '@cardstack/host/services/realm';
-import PublishRealmCommand from '@cardstack/host/tools/publish-realm';
+import PublishRealmTool from '@cardstack/host/tools/publish-realm';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
 import {
   setupIntegrationTestRealm,
@@ -42,7 +42,7 @@ let publishShouldFail: boolean;
 let publishabilityRequested: boolean;
 let publishedURLs: string[];
 let loader: Loader;
-let PublishTarget: typeof BaseCommandModule.PublishTarget;
+let PublishTarget: typeof BaseToolModule.PublishTarget;
 
 module('Integration | commands | publish-realm', function (hooks) {
   setupRenderingTest(hooks);
@@ -117,7 +117,7 @@ module('Integration | commands | publish-realm', function (hooks) {
     getOwner(this)!.register('service:realm', StubRealmService);
     loader = getService('loader-service').loader;
     PublishTarget = (
-      await loader.import<typeof BaseCommandModule>(`${baseRealm.url}command`)
+      await loader.import<typeof BaseToolModule>(`${baseRealm.url}command`)
     ).PublishTarget;
     publishabilityResponse = { publishable: true, violations: [] };
     publishShouldFail = false;
@@ -134,8 +134,8 @@ module('Integration | commands | publish-realm', function (hooks) {
   });
 
   function makeCommand() {
-    let commandService = getService('command-service');
-    return new PublishRealmCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    return new PublishRealmTool(toolService.commandContext);
   }
 
   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/commands/read-card-for-ai-assistant-test.gts
index 334e64e6159..aafa9d3034f 100644
--- a/packages/host/tests/integration/commands/read-card-for-ai-assistant-test.gts
+++ b/packages/host/tests/integration/commands/read-card-for-ai-assistant-test.gts
@@ -107,11 +107,9 @@ module('Integration | commands | read-card-for-ai-assistant', function (hooks) {
   });
 
   test('read card', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
 
-    let command = new ReadCardForAiAssistantCommand(
-      commandService.commandContext,
-    );
+    let command = new ReadCardForAiAssistantCommand(toolService.commandContext);
     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/commands/read-file-for-ai-assistant-test.gts
index d8b48f958b4..098504b6603 100644
--- a/packages/host/tests/integration/commands/read-file-for-ai-assistant-test.gts
+++ b/packages/host/tests/integration/commands/read-file-for-ai-assistant-test.gts
@@ -55,11 +55,9 @@ module('Integration | commands | read-file-for-ai-assistant', function (hooks) {
   });
 
   test('read file', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
 
-    let command = new ReadFileForAiAssistantCommand(
-      commandService.commandContext,
-    );
+    let command = new ReadFileForAiAssistantCommand(toolService.commandContext);
     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/commands/read-source-test.gts
index ef89bd2003e..9d2044a97db 100644
--- a/packages/host/tests/integration/commands/read-source-test.gts
+++ b/packages/host/tests/integration/commands/read-source-test.gts
@@ -5,7 +5,7 @@ import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
-import ReadSourceCommand from '@cardstack/host/tools/read-source';
+import ReadSourceTool from '@cardstack/host/tools/read-source';
 
 import {
   setupIntegrationTestRealm,
@@ -37,7 +37,7 @@ module('Integration | commands | read-source', function (hooks) {
     getOwner(this)!.register('service:realm', StubRealmService);
   });
 
-  let readSourceCommand: ReadSourceCommand;
+  let readSourceCommand: ReadSourceTool;
   setupRealmCacheTeardown(hooks);
 
   hooks.beforeEach(async function () {
@@ -49,8 +49,8 @@ module('Integration | commands | read-source', function (hooks) {
         },
       }),
     );
-    let commandService = getService('command-service');
-    readSourceCommand = new ReadSourceCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    readSourceCommand = new ReadSourceTool(toolService.commandContext);
   });
 
   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/commands/read-text-file-test.gts
index 441fd2a3dde..a07b1f40c57 100644
--- a/packages/host/tests/integration/commands/read-text-file-test.gts
+++ b/packages/host/tests/integration/commands/read-text-file-test.gts
@@ -5,7 +5,7 @@ import { getService } from '@universal-ember/test-support';
 import { module, skip, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
-import ReadTextFileCommand from '@cardstack/host/tools/read-text-file';
+import ReadTextFileTool from '@cardstack/host/tools/read-text-file';
 
 import {
   setupIntegrationTestRealm,
@@ -37,7 +37,7 @@ module('Integration | commands | read-text-file', function (hooks) {
     getOwner(this)!.register('service:realm', StubRealmService);
   });
 
-  let readTextFileCommand: ReadTextFileCommand;
+  let readTextFileCommand: ReadTextFileTool;
   setupRealmCacheTeardown(hooks);
 
   hooks.beforeEach(async function () {
@@ -53,10 +53,8 @@ module('Integration | commands | read-text-file', function (hooks) {
         },
       }),
     );
-    let commandService = getService('command-service');
-    readTextFileCommand = new ReadTextFileCommand(
-      commandService.commandContext,
-    );
+    let toolService = getService('tool-service');
+    readTextFileCommand = new ReadTextFileTool(toolService.commandContext);
   });
 
   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/commands/reindex-realm-test.gts
index c24c515899b..202bf210b89 100644
--- a/packages/host/tests/integration/commands/reindex-realm-test.gts
+++ b/packages/host/tests/integration/commands/reindex-realm-test.gts
@@ -7,7 +7,7 @@ import { module, test } from 'qunit';
 import { APP_BOXEL_REALM_EVENT_TYPE } from '@cardstack/runtime-common/matrix-constants';
 
 import RealmService from '@cardstack/host/services/realm';
-import ReindexRealmCommand from '@cardstack/host/tools/reindex-realm';
+import ReindexRealmTool from '@cardstack/host/tools/reindex-realm';
 
 import {
   setupIntegrationTestRealm,
@@ -80,10 +80,10 @@ module('Integration | commands | reindex-realm', function (hooks) {
   });
 
   test('calls realm endpoint with expected auth header', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let realmServer = getService('realm-server');
     let realmService = getService('realm') as RealmService;
-    let command = new ReindexRealmCommand(commandService.commandContext);
+    let command = new ReindexRealmTool(toolService.commandContext);
     let realmURL = new URL('test/', realmServer.url).href;
 
     assert.false(
@@ -151,10 +151,10 @@ module('Integration | commands | reindex-realm', function (hooks) {
   });
 
   test('throws when reindex endpoint returns non-204', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let realmServer = getService('realm-server');
     let realmService = getService('realm') as RealmService;
-    let command = new ReindexRealmCommand(commandService.commandContext);
+    let command = new ReindexRealmTool(toolService.commandContext);
     let realmURL = new URL('test/', realmServer.url).href;
     responseStatus = 500;
     responseBody = 'boom';
@@ -173,10 +173,10 @@ module('Integration | commands | reindex-realm', function (hooks) {
   });
 
   test('full realm event also stops the indexing animation for no-op reindex', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let realmServer = getService('realm-server');
     let realmService = getService('realm') as RealmService;
-    let command = new ReindexRealmCommand(commandService.commandContext);
+    let command = new ReindexRealmTool(toolService.commandContext);
     let realmURL = new URL('test/', realmServer.url).href;
 
     await command.execute({
@@ -207,8 +207,8 @@ module('Integration | commands | reindex-realm', function (hooks) {
   });
 
   test('description explains lighter reindex semantics', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new ReindexRealmCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new ReindexRealmTool(toolService.commandContext);
 
     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/commands/sanitize-module-list-test.gts
index a4214e89f10..f25c1d6351b 100644
--- a/packages/host/tests/integration/commands/sanitize-module-list-test.gts
+++ b/packages/host/tests/integration/commands/sanitize-module-list-test.gts
@@ -7,7 +7,7 @@ import { module, test } from 'qunit';
 import { ri } from '@cardstack/runtime-common';
 
 import RealmService from '@cardstack/host/services/realm';
-import SanitizeModuleListCommand from '@cardstack/host/tools/sanitize-module-list';
+import SanitizeModuleListTool from '@cardstack/host/tools/sanitize-module-list';
 
 import {
   setupIntegrationTestRealm,
@@ -72,8 +72,8 @@ module('Integration | commands | sanitize-module-list', function (hooks) {
   });
 
   test('filters out global URLs and keeps realm modules', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new SanitizeModuleListCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new SanitizeModuleListTool(toolService.commandContext);
     let result = await command.execute({
       moduleIdentifiers: [
         `${testRealmURL}my-module.gts`,
@@ -88,8 +88,8 @@ module('Integration | commands | sanitize-module-list', function (hooks) {
   });
 
   test('deduplicates modules by normalized URL', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new SanitizeModuleListCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new SanitizeModuleListTool(toolService.commandContext);
     let result = await command.execute({
       moduleIdentifiers: [
         `${testRealmURL}my-module.gts`,
@@ -105,8 +105,8 @@ module('Integration | commands | sanitize-module-list', function (hooks) {
 
   test('excludes modules from unreadable realms', async function (assert) {
     readableRealms = new Set([testRealmURL]);
-    let commandService = getService('command-service');
-    let command = new SanitizeModuleListCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new SanitizeModuleListTool(toolService.commandContext);
     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/commands/schema-generation-test.gts
index f91e8820ff6..9edbd630d24 100644
--- a/packages/host/tests/integration/commands/schema-generation-test.gts
+++ b/packages/host/tests/integration/commands/schema-generation-test.gts
@@ -7,8 +7,8 @@ import { baseRealm } from '@cardstack/runtime-common';
 import type { AttributesSchema } from '@cardstack/runtime-common/helpers/ai';
 import { basicMappings } from '@cardstack/runtime-common/helpers/ai';
 
-import type HostBaseCommand from '@cardstack/host/lib/host-base-command';
-import { HostCommandClasses } from '@cardstack/host/tools';
+import type HostBaseTool from '@cardstack/host/lib/host-base-tool';
+import { HostToolClasses } from '@cardstack/host/tools';
 
 import type * as CardAPI from 'https://cardstack.com/base/card-api';
 
@@ -32,16 +32,16 @@ module(
         );
       });
       // for each host command, attempt to generate a JSON schema with strict: true
-      for (const CommandClass of HostCommandClasses) {
+      for (const CommandClass of HostToolClasses) {
         test(
           'getInputJsonSchema for ' + CommandClass.name,
           async function (assert) {
             // Type CommandClass as a concrete subclass of BaseHostCommand
             const TypedCommandClass = CommandClass as unknown as new (
               ...args: any[]
-            ) => HostBaseCommand<any, any>;
+            ) => HostBaseTool<any, any>;
             let command = new TypedCommandClass(
-              getService('command-service').commandContext,
+              getService('tool-service').commandContext,
             );
             const inputSchema = await command.getInputJsonSchema(
               cardAPI,
diff --git a/packages/host/tests/integration/commands/search-and-choose-test.gts b/packages/host/tests/integration/commands/search-and-choose-test.gts
index 865c0286153..a72ddfa8d0d 100644
--- a/packages/host/tests/integration/commands/search-and-choose-test.gts
+++ b/packages/host/tests/integration/commands/search-and-choose-test.gts
@@ -5,7 +5,7 @@ import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
-import SearchAndChooseCommand from '@cardstack/host/tools/search-and-choose';
+import SearchAndChooseTool from '@cardstack/host/tools/search-and-choose';
 
 import {
   setupIntegrationTestRealm,
@@ -82,7 +82,7 @@ module('Integration | commands | search-and-choose', function (hooks) {
     capturedMessages = undefined;
   });
 
-  let searchAndChooseCommand: SearchAndChooseCommand;
+  let searchAndChooseCommand: SearchAndChooseTool;
   setupRealmCacheTeardown(hooks);
 
   hooks.beforeEach(async function () {
@@ -141,9 +141,9 @@ export class ContextCard extends CardDef {
       }),
     );
 
-    const commandService = getService('command-service');
-    searchAndChooseCommand = new SearchAndChooseCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    searchAndChooseCommand = new SearchAndChooseTool(
+      toolService.commandContext,
     );
   });
 
diff --git a/packages/host/tests/integration/commands/search-command-test.gts b/packages/host/tests/integration/commands/search-command-test.gts
index d7bdb9b1a76..ce8909f0d01 100644
--- a/packages/host/tests/integration/commands/search-command-test.gts
+++ b/packages/host/tests/integration/commands/search-command-test.gts
@@ -5,8 +5,8 @@ import { baseRealm, type Query, rri } from '@cardstack/runtime-common';
 import type { Loader } from '@cardstack/runtime-common/loader';
 
 import {
-  SearchCardsByQueryCommand,
-  SearchCardsByTypeAndTitleCommand,
+  SearchCardsByQueryTool,
+  SearchCardsByTypeAndTitleTool,
 } from '@cardstack/host/tools/search-cards';
 
 import {
@@ -50,18 +50,16 @@ module('Integration | commands | search', function (hooks) {
     cardType: string | undefined;
     cardTitle: string | undefined;
   }) {
-    let commandService = getService('command-service');
-    let searchCommand = new SearchCardsByTypeAndTitleCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let searchCommand = new SearchCardsByTypeAndTitleTool(
+      toolService.commandContext,
     );
     return searchCommand.execute(input);
   }
 
   function runQuerySearch(query: Query) {
-    let commandService = getService('command-service');
-    let searchCommand = new SearchCardsByQueryCommand(
-      commandService.commandContext,
-    );
+    let toolService = getService('tool-service');
+    let searchCommand = new SearchCardsByQueryTool(toolService.commandContext);
     return searchCommand.execute({ query });
   }
 
diff --git a/packages/host/tests/integration/commands/search-google-images-test.gts b/packages/host/tests/integration/commands/search-google-images-test.gts
index 58bfbbcb3df..99decc4dd19 100644
--- a/packages/host/tests/integration/commands/search-google-images-test.gts
+++ b/packages/host/tests/integration/commands/search-google-images-test.gts
@@ -1,7 +1,7 @@
 import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
-import SearchGoogleImagesCommand from '@cardstack/host/tools/search-google-images';
+import SearchGoogleImagesTool from '@cardstack/host/tools/search-google-images';
 
 import {
   setupIntegrationTestRealm,
@@ -151,9 +151,9 @@ module('Integration | commands | search-google-images', function (hooks) {
   });
 
   test('successfully searches Google Images and returns results', async function (assert) {
-    const commandService = getService('command-service');
-    const searchCommand = new SearchGoogleImagesCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const searchCommand = new SearchGoogleImagesTool(
+      toolService.commandContext,
     );
 
     const input = {
@@ -255,9 +255,9 @@ module('Integration | commands | search-google-images', function (hooks) {
   });
 
   test('uses default maxResults when not provided', async function (assert) {
-    const commandService = getService('command-service');
-    const searchCommand = new SearchGoogleImagesCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const searchCommand = new SearchGoogleImagesTool(
+      toolService.commandContext,
     );
 
     const input = {
@@ -272,9 +272,9 @@ module('Integration | commands | search-google-images', function (hooks) {
   });
 
   test('limits maxResults to 10', async function (assert) {
-    const commandService = getService('command-service');
-    const searchCommand = new SearchGoogleImagesCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const searchCommand = new SearchGoogleImagesTool(
+      toolService.commandContext,
     );
 
     const input = {
@@ -294,9 +294,9 @@ module('Integration | commands | search-google-images', function (hooks) {
   });
 
   test('supports pagination with startIndex parameter', async function (assert) {
-    const commandService = getService('command-service');
-    const searchCommand = new SearchGoogleImagesCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const searchCommand = new SearchGoogleImagesTool(
+      toolService.commandContext,
     );
 
     const input = {
diff --git a/packages/host/tests/integration/commands/send-ai-assistant-message-test.gts b/packages/host/tests/integration/commands/send-ai-assistant-message-test.gts
index 7e36c12aead..d47fbbf7c93 100644
--- a/packages/host/tests/integration/commands/send-ai-assistant-message-test.gts
+++ b/packages/host/tests/integration/commands/send-ai-assistant-message-test.gts
@@ -7,7 +7,7 @@ import { module, test } from 'qunit';
 import { APP_BOXEL_MESSAGE_MSGTYPE } from '@cardstack/runtime-common/matrix-constants';
 
 import RealmService from '@cardstack/host/services/realm';
-import SendAiAssistantMessageCommand from '@cardstack/host/tools/send-ai-assistant-message';
+import SendAiAssistantMessageTool from '@cardstack/host/tools/send-ai-assistant-message';
 
 import {
   setupIntegrationTestRealm,
@@ -61,10 +61,10 @@ module('Integration | commands | send-ai-assistant-message', function (hooks) {
       sender: '@testuser:localhost',
       name: 'room-test',
     });
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
 
-    let sendAiAssistantMessageCommand = new SendAiAssistantMessageCommand(
-      commandService.commandContext,
+    let sendAiAssistantMessageCommand = new SendAiAssistantMessageTool(
+      toolService.commandContext,
     );
     await sendAiAssistantMessageCommand.execute({
       roomId,
diff --git a/packages/host/tests/integration/commands/send-bot-trigger-event-test.gts b/packages/host/tests/integration/commands/send-bot-trigger-event-test.gts
index d11d5f301cd..e4122018377 100644
--- a/packages/host/tests/integration/commands/send-bot-trigger-event-test.gts
+++ b/packages/host/tests/integration/commands/send-bot-trigger-event-test.gts
@@ -7,7 +7,7 @@ import { module, test } from 'qunit';
 import { isBotTriggerEvent } from '@cardstack/runtime-common';
 
 import RealmService from '@cardstack/host/services/realm';
-import SendBotTriggerEventCommand from '@cardstack/host/tools/bot-requests/send-bot-trigger-event';
+import SendBotTriggerEventTool from '@cardstack/host/tools/bot-requests/send-bot-trigger-event';
 
 import {
   setupIntegrationTestRealm,
@@ -60,9 +60,9 @@ module('Integration | commands | send-bot-trigger-event', function (hooks) {
       sender: '@testuser:localhost',
       name: 'room-test',
     });
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
 
-    let command = new SendBotTriggerEventCommand(commandService.commandContext);
+    let command = new SendBotTriggerEventTool(toolService.commandContext);
     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/commands/send-request-via-proxy-test.gts
index 435e867a87f..71b3b8723fd 100644
--- a/packages/host/tests/integration/commands/send-request-via-proxy-test.gts
+++ b/packages/host/tests/integration/commands/send-request-via-proxy-test.gts
@@ -5,7 +5,7 @@ import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
-import SendRequestViaProxyCommand from '@cardstack/host/tools/send-request-via-proxy';
+import SendRequestViaProxyTool from '@cardstack/host/tools/send-request-via-proxy';
 
 import {
   setupIntegrationTestRealm,
@@ -186,9 +186,9 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
 
   // Test successful JSON response
   test('successfully sends request and returns JSON response', async function (assert) {
-    const commandService = getService('command-service');
-    const requestForwardCommand = new SendRequestViaProxyCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const requestForwardCommand = new SendRequestViaProxyTool(
+      toolService.commandContext,
     );
 
     const input = createMockSendRequestViaProxyInput();
@@ -207,9 +207,9 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
 
   // Test text response
   test('successfully sends request and returns text response', async function (assert) {
-    const commandService = getService('command-service');
-    const requestForwardCommand = new SendRequestViaProxyCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const requestForwardCommand = new SendRequestViaProxyTool(
+      toolService.commandContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -228,9 +228,9 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
   test('successfully sends request and returns image response', async function (assert) {
     const mockImageData = new Uint8Array([137, 80, 78, 71, 13, 10, 26, 10]); // PNG header
 
-    const commandService = getService('command-service');
-    const requestForwardCommand = new SendRequestViaProxyCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const requestForwardCommand = new SendRequestViaProxyTool(
+      toolService.commandContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -261,9 +261,9 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
       'data: [DONE]\n\n',
     ].join('');
 
-    const commandService = getService('command-service');
-    const requestForwardCommand = new SendRequestViaProxyCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const requestForwardCommand = new SendRequestViaProxyTool(
+      toolService.commandContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -285,9 +285,9 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
 
   // Test error response (4xx)
   test('handles 4xx error responses from external API', async function (assert) {
-    const commandService = getService('command-service');
-    const requestForwardCommand = new SendRequestViaProxyCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const requestForwardCommand = new SendRequestViaProxyTool(
+      toolService.commandContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -309,9 +309,9 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
 
   // Test error response (5xx)
   test('handles 5xx error responses from external API', async function (assert) {
-    const commandService = getService('command-service');
-    const requestForwardCommand = new SendRequestViaProxyCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const requestForwardCommand = new SendRequestViaProxyTool(
+      toolService.commandContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -333,9 +333,9 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
 
   // Test realm server error
   test('handles realm server errors gracefully', async function (assert) {
-    const commandService = getService('command-service');
-    const requestForwardCommand = new SendRequestViaProxyCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const requestForwardCommand = new SendRequestViaProxyTool(
+      toolService.commandContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -353,9 +353,9 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
 
   // Test network error
   test('handles network errors gracefully', async function (assert) {
-    const commandService = getService('command-service');
-    const requestForwardCommand = new SendRequestViaProxyCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const requestForwardCommand = new SendRequestViaProxyTool(
+      toolService.commandContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -376,9 +376,9 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
     const methods = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'];
 
     for (const method of methods) {
-      const commandService = getService('command-service');
-      const requestForwardCommand = new SendRequestViaProxyCommand(
-        commandService.commandContext,
+      const toolService = getService('tool-service');
+      const requestForwardCommand = new SendRequestViaProxyTool(
+        toolService.commandContext,
       );
 
       const input = createMockSendRequestViaProxyInput({ method });
@@ -402,9 +402,9 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
     ];
 
     for (const testCase of testCases) {
-      const commandService = getService('command-service');
-      const requestForwardCommand = new SendRequestViaProxyCommand(
-        commandService.commandContext,
+      const toolService = getService('tool-service');
+      const requestForwardCommand = new SendRequestViaProxyTool(
+        toolService.commandContext,
       );
 
       const input = createMockSendRequestViaProxyInput({
@@ -426,9 +426,9 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
 
   // Test with large response
   test('handles large response data', async function (assert) {
-    const commandService = getService('command-service');
-    const requestForwardCommand = new SendRequestViaProxyCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const requestForwardCommand = new SendRequestViaProxyTool(
+      toolService.commandContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -454,9 +454,9 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
       Authorization: 'Bearer token-with-special-chars: !@#$%^&*()',
     };
 
-    const commandService = getService('command-service');
-    const requestForwardCommand = new SendRequestViaProxyCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const requestForwardCommand = new SendRequestViaProxyTool(
+      toolService.commandContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -471,9 +471,9 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
 
   // Test with empty request body
   test('handles empty request body', async function (assert) {
-    const commandService = getService('command-service');
-    const requestForwardCommand = new SendRequestViaProxyCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const requestForwardCommand = new SendRequestViaProxyTool(
+      toolService.commandContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
@@ -488,9 +488,9 @@ module('Integration | commands | send-request-via-proxy', function (hooks) {
 
   // Test with null/undefined headers
   test('handles null/undefined headers', async function (assert) {
-    const commandService = getService('command-service');
-    const requestForwardCommand = new SendRequestViaProxyCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const requestForwardCommand = new SendRequestViaProxyTool(
+      toolService.commandContext,
     );
 
     const input = createMockSendRequestViaProxyInput({
diff --git a/packages/host/tests/integration/commands/set-user-system-card-test.gts b/packages/host/tests/integration/commands/set-user-system-card-test.gts
index e57a16d0a23..12059a456cb 100644
--- a/packages/host/tests/integration/commands/set-user-system-card-test.gts
+++ b/packages/host/tests/integration/commands/set-user-system-card-test.gts
@@ -5,7 +5,7 @@ import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
-import SetUserSystemCardCommand from '@cardstack/host/tools/set-user-system-card';
+import SetUserSystemCardTool from '@cardstack/host/tools/set-user-system-card';
 
 import {
   setupIntegrationTestRealm,
@@ -53,8 +53,8 @@ module('Integration | commands | set-user-system-card', function (hooks) {
   });
 
   test('sets the system card account data', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new SetUserSystemCardCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new SetUserSystemCardTool(toolService.commandContext);
 
     let systemCardId = `${testRealmURL}SystemCard/default`;
 
@@ -68,8 +68,8 @@ module('Integration | commands | set-user-system-card', function (hooks) {
   });
 
   test('clears system card account data when cardId is empty', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new SetUserSystemCardCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new SetUserSystemCardTool(toolService.commandContext);
 
     // First set a system card
     let systemCardId = `${testRealmURL}SystemCard/default`;
@@ -94,8 +94,8 @@ module('Integration | commands | set-user-system-card', function (hooks) {
   });
 
   test('clears system card account data when cardId is omitted', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new SetUserSystemCardCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new SetUserSystemCardTool(toolService.commandContext);
 
     // 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/commands/show-card-test.gts
index 75466dfec7f..08bf6474e04 100644
--- a/packages/host/tests/integration/commands/show-card-test.gts
+++ b/packages/host/tests/integration/commands/show-card-test.gts
@@ -17,7 +17,7 @@ import { StackItem } from '@cardstack/host/lib/stack-item';
 
 import type { OperatorModeState } from '@cardstack/host/services/operator-mode-state-service';
 import RealmService from '@cardstack/host/services/realm';
-import ShowCardCommand from '@cardstack/host/tools/show-card';
+import ShowCardTool from '@cardstack/host/tools/show-card';
 
 import type * as CardAPI from 'https://cardstack.com/base/card-api';
 
@@ -143,7 +143,7 @@ module('Integration | Command | show-card', function (hooks) {
     autostart: true,
   });
 
-  let command: ShowCardCommand;
+  let command: ShowCardTool;
   let mockOperatorModeStateService: MockOperatorModeStateService;
   let mockPlaygroundPanelService: MockPlaygroundPanelService;
 
@@ -251,7 +251,7 @@ module('Integration | Command | show-card', function (hooks) {
       { instantiate: false },
     );
 
-    command = new ShowCardCommand(getService('command-service').commandContext);
+    command = new ShowCardTool(getService('tool-service').commandContext);
   });
 
   hooks.afterEach(function () {
@@ -563,7 +563,7 @@ module('Integration | Command | show-card', function (hooks) {
         'Command has correct description',
       );
       assert.strictEqual(
-        ShowCardCommand.actionVerb,
+        ShowCardTool.actionVerb,
         'Show Card',
         'Command has correct action verb',
       );
diff --git a/packages/host/tests/integration/commands/store-add-test.gts b/packages/host/tests/integration/commands/store-add-test.gts
index 2a366923e7e..af576a01988 100644
--- a/packages/host/tests/integration/commands/store-add-test.gts
+++ b/packages/host/tests/integration/commands/store-add-test.gts
@@ -5,7 +5,7 @@ import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
-import StoreAddCommand from '@cardstack/host/tools/store-add';
+import StoreAddTool from '@cardstack/host/tools/store-add';
 
 import {
   setupIntegrationTestRealm,
@@ -55,8 +55,8 @@ module('Integration | commands | store-add', function (hooks) {
   });
 
   test('adds a card document to the store and returns a CardDef', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new StoreAddCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new StoreAddTool(toolService.commandContext);
     let result = await command.execute({
       document: {
         data: {
diff --git a/packages/host/tests/integration/commands/summarize-session-test.gts b/packages/host/tests/integration/commands/summarize-session-test.gts
index c2a286fa1de..195be444307 100644
--- a/packages/host/tests/integration/commands/summarize-session-test.gts
+++ b/packages/host/tests/integration/commands/summarize-session-test.gts
@@ -5,7 +5,7 @@ import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
-import SummarizeSessionCommand from '@cardstack/host/tools/summarize-session';
+import SummarizeSessionTool from '@cardstack/host/tools/summarize-session';
 
 import {
   setupIntegrationTestRealm,
@@ -170,9 +170,9 @@ module('Integration | commands | summarize-session', function (hooks) {
   }
 
   test('successfully summarizes a conversation with project help content', async function (assert) {
-    const commandService = getService('command-service');
-    const summarizeCommand = new SummarizeSessionCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const summarizeCommand = new SummarizeSessionTool(
+      toolService.commandContext,
     );
 
     // Create a room with project-related conversation
@@ -202,9 +202,9 @@ module('Integration | commands | summarize-session', function (hooks) {
   });
 
   test('successfully summarizes a conversation with cards and files', async function (assert) {
-    const commandService = getService('command-service');
-    const summarizeCommand = new SummarizeSessionCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const summarizeCommand = new SummarizeSessionTool(
+      toolService.commandContext,
     );
 
     // Create a room with card and file discussion
@@ -234,9 +234,9 @@ module('Integration | commands | summarize-session', function (hooks) {
   });
 
   test('handles empty room gracefully', async function (assert) {
-    const commandService = getService('command-service');
-    const summarizeCommand = new SummarizeSessionCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const summarizeCommand = new SummarizeSessionTool(
+      toolService.commandContext,
     );
 
     // Create an empty room
@@ -254,9 +254,9 @@ module('Integration | commands | summarize-session', function (hooks) {
   });
 
   test('handles API errors gracefully', async function (assert) {
-    const commandService = getService('command-service');
-    const summarizeCommand = new SummarizeSessionCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const summarizeCommand = new SummarizeSessionTool(
+      toolService.commandContext,
     );
 
     // Create a room with error-triggering content
@@ -282,9 +282,9 @@ module('Integration | commands | summarize-session', function (hooks) {
   });
 
   test('handles room not found gracefully', async function (assert) {
-    const commandService = getService('command-service');
-    const summarizeCommand = new SummarizeSessionCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const summarizeCommand = new SummarizeSessionTool(
+      toolService.commandContext,
     );
 
     const input = createMockSummarizeSessionInput('non-existent-room-id');
@@ -305,9 +305,9 @@ module('Integration | commands | summarize-session', function (hooks) {
   });
 
   test('includes conversation context in summary request', async function (assert) {
-    const commandService = getService('command-service');
-    const summarizeCommand = new SummarizeSessionCommand(
-      commandService.commandContext,
+    const toolService = getService('tool-service');
+    const summarizeCommand = new SummarizeSessionTool(
+      toolService.commandContext,
     );
 
     // Create a room with specific conversation
diff --git a/packages/host/tests/integration/commands/switch-submode-test.gts b/packages/host/tests/integration/commands/switch-submode-test.gts
index 4055b36fc88..9cb1ccd30f7 100644
--- a/packages/host/tests/integration/commands/switch-submode-test.gts
+++ b/packages/host/tests/integration/commands/switch-submode-test.gts
@@ -8,7 +8,7 @@ import { localId } from '@cardstack/runtime-common';
 
 import RealmService from '@cardstack/host/services/realm';
 import type StoreService from '@cardstack/host/services/store';
-import SwitchSubmodeCommand from '@cardstack/host/tools/switch-submode';
+import SwitchSubmodeTool from '@cardstack/host/tools/switch-submode';
 
 import type { CardDef as CardDefType } from 'https://cardstack.com/base/card-api';
 
@@ -64,14 +64,14 @@ module('Integration | commands | switch-submode', function (hooks) {
 
   test('switch to code submode by local id of a saved instance', async function (assert) {
     let instance = (await store.add(new CardDef())) as CardDefType;
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let operatorModeStateService = getService('operator-mode-state-service');
     operatorModeStateService.restore({
       stacks: [[{ id: instance[localId], format: 'isolated' }]],
       submode: 'interact',
     });
-    let switchSubmodeCommand = new SwitchSubmodeCommand(
-      commandService.commandContext,
+    let switchSubmodeCommand = new SwitchSubmodeTool(
+      toolService.commandContext,
     );
     assert.strictEqual(operatorModeStateService.state?.submode, 'interact');
     await switchSubmodeCommand.execute({
@@ -86,14 +86,14 @@ module('Integration | commands | switch-submode', function (hooks) {
 
   test('switch to code submode by remote id of a saved instance', async function (assert) {
     let instance = await store.add(new CardDef());
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let operatorModeStateService = getService('operator-mode-state-service');
     operatorModeStateService.restore({
       stacks: [[{ id: instance.id!, format: 'isolated' }]],
       submode: 'interact',
     });
-    let switchSubmodeCommand = new SwitchSubmodeCommand(
-      commandService.commandContext,
+    let switchSubmodeCommand = new SwitchSubmodeTool(
+      toolService.commandContext,
     );
     assert.strictEqual(operatorModeStateService.state?.submode, 'interact');
     await switchSubmodeCommand.execute({
@@ -108,15 +108,15 @@ module('Integration | commands | switch-submode', function (hooks) {
 
   test('when workspace chooser is open, close it when switching', async function (assert) {
     let instance = (await store.add(new CardDef())) as CardDefType;
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let operatorModeStateService = getService('operator-mode-state-service');
     operatorModeStateService.restore({
       stacks: [[{ id: instance[localId], format: 'isolated' }]],
       submode: 'interact',
       workspaceChooserOpened: true,
     });
-    let switchSubmodeCommand = new SwitchSubmodeCommand(
-      commandService.commandContext,
+    let switchSubmodeCommand = new SwitchSubmodeTool(
+      toolService.commandContext,
     );
     assert.strictEqual(operatorModeStateService.state?.submode, 'interact');
     assert.true(operatorModeStateService.workspaceChooserOpened);
@@ -133,15 +133,15 @@ module('Integration | commands | switch-submode', function (hooks) {
   test('createFile creates a blank file when it does not exist', async function (assert) {
     assert.expect(5);
 
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let cardService = getService('card-service');
     let operatorModeStateService = getService('operator-mode-state-service');
     operatorModeStateService.restore({
       stacks: [[]],
       submode: 'interact',
     });
-    let switchSubmodeCommand = new SwitchSubmodeCommand(
-      commandService.commandContext,
+    let switchSubmodeCommand = new SwitchSubmodeTool(
+      toolService.commandContext,
     );
     let fileUrl = `${testRealmURL}new-file.gts`;
 
@@ -163,15 +163,15 @@ module('Integration | commands | switch-submode', function (hooks) {
   test('createFile picks a non-conflicting filename when the target exists', async function (assert) {
     assert.expect(5);
 
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let cardService = getService('card-service');
     let operatorModeStateService = getService('operator-mode-state-service');
     operatorModeStateService.restore({
       stacks: [[]],
       submode: 'interact',
     });
-    let switchSubmodeCommand = new SwitchSubmodeCommand(
-      commandService.commandContext,
+    let switchSubmodeCommand = new SwitchSubmodeTool(
+      toolService.commandContext,
     );
     let fileUrl = `${testRealmURL}existing-file.gts`;
     let newFileIdentifier = `${testRealmURL}existing-file-1.gts`;
@@ -205,15 +205,15 @@ module('Integration | commands | switch-submode', function (hooks) {
   test('createFile reuses an existing blank file', async function (assert) {
     assert.expect(5);
 
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let cardService = getService('card-service');
     let operatorModeStateService = getService('operator-mode-state-service');
     operatorModeStateService.restore({
       stacks: [[]],
       submode: 'interact',
     });
-    let switchSubmodeCommand = new SwitchSubmodeCommand(
-      commandService.commandContext,
+    let switchSubmodeCommand = new SwitchSubmodeTool(
+      toolService.commandContext,
     );
     let fileUrl = `${testRealmURL}empty-file.gts`;
 
diff --git a/packages/host/tests/integration/commands/sync-openrouter-models-test.gts b/packages/host/tests/integration/commands/sync-openrouter-models-test.gts
index 0622bc6e298..df23fafc321 100644
--- a/packages/host/tests/integration/commands/sync-openrouter-models-test.gts
+++ b/packages/host/tests/integration/commands/sync-openrouter-models-test.gts
@@ -9,7 +9,7 @@ import type { AtomicOperation } from '@cardstack/runtime-common/atomic-document'
 import type { Loader } from '@cardstack/runtime-common/loader';
 
 import CardService from '@cardstack/host/services/card-service';
-import SyncOpenRouterModelsCommand from '@cardstack/host/tools/sync-openrouter-models';
+import SyncOpenRouterModelsTool from '@cardstack/host/tools/sync-openrouter-models';
 
 import {
   testRealmURL,
@@ -129,10 +129,8 @@ module('Integration | commands | sync-openrouter-models', function (hooks) {
   });
 
   function runSync() {
-    let commandService = getService('command-service');
-    let command = new SyncOpenRouterModelsCommand(
-      commandService.commandContext,
-    );
+    let toolService = getService('tool-service');
+    let command = new SyncOpenRouterModelsTool(toolService.commandContext);
     return command.execute({ realmIdentifier: testRealmURL });
   }
 
diff --git a/packages/host/tests/integration/commands/transform-cards-test.gts b/packages/host/tests/integration/commands/transform-cards-test.gts
index 88c6e86ac99..83b6dd38aeb 100644
--- a/packages/host/tests/integration/commands/transform-cards-test.gts
+++ b/packages/host/tests/integration/commands/transform-cards-test.gts
@@ -8,8 +8,8 @@ import { baseRealm, Command } from '@cardstack/runtime-common';
 import type { Loader } from '@cardstack/runtime-common/loader';
 
 import RealmService from '@cardstack/host/services/realm';
-import type { SearchCardsByQueryCommand as SearchCardsByQueryCommandType } from '@cardstack/host/tools/search-cards';
-import TransformCardsCommand from '@cardstack/host/tools/transform-cards';
+import type { SearchCardsByQueryTool as SearchCardsByQueryCommandType } from '@cardstack/host/tools/search-cards';
+import TransformCardsTool from '@cardstack/host/tools/transform-cards';
 
 import type * as CommandModule from 'https://cardstack.com/base/command';
 
@@ -143,7 +143,7 @@ module('Integration | commands | transform-cards', function (hooks) {
       ): Promise<CommandModule.JsonCard> {
         let json = { ...input.json };
         if (!json.data.attributes.metadata) {
-          json.data.attributes.metadata = 'Added by TransformCardsCommand';
+          json.data.attributes.metadata = 'Added by TransformCardsTool';
         }
         return new JsonCard({ json });
       }
@@ -241,10 +241,8 @@ module('Integration | commands | transform-cards', function (hooks) {
   });
 
   test('transforms all cards matching a query', async function (assert) {
-    let commandService = getService('command-service');
-    let transformCommand = new TransformCardsCommand(
-      commandService.commandContext,
-    );
+    let toolService = getService('tool-service');
+    let transformCommand = new TransformCardsTool(toolService.commandContext);
 
     await transformCommand.execute({
       query: {
@@ -262,13 +260,11 @@ module('Integration | commands | transform-cards', function (hooks) {
     });
 
     // Verify that all Person cards were transformed
-    let { SearchCardsByQueryCommand } = (await import(
+    let { SearchCardsByQueryTool } = (await import(
       // @ts-expect-error tsconfig paths not resolved for dynamic import()
       '@cardstack/host/tools/search-cards'
-    )) as { SearchCardsByQueryCommand: typeof SearchCardsByQueryCommandType };
-    let searchCommand = new SearchCardsByQueryCommand(
-      commandService.commandContext,
-    );
+    )) as { SearchCardsByQueryTool: typeof SearchCardsByQueryCommandType };
+    let searchCommand = new SearchCardsByQueryTool(toolService.commandContext);
     let { cardIds } = await searchCommand.execute({
       query: {
         filter: {
@@ -295,10 +291,8 @@ module('Integration | commands | transform-cards', function (hooks) {
   });
 
   test('transforms specific cards using title filter', async function (assert) {
-    let commandService = getService('command-service');
-    let transformCommand = new TransformCardsCommand(
-      commandService.commandContext,
-    );
+    let toolService = getService('tool-service');
+    let transformCommand = new TransformCardsTool(toolService.commandContext);
 
     await transformCommand.execute({
       query: {
@@ -336,10 +330,8 @@ module('Integration | commands | transform-cards', function (hooks) {
   });
 
   test('transforms Pet cards with different command', async function (assert) {
-    let commandService = getService('command-service');
-    let transformCommand = new TransformCardsCommand(
-      commandService.commandContext,
-    );
+    let toolService = getService('tool-service');
+    let transformCommand = new TransformCardsTool(toolService.commandContext);
 
     await transformCommand.execute({
       query: {
@@ -366,7 +358,7 @@ module('Integration | commands | transform-cards', function (hooks) {
     let fluffyData = JSON.parse(fluffyContent);
     assert.strictEqual(
       fluffyData.data.attributes.metadata,
-      'Added by TransformCardsCommand',
+      'Added by TransformCardsTool',
     );
 
     response = await networkService.authedFetch(
@@ -376,15 +368,13 @@ module('Integration | commands | transform-cards', function (hooks) {
     let roverData = JSON.parse(roverContent);
     assert.strictEqual(
       roverData.data.attributes.metadata,
-      'Added by TransformCardsCommand',
+      'Added by TransformCardsTool',
     );
   });
 
   test('handles empty search results gracefully', async function (assert) {
-    let commandService = getService('command-service');
-    let transformCommand = new TransformCardsCommand(
-      commandService.commandContext,
-    );
+    let toolService = getService('tool-service');
+    let transformCommand = new TransformCardsTool(toolService.commandContext);
 
     // Search for non-existent cards
     await transformCommand.execute({
@@ -404,10 +394,8 @@ module('Integration | commands | transform-cards', function (hooks) {
   });
 
   test('preserves JSON structure while transforming', async function (assert) {
-    let commandService = getService('command-service');
-    let transformCommand = new TransformCardsCommand(
-      commandService.commandContext,
-    );
+    let toolService = getService('tool-service');
+    let transformCommand = new TransformCardsTool(toolService.commandContext);
 
     // Get original structure first
     let networkService = getService('network');
@@ -455,10 +443,8 @@ 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 commandService = getService('command-service');
-    let transformCommand = new TransformCardsCommand(
-      commandService.commandContext,
-    );
+    let toolService = getService('tool-service');
+    let transformCommand = new TransformCardsTool(toolService.commandContext);
 
     try {
       await transformCommand.execute({
diff --git a/packages/host/tests/integration/commands/unpublish-realm-test.gts b/packages/host/tests/integration/commands/unpublish-realm-test.gts
index 2a530cdd707..ba038d46c8a 100644
--- a/packages/host/tests/integration/commands/unpublish-realm-test.gts
+++ b/packages/host/tests/integration/commands/unpublish-realm-test.gts
@@ -7,9 +7,9 @@ import { module, test } from 'qunit';
 import { baseRealm, type Loader } from '@cardstack/runtime-common';
 
 import RealmService from '@cardstack/host/services/realm';
-import UnpublishRealmCommand from '@cardstack/host/tools/unpublish-realm';
+import UnpublishRealmTool from '@cardstack/host/tools/unpublish-realm';
 
-import type * as BaseCommandModule from 'https://cardstack.com/base/command';
+import type * as BaseToolModule from 'https://cardstack.com/base/command';
 
 import {
   setupIntegrationTestRealm,
@@ -36,7 +36,7 @@ class StubRealmService extends RealmService {
 let unpublishShouldFail: boolean;
 let unpublishedURLs: string[];
 let loader: Loader;
-let PublishTarget: typeof BaseCommandModule.PublishTarget;
+let PublishTarget: typeof BaseToolModule.PublishTarget;
 
 module('Integration | commands | unpublish-realm', function (hooks) {
   setupRenderingTest(hooks);
@@ -77,7 +77,7 @@ module('Integration | commands | unpublish-realm', function (hooks) {
     getOwner(this)!.register('service:realm', StubRealmService);
     loader = getService('loader-service').loader;
     PublishTarget = (
-      await loader.import<typeof BaseCommandModule>(`${baseRealm.url}command`)
+      await loader.import<typeof BaseToolModule>(`${baseRealm.url}command`)
     ).PublishTarget;
     unpublishShouldFail = false;
     unpublishedURLs = [];
@@ -92,8 +92,8 @@ module('Integration | commands | unpublish-realm', function (hooks) {
   });
 
   function makeCommand() {
-    let commandService = getService('command-service');
-    return new UnpublishRealmCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    return new UnpublishRealmTool(toolService.commandContext);
   }
 
   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/commands/update-room-skills-test.gts
index 80210fa1e44..02a40d40940 100644
--- a/packages/host/tests/integration/commands/update-room-skills-test.gts
+++ b/packages/host/tests/integration/commands/update-room-skills-test.gts
@@ -14,7 +14,7 @@ import { basicMappings } from '@cardstack/runtime-common/helpers/ai';
 import type { Loader } from '@cardstack/runtime-common/loader';
 
 import RealmService from '@cardstack/host/services/realm';
-import UpdateRoomSkillsCommand from '@cardstack/host/tools/update-room-skills';
+import UpdateRoomSkillsTool from '@cardstack/host/tools/update-room-skills';
 
 import type * as CardAPI from 'https://cardstack.com/base/card-api';
 import type { SerializedFile } from 'https://cardstack.com/base/file-api';
@@ -29,7 +29,7 @@ import {
   setupRealmCacheTeardown,
   withCachedRealmSetup,
 } from '../../helpers';
-import { setupBaseRealm, CommandField, Skill } from '../../helpers/base-realm';
+import { setupBaseRealm, ToolField, Skill } from '../../helpers/base-realm';
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
@@ -68,8 +68,8 @@ module('Integration | Command | update-room-skills', function (hooks) {
 
   module('command metadata', function () {
     test('has correct description and action verb', function (assert) {
-      let command = new UpdateRoomSkillsCommand(
-        getService('command-service').commandContext,
+      let command = new UpdateRoomSkillsTool(
+        getService('tool-service').commandContext,
       );
       assert.strictEqual(
         command.description,
@@ -77,23 +77,23 @@ module('Integration | Command | update-room-skills', function (hooks) {
         'Command has correct description',
       );
       assert.strictEqual(
-        UpdateRoomSkillsCommand.actionVerb,
+        UpdateRoomSkillsTool.actionVerb,
         'Update',
         'Command has correct action verb',
       );
     });
 
     test('getInputType returns UpdateRoomSkillsInput', async function (assert) {
-      let command = new UpdateRoomSkillsCommand(
-        getService('command-service').commandContext,
+      let command = new UpdateRoomSkillsTool(
+        getService('tool-service').commandContext,
       );
       const inputType = await command.getInputType();
       assert.ok(inputType, 'Input type is defined');
     });
 
     test('getInputJsonSchema', async function (assert) {
-      let command = new UpdateRoomSkillsCommand(
-        getService('command-service').commandContext,
+      let command = new UpdateRoomSkillsTool(
+        getService('tool-service').commandContext,
       );
       let loader = getService('loader-service').loader;
       let mappings = await basicMappings(loader);
@@ -148,11 +148,11 @@ export class DoThing extends Command {
               cardDescription: 'test',
               instructions: 'test',
               commands: [
-                new CommandField({
+                new ToolField({
                   codeRef: { module: '', name: '' },
                   requiresApproval: false,
                 }),
-                new CommandField({
+                new ToolField({
                   codeRef: {
                     module: `${testRealmURL}test-command.gts`,
                     name: 'DoThing',
@@ -166,7 +166,7 @@ export class DoThing extends Command {
               description: 'Test environment skill',
               instructions: 'Test skill card for environment commands',
               commands: [
-                new CommandField({
+                new ToolField({
                   codeRef: {
                     module: `${testRealmURL}test-command.gts`,
                     name: 'DoThing',
@@ -203,8 +203,8 @@ Instructions live in the markdown body.
       });
     });
     test('activates new skills and uploads command definitions', async function (assert) {
-      let command = new UpdateRoomSkillsCommand(
-        getService('command-service').commandContext,
+      let command = new UpdateRoomSkillsTool(
+        getService('tool-service').commandContext,
       );
       let skillCardId = `${testRealmURL}Skill/boxel-environment`;
       await command.execute({
@@ -246,8 +246,8 @@ Instructions live in the markdown body.
     });
 
     test('deactivates existing skills without reuploading cards', async function (assert) {
-      let command = new UpdateRoomSkillsCommand(
-        getService('command-service').commandContext,
+      let command = new UpdateRoomSkillsTool(
+        getService('tool-service').commandContext,
       );
       let skillCardId = `${testRealmURL}Skill/boxel-environment`;
       mockMatrixUtils.setRoomState(
@@ -256,7 +256,9 @@ Instructions live in the markdown body.
         {
           enabledSkillCards: [{ sourceUrl: skillCardId } as SerializedFile],
           disabledSkillCards: [],
-          commandDefinitions: [{ sourceUrl: 'command-def' } as SerializedFile],
+          toolDefinitionFileDefs: [
+            { sourceUrl: 'command-def' } as SerializedFile,
+          ],
         },
       );
 
@@ -294,8 +296,8 @@ Instructions live in the markdown body.
     });
 
     test('reactivates skills already present in room', async function (assert) {
-      let command = new UpdateRoomSkillsCommand(
-        getService('command-service').commandContext,
+      let command = new UpdateRoomSkillsTool(
+        getService('tool-service').commandContext,
       );
       let skillCardId = `${testRealmURL}Skill/boxel-environment`;
       await command.execute({
@@ -346,8 +348,8 @@ Instructions live in the markdown body.
     });
 
     test('skips invalid command definitions when uploading skills', async function (assert) {
-      let command = new UpdateRoomSkillsCommand(
-        getService('command-service').commandContext,
+      let command = new UpdateRoomSkillsTool(
+        getService('tool-service').commandContext,
       );
 
       await command.execute({
@@ -373,8 +375,8 @@ Instructions live in the markdown body.
     });
 
     test('activates a skill markdown file and uploads its command definitions', async function (assert) {
-      let command = new UpdateRoomSkillsCommand(
-        getService('command-service').commandContext,
+      let command = new UpdateRoomSkillsTool(
+        getService('tool-service').commandContext,
       );
       let skillId = `${testRealmURL}skills/markdown-skill/SKILL.md`;
       await command.execute({
@@ -409,8 +411,8 @@ 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 UpdateRoomSkillsCommand(
-        getService('command-service').commandContext,
+      let command = new UpdateRoomSkillsTool(
+        getService('tool-service').commandContext,
       );
       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/commands/use-ai-assistant-test.gts
index f03c18981ca..731c7e4c5ea 100644
--- a/packages/host/tests/integration/commands/use-ai-assistant-test.gts
+++ b/packages/host/tests/integration/commands/use-ai-assistant-test.gts
@@ -12,10 +12,10 @@ import {
   APP_BOXEL_ROOM_SKILLS_EVENT_TYPE,
 } from '@cardstack/runtime-common/matrix-constants';
 
-import type CommandService from '@cardstack/host/services/command-service';
 import RealmService from '@cardstack/host/services/realm';
-import UseAiAssistantCommand from '@cardstack/host/tools/ai-assistant';
-import OpenAiAssistantRoomCommand from '@cardstack/host/tools/open-ai-assistant-room';
+import type ToolService from '@cardstack/host/services/tool-service';
+import UseAiAssistantTool from '@cardstack/host/tools/ai-assistant';
+import OpenAiAssistantRoomTool from '@cardstack/host/tools/open-ai-assistant-room';
 
 import type { CardDef } from 'https://cardstack.com/base/card-api';
 
@@ -33,7 +33,7 @@ import {
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { setupRenderingTest } from '../../helpers/setup';
 
-let commandService: CommandService;
+let toolService: ToolService;
 
 class StubRealmService extends RealmService {
   get defaultReadableRealm() {
@@ -131,15 +131,13 @@ module('Integration | commands | ai-assistant', function (hooks) {
         },
       }),
     );
-    commandService = getService('command-service');
+    toolService = getService('tool-service');
   });
 
   test('creates a new room when no roomId is provided', async function (assert) {
     let initialRoomCount = Object.keys(getRoomIds()).length;
 
-    let aiAssistantCommand = new UseAiAssistantCommand(
-      commandService.commandContext,
-    );
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
     let result = await aiAssistantCommand.execute({
       prompt: 'Hello, new room!',
       roomName: 'My Test Room',
@@ -180,9 +178,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
       (event) => event.type === 'm.room.message',
     ).length;
 
-    let aiAssistantCommand = new UseAiAssistantCommand(
-      commandService.commandContext,
-    );
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
     await aiAssistantCommand.execute({
       prompt: 'Hello, existing room!',
       roomId,
@@ -217,9 +213,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 UseAiAssistantCommand(
-      commandService.commandContext,
-    );
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
     await aiAssistantCommand.execute({
       prompt: 'Hello with attached cards!',
       roomId,
@@ -245,9 +239,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 UseAiAssistantCommand(
-      commandService.commandContext,
-    );
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
     let result = await aiAssistantCommand.execute({
       prompt: 'Hello, new room with "new"!',
       roomId: 'new',
@@ -285,9 +277,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
       (event) => event.type === 'm.room.message',
     ).length;
 
-    let aiAssistantCommand = new UseAiAssistantCommand(
-      commandService.commandContext,
-    );
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
 
     let clientGeneratedId = 'unique-client-id-123';
     await aiAssistantCommand.execute({
@@ -328,9 +318,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
       name: 'room-with-llm-model',
     });
 
-    let aiAssistantCommand = new UseAiAssistantCommand(
-      commandService.commandContext,
-    );
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
     await aiAssistantCommand.execute({
       prompt: 'Hello with custom LLM!',
       roomId,
@@ -359,9 +347,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 UseAiAssistantCommand(
-      commandService.commandContext,
-    );
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
     await aiAssistantCommand.execute({
       prompt: 'Hello with skill cards!',
       roomId,
@@ -399,9 +385,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
       (event) => event.type === 'm.room.message',
     ).length;
 
-    let aiAssistantCommand = new UseAiAssistantCommand(
-      commandService.commandContext,
-    );
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
     await aiAssistantCommand.execute({
       roomId,
       skillCards: [skillCard1, skillCard2],
@@ -437,9 +421,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
       name: 'room-with-skill-ids',
     });
 
-    let aiAssistantCommand = new UseAiAssistantCommand(
-      commandService.commandContext,
-    );
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
     await aiAssistantCommand.execute({
       prompt: 'Hello with skill card IDs!',
       roomId,
@@ -466,9 +448,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
       name: 'room-with-attached-card-ids',
     });
 
-    let aiAssistantCommand = new UseAiAssistantCommand(
-      commandService.commandContext,
-    );
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
     await aiAssistantCommand.execute({
       prompt: 'Hello with attached card IDs!',
       roomId,
@@ -497,19 +477,19 @@ module('Integration | commands | ai-assistant', function (hooks) {
       name: 'room-to-open',
     });
 
-    // Spy on OpenAiAssistantRoomCommand execution
+    // Spy on OpenAiAssistantRoomTool execution
     let openRoomExecuted = false;
-    let originalOpenFunction = OpenAiAssistantRoomCommand.prototype.execute;
+    let originalOpenFunction = OpenAiAssistantRoomTool.prototype.execute;
 
     try {
       // @ts-expect-error abusing JS to test this
-      OpenAiAssistantRoomCommand.prototype.execute = async function (input) {
+      OpenAiAssistantRoomTool.prototype.execute = async function (input) {
         openRoomExecuted = true;
         assert.strictEqual(input.roomId, roomId, 'Room ID should match');
       };
 
-      let aiAssistantCommand = new UseAiAssistantCommand(
-        commandService.commandContext,
+      let aiAssistantCommand = new UseAiAssistantTool(
+        toolService.commandContext,
       );
       await aiAssistantCommand.execute({
         prompt: 'Hello, open this room!',
@@ -519,10 +499,10 @@ module('Integration | commands | ai-assistant', function (hooks) {
 
       assert.true(
         openRoomExecuted,
-        'OpenAiAssistantRoomCommand should be executed',
+        'OpenAiAssistantRoomTool should be executed',
       );
     } finally {
-      OpenAiAssistantRoomCommand.prototype.execute = originalOpenFunction;
+      OpenAiAssistantRoomTool.prototype.execute = originalOpenFunction;
     }
   });
 
@@ -534,9 +514,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
 
     const fileURLs = [`${testRealmURL}file1.gts`, `${testRealmURL}file2.gts`];
 
-    let aiAssistantCommand = new UseAiAssistantCommand(
-      commandService.commandContext,
-    );
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
     await aiAssistantCommand.execute({
       prompt: 'Hello with attached files!',
       roomId,
@@ -570,9 +548,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 UseAiAssistantCommand(
-      commandService.commandContext,
-    );
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
     await aiAssistantCommand.execute({
       prompt: 'Hello with open cards!',
       roomId,
@@ -599,9 +575,7 @@ module('Integration | commands | ai-assistant', function (hooks) {
       name: 'room-for-llm-mode-test',
     });
 
-    let aiAssistantCommand = new UseAiAssistantCommand(
-      commandService.commandContext,
-    );
+    let aiAssistantCommand = new UseAiAssistantTool(toolService.commandContext);
 
     // 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/commands/validate-realm-test.gts
index 5410f475bdf..d8cbd548cc4 100644
--- a/packages/host/tests/integration/commands/validate-realm-test.gts
+++ b/packages/host/tests/integration/commands/validate-realm-test.gts
@@ -5,7 +5,7 @@ import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
 import RealmService from '@cardstack/host/services/realm';
-import ValidateRealmCommand from '@cardstack/host/tools/validate-realm';
+import ValidateRealmTool from '@cardstack/host/tools/validate-realm';
 
 import {
   setupIntegrationTestRealm,
@@ -57,15 +57,15 @@ module('Integration | commands | validate-realm', function (hooks) {
   });
 
   test('returns normalized realm URL for a valid realm', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new ValidateRealmCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new ValidateRealmTool(toolService.commandContext);
     let result = await command.execute({ realmIdentifier: testRealmURL });
     assert.strictEqual(result.realmIdentifier, testRealmURL);
   });
 
   test('throws error for an invalid realm URL', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new ValidateRealmCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new ValidateRealmTool(toolService.commandContext);
     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/commands/write-binary-file-test.gts
index 657a60b17a9..f8b6e9f27ec 100644
--- a/packages/host/tests/integration/commands/write-binary-file-test.gts
+++ b/packages/host/tests/integration/commands/write-binary-file-test.gts
@@ -7,7 +7,7 @@ import { module, test } from 'qunit';
 import type NetworkService from '@cardstack/host/services/network';
 
 import RealmService from '@cardstack/host/services/realm';
-import WriteBinaryFileCommand from '@cardstack/host/tools/write-binary-file';
+import WriteBinaryFileTool from '@cardstack/host/tools/write-binary-file';
 
 import {
   setupIntegrationTestRealm,
@@ -66,8 +66,8 @@ module('Integration | commands | write-binary-file', function (hooks) {
   });
 
   test('writes a binary file', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new WriteBinaryFileCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new WriteBinaryFileTool(toolService.commandContext);
     let result = await command.execute({
       path: 'test-image.png',
       realm: testRealmURL,
@@ -117,8 +117,8 @@ module('Integration | commands | write-binary-file', function (hooks) {
       { prepend: true },
     );
 
-    let commandService = getService('command-service');
-    let command = new WriteBinaryFileCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new WriteBinaryFileTool(toolService.commandContext);
     try {
       await command.execute({
         path: 'waf-blocked.png',
@@ -147,8 +147,8 @@ module('Integration | commands | write-binary-file', function (hooks) {
   });
 
   test('handles a leading slash in the path', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new WriteBinaryFileCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new WriteBinaryFileTool(toolService.commandContext);
     let result = await command.execute({
       path: '/test-image.png',
       realm: testRealmURL,
@@ -162,8 +162,8 @@ module('Integration | commands | write-binary-file', function (hooks) {
   });
 
   test('throws an error when an invalid realm is provided', async function (assert) {
-    let commandService = getService('command-service');
-    let command = new WriteBinaryFileCommand(commandService.commandContext);
+    let toolService = getService('tool-service');
+    let command = new WriteBinaryFileTool(toolService.commandContext);
     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/commands/write-text-file-test.gts
index 8dbf4710c87..d13e83d4734 100644
--- a/packages/host/tests/integration/commands/write-text-file-test.gts
+++ b/packages/host/tests/integration/commands/write-text-file-test.gts
@@ -7,7 +7,7 @@ import { module, test } from 'qunit';
 import type NetworkService from '@cardstack/host/services/network';
 
 import RealmService from '@cardstack/host/services/realm';
-import WriteTextFileCommand from '@cardstack/host/tools/write-text-file';
+import WriteTextFileTool from '@cardstack/host/tools/write-text-file';
 
 import {
   setupIntegrationTestRealm,
@@ -62,9 +62,9 @@ module('Integration | commands | write-text-file', function (hooks) {
   });
 
   test('writes a text file', async function (assert) {
-    let commandService = getService('command-service');
-    let writeTextFileCommand = new WriteTextFileCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let writeTextFileCommand = new WriteTextFileTool(
+      toolService.commandContext,
     );
     await writeTextFileCommand.execute({
       path: 'test.txt',
@@ -77,9 +77,9 @@ module('Integration | commands | write-text-file', function (hooks) {
   });
 
   test('fails if the file already exists', async function (assert) {
-    let commandService = getService('command-service');
-    let writeTextFileCommand = new WriteTextFileCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let writeTextFileCommand = new WriteTextFileTool(
+      toolService.commandContext,
     );
     await writeTextFileCommand.execute({
       path: 'test.txt',
@@ -105,9 +105,9 @@ module('Integration | commands | write-text-file', function (hooks) {
   });
 
   test('is able to overwrite a file', async function (assert) {
-    let commandService = getService('command-service');
-    let writeTextFileCommand = new WriteTextFileCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let writeTextFileCommand = new WriteTextFileTool(
+      toolService.commandContext,
     );
     await writeTextFileCommand.execute({
       path: 'test.txt',
@@ -126,9 +126,9 @@ module('Integration | commands | write-text-file', function (hooks) {
   });
 
   test('handles a leading slash in the path', async function (assert) {
-    let commandService = getService('command-service');
-    let writeTextFileCommand = new WriteTextFileCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let writeTextFileCommand = new WriteTextFileTool(
+      toolService.commandContext,
     );
     await writeTextFileCommand.execute({
       path: '/test.txt',
@@ -141,10 +141,10 @@ module('Integration | commands | write-text-file', function (hooks) {
   });
 
   test('useNonConflictingFilename writes to a new file when content exists', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let cardService = getService('card-service');
-    let writeTextFileCommand = new WriteTextFileCommand(
-      commandService.commandContext,
+    let writeTextFileCommand = new WriteTextFileTool(
+      toolService.commandContext,
     );
     await cardService.saveSource(
       new URL('test.txt', testRealmURL),
@@ -171,10 +171,10 @@ module('Integration | commands | write-text-file', function (hooks) {
   });
 
   test('useNonConflictingFilename reuses an existing blank file', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let cardService = getService('card-service');
-    let writeTextFileCommand = new WriteTextFileCommand(
-      commandService.commandContext,
+    let writeTextFileCommand = new WriteTextFileTool(
+      toolService.commandContext,
     );
     await cardService.saveSource(
       new URL('empty.txt', testRealmURL),
@@ -204,10 +204,10 @@ module('Integration | commands | write-text-file', function (hooks) {
   });
 
   test('useNonConflictingFilename writes into an existing blank file when content is provided', async function (assert) {
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
     let cardService = getService('card-service');
-    let writeTextFileCommand = new WriteTextFileCommand(
-      commandService.commandContext,
+    let writeTextFileCommand = new WriteTextFileTool(
+      toolService.commandContext,
     );
     await cardService.saveSource(
       new URL('empty.txt', testRealmURL),
@@ -232,9 +232,9 @@ module('Integration | commands | write-text-file', function (hooks) {
   });
 
   test('throws an error when an invalid realm is provided', async function (assert) {
-    let commandService = getService('command-service');
-    let writeTextFileCommand = new WriteTextFileCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let writeTextFileCommand = new WriteTextFileTool(
+      toolService.commandContext,
     );
     try {
       await writeTextFileCommand.execute({
@@ -252,9 +252,9 @@ module('Integration | commands | write-text-file', function (hooks) {
   });
 
   test('throws when overwrite and useNonConflictingFilename are both true', async function (assert) {
-    let commandService = getService('command-service');
-    let writeTextFileCommand = new WriteTextFileCommand(
-      commandService.commandContext,
+    let toolService = getService('tool-service');
+    let writeTextFileCommand = new WriteTextFileTool(
+      toolService.commandContext,
     );
     try {
       await writeTextFileCommand.execute({
diff --git a/packages/host/tests/integration/components/ai-assistant-panel/commands-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/commands-test.gts
index e6aeafae98a..511e5146dca 100644
--- a/packages/host/tests/integration/components/ai-assistant-panel/commands-test.gts
+++ b/packages/host/tests/integration/components/ai-assistant-panel/commands-test.gts
@@ -213,14 +213,14 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
               commands: [
                 {
                   codeRef: {
-                    name: 'SearchCardsByTypeAndTitleCommand',
+                    name: 'SearchCardsByTypeAndTitleTool',
                     module: '@cardstack/boxel-host/commands/search-cards',
                   },
                   requiresApproval: false,
                 },
                 {
                   codeRef: {
-                    name: 'SearchCardsByQueryCommand',
+                    name: 'SearchCardsByQueryTool',
                     module: '@cardstack/boxel-host/commands/search-cards',
                   },
                   requiresApproval: false,
@@ -383,15 +383,15 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
       },
     });
 
-    await waitFor('[data-test-command-apply]');
+    await waitFor('[data-test-tool-call-apply]');
     this.onSave((_, json) => {
       if (typeof json === 'string') {
         throw new Error('expected JSON save data');
       }
       assert.strictEqual(json.data.attributes?.firstName, 'Dave');
     });
-    await click('[data-test-command-apply]');
-    await waitFor('[data-test-command-card-idle]');
+    await click('[data-test-tool-call-apply]');
+    await waitFor('[data-test-tool-call-card-idle]');
     assert.dom('[data-test-person]').hasText('Dave');
   });
 
@@ -435,9 +435,11 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     await click('[data-test-open-ai-assistant]');
     await waitFor('[data-test-room-name="test room 1"]');
     assert.dom('[data-test-message-idx]').exists({ count: 1 });
-    await waitFor('[data-test-message-idx="0"] [data-test-command-apply]');
+    await waitFor('[data-test-message-idx="0"] [data-test-tool-call-apply]');
     assert
-      .dom('[data-test-message-idx="0"] [data-test-command-apply="preparing"]')
+      .dom(
+        '[data-test-message-idx="0"] [data-test-tool-call-apply="preparing"]',
+      )
       .exists();
   });
 
@@ -514,9 +516,11 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     await click('[data-test-open-ai-assistant]');
     await waitFor('[data-test-room-name="test room 1"]');
     assert.dom('[data-test-message-idx]').exists({ count: 1 });
-    await waitFor('[data-test-message-idx="0"] [data-test-command-apply]');
+    await waitFor('[data-test-message-idx="0"] [data-test-tool-call-apply]');
     assert
-      .dom('[data-test-message-idx="0"] [data-test-command-apply="preparing"]')
+      .dom(
+        '[data-test-message-idx="0"] [data-test-tool-call-apply="preparing"]',
+      )
       .exists({ count: 1 });
 
     simulateRemoteMessage(roomId, '@aibot:localhost', {
@@ -556,9 +560,11 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     await settled();
 
     assert.dom('[data-test-message-idx]').exists({ count: 1 });
-    await waitFor('[data-test-message-idx="0"] [data-test-command-apply]');
+    await waitFor('[data-test-message-idx="0"] [data-test-tool-call-apply]');
     assert
-      .dom('[data-test-message-idx="0"] [data-test-command-apply="preparing"]')
+      .dom(
+        '[data-test-message-idx="0"] [data-test-tool-call-apply="preparing"]',
+      )
       .exists({ count: 2 });
 
     simulateRemoteMessage(roomId, '@aibot:localhost', {
@@ -598,12 +604,14 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     await settled();
 
     assert.dom('[data-test-message-idx]').exists({ count: 1 });
-    await waitFor('[data-test-message-idx="0"] [data-test-command-apply]');
+    await waitFor('[data-test-message-idx="0"] [data-test-tool-call-apply]');
     assert
-      .dom('[data-test-message-idx="0"] [data-test-command-apply="preparing"]')
+      .dom(
+        '[data-test-message-idx="0"] [data-test-tool-call-apply="preparing"]',
+      )
       .exists({ count: 0 });
     assert
-      .dom('[data-test-message-idx="0"] [data-test-command-apply="ready"]')
+      .dom('[data-test-message-idx="0"] [data-test-tool-call-apply="ready"]')
       .exists({ count: 2 });
   });
 
@@ -655,9 +663,9 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
 
     await click('[data-test-open-ai-assistant]');
     await waitFor('[data-test-room-name="test room 1"]');
-    await waitFor('[data-test-message-idx="0"] [data-test-command-apply]');
-    await click('[data-test-message-idx="0"] [data-test-command-apply]');
-    await waitFor('[data-test-command-card-idle]');
+    await waitFor('[data-test-message-idx="0"] [data-test-tool-call-apply]');
+    await click('[data-test-message-idx="0"] [data-test-tool-call-apply]');
+    await waitFor('[data-test-tool-call-card-idle]');
 
     assert
       .dom('[data-test-message-idx="0"] [data-test-apply-state="applied"]')
@@ -734,9 +742,9 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     await settled();
     await click('[data-test-open-ai-assistant]');
     await waitFor('[data-test-room-name="test room 1"]');
-    await waitFor('[data-test-message-idx="0"] [data-test-command-apply]');
-    await click('[data-test-message-idx="0"] [data-test-command-apply]');
-    await waitFor('[data-test-command-card-idle]');
+    await waitFor('[data-test-message-idx="0"] [data-test-tool-call-apply]');
+    await click('[data-test-message-idx="0"] [data-test-tool-call-apply]');
+    await waitFor('[data-test-tool-call-card-idle]');
 
     assert
       .dom('[data-test-message-idx="0"] [data-test-apply-state="applied"]')
@@ -797,7 +805,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
         },
       },
     });
-    await waitFor('[data-test-command-result-header]', { timeout: 10_000 });
+    await waitFor('[data-test-tool-result-header]', { timeout: 10_000 });
     assert
       .dom('[data-test-ai-message-content]')
       .containsText('Search for the following card');
@@ -842,7 +850,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
         },
       },
     });
-    await waitFor('[data-test-command-result-header]', { timeout: 10_000 });
+    await waitFor('[data-test-tool-result-header]', { timeout: 10_000 });
     assert
       .dom('[data-test-ai-message-content]')
       .containsText('Search for the following card');
@@ -886,7 +894,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
         },
       },
     });
-    await waitFor('[data-test-command-result-header]');
+    await waitFor('[data-test-tool-result-header]');
     assert.dom('.result-list li:nth-child(6)').doesNotExist();
     assert
       .dom('[data-test-toggle-show-button]')
@@ -943,7 +951,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
         },
       },
     });
-    await waitFor('[data-test-command-result-header]');
+    await waitFor('[data-test-tool-result-header]');
     assert.dom(`[data-test-stack-card="${id}"]`).exists();
     assert
       .dom('[data-test-message-idx="0"] [data-test-boxel-card-header-title]')
@@ -958,7 +966,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     assert.dom(rightStackItem).doesNotExist();
 
     await click(
-      '[data-test-command-result-container] [data-test-more-options-button]',
+      '[data-test-tool-result-container] [data-test-more-options-button]',
     );
     await click('[data-test-boxel-menu-item-text="Copy to Workspace"]');
     assert
@@ -968,7 +976,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     const savedCardId = document
       .querySelector(rightStackItem)
       ?.getAttribute('data-stack-card');
-    const savedCard = `[data-test-card="${savedCardId}"] [data-test-command-result-isolated]`;
+    const savedCard = `[data-test-card="${savedCardId}"] [data-test-tool-result-isolated]`;
     assert.dom(`${savedCard} header`).hasText('Search Results 8 Results');
     assert.dom(`${savedCard} [data-test-boxel-field]`).exists({ count: 2 });
     assert
@@ -1015,10 +1023,10 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
         },
       },
     });
-    await waitFor('[data-test-command-result-header]');
+    await waitFor('[data-test-tool-result-header]');
 
     await click(
-      '[data-test-command-result-container] [data-test-more-options-button]',
+      '[data-test-tool-result-container] [data-test-more-options-button]',
     );
     assert.dom('[data-test-boxel-menu-item-text="Copy to Workspace"]').exists();
   });
@@ -1054,12 +1062,10 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
         },
       },
     });
-    await waitFor('[data-test-command-result-header]');
+    await waitFor('[data-test-tool-result-header]');
 
     assert
-      .dom(
-        '[data-test-command-result-container] [data-test-more-options-button]',
-      )
+      .dom('[data-test-tool-result-container] [data-test-more-options-button]')
       .doesNotExist();
     assert
       .dom('[data-test-boxel-menu-item-text="Copy to Workspace"]')
@@ -1097,7 +1103,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
         },
       },
     });
-    await waitFor('[data-test-command-result-header]');
+    await waitFor('[data-test-tool-result-header]');
     assert.dom(`[data-test-stack-card="${id}"]`).exists();
     await click('[data-test-close-button]'); // close the last open card
     assert.dom(`[data-test-stack-card="${id}"]`).doesNotExist();
@@ -1108,9 +1114,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
       .containsText('Search Results');
 
     assert
-      .dom(
-        '[data-test-command-result-container] [data-test-toggle-show-button]',
-      )
+      .dom('[data-test-tool-result-container] [data-test-toggle-show-button]')
       .containsText('Show 3 more results');
     let resultListItem = '[data-test-result-list] > li';
     assert.dom(`${resultListItem}:nth-child(1)`).containsText('Buck');
@@ -1121,7 +1125,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     assert.dom(stackItem).doesNotExist();
 
     await click(
-      '[data-test-command-result-container] [data-test-more-options-button]',
+      '[data-test-tool-result-container] [data-test-more-options-button]',
     );
     await click('[data-test-boxel-menu-item-text="Copy to Workspace"]');
     assert
@@ -1131,7 +1135,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     const savedCardId = document
       .querySelector(stackItem)
       ?.getAttribute('data-stack-card');
-    const savedCard = `[data-test-card="${savedCardId}"] [data-test-command-result-isolated]`;
+    const savedCard = `[data-test-card="${savedCardId}"] [data-test-tool-result-isolated]`;
     assert.dom(`${savedCard} header`).hasText('Search Results 8 Results');
     assert.dom(`${savedCard} [data-test-boxel-field]`).exists({ count: 2 });
     assert
@@ -1257,9 +1261,11 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     await click('[data-test-open-ai-assistant]');
     await waitFor('[data-test-room-name="test room 1"]');
     assert.dom('[data-test-message-idx]').exists({ count: 1 });
-    await waitFor('[data-test-message-idx="0"] [data-test-command-apply]');
+    await waitFor('[data-test-message-idx="0"] [data-test-tool-call-apply]');
     assert
-      .dom('[data-test-message-idx="0"] [data-test-command-apply="preparing"]')
+      .dom(
+        '[data-test-message-idx="0"] [data-test-tool-call-apply="preparing"]',
+      )
       .exists({ count: 1 });
 
     simulateRemoteMessage(roomId, '@aibot:localhost', {
@@ -1300,9 +1306,11 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     await settled();
 
     assert.dom('[data-test-message-idx]').exists({ count: 1 });
-    await waitFor('[data-test-message-idx="0"] [data-test-command-apply]');
+    await waitFor('[data-test-message-idx="0"] [data-test-tool-call-apply]');
     assert
-      .dom('[data-test-message-idx="0"] [data-test-command-apply="preparing"]')
+      .dom(
+        '[data-test-message-idx="0"] [data-test-tool-call-apply="preparing"]',
+      )
       .exists({ count: 2 });
 
     simulateRemoteMessage(roomId, '@aibot:localhost', {
@@ -1343,12 +1351,14 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     await settled();
 
     assert.dom('[data-test-message-idx]').exists({ count: 1 });
-    await waitFor('[data-test-message-idx="0"] [data-test-command-apply]');
+    await waitFor('[data-test-message-idx="0"] [data-test-tool-call-apply]');
     assert
-      .dom('[data-test-message-idx="0"] [data-test-command-apply="preparing"]')
+      .dom(
+        '[data-test-message-idx="0"] [data-test-tool-call-apply="preparing"]',
+      )
       .exists({ count: 0 });
     assert
-      .dom('[data-test-message-idx="0"] [data-test-command-apply="ready"]')
+      .dom('[data-test-message-idx="0"] [data-test-tool-call-apply="ready"]')
       .exists({ count: 2 });
   });
 
@@ -1405,9 +1415,9 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
 
     await settled();
 
-    await waitFor('[data-test-message-idx="0"] [data-test-command-apply]');
-    await click('[data-test-message-idx="0"] [data-test-command-apply]');
-    await waitFor('[data-test-command-card-idle]');
+    await waitFor('[data-test-message-idx="0"] [data-test-tool-call-apply]');
+    await click('[data-test-message-idx="0"] [data-test-tool-call-apply]');
+    await waitFor('[data-test-tool-call-card-idle]');
 
     assert
       .dom('[data-test-message-idx="0"] [data-test-apply-state="applied"]')
@@ -1496,9 +1506,9 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
 
     await settled();
 
-    await waitFor('[data-test-message-idx="0"] [data-test-command-apply]');
-    await click('[data-test-message-idx="0"] [data-test-command-apply]');
-    await waitFor('[data-test-command-card-idle]');
+    await waitFor('[data-test-message-idx="0"] [data-test-tool-call-apply]');
+    await click('[data-test-message-idx="0"] [data-test-tool-call-apply]');
+    await waitFor('[data-test-tool-call-card-idle]');
 
     assert
       .dom('[data-test-message-idx="0"] [data-test-apply-state="applied"]')
@@ -1534,11 +1544,11 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     );
   });
 
-  // The host's MessageCommand.eventId is captured from the bot message's
+  // The host's MessageTool.eventId is captured from the bot message's
   // effectiveEventId at construction time and never refreshes. When a tool_call
   // first appears on a later m.replace event, the bot message's "current"
   // event_id (in room.events) is the m.replace's event_id — but
-  // MessageCommand.eventId is the parent/original. Emitting a commandResult
+  // MessageTool.eventId is the parent/original. Emitting a commandResult
   // bound to the parent id can disagree with what ai-bot's `getRoomEvents`
   // reads via /messages, so the host sources the linkage event_id from
   // current room state at execute time.
@@ -1557,7 +1567,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
 
     let commandRequestId = 'cmd-request-id';
 
-    // Streaming event #1: original bot message, no commandRequests yet.
+    // Streaming event #1: original bot message, no toolRequests yet.
     let streamingEventId = simulateRemoteMessage(roomId, '@aibot:localhost', {
       msgtype: APP_BOXEL_MESSAGE_MSGTYPE,
       body: 'Changing',
@@ -1568,7 +1578,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     // Streaming event #2: m.replace adding the tool_call. After this,
     // room.events has both events. The latest event with the matching
     // commandRequestId is the m.replace event (replacedEventId), while
-    // MessageCommand.eventId is streamingEventId because getEffectiveEventId
+    // MessageTool.eventId is streamingEventId because getEffectiveEventId
     // resolves replace events to their parent and updateMessage refreshes
     // content but not eventId. The host emits
     // commandResult.m.relates_to.event_id = replacedEventId — what room.events
@@ -1599,11 +1609,11 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     await settled();
     await click('[data-test-open-ai-assistant]');
     await waitFor('[data-test-room-name="test room 1"]');
-    await waitFor('[data-test-message-idx="0"] [data-test-command-apply]');
-    await click('[data-test-message-idx="0"] [data-test-command-apply]');
-    await waitFor('[data-test-command-card-idle]');
+    await waitFor('[data-test-message-idx="0"] [data-test-tool-call-apply]');
+    await click('[data-test-message-idx="0"] [data-test-tool-call-apply]');
+    await waitFor('[data-test-tool-call-card-idle]');
 
-    // The host's MessageCommand must reach 'applied' state once the
+    // The host's MessageTool must reach 'applied' state once the
     // commandResult is dispatched. _messageCache is keyed by the bot
     // message's effective/parent id (streamingEventId), but the dispatched
     // commandResult.m.relates_to.event_id is the latest m.replace
@@ -1614,7 +1624,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     assert
       .dom('[data-test-message-idx="0"] [data-test-apply-state="applied"]')
       .exists(
-        'MessageCommand status should flip to applied even though commandResult.m.relates_to.event_id is the m.replace id, not the streaming id the cache is keyed by',
+        'MessageTool status should flip to applied even though commandResult.m.relates_to.event_id is the m.replace id, not the streaming id the cache is keyed by',
       );
 
     let commandResultEvents = getRoomEvents(roomId).filter(
@@ -1632,12 +1642,12 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     assert.strictEqual(
       commandResultEvents[0].content['m.relates_to']?.event_id,
       replacedEventId,
-      'commandResult.m.relates_to.event_id should be the bot message event_id currently in room.events that owns the commandRequest, not a stale snapshot of the streaming/original id',
+      'commandResult.m.relates_to.event_id should be the bot message event_id currently in room.events that owns the toolRequest, not a stale snapshot of the streaming/original id',
     );
     assert.notStrictEqual(
       commandResultEvents[0].content['m.relates_to']?.event_id,
       streamingEventId,
-      'commandResult should not reference the original/streaming event_id once a later event in room.events owns the commandRequest',
+      'commandResult should not reference the original/streaming event_id once a later event in room.events owns the toolRequest',
     );
   });
 
@@ -1819,7 +1829,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     // checkCorrectness is on the always-auto-execute list (one of three
     // branches in isAutoExecutableCommand). Before the fix, the manual
     // approval bar painted for the ~100ms debounce window before
-    // command-service flipped `acceptingAllRoomIds`; the user saw
+    // tool-service flipped `acceptingAllRoomIds`; the user saw
     // Accept All / Cancel briefly appear then disappear. The bar must
     // never paint in its manual-approval branch for any auto-executed
     // command, regardless of which condition triggers auto-execute.
@@ -1883,7 +1893,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 MessageCommand.requiresApproval is false here — the second
+    // so MessageTool.requiresApproval is false here — the second
     // isAutoExecutableCommand branch. The fix must also suppress the
     // Accept All bar for this path.
     await addSkillToAiAssistant(`${testRealmURL}Skill/boxel-environment`);
@@ -1925,7 +1935,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
 
     // The per-command Apply button (rendered next to each tool-call message)
     // has the same race as the Accept All bar: between "message lands"
-    // and "command-service starts the run", a ready Run button would
+    // and "tool-service starts the run", a ready Run button would
     // briefly render. The fix presents the applying-spinner immediately
     // for any auto-executable command.
     simulateRemoteMessage(roomId, '@aibot:localhost', {
@@ -1947,25 +1957,25 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
       },
     });
 
-    await waitFor('[data-test-message-idx="0"] [data-test-command-apply]');
+    await waitFor('[data-test-message-idx="0"] [data-test-tool-call-apply]');
     assert
-      .dom('[data-test-message-idx="0"] [data-test-command-apply="ready"]')
+      .dom('[data-test-message-idx="0"] [data-test-tool-call-apply="ready"]')
       .doesNotExist(
         'per-command Apply button must not show the ready/Run state for an auto-executed command',
       );
     assert
-      .dom('[data-test-message-idx="0"] [data-test-command-apply="applying"]')
+      .dom('[data-test-message-idx="0"] [data-test-tool-call-apply="applying"]')
       .exists('per-command Apply button shows the applying spinner instead');
-    // The data-test-command-card-idle attribute is computed from
+    // The data-test-tool-call-card-idle attribute is computed from
     // applyButtonState (not the raw status); while the synthetic 'applying'
     // is on it must NOT mark the card idle. Glimmer omits an attribute
     // bound to a falsy expression, so the coherence check is on attribute
     // presence — the apply button + the card must agree the spinner is
     // up, not just one of them.
     assert
-      .dom('[data-test-message-idx="0"] [data-test-command-card-idle]')
+      .dom('[data-test-message-idx="0"] [data-test-tool-call-card-idle]')
       .doesNotExist(
-        'data-test-command-card-idle agrees with applyButtonState while the synthetic spinner is on',
+        'data-test-tool-call-card-idle agrees with applyButtonState while the synthetic spinner is on',
       );
   });
 
@@ -1973,10 +1983,10 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     let roomId = await renderAiAssistantPanel();
 
     // Verifies the followup-fix for the synthetic-spinner hang flagged in
-    // the self-review of this branch: drainCommandProcessingQueue must
+    // the self-review of this branch: drainToolProcessingQueue must
     // dispatch an `invalid` commandResult when a room is wedged, so the
-    // synthetic 'applying' state in room-message-command.gts falls through
-    // to the invalidCommandState ("Try Anyway") branch instead of pinning
+    // synthetic 'applying' state in room-message-tool.gts falls through
+    // to the invalidToolCallState ("Try Anyway") branch instead of pinning
     // a spinner that no terminal event ever clears.
     //
     // Driving the real wait-loop end-to-end is unstable: roomResource is
@@ -1984,11 +1994,11 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     // processingLastStartedAt silently no-op, and there's no public seam
     // to keep the processRoomTask "running" without rewriting the
     // resource itself. Instead, exercise the helper directly with a
-    // spied sendCommandResultEvent on matrixService — this proves the
+    // spied sendToolResultEvent on matrixService — this proves the
     // dispatch shape, the per-command iteration, and the failureReason
     // text without depending on the proxy internals.
     let matrixService = getService('matrix-service');
-    let commandService = getService('command-service');
+    let toolService = getService('tool-service');
 
     simulateRemoteMessage(roomId, '@aibot:localhost', {
       body: 'checking correctness',
@@ -2018,17 +2028,15 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
         },
       },
     });
-    await waitFor('[data-test-message-idx="0"] [data-test-command-apply]');
+    await waitFor('[data-test-message-idx="0"] [data-test-tool-call-apply]');
 
     let roomResource = matrixService.roomResources.get(roomId)!;
-    let message = roomResource.messages.find(
-      (m: any) => m.commands?.length === 2,
-    );
+    let message = roomResource.messages.find((m: any) => m.tools?.length === 2);
     assert.ok(message, 'two-command bot message lands in the room resource');
 
     let captured: Array<{ toolCallId: string; failureReason?: string }> = [];
-    let originalSend = matrixService.sendCommandResultEvent.bind(matrixService);
-    (matrixService as any).sendCommandResultEvent = async (params: any) => {
+    let originalSend = matrixService.sendToolResultEvent.bind(matrixService);
+    (matrixService as any).sendToolResultEvent = async (params: any) => {
       captured.push({
         toolCallId: params.toolCallId,
         failureReason: params.failureReason,
@@ -2036,14 +2044,14 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
     };
     try {
       await (
-        commandService as any
+        toolService as any
       ).invalidateAutoExecutableCommandsForStuckProcessing(
         roomResource,
         roomId,
         message!.eventId,
       );
     } finally {
-      (matrixService as any).sendCommandResultEvent = originalSend;
+      (matrixService as any).sendToolResultEvent = originalSend;
     }
 
     assert.strictEqual(
@@ -2060,7 +2068,7 @@ module('Integration | ai-assistant-panel | commands', function (hooks) {
       (captured[0]?.failureReason ?? '').startsWith(
         'Room processing did not finish within',
       ),
-      'failureReason surfaces the stuck-processing cause for the invalidCommandState alert',
+      'failureReason surfaces the stuck-processing cause for the invalidToolCallState alert',
     );
   });
 
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 eb23d4b0ea7..a06e199190b 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
@@ -183,8 +183,8 @@ module('Integration | ai-assistant-panel | skills', function (hooks) {
         }),
         'search-and-open-card-command.ts': `
             import { Command } from '@cardstack/runtime-common';
-            import { SearchCardsByTypeAndTitleCommand } from '@cardstack/boxel-host/commands/search-cards';
-            import ShowCardCommand from '@cardstack/boxel-host/commands/show-card';
+            import { SearchCardsByTypeAndTitleTool } from '@cardstack/boxel-host/commands/search-cards';
+            import ShowCardTool from '@cardstack/boxel-host/commands/show-card';
             import type { SearchCardsByTypeAndTitleInput } from 'https://cardstack.com/base/commands/search-card-result';
 
             export default class SearchAndOpenCardCommand extends Command<
@@ -194,19 +194,19 @@ module('Integration | ai-assistant-panel | skills', function (hooks) {
               static displayName = 'SearchAndOpenCardCommand';
               static actionVerb = 'Search';
               async getInputType() {
-                return new SearchCardsByTypeAndTitleCommand(
+                return new SearchCardsByTypeAndTitleTool(
                   this.commandContext,
                 ).getInputType();
               }
               protected async run(
                 input: SearchCardsByTitleInput,
               ): Promise<undefined> {
-                let searchCommand = new SearchCardsByTypeAndTitleCommand(
+                let searchCommand = new SearchCardsByTypeAndTitleTool(
                   this.commandContext,
                 );
                 let searchResult = await searchCommand.execute(input);
                 if (searchResult.cardIds.length > 0) {
-                  let showCardCommand = new ShowCardCommand(this.commandContext);
+                  let showCardCommand = new ShowCardTool(this.commandContext);
                   await showCardCommand.execute({
                     cardId: searchResult.cardIds[0],
                   });
@@ -959,8 +959,8 @@ Instructions live in the markdown body.
     });
     await settled();
     // Click on the apply button, skill card will be updated since it has changed
-    await waitFor('[data-test-message-idx="0"] [data-test-command-apply]');
-    await click('[data-test-message-idx="0"] [data-test-command-apply]');
+    await waitFor('[data-test-message-idx="0"] [data-test-tool-call-apply]');
+    await click('[data-test-message-idx="0"] [data-test-tool-call-apply]');
 
     const finalRoomStateSkillsJson = getRoomState(
       roomId,
diff --git a/packages/host/tests/integration/components/ai-module-creation-test.gts b/packages/host/tests/integration/components/ai-module-creation-test.gts
index 381f4467a56..e0197954d78 100644
--- a/packages/host/tests/integration/components/ai-module-creation-test.gts
+++ b/packages/host/tests/integration/components/ai-module-creation-test.gts
@@ -217,8 +217,8 @@ module('Integration | create app module via ai-assistant', function (hooks) {
       },
     });
 
-    await waitFor('[data-test-command-apply="ready"]');
-    await click('[data-test-command-apply="ready"]');
+    await waitFor('[data-test-tool-call-apply="ready"]');
+    await click('[data-test-tool-call-apply="ready"]');
     assert.dom('[data-test-view-module]').exists();
     let moduleURL = (
       document.querySelector('[data-test-view-module]') as HTMLElement
diff --git a/packages/host/tests/integration/components/realm-field-test.gts b/packages/host/tests/integration/components/realm-field-test.gts
index 24717da786a..c07cf1eac62 100644
--- a/packages/host/tests/integration/components/realm-field-test.gts
+++ b/packages/host/tests/integration/components/realm-field-test.gts
@@ -84,8 +84,8 @@ module('Integration | components | realm field', function (hooks) {
   hooks.beforeEach(function (this: RenderingTestContext) {
     loader = getService('loader-service').loader;
 
-    const commandService = getService('command-service');
-    commandContext = commandService.commandContext;
+    const toolService = getService('tool-service');
+    commandContext = toolService.commandContext;
 
     const store = getService('store');
 
diff --git a/packages/host/tests/unit/is-markdown-skill-id-test.ts b/packages/host/tests/unit/is-markdown-skill-id-test.ts
index 04c08768c56..f7d17a79b59 100644
--- a/packages/host/tests/unit/is-markdown-skill-id-test.ts
+++ b/packages/host/tests/unit/is-markdown-skill-id-test.ts
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 
-import { isMarkdownSkillId } from '@cardstack/host/lib/skill-commands';
+import { isMarkdownSkillId } from '@cardstack/host/lib/skill-tools';
 
 // `isMarkdownSkillId` drives the load-type dispatch for skills: a true result
 // loads through the `file-meta` read type, false loads as a card. Lock the
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 6869c296f05..49a5ec3d715 100644
--- a/packages/host/tests/unit/lib/command-auto-execute-test.ts
+++ b/packages/host/tests/unit/lib/command-auto-execute-test.ts
@@ -3,7 +3,7 @@ import { module, test } from 'qunit';
 import {
   CHECK_CORRECTNESS_COMMAND_NAME,
   isAutoExecutableCommand,
-} from '@cardstack/host/lib/command-auto-execute';
+} from '@cardstack/host/lib/tool-auto-execute';
 
 type AutoExecCommandInput = Parameters<typeof isAutoExecutableCommand>[0];
 
@@ -15,7 +15,7 @@ function cmd(
   return { name, requiresApproval, executedBy };
 }
 
-module('Unit | Lib | command-auto-execute', function () {
+module('Unit | Lib | tool-auto-execute', function () {
   test('check-correctness commands auto-execute regardless of mode or approval flag', function (assert) {
     assert.true(
       isAutoExecutableCommand(
@@ -96,7 +96,7 @@ module('Unit | Lib | command-auto-execute', function () {
   });
 
   test('commands owned by another agent never auto-execute', function (assert) {
-    // Mirrors the agentId gate in command-service.drainCommandProcessingQueue:
+    // Mirrors the agentId gate in tool-service.drainToolProcessingQueue:
     // a command whose message came from a different agent must not auto-run
     // on this host, even if it would otherwise satisfy one of the auto-exec
     // branches. UI callers rely on this so the manual approval bar / per-
diff --git a/packages/host/tests/unit/lib/command-definitions-test.ts b/packages/host/tests/unit/lib/command-definitions-test.ts
index 2a0b1da1ebe..d30957c68a1 100644
--- a/packages/host/tests/unit/lib/command-definitions-test.ts
+++ b/packages/host/tests/unit/lib/command-definitions-test.ts
@@ -1,14 +1,14 @@
 import { module, test } from 'qunit';
 
 import {
-  getUniqueValidCommandDefinitions,
+  getUniqueValidToolDefinitions,
   isValidCommandDefinition,
-} from '@cardstack/host/lib/command-definitions';
+} from '@cardstack/host/lib/tool-definitions';
 
 import type * as SkillModule from 'https://cardstack.com/base/skill';
 
-function asCommand(command: unknown): SkillModule.CommandField {
-  return command as unknown as SkillModule.CommandField;
+function asCommand(command: unknown): SkillModule.ToolField {
+  return command as unknown as SkillModule.ToolField;
 }
 
 module('Unit | Lib | command-definitions', function () {
@@ -68,7 +68,7 @@ module('Unit | Lib | command-definitions', function () {
       requiresApproval: false,
     });
 
-    let results = getUniqueValidCommandDefinitions([
+    let results = getUniqueValidToolDefinitions([
       asCommand({ ...baseCommand, codeRef: undefined }),
       asCommand(baseCommand),
       asCommand({ ...baseCommand }),
diff --git a/packages/matrix/tests/commands.spec.ts b/packages/matrix/tests/commands.spec.ts
index 547e126818a..079ac472f8c 100644
--- a/packages/matrix/tests/commands.spec.ts
+++ b/packages/matrix/tests/commands.spec.ts
@@ -210,9 +210,11 @@ test.describe('Commands', () => {
       commandRequestId,
       content,
     );
-    let command = page.locator(`[data-test-command-id="${commandRequestId}"]`);
+    let command = page.locator(
+      `[data-test-tool-call-id="${commandRequestId}"]`,
+    );
     await command.waitFor();
-    await command.locator('[data-test-command-apply]').click();
+    await command.locator('[data-test-tool-call-apply]').click();
 
     await expect(async () => {
       let events = await getRoomEvents(username, password, room1);
@@ -264,9 +266,11 @@ test.describe('Commands', () => {
       commandRequestId,
       content,
     );
-    let command = page.locator(`[data-test-command-id="${commandRequestId}"]`);
+    let command = page.locator(
+      `[data-test-tool-call-id="${commandRequestId}"]`,
+    );
     await command.waitFor();
-    await command.locator('[data-test-command-apply]').click();
+    await command.locator('[data-test-tool-call-apply]').click();
 
     await expect(async () => {
       let events = await getRoomEvents(username, password, room1);
@@ -371,7 +375,7 @@ test.describe('Commands', () => {
     // local echo — synapse's /messages stream can still lag a beat behind.
     // Poll until the user message (and its data.context.agentId) is visible
     // via /messages; without this the bot putEvent below carries
-    // `agentId: undefined`, and command-service's auto-execute gate
+    // `agentId: undefined`, and tool-service's auto-execute gate
     // (`message.agentId !== matrixService.agentId`) skips the command.
     let roomEvents: any[] = [];
     let agentId: string | undefined;
@@ -415,7 +419,7 @@ test.describe('Commands', () => {
     );
 
     await expect(
-      page.locator('[data-test-message-idx="1"] [data-test-command-id]'),
+      page.locator('[data-test-message-idx="1"] [data-test-tool-call-id]'),
     ).not.toHaveClass(/is-failed/);
 
     // check we're in code mode
@@ -488,7 +492,7 @@ test.describe('Commands', () => {
     );
 
     await expect(
-      page.locator('[data-test-message-idx="3"] [data-test-command-id]'),
+      page.locator('[data-test-message-idx="3"] [data-test-tool-call-id]'),
     ).not.toHaveClass(/is-failed/);
 
     // check we're in interact mode
diff --git a/packages/matrix/tests/correctness-checks.spec.ts b/packages/matrix/tests/correctness-checks.spec.ts
index be88e33af36..bf9a278c0b1 100644
--- a/packages/matrix/tests/correctness-checks.spec.ts
+++ b/packages/matrix/tests/correctness-checks.spec.ts
@@ -136,7 +136,7 @@ test.describe('Correctness Checks', () => {
 
     // Wait for the command to render
     let commandContainer = page.locator(
-      `[data-test-command-id="${commandRequestId}"]`,
+      `[data-test-tool-call-id="${commandRequestId}"]`,
     );
     await commandContainer.waitFor();
 
@@ -313,7 +313,7 @@ ${brokenContent}
     );
 
     let failingCommandContainer = page.locator(
-      `[data-test-command-id="${failingCommandRequestId}"]`,
+      `[data-test-tool-call-id="${failingCommandRequestId}"]`,
     );
     await failingCommandContainer.waitFor();
 
@@ -455,7 +455,7 @@ ${originalContent}
     );
 
     let finalCommandContainer = page.locator(
-      `[data-test-command-id="${finalCommandRequestId}"]`,
+      `[data-test-tool-call-id="${finalCommandRequestId}"]`,
     );
     await finalCommandContainer.waitFor();
     await finalCommandContainer
@@ -668,7 +668,7 @@ ${brokenModuleContent}
       );
 
       let commandContainer = page.locator(
-        `[data-test-command-id="${commandRequestId}"]`,
+        `[data-test-tool-call-id="${commandRequestId}"]`,
       );
       await commandContainer.waitFor();
       await commandContainer
diff --git a/packages/runtime-common/commands.ts b/packages/runtime-common/commands.ts
index b253cd77d84..03066ef9717 100644
--- a/packages/runtime-common/commands.ts
+++ b/packages/runtime-common/commands.ts
@@ -16,7 +16,7 @@ import type { EncodedCommandRequest } from '../base/matrix-event.gts';
 // readRealmFile).
 export const AI_BOT_EXECUTOR = 'ai-bot';
 
-export interface CommandRequest {
+export interface ToolRequest {
   id: string;
   name: string;
   arguments: { [key: string]: any };
@@ -199,12 +199,12 @@ export function buildCommandFunctionNameFromResolvedRef(ref: {
 
 export function decodeCommandRequest(
   commandRequest: Partial<EncodedCommandRequest>,
-): Partial<CommandRequest> {
+): Partial<ToolRequest> {
   if (typeof commandRequest.arguments === 'object') {
     // backwards compatibility for older format
-    return commandRequest as Partial<CommandRequest>;
+    return commandRequest as Partial<ToolRequest>;
   }
-  let decodedCommandRequest: Partial<CommandRequest> = {};
+  let decodedCommandRequest: Partial<ToolRequest> = {};
   if (commandRequest.id) {
     decodedCommandRequest.id = commandRequest.id;
   }
@@ -229,7 +229,7 @@ export function decodeCommandRequest(
 }
 
 export function encodeCommandRequest(
-  commandRequest: Partial<CommandRequest>,
+  commandRequest: Partial<ToolRequest>,
 ): Partial<EncodedCommandRequest> {
   if (typeof commandRequest.arguments === 'string') {
     // backwards compatibility for older format
@@ -252,7 +252,10 @@ export function encodeCommandRequest(
 }
 
 export function encodeCommandRequests(
-  commandRequests: Partial<CommandRequest>[],
+  commandRequests: Partial<ToolRequest>[],
 ): Partial<EncodedCommandRequest>[] {
   return commandRequests.map(encodeCommandRequest);
 }
+
+// Pre-rename spelling; new code imports `ToolRequest`.
+export type CommandRequest = ToolRequest;
diff --git a/packages/software-factory/src/parse-execution.ts b/packages/software-factory/src/parse-execution.ts
index 1c4688df222..5fccc34a987 100644
--- a/packages/software-factory/src/parse-execution.ts
+++ b/packages/software-factory/src/parse-execution.ts
@@ -627,8 +627,9 @@ export async function runGlintCheck(
             'https://cardstack.com/base/*': [`${BASE_PKG_PATH}/*`],
             '@cardstack/host/tests/*': [`${HOST_PKG_PATH}/tests/*`],
             '@cardstack/host/*': [`${HOST_PKG_PATH}/app/*`],
+            '@cardstack/boxel-host/tools/*': [`${HOST_PKG_PATH}/app/tools/*`],
             '@cardstack/boxel-host/commands/*': [
-              `${HOST_PKG_PATH}/app/commands/*`,
+              `${HOST_PKG_PATH}/app/tools/*`,
             ],
             '@cardstack/boxel-ui/*': [
               `${join(PACKAGES_PATH, 'boxel-ui', 'addon', 'src')}/*`,
diff --git a/packages/test-realm-cards/contents/ai-command-example.gts b/packages/test-realm-cards/contents/ai-command-example.gts
index 6983af6fc6d..038a8f625b3 100644
--- a/packages/test-realm-cards/contents/ai-command-example.gts
+++ b/packages/test-realm-cards/contents/ai-command-example.gts
@@ -1,7 +1,7 @@
 import { on } from '@ember/modifier';
 
-import CreateAiAssistantRoomCommand from '@cardstack/boxel-host/commands/create-ai-assistant-room';
-import SendAiAssistantMessageCommand from '@cardstack/boxel-host/commands/send-ai-assistant-message';
+import CreateAiAssistantRoomTool from '@cardstack/boxel-host/commands/create-ai-assistant-room';
+import SendAiAssistantMessageTool from '@cardstack/boxel-host/commands/send-ai-assistant-message';
 
 import { Button } from '@cardstack/boxel-ui/components';
 import { CardContainer } from '@cardstack/boxel-ui/components';
@@ -59,7 +59,7 @@ export class AiCommandExample extends CardDef {
 
       // let getWeatherCommand = new GetWeatherCommand(commandContext);
 
-      let createAIAssistantRoomCommand = new CreateAiAssistantRoomCommand(
+      let createAIAssistantRoomCommand = new CreateAiAssistantRoomTool(
         commandContext,
       );
       let weatherSkill = new Skill({
@@ -83,7 +83,7 @@ export class AiCommandExample extends CardDef {
         enabledSkills: [weatherSkill],
       });
 
-      let sendMessageCommand = new SendAiAssistantMessageCommand(
+      let sendMessageCommand = new SendAiAssistantMessageTool(
         commandContext,
       );
 
diff --git a/packages/test-realm-cards/contents/person.gts b/packages/test-realm-cards/contents/person.gts
index b101984b7ec..04fb8f42c00 100644
--- a/packages/test-realm-cards/contents/person.gts
+++ b/packages/test-realm-cards/contents/person.gts
@@ -1,8 +1,8 @@
 import { on } from '@ember/modifier';
 
-import CreateAiAssistantRoomCommand from '@cardstack/boxel-host/commands/create-ai-assistant-room';
-import SendAiAssistantMessageCommand from '@cardstack/boxel-host/commands/send-ai-assistant-message';
-// import SwitchSubmodeCommand from '@cardstack/boxel-host/commands/switch-submode';
+import CreateAiAssistantRoomTool from '@cardstack/boxel-host/commands/create-ai-assistant-room';
+import SendAiAssistantMessageTool from '@cardstack/boxel-host/commands/send-ai-assistant-message';
+// import SwitchSubmodeTool from '@cardstack/boxel-host/commands/switch-submode';
 
 import {
   contains,
@@ -40,13 +40,13 @@ export class Person extends CardDef {
         console.error('No command context found');
         return;
       }
-      let createAIAssistantRoomCommand = new CreateAiAssistantRoomCommand(
+      let createAIAssistantRoomCommand = new CreateAiAssistantRoomTool(
         commandContext,
       );
       let { roomId } = await createAIAssistantRoomCommand.execute({
         name: 'AI Assistant Room',
       });
-      let sendAiAssistantMessageCommand = new SendAiAssistantMessageCommand(
+      let sendAiAssistantMessageCommand = new SendAiAssistantMessageTool(
         commandContext,
       );
       await sendAiAssistantMessageCommand.execute({