@saadnvd1/agent-os 0.3.637 → 0.3.639

package/lib/notify/push/index.ts

@@ -57,7 +57,7 @@ export interface PushOptions {
 
 function isMirrored(sessionId: string): boolean {
   const s = db
-    .prepare(`SELECT host_id, peer_mirror FROM sessions WHERE id = ?`)
+    .prepare(`SELECT host_id, peer_mirror FROM session_rows WHERE id = ?`)
     .get(sessionId) as
     | { host_id: string | null; peer_mirror: number | null }
     | undefined;

package/lib/orchestrator/act.ts

@@ -439,7 +439,7 @@ export async function resurrect(
   if (!reason.trim()) throw new Error("Say why it's restored");
   const id = resolveEnded(ref, { workspaceId });
   const row = db
-    .prepare(`SELECT task_status, archived_at FROM sessions WHERE id = ?`)
+    .prepare(`SELECT task_status, archived_at FROM session_rows WHERE id = ?`)
     .get(id) as { task_status: string | null; archived_at: string | null };
   const task =
     row.task_status === "dropped" ||

package/lib/orchestrator/armed.ts

@@ -28,6 +28,7 @@ import { review } from "./review";
 import { judge, mergeJudged } from "./signoff";
 import { workspaceTask } from "./targets";
 import { markStatusDirty } from "../status/dirty";
+import { setPr } from "../db/session-parts";
 
 // Judged again at least this often, for what the fingerprint can't see.
 export const ARMED_RECHECK_MS = 5 * 60 * 1000;
@@ -35,10 +36,18 @@ export const ARMED_RECHECK_MS = 5 * 60 * 1000;
 const short = (sha: string) => sha.slice(0, 7);
 
 export function setArmed(sessionId: string, armed: boolean): void {
-  db.prepare(
-    `UPDATE sessions SET merge_armed_at = ${armed ? "COALESCE(merge_armed_at, datetime('now'))" : "NULL"},
-       merge_armed_seen = NULL WHERE id = ?`
-  ).run(sessionId);
+  db.transaction(() => {
+    const row = db
+      .prepare(`SELECT merge_armed_at FROM session_rows WHERE id = ?`)
+      .get(sessionId) as { merge_armed_at: string | null } | undefined;
+    setPr(db, sessionId, {
+      merge_armed_at: !armed
+        ? null
+        : (row?.merge_armed_at ??
+          new Date().toISOString().slice(0, 19).replace("T", " ")),
+      merge_armed_seen: null,
+    });
+  })();
   looked.delete(sessionId);
   markStatusDirty(sessionId);
   notifyStatusChanged();
@@ -57,7 +66,7 @@ export function armingWorkspace(task: Session): string | null {
 function armedTasks(workspaceId: string): Session[] {
   return db
     .prepare(
-      `SELECT s.* FROM sessions s JOIN projects p ON p.id = s.project_id
+      `SELECT s.* FROM session_rows s JOIN projects p ON p.id = s.project_id
        WHERE p.workspace_id = ? AND s.merge_armed_at IS NOT NULL
          AND s.task_status = 'running' AND s.peer_mirror = 0
          AND s.held_by_device IS NULL`
@@ -70,7 +79,7 @@ function armedTasks(workspaceId: string): Session[] {
 function stillArmed(workspaceId: string, taskId: string): boolean {
   if (isPaused(workspaceId)) return false;
   const row = db
-    .prepare(`SELECT merge_armed_at FROM sessions WHERE id = ?`)
+    .prepare(`SELECT merge_armed_at FROM session_rows WHERE id = ?`)
     .get(taskId) as { merge_armed_at: string | null } | undefined;
   return !!row?.merge_armed_at;
 }
@@ -255,11 +264,7 @@ async function mergeOne(
   if (counted.ok) return merge(workspaceId, task, counted, deps);
   const toSaad = holdingEscalations(task.id).length > 0;
   if (toSaad) setArmed(task.id, false);
-  else
-    db.prepare(`UPDATE sessions SET merge_armed_seen = ? WHERE id = ?`).run(
-      seen,
-      task.id
-    );
+  else setPr(db, task.id, { merge_armed_seen: seen });
   event(
     workspaceId,
     task,
@@ -283,10 +288,7 @@ async function merge(
     const why = error instanceof Error ? error.message : String(error);
     const seen = `${verdict.sha}:merge:${why}`;
     if (task.merge_armed_seen === seen) return;
-    db.prepare(`UPDATE sessions SET merge_armed_seen = ? WHERE id = ?`).run(
-      seen,
-      task.id
-    );
+    setPr(db, task.id, { merge_armed_seen: seen });
     event(
       workspaceId,
       task,

package/lib/orchestrator/ask-approvals.ts

@@ -76,7 +76,7 @@ export function releaseInterruptedClaims(): number {
       `UPDATE orchestrator_asks SET used_at = NULL
        WHERE status = 'approved' AND used_at IS NOT NULL
          AND COALESCE(answer, '') != 'approve (void)'
-         AND (subject IN (SELECT 'task:' || id FROM sessions WHERE task_status = 'running')
+         AND (subject IN (SELECT 'task:' || id FROM session_rows WHERE task_status = 'running')
            -- A PR no task owns: a merge that happened can't happen again.
            OR subject LIKE 'pr:%')`
     )

package/lib/orchestrator/ask-heads.ts

@@ -34,7 +34,7 @@ export async function followAskHeads(
     )
       continue;
     const task = db
-      .prepare(`SELECT * FROM sessions WHERE id = ?`)
+      .prepare(`SELECT * FROM session_rows WHERE id = ?`)
       .get(f!.id) as Session | undefined;
     if (!task || hostLink(task.host_id)) continue;
     try {

package/lib/orchestrator/ask-settle.ts

@@ -44,7 +44,7 @@ function workspaceTasks(workspaceId: string): TaskRow[] {
   return db
     .prepare(
       `SELECT s.id, s.task_status, s.pr_status, s.pr_url, s.pr_number
-       FROM sessions s JOIN projects p ON p.id = s.project_id
+       FROM session_rows s JOIN projects p ON p.id = s.project_id
        WHERE p.workspace_id = ? AND s.task_status IS NOT NULL`
     )
     .all(workspaceId) as TaskRow[];

package/lib/orchestrator/brakes.ts

@@ -81,7 +81,7 @@ export async function runningCount(
   // minutes, here or there: it holds its slot.
   const moving = db
     .prepare(
-      `SELECT s.id FROM sessions s JOIN projects p ON p.id = s.project_id
+      `SELECT s.id FROM session_rows s JOIN projects p ON p.id = s.project_id
        WHERE p.workspace_id = ? AND s.task_status = 'moving' AND s.peer_mirror = 0`
     )
     .all(workspaceId) as { id: string }[];

package/lib/orchestrator/digest.ts

@@ -167,7 +167,7 @@ function tasksSection(
     .prepare(
       `SELECT s.id, s.name, p.name AS project, s.pr_number, s.pr_status, s.view,
          s.merge_armed_at AS armed_at, s.pause_state, s.paused_until, s.pause_note, s.placed_note
-       FROM sessions s JOIN projects p ON p.id = s.project_id
+       FROM session_rows s JOIN projects p ON p.id = s.project_id
        WHERE p.workspace_id = ? AND s.role IS NULL AND s.archived_at IS NULL
          AND s.task_status = 'running'
        ORDER BY s.created_at, s.id`
@@ -223,7 +223,7 @@ function queueSection(workspaceId: string): Section {
             AND b.held_queued = 1 AND b.delivered_at IS NULL AND b.read_at IS NULL) AS held,
          p.name AS project, a.name AS after_name
        FROM task_queue q JOIN projects p ON p.id = q.project_id
-       LEFT JOIN sessions a ON a.id = q.after_task
+       LEFT JOIN session_rows a ON a.id = q.after_task
        WHERE p.workspace_id = ? AND q.status IN ('queued', 'starting', 'failed')
        ORDER BY q.position`
     )

package/lib/orchestrator/external-pr.ts

@@ -94,7 +94,7 @@ const unique = (repos: WorkspaceRepo[]) => [
 function tasksWithPR(workspaceId: string, ref: PRRef): WorkspaceTask[] {
   const rows = db
     .prepare(
-      `SELECT s.*, p.name AS project_name FROM sessions s
+      `SELECT s.*, p.name AS project_name FROM session_rows s
        JOIN projects p ON p.id = s.project_id
        WHERE p.workspace_id = ? AND s.pr_number = ? AND s.task_status IS NOT NULL
        ORDER BY s.created_at DESC`
@@ -125,7 +125,7 @@ async function ownerOf(
     .prepare(
       `SELECT s.*, p.name AS project_name, p.workspace_id AS owner_workspace,
          p.working_directory AS project_dir, p.host_id AS project_host
-       FROM sessions s JOIN projects p ON p.id = s.project_id
+       FROM session_rows s JOIN projects p ON p.id = s.project_id
        WHERE s.task_status IS NOT NULL
          AND (s.pr_number = ? OR (s.branch_name = ? AND s.task_status IN ('running', 'moving', 'moved')))
        ORDER BY s.created_at DESC`

package/lib/orchestrator/facts.ts

@@ -7,7 +7,7 @@
 
 import { db, type Session, type StackItemStatus } from "../db";
 import { statusDetector } from "../status-detector";
-import { cleanRemoteText, hostLink } from "../hosts/remote-api";
+import { hostLink } from "../hosts/remote-api";
 import { peerStatus } from "../hosts/peer-sessions";
 import { chatCompacting, chatState } from "../chat/runner";
 import { chatActivityLine, chatStall, type Stall } from "../chat/activity";
@@ -18,14 +18,13 @@ import { sessionRowInfo } from "../session-meta";
 import { taskView, type TaskPR, type TaskState } from "../tasks";
 import { prFor, storedPR } from "../tasks/session";
 import { lastActiveOf } from "../tasks/last-active";
-import { hostTasks } from "../tasks/remote";
+import * as taskClient from "../tasks/contract/client";
 import { deriveTaskState } from "../tasks";
 import { waitingState } from "./task-state";
 import { commitTime, repoOf } from "./repo";
 import { CHECKLESS_MS, checklessFor, ciSettleIn } from "./task-state";
 import { repoHasCI } from "./repo-ci";
 import { markStatusDirty } from "../status/dirty";
-import { queueEvent } from "./events";
 
 export type FactStatus = "running" | "waiting" | "idle" | "dead";
 
@@ -85,7 +84,7 @@ export function workspaceSessions(
 ): (Session & { project_name: string })[] {
   return db
     .prepare(
-      `SELECT s.*, p.name AS project_name FROM sessions s
+      `SELECT s.*, p.name AS project_name FROM session_rows s
        JOIN projects p ON p.id = s.project_id
        WHERE p.workspace_id = ? AND s.role IS NULL AND s.archived_at IS NULL
          -- A linked machine's own sessions are its orchestrator's to run.
@@ -271,7 +270,6 @@ async function remoteTaskFacts(
     prFor(s).catch(() => null),
     waitingState(s),
   ]);
-  await announceRemotePlan(workspaceId, s);
   const status = peerStatus(s.host_id, s.id) ?? "running";
   const state = deriveTaskState({
     taskStatus: "running",
@@ -288,34 +286,12 @@ async function remoteTaskFacts(
   };
 }
 
-// The plan-written line a held task stored on its machine (plan-step.ts),
-// once per distinct plan: the mirror keeps the last one it told about.
-async function announceRemotePlan(
-  workspaceId: string,
-  s: Session
-): Promise<void> {
-  const link = hostLink(s.host_id);
-  if (!link) return;
-  const view = await hostTasks(link)
-    .then(({ tasks }) => tasks.find((t) => t?.id === s.id))
-    .catch(() => undefined);
-  const note =
-    typeof view?.planNote === "string"
-      ? cleanRemoteText(view.planNote).slice(0, 2000)
-      : "";
-  if (!note || note === s.plan_note) return;
-  db.prepare(`UPDATE sessions SET plan_note = ? WHERE id = ?`).run(note, s.id);
-  queueEvent(workspaceId, `plan-done:${s.id}`, s.id, note);
-}
-
 // A task on another machine is as active as that machine says; one it can't
 // reach is taken as active just now, so nothing reads it as abandoned.
 async function lastActiveFor(s: Session): Promise<number> {
   const link = hostLink(s.host_id);
   if (!link) return lastActiveOf(s);
-  const view = await hostTasks(link)
-    .then(({ tasks }) => tasks.find((t) => t?.id === s.id))
-    .catch(() => undefined);
+  const view = await taskClient.view(link, s.id).catch(() => undefined);
   return typeof view?.lastActiveAt === "number"
     ? view.lastActiveAt
     : Date.now();

package/lib/orchestrator/held-asks.ts

@@ -58,9 +58,9 @@ async function raiseFor(
   now: number
 ): Promise<void> {
   const f = facts.find((x) => x.id === taskId);
-  const task = db.prepare(`SELECT * FROM sessions WHERE id = ?`).get(taskId) as
-    | Session
-    | undefined;
+  const task = db
+    .prepare(`SELECT * FROM session_rows WHERE id = ?`)
+    .get(taskId) as Session | undefined;
   // Gone, merged or dropped: nothing left to ask. An open ask or an
   // unspent approval already covers it (followAskHeads, heldVerdict).
   if (

package/lib/orchestrator/home.ts

@@ -24,7 +24,7 @@ export function getOrchestrator(workspaceId: string): Session | null {
   return (
     (db
       .prepare(
-        `SELECT * FROM sessions WHERE role = 'orchestrator' AND workspace_id = ?`
+        `SELECT * FROM session_rows WHERE role = 'orchestrator' AND workspace_id = ?`
       )
       .get(workspaceId) as Session | undefined) ?? null
   );
@@ -32,7 +32,7 @@ export function getOrchestrator(workspaceId: string): Session | null {
 
 export function listOrchestrators(): Session[] {
   return db
-    .prepare(`SELECT * FROM sessions WHERE role = 'orchestrator'`)
+    .prepare(`SELECT * FROM session_rows WHERE role = 'orchestrator'`)
     .all() as Session[];
 }
 

package/lib/orchestrator/overview.ts

@@ -25,7 +25,7 @@ function inReview(workspaceId: string): number {
   return (
     db
       .prepare(
-        `SELECT COUNT(*) AS n FROM sessions s JOIN projects p ON p.id = s.project_id
+        `SELECT COUNT(*) AS n FROM session_rows s JOIN projects p ON p.id = s.project_id
          WHERE p.workspace_id = ? AND s.role IS NULL
            AND s.task_status = 'running' AND s.pr_status = 'open'`
       )

package/lib/orchestrator/pr-wake.ts

@@ -41,6 +41,7 @@ import type { SessionFacts } from "./facts";
 import { isPaused } from "./pause";
 import { repoOf } from "./repo";
 import { untrusted, UNTRUSTED_RULE } from "./untrusted";
+import { setPr } from "../db/session-parts";
 
 export const COMMENT_WAKE_CAP = 10;
 // A first look at a PR this young takes its whole history as new.
@@ -93,7 +94,7 @@ const polled = new Map<string, number>();
 const failures = new Map<string, number>();
 
 const sessionRow = (id: string) =>
-  db.prepare(`SELECT * FROM sessions WHERE id = ?`).get(id) as
+  db.prepare(`SELECT * FROM session_rows WHERE id = ?`).get(id) as
     | Session
     | undefined;
 
@@ -350,10 +351,7 @@ function watchSince(task: Session, print: Fingerprint, now: number): string {
     Number.isFinite(created) && now - created < YOUNG_PR_MS
       ? new Date(created).toISOString()
       : new Date(now).toISOString();
-  db.prepare(`UPDATE sessions SET pr_wake_since = ? WHERE id = ?`).run(
-    since,
-    task.id
-  );
+  setPr(db, task.id, { pr_wake_since: since });
   task.pr_wake_since = since;
   return since;
 }

package/lib/orchestrator/questions.ts

@@ -46,7 +46,7 @@ function settleQuestions(workspaceId: string): void {
     `UPDATE orchestrator_questions
      SET status = 'cleared', resolved_by = 'orchestrator', resolved_at = datetime('now')
      WHERE workspace_id = ? AND status = 'open' AND task IN (
-       SELECT id FROM sessions WHERE task_status IN ('merged', 'dropped', 'done'))`
+       SELECT id FROM session_rows WHERE task_status IN ('merged', 'dropped', 'done'))`
   ).run(workspaceId);
 }
 

package/lib/orchestrator/quick-store.ts

@@ -9,7 +9,7 @@ export function quickWorktrees(orchestratorId: string): string[] {
   return (
     db
       .prepare(
-        `SELECT worktree_path AS dir FROM sessions
+        `SELECT worktree_path AS dir FROM session_rows
           WHERE quick_of = ? AND task_status = 'running'
             AND worktree_path IS NOT NULL AND worktree_path != ''`
       )

package/lib/orchestrator/quick.ts

@@ -29,6 +29,7 @@ import { addNote } from "./notes";
 import { quickWorktrees } from "./quick-store";
 import { findWorkspaceSession } from "./read";
 import { workspaceProject } from "./targets";
+import { recordPr, setTask } from "../db/session-parts";
 
 // Open quick changes one orchestrator may hold at once.
 export const MAX_OPEN_QUICK = 5;
@@ -105,8 +106,13 @@ export async function startQuickChange(
         .updateSessionWorktree(db)
         .run(wt.worktreePath, wt.branchName, baseBranch, null, id);
       db.prepare(
-        `UPDATE sessions SET task_prompt = ?, task_status = 'running', name_source = 'user', view = 'chat', quick_of = ? WHERE id = ?`
-      ).run(`Quick change: ${label}`, owner.id, id);
+        `UPDATE sessions SET name_source = 'user', view = 'chat' WHERE id = ?`
+      ).run(id);
+      setTask(db, id, {
+        task_prompt: `Quick change: ${label}`,
+        task_status: "running",
+        quick_of: owner.id,
+      });
     })();
   } catch (e) {
     await deleteWorktree(wt.worktreePath, projectPath, true).catch(() => {});
@@ -208,10 +214,7 @@ export async function quickPR(
   );
   const head = (await revParse(wt, "HEAD")).trim();
   const goal = `${title.trim()}\n\n${body.trim()}`;
-  db.prepare(`UPDATE sessions SET task_prompt = ? WHERE id = ?`).run(
-    goal,
-    s.id
-  );
+  setTask(db, s.id, { task_prompt: goal });
   const existing = await prFor(s, true);
   if (existing?.state === "OPEN") {
     forgetPR(s.id);
@@ -238,7 +241,7 @@ export async function quickPR(
     60_000
   );
   const m = /https:\/\/\S+\/pull\/(\d+)/.exec(out);
-  if (m) queries.updateSessionPR(db).run(m[0], Number(m[1]), "open", s.id);
+  if (m) recordPr(db, s.id, { url: m[0], number: Number(m[1]), state: "open" });
   forgetPR(s.id);
   addNote(
     workspaceId,

package/lib/orchestrator/read.ts

@@ -10,7 +10,7 @@ import { hostLink } from "../hosts/remote-api";
 import { peerPane } from "../hosts/peer-sessions";
 import { workspaceSessions } from "./facts";
 import { untrusted } from "./untrusted";
-import { heldChatTail, isHeldRemote } from "../tasks/held-remote";
+import { heldChatTail, isHeldRemote } from "../tasks/contract/held-calls";
 import {
   findExternalSession,
   knownExternalSession,

package/lib/orchestrator/rebase.ts

@@ -39,6 +39,7 @@ import { statusOf, type SessionFacts } from "./facts";
 import { isPaused } from "./pause";
 import { repoOf } from "./repo";
 import { reviewAt, taskReviewTarget } from "./review";
+import { setPr } from "../db/session-parts";
 
 const short = (sha: string) => sha.slice(0, 7);
 
@@ -72,7 +73,7 @@ const defaults: RebaseDeps = {
 const tried = new Map<string, string>();
 
 const sessionRow = (id: string) =>
-  db.prepare(`SELECT * FROM sessions WHERE id = ?`).get(id) as
+  db.prepare(`SELECT * FROM session_rows WHERE id = ?`).get(id) as
     | Session
     | undefined;
 
@@ -207,9 +208,10 @@ async function rebaseOne(
     },
     { from: pr.head, to, unpushed: false }
   );
-  db.prepare(
-    `UPDATE sessions SET rebased_from = ?, rebased_to = ? WHERE id = ?`
-  ).run(heads.restacked_from, heads.restacked_to, task.id);
+  setPr(db, task.id, {
+    rebased_from: heads.restacked_from,
+    rebased_to: heads.restacked_to,
+  });
   // Only the task's own branch, and only if origin still has the head
   // that was judged. --no-verify: CI runs on the PR.
   const pushed = await git(
@@ -225,9 +227,7 @@ async function rebaseOne(
   );
   if (pushed !== null) {
     console.error(`Pushing ${task.name}'s rebase:`, pushed);
-    db.prepare(
-      `UPDATE sessions SET rebased_from = ?, rebased_to = ? WHERE id = ?`
-    ).run(...before, task.id);
+    setPr(db, task.id, { rebased_from: before[0], rebased_to: before[1] });
     return askToRebase(
       workspaceId,
       task,
@@ -362,10 +362,7 @@ async function askToRebase(
   deps: RebaseDeps
 ): Promise<void> {
   // Claimed first: a restart mid-send doesn't ask twice.
-  db.prepare(`UPDATE sessions SET rebase_asked_head = ? WHERE id = ?`).run(
-    pr.head,
-    task.id
-  );
+  setPr(db, task.id, { rebase_asked_head: pr.head });
   // A quick change has no agent to ask: it's the orchestrator's to redo.
   if (task.quick_of) {
     queueEvent(

package/lib/orchestrator/reconcile.ts

@@ -114,7 +114,7 @@ async function ownedBy(
 ): Promise<boolean> {
   const rows = db
     .prepare(
-      `SELECT s.pr_url, s.branch_name, p.working_directory FROM sessions s
+      `SELECT s.pr_url, s.branch_name, p.working_directory FROM session_rows s
        LEFT JOIN projects p ON p.id = s.project_id
        WHERE s.task_status IS NOT NULL AND (LOWER(s.pr_url) = ? OR s.branch_name = ?)`
     )
@@ -145,7 +145,7 @@ export async function classifyAgentPrs(
   let raised = 0;
   for (const pr of open) {
     const task = db
-      .prepare(`SELECT * FROM sessions WHERE id = ?`)
+      .prepare(`SELECT * FROM session_rows WHERE id = ?`)
       .get(pr.session_id) as Session | undefined;
     const workspaceId = task ? sessionWorkspace(task) : null;
     if (!task || !workspaceId) {

package/lib/orchestrator/signoff.ts

@@ -331,7 +331,9 @@ export async function refundIfRefused(
     await merge();
   } catch (e) {
     const merged = db
-      .prepare(`SELECT 1 FROM sessions WHERE id = ? AND task_status = 'merged'`)
+      .prepare(
+        `SELECT 1 FROM session_rows WHERE id = ? AND task_status = 'merged'`
+      )
       .get(taskId);
     if (approval && !merged) refundApproval(approval);
     throw e;

package/lib/orchestrator/targets.ts

@@ -56,7 +56,7 @@ export function workspaceTask(
   if (pr !== null) {
     const rows = db
       .prepare(
-        `SELECT s.*, p.name AS project_name FROM sessions s
+        `SELECT s.*, p.name AS project_name FROM session_rows s
          JOIN projects p ON p.id = s.project_id
          WHERE p.workspace_id = ? AND s.pr_number = ? AND s.task_status IS NOT NULL
          ORDER BY s.created_at DESC`

package/lib/orchestrator/task-state.ts

@@ -9,8 +9,8 @@ import { blockedReason } from "../tasks/state";
 import { checkWaitingPatterns, statusDetector } from "../status-detector";
 import { getCheck, putCheck } from "./checks";
 import { cleanRemoteText, hostLink, type HostLink } from "../hosts/remote-api";
-import { heldChatFacts, isHeldRemote } from "../tasks/held-remote";
-import { hostTasks } from "../tasks/remote";
+import { heldChatFacts, isHeldRemote } from "../tasks/contract/held-calls";
+import { list as hostTasks } from "../tasks/contract/client";
 import { peerPane } from "../hosts/peer-sessions";
 import { untrusted } from "./untrusted";
 
@@ -104,6 +104,8 @@ async function peerChatWaiting(
             : `its chat on ${link.hostName} couldn't say whether a question is open`,
     };
   }
+  // compat: task-contract-1. A machine without held-chat-facts is asked
+  // through its task list; drop this once every linked machine has it.
   const view = await hostTasks(link, true)
     .then(({ tasks, capabilities }) =>
       // One that can't say its chat's turn can't rule out an open question.

package/lib/plans/features.ts

@@ -160,7 +160,7 @@ export function pieceOfSession(sessionId: string): FeaturePiece | undefined {
 export function prOf(p: FeaturePiece): number | null {
   if (!p.session_id) return null;
   const s = db
-    .prepare(`SELECT pr_number, project_id FROM sessions WHERE id = ?`)
+    .prepare(`SELECT pr_number, project_id FROM session_rows WHERE id = ?`)
     .get(p.session_id) as
     | { pr_number: number | null; project_id: string | null }
     | undefined;

package/lib/plans/release.ts

@@ -38,7 +38,7 @@ export interface ReleaseDeps {
 
 const sessionOf = (id: string | null) =>
   id
-    ? (db.prepare(`SELECT * FROM sessions WHERE id = ?`).get(id) as
+    ? (db.prepare(`SELECT * FROM session_rows WHERE id = ?`).get(id) as
         | Session
         | undefined)
     : undefined;

package/lib/ports.ts

@@ -70,7 +70,7 @@ async function reclaimEnded(
 ): Promise<void> {
   const rows = db
     .prepare(
-      `SELECT id, tmux_name, task_status, host_id FROM sessions
+      `SELECT id, tmux_name, task_status, host_id FROM session_rows
        WHERE port_slot IS NOT NULL
          AND (archived_at IS NOT NULL OR task_status IN ('done', 'merged'))`
     )

package/lib/resurrect/find.ts

@@ -65,7 +65,7 @@ function rows(scope: EndedScope, limit: number, kind?: EndedKind): Row[] {
       `SELECT s.id, s.name, s.tmux_name, s.project_id, p.name AS project_name,
          s.task_status, s.archived_at, s.plan_phase,
          COALESCE(s.task_ended_at, s.archived_at, s.settled_at, s.updated_at) AS ended_at
-       FROM sessions s LEFT JOIN projects p ON p.id = s.project_id
+       FROM session_rows s LEFT JOIN projects p ON p.id = s.project_id
        WHERE ${where.join(" AND ")}
        ORDER BY ended_at DESC LIMIT ?`
     )