fix(cli): Align profile parsing with yargs

Use yargs-parser for builder-time --profile resolution so help-time\nrequiredness stays aligned with handler-time parsing. This removes\nthe manual argv scan that could diverge from command execution.\n\nAlso remove the unused resolveActiveCliSessionDefaults wrapper and\npoint the tests at the shared resolver directly.\n\nCo-Authored-By: OpenAI <noreply@openai.com>

Author: cameroncooke

docs/TOOLS-CLI.md

@@ -206,4 +206,4 @@ XcodeBuildMCP provides 76 canonical tools organized into 14 workflow groups.
 
 ---
 
-*This documentation is automatically generated by `scripts/update-tools-docs.ts` from the tools manifest. Last updated: 2026-03-07T20:17:02.262Z UTC*
+*This documentation is automatically generated by `scripts/update-tools-docs.ts` from the tools manifest. Last updated: 2026-03-07T20:50:55.840Z UTC*

docs/TOOLS.md

@@ -222,4 +222,4 @@ This document lists MCP tool names as exposed to MCP clients. XcodeBuildMCP prov
 
 ---
 
-*This documentation is automatically generated by `scripts/update-tools-docs.ts` from the tools manifest. Last updated: 2026-03-07T20:17:02.262Z UTC*
+*This documentation is automatically generated by `scripts/update-tools-docs.ts` from the tools manifest. Last updated: 2026-03-07T20:50:55.840Z UTC*

src/cli/__tests__/session-defaults.test.ts

@@ -3,34 +3,36 @@ import * as z from 'zod';
 import {
   mergeCliSessionDefaults,
   pickSchemaSessionDefaults,
-  resolveActiveCliSessionDefaults,
+  resolveCliSessionDefaults,
 } from '../session-defaults.ts';
 
 describe('CLI session defaults', () => {
   it('uses the active profile without overlaying global defaults', () => {
-    const defaults = resolveActiveCliSessionDefaults({
-      enabledWorkflows: [],
-      customWorkflows: {},
-      debug: false,
-      sentryDisabled: false,
-      experimentalWorkflowDiscovery: false,
-      disableSessionDefaults: true,
-      disableXcodeAutoSync: false,
-      uiDebuggerGuardMode: 'error',
-      incrementalBuildsEnabled: false,
-      dapRequestTimeoutMs: 30_000,
-      dapLogEvents: false,
-      launchJsonWaitMs: 8_000,
-      debuggerBackend: 'dap',
-      sessionDefaults: {
-        workspacePath: 'Global.xcworkspace',
-      },
-      sessionDefaultsProfiles: {
-        ios: {
-          scheme: 'ProfileScheme',
+    const defaults = resolveCliSessionDefaults({
+      runtimeConfig: {
+        enabledWorkflows: [],
+        customWorkflows: {},
+        debug: false,
+        sentryDisabled: false,
+        experimentalWorkflowDiscovery: false,
+        disableSessionDefaults: true,
+        disableXcodeAutoSync: false,
+        uiDebuggerGuardMode: 'error',
+        incrementalBuildsEnabled: false,
+        dapRequestTimeoutMs: 30_000,
+        dapLogEvents: false,
+        launchJsonWaitMs: 8_000,
+        debuggerBackend: 'dap',
+        sessionDefaults: {
+          workspacePath: 'Global.xcworkspace',
+        },
+        sessionDefaultsProfiles: {
+          ios: {
+            scheme: 'ProfileScheme',
+          },
         },
+        activeSessionDefaultsProfile: 'ios',
       },
-      activeSessionDefaultsProfile: 'ios',
     });
 
     expect(defaults).toEqual({ scheme: 'ProfileScheme' });

src/cli/register-tool-commands.ts

@@ -1,4 +1,5 @@
 import type { Argv } from 'yargs';
+import yargsParser from 'yargs-parser';
 import type { ToolCatalog, ToolDefinition } from '../runtime/types.ts';
 import type { OutputStyle } from '../types/common.ts';
 import { DefaultToolInvoker } from '../runtime/tool-invoker.ts';
@@ -34,17 +35,15 @@ function buildXcodeIdeNoCommandsMessage(workflowName: string): string {
 }
 
 function readProfileOverrideFromProcessArgv(): string | undefined {
-  const argv = process.argv.slice(2);
-  for (let index = 0; index < argv.length; index += 1) {
-    const token = argv[index];
-    if (token === '--profile') {
-      return argv[index + 1];
-    }
-    if (token.startsWith('--profile=')) {
-      return token.slice('--profile='.length);
-    }
-  }
-  return undefined;
+  const parsedArgv = yargsParser(process.argv.slice(2), {
+    configuration: {
+      'camel-case-expansion': true,
+    },
+    string: ['profile'],
+  }) as { profile?: string | string[] };
+
+  const profile = parsedArgv.profile;
+  return typeof profile === 'string' ? profile : undefined;
 }
 
 /**

src/cli/session-defaults.ts

@@ -24,12 +24,6 @@ export function resolveCliSessionDefaults(opts: {
   return { ...(opts.runtimeConfig.sessionDefaults ?? {}) };
 }
 
-export function resolveActiveCliSessionDefaults(
-  runtimeConfig: ResolvedRuntimeConfig,
-): Partial<SessionDefaults> {
-  return resolveCliSessionDefaults({ runtimeConfig });
-}
-
 export function isKnownCliSessionDefaultsProfile(
   runtimeConfig: ResolvedRuntimeConfig,
   profileName: string,