Fix argv parser edge cases and remove unused export

- Make readProfileOverrideFromProcessArgv respect -- terminators and validate profile values
- Remove unused resolveActiveCliSessionDefaults export
- Update test to use resolveCliSessionDefaults directly

Author: cursoragent

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

@@ -37,8 +37,15 @@ 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 === '--') {
+      break;
+    }
     if (token === '--profile') {
-      return argv[index + 1];
+      const nextToken = argv[index + 1];
+      if (nextToken && !nextToken.startsWith('-')) {
+        return nextToken;
+      }
+      return undefined;
     }
     if (token.startsWith('--profile=')) {
       return token.slice('--profile='.length);

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,