refactor: centralize common input field metadata

Author: kkkhs

src/ai-sdk/index.ts

@@ -4,6 +4,7 @@ import { AppError, type NormalizedError } from '@agent-device/kernel/errors';
 import { createAgentDeviceClient } from '../agent-device-client.ts';
 import type { AgentDeviceClient } from '../client/client-types.ts';
 import type { JsonSchema } from '../commands/command-contract.ts';
+import { commonInputKeysHiddenFromAiSdk } from '../commands/command-input.ts';
 import { resolveCommandFrameworkTier } from '../core/command-descriptor/registry.ts';
 import { createCommandToolExecutor, listCommandTools } from '../mcp/command-tools.ts';
 import { formatToolErrorText } from '../mcp/tool-error.ts';
@@ -49,21 +50,11 @@ export type AgentDeviceTools = {
   toolApproval?: Partial<Record<string, ToolApprovalStatus>>;
 };
 
-// Hidden unconditionally, from both the schema the model sees and the input
-// `execute` forwards to the shared executor:
-//  - `session` is always pinned by this factory — the whole point is that a
-//    tool call can never target a session other than the one passed in.
-//  - `stateDir` selects which daemon state directory (and therefore which
-//    daemon/session namespace) a call resolves against. Left model-visible,
-//    it would let a call escape the pinned session into another daemon's
-//    state entirely, defeating that guarantee.
-//  - `mcpOutputFormat`, `includeCost`, `responseLevel` are MCP tool-config
-//    knobs, not command arguments; irrelevant here since `execute` below
-//    returns structuredContent directly and never reads a tool's rendered
-//    text, and shaping the response is this factory's decision, not the
-//    model's.
-const ALWAYS_HIDDEN_FIELDS = [
-  'session',
+// MCP tool-config knobs, not command arguments; irrelevant here since
+// `execute` below returns structuredContent directly and never reads a tool's
+// rendered text. Common pinned fields such as `session`/`platform` come from
+// the common input-field table.
+const AI_SDK_HIDDEN_MCP_FIELDS = [
   'stateDir',
   'mcpOutputFormat',
   'includeCost',
@@ -104,8 +95,10 @@ export async function createAgentDeviceTools(
   });
   const executor = createCommandToolExecutor();
 
-  const hiddenFields = new Set<string>(ALWAYS_HIDDEN_FIELDS);
-  if (platform) hiddenFields.add('platform');
+  const hiddenFields = new Set<string>([
+    ...AI_SDK_HIDDEN_MCP_FIELDS,
+    ...commonInputKeysHiddenFromAiSdk({ platformPinned: Boolean(platform) }),
+  ]);
 
   const tools: ToolSet = {};
   for (const definition of listCommandTools()) {

src/commands/cli-grammar/common.ts

@@ -11,7 +11,11 @@ import {
   SELECTOR_EXPRESSION_REQUIRED_MESSAGE,
   splitSelectorFromArgs,
 } from '@agent-device/selectors';
-import { compactRecord, type SelectorSnapshotInput } from '../command-input.ts';
+import {
+  commonCommandInputFromFlags,
+  compactRecord,
+  type SelectorSnapshotInput,
+} from '../command-input.ts';
 import type {
   CommandInput,
   DaemonCommandRequest,
@@ -56,33 +60,7 @@ function readDeviceTarget(value: unknown): InternalRequestOptions['target'] | un
 }
 
 export function commonInputFromFlags(flags: CliFlags): Record<string, unknown> {
-  return compactRecord({
-    // `--no-record` is a COMMON flag (`COMMON_COMMAND_SUPPORTED_FLAG_KEYS`): it
-    // is accepted on, and meaningful for, every recordable command. It rides
-    // the common seam every reader already spreads, so a reader cannot forget
-    // it and a new reader inherits it for free. The three seams it must survive
-    // are this one, `readCommonInput`, and `commonToClientOptions`
-    // (`commands/command-input.ts`) — a drop at any one of them silently
-    // disables the flag (#1304/#1305 fixed only the reader layer, so the flag
-    // still never reached the daemon).
-    //
-    // `--record` deliberately does NOT ride here: it is scoped to the
-    // observation-only commands the repair-segment exclusion can drop
-    // (ADR 0012 decision 6 amendment), so it stays on the narrow
-    // `observationRecordInputFromFlags` seam below.
-    noRecord: flags.noRecord,
-    session: flags.session,
-    platform: flags.platform,
-    deviceTarget: flags.target,
-    device: flags.device,
-    udid: flags.udid,
-    serial: flags.serial,
-    iosSimulatorDeviceSet: flags.iosSimulatorDeviceSet,
-    iosXctestrunFile: flags.iosXctestrunFile,
-    iosXctestDerivedDataPath: flags.iosXctestDerivedDataPath,
-    iosXctestEnvDir: flags.iosXctestEnvDir,
-    androidDeviceAllowlist: flags.androidDeviceAllowlist,
-  });
+  return commonCommandInputFromFlags(flags);
 }
 
 /**

src/commands/cli-grammar/flag-groups.ts

@@ -1,4 +1,5 @@
 import type { FlagKey } from './flag-types.ts';
+import { commonCommandSupportedFlagKeys } from '../command-input.ts';
 
 function flagKeys<const TKeys extends readonly FlagKey[]>(...keys: TKeys): TKeys {
   return keys;
@@ -45,22 +46,14 @@ export const REPEATED_TOUCH_FLAGS = flagKeys(
 export const SETTLE_FLAGS = flagKeys('settle', 'settleQuietMs', 'timeoutMs');
 export const REPLAY_FLAGS = flagKeys('replayUpdate', 'replayEnv');
 
-export const COMMON_COMMAND_SUPPORTED_FLAG_KEYS = flagKeys(
+export const COMMON_COMMAND_SUPPORTED_FLAG_KEYS: readonly FlagKey[] = flagKeys(
   'remoteConfig',
   'stateDir',
-  'daemonBaseUrl',
-  'daemonAuthToken',
   'daemonTransport',
   'daemonServerMode',
-  'tenant',
   'sessionIsolation',
-  'runId',
-  'leaseId',
   'leaseBackend',
   'sessionLock',
-  'platform',
-  'target',
-  'device',
   'providerApp',
   'providerOsVersion',
   'providerProject',
@@ -79,21 +72,7 @@ export const COMMON_COMMAND_SUPPORTED_FLAG_KEYS = flagKeys(
   'awsAppArn',
   'awsRegion',
   'awsInteractionMode',
-  'udid',
-  'serial',
-  'iosSimulatorDeviceSet',
-  'iosXctestrunFile',
-  'iosXctestDerivedDataPath',
-  'iosXctestEnvDir',
-  'androidDeviceAllowlist',
-  'session',
-  // `--no-record` is genuinely common: it applies to every recordable command,
-  // mutations included. `--record` is NOT — it only means anything for the
-  // observation-only commands the repair-segment exclusion can drop
-  // (snapshot/get/is/find), so it is scoped per-command via each schema's
-  // `allowedFlags` instead of being accepted everywhere and silently ignored
-  // (#1271 stage 2).
-  'noRecord',
+  ...commonCommandSupportedFlagKeys(),
 );
 
 export const GLOBAL_FLAG_KEYS: ReadonlySet<FlagKey> = new Set([