switchroom 0.16.6 → 0.16.8

package/dist/host-control/main.js

@@ -22587,7 +22587,7 @@ import { existsSync as existsSync6, readFileSync as readFileSync4 } from "node:f
 import { dirname as dirname4, join as join2 } from "node:path";
 
 // src/build-info.ts
-var VERSION = "0.16.6";
+var VERSION = "0.16.8";
 
 // src/cli/resolve-version.ts
 function readPackageVersion() {
@@ -22827,7 +22827,7 @@ function parseUpdateResultLine(stdout) {
 // src/host-control/config-edit-validator.ts
 import { mkdtempSync, writeFileSync as writeFileSync2, rmSync as rmSync2, existsSync as existsSync7, readFileSync as readFileSync5 } from "node:fs";
 import { tmpdir } from "node:os";
-import { join as join4, isAbsolute as isAbsolute2, normalize } from "node:path";
+import { join as join4, isAbsolute as isAbsolute2, normalize, basename as basename2 } from "node:path";
 import { spawnSync as spawnSync2 } from "node:child_process";
 import { isDeepStrictEqual } from "node:util";
 var MAX_PATCH_BYTES = 1024 * 1024;
@@ -22847,7 +22847,7 @@ function isTargetPathHeader(headerPath, targetBasename) {
   const norm = normalize(p);
   if (norm.includes("..") || isAbsolute2(norm))
     return false;
-  return norm === targetBasename;
+  return norm === targetBasename || basename2(norm) === targetBasename;
 }
 function validateShape(unifiedDiff, targetPath) {
   const byteLen = Buffer.byteLength(unifiedDiff, "utf8");
@@ -22923,8 +22923,8 @@ function applyPatch(unifiedDiff, configPath, gitBin) {
   const liveContent = readFileSync5(configPath, "utf8");
   const scratchDir = mkdtempSync(join4(tmpdir(), "config-propose-edit-"));
   try {
-    const basename2 = configPath.split("/").pop() ?? "switchroom.yaml";
-    const scratchFile = join4(scratchDir, basename2);
+    const basename3 = configPath.split("/").pop() ?? "switchroom.yaml";
+    const scratchFile = join4(scratchDir, basename3);
     writeFileSync2(scratchFile, liveContent);
     const patchFile = join4(scratchDir, "proposal.patch");
     writeFileSync2(patchFile, unifiedDiff);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "switchroom",
-  "version": "0.16.6",
+  "version": "0.16.8",
   "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/profiles/_base/cron-session.sh.hbs

@@ -86,6 +86,39 @@ CRON_APPEND_PROMPT="You are the cheap background cron worker for {{name}}. You r
 # (no --continue) — low context by construction. cd into the workspace so
 # claude's project key matches the pre-seeded trust state (.claude-cron).
 cd "{{agentDir}}" || exit 1
+
+# LiteLLM routing for the cron session — mirrors start.sh's boot block.
+# IMPORTANT: the vault key is provisioned under the BASE agent name ({{name}}),
+# NOT the cron identity ({{name}}-cron). Use the Handlebars template var so the
+# lookup is a compile-time literal — no fragile runtime suffix-stripping.
+# Attribution headers carry $SWITCHROOM_AGENT_NAME (= {{name}}-cron) so LiteLLM
+# can distinguish cron spend from main-session spend per agent.
+# FAIL-OPEN: missing key OR unreachable proxy → strip routing env, fall back to
+# direct OAuth. An outage must never take the cron session dark.
+if [ -n "$SWITCHROOM_LITELLM" ] && command -v switchroom >/dev/null 2>&1; then
+  sr_ll_key="$(switchroom vault get "litellm/{{name}}/api-key" 2>/dev/null || true)"
+  sr_ll_ok=""
+  if [ -z "$sr_ll_key" ]; then
+    echo "litellm: no virtual key for cron '{{name}}' — falling back to direct OAuth (no tracking/guardrail)" >&2
+  elif command -v curl >/dev/null 2>&1 && [ -n "$ANTHROPIC_BASE_URL" ] \
+       && ! curl -fsS -m 5 -o /dev/null "${ANTHROPIC_BASE_URL%/}/health/liveliness" 2>/dev/null; then
+    echo "litellm: proxy unreachable at $ANTHROPIC_BASE_URL — falling back to direct OAuth (no tracking/guardrail this session)" >&2
+  else
+    sr_ll_ok="1"
+  fi
+  if [ -n "$sr_ll_ok" ]; then
+    export ANTHROPIC_CUSTOM_HEADERS="x-litellm-api-key: Bearer $sr_ll_key
+x-litellm-customer-id: $SWITCHROOM_AGENT_NAME
+x-litellm-tags: agent:$SWITCHROOM_AGENT_NAME,profile:${SWITCHROOM_AGENT_PROFILE:-default}"
+    export CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY=1
+  else
+    # Fail-open: drop every routing var so the claude CLI talks to Anthropic
+    # directly on its OAuth credential (subscription path), unproxied.
+    unset ANTHROPIC_BASE_URL ANTHROPIC_SMALL_FAST_MODEL SWITCHROOM_LITELLM
+  fi
+  unset sr_ll_key sr_ll_ok
+fi
+
 # Create the cron tmux session DETACHED (-d), not in attach mode. This is a
 # SUPERVISED BACKGROUND sidecar (start.sh forks it with `&`) with no controlling
 # TTY — the MAIN session owns the container's foreground TTY. The attach flag

package/profiles/_base/start.sh.hbs

@@ -51,6 +51,41 @@ if [ "$SWITCHROOM_RUNTIME" = "docker" ] && [ -z "$SWITCHROOM_DOCKER_TMUX_INNER"
 {{/each}}
 {{/if}}
 
+  # LiteLLM virtual-key fetch for the GATEWAY process (outer-pass hoist).
+  # The INNER block below fetches this same key for the `claude` process;
+  # the gateway daemon forks HERE (in the outer pass) so it needs
+  # ANTHROPIC_CUSTOM_HEADERS exported BEFORE the gateway fork below, or
+  # discoverSrModels() returns [] and /model never shows OpenRouter entries.
+  #
+  # Mirrors the INNER block's fail-open logic exactly:
+  #   - missing key   → log + skip export (gateway talks direct OAuth)
+  #   - proxy down    → log + strip ALL routing env (fail-open)
+  #   - ANTHROPIC_CUSTOM_HEADERS already set → skip (idempotent)
+  #
+  # SWITCHROOM_AGENT_NAME is injected by compose env (compose.ts:1816)
+  # so it is available here, before the inner-pass export at line ~320.
+  if [ -n "$SWITCHROOM_LITELLM" ] && [ -z "$ANTHROPIC_CUSTOM_HEADERS" ] && command -v switchroom >/dev/null 2>&1; then
+    sr_ll_key="$(switchroom vault get "litellm/$SWITCHROOM_AGENT_NAME/api-key" 2>/dev/null || true)"
+    sr_ll_ok=""
+    if [ -z "$sr_ll_key" ]; then
+      echo "litellm(outer): no virtual key for agent '$SWITCHROOM_AGENT_NAME' — gateway will use direct OAuth (no tracking/guardrail)" >&2
+    elif command -v curl >/dev/null 2>&1 && [ -n "$ANTHROPIC_BASE_URL" ] \
+         && ! curl -fsS -m 5 -o /dev/null "${ANTHROPIC_BASE_URL%/}/health/liveliness" 2>/dev/null; then
+      echo "litellm(outer): proxy unreachable at $ANTHROPIC_BASE_URL — falling back to direct OAuth (no tracking/guardrail this session)" >&2
+    else
+      sr_ll_ok="1"
+    fi
+    if [ -n "$sr_ll_ok" ]; then
+      export ANTHROPIC_CUSTOM_HEADERS="x-litellm-api-key: Bearer $sr_ll_key
+x-litellm-customer-id: $SWITCHROOM_AGENT_NAME
+x-litellm-tags: agent:$SWITCHROOM_AGENT_NAME,profile:${SWITCHROOM_AGENT_PROFILE:-default}"
+      export CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY=1
+    else
+      unset ANTHROPIC_BASE_URL ANTHROPIC_SMALL_FAST_MODEL SWITCHROOM_LITELLM
+    fi
+    unset sr_ll_key sr_ll_ok
+  fi
+
   # Tiny in-process supervisor: runs cmd in a respawn loop with
   # exponential backoff (1→2→4…→60s cap) and NEVER permanently gives
   # up. Rationale (RFC J / install-validation 2026-05-17): the

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

@@ -46156,9 +46156,10 @@ function menuKeyboard(claudeOptions, srOptions) {
 async function buildModelMenu(deps) {
   if (deps.isBusy())
     return busyReply(deps);
-  const [discovered, quota] = await Promise.all([
+  const [discovered, quota, srNames] = await Promise.all([
     deps.discover(deps.getAgentName()),
-    deps.getQuotaBrief().catch(() => null)
+    deps.getQuotaBrief().catch(() => null),
+    deps.discoverSrModels().catch(() => [])
   ]);
   if (!discovered.ok) {
     const v1 = await handleModelCommand({ kind: "show" }, deps);
@@ -46168,7 +46169,8 @@ async function buildModelMenu(deps) {
       html: true
     };
   }
-  const { claude: claudeOptions, sr: srOptions } = classifyDiscoveredOptions(discovered.options);
+  const { claude: claudeOptions } = classifyDiscoveredOptions(discovered.options);
+  const srOptions = srNames.map((name, i) => ({ index: i, label: name, detail: "", current: false }));
   const current = claudeOptions.find((o) => o.current);
   const lines = [`<b>Model \u2014 ${deps.escapeHtml(deps.getAgentName())}</b>`];
   if (discovered.dismissFailed) {
@@ -54801,6 +54803,8 @@ function naturalAction(toolName, inputPreview) {
       return "update its task list";
     case "ExitPlanMode":
       return "exit plan mode";
+    case "config_propose_edit":
+      return "edit switchroom config";
     default:
       return `use ${toolName}`;
   }
@@ -56011,11 +56015,11 @@ function readTurnActiveMarkerAgeMs(stateDir, now) {
 }
 
 // ../src/build-info.ts
-var VERSION = "0.16.6";
-var COMMIT_SHA = "925f5798";
-var COMMIT_DATE = "2026-06-28T03:53:56Z";
-var LATEST_PR = 2611;
-var COMMITS_AHEAD_OF_TAG = 0;
+var VERSION = "0.16.8";
+var COMMIT_SHA = "c2668516";
+var COMMIT_DATE = "2026-06-28T15:28:08+10:00";
+var LATEST_PR = null;
+var COMMITS_AHEAD_OF_TAG = 5;
 
 // gateway/boot-version.ts
 function formatRelativeAgo(iso) {
@@ -65208,6 +65212,27 @@ bot.command("clear", async (ctx) => {
 function buildModelDeps() {
   return {
     discover: (a) => discoverModels(a),
+    discoverSrModels: async () => {
+      const base = process.env.ANTHROPIC_BASE_URL;
+      const headers = process.env.ANTHROPIC_CUSTOM_HEADERS;
+      if (!base || !headers)
+        return [];
+      const keyMatch = headers.match(/x-litellm-api-key:\s*Bearer\s*(\S+)/);
+      if (!keyMatch)
+        return [];
+      try {
+        const res = await fetch(`${base.replace(/\/$/, "")}/model/info`, {
+          headers: { Authorization: `Bearer ${keyMatch[1]}` },
+          signal: AbortSignal.timeout(5000)
+        });
+        if (!res.ok)
+          return [];
+        const data = await res.json();
+        return (data.data ?? []).map((m) => m.model_name).filter((n) => n.startsWith("sr-")).sort();
+      } catch {
+        return [];
+      }
+    },
     select: (a, label) => selectModel(a, label),
     isBusy: () => currentTurn !== null,
     getAgentName: getMyAgentName,

package/telegram-plugin/gateway/gateway.ts

@@ -15981,6 +15981,27 @@ bot.command('clear', async ctx => {
 function buildModelDeps(): ModelMenuDeps & ModelCommandDeps {
   return {
     discover: (a) => discoverModels(a),
+    discoverSrModels: async () => {
+      const base = process.env.ANTHROPIC_BASE_URL
+      const headers = process.env.ANTHROPIC_CUSTOM_HEADERS
+      if (!base || !headers) return []
+      const keyMatch = headers.match(/x-litellm-api-key:\s*Bearer\s*(\S+)/)
+      if (!keyMatch) return []
+      try {
+        const res = await fetch(`${base.replace(/\/$/, '')}/model/info`, {
+          headers: { Authorization: `Bearer ${keyMatch[1]}` },
+          signal: AbortSignal.timeout(5000),
+        })
+        if (!res.ok) return []
+        const data = (await res.json()) as { data?: Array<{ model_name: string }> }
+        return (data.data ?? [])
+          .map((m) => m.model_name)
+          .filter((n) => n.startsWith('sr-'))
+          .sort()
+      } catch {
+        return []
+      }
+    },
     select: (a, label) => selectModel(a, label),
     isBusy: () => currentTurn !== null,
     getAgentName: getMyAgentName,

package/telegram-plugin/gateway/model-command.ts

@@ -214,6 +214,11 @@ export interface ModelMenuDeps {
   getAgentName: () => string
   /** One-line quota summary (e.g. "29% / 5h · 33% / 7d") or null. */
   getQuotaBrief: () => Promise<string | null>
+  /**
+   * Fetch sr-* model names available via LiteLLM for this agent.
+   * Returns [] when LiteLLM is not configured or the probe fails.
+   */
+  discoverSrModels: () => Promise<string[]>
   escapeHtml: (s: string) => string
 }
 
@@ -344,9 +349,10 @@ export async function buildModelMenu(
 ): Promise<ModelMenuReply> {
   if (deps.isBusy()) return busyReply(deps)
 
-  const [discovered, quota] = await Promise.all([
+  const [discovered, quota, srNames] = await Promise.all([
     deps.discover(deps.getAgentName()),
     deps.getQuotaBrief().catch(() => null),
+    deps.discoverSrModels().catch(() => [] as string[]),
   ])
 
   if (!discovered.ok) {
@@ -364,7 +370,10 @@ export async function buildModelMenu(
   // or a prior session switch). Labelling the ✔ row "Now:" was misleading —
   // it could read "Opus 4.8" while the live session is on Fable. Call it what
   // it is, and tell the operator a switch applies to the live session.
-  const { claude: claudeOptions, sr: srOptions } = classifyDiscoveredOptions(discovered.options)
+  // sr-* models come from LiteLLM (/model/info via discoverSrModels), not the
+  // claude picker — the CLI only knows Anthropic models.
+  const { claude: claudeOptions } = classifyDiscoveredOptions(discovered.options)
+  const srOptions: ModelPickerOption[] = srNames.map((name, i) => ({ index: i, label: name, detail: '', current: false }))
   const current = claudeOptions.find((o) => o.current)
   const lines: string[] = [`<b>Model — ${deps.escapeHtml(deps.getAgentName())}</b>`]
   if (discovered.dismissFailed) {

package/telegram-plugin/permission-title.ts

@@ -212,6 +212,11 @@ export function naturalAction(
       return "update its task list";
     case "ExitPlanMode":
       return "exit plan mode";
+    // hostd config-edit verb (#2605) — not mcp__-prefixed (it's a direct
+    // wire call from the agent-config MCP server), so it falls through to
+    // the switch rather than naturalMcpAction. Give it a readable title.
+    case "config_propose_edit":
+      return "edit switchroom config";
     default:
       return `use ${toolName}`;
   }

package/telegram-plugin/tests/model-command.test.ts

@@ -283,6 +283,7 @@ function makeMenuDeps(overrides: Partial<ModelMenuDeps> = {}) {
     },
     isBusy: () => false,
     getQuotaBrief: async () => "29% / 5h · 33% / 7d",
+    discoverSrModels: async () => [],
     ...overrides,
   };
   return { deps, calls, injectCalls: base.calls };
@@ -475,13 +476,10 @@ describe("SR_MODEL_LABELS", () => {
 });
 
 describe("buildModelMenu — with sr-* models", () => {
+  // sr-* models now come from discoverSrModels (LiteLLM), not the claude picker.
   function makeMenuDepsWithSr(overrides: Partial<ModelMenuDeps> = {}) {
     return makeMenuDeps({
-      discover: async () => ({
-        ok: true as const,
-        options: OPTIONS_WITH_SR,
-        currentLabel: "Sonnet",
-      }),
+      discoverSrModels: async () => ["sr-gemini-2.5-pro", "sr-deepseek-r1"],
       ...overrides,
     });
   }
@@ -550,11 +548,7 @@ describe("buildModelMenu — with sr-* models", () => {
 describe("handleModelMenuCallback — sr-* selection", () => {
   function makeMenuDepsWithSr(overrides: Partial<ModelMenuDeps> = {}) {
     return makeMenuDeps({
-      discover: async () => ({
-        ok: true as const,
-        options: OPTIONS_WITH_SR,
-        currentLabel: "Sonnet",
-      }),
+      discoverSrModels: async () => ["sr-gemini-2.5-pro", "sr-deepseek-r1"],
       ...overrides,
     });
   }

package/telegram-plugin/uat/scenarios/jtbd-model-litellm-sr-dm.test.ts

@@ -0,0 +1,147 @@
+/**
+ * UAT — /model with LiteLLM sr-* (OpenRouter) model switching + spend tracking.
+ *
+ * Covers:
+ *   1. /model menu shows section headers ("Claude (Max / Pro subscription)" and
+ *      "OpenRouter / external") when sr-* models are available.
+ *   2. Tapping an sr-* button switches the live session (text-inject path,
+ *      not cursor-nav) and the confirmation banner appears.
+ *   3. After switching, the agent replies on the new model, and LiteLLM
+ *      spend logs show agent:test-harness attribution.
+ *   4. Session resets to the configured model on restart (out of scope for
+ *      this test — asserted in jtbd-always-on-after-restart-dm).
+ *
+ * Self-skips green when:
+ *   - SWITCHROOM_UAT_DRIVER_SESSION is not set (no Telegram driver)
+ *   - LiteLLM admin key unavailable (SWITCHROOM_UAT_LITELLM_ADMIN_KEY unset)
+ *   - No sr-* buttons found in the menu (agent not LiteLLM-enabled or no
+ *     sr-* models registered in LiteLLM)
+ */
+
+import { describe, expect, it } from "vitest";
+import { spinUp } from "../harness.js";
+
+const AGENT = "test-harness";
+const LITELLM_URL = process.env.SWITCHROOM_UAT_LITELLM_URL ?? "http://127.0.0.1:4010";
+const LITELLM_ADMIN_KEY = process.env.SWITCHROOM_UAT_LITELLM_ADMIN_KEY ?? "";
+
+async function getLiteLLMSpendForAgent(agent: string): Promise<number> {
+  if (!LITELLM_ADMIN_KEY) return -1;
+  const res = await fetch(`${LITELLM_URL}/spend/tags`, {
+    headers: { Authorization: `Bearer ${LITELLM_ADMIN_KEY}` },
+  }).catch(() => null);
+  if (!res?.ok) return -1;
+  const tags: Array<{ individual_request_tag: string; log_count: number }> = await res.json();
+  return tags.find((t) => t.individual_request_tag === `agent:${agent}`)?.log_count ?? 0;
+}
+
+describe("uat: /model sr-* LiteLLM routing — section headers + session switch + spend attribution", () => {
+  it(
+    "menu shows Claude/OpenRouter section headers, sr-* tap switches session and LiteLLM logs the request",
+    async () => {
+      const sc = await spinUp({ agent: AGENT });
+      try {
+        await sc.sendDM("/model");
+        const menu = await sc.expectMessage(/Default \(new sessions\):/i, {
+          from: "bot",
+          timeout: 30_000,
+        });
+
+        // ── 1. Section headers ──────────────────────────────────────────
+        const kb = await sc.driver.getKeyboard(sc.botUserId, menu.messageId);
+        const flat = (kb ?? []).flat().filter((b) => b.callbackData);
+
+        const claudeHeader = flat.find(
+          (b) => b.text.includes("Claude") && b.text.includes("subscription") && b.callbackData === "mdl:h",
+        );
+        const openrouterHeader = flat.find(
+          (b) => b.text.includes("OpenRouter") && b.callbackData === "mdl:h",
+        );
+        const srButton = flat.find((b) => b.callbackData?.startsWith("mdl:sr:"));
+
+        if (!srButton) {
+          console.log("No sr-* buttons in menu — agent not LiteLLM-enabled or no sr-* models registered. Skipping.");
+          return;
+        }
+
+        expect(claudeHeader, "Claude (Max / Pro subscription) header row").toBeDefined();
+        expect(openrouterHeader, "OpenRouter / external header row").toBeDefined();
+        expect(menu.text).toContain("Max/Pro subscription");
+        expect(menu.text).toContain("OpenRouter");
+
+        // ── 2. sr-* switch ─────────────────────────────────────────────
+        const spendBefore = await getLiteLLMSpendForAgent(AGENT);
+        const srName = srButton.callbackData!.replace("mdl:sr:", "");
+
+        await sc.driver.pressButton(sc.botUserId, menu.messageId, srButton.callbackData!);
+        // Allow text-inject + claude's /model response to propagate
+        await new Promise((r) => setTimeout(r, 8_000));
+
+        const afterMenu = await sc.driver.getMessage(sc.botUserId, menu.messageId);
+        expect(afterMenu?.text ?? "", "confirmation banner after sr-* tap").toMatch(
+          /Set model to|Switched|session/i,
+        );
+        // Card must keep its buttons (#2270 — no dead card)
+        const kbAfter = await sc.driver.getKeyboard(sc.botUserId, menu.messageId);
+        expect((kbAfter ?? []).flat().length, "menu keeps buttons after sr-* tap").toBeGreaterThan(0);
+
+        // ── 3. Send a quick message to generate a LiteLLM-routed turn ──
+        await sc.sendDM("Just reply with the word OK.");
+        await sc.expectMessage(/ok/i, { from: "bot", timeout: 60_000 });
+
+        // ── 4. LiteLLM spend attribution ────────────────────────────────
+        if (spendBefore >= 0) {
+          // Give LiteLLM a moment to flush the log
+          await new Promise((r) => setTimeout(r, 3_000));
+          const spendAfter = await getLiteLLMSpendForAgent(AGENT);
+          expect(spendAfter, `agent:${AGENT} log_count increased after turn`).toBeGreaterThan(spendBefore);
+        }
+
+        // ── Restore: switch back to configured model ────────────────────
+        const currentKb = await sc.driver.getKeyboard(sc.botUserId, menu.messageId);
+        const restoreBtn = (currentKb ?? []).flat().find(
+          (b) => b.callbackData?.startsWith("mdl:s:") && /Default|Sonnet|claude-sonnet/i.test(b.text),
+        );
+        if (restoreBtn?.callbackData) {
+          await sc.driver.pressButton(sc.botUserId, menu.messageId, restoreBtn.callbackData);
+          await new Promise((r) => setTimeout(r, 4_000));
+        }
+
+        console.log(`✅ sr-* model switch (${srName}) verified end-to-end through LiteLLM`);
+      } finally {
+        await sc.tearDown();
+      }
+    },
+    180_000,
+  );
+
+  it(
+    "header row tap shows toast without switching model or opening picker",
+    async () => {
+      const sc = await spinUp({ agent: AGENT });
+      try {
+        await sc.sendDM("/model");
+        const menu = await sc.expectMessage(/Default \(new sessions\):/i, {
+          from: "bot",
+          timeout: 30_000,
+        });
+        const kb = await sc.driver.getKeyboard(sc.botUserId, menu.messageId);
+        const flat = (kb ?? []).flat();
+        const headerBtn = flat.find((b) => b.callbackData === "mdl:h");
+        if (!headerBtn) {
+          console.log("No header row — agent not LiteLLM-enabled. Skipping.");
+          return;
+        }
+        // Pressing the header should NOT change the menu text
+        const textBefore = menu.text;
+        await sc.driver.pressButton(sc.botUserId, menu.messageId, "mdl:h");
+        await new Promise((r) => setTimeout(r, 3_000));
+        const after = await sc.driver.getMessage(sc.botUserId, menu.messageId);
+        expect(after?.text ?? "").toBe(textBefore);
+      } finally {
+        await sc.tearDown();
+      }
+    },
+    60_000,
+  );
+});