@songsid/agend 2.1.0-beta.3 → 2.1.0-beta.31

package/dist/cli.js

@@ -11,6 +11,8 @@ import { homedir, totalmem, freemem } from "node:os";
 import { fileURLToPath } from "node:url";
 import { spawn, execSync, execFileSync } from "node:child_process";
 import { getAgendHome, getTmuxSocketName } from "./paths.js";
+import { readClassicLastActivityAt } from "./classic-channel-manager.js";
+import { hasPausedMarker } from "./pause-marker.js";
 /** Prefix tmux args with -L when socket isolation is active. */
 function tmuxArgs(args) {
     const socket = getTmuxSocketName();
@@ -1889,14 +1891,14 @@ function getTreeRssKb(pid, depth = 0) {
     return total;
 }
 function getInstanceStatusStandalone(name) {
+    if (hasPausedMarker(join(DATA_DIR, "instances", name)))
+        return "paused";
     const pidPath = join(DATA_DIR, "instances", name, "daemon.pid");
     if (!existsSync(pidPath))
         return "stopped";
     const pid = parseInt(readFileSync(pidPath, "utf-8").trim(), 10);
     try {
         process.kill(pid, 0);
-        if (existsSync(join(DATA_DIR, "instances", name, "paused-state.json")))
-            return "paused";
         return "running";
     }
     catch {
@@ -1938,6 +1940,7 @@ function formatTimeSince(isoStr) {
  *   kiro classic "8% !>" / TUI "◔ 1%" / bracket "[8%]" / prompt "8% ❯"
  *   codex "Context N% left" (remaining → 100-N) or "Context N% used"
  *   opencode "1.2K (6%)"
+ *   grok "12K / 500K" (used tokens / context window)
  * Duplicated (not imported) so this CLI entry point stays free of the daemon's
  * dependency graph. All returned values are context USED (low % = fresh).
  */
@@ -1948,6 +1951,18 @@ const defaultParser = (output) => {
         const left = line.match(/Context\s+(\d+)%\s+left/i);
         if (left)
             return 100 - parseInt(left[1], 10);
+        const ratio = line.match(/(\d+\.?\d*[KkMm]?)\s*\/\s*(\d+\.?\d*[KkMm]?)/);
+        if (ratio) {
+            const tokenCount = (value) => {
+                const suffix = value.at(-1)?.toLowerCase();
+                const multiplier = suffix === "k" ? 1_000 : suffix === "m" ? 1_000_000 : 1;
+                return parseFloat(value) * multiplier;
+            };
+            const used = tokenCount(ratio[1]);
+            const total = tokenCount(ratio[2]);
+            if (Number.isFinite(used) && Number.isFinite(total) && total > 0)
+                return used / total * 100;
+        }
         const m = line.match(/(\d+)%.*[!❯>]/)
             || line.match(/◔\s*(\d+)%/)
             || line.match(/\[(\d+)%\]/)
@@ -2084,19 +2099,40 @@ async function lsAction(opts) {
             }
             catch { /* ignore */ }
         }
-        // Last activity: prefer statusline.json mtime (updated on real agent activity)
+        // Classic activity is channel-driven. Lightweight Classic daemons often
+        // have no statusline/output log, so prefer the persisted inbound timestamp
+        // and fall back to their durable chat-log mtime for pre-migration history.
         let lastActivity = null;
-        for (const probe of ["statusline.json", "daemon.log", "output.log"]) {
-            const p = join(DATA_DIR, "instances", name, probe);
+        if (isClassic) {
+            let classicActivity = readClassicLastActivityAt(DATA_DIR, name) ?? 0;
             try {
-                if (existsSync(p)) {
-                    lastActivity = formatTimeSince(statSync(p).mtime.toISOString());
-                    break;
+                const inboundPath = join(DATA_DIR, "instances", name, "last-inbound-at");
+                if (existsSync(inboundPath)) {
+                    const inboundAt = Number(readFileSync(inboundPath, "utf-8").trim());
+                    if (Number.isFinite(inboundAt) && inboundAt >= 0 && inboundAt <= Date.now()) {
+                        classicActivity = Math.max(classicActivity, inboundAt);
+                    }
                 }
             }
             catch { /* ignore */ }
+            if (classicActivity) {
+                lastActivity = formatTimeSince(new Date(classicActivity).toISOString());
+            }
+        }
+        else {
+            // Fleet activity: prefer statusline.json mtime (updated on real agent activity).
+            for (const probe of ["statusline.json", "daemon.log", "output.log"]) {
+                const p = join(DATA_DIR, "instances", name, probe);
+                try {
+                    if (existsSync(p)) {
+                        lastActivity = formatTimeSince(statSync(p).mtime.toISOString());
+                        break;
+                    }
+                }
+                catch { /* ignore */ }
+            }
         }
-        return { name, backend, status, teams, source, context, memMb, lastActivity, idle: undefined };
+        return { name, backend, status, teams, source, context, memMb, lastActivity, classic: isClassic, idle: undefined, state: undefined };
     });
     // Enrich with idle state from fleet API (if fleet is running)
     try {
@@ -2104,11 +2140,37 @@ async function lsAction(opts) {
         const resp = await fetch(`http://127.0.0.1:${port}/api/fleet`, { signal: AbortSignal.timeout(2000) });
         const apiData = await resp.json();
         for (const inst of apiData.instances ?? []) {
-            const row = rows.find(r => r.name === inst.name);
+            let row = rows.find(r => r.name === inst.name);
+            if (!row && inst.classic) {
+                classicNames.add(inst.name);
+                const channelId = inst.channelId ?? "";
+                row = {
+                    name: inst.name,
+                    backend: inst.backend ?? "claude-code",
+                    status: inst.status ?? "stopped",
+                    teams: ["(classic)"],
+                    source: inst.adapterId?.toLowerCase().includes("telegram") || channelId.startsWith("-") || (channelId.length > 0 && channelId.length < 17) ? "TG" : "DC",
+                    context: null,
+                    memMb: null,
+                    lastActivity: inst.lastActivity ? formatTimeSince(new Date(inst.lastActivity).toISOString()) : null,
+                    classic: true,
+                    idle: inst.idle,
+                    state: inst.state,
+                };
+                rows.push(row);
+            }
             if (row) {
                 row.idle = inst.idle;
                 if (inst.status)
                     row.status = inst.status;
+                if (inst.backend)
+                    row.backend = inst.backend;
+                if (inst.classic)
+                    row.classic = true;
+                if (inst.state)
+                    row.state = inst.state;
+                if (inst.lastActivity)
+                    row.lastActivity = formatTimeSince(new Date(inst.lastActivity).toISOString());
             }
         }
     }
@@ -2117,9 +2179,38 @@ async function lsAction(opts) {
         console.log(JSON.stringify(rows, null, 2));
         return;
     }
-    // Status icon
-    const statusIcon = (s, idle) => s === "paused" ? "\x1b[33m⏸\x1b[0m" : s === "running" ? (idle === false ? "\x1b[34m●\x1b[0m" : "\x1b[32m●\x1b[0m") : s === "crashed" ? "\x1b[31m●\x1b[0m" : "\x1b[90m○\x1b[0m";
-    const statusLabel = (s, idle) => s === "paused" ? "Paused" : s === "running" ? (idle === false ? "Busy" : "Idle") : s === "crashed" ? "Crashed" : "Stopped";
+    // Status icon — prefer tri-state 'state' field, fall back to idle boolean
+    const statusIcon = (s, idle, state) => {
+        if (state === "stuck")
+            return "\x1b[31m●\x1b[0m";
+        if (state === "paused" || s === "paused")
+            return "\x1b[2;33m●\x1b[0m";
+        if (state === "working")
+            return "\x1b[34m●\x1b[0m";
+        if (state === "idle")
+            return "\x1b[32m●\x1b[0m";
+        // Fallback for when API is unreachable
+        if (s === "running")
+            return idle === false ? "\x1b[34m●\x1b[0m" : "\x1b[32m●\x1b[0m";
+        if (s === "crashed")
+            return "\x1b[31m●\x1b[0m";
+        return "\x1b[90m○\x1b[0m";
+    };
+    const statusLabel = (s, idle, state) => {
+        if (state === "stuck")
+            return "Stuck";
+        if (state === "paused" || s === "paused")
+            return "Paused";
+        if (state === "working")
+            return "Working";
+        if (state === "idle")
+            return "Idle";
+        if (s === "running")
+            return idle === false ? "Busy" : "Idle";
+        if (s === "crashed")
+            return "Crashed";
+        return "Stopped";
+    };
     /** Get display width accounting for fullwidth (CJK) characters */
     const displayWidth = (s) => {
         let w = 0;
@@ -2130,7 +2221,8 @@ async function lsAction(opts) {
         return w;
     };
     const padDisplay = (s, width) => s + " ".repeat(Math.max(0, width - displayWidth(s)));
-    const nameW = Math.max(20, ...rows.map(r => displayWidth(r.name) + 2));
+    const displayName = (row) => row.classic ? `[C] ${row.name}` : row.name;
+    const nameW = Math.max(20, ...rows.map(r => displayWidth(displayName(r)) + 2));
     const backendW = 14;
     const statusW = 12;
     const teamW = 20;
@@ -2151,9 +2243,9 @@ async function lsAction(opts) {
         const ctxStr = r.context != null ? `${Math.round(r.context)}%` : "-";
         const memStr = r.memMb != null ? `${r.memMb}MB` : "-";
         const actStr = r.lastActivity ?? "-";
-        console.log(padDisplay(r.name, nameW) +
+        console.log(padDisplay(displayName(r), nameW) +
             r.backend.padEnd(backendW) +
-            statusIcon(r.status, r.idle) + " " + statusLabel(r.status, r.idle).padEnd(statusW - 2) +
+            statusIcon(r.status, r.idle, r.state) + " " + statusLabel(r.status, r.idle, r.state).padEnd(statusW - 2) +
             padDisplay(teamStr, teamW) +
             r.source.padEnd(srcW) +
             ctxStr.padEnd(ctxW) +