@saadnvd1/agent-os 0.3.631 → 0.3.639

package/lib/tasks/schedule.ts

@@ -13,59 +13,33 @@ import {
   PRIORITY_LABEL,
   type Priority,
   type QueueExplainView,
-  type WaitCode,
 } from "./schedule-types";
+import {
+  PRIORITY_POINTS,
+  holdsFor,
+  type Hold,
+  type MachineView,
+} from "./holds";
 
 export { PRIORITIES, DEFAULT_PRIORITY } from "./schedule-types";
 export type { Priority, WaitCode } from "./schedule-types";
+export {
+  AMBER_MIN_PRIORITY,
+  HEAVY_START_GAP_MS,
+  LOAD_SETTLE_MS,
+  PRIORITY_POINTS,
+  START_GAP_MS,
+  machineHold,
+  slotText,
+  type Hold,
+  type MachineLevel,
+  type MachineView,
+} from "./holds";
 
-export const PRIORITY_POINTS: Record<Priority, number> = {
-  urgent: 400,
-  blocking: 300,
-  normal: 200,
-  background: 100,
-};
 export const AGE_POINTS_PER_MIN = 0.5;
 // Reached after five hours of waiting.
 export const AGE_CAP = 150;
 export const RESUME_BONUS = 150;
-// Out of red this long before automatic starts resume.
-export const LOAD_SETTLE_MS = 120_000;
-// On amber, only this priority and above start.
-export const AMBER_MIN_PRIORITY: Priority = "blocking";
-// Between automatic starts on one machine.
-export const START_GAP_MS = 60_000;
-// Between starts of tasks that boot a simulator.
-export const HEAVY_START_GAP_MS = 5 * 60_000;
-
-export type MachineLevel = "green" | "amber" | "red";
-
-// What the machine a candidate would start on looks like right now.
-export interface MachineView {
-  // Shown in hold texts, e.g. "this machine".
-  label: string;
-  // False: no load holds at all (AGENTOS_LOAD=off).
-  enabled: boolean;
-  // No sample read yet since AgentOS started.
-  reading: boolean;
-  level: MachineLevel;
-  // Not red, and calm for LOAD_SETTLE_MS since it last was.
-  settled: boolean;
-  // Seconds of calm still needed, when not settled and not red.
-  settleLeftMs: number;
-  booted: number;
-  maxBooted: number;
-  // Heavy tasks started within HEAVY_START_GAP_MS that hold no lease yet.
-  heavyStarting: number;
-  lastAutoStartAt: number | null;
-  lastHeavyStartAt: number | null;
-}
-
-export interface Hold {
-  code: WaitCode;
-  text: string;
-}
-
 export interface Candidate {
   id: string;
   kind: "start" | "resume";
@@ -88,7 +62,7 @@ export interface Candidate {
   // `after X` hold, from the caller (it needs the database).
   before: Hold | null;
   // Orchestrator Pause and the usage window, which hold after `after`.
-  auto: Hold | null;
+  auto: Hold | readonly Hold[] | null;
   // "After any": its set, the ones that have finished, the ones other waiters
   // already used, and whether it was already released (a retry).
   any: {
@@ -110,6 +84,8 @@ export interface Plan {
   // The finish an "after any" waiter takes, by candidate id (null: none left).
   consume: Map<string, string | null>;
   explain: Map<string, QueueExplainView>;
+  // Every hold on each candidate, in order (empty: it starts).
+  holds: Map<string, Hold[]>;
 }
 
 export function scoreParts(
@@ -124,75 +100,6 @@ export function scoreParts(
   return { priority, age, resume, score: priority + age + resume };
 }
 
-const priorityRank = (p: Priority) => PRIORITY_POINTS[p] ?? 0;
-
-const seconds = (ms: number) => Math.max(1, Math.ceil(ms / 1000));
-
-// The machine holds, in order. Null: it may start here now.
-export function machineHold(
-  c: Pick<Candidate, "heavy" | "needsUnmet" | "remote" | "priority"> &
-    Partial<Pick<Candidate, "planOnly">>,
-  m: MachineView,
-  now: number
-): Hold | null {
-  if (c.remote || c.planOnly) return null;
-  if (c.needsUnmet) return { code: "needs", text: `Waiting: needs a Mac` };
-  if (!m.enabled) return null;
-  if (m.reading)
-    return { code: "load_red", text: "Waiting: reading machine load" };
-  if (m.level === "red")
-    return { code: "load_red", text: `Waiting: ${m.label} load red` };
-  if (!m.settled)
-    return {
-      code: "load_red",
-      text: `Waiting: ${m.label} load was red; calm for ${seconds(m.settleLeftMs)}s more`,
-    };
-  if (
-    m.level === "amber" &&
-    priorityRank(c.priority) < priorityRank(AMBER_MIN_PRIORITY)
-  )
-    return {
-      code: "load_amber",
-      text: `Waiting: ${m.label} load amber; ${c.priority} work starts on green`,
-    };
-  if (c.heavy) {
-    if (m.level !== "green")
-      return {
-        code: "heavy",
-        text: `Waiting: ${m.label} load amber; simulator work starts on green`,
-      };
-    if (m.heavyStarting > 0)
-      return {
-        code: "heavy",
-        text: `Waiting: a simulator is booting on ${m.label}`,
-      };
-    if (m.booted >= m.maxBooted)
-      return {
-        code: "heavy",
-        text: `Waiting: ${m.booted} of ${m.maxBooted} simulators in use`,
-      };
-    if (
-      m.lastHeavyStartAt !== null &&
-      now - m.lastHeavyStartAt < HEAVY_START_GAP_MS
-    )
-      return {
-        code: "heavy",
-        text: `Waiting: a simulator task just started on ${m.label} (next in ${seconds(HEAVY_START_GAP_MS - (now - m.lastHeavyStartAt))}s)`,
-      };
-  }
-  if (m.lastAutoStartAt !== null && now - m.lastAutoStartAt < START_GAP_MS)
-    return {
-      code: "spacing",
-      text: `Waiting: spacing starts (next in ${seconds(START_GAP_MS - (now - m.lastAutoStartAt))}s)`,
-    };
-  return null;
-}
-
-export function slotText(rank: number, of: number, priority: Priority): string {
-  const word = priority === DEFAULT_PRIORITY ? "" : ` · ${priority}`;
-  return `#${rank} of ${of}${word}`;
-}
-
 export function priorityWord(priority: Priority): string {
   return PRIORITY_LABEL[priority];
 }
@@ -204,7 +111,12 @@ export function planStarts(
   machine: MachineView,
   now: number
 ): Plan {
-  const plan: Plan = { start: [], consume: new Map(), explain: new Map() };
+  const plan: Plan = {
+    start: [],
+    consume: new Map(),
+    explain: new Map(),
+    holds: new Map(),
+  };
   const m: MachineView = { ...machine };
   const byGroup = new Map<string, Candidate[]>();
   for (const c of candidates)
@@ -218,26 +130,27 @@ export function planStarts(
     const scored = list
       .map((c) => ({ c, ...scoreParts(c, now) }))
       .sort((a, b) => b.score - a.score || a.c.position - b.c.position);
-    scored.forEach(({ c, score, priority: _p }, index) => {
-      const rank = index + 1;
-      const hold = holdOf(c);
-      const view = (h: Hold | null): QueueExplainView => ({
-        code: h?.code ?? null,
-        text: h?.text ?? null,
+    scored.forEach(({ c, score }, index) => {
+      const holds = holdsFor(c, {
+        machine: m,
+        now,
+        used,
+        inFlight,
+        limit: group.limit,
+        rank: index + 1,
+        of: scored.length,
+      });
+      const hold = holds[0] ?? null;
+      plan.holds.set(c.id, holds);
+      plan.explain.set(c.id, {
+        code: hold?.code ?? null,
+        text: hold?.text ?? null,
         score: Math.round(score * 10) / 10,
-        rank,
+        rank: index + 1,
         of: scored.length,
         priority: c.priority,
       });
-      if (hold) return void plan.explain.set(c.id, view(hold));
-      if (!c.planOnly && inFlight >= group.limit)
-        return void plan.explain.set(
-          c.id,
-          view({
-            code: "slot",
-            text: slotText(rank, scored.length, c.priority),
-          })
-        );
+      if (hold) return;
       // Passed every hold: it starts.
       if (c.any && !c.any.released) {
         const free = c.any.finished.find((id) => !used.has(id)) ?? null;
@@ -253,23 +166,7 @@ export function planStarts(
         }
       }
       plan.start.push(c.id);
-      plan.explain.set(c.id, view(null));
     });
   }
   return plan;
-
-  function holdOf(c: Candidate): Hold | null {
-    if (c.before) return c.before;
-    if (c.any && !c.any.released) {
-      const free = c.any.finished.some((id) => !used.has(id));
-      const spent =
-        c.any.ids.length > 0 && c.any.finished.length === c.any.ids.length;
-      if (!free && !spent)
-        return {
-          code: "after_any",
-          text: `Waiting: after any running task (${c.any.label})`,
-        };
-    }
-    return c.auto ?? machineHold(c, m, now);
-  }
 }

package/lib/tasks/session.ts

@@ -26,6 +26,7 @@ import {
 import { notifyStatusChanged } from "../status/hub";
 import type { TaskPR } from "./state";
 import { markStatusDirty } from "../status/dirty";
+import { setPr } from "../db/session-parts";
 
 export const expandHome = (p: string) => p.replace(/^~/, os.homedir());
 
@@ -33,7 +34,7 @@ export const expandHome = (p: string) => p.replace(/^~/, os.homedir());
 export function taskSessions(includeArchived = true): Session[] {
   return db
     .prepare(
-      `SELECT ${sessionListColumns(db)} FROM sessions
+      `SELECT ${sessionListColumns(db)} FROM session_rows
          WHERE task_status IS NOT NULL AND task_status != 'moved'
            ${includeArchived ? "" : "AND archived_at IS NULL"}
          ORDER BY created_at DESC`
@@ -205,9 +206,11 @@ export async function prFor(
     if (pr) pushPrChange(session, pr);
   }
   if (pr) {
-    db.prepare(
-      `UPDATE sessions SET pr_url = ?, pr_number = ?, pr_status = ? WHERE id = ?`
-    ).run(pr.url, pr.number, pr.state.toLowerCase(), session.id);
+    setPr(db, session.id, {
+      pr_url: pr.url,
+      pr_number: pr.number,
+      pr_status: pr.state.toLowerCase() as "open" | "merged" | "closed",
+    });
     // Merged on GitHub rather than through AgentOS: its log is due too.
     if (pr.state === "MERGED") {
       if (session.pr_status !== "merged") pushMerged(session.id);

package/lib/tasks/start.ts

@@ -107,7 +107,7 @@ export async function finishTaskStart(
   earlier?: TaskSetup
 ): Promise<TaskSetup> {
   const session = db
-    .prepare(`SELECT * FROM sessions WHERE id = ?`)
+    .prepare(`SELECT * FROM session_rows WHERE id = ?`)
     .get(sessionId) as Session | undefined;
   if (!session?.worktree_path) throw new Error(`No task ${sessionId}`);
   const project = session.project_id ? getProject(session.project_id) : null;
@@ -133,7 +133,7 @@ export async function finishTaskStart(
   // The setup's own error is kept, for the agent's prompt when it launches.
   if (held) return done({ ...setup, status: "held" });
   const now = db
-    .prepare(`SELECT task_status, archived_at FROM sessions WHERE id = ?`)
+    .prepare(`SELECT task_status, archived_at FROM session_rows WHERE id = ?`)
     .get(sessionId) as
     | { task_status: string | null; archived_at: string | null }
     | undefined;
@@ -226,7 +226,7 @@ export async function resumeTaskStarts(
 ): Promise<string[]> {
   const rows = db
     .prepare(
-      `SELECT id, tmux_name, view, setup_ms, setup_error FROM sessions
+      `SELECT id, tmux_name, view, setup_ms, setup_error FROM session_rows
        WHERE setup_status = 'running' AND task_status = 'running'
          AND archived_at IS NULL`
     )
@@ -269,7 +269,7 @@ export async function resumeTaskStarts(
 export function resumeHeldStarts(): string[] {
   const rows = db
     .prepare(
-      `SELECT id, setup_ms, setup_error FROM sessions WHERE setup_status = 'held'
+      `SELECT id, setup_ms, setup_error FROM session_rows WHERE setup_status = 'held'
          AND task_status = 'running' AND archived_at IS NULL`
     )
     .all() as ({ id: string } & SetupColumns)[];

package/lib/tasks/starter.ts

@@ -4,6 +4,7 @@
 
 import path from "path";
 import { db } from "../db";
+import { setPlacement } from "../db/session-parts";
 
 export type StartVia =
   | "session"
@@ -59,7 +60,7 @@ export function callerSession(input: {
   const cwd = path.resolve(input.cwd);
   const rows = db
     .prepare(
-      `SELECT id, role, worktree_path FROM sessions
+      `SELECT id, role, worktree_path FROM session_rows
        WHERE worktree_path IS NOT NULL AND archived_at IS NULL
          AND task_status IS NOT NULL
          AND (host_id IS NULL OR host_id = 'local')`
@@ -111,14 +112,10 @@ export function orchestratorOf(startedBy: string | null | undefined) {
 }
 
 export function recordStart(id: string, s: Starter): void {
-  db.prepare(
-    `UPDATE sessions SET started_by = ?, parent_session_id = (SELECT id FROM sessions WHERE id = ?), started_via = ?,
-       started_by_device = COALESCE(?, started_by_device) WHERE id = ?`
-  ).run(
-    s.startedBy,
-    s.parentSessionId,
-    s.startedVia,
-    s.startedByDevice ?? null,
-    id
-  );
+  db.transaction(() => {
+    db.prepare(
+      `UPDATE sessions SET started_by = ?, parent_session_id = (SELECT id FROM sessions WHERE id = ?), started_via = ? WHERE id = ?`
+    ).run(s.startedBy, s.parentSessionId, s.startedVia, id);
+    setPlacement(db, id, { started_by_device: s.startedByDevice ?? undefined });
+  })();
 }

package/lib/usage/calls.ts

@@ -97,7 +97,7 @@ export function sessionContext(sessionId: string): SessionContext {
   const s = db
     .prepare(
       `SELECT name, workspace_id, project_id, model_provider, role, task_status,
-         plan_phase, started_by FROM sessions WHERE id = ?`
+         plan_phase, started_by FROM session_rows WHERE id = ?`
     )
     .get(sessionId) as
     | {

package/lib/usage/compare.ts

@@ -225,7 +225,7 @@ export function taskOutcomes(ids: string[]): Map<string, TaskOutcome> {
   const marks = ids.map(() => "?").join(",");
   const tasks = db
     .prepare(
-      `SELECT id, task_status, plan_decided FROM sessions
+      `SELECT id, task_status, plan_decided FROM session_rows
        WHERE id IN (${marks}) AND task_status IS NOT NULL`
     )
     .all(...ids) as {

package/lib/usage/quality.ts

@@ -82,7 +82,7 @@ export function mergedTasks(from: number, to: number): MergedTask[] {
     db
       .prepare(
         `SELECT id, project_id AS projectId, pr_number AS prNumber, merged_at AS mergedAt
-         FROM sessions WHERE task_status = 'merged' AND merged_at >= ? AND merged_at < ?`
+         FROM session_rows WHERE task_status = 'merged' AND merged_at >= ? AND merged_at < ?`
       )
       .all(sqlTime(from), sqlTime(to)) as MergedTask[]
   ).filter((t) => t.mergedAt);

package/lib/usage/turns.ts

@@ -61,7 +61,7 @@ export function recordTurn(
     const current = db
       .prepare(
         `SELECT name, workspace_id, model, model_provider, role, task_status,
-           plan_phase, started_by FROM sessions WHERE id = ?`
+           plan_phase, started_by FROM session_rows WHERE id = ?`
       )
       .get(session.id) as
       | Pick<

package/lib/voice/vocab.ts

@@ -44,7 +44,7 @@ export function vocabFor(workspaceId: string): string[] {
     workspaceId
   );
   const sessions = names(
-    `SELECT s.name FROM sessions s
+    `SELECT s.name FROM session_rows s
      JOIN projects p ON p.id = s.project_id
      WHERE p.workspace_id = ?
        AND (s.task_status IS NULL OR s.task_status NOT IN ('merged','dropped','done','moved'))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saadnvd1/agent-os",
-  "version": "0.3.631",
+  "version": "0.3.639",
   "description": "Self-hosted web UI for managing Claude Code sessions",
   "bin": {
     "agent-os": "scripts/agent-os"

package/scripts/backfill-session-logs.ts

@@ -47,7 +47,7 @@ async function main() {
   const { commitLogs } = await import("../lib/session-logs/hq");
   const rows = db
     .prepare(
-      `SELECT id, name FROM sessions
+      `SELECT id, name FROM session_rows
        WHERE task_prompt IS NOT NULL AND peer_mirror = 0
          AND (task_status = 'merged' OR (pr_status = 'merged' AND task_status != 'dropped'))
        ORDER BY COALESCE(merged_at, updated_at)`

package/scripts/check

@@ -2,18 +2,66 @@
 # The full guard, the same run locally and in CI:
 #   scripts/check            banned terms, typecheck, lint, format, tests
 #   scripts/check --build    ...and a production build, held to its JS budget
+# CI runs the same groups as parallel jobs:
+#   --only static,test,build   run just these groups (static = migrations,
+#                              terms, typecheck, lint, format)
+#   --parallel                 run typecheck, lint and format at once
+#   -- <args>                  passed to `vitest run` (e.g. --shard=1/3)
 set -euo pipefail
 cd "$(dirname "$0")/.."
 
+usage() { sed -n '2,10p' "$0" | sed 's/^# \{0,1\}//' >&2; exit 2; }
+
+groups="static,test" parallel=0 vitest_args=()
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --build) groups="$groups,build" ;;
+    --only) [ $# -ge 2 ] || usage; groups="$2"; shift ;;
+    --parallel) parallel=1 ;;
+    --) shift; vitest_args=("$@"); break ;;
+    *) usage ;;
+  esac
+  shift
+done
+for g in ${groups//,/ }; do
+  case "$g" in static|test|build) ;; *) usage ;; esac
+done
+has() { [[ ",$groups," == *",$1,"* ]]; }
+
 step() { printf '\n▸ %s\n' "$1"; }
 
-step "migrations"; node scripts/gen-migrations-index.mjs && node scripts/gen-migrations-index.mjs --check
-step "terms";     npx tsx scripts/hooks/banned-terms.ts --tree
-step "typecheck"; npx tsc --noEmit
-step "lint";      npx eslint . --max-warnings=40
-step "format";    npx prettier --check . --log-level warn
-step "test";      npx vitest run
-if [ "${1:-}" = "--build" ]; then
+if has static; then
+  step "migrations"; node scripts/gen-migrations-index.mjs && node scripts/gen-migrations-index.mjs --check
+  step "terms";     npx tsx scripts/hooks/banned-terms.ts --tree
+  if [ "$parallel" = 1 ]; then
+    out=$(mktemp -d); trap 'rm -rf "$out"' EXIT
+    pids=()
+    npx tsc --noEmit >"$out/typecheck" 2>&1 & pids+=($!)
+    npx eslint . --max-warnings=40 --concurrency=auto >"$out/lint" 2>&1 & pids+=($!)
+    npx prettier --check . --log-level warn >"$out/format" 2>&1 & pids+=($!)
+    failed=()
+    names=(typecheck lint format)
+    for i in 0 1 2; do
+      wait "${pids[$i]}" || failed+=("${names[$i]}")
+      step "${names[$i]}"; cat "$out/${names[$i]}"
+    done
+    if [ ${#failed[@]} -gt 0 ]; then
+      printf '\n✗ failed: %s\n' "${failed[*]}" >&2
+      exit 1
+    fi
+  else
+    step "typecheck"; npx tsc --noEmit
+    step "lint";      npx eslint . --max-warnings=40 --concurrency=auto
+    step "format";    npx prettier --check . --log-level warn
+  fi
+fi
+if has test; then
+  step "test";      npx vitest run ${vitest_args[@]+"${vitest_args[@]}"}
+fi
+if has build; then
+  # The build imports the generated migrations index, so it needs it even
+  # when the static group (which checks it) did not run.
+  step "migrations"; node scripts/gen-migrations-index.mjs
   step "build";   npx next build
   step "bundle";  node scripts/check-bundle.mjs
 fi

package/lib/tasks/auto-hold.ts

@@ -1,17 +0,0 @@
-import { brakesEnabled } from "../orchestrator/brakes";
-import { isPaused } from "../orchestrator/pause";
-import { readUsage, windowRefusal } from "../orchestrator/usage";
-import type { Hold } from "./schedule";
-
-// Why an automatic start has to wait, or null. A start now by a person
-// isn't held.
-export function autoHold(
-  workspaceId: string | null,
-  planOnly = false
-): Hold | null {
-  if (workspaceId && isPaused(workspaceId))
-    return { code: "orch_paused", text: "Waiting: the orchestrator is paused" };
-  if (planOnly) return null;
-  const window = brakesEnabled() ? windowRefusal(readUsage()) : null;
-  return window ? { code: "window", text: `Waiting: ${window}` } : null;
-}

package/lib/tasks/held-routes.ts

@@ -1,33 +0,0 @@
-/**
- * The routes only the device that moved a task here may call on it
- * (held.ts): message, stop, done and read. Each is refused for any other
- * device, and for a task that isn't held.
- */
-
-import { NextRequest, NextResponse } from "next/server";
-import { db, type Session } from "../db";
-import { callingDevice } from "../security/device-me";
-import { holderRefusal } from "./held";
-
-type Ctx = { params: Promise<{ id: string }> };
-
-export async function heldRoute(
-  request: NextRequest,
-  { params }: Ctx,
-  run: (task: Session) => Promise<object>
-): Promise<NextResponse> {
-  const id = (await params).id;
-  const task = db.prepare(`SELECT * FROM sessions WHERE id = ?`).get(id) as
-    | Session
-    | undefined;
-  if (!task?.held_by_device)
-    return NextResponse.json({ error: "No such held task" }, { status: 404 });
-  const refusal = holderRefusal(task, callingDevice(request));
-  if (refusal) return NextResponse.json({ error: refusal }, { status: 403 });
-  try {
-    return NextResponse.json(await run(task));
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    return NextResponse.json({ error: message }, { status: 409 });
-  }
-}