pi-studio 0.9.58 → 0.9.59

package/CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to `pi-studio` are documented here.
 
 ## [Unreleased]
 
+## [0.9.59] — 2026-09-03
+
+### Added
+- Add `Cmd/Ctrl+Shift+L` for loading the current Pi terminal input draft into Studio without clearing it.
+- Add a confirmed **Clear Pi editor text…** action for removing text waiting in Pi's terminal input editor without changing Studio text or conversation history.
+
+### Changed
+- Treat Pi terminal drafts loaded into Studio or staged from Studio as transient linked handoffs. An accepted **Run editor text** now clears the terminal draft only when its SHA-256 fingerprint and byte length still match; later terminal typing, added `pi-nvim-context` context, another client change, and failed submissions all preserve it.
+
 ## [0.9.58] — 2026-09-03
 
 ### Added

package/README.md

@@ -35,6 +35,7 @@ _The video shows an earlier version of the Studio interface. The basic workflow
 - Supports one canonical full Studio view per Pi session, plus additional editor-only companion views when you want extra editing/preview surfaces; editor-only views can also browse files and use the Studio REPL send controls without taking over the full Studio session view
 - Includes a global **Zen** mode that hides the Studio header and secondary chrome without changing the current pane layout; the header can also be hidden independently and restored from the top-right edge
 - Runs editor text directly, asks for structured critique (auto/writing/code focus), offers explicit **Show me** actions for a one-turn compact visual or structural explanation of the editor selection/document, displayed response, or current conversation topic, provides 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
+- Treats text copied from or staged in Pi's terminal input editor as a linked draft: ordinary Studio edits retain the link, and an accepted **Run editor text** clears the terminal draft only when it has not changed in the meantime; a confirmed **Clear Pi editor text…** action remains available explicitly
 - Adds a right-pane **Side questions** thread for contextual questions that stay outside the main Pi conversation unless explicitly promoted. It can start with the editor selection, the Markdown/LaTeX heading block at the cursor, nearby unstructured text, the whole editor, the displayed response, or no starting text; independently, it can use read-only tools to map, search, and read the document folder, repository, or another chosen folder—including extracted PDF, DOCX, ODT, and EPUB text—and can optionally search the web through Brave Search.
 - 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; optional browser-stored **Follow activity** (off by default under **View → Workspace**) switches to Working when the main Pi agent starts generating and to Response Preview when it completes, unless you manually choose another view during that request. When cycling response history, Working follows saved working details for the selected response when available, and `Cmd/Ctrl+Alt+1–8` switches directly between right-pane views while `Cmd/Ctrl+Alt+P` / `Cmd/Ctrl+Alt+E` / `Cmd/Ctrl+Alt+W` / `Cmd/Ctrl+Alt+F` / `Cmd/Ctrl+Alt+R` / `Cmd/Ctrl+Alt+Q` keep quick mnemonic shortcuts for Response Preview, Editor Preview, Working, Files, REPL, and Side questions
 - Includes a right-pane **Changes** view for browsing the current git diff by file, previewing per-file diffs, opening changed files, loading the full diff into the editor, and copying the diff
@@ -66,6 +67,12 @@ _The video shows an earlier version of the Studio interface. The basic workflow
 - Exports local files headlessly via `/studio-pdf <path>` to `<name>.studio.pdf` or `/studio-html <path>` to `<name>.studio.html`; without a path, those commands export the last model response to a timestamped file. Agent tools `studio_export_pdf` and `studio_export_html` expose the same export pipeline for remote/Telegram-style sessions.
 - Shows model/session/context usage in the footer, plus compact-context and active-theme controls
 
+## Pi input-draft handoff
+
+Tools such as [`pi-nvim-context`](https://github.com/omaclaren/pi-nvim-context) deliberately accumulate visible context in Pi's terminal input draft without submitting it. **Load from pi editor** (`Cmd/Ctrl+Shift+L`) copies that draft into Studio without clearing it and records only a transient SHA-256 fingerprint and byte length for the handoff—no additional snapshot copy beyond the text already in Studio. You can then edit the text freely in Studio.
+
+When Pi accepts **Run editor text**, Studio clears the linked terminal draft only if its current fingerprint and byte length still match those captured at load time. Terminal typing, additional Neovim context, or another client changing the draft causes Studio to preserve it silently. A failed or rejected run also leaves it intact. **Send current text to Pi editor** establishes the same safe link, while **Clear Pi editor text…** provides a separate confirmed, unconditional cleanup action. Studio never clears terminal history or its own editor through this handoff.
+
 ## Commands
 
 | Command | Description |

package/ROADMAP.md

@@ -106,6 +106,16 @@ A small interaction increment before the buffer-first architecture:
 - add opt-in activity following from Working during main-agent generation to Response Preview on completion, disabled by default and cancelled when the user manually changes views;
 - keep Quick send separate from the durable editor, the raw tmux mirror read-only, and protocol-v1 authority unchanged.
 
+## 0.9.59 — Safe Pi input-draft handoff (shipped 2026-09-03)
+
+A small workflow refinement for moving Neovim-provided context through Pi and Studio:
+
+- load or stage Pi's terminal input draft without clearing it, retaining only a transient SHA-256 fingerprint and byte length for provenance;
+- keep that link through unrestricted Studio edits, then clear the original Pi draft only after Pi accepts the Studio run and the current terminal text still matches exactly;
+- silently preserve later terminal typing, added `pi-nvim-context` context, or another client's changes, and never clear after a rejected submission;
+- provide `Cmd/Ctrl+Shift+L` for loading and a confirmed **Clear Pi editor text…** fallback without changing Studio text or conversation history;
+- keep `pi-nvim-context`, protocol v1, networking, and the buffer-first architecture unchanged.
+
 ## 0.10.0 — Buffer-first editing
 
 The first architectural `0.10` release should add:

package/client/studio-client.js

@@ -121,6 +121,7 @@
       const refreshFromDiskBtn = document.getElementById("refreshFromDiskBtn");
       const clearWorkspaceBtn = document.getElementById("clearWorkspaceBtn");
       const sendEditorBtn = document.getElementById("sendEditorBtn");
+      const clearPiEditorBtn = document.getElementById("clearPiEditorBtn");
       const openCompanionBtn = document.getElementById("openCompanionBtn");
       const getEditorBtn = document.getElementById("getEditorBtn");
       const studioHeaderEl = document.getElementById("studioHeader");
@@ -361,6 +362,9 @@
       const pendingSaveOperations = new Map();
       const pendingCompanionLaunches = new Map();
       const activeStudioTabLaunches = new Set();
+      // Deliberately page-memory-only: never persist Pi input-draft handoff fingerprints.
+      const pendingPiEditorDraftSnapshots = new Map();
+      let linkedPiEditorDraftSnapshot = null;
       let sourceOriginSummaryEl = null;
       let sourceResetOriginBtn = null;
       let sourceOpenCurrentFileTabBtn = null;
@@ -3186,7 +3190,9 @@
           if (sendEditorBtn) sendEditorBtn.textContent = "Send current text to Pi editor";
           appendStudioUiRefreshMenuSection(contextMenu.menu, "Document", [sourceOriginSummaryEl, sourceResetOriginBtn, sourceOpenCurrentFileTabBtn, sourceOpenCurrentTextCopyTabBtn]);
           appendStudioUiRefreshMenuSection(contextMenu.menu, "Working directory", [resourceDirBtn, resourceDirLabel, resourceDirInputWrap]);
-          if (!isEditorOnlyMode && sendEditorBtn) appendStudioUiRefreshMenuSection(contextMenu.menu, "Pi editor", [sendEditorBtn]);
+          if (!isEditorOnlyMode) {
+            appendStudioUiRefreshMenuSection(contextMenu.menu, "Pi editor", [sendEditorBtn, clearPiEditorBtn]);
+          }
           const cursorContextBtn = makeStudioUiRefreshElement("button", "completion-context-option", "Editor only");
           cursorContextBtn.type = "button";
           cursorContextBtn.setAttribute("data-completion-context-mode", "cursor");
@@ -3545,6 +3551,7 @@
         if (kind === "compact") return "compacting context";
         if (kind === "send_to_editor") return "sending to pi editor";
         if (kind === "get_from_editor") return "loading from pi editor";
+        if (kind === "clear_pi_editor") return "clearing Pi editor text";
         if (kind === "load_git_diff") return "loading git diff";
         if (kind === "open_editor_only") return "opening companion editor";
         if (kind === "refresh_from_disk") return "refreshing from disk";
@@ -3803,6 +3810,7 @@
         if (kind === "compact") return "Compacting…";
         if (kind === "send_to_editor") return "Sending to editor…";
         if (kind === "get_from_editor") return "Loading from editor…";
+        if (kind === "clear_pi_editor") return "Clearing Pi editor text…";
         if (kind === "load_git_diff") return "Loading git diff…";
         if (kind === "refresh_from_disk") return "Refreshing from disk…";
         if (kind === "save_as" || kind === "save_over") return "Saving…";
@@ -4464,6 +4472,58 @@
         return /^sha256:[a-f0-9]{64}$/.test(revision) ? revision : null;
       }
 
+      function normalizePiEditorDraftSnapshot(value) {
+        if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+        const fingerprint = normalizeStudioDiskRevision(value.fingerprint);
+        const byteLength = value.byteLength;
+        if (!fingerprint || typeof byteLength !== "number" || !Number.isSafeInteger(byteLength) || byteLength < 0) return null;
+        return { fingerprint, byteLength };
+      }
+
+      function piEditorDraftSnapshotsMatch(left, right) {
+        const normalizedLeft = normalizePiEditorDraftSnapshot(left);
+        const normalizedRight = normalizePiEditorDraftSnapshot(right);
+        return Boolean(
+          normalizedLeft
+          && normalizedRight
+          && normalizedLeft.fingerprint === normalizedRight.fingerprint
+          && normalizedLeft.byteLength === normalizedRight.byteLength
+        );
+      }
+
+      function setLinkedPiEditorDraftSnapshot(value, hasContent) {
+        linkedPiEditorDraftSnapshot = hasContent ? normalizePiEditorDraftSnapshot(value) : null;
+      }
+
+      function clearLinkedPiEditorDraftSnapshot() {
+        linkedPiEditorDraftSnapshot = null;
+      }
+
+      function reserveLinkedPiEditorDraftSnapshot(requestId) {
+        const snapshot = normalizePiEditorDraftSnapshot(linkedPiEditorDraftSnapshot);
+        if (!snapshot || typeof requestId !== "string" || !requestId) return null;
+        linkedPiEditorDraftSnapshot = null;
+        pendingPiEditorDraftSnapshots.set(requestId, snapshot);
+        return snapshot;
+      }
+
+      function restoreReservedPiEditorDraftSnapshot(requestId) {
+        if (typeof requestId !== "string" || !requestId) return;
+        const snapshot = pendingPiEditorDraftSnapshots.get(requestId);
+        if (!snapshot) return;
+        pendingPiEditorDraftSnapshots.delete(requestId);
+        if (!linkedPiEditorDraftSnapshot) linkedPiEditorDraftSnapshot = snapshot;
+      }
+
+      function settleReservedPiEditorDraftSnapshot(requestId, reportedSnapshot) {
+        if (typeof requestId !== "string" || !requestId) return false;
+        const snapshot = pendingPiEditorDraftSnapshots.get(requestId);
+        if (!snapshot) return false;
+        if (reportedSnapshot && !piEditorDraftSnapshotsMatch(snapshot, reportedSnapshot)) return false;
+        pendingPiEditorDraftSnapshots.delete(requestId);
+        return true;
+      }
+
       function markFileBackedBaseline(text, diskRevision) {
         fileBackedBaselineText = String(text || "");
         fileBackedDiskRevision = normalizeStudioDiskRevision(diskRevision);
@@ -5098,6 +5158,20 @@
         return true;
       }
 
+      function triggerLoadFromPiEditorShortcut() {
+        if (isWatchedFilePreview) {
+          setStatus("This preview is read-only. Open full Studio to load the Pi draft.", "warning");
+          return false;
+        }
+        if (!getEditorBtn || getEditorBtn.hidden) return false;
+        if (getEditorBtn.disabled) {
+          setStatus("Load from Pi editor is unavailable while Studio is busy.", "warning");
+          return false;
+        }
+        getEditorBtn.click();
+        return true;
+      }
+
       function triggerEditorSaveShortcut() {
         if (hasRefreshableFilePath() && saveOverBtn && !saveOverBtn.disabled && !saveOverBtn.hidden) {
           saveOverBtn.click();
@@ -5459,6 +5533,18 @@
           return;
         }
 
+        const isLoadFromPiEditorShortcut =
+          (key.toLowerCase() === "l" || code === "KeyL")
+          && (event.metaKey || event.ctrlKey)
+          && !event.altKey
+          && event.shiftKey;
+
+        if (isLoadFromPiEditorShortcut) {
+          event.preventDefault();
+          triggerLoadFromPiEditorShortcut();
+          return;
+        }
+
         const isSaveAsShortcut =
           key.toLowerCase() === "s"
           && (event.metaKey || event.ctrlKey)
@@ -13888,7 +13974,7 @@
         const safeStart = Math.max(0, Math.min(start, current.length));
         const safeEnd = Math.max(safeStart, Math.min(end, current.length));
         const next = current.slice(0, safeStart) + answer.text + current.slice(safeEnd);
-        setEditorText(next, { preserveScroll: false, preserveSelection: false });
+        setEditorText(next, { preserveScroll: false, preserveSelection: false, preservePiEditorDraftLink: true });
         const caret = safeStart + answer.text.length;
         sourceTextEl.setSelectionRange(caret, caret);
         setActivePane("left");
@@ -14504,6 +14590,7 @@
         if (refreshFromDiskBtn) refreshFromDiskBtn.disabled = uiBusy || isWatchedFilePreview || !canRefreshFromDisk;
         if (clearWorkspaceBtn) clearWorkspaceBtn.disabled = uiBusy || isWatchedFilePreview;
         sendEditorBtn.disabled = uiBusy || isEditorOnlyMode;
+        if (clearPiEditorBtn) clearPiEditorBtn.disabled = uiBusy || isEditorOnlyMode;
         if (getEditorBtn) getEditorBtn.disabled = uiBusy || isWatchedFilePreview;
         if (watchedOpenEditableBtn) {
           watchedOpenEditableBtn.hidden = !isWatchedFilePreview;
@@ -14885,6 +14972,9 @@
         const value = String(nextText || "");
         const preserveScroll = Boolean(options && options.preserveScroll);
         const preserveSelection = Boolean(options && options.preserveSelection);
+        if (!(options && options.preservePiEditorDraftLink === true)) {
+          clearLinkedPiEditorDraftSnapshot();
+        }
         if (activePreviewCommentSelection) {
           clearPreviewCommentSelection();
         }
@@ -22387,7 +22477,7 @@
           ? current.slice(0, inlineState.range.end) + current.slice(inlineState.range.end + inlineState.markerText.length)
           : current.slice(0, inlineState.range.end) + inlineState.markerText + current.slice(inlineState.range.end);
         setEditorView("markdown");
-        setEditorText(next, { preserveScroll: true, preserveSelection: true });
+        setEditorText(next, { preserveScroll: true, preserveSelection: true, preservePiEditorDraftLink: true });
         pendingReviewNoteInlineFocusId = note.id;
         renderReviewNotesList();
         updateReviewNotesUi();
@@ -22432,7 +22522,7 @@
         }
 
         setEditorView("markdown");
-        setEditorText(currentText, { preserveScroll: true, preserveSelection: true });
+        setEditorText(currentText, { preserveScroll: true, preserveSelection: true, preservePiEditorDraftLink: true });
         renderReviewNotesList();
         updateReviewNotesUi();
         if (reviewNotesInlineAllBtn && typeof reviewNotesInlineAllBtn.focus === "function") {
@@ -22618,7 +22708,7 @@
         const safeStart = Math.max(0, Math.min(start, current.length));
         const safeEnd = Math.max(safeStart, Math.min(end, current.length));
         const next = current.slice(0, safeStart) + content + current.slice(safeEnd);
-        setEditorText(next, { preserveScroll: false, preserveSelection: false });
+        setEditorText(next, { preserveScroll: false, preserveSelection: false, preservePiEditorDraftLink: true });
         const caret = safeStart + content.length;
         sourceTextEl.setSelectionRange(caret, caret);
         setActivePane("left");
@@ -22821,11 +22911,14 @@
           const replHint = rightView === "repl" && getActiveReplSessionForCurrentRuntime()
             ? " Sends text to Pi, not the REPL; use Send chunk/selection or Send to REPL to execute code in the active REPL."
             : "";
+          const piEditorDraftHint = linkedPiEditorDraftSnapshot
+            ? " The linked Pi terminal draft will be cleared after Pi accepts this run only if that draft remains unchanged."
+            : "";
           sendRunBtn.title = directIsStop
             ? "Stop the active run. Shortcut: Esc."
             : (annotationsEnabled
-              ? "Run editor text as-is (includes [an: ...] markers). Shortcut: Cmd/Ctrl+Enter. Stop the active request with Esc." + replHint
-              : "Run editor text with [an: ...] markers stripped. Shortcut: Cmd/Ctrl+Enter. Stop the active request with Esc." + replHint);
+              ? "Run editor text as-is (includes [an: ...] markers). Shortcut: Cmd/Ctrl+Enter. Stop the active request with Esc." + piEditorDraftHint + replHint
+              : "Run editor text with [an: ...] markers stripped. Shortcut: Cmd/Ctrl+Enter. Stop the active request with Esc." + piEditorDraftHint + replHint);
         }
 
         if (queueSteerBtn) {
@@ -23670,6 +23763,7 @@
           }
 
           const completedRequestId = typeof message.requestId === "string" ? message.requestId : pendingRequestId;
+          if (completedRequestId) pendingPiEditorDraftSnapshots.delete(completedRequestId);
           const responseKind =
             typeof message.kind === "string"
               ? message.kind
@@ -23804,17 +23898,46 @@
           return;
         }
 
+        if (message.type === "pi_editor_draft_result") {
+          const requestId = typeof message.requestId === "string" ? message.requestId : "";
+          if (!settleReservedPiEditorDraftSnapshot(requestId, message.piEditorDraftSnapshot)) return;
+          const outcome = String(message.outcome || "");
+          syncActionButtons();
+          if (outcome === "cleared") {
+            setStatus("Submission accepted; cleared the unchanged Pi draft.", "success");
+          } else if (outcome === "already-empty") {
+            setStatus("Submission accepted; the Pi draft was already empty.", "success");
+          } else if (outcome !== "changed") {
+            setStatus("Submission accepted, but Studio could not confirm Pi-draft cleanup; check the terminal draft.", "warning");
+          }
+          return;
+        }
+
         if (message.type === "editor_loaded") {
           if (typeof message.requestId === "string" && pendingRequestId === message.requestId) {
             pendingRequestId = null;
             pendingKind = null;
           }
+          const snapshot = normalizePiEditorDraftSnapshot(message.piEditorDraftSnapshot);
+          setLinkedPiEditorDraftSnapshot(snapshot, Boolean(snapshot && snapshot.byteLength > 0));
           setBusy(false);
           setWsState("Ready");
           setStatus(typeof message.message === "string" ? message.message : "Loaded into pi editor.", "success");
           return;
         }
 
+        if (message.type === "pi_editor_cleared") {
+          if (typeof message.requestId === "string" && pendingRequestId === message.requestId) {
+            pendingRequestId = null;
+            pendingKind = null;
+          }
+          clearLinkedPiEditorDraftSnapshot();
+          setBusy(false);
+          setWsState("Ready");
+          setStatus(message.cleared ? "Cleared Pi editor text." : "Pi editor text was already empty.", "success");
+          return;
+        }
+
         if (message.type === "editor_snapshot") {
           if (isWatchedFilePreview) {
             setStatus("Ignored editor snapshot because this preview follows its watched file on disk.", "warning");
@@ -23830,12 +23953,14 @@
 
           const content = typeof message.content === "string" ? message.content : "";
           setEditorText(content, { preserveScroll: false, preserveSelection: false });
+          const snapshot = normalizePiEditorDraftSnapshot(message.piEditorDraftSnapshot);
+          setLinkedPiEditorDraftSnapshot(snapshot, Boolean(content.length > 0 && snapshot));
           setSourceState({ source: "pi-editor", label: "pi editor draft", path: null });
           setBusy(false);
           setWsState("Ready");
           setStatus(
             content.trim()
-              ? "Loaded draft from pi editor."
+              ? "Loaded draft from pi editor. A Studio Run will clear it if the Pi draft remains unchanged."
               : "pi editor is empty. Loaded blank text.",
             content.trim() ? "success" : "warning",
           );
@@ -24032,6 +24157,7 @@
 
         if (message.type === "busy") {
           if (typeof message.requestId === "string") {
+            restoreReservedPiEditorDraftSnapshot(message.requestId);
             pendingSaveOperations.delete(message.requestId);
             failPendingCompanionLaunch(message.requestId, "Studio could not start the companion editor because another request was busy.");
           }
@@ -24055,6 +24181,7 @@
 
         if (message.type === "error") {
           if (typeof message.requestId === "string") {
+            restoreReservedPiEditorDraftSnapshot(message.requestId);
             pendingSaveOperations.delete(message.requestId);
             failPendingCompanionLaunch(message.requestId, "Studio could not prepare the companion editor. Return to the originating Studio page for details.");
           }
@@ -24203,6 +24330,7 @@
           quartoPreviewCheckSourcePath = "";
           quartoPreviewActionRequestId = null;
           sideQuestionMarkdownExportRequest = null;
+          pendingPiEditorDraftSnapshots.clear();
           failAllPendingCompanionLaunches("The originating Studio connection was lost before the companion editor was ready.");
           if (rightView === "editor-quarto-preview") renderQuartoPreviewView();
           setBusy(true);
@@ -24473,7 +24601,7 @@
 
         if (stripped.hadHeader) {
           const updated = stripped.body;
-          setEditorText(updated, { preserveScroll: true, preserveSelection: true });
+          setEditorText(updated, { preserveScroll: true, preserveSelection: true, preservePiEditorDraftLink: true });
           updateResultActionButtons();
           setStatus("Removed annotated reply header.", "success");
           return;
@@ -24486,7 +24614,7 @@
           return;
         }
 
-        setEditorText(updated, { preserveScroll: true, preserveSelection: true });
+        setEditorText(updated, { preserveScroll: true, preserveSelection: true, preservePiEditorDraftLink: true });
         updateResultActionButtons();
         setStatus("Inserted annotated reply header.", "success");
       }
@@ -25356,6 +25484,29 @@
         }
       });
 
+      if (clearPiEditorBtn) {
+        clearPiEditorBtn.addEventListener("click", async () => {
+          closeStudioUiRefreshMenus();
+          const confirmed = await requestStudioConfirmation(
+            "Clear the current Pi input draft? This removes text waiting in the terminal editor, including context added from Neovim. Studio text and Pi conversation history will not change.",
+            { title: "Clear Pi editor text?", confirmLabel: "Clear text", destructive: true },
+          );
+          if (!confirmed) {
+            setStatus("Pi editor text was not cleared.");
+            return;
+          }
+
+          const requestId = beginUiAction("clear_pi_editor");
+          if (!requestId) return;
+          const sent = sendMessage({ type: "clear_pi_editor_request", requestId });
+          if (!sent) {
+            pendingRequestId = null;
+            pendingKind = null;
+            setBusy(false);
+          }
+        });
+      }
+
       if (openCompanionBtn) {
         openCompanionBtn.addEventListener("click", () => {
           requestOpenEditorOnlyDocument("", {
@@ -25423,14 +25574,17 @@
 
         const requestId = beginUiAction("direct");
         if (!requestId) return;
+        const piEditorDraftSnapshot = reserveLinkedPiEditorDraftSnapshot(requestId);
 
         const sent = sendMessage({
           type: "send_run_request",
           requestId,
           text: prepared,
+          piEditorDraftSnapshot: piEditorDraftSnapshot || undefined,
         });
 
         if (!sent) {
+          restoreReservedPiEditorDraftSnapshot(requestId);
           pendingRequestId = null;
           pendingKind = null;
           setBusy(false);
@@ -25451,12 +25605,17 @@
 
           const requestId = makeRequestId();
           clearTitleAttention();
+          const piEditorDraftSnapshot = reserveLinkedPiEditorDraftSnapshot(requestId);
           const sent = sendMessage({
             type: "send_run_request",
             requestId,
             text: prepared,
+            piEditorDraftSnapshot: piEditorDraftSnapshot || undefined,
           });
-          if (!sent) return;
+          if (!sent) {
+            restoreReservedPiEditorDraftSnapshot(requestId);
+            return;
+          }
           setStatus("Queueing steering…", "warning");
         });
       }
@@ -25892,7 +26051,7 @@
           if (!confirmed) return;
 
           const strippedContent = stripAnnotationMarkers(content);
-          setEditorText(strippedContent, { preserveScroll: true, preserveSelection: false });
+          setEditorText(strippedContent, { preserveScroll: true, preserveSelection: false, preservePiEditorDraftLink: true });
           setStatus("Removed annotation markers from editor text.", "success");
         });
       }

package/client/studio.css

@@ -569,6 +569,7 @@
     body[data-studio-mode="editor-only"] #sendRunBtn,
     body[data-studio-mode="editor-only"] #queueSteerBtn,
     body[data-studio-mode="editor-only"] #sendEditorBtn,
+    body[data-studio-mode="editor-only"] #clearPiEditorBtn,
     body[data-studio-mode="editor-only"] #lensSelect,
     body[data-studio-mode="editor-only"] #critiqueBtn,
     body[data-studio-mode="editor-only"] #showMeBtn,

package/index.ts

@@ -29,6 +29,11 @@ import {
 	saveStudioDiskFileAs,
 	saveStudioDiskFileIfRevision,
 } from "./shared/studio-disk-revisions.js";
+import {
+	consumeStudioPiEditorDraftSnapshot,
+	createStudioPiEditorDraftSnapshot,
+	normalizeStudioPiEditorDraftSnapshot,
+} from "./shared/studio-pi-editor-draft.js";
 import { normalizeStudioMarkdownSmartFences } from "./shared/studio-markdown-fences.js";
 import {
 	extractStandaloneLatexDefinitionsFromMarkdown,
@@ -646,10 +651,16 @@ interface AnnotationRequestMessage {
 	text: string;
 }
 
+interface StudioPiEditorDraftSnapshot {
+	fingerprint: string;
+	byteLength: number;
+}
+
 interface SendRunRequestMessage {
 	type: "send_run_request";
 	requestId: string;
 	text: string;
+	piEditorDraftSnapshot?: StudioPiEditorDraftSnapshot;
 }
 
 interface CompletionSuggestionRequestMessage {
@@ -839,6 +850,11 @@ interface GetFromEditorRequestMessage {
 	requestId: string;
 }
 
+interface ClearPiEditorRequestMessage {
+	type: "clear_pi_editor_request";
+	requestId: string;
+}
+
 interface QuartoPreviewCheckRequestMessage {
 	type: "quarto_preview_check_request";
 	requestId: string;
@@ -922,6 +938,7 @@ type IncomingStudioMessage =
 	| WatchFileSubscribeMessage
 	| SendToEditorRequestMessage
 	| GetFromEditorRequestMessage
+	| ClearPiEditorRequestMessage
 	| QuartoPreviewCheckRequestMessage
 	| QuartoPreviewStartRequestMessage
 	| QuartoPreviewStopRequestMessage
@@ -9917,10 +9934,15 @@ function parseIncomingMessage(data: RawData): IncomingStudioMessage | null {
 	}
 
 	if (msg.type === "send_run_request" && typeof msg.requestId === "string" && typeof msg.text === "string") {
+		const piEditorDraftSnapshot = msg.piEditorDraftSnapshot === undefined
+			? undefined
+			: normalizeStudioPiEditorDraftSnapshot(msg.piEditorDraftSnapshot);
+		if (msg.piEditorDraftSnapshot !== undefined && !piEditorDraftSnapshot) return null;
 		return {
 			type: "send_run_request",
 			requestId: msg.requestId,
 			text: msg.text,
+			piEditorDraftSnapshot: piEditorDraftSnapshot ?? undefined,
 		};
 	}
 
@@ -10200,6 +10222,13 @@ function parseIncomingMessage(data: RawData): IncomingStudioMessage | null {
 		};
 	}
 
+	if (msg.type === "clear_pi_editor_request" && typeof msg.requestId === "string") {
+		return {
+			type: "clear_pi_editor_request",
+			requestId: msg.requestId,
+		};
+	}
+
 	if (
 		msg.type === "quarto_preview_check_request"
 		&& typeof msg.requestId === "string"
@@ -12385,7 +12414,7 @@ ${cssVarsBlock}
       <button id="clearWorkspaceBtn" type="button" title="Clear editor text and reset this tab to a fresh blank draft. Saved files and responses are not changed.">Reset editor</button>
       <button id="importFileBtn" type="button" title="Import a file as an editable copy.">Import file copy…</button>
       <input id="fileInput" class="file-input-hidden" type="file" tabindex="-1" aria-hidden="true" accept=".md,.markdown,.mdx,.qmd,.js,.mjs,.cjs,.jsx,.ts,.mts,.cts,.tsx,.py,.pyw,.sh,.bash,.zsh,.json,.jsonc,.json5,.rs,.c,.h,.cpp,.cxx,.cc,.hpp,.hxx,.jl,.f90,.f95,.f03,.f,.for,.r,.R,.m,.tex,.latex,.diff,.patch,.java,.go,.rb,.swift,.html,.htm,.css,.xml,.yaml,.yml,.toml,.lua,.txt,.rst,.adoc" />
-      <button id="getEditorBtn" type="button" title="Load the current terminal editor draft into Studio.">Load from pi editor</button>
+      <button id="getEditorBtn" type="button" aria-keyshortcuts="Meta+Shift+L Control+Shift+L" title="Copy the current Pi terminal input draft into Studio without clearing it. A later Studio Run clears that draft only if it remains unchanged. Shortcut: Cmd/Ctrl+Shift+L.">Load from pi editor</button>
       <button id="hideStudioHeaderBtn" class="header-visibility-btn" type="button" aria-controls="studioHeader" title="Hide the global Studio header. Restore it from the top-right edge.">Hide header</button>
       <button id="zenModeBtn" class="zen-mode-btn" type="button" title="Hide the Studio header and secondary controls. Shortcut: F9.">Zen</button>
     </div>
@@ -12426,7 +12455,7 @@ ${cssVarsBlock}
           </div>
           <div class="source-actions">
             <div class="source-actions-row">
-              <button id="sendRunBtn" type="button" title="Run editor text. While a direct run is active, this button becomes Stop. Cmd/Ctrl+Enter queues steering from the current editor text. Stop the active request with Esc.">Run editor text</button>
+              <button id="sendRunBtn" type="button" title="Run editor text. If Studio loaded or staged an unchanged Pi terminal draft, clear that draft after Pi accepts the run. While a direct run is active, this button becomes Stop. Cmd/Ctrl+Enter queues steering from the current editor text. Stop the active request with Esc.">Run editor text</button>
               <button id="queueSteerBtn" type="button" title="Queue steering is available while Run editor text is active." disabled>Queue steering</button>
             </div>
             <div class="source-actions-row repl-action-line" hidden>
@@ -12453,7 +12482,8 @@ ${cssVarsBlock}
                 <option value="current" selected>Suggestion model: current Pi model</option>
               </select>
               <button id="openCompanionBtn" type="button" title="Open a blank editor-only Studio tab.">New editor tab</button>
-              <button id="sendEditorBtn" type="button">Send current text to Pi editor</button>
+              <button id="sendEditorBtn" type="button" title="Replace the Pi terminal input draft with the current Studio text. A later Studio Run clears that staged draft only if it remains unchanged.">Send current text to Pi editor</button>
+              <button id="clearPiEditorBtn" type="button" title="Clear text currently waiting in the Pi terminal input editor without changing Studio text or conversation history.">Clear Pi editor text…</button>
             </div>
             <div class="source-actions-row">
               <button id="insertHeaderBtn" type="button" title="Insert annotated-reply protocol header (source metadata, [an: ...] syntax hint, precedence note, and end marker).">Annotation header</button>
@@ -12759,6 +12789,7 @@ ${cssVarsBlock}
           <dl>
             <div><dt>Cmd/Ctrl+S</dt><dd>Save editor when the disk revision still matches</dd></div>
             <div><dt>Cmd/Ctrl+Shift+S</dt><dd>Save editor as a new file</dd></div>
+            <div><dt>Cmd/Ctrl+Shift+L</dt><dd>Load the current Pi terminal input draft without clearing it</dd></div>
             <div class="shortcuts-full-only"><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>
@@ -13649,6 +13680,23 @@ export default function (pi: ExtensionAPI) {
 		}
 	};
 
+	const reportPiEditorDraftDisposition = (
+		client: WebSocket,
+		requestId: string,
+		snapshot: StudioPiEditorDraftSnapshot | undefined,
+	) => {
+		if (!snapshot) return;
+		const result = consumeStudioPiEditorDraftSnapshot(lastCommandCtx?.ui, snapshot);
+		if (result.status === "not-requested") return;
+		emitDebugEvent("pi_editor_draft_disposition", { requestId, outcome: result.status });
+		sendToClient(client, {
+			type: "pi_editor_draft_result",
+			requestId,
+			outcome: result.status,
+			piEditorDraftSnapshot: snapshot,
+		});
+	};
+
 	const broadcast = (payload: unknown) => {
 		if (!serverState) return;
 		const serialized = JSON.stringify(payload);
@@ -15743,6 +15791,7 @@ export default function (pi: ExtensionAPI) {
 						queuedSteeringCount: getQueuedStudioSteeringCount(),
 					});
 					broadcastState();
+					reportPiEditorDraftDisposition(client, msg.requestId, msg.piEditorDraftSnapshot);
 				} catch (error) {
 					queuedStudioDirectRequests = queuedStudioDirectRequests.filter((request) => request.requestId !== msg.requestId);
 					if (studioDirectRunChain?.steeringPrompts.length) {
@@ -15766,6 +15815,7 @@ export default function (pi: ExtensionAPI) {
 
 			try {
 				pi.sendUserMessage(msg.text);
+				reportPiEditorDraftDisposition(client, msg.requestId, msg.piEditorDraftSnapshot);
 			} catch (error) {
 				clearStudioDirectRunState();
 				clearActiveRequest();
@@ -16510,7 +16560,8 @@ export default function (pi: ExtensionAPI) {
 				sendToClient(client, {
 					type: "editor_loaded",
 					requestId: msg.requestId,
-					message: "Draft loaded into pi editor.",
+					message: "Draft loaded into pi editor. A Studio Run will clear it if it remains unchanged.",
+					piEditorDraftSnapshot: createStudioPiEditorDraftSnapshot(msg.content),
 				});
 			} catch (error) {
 				sendToClient(client, {
@@ -16546,6 +16597,7 @@ export default function (pi: ExtensionAPI) {
 					type: "editor_snapshot",
 					requestId: msg.requestId,
 					content,
+					piEditorDraftSnapshot: createStudioPiEditorDraftSnapshot(content),
 				});
 			} catch (error) {
 				sendToClient(client, {
@@ -16556,6 +16608,43 @@ export default function (pi: ExtensionAPI) {
 			}
 			return;
 		}
+
+		if (msg.type === "clear_pi_editor_request") {
+			if (!isValidRequestId(msg.requestId)) {
+				sendToClient(client, { type: "error", requestId: msg.requestId, message: "Invalid request ID." });
+				return;
+			}
+			if (isStudioBusy()) {
+				sendToClient(client, { type: "busy", requestId: msg.requestId, message: "Studio is busy." });
+				return;
+			}
+			if (!lastCommandCtx || !lastCommandCtx.hasUI) {
+				sendToClient(client, {
+					type: "error",
+					requestId: msg.requestId,
+					message: "No interactive pi editor context is available.",
+				});
+				return;
+			}
+
+			try {
+				const hadContent = lastCommandCtx.ui.getEditorText().length > 0;
+				if (hadContent) lastCommandCtx.ui.setEditorText("");
+				lastCommandCtx.ui.notify(hadContent ? "Pi editor text cleared from Studio." : "Pi editor text is already empty.", "info");
+				sendToClient(client, {
+					type: "pi_editor_cleared",
+					requestId: msg.requestId,
+					cleared: hadContent,
+				});
+			} catch (error) {
+				sendToClient(client, {
+					type: "error",
+					requestId: msg.requestId,
+					message: `Failed to clear pi editor text: ${error instanceof Error ? error.message : String(error)}`,
+				});
+			}
+			return;
+		}
 	};
 
 	const disposePreparedPdfExport = (entry: PreparedStudioPdfExport | null | undefined) => {

package/package.json

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

package/shared/studio-pi-editor-draft.js

@@ -0,0 +1,49 @@
+import { createHash } from "node:crypto";
+
+export const STUDIO_PI_EDITOR_DRAFT_FINGERPRINT_PATTERN = /^sha256:[a-f0-9]{64}$/;
+
+export function createStudioPiEditorDraftSnapshot(content) {
+	const buffer = Buffer.from(String(content ?? ""), "utf8");
+	return Object.freeze({
+		fingerprint: `sha256:${createHash("sha256").update(buffer).digest("hex")}`,
+		byteLength: buffer.length,
+	});
+}
+
+export function normalizeStudioPiEditorDraftSnapshot(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+	const fingerprint = typeof value.fingerprint === "string"
+		? value.fingerprint.trim().toLowerCase()
+		: "";
+	const byteLength = value.byteLength;
+	if (!STUDIO_PI_EDITOR_DRAFT_FINGERPRINT_PATTERN.test(fingerprint)) return null;
+	if (typeof byteLength !== "number" || !Number.isSafeInteger(byteLength) || byteLength < 0) return null;
+	return Object.freeze({ fingerprint, byteLength });
+}
+
+export function studioPiEditorDraftMatchesSnapshot(content, snapshot) {
+	const expected = normalizeStudioPiEditorDraftSnapshot(snapshot);
+	if (!expected) return false;
+	const current = createStudioPiEditorDraftSnapshot(content);
+	return current.byteLength === expected.byteLength && current.fingerprint === expected.fingerprint;
+}
+
+export function consumeStudioPiEditorDraftSnapshot(ui, snapshot) {
+	const expected = normalizeStudioPiEditorDraftSnapshot(snapshot);
+	if (!expected) return Object.freeze({ status: "not-requested" });
+	if (!ui || typeof ui.getEditorText !== "function" || typeof ui.setEditorText !== "function") {
+		return Object.freeze({ status: "unavailable" });
+	}
+
+	try {
+		const current = String(ui.getEditorText() ?? "");
+		if (current.length === 0) return Object.freeze({ status: "already-empty" });
+		if (!studioPiEditorDraftMatchesSnapshot(current, expected)) {
+			return Object.freeze({ status: "changed" });
+		}
+		ui.setEditorText("");
+		return Object.freeze({ status: "cleared" });
+	} catch {
+		return Object.freeze({ status: "unavailable" });
+	}
+}