feat: persist supervisor target ids

pallyoung · pallyoung · commit 789ccf0e8862 · 2026-05-12T22:06:09.000Z
diff --git a/packages/core/src/domain/supervisor.ts b/packages/core/src/domain/supervisor.ts
@@ -19,7 +19,37 @@ export type CycleStatus =
 
 export type CycleTrigger = "turn_completed" | "manual" | "scheduled";
 
-export type SupervisorStopReason = "objective_complete" | "max_supervision_count_reached";
+export type SupervisorStopReason =
+  | "objective_complete"
+  | "max_supervision_count_reached"
+  | "supervisor_uncertain"
+  | "needs_user_input";
+
+export type SupervisorPlanStepStatus = "pending" | "in_progress" | "completed";
+
+export interface SupervisorPlanStep {
+  step: string;
+  status: SupervisorPlanStepStatus;
+}
+
+export interface SupervisorTargetMemory {
+  summary: string;
+  plan: SupervisorPlanStep[];
+  updatedAt: number;
+}
+
+export interface SupervisorCycleStepUpdate {
+  step: string;
+  status: SupervisorPlanStepStatus;
+}
+
+export interface SupervisorCycleTargetRecord {
+  cycleId: string;
+  targetId: string;
+  summary?: string;
+  stepUpdates: SupervisorCycleStepUpdate[];
+  createdAt: number;
+}
 
 export type SupervisorCycleAttemptStatus = "evaluating" | "completed" | "failed" | "cancelled";
 
@@ -65,6 +95,7 @@ export interface Supervisor {
   id: string;
   sessionId: string;
   workspaceId: string;
+  targetId: string;
   state: SupervisorState;
   objective: string;
   evaluatorProviderId: string;
@@ -73,6 +104,8 @@ export interface Supervisor {
   completedSupervisionCount: number;
   scheduledAt?: number;
   stopReason?: SupervisorStopReason;
+  currentTargetMemory?: SupervisorTargetMemory;
+  recentTargetCycles: SupervisorCycleTargetRecord[];
   cycles: SupervisorCycle[];
   lastCycleAt?: number;
   lastEvaluatedTurnId?: string;
diff --git a/packages/server/src/__tests__/db.test.ts b/packages/server/src/__tests__/db.test.ts
@@ -8,6 +8,7 @@ import {
   CURRENT_SCHEMA_VERSION,
   IncompatibleSchemaError,
   V1_SCHEMA_SQL,
+  V2_SCHEMA_SQL,
 } from "../storage/schema-version.js";
 
 describe("Database", () => {
@@ -98,7 +99,7 @@ describe("Database", () => {
       expect(tables.map((table) => table.name)).not.toContain("_migrations");
     });
 
-    it("should upgrade a known v1 supervisor schema to v2 when user_version is unset", () => {
+    it("should upgrade a known v1 supervisor schema to v3 when user_version is unset", () => {
       const dbPath = join(tempDir, "v1.db");
       const rawDb = new DatabaseSync(dbPath);
       rawDb.exec("PRAGMA user_version = 0");
@@ -108,13 +109,14 @@ describe("Database", () => {
       db = openDatabase(dbPath);
 
       const userVersion = db.prepare("PRAGMA user_version").get() as { user_version: number };
-      expect(userVersion.user_version).toBe(2);
+      expect(userVersion.user_version).toBe(CURRENT_SCHEMA_VERSION);
 
       const supervisorColumns = db.prepare("PRAGMA table_info(supervisors)").all() as Array<{
         name: string;
       }>;
       expect(supervisorColumns.map((column) => column.name)).toEqual(
         expect.arrayContaining([
+          "target_id",
           "evaluator_model",
           "max_supervision_count",
           "completed_supervision_count",
@@ -138,6 +140,79 @@ describe("Database", () => {
       expect(upgradedIndex?.name).toBe("idx_supervisor_cycle_attempts_cycle");
     });
 
+    it("should upgrade a known v2 supervisor schema to v3 and backfill target ids", () => {
+      const dbPath = join(tempDir, "v2.db");
+      const rawDb = new DatabaseSync(dbPath);
+      rawDb.exec("PRAGMA user_version = 2");
+      rawDb.exec(V2_SCHEMA_SQL);
+      rawDb.exec(`
+        INSERT INTO workspaces (id, path, target_runtime, opened_at, last_active_at, ui_state)
+        VALUES ('ws-1', '/workspace', 'native', 1, 1, '{}');
+      `);
+      rawDb.exec(`
+        INSERT INTO terminals (id, workspace_id, kind, cwd, argv, cols, rows, created_at)
+        VALUES ('term-1', 'ws-1', 'agent', '/workspace', '[]', 120, 30, 1);
+      `);
+      rawDb.exec(`
+        INSERT INTO sessions (
+          id, workspace_id, terminal_id, provider_id, capability, state, started_at, last_active_at
+        ) VALUES ('sess-1', 'ws-1', 'term-1', 'codex', 'full', 'idle', 1, 1);
+      `);
+      rawDb.exec(`
+        INSERT INTO supervisors (
+          id,
+          session_id,
+          workspace_id,
+          state,
+          objective,
+          evaluator_provider_id,
+          evaluator_model,
+          max_supervision_count,
+          completed_supervision_count,
+          scheduled_at,
+          stop_reason,
+          last_cycle_at,
+          last_evaluated_turn_id,
+          error_reason,
+          created_at,
+          updated_at
+        ) VALUES (
+          'sup-legacy',
+          'sess-1',
+          'ws-1',
+          'idle',
+          'Legacy supervisor',
+          'codex',
+          NULL,
+          0,
+          0,
+          NULL,
+          NULL,
+          NULL,
+          NULL,
+          NULL,
+          1,
+          1
+        );
+      `);
+      rawDb.close();
+
+      db = openDatabase(dbPath);
+
+      const userVersion = db.prepare("PRAGMA user_version").get() as { user_version: number };
+      expect(userVersion.user_version).toBe(CURRENT_SCHEMA_VERSION);
+
+      const supervisorColumns = db.prepare("PRAGMA table_info(supervisors)").all() as Array<{
+        name: string;
+      }>;
+      expect(supervisorColumns.map((column) => column.name)).toContain("target_id");
+
+      const upgradedRow = db
+        .prepare("SELECT target_id FROM supervisors WHERE id = ?")
+        .get("sup-legacy") as { target_id: string };
+      expect(upgradedRow.target_id).toBe("legacy_sup-legacy");
+    });
+
     it("should restamp user_version for an already-current schema when it is unset", () => {
       const dbPath = join(tempDir, "current-unstamped.db");
       db = openDatabase(dbPath);
diff --git a/packages/server/src/__tests__/supervisor-repo.test.ts b/packages/server/src/__tests__/supervisor-repo.test.ts
@@ -46,6 +46,7 @@ describe("SupervisorRepo", () => {
       id: "sup-1",
       sessionId: "sess-1",
       workspaceId: "ws-1",
+      targetId: "target-1",
       state: "idle",
       objective: "Finish supervisor persistence",
       evaluatorProviderId: "codex",
@@ -64,6 +65,7 @@ describe("SupervisorRepo", () => {
       id: "sup-1",
       sessionId: "sess-1",
       workspaceId: "ws-1",
+      targetId: "target-initial",
       state: "stopped",
       objective: "Stop when objective is complete",
       evaluatorProviderId: "codex",
@@ -87,6 +89,31 @@ describe("SupervisorRepo", () => {
     });
   });
 
+  it("persists targetId on create and update", () => {
+    supervisorRepo.create({
+      id: "sup-1",
+      sessionId: "sess-1",
+      workspaceId: "ws-1",
+      targetId: "target-alpha",
+      state: "idle",
+      objective: "Track target scope",
+      evaluatorProviderId: "codex",
+      createdAt: 10,
+      updatedAt: 10,
+    });
+
+    const created = supervisorRepo.findById("sup-1");
+    expect(created?.targetId).toBe("target-alpha");
+
+    const updated = supervisorRepo.update("sup-1", {
+      targetId: "target-beta",
+      updatedAt: 11,
+    });
+
+    expect(updated.targetId).toBe("target-beta");
+    expect(supervisorRepo.findById("sup-1")?.targetId).toBe("target-beta");
+  });
+
   it("rejects a supervisor whose workspace does not match its session workspace", () => {
     db.prepare(
       "INSERT INTO workspaces (id, path, target_runtime, opened_at, last_active_at, ui_state) VALUES (?, ?, ?, ?, ?, ?)"
@@ -103,6 +130,7 @@ describe("SupervisorRepo", () => {
         id: "sup-bad",
         sessionId: "sess-2",
         workspaceId: "ws-1",
+        targetId: "target-bad",
         state: "idle",
         objective: "This insert must fail",
         evaluatorProviderId: "claude",
@@ -124,6 +152,7 @@ describe("SupervisorRepo", () => {
       id: "sup-1",
       sessionId: "sess-1",
       workspaceId: "ws-1",
+      targetId: "target-1",
       state: "idle",
       objective: "Enforce supervisor/session integrity",
       evaluatorProviderId: "claude",
@@ -152,6 +181,7 @@ describe("SupervisorRepo", () => {
       id: "sup-1",
       sessionId: "sess-1",
       workspaceId: "ws-1",
+      targetId: "target-1",
       state: "idle",
       objective: "Keep nullable fields intact",
       evaluatorProviderId: "claude",
@@ -178,6 +208,7 @@ describe("SupervisorRepo", () => {
       id: "sup-1",
       sessionId: "sess-1",
       workspaceId: "ws-1",
+      targetId: "target-1",
       state: "idle",
       objective: "Clear nullable fields",
       evaluatorProviderId: "claude",
@@ -205,6 +236,7 @@ describe("SupervisorRepo", () => {
       id: "sup-1",
       sessionId: "sess-1",
       workspaceId: "ws-1",
+      targetId: "target-1",
       state: "idle",
       objective: "Clear execution policy fields",
       evaluatorProviderId: "claude",
@@ -236,6 +268,7 @@ describe("SupervisorRepo", () => {
       id: "sup-1",
       sessionId: "sess-1",
       workspaceId: "ws-1",
+      targetId: "target-1",
       state: "idle",
       objective: "Keep cycle fields intact",
       evaluatorProviderId: "claude",
@@ -276,6 +309,7 @@ describe("SupervisorRepo", () => {
       id: "sup-1",
       sessionId: "sess-1",
       workspaceId: "ws-1",
+      targetId: "target-1",
       state: "idle",
       objective: "Clear cycle fields",
       evaluatorProviderId: "claude",
@@ -336,6 +370,7 @@ describe("SupervisorRepo", () => {
       id: "sup-1",
       sessionId: "sess-1",
       workspaceId: "ws-1",
+      targetId: "target-1",
       state: "idle",
       objective: "Keep the newest 100 cycles",
       evaluatorProviderId: "claude",
@@ -371,6 +406,7 @@ describe("SupervisorRepo", () => {
       id: "sup-1",
       sessionId: "sess-1",
       workspaceId: "ws-1",
+      targetId: "target-1",
       state: "idle",
       objective: "Allow scheduled cancelled cycle",
       evaluatorProviderId: "claude",
@@ -399,6 +435,7 @@ describe("SupervisorRepo", () => {
       id: "sup-1",
       sessionId: "sess-1",
       workspaceId: "ws-1",
+      targetId: "target-1",
       state: "idle",
       objective: "Track attempts",
       evaluatorProviderId: "claude",
@@ -456,6 +493,7 @@ describe("SupervisorRepo", () => {
       id: "sup-1",
       sessionId: "sess-1",
       workspaceId: "ws-1",
+      targetId: "target-1",
       state: "idle",
       objective: "Update attempts",
       evaluatorProviderId: "claude",
diff --git a/packages/server/src/storage/db.test.ts b/packages/server/src/storage/db.test.ts
@@ -53,6 +53,11 @@ describe("database schema baseline", () => {
     expect(sessionColumns.find((column) => column.name === "transcript_path")).toBeUndefined();
     expect(sessionColumns.find((column) => column.name === "title")).toBeDefined();
 
+    const supervisorColumns = db.prepare("PRAGMA table_info(supervisors)").all() as Array<{
+      name: string;
+    }>;
+    expect(supervisorColumns.find((column) => column.name === "target_id")).toBeDefined();
+
     const indexNames = (
       db.prepare("SELECT name FROM sqlite_master WHERE type='index' ORDER BY name").all() as Array<{
         name: string;
diff --git a/packages/server/src/storage/db.ts b/packages/server/src/storage/db.ts
@@ -6,6 +6,7 @@ import {
   detectSchema,
   IncompatibleSchemaError,
   stampCurrentSchemaVersion,
+  stampSchemaVersion,
 } from "./schema-version.js";
 
 interface IntegrityCheckRow {
@@ -97,6 +98,14 @@ function upgradeSchemaV1ToV2(db: Database): void {
     db.exec(
       "CREATE INDEX idx_supervisor_cycle_attempts_cycle ON supervisor_cycle_attempts(cycle_id, attempt_index)"
     );
+    stampSchemaVersion(db, 2);
+  });
+}
+
+function upgradeSchemaV2ToV3(db: Database): void {
+  withTransaction(db, () => {
+    db.exec("ALTER TABLE supervisors ADD COLUMN target_id TEXT NOT NULL DEFAULT ''");
+    db.exec("UPDATE supervisors SET target_id = 'legacy_' || id WHERE target_id = ''");
     stampCurrentSchemaVersion(db);
   });
 }
@@ -128,6 +137,12 @@ function initializeOrUpgradeSchema(db: Database, dbPath: string): void {
 
     case "v1":
       upgradeSchemaV1ToV2(db);
+      upgradeSchemaV2ToV3(db);
+      assertCurrentSchema(db, dbPath);
+      return;
+
+    case "v2":
+      upgradeSchemaV2ToV3(db);
       assertCurrentSchema(db, dbPath);
       return;
 
diff --git a/packages/server/src/storage/migrations/001_init.sql b/packages/server/src/storage/migrations/001_init.sql
@@ -1,5 +1,5 @@
 -- Current database schema baseline
-PRAGMA user_version = 2;
+PRAGMA user_version = 3;
 
 CREATE TABLE IF NOT EXISTS workspaces (
   id TEXT PRIMARY KEY,
@@ -78,7 +78,7 @@ CREATE TABLE IF NOT EXISTS supervisors (
   last_evaluated_turn_id TEXT,
   error_reason TEXT,
   created_at INTEGER NOT NULL,
-  updated_at INTEGER NOT NULL, evaluator_model TEXT, max_supervision_count INTEGER NOT NULL DEFAULT 0, completed_supervision_count INTEGER NOT NULL DEFAULT 0, scheduled_at INTEGER, stop_reason TEXT,
+  updated_at INTEGER NOT NULL, evaluator_model TEXT, max_supervision_count INTEGER NOT NULL DEFAULT 0, completed_supervision_count INTEGER NOT NULL DEFAULT 0, scheduled_at INTEGER, stop_reason TEXT, target_id TEXT NOT NULL DEFAULT '',
   FOREIGN KEY (session_id, workspace_id) REFERENCES sessions(id, workspace_id) ON DELETE CASCADE,
   FOREIGN KEY (workspace_id) REFERENCES workspaces(id) ON DELETE CASCADE
 );
diff --git a/packages/server/src/storage/repositories/supervisor-repo.ts b/packages/server/src/storage/repositories/supervisor-repo.ts
diff --git a/packages/server/src/storage/schema-version.ts b/packages/server/src/storage/schema-version.ts
