switchroom 0.13.11 → 0.13.13

package/dist/cli/switchroom.js

@@ -26509,17 +26509,34 @@ var init_wait = __esm(() => {
 // src/cli/drive.ts
 var exports_drive = {};
 __export(exports_drive, {
+  workspaceScopesForTier: () => workspaceScopesForTier,
+  selectGoogleWorkspaceScopes: () => selectGoogleWorkspaceScopes,
   selectDriveAccountScopes: () => selectDriveAccountScopes,
   runDriveOAuthFlow: () => runDriveOAuthFlow,
   registerDriveCommand: () => registerDriveCommand,
   __test: () => __test,
+  GOOGLE_SLIDES_SCOPE: () => GOOGLE_SLIDES_SCOPE,
+  GOOGLE_SHEETS_SCOPE: () => GOOGLE_SHEETS_SCOPE,
+  GOOGLE_DOCS_SCOPE: () => GOOGLE_DOCS_SCOPE,
   DRIVE_WRITE_SCOPES: () => DRIVE_WRITE_SCOPES,
   DRIVE_READONLY_SCOPES: () => DRIVE_READONLY_SCOPES
 });
 import { createInterface as createInterface2 } from "node:readline";
+function workspaceScopesForTier(tier) {
+  const docScopes = [GOOGLE_DOCS_SCOPE, GOOGLE_SHEETS_SCOPE];
+  if (tier === "extended" || tier === "complete") {
+    return [...docScopes, GOOGLE_SLIDES_SCOPE];
+  }
+  return docScopes;
+}
 function selectDriveAccountScopes(write) {
   return write ? DRIVE_WRITE_SCOPES : DRIVE_READONLY_SCOPES;
 }
+function selectGoogleWorkspaceScopes(opts) {
+  const base = selectDriveAccountScopes(opts.write);
+  const workspace = workspaceScopesForTier(opts.tier ?? "core");
+  return [...new Set([...base, ...workspace])];
+}
 function getVaultPath(configPath) {
   try {
     const config = loadConfig(configPath);
@@ -26932,7 +26949,7 @@ function registerDriveCommand(program3, deps = {}) {
     await runDisconnect({ agentName: agent }, deps);
   });
 }
-var EXIT_OK = 0, EXIT_DENIED = 1, EXIT_TIMEOUT = 2, EXIT_RATE_LIMITED = 3, EXIT_ERROR = 4, EXIT_ABORTED = 130, DRIVE_READONLY_SCOPES, DRIVE_WRITE_SCOPES, DEFAULT_SCOPES, __test;
+var EXIT_OK = 0, EXIT_DENIED = 1, EXIT_TIMEOUT = 2, EXIT_RATE_LIMITED = 3, EXIT_ERROR = 4, EXIT_ABORTED = 130, DRIVE_READONLY_SCOPES, DRIVE_WRITE_SCOPES, DEFAULT_SCOPES, GOOGLE_DOCS_SCOPE = "https://www.googleapis.com/auth/documents", GOOGLE_SHEETS_SCOPE = "https://www.googleapis.com/auth/spreadsheets", GOOGLE_SLIDES_SCOPE = "https://www.googleapis.com/auth/presentations", __test;
 var init_drive = __esm(() => {
   init_source();
   init_loader();
@@ -47314,8 +47331,8 @@ var {
 } = import__.default;
 
 // src/build-info.ts
-var VERSION = "0.13.11";
-var COMMIT_SHA = "5984798c";
+var VERSION = "0.13.13";
+var COMMIT_SHA = "dc583d57";
 
 // src/cli/agent.ts
 init_source();
@@ -54578,7 +54595,7 @@ function registerAccountAdd(accountParent) {
   accountParent.command("add <account>").description("Mint a Google OAuth refresh token for <account> and register it with the auth-broker. For Drive scopes the effective flow is desktop-loopback (device-code returns invalid_scope for Drive; OOB is retired) \u2014 use a Desktop OAuth client; on a headless host complete the browser step over an SSH port-forward. Add --write for create/edit (drive.file); default is read-only.").option("--replace", "Overwrite existing credentials for <account> (default refuses if account already registered)", false).option("--write", "Request Drive WRITE scope (drive.file: create + edit app-created files) in addition to read. Default is read-only \u2014 a read grant never silently becomes a write grant. Re-consent an existing account with `--replace --write`.", false).action(withConfigError(async (account, opts) => {
     const normalizedAccount = validateAndNormalizeAccountEmail(account);
     const [
-      { runDriveOAuthFlow: runDriveOAuthFlow2, selectDriveAccountScopes: selectDriveAccountScopes2 },
+      { runDriveOAuthFlow: runDriveOAuthFlow2, selectGoogleWorkspaceScopes: selectGoogleWorkspaceScopes2 },
       { selectInitialTier: selectInitialTier2 },
       { brokerCall: brokerCall2 },
       { loadConfig: loadConfig2, resolvePath: resolvePath2 },
@@ -54647,7 +54664,11 @@ function registerAccountAdd(accountParent) {
       clientIdRaw = await resolveRef(clientIdRaw, "google_client_id");
       clientSecretRaw = await resolveRef(clientSecretRaw, "google_client_secret");
     }
-    const accountScopes = selectDriveAccountScopes2(opts.write ?? false);
+    const tier = gw.tier ?? "core";
+    const accountScopes = selectGoogleWorkspaceScopes2({
+      write: opts.write ?? false,
+      tier
+    });
     const oauthCfg = {
       client_id: clientIdRaw,
       client_secret: clientSecretRaw,
@@ -54656,6 +54677,9 @@ function registerAccountAdd(accountParent) {
     if (opts.write) {
       console.log(source_default.yellow("  Requesting Drive WRITE scope (drive.file \u2014 create/edit app-created files)."));
     }
+    console.log(source_default.gray(`  Workspace tier: ${tier} \u2014 requesting Docs + Sheets` + (tier === "extended" || tier === "complete" ? " + Slides" : "") + " API scopes so the tier's tools can authenticate."));
+    console.log(source_default.gray(`  Changing the tier later requires re-running this command
+` + "  (`--replace`) \u2014 OAuth scopes are fixed at consent time."));
     const oauthEnv = {
       DISPLAY: process.env.DISPLAY,
       WAYLAND_DISPLAY: process.env.WAYLAND_DISPLAY,
@@ -73048,6 +73072,29 @@ function buildSeedCredentials(input) {
 }
 var AIOFILE_PIN = "aiofile==3.10.2";
 var AIOFILE_PKG = AIOFILE_PIN.split("==")[0];
+function requiredWorkspaceScopesForTier(tier) {
+  const docs = [
+    "https://www.googleapis.com/auth/documents",
+    "https://www.googleapis.com/auth/spreadsheets"
+  ];
+  if (tier === "extended" || tier === "complete") {
+    return [...docs, "https://www.googleapis.com/auth/presentations"];
+  }
+  return docs;
+}
+function findMissingWorkspaceScopes(seedScope, tier) {
+  const have = new Set(seedScope.split(/\s+/).map((s) => s.trim()).filter((s) => s.length > 0));
+  return requiredWorkspaceScopesForTier(tier).filter((s) => !have.has(s));
+}
+var DRIVE_FILE_SCOPE = "https://www.googleapis.com/auth/drive.file";
+function buildMissingScopeWarning(missing, tier, accountEmail, hasWriteScope) {
+  const short = missing.map((s) => s.replace(/^https:\/\/www\.googleapis\.com\/auth\//, "")).join(", ");
+  return `drive-mcp-launcher: WARNING \u2014 the Google account '${accountEmail}' was ` + `consented WITHOUT the scope(s) needed for tier '${tier ?? "core"}': ` + `${short}.
+` + `  The matching MCP tools (Docs / Sheets / Slides create+edit) will FAIL ` + `to authenticate. OAuth scopes are fixed at consent time \u2014 re-run on the ` + `host to re-mint the token with the correct scopes:
+` + `    switchroom auth google account add ${accountEmail} --replace` + `${hasWriteScope ? " --write" : ""}
+` + `  (scopes are derived from \`google_workspace.tier\` \u2014 set the tier ` + `before re-running${hasWriteScope ? "; --write preserves the existing " + "Drive write capability" : ""}). Drive read/file tools are unaffected.
+`;
+}
 function buildUvxArgs(tier) {
   const args = [
     "--from",
@@ -73072,6 +73119,9 @@ function buildChildEnv(baseEnv, credentialsDir, accountEmail) {
   delete env2.WORKSPACE_MCP_STATELESS_MODE;
   delete env2.GOOGLE_APPLICATION_CREDENTIALS;
   delete env2.WORKSPACE_MCP_SERVICE_ACCOUNT_FILE;
+  if (!env2.WORKSPACE_MCP_PORT) {
+    env2.WORKSPACE_MCP_PORT = env2.SWITCHROOM_GDRIVE_MCP_PORT ?? "8631";
+  }
   return env2;
 }
 function classifyRootSchema(schema) {
@@ -73288,6 +73338,11 @@ async function runDriveMcpLauncher(opts) {
     process.exit(1);
   }
   const tier = opts.tier ?? configSecrets.tier;
+  const missingScopes = findMissingWorkspaceScopes(brokerCreds.scope, tier);
+  if (missingScopes.length > 0) {
+    const hasWriteScope = brokerCreds.scope.split(/\s+/).map((s) => s.trim()).includes(DRIVE_FILE_SCOPE);
+    process.stderr.write(buildMissingScopeWarning(missingScopes, tier, brokerCreds.accountEmail, hasWriteScope));
+  }
   const args = buildUvxArgs(tier);
   const env2 = buildChildEnv(process.env, credentialsDir, brokerCreds.accountEmail);
   const { spawn: spawn5 } = await import("node:child_process");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "switchroom",
-  "version": "0.13.11",
+  "version": "0.13.13",
   "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

@@ -37383,6 +37383,19 @@ function recordSilentTurnEnd(args, deps) {
   writeSilentEndState(args, deps);
   return { exhausted: false };
 }
+var recordUndeliveredTurnEnd = recordSilentTurnEnd;
+
+// final-answer-detect.ts
+var FINAL_ANSWER_MIN_CHARS = 200;
+function isFinalAnswerReply(input) {
+  if (input.done === true)
+    return true;
+  if (!input.disableNotification)
+    return true;
+  if (input.text.length >= FINAL_ANSWER_MIN_CHARS)
+    return true;
+  return false;
+}
 
 // turn-flush-safety.ts
 var SILENT_MARKERS = new Set(["NO_REPLY", "HEARTBEAT_OK"]);
@@ -40593,28 +40606,12 @@ function isSilentFlushMarker2(text) {
   }
   return SILENT_MARKERS2.has(trimmed.toUpperCase());
 }
-var REPLY_CALLED_TAIL_MIN_CHARS = 40;
 function decideTurnFlush(input) {
   const flushEnabled = input.flushEnabled !== false;
   if (!flushEnabled)
     return { kind: "skip", reason: "flag-disabled" };
-  if (input.replyCalled) {
-    const tailIdx = input.capturedTextLenAtLastReply ?? input.capturedText.length;
-    const tail = input.capturedText.slice(tailIdx).join(`
-`).trim();
-    const minChars = input.replyCalledTailMinChars ?? REPLY_CALLED_TAIL_MIN_CHARS;
-    if (tail.length === 0) {
-      return { kind: "skip", reason: "reply-called" };
-    }
-    if (tail.length < minChars) {
-      return { kind: "skip", reason: "reply-called-no-new-text" };
-    }
-    if (input.chatId == null)
-      return { kind: "skip", reason: "no-inbound-chat" };
-    if (isSilentFlushMarker2(tail))
-      return { kind: "skip", reason: "silent-marker" };
-    return { kind: "flush", text: tail };
-  }
+  if (input.replyCalled)
+    return { kind: "skip", reason: "reply-called" };
   if (input.chatId == null)
     return { kind: "skip", reason: "no-inbound-chat" };
   const joined = input.capturedText.join(`
@@ -46654,14 +46651,6 @@ function startSubagentWatcher(config) {
       return;
     if (entry.state === "done" && !entry.completionNotified) {
       entry.completionNotified = true;
-      const desc = escapeHtml8(truncate3(entry.description, 80));
-      const summary = entry.lastSummaryLine ? ` \u2014 ${escapeHtml8(truncate3(entry.lastSummaryLine, 120))}` : "";
-      const tools = entry.toolCount > 0 ? ` (${entry.toolCount} tools)` : "";
-      try {
-        config.sendNotification(`\u2713 Worker done: ${desc}${tools}${summary}`);
-      } catch (err) {
-        log?.(`subagent-watcher: completion notification error: ${err.message}`);
-      }
       if (config.onFinish) {
         try {
           config.onFinish({
@@ -48027,9 +48016,9 @@ function sweepStaleTurnActiveMarker(stateDir, opts) {
 }
 
 // ../src/build-info.ts
-var VERSION = "0.13.11";
-var COMMIT_SHA = "5984798c";
-var COMMIT_DATE = "2026-05-22T15:59:07+10:00";
+var VERSION = "0.13.13";
+var COMMIT_SHA = "dc583d57";
+var COMMIT_DATE = "2026-05-22T22:02:14+10:00";
 var LATEST_PR = null;
 var COMMITS_AHEAD_OF_TAG = 3;
 
@@ -50446,6 +50435,7 @@ async function executeUpdateChecklist(args) {
   return { content: [{ type: "text", text: `checklist updated (id: ${message_id})` }] };
 }
 async function executeReply(args) {
+  const turn = currentTurn;
   const chat_id = args.chat_id;
   if (!chat_id)
     throw new Error("reply: chat_id is required");
@@ -50731,6 +50721,9 @@ ${url}`;
       process.stderr.write(`telegram gateway: reply: endStatusReaction hook threw: ${err}
 `);
     }
+    if (turn != null && isFinalAnswerReply({ text: rawText, disableNotification })) {
+      turn.finalAnswerDelivered = true;
+    }
   }
   process.stderr.write(`telegram channel: reply: finalized chatId=${chat_id} messageIds=[${sentIds.join(",")}] chunks=${chunks.length}
 `);
@@ -50740,6 +50733,7 @@ ${url}`;
   return { content: [{ type: "text", text: result }] };
 }
 async function executeStreamReply(args) {
+  const turn = currentTurn;
   if (!args.chat_id)
     throw new Error("stream_reply: chat_id is required");
   if (args.text == null || args.text === "")
@@ -50842,6 +50836,13 @@ async function executeStreamReply(args) {
     const sThreadId = args.message_thread_id != null ? Number(args.message_thread_id) : undefined;
     outboundDedup.record(sChatId, sThreadId, args.text, Date.now());
   }
+  if (turn != null && isFinalAnswerReply({
+    text: args.text ?? "",
+    disableNotification: args.disable_notification === true,
+    done: args.done === true
+  })) {
+    turn.finalAnswerDelivered = true;
+  }
   return { content: [{ type: "text", text: `${result.status} (id: ${result.messageId ?? "pending"})` }] };
 }
 async function executeProgressUpdate(args) {
@@ -51593,8 +51594,8 @@ function handleSessionEvent(ev) {
           startedAt,
           gatewayReceiveAt: startedAt,
           replyCalled: false,
+          finalAnswerDelivered: false,
           capturedText: [],
-          capturedTextLenAtLastReply: 0,
           orphanedReplyTimeoutId: null,
           registryKey: null,
           lastAssistantMsgId: null,
@@ -51659,7 +51660,6 @@ function handleSessionEvent(ev) {
       const name = ev.toolName;
       if (isTelegramReplyTool(name)) {
         turn.replyCalled = true;
-        turn.capturedTextLenAtLastReply = turn.capturedText.length;
         if (turn.orphanedReplyTimeoutId != null) {
           clearTimeout(turn.orphanedReplyTimeoutId);
           turn.orphanedReplyTimeoutId = null;
@@ -51822,13 +51822,8 @@ function handleSessionEvent(ev) {
         chatId: turn.sessionChatId,
         replyCalled: turn.replyCalled,
         capturedText: turn.capturedText,
-        capturedTextLenAtLastReply: turn.capturedTextLenAtLastReply,
         flushEnabled: TURN_FLUSH_SAFETY_ENABLED
       });
-      if (flushDecision.kind === "flush" && turn.replyCalled) {
-        process.stderr.write(`telegram gateway: WARN post-reply-tail flush (#1291) \u2014 model emitted ${flushDecision.text.length} chars after a prior reply call without a follow-up reply tool chat=${chatId} turnStartedAt=${turn.startedAt}
-`);
-      }
       if (flushDecision.kind === "skip" && flushDecision.reason !== "reply-called") {
         process.stderr.write(`telegram gateway: turn-flush skipped \u2014 reason=${flushDecision.reason}
 `);
@@ -51899,6 +51894,7 @@ function handleSessionEvent(ev) {
         const backstopChatId = chatId;
         const backstopThreadId = threadId;
         const backstopCtrl = ctrl;
+        turn.finalAnswerDelivered = true;
         const cardTakeover = progressDriver?.takeOverCard({
           chatId: backstopChatId,
           threadId: backstopThreadId != null ? String(backstopThreadId) : undefined
@@ -52037,8 +52033,8 @@ function handleSessionEvent(ev) {
           longest_silent_gap_ms: outboundMetrics.longestOutboundGapMs,
           ended_via: outboundMetrics.outboundCount > 0 ? "reply" : "silent"
         });
-        if (outboundMetrics.outboundCount === 0) {
-          const silentEnd = recordSilentTurnEnd({
+        if (turn.finalAnswerDelivered === false) {
+          const silentEnd = recordUndeliveredTurnEnd({
             chatId,
             threadId: threadId ?? null,
             turnKey: tKey
@@ -57308,20 +57304,6 @@ var didOneTimeSetup = false;
               agentCwd: watcherAgentDir,
               db: turnsDb,
               parentStateDir: STATE_DIR,
-              sendNotification: (text) => {
-                const ownerChatId = loadAccess().allowFrom[0];
-                if (!ownerChatId)
-                  return;
-                swallowingApiCall(() => lockedBot.api.sendMessage(ownerChatId, text, {
-                  parse_mode: "HTML",
-                  link_preview_options: { is_disabled: true },
-                  ...TOPIC_ID != null ? { message_thread_id: TOPIC_ID } : {}
-                }), {
-                  chat_id: ownerChatId,
-                  verb: "subagent-watcher-notification",
-                  ...TOPIC_ID != null ? { threadId: TOPIC_ID } : {}
-                });
-              },
               log: (msg) => process.stderr.write(`telegram gateway: ${msg}
 `),
               onStall: (agentId, idleMs, description) => {

package/telegram-plugin/final-answer-detect.ts

@@ -0,0 +1,83 @@
+/**
+ * final-answer-detect.ts — #1664 "did this reply deliver the final answer?"
+ *
+ * Background. An agent often ends a turn with its real answer as plain
+ * assistant transcript text instead of a `reply` / `stream_reply` tool
+ * call. The gateway renders that transcript as a live Telegram draft
+ * (`sendMessageDraft`) and, at turn_end, retracts the draft — so the
+ * answer is never finalized and the user watches it vanish (#1664).
+ *
+ * The gateway's `replyCalled` flag flips on the FIRST reply / stream_reply
+ * tool use and stays true for the rest of the turn. It cannot distinguish
+ * "the model sent an interim ack" from "the model sent its real answer" —
+ * both set `replyCalled`. The silent-end re-prompt safety net needs a
+ * finer signal: it must engage when a turn ended with only an interim
+ * ack and the real answer left as transcript text.
+ *
+ * This module is that finer signal — a pure predicate the gateway calls
+ * for each reply that lands. A turn whose every reply was classified
+ * "interim" ends with `CurrentTurn.finalAnswerDelivered === false`, which
+ * triggers the re-prompt; a turn with at least one "final" reply does not.
+ *
+ * Keeping the policy in one unit-testable function is the point — the
+ * gateway is a multi-thousand-line module that's expensive to import in a
+ * test. See `telegram-plugin/tests/final-answer-detect.test.ts`.
+ *
+ * The fix re-prompts the model; it never materializes the draft into a
+ * message (`reference/principles.md`: the model communicates, the
+ * framework is the safety net). So a false "interim" classification is
+ * cheap (one extra re-prompt) and a false "final" classification is the
+ * dangerous one (a real answer left undelivered) — the length backstop
+ * exists to make the dangerous miss rare.
+ */
+
+/**
+ * Length backstop for the final-answer classification. The pacing
+ * contract (`docs/telegram-style.md`) says interim updates pass
+ * `disable_notification: true` and the final answer omits it — so a
+ * notification-bearing reply is the primary "final answer" signal. But a
+ * model that mis-marks a genuinely substantive reply as interim
+ * (`disable_notification: true` on what is really the answer) would
+ * otherwise leave the turn looking undelivered. Any reply at or above
+ * this many characters therefore ALSO counts as the final answer,
+ * regardless of the notification flag. 200 chars is comfortably longer
+ * than a typical interim ack ("on it", "looking into that…", "give me a
+ * sec") and short enough that a real answer almost always clears it.
+ */
+export const FINAL_ANSWER_MIN_CHARS = 200
+
+export interface FinalAnswerReplyInput {
+  /** The reply text the model sent (the model's own answer text, before
+   * any HTML conversion or Telegraph-link substitution). */
+  text: string
+  /** The `disable_notification` argument the reply tool was called with.
+   * `true` is the pacing contract's "interim update" marker; the final
+   * answer omits it (effectively `false`). */
+  disableNotification: boolean
+  /** For `stream_reply` only: whether this call carried `done: true`. A
+   * `done: true` call explicitly closes the stream and IS the final
+   * answer by definition. Pass `false` for the plain `reply` tool. */
+  done?: boolean
+}
+
+/**
+ * Pure predicate: did this reply deliver the turn's final answer (as
+ * opposed to an interim ack)? `true` if ANY of:
+ *
+ *   - `done === true` — a `stream_reply` terminal call; the model
+ *     explicitly closed the stream, so this is the final answer.
+ *   - `disableNotification === false` — the pacing contract's explicit
+ *     "final answer" signal (interim updates set it `true`).
+ *   - `text.length >= FINAL_ANSWER_MIN_CHARS` — the length backstop for
+ *     a substantive answer mis-marked as interim.
+ *
+ * The gateway ORs this across every reply in a turn; once one reply
+ * qualifies, `CurrentTurn.finalAnswerDelivered` latches true and the
+ * silent-end re-prompt will not engage for that turn.
+ */
+export function isFinalAnswerReply(input: FinalAnswerReplyInput): boolean {
+  if (input.done === true) return true
+  if (!input.disableNotification) return true
+  if (input.text.length >= FINAL_ANSWER_MIN_CHARS) return true
+  return false
+}