switchroom 0.5.0 → 0.7.8

package/telegram-plugin/dist/server.js

@@ -16931,7 +16931,7 @@ var init_zod = __esm(() => {
 });
 
 // plugin-logger.ts
-import { appendFileSync as appendFileSync2, mkdirSync as mkdirSync2, renameSync as renameSync3, statSync as statSync2 } from "fs";
+import { appendFileSync as appendFileSync2, mkdirSync as mkdirSync2, renameSync as renameSync3, statSync as statSync2, existsSync as existsSync2 } from "fs";
 import { homedir as homedir2 } from "os";
 import { dirname as dirname2, join as join2 } from "path";
 function resolveLogPath2(env = process.env) {
@@ -16950,6 +16950,14 @@ function rotateIfNeeded2(path) {
     const st = statSync2(path);
     if (st.size < ROTATE_AT_BYTES2)
       return;
+    for (let i = ROTATION_BACKUPS2 - 1;i >= 1; i--) {
+      const src = `${path}.${i}`;
+      const dst = `${path}.${i + 1}`;
+      try {
+        if (existsSync2(src))
+          renameSync3(src, dst);
+      } catch {}
+    }
     const backup = `${path}.1`;
     renameSync3(path, backup);
   } catch {}
@@ -16981,11 +16989,14 @@ function installPluginLogger2(env = process.env) {
   };
   return activeHandle2;
 }
-var DEFAULT_LOG_PATH2, ROTATE_AT_BYTES2, activeHandle2 = null;
+var DEFAULT_LOG_PATH2, ROTATE_AT_BYTES2, ROTATION_BACKUPS2 = 5, activeHandle2 = null;
 var init_plugin_logger = __esm(() => {
   DEFAULT_LOG_PATH2 = join2(homedir2(), ".switchroom", "logs", "telegram-plugin.log");
-  ROTATE_AT_BYTES2 = 5 * 1024 * 1024;
+  ROTATE_AT_BYTES2 = 50 * 1024 * 1024;
 });
+
+// tool-labels.ts
+var init_tool_labels = () => {};
 // tool-error-filter.ts
 var init_tool_error_filter = () => {};
 
@@ -16995,6 +17006,7 @@ var init_fleet_state = () => {};
 // two-zone-card.ts
 var init_two_zone_card = __esm(() => {
   init_fleet_state();
+  init_tool_labels();
 });
 
 // progress-card.ts
@@ -17003,6 +17015,7 @@ function isMultiAgentEnabled(env = process.env) {
 }
 var STUCK_THRESHOLD_MS;
 var init_progress_card = __esm(() => {
+  init_tool_labels();
   init_tool_error_filter();
   init_two_zone_card();
   STUCK_THRESHOLD_MS = 2 * 60000;
@@ -17076,26 +17089,117 @@ var init_operator_events = __esm(() => {
   cooldownMap = new Map;
 });
 
+// tool-label-sidecar.ts
+import { existsSync as existsSync3, readFileSync as readFileSync2, statSync as statSync3 } from "node:fs";
+import { join as join3 } from "node:path";
+function createToolLabelSidecar(opts) {
+  const path = join3(opts.stateDir, `tool-labels-${opts.sessionId}.jsonl`);
+  const labels = new Map;
+  const subscribers = new Set;
+  let offset = 0;
+  let stopped = false;
+  const sched = opts.scheduler ?? {
+    setInterval: (cb, ms) => setInterval(cb, ms),
+    clearInterval: (h) => clearInterval(h)
+  };
+  function ingestSuffix(text) {
+    if (!text)
+      return;
+    const lines = text.split(`
+`);
+    for (const raw of lines) {
+      const line = raw.trim();
+      if (!line)
+        continue;
+      let row = null;
+      try {
+        row = JSON.parse(line);
+      } catch {
+        continue;
+      }
+      if (!row || typeof row.tool_use_id !== "string" || typeof row.label !== "string")
+        continue;
+      if (labels.has(row.tool_use_id))
+        continue;
+      labels.set(row.tool_use_id, row.label);
+      for (const cb of subscribers) {
+        try {
+          cb(row.tool_use_id, row.label);
+        } catch {}
+      }
+    }
+  }
+  function poll() {
+    if (stopped)
+      return;
+    if (!existsSync3(path))
+      return;
+    let size = 0;
+    try {
+      size = statSync3(path).size;
+    } catch {
+      return;
+    }
+    if (size <= offset) {
+      if (size < offset)
+        offset = 0;
+      else
+        return;
+    }
+    let text = "";
+    try {
+      const buf = readFileSync2(path);
+      text = buf.subarray(offset).toString("utf8");
+      offset = buf.length;
+    } catch {
+      return;
+    }
+    ingestSuffix(text);
+  }
+  poll();
+  const handle = sched.setInterval(poll, opts.pollMs ?? 250);
+  return {
+    getLabel(toolUseId) {
+      return labels.get(toolUseId);
+    },
+    onLabel(cb) {
+      subscribers.add(cb);
+      return () => subscribers.delete(cb);
+    },
+    poll,
+    stop() {
+      if (stopped)
+        return;
+      stopped = true;
+      try {
+        sched.clearInterval(handle);
+      } catch {}
+      subscribers.clear();
+    }
+  };
+}
+var init_tool_label_sidecar = () => {};
+
 // session-tail.ts
 import {
   closeSync,
-  existsSync as existsSync3,
+  existsSync as existsSync4,
   openSync,
   readdirSync,
   readSync,
-  statSync as statSync3,
+  statSync as statSync4,
   watch
 } from "fs";
 import { homedir as homedir3 } from "os";
-import { basename, join as join3 } from "path";
+import { basename, join as join4 } from "path";
 function sanitizeCwdToProjectName(cwd) {
   return cwd.replace(/[^a-zA-Z0-9]/g, "-");
 }
-function getProjectsDirForCwd(cwd = process.cwd(), claudeHome = process.env.CLAUDE_CONFIG_DIR ?? join3(homedir3(), ".claude")) {
-  return join3(claudeHome, "projects", sanitizeCwdToProjectName(cwd));
+function getProjectsDirForCwd(cwd = process.cwd(), claudeHome = process.env.CLAUDE_CONFIG_DIR ?? join4(homedir3(), ".claude")) {
+  return join4(claudeHome, "projects", sanitizeCwdToProjectName(cwd));
 }
 function findActiveSessionFile(projectsDir) {
-  if (!existsSync3(projectsDir))
+  if (!existsSync4(projectsDir))
     return null;
   let entries;
   try {
@@ -17108,9 +17212,9 @@ function findActiveSessionFile(projectsDir) {
   for (const e of entries) {
     if (!e.endsWith(".jsonl"))
       continue;
-    const p = join3(projectsDir, e);
+    const p = join4(projectsDir, e);
     try {
-      const s = statSync3(p);
+      const s = statSync4(p);
       if (s.mtimeMs > bestMtime) {
         bestMtime = s.mtimeMs;
         bestPath = p;
@@ -17335,13 +17439,53 @@ function extractDetailMessage(obj) {
 }
 function startSessionTail(config2) {
   const cwd = config2.cwd ?? process.cwd();
-  const claudeHome = config2.claudeHome ?? process.env.CLAUDE_CONFIG_DIR ?? join3(homedir3(), ".claude");
+  const claudeHome = config2.claudeHome ?? process.env.CLAUDE_CONFIG_DIR ?? join4(homedir3(), ".claude");
   const projectsDir = getProjectsDirForCwd(cwd, claudeHome);
   const rescanMs = config2.rescanIntervalMs ?? 500;
   const log = config2.log;
-  const onEvent = config2.onEvent;
+  const rawOnEvent = config2.onEvent;
   const onOperatorEvent = config2.onOperatorEvent;
   log?.(`session-tail: projectsDir=${projectsDir}`);
+  const sidecars = new Map;
+  const stateDirForSidecar = process.env.TELEGRAM_STATE_DIR ?? null;
+  function sessionIdForFile(file) {
+    if (!file)
+      return null;
+    const b = file.endsWith(".jsonl") ? basename(file, ".jsonl") : null;
+    return b && b.length > 0 ? b : null;
+  }
+  function ensureSidecar(sessionId) {
+    if (!stateDirForSidecar)
+      return null;
+    const existing = sidecars.get(sessionId);
+    if (existing)
+      return existing;
+    try {
+      const s = createToolLabelSidecar({ stateDir: stateDirForSidecar, sessionId });
+      sidecars.set(sessionId, s);
+      return s;
+    } catch (err) {
+      log?.(`session-tail: sidecar create failed: ${err.message}`);
+      return null;
+    }
+  }
+  function decorate(ev, sessionId) {
+    if (!sessionId)
+      return ev;
+    if (ev.kind !== "tool_use" && ev.kind !== "sub_agent_tool_use")
+      return ev;
+    if (!ev.toolUseId)
+      return ev;
+    const s = ensureSidecar(sessionId);
+    if (!s)
+      return ev;
+    s.poll();
+    const label = s.getLabel(ev.toolUseId);
+    if (!label)
+      return ev;
+    return { ...ev, precomputedLabel: label };
+  }
+  const onEvent = (ev) => rawOnEvent(ev);
   let currentFile = null;
   let cursor = 0;
   let watcher = null;
@@ -17353,7 +17497,7 @@ function startSessionTail(config2) {
     if (stopped || !currentFile)
       return;
     try {
-      const stat = statSync3(currentFile);
+      const stat = statSync4(currentFile);
       if (stat.size < cursor) {
         cursor = 0;
         pendingPartial = "";
@@ -17378,9 +17522,10 @@ function startSessionTail(config2) {
         if (!line)
           continue;
         const events = projectTranscriptLine(line);
+        const sid = sessionIdForFile(currentFile);
         for (const ev of events) {
           try {
-            onEvent(ev);
+            onEvent(decorate(ev, sid));
           } catch (err) {
             log?.(`session-tail: onEvent threw: ${err.message}`);
           }
@@ -17421,7 +17566,7 @@ function startSessionTail(config2) {
     } else {
       pendingPartial = "";
       try {
-        cursor = statSync3(file).size;
+        cursor = statSync4(file).size;
       } catch {
         cursor = 0;
       }
@@ -17441,7 +17586,7 @@ function startSessionTail(config2) {
     if (stopped)
       return;
     try {
-      const stat = statSync3(t.file);
+      const stat = statSync4(t.file);
       if (stat.size < t.cursor) {
         t.cursor = 0;
         t.pendingPartial = "";
@@ -17482,7 +17627,8 @@ function startSessionTail(config2) {
             t.hasSeenTerminal = true;
           }
           try {
-            onEvent(ev);
+            const subSid = sessionIdForFile(t.file);
+            onEvent(decorate(ev, subSid));
           } catch (err) {
             log?.(`session-tail: sub onEvent threw: ${err.message}`);
           }
@@ -17498,7 +17644,7 @@ function startSessionTail(config2) {
       return;
     let cursor2 = 0;
     try {
-      cursor2 = statSync3(file).size;
+      cursor2 = statSync4(file).size;
     } catch {}
     const t = {
       agentId,
@@ -17553,8 +17699,8 @@ function startSessionTail(config2) {
     if (!currentFile)
       return;
     const sessionId = basename(currentFile, ".jsonl");
-    const subDir = join3(projectsDir, sessionId, "subagents");
-    if (!existsSync3(subDir))
+    const subDir = join4(projectsDir, sessionId, "subagents");
+    if (!existsSync4(subDir))
       return;
     let entries;
     try {
@@ -17566,7 +17712,7 @@ function startSessionTail(config2) {
       if (!e.startsWith("agent-") || !e.endsWith(".jsonl"))
         continue;
       const agentId = e.slice("agent-".length, -".jsonl".length);
-      const file = join3(subDir, e);
+      const file = join4(subDir, e);
       if (!subTails.has(file)) {
         attachSub(file, agentId);
       } else {
@@ -17607,6 +17753,12 @@ function startSessionTail(config2) {
         }
       }
       subTails.clear();
+      for (const s of sidecars.values()) {
+        try {
+          s.stop();
+        } catch {}
+      }
+      sidecars.clear();
       if (pollTimer) {
         clearInterval(pollTimer);
         pollTimer = null;
@@ -17621,6 +17773,7 @@ var MAX_JSONL_LINE_BYTES, MAX_ERROR_TEXT_CHARS = 500;
 var init_session_tail = __esm(() => {
   init_progress_card();
   init_operator_events();
+  init_tool_label_sidecar();
   MAX_JSONL_LINE_BYTES = 2 * 1024 * 1024;
 });
 
@@ -23180,7 +23333,7 @@ ${i3.join(`
 });
 
 // pty-tail.ts
-import { existsSync as existsSync4, statSync as statSync4, watch as watch2, openSync as openSync2, readSync as readSync2, closeSync as closeSync2 } from "fs";
+import { existsSync as existsSync5, statSync as statSync5, watch as watch2, openSync as openSync2, readSync as readSync2, closeSync as closeSync2 } from "fs";
 function debugDumpBufferOnMiss(buf) {
   if (!PTY_DEBUG)
     return;
@@ -23450,11 +23603,11 @@ function startPtyTail(config2) {
   function readNew() {
     if (stopped)
       return;
-    if (!existsSync4(config2.logFile))
+    if (!existsSync5(config2.logFile))
       return;
     let stat;
     try {
-      stat = statSync4(config2.logFile);
+      stat = statSync5(config2.logFile);
     } catch {
       return;
     }
@@ -23483,13 +23636,13 @@ function startPtyTail(config2) {
     });
   }
   function attachWatcher() {
-    if (!existsSync4(config2.logFile))
+    if (!existsSync5(config2.logFile))
       return;
     if (watcher)
       return;
     let size = 0;
     try {
-      size = statSync4(config2.logFile).size;
+      size = statSync5(config2.logFile).size;
     } catch {
       return;
     }
@@ -23815,7 +23968,7 @@ var init_ipc_client = () => {};
 
 // bridge/bridge.ts
 var exports_bridge = {};
-import { dirname as dirname3, join as join4 } from "path";
+import { dirname as dirname3, join as join5 } from "path";
 import { homedir as homedir4 } from "os";
 function onInbound(msg) {
   mcp.notification({
@@ -23882,7 +24035,7 @@ async function main() {
     onStatus,
     log: (msg) => process.stderr.write(`telegram bridge: ipc: ${msg}
 `),
-    livenessFilePath: join4(STATE_DIR, ".bridge-alive")
+    livenessFilePath: join5(STATE_DIR, ".bridge-alive")
   });
   if (ipc.isConnected()) {
     process.stderr.write(`telegram bridge: connected to gateway at ${SOCKET_PATH}
@@ -23904,8 +24057,8 @@ var init_bridge = __esm(async () => {
   init_pty_tail();
   init_ipc_client();
   installPluginLogger2();
-  STATE_DIR = process.env.TELEGRAM_STATE_DIR ?? join4(homedir4(), ".claude", "channels", "telegram");
-  SOCKET_PATH = process.env.SWITCHROOM_GATEWAY_SOCKET ?? join4(STATE_DIR, "gateway.sock");
+  STATE_DIR = process.env.TELEGRAM_STATE_DIR ?? join5(homedir4(), ".claude", "channels", "telegram");
+  SOCKET_PATH = process.env.SWITCHROOM_GATEWAY_SOCKET ?? join5(STATE_DIR, "gateway.sock");
   TOPIC_ID = process.env.TELEGRAM_TOPIC_ID ? Number(process.env.TELEGRAM_TOPIC_ID) : undefined;
   AGENT_NAME = process.env.SWITCHROOM_AGENT_NAME;
   if (!AGENT_NAME) {
@@ -24334,7 +24487,7 @@ var init_bridge = __esm(async () => {
   if (ptyTailEnabled) {
     try {
       const agentDir = process.env.CLAUDE_CONFIG_DIR ? dirname3(process.env.CLAUDE_CONFIG_DIR) : process.cwd();
-      const serviceLogPath = process.env.SWITCHROOM_SERVICE_LOG_PATH ?? join4(agentDir, "service.log");
+      const serviceLogPath = process.env.SWITCHROOM_SERVICE_LOG_PATH ?? join5(agentDir, "service.log");
       ptyTailHandle = startPtyTail({
         logFile: serviceLogPath,
         log: (msg) => process.stderr.write(`telegram bridge: ${msg}
@@ -24383,16 +24536,17 @@ var init_bridge = __esm(async () => {
 });
 
 // server.ts
-import { existsSync as existsSync5 } from "fs";
+import { existsSync as existsSync6 } from "fs";
 import { homedir as homedir5 } from "os";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 
 // plugin-logger.ts
-import { appendFileSync, mkdirSync, renameSync, statSync } from "fs";
+import { appendFileSync, mkdirSync, renameSync, statSync, existsSync } from "fs";
 import { homedir } from "os";
 import { dirname, join } from "path";
 var DEFAULT_LOG_PATH = join(homedir(), ".switchroom", "logs", "telegram-plugin.log");
-var ROTATE_AT_BYTES = 5 * 1024 * 1024;
+var ROTATE_AT_BYTES = 50 * 1024 * 1024;
+var ROTATION_BACKUPS = 5;
 var activeHandle = null;
 function resolveLogPath(env = process.env) {
   const override = env.SWITCHROOM_TELEGRAM_LOG_PATH;
@@ -24410,6 +24564,14 @@ function rotateIfNeeded(path) {
     const st = statSync(path);
     if (st.size < ROTATE_AT_BYTES)
       return;
+    for (let i = ROTATION_BACKUPS - 1;i >= 1; i--) {
+      const src = `${path}.${i}`;
+      const dst = `${path}.${i + 1}`;
+      try {
+        if (existsSync(src))
+          renameSync(src, dst);
+      } catch {}
+    }
     const backup = `${path}.1`;
     renameSync(path, backup);
   } catch {}
@@ -24482,12 +24644,12 @@ function shouldFallBackToLegacy(input) {
 // server.ts
 installPluginLogger();
 {
-  const _stateDir = process.env.TELEGRAM_STATE_DIR ?? join5(homedir5(), ".claude", "channels", "telegram");
-  const _gatewaySocket = process.env.SWITCHROOM_GATEWAY_SOCKET ?? join5(_stateDir, "gateway.sock");
-  const _gatewayPidPath = process.env.SWITCHROOM_GATEWAY_PID_FILE ?? join5(_stateDir, "gateway.pid.json");
+  const _stateDir = process.env.TELEGRAM_STATE_DIR ?? join6(homedir5(), ".claude", "channels", "telegram");
+  const _gatewaySocket = process.env.SWITCHROOM_GATEWAY_SOCKET ?? join6(_stateDir, "gateway.sock");
+  const _gatewayPidPath = process.env.SWITCHROOM_GATEWAY_PID_FILE ?? join6(_stateDir, "gateway.pid.json");
   let _gatewayLive = false;
   async function probeSocketOnce() {
-    if (!existsSync5(_gatewaySocket))
+    if (!existsSync6(_gatewaySocket))
       return;
     try {
       await Bun.connect({

package/telegram-plugin/fleet-state.ts

@@ -39,6 +39,13 @@ export interface FleetMember {
   errorSeen: boolean
   /** Snapshot of driver's currentTurnKey at sub_agent_started. Stable across turns. */
   originatingTurnKey: string
+  /**
+   * True if this member was dispatched with `run_in_background: true`.
+   * Sticky — does NOT clear when status later promotes from background →
+   * running. Used by `hasLiveBackground` to keep the parent turn's
+   * PerChatState alive even after the member starts doing tool work.
+   */
+  isBackgroundDispatch: boolean
 }
 
 export interface CreateFleetMemberArgs {
@@ -46,6 +53,7 @@ export interface CreateFleetMemberArgs {
   role: string
   startedAt: number
   originatingTurnKey: string
+  isBackgroundDispatch?: boolean
 }
 
 export function createFleetMember(args: CreateFleetMemberArgs): FleetMember {
@@ -60,6 +68,7 @@ export function createFleetMember(args: CreateFleetMemberArgs): FleetMember {
     terminalAt: null,
     errorSeen: false,
     originatingTurnKey: args.originatingTurnKey,
+    isBackgroundDispatch: args.isBackgroundDispatch ?? false,
   }
 }
 
@@ -69,10 +78,12 @@ export function applyToolUse(
   input: Record<string, unknown> | undefined,
   now: number,
 ): FleetMember {
-  // P3 of #662 — recovery from stuck. A live tool event proves the
-  // sub-agent is alive again, so flip status back to running. Terminal
-  // statuses (done/failed/killed) are sticky and never reset here.
-  const status: FleetStatus = member.status === 'stuck' ? 'running' : member.status
+  // A live tool event proves the sub-agent is active — flip stuck or
+  // background back to running. Terminal statuses (done/failed/killed)
+  // are sticky and never reset here. Fixes #757: background members
+  // previously stayed ⏸ even while doing real work.
+  const status: FleetStatus =
+    member.status === 'stuck' || member.status === 'background' ? 'running' : member.status
   return {
     ...member,
     status,
@@ -126,15 +137,19 @@ export function markStuck(member: FleetMember, now: number, idleMs: number = 60_
 }
 
 /**
- * P2 of #662 / fixes #64 — true if any fleet member is in
- * `status: 'background'` AND has not yet reached terminal state. Used by
- * the driver's dispose path to keep a PerChatState alive past parent
- * turn_end while background sub-agents are still running, and by the v2
- * renderer's phase resolver to choose ⏸ Background vs ✅ Done.
+ * P2 of #662 / fixes #64 — true if any fleet member was dispatched as a
+ * background worker AND has not yet reached terminal state. Used by the
+ * driver's dispose path to keep a PerChatState alive past parent turn_end
+ * while background sub-agents are still running, and by the v2 renderer's
+ * phase resolver to choose ⏸ Background vs ✅ Done.
+ *
+ * Uses `isBackgroundDispatch` (sticky) rather than current `status`, because
+ * background members promote to `running` once tool activity is observed
+ * (fixes #757 — card goes silent for active background workers).
  */
 export function hasLiveBackground(fleet: ReadonlyMap<string, FleetMember>): boolean {
   for (const m of fleet.values()) {
-    if (m.status === 'background' && m.terminalAt == null) return true
+    if (m.isBackgroundDispatch && m.terminalAt == null) return true
   }
   return false
 }

package/telegram-plugin/foreman/foreman.ts

@@ -114,12 +114,47 @@ try {
 }
 
 // ─── Bot token ────────────────────────────────────────────────────────────
-const TOKEN = process.env.TELEGRAM_BOT_TOKEN
-if (!TOKEN) {
+// Issue #758: when bot_token is a `vault:` ref and no .env was written,
+// materialize it from the vault at startup (in-memory only).
+//
+// The outer try/catch is narrowed (post-#761 review) to ONLY catch
+// ERR_MODULE_NOT_FOUND from the dynamic import. Other errors (e.g. throws
+// from inside materializeBotToken that aren't BotTokenMaterializeError)
+// must propagate so we don't mask real bugs behind the legacy "set in .env"
+// hint.
+type MaterializeMod = typeof import('../../src/telegram/materialize-bot-token.js')
+let materializeMod: MaterializeMod | null = null
+try {
+  materializeMod = await import('../../src/telegram/materialize-bot-token.js')
+} catch (err) {
+  const code = (err as NodeJS.ErrnoException | undefined)?.code
+  if (code === 'ERR_MODULE_NOT_FOUND' || code === 'MODULE_NOT_FOUND') {
+    // Module missing — fall through with materializeMod=null.
+  } else {
+    throw err
+  }
+}
+
+let TOKEN: string
+if (materializeMod !== null) {
+  const { materializeBotToken, BotTokenMaterializeError } = materializeMod
+  try {
+    TOKEN = await materializeBotToken()
+  } catch (err) {
+    if (err instanceof BotTokenMaterializeError) {
+      process.stderr.write(`foreman: ${err.message}\n`)
+      process.exit(1)
+    }
+    throw err
+  }
+} else if (process.env.TELEGRAM_BOT_TOKEN) {
+  TOKEN = process.env.TELEGRAM_BOT_TOKEN
+} else {
   process.stderr.write(
     `foreman: TELEGRAM_BOT_TOKEN required\n` +
     `  set in ${ENV_FILE}\n` +
-    `  format: TELEGRAM_BOT_TOKEN=123456789:AAH...\n`,
+    `  format: TELEGRAM_BOT_TOKEN=123456789:AAH...\n` +
+    `  (token-materialization helper not found)\n`,
   )
   process.exit(1)
 }