@saadnvd1/agent-os 0.3.777 → 0.3.778

package/lib/orchestrator/describe.ts

@@ -64,15 +64,35 @@ function sessionLine(f: SessionFacts): string {
   return parts.join(" | ");
 }
 
-// The sessions tool's answer: one line per session, busiest news first.
+const compactLine = (f: SessionFacts) =>
+  `${f.name} (${f.project ?? "no project"}, id ${shortId(f.id)})`;
+
+// Nothing to say about it beyond that it is idle.
+const plainIdle = (f: SessionFacts) =>
+  f.status === "idle" &&
+  !f.activity &&
+  !f.task &&
+  !f.plan &&
+  !f.group &&
+  !f.stack &&
+  !f.compacting &&
+  !f.waits?.on.length &&
+  !f.waits?.by.length;
+
+// The sessions tool's answer: one line per live session, busiest news first;
+// then the done and plain idle ones, compactly, so a done can be seen to have
+// worked.
 export function describeSessions(
   workspace: string,
   facts: SessionFacts[],
   groups: readonly string[] = []
 ): string {
   if (!facts.length) return `No sessions are running in ${workspace}.`;
+  const done = facts.filter((f) => f.done && f.status !== "running");
+  const idle = facts.filter((f) => !f.done && plainIdle(f));
+  const shown = facts.filter((f) => !done.includes(f) && !idle.includes(f));
   const rank = { waiting: 0, running: 1, idle: 2, dead: 3 };
-  const sorted = [...facts].sort((a, b) => rank[a.status] - rank[b.status]);
+  const sorted = [...shown].sort((a, b) => rank[a.status] - rank[b.status]);
   const counts = (["running", "waiting"] as const)
     .map((s) => {
       const n = facts.filter((f) => f.status === s).length;
@@ -84,6 +104,10 @@ export function describeSessions(
   return [
     `${facts.length} ${noun} in ${workspace}${summary}:`,
     ...sorted.map(sessionLine),
+    ...(idle.length ? [`Idle: ${idle.map(compactLine).join("; ")}.`] : []),
+    ...(done.length
+      ? [`Done (on Saad's Done shelf): ${done.map(compactLine).join("; ")}.`]
+      : []),
     ...(groups.length
       ? [`Saad's groups here: ${groups.map((g) => `"${g}"`).join(", ")}.`]
       : []),

package/lib/orchestrator/facts.ts

@@ -27,6 +27,7 @@ import { commitTime, repoOf } from "./repo";
 import { CHECKLESS_MS, checklessFor, ciSettleIn } from "./task-state";
 import { repoHasCI } from "./repo-ci";
 import { markStatusDirty } from "../status/dirty";
+import { settledHow } from "../sidebar/shelves";
 
 export type FactStatus = "running" | "waiting" | "idle" | "dead";
 
@@ -46,6 +47,8 @@ export interface SessionFacts {
   compacting?: boolean;
   // Saad's group it sits in, when it is in one.
   group?: string | null;
+  // On Saad's Done shelf: marked done (or quiet for days) and not woken since.
+  done?: boolean;
   // Last sign of life, in ms.
   lastActive: number;
   // Open waits (aos send --await, aos wait): who it waits on, and who waits on it.
@@ -346,6 +349,7 @@ export async function sessionFacts(
         compacting:
           s.view === "chat" && !hostLink(s.host_id) && !!chatCompacting(s.id),
         group: groups.get(s.session_group_id ?? "") ?? null,
+        done: settledHow(s, Date.now()) !== null,
         lastActive: await lastActiveFor(s),
         branch: s.branch_name,
         quick: !!s.quick_of,

package/lib/orchestrator/tools.ts

@@ -116,7 +116,7 @@ const answer = async (call: Promise<string>): Promise<CallToolResult> => {
 
 const DESCRIPTIONS: Record<ToolName, string> = {
   sessions:
-    "Every session in this workspace: project, view, status, what it's doing, task/PR/CI state and stack position; then external sessions (tmux sessions AgentOS didn't start, here or on other machines, working in a workspace repository), read-only, with their branch's PR.",
+    "Every session in this workspace: project, view, status, what it's doing, task/PR/CI state and stack position; plain idle and done sessions (on Saad's Done shelf) are listed compactly after them; then external sessions (tmux sessions AgentOS didn't start, here or on other machines, working in a workspace repository), read-only, with their branch's PR.",
   read: "The end of one session's terminal or chat, or an external session's screen, as plain text (capped at about 4k tokens).",
   cards: "Cards on this workspace's linked LumifyHub boards, by list.",
   logs: "Session logs AgentOS wrote when tasks merged: the last N headers (task, PR, cost, duration) of the workspace or one project, or one log in full (brief, plan, timeline, usage, outcome). Read straight from the database; nothing is summarised.",

package/lib/program-status/store.ts

@@ -85,7 +85,8 @@ function commit(sessionName: string, next: Records): boolean {
   if (same(before, after)) return false;
   if (after && after.state !== "idle" && after.state !== before?.state)
     db.prepare(
-      `UPDATE sessions SET updated_at = datetime('now'), active_at = datetime('now') WHERE tmux_name = ? OR id = ?`
+      `UPDATE sessions SET updated_at = datetime('now'), active_at = datetime('now') WHERE (tmux_name = ? OR id = ?)
+         AND (settled_at IS NULL OR active_at > settled_at)`
     ).run(sessionName, getSessionIdFromName(sessionName));
   return true;
 }

package/lib/session-activity.ts

@@ -1,7 +1,9 @@
 import { getDb } from "./db";
 
 // A session did something: a message, a run starting, a need. Written at most
-// once a minute, unless it wakes a snooze or brings a settled session back.
+// once a minute, unless it wakes a snooze. Never for a settled session: what
+// comes after Done (the stop's own events, a status refresh) isn't the work
+// starting again. Only a prompt does that (the chat worker writes it).
 export function touchActive(sessionId: string): void {
   try {
     getDb()
@@ -9,8 +11,8 @@ export function touchActive(sessionId: string): void {
         `UPDATE sessions SET active_at = datetime('now')
          WHERE id = ? AND (active_at IS NULL
            OR active_at < datetime('now', '-60 seconds')
-           OR (snoozed_at IS NOT NULL AND active_at <= snoozed_at)
-           OR (settled_at IS NOT NULL AND active_at <= settled_at))`
+           OR (snoozed_at IS NOT NULL AND active_at <= snoozed_at))
+           AND (settled_at IS NULL OR active_at > settled_at)`
       )
       .run(sessionId);
   } catch (err) {

package/lib/sidebar/shelves.ts

@@ -220,7 +220,10 @@ export function settledHow(
   now: number
 ): "manual" | "auto" | null {
   const active = activeMs(session, now);
-  if (session.settled_at && active <= ms(session.settled_at)) return "manual";
+  // A settled session's own row is the clock: updated_at moves with
+  // bookkeeping, so it never takes a done session off the shelf.
+  const own = session.peer_mirror || session.active_at ? active : 0;
+  if (session.settled_at && own <= ms(session.settled_at)) return "manual";
   return now - active >= SETTLE_AFTER_MS ? "auto" : null;
 }
 

package/lib/status/collect.ts

@@ -421,7 +421,8 @@ async function collect(full = false): Promise<StatusSnapshot> {
 
   // Batch update sessions and claude_session_id in a single transaction
   const updateStatusStmt = db.prepare(
-    "UPDATE sessions SET updated_at = datetime('now'), active_at = datetime('now') WHERE id = ?"
+    `UPDATE sessions SET updated_at = datetime('now'), active_at = datetime('now')
+     WHERE id = ? AND (settled_at IS NULL OR active_at > settled_at)`
   );
   const updateClaudeIdStmt = db.prepare(
     "UPDATE sessions SET claude_session_id = ? WHERE id = ? AND (claude_session_id IS NULL OR claude_session_id != ?)"

package/package.json

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