chore(main): extract tool-assembly + artifact-persistence from main.ts (arch R4) by jackwener · Pull Request #1246 · apache/maka

jackwener · 2026-07-19T15:48:23Z

Round 4 of notes/frontend-architecture-map-2026-07-19.md: main.ts 1903 → 1656 (−247).

tool-assembly.ts (277 L): the module-scope tool-assembly block (~L640-817) becomes assembleDesktopTools(deps) — sandbox/filesystem workers, agent/team/deferred/web-search/skill tools, computer-use host, product-binding assertion; 11 symbols returned to main.
tool-artifact-persistence.ts (124 L): createToolArtifactPersistence(deps) DI factory (persist/snapshot/archive/read paths, containment checks).
Both follow the register*/create* house DI style: explicit deps objects, no hidden globals. Deliberately NOT moved: registerIpc (wiring-contract anchor), modelSupportsVision + ai-sdk backend closure (session-stream core — R5 territory), the overlay-teardown let wiring.
Contracts: both modules added to the main-process combined-source aggregator (R3 pattern); three direct-read contracts switched to the aggregator with every assertion kept; wiring-contract untouched.
Proof: alignment auditor boots the full app across all 11 fixtures clean; turn-narrative CDP smoke renders 10 chat turns + composer (tool assembly feeds the session runtime — breakage shows at boot).

Gates (merged tree): desktop 2744 · ui 196 · typecheck · check-dead-css · knip ×2 = 0. Implemented by an opus worktree agent; R5/R6 boundaries in the map shifted accordingly.

…arch R4) Pure move of the tool-artifact persistence cluster out of main.ts: persistToolArtifacts / snapshotReadImage / persistArchivedToolResult / readArchivedToolResult, plus the internal resolveToolArtifactSourcePath / isInsideOrSamePath path-safety helpers. createToolArtifactPersistence takes an explicit { artifactStore, storeReadImage, safeSendToRenderer } deps object, matching the house register*/create* DI style. Zero behavior change.

Pure move of main.ts's module-scope tool-assembly block into tool-assembly.ts: assembleDesktopTools(deps) builds the sandbox / filesystem worker, the deferred capability groups (Rive, Office, browser, computer-use, agent orchestration), the WebSearch tool, the builtin + skill host surface, the deferred-group toolAvailability, and childAgentTools, and returns the 11 collections main.ts consumes downstream. main.ts keeps every call site plus the seams that must stay module-scoped: the backends.register ai-sdk closure (modelSupportsVision unchanged), systemPromptService, storeReadImage, and the onMainWindowClose cursor-overlay teardown (assigns a module let). Declaration order inside assembleDesktopTools preserves the original init order. main.ts 1903 -> 1656 (-247). Zero behavior change.

…urce (arch R4) Extend the main-process-contract-source-helpers aggregator with tool-assembly.ts and tool-artifact-persistence.ts so every combined-source consumer auto-covers the moved symbols. Switch three direct-main.ts readers to the combined source, keeping every assertion: agent-swarm-host-contract (buildParentAgentTools + buildDeferredToolGroupsFromCatalog), agent-team-collaboration-contract (childAgentTools + team tool builders), attachment-frontend-contract (snapshotReadImage). Relax the block-closer regexes in permission-response-ipc-boundary to tolerate the now-indented in-function brackets. registerIpc stays anchored in main.ts (main-process-wiring-contract untouched).

jackwener · 2026-07-19T15:48:23Z

Round 4 of notes/frontend-architecture-map-2026-07-19.md: main.ts 1903 → 1656 (−247).

tool-assembly.ts (277 L): the module-scope tool-assembly block (~L640-817) becomes assembleDesktopTools(deps) — sandbox/filesystem workers, agent/team/deferred/web-search/skill tools, computer-use host, product-binding assertion; 11 symbols returned to main.
tool-artifact-persistence.ts (124 L): createToolArtifactPersistence(deps) DI factory (persist/snapshot/archive/read paths, containment checks).
Both follow the register*/create* house DI style: explicit deps objects, no hidden globals. Deliberately NOT moved: registerIpc (wiring-contract anchor), modelSupportsVision + ai-sdk backend closure (session-stream core — R5 territory), the overlay-teardown let wiring.
Contracts: both modules added to the main-process combined-source aggregator (R3 pattern); three direct-read contracts switched to the aggregator with every assertion kept; wiring-contract untouched.
Proof: alignment auditor boots the full app across all 11 fixtures clean; turn-narrative CDP smoke renders 10 chat turns + composer (tool assembly feeds the session runtime — breakage shows at boot).

Gates (merged tree): desktop 2744 · ui 196 · typecheck · check-dead-css · knip ×2 = 0. Implemented by an opus worktree agent; R5/R6 boundaries in the map shifted accordingly.

…arch R4) Pure move of the tool-artifact persistence cluster out of main.ts: persistToolArtifacts / snapshotReadImage / persistArchivedToolResult / readArchivedToolResult, plus the internal resolveToolArtifactSourcePath / isInsideOrSamePath path-safety helpers. createToolArtifactPersistence takes an explicit { artifactStore, storeReadImage, safeSendToRenderer } deps object, matching the house register*/create* DI style. Zero behavior change.

Pure move of main.ts's module-scope tool-assembly block into tool-assembly.ts: assembleDesktopTools(deps) builds the sandbox / filesystem worker, the deferred capability groups (Rive, Office, browser, computer-use, agent orchestration), the WebSearch tool, the builtin + skill host surface, the deferred-group toolAvailability, and childAgentTools, and returns the 11 collections main.ts consumes downstream. main.ts keeps every call site plus the seams that must stay module-scoped: the backends.register ai-sdk closure (modelSupportsVision unchanged), systemPromptService, storeReadImage, and the onMainWindowClose cursor-overlay teardown (assigns a module let). Declaration order inside assembleDesktopTools preserves the original init order. main.ts 1903 -> 1656 (-247). Zero behavior change.

…urce (arch R4) Extend the main-process-contract-source-helpers aggregator with tool-assembly.ts and tool-artifact-persistence.ts so every combined-source consumer auto-covers the moved symbols. Switch three direct-main.ts readers to the combined source, keeping every assertion: agent-swarm-host-contract (buildParentAgentTools + buildDeferredToolGroupsFromCatalog), agent-team-collaboration-contract (childAgentTools + team tool builders), attachment-frontend-contract (snapshotReadImage). Relax the block-closer regexes in permission-response-ipc-boundary to tolerate the now-indented in-function brackets. registerIpc stays anchored in main.ts (main-process-wiring-contract untouched).

jackwener · 2026-07-19T15:48:23Z

Round 4 of notes/frontend-architecture-map-2026-07-19.md: main.ts 1903 → 1656 (−247).

tool-assembly.ts (277 L): the module-scope tool-assembly block (~L640-817) becomes assembleDesktopTools(deps) — sandbox/filesystem workers, agent/team/deferred/web-search/skill tools, computer-use host, product-binding assertion; 11 symbols returned to main.
tool-artifact-persistence.ts (124 L): createToolArtifactPersistence(deps) DI factory (persist/snapshot/archive/read paths, containment checks).
Both follow the register*/create* house DI style: explicit deps objects, no hidden globals. Deliberately NOT moved: registerIpc (wiring-contract anchor), modelSupportsVision + ai-sdk backend closure (session-stream core — R5 territory), the overlay-teardown let wiring.
Contracts: both modules added to the main-process combined-source aggregator (R3 pattern); three direct-read contracts switched to the aggregator with every assertion kept; wiring-contract untouched.
Proof: alignment auditor boots the full app across all 11 fixtures clean; turn-narrative CDP smoke renders 10 chat turns + composer (tool assembly feeds the session runtime — breakage shows at boot).

Gates (merged tree): desktop 2744 · ui 196 · typecheck · check-dead-css · knip ×2 = 0. Implemented by an opus worktree agent; R5/R6 boundaries in the map shifted accordingly.

…arch R4) Pure move of the tool-artifact persistence cluster out of main.ts: persistToolArtifacts / snapshotReadImage / persistArchivedToolResult / readArchivedToolResult, plus the internal resolveToolArtifactSourcePath / isInsideOrSamePath path-safety helpers. createToolArtifactPersistence takes an explicit { artifactStore, storeReadImage, safeSendToRenderer } deps object, matching the house register*/create* DI style. Zero behavior change.

Pure move of main.ts's module-scope tool-assembly block into tool-assembly.ts: assembleDesktopTools(deps) builds the sandbox / filesystem worker, the deferred capability groups (Rive, Office, browser, computer-use, agent orchestration), the WebSearch tool, the builtin + skill host surface, the deferred-group toolAvailability, and childAgentTools, and returns the 11 collections main.ts consumes downstream. main.ts keeps every call site plus the seams that must stay module-scoped: the backends.register ai-sdk closure (modelSupportsVision unchanged), systemPromptService, storeReadImage, and the onMainWindowClose cursor-overlay teardown (assigns a module let). Declaration order inside assembleDesktopTools preserves the original init order. main.ts 1903 -> 1656 (-247). Zero behavior change.

…urce (arch R4) Extend the main-process-contract-source-helpers aggregator with tool-assembly.ts and tool-artifact-persistence.ts so every combined-source consumer auto-covers the moved symbols. Switch three direct-main.ts readers to the combined source, keeping every assertion: agent-swarm-host-contract (buildParentAgentTools + buildDeferredToolGroupsFromCatalog), agent-team-collaboration-contract (childAgentTools + team tool builders), attachment-frontend-contract (snapshotReadImage). Relax the block-closer regexes in permission-response-ipc-boundary to tolerate the now-indented in-function brackets. registerIpc stays anchored in main.ts (main-process-wiring-contract untouched).

jackwener · 2026-07-19T15:48:23Z

Round 4 of notes/frontend-architecture-map-2026-07-19.md: main.ts 1903 → 1656 (−247).

tool-assembly.ts (277 L): the module-scope tool-assembly block (~L640-817) becomes assembleDesktopTools(deps) — sandbox/filesystem workers, agent/team/deferred/web-search/skill tools, computer-use host, product-binding assertion; 11 symbols returned to main.
tool-artifact-persistence.ts (124 L): createToolArtifactPersistence(deps) DI factory (persist/snapshot/archive/read paths, containment checks).
Both follow the register*/create* house DI style: explicit deps objects, no hidden globals. Deliberately NOT moved: registerIpc (wiring-contract anchor), modelSupportsVision + ai-sdk backend closure (session-stream core — R5 territory), the overlay-teardown let wiring.
Contracts: both modules added to the main-process combined-source aggregator (R3 pattern); three direct-read contracts switched to the aggregator with every assertion kept; wiring-contract untouched.
Proof: alignment auditor boots the full app across all 11 fixtures clean; turn-narrative CDP smoke renders 10 chat turns + composer (tool assembly feeds the session runtime — breakage shows at boot).

Gates (merged tree): desktop 2744 · ui 196 · typecheck · check-dead-css · knip ×2 = 0. Implemented by an opus worktree agent; R5/R6 boundaries in the map shifted accordingly.

…arch R4) Pure move of the tool-artifact persistence cluster out of main.ts: persistToolArtifacts / snapshotReadImage / persistArchivedToolResult / readArchivedToolResult, plus the internal resolveToolArtifactSourcePath / isInsideOrSamePath path-safety helpers. createToolArtifactPersistence takes an explicit { artifactStore, storeReadImage, safeSendToRenderer } deps object, matching the house register*/create* DI style. Zero behavior change.

Pure move of main.ts's module-scope tool-assembly block into tool-assembly.ts: assembleDesktopTools(deps) builds the sandbox / filesystem worker, the deferred capability groups (Rive, Office, browser, computer-use, agent orchestration), the WebSearch tool, the builtin + skill host surface, the deferred-group toolAvailability, and childAgentTools, and returns the 11 collections main.ts consumes downstream. main.ts keeps every call site plus the seams that must stay module-scoped: the backends.register ai-sdk closure (modelSupportsVision unchanged), systemPromptService, storeReadImage, and the onMainWindowClose cursor-overlay teardown (assigns a module let). Declaration order inside assembleDesktopTools preserves the original init order. main.ts 1903 -> 1656 (-247). Zero behavior change.

…urce (arch R4) Extend the main-process-contract-source-helpers aggregator with tool-assembly.ts and tool-artifact-persistence.ts so every combined-source consumer auto-covers the moved symbols. Switch three direct-main.ts readers to the combined source, keeping every assertion: agent-swarm-host-contract (buildParentAgentTools + buildDeferredToolGroupsFromCatalog), agent-team-collaboration-contract (childAgentTools + team tool builders), attachment-frontend-contract (snapshotReadImage). Relax the block-closer regexes in permission-response-ipc-boundary to tolerate the now-indented in-function brackets. registerIpc stays anchored in main.ts (main-process-wiring-contract untouched).

jackwener · 2026-07-19T15:48:23Z

Round 4 of notes/frontend-architecture-map-2026-07-19.md: main.ts 1903 → 1656 (−247).

tool-assembly.ts (277 L): the module-scope tool-assembly block (~L640-817) becomes assembleDesktopTools(deps) — sandbox/filesystem workers, agent/team/deferred/web-search/skill tools, computer-use host, product-binding assertion; 11 symbols returned to main.
tool-artifact-persistence.ts (124 L): createToolArtifactPersistence(deps) DI factory (persist/snapshot/archive/read paths, containment checks).
Both follow the register*/create* house DI style: explicit deps objects, no hidden globals. Deliberately NOT moved: registerIpc (wiring-contract anchor), modelSupportsVision + ai-sdk backend closure (session-stream core — R5 territory), the overlay-teardown let wiring.
Contracts: both modules added to the main-process combined-source aggregator (R3 pattern); three direct-read contracts switched to the aggregator with every assertion kept; wiring-contract untouched.
Proof: alignment auditor boots the full app across all 11 fixtures clean; turn-narrative CDP smoke renders 10 chat turns + composer (tool assembly feeds the session runtime — breakage shows at boot).

Gates (merged tree): desktop 2744 · ui 196 · typecheck · check-dead-css · knip ×2 = 0. Implemented by an opus worktree agent; R5/R6 boundaries in the map shifted accordingly.

…arch R4) Pure move of the tool-artifact persistence cluster out of main.ts: persistToolArtifacts / snapshotReadImage / persistArchivedToolResult / readArchivedToolResult, plus the internal resolveToolArtifactSourcePath / isInsideOrSamePath path-safety helpers. createToolArtifactPersistence takes an explicit { artifactStore, storeReadImage, safeSendToRenderer } deps object, matching the house register*/create* DI style. Zero behavior change.

Pure move of main.ts's module-scope tool-assembly block into tool-assembly.ts: assembleDesktopTools(deps) builds the sandbox / filesystem worker, the deferred capability groups (Rive, Office, browser, computer-use, agent orchestration), the WebSearch tool, the builtin + skill host surface, the deferred-group toolAvailability, and childAgentTools, and returns the 11 collections main.ts consumes downstream. main.ts keeps every call site plus the seams that must stay module-scoped: the backends.register ai-sdk closure (modelSupportsVision unchanged), systemPromptService, storeReadImage, and the onMainWindowClose cursor-overlay teardown (assigns a module let). Declaration order inside assembleDesktopTools preserves the original init order. main.ts 1903 -> 1656 (-247). Zero behavior change.

…urce (arch R4) Extend the main-process-contract-source-helpers aggregator with tool-assembly.ts and tool-artifact-persistence.ts so every combined-source consumer auto-covers the moved symbols. Switch three direct-main.ts readers to the combined source, keeping every assertion: agent-swarm-host-contract (buildParentAgentTools + buildDeferredToolGroupsFromCatalog), agent-team-collaboration-contract (childAgentTools + team tool builders), attachment-frontend-contract (snapshotReadImage). Relax the block-closer regexes in permission-response-ipc-boundary to tolerate the now-indented in-function brackets. registerIpc stays anchored in main.ts (main-process-wiring-contract untouched).

jackwener · 2026-07-19T15:48:23Z

Round 4 of notes/frontend-architecture-map-2026-07-19.md: main.ts 1903 → 1656 (−247).

tool-assembly.ts (277 L): the module-scope tool-assembly block (~L640-817) becomes assembleDesktopTools(deps) — sandbox/filesystem workers, agent/team/deferred/web-search/skill tools, computer-use host, product-binding assertion; 11 symbols returned to main.
tool-artifact-persistence.ts (124 L): createToolArtifactPersistence(deps) DI factory (persist/snapshot/archive/read paths, containment checks).
Both follow the register*/create* house DI style: explicit deps objects, no hidden globals. Deliberately NOT moved: registerIpc (wiring-contract anchor), modelSupportsVision + ai-sdk backend closure (session-stream core — R5 territory), the overlay-teardown let wiring.
Contracts: both modules added to the main-process combined-source aggregator (R3 pattern); three direct-read contracts switched to the aggregator with every assertion kept; wiring-contract untouched.
Proof: alignment auditor boots the full app across all 11 fixtures clean; turn-narrative CDP smoke renders 10 chat turns + composer (tool assembly feeds the session runtime — breakage shows at boot).

Gates (merged tree): desktop 2744 · ui 196 · typecheck · check-dead-css · knip ×2 = 0. Implemented by an opus worktree agent; R5/R6 boundaries in the map shifted accordingly.

…arch R4) Pure move of the tool-artifact persistence cluster out of main.ts: persistToolArtifacts / snapshotReadImage / persistArchivedToolResult / readArchivedToolResult, plus the internal resolveToolArtifactSourcePath / isInsideOrSamePath path-safety helpers. createToolArtifactPersistence takes an explicit { artifactStore, storeReadImage, safeSendToRenderer } deps object, matching the house register*/create* DI style. Zero behavior change.

Pure move of main.ts's module-scope tool-assembly block into tool-assembly.ts: assembleDesktopTools(deps) builds the sandbox / filesystem worker, the deferred capability groups (Rive, Office, browser, computer-use, agent orchestration), the WebSearch tool, the builtin + skill host surface, the deferred-group toolAvailability, and childAgentTools, and returns the 11 collections main.ts consumes downstream. main.ts keeps every call site plus the seams that must stay module-scoped: the backends.register ai-sdk closure (modelSupportsVision unchanged), systemPromptService, storeReadImage, and the onMainWindowClose cursor-overlay teardown (assigns a module let). Declaration order inside assembleDesktopTools preserves the original init order. main.ts 1903 -> 1656 (-247). Zero behavior change.

…urce (arch R4) Extend the main-process-contract-source-helpers aggregator with tool-assembly.ts and tool-artifact-persistence.ts so every combined-source consumer auto-covers the moved symbols. Switch three direct-main.ts readers to the combined source, keeping every assertion: agent-swarm-host-contract (buildParentAgentTools + buildDeferredToolGroupsFromCatalog), agent-team-collaboration-contract (childAgentTools + team tool builders), attachment-frontend-contract (snapshotReadImage). Relax the block-closer regexes in permission-response-ipc-boundary to tolerate the now-indented in-function brackets. registerIpc stays anchored in main.ts (main-process-wiring-contract untouched).

jackwener · 2026-07-19T15:48:23Z

Round 4 of notes/frontend-architecture-map-2026-07-19.md: main.ts 1903 → 1656 (−247).

tool-assembly.ts (277 L): the module-scope tool-assembly block (~L640-817) becomes assembleDesktopTools(deps) — sandbox/filesystem workers, agent/team/deferred/web-search/skill tools, computer-use host, product-binding assertion; 11 symbols returned to main.
tool-artifact-persistence.ts (124 L): createToolArtifactPersistence(deps) DI factory (persist/snapshot/archive/read paths, containment checks).
Both follow the register*/create* house DI style: explicit deps objects, no hidden globals. Deliberately NOT moved: registerIpc (wiring-contract anchor), modelSupportsVision + ai-sdk backend closure (session-stream core — R5 territory), the overlay-teardown let wiring.
Contracts: both modules added to the main-process combined-source aggregator (R3 pattern); three direct-read contracts switched to the aggregator with every assertion kept; wiring-contract untouched.
Proof: alignment auditor boots the full app across all 11 fixtures clean; turn-narrative CDP smoke renders 10 chat turns + composer (tool assembly feeds the session runtime — breakage shows at boot).

Gates (merged tree): desktop 2744 · ui 196 · typecheck · check-dead-css · knip ×2 = 0. Implemented by an opus worktree agent; R5/R6 boundaries in the map shifted accordingly.

…arch R4) Pure move of the tool-artifact persistence cluster out of main.ts: persistToolArtifacts / snapshotReadImage / persistArchivedToolResult / readArchivedToolResult, plus the internal resolveToolArtifactSourcePath / isInsideOrSamePath path-safety helpers. createToolArtifactPersistence takes an explicit { artifactStore, storeReadImage, safeSendToRenderer } deps object, matching the house register*/create* DI style. Zero behavior change.

Pure move of main.ts's module-scope tool-assembly block into tool-assembly.ts: assembleDesktopTools(deps) builds the sandbox / filesystem worker, the deferred capability groups (Rive, Office, browser, computer-use, agent orchestration), the WebSearch tool, the builtin + skill host surface, the deferred-group toolAvailability, and childAgentTools, and returns the 11 collections main.ts consumes downstream. main.ts keeps every call site plus the seams that must stay module-scoped: the backends.register ai-sdk closure (modelSupportsVision unchanged), systemPromptService, storeReadImage, and the onMainWindowClose cursor-overlay teardown (assigns a module let). Declaration order inside assembleDesktopTools preserves the original init order. main.ts 1903 -> 1656 (-247). Zero behavior change.

…urce (arch R4) Extend the main-process-contract-source-helpers aggregator with tool-assembly.ts and tool-artifact-persistence.ts so every combined-source consumer auto-covers the moved symbols. Switch three direct-main.ts readers to the combined source, keeping every assertion: agent-swarm-host-contract (buildParentAgentTools + buildDeferredToolGroupsFromCatalog), agent-team-collaboration-contract (childAgentTools + team tool builders), attachment-frontend-contract (snapshotReadImage). Relax the block-closer regexes in permission-response-ipc-boundary to tolerate the now-indented in-function brackets. registerIpc stays anchored in main.ts (main-process-wiring-contract untouched).

jackwener · 2026-07-19T15:48:23Z

Round 4 of notes/frontend-architecture-map-2026-07-19.md: main.ts 1903 → 1656 (−247).

tool-assembly.ts (277 L): the module-scope tool-assembly block (~L640-817) becomes assembleDesktopTools(deps) — sandbox/filesystem workers, agent/team/deferred/web-search/skill tools, computer-use host, product-binding assertion; 11 symbols returned to main.
tool-artifact-persistence.ts (124 L): createToolArtifactPersistence(deps) DI factory (persist/snapshot/archive/read paths, containment checks).
Both follow the register*/create* house DI style: explicit deps objects, no hidden globals. Deliberately NOT moved: registerIpc (wiring-contract anchor), modelSupportsVision + ai-sdk backend closure (session-stream core — R5 territory), the overlay-teardown let wiring.
Contracts: both modules added to the main-process combined-source aggregator (R3 pattern); three direct-read contracts switched to the aggregator with every assertion kept; wiring-contract untouched.
Proof: alignment auditor boots the full app across all 11 fixtures clean; turn-narrative CDP smoke renders 10 chat turns + composer (tool assembly feeds the session runtime — breakage shows at boot).

Gates (merged tree): desktop 2744 · ui 196 · typecheck · check-dead-css · knip ×2 = 0. Implemented by an opus worktree agent; R5/R6 boundaries in the map shifted accordingly.

…arch R4) Pure move of the tool-artifact persistence cluster out of main.ts: persistToolArtifacts / snapshotReadImage / persistArchivedToolResult / readArchivedToolResult, plus the internal resolveToolArtifactSourcePath / isInsideOrSamePath path-safety helpers. createToolArtifactPersistence takes an explicit { artifactStore, storeReadImage, safeSendToRenderer } deps object, matching the house register*/create* DI style. Zero behavior change.

Pure move of main.ts's module-scope tool-assembly block into tool-assembly.ts: assembleDesktopTools(deps) builds the sandbox / filesystem worker, the deferred capability groups (Rive, Office, browser, computer-use, agent orchestration), the WebSearch tool, the builtin + skill host surface, the deferred-group toolAvailability, and childAgentTools, and returns the 11 collections main.ts consumes downstream. main.ts keeps every call site plus the seams that must stay module-scoped: the backends.register ai-sdk closure (modelSupportsVision unchanged), systemPromptService, storeReadImage, and the onMainWindowClose cursor-overlay teardown (assigns a module let). Declaration order inside assembleDesktopTools preserves the original init order. main.ts 1903 -> 1656 (-247). Zero behavior change.

…urce (arch R4) Extend the main-process-contract-source-helpers aggregator with tool-assembly.ts and tool-artifact-persistence.ts so every combined-source consumer auto-covers the moved symbols. Switch three direct-main.ts readers to the combined source, keeping every assertion: agent-swarm-host-contract (buildParentAgentTools + buildDeferredToolGroupsFromCatalog), agent-team-collaboration-contract (childAgentTools + team tool builders), attachment-frontend-contract (snapshotReadImage). Relax the block-closer regexes in permission-response-ipc-boundary to tolerate the now-indented in-function brackets. registerIpc stays anchored in main.ts (main-process-wiring-contract untouched).