pi-studio 0.9.15 → 0.9.17

package/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to `pi-studio` are documented here.
 
 ## [Unreleased]
 
+## [0.9.17] — 2026-05-25
+
+### Changed
+- Escape now dismisses a visible editor completion suggestion before falling through to other Studio Escape actions.
+- Added a compact **Source & context** dropdown beside the editor-mode selector, with editor-only suggestions by default and an optional editor-plus-latest-response context mode; in-flight suggestion requests can now be stopped from the **Suggest** button.
+- Kept Zen mode focused by hiding **Suggest** with the other secondary editor utilities while still showing **Send to REPL** controls when the REPL pane is active.
+
+## [0.9.16] — 2026-05-24
+
+### Added
+- Added a first-cut manual **Suggest completion** editor action beside Run/Queue that asks the active model for a short cursor/selection-aware continuation, previews it before insertion, supports Option/Alt+Tab where available plus Cmd/Ctrl+Shift+Space from the editor, and lets Tab insert a visible suggestion.
+
 ## [0.9.15] — 2026-05-23
 
 ### Added

package/README.md

@@ -21,7 +21,7 @@ Extension for [pi](https://pi.dev) that opens a local two-pane browser workspace
 - Opens a two-pane browser workspace: **Editor** (left) + **Response/Working/Editor Preview** (right)
 - Supports one canonical full Studio view per Pi session, plus additional editor-only companion views when you just want extra editing/preview surfaces; the editor toolbar can open a detached copy of the current editor text as a companion view
 - Includes a global **Zen** mode for hiding secondary Studio chrome without changing the current left/right pane layout
-- Runs editor text directly, asks for structured critique (auto/writing/code focus), or opens **Quiz me** for a Studio-native active-recall loop over the current editor text, selection, current file, folder, or repo, with optional focus guidance for shaping question selection
+- Runs editor text directly, asks for structured critique (auto/writing/code focus), offers a manual **Suggest completion** action for short cursor-aware continuations (`Option/Alt+Tab` where available or `Cmd/Ctrl+Shift+Space` from the editor, `Tab` to insert a visible suggestion) with an optional editor-plus-latest-response context mode, or opens **Quiz me** for a Studio-native active-recall loop over the current editor text, selection, current file, folder, or repo, with optional focus guidance for shaping question selection
 - Includes a live **Working** view for following current model/tool activity, with `All` / `Thinking` / `Tools` filters, image previews for image-producing tool outputs, plus **Load visible into editor** and **Copy visible** actions; when cycling response history, Working follows saved working details for the selected response when available
 - Includes a right-pane **Files** view for browsing the current Pi session/resource directory, opening folders, loading text/code documents into the editor, previewing PDFs/images, copying paths, and revealing files in the file manager
 - Includes an optional tmux-backed **REPL** view for Shell, Python, IPython, Julia, R, GHCi, and Clojure sessions, with Raw/Literate send modes, `Cmd/Ctrl+Shift+Enter` **Send to REPL**, session start/stop/interrupt controls, a compact refresh-persistent **Studio REPL Record** of user and Pi-sent code, a secondary raw tmux mirror, agent-facing `studio_repl_status` / `studio_repl_send` tools, and Markdown/PDF/HTML export

package/client/studio-client.js

@@ -114,6 +114,13 @@
       const sendReplBtn = document.getElementById("sendReplBtn");
       const replSendModeSelect = document.getElementById("replSendModeSelect");
       const copyDraftBtn = document.getElementById("copyDraftBtn");
+      const suggestCompletionBtn = document.getElementById("suggestCompletionBtn");
+      const suggestCompletionOptionsBtn = document.getElementById("suggestCompletionOptionsBtn");
+      const completionContextSelect = document.getElementById("completionContextSelect");
+      const completionSuggestionPanelEl = document.getElementById("completionSuggestionPanel");
+      const completionSuggestionTextEl = document.getElementById("completionSuggestionText");
+      const completionSuggestionInsertBtn = document.getElementById("completionSuggestionInsertBtn");
+      const completionSuggestionDismissBtn = document.getElementById("completionSuggestionDismissBtn");
       const saveAnnotatedBtn = document.getElementById("saveAnnotatedBtn");
       const stripAnnotationsBtn = document.getElementById("stripAnnotationsBtn");
       const highlightSelect = document.getElementById("highlightSelect");
@@ -251,6 +258,8 @@
       const HTML_ARTIFACT_RESOURCE_FETCH_TIMEOUT_MS = 30_000;
       const EDITOR_TAB_TEXT = "  ";
       const QUIZ_DEFAULT_COUNT = 5;
+      const COMPLETION_CONTEXT_STORAGE_KEY = "piStudio.completionContextMode";
+      const COMPLETION_CONTEXT_MAX_CHARS = 12000;
       const QUIZ_SCOPES = ["editor", "selection", "file", "folder", "repo"];
       const QUIZ_ANGLES = ["general", "scientist", "mathematician", "statistician", "developer", "reviewer"];
       const QUIZ_THINKING_LEVELS = ["off", "minimal", "low", "medium", "high"];
@@ -1943,6 +1952,12 @@
       let editorHighlightEnabled = false;
       let editorLanguage = "markdown";
       let responseHighlightEnabled = false;
+      let completionSuggestionState = null;
+      let completionSuggestionContextMode = readCompletionSuggestionContextMode();
+      let completionSuggestionInFlight = false;
+      let completionSuggestionRequestId = null;
+      let completionSuggestionPendingSnapshot = null;
+      let completionSuggestionRefocusEditorOnResult = false;
       let editorHighlightRenderRaf = null;
       let lineNumbersEnabled = false;
       let lineNumbersRenderRaf = null;
@@ -2329,6 +2344,34 @@
           appendStudioUiRefreshMenuSection(reviewMenu.menu, "Setting", [lensSelect]);
         }
 
+        let contextMenu = null;
+        if (suggestCompletionOptionsBtn) {
+          suggestCompletionOptionsBtn.hidden = false;
+          if (completionContextSelect) completionContextSelect.hidden = true;
+          contextMenu = makeStudioUiRefreshMenu(suggestCompletionOptionsBtn, "context", "studio-refresh-context-anchor");
+          if (sourceBadgeEl) appendStudioUiRefreshMenuSection(contextMenu.menu, "Document", [sourceBadgeEl]);
+          appendStudioUiRefreshMenuSection(contextMenu.menu, "Working directory", [resourceDirBtn, resourceDirLabel, resourceDirInputWrap]);
+          const cursorContextBtn = makeStudioUiRefreshElement("button", "completion-context-option", "Editor only");
+          cursorContextBtn.type = "button";
+          cursorContextBtn.setAttribute("data-completion-context-mode", "cursor");
+          const sessionContextBtn = makeStudioUiRefreshElement("button", "completion-context-option", "Editor + latest response");
+          sessionContextBtn.type = "button";
+          sessionContextBtn.setAttribute("data-completion-context-mode", "session");
+          [cursorContextBtn, sessionContextBtn].forEach((button) => {
+            button.addEventListener("click", (event) => {
+              event.preventDefault();
+              event.stopPropagation();
+              setCompletionSuggestionContextMode(button.getAttribute("data-completion-context-mode") === "session" ? "session" : "cursor");
+              syncActionButtons();
+            });
+          });
+          appendStudioUiRefreshMenuSection(contextMenu.menu, "Suggestions", [cursorContextBtn, sessionContextBtn]);
+          if (syncBadgeEl) {
+            syncBadgeEl.hidden = false;
+            appendStudioUiRefreshMenuSection(contextMenu.menu, "Status", [syncBadgeEl]);
+          }
+        }
+
         const headerTopEl = makeStudioUiRefreshElement("div", "studio-refresh-header-top");
         const titleGroupEl = makeStudioUiRefreshElement("div", "studio-refresh-title-group");
         if (leftFocusBtn) {
@@ -2341,6 +2384,10 @@
         } else if (editorViewSelect) {
           titleGroupEl.appendChild(editorViewSelect);
         }
+        if (contextMenu) {
+          titleGroupEl.appendChild(makeStudioUiRefreshSeparator());
+          titleGroupEl.appendChild(contextMenu.anchor);
+        }
         headerTopEl.appendChild(titleGroupEl);
         const headerToolsEl = makeStudioUiRefreshElement("div", "studio-refresh-pane-tools");
         if (reviewNotesBtn) headerToolsEl.appendChild(reviewNotesBtn);
@@ -2349,18 +2396,7 @@
         if (reviewMenu) headerToolsEl.appendChild(reviewMenu.anchor);
         headerTopEl.appendChild(headerToolsEl);
 
-        const headerUtilityEl = makeStudioUiRefreshElement("div", "studio-refresh-header-utility");
-        const utilityLeftEl = makeStudioUiRefreshElement("div", "studio-refresh-utility-left");
-        if (sourceBadgeEl) utilityLeftEl.appendChild(sourceBadgeEl);
-        if (sourceBadgeEl && (resourceDirBtn || resourceDirLabel || resourceDirInputWrap || syncBadgeEl)) {
-          utilityLeftEl.appendChild(makeStudioUiRefreshSeparator());
-        }
-        if (resourceDirBtn) utilityLeftEl.appendChild(resourceDirBtn);
-        if (resourceDirLabel) utilityLeftEl.appendChild(resourceDirLabel);
-        if (resourceDirInputWrap) utilityLeftEl.appendChild(resourceDirInputWrap);
-        if (syncBadgeEl) utilityLeftEl.appendChild(syncBadgeEl);
-        headerUtilityEl.appendChild(utilityLeftEl);
-        leftHeaderEl.replaceChildren(headerTopEl, headerUtilityEl);
+        leftHeaderEl.replaceChildren(headerTopEl);
 
         const rightHeaderEl = document.getElementById("rightSectionHeader");
         if (rightHeaderEl && rightViewSelect) {
@@ -2392,17 +2428,18 @@
         const actionLineOneEl = makeStudioUiRefreshElement("div", "studio-refresh-action-line");
         if (!isEditorOnlyMode && sendRunBtn) actionLineOneEl.appendChild(sendRunBtn);
         if (!isEditorOnlyMode && queueSteerBtn) actionLineOneEl.appendChild(queueSteerBtn);
+        const actionLineTwoEl = makeStudioUiRefreshElement("div", "studio-refresh-action-line studio-refresh-utility-action-line");
+        actionLineTwoEl.appendChild(copyDraftBtn);
+        if (suggestCompletionBtn) actionLineTwoEl.appendChild(suggestCompletionBtn);
+        if (openCompanionBtn) actionLineTwoEl.appendChild(openCompanionBtn);
+        if (!isEditorOnlyMode && sendEditorBtn) actionLineTwoEl.appendChild(sendEditorBtn);
         const replActionLineEl = makeStudioUiRefreshElement("div", "studio-refresh-action-line repl-action-line");
         replActionLineEl.hidden = true;
         if (!isEditorOnlyMode && sendReplBtn) replActionLineEl.appendChild(sendReplBtn);
         if (!isEditorOnlyMode && replSendModeSelect) replActionLineEl.appendChild(replSendModeSelect);
-        const actionLineTwoEl = makeStudioUiRefreshElement("div", "studio-refresh-action-line");
-        actionLineTwoEl.appendChild(copyDraftBtn);
-        if (openCompanionBtn) actionLineTwoEl.appendChild(openCompanionBtn);
-        if (!isEditorOnlyMode && sendEditorBtn) actionLineTwoEl.appendChild(sendEditorBtn);
         if (actionLineOneEl.childNodes.length > 0) actionsEl.appendChild(actionLineOneEl);
-        if (replActionLineEl.childNodes.length > 0) actionsEl.appendChild(replActionLineEl);
         actionsEl.appendChild(actionLineTwoEl);
+        if (replActionLineEl.childNodes.length > 0) actionsEl.appendChild(replActionLineEl);
 
         const stateEl = makeStudioUiRefreshElement("div", "studio-refresh-toolbar-state");
         const annotationsButton = makeStudioUiRefreshElement("button", "", "Annotations");
@@ -2424,7 +2461,9 @@
           annotationsButton,
           viewButton,
           reviewButton: reviewMenu ? reviewMenu.button : null,
-          menus: [annotationsMenu, viewMenu].concat(reviewMenu ? [reviewMenu] : []),
+          menus: [annotationsMenu, viewMenu]
+            .concat(contextMenu ? [contextMenu] : [])
+            .concat(reviewMenu ? [reviewMenu] : []),
         };
 
         document.addEventListener("click", (event) => {
@@ -3680,6 +3719,16 @@
           return;
         }
 
+        if (plainEscape && completionSuggestionState) {
+          event.preventDefault();
+          hideCompletionSuggestion();
+          focusSourceTextNoScroll();
+          setStatus("Dismissed completion suggestion.");
+          return;
+        }
+
+        if (handleCompletionSuggestionAcceptKey(event)) return;
+
         if ((key === "?" || (key === "/" && event.shiftKey)) && !event.metaKey && !event.ctrlKey && !event.altKey && !isTextEntryShortcutTarget(event.target)) {
           event.preventDefault();
           toggleShortcuts();
@@ -4231,20 +4280,15 @@
 
         if (isEditorOnlyMode) {
           syncBadgeEl.hidden = true;
-          syncBadgeEl.classList.remove("sync");
-          return;
-        }
-
-        if (rightView === "trace") {
-          syncBadgeEl.hidden = true;
-          syncBadgeEl.classList.remove("sync");
+          syncBadgeEl.textContent = "Editor-only tab";
+          syncBadgeEl.classList.remove("sync", "out-of-sync");
           return;
         }
 
         if (!latestResponseHasContent) {
-          syncBadgeEl.hidden = true;
-          syncBadgeEl.textContent = "In sync with response";
-          syncBadgeEl.classList.remove("sync");
+          syncBadgeEl.hidden = false;
+          syncBadgeEl.textContent = "No latest response";
+          syncBadgeEl.classList.remove("sync", "out-of-sync");
           return;
         }
 
@@ -4252,15 +4296,10 @@
           ? normalizedEditorText
           : normalizeForCompare(sourceTextEl.value);
         const inSync = normalizedEditor === latestResponseNormalized;
-        syncBadgeEl.hidden = !inSync;
-        syncBadgeEl.textContent = "In sync with response";
-
-        if (inSync) {
-          syncBadgeEl.classList.add("sync");
-          return;
-        }
-
-        syncBadgeEl.classList.remove("sync");
+        syncBadgeEl.hidden = false;
+        syncBadgeEl.textContent = inSync ? "In sync with response" : "Editor differs from latest response";
+        syncBadgeEl.classList.toggle("sync", inSync);
+        syncBadgeEl.classList.toggle("out-of-sync", !inSync);
       }
 
       function buildPlainMarkdownHtml(markdown, options) {
@@ -8653,6 +8692,15 @@
         if (loadGitDiffBtn) loadGitDiffBtn.disabled = uiBusy;
         syncRunAndCritiqueButtons();
         copyDraftBtn.disabled = uiBusy;
+        if (suggestCompletionBtn) {
+          suggestCompletionBtn.disabled = wsState !== "Ready" || (!completionSuggestionInFlight && (uiBusy || !String(sourceTextEl.value || "").trim()));
+          suggestCompletionBtn.textContent = completionSuggestionInFlight ? "Stop" : "Suggest";
+          suggestCompletionBtn.title = completionSuggestionInFlight
+            ? "Stop the current suggestion request."
+            : "Ask the current model for a short completion at the editor cursor. Shortcut: Option/Alt+Tab where available, or Cmd/Ctrl+Shift+Space from the editor.";
+        }
+        if (suggestCompletionOptionsBtn) suggestCompletionOptionsBtn.disabled = uiBusy || completionSuggestionInFlight;
+        syncCompletionSuggestionContextUi();
         if (openCompanionBtn) openCompanionBtn.disabled = uiBusy || wsState !== "Ready";
         if (highlightSelect) highlightSelect.disabled = uiBusy;
         if (lineNumbersSelect) lineNumbersSelect.disabled = uiBusy;
@@ -8986,6 +9034,282 @@
         }
       }
 
+      function readCompletionSuggestionContextMode() {
+        try {
+          const stored = window.localStorage ? String(window.localStorage.getItem(COMPLETION_CONTEXT_STORAGE_KEY) || "") : "";
+          return stored === "session" ? "session" : "cursor";
+        } catch {
+          return "cursor";
+        }
+      }
+
+      function setCompletionSuggestionContextMode(mode) {
+        completionSuggestionContextMode = mode === "session" ? "session" : "cursor";
+        if (completionContextSelect) completionContextSelect.value = completionSuggestionContextMode;
+        try {
+          if (window.localStorage) window.localStorage.setItem(COMPLETION_CONTEXT_STORAGE_KEY, completionSuggestionContextMode);
+        } catch {}
+        setStatus(completionSuggestionContextMode === "session"
+          ? "Suggestions will include the latest response as context."
+          : "Suggestions will use cursor-local editor context only.");
+      }
+
+      function syncCompletionSuggestionContextUi() {
+        if (completionContextSelect) completionContextSelect.value = completionSuggestionContextMode;
+        if (suggestCompletionOptionsBtn) {
+          suggestCompletionOptionsBtn.textContent = "Source & context";
+          suggestCompletionOptionsBtn.title = completionSuggestionContextMode === "session"
+            ? "Document source, working directory, status, and suggestion context. Suggestions include editor plus latest response."
+            : "Document source, working directory, status, and suggestion context. Suggestions use editor-only context.";
+          suggestCompletionOptionsBtn.setAttribute("aria-label", suggestCompletionOptionsBtn.title);
+        }
+        document.querySelectorAll("[data-completion-context-mode]").forEach((button) => {
+          if (!(button instanceof HTMLElement)) return;
+          const mode = button.getAttribute("data-completion-context-mode") === "session" ? "session" : "cursor";
+          const selected = mode === completionSuggestionContextMode;
+          button.classList.toggle("is-selected", selected);
+          button.setAttribute("aria-pressed", selected ? "true" : "false");
+          button.textContent = (selected ? "✓ " : "  ") + (mode === "session" ? "Editor + latest response" : "Editor only");
+        });
+      }
+
+      function trimCompletionContextText(text) {
+        const value = String(text || "").trim();
+        if (value.length <= COMPLETION_CONTEXT_MAX_CHARS) return value;
+        return value.slice(value.length - COMPLETION_CONTEXT_MAX_CHARS);
+      }
+
+      function getCompletionSuggestionContextText() {
+        if (completionSuggestionContextMode !== "session") return "";
+        const selected = getSelectedHistoryItem ? getSelectedHistoryItem() : null;
+        const responseText = selected && typeof selected.markdown === "string" && selected.markdown.trim()
+          ? selected.markdown
+          : latestResponseMarkdown;
+        const parts = [];
+        if (selected && typeof selected.promptTriggerText === "string" && selected.promptTriggerText.trim()) {
+          parts.push("Latest request/steering:\n" + trimCompletionContextText(selected.promptTriggerText));
+        } else if (selected && typeof selected.prompt === "string" && selected.prompt.trim()) {
+          parts.push("Latest prompt:\n" + trimCompletionContextText(selected.prompt));
+        }
+        if (String(responseText || "").trim()) {
+          parts.push("Latest response:\n" + trimCompletionContextText(responseText));
+        }
+        return trimCompletionContextText(parts.join("\n\n---\n\n"));
+      }
+
+      function hideCompletionSuggestion() {
+        completionSuggestionState = null;
+        if (completionSuggestionTextEl) completionSuggestionTextEl.textContent = "";
+        if (completionSuggestionPanelEl) completionSuggestionPanelEl.hidden = true;
+      }
+
+      function showCompletionSuggestion(state) {
+        completionSuggestionState = state;
+        if (completionSuggestionTextEl) completionSuggestionTextEl.textContent = state && state.suggestion ? state.suggestion : "";
+        if (completionSuggestionPanelEl) completionSuggestionPanelEl.hidden = false;
+      }
+
+      function focusSourceTextNoScroll() {
+        if (!sourceTextEl || typeof sourceTextEl.focus !== "function") return;
+        try {
+          sourceTextEl.focus({ preventScroll: true });
+        } catch {
+          try { sourceTextEl.focus(); } catch {}
+        }
+      }
+
+      function focusSourceEditorForCompletion() {
+        const snapshot = snapshotStudioScrollablePositions();
+        if (editorView !== "markdown") {
+          setEditorView("markdown");
+          scheduleStudioScrollablePositionRestore(snapshot);
+        }
+        window.setTimeout(focusSourceTextNoScroll, 0);
+      }
+
+      function isCompletionSuggestionRequestShortcut(event) {
+        if (!event) return false;
+        const key = typeof event.key === "string" ? event.key : "";
+        const code = typeof event.code === "string" ? event.code : "";
+        const commandSpace = (event.metaKey || event.ctrlKey)
+          && event.shiftKey
+          && !event.altKey
+          && (code === "Space" || key === " " || key === "Spacebar");
+        const optionTab = event.altKey
+          && !event.metaKey
+          && !event.ctrlKey
+          && !event.shiftKey
+          && key === "Tab";
+        return commandSpace || optionTab;
+      }
+
+      function handleCompletionSuggestionAcceptKey(event) {
+        if (!event || !completionSuggestionState) return false;
+        if (event.key !== "Tab" || event.shiftKey || event.metaKey || event.ctrlKey || event.altKey) return false;
+        const target = event.target;
+        const focusIsUnclaimed = target === document.body || target === document.documentElement;
+        const targetCanAccept = focusIsUnclaimed
+          || target === sourceTextEl
+          || target === suggestCompletionBtn
+          || Boolean(completionSuggestionPanelEl && target instanceof Element && completionSuggestionPanelEl.contains(target));
+        if (!targetCanAccept) return false;
+        event.preventDefault();
+        insertCompletionSuggestion();
+        return true;
+      }
+
+      function shouldRefocusEditorForCompletionRequest() {
+        const activeEl = document.activeElement;
+        return activeEl === sourceTextEl
+          || activeEl === suggestCompletionBtn
+          || activeEl === document.body
+          || activeEl === document.documentElement
+          || Boolean(completionSuggestionPanelEl && activeEl instanceof Element && completionSuggestionPanelEl.contains(activeEl));
+      }
+
+      function cancelCompletionSuggestion() {
+        if (!completionSuggestionInFlight || !completionSuggestionRequestId) {
+          setStatus("No suggestion request is running.", "warning");
+          return;
+        }
+        setStatus("Stopping suggestion…", "warning");
+        const sent = sendMessage({
+          type: "completion_suggestion_cancel_request",
+          requestId: completionSuggestionRequestId,
+        });
+        if (!sent) {
+          completionSuggestionInFlight = false;
+          completionSuggestionRequestId = null;
+          completionSuggestionPendingSnapshot = null;
+          completionSuggestionRefocusEditorOnResult = false;
+          syncActionButtons();
+        }
+      }
+
+      function requestCompletionSuggestion() {
+        if (isEditorOnlyMode && !sourceTextEl) return;
+        if (completionSuggestionInFlight) {
+          cancelCompletionSuggestion();
+          return;
+        }
+        const text = String(sourceTextEl.value || "");
+        if (!text.trim()) {
+          setStatus("Editor is empty.", "warning");
+          return;
+        }
+        const selectionStart = typeof sourceTextEl.selectionStart === "number" ? sourceTextEl.selectionStart : text.length;
+        const selectionEnd = typeof sourceTextEl.selectionEnd === "number" ? sourceTextEl.selectionEnd : selectionStart;
+        const contextText = getCompletionSuggestionContextText();
+        const requestId = makeRequestId();
+        completionSuggestionInFlight = true;
+        completionSuggestionRequestId = requestId;
+        completionSuggestionPendingSnapshot = { text, selectionStart, selectionEnd };
+        completionSuggestionRefocusEditorOnResult = shouldRefocusEditorForCompletionRequest();
+        hideCompletionSuggestion();
+        syncActionButtons();
+        setStatus("Generating completion suggestion…", "warning");
+        const sent = sendMessage({
+          type: "completion_suggestion_request",
+          requestId,
+          text,
+          selectionStart,
+          selectionEnd,
+          language: editorLanguage || "",
+          label: sourceState && sourceState.label ? sourceState.label : "Studio editor",
+          path: sourceState && sourceState.path ? sourceState.path : undefined,
+          contextMode: completionSuggestionContextMode,
+          contextText: contextText || undefined,
+        });
+        if (!sent) {
+          completionSuggestionInFlight = false;
+          completionSuggestionRequestId = null;
+          completionSuggestionPendingSnapshot = null;
+          completionSuggestionRefocusEditorOnResult = false;
+          syncActionButtons();
+        }
+      }
+
+      function insertCompletionSuggestion() {
+        const state = completionSuggestionState;
+        if (!state || typeof state.suggestion !== "string") {
+          setStatus("No suggestion to insert.", "warning");
+          return;
+        }
+        const currentText = String(sourceTextEl.value || "");
+        const useOriginalRange = currentText === state.baseText;
+        const start = useOriginalRange
+          ? Math.max(0, Math.min(state.selectionStart, currentText.length))
+          : (typeof sourceTextEl.selectionStart === "number" ? sourceTextEl.selectionStart : currentText.length);
+        const end = useOriginalRange
+          ? Math.max(start, Math.min(state.selectionEnd, currentText.length))
+          : (typeof sourceTextEl.selectionEnd === "number" ? sourceTextEl.selectionEnd : start);
+        const nextText = currentText.slice(0, start) + state.suggestion + currentText.slice(end);
+        const caret = start + state.suggestion.length;
+        applySourceTextEdit(nextText, caret, caret);
+        hideCompletionSuggestion();
+        focusSourceTextNoScroll();
+        setStatus("Inserted completion suggestion.", "success");
+      }
+
+      function handleCompletionSuggestionServerMessage(message) {
+        if (!message || typeof message !== "object") return false;
+        if (
+          message.type !== "completion_suggestion_progress"
+          && message.type !== "completion_suggestion_result"
+          && message.type !== "completion_suggestion_error"
+        ) return false;
+        if (typeof message.requestId === "string" && completionSuggestionRequestId && message.requestId !== completionSuggestionRequestId) {
+          return true;
+        }
+        if (message.type === "completion_suggestion_progress") {
+          setStatus(typeof message.message === "string" ? message.message : "Generating suggestion…", "warning");
+          return true;
+        }
+        const pendingSnapshot = completionSuggestionPendingSnapshot;
+        const shouldRefocusEditor = completionSuggestionRefocusEditorOnResult;
+        completionSuggestionInFlight = false;
+        completionSuggestionRequestId = null;
+        completionSuggestionPendingSnapshot = null;
+        completionSuggestionRefocusEditorOnResult = false;
+        syncActionButtons();
+        if (message.type === "completion_suggestion_error") {
+          setStatus(typeof message.message === "string" ? message.message : "Suggestion failed.", "warning");
+          return true;
+        }
+        const suggestion = typeof message.suggestion === "string" ? message.suggestion : "";
+        if (!suggestion.trim()) {
+          setStatus("Model returned an empty suggestion.", "warning");
+          return true;
+        }
+        const text = String(sourceTextEl.value || "");
+        if (pendingSnapshot && text !== pendingSnapshot.text) {
+          setStatus("Editor changed while the suggestion was generating. Please request a fresh suggestion.", "warning");
+          return true;
+        }
+        const baseText = pendingSnapshot ? pendingSnapshot.text : text;
+        const start = Math.max(0, Math.min(pendingSnapshot ? pendingSnapshot.selectionStart : (Number(message.selectionStart) || 0), baseText.length));
+        const end = Math.max(start, Math.min(pendingSnapshot ? pendingSnapshot.selectionEnd : (Number(message.selectionEnd) || start), baseText.length));
+        showCompletionSuggestion({
+          suggestion,
+          baseText,
+          selectionStart: start,
+          selectionEnd: end,
+        });
+        const activeEl = document.activeElement;
+        if (
+          shouldRefocusEditor
+          || activeEl === sourceTextEl
+          || activeEl === suggestCompletionBtn
+          || activeEl === document.body
+          || activeEl === document.documentElement
+          || Boolean(completionSuggestionPanelEl && activeEl instanceof Element && completionSuggestionPanelEl.contains(activeEl))
+        ) {
+          focusSourceEditorForCompletion();
+        }
+        setStatus("Suggestion ready. Press Tab to insert it, or use the Insert suggestion button.", "success");
+        return true;
+      }
+
       function getSourceTextLineEditBounds(text, selectionStart, selectionEnd) {
         const source = String(text || "");
         const safeStart = Math.max(0, Math.min(Math.floor(Number(selectionStart) || 0), source.length));
@@ -9065,7 +9389,14 @@
       }
 
       function handleSourceTextTabKey(event) {
-        if (!event || event.key !== "Tab" || event.metaKey || event.ctrlKey || event.altKey) return;
+        if (!event) return;
+        if (isCompletionSuggestionRequestShortcut(event)) {
+          event.preventDefault();
+          requestCompletionSuggestion();
+          return;
+        }
+        if (handleCompletionSuggestionAcceptKey(event)) return;
+        if (event.key !== "Tab" || event.metaKey || event.ctrlKey || event.altKey) return;
         event.preventDefault();
         if (event.shiftKey) {
           unindentSourceTextSelection();
@@ -16007,6 +16338,8 @@
           updateFooterMeta();
         }
 
+        if (handleCompletionSuggestionServerMessage(message)) return;
+
         if (
           message.type === "quiz_progress" ||
           message.type === "quiz_generated" ||
@@ -17258,6 +17591,9 @@
       sourceTextEl.addEventListener("keydown", handleSourceTextTabKey);
 
       sourceTextEl.addEventListener("input", () => {
+        if (completionSuggestionState && sourceTextEl.value !== completionSuggestionState.baseText) {
+          hideCompletionSuggestion();
+        }
         if (activePreviewCommentSelection) {
           clearPreviewCommentSelection();
         }
@@ -17266,6 +17602,7 @@
         scheduleEditorMetaUpdate();
         updateEditorSelectionCommentUi();
         updateOutlineUi();
+        syncActionButtons();
         if (isReviewNotesOpen() && reviewNotes.length > 0) {
           renderReviewNotesList();
           updateReviewNotesUi();
@@ -17721,6 +18058,31 @@
         }
       });
 
+      if (suggestCompletionBtn) {
+        suggestCompletionBtn.addEventListener("click", () => {
+          requestCompletionSuggestion();
+        });
+      }
+      if (completionContextSelect) {
+        completionContextSelect.value = completionSuggestionContextMode;
+        completionContextSelect.addEventListener("change", () => {
+          setCompletionSuggestionContextMode(completionContextSelect.value);
+          syncActionButtons();
+        });
+      }
+      if (completionSuggestionInsertBtn) {
+        completionSuggestionInsertBtn.addEventListener("click", () => {
+          insertCompletionSuggestion();
+        });
+      }
+      if (completionSuggestionDismissBtn) {
+        completionSuggestionDismissBtn.addEventListener("click", () => {
+          hideCompletionSuggestion();
+          focusSourceTextNoScroll();
+          setStatus("Dismissed completion suggestion.");
+        });
+      }
+
       if (reviewNotesBtn) {
         reviewNotesBtn.addEventListener("click", () => {
           toggleReviewNotes();

package/client/studio.css

@@ -849,6 +849,63 @@
       -webkit-text-fill-color: transparent;
     }
 
+    .completion-suggestion-panel {
+      border: 1px solid var(--control-border);
+      border-radius: 10px;
+      background: var(--panel-2);
+      box-shadow: var(--panel-shadow);
+      overflow: hidden;
+    }
+
+    .completion-suggestion-panel[hidden] {
+      display: none !important;
+    }
+
+    .completion-suggestion-header,
+    .completion-suggestion-actions {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      gap: 8px;
+      padding: 8px 10px;
+    }
+
+    .completion-suggestion-header {
+      border-bottom: 1px solid var(--border-subtle);
+      color: var(--studio-info-text, var(--muted));
+      font-size: 12px;
+    }
+
+    .completion-suggestion-header strong {
+      color: var(--text);
+      font-weight: 650;
+    }
+
+    .completion-suggestion-text {
+      margin: 0;
+      max-height: 180px;
+      overflow: auto;
+      padding: 10px;
+      white-space: pre-wrap;
+      word-break: break-word;
+      font-family: var(--font-mono);
+      font-size: var(--studio-editor-font-size);
+      line-height: 1.45;
+      color: var(--text);
+      background: var(--editor-bg);
+    }
+
+    .completion-suggestion-actions {
+      justify-content: flex-end;
+      border-top: 1px solid var(--border-subtle);
+    }
+
+    .completion-suggestion-header button,
+    .completion-suggestion-actions button {
+      padding: 4px 8px;
+      font-size: 12px;
+    }
+
     .editor-selection-actions {
       position: absolute;
       top: 12px;
@@ -3766,8 +3823,8 @@
 
     .shortcuts-group dl > div {
       display: grid;
-      grid-template-columns: minmax(130px, max-content) minmax(0, 1fr);
-      gap: 12px;
+      grid-template-columns: minmax(260px, 260px) minmax(0, 1fr);
+      gap: 24px;
       align-items: baseline;
       padding: 6px 10px;
       border-top: 1px solid var(--border-subtle);
@@ -4188,13 +4245,18 @@
         justify-content: stretch;
       }
 
-      body.studio-ui-refresh .studio-refresh-pane-tools,
-      body.studio-ui-refresh .studio-refresh-toolbar-state {
+      body.studio-ui-refresh .studio-refresh-pane-tools {
         justify-content: flex-start;
         justify-items: start;
         min-width: 0;
       }
 
+      body.studio-ui-refresh .studio-refresh-toolbar-state {
+        justify-content: flex-end;
+        justify-items: end;
+        min-width: 0;
+      }
+
       body.studio-ui-refresh .studio-refresh-pane-tools,
       body.studio-ui-refresh .studio-refresh-title-group,
       body.studio-ui-refresh .studio-refresh-utility-left {
@@ -4202,7 +4264,7 @@
       }
 
       body.studio-ui-refresh .studio-refresh-toolbar-state .studio-refresh-action-line {
-        justify-content: flex-start;
+        justify-content: flex-end;
       }
     }
 
@@ -4274,7 +4336,8 @@
     }
 
     body.studio-ui-refresh .studio-refresh-header-utility {
-      grid-template-columns: minmax(0, 1fr) auto;
+      grid-template-columns: minmax(0, 1fr);
+      justify-items: start;
     }
 
     body.studio-ui-refresh .studio-refresh-pane-identity {
@@ -4291,12 +4354,18 @@
       flex-wrap: nowrap;
     }
 
-    body.studio-ui-refresh .studio-refresh-context-group,
-    body.studio-ui-refresh .studio-refresh-utility-left {
+    body.studio-ui-refresh .studio-refresh-context-group {
       overflow: hidden;
       white-space: nowrap;
     }
 
+    body.studio-ui-refresh .studio-refresh-utility-left {
+      overflow: visible;
+      white-space: nowrap;
+      justify-content: flex-start;
+      justify-self: start;
+    }
+
     body.studio-ui-refresh .studio-refresh-title-group {
       position: relative;
       z-index: 2;
@@ -4400,12 +4469,14 @@
       border-color: transparent;
       background: transparent;
       padding: 3px 5px;
-      font-size: 13px;
+      font-size: 12px;
+      font-weight: 400;
+      line-height: 1.25;
       border-radius: 8px;
     }
 
     body.studio-ui-refresh #sourceBadge {
-      color: var(--text);
+      color: var(--studio-info-text, var(--muted));
       max-width: min(34rem, 54vw);
       min-width: 0;
       overflow: hidden;
@@ -4413,7 +4484,6 @@
       white-space: nowrap;
     }
 
-    body.studio-ui-refresh #resourceDirBtn,
     body.studio-ui-refresh #reviewNotesBtn,
     body.studio-ui-refresh #outlineBtn,
     body.studio-ui-refresh #scratchpadBtn,
@@ -4421,11 +4491,19 @@
       color: var(--text);
     }
 
+    body.studio-ui-refresh #resourceDirBtn,
     body.studio-ui-refresh #resourceDirLabel {
       color: var(--studio-info-text, var(--muted));
       font-weight: 400;
     }
 
+    body.studio-ui-refresh #resourceDirBtn:hover,
+    body.studio-ui-refresh #resourceDirLabel:hover {
+      color: var(--text);
+      background: var(--studio-header-action-hover-bg, var(--panel-2));
+      border-color: transparent;
+    }
+
     body.studio-ui-refresh #resourceDirInputWrap.visible {
       display: inline-flex;
     }
@@ -4439,9 +4517,11 @@
       border-radius: 999px;
       padding: 2px 7px;
       background: transparent;
-      color: var(--muted);
-      opacity: 0.82;
-      font-weight: 450;
+      color: var(--studio-info-text, var(--muted));
+      opacity: 1;
+      font-size: 12px;
+      font-weight: 400;
+      line-height: 1.25;
     }
 
     body.studio-ui-refresh #syncBadge[hidden] {
@@ -4457,6 +4537,11 @@
       opacity: 0.72;
     }
 
+    body.studio-ui-refresh #syncBadge.out-of-sync::before {
+      background: var(--warning, var(--accent));
+      opacity: 0.95;
+    }
+
     body.studio-ui-refresh #reviewNotesBtn,
     body.studio-ui-refresh #outlineBtn,
     body.studio-ui-refresh #scratchpadBtn,
@@ -4474,9 +4559,10 @@
     body.studio-zen-mode #exportPdfBtn,
     body.studio-zen-mode .studio-refresh-tool-tab,
     body.studio-zen-mode .studio-refresh-toolbar-state,
-    body.studio-zen-mode .studio-refresh-toolbar-actions .studio-refresh-action-line:nth-child(n+3),
+    body.studio-zen-mode .studio-refresh-toolbar-actions .studio-refresh-utility-action-line,
     body.studio-zen-mode .source-actions-row:nth-child(n+3),
     body.studio-zen-mode #copyDraftBtn,
+    body.studio-zen-mode #suggestCompletionBtn,
     body.studio-zen-mode #openCompanionBtn,
     body.studio-zen-mode #sendEditorBtn {
       display: none !important;
@@ -4664,6 +4750,12 @@
       font-size: 12px;
     }
 
+    body.studio-ui-refresh .studio-refresh-toolbar-actions .studio-refresh-action-line button:not(#sendRunBtn):not(#queueSteerBtn):not(#sendReplBtn):not(.request-stop-active) {
+      min-height: 26px;
+      padding: 5px 8px;
+      line-height: 1.2;
+    }
+
     body.studio-ui-refresh .studio-refresh-toolbar button:not(#sendRunBtn):not(#queueSteerBtn):not(#sendReplBtn):not(.request-stop-active),
     body.studio-ui-refresh .studio-refresh-toolbar select {
       color: color-mix(in srgb, var(--text) 72%, var(--muted));
@@ -4737,6 +4829,19 @@
       width: min(320px, calc(100vw - 48px));
     }
 
+    body.studio-ui-refresh .studio-refresh-title-group .studio-refresh-context-anchor .studio-refresh-chip {
+      color: var(--studio-info-text, var(--muted));
+      font-size: 13px;
+      font-weight: 500;
+      padding: 3px 5px;
+    }
+
+    body.studio-ui-refresh .studio-refresh-context-anchor .studio-refresh-menu {
+      left: 0;
+      right: auto;
+      width: min(360px, calc(100vw - 48px));
+    }
+
     body.studio-ui-refresh .studio-refresh-menu[hidden] {
       display: none !important;
     }
@@ -4784,6 +4889,11 @@
       text-align: left;
     }
 
+    body.studio-ui-refresh .completion-context-option.is-selected {
+      color: var(--text);
+      font-weight: 650;
+    }
+
     body.studio-ui-refresh .studio-refresh-menu-item > button:not(:disabled):hover,
     body.studio-ui-refresh .studio-refresh-menu-item > select:not(:disabled):hover {
       background: var(--studio-header-action-hover-bg, var(--panel-2));

package/index.ts

@@ -311,6 +311,24 @@ interface SendRunRequestMessage {
 	text: string;
 }
 
+interface CompletionSuggestionRequestMessage {
+	type: "completion_suggestion_request";
+	requestId: string;
+	text: string;
+	selectionStart: number;
+	selectionEnd: number;
+	language?: string;
+	label?: string;
+	path?: string;
+	contextMode?: "cursor" | "session";
+	contextText?: string;
+}
+
+interface CompletionSuggestionCancelRequestMessage {
+	type: "completion_suggestion_cancel_request";
+	requestId: string;
+}
+
 interface QuizGenerateRequestMessage {
 	type: "quiz_generate_request";
 	requestId: string;
@@ -451,6 +469,8 @@ type IncomingStudioMessage =
 	| CritiqueRequestMessage
 	| AnnotationRequestMessage
 	| SendRunRequestMessage
+	| CompletionSuggestionRequestMessage
+	| CompletionSuggestionCancelRequestMessage
 	| QuizGenerateRequestMessage
 	| QuizAnswerRequestMessage
 	| QuizDiscussRequestMessage
@@ -472,6 +492,10 @@ type IncomingStudioMessage =
 
 const REQUEST_TIMEOUT_MS = 5 * 60 * 1000;
 const PREVIEW_RENDER_MAX_CHARS = 400_000;
+const STUDIO_COMPLETION_MAX_TEXT_CHARS = 250_000;
+const STUDIO_COMPLETION_MAX_CONTEXT_CHARS = 12_000;
+const STUDIO_COMPLETION_PREFIX_CHARS = 12_000;
+const STUDIO_COMPLETION_SUFFIX_CHARS = 6_000;
 const PDF_EXPORT_MAX_CHARS = 400_000;
 const HTML_EXPORT_MAX_CHARS = 400_000;
 const HTML_PREVIEW_MATH_RENDER_MAX_ITEMS = 250;
@@ -7118,7 +7142,7 @@ async function resolveStudioModelRequestAuth(ctx: StudioModelRequestContext, mod
 	if (typeof registry.getApiKey === "function") {
 		return { apiKey: await registry.getApiKey(model) };
 	}
-	throw new Error("Current pi model registry does not expose model credentials for Studio quiz.");
+	throw new Error("Current pi model registry does not expose model credentials for Studio model requests.");
 }
 
 function getStudioQuizReasoning(model: NonNullable<ExtensionContext["model"]>, thinking: StudioQuizThinking | undefined): ThinkingLevel | undefined {
@@ -7127,33 +7151,47 @@ function getStudioQuizReasoning(model: NonNullable<ExtensionContext["model"]>, t
 	return normalized === "off" ? undefined : normalized;
 }
 
-async function runStudioQuizModelText(ctx: StudioModelRequestContext, prompt: string, options?: { maxTokens?: number; signal?: AbortSignal; thinking?: StudioQuizThinking }): Promise<string> {
+async function runStudioModelText(
+	ctx: StudioModelRequestContext,
+	prompt: string,
+	options?: { systemPrompt?: string; maxTokens?: number; signal?: AbortSignal; reasoning?: ThinkingLevel; timeoutMs?: number; trim?: boolean },
+): Promise<string> {
 	if (!ctx.model) throw new Error("No active model selected.");
 	const auth = await resolveStudioModelRequestAuth(ctx, ctx.model);
 	const response = await completeSimple(
 		ctx.model,
 		{
-			systemPrompt: "You are an active tutor inside pi Studio. Ask and mark concise, probing quiz questions. Return exactly the requested format.",
+			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() }],
 		},
 		{
 			apiKey: auth.apiKey,
 			headers: auth.headers,
-			reasoning: getStudioQuizReasoning(ctx.model, options?.thinking),
+			reasoning: options?.reasoning,
 			maxTokens: options?.maxTokens ?? 2500,
 			signal: options?.signal,
-			timeoutMs: 120_000,
+			timeoutMs: options?.timeoutMs ?? 120_000,
 		},
 	);
-	const text = response.content
+	const rawText = response.content
 		.filter((part): part is { type: "text"; text: string } => part.type === "text")
 		.map((part) => part.text)
-		.join("\n")
-		.trim();
-	if (!text) throw new Error("Model returned no text response.");
+		.join("\n");
+	const text = options?.trim === false ? rawText : rawText.trim();
+	if (!text.trim()) throw new Error("Model returned no text response.");
 	return text;
 }
 
+async function runStudioQuizModelText(ctx: StudioModelRequestContext, prompt: string, options?: { maxTokens?: number; signal?: AbortSignal; thinking?: StudioQuizThinking }): Promise<string> {
+	return runStudioModelText(ctx, prompt, {
+		systemPrompt: "You are an active tutor inside pi Studio. Ask and mark concise, probing quiz questions. Return exactly the requested format.",
+		reasoning: ctx.model ? getStudioQuizReasoning(ctx.model, options?.thinking) : undefined,
+		maxTokens: options?.maxTokens ?? 2500,
+		signal: options?.signal,
+		timeoutMs: 120_000,
+	});
+}
+
 async function runStudioQuizModelJson(
 	ctx: StudioModelRequestContext,
 	prompt: string,
@@ -7181,6 +7219,84 @@ async function runStudioQuizModelJson(
 	throw lastError ?? new Error("Model did not return valid JSON.");
 }
 
+function buildStudioCompletionSuggestionPrompt(options: {
+	text: string;
+	selectionStart: number;
+	selectionEnd: number;
+	language?: string;
+	label?: string;
+	path?: string;
+	contextMode?: "cursor" | "session";
+	contextText?: string;
+}): string {
+	const text = String(options.text || "");
+	const start = Math.max(0, Math.min(Math.floor(options.selectionStart || 0), text.length));
+	const end = Math.max(start, Math.min(Math.floor(options.selectionEnd || start), text.length));
+	const prefix = text.slice(Math.max(0, start - STUDIO_COMPLETION_PREFIX_CHARS), start);
+	const selected = text.slice(start, end);
+	const suffix = text.slice(end, Math.min(text.length, end + STUDIO_COMPLETION_SUFFIX_CHARS));
+	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);
+	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.",
+		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.",
+		"",
+		`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") : "",
+		"",
+		"<prefix>",
+		prefix,
+		"</prefix>",
+		selected ? ["", "<selected>", selected, "</selected>"].join("\n") : "",
+		"",
+		"<suffix>",
+		suffix,
+		"</suffix>",
+	].filter((part) => part !== "").join("\n");
+}
+
+function cleanStudioCompletionSuggestion(text: string): string {
+	let value = String(text || "").replace(/\r\n/g, "\n");
+	value = value.replace(/^\s*(?:Here(?:'s| is) (?:the )?(?:completion|suggestion):|Completion:|Suggestion:)\s*/i, "");
+	return value;
+}
+
+async function runStudioCompletionSuggestion(ctx: StudioModelRequestContext, options: {
+	text: string;
+	selectionStart: number;
+	selectionEnd: number;
+	language?: string;
+	label?: string;
+	path?: string;
+	contextMode?: "cursor" | "session";
+	contextText?: string;
+	signal?: AbortSignal;
+}): Promise<string> {
+	const prompt = buildStudioCompletionSuggestionPrompt(options);
+	// 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.",
+		maxTokens: 650,
+		timeoutMs: 60_000,
+		trim: false,
+		signal: options.signal,
+	}));
+	if (!suggestion.trim()) throw new Error("Model returned an empty completion suggestion.");
+	return suggestion;
+}
+
 function inferStudioResponseKind(markdown: string): StudioRequestKind {
 	const lower = markdown.toLowerCase();
 	if (lower.includes("## critiques") && lower.includes("## document")) return "critique";
@@ -7590,6 +7706,34 @@ function parseIncomingMessage(data: RawData): IncomingStudioMessage | null {
 		};
 	}
 
+	if (msg.type === "completion_suggestion_cancel_request" && typeof msg.requestId === "string") {
+		return {
+			type: "completion_suggestion_cancel_request",
+			requestId: msg.requestId,
+		};
+	}
+
+	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;
+		const rawEnd = typeof msg.selectionEnd === "number" && Number.isFinite(msg.selectionEnd) ? msg.selectionEnd : rawStart;
+		const selectionStart = Math.max(0, Math.min(Math.floor(rawStart), textLength));
+		const selectionEnd = Math.max(selectionStart, Math.min(Math.floor(rawEnd), textLength));
+		const contextMode = msg.contextMode === "session" ? "session" : "cursor";
+		return {
+			type: "completion_suggestion_request",
+			requestId: msg.requestId,
+			text: msg.text,
+			selectionStart,
+			selectionEnd,
+			language: typeof msg.language === "string" ? msg.language : undefined,
+			label: typeof msg.label === "string" ? msg.label : undefined,
+			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,
+		};
+	}
+
 	if (msg.type === "quiz_generate_request" && typeof msg.requestId === "string" && typeof msg.sourceText === "string") {
 		const rawCount = typeof msg.questionCount === "number" && Number.isFinite(msg.questionCount) ? msg.questionCount : 5;
 		return {
@@ -9467,8 +9611,14 @@ ${cssVarsBlock}
               </select>
             </div>
             <div class="source-actions-row">
-              <button id="copyDraftBtn" type="button" title="Copy the current editor text to the clipboard.">Copy text</button>
-              <button id="openCompanionBtn" type="button" title="Open a detached copy of the current editor text in a new editor-only Studio tab.">Open new editor</button>
+              <button id="copyDraftBtn" type="button" title="Copy the current editor text to the clipboard.">Copy</button>
+              <button id="suggestCompletionBtn" type="button" title="Ask the current model for a short completion at the editor cursor. Shortcut: Option/Alt+Tab where available, or Cmd/Ctrl+Shift+Space from the editor.">Suggest</button>
+              <button id="suggestCompletionOptionsBtn" type="button" hidden title="Suggestion context options">▾</button>
+              <select id="completionContextSelect" hidden aria-label="Suggestion context mode" title="Choose how much context Suggest includes.">
+                <option value="cursor" selected>Context: editor only</option>
+                <option value="session">Context: editor + latest response</option>
+              </select>
+              <button id="openCompanionBtn" type="button" title="Open a detached copy of the current editor text in a new editor-only Studio tab.">New editor</button>
               <button id="sendEditorBtn" type="button">Send to pi editor</button>
             </div>
             <div class="source-actions-row">
@@ -9550,6 +9700,16 @@ ${cssVarsBlock}
                 <button id="editorSelectionJumpBtn" type="button" class="editor-selection-action-btn" hidden title="Jump to the current editor selection in the preview.">Jump</button>
               </div>
             </div>
+            <div id="completionSuggestionPanel" class="completion-suggestion-panel" hidden>
+              <div class="completion-suggestion-header">
+                <strong>Suggested completion</strong>
+                <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="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>
             <div id="sourcePreview" class="panel-scroll rendered-markdown" hidden><pre class="plain-markdown"></pre></div>
           </div>
           <aside id="outlineOverlay" class="outline-dock-wrap" hidden>
@@ -9718,7 +9878,10 @@ ${cssVarsBlock}
           <dl>
             <div><dt>Cmd/Ctrl+S</dt><dd>Save editor</dd></div>
             <div><dt>Cmd/Ctrl+Enter</dt><dd>Run editor text, or queue steering during an active run</dd></div>
-            <div><dt>Tab / Shift+Tab</dt><dd>Indent or unindent selected editor text</dd></div>
+            <div><dt>Option/Alt+Tab or Cmd/Ctrl+Shift+Space</dt><dd>Suggest a completion at the editor cursor</dd></div>
+            <div><dt>Tab</dt><dd>Insert a visible completion suggestion; otherwise indent selected editor text</dd></div>
+            <div><dt>Esc</dt><dd>Dismiss a visible completion suggestion, close overlays, exit pane focus, or stop an active request</dd></div>
+            <div><dt>Shift+Tab</dt><dd>Unindent selected editor text</dd></div>
           </dl>
         </section>
         <section class="shortcuts-group">
@@ -9812,6 +9975,7 @@ export default function (pi: ExtensionAPI) {
 	let studioReplActiveSessionName: string | null = null;
 	let compactInProgress = false;
 	let compactRequestId: string | null = null;
+	const activeCompletionSuggestions = new Map<string, AbortController>();
 
 	const selectStudioReplSessionForTool = (params: { sessionName?: string; target?: string }): { session: StudioReplSessionInfo | null; error?: string; sessions: StudioReplSessionInfo[] } => {
 		const state = listStudioReplSessions();
@@ -11298,6 +11462,77 @@ export default function (pi: ExtensionAPI) {
 			return;
 		}
 
+		if (msg.type === "completion_suggestion_cancel_request") {
+			if (!isValidRequestId(msg.requestId)) {
+				sendToClient(client, { type: "completion_suggestion_error", requestId: msg.requestId, message: "Invalid request ID." });
+				return;
+			}
+			const controller = activeCompletionSuggestions.get(msg.requestId);
+			if (!controller) {
+				sendToClient(client, { type: "completion_suggestion_error", requestId: msg.requestId, message: "No matching suggestion request is running." });
+				return;
+			}
+			controller.abort();
+			sendToClient(client, { type: "completion_suggestion_progress", requestId: msg.requestId, message: "Stopping suggestion…" });
+			return;
+		}
+
+		if (msg.type === "completion_suggestion_request") {
+			if (!isValidRequestId(msg.requestId)) {
+				sendToClient(client, { type: "completion_suggestion_error", requestId: msg.requestId, message: "Invalid request ID." });
+				return;
+			}
+			const ctx = latestModelRequestCtx ?? lastCommandCtx;
+			if (!ctx) {
+				sendToClient(client, { type: "completion_suggestion_error", requestId: msg.requestId, message: "No active pi model context is available for editor suggestions." });
+				return;
+			}
+			if (!msg.text.trim()) {
+				sendToClient(client, { type: "completion_suggestion_error", requestId: msg.requestId, message: "Editor is empty." });
+				return;
+			}
+			if (msg.text.length > STUDIO_COMPLETION_MAX_TEXT_CHARS) {
+				sendToClient(client, { type: "completion_suggestion_error", requestId: msg.requestId, message: `Editor text is too large for suggestions (${STUDIO_COMPLETION_MAX_TEXT_CHARS} character limit).` });
+				return;
+			}
+			sendToClient(client, { type: "completion_suggestion_progress", requestId: msg.requestId, message: "Generating suggestion…" });
+			const completionController = new AbortController();
+			activeCompletionSuggestions.set(msg.requestId, completionController);
+			void (async () => {
+				try {
+					const suggestion = await runStudioCompletionSuggestion(ctx, {
+						text: msg.text,
+						selectionStart: msg.selectionStart,
+						selectionEnd: msg.selectionEnd,
+						language: msg.language,
+						label: msg.label,
+						path: msg.path,
+						contextMode: msg.contextMode,
+						contextText: msg.contextText,
+						signal: completionController.signal,
+					});
+					sendToClient(client, {
+						type: "completion_suggestion_result",
+						requestId: msg.requestId,
+						suggestion,
+						selectionStart: msg.selectionStart,
+						selectionEnd: msg.selectionEnd,
+					});
+				} catch (error) {
+					sendToClient(client, {
+						type: "completion_suggestion_error",
+						requestId: msg.requestId,
+						message: completionController.signal.aborted
+							? "Suggestion stopped."
+							: `Suggestion failed: ${error instanceof Error ? error.message : String(error)}`,
+					});
+				} finally {
+					activeCompletionSuggestions.delete(msg.requestId);
+				}
+			})();
+			return;
+		}
+
 		if (msg.type === "quiz_generate_request") {
 			if (!isValidRequestId(msg.requestId)) {
 				sendToClient(client, { type: "error", requestId: msg.requestId, message: "Invalid request ID." });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-studio",
-  "version": "0.9.15",
+  "version": "0.9.17",
   "description": "Two-pane browser workspace for pi with prompt/response editing, annotations, critiques, active quiz, prompt/response history, live previews, and tmux-backed REPL/literate REPL workflows",
   "type": "module",
   "license": "MIT",