switchroom 0.18.6 → 0.18.8

package/dist/agent-scheduler/index.js

@@ -11155,6 +11155,7 @@ var SessionContinuitySchema = exports_external.object({
   max_turns_in_briefing: exports_external.number().int().positive().optional().describe("Cap on recent user/assistant turn pairs fed to the summarizer."),
   resume_mode: exports_external.enum(["auto", "continue", "handoff", "none"]).optional().describe("How to resume the next session. 'handoff' (default as of #362) " + "never passes --continue; a fresh Claude starts each restart and " + "reads a briefing assembled from recent Telegram messages, Hindsight " + "recall, and today's daily memory file. 'auto' uses --continue when " + "the latest JSONL is smaller than resume_max_bytes, else falls back " + "to the handoff briefing. 'continue' always passes --continue. " + "'none' starts completely fresh every time."),
   resume_max_bytes: exports_external.number().int().positive().optional().describe("Byte threshold above which 'auto' mode falls back to handoff " + "instead of --continue. Default 2_000_000 (~2MB). Large transcripts " + "can blow out the context window even with prefix caching, and " + "--continue replay is known-fragile at scale."),
+  boot_resume: exports_external.enum(["always", "in-flight", "never"]).optional().describe("How the gateway auto-resumes a turn that was IN FLIGHT when the " + "agent restarted. 'in-flight' (default) resumes genuinely " + "interrupted work even after a deliberate/operator restart — a " + "sanctioned restart landing mid-turn no longer silently drops the " + "work. 'always' forces resume unconditionally (same as the " + "SWITCHROOM_BOOT_RESUME_ALWAYS=1 escape hatch). 'never' is the " + "quota-saving posture: don't auto-replay work across a clean " + "restart — but the user is STILL sent a passive notice of what was " + "in flight (silence is never used). Independent of the at-most-once " + "resume ledger and the bounded resume-chain loop-guard, which always " + "apply. Threaded to the gateway as SWITCHROOM_BOOT_RESUME."),
   session_retention_max_count: exports_external.number().int().nonnegative().optional().describe("Session-JSONL retention (issue #2792): keep at most this many " + "newest session transcripts under .claude/projects; older ones " + "past both this count and the age bound are pruned by the Stop " + "hook. The newest sessions (and the handoff source) are always " + "kept. Default 20; set 0 to disable the count bound."),
   session_retention_max_age_days: exports_external.number().int().nonnegative().optional().describe("Session-JSONL retention (issue #2792): prune session transcripts " + "older than this many days (a file is deleted only when it is BOTH " + "over the count bound and older than this). Default 30; set 0 to " + "disable the age bound.")
 }).optional();

package/dist/auth-broker/index.js

@@ -16784,6 +16784,7 @@ var SessionContinuitySchema = exports_external.object({
   max_turns_in_briefing: exports_external.number().int().positive().optional().describe("Cap on recent user/assistant turn pairs fed to the summarizer."),
   resume_mode: exports_external.enum(["auto", "continue", "handoff", "none"]).optional().describe("How to resume the next session. 'handoff' (default as of #362) " + "never passes --continue; a fresh Claude starts each restart and " + "reads a briefing assembled from recent Telegram messages, Hindsight " + "recall, and today's daily memory file. 'auto' uses --continue when " + "the latest JSONL is smaller than resume_max_bytes, else falls back " + "to the handoff briefing. 'continue' always passes --continue. " + "'none' starts completely fresh every time."),
   resume_max_bytes: exports_external.number().int().positive().optional().describe("Byte threshold above which 'auto' mode falls back to handoff " + "instead of --continue. Default 2_000_000 (~2MB). Large transcripts " + "can blow out the context window even with prefix caching, and " + "--continue replay is known-fragile at scale."),
+  boot_resume: exports_external.enum(["always", "in-flight", "never"]).optional().describe("How the gateway auto-resumes a turn that was IN FLIGHT when the " + "agent restarted. 'in-flight' (default) resumes genuinely " + "interrupted work even after a deliberate/operator restart — a " + "sanctioned restart landing mid-turn no longer silently drops the " + "work. 'always' forces resume unconditionally (same as the " + "SWITCHROOM_BOOT_RESUME_ALWAYS=1 escape hatch). 'never' is the " + "quota-saving posture: don't auto-replay work across a clean " + "restart — but the user is STILL sent a passive notice of what was " + "in flight (silence is never used). Independent of the at-most-once " + "resume ledger and the bounded resume-chain loop-guard, which always " + "apply. Threaded to the gateway as SWITCHROOM_BOOT_RESUME."),
   session_retention_max_count: exports_external.number().int().nonnegative().optional().describe("Session-JSONL retention (issue #2792): keep at most this many " + "newest session transcripts under .claude/projects; older ones " + "past both this count and the age bound are pruned by the Stop " + "hook. The newest sessions (and the handoff source) are always " + "kept. Default 20; set 0 to disable the count bound."),
   session_retention_max_age_days: exports_external.number().int().nonnegative().optional().describe("Session-JSONL retention (issue #2792): prune session transcripts " + "older than this many days (a file is deleted only when it is BOTH " + "over the count bound and older than this). Default 30; set 0 to " + "disable the age bound.")
 }).optional();

package/dist/cli/autoaccept-poll.js

@@ -209,6 +209,92 @@ function sendKeys2(agentName, keys) {
   }
 }
 
+// src/agents/permission-pending-query.ts
+import { createConnection } from "node:net";
+import { join } from "node:path";
+import { randomUUID } from "node:crypto";
+function resolveGatewaySocketPath() {
+  const stateDir = process.env.TELEGRAM_STATE_DIR ?? "/state/agent/telegram";
+  return process.env.SWITCHROOM_GATEWAY_SOCKET ?? join(stateDir, "gateway.sock");
+}
+function queryPendingPermission(agentName, opts = {}) {
+  const socketPath = opts.socketPath ?? resolveGatewaySocketPath();
+  const connect = opts._connect ?? ((p) => createConnection(p));
+  const log = opts._log ?? ((m) => console.error(m));
+  const timeoutMs = opts.timeoutMs ?? 2000;
+  const correlationId = randomUUID();
+  const msg = {
+    type: "query_pending_permission",
+    agentName,
+    correlationId
+  };
+  const line = JSON.stringify(msg) + `
+`;
+  return new Promise((resolve) => {
+    let settled = false;
+    let sock;
+    const done = (r) => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
+      try {
+        sock?.destroy();
+      } catch {}
+      resolve(r);
+    };
+    const timer = setTimeout(() => {
+      log(`[permission-pending-query] ${agentName}: timed out after ${timeoutMs}ms \u2014 treating as unreachable`);
+      done({ ok: false, reason: "timeout" });
+    }, timeoutMs);
+    try {
+      sock = connect(socketPath);
+    } catch (err) {
+      log(`[permission-pending-query] ${agentName}: connect threw: ${err.message}`);
+      done({ ok: false, reason: `connect threw: ${err.message}` });
+      return;
+    }
+    let buffer = "";
+    sock.on("connect", () => {
+      try {
+        sock.write(line);
+      } catch (err) {
+        log(`[permission-pending-query] ${agentName}: write threw: ${err.message}`);
+        done({ ok: false, reason: `write threw: ${err.message}` });
+      }
+    });
+    sock.on("data", (chunk) => {
+      buffer += chunk.toString("utf8");
+      let idx;
+      while ((idx = buffer.indexOf(`
+`)) >= 0) {
+        const rawLine = buffer.slice(0, idx);
+        buffer = buffer.slice(idx + 1);
+        if (!rawLine.trim())
+          continue;
+        let parsed;
+        try {
+          parsed = JSON.parse(rawLine);
+        } catch {
+          continue;
+        }
+        const p = parsed;
+        if (p && p.type === "pending_permission_status" && p.correlationId === correlationId) {
+          done({ ok: true, pending: !!p.pending, requestId: p.requestId });
+          return;
+        }
+      }
+    });
+    sock.on("error", (err) => {
+      log(`[permission-pending-query] ${agentName}: socket error: ${err.message}`);
+      done({ ok: false, reason: `socket error: ${err.message}` });
+    });
+    sock.on("close", () => {
+      done({ ok: false, reason: "socket closed before a matching reply arrived" });
+    });
+  });
+}
+
 // src/agents/wedge-watchdog.ts
 var WEDGE_FOOTER_SIGNATURE = /(?=[\s\S]*[Ee]sc(?:ape)?[^\n]*cancel)(?=[\s\S]*(?:to select|to navigate|\u2191\/\u2193))/;
 var RATE_LIMIT_MENU_SIGNATURE = /(?=[\s\S]*Stop and wait for)(?=[\s\S]*(?:usage credits|Upgrade your plan|\/rate-limit-options))/;
@@ -384,6 +470,7 @@ async function runWedgeWatchdog(opts) {
   const manifestStallSignature = opts.manifestStallSignature === null ? null : opts.manifestStallSignature ?? MANIFESTING_SIGNATURE;
   const manifestStallPolls = opts.manifestStallPolls ?? envInt("SWITCHROOM_WEDGE_MANIFEST_POLLS", DEFAULT_MANIFEST_STALL_POLLS);
   const requestRestart = opts.requestRestart;
+  const queryPendingPermission2 = opts.queryPendingPermission === null ? null : opts.queryPendingPermission ?? queryPendingPermission;
   const maxPolls = opts.maxPolls ?? Number.POSITIVE_INFINITY;
   const now = opts.now ?? Date.now;
   const sleep = opts.sleep ?? defaultSleep2;
@@ -397,6 +484,7 @@ async function runWedgeWatchdog(opts) {
   let overageCreditSelections = 0;
   let confirmModalFires = 0;
   let permissionPromptFires = 0;
+  let permissionPromptDeferrals = 0;
   let restartEscalations = 0;
   let polls = 0;
   let confirmModalPresent = 0;
@@ -494,16 +582,32 @@ async function runWedgeWatchdog(opts) {
       stableCount = 0;
       lastKey = null;
       if (permissionPromptPresent >= permissionPromptPolls && now() >= permissionCooldownUntil) {
-        console.error(`[wedge-watchdog] ${opts.agentName}: dismissing stuck per-tool ` + `permission prompt (Esc == decline == safe DENY) after ` + `${permissionPromptPresent} polls present ` + `(~${Math.round(permissionPromptPresent * pollIntervalMs / 1000)}s) \u2014 ` + `the prompt rendered as an interactive TUI with no TTL auto-deny, ` + `freezing the turn; no human to answer it`);
-        try {
-          send(opts.agentName, ["Escape"]);
-        } catch (err) {
-          console.error(`[wedge-watchdog] ${opts.agentName}: send threw: ${err.message}`);
+        let status = null;
+        if (queryPendingPermission2) {
+          try {
+            status = await queryPendingPermission2(opts.agentName);
+          } catch (err) {
+            console.error(`[wedge-watchdog] ${opts.agentName}: queryPendingPermission threw: ${err.message} \u2014 treating as unreachable`);
+            status = { ok: false, reason: `threw: ${err.message}` };
+          }
+        }
+        if (status && status.ok && status.pending) {
+          console.error(`[wedge-watchdog] ${opts.agentName}: permission prompt has live card ` + `${status.requestId ?? "(id unknown)"}, deferring to card/TTL after ` + `${permissionPromptPresent} polls present ` + `(~${Math.round(permissionPromptPresent * pollIntervalMs / 1000)}s) \u2014 NOT sending Esc`);
+          permissionPromptDeferrals++;
+          permissionCooldownUntil = now() + cooldownMs;
+        } else {
+          const reason = queryPendingPermission2 == null ? "card-aware check disabled" : status && status.ok ? "gateway reports no pending permission (card-less prompt)" : `gateway unreachable/no answer within budget${status && !status.ok ? ` (${status.reason})` : ""}`;
+          console.error(`[wedge-watchdog] ${opts.agentName}: dismissing stuck per-tool ` + `permission prompt (Esc == decline == safe DENY) after ` + `${permissionPromptPresent} polls present ` + `(~${Math.round(permissionPromptPresent * pollIntervalMs / 1000)}s) \u2014 ${reason}`);
+          try {
+            send(opts.agentName, ["Escape"]);
+          } catch (err) {
+            console.error(`[wedge-watchdog] ${opts.agentName}: send threw: ${err.message}`);
+          }
+          fires++;
+          permissionPromptFires++;
+          permissionCooldownUntil = now() + cooldownMs;
+          permissionPromptPresent = 0;
         }
-        fires++;
-        permissionPromptFires++;
-        permissionCooldownUntil = now() + cooldownMs;
-        permissionPromptPresent = 0;
       }
     } else if (isConfirmModal) {
       confirmModalPresent++;
@@ -556,6 +660,7 @@ async function runWedgeWatchdog(opts) {
     overageCreditSelections,
     confirmModalFires,
     permissionPromptFires,
+    permissionPromptDeferrals,
     restartEscalations,
     polls,
     reason: "max-polls"
@@ -563,15 +668,15 @@ async function runWedgeWatchdog(opts) {
 }
 
 // src/agents/rate-limit-signal.ts
-import { createConnection } from "node:net";
-import { join } from "node:path";
-function resolveGatewaySocketPath() {
+import { createConnection as createConnection2 } from "node:net";
+import { join as join2 } from "node:path";
+function resolveGatewaySocketPath2() {
   const stateDir = process.env.TELEGRAM_STATE_DIR ?? "/state/agent/telegram";
-  return process.env.SWITCHROOM_GATEWAY_SOCKET ?? join(stateDir, "gateway.sock");
+  return process.env.SWITCHROOM_GATEWAY_SOCKET ?? join2(stateDir, "gateway.sock");
 }
 function signalQuotaWall(agentName, resetAt, opts = {}) {
-  const socketPath = opts.socketPath ?? resolveGatewaySocketPath();
-  const connect = opts._connect ?? ((p) => createConnection(p));
+  const socketPath = opts.socketPath ?? resolveGatewaySocketPath2();
+  const connect = opts._connect ?? ((p) => createConnection2(p));
   const log = opts._log ?? ((m) => console.error(m));
   const connectTimeoutMs = opts.connectTimeoutMs ?? 5000;
   const msg = { type: "quota_wall_detected", agentName };
@@ -632,8 +737,8 @@ function signalQuotaWall(agentName, resetAt, opts = {}) {
 // src/auth/broker/client.ts
 import * as net from "node:net";
 import { homedir } from "node:os";
-import { randomUUID } from "node:crypto";
-import { join as join2 } from "node:path";
+import { randomUUID as randomUUID2 } from "node:crypto";
+import { join as join3 } from "node:path";
 
 // node_modules/.bun/zod@3.25.76/node_modules/zod/v3/external.js
 var exports_external = {};
@@ -4884,7 +4989,7 @@ function reviveDate(v) {
   return Number.isNaN(d.getTime()) ? null : d;
 }
 function operatorSocketPath(home = homedir()) {
-  return join2(home, ".switchroom", "state", "auth-broker-operator", "sock");
+  return join3(home, ".switchroom", "state", "auth-broker-operator", "sock");
 }
 function resolveAuthBrokerSocketPath(opts) {
   if (opts?.socket)
@@ -4947,7 +5052,7 @@ class AuthBrokerClient {
   async getCredentials(provider) {
     const base = {
       v: PROTOCOL_VERSION,
-      id: randomUUID(),
+      id: randomUUID2(),
       op: "get-credentials"
     };
     const req = provider !== undefined ? { ...base, provider } : base;
@@ -4957,7 +5062,7 @@ class AuthBrokerClient {
   async listState() {
     const data = await this.send({
       v: PROTOCOL_VERSION,
-      id: randomUUID(),
+      id: randomUUID2(),
       op: "list-state"
     });
     return data;
@@ -4965,7 +5070,7 @@ class AuthBrokerClient {
   async listGoogleAccounts() {
     const data = await this.send({
       v: PROTOCOL_VERSION,
-      id: randomUUID(),
+      id: randomUUID2(),
       op: "list-google-accounts"
     });
     return data;
@@ -4973,7 +5078,7 @@ class AuthBrokerClient {
   async listMicrosoftAccounts() {
     const data = await this.send({
       v: PROTOCOL_VERSION,
-      id: randomUUID(),
+      id: randomUUID2(),
       op: "list-microsoft-accounts"
     });
     return data;
@@ -4981,7 +5086,7 @@ class AuthBrokerClient {
   async probeQuota(accounts, timeoutMs, forceLive) {
     const data = await this.send({
       v: PROTOCOL_VERSION,
-      id: randomUUID(),
+      id: randomUUID2(),
       op: "probe-quota",
       accounts: [...accounts],
       ...timeoutMs !== undefined ? { timeoutMs } : {},
@@ -4999,21 +5104,21 @@ class AuthBrokerClient {
   async setActive(account) {
     const data = await this.send({
       v: PROTOCOL_VERSION,
-      id: randomUUID(),
+      id: randomUUID2(),
       op: "set-active",
       account
     });
     return data;
   }
   async markExhausted(until) {
-    const req = until !== undefined ? { v: PROTOCOL_VERSION, id: randomUUID(), op: "mark-exhausted", until } : { v: PROTOCOL_VERSION, id: randomUUID(), op: "mark-exhausted" };
+    const req = until !== undefined ? { v: PROTOCOL_VERSION, id: randomUUID2(), op: "mark-exhausted", until } : { v: PROTOCOL_VERSION, id: randomUUID2(), op: "mark-exhausted" };
     const data = await this.send(req);
     return data;
   }
   async claimNotification(key, windowMs) {
     const data = await this.send({
       v: PROTOCOL_VERSION,
-      id: randomUUID(),
+      id: randomUUID2(),
       op: "claim-notification",
       key,
       windowMs
@@ -5023,7 +5128,7 @@ class AuthBrokerClient {
   async refreshAccount(account) {
     const data = await this.send({
       v: PROTOCOL_VERSION,
-      id: randomUUID(),
+      id: randomUUID2(),
       op: "refresh-account",
       account
     });
@@ -5032,7 +5137,7 @@ class AuthBrokerClient {
   async addAccount(label, credentials, replace, provider) {
     const base = {
       v: PROTOCOL_VERSION,
-      id: randomUUID(),
+      id: randomUUID2(),
       op: "add-account",
       label,
       credentials
@@ -5045,7 +5150,7 @@ class AuthBrokerClient {
   async rmAccount(label, provider) {
     const base = {
       v: PROTOCOL_VERSION,
-      id: randomUUID(),
+      id: randomUUID2(),
       op: "rm-account",
       label
     };
@@ -5056,7 +5161,7 @@ class AuthBrokerClient {
   async setOverride(agent, account) {
     const data = await this.send({
       v: PROTOCOL_VERSION,
-      id: randomUUID(),
+      id: randomUUID2(),
       op: "set-override",
       agent,
       account
@@ -5237,8 +5342,9 @@ async function main() {
   }
   const rateLimitDetect = process.env.SWITCHROOM_RATE_LIMIT_DETECT !== "0";
   const overageSelect = rateLimitDetect && process.env.SWITCHROOM_RATE_LIMIT_OVERAGE !== "0";
+  const permissionCardAware = process.env.SWITCHROOM_PERMISSION_CARD_AWARE !== "0";
   try {
-    console.error(`[autoaccept-poll] ${agentName}: entering wedge-watchdog (continuous)` + (rateLimitDetect ? " +rate-limit-detect" : " (rate-limit-detect OFF)") + (overageSelect ? " +overage-carveout" : ""));
+    console.error(`[autoaccept-poll] ${agentName}: entering wedge-watchdog (continuous)` + (rateLimitDetect ? " +rate-limit-detect" : " (rate-limit-detect OFF)") + (overageSelect ? " +overage-carveout" : "") + (permissionCardAware ? " +permission-card-aware" : " (permission-card-aware OFF)"));
     const res = await runWedgeWatchdog({
       agentName,
       rateLimitSignature: rateLimitDetect ? undefined : null,
@@ -5246,9 +5352,10 @@ async function main() {
         signalQuotaWall(name, resetAt);
       } : undefined,
       overageDecision: overageSelect ? () => queryActiveOverageServing() : undefined,
-      requestRestart: requestWedgeRestart
+      requestRestart: requestWedgeRestart,
+      queryPendingPermission: permissionCardAware ? undefined : null
     });
-    console.error(`[autoaccept-poll] ${agentName}: wedge-watchdog returned reason=${res.reason} fires=${res.fires} rateLimitFires=${res.rateLimitFires} overageCreditSelections=${res.overageCreditSelections} confirmModalFires=${res.confirmModalFires} permissionPromptFires=${res.permissionPromptFires} restartEscalations=${res.restartEscalations}`);
+    console.error(`[autoaccept-poll] ${agentName}: wedge-watchdog returned reason=${res.reason} fires=${res.fires} rateLimitFires=${res.rateLimitFires} overageCreditSelections=${res.overageCreditSelections} confirmModalFires=${res.confirmModalFires} permissionPromptFires=${res.permissionPromptFires} permissionPromptDeferrals=${res.permissionPromptDeferrals} restartEscalations=${res.restartEscalations}`);
   } catch (err) {
     console.error(`[autoaccept-poll] ${agentName}: wedge-watchdog unexpected throw: ${err.message}`);
   }

package/dist/cli/notion-write-pretool.mjs

@@ -11904,6 +11904,7 @@ var SessionContinuitySchema = exports_external.object({
   max_turns_in_briefing: exports_external.number().int().positive().optional().describe("Cap on recent user/assistant turn pairs fed to the summarizer."),
   resume_mode: exports_external.enum(["auto", "continue", "handoff", "none"]).optional().describe("How to resume the next session. 'handoff' (default as of #362) " + "never passes --continue; a fresh Claude starts each restart and " + "reads a briefing assembled from recent Telegram messages, Hindsight " + "recall, and today's daily memory file. 'auto' uses --continue when " + "the latest JSONL is smaller than resume_max_bytes, else falls back " + "to the handoff briefing. 'continue' always passes --continue. " + "'none' starts completely fresh every time."),
   resume_max_bytes: exports_external.number().int().positive().optional().describe("Byte threshold above which 'auto' mode falls back to handoff " + "instead of --continue. Default 2_000_000 (~2MB). Large transcripts " + "can blow out the context window even with prefix caching, and " + "--continue replay is known-fragile at scale."),
+  boot_resume: exports_external.enum(["always", "in-flight", "never"]).optional().describe("How the gateway auto-resumes a turn that was IN FLIGHT when the " + "agent restarted. 'in-flight' (default) resumes genuinely " + "interrupted work even after a deliberate/operator restart \u2014 a " + "sanctioned restart landing mid-turn no longer silently drops the " + "work. 'always' forces resume unconditionally (same as the " + "SWITCHROOM_BOOT_RESUME_ALWAYS=1 escape hatch). 'never' is the " + "quota-saving posture: don't auto-replay work across a clean " + "restart \u2014 but the user is STILL sent a passive notice of what was " + "in flight (silence is never used). Independent of the at-most-once " + "resume ledger and the bounded resume-chain loop-guard, which always " + "apply. Threaded to the gateway as SWITCHROOM_BOOT_RESUME."),
   session_retention_max_count: exports_external.number().int().nonnegative().optional().describe("Session-JSONL retention (issue #2792): keep at most this many " + "newest session transcripts under .claude/projects; older ones " + "past both this count and the age bound are pruned by the Stop " + "hook. The newest sessions (and the handoff source) are always " + "kept. Default 20; set 0 to disable the count bound."),
   session_retention_max_age_days: exports_external.number().int().nonnegative().optional().describe("Session-JSONL retention (issue #2792): prune session transcripts " + "older than this many days (a file is deleted only when it is BOTH " + "over the count bound and older than this). Default 30; set 0 to " + "disable the age bound.")
 }).optional();