@saadnvd1/agent-os 0.3.637 → 0.3.639

package/app/api/sessions/[id]/pr/route.ts

@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import { execFile } from "child_process";
 import { promisify } from "util";
-import { getDb, queries, type Session } from "@/lib/db";
+import { getDb, queries, recordPr, type Session } from "@/lib/db";
 import { gitPush } from "@/lib/git-exec";
 
 const execFileAsync = promisify(execFile);
@@ -129,7 +129,7 @@ export async function GET(request: NextRequest, { params }: RouteParams) {
 
     // Update session with PR info if found
     if (pr) {
-      queries.updateSessionPR(db).run(pr.url, pr.number, pr.state, id);
+      recordPr(db, id, pr);
     }
 
     return NextResponse.json({ pr });
@@ -197,7 +197,7 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
     );
 
     // Save PR info to session
-    queries.updateSessionPR(db).run(pr.url, pr.number, pr.state, id);
+    recordPr(db, id, pr);
 
     return NextResponse.json({ pr }, { status: 201 });
   } catch (error) {

package/app/api/sessions/[id]/setup/route.ts

@@ -16,9 +16,9 @@ export async function GET(
   const { id } = await params;
   const live = getSetup(id);
   if (live) return NextResponse.json({ setup: live });
-  const session = db.prepare(`SELECT * FROM sessions WHERE id = ?`).get(id) as
-    | Session
-    | undefined;
+  const session = db
+    .prepare(`SELECT * FROM session_rows WHERE id = ?`)
+    .get(id) as Session | undefined;
   if (!session)
     return NextResponse.json({ error: "Session not found" }, { status: 404 });
   const link = isRemoteHost(session.host_id) ? hostLink(session.host_id) : null;

package/app/api/tasks/[id]/approve-plan/route.ts

@@ -1,7 +1,6 @@
+import { refuse } from "@/lib/tasks/contract/authorize";
 import { NextRequest, NextResponse } from "next/server";
 import { approvePlanNow } from "@/lib/models/plan-step";
-import { callingDevice } from "@/lib/security/device-me";
-import { planWaitRefusal } from "@/lib/tasks/held";
 
 // Approves a plan-only task's plan: it continues on the implementation
 // model. An optional message amends the plan (recorded as a scope change).
@@ -10,8 +9,8 @@ export async function POST(
   { params }: { params: Promise<{ id: string }> }
 ) {
   const id = (await params).id;
-  const refusal = planWaitRefusal(id, callingDevice(request));
-  if (refusal) return NextResponse.json({ error: refusal }, { status: 403 });
+  const refused = refuse(request, id, "plan");
+  if (refused) return refused;
   try {
     const body = await request.json().catch(() => ({}));
     const message =

package/app/api/tasks/[id]/arm/route.ts

@@ -1,8 +1,7 @@
+import { refuse } from "@/lib/tasks/contract/authorize";
 import { NextRequest, NextResponse } from "next/server";
 import { db, type Session } from "@/lib/db";
 import { armTask, setArmed } from "@/lib/orchestrator/armed";
-import { callingDevice } from "@/lib/security/device-me";
-import { heldRefusal } from "@/lib/tasks/held";
 
 // { armed: true } merges the task's PR by itself once every gate passes;
 // false takes that back.
@@ -11,8 +10,8 @@ export async function POST(
   { params }: { params: Promise<{ id: string }> }
 ) {
   const id = (await params).id;
-  const held = heldRefusal(id, callingDevice(request));
-  if (held) return NextResponse.json({ error: held }, { status: 403 });
+  const refused = refuse(request, id, "open");
+  if (refused) return refused;
   const { armed } = await request.json().catch(() => ({}));
   if (typeof armed !== "boolean")
     return NextResponse.json(
@@ -20,7 +19,9 @@ export async function POST(
       { status: 400 }
     );
   const task = db
-    .prepare(`SELECT * FROM sessions WHERE id = ? AND task_status IS NOT NULL`)
+    .prepare(
+      `SELECT * FROM session_rows WHERE id = ? AND task_status IS NOT NULL`
+    )
     .get((await params).id) as Session | undefined;
   if (!task)
     return NextResponse.json({ error: "No such task" }, { status: 404 });

package/app/api/tasks/[id]/chat-facts/route.ts

@@ -2,7 +2,7 @@ import { NextRequest } from "next/server";
 import { blockedReason } from "@/lib/tasks/state";
 import { saidSinceLastMessage } from "@/lib/chat/store";
 import { chatStateNow } from "@/lib/chat/runner";
-import { heldRoute } from "@/lib/tasks/held-routes";
+import { taskRoute } from "@/lib/tasks/contract/authorize";
 
 // GET /api/tasks/:id/chat-facts - what its chat says about being blocked
 // and whether a question is open, for the orchestrator that moved it here.
@@ -11,7 +11,7 @@ export async function GET(
   request: NextRequest,
   ctx: { params: Promise<{ id: string }> }
 ) {
-  return heldRoute(request, ctx, async (task) => {
+  return taskRoute(request, ctx, "holder", async (task) => {
     if (task.view !== "chat") return { blocked: null, turn: null };
     return {
       blocked: blockedReason(saidSinceLastMessage(task.id)),

package/app/api/tasks/[id]/chat-tail/route.ts

@@ -1,6 +1,6 @@
 import { NextRequest } from "next/server";
 import { chatTailText } from "@/lib/orchestrator/read";
-import { heldRoute } from "@/lib/tasks/held-routes";
+import { taskRoute } from "@/lib/tasks/contract/authorize";
 
 // GET /api/tasks/:id/chat-tail?lines= - the last lines of its conversation,
 // for the orchestrator that moved it here to read.
@@ -9,7 +9,7 @@ export async function GET(
   ctx: { params: Promise<{ id: string }> }
 ) {
   const lines = Number(request.nextUrl.searchParams.get("lines")) || 60;
-  return heldRoute(request, ctx, async (task) => ({
+  return taskRoute(request, ctx, "holder", async (task) => ({
     text: task.view === "chat" ? chatTailText(task.id, lines) : "",
   }));
 }

package/app/api/tasks/[id]/checks/route.ts

@@ -2,7 +2,7 @@ import { NextRequest, NextResponse } from "next/server";
 import { db, queries, type Session } from "@/lib/db";
 import { taskChecks } from "@/lib/tasks/checks-view";
 import { LoopError, localTask } from "@/lib/tasks/loop-error";
-import { isMirror } from "@/lib/tasks/remote";
+import { isMirror } from "@/lib/tasks/contract/start";
 
 // GET /api/tasks/:id/checks - the PR head's checks, the tail of a failing
 // job's log, and the review gate's verdict on the head. ?log=0 leaves the

package/app/api/tasks/[id]/diff/route.ts

@@ -2,7 +2,7 @@ import { NextRequest, NextResponse } from "next/server";
 import { db, queries, type Session } from "@/lib/db";
 import { taskDiff } from "@/lib/tasks/diff";
 import { LoopError, localTask } from "@/lib/tasks/loop-error";
-import { isMirror } from "@/lib/tasks/remote";
+import { isMirror } from "@/lib/tasks/contract/start";
 
 // GET /api/tasks/:id/diff - the task's whole change, base to head: a file
 // list with status and line counts; with ?file=<path>, that file's patch.

package/app/api/tasks/[id]/done/route.ts

@@ -1,6 +1,6 @@
 import { NextRequest } from "next/server";
 import { doneSession } from "@/lib/done";
-import { heldRoute } from "@/lib/tasks/held-routes";
+import { taskRoute } from "@/lib/tasks/contract/authorize";
 
 // POST /api/tasks/:id/done - its orchestrator finishes it: the agent stops
 // and the worktree goes. Never a merge (noMerge): an open PR is refused
@@ -9,7 +9,7 @@ export async function POST(
   request: NextRequest,
   ctx: { params: Promise<{ id: string }> }
 ) {
-  return heldRoute(request, ctx, async (task) => ({
+  return taskRoute(request, ctx, "holder", async (task) => ({
     outcome: await doneSession(task.id, { by: "direct", noMerge: true }),
   }));
 }

package/app/api/tasks/[id]/drop/route.ts

@@ -1,12 +1,16 @@
 import { NextRequest, NextResponse } from "next/server";
+import { refuse } from "@/lib/tasks/contract/authorize";
 import { dropTask } from "@/lib/tasks";
 
 export async function POST(
-  _request: NextRequest,
+  request: NextRequest,
   { params }: { params: Promise<{ id: string }> }
 ) {
+  const id = (await params).id;
+  const refused = refuse(request, id, "open");
+  if (refused) return refused;
   try {
-    await dropTask((await params).id);
+    await dropTask(id);
     return NextResponse.json({ success: true });
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);

package/app/api/tasks/[id]/export/route.ts

@@ -1,7 +1,6 @@
+import { refuse } from "@/lib/tasks/contract/authorize";
 import { NextRequest, NextResponse } from "next/server";
 import { exportOrResume } from "@/lib/tasks/move";
-import { callingDevice } from "@/lib/security/device-me";
-import { heldRefusal, planWaitRefusal } from "@/lib/tasks/held";
 
 // POST /api/tasks/:id/export - stop the agent, push, hand over the task.
 // The caller confirms with /moved, or restarts it here with /resume; if it
@@ -11,9 +10,8 @@ export async function POST(
   { params }: { params: Promise<{ id: string }> }
 ) {
   const id = (await params).id;
-  const device = callingDevice(request);
-  const held = heldRefusal(id, device) ?? planWaitRefusal(id, device);
-  if (held) return NextResponse.json({ error: held }, { status: 403 });
+  const refused = refuse(request, id, "plan");
+  if (refused) return refused;
   try {
     const { to } = await request.json().catch(() => ({}));
     const bundle = await exportOrResume(

package/app/api/tasks/[id]/merge/route.ts

@@ -1,8 +1,8 @@
+import { refuse } from "@/lib/tasks/contract/authorize";
 import { NextRequest, NextResponse } from "next/server";
 import { signOffTask } from "@/lib/tasks";
 import { callingDevice } from "@/lib/security/device-me";
 import { isBranchName } from "@/lib/git";
-import { heldRefusal } from "@/lib/tasks/held";
 
 // head: merge only if the PR is still at this commit; the answer names the
 // commit it was pinned to, so another machine forwarding a merge can check.
@@ -11,8 +11,8 @@ export async function POST(
   { params }: { params: Promise<{ id: string }> }
 ) {
   const id = (await params).id;
-  const held = heldRefusal(id, callingDevice(request));
-  if (held) return NextResponse.json({ error: held }, { status: 403 });
+  const refused = refuse(request, id, "open");
+  if (refused) return refused;
   const { head, base } = await request.json().catch(() => ({}));
   if (
     head !== undefined &&

package/app/api/tasks/[id]/message/route.ts

@@ -3,7 +3,7 @@ import { statusDetector } from "@/lib/status-detector";
 import { deliver } from "@/lib/bus";
 import { sendChatConfirmed } from "@/lib/chat/runner";
 import { cleanRemoteText } from "@/lib/hosts/remote-api";
-import { heldRoute } from "@/lib/tasks/held-routes";
+import { taskRoute } from "@/lib/tasks/contract/authorize";
 
 const MAX_LINE = 40_000;
 
@@ -15,7 +15,7 @@ export async function POST(
   ctx: { params: Promise<{ id: string }> }
 ) {
   const body = await request.json().catch(() => ({}));
-  return heldRoute(request, ctx, async (task) => {
+  return taskRoute(request, ctx, "holder", async (task) => {
     const line = typeof body.line === "string" ? body.line.trim() : "";
     if (!line || line.length > MAX_LINE) throw new Error("Bad message");
     const id = typeof body.id === "string" ? body.id.slice(0, 100) : undefined;

package/app/api/tasks/[id]/model/route.ts

@@ -1,3 +1,4 @@
+import { refuse } from "@/lib/tasks/contract/authorize";
 import { NextRequest, NextResponse } from "next/server";
 import { resumeOnModel } from "@/lib/models/resume";
 
@@ -8,10 +9,13 @@ export async function POST(
   request: NextRequest,
   { params }: { params: Promise<{ id: string }> }
 ) {
+  const id = (await params).id;
+  const refused = refuse(request, id, "open");
+  if (refused) return refused;
   const { model, message } = await request.json().catch(() => ({}));
   try {
     const result = await resumeOnModel(
-      (await params).id,
+      id,
       model,
       typeof message === "string" && message.trim() ? message : undefined
     );

package/app/api/tasks/[id]/move/route.ts

@@ -1,4 +1,5 @@
 import { NextRequest, NextResponse } from "next/server";
+import { refuse } from "@/lib/tasks/contract/authorize";
 import { moveTask } from "@/lib/tasks";
 import { getProgress } from "@/lib/tasks/move-progress";
 
@@ -7,9 +8,12 @@ export async function POST(
   request: NextRequest,
   { params }: { params: Promise<{ id: string }> }
 ) {
+  const id = (await params).id;
+  const refused = refuse(request, id, "open");
+  if (refused) return refused;
   try {
     const { hostId } = await request.json();
-    const session = await moveTask((await params).id, String(hostId || ""));
+    const session = await moveTask(id, String(hostId || ""));
     return NextResponse.json({ session });
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);

package/app/api/tasks/[id]/moved/route.ts

@@ -1,7 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 import { markMoved } from "@/lib/tasks/move";
-import { callingDevice } from "@/lib/security/device-me";
-import { heldRefusal } from "@/lib/tasks/held";
+import { refuse } from "@/lib/tasks/contract/authorize";
 import { cleanUpMovedAway } from "@/lib/tasks/moved-away";
 import { runInBackground } from "@/lib/async-operations";
 
@@ -11,14 +10,13 @@ export async function POST(
   { params }: { params: Promise<{ id: string }> }
 ) {
   const id = (await params).id;
-  const held = heldRefusal(id, callingDevice(request));
-  if (held) return NextResponse.json({ error: held }, { status: 403 });
+  const refused = refuse(request, id, "open");
+  if (refused) return refused;
   const { to } = await request.json().catch(() => ({}));
   markMoved(id, String(to || "another machine").slice(0, 100));
   // A task its orchestrator took back: its agent and worktree here go.
-  if (held === null)
-    runInBackground(async () => {
-      await cleanUpMovedAway(id);
-    }, `moved-away-${id}`);
+  runInBackground(async () => {
+    await cleanUpMovedAway(id);
+  }, `moved-away-${id}`);
   return NextResponse.json({ success: true });
 }

package/app/api/tasks/[id]/plan/route.ts

@@ -1,9 +1,8 @@
+import { refuse } from "@/lib/tasks/contract/authorize";
 import fs from "fs/promises";
 import path from "path";
 import { NextRequest, NextResponse } from "next/server";
 import { db, type Session } from "@/lib/db";
-import { callingDevice } from "@/lib/security/device-me";
-import { heldRefusal, planWaitRefusal } from "@/lib/tasks/held";
 import { MAX_PLAN_BYTES } from "@/lib/tasks/move-bundle";
 import { PLAN_FILE } from "@/lib/models/plan-step";
 import { expandHome } from "@/lib/tasks/session";
@@ -15,11 +14,10 @@ export async function GET(
   { params }: { params: Promise<{ id: string }> }
 ) {
   const id = (await params).id;
-  const device = callingDevice(request);
-  const refusal = heldRefusal(id, device) ?? planWaitRefusal(id, device);
-  if (refusal) return NextResponse.json({ error: refusal }, { status: 403 });
+  const refused = refuse(request, id, "plan");
+  if (refused) return refused;
   const s = db
-    .prepare(`SELECT plan_phase, worktree_path FROM sessions WHERE id = ?`)
+    .prepare(`SELECT plan_phase, worktree_path FROM session_rows WHERE id = ?`)
     .get(id) as Pick<Session, "plan_phase" | "worktree_path"> | undefined;
   if (!s?.worktree_path)
     return NextResponse.json({ error: "No such task" }, { status: 404 });

package/app/api/tasks/[id]/plan-edits/route.ts

@@ -1,6 +1,8 @@
+import { refuse } from "@/lib/tasks/contract/authorize";
 import { NextRequest, NextResponse } from "next/server";
 import { db, type Session } from "@/lib/db";
 import { notifyStatusChanged } from "@/lib/status/hub";
+import { setPlan } from "@/lib/db/session-parts";
 
 // Saad's edits to a waiting plan's pieces: which to fold into the one before
 // and which to leave out. Kept on the task and applied when the plan is
@@ -10,6 +12,8 @@ export async function PUT(
   { params }: { params: Promise<{ id: string }> }
 ) {
   const { id } = await params;
+  const refused = refuse(request, id, "open");
+  if (refused) return refused;
   const body = await request.json().catch(() => ({}));
   const ints = (v: unknown) =>
     Array.isArray(v)
@@ -18,17 +22,14 @@ export async function PUT(
   const merge = ints(body?.merge);
   const drop = ints(body?.drop).filter((n) => !merge.includes(n));
   const session = db
-    .prepare(`SELECT plan_phase FROM sessions WHERE id = ?`)
+    .prepare(`SELECT plan_phase FROM session_rows WHERE id = ?`)
     .get(id) as Pick<Session, "plan_phase"> | undefined;
   if (session?.plan_phase !== "awaiting")
     return NextResponse.json(
       { error: "That task isn't waiting for plan approval" },
       { status: 409 }
     );
-  db.prepare(`UPDATE sessions SET plan_edits = ? WHERE id = ?`).run(
-    JSON.stringify({ merge, drop }),
-    id
-  );
+  setPlan(db, id, { plan_edits: JSON.stringify({ merge, drop }) });
   notifyStatusChanged();
   return NextResponse.json({ success: true, merge, drop });
 }

package/app/api/tasks/[id]/priority/route.ts

@@ -1,4 +1,5 @@
-import { NextResponse } from "next/server";
+import { refuse } from "@/lib/tasks/contract/authorize";
+import { NextRequest, NextResponse } from "next/server";
 import { setPriority } from "@/lib/tasks/queue";
 import { isPriority } from "@/lib/tasks/schedule-types";
 
@@ -9,6 +10,8 @@ export async function PATCH(
   { params }: { params: Promise<{ id: string }> }
 ) {
   const { id } = await params;
+  const refused = refuse(request as NextRequest, id, "open");
+  if (refused) return refused;
   const body = (await request.json().catch(() => null)) as {
     priority?: unknown;
   } | null;

package/app/api/tasks/[id]/resume/route.ts

@@ -1,7 +1,6 @@
+import { refuse } from "@/lib/tasks/contract/authorize";
 import { NextRequest, NextResponse } from "next/server";
 import { resumeHere } from "@/lib/tasks/move-recover";
-import { callingDevice } from "@/lib/security/device-me";
-import { heldRefusal } from "@/lib/tasks/held";
 
 // POST /api/tasks/:id/resume {force?} - start its agent again here, on its
 // conversation. A task left moving asks its target first unless forced.
@@ -10,8 +9,8 @@ export async function POST(
   { params }: { params: Promise<{ id: string }> }
 ) {
   const id = (await params).id;
-  const held = heldRefusal(id, callingDevice(request));
-  if (held) return NextResponse.json({ error: held }, { status: 403 });
+  const refused = refuse(request, id, "open");
+  if (refused) return refused;
   const { force } = await request.json().catch(() => ({}));
   try {
     const result = await resumeHere(id, force === true);

package/app/api/tasks/[id]/stop/route.ts

@@ -1,6 +1,6 @@
 import { NextRequest } from "next/server";
 import { stopSession } from "@/lib/sessions/stop";
-import { heldRoute } from "@/lib/tasks/held-routes";
+import { taskRoute } from "@/lib/tasks/contract/authorize";
 
 // POST /api/tasks/:id/stop - its orchestrator stops the agent; the
 // conversation and worktree are kept.
@@ -8,7 +8,7 @@ export async function POST(
   request: NextRequest,
   ctx: { params: Promise<{ id: string }> }
 ) {
-  return heldRoute(request, ctx, async (task) => ({
+  return taskRoute(request, ctx, "holder", async (task) => ({
     text: await stopSession(task),
   }));
 }

package/app/api/tasks/route.ts

@@ -3,7 +3,7 @@ import { NextRequest, NextResponse } from "next/server";
 import { createTask, listTasks, movedTasks } from "@/lib/tasks";
 import { stampPriority, startOrQueue } from "@/lib/tasks/queue";
 import { isPriority } from "@/lib/tasks/schedule-types";
-import { TASK_CAPABILITIES } from "@/lib/tasks/remote";
+import { TASK_CAPABILITIES } from "@/lib/tasks/contract/types";
 import { ensureProject, type ProjectRef } from "@/lib/tasks/project-ref";
 import { callingDevice } from "@/lib/security/device-me";
 import {

package/lib/approvals/enable.ts

@@ -29,7 +29,7 @@ async function sweep(): Promise<void> {
   }
   const plans = db
     .prepare(
-      `SELECT id, host_id, plan_waits_for_caller FROM sessions WHERE plan_phase = 'awaiting' AND task_status = 'running'`
+      `SELECT id, host_id, plan_waits_for_caller FROM session_rows WHERE plan_phase = 'awaiting' AND task_status = 'running'`
     )
     .all() as {
     id: string;

package/lib/away/report.ts

@@ -137,7 +137,7 @@ function merged(
   const rows = db
     .prepare(
       `SELECT s.id, s.name, p.name AS project, p.id AS project_id, s.pr_number, s.pr_url
-       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 = 'merged'
          AND s.merged_at >= ? AND s.merged_at <= ?
        ORDER BY s.merged_at, s.id`
@@ -178,7 +178,7 @@ function inFlight(workspaceId: string, awayId: number): InFlightItem[] {
     .prepare(
       `SELECT s.id, s.name, p.name AS project, s.pr_number, s.pr_url,
          s.merge_armed_at AS armed_at
-       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'
          AND EXISTS (SELECT 1 FROM away_actions a WHERE a.away_id = ?
@@ -224,7 +224,7 @@ function failed(workspaceId: string, away: AwayRow, end: string) {
   const deploys = db
     .prepare(
       `SELECT a.detail, s.name, s.pr_number, s.pr_url FROM away_actions a
-       LEFT JOIN sessions s ON s.id = a.subject
+       LEFT JOIN session_rows s ON s.id = a.subject
        WHERE a.away_id = ? AND a.workspace_id = ? AND a.kind = 'deploy_failed'
        ORDER BY a.id`
     )
@@ -236,7 +236,7 @@ function failed(workspaceId: string, away: AwayRow, end: string) {
   }[];
   const ended = db
     .prepare(
-      `SELECT s.name, s.task_status, s.pr_number, s.pr_url FROM sessions s
+      `SELECT s.name, s.task_status, s.pr_number, s.pr_url FROM session_rows s
        JOIN projects p ON p.id = s.project_id
        WHERE p.workspace_id = ? AND s.task_status IN ('dropped', 'done')
          AND s.task_ended_at >= ? AND s.task_ended_at <= ?

package/lib/away/run.ts

@@ -69,7 +69,7 @@ function orchestrated(): { workspaceId: string; orchestratorId: 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;
 
@@ -330,7 +330,7 @@ async function checkDeploys(
   const found: DeployFinding[] = [];
   const merged = 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.task_status = 'merged' AND s.merged_at >= ?
          AND NOT EXISTS (SELECT 1 FROM away_actions a
            WHERE a.away_id = ? AND a.key = 'deploy:' || s.id)`

package/lib/bookmarks/store.ts

@@ -57,7 +57,7 @@ type Joined = Row & {
 // The bookmark with its chat's state as of now.
 const SELECT = `
   SELECT b.*, s.id AS s_id, s.task_status, s.archived_at
-  FROM chat_bookmarks b LEFT JOIN sessions s ON s.id = b.session_id`;
+  FROM chat_bookmarks b LEFT JOIN session_rows s ON s.id = b.session_id`;
 
 function toBookmark(r: Joined): Bookmark {
   return {
@@ -141,7 +141,7 @@ export function createBookmark(input: {
     throw new BookmarkError("scope must be 'item' or 'turn'", 400);
   const note = cleanNote(input.note);
   const session = db
-    .prepare(`SELECT * FROM sessions WHERE id = ?`)
+    .prepare(`SELECT * FROM session_rows WHERE id = ?`)
     .get(sessionId) as Session | undefined;
   if (!session) throw new BookmarkError("Session not found", 404);
   const existing = db
@@ -308,7 +308,7 @@ export function insertMovedBookmarks(
 ): void {
   if (!rows.length) return;
   const session = db
-    .prepare(`SELECT * FROM sessions WHERE id = ?`)
+    .prepare(`SELECT * FROM session_rows WHERE id = ?`)
     .get(sessionId) as Session | undefined;
   if (!session) return;
   const workspace = sessionWorkspace(session);

package/lib/bus/held-reply.ts

@@ -68,7 +68,7 @@ export function pendingReplies(device: string, limit = 50): PendingReply[] {
     db
       .prepare(
         `SELECT m.id, m.from_id AS fromId, m.body, m.created_at AS createdAt
-         FROM bus_messages m JOIN sessions s ON s.id = m.from_id
+         FROM bus_messages m JOIN session_rows s ON s.id = m.from_id
          WHERE m.relay_state = 'pending' AND s.held_by_device = ?
          ORDER BY m.id LIMIT ?`
       )
@@ -81,7 +81,7 @@ export function ackReplies(device: string, ids: number[]): void {
   const mark = db.prepare(
     `UPDATE bus_messages SET relay_state = 'relayed', delivered_at = datetime('now')
      WHERE id = ? AND relay_state = 'pending'
-       AND from_id IN (SELECT id FROM sessions WHERE held_by_device = ?)`
+       AND from_id IN (SELECT id FROM session_rows WHERE held_by_device = ?)`
   );
   db.transaction(() => {
     for (const id of ids) mark.run(id, device);

package/lib/bus/index.ts

@@ -15,7 +15,7 @@ import { deliverToPane, type Delivery } from "./delivery";
 import { resolveRef, wasNames, type Candidate } from "./resolve";
 import { tmuxPane } from "./tmux-pane";
 import { pauseHoldOf, pausedNote } from "../tasks/pause-hold";
-import { isHeldRemote, relayToHeldTask } from "../tasks/held-remote";
+import { isHeldRemote, relayToHeldTask } from "../tasks/contract/held-calls";
 import {
   assertTakesMessages,
   findQueuedTarget,
@@ -43,7 +43,7 @@ export interface Peer {
 function liveSessions(): Session[] {
   return db
     .prepare(
-      `SELECT * FROM sessions WHERE (task_status IS NULL OR task_status = 'running')
+      `SELECT * FROM session_rows WHERE (task_status IS NULL OR task_status = 'running')
          AND archived_at IS NULL
        ORDER BY updated_at DESC`
     )
@@ -63,7 +63,7 @@ function candidates(sessions: Session[]): Candidate[] {
 
 const sessionById = (id: string | null | undefined) =>
   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/chat/compact-context.ts

@@ -28,7 +28,7 @@ async function gitStatus(cwd: string): Promise<string> {
 export async function compactContext(sessionId: string): Promise<string> {
   const session = db
     .prepare(
-      `SELECT working_directory, task_prompt, role FROM sessions WHERE id = ?`
+      `SELECT working_directory, task_prompt, role FROM session_rows WHERE id = ?`
     )
     .get(sessionId) as
     | Pick<Session, "working_directory" | "task_prompt" | "role">

package/lib/chat/hold.ts

@@ -15,10 +15,10 @@ import { db } from "../db";
 
 // The SQL form, for queries that take the session id as @sid.
 export const HELD_SQL = `(
-  EXISTS (SELECT 1 FROM sessions WHERE id = @sid AND task_status = 'moving')
+  EXISTS (SELECT 1 FROM session_rows WHERE id = @sid AND task_status = 'moving')
   OR EXISTS (SELECT 1 FROM stack_items i JOIN stacks s ON s.id = i.stack_id
              WHERE i.session_id = @sid AND s.status = 'landing')
-  OR EXISTS (SELECT 1 FROM sessions WHERE id = @sid
+  OR EXISTS (SELECT 1 FROM session_rows WHERE id = @sid
              AND pause_state IN ('pausing', 'paused'))
 )`;
 
@@ -58,7 +58,7 @@ const holdRow = (sessionId: string) =>
       `SELECT task_status, moved_to, quick_of, pause_state, paused_until,
          EXISTS (SELECT 1 FROM stack_items i JOIN stacks s ON s.id = i.stack_id
                  WHERE i.session_id = @sid AND s.status = 'landing') AS landing
-       FROM sessions WHERE id = @sid`
+       FROM session_rows WHERE id = @sid`
     )
     .get({ sid: sessionId }) as HoldRow | undefined;
 

package/lib/chat/refresh.ts

@@ -163,7 +163,7 @@ export function autoCompactEnv(sessionId: string): Record<string, string> {
   const row = db
     .prepare(
       `SELECT role, task_status, plan_phase, started_by, model_provider
-       FROM sessions WHERE id = ?`
+       FROM session_rows WHERE id = ?`
     )
     .get(sessionId) as
     | {