Update tools to support session-aware opt-out mode

Author: cameroncooke

src/mcp/tools/device/build_device.ts

@@ -10,7 +10,10 @@ import { ToolResponse, XcodePlatform } from '../../../types/common.ts';
 import { executeXcodeBuildCommand } from '../../../utils/build/index.ts';
 import type { CommandExecutor } from '../../../utils/execution/index.ts';
 import { getDefaultCommandExecutor } from '../../../utils/execution/index.ts';
-import { createSessionAwareTool } from '../../../utils/typed-tool-factory.ts';
+import {
+  createSessionAwareTool,
+  getSessionAwareToolSchemaShape,
+} from '../../../utils/typed-tool-factory.ts';
 import { nullifyEmptyStrings } from '../../../utils/schema-helpers.ts';
 
 // Unified schema: XOR between projectPath and workspacePath
@@ -36,6 +39,13 @@ const buildDeviceSchema = baseSchema
 
 export type BuildDeviceParams = z.infer<typeof buildDeviceSchema>;
 
+const publicSchemaObject = baseSchemaObject.omit({
+  projectPath: true,
+  workspacePath: true,
+  scheme: true,
+  configuration: true,
+} as const);
+
 /**
  * Business logic for building device project or workspace.
  * Exported for direct testing and reuse.
@@ -64,12 +74,10 @@ export async function buildDeviceLogic(
 export default {
   name: 'build_device',
   description: 'Builds an app for a connected device.',
-  schema: baseSchemaObject.omit({
-    projectPath: true,
-    workspacePath: true,
-    scheme: true,
-    configuration: true,
-  } as const).shape,
+  schema: getSessionAwareToolSchemaShape({
+    sessionAware: publicSchemaObject,
+    legacy: baseSchemaObject,
+  }),
   handler: createSessionAwareTool<BuildDeviceParams>({
     internalSchema: buildDeviceSchema as unknown as z.ZodType<BuildDeviceParams>,
     logicFunction: buildDeviceLogic,

src/mcp/tools/device/get_device_app_path.ts

@@ -11,7 +11,10 @@ import { log } from '../../../utils/logging/index.ts';
 import { createTextResponse } from '../../../utils/responses/index.ts';
 import type { CommandExecutor } from '../../../utils/execution/index.ts';
 import { getDefaultCommandExecutor } from '../../../utils/execution/index.ts';
-import { createSessionAwareTool } from '../../../utils/typed-tool-factory.ts';
+import {
+  createSessionAwareTool,
+  getSessionAwareToolSchemaShape,
+} from '../../../utils/typed-tool-factory.ts';
 import { nullifyEmptyStrings } from '../../../utils/schema-helpers.ts';
 
 // Unified schema: XOR between projectPath and workspacePath, sharing common options
@@ -43,6 +46,13 @@ const getDeviceAppPathSchema = baseSchema
 // Use z.infer for type safety
 type GetDeviceAppPathParams = z.infer<typeof getDeviceAppPathSchema>;
 
+const publicSchemaObject = baseSchemaObject.omit({
+  projectPath: true,
+  workspacePath: true,
+  scheme: true,
+  configuration: true,
+} as const);
+
 export async function get_device_app_pathLogic(
   params: GetDeviceAppPathParams,
   executor: CommandExecutor,
@@ -147,12 +157,10 @@ export async function get_device_app_pathLogic(
 export default {
   name: 'get_device_app_path',
   description: 'Retrieves the built app path for a connected device.',
-  schema: baseSchemaObject.omit({
-    projectPath: true,
-    workspacePath: true,
-    scheme: true,
-    configuration: true,
-  } as const).shape,
+  schema: getSessionAwareToolSchemaShape({
+    sessionAware: publicSchemaObject,
+    legacy: baseSchemaObject,
+  }),
   handler: createSessionAwareTool<GetDeviceAppPathParams>({
     internalSchema: getDeviceAppPathSchema as unknown as z.ZodType<GetDeviceAppPathParams>,
     logicFunction: get_device_app_pathLogic,

src/mcp/tools/device/install_app_device.ts

@@ -10,7 +10,10 @@ import { ToolResponse } from '../../../types/common.ts';
 import { log } from '../../../utils/logging/index.ts';
 import type { CommandExecutor } from '../../../utils/execution/index.ts';
 import { getDefaultCommandExecutor } from '../../../utils/execution/index.ts';
-import { createSessionAwareTool } from '../../../utils/typed-tool-factory.ts';
+import {
+  createSessionAwareTool,
+  getSessionAwareToolSchemaShape,
+} from '../../../utils/typed-tool-factory.ts';
 
 // Define schema as ZodObject
 const installAppDeviceSchema = z.object({
@@ -23,6 +26,8 @@ const installAppDeviceSchema = z.object({
     .describe('Path to the .app bundle to install (full path to the .app directory)'),
 });
 
+const publicSchemaObject = installAppDeviceSchema.omit({ deviceId: true } as const);
+
 // Use z.infer for type safety
 type InstallAppDeviceParams = z.infer<typeof installAppDeviceSchema>;
 
@@ -83,7 +88,10 @@ export async function install_app_deviceLogic(
 export default {
   name: 'install_app_device',
   description: 'Installs an app on a connected device.',
-  schema: installAppDeviceSchema.omit({ deviceId: true } as const).shape,
+  schema: getSessionAwareToolSchemaShape({
+    sessionAware: publicSchemaObject,
+    legacy: installAppDeviceSchema,
+  }),
   handler: createSessionAwareTool<InstallAppDeviceParams>({
     internalSchema: installAppDeviceSchema as unknown as z.ZodType<InstallAppDeviceParams>,
     logicFunction: install_app_deviceLogic,

src/mcp/tools/device/launch_app_device.ts

@@ -10,7 +10,10 @@ import { ToolResponse } from '../../../types/common.ts';
 import { log } from '../../../utils/logging/index.ts';
 import type { CommandExecutor } from '../../../utils/execution/index.ts';
 import { getDefaultCommandExecutor } from '../../../utils/execution/index.ts';
-import { createSessionAwareTool } from '../../../utils/typed-tool-factory.ts';
+import {
+  createSessionAwareTool,
+  getSessionAwareToolSchemaShape,
+} from '../../../utils/typed-tool-factory.ts';
 import { promises as fs } from 'fs';
 import { tmpdir } from 'os';
 import { join } from 'path';
@@ -32,6 +35,8 @@ const launchAppDeviceSchema = z.object({
     .describe('Bundle identifier of the app to launch (e.g., "com.example.MyApp")'),
 });
 
+const publicSchemaObject = launchAppDeviceSchema.omit({ deviceId: true } as const);
+
 // Use z.infer for type safety
 type LaunchAppDeviceParams = z.infer<typeof launchAppDeviceSchema>;
 
@@ -142,7 +147,10 @@ export async function launch_app_deviceLogic(
 export default {
   name: 'launch_app_device',
   description: 'Launches an app on a connected device.',
-  schema: launchAppDeviceSchema.omit({ deviceId: true } as const).shape,
+  schema: getSessionAwareToolSchemaShape({
+    sessionAware: publicSchemaObject,
+    legacy: launchAppDeviceSchema,
+  }),
   handler: createSessionAwareTool<LaunchAppDeviceParams>({
     internalSchema: launchAppDeviceSchema as unknown as z.ZodType<LaunchAppDeviceParams>,
     logicFunction: launch_app_deviceLogic,

src/mcp/tools/device/stop_app_device.ts

@@ -10,7 +10,10 @@ import { ToolResponse } from '../../../types/common.ts';
 import { log } from '../../../utils/logging/index.ts';
 import type { CommandExecutor } from '../../../utils/execution/index.ts';
 import { getDefaultCommandExecutor } from '../../../utils/execution/index.ts';
-import { createSessionAwareTool } from '../../../utils/typed-tool-factory.ts';
+import {
+  createSessionAwareTool,
+  getSessionAwareToolSchemaShape,
+} from '../../../utils/typed-tool-factory.ts';
 
 // Define schema as ZodObject
 const stopAppDeviceSchema = z.object({
@@ -21,6 +24,8 @@ const stopAppDeviceSchema = z.object({
 // Use z.infer for type safety
 type StopAppDeviceParams = z.infer<typeof stopAppDeviceSchema>;
 
+const publicSchemaObject = stopAppDeviceSchema.omit({ deviceId: true } as const);
+
 export async function stop_app_deviceLogic(
   params: StopAppDeviceParams,
   executor: CommandExecutor,
@@ -85,7 +90,10 @@ export async function stop_app_deviceLogic(
 export default {
   name: 'stop_app_device',
   description: 'Stops a running app on a connected device.',
-  schema: stopAppDeviceSchema.omit({ deviceId: true } as const).shape,
+  schema: getSessionAwareToolSchemaShape({
+    sessionAware: publicSchemaObject,
+    legacy: stopAppDeviceSchema,
+  }),
   handler: createSessionAwareTool<StopAppDeviceParams>({
     internalSchema: stopAppDeviceSchema as unknown as z.ZodType<StopAppDeviceParams>,
     logicFunction: stop_app_deviceLogic,

src/mcp/tools/device/test_device.ts

@@ -21,7 +21,10 @@ import {
   getDefaultCommandExecutor,
   getDefaultFileSystemExecutor,
 } from '../../../utils/execution/index.ts';
-import { createSessionAwareTool } from '../../../utils/typed-tool-factory.ts';
+import {
+  createSessionAwareTool,
+  getSessionAwareToolSchemaShape,
+} from '../../../utils/typed-tool-factory.ts';
 import { nullifyEmptyStrings } from '../../../utils/schema-helpers.ts';
 
 // Unified schema: XOR between projectPath and workspacePath
@@ -58,6 +61,14 @@ const testDeviceSchema = baseSchema
 
 export type TestDeviceParams = z.infer<typeof testDeviceSchema>;
 
+const publicSchemaObject = baseSchemaObject.omit({
+  projectPath: true,
+  workspacePath: true,
+  scheme: true,
+  deviceId: true,
+  configuration: true,
+} as const);
+
 /**
  * Type definition for test summary structure from xcresulttool
  * (JavaScript implementation - no actual interface, this is just documentation)
@@ -276,13 +287,10 @@ export async function testDeviceLogic(
 export default {
   name: 'test_device',
   description: 'Runs tests on a physical Apple device.',
-  schema: baseSchemaObject.omit({
-    projectPath: true,
-    workspacePath: true,
-    scheme: true,
-    deviceId: true,
-    configuration: true,
-  } as const).shape,
+  schema: getSessionAwareToolSchemaShape({
+    sessionAware: publicSchemaObject,
+    legacy: baseSchemaObject,
+  }),
   handler: createSessionAwareTool<TestDeviceParams>({
     internalSchema: testDeviceSchema as unknown as z.ZodType<TestDeviceParams>,
     logicFunction: (params: TestDeviceParams, executor: CommandExecutor) =>

src/mcp/tools/logging/start_device_log_cap.ts

@@ -14,7 +14,10 @@ import { log } from '../../../utils/logging/index.ts';
 import type { CommandExecutor, FileSystemExecutor } from '../../../utils/execution/index.ts';
 import { getDefaultCommandExecutor } from '../../../utils/execution/index.ts';
 import { ToolResponse } from '../../../types/common.ts';
-import { createSessionAwareTool } from '../../../utils/typed-tool-factory.ts';
+import {
+  createSessionAwareTool,
+  getSessionAwareToolSchemaShape,
+} from '../../../utils/typed-tool-factory.ts';
 
 /**
  * Log file retention policy for device logs:
@@ -632,6 +635,8 @@ const startDeviceLogCapSchema = z.object({
   bundleId: z.string().describe('Bundle identifier of the app to launch and capture logs for.'),
 });
 
+const publicSchemaObject = startDeviceLogCapSchema.omit({ deviceId: true } as const);
+
 // Use z.infer for type safety
 type StartDeviceLogCapParams = z.infer<typeof startDeviceLogCapSchema>;
 
@@ -679,7 +684,10 @@ export async function start_device_log_capLogic(
 export default {
   name: 'start_device_log_cap',
   description: 'Starts log capture on a connected device.',
-  schema: startDeviceLogCapSchema.omit({ deviceId: true } as const).shape,
+  schema: getSessionAwareToolSchemaShape({
+    sessionAware: publicSchemaObject,
+    legacy: startDeviceLogCapSchema,
+  }),
   handler: createSessionAwareTool<StartDeviceLogCapParams>({
     internalSchema: startDeviceLogCapSchema as unknown as z.ZodType<StartDeviceLogCapParams>,
     logicFunction: start_device_log_capLogic,

src/mcp/tools/logging/start_sim_log_cap.ts

@@ -8,7 +8,10 @@ import { z } from 'zod';
 import { startLogCapture } from '../../../utils/log-capture/index.ts';
 import { CommandExecutor, getDefaultCommandExecutor } from '../../../utils/command.ts';
 import { ToolResponse, createTextContent } from '../../../types/common.ts';
-import { createSessionAwareTool } from '../../../utils/typed-tool-factory.ts';
+import {
+  createSessionAwareTool,
+  getSessionAwareToolSchemaShape,
+} from '../../../utils/typed-tool-factory.ts';
 
 // Define schema as ZodObject
 const startSimLogCapSchema = z.object({
@@ -61,7 +64,10 @@ export default {
   name: 'start_sim_log_cap',
   description:
     'Starts capturing logs from a specified simulator. Returns a session ID. By default, captures only structured logs.',
-  schema: publicSchemaObject.shape, // MCP SDK compatibility
+  schema: getSessionAwareToolSchemaShape({
+    sessionAware: publicSchemaObject,
+    legacy: startSimLogCapSchema,
+  }),
   handler: createSessionAwareTool<StartSimLogCapParams>({
     internalSchema: startSimLogCapSchema as unknown as z.ZodType<StartSimLogCapParams>,
     logicFunction: start_sim_log_capLogic,

src/mcp/tools/macos/build_macos.ts

@@ -11,7 +11,10 @@ import { executeXcodeBuildCommand } from '../../../utils/build/index.ts';
 import { ToolResponse, XcodePlatform } from '../../../types/common.ts';
 import type { CommandExecutor } from '../../../utils/execution/index.ts';
 import { getDefaultCommandExecutor } from '../../../utils/execution/index.ts';
-import { createSessionAwareTool } from '../../../utils/typed-tool-factory.ts';
+import {
+  createSessionAwareTool,
+  getSessionAwareToolSchemaShape,
+} from '../../../utils/typed-tool-factory.ts';
 import { nullifyEmptyStrings } from '../../../utils/schema-helpers.ts';
 
 // Types for dependency injection
@@ -98,7 +101,10 @@ export async function buildMacOSLogic(
 export default {
   name: 'build_macos',
   description: 'Builds a macOS app.',
-  schema: publicSchemaObject.shape,
+  schema: getSessionAwareToolSchemaShape({
+    sessionAware: publicSchemaObject,
+    legacy: baseSchemaObject,
+  }),
   handler: createSessionAwareTool<BuildMacOSParams>({
     internalSchema: buildMacOSSchema as unknown as z.ZodType<BuildMacOSParams>,
     logicFunction: buildMacOSLogic,

src/mcp/tools/macos/build_run_macos.ts

@@ -12,7 +12,10 @@ import { executeXcodeBuildCommand } from '../../../utils/build/index.ts';
 import { ToolResponse, XcodePlatform } from '../../../types/common.ts';
 import type { CommandExecutor } from '../../../utils/execution/index.ts';
 import { getDefaultCommandExecutor } from '../../../utils/execution/index.ts';
-import { createSessionAwareTool } from '../../../utils/typed-tool-factory.ts';
+import {
+  createSessionAwareTool,
+  getSessionAwareToolSchemaShape,
+} from '../../../utils/typed-tool-factory.ts';
 import { nullifyEmptyStrings } from '../../../utils/schema-helpers.ts';
 
 // Unified schema: XOR between projectPath and workspacePath
@@ -216,7 +219,10 @@ export async function buildRunMacOSLogic(
 export default {
   name: 'build_run_macos',
   description: 'Builds and runs a macOS app.',
-  schema: publicSchemaObject.shape,
+  schema: getSessionAwareToolSchemaShape({
+    sessionAware: publicSchemaObject,
+    legacy: baseSchemaObject,
+  }),
   handler: createSessionAwareTool<BuildRunMacOSParams>({
     internalSchema: buildRunMacOSSchema as unknown as z.ZodType<BuildRunMacOSParams>,
     logicFunction: buildRunMacOSLogic,