switchroom 0.15.17 → 0.15.19

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

@@ -43144,6 +43144,7 @@ var TELEGRAM_MENU_COMMANDS = [
   { command: "logs", description: "Show recent agent logs" },
   { command: "inject", description: "Inject a Claude Code slash command (e.g. /cost)" },
   { command: "model", description: "Show or switch the Claude model" },
+  { command: "effort", description: "Show or switch the reasoning effort" },
   { command: "doctor", description: "Health check (deps, services, MCP)" },
   { command: "usage", description: "Pro/Max plan quota (5h + 7d windows)" },
   { command: "vault", description: "Manage vault secrets + capability grants" },
@@ -43185,6 +43186,7 @@ function switchroomHelpText(agentName3) {
     `<code>/auth rm [agent] &lt;slot&gt; [--force]</code> \u2014 remove a slot`,
     `<code>/model</code> \u2014 show the configured Claude model`,
     `<code>/model &lt;name&gt;</code> \u2014 switch the live session's model (opus \u00b7 sonnet \u00b7 haiku or a full id; until restart)`,
+    `<code>/effort</code> \u2014 show or switch reasoning effort (low \u00b7 medium \u00b7 high \u00b7 xhigh \u00b7 max; until restart)`,
     `<code>/topics</code> \u2014 topic-to-agent mappings`,
     `<code>/permissions [agent]</code> \u2014 show agent permissions`,
     `<code>/grant &lt;tool&gt;</code> \u2014 grant a tool permission`,
@@ -44527,6 +44529,7 @@ var INJECT_COMMANDS = new Map([
   ["/hooks", { description: "List configured hooks", expectsOutput: true }],
   ["/memory", { description: "Open memory picker", expectsOutput: true }],
   ["/model", { description: "Open model picker", expectsOutput: true }],
+  ["/effort", { description: "Set reasoning effort", expectsOutput: true }],
   [
     "/clear",
     { description: "Clear session screen", expectsOutput: false }
@@ -44784,6 +44787,7 @@ var INJECT_COMMANDS2 = new Map([
   ["/hooks", { description: "List configured hooks", expectsOutput: true }],
   ["/memory", { description: "Open memory picker", expectsOutput: true }],
   ["/model", { description: "Open model picker", expectsOutput: true }],
+  ["/effort", { description: "Set reasoning effort", expectsOutput: true }],
   [
     "/clear",
     { description: "Clear session screen", expectsOutput: false }
@@ -45392,6 +45396,161 @@ function extractConfirmation(pane) {
   return null;
 }
 
+// gateway/effort-command.ts
+var EFFORT_LEVELS = ["low", "medium", "high", "xhigh", "max"];
+function isValidEffortArg(arg) {
+  return EFFORT_LEVELS.includes(arg.toLowerCase());
+}
+function parseEffortCommand(text) {
+  const m = text.match(/^\/effort(?:@[A-Za-z0-9_]+)?(?:\s+([\s\S]*))?$/);
+  if (!m)
+    return null;
+  const rest = (m[1] ?? "").trim();
+  if (rest.length === 0)
+    return { kind: "show" };
+  const parts = rest.split(/\s+/);
+  if (parts.length > 1) {
+    return { kind: "help", reason: "effort takes a single level" };
+  }
+  const arg = parts[0];
+  if (arg.toLowerCase() === "help")
+    return { kind: "help" };
+  if (!isValidEffortArg(arg)) {
+    return { kind: "help", reason: `not a valid effort level: ${arg}` };
+  }
+  return { kind: "set", level: arg.toLowerCase() };
+}
+var PERSIST_NOTE2 = "<i>Session-only \u2014 reverts to the configured default on restart. To change the default, set <code>thinking_effort:</code> in switchroom.yaml and restart.</i>";
+var LEVELS_INLINE = EFFORT_LEVELS.map((l) => `<code>${l}</code>`).join(" \u00b7 ");
+function helpText3(deps, reason) {
+  const lines = [];
+  if (reason)
+    lines.push(`\u26a0\ufe0f ${deps.escapeHtml(reason)}`);
+  lines.push("<b>/effort</b> \u2014 show or switch the reasoning effort (faster\u2192smarter)", "<code>/effort</code> \u2014 show the configured effort + a tap menu", `<code>/effort &lt;level&gt;</code> \u2014 switch the live session (${LEVELS_INLINE})`, PERSIST_NOTE2);
+  return { text: lines.join(`
+`), html: true };
+}
+async function handleEffortCommand(parsed, deps) {
+  if (parsed.kind === "help")
+    return helpText3(deps, parsed.reason);
+  if (parsed.kind === "show") {
+    const configured = deps.getConfiguredEffort();
+    const shown = configured && configured.length > 0 ? configured : "low";
+    return {
+      text: [
+        `<b>Effort \u2014 ${deps.escapeHtml(deps.getAgentName())}</b>`,
+        `Configured default: <code>${deps.escapeHtml(shown)}</code>`,
+        `Switch the live session: ${EFFORT_LEVELS.map((l) => `<code>/effort ${l}</code>`).join(" \u00b7 ")}`,
+        PERSIST_NOTE2
+      ].join(`
+`),
+      html: true
+    };
+  }
+  if (!isValidEffortArg(parsed.level)) {
+    return helpText3(deps, `not a valid effort level: ${parsed.level}`);
+  }
+  const verbHtml = `<code>/effort ${deps.escapeHtml(parsed.level)}</code>`;
+  let result;
+  try {
+    result = await deps.inject(deps.getAgentName(), `/effort ${parsed.level}`);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    return { text: `\u274c ${verbHtml} \u2014 inject failed: ${deps.escapeHtml(msg)}`, html: true };
+  }
+  if (result.outcome === "ok") {
+    return {
+      text: [
+        `${verbHtml}`,
+        deps.preBlock(result.output),
+        ...result.truncated ? ["<i>truncated</i>"] : [],
+        PERSIST_NOTE2
+      ].join(`
+`),
+      html: true
+    };
+  }
+  if (result.outcome === "ok_no_output") {
+    return {
+      text: [
+        `${verbHtml} \u2014 sent, but no response captured. The agent may be mid-turn; check <code>/inject /status</code> to confirm the active effort.`,
+        PERSIST_NOTE2
+      ].join(`
+`),
+      html: true
+    };
+  }
+  if (result.errorCode === "session_missing") {
+    return {
+      text: "\u274c tmux session not found \u2014 the agent must be running under the tmux supervisor (the default). Remove <code>experimental.legacy_pty: true</code> if set.",
+      html: true
+    };
+  }
+  return {
+    text: `\u274c ${verbHtml} \u2014 ${deps.escapeHtml(result.errorMessage ?? "inject failed")}`,
+    html: true
+  };
+}
+var EFFORT_CALLBACK_PREFIX = "eff:";
+var EFFORT_CALLBACK_SELECT = "eff:s:";
+function effortSelectCallbackData(level) {
+  return `${EFFORT_CALLBACK_SELECT}${level}`;
+}
+function menuKeyboard2(highlight) {
+  return [
+    EFFORT_LEVELS.map((l) => ({
+      text: l === highlight ? `\u2705 ${l}` : l,
+      callback_data: effortSelectCallbackData(l)
+    }))
+  ];
+}
+function buildEffortMenu(deps, highlight) {
+  const configured = deps.getConfiguredEffort() || "low";
+  const live = highlight ?? configured;
+  return {
+    text: [
+      `<b>Effort \u2014 ${deps.escapeHtml(deps.getAgentName())}</b>`,
+      `Default: <code>${deps.escapeHtml(configured)}</code> \u00b7 faster \u2192 smarter: ${LEVELS_INLINE}`,
+      "Tap to switch the live session:",
+      PERSIST_NOTE2
+    ].join(`
+`),
+    html: true,
+    keyboard: menuKeyboard2(live)
+  };
+}
+async function handleEffortMenuCallback(data, deps) {
+  if (!data.startsWith(EFFORT_CALLBACK_SELECT)) {
+    return { reply: buildEffortMenu(deps) };
+  }
+  const level = data.slice(EFFORT_CALLBACK_SELECT.length);
+  if (!isValidEffortArg(level)) {
+    return { reply: buildEffortMenu(deps) };
+  }
+  let banner;
+  let selected;
+  try {
+    const result = await deps.inject(deps.getAgentName(), `/effort ${level}`);
+    if (result.outcome === "ok" || result.outcome === "ok_no_output") {
+      banner = `\u2705 Effort \u2192 <code>${deps.escapeHtml(level)}</code> for this session`;
+      selected = level;
+    } else if (result.errorCode === "session_missing") {
+      banner = "\u274c tmux session not found \u2014 is the agent running under the supervisor?";
+    } else {
+      banner = `\u274c couldn't set effort: ${deps.escapeHtml(result.errorMessage ?? "inject failed")}`;
+    }
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    banner = `\u274c inject failed: ${deps.escapeHtml(msg)}`;
+  }
+  const menu = buildEffortMenu(deps, selected);
+  return {
+    reply: { ...menu, text: `${banner}
+${menu.text}` },
+    selectedEffort: selected
+  };
+}
+
 // ../src/config/loader.ts
 init_dist();
 init_zod();
@@ -54158,10 +54317,10 @@ function readTurnActiveMarkerAgeMs(stateDir, now) {
 }
 
 // ../src/build-info.ts
-var VERSION = "0.15.17";
-var COMMIT_SHA = "a5129bd3";
-var COMMIT_DATE = "2026-06-13T22:07:37Z";
-var LATEST_PR = 2332;
+var VERSION = "0.15.19";
+var COMMIT_SHA = "3f40c6f9";
+var COMMIT_DATE = "2026-06-14T00:06:47Z";
+var LATEST_PR = 2337;
 var COMMITS_AHEAD_OF_TAG = 0;
 
 // gateway/boot-version.ts
@@ -57206,10 +57365,8 @@ if (inboundSpool != null) {
   }
 }
 var pendingPermissionBuffer = createPendingPermissionBuffer();
-function buildPermissionActionRow(requestId, showAlways, showTimeBox = false) {
-  const kb = new import_grammy9.InlineKeyboard().text("\u274C Deny", `perm:deny:${requestId}`).text("\u2705 Allow once", `perm:allow:${requestId}`);
-  if (showTimeBox)
-    kb.text("\u23F1 30 min", `perm:tmb:${requestId}`);
+function buildPermissionActionRow(requestId, showAlways) {
+  const kb = new import_grammy9.InlineKeyboard().text("\u274C Deny", `perm:deny:${requestId}`).text("\u2705 Allow", `perm:allow:${requestId}`);
   if (showAlways)
     kb.text("\uD83D\uDD01 Always\u2026", `perm:always:${requestId}`);
   return kb;
@@ -57465,10 +57622,8 @@ var ipcServer = createIpcServer({
       description,
       agentName: _client.agentName
     });
-    const scopeChoices = resolveScopedAllowChoices(toolName, inputPreview);
-    const showAlways = scopeChoices != null;
-    const showTimeBox = scopedApprovalTtlMs() > 0 && resolveTimeBox(toolName, inputPreview, scopeChoices) != null;
-    const keyboard = buildPermissionActionRow(requestId, showAlways, showTimeBox);
+    const showAlways = resolveScopedAllowChoices(toolName, inputPreview) != null;
+    const keyboard = buildPermissionActionRow(requestId, showAlways);
     const activeTurn = currentTurn;
     const targets = resolvePermissionCardTargets();
     for (const { chatId, threadId } of targets) {
@@ -62147,6 +62302,43 @@ bot.command("model", async (ctx) => {
   const reply = await handleModelCommand(parsed, deps);
   await switchroomReply(ctx, reply.text, { html: reply.html });
 });
+function buildEffortDeps() {
+  return {
+    inject: injectSlashCommand,
+    getAgentName: getMyAgentName,
+    getConfiguredEffort: () => {
+      const data = switchroomExecJson(["agent", "list"]);
+      return data?.agents?.find((a) => a.name === getMyAgentName())?.thinking_effort ?? null;
+    },
+    escapeHtml: escapeHtmlForTg,
+    preBlock
+  };
+}
+function effortMenuReplyMarkup(reply) {
+  if (!reply.keyboard)
+    return;
+  const kb = new import_grammy9.InlineKeyboard;
+  for (const row of reply.keyboard) {
+    for (const btn of row)
+      kb.text(btn.text, btn.callback_data);
+    kb.row();
+  }
+  return kb;
+}
+bot.command("effort", async (ctx) => {
+  if (!isAuthorizedSender(ctx))
+    return;
+  const text = ctx.message?.text ?? ctx.channelPost?.text ?? "";
+  const parsed = parseEffortCommand(text) ?? { kind: "show" };
+  const deps = buildEffortDeps();
+  if (parsed.kind === "show") {
+    const menu = buildEffortMenu(deps);
+    await switchroomReply(ctx, menu.text, { html: true, reply_markup: effortMenuReplyMarkup(menu) });
+    return;
+  }
+  const reply = await handleEffortCommand(parsed, deps);
+  await switchroomReply(ctx, reply.text, { html: reply.html });
+});
 bot.command("agentstart", async (ctx) => {
   if (!isAuthorizedSender(ctx))
     return;
@@ -64874,6 +65066,26 @@ bot.on("callback_query:data", async (ctx) => {
     await handleAuthDashboardCallback(ctx);
     return;
   }
+  if (data.startsWith(EFFORT_CALLBACK_PREFIX)) {
+    const access2 = loadAccess();
+    const senderId2 = String(ctx.from?.id ?? "");
+    if (!access2.allowFrom.includes(senderId2)) {
+      await ctx.answerCallbackQuery({ text: "Not authorized." });
+      return;
+    }
+    await ctx.answerCallbackQuery({ text: "Setting effort\u2026" }).catch(() => {});
+    try {
+      const outcome = await handleEffortMenuCallback(data, buildEffortDeps());
+      await ctx.editMessageText(outcome.reply.text, {
+        parse_mode: "HTML",
+        reply_markup: effortMenuReplyMarkup(outcome.reply) ?? { inline_keyboard: [] }
+      }).catch(() => {});
+    } catch (err) {
+      process.stderr.write(`telegram gateway: effort-menu callback failed: ${err?.message ?? String(err)}
+`);
+    }
+    return;
+  }
   if (data.startsWith(MODEL_CALLBACK_PREFIX)) {
     const access2 = loadAccess();
     const senderId2 = String(ctx.from?.id ?? "");
@@ -65080,8 +65292,8 @@ ${preBlock(formatSwitchroomOutput(err.message ?? "unknown error"))}`, { html: tr
     const cbMessageId = ctx.callbackQuery?.message?.message_id;
     const metaForMessage = cbMessageId != null ? agentButtonMeta.get(`${cbChatId}:${cbMessageId}`) : undefined;
     const tapMeta = metaForMessage?.get(agentCb.raw);
-    const ackText = typeof tapMeta?.ack_text === "string" && tapMeta.ack_text.length > 0 ? tapMeta.ack_text : "\u2713 received";
-    await ctx.answerCallbackQuery({ text: ackText }).catch(() => {});
+    const ackText2 = typeof tapMeta?.ack_text === "string" && tapMeta.ack_text.length > 0 ? tapMeta.ack_text : "\u2713 received";
+    await ctx.answerCallbackQuery({ text: ackText2 }).catch(() => {});
     const buttonText = (() => {
       const msg2 = ctx.callbackQuery?.message;
       const kb = msg2 && "reply_markup" in msg2 ? msg2.reply_markup : undefined;
@@ -65150,7 +65362,7 @@ ${preBlock(formatSwitchroomOutput(err.message ?? "unknown error"))}`, { html: tr
     }
     return;
   }
-  const m = /^perm:(allow|deny|always|asn|asb|back|tmb):([a-km-z]{5})$/.exec(data);
+  const m = /^perm:(allow|deny|always|asn|asb|back):([a-km-z]{5})$/.exec(data);
   if (!m) {
     await ctx.answerCallbackQuery().catch(() => {});
     return;
@@ -65170,9 +65382,7 @@ ${preBlock(formatSwitchroomOutput(err.message ?? "unknown error"))}`, { html: tr
     }
     let keyboard;
     if (behavior === "back") {
-      const backChoices = resolveScopedAllowChoices(details.tool_name, details.input_preview);
-      const backTimeBox = scopedApprovalTtlMs() > 0 && resolveTimeBox(details.tool_name, details.input_preview, backChoices) != null;
-      keyboard = buildPermissionActionRow(request_id, true, backTimeBox);
+      keyboard = buildPermissionActionRow(request_id, true);
     } else {
       const choices = resolveScopedAllowChoices(details.tool_name, details.input_preview);
       if (choices == null) {
@@ -65305,12 +65515,12 @@ ${preBlock(formatSwitchroomOutput(err.message ?? "unknown error"))}`, { html: tr
     }
     const ok = durable;
     const legacyNote = legacy && durable;
-    const ackText = ok ? legacyNote ? `\u2705 Saved. ${agentName3} can now ${grantPhrase} without asking (legacy path).` : `\u2705 Saved. ${agentName3} can now ${grantPhrase} without asking.` : editLockHint ? `\u26A0\uFE0F Allowed for now \u2014 config edits are locked. Enable hostd.config_edit_enabled.` : `\u26A0\uFE0F Allowed for now, but "always" did NOT save \u2014 it will ask again after restart. Check gateway log.`;
+    const ackText2 = ok ? legacyNote ? `\u2705 Saved. ${agentName3} can now ${grantPhrase} without asking (legacy path).` : `\u2705 Saved. ${agentName3} can now ${grantPhrase} without asking.` : editLockHint ? `\u26A0\uFE0F Allowed for now \u2014 config edits are locked. Enable hostd.config_edit_enabled.` : `\u26A0\uFE0F Allowed for now, but "always" did NOT save \u2014 it will ask again after restart. Check gateway log.`;
     const sourceMsg = ctx.callbackQuery?.message;
     const baseText2 = sourceMsg && "text" in sourceMsg && sourceMsg.text ? escapeHtmlForTg(sourceMsg.text) : "";
     const editLabel = ok ? legacyNote ? `\u2705 <b>${escapeHtmlForTg(agentName3)} can now ${escapeHtmlForTg(grantPhrase)}</b> without asking (legacy path); restart agent for full effect` : `\u2705 <b>${escapeHtmlForTg(agentName3)} can now ${escapeHtmlForTg(grantPhrase)}</b> without asking; restart agent for full effect` : editLockHint ? `\u26A0\uFE0F <b>Allowed for now \u2014 "always" did NOT save.</b> Config edits are locked; enable <code>hostd.config_edit_enabled</code>.` : `\u26A0\uFE0F <b>Allowed for now \u2014 "always" did NOT save.</b> It will ask again after restart. Check gateway log.`;
     await finalizeCallback(ctx, {
-      ackText: ackText.slice(0, 200),
+      ackText: ackText2.slice(0, 200),
       newText: baseText2 ? `${baseText2}
 
 ${editLabel}` : editLabel,
@@ -65318,64 +65528,28 @@ ${editLabel}` : editLabel,
     });
     return;
   }
-  if (behavior === "tmb") {
-    const details = pendingPermissions.get(request_id);
-    if (!details) {
-      await ctx.answerCallbackQuery({ text: "Details no longer available." }).catch(() => {});
-      return;
-    }
-    const ttl = scopedApprovalTtlMs();
-    if (ttl <= 0) {
-      await ctx.answerCallbackQuery({ text: "Time-boxed approvals are disabled." }).catch(() => {});
-      return;
-    }
-    const choices = resolveScopedAllowChoices(details.tool_name, details.input_preview);
-    const tb = resolveTimeBox(details.tool_name, details.input_preview, choices);
-    if (!tb) {
-      await ctx.answerCallbackQuery({ text: "This action can't be time-boxed." }).catch(() => {});
-      return;
-    }
-    const agentName3 = selfAgentName();
-    if (!agentName3) {
-      await ctx.answerCallbackQuery({ text: "Time-box needs SWITCHROOM_AGENT_NAME \u2014 gateway is misconfigured." }).catch(() => {});
-      return;
-    }
-    pendingPermissions.delete(request_id);
-    dispatchPermissionVerdict({ type: "permission", requestId: request_id, behavior: "allow" });
-    recordScopedGrant(scopedGrants, agentName3, tb.rule, Date.now(), ttl);
-    resumeReactionAfterVerdict();
-    postPermissionResumeMessage({
-      behavior: "allow",
-      action: naturalAction(details.tool_name, details.input_preview)
-    });
-    process.stderr.write(`telegram gateway: scoped-approval granted rule="${tb.rule}" agent=${agentName3} ttl_ms=${ttl} (request_id=${request_id})
+  const pd = pendingPermissions.get(request_id);
+  const resumeAction = pd ? naturalAction(pd.tool_name, pd.input_preview) : "";
+  const scopedTtl = scopedApprovalTtlMs();
+  const timeBox = behavior === "allow" && scopedTtl > 0 && pd ? resolveTimeBox(pd.tool_name, pd.input_preview, resolveScopedAllowChoices(pd.tool_name, pd.input_preview)) : null;
+  const grantAgent = selfAgentName();
+  pendingPermissions.delete(request_id);
+  if (timeBox && grantAgent) {
+    recordScopedGrant(scopedGrants, grantAgent, timeBox.rule, Date.now(), scopedTtl);
+    process.stderr.write(`telegram gateway: scoped-approval granted via Allow rule="${timeBox.rule}" agent=${grantAgent} ttl_ms=${scopedTtl} (request_id=${request_id})
 `);
-    const mins = Math.max(1, Math.round(ttl / 60000));
-    const sourceMsg = ctx.callbackQuery?.message;
-    const baseText2 = sourceMsg && "text" in sourceMsg && sourceMsg.text ? escapeHtmlForTg(sourceMsg.text) : "";
-    const editLabel = `\u23F1 <b>Allowed for ${mins} min \u2014 ${escapeHtmlForTg(tb.breadth)}</b> \xB7 re-asks after that, and now for anything else`;
-    await finalizeCallback(ctx, {
-      ackText: `\u23F1 Allowed for ${mins} min`.slice(0, 200),
-      newText: baseText2 ? `${baseText2}
-
-${editLabel}` : editLabel,
-      parseMode: "HTML"
-    });
-    return;
   }
-  const resumeAction = (() => {
-    const d = pendingPermissions.get(request_id);
-    return d ? naturalAction(d.tool_name, d.input_preview) : "";
-  })();
-  pendingPermissions.delete(request_id);
-  const label = behavior === "allow" ? "\u2705 Allowed" : "\u274C Denied";
+  const scopedMins = Math.max(1, Math.round(scopedTtl / 60000));
+  const windowGranted = timeBox != null && grantAgent !== "";
+  const ackText = behavior === "deny" ? "\u274C Denied" : windowGranted ? `\u2705 Allowed (${scopedMins} min)` : "\u2705 Allowed once";
+  const htmlLabel = behavior === "deny" ? "\u274C <b>Denied</b>" : windowGranted ? `\u2705 <b>Allowed \u2014 won't ask again about ${escapeHtmlForTg(timeBox.breadth)} for ${scopedMins} min</b>` : "\u2705 <b>Allowed once</b>";
   const msg = ctx.callbackQuery?.message;
   const baseText = msg && "text" in msg && msg.text ? escapeHtmlForTg(msg.text) : "";
   await finalizeCallback(ctx, {
-    ackText: label,
+    ackText: ackText.slice(0, 200),
     newText: baseText ? `${baseText}
 
-${label}` : label,
+${htmlLabel}` : htmlLabel,
     parseMode: "HTML",
     synthInbound: () => {
       dispatchPermissionVerdict({