Fix CI failures: tests, bootstrap SQL, type error

- App.test.tsx: update loading text assertion to match new splash screen
- laneService.test.ts: insert mission rows before FK references
- conflictService.test.ts: adjust assertion for lane_base/pr_target dedup
- kvDb bootstrap SQL: regenerate iOS artifact for resume_command column
- TerminalsPage.tsx: remove unused SANS_FONT reference

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: arul28

apps/desktop/src/main/services/conflicts/conflictService.test.ts

@@ -940,23 +940,16 @@ describe("conflictService conflict context integrity", () => {
     });
 
     const needs = await service.scanRebaseNeeds();
-    expect(needs).toHaveLength(2);
-    expect(needs).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          laneId: "lane-2",
-          kind: "lane_base",
-          baseBranch: "main",
-          groupContext: "Queue A",
-        }),
-        expect.objectContaining({
-          laneId: "lane-2",
-          kind: "pr_target",
-          baseBranch: "main",
-          prId: "pr-2",
-          groupContext: "Queue A",
-        }),
-      ]),
+    // Dedup keeps only the pr_target need when both lane_base and pr_target exist for the same lane
+    expect(needs).toHaveLength(1);
+    expect(needs[0]).toEqual(
+      expect.objectContaining({
+        laneId: "lane-2",
+        kind: "pr_target",
+        baseBranch: "main",
+        prId: "pr-2",
+        groupContext: "Queue A",
+      }),
     );
     expect(needs.every((need) => need.behindBy > 0)).toBe(true);
 

apps/desktop/src/main/services/lanes/laneService.test.ts

@@ -1804,6 +1804,14 @@ describe("laneService missionId and laneRole", () => {
       throw new Error(`Unexpected git call: ${args.join(" ")}`);
     });
 
+    // Insert a mission row so the FK on lanes.mission_id is satisfied
+    const now = "2026-03-11T12:00:00.000Z";
+    db.run(
+      `insert into missions(id, project_id, title, prompt, status, priority, execution_mode, created_at, updated_at)
+       values (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+      ["mission-abc", "proj-child-mission", "Test mission", "do something", "pending", "normal", "local", now, now],
+    );
+
     const service = createLaneService({
       db,
       projectRoot: repoRoot,
@@ -1974,6 +1982,14 @@ describe("laneService missionId and laneRole", () => {
       throw new Error(`Unexpected git call: ${args.join(" ")}`);
     });
 
+    // Insert a mission row so the FK on lanes.mission_id is satisfied
+    const now = "2026-03-11T12:00:00.000Z";
+    db.run(
+      `insert into missions(id, project_id, title, prompt, status, priority, execution_mode, created_at, updated_at)
+       values (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+      ["mission-xyz", "proj-set-ownership", "Test mission", "do something", "pending", "normal", "local", now, now],
+    );
+
     const service = createLaneService({
       db,
       projectRoot: repoRoot,
@@ -2004,6 +2020,14 @@ describe("laneService missionId and laneRole", () => {
     const db = await openKvDb(path.join(repoRoot, "kv.sqlite"), createLogger());
     await seedProjectAndStack(db, { projectId: "proj-clear-ownership", repoRoot });
 
+    // Insert a mission row so the FK on lanes.mission_id is satisfied
+    const now = "2026-03-11T12:00:00.000Z";
+    db.run(
+      `insert into missions(id, project_id, title, prompt, status, priority, execution_mode, created_at, updated_at)
+       values (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+      ["mission-existing", "proj-clear-ownership", "Test mission", "do something", "pending", "normal", "local", now, now],
+    );
+
     // Manually set mission_id/lane_role in DB first
     db.run("update lanes set mission_id = ?, lane_role = ? where id = ?", ["mission-existing", "worker", "lane-parent"]);
 

apps/desktop/src/renderer/components/app/App.test.tsx

@@ -55,7 +55,7 @@ describe("RequireProject", () => {
       </MemoryRouter>,
     );
 
-    expect(screen.getByText("Loading...")).toBeTruthy();
+    expect(screen.getByText("Starting ADE")).toBeTruthy();
     expect(screen.queryByText("Run page")).toBeNull();
   });
 

apps/desktop/src/renderer/components/terminals/TerminalsPage.tsx

@@ -184,7 +184,7 @@ export function TerminalsPage() {
   );
 
   return (
-    <div className="flex h-full min-w-0 flex-col" style={{ background: "var(--color-bg)", fontFamily: SANS_FONT }}>
+    <div className="flex h-full min-w-0 flex-col" style={{ background: "var(--color-bg)" }}>
       {renameError ? (
         <div
           className="shrink-0 border-b border-red-500/25 px-4 py-2 text-[12px] text-red-300/95"

apps/ios/ADE/Resources/DatabaseBootstrap.sql

@@ -100,6 +100,8 @@ create index if not exists idx_terminal_sessions_started_at on terminal_sessions
 
 create index if not exists idx_terminal_sessions_lane_started_at on terminal_sessions(lane_id, started_at desc);
 
+alter table terminal_sessions add column resume_command text;
+
 create table if not exists process_definitions (
       id text primary key,
       project_id text not null,