chore: keep mcp config out of command contracts

Author: thymikee

src/commands/command-input.ts

@@ -584,7 +584,6 @@ function commonProperties(): Record<string, JsonSchema> {
       type: 'string',
       description: 'Android serial allowlist used for device resolution.',
     },
-    stateDir: { type: 'string', description: 'Agent-device state directory.' },
     daemonBaseUrl: { type: 'string', description: 'Remote daemon base URL.' },
     daemonAuthToken: { type: 'string', description: 'Remote daemon auth token.' },
     tenant: { type: 'string', description: 'Remote tenant identifier.' },

src/mcp/__tests__/command-tools.test.ts

@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import { test } from 'vitest';
 import type { AgentDeviceClient } from '../../client-types.ts';
-import { createCommandToolExecutor } from '../command-tools.ts';
+import { createCommandToolExecutor, listCommandTools } from '../command-tools.ts';
 
 test('MCP command tool executor hides client creation behind an execution adapter', async () => {
   const client = {} as AgentDeviceClient;
@@ -31,3 +31,10 @@ test('MCP command tool executor hides client creation behind an execution adapte
   assert.deepEqual(result.structuredContent, { name: 'devices', ok: true });
   assert.match(result.content[0]?.text ?? '', /"name": "devices"/);
 });
+
+test('MCP tool schemas add MCP client config fields at the MCP boundary', () => {
+  const devicesTool = listCommandTools().find((tool) => tool.name === 'devices');
+
+  assert.ok(devicesTool);
+  assert.ok('stateDir' in (devicesTool.inputSchema.properties ?? {}));
+});

src/mcp/command-tools.ts

@@ -8,7 +8,7 @@ import {
 } from '../commands/command-surface.ts';
 import type { JsonSchema } from '../commands/command-contract.ts';
 
-export type ToolResult = {
+type ToolResult = {
   isError: boolean;
   structuredContent?: unknown;
   content: Array<{ type: 'text'; text: string }>;
@@ -19,7 +19,7 @@ type CommandToolExecutorDeps = {
   runCommand: (client: AgentDeviceClient, name: CommandName, input: unknown) => Promise<unknown>;
 };
 
-export type CommandToolExecutor = {
+type CommandToolExecutor = {
   execute: (name: string, input: unknown) => Promise<ToolResult>;
 };
 
@@ -31,7 +31,7 @@ export function listCommandTools(): Array<{
   return listMcpToolDefinitions().map((definition) => ({
     name: definition.name,
     description: definition.description,
-    inputSchema: definition.inputSchema,
+    inputSchema: withMcpConfigSchema(definition.inputSchema),
   }));
 }
 
@@ -75,6 +75,16 @@ function stripClientConfigFields(input: unknown): unknown {
   return commandInput;
 }
 
+function withMcpConfigSchema(schema: JsonSchema): JsonSchema {
+  return {
+    ...schema,
+    properties: {
+      ...schema.properties,
+      stateDir: { type: 'string', description: 'Agent-device state directory.' },
+    },
+  };
+}
+
 function renderToolText(value: unknown): string {
   return typeof value === 'string' ? value : JSON.stringify(value, null, 2);
 }