fix(tests): Normalize LLDB offsets and stale tools

Normalize LLDB breakpoint byte offsets in snapshot output and update the affected CLI/MCP JSON/text fixtures. Also avoid retaining stale MCP tool registrations when a previously registered tool fails to import during workflow re-selection.

Co-Authored-By: OpenAI Codex <noreply@openai.com>

Author: cameroncooke

src/snapshot-tests/__fixtures__/cli/json/debugging/lldb-command--success.json

@@ -11,7 +11,7 @@
       "  Names:",
       "    dap",
       "",
-      "  1.1: where = CalculatorApp.debug.dylib`closure #1 in closure #1 in closure #1 in ContentView.body.getter + 1428 at ContentView.swift:42:31, address = <ADDR>, resolved, hit count = 0"
+      "  1.1: where = CalculatorApp.debug.dylib`closure #1 in closure #1 in closure #1 in ContentView.body.getter + <OFFSET> at ContentView.swift:42:31, address = <ADDR>, resolved, hit count = 0"
     ]
   }
 }

src/snapshot-tests/__fixtures__/cli/text/debugging/lldb-command--success.txt

@@ -11,4 +11,4 @@ Output:
     Names:
       dap
 
-    1.1: where = CalculatorApp.debug.dylib`closure #1 in closure #1 in closure #1 in ContentView.body.getter + 1428 at ContentView.swift:42:31, address = <ADDR>, resolved, hit count = 0
+    1.1: where = CalculatorApp.debug.dylib`closure #1 in closure #1 in closure #1 in ContentView.body.getter + <OFFSET> at ContentView.swift:42:31, address = <ADDR>, resolved, hit count = 0

src/snapshot-tests/__fixtures__/mcp/json/debugging/lldb-command--success.json

@@ -11,7 +11,7 @@
       "  Names:",
       "    dap",
       "",
-      "  1.1: where = CalculatorApp.debug.dylib`closure #1 in closure #1 in closure #1 in ContentView.body.getter + 1428 at ContentView.swift:42:31, address = <ADDR>, resolved, hit count = 0"
+      "  1.1: where = CalculatorApp.debug.dylib`closure #1 in closure #1 in closure #1 in ContentView.body.getter + <OFFSET> at ContentView.swift:42:31, address = <ADDR>, resolved, hit count = 0"
     ]
   }
 }

src/snapshot-tests/__fixtures__/mcp/text/debugging/lldb-command--success.txt

@@ -9,4 +9,4 @@ Output:
     Names:
       dap
 
-    1.1: where = CalculatorApp.debug.dylib`closure #1 in closure #1 in closure #1 in ContentView.body.getter + 1428 at ContentView.swift:42:31, address = <ADDR>, resolved, hit count = 0
+    1.1: where = CalculatorApp.debug.dylib`closure #1 in closure #1 in closure #1 in ContentView.body.getter + <OFFSET> at ContentView.swift:42:31, address = <ADDR>, resolved, hit count = 0

src/snapshot-tests/__tests__/normalize.test.ts

@@ -44,6 +44,16 @@ describe('normalizeSnapshotOutput', () => {
     );
   });
 
+  it('normalizes LLDB breakpoint byte offsets', () => {
+    expect(
+      normalizeSnapshotOutput(
+        '  1.1: where = App.debug.dylib`ContentView.body.getter + 1428 at ContentView.swift:42:31, address = 0x123456789, unresolved, hit count = 0\n',
+      ),
+    ).toBe(
+      '  1.1: where = App.debug.dylib`ContentView.body.getter + <OFFSET> at ContentView.swift:42:31, address = <ADDR>, unresolved, hit count = 0\n',
+    );
+  });
+
   it('normalizes process identifiers in string output', () => {
     expect(normalizeSnapshotOutput('appName: PID 123456\nkill: 123456: No such process\n')).toBe(
       'appName: PID <PID>\nkill: <PID>: No such process\n',

src/snapshot-tests/normalize.ts

@@ -24,6 +24,7 @@ const THREAD_ID_REGEX = /Thread \d{5,}/g;
 const HEX_ADDRESS_REGEX = /0x[0-9a-fA-F]{8,}/g;
 
 const LLDB_FRAME_OFFSET_REGEX = /(`[^`\n]+):(\d+)$/gm;
+const LLDB_BREAKPOINT_BYTE_OFFSET_REGEX = /\+ \d+ at /g;
 const LLDB_SYS_FRAME_FUNC_REGEX =
   /(frame #\d+: )\S+( at (?:\/usr\/lib\/|\/Library\/Developer\/CoreSimulator\/)[^`\n]*`)[^:\n]+(:<OFFSET>)/gm;
 const LLDB_FRAME_NUMBER_REGEX = /  frame #\d+:/g;
@@ -204,6 +205,7 @@ export function normalizeSnapshotOutput(text: string): string {
   normalized = normalized.replace(THREAD_ID_REGEX, 'Thread <THREAD_ID>');
   normalized = normalized.replace(HEX_ADDRESS_REGEX, '<ADDR>');
   normalized = normalized.replace(LLDB_FRAME_OFFSET_REGEX, '$1:<OFFSET>');
+  normalized = normalized.replace(LLDB_BREAKPOINT_BYTE_OFFSET_REGEX, '+ <OFFSET> at ');
   normalized = normalized.replace(LLDB_SYS_FRAME_FUNC_REGEX, '$1<FUNC>$2<FUNC>$3');
   normalized = normalized.replace(LLDB_FRAME_NUMBER_REGEX, '  frame #<N>:');
   normalized = normalized.replace(LLDB_BREAKPOINT_LOCATIONS_REGEX, 'locations = <LOCATIONS>');

src/utils/__tests__/tool-registry.test.ts

@@ -1,6 +1,46 @@
-import { describe, expect, it } from 'vitest';
-import { createCustomWorkflowsFromConfig } from '../tool-registry.ts';
+import { describe, expect, it, vi, beforeEach } from 'vitest';
+import type { ToolSchemaShape } from '../../core/plugin-types.ts';
 import type { ResolvedManifest } from '../../core/manifest/schema.ts';
+import type { PredicateContext } from '../../visibility/predicate-types.ts';
+
+const testState = vi.hoisted(() => {
+  const registeredTools = new Map<string, { remove: ReturnType<typeof vi.fn> }>();
+  return {
+    manifest: undefined as ResolvedManifest | undefined,
+    importToolModule: vi.fn(),
+    registeredTools,
+    server: {
+      registerTool: vi.fn((name: string) => {
+        const registeredTool = { remove: vi.fn() };
+        registeredTools.set(name, registeredTool);
+        return registeredTool;
+      }),
+    },
+  };
+});
+
+vi.mock('../../server/server-state.ts', () => ({
+  server: testState.server,
+}));
+
+vi.mock('../../core/manifest/load-manifest.ts', () => ({
+  loadManifest: () => {
+    if (!testState.manifest) {
+      throw new Error('No manifest configured for test');
+    }
+    return testState.manifest;
+  },
+}));
+
+vi.mock('../../core/manifest/import-tool-module.ts', () => ({
+  importToolModule: testState.importToolModule,
+}));
+
+import {
+  __resetToolRegistryForTests,
+  applyWorkflowSelectionFromManifest,
+  createCustomWorkflowsFromConfig,
+} from '../tool-registry.ts';
 
 function createManifestFixture(): ResolvedManifest {
   return {
@@ -37,6 +77,7 @@ function createManifestFixture(): ResolvedManifest {
           description: 'Built-in simulator workflow',
           targetPlatforms: ['iOS'],
           availability: { mcp: true, cli: true },
+          selection: { mcp: { defaultEnabled: true, autoInclude: false } },
           predicates: [],
           tools: ['build_run_sim'],
         },
@@ -46,6 +87,36 @@ function createManifestFixture(): ResolvedManifest {
   };
 }
 
+function createToolModule() {
+  return {
+    schema: {} as ToolSchemaShape,
+    handler: vi.fn().mockResolvedValue({ content: [] }),
+  };
+}
+
+function createPredicateContext(): PredicateContext {
+  return {
+    runtime: 'mcp',
+    config: {
+      enabledWorkflows: [],
+      customWorkflows: {},
+      debug: false,
+      sentryDisabled: false,
+      experimentalWorkflowDiscovery: false,
+      disableSessionDefaults: false,
+      disableXcodeAutoSync: false,
+      showTestTiming: false,
+      uiDebuggerGuardMode: 'error',
+      incrementalBuildsEnabled: false,
+      dapRequestTimeoutMs: 30_000,
+      dapLogEvents: false,
+      launchJsonWaitMs: 8000,
+      debuggerBackend: 'dap',
+    },
+    runningUnderXcode: false,
+  };
+}
+
 describe('createCustomWorkflowsFromConfig', () => {
   it('creates custom workflows and resolves tool IDs', () => {
     const manifest = createManifestFixture();
@@ -76,3 +147,36 @@ describe('createCustomWorkflowsFromConfig', () => {
     expect(result.warnings).toHaveLength(3);
   });
 });
+
+describe('applyWorkflowSelectionFromManifest', () => {
+  beforeEach(() => {
+    __resetToolRegistryForTests();
+    testState.manifest = createManifestFixture();
+    testState.importToolModule.mockReset();
+    testState.server.registerTool.mockClear();
+    testState.registeredTools.clear();
+  });
+
+  it('removes a stale registered tool when its module no longer imports', async () => {
+    testState.importToolModule.mockResolvedValueOnce(createToolModule());
+
+    const initialRegistration = await applyWorkflowSelectionFromManifest(
+      undefined,
+      createPredicateContext(),
+    );
+
+    const registeredTool = testState.registeredTools.get('build_run_sim');
+    expect(initialRegistration.registeredToolCount).toBe(1);
+    expect(registeredTool).toBeDefined();
+
+    testState.importToolModule.mockRejectedValueOnce(new Error('import failed'));
+
+    const nextRegistration = await applyWorkflowSelectionFromManifest(
+      undefined,
+      createPredicateContext(),
+    );
+
+    expect(nextRegistration.registeredToolCount).toBe(0);
+    expect(registeredTool?.remove).toHaveBeenCalledTimes(1);
+  });
+});

src/utils/tool-registry.ts

@@ -431,13 +431,12 @@ async function enumerateAndRegisterTools(
         continue;
       }
 
-      desiredToolNames.add(toolManifest.names.mcp);
-
       const toolModule = await tryImportToolModule(toolManifest, moduleCache);
       if (!toolModule) {
         continue;
       }
 
+      desiredToolNames.add(toolManifest.names.mcp);
       catalogTools.push(toCatalogTool(toolManifest, workflow, toolModule));
       registerToolFromManifest(toolManifest, toolModule);
     }