switchroom 0.17.3 → 0.17.5

package/dist/cli/switchroom.js

@@ -63737,8 +63737,8 @@ import { existsSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 
 // src/build-info.ts
-var VERSION = "0.17.3";
-var COMMIT_SHA = "b8f8edaa";
+var VERSION = "0.17.5";
+var COMMIT_SHA = "aae03307";
 
 // src/cli/resolve-version.ts
 function readPackageVersion() {

package/dist/host-control/main.js

@@ -22670,7 +22670,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.17.3";
+var VERSION = "0.17.5";
 
 // src/cli/resolve-version.ts
 function readPackageVersion() {
@@ -24819,7 +24819,7 @@ class HostdServer {
         });
         return this.reconcileFailedRolledBack(`write failed: ${e.message}`, req, caller, started);
       }
-      const runner = this.opts.runReconcile ?? (async () => this.runSwitchroom(["apply"]));
+      const runner = this.opts.runReconcile ?? (async () => this.runSwitchroom(caller.kind === "agent" ? ["apply", "--only", callerName, "--non-interactive"] : ["apply", "--non-interactive"]));
       const recRes = await runner({ requestId: approvalId });
       if (recRes.exit_code === 0) {
         const blast = classifyBlastRadius(snapshot, postApply);

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.17.3",
+  "version": "0.17.5",
   "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/start.sh.hbs

@@ -303,12 +303,26 @@ for _stray_claude in \
   "$HOME/.local/bin/claude" \
   "$HOME/bin/claude"; do
   if [ -e "$_stray_claude" ] || [ -L "$_stray_claude" ]; then
+    # Skip our own canonical symlink re-seated at end of this block — it points
+    # back to the image binary and is not a shadow install. Any other file or
+    # symlink at this path (e.g. npm self-install, manual copy) is pruned.
+    if [ -L "$_stray_claude" ] && [ "$(readlink "$_stray_claude" 2>/dev/null)" = "/usr/local/bin/claude" ]; then
+      continue
+    fi
     echo "start.sh: pruning user-local claude shadow at $_stray_claude (image binary is authoritative)" >&2
     rm -f "$_stray_claude"
   fi
 done
 rm -rf "$HOME/.npm-global/lib/node_modules/@anthropic-ai/claude-code" 2>/dev/null || true
 unset _stray_claude
+# Re-seat the canonical symlink so claude v2.1.x+ self-check ("claude command
+# at $HOME/.local/bin/claude missing or broken") stays silent. The prune loop
+# above skips this canonical pointer (via the readlink guard) and removes only
+# genuine shadow installs; the ln -sf below creates the symlink on first boot
+# and is a no-op on subsequent boots. `mkdir -p` is safe: the dir already exists
+# or is about to be created.
+mkdir -p "$HOME/.local/bin"
+ln -sf /usr/local/bin/claude "$HOME/.local/bin/claude"
 
 # ── Root-tier agent: provision the docker CLI ────────────────────────
 # The root debugging agent (`root: true`) has /var/run/docker.sock

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

@@ -58590,10 +58590,10 @@ function readTurnActiveMarkerAgeMs(stateDir, now) {
 }
 
 // ../src/build-info.ts
-var VERSION = "0.17.3";
-var COMMIT_SHA = "b8f8edaa";
-var COMMIT_DATE = "2026-07-05T10:15:33Z";
-var LATEST_PR = 2836;
+var VERSION = "0.17.5";
+var COMMIT_SHA = "aae03307";
+var COMMIT_DATE = "2026-07-05T22:09:14+10:00";
+var LATEST_PR = null;
 var COMMITS_AHEAD_OF_TAG = 0;
 
 // gateway/boot-version.ts
@@ -60650,9 +60650,10 @@ var FEED_LIVENESS_OPEN_MS = (() => {
 })();
 var POST_ANSWER_LIVENESS_STALE_MS = parsePostAnswerLivenessMs(process.env.SWITCHROOM_POST_ANSWER_LIVENESS_STALE_MS) || 30000;
 function turnInFlightForGate() {
+  const hasPendingApproval = pendingPermissions.size > 0;
   if (!isDeliveryCutoverEnabled())
-    return claudeBusyKeys.size > 0;
-  return probeGateParity(isMachineInTurn(), claudeBusyKeys.size);
+    return claudeBusyKeys.size > 0 || hasPendingApproval;
+  return probeGateParity(isMachineInTurn(), claudeBusyKeys.size) || hasPendingApproval;
 }
 function deliverResumeSyntheticOrBuffer(agent, inbound) {
   const decision = decideInboundDelivery({

package/telegram-plugin/gateway/gateway.ts

@@ -2039,14 +2039,25 @@ const POST_ANSWER_LIVENESS_STALE_MS = parsePostAnswerLivenessMs(
  * message self-blocks. See the snapshot at the inbound handler.
  */
 function turnInFlightForGate(): boolean {
-  if (!isDeliveryCutoverEnabled()) return claudeBusyKeys.size > 0
+  // Include pendingPermissions in the "turn busy" signal (#2841): after the
+  // first interim reply, `releaseTurnBufferGate` clears claudeBusyKeys/machine
+  // even though a permission card is still outstanding and claude is still
+  // blocked mid-turn waiting for the tap verdict. A new inbound that arrives
+  // in this window would see turnInFlightAtReceipt=false and deliver directly,
+  // landing while claude's bridge is suspended in the permission-notification
+  // handler — displacing the approval and orphaning the pending brevo/MCP call.
+  // Keeping the gate closed for as long as there is an outstanding approval
+  // card prevents that race. The gate reopens when the card is tapped or times
+  // out (pendingPermissions.delete in finalizeCallback / TTL sweep).
+  const hasPendingApproval = pendingPermissions.size > 0
+  if (!isDeliveryCutoverEnabled()) return claudeBusyKeys.size > 0 || hasPendingApproval
   // Machine is authoritative. Run the log-only drift canary (#2794): the
   // imperative `claudeBusyKeys` shadow is still live in parallel, so a
   // dangerous over-hold divergence (machine holds the gate while the
   // imperative view is idle) is surfaced without changing behaviour. The
   // benign orphan-dangle direction — the wedge the machine self-heals — is
   // NOT flagged. `probeGateParity` returns the machine value unchanged.
-  return probeGateParity(isMachineInTurn(), claudeBusyKeys.size)
+  return probeGateParity(isMachineInTurn(), claudeBusyKeys.size) || hasPendingApproval
 }
 
 /**

package/telegram-plugin/tests/permission-no-repeat-wiring.test.ts

@@ -84,3 +84,29 @@ describe('no-repeat-on-timeout wiring', () => {
     expect(GATEWAY).toMatch(/permissionTimeoutSignatures\.delete\(sig\)/)
   })
 })
+
+describe('inbound gate holds while approval card is outstanding (#2841)', () => {
+  // turnInFlightForGate() must return true when pendingPermissions is non-empty,
+  // even after releaseTurnBufferGate has cleared claudeBusyKeys/machine on the
+  // first interim reply. Without this, a new inbound delivered in that window
+  // displaces the approval context and orphans the pending MCP call.
+  it('turnInFlightForGate includes pendingPermissions.size > 0 on the legacy path', () => {
+    // span 1500: the function has a ~800-char comment block before the code lines.
+    const fn = slice(GATEWAY, 'function turnInFlightForGate()', 1500)
+    // Both paths (legacy claudeBusyKeys + machine-authoritative) must include the check.
+    expect(fn).toMatch(/claudeBusyKeys\.size\s*>\s*0\s*\|\|\s*hasPendingApproval/)
+  })
+
+  it('turnInFlightForGate includes pendingPermissions.size > 0 on the machine path', () => {
+    const fn = slice(GATEWAY, 'function turnInFlightForGate()', 1600)
+    // probeGateParity(...) || hasPendingApproval — the inner arg contains its own
+    // parens (isMachineInTurn()), so match the two tokens independently.
+    expect(fn).toContain('probeGateParity(')
+    expect(fn).toMatch(/probeGateParity[\s\S]+?\|\|\s*hasPendingApproval/)
+  })
+
+  it('hasPendingApproval reads pendingPermissions.size', () => {
+    const fn = slice(GATEWAY, 'function turnInFlightForGate()', 1500)
+    expect(fn).toMatch(/pendingPermissions\.size\s*>\s*0/)
+  })
+})