Merge fix-integration-copilot

Author: nigel-dev

src/tools/plan-approve.ts

@@ -5,6 +5,8 @@ import { getSharedMonitor, getSharedNotifyCallback, setSharedOrchestrator } from
 import type { CheckpointType } from '../lib/plan-types';
 import { loadConfig } from '../lib/config';
 import { getCurrentModel } from '../lib/model-tracker';
+import { createIntegrationBranch } from '../lib/integration';
+import { resolvePostCreateHook } from '../lib/worktree-setup';
 
 export const mc_plan_approve: ToolDefinition = tool({
   description:
@@ -49,10 +51,15 @@ export const mc_plan_approve: ToolDefinition = tool({
       );
     }
 
+    // Create integration infrastructure that copilot mode skipped
+    const config = await loadConfig();
+    const integrationPostCreate = resolvePostCreateHook(config.worktreeSetup);
+    const integration = await createIntegrationBranch(plan.id, integrationPostCreate);
+    plan.integrationBranch = integration.branch;
+    plan.integrationWorktree = integration.worktreePath;
     plan.status = 'running';
     await savePlan(plan);
 
-    const config = await loadConfig();
     const orchestrator = new Orchestrator(getSharedMonitor(), config, { notify: getSharedNotifyCallback() ?? undefined });
     setSharedOrchestrator(orchestrator);
     orchestrator.setPlanModelSnapshot(getCurrentModel());

src/tools/plan.ts

@@ -111,7 +111,7 @@ export const mc_plan: ToolDefinition = tool({
       placement: args.placement,
       status: 'pending',
       jobs: jobSpecs,
-      integrationBranch: `mc/integration/${planId.slice(0, 8)}`,
+      integrationBranch: `mc/integration-${planId}`,
       baseCommit,
       createdAt: new Date().toISOString(),
     };

tests/tools/plan-approve.test.ts

@@ -3,6 +3,8 @@ import * as planState from '../../src/lib/plan-state';
 import * as orchestrator from '../../src/lib/orchestrator';
 import * as config from '../../src/lib/config';
 import * as monitor from '../../src/lib/monitor';
+import * as integration from '../../src/lib/integration';
+import * as worktreeSetup from '../../src/lib/worktree-setup';
 
 const { mc_plan_approve } = await import('../../src/tools/plan-approve');
 
@@ -78,7 +80,7 @@ describe('mc_plan_approve', () => {
           { id: 'j1', name: 'auth', prompt: 'do auth', status: 'queued' },
           { id: 'j2', name: 'api', prompt: 'do api', status: 'queued' },
         ],
-        integrationBranch: 'mc/integration/plan-1',
+        integrationBranch: 'mc/integration-plan-1',
         baseCommit: 'abc123',
         createdAt: new Date().toISOString(),
       });
@@ -92,6 +94,11 @@ describe('mc_plan_approve', () => {
             setPlanModelSnapshot: vi.fn(),
           }) as any,
       );
+      vi.spyOn(integration, 'createIntegrationBranch').mockResolvedValue({
+        branch: 'mc/integration-plan-1',
+        worktreePath: '/tmp/integration-plan-1',
+      });
+      vi.spyOn(worktreeSetup, 'resolvePostCreateHook').mockReturnValue(undefined as any);
 
       const result = await mc_plan_approve.execute({}, mockContext);