@saadnvd1/agent-os 0.3.775 → 0.3.778

package/lib/live/store.ts

@@ -0,0 +1,149 @@
+import { db } from "../db";
+
+export interface LiveShareRow {
+  id: string;
+  session_id: string;
+  title: string;
+  url: string;
+  ends_with_session: number;
+  max_guests: number;
+  created_at: string;
+  expires_at: string | null;
+  ended_at: string | null;
+}
+
+export type LogKind =
+  | "join_request"
+  | "admit"
+  | "deny"
+  | "kick"
+  | "suggestion"
+  | "sent"
+  | "dismissed";
+
+export interface LogRow {
+  id: number;
+  share_id: string;
+  at: number;
+  kind: LogKind;
+  guest_id: string | null;
+  guest_name: string | null;
+  ref: string | null;
+  text: string | null;
+  sent_text: string | null;
+}
+
+export function insertLiveShare(row: LiveShareRow): void {
+  db.prepare(
+    `INSERT INTO live_shares
+       (id, session_id, title, url, ends_with_session, max_guests, created_at, expires_at, ended_at)
+     VALUES (@id, @session_id, @title, @url, @ends_with_session, @max_guests, @created_at, @expires_at, @ended_at)`
+  ).run(row);
+}
+
+export function getLiveShare(id: string): LiveShareRow | undefined {
+  return db.prepare(`SELECT * FROM live_shares WHERE id = ?`).get(id) as
+    LiveShareRow | undefined;
+}
+
+/** Shares this machine still holds: not ended, not past their time. */
+export function activeLiveShares(now = Date.now()): LiveShareRow[] {
+  return (
+    db
+      .prepare(
+        `SELECT * FROM live_shares WHERE ended_at IS NULL ORDER BY created_at, rowid`
+      )
+      .all() as LiveShareRow[]
+  ).filter((s) => !s.expires_at || Date.parse(s.expires_at) > now);
+}
+
+export function activeLiveShareFor(
+  sessionId: string,
+  now = Date.now()
+): LiveShareRow | undefined {
+  return activeLiveShares(now).find((s) => s.session_id === sessionId);
+}
+
+export function markLiveEnded(id: string): void {
+  db.prepare(
+    `UPDATE live_shares SET ended_at = COALESCE(ended_at, ?) WHERE id = ?`
+  ).run(new Date().toISOString(), id);
+}
+
+export function logLive(
+  row: Omit<LogRow, "id" | "at"> & { at?: number }
+): void {
+  db.prepare(
+    `INSERT INTO live_share_log (share_id, at, kind, guest_id, guest_name, ref, text, sent_text)
+     VALUES (@share_id, @at, @kind, @guest_id, @guest_name, @ref, @text, @sent_text)`
+  ).run({ ...row, at: row.at ?? Date.now() });
+}
+
+export function listLog(shareId: string): LogRow[] {
+  return db
+    .prepare(`SELECT * FROM live_share_log WHERE share_id = ? ORDER BY id`)
+    .all(shareId) as LogRow[];
+}
+
+export interface OpenSuggestion {
+  id: string;
+  guestId: string;
+  guestName: string;
+  text: string;
+  at: number;
+}
+
+/** Suggestions with no sent or dismissed line yet, oldest first. */
+export function openSuggestions(shareId: string): OpenSuggestion[] {
+  const rows = db
+    .prepare(
+      `SELECT s.ref, s.guest_id, s.guest_name, s.text, s.at FROM live_share_log s
+       WHERE s.share_id = ? AND s.kind = 'suggestion' AND NOT EXISTS (
+         SELECT 1 FROM live_share_log d
+         WHERE d.share_id = s.share_id AND d.ref = s.ref AND d.kind IN ('sent', 'dismissed'))
+       ORDER BY s.id`
+    )
+    .all(shareId) as {
+    ref: string;
+    guest_id: string;
+    guest_name: string;
+    text: string;
+    at: number;
+  }[];
+  return rows.map((r) => ({
+    id: r.ref,
+    guestId: r.guest_id,
+    guestName: r.guest_name,
+    text: r.text,
+    at: r.at,
+  }));
+}
+
+/** Guests this machine admitted and has not removed since. */
+export function admittedGuestIds(shareId: string): Set<string> {
+  const out = new Set<string>();
+  for (const l of listLog(shareId)) {
+    if (!l.guest_id) continue;
+    if (l.kind === "admit") out.add(l.guest_id);
+    else if (l.kind === "kick" || l.kind === "deny") out.delete(l.guest_id);
+  }
+  return out;
+}
+
+/** Whether a suggestion with this id was ever logged for the share. */
+export function hasSuggestion(shareId: string, ref: string): boolean {
+  return !!db
+    .prepare(
+      `SELECT 1 FROM live_share_log WHERE share_id = ? AND kind = 'suggestion' AND ref = ? LIMIT 1`
+    )
+    .get(shareId, ref);
+}
+
+/** Whether a join request from this guest was already logged. */
+export function hasJoinRequest(shareId: string, guestId: string): boolean {
+  return !!db
+    .prepare(
+      `SELECT 1 FROM live_share_log WHERE share_id = ? AND kind = 'join_request' AND guest_id = ? LIMIT 1`
+    )
+    .get(shareId, guestId);
+}

package/lib/live/types.ts

@@ -0,0 +1,39 @@
+// What the host's screens show of a live share (served by /api/live-shares).
+export interface LiveView {
+  id: string;
+  sessionId: string;
+  title: string;
+  url: string;
+  expiresAt: string | null;
+  endsWithSession: boolean;
+  maxGuests: number;
+  connected: boolean;
+  notice: string | null;
+  guests: {
+    id: string;
+    name: string;
+    status: "pending" | "admitted";
+    online: boolean;
+    /** Another guest here has the same name. */
+    duplicateName: boolean;
+  }[];
+  suggestions: {
+    id: string;
+    guestId: string;
+    guestName: string;
+    text: string;
+    at: number;
+  }[];
+}
+
+export type LiveExpiry = "1h" | "session";
+
+export const EXPIRY_LABEL: Record<LiveExpiry, string> = {
+  "1h": "1 hour",
+  session: "Until the session ends",
+};
+
+export interface LiveResponse {
+  linked: boolean;
+  shares: LiveView[];
+}

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/share/connect.ts

@@ -6,8 +6,10 @@ import {
   clean,
   listShares,
   replaceShare,
+  createLiveShare,
   revokeShare,
   uploadShare,
+  type LiveExpiry,
   type RemoteShare,
   type ShareExpiry,
 } from "@/lib/connect/control-api";
@@ -40,6 +42,16 @@ function explain(err: unknown): never {
         `Connect refused it as too big or over your quota: ${clean(err.message, 120)}`,
         413
       );
+    if (err.status === 402)
+      throw new ShareError(
+        clean(
+          typeof err.body.error === "string"
+            ? err.body.error
+            : "Your plan's live share limit is reached.",
+          160
+        ),
+        402
+      );
     if (err.status === 429)
       throw new ShareError(
         "Too many shares just now. Try again in a few minutes.",
@@ -95,3 +107,15 @@ export async function revokeRemote(id: string): Promise<void> {
     explain(err);
   }
 }
+
+export async function createLiveRemote(share: {
+  title: string;
+  expiresIn: LiveExpiry;
+}) {
+  const { config, machineKey } = files();
+  try {
+    return await createLiveShare(config, machineKey, share);
+  } catch (err) {
+    explain(err);
+  }
+}

package/lib/share/redact.ts

@@ -18,6 +18,15 @@ import {
   BASE64_RUN,
   looksRandom,
 } from "@/lib/orchestrator/untrusted";
+import {
+  BASIC_AUTH,
+  CLI_FLAG,
+  DATA_URI,
+  KEY_VALUE,
+  MYSQL_P,
+  TOKEN_RUN,
+  isHighEntropyToken,
+} from "./secret-patterns";
 import { HOME } from "@/lib/session-audit/normalize";
 
 export type Kind = "secret" | "path" | "ip" | "host" | "email";
@@ -59,7 +68,8 @@ const SECRET = "[secret]";
 const BEARER = /(\bbearer\s+)(?!\[secret\])[A-Za-z0-9._~+/=-]{8,}/gi;
 const INLINE_ASSIGNMENT =
   /(\b[A-Z][A-Z0-9_]*(?:KEY|TOKEN|SECRET|PASSWORD|PASS|PWD|CREDENTIALS?|AUTH)[A-Z0-9_]*=)(?!\[secret\])[^\s'"]+/g;
-const LONG_HEX = /\b[a-fA-F0-9]{40,}\b/g;
+// Up to 64 hex characters is a git sha or a hash, not a key.
+const LONG_HEX = /\b[a-fA-F0-9]{65,}\b/g;
 
 const IPV4 =
   /(?<![\w.])(?:(?:25[0-5]|2[0-4]\d|1?\d?\d)\.){3}(?:25[0-5]|2[0-4]\d|1?\d?\d)(?![\w.]*\w)/g;
@@ -104,6 +114,10 @@ export function redactForShare(
   let t = input;
   const on = (k: Kind) => !opts.only || opts.only.includes(k);
 
+  // Inline base64 (images) is content, not a credential: set aside, put back.
+  const uris: string[] = [];
+  t = t.replace(DATA_URI, (m) => `\u0000${uris.push(m) - 1}\u0000`);
+
   // 1. Credentials by shape.
   t = sub(t, PRIVATE_KEY_BLOCK, SECRET, hits, "secret");
   t = sub(
@@ -132,9 +146,16 @@ export function redactForShare(
     "secret",
     (m) => m.endsWith(SECRET)
   );
+  const keepValue = (_m: string, k: string, v: string) =>
+    `${k}${/^["']/.test(v) ? v[0] + SECRET + v[0] : SECRET}`;
+  t = sub(t, KEY_VALUE, keepValue, hits, "secret");
+  t = sub(t, CLI_FLAG, keepValue, hits, "secret");
+  t = sub(t, MYSQL_P, (_m, k) => `${k}${SECRET}`, hits, "secret");
+  t = sub(t, BASIC_AUTH, (_m, k) => `${k}${SECRET}`, hits, "secret");
   for (const re of SECRET_TOKENS) t = sub(t, re, SECRET, hits, "secret");
   t = sub(t, LONG_HEX, SECRET, hits, "secret");
   t = sub(t, BASE64_RUN, SECRET, hits, "secret", (m) => !looksRandom(m));
+  t = sub(t, TOKEN_RUN, SECRET, hits, "secret", (m) => !isHighEntropyToken(m));
 
   // 2. This machine's own secrets, wherever they appear.
   for (const value of ctx.secrets) {
@@ -192,5 +213,6 @@ export function redactForShare(
   // 6. Email addresses.
   if (on("email")) t = sub(t, EMAIL, "[email]", hits, "email");
 
+  t = t.replace(/\u0000(\d+)\u0000/g, (_m, i) => uris[Number(i)]);
   return { text: t, hits };
 }

package/lib/share/secret-patterns.ts

@@ -0,0 +1,77 @@
+/**
+ * Generic credential shapes for redactForShare: key/value secrets in any
+ * syntax, Basic auth headers, mysql -p, and high-entropy tokens. Pure data
+ * and predicates; redact.ts applies them and counts the hits.
+ */
+
+const WORDS =
+  "password|passwd|pwd|secret|token|api[_-]?key|apikey|access[_-]?key|client[_-]?secret|auth|private[_-]?key";
+
+// A value that is a type, a placeholder or a call, not a credential.
+const NOT_A_VALUE =
+  "(?![\"']?\\[secret\\])" +
+  "(?!(?:string|number|boolean|any|unknown|null|undefined|true|false|none|void|required|optional)\\b)" +
+  "(?![$<{(\\[%]|\\.\\.\\.)(?![\\w.]+\\()";
+
+/**
+ * `password=x`, `"api_key": "x"`, `token: x`, `export DB_PASSWORD=x`,
+ * `--password=x`. The key may carry any prefix (GITHUB_TOKEN) but must end
+ * in the word, so `author` and `max_tokens` stay. Group 1 is kept.
+ */
+export const KEY_VALUE = new RegExp(
+  `((?<![\\w.-])[\\w.-]*(?:${WORDS})["']?[ \\t]*[:=][ \\t]*)` +
+    `${NOT_A_VALUE}("[^"\\n]*"|'[^'\\n]*'|[^\\s,;'"&}\\])]+)`,
+  "gi"
+);
+
+/** `--password value`, `--api-key value` (space separated). */
+export const CLI_FLAG = new RegExp(
+  `(--[\\w-]*?(?:${WORDS})[ \\t]+)(?!-)${NOT_A_VALUE}("[^"\\n]*"|'[^'\\n]*'|\\S+)`,
+  "gi"
+);
+
+/**
+ * mysql-family `-pSECRET` (attached: `-p secret` would be a database name).
+ * psql's -p is a port, so it is left alone.
+ */
+export const MYSQL_P =
+  /(\b(?:mysql|mysqldump|mysqladmin|mariadb)\b[^\n|;&]*?\s-p)(?=\S)(\S+)/gi;
+
+/** `Authorization: Basic <x>` (Bearer is handled in redact.ts). */
+export const BASIC_AUTH =
+  /(\bauthorization["']?\s*[:=]\s*["']?basic\s+)[A-Za-z0-9+/=._~-]{4,}/gi;
+
+/** A base64 data URI, such as an inline image. Kept as is: not a credential. */
+export const DATA_URI =
+  /data:[\w.+-]+\/[\w.+-]+(?:;[\w=.-]+)*;base64,[A-Za-z0-9+/=_-]+/g;
+
+/** Candidate runs for the entropy test. */
+export const TOKEN_RUN = /(?<![A-Za-z0-9_\-+/=])[A-Za-z0-9_\-+/=]{32,}/g;
+
+export const ENTROPY_MIN = 4.0;
+
+export function shannon(s: string): number {
+  const counts = new Map<string, number>();
+  for (const c of s) counts.set(c, (counts.get(c) ?? 0) + 1);
+  let h = 0;
+  for (const n of counts.values())
+    h -= (n / s.length) * Math.log2(n / s.length);
+  return h;
+}
+
+const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
+function looksLikePath(s: string): boolean {
+  if (/^(?:\.{0,2}\/|~\/)/.test(s)) return true;
+  const parts = s.split("/");
+  return parts.length > 2 && parts.every((p) => p.length >= 2);
+}
+
+/** True when a run is a random-looking token rather than prose, a hash or a path. */
+export function isHighEntropyToken(s: string): boolean {
+  if (/^[0-9a-f]+$/i.test(s) && s.length <= 64) return false; // git sha, md5/sha256
+  if (UUID.test(s)) return false;
+  if (looksLikePath(s)) return false;
+  if (!/[a-z]/.test(s) || !/[A-Z]/.test(s) || !/[0-9]/.test(s)) return false;
+  return shannon(s) > ENTROPY_MIN;
+}

package/lib/sidebar/row-menu.ts

@@ -17,6 +17,7 @@ export type RowMenuItem =
   | "copy-link"
   | "share"
   | "export"
+  | "invite-live"
   | "fork"
   | "fresh-start"
   | "new-conversation"
@@ -127,6 +128,7 @@ export function rowMenu(input: RowMenuInput): RowMenuPlan {
     ...group("share", [
       "copy-link",
       s.view === "chat" && "share",
+      s.view === "chat" && "invite-live",
       s.view === "chat" && "export",
     ]),
     ...group("restart", [

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.775",
+  "version": "0.3.778",
   "description": "Self-hosted web UI for managing Claude Code sessions",
   "bin": {
     "agent-os": "scripts/agent-os"

package/server.ts

@@ -54,6 +54,7 @@ import {
 import { lanEnabled } from "./lib/security/network-settings";
 import { handlePeerRpc, isPeerRpc, rpcDeps } from "./lib/peer/rpc-server";
 import { startConnect } from "./lib/connect/serve";
+import { startLive } from "./lib/live/service";
 import { serverPort } from "./lib/connect/config";
 import { startUpdateChecks, updateChecksEnabled } from "./lib/updates/check";
 import {
@@ -399,6 +400,7 @@ app.prepare().then(async () => {
     ? { hostname: () => null }
     : startConnect({ onRequest, onUpgrade }, port);
   policy.machineHost = () => connect.hostname();
+  if (!demo) startLive();
   // HTTPS on the tailnet (its own port) for passkeys and other secure-origin APIs.
   if (
     !demo &&

package/stores/liveUi.ts

@@ -0,0 +1,17 @@
+import { proxy } from "valtio";
+
+// The invite dialog: which chat it is open on, started from a menu.
+export const liveUi = proxy<{
+  target: { sessionId: string; title: string } | null;
+}>({
+  target: null,
+});
+
+export const liveUiActions = {
+  open: (sessionId: string, title: string) => {
+    liveUi.target = { sessionId, title };
+  },
+  close: () => {
+    liveUi.target = null;
+  },
+};