pi-studio 0.9.16 → 0.9.17

package/CHANGELOG.md

@@ -4,6 +4,13 @@ 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

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), 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), 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

@@ -115,6 +115,8 @@
       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");
@@ -256,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"];
@@ -1949,6 +1953,7 @@
       let editorLanguage = "markdown";
       let responseHighlightEnabled = false;
       let completionSuggestionState = null;
+      let completionSuggestionContextMode = readCompletionSuggestionContextMode();
       let completionSuggestionInFlight = false;
       let completionSuggestionRequestId = null;
       let completionSuggestionPendingSnapshot = null;
@@ -2339,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) {
@@ -2351,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);
@@ -2359,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) {
@@ -2402,18 +2428,18 @@
         const actionLineOneEl = makeStudioUiRefreshElement("div", "studio-refresh-action-line");
         if (!isEditorOnlyMode && sendRunBtn) actionLineOneEl.appendChild(sendRunBtn);
         if (!isEditorOnlyMode && queueSteerBtn) actionLineOneEl.appendChild(queueSteerBtn);
-        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");
+        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);
         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");
@@ -2435,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) => {
@@ -3691,6 +3719,14 @@
           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)) {
@@ -4244,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;
         }
 
@@ -4265,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) {
@@ -8667,9 +8693,14 @@
         syncRunAndCritiqueButtons();
         copyDraftBtn.disabled = uiBusy;
         if (suggestCompletionBtn) {
-          suggestCompletionBtn.disabled = uiBusy || completionSuggestionInFlight || wsState !== "Ready" || !String(sourceTextEl.value || "").trim();
-          suggestCompletionBtn.textContent = completionSuggestionInFlight ? "Suggesting…" : "Suggest";
-        }
+          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;
@@ -9003,6 +9034,69 @@
         }
       }
 
+      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 = "";
@@ -9073,10 +9167,29 @@
           || 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) {
-          setStatus("Suggestion request already in progress.", "warning");
+          cancelCompletionSuggestion();
           return;
         }
         const text = String(sourceTextEl.value || "");
@@ -9086,6 +9199,7 @@
         }
         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;
@@ -9103,6 +9217,8 @@
           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;
@@ -17947,6 +18063,13 @@
           requestCompletionSuggestion();
         });
       }
+      if (completionContextSelect) {
+        completionContextSelect.value = completionSuggestionContextMode;
+        completionContextSelect.addEventListener("change", () => {
+          setCompletionSuggestionContextMode(completionContextSelect.value);
+          syncActionButtons();
+        });
+      }
       if (completionSuggestionInsertBtn) {
         completionSuggestionInsertBtn.addEventListener("click", () => {
           insertCompletionSuggestion();

package/client/studio.css

@@ -4336,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 {
@@ -4353,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;
@@ -4462,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;
@@ -4475,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,
@@ -4483,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;
     }
@@ -4501,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] {
@@ -4519,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,
@@ -4536,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;
@@ -4805,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;
     }
@@ -4852,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

@@ -320,6 +320,13 @@ interface CompletionSuggestionRequestMessage {
 	language?: string;
 	label?: string;
 	path?: string;
+	contextMode?: "cursor" | "session";
+	contextText?: string;
+}
+
+interface CompletionSuggestionCancelRequestMessage {
+	type: "completion_suggestion_cancel_request";
+	requestId: string;
 }
 
 interface QuizGenerateRequestMessage {
@@ -463,6 +470,7 @@ type IncomingStudioMessage =
 	| AnnotationRequestMessage
 	| SendRunRequestMessage
 	| CompletionSuggestionRequestMessage
+	| CompletionSuggestionCancelRequestMessage
 	| QuizGenerateRequestMessage
 	| QuizAnswerRequestMessage
 	| QuizDiscussRequestMessage
@@ -485,6 +493,7 @@ 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;
@@ -7217,6 +7226,8 @@ function buildStudioCompletionSuggestionPrompt(options: {
 	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));
@@ -7226,17 +7237,23 @@ function buildStudioCompletionSuggestionPrompt(options: {
 	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,
@@ -7262,6 +7279,9 @@ async function runStudioCompletionSuggestion(ctx: StudioModelRequestContext, opt
 	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
@@ -7271,6 +7291,7 @@ async function runStudioCompletionSuggestion(ctx: StudioModelRequestContext, opt
 		maxTokens: 650,
 		timeoutMs: 60_000,
 		trim: false,
+		signal: options.signal,
 	}));
 	if (!suggestion.trim()) throw new Error("Model returned an empty completion suggestion.");
 	return suggestion;
@@ -7685,12 +7706,20 @@ 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,
@@ -7700,6 +7729,8 @@ function parseIncomingMessage(data: RawData): IncomingStudioMessage | null {
 			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,
 		};
 	}
 
@@ -9582,6 +9613,11 @@ ${cssVarsBlock}
             <div class="source-actions-row">
               <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>
@@ -9844,6 +9880,7 @@ ${cssVarsBlock}
             <div><dt>Cmd/Ctrl+Enter</dt><dd>Run editor text, or queue steering during an active run</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>
@@ -9938,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();
@@ -11424,6 +11462,21 @@ 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." });
@@ -11443,6 +11496,8 @@ export default function (pi: ExtensionAPI) {
 				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, {
@@ -11452,6 +11507,9 @@ export default function (pi: ExtensionAPI) {
 						language: msg.language,
 						label: msg.label,
 						path: msg.path,
+						contextMode: msg.contextMode,
+						contextText: msg.contextText,
+						signal: completionController.signal,
 					});
 					sendToClient(client, {
 						type: "completion_suggestion_result",
@@ -11464,8 +11522,12 @@ export default function (pi: ExtensionAPI) {
 					sendToClient(client, {
 						type: "completion_suggestion_error",
 						requestId: msg.requestId,
-						message: `Suggestion failed: ${error instanceof Error ? error.message : String(error)}`,
+						message: completionController.signal.aborted
+							? "Suggestion stopped."
+							: `Suggestion failed: ${error instanceof Error ? error.message : String(error)}`,
 					});
+				} finally {
+					activeCompletionSuggestions.delete(msg.requestId);
 				}
 			})();
 			return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-studio",
-  "version": "0.9.16",
+  "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",