npm - pi-studio - Versions diffs - 0.9.26 → 0.9.28 - Mend

pi-studio 0.9.26 → 0.9.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/CHANGELOG.md +27 -0
package/README.md +1 -1
package/client/studio-client.js +338 -16
package/client/studio.css +97 -2
package/index.ts +328 -41
package/package.json +1 -1

package/index.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext, SessionEntry, Theme } from "@earendil-works/pi-coding-agent";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
-import { completeSimple, type ThinkingLevel } from "@earendil-works/pi-ai";
+import { completeSimple, type ModelThinkingLevel, type ThinkingLevel } from "@earendil-works/pi-ai";
 import { Type } from "@sinclair/typebox";
 import { spawn, spawnSync } from "node:child_process";
 import { createHash, randomUUID } from "node:crypto";
@@ -339,6 +339,9 @@ interface CompletionSuggestionRequestMessage {
 	path?: string;
 	contextMode?: "cursor" | "session";
 	contextText?: string;
+	previousSuggestion?: string;
+	suggestionModelProvider?: string;
+	suggestionModelId?: string;
 }
 interface CompletionSuggestionCancelRequestMessage {
@@ -346,6 +349,17 @@ interface CompletionSuggestionCancelRequestMessage {
 	requestId: string;
 }
+interface PiModelSelectRequestMessage {
+	type: "pi_model_select_request";
+	provider: string;
+	id: string;
+}
+interface PiThinkingLevelRequestMessage {
+	type: "pi_thinking_level_request";
+	level: ModelThinkingLevel;
+}
 interface QuizGenerateRequestMessage {
 	type: "quiz_generate_request";
 	requestId: string;
@@ -489,6 +503,8 @@ type IncomingStudioMessage =
 	| SendRunRequestMessage
 	| CompletionSuggestionRequestMessage
 	| CompletionSuggestionCancelRequestMessage
+	| PiModelSelectRequestMessage
+	| PiThinkingLevelRequestMessage
 	| QuizGenerateRequestMessage
 	| QuizAnswerRequestMessage
 	| QuizDiscussRequestMessage
@@ -754,6 +770,17 @@ function buildStudioPandocPdfEngineOptArgs(pdfEngine: string): string[] {
 	];
 }
+function getStudioMissingLatexEngineHint(stderr: string, pdfEngine: string): string {
+	const text = String(stderr || "");
+	const lower = text.toLowerCase();
+	const engine = basename(String(pdfEngine || "")).toLowerCase();
+	const engineMentioned = [engine, "xelatex", "pdflatex", "lualatex", "tectonic"].filter(Boolean).some((name) => lower.includes(name));
+	const missingEnginePattern = /(?:command not found|not found|no such file|could not find|cannot find|is not installed|not installed)/i;
+	return engineMentioned && missingEnginePattern.test(text)
+		? "\nPDF export requires a LaTeX engine. Install TeX Live (e.g. brew install --cask mactex) or set PANDOC_PDF_ENGINE."
+		: "";
+}
 const STUDIO_PANDOC_HTML_FRAGMENT_TEMPLATE = `<!doctype html>
 <html>
 <head>
@@ -761,6 +788,26 @@ const STUDIO_PANDOC_HTML_FRAGMENT_TEMPLATE = `<!doctype html>
 <title>pi Studio preview</title>
 </head>
 <body>
+$if(title)$
+<header id="title-block-header">
+<h1 class="title">$title$</h1>
+$if(subtitle)$
+<p class="subtitle">$subtitle$</p>
+$endif$
+$for(author)$
+<p class="author">$author$</p>
+$endfor$
+$if(date)$
+<p class="date">$date$</p>
+$endif$
+$if(abstract)$
+<div class="abstract">
+<div class="abstract-title">Abstract</div>
+$abstract$
+</div>
+$endif$
+</header>
+$endif$
 $body$
 </body>
 </html>
@@ -4279,12 +4326,14 @@ function normalizeMathDelimitersInSegment(markdown: string): string {
 	});
 	normalized = normalized.replace(/\$\s*\\\[\s*([\s\S]*?)\s*\\\]\s*\$/g, (match, expr: string) => {
+		if (/\n\s{0,3}>/.test(match)) return match;
 		if (!isLikelyMathExpression(expr)) return match;
 		const content = collapseDisplayMathContent(expr);
 		return content.length > 0 ? `\\[${content}\\]` : "\\[\\]";
 	});
 	normalized = normalized.replace(/\\\[\s*([\s\S]*?)\s*\\\]/g, (match, expr: string) => {
+		if (/\n\s{0,3}>/.test(match)) return match;
 		if (!isLikelyMathExpression(expr)) return `[${expr.trim()}]`;
 		const content = collapseDisplayMathContent(expr);
 		return content.length > 0 ? `\\[${content}\\]` : "\\[\\]";
@@ -5920,9 +5969,17 @@ async function getStudioPandocHtmlResourceFlag(pandocCommand: string): Promise<"
 	return cached;
 }
+function preprocessStudioLatexFootnotemarksForPreview(latex: string): string {
+	return String(latex ?? "").replace(/\\footnotemark\s*\[\s*([^\]\r\n]+?)\s*\]/g, (_match, marker: string) => {
+		const value = String(marker || "").trim();
+		return /^\d+$/.test(value) ? `\\href{#fn${value}}{\\textsuperscript{${value}}}` : (value ? `\\textsuperscript{${value}}` : "");
+	});
+}
 async function renderStudioMarkdownWithPandoc(markdown: string, isLatex?: boolean, resourcePath?: string, sourcePath?: string): Promise<string> {
 	const pandocCommand = process.env.PANDOC_PATH?.trim() || "pandoc";
-	const markdownWithNormalizedFences = isLatex ? markdown : normalizeStudioMarkdownSmartFences(markdown);
+	const latexPreviewSource = isLatex ? preprocessStudioLatexFootnotemarksForPreview(markdown) : markdown;
+	const markdownWithNormalizedFences = isLatex ? latexPreviewSource : normalizeStudioMarkdownSmartFences(markdown);
 	const markdownWithoutHtmlComments = isLatex ? markdownWithNormalizedFences : stripStudioMarkdownHtmlCommentsPreservingYamlFrontMatter(markdownWithNormalizedFences);
 	const markdownWithPreviewPageBreaks = isLatex ? markdownWithoutHtmlComments : replaceStudioPreviewPageBreakCommands(markdownWithoutHtmlComments);
 	const latexSubfigurePreviewTransform = isLatex
@@ -5938,16 +5995,20 @@ async function renderStudioMarkdownWithPandoc(markdown: string, isLatex?: boolea
 	const bibliographyArgs = buildStudioPandocBibliographyArgs(markdown, isLatex, resourcePath);
 	const args = ["-f", inputFormat, "-t", "html5", "--mathml", "--wrap=none", ...bibliographyArgs];
 	let htmlTemplateDir: string | null = null;
+	const useStudioHtmlTemplate = Boolean(resourcePath || isLatex);
 	if (resourcePath) {
 		args.push(`--resource-path=${resourcePath}`);
-		// Embed images as data URIs so browser previews and exported HTML keep local figures.
-		// A minimal template prevents Pandoc's standalone default CSS/title block from leaking
-		// into Studio's own standalone export wrapper.
+	}
+	if (useStudioHtmlTemplate) {
+		// Use standalone mode for embedded resources and LaTeX metadata. A minimal
+		// Studio template keeps Pandoc's default standalone CSS out of the pane while
+		// still rendering LaTeX title/author/abstract metadata.
 		htmlTemplateDir = join(tmpdir(), `pi-studio-pandoc-html-${randomUUID()}`);
 		await mkdir(htmlTemplateDir, { recursive: true });
 		const htmlTemplatePath = join(htmlTemplateDir, "template.html");
 		await writeFile(htmlTemplatePath, STUDIO_PANDOC_HTML_FRAGMENT_TEMPLATE, "utf-8");
-		args.push(await getStudioPandocHtmlResourceFlag(pandocCommand), "--standalone", `--template=${htmlTemplatePath}`);
+		if (resourcePath) args.push(await getStudioPandocHtmlResourceFlag(pandocCommand));
+		args.push("--standalone", `--template=${htmlTemplatePath}`);
 	}
 	const normalizedMarkdown = isLatex
 		? sourceWithResolvedRefs
@@ -5977,8 +6038,8 @@ async function renderStudioMarkdownWithPandoc(markdown: string, isLatex?: boolea
 	}
 	let renderedHtml = pandocResult.stdout;
-	// When --standalone is used for embedded resources, extract only the <body> content.
-	if (resourcePath) {
+	// When --standalone is used for embedded resources or LaTeX metadata, extract only the <body> content.
+	if (useStudioHtmlTemplate) {
 		const bodyMatch = renderedHtml.match(/<body[^>]*>([\s\S]*)<\/body>/i);
 		if (!bodyMatch) {
 			throw new Error("pandoc HTML render did not include a complete body element.");
@@ -6787,9 +6848,7 @@ async function renderStudioPdfWithPandoc(
 			});
 			if (pandocResult.code !== 0) {
 				const stderr = pandocResult.stderr;
-				const hint = stderr.includes("not found") || stderr.includes("xelatex") || stderr.includes("pdflatex")
-					? "\nPDF export requires a LaTeX engine. Install TeX Live (e.g. brew install --cask mactex) or set PANDOC_PDF_ENGINE."
-					: "";
+				const hint = getStudioMissingLatexEngineHint(stderr, pdfEngine);
 				throw new Error(`pandoc PDF export failed with exit code ${pandocResult.code}${stderr ? `: ${stderr}` : ""}${hint}`);
 			}
@@ -6915,9 +6974,7 @@ async function renderStudioPdfWithPandoc(
 		});
 		if (pandocResult.code !== 0) {
 			const stderr = pandocResult.stderr;
-			const hint = stderr.includes("not found") || stderr.includes("xelatex") || stderr.includes("pdflatex")
-				? "\nPDF export requires a LaTeX engine. Install TeX Live (e.g. brew install --cask mactex) or set PANDOC_PDF_ENGINE."
-				: "";
+			const hint = getStudioMissingLatexEngineHint(stderr, pdfEngine);
 			throw new Error(`pandoc PDF export failed with exit code ${pandocResult.code}${stderr ? `: ${stderr}` : ""}${hint}`);
 		}
@@ -7303,6 +7360,41 @@ function openPathInDefaultViewer(path: string): Promise<void> {
 	});
 }
+async function handleOpenStudioFileBrowserDirectoryRequest(req: IncomingMessage, res: ServerResponse, studioCwd: string): Promise<void> {
+	const method = (req.method ?? "GET").toUpperCase();
+	if (method !== "POST") {
+		res.setHeader("Allow", "POST");
+		respondJson(res, 405, { ok: false, error: "Method not allowed. Use POST." });
+		return;
+	}
+	if (isSshSession()) {
+		respondJson(res, 409, { ok: false, error: "Cannot open local file manager from an SSH/headless Studio session. Copy the path instead." });
+		return;
+	}
+	const rawBody = await readRequestBody(req, REQUEST_BODY_MAX_BYTES);
+	let payload: Record<string, unknown> = {};
+	try {
+		payload = rawBody ? JSON.parse(rawBody) : {};
+	} catch {
+		respondJson(res, 400, { ok: false, error: "Invalid JSON body." });
+		return;
+	}
+	try {
+		const directory = resolveStudioFileBrowserDirectory(
+			typeof payload.dir === "string" ? payload.dir : undefined,
+			typeof payload.sourcePath === "string" ? payload.sourcePath : undefined,
+			typeof payload.resourceDir === "string" ? payload.resourceDir : undefined,
+			studioCwd,
+		);
+		await openPathInDefaultViewer(directory.currentDir);
+		respondJson(res, 200, { ok: true, message: "Opened folder in file manager.", path: directory.currentDir, rootDir: directory.rootDir });
+	} catch (error) {
+		respondJson(res, 404, { ok: false, error: `Could not open file-browser folder: ${error instanceof Error ? error.message : String(error)}` });
+	}
+}
 function detectLensFromText(text: string): Lens {
 	const lines = text.split("\n");
 	const fencedCodeBlocks = (text.match(/```[\w-]*\n[\s\S]*?```/g) ?? []).length;
@@ -7627,12 +7719,13 @@ function getStudioQuizReasoning(model: NonNullable<ExtensionContext["model"]>, t
 async function runStudioModelText(
 	ctx: StudioModelRequestContext,
 	prompt: string,
-	options?: { systemPrompt?: string; maxTokens?: number; signal?: AbortSignal; reasoning?: ThinkingLevel; timeoutMs?: number; trim?: boolean },
+	options?: { systemPrompt?: string; maxTokens?: number; signal?: AbortSignal; reasoning?: ThinkingLevel; timeoutMs?: number; trim?: boolean; model?: NonNullable<ExtensionContext["model"]> },
 ): Promise<string> {
-	if (!ctx.model) throw new Error("No active model selected.");
-	const auth = await resolveStudioModelRequestAuth(ctx, ctx.model);
+	const model = options?.model ?? ctx.model;
+	if (!model) throw new Error("No active model selected.");
+	const auth = await resolveStudioModelRequestAuth(ctx, model);
 	const response = await completeSimple(
-		ctx.model,
+		model,
 		{
 			systemPrompt: options?.systemPrompt ?? "You are a concise assistant inside pi Studio. Return exactly the requested format.",
 			messages: [{ role: "user", content: [{ type: "text", text: prompt }], timestamp: Date.now() }],
@@ -7692,6 +7785,37 @@ async function runStudioQuizModelJson(
 	throw lastError ?? new Error("Model did not return valid JSON.");
 }
+function isStudioCompletionCodeLanguage(language: string | undefined): boolean {
+	const normalized = String(language || "").trim().toLowerCase();
+	return new Set([
+		"javascript",
+		"typescript",
+		"python",
+		"bash",
+		"json",
+		"rust",
+		"c",
+		"cpp",
+		"julia",
+		"fortran",
+		"r",
+		"matlab",
+		"diff",
+		"csv",
+		"tsv",
+		"java",
+		"go",
+		"ruby",
+		"swift",
+		"html",
+		"css",
+		"xml",
+		"yaml",
+		"toml",
+		"lua",
+	]).has(normalized);
+}
 function buildStudioCompletionSuggestionPrompt(options: {
 	text: string;
 	selectionStart: number;
@@ -7701,6 +7825,7 @@ function buildStudioCompletionSuggestionPrompt(options: {
 	path?: string;
 	contextMode?: "cursor" | "session";
 	contextText?: string;
+	previousSuggestion?: string;
 }): string {
 	const text = String(options.text || "");
 	const start = Math.max(0, Math.min(Math.floor(options.selectionStart || 0), text.length));
@@ -7711,31 +7836,51 @@ function buildStudioCompletionSuggestionPrompt(options: {
 	const language = String(options.language || "").trim() || "unknown";
 	const label = String(options.label || options.path || "Studio editor").trim();
 	const contextText = String(options.contextText || "").trim().slice(-STUDIO_COMPLETION_MAX_CONTEXT_CHARS);
+	const previousSuggestion = String(options.previousSuggestion || "").trim().slice(-4000);
+	const editorExcerpt = selected
+		? `${prefix}⟦SELECTION_START⟧${selected}⟦SELECTION_END⟧${suffix}`
+		: `${prefix}⟦CURSOR⟧${suffix}`;
+	const isCodeCompletion = isStudioCompletionCodeLanguage(language);
+	const modeInstructions = isCodeCompletion
+		? [
+			"You are acting as a tab-completion model for a code editor.",
+			"Return only the exact code/text that should be inserted if the user presses Tab. Do not wrap it in Markdown fences. Do not explain.",
+			"Preserve syntax, indentation, delimiters, local names, comments, and the surrounding coding style.",
+			"Partial identifiers, expressions, arguments, statements, or structured-data fragments are allowed when they are syntactically natural at the marker.",
+			"If the marker is inside a string, comment, docstring, or markup text node, continue that local text naturally rather than applying prose sentence rules globally.",
+			"Keep the completion local and short unless the surrounding code clearly calls for a larger block.",
+		]
+		: [
+			"You are acting as a tab-completion model for a text editor.",
+			"Return only the exact text that should be inserted if the user presses Tab. Do not wrap it in Markdown fences. Do not explain.",
+			"Do not return a sentence fragment, dependent clause, or lowercase noun phrase unless it is grammatically valid immediately at the marker.",
+			"If the marker follows a completed sentence and you continue with prose, begin with any needed whitespace and a complete new sentence using normal capitalization.",
+			"Return a non-empty completion. If the cursor is at the end of a sentence or paragraph, continue with a plausible complete sentence rather than a fragment.",
+			"Match the surrounding language, style, indentation, and register.",
+			"Keep the suggestion short unless the context clearly asks for a longer continuation.",
+		];
 	return [
-		"Generate an inline completion for the current editor cursor position.",
-		"Return only the exact text to insert. Do not wrap it in Markdown fences. Do not explain.",
-		"Match the surrounding language, style, indentation, and register.",
-		"Keep the suggestion short unless the context clearly asks for a longer continuation.",
+		...modeInstructions,
+		selected
+			? "The text between ⟦SELECTION_START⟧ and ⟦SELECTION_END⟧ is selected. Your answer will replace only that selected text."
+			: "The cursor is marked by ⟦CURSOR⟧. Your answer will replace only that marker.",
+		"The text before the marker is already written. Do not rewrite it, paraphrase it, or continue from an earlier point in the excerpt.",
+		"After replacing the marker or selected range with your answer, the excerpt must read naturally at that exact position.",
+		"Include any needed leading whitespace or punctuation; do not assume the editor will add it.",
 		contextText
 			? "Use the extra session context only as background. Do not continue the extra context directly unless the editor cursor calls for it."
 			: "Use only the cursor-local editor context below.",
-		selected
-			? "The selected text will be replaced by the completion."
-			: "The completion will be inserted at the cursor.",
+		previousSuggestion ? "The user asked for another suggestion. Avoid repeating the previous suggestion; offer a materially different continuation that still fits the same cursor context." : "",
 		"",
 		`File/context label: ${label}`,
 		`Language mode: ${language}`,
 		`Suggestion context mode: ${contextText ? "editor plus latest response" : "editor only"}`,
 		contextText ? ["", "<extra_context>", contextText, "</extra_context>"].join("\n") : "",
+		previousSuggestion ? ["", "<previous_suggestion>", previousSuggestion, "</previous_suggestion>"].join("\n") : "",
 		"",
-		"<prefix>",
-		prefix,
-		"</prefix>",
-		selected ? ["", "<selected>", selected, "</selected>"].join("\n") : "",
-		"",
-		"<suffix>",
-		suffix,
-		"</suffix>",
+		"<editor_excerpt>",
+		editorExcerpt,
+		"</editor_excerpt>",
 	].filter((part) => part !== "").join("\n");
 }
@@ -7754,13 +7899,19 @@ async function runStudioCompletionSuggestion(ctx: StudioModelRequestContext, opt
 	path?: string;
 	contextMode?: "cursor" | "session";
 	contextText?: string;
+	previousSuggestion?: string;
+	model?: NonNullable<ExtensionContext["model"]>;
 	signal?: AbortSignal;
 }): Promise<string> {
 	const prompt = buildStudioCompletionSuggestionPrompt(options);
+	const systemPrompt = isStudioCompletionCodeLanguage(options.language)
+		? "You are a code tab-completion engine inside pi Studio. Return only the exact code/text that replaces the cursor marker or selected range in the provided editor excerpt. The resulting excerpt must be syntactically natural at that exact position. Include needed leading whitespace. Never explain. Never include Markdown fences unless literal fences are the intended insertion."
+		: "You are a prose tab-completion engine inside pi Studio. Return only the exact text that replaces the cursor marker or selected range in the provided editor excerpt. The resulting excerpt must read naturally at that exact position. Include needed leading whitespace. Never explain. Never include Markdown fences unless literal fences are the intended insertion.";
 	// Intentionally omit `reasoning`: pi-ai treats absent reasoning as off/disabled
 	// where supported. Passing "minimal" would still enable a reasoning path and slow completions.
 	const suggestion = cleanStudioCompletionSuggestion(await runStudioModelText(ctx, prompt, {
-		systemPrompt: "You are an inline autocomplete engine inside pi Studio. Return only text to insert at the cursor. Never explain. Never include Markdown fences unless literal fences are the intended insertion.",
+		systemPrompt,
+		model: options.model,
 		maxTokens: 650,
 		timeoutMs: 60_000,
 		trim: false,
@@ -8186,6 +8337,24 @@ function parseIncomingMessage(data: RawData): IncomingStudioMessage | null {
 		};
 	}
+	if (msg.type === "pi_model_select_request" && typeof msg.provider === "string" && typeof msg.id === "string") {
+		return {
+			type: "pi_model_select_request",
+			provider: msg.provider,
+			id: msg.id,
+		};
+	}
+	if (msg.type === "pi_thinking_level_request" && typeof msg.level === "string") {
+		const level = msg.level.trim().toLowerCase();
+		if (level === "off" || level === "minimal" || level === "low" || level === "medium" || level === "high" || level === "xhigh") {
+			return {
+				type: "pi_thinking_level_request",
+				level,
+			};
+		}
+	}
 	if (msg.type === "completion_suggestion_request" && typeof msg.requestId === "string" && typeof msg.text === "string") {
 		const textLength = msg.text.length;
 		const rawStart = typeof msg.selectionStart === "number" && Number.isFinite(msg.selectionStart) ? msg.selectionStart : textLength;
@@ -8204,6 +8373,9 @@ function parseIncomingMessage(data: RawData): IncomingStudioMessage | null {
 			path: typeof msg.path === "string" ? msg.path : undefined,
 			contextMode,
 			contextText: contextMode === "session" && typeof msg.contextText === "string" ? msg.contextText.slice(-STUDIO_COMPLETION_MAX_CONTEXT_CHARS) : undefined,
+			previousSuggestion: typeof msg.previousSuggestion === "string" ? msg.previousSuggestion.slice(-4000) : undefined,
+			suggestionModelProvider: typeof msg.suggestionModelProvider === "string" ? msg.suggestionModelProvider : undefined,
+			suggestionModelId: typeof msg.suggestionModelId === "string" ? msg.suggestionModelId : undefined,
 		};
 	}
@@ -9760,6 +9932,12 @@ function formatModelLabelWithThinking(modelLabel: string, thinkingLevel?: string
 	return `${base} (${level})`;
 }
+function formatStudioModelOptionLabel(model: { provider?: string; id?: string; name?: string } | undefined): string {
+	const base = formatModelLabel(model);
+	const name = typeof model?.name === "string" ? model.name.trim() : "";
+	return name && name !== model?.id ? `${name} (${base})` : base;
+}
 function buildTerminalSessionLabel(cwd: string, sessionName?: string): string {
 	const cwdBase = basename(cwd || process.cwd() || "") || cwd || "~";
 	const termProgram = String(process.env.TERM_PROGRAM ?? "").trim();
@@ -10073,7 +10251,7 @@ ${cssVarsBlock}
       <button id="saveOverBtn" type="button" title="Overwrite current file with editor content. Shortcut: Cmd/Ctrl+S.">Save editor</button>
       <button id="refreshFromDiskBtn" type="button" title="Reload the current file-backed document from disk.">Refresh from disk</button>
       <button id="clearWorkspaceBtn" type="button" title="Clear editor text and reset this tab to a fresh blank draft. Saved files and responses are not changed.">Reset editor</button>
-      <label class="file-label" title="Import a browser-selected text file into the editor as an unsaved copy. It will not be refreshable from disk until you save it.">Import file copy…<input id="fileInput" type="file" accept=".md,.markdown,.mdx,.qmd,.js,.mjs,.cjs,.jsx,.ts,.mts,.cts,.tsx,.py,.pyw,.sh,.bash,.zsh,.json,.jsonc,.json5,.rs,.c,.h,.cpp,.cxx,.cc,.hpp,.hxx,.jl,.f90,.f95,.f03,.f,.for,.r,.R,.m,.tex,.latex,.diff,.patch,.java,.go,.rb,.swift,.html,.htm,.css,.xml,.yaml,.yml,.toml,.lua,.txt,.rst,.adoc" /></label>
+      <label class="file-label" title="Browser import: load a selected text file as a detached copy. Use Save editor as… to attach this copy to a file path and make it file-backed, or use the Files view to open a refreshable file-backed document directly.">Import file copy…<input id="fileInput" type="file" accept=".md,.markdown,.mdx,.qmd,.js,.mjs,.cjs,.jsx,.ts,.mts,.cts,.tsx,.py,.pyw,.sh,.bash,.zsh,.json,.jsonc,.json5,.rs,.c,.h,.cpp,.cxx,.cc,.hpp,.hxx,.jl,.f90,.f95,.f03,.f,.for,.r,.R,.m,.tex,.latex,.diff,.patch,.java,.go,.rb,.swift,.html,.htm,.css,.xml,.yaml,.yml,.toml,.lua,.txt,.rst,.adoc" /></label>
       <button id="getEditorBtn" type="button" title="Load the current terminal editor draft into Studio.">Load from pi editor</button>
       <button id="zenModeBtn" class="zen-mode-btn" type="button" title="Hide secondary Studio controls. Shortcut: F9.">Zen</button>
     </div>
@@ -10127,6 +10305,9 @@ ${cssVarsBlock}
                 <option value="cursor" selected>Context: editor only</option>
                 <option value="session">Context: editor + latest response</option>
               </select>
+              <select id="completionModelSelect" hidden aria-label="Suggestion model" title="Choose the model used for Suggest. Suggestions use direct completion with thinking off and do not change the main Pi model.">
+                <option value="current" selected>Suggestion model: current Pi model</option>
+              </select>
               <button id="openCompanionBtn" type="button" title="Open a blank editor-only Studio tab.">New editor tab</button>
               <button id="sendEditorBtn" type="button">Send current text to Pi editor</button>
             </div>
@@ -10213,11 +10394,12 @@ ${cssVarsBlock}
             </div>
             <div id="completionSuggestionPanel" class="completion-suggestion-panel" hidden>
               <div class="completion-suggestion-header">
-                <strong>Suggested completion</strong>
+                <div><strong>Suggested completion</strong><span id="completionSuggestionMeta" class="completion-suggestion-meta"></span></div>
                 <button id="completionSuggestionDismissBtn" type="button" title="Dismiss this suggestion">Dismiss</button>
               </div>
               <pre id="completionSuggestionText" class="completion-suggestion-text"></pre>
               <div class="completion-suggestion-actions">
+                <button id="completionSuggestionRegenerateBtn" type="button" title="Ask for a different suggestion at the same cursor position.">Try another</button>
                 <button id="completionSuggestionInsertBtn" type="button" title="Insert this suggestion at the cursor or original selection. You can also press Tab while the editor is focused.">Insert suggestion (Tab)</button>
               </div>
             </div>
@@ -10352,7 +10534,8 @@ ${cssVarsBlock}
   <footer>
     <span id="statusLine"><span id="statusSpinner" aria-hidden="true"> </span><span id="status">Booting studio…</span></span>
-    <span id="footerMeta" class="footer-meta"><span id="footerMetaText" class="footer-meta-text"><span id="footerMetaModel" class="footer-meta-part footer-meta-model">${initialModel}</span><span class="footer-meta-sep">·</span><span id="footerMetaTerminal" class="footer-meta-part footer-meta-terminal">${initialTerminal}</span><span class="footer-meta-sep">·</span><span id="footerMetaContext" class="footer-meta-part footer-meta-context">unknown</span></span><button id="compactBtn" class="footer-compact-btn" type="button" title="Trigger pi context compaction now.">Compact</button></span>
+    <span id="footerMeta" class="footer-meta"><span id="footerMetaText" class="footer-meta-text"><button id="footerMetaModel" class="footer-meta-part footer-meta-model footer-model-btn" type="button" aria-haspopup="menu" aria-expanded="false">${initialModel}</button><span class="footer-meta-sep">·</span><span id="footerMetaTerminal" class="footer-meta-part footer-meta-terminal">${initialTerminal}</span><span class="footer-meta-sep">·</span><span id="footerMetaContext" class="footer-meta-part footer-meta-context">unknown</span></span><button id="compactBtn" class="footer-compact-btn" type="button" title="Trigger pi context compaction now.">Compact</button></span>
+    <div id="footerModelMenu" class="footer-model-menu" hidden></div>
     <button id="shortcutsBtn" class="shortcut-hint" type="button" title="Show Studio keyboard shortcuts. Press ? when not editing text.">Shortcuts (?)</button>
   </footer>
@@ -10473,7 +10656,7 @@ export default function (pi: ExtensionAPI) {
 	let terminalActivityToolName: string | null = null;
 	let terminalActivityLabel: string | null = null;
 	let lastSpecificToolActivityLabel: string | null = null;
-	let currentModel: { provider?: string; id?: string } | undefined;
+	let currentModel: { provider?: string; id?: string; name?: string; reasoning?: boolean } | undefined;
 	let currentModelLabel = "none";
 	let terminalSessionLabel = buildTerminalSessionLabel(studioCwd);
 	let terminalSessionDetail = buildTerminalSessionDetail(studioCwd);
@@ -10746,15 +10929,20 @@ export default function (pi: ExtensionAPI) {
 		}
 	};
-	const getThinkingLevelSafe = (): string | undefined => {
+	const getThinkingLevelSafe = (): ModelThinkingLevel | undefined => {
 		try {
-			return pi.getThinkingLevel();
+			return pi.getThinkingLevel() as ModelThinkingLevel;
 		} catch {
 			return undefined;
 		}
 	};
-	const refreshRuntimeMetadata = (ctx?: { cwd?: string; model?: { provider?: string; id?: string } | undefined }) => {
+	const setThinkingLevelSafe = (level: ModelThinkingLevel) => {
+		// Pi's CLI/model config support "off" as a thinking level; some extension API typings still expose the narrower reasoning-only type.
+		(pi.setThinkingLevel as (nextLevel: ModelThinkingLevel) => void)(level);
+	};
+	const refreshRuntimeMetadata = (ctx?: { cwd?: string; model?: { provider?: string; id?: string; name?: string; reasoning?: boolean } | undefined }) => {
 		if (ctx?.cwd) {
 			studioCwd = ctx.cwd;
 		}
@@ -10763,6 +10951,8 @@ export default function (pi: ExtensionAPI) {
 				currentModel = {
 					provider: ctx.model.provider,
 					id: ctx.model.id,
+					name: ctx.model.name,
+					reasoning: Boolean(ctx.model.reasoning),
 				};
 			} else {
 				currentModel = undefined;
@@ -10771,6 +10961,8 @@ export default function (pi: ExtensionAPI) {
 			currentModel = {
 				provider: lastCommandCtx.model.provider,
 				id: lastCommandCtx.model.id,
+				name: lastCommandCtx.model.name,
+				reasoning: Boolean(lastCommandCtx.model.reasoning),
 			};
 		}
 		const baseModelLabel = formatModelLabel(currentModel);
@@ -11455,11 +11647,32 @@ export default function (pi: ExtensionAPI) {
 		broadcastState();
 	};
+	const getStudioModelOptions = () => {
+		const registry = lastCommandCtx?.modelRegistry ?? latestModelRequestCtx?.modelRegistry;
+		if (!registry || typeof registry.getAvailable !== "function") return [];
+		return registry.getAvailable().map((model) => ({
+			provider: model.provider,
+			id: model.id,
+			label: formatStudioModelOptionLabel(model),
+			reasoning: Boolean(model.reasoning),
+		}));
+	};
+	const getCurrentStudioModelDescriptor = () => currentModel
+		? {
+			provider: currentModel.provider,
+			id: currentModel.id,
+			label: formatStudioModelOptionLabel(currentModel),
+			reasoning: Boolean(currentModel.reasoning),
+		}
+		: null;
 	const broadcastState = () => {
 		terminalSessionLabel = buildTerminalSessionLabel(studioCwd, getSessionNameSafe());
 		terminalSessionDetail = buildTerminalSessionDetail(studioCwd, getSessionNameSafe());
 		currentModelLabel = formatModelLabelWithThinking(formatModelLabel(currentModel), getThinkingLevelSafe());
 		refreshContextUsage();
+		const modelOptions = getStudioModelOptions();
 		broadcast({
 			type: "studio_state",
 			busy: isStudioBusy(),
@@ -11468,6 +11681,10 @@ export default function (pi: ExtensionAPI) {
 			terminalToolName: terminalActivityToolName,
 			terminalActivityLabel,
 			modelLabel: currentModelLabel,
+			currentModel: getCurrentStudioModelDescriptor(),
+			thinkingLevel: getThinkingLevelSafe() ?? "off",
+			piModels: modelOptions,
+			suggestionModels: modelOptions,
 			terminalSessionLabel,
 			terminalSessionDetail,
 			contextTokens: contextUsageSnapshot.tokens,
@@ -11763,6 +11980,10 @@ export default function (pi: ExtensionAPI) {
 				terminalToolName: terminalActivityToolName,
 				terminalActivityLabel,
 				modelLabel: currentModelLabel,
+				currentModel: getCurrentStudioModelDescriptor(),
+				thinkingLevel: getThinkingLevelSafe() ?? "off",
+				piModels: getStudioModelOptions(),
+				suggestionModels: getStudioModelOptions(),
 				terminalSessionLabel,
 				terminalSessionDetail,
 				contextTokens: contextUsageSnapshot.tokens,
@@ -11781,6 +12002,47 @@ export default function (pi: ExtensionAPI) {
 			return;
 		}
+		if (msg.type === "pi_model_select_request") {
+			void (async () => {
+				const registry = lastCommandCtx?.modelRegistry ?? latestModelRequestCtx?.modelRegistry;
+				if (!registry || typeof registry.find !== "function") {
+					sendToClient(client, { type: "info", level: "warning", message: "Pi model registry is not available yet." });
+					return;
+				}
+				const model = registry.find(msg.provider, msg.id);
+				if (!model) {
+					sendToClient(client, { type: "info", level: "warning", message: `Pi model not found: ${msg.provider}/${msg.id}` });
+					return;
+				}
+				try {
+					const ok = await pi.setModel(model);
+					if (!ok) {
+						sendToClient(client, { type: "info", level: "warning", message: `Could not switch to ${formatStudioModelOptionLabel(model)}; credentials may be unavailable.` });
+						return;
+					}
+					latestModelRequestCtx = { model, modelRegistry: registry };
+					refreshRuntimeMetadata({ model });
+					broadcastState();
+					sendToClient(client, { type: "info", level: "info", message: `Pi model switched to ${formatStudioModelOptionLabel(model)}.` });
+				} catch (error) {
+					sendToClient(client, { type: "info", level: "error", message: `Model switch failed: ${error instanceof Error ? error.message : String(error)}` });
+				}
+			})();
+			return;
+		}
+		if (msg.type === "pi_thinking_level_request") {
+			try {
+				setThinkingLevelSafe(msg.level);
+				refreshRuntimeMetadata({ model: lastCommandCtx?.model ?? latestModelRequestCtx?.model });
+				broadcastState();
+				sendToClient(client, { type: "info", level: "info", message: `Pi thinking level set to ${getThinkingLevelSafe() ?? msg.level}.` });
+			} catch (error) {
+				sendToClient(client, { type: "info", level: "error", message: `Thinking level change failed: ${error instanceof Error ? error.message : String(error)}` });
+			}
+			return;
+		}
 		if (msg.type === "get_latest_response") {
 			if (!lastStudioResponse) {
 				sendToClient(client, { type: "info", message: "No latest assistant response is available yet." });
@@ -12063,10 +12325,19 @@ export default function (pi: ExtensionAPI) {
 				return;
 			}
 			sendToClient(client, { type: "completion_suggestion_progress", requestId: msg.requestId, message: "Generating suggestion…" });
+			let suggestionModel: NonNullable<ExtensionContext["model"]> | undefined;
+			if (msg.suggestionModelProvider && msg.suggestionModelId) {
+				suggestionModel = ctx.modelRegistry.find(msg.suggestionModelProvider, msg.suggestionModelId);
+				if (!suggestionModel) {
+					sendToClient(client, { type: "completion_suggestion_error", requestId: msg.requestId, message: `Suggestion model not found: ${msg.suggestionModelProvider}/${msg.suggestionModelId}` });
+					return;
+				}
+			}
 			const completionController = new AbortController();
 			activeCompletionSuggestions.set(msg.requestId, completionController);
 			void (async () => {
 				try {
+					const activeSuggestionModel = suggestionModel ?? ctx.model;
 					const suggestion = await runStudioCompletionSuggestion(ctx, {
 						text: msg.text,
 						selectionStart: msg.selectionStart,
@@ -12076,12 +12347,15 @@ export default function (pi: ExtensionAPI) {
 						path: msg.path,
 						contextMode: msg.contextMode,
 						contextText: msg.contextText,
+						previousSuggestion: msg.previousSuggestion,
+						model: suggestionModel,
 						signal: completionController.signal,
 					});
 					sendToClient(client, {
 						type: "completion_suggestion_result",
 						requestId: msg.requestId,
 						suggestion,
+						modelLabel: formatStudioModelOptionLabel(activeSuggestionModel),
 						selectionStart: msg.selectionStart,
 						selectionEnd: msg.selectionEnd,
 					});
@@ -13706,6 +13980,19 @@ export default function (pi: ExtensionAPI) {
 			return;
 		}
+		if (requestUrl.pathname === "/file-browser-open") {
+			const token = requestUrl.searchParams.get("token") ?? "";
+			if (token !== serverState.token) {
+				respondJson(res, 403, { ok: false, error: "Invalid or expired studio token. Re-run /studio." });
+				return;
+			}
+			void handleOpenStudioFileBrowserDirectoryRequest(req, res, studioCwd).catch((error) => {
+				respondJson(res, 500, { ok: false, error: `Open folder failed: ${error instanceof Error ? error.message : String(error)}` });
+			});
+			return;
+		}
 		if (requestUrl.pathname === "/local-preview-link") {
 			const token = requestUrl.searchParams.get("token") ?? "";
 			if (token !== serverState.token) {