@saadnvd1/agent-os 0.3.597 → 0.3.600

package/app/api/bus/spawn/route.ts

@@ -5,17 +5,14 @@ import { startOrQueue, stampPriority } from "@/lib/tasks/queue";
 import { isPriority } from "@/lib/tasks/schedule-types";
 import { hostIdNamed } from "@/lib/hosts";
 import { startView } from "@/lib/sessions/launch";
-import { db } from "@/lib/db";
-
-// The calling session, when it's an orchestrator: what it starts runs on the
-// implementation model. A made-up `from` can only pick that cheaper role.
-function orchestratorFrom(from: unknown): string | null {
-  if (typeof from !== "string" || !from) return null;
-  const row = db
-    .prepare(`SELECT 1 FROM sessions WHERE id = ? AND role = 'orchestrator'`)
-    .get(from);
-  return row ? from : null;
-}
+import { callerSession, starterOf } from "@/lib/tasks/starter";
+import { callingDevice } from "@/lib/security/device-me";
+import {
+  findPiece,
+  pieceLabel,
+  pieceRefusal,
+  waitingPiecesFor,
+} from "@/lib/plans/claim";
 
 // mode "session" starts an interactive agent; "task" starts one that ends in
 // a PR, or queues it (over the workspace's limit, or with `after`).
@@ -34,8 +31,15 @@ export async function POST(request: NextRequest) {
       priority,
       machine,
       from,
+      cwd,
+      piece,
     } = await request.json();
-    const startedBy = orchestratorFrom(from);
+    // Whoever called: a session (by `from`, else the worktree it runs in) or a person.
+    const starter = starterOf(
+      callerSession({ from, cwd }),
+      callingDevice(request)
+    );
+    const { startedBy } = starter;
     const given = typeof name === "string" ? name : undefined;
     if (after !== undefined && mode !== "task")
       throw new Error("--after works for tasks only");
@@ -47,16 +51,29 @@ export async function POST(request: NextRequest) {
       throw new Error("--priority is urgent, blocking, normal or background");
     if (machine !== undefined && machine !== "mac" && machine !== "any")
       throw new Error('machine is "mac" or "any"');
+    if (piece !== undefined && mode !== "task")
+      throw new Error("--piece works for tasks only");
     if (mode === "task") {
+      const projectId = findProject(String(project ?? "")).id;
+      // A task whose plan has pieces waiting here must say which it builds.
+      const waiting = startedBy ? waitingPiecesFor(startedBy, projectId) : [];
+      let pieceId: number | undefined;
+      if (piece !== undefined) {
+        if (typeof piece !== "string" || !piece.trim())
+          throw new Error("--piece needs a piece name");
+        pieceId = findPiece(waiting, piece).id;
+      } else if (waiting.length)
+        throw new Error(pieceRefusal(waiting, projectId));
       const task = {
-        projectId: findProject(String(project ?? "")).id,
+        projectId,
+        ...starter,
+        pieceId,
         prompt: String(prompt ?? ""),
         name: given,
         model,
         hostId: on ? hostIdNamed(String(on)) : undefined,
         view: startView(view),
         planOnly: planOnly === true ? true : undefined,
-        startedBy,
       };
       const out = await startOrQueue(
         {
@@ -71,9 +88,10 @@ export async function POST(request: NextRequest) {
           return session;
         }
       );
+      const builds = pieceId ? pieceLabel(pieceId) : undefined;
       return "queued" in out
-        ? NextResponse.json({ queued: out.queued }, { status: 202 })
-        : NextResponse.json({ session: out.started }, { status: 201 });
+        ? NextResponse.json({ queued: out.queued, builds }, { status: 202 })
+        : NextResponse.json({ session: out.started, builds }, { status: 201 });
     }
     const session = await spawnSession({
       project: String(project ?? ""),
@@ -81,6 +99,7 @@ export async function POST(request: NextRequest) {
       name: given,
       model,
       startedBy,
+      parentSessionId: starter.parentSessionId,
     });
     return NextResponse.json({ session }, { status: 201 });
   } catch (error) {

package/app/api/lumifyhub/cards/[cardId]/run/route.ts

@@ -3,6 +3,7 @@ import { body, respond } from "@/lib/lumifyhub/http";
 import { lumifyHubId } from "@/lib/lumifyhub/ids";
 import { cardForTask, promptFromCard } from "@/lib/lumifyhub/task-cards";
 import { createTask } from "@/lib/tasks";
+import { callingDevice } from "@/lib/security/device-me";
 
 type RouteParams = { params: Promise<{ cardId: string }> };
 
@@ -20,6 +21,8 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
       prompt: promptFromCard(card),
       name: card.title,
       cardId: card.id,
+      startedVia: "person",
+      startedByDevice: callingDevice(request) ?? undefined,
     });
     return { session };
   });

package/app/api/tasks/route.ts

@@ -85,6 +85,8 @@ export async function POST(request: NextRequest) {
       hostId: typeof hostId === "string" && hostId ? hostId : undefined,
       baseBranch: typeof baseBranch === "string" ? baseBranch : undefined,
       view: startView(view),
+      startedVia: "person" as const,
+      startedByDevice: callingDevice(request) ?? undefined,
     };
     if (id !== undefined) {
       // An orchestrator's task is held for the paired device that sent it,
@@ -105,6 +107,7 @@ export async function POST(request: NextRequest) {
         id,
         ...opts,
         held,
+        startedVia: "remote",
         startedByDevice: device ?? undefined,
       });
       return NextResponse.json({ session }, { status: 201 });

package/app/page.tsx

@@ -1,5 +1,6 @@
 "use client";
 
+import { isFork } from "@/lib/sessions/fork";
 import { toast } from "sonner";
 
 import { subscribe } from "valtio";
@@ -299,7 +300,7 @@ function HomeContent() {
 
       // Get parent session ID for forking
       let parentSessionId: string | null = null;
-      if (!session.claude_session_id && session.parent_session_id) {
+      if (!session.claude_session_id && isFork(session)) {
         const parentSession = sessions.find(
           (s) => s.id === session.parent_session_id
         );

package/components/SessionList/SessionRow.tsx

@@ -1,5 +1,6 @@
 "use client";
 
+import { isFork } from "@/lib/sessions/fork";
 import { memo, useState } from "react";
 import { useSnapshot } from "valtio";
 import {
@@ -99,7 +100,7 @@ export const SessionRow = memo(function SessionRow({
                 />
               </span>
             )}
-            {session.parent_session_id && (
+            {isFork(session) && (
               <GitFork className="text-muted-foreground/60 h-3 w-3 shrink-0" />
             )}
           </>

package/lib/agents/spawn.ts

@@ -1,4 +1,5 @@
 import { randomUUID } from "crypto";
+import { orchestratorOf, recordStart } from "../tasks/starter";
 import os from "os";
 import { db, queries, type Session } from "../db";
 import { getProject, getAllProjects } from "../projects";
@@ -35,6 +36,7 @@ export async function spawnSession(opts: {
   // The orchestrator session that starts it: the implementation role's
   // model unless `model` is given.
   startedBy?: string | null;
+  parentSessionId?: string | null;
 }): Promise<Session> {
   const prompt = opts.prompt.trim();
   if (!prompt) throw new Error("Give the new session a prompt");
@@ -46,7 +48,7 @@ export async function spawnSession(opts: {
 
   const id = randomUUID();
   const tmuxName = `claude-${id}`;
-  const routed = opts.startedBy
+  const routed = orchestratorOf(opts.startedBy)
     ? resolveRole("implement", {
         workspaceId: project.workspace_id,
         override: parseOverride(opts.model),
@@ -76,9 +78,19 @@ export async function spawnSession(opts: {
       project.id,
       "local"
     );
-  db.prepare(
-    `UPDATE sessions SET name_source = ?, started_by = ? WHERE id = ?`
-  ).run(naming.source, opts.startedBy ?? null, id);
+  db.prepare(`UPDATE sessions SET name_source = ? WHERE id = ?`).run(
+    naming.source,
+    id
+  );
+  recordStart(id, {
+    startedBy: opts.startedBy ?? null,
+    parentSessionId: opts.parentSessionId ?? opts.startedBy ?? null,
+    startedVia: orchestratorOf(opts.startedBy)
+      ? "orchestrator"
+      : opts.startedBy
+        ? "session"
+        : "person",
+  });
   if (routed) setSessionModel(id, routed);
   void naming.refine?.(id);
   await launchClaude({ sessionId: id, tmuxName, cwd, model, prompt });

package/lib/chat/refresh.ts

@@ -13,7 +13,8 @@
 
 import { db } from "../db";
 import { effectiveModels } from "../models/config";
-import { sessionRole, type ModelRole } from "../models/roles";
+import { type ModelRole } from "../models/roles";
+import { sessionRole } from "../models/session-role";
 import { MAX_REFRESH_TOKENS, MIN_REFRESH_TOKENS } from "./refresh-limits";
 
 export const ORCHESTRATOR_KEY = "orchestrator.refresh_tokens";

package/lib/chat/runner.ts

@@ -41,10 +41,13 @@ import {
   setChatPlan,
 } from "./settings";
 import {
+  endOrphanedTasks,
+  endRunningTasks,
   getItem,
   hasItem,
   itemsOfKind,
   recentTasks,
+  sessionsWithRunningTasks,
   saveItem,
   settle,
 } from "./store";
@@ -167,8 +170,26 @@ function planEnv(sessionId: string): PlanHandoffEnv {
   };
 }
 
+// Tell watchers of tasks that just ended, and drop them from the live count.
+function emitEnded(
+  sessionId: string,
+  live: Live | undefined,
+  ended: ReturnType<typeof endRunningTasks>
+): void {
+  for (const item of ended) {
+    live?.activity.tasks.delete(item.taskId);
+    emit(sessionId, { type: "item", item });
+  }
+}
+
 function onWorkerEvent(sessionId: string, live: Live, e: WorkerEvent): void {
   track(live, e);
+  if (
+    e.type === "item" &&
+    e.item.kind === "tool" &&
+    (e.item.status === "stopped" || e.item.status === "error")
+  )
+    emitEnded(sessionId, live, endOrphanedTasks(sessionId));
   if (e.type === "item" && e.item.kind === "task")
     retireIfStale(sessionId, live);
   if (e.type === "item") {
@@ -297,7 +318,11 @@ async function ensureLive(sessionId: string, spawn = true): Promise<Live> {
             );
       },
     };
+    // No worker running: its agent ended, and with it every job it ran.
+    const hadWorker = runningWorkers().includes(sessionId);
     let { client, hello } = await connectWorker(sessionId, spawn, handlers);
+    if (!hadWorker) emitEnded(sessionId, undefined, endRunningTasks(sessionId));
+    emitEnded(sessionId, undefined, endOrphanedTasks(sessionId));
     let activity = restoreActivity(sessionId, hello.state);
     // An idle worker left over from before a redeploy: retire it, and start
     // a fresh one only when a message needs it. One still running background
@@ -316,6 +341,7 @@ async function ensureLive(sessionId: string, spawn = true): Promise<Live> {
           { code: RETIRED }
         );
       ({ client, hello } = await connectWorker(sessionId, true, handlers));
+      emitEnded(sessionId, undefined, endRunningTasks(sessionId));
       activity = restoreActivity(sessionId, hello.state);
     }
     live = {
@@ -965,6 +991,9 @@ export async function reattachChats(): Promise<void> {
         })
     )
   );
+  // A task saved as running with no worker behind it has no job either.
+  for (const id of sessionsWithRunningTasks())
+    if (!live.has(id)) endRunningTasks(id);
   // Turns cut off while no worker was left to finish them, then queues.
   // One at a time, and only what was queued recently: a backlog from long
   // ago isn't sent unasked by a restart (it stays on screen to send).

package/lib/chat/store.ts

@@ -235,6 +235,59 @@ export function runningItems<K extends "tool" | "task">(
   ).map((r) => JSON.parse(r.data));
 }
 
+const LOST = "Its agent ended before this finished";
+
+function endTasks(
+  sessionId: string,
+  which: (task: Extract<ChatItem, { kind: "task" }>) => boolean
+): Extract<ChatItem, { kind: "task" }>[] {
+  const ended: Extract<ChatItem, { kind: "task" }>[] = [];
+  for (const task of runningItems(sessionId, "task")) {
+    if (!which(task)) continue;
+    const item = {
+      ...task,
+      status: "stopped" as const,
+      endedAt: Date.now(),
+      summary: task.summary ?? LOST,
+    };
+    saveItem(sessionId, item);
+    ended.push(item);
+  }
+  return ended;
+}
+
+// Its agent is gone (a fresh worker, no worker at restart): nothing it ran
+// in the background is still going. Returns what it ended.
+export const endRunningTasks = (sessionId: string) =>
+  endTasks(sessionId, () => true);
+
+// A task whose tool call was stopped or errored has no job behind it.
+export function endOrphanedTasks(sessionId: string) {
+  const dead = new Set(
+    runningItems(sessionId, "task").flatMap((t) => {
+      const tool = t.toolUseId ? getItem(sessionId, t.toolUseId) : undefined;
+      return tool?.kind === "tool" &&
+        (tool.status === "stopped" || tool.status === "error")
+        ? [t.id]
+        : [];
+    })
+  );
+  return endTasks(sessionId, (t) => dead.has(t.id));
+}
+
+// Chats with a task saved as running.
+export function sessionsWithRunningTasks(): string[] {
+  flushItems();
+  return (
+    db
+      .prepare(
+        `SELECT DISTINCT session_id FROM chat_items WHERE kind = 'task'
+         AND json_extract(data, '$.status') = 'running'`
+      )
+      .all() as { session_id: string }[]
+  ).map((r) => r.session_id);
+}
+
 // Tool calls saved as still running.
 export const runningTools = (sessionId: string) =>
   runningItems(sessionId, "tool");

package/lib/db/migrations/20261014T2110_task_start_record.ts

@@ -0,0 +1,21 @@
+import type { Migration } from "../migration-types";
+
+export default {
+  key: "20261014T2110_task_start_record",
+  up: (db) => {
+    // Who started a task and how, on the session and its queue row; an
+    // approval kind on brief entries. Additive.
+    const add = (table: string, col: string, type: string) => {
+      const columns = db.prepare(`PRAGMA table_info(${table})`).all() as {
+        name: string;
+      }[];
+      if (!columns.some((c) => c.name === col))
+        db.exec(`ALTER TABLE ${table} ADD COLUMN ${col} ${type}`);
+    };
+    add("sessions", "started_via", "TEXT");
+    add("task_queue", "parent_session_id", "TEXT");
+    add("task_queue", "started_by_device", "TEXT");
+    add("task_queue", "started_via", "TEXT");
+    add("brief_amendments", "kind", "TEXT NOT NULL DEFAULT 'scope'");
+  },
+} satisfies Migration;

package/lib/db/migrations/20261014T2200_end_orphaned_tasks.ts

@@ -0,0 +1,23 @@
+import type { Migration } from "../migration-types";
+
+export default {
+  key: "20261014T2200_end_orphaned_tasks",
+  up: (db) => {
+    // A background task still "running" whose tool call was stopped or
+    // errored has no job behind it. Settles the rows already stuck.
+    db.exec(`
+      UPDATE chat_items
+      SET data = json_set(data, '$.status', 'stopped',
+                          '$.endedAt', CAST(strftime('%s','now') AS INTEGER) * 1000,
+                          '$.summary', COALESCE(json_extract(data, '$.summary'),
+                                                'Its agent ended before this finished'))
+      WHERE kind = 'task' AND json_extract(data, '$.status') = 'running'
+        AND EXISTS (
+          SELECT 1 FROM chat_items t
+          WHERE t.session_id = chat_items.session_id
+            AND t.item_id = json_extract(chat_items.data, '$.toolUseId')
+            AND t.kind = 'tool'
+            AND json_extract(t.data, '$.status') IN ('stopped', 'error'))
+    `);
+  },
+} satisfies Migration;

package/lib/db/types.ts

@@ -24,6 +24,8 @@ export interface Session {
   plan_only?: number | null;
   // The orchestrator session that started this one; null for a person.
   started_by?: string | null;
+  // How it started: session, orchestrator, person, plan, schedule, recipe, stack or remote.
+  started_via?: string | null;
   // 1 planned, 0 no plan, null not stated; why, in the starter's words.
   plan_decided?: number | null;
   // JSON: the pieces Saad merged or dropped before approving the plan.

package/lib/learning-cards/apply.ts

@@ -80,6 +80,7 @@ async function toClaudeMd(card: Card, p: LessonPayload, line: string) {
     projectId: project.id,
     prompt: `Add exactly this line under a "${HEADING}" heading in CLAUDE.md at the repository root, creating the file and heading if missing, and change nothing else: ${line}`,
     startedBy: null,
+    startedVia: "person",
   });
   return task.id;
 }
@@ -105,7 +106,12 @@ async function applyLesson(card: Card, p: LessonPayload, edits: Edits) {
       if (!prompt || !p.projectId)
         throw new CardRefused("There's no task to start");
       return (
-        await createTask({ projectId: p.projectId, prompt, startedBy: null })
+        await createTask({
+          projectId: p.projectId,
+          prompt,
+          startedBy: null,
+          startedVia: "person",
+        })
       ).id;
     }
     case "rule":

package/lib/models/plan-step.ts

@@ -21,8 +21,9 @@ import { ANTHROPIC } from "./roles";
 import { queueEvent } from "../orchestrator/events";
 import { noApprovalsOn, recordAutoApproval } from "../approvals/no-approvals";
 import { addNote } from "../orchestrator/notes";
-import { amendBrief, amendmentsOf } from "../orchestrator/amendments";
+import { amendBrief, scopeChangesOf } from "../orchestrator/amendments";
 import { PIECES_PROMPT, foldedBrief, pieceBrief } from "../plans/pieces";
+import { orchestratorOf } from "../tasks/starter";
 import {
   createFeature,
   ownPieceOf,
@@ -119,7 +120,7 @@ function piecesLine(r: NonNullable<ReturnType<typeof planFor>>): string {
 
 // Tells the orchestrator that started a task its plan is written, once.
 function announcePlan(s: Session, ref: string | null, retried = false): void {
-  if (!s.started_by && !s.held_by_device) return;
+  if (!orchestratorOf(s.started_by) && !s.held_by_device) return;
   const workspaceId = sessionWorkspace(s);
   // A task held for another machine's orchestrator can't reach it: the line
   // waits on the task for that orchestrator to read (orchestrator/facts).
@@ -507,12 +508,21 @@ export async function recheckPlanning(
     );
 }
 
+export type ApprovedBy = "saad" | "orchestrator" | "no-approvals";
+
+const APPROVAL_TEXT: Record<ApprovedBy, string> = {
+  saad: "Saad approved the plan; implement it as planned.",
+  orchestrator: "The orchestrator approved the plan; implement it as planned.",
+  "no-approvals":
+    "The plan was approved automatically (no-approvals mode); implement it as planned.",
+};
+
 // approvePlan, sending through the chat runner (imported when needed: it
 // imports this file).
 export async function approvePlanNow(
   sessionId: string,
   message?: string,
-  by: "saad" | "no-approvals" = "saad"
+  by: ApprovedBy = "saad"
 ) {
   const { sendQueuedNow } = await import("../chat/runner");
   return approvePlan(sessionId, message, (id, m) => sendQueuedNow(id, m), by);
@@ -526,7 +536,7 @@ export async function approvePlan(
   sessionId: string,
   message: string | undefined,
   send: Send,
-  by: "saad" | "no-approvals" = "saad"
+  by: ApprovedBy = "saad"
 ): Promise<{ ref: string; amendments: number }> {
   const s = getSession(sessionId);
   if (!s || s.plan_phase !== "awaiting" || s.task_status !== "running")
@@ -535,9 +545,16 @@ export async function approvePlan(
     );
   const text = message?.trim() || undefined;
   const workspaceId = sessionWorkspace(s);
-  if (text && workspaceId) {
-    amendBrief(workspaceId, s.id, text);
-    addNote(workspaceId, `Plan approved with a change for ${s.name}: ${text}`);
+  // Every approval is on the brief, so the review judges the PR as the
+  // implementation of the plan, not as plan-only work.
+  if (workspaceId) {
+    if (text) {
+      amendBrief(workspaceId, s.id, text);
+      addNote(
+        workspaceId,
+        `Plan approved with a change for ${s.name}: ${text}`
+      );
+    } else amendBrief(workspaceId, s.id, APPROVAL_TEXT[by], "approval");
   }
   const ref = await startImplementing(s, "awaiting", send, text);
   if (!ref) throw new Error(`${s.name} isn't waiting for plan approval`);
@@ -549,5 +566,5 @@ export async function approvePlan(
       subject: `plan for ${s.name}`,
       detail: "already waiting when the mode was turned on",
     });
-  return { ref, amendments: amendmentsOf(s.id).length };
+  return { ref, amendments: scopeChangesOf(s.id).length };
 }

package/lib/models/resolve.ts

@@ -24,9 +24,9 @@ import {
   formatModelRef,
   isModelRole,
   parseModelRef,
-  sessionRole,
   type ModelRole,
 } from "./roles";
+import { sessionRole } from "./session-role";
 import {
   resolveSecret,
   secretShellExpansion,

package/lib/models/resume.ts

@@ -18,7 +18,7 @@ import {
   taskOverride,
   type ModelOverride,
 } from "./resolve";
-import { sessionRole } from "./roles";
+import { sessionRole } from "./session-role";
 
 export const RESUME_MESSAGE =
   "You were paused. Carry on where you left off: check the worktree and the conversation above for where things stand, then finish the task.";

package/lib/models/roles.ts

@@ -85,19 +85,3 @@ export function parseModelRef(ref: string): ModelRef {
 export const formatModelRef = (r: ModelRef) => `${r.provider}/${r.model}`;
 
 export const REF_PATTERN = /^[a-z0-9][a-z0-9_-]*\/[\w.:@/-]+$/i;
-
-// The role a session's next turn runs as.
-export function sessionRole(session: {
-  role?: string | null;
-  task_status?: string | null;
-  plan_phase?: string | null;
-  started_by?: string | null;
-}): ModelRole {
-  if (session.role === "orchestrator") return "orchestrator";
-  // Work an orchestrator started is implementation, not a person's session.
-  if (!session.task_status)
-    return session.started_by ? "implement" : "interactive";
-  return session.plan_phase === "planning" || session.plan_phase === "awaiting"
-    ? "plan"
-    : "implement";
-}

package/lib/models/session-role.ts

@@ -0,0 +1,19 @@
+import { orchestratorOf } from "../tasks/starter";
+import type { ModelRole } from "./roles";
+
+// Server-only: it reads the database, so the client-safe roles module can't hold it.
+// The role a session's next turn runs as.
+export function sessionRole(session: {
+  role?: string | null;
+  task_status?: string | null;
+  plan_phase?: string | null;
+  started_by?: string | null;
+}): ModelRole {
+  if (session.role === "orchestrator") return "orchestrator";
+  // Work an orchestrator started is implementation, not a person's session.
+  if (!session.task_status)
+    return orchestratorOf(session.started_by) ? "implement" : "interactive";
+  return session.plan_phase === "planning" || session.plan_phase === "awaiting"
+    ? "plan"
+    : "implement";
+}