pi-bro 0.17.0 → 0.18.1

package/bro.ts

@@ -63,7 +63,9 @@ type BroSource = { text: string; label?: string };
 type BroResult = { source: BroSource; text: string; model?: string };
 type ModalResult = { source?: BroSource; text: string; htmlPath?: string; model?: string };
 type BtwTurn = { question: string; answer: string };
-type BtwThread = { turns: BtwTurn[]; conversationId?: string; full: boolean; backend?: BackendName; model?: string };
+// `context` keeps the main-session seed so a fresh native session can be reseeded with the whole
+// thread; `sessionFull` is the access mode the native session last ran in.
+type BtwThread = { turns: BtwTurn[]; conversationId?: string; full: boolean; backend?: BackendName; model?: string; context?: string; sessionFull?: boolean };
 const EFFORTS = ["default", "low", "medium", "high"] as const;
 const BACKENDS = ["agy", "claude", "grok"] as const;
 type BackendName = (typeof BACKENDS)[number];
@@ -122,11 +124,9 @@ const COMMANDS = [
 	{ value: "url", label: "url", description: "Explain a public webpage" },
 	{ value: "open", label: "open", description: "Reopen the last explanation" },
 	{ value: "doctor", label: "doctor", description: "Check whether Bro is ready" },
-	{ value: "model", label: "model", description: "View or choose the shared default model" },
-	{ value: "effort", label: "effort", description: "View or choose the shared default reasoning effort" },
 	{ value: "show", label: "show", description: "Draw what happened in recent session turns as shapes" },
 	{ value: "mode", label: "mode", description: "View or choose explanation mode (brief, balanced, faithful)" },
-	{ value: "btw", label: "btw", description: "Open a side conversation (context-only intent; --full invites workspace access)" },
+	{ value: "btw", label: "btw", description: "Open a side conversation (starts conversation-only; /mode toggles full permission)" },
 	{ value: "config", label: "config", description: "Configure shared defaults and per-capability model/effort overrides" },
 	{ value: "advisor", label: "advisor", description: "Check whether the executor's advisor tool is available right now" },
 	{ value: "advisor-steer", label: "advisor-steer", description: "View, edit, save, or clear the advisor's persistent steering brief" },
@@ -1092,7 +1092,7 @@ async function doctorReport(pi: ExtensionAPI, ctx: ExtensionCommandContext, sign
 		if (defaultBackend === "claude") {
 			pass("Selected model", `claude \`${settings.model}\``);
 			if (!isClaudeEffort(settings.effort)) {
-				fail("Reasoning effort", `\`${settings.effort}\` is unsupported. Run \`/bro effort\` to choose another.`);
+				fail("Reasoning effort", `\`${settings.effort}\` is unsupported. Run \`/bro config\` to choose another.`);
 			} else if (settings.effort === "default") {
 				pass("Reasoning effort", "built into the selected model");
 			} else {
@@ -1101,7 +1101,7 @@ async function doctorReport(pi: ExtensionAPI, ctx: ExtensionCommandContext, sign
 		} else if (defaultBackend === "grok") {
 			pass("Selected model", `grok \`${settings.model}\``);
 			if (!isGrokEffort(settings.effort)) {
-				fail("Reasoning effort", `\`${settings.effort}\` is unsupported. Run \`/bro effort\` to choose another.`);
+				fail("Reasoning effort", `\`${settings.effort}\` is unsupported. Run \`/bro config\` to choose another.`);
 			} else if (settings.effort === "default") {
 				pass("Reasoning effort", "built into the selected model");
 			} else {
@@ -1110,7 +1110,7 @@ async function doctorReport(pi: ExtensionAPI, ctx: ExtensionCommandContext, sign
 		} else if (models) {
 			const current = resolveCatalogSettings(settings, models);
 			if (!current.family) {
-				fail("Selected model", `\`${settings.model}\` is unavailable. Run \`/bro model\` to choose another.`);
+				fail("Selected model", `\`${settings.model}\` is unavailable. Run \`/bro config\` to choose another.`);
 			} else {
 				pass("Selected model", `agy \`${current.family.id}\``);
 				const effort = current.settings.effort;
@@ -1119,7 +1119,7 @@ async function doctorReport(pi: ExtensionAPI, ctx: ExtensionCommandContext, sign
 				} else if (effort !== "default" && current.family.efforts.includes(effort as AgyEffort)) {
 					pass("Reasoning effort", effort);
 				} else {
-					fail("Reasoning effort", `\`${effort}\` is unsupported. Run \`/bro effort\` to choose another.`);
+					fail("Reasoning effort", `\`${effort}\` is unsupported. Run \`/bro config\` to choose another.`);
 				}
 			}
 		}
@@ -1130,10 +1130,6 @@ async function doctorReport(pi: ExtensionAPI, ctx: ExtensionCommandContext, sign
 			const backend = capabilityBackend(settings, capability);
 			const pair = capabilityPair(settings, capability);
 			if (backend === "claude") {
-				if (capability === "btw") {
-					fail(label, "`btw` is not supported on the Claude backend. Run `/bro config` to give it an Agy model.");
-					continue;
-				}
 				if (!isClaudeEffort(pair.effort)) {
 					fail(label, `\`${pair.effort}\` is unsupported for claude \`${pair.model}\`. Run \`/bro config\` to fix this.`);
 					continue;
@@ -2307,101 +2303,62 @@ export function helpText(settings?: BroSettings, settingsError?: string): string
 	const settingsSummary = settings
 		? `- **Backend:** ${settings.backend ?? "agy"}\n- **Model:** \`${settings.model}\`\n- **Reasoning effort:** ${settings.effort === "default" ? "built into the selected model" : settings.effort}\n- **Mode:** ${settings.mode}\n- **Show turns:** ${settings.showTurns}${overrideLines.length ? `\n${overrideLines.join("\n")}` : ""}`
 		: `Bro could not read its settings: ${settingsError}\n\nRun \`/bro doctor\` for setup help.`;
-	const advisorBackend = settings ? capabilityBackend(settings, "advisor") : "agy";
-	const advisorProcess = advisorBackend === "claude" ? "Claude process" : advisorBackend === "grok" ? "Grok process" : "Agy process";
-	const advisorName = advisorBackend === "claude" ? "Claude" : advisorBackend === "grok" ? "Grok" : "Agy";
 	return `# Bro
 
-Bro explains a dense assistant reply, pasted text, local document, or public webpage in plain language, draws recent session turns as shapes, or opens a separate side conversation with \`/bro btw\` — without adding anything to Pi's conversation.
+Quick reference. The README is the full user guide: https://github.com/tranhoangnguyen03/pi-bro#readme
 
-## Explain
+## Explain and show
 
 - \`/bro\` — explain the latest completed assistant reply
 - \`/bro text [text]\` — explain pasted text, or the latest reply when text is omitted
-- \`/bro file <path>\` — explain a Markdown, text, PDF, or DOCX file
+- \`/bro file <path>\` — explain a workspace \`.md\`, \`.markdown\`, \`.txt\`, \`.pdf\`, or \`.docx\` file
 - \`/bro url <url>\` — explain one public webpage
-- \`/bro open\` — reopen the latest explanation
-- \`/bro show [n-turns] [query]\` — draw the last few session turns (default 1) as shapes, from user and assistant conversation text only (tool calls, tool results, reasoning, and images are omitted); add a query to steer what the shapes focus on
-
-Any other input is the source itself: a lone URL explains that webpage, an existing workspace file with a supported extension explains that file, and anything else is explained as pasted text. Quoted paths with spaces are routed too when the file exists.
-
-Press **R** to simplify the captured source again. Run a new \`/bro text\`, \`/bro file\`, \`/bro url\`, or \`/bro show\` command — or give \`/bro\` the input directly — to capture a new source.
-
-## Check and configure
-
-- \`/bro doctor\` — check settings, backends, account, model, effort, and mode (per-feature backend/model/effort)
-- \`/bro model [id]\` — view or choose the shared default model (Agy catalog, sonnet/opus/explicit IDs on Claude, grok-4.7/grok-4.7-build-fast/explicit IDs on Grok)
-- \`/bro effort [low|medium|high|xhigh|max]\` — view or choose the shared default reasoning effort (xhigh on Claude/Grok, max on Claude only)
-- \`/bro mode [brief|balanced|faithful]\` — view or choose explanation mode
-- \`/bro config\` — open an interactive settings screen for the shared default backend/model/effort, explain mode, show turns, and per-capability (explain/show/btw/advisor) backend, model, and effort overrides. Changes save immediately; Esc on a picker cancels without changing anything, Esc on the screen closes it and keeps whatever was already saved.
-
-\`/bro model\` and \`/bro effort\` always change the shared default that explain, show, btw, and advisor fall back to when they have no override. Use \`/bro config\` to give one of them its own backend, model, or effort. \`btw\` runs on Agy or Grok (Claude continuation is pending).
+- \`/bro <input>\` — a lone URL, an existing supported file, or anything else as pasted text
+- \`/bro open\` — reopen the latest explanation without a new request
+- \`/bro show [n-turns] [query]\` — draw recent turns' conversation text as shapes; an optional query steers the focus
 
 ## Side conversation
 
-- \`/bro btw [--fresh] [--full] [question]\` — open a side conversation. Conversation-only intent by default (Agy sandbox controls; Grok prompt request, not enforced); add \`--full\` to let it read and edit the workspace, and \`--fresh\` to start without main-session context. Reopening preserves the thread's access mode (even with \`--fresh\`); use \`--sandbox\` to return to sandbox mode. Changing access mode starts a new thread. Inside the side thread, type questions and press Enter (empty Enter re-asks); exact commands \`/copy\` and \`/copy-all\` copy the latest answer or full thread to the system clipboard; exact commands \`/insert\` and \`/insert-all\` insert into the main editor without submitting (use \`/insert!\` or \`/insert-all!\` to replace an existing draft); \`/retry\` re-asks the last question; \`/clear\` resets the thread. Any other input is sent as a question. Esc closes.
+- \`/bro btw [question]\` — open a side conversation seeded with recent main-session context. It starts conversation-only; reopening keeps the thread and its mode.
+- Inside the modal: Enter asks (empty Enter re-asks); \`/mode\` toggles conversation-only / full permission (read and edit the workspace) and keeps the thread; \`/copy\` and \`/copy-all\` copy to the clipboard; \`/insert\` and \`/insert-all\` insert into an empty main editor without submitting; \`/retry\` re-asks; \`/clear\` resets. Any other text is sent as a question. Esc closes.
 
 ## Advisor
 
-- \`bro_advisor\` — a tool the executor agent can voluntarily call mid-task for a second opinion from a fresh ${advisorProcess} before or after a non-trivial decision. It is registered like any other tool and has no on/off switch of its own; whether the executor can actually call it depends entirely on this host's own tool restrictions
-- \`/bro advisor\` — a quick notice of whether \`bro_advisor\` is available right now, pointing at \`/bro config\`, \`/bro advisor-steer\`, and \`/bro doctor\`
-- \`/bro advisor-steer\` — open an editor for one persistent steering brief the advisor always sees. **Ctrl+S** saves, **Enter**/**Shift+Enter** insert newlines, **Ctrl+K** clears the saved brief and draft, **Ctrl+C** copies the full draft, and **Esc** closes without saving unsaved edits
-- \`/bro doctor\` — the full advisor diagnostic: whether this host exposes and activates \`bro_advisor\`, its resolved model/effort, steering presence, and backend compatibility
+- \`bro_advisor\` — a tool the executor agent may call for a second opinion from a fresh backend process with real, auto-approved workspace access; it is told to advise, not edit, but that is not enforced
+- \`/bro advisor\` — whether \`bro_advisor\` is available right now
+- \`/bro advisor-steer\` — edit the session's persistent steering brief (**Ctrl+S** save, **Ctrl+K** clear, **Ctrl+C** copy, **Esc** close)
+
+## Configure and check
 
-Each consultation is a fresh, standalone ${advisorProcess} — never resumed, never looping, never automatically triggered. Bro captures the context snapshot (system instructions, active tools, and the conversation so far including tool calls and results) automatically; the executor never has to assemble one. The advisor has real tool access in the workspace, running with permissions auto-approved, so it can verify claims itself; it is instructed to only return advice and leave edits to the executor, but that instruction is behavioral rather than an enforced sandbox constraint. The steering brief persists in the session (not sent to the model) and is restored on resume or reload; forking a session inherits it, and edits after the fork are independent of the original branch.
+- \`/bro config\` — shared default and per-capability (explain/show/btw/advisor) backend, model, and effort; explain mode; show turns. Changes save immediately.
+- \`/bro mode [brief|balanced|faithful]\` — view or choose the explanation mode
+- \`/bro doctor\` — check settings, prompt, and every selected backend without running a model turn
 
 ## Current settings
 
 ${settingsSummary}
 
-Saved in \`${SETTINGS_FILE}\`. Use the commands above, configure interactively via \`/bro config\`, or edit the file directly. Changes apply to future explanations. \`showTurns\` can be configured interactively in \`/bro config\` or edited directly in \`${SETTINGS_FILE}\`, and overridden per run with \`/bro show <n-turns>\`. Add a query after the count — or on its own, e.g. \`/bro show what changed in the auth flow\` — to steer what the shapes focus on.
+Saved in \`${SETTINGS_FILE}\`.
 
 ## Explanation modes
 
 - brief — the main point and next action, with no fixed word target
 - balanced — default; material detail with clearer structure
 - faithful — closest to the source, with no fixed word limit
-/bro show uses its own built-in draw prompt; the modes and \`bro-prompt.md\` do not affect it.
-If \`${PROMPT_FILE}\` exists and is valid, the selected mode stays saved but inactive because the custom prompt fully overrides it. Remove or rename \`bro-prompt.md\` to use the saved built-in mode again.
+
+A valid \`${PROMPT_FILE}\` (with \`{{response}}\` exactly once) overrides the modes; the saved mode stays inactive until you remove or rename it. Show always uses its own prompt.
 
 ## Controls
 
-- **Mouse wheel / trackpad** — scroll
-- **↑ / ↓** — scroll
+- **Mouse wheel / trackpad**, **↑ / ↓** — scroll
 - **C** — copy the full explanation
-- **R** — repeat the current action\n- **O** — open the HTML diagram when a show reply contains one
+- **R** — repeat the current action
+- **O** — open the HTML diagram when a show reply contains one
 - **Esc** — close, or cancel while Bro is working
 
-Bro temporarily captures mouse input while the modal is open. Native mouse selection may be unavailable or extend outside the modal; press **C** to copy everything reliably.
-
-## Important limits
-
-- Documents must be inside the current workspace, are limited to 10 MiB and 100,000 extracted characters, and must be \`.md\`, \`.markdown\`, \`.txt\`, \`.pdf\`, or \`.docx\`. Scanned PDFs need OCR first.
-- Web input is limited to one public HTML page. Bro cannot sign in, run page JavaScript, bypass paywalls or blocks, follow pagination, or understand images and video.
-- If a webpage fails, copy it into a text file or save it as a PDF, then use \`/bro file\`.
-- Show draws only what already happened in this session — the conversation text of the last few turns, with tool calls, tool results, reasoning, and images always omitted — and is requested not to investigate the repository; Grok retains normal tools, so this is not enforced isolation. On a remote or headless session with no display, pressing **O** reports a failure instead of opening the diagram.
-- Show reflects what was reported in the conversation, not independent verification against the actual code or system state.
-- Btw threads are memory-only and do not survive reloads or restarts. A turn is capped at 2 minutes in sandbox mode and 10 minutes in full mode; the side conversation resumes through Agy \`--conversation\` or Grok \`--resume\`.
-- Advisor consultations run with real tool access and auto-approved permissions (Grok: \`--sandbox off --permission-mode bypassPermissions\`; Agy/Claude: \`--dangerously-skip-permissions\`) — there is no enforced read-only isolation, only the advisor's own behavioral instructions to advise rather than implement. On invocation failure (not a completed answer), Bro retries with the identical snapshot, steering, and question: once after 5 seconds, once more after 10 seconds, then returns ${advisorName}'s own diagnostic as the failure.
-
-## Privacy and safety
-
-Bro sends the selected assistant reply, pasted text, locally extracted document or webpage text, or recent session conversation text (tool calls, tool results, reasoning, and images omitted) to the selected backend and its model provider. They may retain request data under their own policies.
-
-Bro never adds the explanation to Pi's conversation, session file, or main-agent context. The captured source and latest explanation stay in process memory until you change sessions, reload extensions, or exit Pi.
-
-Bro asks explain/show backends to use supplied context; Grok retains tool authority, so this is behavioral rather than enforced. \`/bro btw\` uses Agy sandbox controls or Grok conversation-only prompt instructions by default; with \`--full\` it can read and edit the workspace, so use \`--full\` only when you want the side conversation to touch your project.
-For webpages, it connects directly to the site without browser cookies; the site sees your IP address and Bro's user agent. Do not use private or signed URLs.
+## Privacy
 
-Doctor checks contact only the selected backends, but never send source text or run a model turn. Pressing **C** sends the explanation to your system clipboard.
-
-Each advisor consultation sends the executor's system instructions, active tool list, ordered conversation (including tool calls and results, since the advisor needs to verify claims), your steering brief, and the executor's optional question to the selected backend and its model provider; the advisor process itself can read and edit the workspace with no permission prompts. The steering brief is stored as session-only extension data — never added to the main conversation Pi or the model sees; the advisor tool has no separate activation state.
-
-## Custom prompt
-
-Create or edit \`${PROMPT_FILE}\` and include \`{{response}}\` exactly once. Bro reads it on the next explanation and never modifies it. Existing valid custom prompts continue working unchanged.
-
-A valid custom prompt fully overrides all built-in mode instructions. \`/bro mode\` still changes the saved mode, but that mode remains inactive until you remove or rename \`bro-prompt.md\`. An invalid custom prompt blocks explanations; run \`/bro doctor\` for the exact problem.`;
+Bro sends the captured source (or, for the advisor, the executor's instructions, tools, and conversation) to the selected backend and its model provider, which may retain it under their own policies. Nothing is added to Pi's conversation unless you insert it. Access controls differ by backend; see the README.`;
 }
 
 // The overlay framing pattern is adapted from pi-btw (MIT); see THIRD_PARTY_NOTICES.md.
@@ -2713,35 +2670,52 @@ async function showBroModal(ctx: ExtensionCommandContext, options: BroModalOptio
 	);
 }
 
-export function parseBtwArguments(value: string): { fresh: boolean; full?: boolean; question: string; invalid?: string } {
-	let rest = value.trim();
-	let fresh = false;
-	let full: boolean | undefined;
-	while (rest.startsWith("--")) {
-		const space = rest.search(/\s/);
-		const token = space === -1 ? rest : rest.slice(0, space);
-		if (token === "--fresh") fresh = true;
-		else if (token === "--full") full = true;
-		else if (token === "--sandbox") full = false;
-		else return { fresh, full, question: "", invalid: `Unknown /bro btw flag: ${token}` };
-		rest = space === -1 ? "" : rest.slice(space).replace(/^\s+/, "");
+export function parseBtwArguments(value: string): { question: string; invalid?: string } {
+	const rest = value.trim();
+	if (!rest.startsWith("--")) return { question: rest };
+	const token = rest.split(/\s/, 1)[0]!;
+	if (token === "--full" || token === "--sandbox") {
+		return { question: "", invalid: `${token} was removed. Open /bro btw and type /mode to switch between conversation-only and full permission.` };
 	}
-	return { fresh, full, question: rest };
+	if (token === "--fresh") {
+		return { question: "", invalid: "--fresh was removed. Every new thread starts with main-session context; type /clear inside /bro btw to start over." };
+	}
+	return { question: "", invalid: `Unknown /bro btw flag: ${token}` };
 }
 
-export function resolveBtwThread(existing: BtwThread | undefined, parsed: { fresh: boolean; full?: boolean }): BtwThread {
-	const targetFull = parsed.full ?? existing?.full ?? false;
-	const startFresh = parsed.fresh || (parsed.full !== undefined && existing !== undefined && existing.full !== parsed.full);
-	return !existing || startFresh ? { turns: [], full: targetFull } : existing;
+// A new thread starts conversation-only; reopening keeps the thread and its mode.
+export function resolveBtwThread(existing: BtwThread | undefined): BtwThread {
+	return existing ?? { turns: [], full: false };
 }
 
 export function bindBtwBackend(thread: BtwThread, backend: BackendName): boolean {
 	const changed = thread.backend !== undefined && thread.backend !== backend;
-	if (changed) { thread.turns = []; thread.conversationId = undefined; }
+	if (changed) { thread.turns = []; thread.conversationId = undefined; thread.context = undefined; thread.sessionFull = undefined; }
 	thread.backend = backend;
 	return changed;
 }
 
+export function btwModeLabel(full: boolean): string {
+	return full ? "full permission" : "conversation-only";
+}
+
+// /mode keeps the transcript; whether the native session survives is decided by
+// nativeBtwContinuation on the next turn.
+export function toggleBtwMode(thread: BtwThread): void {
+	thread.full = !thread.full;
+}
+
+// Claude and Grok run btw in the workspace for both modes and resume one native session across
+// /mode switches. An Agy conversation stays bound to the workspace it started in (a sandbox scratch
+// dir vs. the repo), so an access change drops it; the next turn reseeds a fresh native session
+// with the main-session context and the whole thread.
+export function nativeBtwContinuation(thread: BtwThread, backend: BackendName): string | undefined {
+	if (backend === "agy" && thread.conversationId && thread.sessionFull !== undefined && thread.sessionFull !== thread.full) {
+		thread.conversationId = undefined;
+	}
+	return thread.conversationId;
+}
+
 export function formatBtwTranscript(turns: readonly BtwTurn[]): string {
 	return turns
 		.map((turn) => {
@@ -2756,26 +2730,23 @@ export function formatBtwTranscript(turns: readonly BtwTurn[]): string {
 
 export type BtwComposerAction =
 	| { kind: "clear" }
+	| { kind: "mode" }
 	| { kind: "retry" }
 	| { kind: "clipboard"; all: boolean }
-	| { kind: "insert"; all: boolean; force: boolean }
+	| { kind: "insert"; all: boolean }
+	| { kind: "removed"; command: string }
 	| { kind: "question"; text: string };
 
 export function parseBtwComposerCommand(value: string): BtwComposerAction {
 	const command = value.trim();
 	if (command === "/clear") return { kind: "clear" };
+	if (command === "/mode") return { kind: "mode" };
 	if (command === "/retry" || command === "") return { kind: "retry" };
 	if (command === "/copy" || command === "/copy-all") {
 		return { kind: "clipboard", all: command === "/copy-all" };
 	}
-	if (
-		command === "/insert" ||
-		command === "/insert!" ||
-		command === "/insert-all" ||
-		command === "/insert-all!"
-	) {
-		return { kind: "insert", all: command.startsWith("/insert-all"), force: command.endsWith("!") };
-	}
+	if (command === "/insert" || command === "/insert-all") return { kind: "insert", all: command === "/insert-all" };
+	if (command === "/insert!" || command === "/insert-all!") return { kind: "removed", command };
 	return { kind: "question", text: command };
 }
 
@@ -2791,12 +2762,6 @@ async function runBtwTurn(
 	signal: AbortSignal,
 	onProgress?: (text: string) => void,
 ): Promise<{ text: string; conversationId?: string }> {
-	// Claude continuation is not wired yet; Agy and Grok use native sessions.
-	// Reject Claude explicitly instead of falling back to another backend.
-	if (selection.backend === "claude") {
-		const name = "Claude";
-		throw new Error(`\`btw\` is not supported on the ${name} backend. Run \`/bro config\` to give it an Agy model.`);
-	}
 	let updateTimer: ReturnType<typeof setTimeout> | undefined;
 	let latest: string | undefined;
 	const throttledProgress = onProgress
@@ -2950,14 +2915,14 @@ class BtwModal implements Focusable {
 		const scroll = this.maxOffset > 0 ? ` · ↑${this.offset} ↓${hiddenBelow}` : "";
 
 		const model = this.model ? this.theme.fg("dim", ` · ${this.model}`) : "";
-		const mode = this.full ? this.theme.fg("dim", " · ") + this.theme.fg("accent", this.theme.bold("full · edits repo")) : "";
+		const mode = this.theme.fg("dim", " · ") + (this.full ? this.theme.fg("accent", this.theme.bold(btwModeLabel(true))) : this.theme.fg("dim", btwModeLabel(false)));
 		const header = this.theme.fg("accent", this.theme.bold("Bro · btw")) + model + mode + this.theme.fg("dim", scroll);
 
 		const composer = this.input.render(innerWidth)[0] ?? "";
 
 		const controls = this.running
 			? this.theme.fg("dim", "Thinking… · Esc cancel")
-			: this.theme.fg("dim", "Enter ask · Esc close · /copy · /copy-all · /insert · /insert-all · /clear · /retry");
+			: this.theme.fg("dim", "Enter ask · Esc close · /mode · /copy · /copy-all · /insert · /insert-all · /clear · /retry");
 
 		const lines = [
 			this.borderLine(innerWidth, "top"),
@@ -2983,7 +2948,7 @@ class BtwModal implements Focusable {
 
 async function openBtwModal(
 	ctx: ExtensionCommandContext,
-	options: { thread: BtwThread; initialQuestion?: string; seed: boolean },
+	options: { thread: BtwThread; initialQuestion?: string },
 ): Promise<void> {
 	const thread = options.thread;
 
@@ -3021,15 +2986,20 @@ async function openBtwModal(
 				} catch (error) {
 					controller = undefined; modal.setRunning(false); modal.setNotice(errorMessage(error)); return;
 				}
-				const first = thread.turns.length === 0;
-				let context: string | undefined;
-				if (first && options.seed) {
-					const captured = captureShowTranscript(ctx, BTW_CONTEXT_TURNS);
-					context = captured?.text;
+				if (thread.turns.length === 0) {
+					thread.conversationId = undefined;
+					let context = captureShowTranscript(ctx, BTW_CONTEXT_TURNS)?.text;
 					if (context && context.length > BTW_CONTEXT_MAX) {
 						context = `${context.slice(0, BTW_CONTEXT_MAX)}\n[… context truncated …]`;
 					}
+					thread.context = context;
 				}
+				// Resume natively when possible; otherwise seed the fresh native session with the main-session
+				// context plus every earlier turn so nothing is silently lost.
+				const conversationId = nativeBtwContinuation(thread, capabilityBackend(settings, "btw"));
+				const history = !conversationId && thread.turns.length ? formatBtwTranscript(thread.turns) : undefined;
+				const context = conversationId ? undefined : thread.context;
+				const full = thread.full;
 
 				thread.turns.push({ question, answer: "…" });
 				modal.setText(transcript());
@@ -3039,9 +3009,9 @@ async function openBtwModal(
 					thread.model = selectionLabel(selection);
 					modal.setModel(thread.model);
 					const result = await runBtwTurn(
-						buildBtwPrompt(context, question),
+						buildBtwPrompt(context, question, { full, history }),
 						selection,
-						{ full: thread.full, cwd: ctx.cwd, conversationId: thread.conversationId },
+						{ full, cwd: ctx.cwd, conversationId },
 						turnController.signal,
 						(partial) => {
 							if (closed || turnController.signal.aborted) return;
@@ -3050,7 +3020,10 @@ async function openBtwModal(
 						},
 					);
 					if (turnController.signal.aborted) return;
-					if (result.conversationId) thread.conversationId = result.conversationId;
+					if (result.conversationId) {
+						thread.conversationId = result.conversationId;
+						thread.sessionFull = full;
+					}
 					thread.turns[thread.turns.length - 1]!.answer = result.text;
 				} catch (error) {
 					if (turnController.signal.aborted || closed) return;
@@ -3065,9 +3038,16 @@ async function openBtwModal(
 				}
 			};
 
+			const toggleMode = () => {
+				toggleBtwMode(thread);
+				modal.setFull(thread.full);
+				modal.setNotice(`Mode: ${btwModeLabel(thread.full)}`);
+			};
+
 			const clear = () => {
 				thread.turns = [];
 				thread.conversationId = undefined;
+				thread.context = undefined;
 				modal.clearComposer();
 				modal.setNotice("");
 				modal.setText("");
@@ -3098,14 +3078,14 @@ async function openBtwModal(
 				}
 			};
 
-			const insert = (all: boolean, force: boolean) => {
+			const insert = (all: boolean) => {
 				const text = all ? transcript() : (thread.turns.at(-1)?.answer ?? "");
 				if (!text.trim()) {
 					modal.setNotice("Nothing to insert yet.");
 					return;
 				}
-				if (ctx.ui.getEditorText().trim() && !force) {
-					modal.setNotice("Main editor has a draft. Use /insert! (or /insert-all!) to replace it.");
+				if (ctx.ui.getEditorText().trim()) {
+					modal.setNotice("Main editor has a draft. Edit or clear it first, then insert again.");
 					return;
 				}
 				ctx.ui.setEditorText(text);
@@ -3119,6 +3099,11 @@ async function openBtwModal(
 					clear();
 					return;
 				}
+				if (action.kind === "mode") {
+					modal.clearComposer();
+					toggleMode();
+					return;
+				}
 				if (action.kind === "clipboard") {
 					modal.clearComposer();
 					void copyOut(action.all);
@@ -3126,7 +3111,12 @@ async function openBtwModal(
 				}
 				if (action.kind === "insert") {
 					modal.clearComposer();
-					insert(action.all, action.force);
+					insert(action.all);
+					return;
+				}
+				if (action.kind === "removed") {
+					modal.clearComposer();
+					modal.setNotice(`${action.command} was removed. Edit or clear the main editor draft, then use /insert or /insert-all.`);
 					return;
 				}
 				if (action.kind === "retry") {
@@ -3288,6 +3278,12 @@ export default async function bro(pi: ExtensionAPI) {
 			let action = parts[0] ?? "";
 			let value = raw.slice(raw.split(/\s+/, 1)[0]?.length ?? 0).trim();
 
+			// Removed commands must never fall through to a paid text explanation.
+			if (action === "model" || action === "effort") {
+				ctx.ui.notify(`/bro ${action} was removed. Use /bro config to choose the shared default and per-capability ${action}; use /bro text <text> to explain text.`, "warning");
+				return;
+			}
+
 			// An unknown first word means the whole input is the source: route it by shape.
 			if (action && !KNOWN_ACTIONS.has(action)) {
 				const candidate = unquote(raw);
@@ -3422,253 +3418,6 @@ export default async function bro(pi: ExtensionAPI) {
 				return;
 			}
 
-			if (action === "model") {
-				if (parts.length > 2) {
-					ctx.ui.notify("Use /bro model or /bro model <id>.", "warning");
-					return;
-				}
-				try {
-					const settings = await readSettings();
-					// /bro model operates on the effective shared backend: no Agy catalog
-					// when the shared default is Claude/Grok.
-					if ((settings.backend ?? "agy") === "grok") {
-						const requested = value.trim();
-						let model: string | undefined;
-						if (requested) {
-							try {
-								model = resolveGrokModel(requested);
-							} catch {
-								ctx.ui.notify("Use /bro model or /bro model <grok-4.7|grok-4.7-build-fast|model-id>.", "warning");
-								return;
-							}
-						} else {
-							if (ctx.mode !== "tui") {
-								ctx.ui.notify("Use /bro model <grok-4.7|grok-4.7-build-fast|model-id> outside Pi's interactive UI.", "warning");
-								return;
-							}
-							const choices = [
-								...GROK_MODELS.map(
-									(entry) => `${entry.id} — ${entry.label}${entry.id === settings.model ? " (current)" : ""}`,
-								),
-								"Custom — enter a model ID…",
-							];
-							const choice = await ctx.ui.select(`Grok model (current: ${settings.model})`, choices);
-							if (!choice) return;
-							if (choice.startsWith("Custom")) {
-								const input = await ctx.ui.input("Grok model", "grok-4.7, grok-4.7-build-fast, or an explicit model ID");
-								if (!input?.trim()) return;
-								model = resolveGrokModel(input);
-							} else {
-								model = GROK_MODELS[choices.indexOf(choice)]?.id;
-							}
-						}
-						if (!model) return;
-						const effort = settings.backend === "grok" && isGrokEffort(settings.effort) ? settings.effort : "default";
-						await writeSettings({ ...settings, backend: "grok", model, effort });
-						ctx.ui.notify(`Bro model: grok ${model}${effort === "default" ? "" : ` (${effort})`}`, "info");
-						return;
-					}
-					if ((settings.backend ?? "agy") === "claude") {
-						const requested = value.trim();
-						let model: string | undefined;
-						if (requested) {
-							try {
-								model = resolveClaudeModel(requested);
-							} catch {
-								ctx.ui.notify("Use /bro model or /bro model <sonnet|opus|model-id>.", "warning");
-								return;
-							}
-						} else {
-							if (ctx.mode !== "tui") {
-								ctx.ui.notify("Use /bro model <sonnet|opus|model-id> outside Pi's interactive UI.", "warning");
-								return;
-							}
-							const choices = [
-								...CLAUDE_MODELS.map(
-									(entry) => `${entry.id} — ${entry.label}${entry.id === settings.model ? " (current)" : ""}`,
-								),
-								"Custom — enter a model ID…",
-							];
-							const choice = await ctx.ui.select(`Claude model (current: ${settings.model})`, choices);
-							if (!choice) return;
-							if (choice.startsWith("Custom")) {
-								const input = await ctx.ui.input("Claude model", "sonnet, opus, or an explicit model ID");
-								if (!input?.trim()) return;
-								model = resolveClaudeModel(input);
-							} else {
-								model = CLAUDE_MODELS[choices.indexOf(choice)]?.id;
-							}
-						}
-						if (!model) return;
-						const effort = settings.backend === "claude" && isClaudeEffort(settings.effort) ? settings.effort : "default";
-						await writeSettings({ ...settings, backend: "claude", model, effort });
-						ctx.ui.notify(`Bro model: claude ${model}${effort === "default" ? "" : ` (${effort})`}`, "info");
-						return;
-					}
-					const models = await listAgyModels(pi);
-					const current = resolveCatalogSettings(settings, models);
-					const requested = parts[1];
-					let selected: AgyModelFamily | undefined;
-					let selectedEffort: BroEffort | undefined;
-					if (requested) {
-						selected = models.find((item) => item.id.toLowerCase() === requested);
-						if (!selected) {
-							for (const family of models) {
-								const variant = family.variants.find((item) => item.id.toLowerCase() === requested);
-								if (variant) {
-									selected = family;
-									selectedEffort = variant.effort ?? "default";
-									break;
-								}
-							}
-						}
-						if (!selected) {
-							ctx.ui.notify(`Unknown Agy model "${requested}". Run /bro model to see available choices.`, "warning");
-							return;
-						}
-					} else {
-						if (ctx.mode !== "tui") {
-							ctx.ui.notify("Use /bro model <id> outside Pi's interactive UI.", "warning");
-							return;
-						}
-						const ordered = [...models].sort((a, b) => Number(b.id === current.family?.id) - Number(a.id === current.family?.id));
-						const choices = ordered.map(
-							(item) =>
-								`${item.id} — ${item.label} · ${item.efforts.length ? item.efforts.join("/") : "fixed effort"}${item.id === current.family?.id ? " (current)" : ""}`,
-						);
-						const choice = await ctx.ui.select(`Agy model (current: ${current.settings.model})`, choices);
-						if (!choice) return;
-						selected = ordered[choices.indexOf(choice)];
-					}
-					if (!selectedEffort) {
-						const currentEffort = current.settings.effort;
-						const canKeepCurrent =
-							current.family?.id === selected.id &&
-							(currentEffort === "default" ? !selected.efforts.length : selected.efforts.includes(currentEffort as AgyEffort));
-						selectedEffort = canKeepCurrent ? currentEffort : preferredEffort(selected);
-					}
-					await writeSettings({ ...settings, model: selected.id, effort: selectedEffort });
-					ctx.ui.notify(
-						`Bro model: ${selected.id}${selectedEffort === "default" ? "" : ` (${selectedEffort})`}`,
-						"info",
-					);
-				} catch (error) {
-					ctx.ui.notify(withDoctor(error), "error");
-				}
-				return;
-			}
-
-			if (action === "effort") {
-				const requested = parts[1];
-				// Claude/Grok levels pass this gate; each backend branch below validates strictly
-				// (the Agy branch still rejects xhigh/max with its supports-list warning).
-				if (parts.length > 2 || (requested && !isClaudeEffort(requested) && !EFFORTS.some((effort) => effort === requested))) {
-					ctx.ui.notify("Use /bro effort, or choose low, medium, or high.", "warning");
-					return;
-				}
-				try {
-					const settings = await readSettings();
-					// /bro effort operates on the effective shared backend: no Agy catalog
-					// when the shared default is Claude/Grok.
-					if ((settings.backend ?? "agy") === "grok") {
-						const allowed = ["default", ...GROK_EFFORTS] as const;
-						if (requested && !allowed.some((effort) => effort === requested)) {
-							ctx.ui.notify("Use /bro effort, or choose default, low, medium, high, or xhigh.", "warning");
-							return;
-						}
-						let selected = requested as BroEffort | undefined;
-						if (!selected) {
-							if (ctx.mode !== "tui") {
-								ctx.ui.notify("Use /bro effort <default|low|medium|high|xhigh> outside Pi's interactive UI.", "warning");
-								return;
-							}
-							const efforts = [...allowed].sort(
-								(a, b) => Number(b === settings.effort) - Number(a === settings.effort),
-							);
-							const choices = efforts.map((effort) => `${effort}${effort === settings.effort ? " (current)" : ""}`);
-							const choice = await ctx.ui.select(`Grok reasoning effort (current: ${settings.effort})`, choices);
-							if (!choice) return;
-							selected = efforts[choices.indexOf(choice)];
-						}
-						if (!selected || !isGrokEffort(selected)) return;
-						await writeSettings({ ...settings, backend: "grok", model: settings.model, effort: selected });
-						ctx.ui.notify(
-							selected === "default" ? "Bro reasoning effort: built into the selected model" : `Bro reasoning effort: ${selected}`,
-							"info",
-						);
-						return;
-					}
-					if ((settings.backend ?? "agy") === "claude") {
-						const allowed = ["default", ...CLAUDE_EFFORTS] as const;
-						if (requested && !allowed.some((effort) => effort === requested)) {
-							ctx.ui.notify("Use /bro effort, or choose default, low, medium, high, xhigh, or max.", "warning");
-							return;
-						}
-						let selected = requested as BroEffort | undefined;
-						if (!selected) {
-							if (ctx.mode !== "tui") {
-								ctx.ui.notify("Use /bro effort <default|low|medium|high|xhigh|max> outside Pi's interactive UI.", "warning");
-								return;
-							}
-							const efforts = [...CLAUDE_EFFORTS].sort(
-								(a, b) => Number(b === settings.effort) - Number(a === settings.effort),
-							);
-							const choices = efforts.map((effort) => `${effort}${effort === settings.effort ? " (current)" : ""}`);
-							const choice = await ctx.ui.select(`Claude reasoning effort (current: ${settings.effort})`, choices);
-							if (!choice) return;
-							selected = efforts[choices.indexOf(choice)];
-						}
-						if (!selected || !isClaudeEffort(selected)) return;
-						await writeSettings({ ...settings, backend: "claude", model: settings.model, effort: selected });
-						ctx.ui.notify(
-							selected === "default" ? "Bro reasoning effort: built into the selected model" : `Bro reasoning effort: ${selected}`,
-							"info",
-						);
-						return;
-					}
-					const current = resolveCatalogSettings(settings, await listAgyModels(pi));
-					if (!current.family) {
-						ctx.ui.notify(`Model "${settings.model}" is not in Agy's current model list. Run /bro model first.`, "warning");
-						return;
-					}
-					if (!current.family.efforts.length) {
-						if (requested && requested !== "default") {
-							ctx.ui.notify(`${current.family.label} uses a fixed effort level.`, "warning");
-							return;
-						}
-						await writeSettings({ ...current.settings, model: current.family.id, effort: "default" });
-						ctx.ui.notify(`${current.family.label} uses its built-in effort level.`, "info");
-						return;
-					}
-					if (requested === "default" || (requested && !current.family.efforts.includes(requested as AgyEffort))) {
-						ctx.ui.notify(
-							`${current.family.label} supports ${current.family.efforts.join(" or ")} effort.`,
-							"warning",
-						);
-						return;
-					}
-					let selected = requested as AgyEffort | undefined;
-					if (!selected) {
-						if (ctx.mode !== "tui") {
-							ctx.ui.notify("Use /bro effort <low|medium|high> outside Pi's interactive UI.", "warning");
-							return;
-						}
-						const efforts = [...current.family.efforts].sort(
-							(a, b) => Number(b === current.settings.effort) - Number(a === current.settings.effort),
-						);
-						const choices = efforts.map((effort) => `${effort}${effort === current.settings.effort ? " (current)" : ""}`);
-						const choice = await ctx.ui.select(`Agy reasoning effort (current: ${current.settings.effort})`, choices);
-						if (!choice) return;
-						selected = efforts[choices.indexOf(choice)];
-					}
-					await writeSettings({ ...current.settings, model: current.family.id, effort: selected });
-					ctx.ui.notify(`Bro reasoning effort: ${selected}`, "info");
-				} catch (error) {
-					ctx.ui.notify(withDoctor(error), "error");
-				}
-				return;
-			}
-
 			if (action === "btw") {
 				if (ctx.mode !== "tui") {
 					ctx.ui.notify("Use /bro btw in Pi's interactive UI.", "warning");
@@ -3681,11 +3430,10 @@ export default async function bro(pi: ExtensionAPI) {
 				}
 				try {
 					const btwBackend = capabilityBackend(await readSettings(), "btw");
-					if (btwBackend === "claude") throw new Error(`${btwBackend === "claude" ? "Claude" : "Grok"} does not support /bro btw yet; choose an Agy or Grok override in /bro config.`);
-					const thread = resolveBtwThread(btwThread, parsed);
+					const thread = resolveBtwThread(btwThread);
 					if (bindBtwBackend(thread, btwBackend)) ctx.ui.notify("Backend changed — started a fresh side thread.", "info");
 					btwThread = thread;
-					await openBtwModal(ctx, { thread, initialQuestion: parsed.question, seed: !parsed.fresh });
+					await openBtwModal(ctx, { thread, initialQuestion: parsed.question });
 				} catch (error) {
 					ctx.ui.notify(withDoctor(error), "error");
 				}