switchroom 0.14.67 → 0.14.69

package/dist/cli/switchroom.js

@@ -14593,6 +14593,35 @@ function shouldEmitNotionMcp(agentName, config) {
     return false;
   return true;
 }
+function normalizeNotionUuid(uuid) {
+  if (typeof uuid !== "string")
+    return null;
+  const stripped = uuid.replace(/-/g, "").toLowerCase();
+  if (!/^[0-9a-f]{32}$/.test(stripped))
+    return null;
+  return stripped;
+}
+function agentCanAccessNotionDB(config, agentName, dbUuid) {
+  if (!shouldEmitNotionMcp(agentName, config))
+    return false;
+  const targetNorm = normalizeNotionUuid(dbUuid);
+  if (targetNorm === null)
+    return false;
+  const agentConfig = config.agents?.[agentName];
+  const allowedNames = agentConfig?.notion_workspace?.databases;
+  if (allowedNames === undefined || allowedNames.length === 0) {
+    return true;
+  }
+  const dbMap = config.notion_workspace?.databases ?? {};
+  for (const name of allowedNames) {
+    const uuid = dbMap[name];
+    if (!uuid)
+      continue;
+    if (normalizeNotionUuid(uuid) === targetNorm)
+      return true;
+  }
+  return false;
+}
 function validateNotionWorkspaceConfig(config) {
   const issues = [];
   const dbMap = config.notion_workspace?.databases ?? {};
@@ -49572,8 +49601,8 @@ var {
 } = import__.default;
 
 // src/build-info.ts
-var VERSION = "0.14.67";
-var COMMIT_SHA = "dcade213";
+var VERSION = "0.14.69";
+var COMMIT_SHA = "a3def2a8";
 
 // src/cli/agent.ts
 init_source();
@@ -71710,6 +71739,70 @@ async function handleGetGoogleAccounts(config) {
   }
   return out;
 }
+async function handleGetMicrosoftAccounts(config) {
+  const live = new Map;
+  try {
+    await withAuthBrokerClient(async (client2) => {
+      const data = await client2.listMicrosoftAccounts();
+      for (const a of data.accounts) {
+        live.set(a.account.toLowerCase(), {
+          expiresAt: a.expiresAt,
+          scope: a.scope,
+          clientId: a.clientId,
+          accountType: a.accountType
+        });
+      }
+    });
+  } catch (err) {
+    if (!(err instanceof AuthBrokerUnreachableError))
+      throw err;
+  }
+  const cfgAccounts = config.microsoft_accounts ?? {};
+  const keys = new Set([
+    ...Object.keys(cfgAccounts).map((k) => k.toLowerCase()),
+    ...live.keys()
+  ]);
+  const out = [];
+  for (const key of [...keys].sort()) {
+    const cfg = cfgAccounts[key];
+    const l = live.get(key);
+    out.push({
+      account: key,
+      expiresAt: l?.expiresAt ?? null,
+      scope: l?.scope ?? null,
+      clientId: l?.clientId ?? null,
+      accountType: l?.accountType ?? null,
+      enabledFor: cfg?.enabled_for ? [...cfg.enabled_for].sort() : [],
+      brokerKnown: l != null
+    });
+  }
+  return out;
+}
+function handleGetNotionWorkspace(config) {
+  const nw = config.notion_workspace;
+  if (!nw) {
+    return { configured: false, vaultKey: null, databases: [], fullAccessAgents: [] };
+  }
+  const declared = nw.databases ?? {};
+  const agentNames = Object.keys(config.agents ?? {});
+  const databases = Object.entries(declared).map(([name, id]) => {
+    const enabledFor = agentNames.filter((n) => agentCanAccessNotionDB(config, n, id)).sort();
+    return { name, id, enabledFor };
+  }).sort((a, b) => a.name.localeCompare(b.name));
+  const agentsRaw = config.agents ?? {};
+  const fullAccessAgents = agentNames.filter((n) => {
+    if (!shouldEmitNotionMcp(n, config))
+      return false;
+    const dbs = agentsRaw[n]?.notion_workspace?.databases;
+    return dbs === undefined || dbs.length === 0;
+  }).sort();
+  return {
+    configured: true,
+    vaultKey: nw.vault_key ?? null,
+    databases,
+    fullAccessAgents
+  };
+}
 function handleGetSchedule(config) {
   const entries = collectScheduleEntries(config);
   const agentsDir = resolveAgentsDir(config);
@@ -72387,6 +72480,12 @@ function parseRoute(pathname, method) {
   if (method === "GET" && pathname === "/api/google-accounts") {
     return { handler: "getGoogleAccounts", params: {} };
   }
+  if (method === "GET" && pathname === "/api/microsoft-accounts") {
+    return { handler: "getMicrosoftAccounts", params: {} };
+  }
+  if (method === "GET" && pathname === "/api/notion-workspace") {
+    return { handler: "getNotionWorkspace", params: {} };
+  }
   if (method === "GET" && pathname === "/api/schedule") {
     return { handler: "getSchedule", params: {} };
   }
@@ -72512,6 +72611,10 @@ function startWebServer(config, port, hostname = "127.0.0.1", configPath) {
             return (async () => jsonResponse(await handleGetSystemHealth()))();
           case "getGoogleAccounts":
             return (async () => jsonResponse(await handleGetGoogleAccounts(config)))();
+          case "getMicrosoftAccounts":
+            return (async () => jsonResponse(await handleGetMicrosoftAccounts(config)))();
+          case "getNotionWorkspace":
+            return jsonResponse(handleGetNotionWorkspace(config));
           case "getSchedule":
             return jsonResponse(handleGetSchedule(config));
           case "getApprovals":

package/dist/cli/ui/index.html

@@ -409,7 +409,7 @@
     <button id="tab-agents" onclick="switchTab('agents')">Agents</button>
     <button id="tab-accounts" onclick="switchTab('accounts')">Accounts</button>
     <button id="tab-system" onclick="switchTab('system')">System</button>
-    <button id="tab-google" onclick="switchTab('google')">Google</button>
+    <button id="tab-connections" onclick="switchTab('connections')">Connections</button>
     <button id="tab-schedule" onclick="switchTab('schedule')">Schedule</button>
     <button id="tab-approvals" onclick="switchTab('approvals')">Approvals</button>
   </nav>
@@ -419,7 +419,7 @@
     <div id="agents" style="display:none" class="loading">Loading agents...</div>
     <div id="accounts" style="display:none"></div>
     <div id="system" style="display:none"></div>
-    <div id="google" style="display:none"></div>
+    <div id="connections" style="display:none"></div>
     <div id="schedule" style="display:none"></div>
     <div id="approvals" style="display:none"></div>
   </main>
@@ -493,14 +493,17 @@
       }
     }
 
-    async function fetchGoogleAccounts() {
+    async function fetchConnections() {
       try {
-        const res = await fetch(`${API}/api/google-accounts`, { headers: authHeaders() });
-        if (!res.ok) throw new Error(`HTTP ${res.status}`);
-        renderGoogleAccounts(await res.json());
+        const [google, microsoft, notion] = await Promise.all([
+          fetch(`${API}/api/google-accounts`, { headers: authHeaders() }).then(r => r.ok ? r.json() : []),
+          fetch(`${API}/api/microsoft-accounts`, { headers: authHeaders() }).then(r => r.ok ? r.json() : []),
+          fetch(`${API}/api/notion-workspace`, { headers: authHeaders() }).then(r => r.ok ? r.json() : { configured: false, databases: [] }),
+        ]);
+        renderConnections({ google, microsoft, notion });
         clearError();
       } catch (err) {
-        showError(`Failed to fetch Google accounts: ${err.message}`);
+        showError(`Failed to fetch connections: ${err.message}`);
       }
     }
 
@@ -527,7 +530,7 @@
     }
 
     function switchTab(tab) {
-      const tabs = ['summary', 'agents', 'accounts', 'system', 'google', 'schedule', 'approvals'];
+      const tabs = ['summary', 'agents', 'accounts', 'system', 'connections', 'schedule', 'approvals'];
       for (const t of tabs) {
         document.getElementById(`tab-${t}`).classList.toggle('active', tab === t);
         document.getElementById(t).style.display = tab === t ? '' : 'none';
@@ -535,7 +538,7 @@
       if (tab === 'summary') fetchSummary();
       if (tab === 'accounts') fetchAccounts();
       if (tab === 'system') fetchSystemHealth();
-      if (tab === 'google') fetchGoogleAccounts();
+      if (tab === 'connections') fetchConnections();
       if (tab === 'schedule') fetchSchedule();
       if (tab === 'approvals') fetchApprovals();
     }
@@ -988,37 +991,99 @@
       return String(ts).replace('T', ' ').replace(/\.\d+Z?$/, '').replace(/Z$/, '');
     }
 
-    function renderGoogleAccounts(rows) {
-      const container = document.getElementById('google');
-      if (!rows || rows.length === 0) {
-        container.innerHTML = '<div class="loading">No Google accounts. Add one under <code>google_accounts:</code> in switchroom.yaml and run <code>switchroom auth google account add</code>.</div>';
-        return;
+    const _dimC = (s) => `<span style="color:var(--text-dim)">${escapeHtml(s)}</span>`;
+
+    // One OAuth-account card (Google or Microsoft — same shape; Microsoft
+    // adds an account-type pill).
+    function renderOAuthAccountCard(a, opts) {
+      const expires = a.expiresAt ? formatTimestamp(a.expiresAt) : _dimC('—');
+      const known = a.brokerKnown
+        ? '<span class="usage-pill primary">slot present</span>'
+        : '<span style="color:var(--yellow)">config-only (no broker slot)</span>';
+      const acl = (a.enabledFor && a.enabledFor.length)
+        ? a.enabledFor.map(escapeHtml).join(', ')
+        : _dimC('no agents enabled');
+      const typePill = (opts && opts.showType && a.accountType)
+        ? `<span class="usage-pill" style="margin-left:.4rem">${escapeHtml(a.accountType)}</span>`
+        : '';
+      return `
+      <div class="account-card">
+        <div class="account-card-header">
+          <div class="account-label">${escapeHtml(a.account)}${typePill}</div>
+          <span style="margin-left:auto">${known}</span>
+        </div>
+        <div class="account-usage"><label style="color:var(--text-dim);opacity:.7">Enabled for: </label>${acl}</div>
+        <div class="card-meta" style="padding:0">
+          <div class="meta-item"><label>Expires </label><span>${expires}</span></div>
+          <div class="meta-item" title="${a.scope ? escapeHtml(a.scope) : ''}"><label>Scope </label><span>${a.scope ? escapeHtml(a.scope.split(' ').length + ' scope(s)') : _dimC('—')}</span></div>
+          <div class="meta-item"><label>Client </label><span>${a.clientId ? escapeHtml(a.clientId.slice(0, 16) + '…') : _dimC('—')}</span></div>
+        </div>
+      </div>`;
+    }
+
+    function _connectionSection(title, emptyHtml, cardsHtml) {
+      return `
+        <div style="margin-bottom:1.5rem">
+          <h3 style="margin:0 0 .6rem;font-size:.95rem;color:var(--text-dim);text-transform:uppercase;letter-spacing:.04em">${title}</h3>
+          ${cardsHtml ? `<div class="accounts-grid">${cardsHtml}</div>` : `<div class="loading" style="padding:.8rem">${emptyHtml}</div>`}
+        </div>`;
+    }
+
+    // Unified external-connections view: Google + Microsoft accounts and
+    // the Notion workspace, each showing which agents have access.
+    function renderConnections(data) {
+      const container = document.getElementById('connections');
+      const google = data.google || [];
+      const microsoft = data.microsoft || [];
+      const notion = data.notion || { configured: false, databases: [] };
+
+      const googleSection = _connectionSection(
+        'Google',
+        'No Google accounts. Add one under <code>google_accounts:</code> and run <code>switchroom auth google account add</code>.',
+        google.map(a => renderOAuthAccountCard(a, { showType: false })).join(''),
+      );
+
+      const microsoftSection = _connectionSection(
+        'Microsoft 365',
+        'No Microsoft accounts. Connect one from Telegram with <code>/connect microsoft</code> (admin DM), or <code>switchroom auth microsoft account add</code>.',
+        microsoft.map(a => renderOAuthAccountCard(a, { showType: true })).join(''),
+      );
+
+      let notionCards = '';
+      if (notion.configured) {
+        notionCards = (notion.databases || []).map(db => {
+          const acl = (db.enabledFor && db.enabledFor.length)
+            ? db.enabledFor.map(escapeHtml).join(', ')
+            : _dimC('no agents enabled');
+          return `
+          <div class="account-card">
+            <div class="account-card-header">
+              <div class="account-label">${escapeHtml(db.name)}</div>
+              <span style="margin-left:auto" class="usage-pill">database</span>
+            </div>
+            <div class="account-usage"><label style="color:var(--text-dim);opacity:.7">Enabled for: </label>${acl}</div>
+            <div class="card-meta" style="padding:0">
+              <div class="meta-item"><label>DB id </label><span>${escapeHtml(db.id.slice(0, 12))}…</span></div>
+            </div>
+          </div>`;
+        }).join('');
       }
-      const dim = (s) => `<span style="color:var(--text-dim)">${escapeHtml(s)}</span>`;
-      const cards = rows.map(a => {
-        const expires = a.expiresAt ? formatTimestamp(a.expiresAt) : dim('—');
-        const scope = a.scope ? escapeHtml(a.scope) : dim('broker offline');
-        const known = a.brokerKnown
-          ? '<span class="usage-pill primary">slot present</span>'
-          : '<span style="color:var(--yellow)">config-only (no broker slot)</span>';
-        const acl = (a.enabledFor && a.enabledFor.length)
-          ? a.enabledFor.map(escapeHtml).join(', ')
-          : dim('no agents enabled');
-        return `
-        <div class="account-card">
-          <div class="account-card-header">
-            <div class="account-label">${escapeHtml(a.account)}</div>
-            <span style="margin-left:auto">${known}</span>
-          </div>
-          <div class="account-usage"><label style="color:var(--text-dim);opacity:.7">Enabled for: </label>${acl}</div>
-          <div class="card-meta" style="padding:0">
-            <div class="meta-item"><label>Expires </label><span>${expires}</span></div>
-            <div class="meta-item" title="${a.scope ? escapeHtml(a.scope) : ''}"><label>Scope </label><span>${a.scope ? escapeHtml(a.scope.split(' ').length + ' scope(s)') : dim('—')}</span></div>
-            <div class="meta-item"><label>Client </label><span>${a.clientId ? escapeHtml(a.clientId.slice(0, 16) + '…') : dim('—')}</span></div>
-          </div>
+      const notionTitle = 'Notion' + (notion.configured && notion.vaultKey ? ` <span style="text-transform:none;font-weight:400">· token <code>${escapeHtml(notion.vaultKey)}</code></span>` : '');
+      const fullAccessBanner = (notion.fullAccessAgents && notion.fullAccessAgents.length)
+        ? `<div style="margin:0 0 .6rem;font-size:.85rem;color:var(--text-dim)">Full access (all databases): ${notion.fullAccessAgents.map(escapeHtml).join(', ')}</div>`
+        : '';
+      const notionBody = notionCards
+        ? `<div class="accounts-grid">${notionCards}</div>`
+        : `<div class="loading" style="padding:.8rem">${notion.configured
+            ? 'Notion configured but no databases declared. Add them under <code>notion_workspace.databases:</code>.'
+            : 'Notion not configured. See <code>docs/notion-integration.md</code>.'}</div>`;
+      const notionSection = `
+        <div style="margin-bottom:1.5rem">
+          <h3 style="margin:0 0 .6rem;font-size:.95rem;color:var(--text-dim);text-transform:uppercase;letter-spacing:.04em">${notionTitle}</h3>
+          ${fullAccessBanner}${notionBody}
         </div>`;
-      }).join('');
-      container.innerHTML = `<div class="accounts-grid">${cards}</div>`;
+
+      container.innerHTML = googleSection + microsoftSection + notionSection;
     }
 
     function renderSchedule(data) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "switchroom",
-  "version": "0.14.67",
+  "version": "0.14.69",
   "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/answer-stream-flag.ts

@@ -16,3 +16,22 @@ export function parseVisibleAnswerStreamEnabled(raw: string | undefined): boolea
   const v = raw.trim().toLowerCase()
   return v === '1' || v === 'true' || v === 'on' || v === 'yes'
 }
+
+/**
+ * Draft-answer-lane retirement (2026-06-05). The compose-box draft transport
+ * (`sendMessageDraft`) is invisible to the mtcute UAT harness, so the live
+ * answer-stream surface couldn't be tested. Retired by DEFAULT: the answer lane
+ * now opens a real, observable edit-in-place message instead of the compose-box
+ * draft (and the onMetric silence-liveness reset from #2169 now fires on visible
+ * sends in BOTH DMs and supergroups, not just DM drafts). Kill switch
+ * `SWITCHROOM_DRAFT_ANSWER_LANE=0` (also false/off/no) restores the legacy
+ * invisible draft.
+ *
+ * Returns true when the draft lane is RETIRED (the default — env unset or any
+ * truthy value); false only for an explicit disable of the retirement.
+ */
+export function parseDraftLaneRetiredEnabled(raw: string | undefined): boolean {
+  if (raw == null) return true
+  const v = raw.trim().toLowerCase()
+  return !(v === '0' || v === 'false' || v === 'off' || v === 'no')
+}

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

@@ -39761,6 +39761,12 @@ function parseVisibleAnswerStreamEnabled(raw) {
   const v = raw.trim().toLowerCase();
   return v === "1" || v === "true" || v === "on" || v === "yes";
 }
+function parseDraftLaneRetiredEnabled(raw) {
+  if (raw == null)
+    return true;
+  const v = raw.trim().toLowerCase();
+  return !(v === "0" || v === "false" || v === "off" || v === "no");
+}
 
 // pty-tail.ts
 var import_headless = __toESM(require_xterm_headless(), 1);
@@ -52770,11 +52776,11 @@ function sweepStaleTurnActiveMarker(stateDir, opts) {
 }
 
 // ../src/build-info.ts
-var VERSION = "0.14.67";
-var COMMIT_SHA = "dcade213";
-var COMMIT_DATE = "2026-06-05T08:22:01Z";
-var LATEST_PR = 2171;
-var COMMITS_AHEAD_OF_TAG = 4;
+var VERSION = "0.14.69";
+var COMMIT_SHA = "a3def2a8";
+var COMMIT_DATE = "2026-06-05T22:00:53+10:00";
+var LATEST_PR = null;
+var COMMITS_AHEAD_OF_TAG = 3;
 
 // gateway/boot-version.ts
 function formatRelativeAgo(iso) {
@@ -53574,6 +53580,7 @@ var TOPIC_ID = process.env.TELEGRAM_TOPIC_ID ? Number(process.env.TELEGRAM_TOPIC
 var AGENT_ADMIN = process.env.SWITCHROOM_AGENT_ADMIN === "true";
 var bot = new import_grammy9.Bot(TOKEN);
 installTgPostLogger(bot);
+var DRAFT_ANSWER_LANE_RETIRED = parseDraftLaneRetiredEnabled(process.env.SWITCHROOM_DRAFT_ANSWER_LANE);
 var _rawSendMessageDraft = bot.api.raw.sendMessageDraft;
 var GRAMMY_VERSION = (() => {
   try {
@@ -53583,7 +53590,7 @@ var GRAMMY_VERSION = (() => {
     return "unknown";
   }
 })();
-var sendMessageDraftFn = typeof _rawSendMessageDraft === "function" ? (chatId, draftId, text, params) => _rawSendMessageDraft({
+var sendMessageDraftFn = !DRAFT_ANSWER_LANE_RETIRED && typeof _rawSendMessageDraft === "function" ? (chatId, draftId, text, params) => _rawSendMessageDraft({
   chat_id: Number(chatId),
   draft_id: draftId,
   text,
@@ -54019,6 +54026,7 @@ var _noReplyDrainRaw = process.env.SWITCHROOM_SERIALIZE_NOREPLY_DRAIN_MS;
 var _noReplyDrainParsed = _noReplyDrainRaw != null && _noReplyDrainRaw !== "" ? Number(_noReplyDrainRaw) : 2500;
 var SERIALIZE_NOREPLY_DRAIN_MS = Number.isFinite(_noReplyDrainParsed) && _noReplyDrainParsed > 0 ? _noReplyDrainParsed : 2500;
 var TURN_ORIGIN_ROUTING_ENABLED = process.env.SWITCHROOM_TURN_ORIGIN_ROUTING !== "0";
+var FRAMEWORK_ORIGIN_ROUTING_ENABLED = process.env.SWITCHROOM_FRAMEWORK_ORIGIN_ROUTING !== "0";
 var TOPIC_FRAMING_ENABLED = process.env.SWITCHROOM_TOPIC_FRAMING !== "0";
 var QUEUED_STATUS_UX_ENABLED = process.env.SWITCHROOM_QUEUED_STATUS_UX !== "0";
 var FEED_REOPEN_AFTER_ACK_ENABLED = process.env.SWITCHROOM_FEED_REOPEN_AFTER_ACK !== "0";
@@ -54051,15 +54059,39 @@ var progressUpdateTurnCount = new Map;
 var currentTurn = null;
 var RECENT_TURNS_MAX = 32;
 var recentTurnsById = new Map;
+var recentTurnIdBySourceMessageId = new Map;
 function rememberRecentTurn(turn) {
   recentTurnsById.set(turn.turnId, turn);
+  if (turn.sourceMessageId != null) {
+    recentTurnIdBySourceMessageId.set(turn.sourceMessageId, turn.turnId);
+  }
   while (recentTurnsById.size > RECENT_TURNS_MAX) {
     const oldest = recentTurnsById.keys().next().value;
     if (oldest === undefined)
       break;
+    const evicted = recentTurnsById.get(oldest);
     recentTurnsById.delete(oldest);
+    if (evicted?.sourceMessageId != null && recentTurnIdBySourceMessageId.get(evicted.sourceMessageId) === oldest) {
+      recentTurnIdBySourceMessageId.delete(evicted.sourceMessageId);
+    }
   }
 }
+function findTurnByQuotedMessageId(chatId, replyTo) {
+  if (!FRAMEWORK_ORIGIN_ROUTING_ENABLED)
+    return null;
+  if (replyTo == null)
+    return null;
+  const mid = Number(replyTo);
+  if (!Number.isFinite(mid))
+    return null;
+  const owner = recentTurnIdBySourceMessageId.get(mid);
+  if (owner == null)
+    return null;
+  const turn = recentTurnsById.get(owner) ?? null;
+  if (turn == null || turn.sessionChatId !== chatId)
+    return null;
+  return turn;
+}
 function deriveTurnId(chatId, threadId, messageId) {
   if (messageId == null || messageId === "" || String(messageId) === "0")
     return null;
@@ -54081,7 +54113,7 @@ function findLatestEndedTurnForChat(chatId) {
   }
   return latest;
 }
-function resolveAnswerThreadWithLog(chatId, explicitThreadId, originTurn, liveTurn, surface) {
+function resolveAnswerThreadWithLog(chatId, explicitThreadId, originTurn, originVia, liveTurn, surface) {
   const recovered = LATE_REPLY_TOPIC_RECOVERY_ENABLED && explicitThreadId == null && originTurn == null && liveTurn == null ? findLatestEndedTurnForChat(chatId) : null;
   const threadId = resolveAnswerThreadId({
     explicitThreadId,
@@ -54091,14 +54123,23 @@ function resolveAnswerThreadWithLog(chatId, explicitThreadId, originTurn, liveTu
     lastEndedResolvedForChat: recovered != null,
     lastEndedThreadIdForChat: recovered?.sessionThreadId
   });
-  const via = explicitThreadId != null ? "explicit" : originTurn != null ? "origin" : liveTurn?.sessionThreadId != null ? "live" : recovered != null ? "recovered" : "none";
+  const via = explicitThreadId != null ? "explicit" : originTurn != null ? originVia === "quoted" ? "quoted" : "origin" : liveTurn?.sessionThreadId != null ? "live" : recovered != null ? "recovered" : "none";
   const ownerTurn = originTurn ?? recovered ?? liveTurn;
   const isSupergroup = chatId.startsWith("-100");
-  const unrouted = isSupergroup && threadId == null;
-  process.stderr.write(`telegram gateway: reply-route surface=${surface} chat=${chatId} resolved_thread=${threadId ?? "-"} via=${via} late=${liveTurn == null} originTurn=${ownerTurn?.turnId ?? "-"} origin_thread=${ownerTurn?.sessionThreadId ?? "-"}` + (via === "recovered" ? " RECOVERED" : "") + (unrouted ? " UNROUTED(supergroup\u2192no-topic)" : "") + `
+  const unrouted = isSupergroup && threadId == null && ownerTurn == null;
+  const misrouteRisk = isSupergroup && via === "live" && hasDifferentThreadedRecentTurn(chatId, liveTurn?.sessionThreadId);
+  process.stderr.write(`telegram gateway: reply-route surface=${surface} chat=${chatId} resolved_thread=${threadId ?? "-"} via=${via} late=${liveTurn == null} originTurn=${ownerTurn?.turnId ?? "-"} origin_thread=${ownerTurn?.sessionThreadId ?? "-"}` + (via === "recovered" ? " RECOVERED" : "") + (via === "quoted" ? " QUOTED(framework-origin)" : "") + (unrouted ? " UNROUTED(supergroup\u2192no-topic)" : "") + (misrouteRisk ? " MISROUTE_RISK(no-echo\u2192live-successor)" : "") + `
 `);
   return threadId;
 }
+function hasDifferentThreadedRecentTurn(chatId, liveThreadId) {
+  const live = liveThreadId ?? null;
+  for (const t of recentTurnsById.values()) {
+    if (t.sessionChatId === chatId && (t.sessionThreadId ?? null) !== live)
+      return true;
+  }
+  return false;
+}
 function closeObligationOnSubstantiveReply(args, liveTurn) {
   if (!OBLIGATION_LEDGER_ENABLED)
     return;
@@ -56332,8 +56373,10 @@ ${url}`;
   let threadId;
   if (TURN_ORIGIN_ROUTING_ENABLED) {
     const explicit = args.message_thread_id != null ? Number(args.message_thread_id) : undefined;
-    const originTurn = findTurnByOriginId(args.origin_turn_id);
-    threadId = resolveAnswerThreadWithLog(chat_id, Number.isFinite(explicit) ? explicit : undefined, originTurn, turn, "reply");
+    const echoedTurn = findTurnByOriginId(args.origin_turn_id);
+    const quotedTurn = echoedTurn == null ? findTurnByQuotedMessageId(chat_id, args.reply_to) : null;
+    const originTurn = echoedTurn ?? quotedTurn;
+    threadId = resolveAnswerThreadWithLog(chat_id, Number.isFinite(explicit) ? explicit : undefined, originTurn, originTurn == null ? null : echoedTurn != null ? "echo" : "quoted", turn, "reply");
   } else {
     threadId = resolveThreadId(chat_id, args.message_thread_id ?? (turn?.sessionThreadId != null ? turn.sessionThreadId : undefined));
   }
@@ -56692,8 +56735,10 @@ async function executeStreamReply(args) {
   if (args.message_thread_id == null) {
     let injected;
     if (TURN_ORIGIN_ROUTING_ENABLED) {
-      const originTurn = findTurnByOriginId(args.origin_turn_id);
-      injected = resolveAnswerThreadWithLog(String(args.chat_id), undefined, originTurn, turn, "stream_reply");
+      const echoedTurn = findTurnByOriginId(args.origin_turn_id);
+      const quotedTurn = echoedTurn == null ? findTurnByQuotedMessageId(String(args.chat_id), args.reply_to) : null;
+      const originTurn = echoedTurn ?? quotedTurn;
+      injected = resolveAnswerThreadWithLog(String(args.chat_id), undefined, originTurn, originTurn == null ? null : echoedTurn != null ? "echo" : "quoted", turn, "stream_reply");
     } else {
       injected = turn?.sessionThreadId;
     }
@@ -58106,7 +58151,7 @@ function handleSessionEvent(ev) {
             chatId: turn.sessionChatId,
             isPrivateChat: turn.isDm,
             threadId: turn.sessionThreadId,
-            ...ANSWER_STREAM_VISIBLE_ENABLED ? { minInitialChars: 1 } : { sendMessageDraft: sendMessageDraftFn, minInitialChars: Number.MAX_SAFE_INTEGER },
+            ...ANSWER_STREAM_VISIBLE_ENABLED || DRAFT_ANSWER_LANE_RETIRED ? { minInitialChars: 1 } : { sendMessageDraft: sendMessageDraftFn, minInitialChars: Number.MAX_SAFE_INTEGER },
             sendMessage: async (chatId, text, params) => {
               const tid = params?.message_thread_id;
               const silent = params?.purpose !== "materialize";
@@ -58238,7 +58283,7 @@ function handleSessionEvent(ev) {
         const stream = turn.answerStream;
         const streamedMsgId = stream.messageId();
         const streamedFinalText = turn.capturedText.join("").trim();
-        if (ANSWER_STREAM_VISIBLE_ENABLED && !turn.replyCalled && streamedMsgId != null && streamedFinalText.length > 0) {
+        if ((ANSWER_STREAM_VISIBLE_ENABLED || DRAFT_ANSWER_LANE_RETIRED) && !turn.replyCalled && streamedMsgId != null && streamedFinalText.length > 0) {
           turn.answerStream = null;
           streamFinalizedAsAnswer = true;
           turn.finalAnswerDelivered = true;
@@ -64574,7 +64619,7 @@ var didOneTimeSetup = false;
           }
         }
       }
-      process.stderr.write(`telegram gateway: answer-stream draft transport=${sendMessageDraftFn != null ? "available" : "unavailable"} grammy=${GRAMMY_VERSION}
+      process.stderr.write(`telegram gateway: answer-stream lane=${DRAFT_ANSWER_LANE_RETIRED ? "visible(draft-retired)" : ANSWER_STREAM_VISIBLE_ENABLED ? "visible" : "draft"} draftFn=${sendMessageDraftFn != null ? "available" : "off"} grammy=${GRAMMY_VERSION}
 `);
       process.stderr.write(`telegram gateway: starting bot polling pid=${process.pid} agent=${process.env.SWITCHROOM_AGENT_NAME ?? "-"} stateDir=${STATE_DIR} historyEnabled=${HISTORY_ENABLED} streamMode=${process.env.SWITCHROOM_TG_STREAM_MODE ?? "checklist"}
 `);