Agent chat improvements and lane base tracking

Introduce several agent chat/runtime improvements and refine lane/base tracking for rebases.

Key changes:
- Agent chat: add persisted approvalOverrides for Claude sessions, normalize tool names, and centralize initial turn activity via initialTurnActivity to emit an immediate startup activity before stream output arrives. Tests added to verify startup activity for unified and Claude streams.
- Approval flow: avoid hanging promises by using try/finally when registering runtime.approvals and pending elicitations, and drain pending approvals on interrupt. Persist and restore approvalOverrides in session state.
- Claude handling: refactor tool headline generation, synthesize todo updates via maybeEmitTodoUpdate, and tighten URL openExternal to only allow http/https.
- Conflict/lanes: use shouldLaneTrackParent and branchNameFromLaneRef to determine tracked parents; add explicit RebaseNeed.kind ("lane_base" | "pr_target") and return both need types (remove prior deduplication). Update auto-rebase logic to respect tracked parents and skip legacy parent links. Add tests to cover the new behaviors.
- IPC: include laneCount in recent project summaries.
- Misc: various test additions and small refactors across services to support the above.

These changes fix race/hang issues around approvals, make startup activity more predictable, and improve correctness when parent lanes diverge from stored bases.

Author: arul28

.ade/state.sqlite

@@ -271,8 +271,10 @@ cd apps/desktop && npx vitest run [affected existing test files]
 
 ### 6a. Check vitest workspace config
 
-Read `apps/desktop/vitest.workspace.ts` and verify every new test file matches an include pattern:
-- Unit: `src/**/*.test.{ts,tsx}`
+Read `apps/desktop/vitest.workspace.ts` and verify every new test file matches one of the three workspace project include patterns:
+- `unit-main`: `src/main/**/*.test.{ts,tsx}`
+- `unit-renderer`: `src/renderer/**/*.test.{ts,tsx}`
+- `unit-shared`: `src/shared/**/*.test.{ts,tsx}` and `src/preload/**/*.test.{ts,tsx}`
 
 If a test file does NOT match, update the workspace config.
 

.claude/commands/automate.md

@@ -3313,4 +3313,133 @@ describe("createAgentChatService", () => {
       expect(updated?.unifiedPermissionMode).toBe("edit");
     });
   });
+
+  it("emits immediate startup activity before unified stream output arrives", async () => {
+    const events: AgentChatEventEnvelope[] = [];
+    let releaseStream!: () => void;
+    const streamGate = new Promise<void>((resolve) => {
+      releaseStream = () => resolve();
+    });
+
+    vi.mocked(streamText).mockImplementation(() => ({
+      fullStream: (async function* () {
+        await streamGate;
+        yield { type: "finish", usage: {} };
+      })(),
+    }) as any);
+
+    const { service } = createService({
+      onEvent: (event: AgentChatEventEnvelope) => events.push(event),
+    });
+
+    const session = await service.createSession({
+      laneId: "lane-1",
+      provider: "unified",
+      model: "openai/gpt-5.4",
+      modelId: "openai/gpt-5.4",
+    });
+
+    const sendPromise = service.sendMessage({
+      sessionId: session.id,
+      text: "Resolve the PR comments.",
+    });
+
+    const startedEvent = await waitForEvent(
+      events,
+      (event): event is AgentChatEventEnvelope & {
+        event: Extract<AgentChatEventEnvelope["event"], { type: "status" }>;
+      } => event.event.type === "status" && event.event.turnStatus === "started",
+    );
+
+    const startupActivity = await waitForEvent(
+      events,
+      (event): event is AgentChatEventEnvelope & {
+        event: Extract<AgentChatEventEnvelope["event"], { type: "activity" }>;
+      } =>
+        event.event.type === "activity"
+        && event.event.turnId === startedEvent.event.turnId
+        && (event.event.activity === "thinking" || event.event.activity === "working"),
+    );
+
+    expect(startupActivity.event.detail).toBeTruthy();
+
+    releaseStream();
+    await sendPromise;
+  });
+
+  it("emits immediate startup activity before Claude SDK stream output arrives", async () => {
+    const events: AgentChatEventEnvelope[] = [];
+    const setPermissionMode = vi.fn().mockResolvedValue(undefined);
+    const send = vi.fn().mockResolvedValue(undefined);
+    let streamCall = 0;
+    let releaseStream!: () => void;
+    const streamGate = new Promise<void>((resolve) => {
+      releaseStream = () => resolve();
+    });
+
+    const stream = vi.fn(() => (async function* () {
+      streamCall += 1;
+      if (streamCall === 1) {
+        yield {
+          type: "system",
+          subtype: "init",
+          session_id: "sdk-session-1",
+          slash_commands: [],
+        };
+        return;
+      }
+
+      await streamGate;
+      yield {
+        type: "result",
+        usage: { input_tokens: 1, output_tokens: 1 },
+      };
+    })());
+
+    vi.mocked(unstable_v2_createSession).mockReturnValue({
+      send,
+      stream,
+      close: vi.fn(),
+      sessionId: "sdk-session-1",
+      setPermissionMode,
+    } as any);
+
+    const { service } = createService({
+      onEvent: (event: AgentChatEventEnvelope) => events.push(event),
+    });
+
+    const session = await service.createSession({
+      laneId: "lane-1",
+      provider: "claude",
+      model: "claude-sonnet-4-6",
+      modelId: "anthropic/claude-sonnet-4-6",
+    });
+
+    const sendPromise = service.sendMessage({
+      sessionId: session.id,
+      text: "Resolve the PR comments.",
+    });
+
+    const startedEvent = await waitForEvent(
+      events,
+      (event): event is AgentChatEventEnvelope & {
+        event: Extract<AgentChatEventEnvelope["event"], { type: "status" }>;
+      } => event.event.type === "status" && event.event.turnStatus === "started",
+    );
+
+    const startupActivity = await waitForEvent(
+      events,
+      (event): event is AgentChatEventEnvelope & {
+        event: Extract<AgentChatEventEnvelope["event"], { type: "activity" }>;
+      } =>
+        event.event.type === "activity"
+        && event.event.turnId === startedEvent.event.turnId
+        && (event.event.activity === "thinking" || event.event.activity === "working"),
+    );
+
+    expect(startupActivity.event.detail).toBeTruthy();
+
+    releaseStream();
+    await sendPromise;
+  });
 });