@saadnvd1/agent-os 0.3.482 → 0.3.484

package/lib/stacks/restack.ts

@@ -11,7 +11,7 @@
 import { db, stackQueries as q, type Session, type StackItemRow } from "../db";
 import { getDefaultBranch } from "../git";
 import { sendMessage } from "../bus";
-import { chatStateNow, interruptChat } from "../chat/runner";
+import { stopChatTurn } from "../chat/stop";
 import { findPRStrict, run } from "../tasks/gh";
 import type { TaskPR } from "../tasks/state";
 import { expandHome } from "../tasks/session";
@@ -64,7 +64,7 @@ export const stackNotice = (
   origin: { kind: "system", label, body } as const,
 });
 
-const sleep = (ms: number) => new Promise((r) => setTimeout(r, ms));
+const sleep = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
 // The note on an item left alone because its agent was still working.
 export const AGENT_BUSY = "Waiting for its agent to stop";
 // How long a chat's turn may take to stop after it's interrupted.
@@ -79,17 +79,11 @@ export async function interruptAgent(
   wait = sleep
 ): Promise<boolean> {
   if (session.view === "chat") {
-    const now = () =>
-      chatStateNow(session.id).catch(() => "unreachable" as const);
-    const busy = (s: Awaited<ReturnType<typeof now>>) =>
-      s === "running" || s === "waiting" || s === "unreachable";
-    if (!busy(await now())) return true;
-    await interruptChat(session.id);
-    for (let waited = 0; waited < CHAT_STOP_WAIT_MS; waited += 500) {
-      await wait(500);
-      if (!busy(await now())) return true;
-    }
-    return false;
+    const out = await stopChatTurn(session.id, {
+      graceMs: CHAT_STOP_WAIT_MS,
+      sleep: wait,
+    });
+    return out.stopped;
   }
   const sent = await run(
     "tmux",

package/lib/status/collect.ts

@@ -21,7 +21,7 @@ import {
 } from "../providers/registry";
 import { getDb, type Session } from "../db";
 import { chatState } from "../chat/runner";
-import { chatActivityLine } from "../chat/activity";
+import { chatActivityLine, chatStall } from "../chat/activity";
 import {
   chatNeed,
   isUnread,
@@ -60,6 +60,8 @@ export interface SessionStatusResponse {
   asks?: number;
   need?: SessionNeed | null;
   unread?: boolean;
+  // A chat turn silent past the stall threshold (lib/chat/stall).
+  stalled?: boolean;
   // A program's own message (OSC 7501): untrusted, plain text only.
   detail?: string | null;
   progress?: number | null;
@@ -464,6 +466,7 @@ async function collect(): Promise<StatusSnapshot> {
       agentType: session.agent_type,
       need: chatNeed(session, state, asks),
       unread: isUnread(session, state),
+      ...(chatStall(session.id) && { stalled: true }),
       ...(session.role === "orchestrator" && { asks }),
     };
   }

package/lib/usage/turns.ts

@@ -91,10 +91,16 @@ export function recordTurn(
   return totals;
 }
 
+// When a compaction ran: "mid_turn" is the agent's own, at its auto-compact
+// window, while it worked; the rest happen between turns.
+export type CompactionPhase = "mid_turn" | "between_turns";
+export const compactionPhase = (trigger: string): CompactionPhase =>
+  trigger === "auto" ? "mid_turn" : "between_turns";
+
 // Records one compaction: who ran it ("auto" is the agent's own, at its
 // auto-compact window; "threshold" and "stale" are AgentOS's before a
-// message; "manual" is a /compact someone typed), and the context before
-// and after when the agent said.
+// message; "manual" is a /compact someone typed), which phase that was,
+// and the context before and after when the agent said.
 export function recordCompaction(
   session: Pick<Session, "id" | "name" | "workspace_id">,
   c: { trigger: string; before?: number; after?: number },
@@ -106,14 +112,15 @@ export function recordCompaction(
     | { name: string; workspace_id: string | null }
     | undefined;
   db.prepare(
-    `INSERT INTO chat_compactions (session_id, session_name, workspace_id, at, trigger, before_tokens, after_tokens)
-     VALUES (?, ?, ?, ?, ?, ?, ?)`
+    `INSERT INTO chat_compactions (session_id, session_name, workspace_id, at, trigger, phase, before_tokens, after_tokens)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?)`
   ).run(
     session.id,
     current?.name ?? session.name,
     current?.workspace_id ?? session.workspace_id,
     at,
     c.trigger,
+    compactionPhase(c.trigger),
     c.before ?? null,
     c.after ?? null
   );

package/package.json

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