switchroom 0.14.16 → 0.14.17

package/dist/cli/switchroom.js

@@ -49413,8 +49413,8 @@ var {
 } = import__.default;
 
 // src/build-info.ts
-var VERSION = "0.14.16";
-var COMMIT_SHA = "6f5d9562";
+var VERSION = "0.14.17";
+var COMMIT_SHA = "95c1d475";
 
 // src/cli/agent.ts
 init_source();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "switchroom",
-  "version": "0.14.16",
+  "version": "0.14.17",
   "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/gateway/gateway.js

@@ -51140,10 +51140,10 @@ function sweepStaleTurnActiveMarker(stateDir, opts) {
 }
 
 // ../src/build-info.ts
-var VERSION = "0.14.16";
-var COMMIT_SHA = "6f5d9562";
-var COMMIT_DATE = "2026-05-30T04:37:39Z";
-var LATEST_PR = 2003;
+var VERSION = "0.14.17";
+var COMMIT_SHA = "95c1d475";
+var COMMIT_DATE = "2026-05-30T05:17:47Z";
+var LATEST_PR = 2005;
 var COMMITS_AHEAD_OF_TAG = 0;
 
 // gateway/boot-version.ts
@@ -51605,6 +51605,34 @@ function applySubagentsSchema(db2) {
   }
   db2.exec("CREATE INDEX IF NOT EXISTS subagents_jsonl_id ON subagents(jsonl_agent_id)");
 }
+function mapSubagentRow(row) {
+  return {
+    id: row.id,
+    parent_session_id: row.parent_session_id,
+    parent_turn_key: row.parent_turn_key,
+    agent_type: row.agent_type,
+    description: row.description,
+    background: row.background !== 0,
+    started_at: row.started_at,
+    last_activity_at: row.last_activity_at,
+    ended_at: row.ended_at,
+    status: row.status,
+    result_summary: row.result_summary,
+    jsonl_agent_id: row.jsonl_agent_id
+  };
+}
+function getSubagentByJsonlId(db2, jsonlAgentId) {
+  const row = db2.prepare("SELECT * FROM subagents WHERE jsonl_agent_id = ?").get(jsonlAgentId);
+  return row ? mapSubagentRow(row) : null;
+}
+
+// gateway/worker-feed-dispatch.ts
+function resolveWorkerFeedDispatch(sub, watcherDescription) {
+  return {
+    isBackground: sub?.background ?? false,
+    feedDescription: (sub?.description ?? "") || watcherDescription
+  };
+}
 
 // gateway/resolve-calling-subagent.ts
 function resolveCallingSubagent(opts) {
@@ -61332,8 +61360,6 @@ var didOneTimeSetup = false;
               onFinish: ({ agentId, outcome, description, resultText, toolCount, durationMs }) => {
                 deferredDoneReactions.promote();
                 let fleetChatId = "";
-                let isBackground = false;
-                let dispatchDesc = "";
                 try {
                   const fleets = progressDriver?.peekAllFleets() ?? [];
                   for (const f of fleets) {
@@ -61343,18 +61369,16 @@ var didOneTimeSetup = false;
                     }
                   }
                 } catch {}
+                let dispatch = resolveWorkerFeedDispatch(null, description);
                 if (turnsDb != null) {
                   try {
-                    const row = turnsDb.prepare("SELECT background, description FROM subagents WHERE jsonl_agent_id = ?").get(agentId);
-                    if (row != null) {
-                      isBackground = row.background === 1;
-                      dispatchDesc = row.description ?? "";
-                    }
+                    dispatch = resolveWorkerFeedDispatch(getSubagentByJsonlId(turnsDb, agentId), description);
                   } catch {}
                 }
+                const isBackground = dispatch.isBackground;
                 if (workerFeedEnabled) {
                   workerActivityFeed.finish(agentId, {
-                    description: dispatchDesc || description,
+                    description: dispatch.feedDescription,
                     lastTool: null,
                     toolCount,
                     latestSummary: resultText,
@@ -61396,8 +61420,6 @@ var didOneTimeSetup = false;
               },
               onProgress: ({ agentId, description, latestSummary, elapsedMs, prevBucketIdx, setBucketIdx, lastTool, toolCount }) => {
                 let fleetChatId = "";
-                let isBackground = false;
-                let dispatchDesc = "";
                 try {
                   const fleets = progressDriver?.peekAllFleets() ?? [];
                   for (const f of fleets) {
@@ -61407,20 +61429,18 @@ var didOneTimeSetup = false;
                     }
                   }
                 } catch {}
+                let dispatch = resolveWorkerFeedDispatch(null, description);
                 if (turnsDb != null) {
                   try {
-                    const row = turnsDb.prepare("SELECT background, description FROM subagents WHERE jsonl_agent_id = ?").get(agentId);
-                    if (row != null) {
-                      isBackground = row.background === 1;
-                      dispatchDesc = row.description ?? "";
-                    }
+                    dispatch = resolveWorkerFeedDispatch(getSubagentByJsonlId(turnsDb, agentId), description);
                   } catch {}
                 }
+                const isBackground = dispatch.isBackground;
                 if (!isBackground)
                   return;
                 if (workerFeedEnabled) {
                   workerActivityFeed.update(agentId, fleetChatId || (loadAccess().allowFrom[0] ?? ""), {
-                    description: dispatchDesc || description,
+                    description: dispatch.feedDescription,
                     lastTool,
                     toolCount,
                     latestSummary,

package/telegram-plugin/gateway/gateway.ts

@@ -418,7 +418,8 @@ import {
   findMostRecentInterruptedTurn,
   findRecentTurnsForChat,
 } from '../registry/turns-schema.js'
-import { applySubagentsSchema } from '../registry/subagents-schema.js'
+import { applySubagentsSchema, getSubagentByJsonlId } from '../registry/subagents-schema.js'
+import { resolveWorkerFeedDispatch, type WorkerFeedDispatch } from './worker-feed-dispatch.js'
 import { formatIdleFooter } from '../idle-footer.js'
 import { resolveCallingSubagent } from './resolve-calling-subagent.js'
 
@@ -17402,11 +17403,6 @@ void (async () => {
                 // independent of the gateway — see
                 // `subagent-handback-decision.test.ts`.
                 let fleetChatId = ''
-                let isBackground = false
-                // Dispatch-time task description from the registry row —
-                // see the onProgress note; used for the feed's terminal recap
-                // header so it matches the running header ("· <real task>").
-                let dispatchDesc = ''
                 try {
                   const fleets = progressDriver?.peekAllFleets() ?? []
                   for (const f of fleets) {
@@ -17419,17 +17415,18 @@ void (async () => {
                   // peek failures are non-fatal — fall through to the
                   // owner-chat fallback inside decideSubagentHandback.
                 }
+                // Background flag + feed header description, both derived from
+                // the registry row via the pure resolveWorkerFeedDispatch
+                // (worker-feed-dispatch.ts, pinned by its test). Best-effort:
+                // a DB hiccup keeps the watcher's generic label rather than
+                // throwing out of the terminal handler.
+                let dispatch: WorkerFeedDispatch = resolveWorkerFeedDispatch(null, description)
                 if (turnsDb != null) {
                   try {
-                    const row = turnsDb
-                      .prepare('SELECT background, description FROM subagents WHERE jsonl_agent_id = ?')
-                      .get(agentId) as { background: number; description: string | null } | undefined
-                    if (row != null) {
-                      isBackground = row.background === 1
-                      dispatchDesc = row.description ?? ''
-                    }
+                    dispatch = resolveWorkerFeedDispatch(getSubagentByJsonlId(turnsDb, agentId), description)
                   } catch { /* best-effort */ }
                 }
+                const isBackground = dispatch.isBackground
                 // #PR2 live worker-feed: force the terminal recap edit on
                 // the worker's live message. No-op when no message was ever
                 // posted (trivial workers stay silent; handback covers them).
@@ -17437,7 +17434,7 @@ void (async () => {
                 // it to 'done' so an already-posted message still finalizes.
                 if (workerFeedEnabled) {
                   void workerActivityFeed.finish(agentId, {
-                    description: dispatchDesc || description,
+                    description: dispatch.feedDescription,
                     lastTool: null,
                     toolCount,
                     latestSummary: resultText,
@@ -17517,12 +17514,6 @@ void (async () => {
               // lives in the `onFinish` block just above.
               onProgress: ({ agentId, description, latestSummary, elapsedMs, prevBucketIdx, setBucketIdx, lastTool, toolCount }) => {
                 let fleetChatId = ''
-                let isBackground = false
-                // The watcher's `description` is its 'sub-agent' default (it
-                // never reassigns it from the worker jsonl). The dispatch-time
-                // task description lives in the registry row — prefer it so the
-                // feed header reads "🔧 Worker · <real task>" not "· sub-agent".
-                let dispatchDesc = ''
                 try {
                   const fleets = progressDriver?.peekAllFleets() ?? []
                   for (const f of fleets) {
@@ -17532,17 +17523,18 @@ void (async () => {
                     }
                   }
                 } catch { /* peek failures non-fatal */ }
+                // The watcher's `description` is its 'sub-agent' default (it
+                // never reassigns it from the worker jsonl). The dispatch-time
+                // task description lives in the registry row — resolveWorkerFeedDispatch
+                // prefers it so the header reads "🔧 Worker · <real task>" not
+                // "· sub-agent" (worker-feed-dispatch.ts, pinned by its test).
+                let dispatch: WorkerFeedDispatch = resolveWorkerFeedDispatch(null, description)
                 if (turnsDb != null) {
                   try {
-                    const row = turnsDb
-                      .prepare('SELECT background, description FROM subagents WHERE jsonl_agent_id = ?')
-                      .get(agentId) as { background: number; description: string | null } | undefined
-                    if (row != null) {
-                      isBackground = row.background === 1
-                      dispatchDesc = row.description ?? ''
-                    }
+                    dispatch = resolveWorkerFeedDispatch(getSubagentByJsonlId(turnsDb, agentId), description)
                   } catch { /* best-effort */ }
                 }
+                const isBackground = dispatch.isBackground
                 if (!isBackground) return // skip overhead for foreground
 
                 // #PR2 live worker-feed: when ON, the worker's live chat
@@ -17556,7 +17548,7 @@ void (async () => {
                     agentId,
                     fleetChatId || (loadAccess().allowFrom[0] ?? ''),
                     {
-                      description: dispatchDesc || description,
+                      description: dispatch.feedDescription,
                       lastTool,
                       toolCount,
                       latestSummary,

package/telegram-plugin/gateway/worker-feed-dispatch.ts

@@ -0,0 +1,37 @@
+import type { Subagent } from '../registry/subagents-schema.js'
+
+export interface WorkerFeedDispatch {
+  /** True when the sub-agent was dispatched with `run_in_background: true`. */
+  isBackground: boolean
+  /**
+   * The human-readable task to render in the feed header
+   * ("🔧 Worker · <feedDescription>").
+   */
+  feedDescription: string
+}
+
+/**
+ * Resolve the two registry-derived inputs the worker-activity feed needs:
+ * whether the sub-agent was a background dispatch, and the task description
+ * to show in the feed header.
+ *
+ * The live watcher only carries a generic 'sub-agent' label — it never
+ * reassigns `description` from the worker jsonl. The real dispatch-time
+ * description lives in the registry `subagents` row (written by the pretool
+ * hook from the `Agent(description:)` input). Prefer it; fall back to the
+ * watcher's label only when the row is missing or its description is empty.
+ *
+ * Pure + DB-free so it pins the #2002 behavior under both vitest and bun —
+ * see worker-feed-dispatch.test.ts. The gateway must never inline this
+ * decision again: a regression here silently reverts the feed header to
+ * "· sub-agent".
+ */
+export function resolveWorkerFeedDispatch(
+  sub: Subagent | null,
+  watcherDescription: string,
+): WorkerFeedDispatch {
+  return {
+    isBackground: sub?.background ?? false,
+    feedDescription: (sub?.description ?? '') || watcherDescription,
+  }
+}

package/telegram-plugin/subagent-watcher.ts

@@ -73,7 +73,13 @@ export interface WorkerEntry {
   readonly agentId: string
   /** File path of the JSONL. */
   readonly filePath: string
-  /** Short description — from the sub-agent's first text/narrative line. */
+  /**
+   * Generic 'sub-agent' placeholder — the watcher deliberately does NOT
+   * reassign this from the worker jsonl (see the init at construction and
+   * the "Do NOT overwrite" note in the line-handler). The real dispatch-time
+   * task description lives in the registry `subagents` row; the gateway reads
+   * it there via resolveWorkerFeedDispatch for the worker-feed header.
+   */
   description: string
   /** Current lifecycle state. */
   state: WorkerState
@@ -864,6 +870,9 @@ export function startSubagentWatcher(config: SubagentWatcherConfig): SubagentWat
     const entry: WorkerEntry = {
       agentId,
       filePath,
+      // Generic placeholder only — never overwritten from the jsonl. The
+      // gateway substitutes the real registry description for the worker
+      // feed (resolveWorkerFeedDispatch). See the WorkerEntry.description doc.
       description: 'sub-agent',
       state: 'running',
       dispatchedAt: n,

package/telegram-plugin/tests/worker-feed-dispatch.test.ts

@@ -0,0 +1,63 @@
+import { describe, expect, it } from 'vitest'
+import type { Subagent } from '../registry/subagents-schema.js'
+import { resolveWorkerFeedDispatch } from '../gateway/worker-feed-dispatch.js'
+
+function makeSub(over: Partial<Subagent>): Subagent {
+  return {
+    id: 'toolu_01ABC',
+    parent_session_id: null,
+    parent_turn_key: null,
+    agent_type: 'general-purpose',
+    description: null,
+    background: false,
+    started_at: 0,
+    last_activity_at: null,
+    ended_at: null,
+    status: 'running',
+    result_summary: null,
+    jsonl_agent_id: 'a37ad7639ae61476c',
+    ...over,
+  }
+}
+
+describe('resolveWorkerFeedDispatch (#2002 regression pin)', () => {
+  it('uses the real registry description for the feed header, not the watcher label', () => {
+    const sub = makeSub({ background: true, description: 'Background ten-step worker' })
+    const out = resolveWorkerFeedDispatch(sub, 'sub-agent')
+    expect(out.isBackground).toBe(true)
+    expect(out.feedDescription).toBe('Background ten-step worker')
+  })
+
+  it('falls back to the watcher label when the registry row is missing', () => {
+    const out = resolveWorkerFeedDispatch(null, 'sub-agent')
+    expect(out.isBackground).toBe(false)
+    expect(out.feedDescription).toBe('sub-agent')
+  })
+
+  it('falls back to the watcher label when the registry description is null', () => {
+    const sub = makeSub({ background: true, description: null })
+    const out = resolveWorkerFeedDispatch(sub, 'sub-agent')
+    expect(out.isBackground).toBe(true)
+    expect(out.feedDescription).toBe('sub-agent')
+  })
+
+  it('falls back to the watcher label when the registry description is empty', () => {
+    const sub = makeSub({ background: true, description: '' })
+    const out = resolveWorkerFeedDispatch(sub, 'sub-agent')
+    expect(out.feedDescription).toBe('sub-agent')
+  })
+
+  it('reports a foreground sub-agent as not background', () => {
+    const sub = makeSub({ background: false, description: 'inline helper' })
+    const out = resolveWorkerFeedDispatch(sub, 'sub-agent')
+    expect(out.isBackground).toBe(false)
+    // description still resolves — callers gate on isBackground separately.
+    expect(out.feedDescription).toBe('inline helper')
+  })
+
+  it('a missing row defaults isBackground false so the feed never fires blind', () => {
+    // The gateway gates the feed on isBackground; a registry miss must not
+    // flip a foreground turn into a background one.
+    expect(resolveWorkerFeedDispatch(null, '').isBackground).toBe(false)
+  })
+})