@saadnvd1/agent-os 0.3.738 → 0.3.742

package/lib/chat/runner-watch.ts

@@ -0,0 +1,68 @@
+import type { ChatContext, ChatItem } from "./events";
+import { getSession, registry, type Listener } from "./registry";
+import { releaseUnwatchedSoon, sendCapabilities } from "./settings";
+import { recentTasks, settle } from "./store";
+import { readPage, toolBody, type ItemPage } from "./page";
+import { listQueue } from "./queued";
+import { runningWorkers } from "./worker/client";
+
+function savedContext(sessionId: string): ChatContext | null {
+  const raw = getSession(sessionId).chat_context;
+  if (!raw) return null;
+  try {
+    return JSON.parse(raw) as ChatContext;
+  } catch {
+    return null;
+  }
+}
+
+// What a watcher is sent of stored items: the live text of what's still
+// streaming, or with no conversation running, nothing left running.
+function present(sessionId: string, items: ChatItem[]): ChatItem[] {
+  const live = registry.live.get(sessionId);
+  if (live) return items.map((i) => live.streaming.get(i.id) ?? i);
+  return runningWorkers().includes(sessionId) ? items : settle(items);
+}
+
+// Snapshot then live updates. Returns the unsubscribe function. Every
+// client gets the latest page and asks for older ones.
+export function watchChat(sessionId: string, listener: Listener): () => void {
+  const live = registry.live.get(sessionId);
+  const page = readPage(sessionId);
+  const onPage = new Set(page.items.map((i) => i.id));
+  // The composer lists background work still going or just done, even when
+  // it started before the page.
+  const recent = Date.now() - 60 * 60 * 1000;
+  const tasks = recentTasks(sessionId, recent).filter((t) => !onPage.has(t.id));
+  listener({
+    type: "snapshot",
+    items: present(sessionId, page.items),
+    cursor: page.cursor,
+    hasMore: page.hasMore,
+    tasks: present(sessionId, tasks),
+    state: live?.state ?? "idle",
+    compacting: live?.compacting ?? null,
+    modelWait: live?.modelWait ?? null,
+    queue: listQueue(sessionId),
+    suggestion: getSession(sessionId).chat_suggestion ?? null,
+  });
+  listener({ type: "context", context: savedContext(sessionId) });
+  sendCapabilities(sessionId, listener).catch((error) =>
+    console.error(`[chat ${sessionId}] capabilities not sent:`, error)
+  );
+  let set = registry.listeners.get(sessionId);
+  if (!set) registry.listeners.set(sessionId, (set = new Set()));
+  set.add(listener);
+  return () => {
+    set?.delete(listener);
+    releaseUnwatchedSoon();
+  };
+}
+
+// The page before `before`, as the reader scrolls up.
+export function chatHistory(sessionId: string, before: number): ItemPage {
+  const page = readPage(sessionId, before);
+  return { ...page, items: present(sessionId, page.items) };
+}
+
+export const chatToolBody = toolBody;

package/lib/chat/runner.ts

@@ -16,9 +16,9 @@ import { randomUUID } from "crypto";
 import os from "os";
 import { db, type Session } from "../db";
 import type { CompactFirst } from "./stale";
+import { trackModelWait } from "./model-wait-live";
 import type {
   ApprovalDecision,
-  ChatContext,
   ChatFile,
   ChatImage,
   ChatServerMessage,
@@ -34,26 +34,17 @@ import {
   type Listener,
   type Live,
 } from "./registry";
-import {
-  capsKey,
-  emitCapabilities,
-  releaseUnwatchedSoon,
-  sendCapabilities,
-  setChatPlan,
-} from "./settings";
+import { capsKey, emitCapabilities, setChatPlan } from "./settings";
 import {
   endOrphanedTasks,
   endRunningTasks,
   getItem,
   hasItem,
   itemsOfKind,
-  recentTasks,
   sessionsWithRunningTasks,
   saveItem,
-  settle,
 } from "./store";
 import { noteToolResult } from "../health/env/recordHit";
-import { readPage, toolBody, type ItemPage } from "./page";
 import {
   deleteQueued,
   editQueued,
@@ -101,16 +92,6 @@ export {
   setChatPlan,
 } from "./settings";
 
-function savedContext(sessionId: string): ChatContext | null {
-  const raw = getSession(sessionId).chat_context;
-  if (!raw) return null;
-  try {
-    return JSON.parse(raw) as ChatContext;
-  } catch {
-    return null;
-  }
-}
-
 const CARRY_OUT = "Carry out the plan.";
 
 // Leaves plan mode and starts the plan. The message's id comes from the
@@ -192,6 +173,7 @@ function emitEnded(
 
 function onWorkerEvent(sessionId: string, live: Live, e: WorkerEvent): void {
   track(live, e);
+  if (trackModelWait(sessionId, live, e)) return;
   if (e.type === "item" && e.item.kind === "tool")
     noteToolResult(sessionId, e.item);
   if (
@@ -968,55 +950,7 @@ export function chatTaskOutput(
   return taskOutputTail(taskId, task.outputFile);
 }
 
-// What a watcher is sent of stored items: the live text of what's still
-// streaming, or with no conversation running, nothing left running.
-function present(sessionId: string, items: ChatItem[]): ChatItem[] {
-  const live = registry.live.get(sessionId);
-  if (live) return items.map((i) => live.streaming.get(i.id) ?? i);
-  return runningWorkers().includes(sessionId) ? items : settle(items);
-}
-
-// Snapshot then live updates. Returns the unsubscribe function. Every
-// client gets the latest page and asks for older ones.
-export function watchChat(sessionId: string, listener: Listener): () => void {
-  const live = registry.live.get(sessionId);
-  const page = readPage(sessionId);
-  const onPage = new Set(page.items.map((i) => i.id));
-  // The composer lists background work still going or just done, even when
-  // it started before the page.
-  const recent = Date.now() - 60 * 60 * 1000;
-  const tasks = recentTasks(sessionId, recent).filter((t) => !onPage.has(t.id));
-  listener({
-    type: "snapshot",
-    items: present(sessionId, page.items),
-    cursor: page.cursor,
-    hasMore: page.hasMore,
-    tasks: present(sessionId, tasks),
-    state: live?.state ?? "idle",
-    compacting: live?.compacting ?? null,
-    queue: listQueue(sessionId),
-    suggestion: getSession(sessionId).chat_suggestion ?? null,
-  });
-  listener({ type: "context", context: savedContext(sessionId) });
-  sendCapabilities(sessionId, listener).catch((error) =>
-    console.error(`[chat ${sessionId}] capabilities not sent:`, error)
-  );
-  let set = registry.listeners.get(sessionId);
-  if (!set) registry.listeners.set(sessionId, (set = new Set()));
-  set.add(listener);
-  return () => {
-    set?.delete(listener);
-    releaseUnwatchedSoon();
-  };
-}
-
-// The page before `before`, as the reader scrolls up.
-export function chatHistory(sessionId: string, before: number): ItemPage {
-  const page = readPage(sessionId, before);
-  return { ...page, items: present(sessionId, page.items) };
-}
-
-export const chatToolBody = toolBody;
+export { chatHistory, chatToolBody, watchChat } from "./runner-watch";
 
 // After a restart: reconnect to every worker still running a conversation,
 // and send the queues of conversations whose worker is gone.

package/lib/chat/tools.ts

@@ -81,3 +81,17 @@ export function clipOutput(text: string): string {
     ? `${text.slice(0, MAX_TOOL_OUTPUT)}\n… (${text.length - MAX_TOOL_OUTPUT} more characters)`
     : text;
 }
+
+export const LIVE_OUTPUT_LINES = 200;
+
+// A running step's output so far: the last lines, never more than a
+// finished step keeps. The end of a long build is what the reader wants.
+export function tailOutput(text: string): string {
+  const lines = text.split("\n");
+  let tail =
+    lines.length > LIVE_OUTPUT_LINES
+      ? lines.slice(-LIVE_OUTPUT_LINES).join("\n")
+      : text;
+  if (tail.length > MAX_TOOL_OUTPUT) tail = tail.slice(-MAX_TOOL_OUTPUT);
+  return tail === text ? tail : `…\n${tail}`;
+}

package/package.json

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