@robota-sdk/agent-command 3.0.0-beta.82 → 3.0.0-beta.84

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@robota-sdk/agent-command",
-  "version": "3.0.0-beta.82",
-  "description": "Consolidated command module implementations for Robota SDK CLI",
+  "version": "3.0.0-beta.84",
+  "description": "Slash-command modules for Robota SDK sessions (/help, /permissions, /mcp, /rewind, …)",
   "type": "module",
   "main": "dist/node/index.js",
   "types": "dist/node/index.d.ts",
@@ -28,19 +28,24 @@
           "default": "./dist/node/index.cjs"
         }
       }
-    }
+    },
+    "./package.json": "./package.json"
+  },
+  "engines": {
+    "node": ">=22.12.0"
   },
   "files": [
     "dist",
-    "src"
+    "src",
+    "CHANGELOG.md"
   ],
   "dependencies": {
-    "@robota-sdk/agent-core": "3.0.0-beta.82",
-    "@robota-sdk/agent-framework": "3.0.0-beta.82",
-    "@robota-sdk/agent-interface-command": "3.0.0-beta.82",
-    "@robota-sdk/agent-interface-execution": "3.0.0-beta.82",
-    "@robota-sdk/agent-interface-session": "3.0.0-beta.82",
-    "@robota-sdk/agent-preset": "3.0.0-beta.82"
+    "@robota-sdk/agent-core": "3.0.0-beta.84",
+    "@robota-sdk/agent-framework": "3.0.0-beta.84",
+    "@robota-sdk/agent-interface-command": "3.0.0-beta.84",
+    "@robota-sdk/agent-interface-execution": "3.0.0-beta.84",
+    "@robota-sdk/agent-interface-session": "3.0.0-beta.84",
+    "@robota-sdk/agent-preset": "3.0.0-beta.84"
   },
   "devDependencies": {
     "@types/node": "^22.19.21",
@@ -55,6 +60,7 @@
     "url": "https://github.com/woojubb/robota.git",
     "directory": "packages/agent-command"
   },
+  "homepage": "https://docs.robota.io/en/packages/agent-command/",
   "publishConfig": {
     "access": "public"
   },

package/src/agent/__tests__/agent-command.test.ts

@@ -15,6 +15,7 @@ function createMockSession(overrides?: Record<string, unknown>) {
       { name: 'general-purpose', description: 'General-purpose task execution agent.' },
       { name: 'Plan', description: 'Read-only planning agent.' },
     ]),
+    setDefaultAgentType: vi.fn(),
     listAgentJobs: vi.fn().mockReturnValue([]),
     readBackgroundTaskLog: vi.fn().mockResolvedValue({ taskId: 'agent_1', lines: [] }),
     spawnAgentJob: vi.fn().mockResolvedValue({
@@ -518,6 +519,67 @@ describe('agent command module', () => {
     expect(result?.uiIntents).toEqual([{ type: 'show-agent-switcher' }]);
   });
 
+  it('#3282 §4: /agent <name> with nothing after it selects a default agent instead of failing', async () => {
+    const module = createAgentCommandModule();
+    const executor = new SystemCommandExecutor([
+      ...createSystemCommands(),
+      ...(module.systemCommands ?? []),
+    ]);
+    const session = createMockSession();
+
+    const result = await executor.execute('agent', session, 'Plan');
+
+    expect(result?.success).toBe(true);
+    expect(result?.message).toBe('Default agent: Plan');
+    expect(result?.data).toEqual({ agentType: 'Plan' });
+    expect(
+      (session as unknown as { setDefaultAgentType: ReturnType<typeof vi.fn> }).setDefaultAgentType,
+    ).toHaveBeenCalledWith('Plan');
+    expect(
+      (session as unknown as { spawnAgentJob: ReturnType<typeof vi.fn> }).spawnAgentJob,
+    ).not.toHaveBeenCalled();
+  });
+
+  it('#3282 §4: a single unrecognized word is still a prompt for the default agent, not a selection', async () => {
+    const module = createAgentCommandModule();
+    const executor = new SystemCommandExecutor([
+      ...createSystemCommands(),
+      ...(module.systemCommands ?? []),
+    ]);
+    const session = createMockSession();
+
+    const result = await executor.execute('agent', session, 'NotARealAgent');
+
+    expect(result?.success).toBe(true);
+    expect(
+      (session as unknown as { spawnAgentJob: ReturnType<typeof vi.fn> }).spawnAgentJob,
+    ).toHaveBeenCalledWith({
+      agentType: 'general-purpose',
+      label: 'general-purpose',
+      mode: 'background',
+      prompt: 'NotARealAgent',
+    });
+    expect(
+      (session as unknown as { setDefaultAgentType: ReturnType<typeof vi.fn> }).setDefaultAgentType,
+    ).not.toHaveBeenCalled();
+  });
+
+  it('#3282 §4: a known agent name followed by a prompt still runs a job, not a selection', async () => {
+    const module = createAgentCommandModule();
+    const executor = new SystemCommandExecutor([
+      ...createSystemCommands(),
+      ...(module.systemCommands ?? []),
+    ]);
+    const session = createMockSession();
+
+    const result = await executor.execute('agent', session, 'Plan "draft architecture"');
+
+    expect(result?.success).toBe(true);
+    expect(
+      (session as unknown as { setDefaultAgentType: ReturnType<typeof vi.fn> }).setDefaultAgentType,
+    ).not.toHaveBeenCalled();
+  });
+
   it('shows text list when agent list subcommand is used explicitly', async () => {
     const module = createAgentCommandModule();
     const executor = new SystemCommandExecutor([

package/src/agent/agent-command-parser.ts

@@ -1,6 +1,6 @@
-import type { TBackgroundTaskIsolation } from '@robota-sdk/agent-interface-execution';
+import { DEFAULT_AGENT_TYPE } from '@robota-sdk/agent-framework';
 
-const DEFAULT_AGENT_TYPE = 'general-purpose';
+import type { TBackgroundTaskIsolation } from '@robota-sdk/agent-interface-execution';
 
 export type TAgentMode = 'background';
 

package/src/agent/agent-command.ts

@@ -44,6 +44,21 @@ function executeOpenSwitcher(): ICommandResult {
   return { message: '', uiIntents: [{ type: 'show-agent-switcher' }], success: true };
 }
 
+/**
+ * #3282 §4: `/agent <name>` with nothing after the name sets the session's default agent type —
+ * the one `/agent <prompt>` falls back to, and the one the agent switcher shows checked. Distinct
+ * from `executeRun`, which a name FOLLOWED by a prompt still reaches (a prompt makes it a run, not
+ * a selection).
+ */
+function executeSelectDefaultAgent(session: IAgentJobHostContext, agentType: string): ICommandResult {
+  session.setDefaultAgentType(agentType);
+  return {
+    message: `Default agent: ${agentType}`,
+    success: true,
+    data: { agentType },
+  };
+}
+
 async function executeList(session: IAgentJobHostContext): Promise<ICommandResult> {
   const agents = session.listAgentDefinitions();
   const jobs = session.listAgentJobs();
@@ -223,6 +238,11 @@ export async function executeAgentCommand(
     if (action === 'send') return executeSend(session, tokens);
     if (action === 'stop' || action === 'cancel') return executeStop(session, tokens);
     if (action === 'close') return executeClose(session, tokens);
+    // `/agent <name>` alone (a known agent, nothing after it) selects a default rather than failing
+    // the "run" parse for want of a prompt — the same one-token shape the switcher sends.
+    if (tokens.length === 0 && getAvailableAgentNames(session).has(action)) {
+      return executeSelectDefaultAgent(session, action);
+    }
     return executeRun(session, [action, ...tokens]);
   } catch (error) {
     return { message: formatError(error), success: false };

package/src/command-module-utils.test.ts

@@ -0,0 +1,37 @@
+import { describe, expect, it } from 'vitest';
+
+import { createSystemCommandFromEntry } from './command-module-utils.js';
+
+const behavior = {
+  lifecycle: 'inline',
+  requiresPermission: false,
+  execute: () => ({ success: true, message: 'ran' }),
+} as const;
+
+describe('createSystemCommandFromEntry', () => {
+  it('#3189: carries where the entry says it runs, so the catalog and the palette agree', () => {
+    const command = createSystemCommandFromEntry(
+      {
+        name: 'local',
+        description: 'Runs on the terminal',
+        source: 'test',
+        runner: 'client',
+        surfaces: ['terminal'],
+      },
+      behavior,
+    );
+
+    expect(command.runner).toBe('client');
+    expect(command.surfaces).toEqual(['terminal']);
+  });
+
+  it('leaves an unstated placement unstated rather than guessing one', () => {
+    const command = createSystemCommandFromEntry(
+      { name: 'plain', description: 'Runs on the runtime', source: 'test' },
+      behavior,
+    );
+
+    expect('runner' in command).toBe(false);
+    expect('surfaces' in command).toBe(false);
+  });
+});

package/src/command-module-utils.ts

@@ -25,6 +25,8 @@ export function createSystemCommandFromEntry(
     ...(entry.argumentHint !== undefined ? { argumentHint: entry.argumentHint } : {}),
     ...(entry.safety !== undefined ? { safety: entry.safety } : {}),
     ...(entry.subcommands !== undefined ? { subcommands: entry.subcommands } : {}),
+    ...(entry.runner !== undefined ? { runner: entry.runner } : {}),
+    ...(entry.surfaces !== undefined ? { surfaces: entry.surfaces } : {}),
     ...(behavior.semanticRole !== undefined ? { semanticRole: behavior.semanticRole } : {}),
     lifecycle: behavior.lifecycle,
     requiresPermission: behavior.requiresPermission,

package/src/default/__tests__/__snapshots__/model-exposure.test.ts.snap

@@ -44,7 +44,7 @@ Run it with no arguments.",
   },
   "loop": {
     "argumentHint": "[prompt] | <N><s|m|h|d> [prompt] | <prompt> every <N> <unit> | list | stop <id>",
-    "description": "Repeat a prompt on a fixed cadence (\`<N><s|m|h|d> [prompt]\`) or self-paced (bare or prompt only: each iteration chooses its next delay or stops). Use it when the user asks for recurring work in this session. \`list\` shows active loops; \`stop <id>\` ends one. Returns the loop id and its next fire time, or the loop list.",
+    "description": "Repeat a prompt on a fixed cadence (\`<N><s|m|h|d> <prompt>\`) or self-paced (\`<prompt>\`: each iteration chooses its next delay or stops). Use it when the user asks for recurring work in this session, and always give your own prompt: any form that would fall back to the host's default maintenance prompt — bare \`/loop\` or an interval alone (\`<N><s|m|h|d>\`) — needs a person to confirm it and is always refused for you, whether or not one is attached. \`list\` shows active loops; \`stop <id>\` ends one, even mid-turn. Returns the loop id and its next fire time, the loop list, or a refusal naming the command to suggest.",
     "kind": "builtin-command",
     "modelInvocable": true,
     "name": "loop",
@@ -64,7 +64,7 @@ Subcommands you may run (bare \`mcp\` is also allowed):
   },
   "memory": {
     "argumentHint": "[list | show [topic] | add <user|feedback|project|reference> <topic> <text> | pending | used]",
-    "description": "Read and write this project’s durable memory. Use \`list\` or \`show [topic]\` to look up stored conventions, preferences or references before asking the user again; \`add <type> <topic> <text>\` to save a durable preference, project convention, feedback item or reference worth reusing across sessions (never secrets, credentials or transient facts); \`pending\` to see candidates awaiting the user’s review; \`used\` to report which memory items informed this turn. Bare lists topics. Returns the requested topics or entries, or a confirmation of what was saved. Approving or rejecting a pending candidate is the user’s review: suggest \`/memory approve <id>\` or \`/memory reject <id>\`.
+    "description": "Read and write this project’s durable memory. Use \`list\` or \`show [topic]\` to look up stored conventions, preferences or references before asking the user again; \`add <type> <topic> <text>\` to save a durable preference, project convention, feedback item or reference worth reusing across sessions (never secrets, credentials or transient facts); \`pending\` to see candidates awaiting the user’s review; \`used\` to report which memory items informed this turn. Bare lists topics. In plan mode \`add\` is refused: save after plan mode ends. Returns the requested topics or entries, or a confirmation of what was saved. Approving or rejecting a pending candidate is the user’s review: suggest \`/memory approve <id>\` or \`/memory reject <id>\`.
 Subcommands you may run (bare \`memory\` is also allowed):
 - list: List project memory topics
 - show: Show project memory index or a topic

package/src/default/__tests__/default-command-modules.test.ts

@@ -1,4 +1,8 @@
-import { describe, expect, it } from 'vitest';
+import { mkdtempSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { afterAll, describe, expect, it } from 'vitest';
 
 import type { IProviderDefinition } from '@robota-sdk/agent-core';
 import type {
@@ -8,6 +12,10 @@ import type {
 
 import { createDefaultCommandModules } from '../default-command-modules.js';
 
+/** User-local storage lives in a private per-run directory, never a fixed name under /tmp. */
+const USER_LOCAL_STORAGE_ROOT = mkdtempSync(join(tmpdir(), 'robota-test-'));
+afterAll(() => rmSync(USER_LOCAL_STORAGE_ROOT, { recursive: true, force: true }));
+
 const providerDefinitions: readonly IProviderDefinition[] = [
   {
     type: 'anthropic',
@@ -26,7 +34,7 @@ const providerSettingsAdapter: IProviderCommandSettingsAdapter = {
   writeTargetSettings: () => undefined,
 };
 
-const baseOptions = { cwd: '/tmp', userLocalStorageRoot: '/tmp/robota-test', providerDefinitions, providerSettingsAdapter } as const;
+const baseOptions = { cwd: '/tmp', userLocalStorageRoot: USER_LOCAL_STORAGE_ROOT, providerDefinitions, providerSettingsAdapter } as const;
 
 function moduleNames(opts: Parameters<typeof createDefaultCommandModules>[0]): string[] {
   return createDefaultCommandModules(opts).modules.map((module) => module.name);
@@ -42,10 +50,10 @@ describe('createDefaultCommandModules — PRESET-004 module-selection delta', ()
     const names = moduleNames(baseOptions);
     // No-regression: the default set length is the documented 32 modules (SELFHOST-002 added
     // `/plan`; PEER-004 added `/peers`; CLI-1994 added `/fork`; MCP-2520 added `/mcp`; CLI-1988 added
-    // `/output-style`; FLOW-008 added `/effort`; `/advisor` joined beside it). The list below is the
-    // assertion that matters — a length on its own can be restored by any substitution, and the count
-    // exists only to catch an addition that also removed something.
-    expect(names).toHaveLength(35);
+    // `/output-style`; FLOW-008 added `/effort`; `/advisor` joined beside it; #3282 §2 added `/model`).
+    // The list below is the assertion that matters — a length on its own can be restored by any
+    // substitution, and the count exists only to catch an addition that also removed something.
+    expect(names).toHaveLength(39);
     expect(names).toEqual([
       'agent-command-skills',
       'agent-command-help',
@@ -66,6 +74,8 @@ describe('createDefaultCommandModules — PRESET-004 module-selection delta', ()
       'agent-command-shell',
       'agent-command-editor',
       'agent-command-git',
+      'agent-command-keybindings',
+      'agent-command-theme',
       'agent-command-memory',
       'agent-command-mcp-activation',
       'agent-command-user-local',
@@ -80,9 +90,11 @@ describe('createDefaultCommandModules — PRESET-004 module-selection delta', ()
       'agent-command-plugin',
       'agent-command-settings',
       'agent-command-peers',
+      'agent-command-events',
       'agent-command-handoff',
       'agent-command-remote-control',
       'agent-command-provider',
+      'agent-command-model',
     ]);
   });
 
@@ -92,14 +104,42 @@ describe('createDefaultCommandModules — PRESET-004 module-selection delta', ()
     expect(names).toHaveLength(2);
   });
 
-  it('BEHAVIOR-2003: registers /keybindings only when the file capability is injected', () => {
-    expect(moduleNames(baseOptions)).not.toContain('agent-command-keybindings');
-    expect(
-      moduleNames({
-        ...baseOptions,
-        keybindingsFilePort: { ensureFile: async () => '/tmp/keybindings.json' },
-      }),
-    ).toContain('agent-command-keybindings');
+  it('#3186: /keybindings and /theme exist on a host without a terminal, and say where they work', async () => {
+    const { modules } = createDefaultCommandModules(baseOptions);
+    const commands = modules.flatMap((module) => module.systemCommands ?? []);
+    for (const name of ['keybindings', 'theme']) {
+      const command = commands.find((candidate) => candidate.name === name);
+      expect(command, name).toBeDefined();
+      const result = await command!.execute({} as never, '');
+      expect(result).toMatchObject({ success: false });
+      expect(result.message).toMatch(/robota terminal/);
+    }
+  });
+
+  it('#3189: exactly /editor, /keybindings, /shell and /theme run on the terminal client', () => {
+    const { modules } = createDefaultCommandModules(baseOptions);
+    const TERMINAL_CLIENT = ['editor', 'keybindings', 'shell', 'theme'];
+
+    // The executable commands: what the runtime keeps in its catalog and what the listing reads.
+    const clientSystemCommands = modules
+      .flatMap((module) => module.systemCommands ?? [])
+      .filter((command) => command.runner === 'client');
+    expect(clientSystemCommands.map((command) => command.name).sort()).toEqual(TERMINAL_CLIENT);
+    for (const command of clientSystemCommands) {
+      expect(command.surfaces, command.name).toEqual(['terminal']);
+    }
+
+    // The palette entries, which must say the same — the two views cannot disagree.
+    const clientEntries = modules
+      .flatMap((module) => module.commandSources ?? [])
+      .flatMap((source) => source.getCommands())
+      .filter((entry) => entry.runner === 'client');
+    expect(clientEntries.map((entry) => entry.name).sort()).toEqual(TERMINAL_CLIENT);
+    for (const entry of clientEntries) {
+      expect(entry.surfaces, entry.name).toEqual(['terminal']);
+      // Running on the client does not change who may run it: all four stay user-only.
+      expect(entry.modelInvocable, entry.name).toBe(false);
+    }
   });
 
   it('TC-02: disabledCommandModules blacklist removes the named module', () => {

package/src/default/__tests__/model-exposure.test.ts

@@ -7,7 +7,11 @@
  * each command's entry.
  */
 
-import { afterEach, describe, expect, it, vi } from 'vitest';
+import { mkdtempSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { afterAll, afterEach, describe, expect, it, vi } from 'vitest';
 
 import { SystemCommandExecutor } from '@robota-sdk/agent-framework';
 import { createTestCommandHost } from '@robota-sdk/agent-framework/testing';
@@ -41,6 +45,10 @@ const themeCataloguePort: IThemeCataloguePort = {
   }),
 };
 
+/** User-local storage lives in a private per-run directory, never a fixed name under /tmp. */
+const USER_LOCAL_STORAGE_ROOT = mkdtempSync(join(tmpdir(), 'robota-test-'));
+afterAll(() => rmSync(USER_LOCAL_STORAGE_ROOT, { recursive: true, force: true }));
+
 const fixtures: IDoctorFixture[] = [];
 afterEach(() => {
   for (const fixture of fixtures.splice(0)) fixture.cleanup();
@@ -52,12 +60,16 @@ function allBuiltInCommands(): ISystemCommand[] {
   fixtures.push(fixture);
   const { modules } = createDefaultCommandModules({
     cwd: '/tmp',
-    userLocalStorageRoot: '/tmp/robota-test',
+    userLocalStorageRoot: USER_LOCAL_STORAGE_ROOT,
     providerDefinitions,
     providerSettingsAdapter,
   });
+  // /keybindings and /theme are in the default set; built here with their capabilities instead.
+  const withoutPortless = modules.filter(
+    (module) => module.name !== 'agent-command-keybindings' && module.name !== 'agent-command-theme',
+  );
   return [
-    ...modules,
+    ...withoutPortless,
     createKeybindingsCommandModule({ ensureFile: async () => '/tmp/keybindings.json' }),
     createThemeCommandModule(themeCataloguePort),
     createDoctorCommandModule(fixture.inputs, fixture.deps),
@@ -94,8 +106,11 @@ const USER_ONLY_COMMANDS = [
   'plugin',
   'reload-plugins',
   'remote-control',
+  'events',
   // Account and credential actions.
   'provider',
+  // Cost and capability decisions: the person chooses, never the model on its own (#3282 §2).
+  'model',
   // Permission widening or permission-mode changes.
   'mode',
   'permissions',

package/src/default/__tests__/org-policy-forwarding.test.ts

@@ -17,7 +17,11 @@
  * type checker's job.
  */
 
-import { describe, expect, it } from 'vitest';
+import { mkdtempSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { afterAll, describe, expect, it } from 'vitest';
 import { SystemCommandExecutor } from '@robota-sdk/agent-framework';
 import { createTestCommandHost } from '@robota-sdk/agent-framework/testing';
 
@@ -55,13 +59,17 @@ const adapter: IProviderCommandSettingsAdapter = {
   writeTargetSettings: () => undefined,
 };
 
+/** User-local storage lives in a private per-run directory, never a fixed name under /tmp. */
+const USER_LOCAL_STORAGE_ROOT = mkdtempSync(join(tmpdir(), 'robota-test-'));
+afterAll(() => rmSync(USER_LOCAL_STORAGE_ROOT, { recursive: true, force: true }));
+
 const POLICY: IOrgPolicy = { allowedProviders: ['anthropic'], adminContact: 'ops@example.com' };
 
 /** Build the provider executor the way the PRODUCT does — through the default-modules factory. */
 function executorThroughFactory(orgPolicy?: IOrgPolicy): SystemCommandExecutor {
   const { modules } = createDefaultCommandModules({
     cwd: '/work',
-    userLocalStorageRoot: '/tmp/robota-test',
+    userLocalStorageRoot: USER_LOCAL_STORAGE_ROOT,
     providerDefinitions,
     providerSettingsAdapter: adapter,
     ...(orgPolicy === undefined ? {} : { orgPolicy }),

package/src/default/default-command-modules.ts

@@ -20,8 +20,10 @@ import { createLanguageCommandModule } from '../language/index.js';
 import { createMCPActivationCommandModule } from '../mcp-activation/index.js';
 import { createMemoryCommandModule } from '../memory/index.js';
 import { createModeCommandModule } from '../mode/index.js';
+import { createModelCommandModule } from '../model/index.js';
 import { createSandboxCommandModule } from '../sandbox/index.js';
 import { createOutputStyleCommandModule } from '../output-style/index.js';
+import { createEventsCommandModule } from '../events/index.js';
 import { createPeersCommandModule } from '../peers/index.js';
 import { createPermissionsCommandModule } from '../permissions/index.js';
 import { createPlanCommandModule } from '../plan/index.js';
@@ -72,12 +74,11 @@ export interface IDefaultCommandModulesOptions {
    * red when the producer dropped it.
    */
   orgPolicy?: IOrgPolicy;
-  /** Optional TUI-owned file capability; absence means `/keybindings` is not registered. */
+  /** Optional TUI-owned file capability; absent, `/keybindings` says it belongs to the robota terminal. */
   keybindingsFilePort?: IKeybindingsFilePort;
   /**
-   * SCREEN-2002: the surface's theme catalogue. Absence means `/theme` is not registered at all —
-   * print mode and `--serve` render no themes, and a command that cannot do anything is better
-   * missing than present-and-failing.
+   * SCREEN-2002: the surface's theme catalogue. Absent (print mode, `--serve`), `/theme` is still
+   * listed and says it belongs to the robota terminal, which runs it itself when attached.
    */
   themeCataloguePort?: IThemeCataloguePort;
   /**
@@ -173,10 +174,8 @@ export function createDefaultCommandModules({
     createShellCommandModule(),
     createEditorCommandModule(editorTemporaryDirectoryPrefix),
     createGitCommandModule(),
-    ...(keybindingsFilePort === undefined
-      ? []
-      : [createKeybindingsCommandModule(keybindingsFilePort)]),
-    ...(themeCataloguePort === undefined ? [] : [createThemeCommandModule(themeCataloguePort)]),
+    createKeybindingsCommandModule(keybindingsFilePort),
+    createThemeCommandModule(themeCataloguePort),
     ...(doctorInputs === undefined
       ? []
       : [createDoctorCommandModule(doctorInputs, undefined, doctorDisplay)]),
@@ -194,6 +193,7 @@ export function createDefaultCommandModules({
     createPluginCommandModule(),
     createSettingsCommandModule(),
     createPeersCommandModule(),
+    createEventsCommandModule(),
     // HANDOFF-001 (issue #1864). Registered even though no product wires the carrier adapter yet:
     // the command's own answer to a host without one is to say so, which is a better state than a
     // capability nobody can see. It is also what makes the carrier's arrival observable.
@@ -205,6 +205,13 @@ export function createDefaultCommandModules({
       settings: providerSettingsAdapter,
       ...(orgPolicy === undefined ? {} : { orgPolicy }),
     }),
+    // #3282 §2: shares the provider command's settings adapter and definitions — one settings write
+    // owner, never a second copy that could drift from what `/provider switch` reads and writes.
+    createModelCommandModule({
+      providerDefinitions,
+      settings: providerSettingsAdapter,
+      ...(orgPolicy === undefined ? {} : { orgPolicy }),
+    }),
   ];
   const builtModuleNames = modules.map((module) => module.name);
   return {