switchroom 0.18.24 → 0.18.25

package/dist/cli/switchroom.js

@@ -2120,7 +2120,7 @@ var init_esm = __esm(() => {
 });
 
 // src/build-info.ts
-var VERSION = "0.18.24", COMMIT_SHA = "f641363e";
+var VERSION = "0.18.25", COMMIT_SHA = "01803cff";
 
 // src/cli/resolve-version.ts
 import { existsSync, readFileSync } from "node:fs";
@@ -15458,18 +15458,32 @@ async function injectSlashCommand(agentName, command, opts = {}) {
   const socket = opts.socketName ?? defaultSocketName(agentName);
   const session = opts.sessionName ?? agentName;
   const settleMs = opts.settleMs ?? 2000;
-  const timeoutMs = opts.timeoutMs ?? 5000;
+  const signalMode = !!(opts.successPattern || opts.errorPattern);
+  const timeoutMs = opts.timeoutMs ?? (signalMode ? 8000 : 5000);
   return withPaneLock(`${socket}:${session}`, () => injectSlashCommandWith(makeTmuxRunner(tmuxBin), {
     socket,
     session,
     command: command.trim(),
     settleMs,
     timeoutMs,
-    precondition: opts.precondition
+    precondition: opts.precondition,
+    successPattern: opts.successPattern,
+    errorPattern: opts.errorPattern,
+    settleBeforeSendMs: opts.settleBeforeSendMs
   }));
 }
 async function injectSlashCommandWith(runner, args) {
-  const { socket, session, command, settleMs, timeoutMs, precondition } = args;
+  const {
+    socket,
+    session,
+    command,
+    settleMs,
+    timeoutMs,
+    precondition,
+    successPattern,
+    errorPattern,
+    settleBeforeSendMs
+  } = args;
   let bareVerb;
   try {
     bareVerb = validateInjectCommand(command);
@@ -15510,6 +15524,17 @@ async function injectSlashCommandWith(runner, args) {
       errorMessage: "inject precondition returned false at write time; send aborted " + "(no keys sent)."
     };
   }
+  if (settleBeforeSendMs && settleBeforeSendMs > 0) {
+    const settleStart = Date.now();
+    let prevSettle = runner.capture(socket, session) ?? "";
+    while (Date.now() - settleStart < settleBeforeSendMs) {
+      await sleep(POLL_INTERVAL_MS);
+      const cur = runner.capture(socket, session) ?? "";
+      if (cur === prevSettle)
+        break;
+      prevSettle = cur;
+    }
+  }
   const before = runner.capture(socket, session) ?? "";
   try {
     runner.send(socket, session, ["send-keys", "-l", command]);
@@ -15528,9 +15553,23 @@ async function injectSlashCommandWith(runner, args) {
   const start = Date.now();
   let last = before;
   let stableSince = null;
+  const signalMode = !!(successPattern || errorPattern);
   while (Date.now() - start < timeoutMs) {
     await sleep(POLL_INTERVAL_MS);
     const cur = runner.capture(socket, session) ?? "";
+    if (signalMode) {
+      last = cur;
+      if (cur !== before) {
+        const { output: region } = diffPane(before, cur, command);
+        const regionLines = region.split(`
+`).map((l) => l.trim());
+        if (errorPattern && regionLines.some((l) => errorPattern.test(l)))
+          break;
+        if (successPattern && regionLines.some((l) => successPattern.test(l)))
+          break;
+      }
+      continue;
+    }
     if (cur === last && cur !== before) {
       if (stableSince === null) {
         stableSince = Date.now();
@@ -63219,8 +63258,9 @@ function isoFromTs(ts) {
     return null;
   return new Date(ts * 1000).toISOString();
 }
-function detectTurnFindings(agent, turns) {
+function detectTurnFindings(agent, turns, opts = {}) {
   const findings = [];
+  const silentNoopFloorTs = opts.silentNoopFloorTs ?? SILENT_NOOP_FLOOR_TS;
   for (const t of turns) {
     const tid = t.turn_id ?? "?";
     const st = t.status;
@@ -63254,7 +63294,7 @@ function detectTurnFindings(agent, turns) {
         ts
       });
     }
-    if (st === "complete" && tl === 0 && !synthetic) {
+    if (st === "complete" && tl === 0 && !synthetic && t.ts != null && t.ts >= silentNoopFloorTs) {
       findings.push({
         signal: "silent-no-op-candidate",
         agent,
@@ -63302,20 +63342,20 @@ function extractTs(line) {
   const m = line.match(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?Z?/);
   return m ? m[0] : null;
 }
-function scanAgent(agent, turnsText, gatewayText) {
+function scanAgent(agent, turnsText, gatewayText, opts = {}) {
   const turns = parseTurns(turnsText);
   const status_mix = {};
   for (const t of turns) {
     const st = t.status ?? "unknown";
     status_mix[st] = (status_mix[st] ?? 0) + 1;
   }
-  const turnFindings = detectTurnFindings(agent, turns);
+  const turnFindings = detectTurnFindings(agent, turns, opts);
   const { findings: gwFindings, gw_hits } = detectGatewayFindings(agent, gatewayText);
   const findings = [...turnFindings, ...gwFindings];
   const escalate = turnFindings.some((f) => f.signal === "killed-incomplete-turn" || f.signal === "hang-long-stalled" || f.signal === "silent-no-op-candidate" || f.signal === "send-failed-delivery") || gw_hits["duplicate-delivery-represent"] > 0 || gw_hits["reply-delivery-failure"] > 0;
   return { agent, turns: turns.length, status_mix, findings, gw_hits, escalate };
 }
-var HANG_MS = 360000, HANG_MAXTOOLS = 2, GATEWAY_SIGNATURES;
+var HANG_MS = 360000, HANG_MAXTOOLS = 2, SILENT_NOOP_FLOOR_TS = 1783900800, GATEWAY_SIGNATURES;
 var init_detect = __esm(() => {
   GATEWAY_SIGNATURES = {
     "duplicate-delivery-represent": /represent duplicate-send/,
@@ -63664,7 +63704,9 @@ function runScan(opts = {}) {
       continue;
     }
     try {
-      const res = scanAgent(agent, turnsText, gwText);
+      const res = scanAgent(agent, turnsText, gwText, {
+        silentNoopFloorTs: opts.silentNoopFloorTs
+      });
       perAgent.push(res);
       findings.push(...res.findings);
       scanned++;
@@ -78672,12 +78714,16 @@ var PHASE2_MIGRATIONS = [
 var PHASE3_MIGRATIONS = [
   `ALTER TABLE turns ADD COLUMN resumed_at INTEGER`
 ];
+var PHASE4_MIGRATIONS = [
+  `ALTER TABLE turns ADD COLUMN session_id TEXT`,
+  `ALTER TABLE turns ADD COLUMN answer_redelivered_at INTEGER`
+];
 function applySchema(db) {
   db.exec("PRAGMA journal_mode = WAL");
   db.exec("PRAGMA synchronous = NORMAL");
   db.exec("PRAGMA busy_timeout = 5000");
   db.exec(SCHEMA_SQL);
-  for (const sql of [...PHASE1_MIGRATIONS, ...PHASE2_MIGRATIONS, ...PHASE3_MIGRATIONS]) {
+  for (const sql of [...PHASE1_MIGRATIONS, ...PHASE2_MIGRATIONS, ...PHASE3_MIGRATIONS, ...PHASE4_MIGRATIONS]) {
     try {
       db.exec(sql);
     } catch (err) {
@@ -78720,6 +78766,8 @@ function mapRow(row) {
     tool_call_count: row.tool_call_count,
     interrupt_reason: row.interrupt_reason,
     resumed_at: row.resumed_at,
+    session_id: row.session_id ?? null,
+    answer_redelivered_at: row.answer_redelivered_at ?? null,
     created_at: row.created_at,
     updated_at: row.updated_at
   };

package/dist/host-control/main.js

@@ -26605,7 +26605,7 @@ import { existsSync as existsSync9, readFileSync as readFileSync7 } from "node:f
 import { dirname as dirname4, join as join7 } from "node:path";
 
 // src/build-info.ts
-var VERSION = "0.18.24";
+var VERSION = "0.18.25";
 
 // src/cli/resolve-version.ts
 function readPackageVersion() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "switchroom",
   "//version": "NOT the release version — source of truth is the git tag, resolved by scripts/build.mjs:resolveVersion() (see CLAUDE.md > Standard release process). This field is stale by design and only the Layer-4 dev/non-tag fallback for build.mjs + src/cli/resolve-version.ts; do NOT bump it expecting a release to pick it up. npm-pack tarball naming needs a real version — do that as an UNCOMMITTED pack-time bump (see release step 6), never a committed one.",
-  "version": "0.18.24",
+  "version": "0.18.25",
   "description": "Run Claude Code 24/7 on your Claude Pro/Max subscription over Telegram. Open-source alternative to OpenClaw and NanoClaw — no API keys.",
   "type": "module",
   "bin": {

package/telegram-plugin/dist/bridge/bridge.js

@@ -23277,6 +23277,13 @@ function projectAssistantTextBlocks(content, make) {
   });
   return out;
 }
+function sumUsageTokens(usage) {
+  if (usage == null || typeof usage !== "object")
+    return 0;
+  const u = usage;
+  const n = (v) => typeof v === "number" && Number.isFinite(v) ? v : 0;
+  return n(u.input_tokens) + n(u.output_tokens) + n(u.cache_creation_input_tokens);
+}
 function assistantLineCarriesAnswerSurface(content) {
   if (!Array.isArray(content))
     return false;
@@ -23332,6 +23339,15 @@ function projectTranscriptLine(line) {
     if (typeof mainModel === "string" && !isModelSentinel(mainModel)) {
       events.push({ kind: "model", model: mainModel });
     }
+    const mainUsageTotal = sumUsageTokens(message?.usage);
+    if (mainUsageTotal > 0) {
+      const mainMsgId = message?.id;
+      events.push({
+        kind: "usage",
+        messageId: typeof mainMsgId === "string" ? mainMsgId : null,
+        totalTokens: mainUsageTotal
+      });
+    }
     const textEvents = projectAssistantTextBlocks(content, (text, blockIndex, lastInMessage) => ({ kind: "text", text, blockIndex, lastInMessage }));
     content.forEach((c, i) => {
       const ct = c.type;
@@ -23438,6 +23454,16 @@ function projectSubagentLine(line, agentId, state) {
     if (typeof subModel === "string" && !isModelSentinel(subModel)) {
       events.push({ kind: "sub_agent_model", agentId, model: subModel });
     }
+    const subUsageTotal = sumUsageTokens(message?.usage);
+    if (subUsageTotal > 0) {
+      const subMsgId = message?.id;
+      events.push({
+        kind: "sub_agent_usage",
+        agentId,
+        messageId: typeof subMsgId === "string" ? subMsgId : null,
+        totalTokens: subUsageTotal
+      });
+    }
     const textEvents = projectAssistantTextBlocks(content, (text, blockIndex, lastInMessage) => ({
       kind: "sub_agent_text",
       agentId,