pi-studio 0.9.60-rc.0 → 0.9.60

package/CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to `pi-studio` are documented here.
 
 ## [Unreleased]
 
+## [0.9.60] — 2026-09-07
+
+### Added
+- Promote the opt-in `--listen-all` networking support from `0.9.60-rc.0` to stable: default binding remains localhost, wildcard binding requires explicit intent and token authentication, and status reports the actual bind address. See the RC security notes below for the exposure and Origin-check boundaries.
+- Add `Cmd/Ctrl+Option/Alt+A` to toggle the browser-stored **Follow activity** preference from the main editable Studio workspace.
+- Add `Cmd/Ctrl+Option/Alt+Enter` for **Annotate response** from either main pane, retaining the existing action's availability and modal guards without changing Run, REPL, or Side question shortcuts. Add Shift (`Cmd/Ctrl+Option/Alt+Shift+Enter`) for **Load response into editor** without switching views, through the existing button and the same replacement safeguards. All three shortcuts ignore held-key repeats and text composition. View-preserving Load refuses to detach the file required by Quarto Preview; choose another view first or use Annotate response.
+
+### Changed
+- Use **Option/Alt** consistently in current shortcut labels, tooltips, and documentation. Keyboard behavior and standard accessibility key names are unchanged.
+
+### Fixed
+- Protect unsubmitted editor changes and unsaved file edits before **Annotate response** or **Load response into editor** replaces them. Keep unchanged accepted prompts confirmation-free using bounded, page-memory-only request-correlated snapshots; failed submissions and late acknowledgements cannot mark newer edits as submitted, and submission never marks file text saved. Cancel preserves text, source identity, and view; confirmation is revalidated against the editor and selected response before replacement. Pi-terminal draft-cleanup provenance remains separate.
+
+### Validation note
+- Production network lifecycle and TCP-forwarding checks pass, but exact `sbx` confirmation from the issue #4 reporter is still outstanding. The issue remains open for confirmation or a follow-up fix; this release does not claim that environment has been tested directly.
+
 ## [0.9.60-rc.0] — 2026-09-03
 
 ### Added

package/README.md

@@ -37,7 +37,7 @@ _The video shows an earlier version of the Studio interface. The basic workflow
 - 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 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** (`Cmd/Ctrl+Option/Alt+A`; 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+Option/Alt+1–8` switches directly between right-pane views while `Cmd/Ctrl+Option/Alt+P` / `Cmd/Ctrl+Option/Alt+E` / `Cmd/Ctrl+Option/Alt+W` / `Cmd/Ctrl+Option/Alt+F` / `Cmd/Ctrl+Option/Alt+R` / `Cmd/Ctrl+Option/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
 - Includes a right-pane **Files** view rooted in folders allowed for the current Studio session, with an **Allow folder…** action and location selector; exact-file grants can still be opened independently without exposing their parent folders. Files supports sorting by name/modified time/size, opening folders or the current root in Finder/the system file manager, loading text/code/CSV/TSV documents into the editor, opening a read-only **Preview (follow)** tab whose disk content is authoritative, previewing PDFs/images, opening previews in new Studio tabs, converting DOCX/ODT documents to editable Markdown when Pandoc is available after confirmation, copying paths, setting the current folder as the Studio working directory, and revealing files in the file manager
 - Imports detached text-file copies either through the browser's file picker or from a path on the computer running Pi, keeping the path option available in embedded and remote browser views; imported copies remain detached until saved or opened as file-backed documents
@@ -50,9 +50,10 @@ _The video shows an earlier version of the Studio interface. The basic workflow
 - Turns local preview links, including links inside sandboxed HTML previews, into Studio actions: PDFs open in the embedded viewer, images open in a zoomable focus viewer, PDF/image links can open in a new Studio preview tab, text/code/CSV/TSV document links can open in a new editor tab, DOCX/ODT links can be converted to editable Markdown, and right-click menus provide **Open here**, **Reveal in file manager**, and **Copy path** for local resources
 - Includes local comments anchored to selections/lines, shown in a docked **Comments** rail, with transient **Comment** / **Jump** actions from raw-editor selections plus editor-preview selections for Markdown, LaTeX, code/text/diff previews, and an opt-in comment mode for editor HTML previews; source-anchored comments can be toggled into inline `[an: ...]` annotations when you want comments reflected in the document text
 - Browses response history (`Prev/Next/Last`) and loads either:
-  - response text, with a one-click **Annotate response** action that also opens **Editor (Preview)**
+  - response text, with **Annotate response** (`Cmd/Ctrl+Option/Alt+Enter` from either main pane) also opening **Editor (Preview)**; add Shift (`Cmd/Ctrl+Option/Alt+Shift+Enter`) for **Load response into editor** without switching views (choose another view first if file-backed Quarto Preview is active)
   - critique notes/full critique
   - the prompt that generated a selected response
+- Keeps the prompt → accepted Run → **Annotate response** loop confirmation-free when the submitted editor text is unchanged. **Annotate response** and **Load response into editor** ask before replacing unsubmitted edits or unsaved file changes; Cancel preserves the editor and its view so you can save or copy first. A failed submission or late acknowledgement cannot mark later typing as submitted, and sending file text does not save it. This bounded accepted-prompt baseline stays in page memory, is not restored after a page reload, and is separate from Pi-terminal draft cleanup.
 - Supports an annotation workflow for `[an: ...]` markers:
   - inserts/removes the annotated-reply header
   - shows/hides annotation markers in preview
@@ -159,7 +160,7 @@ See [`shared/REPL_SESSION_RECORD_PROTOCOL.md`](./shared/REPL_SESSION_RECORD_PROT
 
 ## Side questions and research context
 
-Open **Review → Side question**, select **Side questions** in the right pane, or press **Cmd/Ctrl+Alt+Q**. A new side thread captures its starting text while keeping related-file access separate:
+Open **Review → Side question**, select **Side questions** in the right pane, or press **Cmd/Ctrl+Option/Alt+Q**. A new side thread captures its starting text while keeping related-file access separate:
 
 - **Starting text** controls what unsaved text begins the thread. The compact **Automatic: selection → heading block at cursor → nearby text** disclosure explains the fallback order; when expanded, it defines the heading boundary. The summary below reports the resolved starting text, editor line range when applicable, and character count separately from the related-file scope.
 - Explicit **Editor selection only** no longer falls back to the whole document when no text is selected; the summary instead reports that no editor text is selected.
@@ -199,7 +200,7 @@ caption: Optional caption
 
 `path` must point to a local `.pdf`. Relative paths resolve from the opened document's directory, or from Studio's working directory for non-file-backed content; the resolved file must be inside a location allowed for the current Studio session before it loads. `page` is an initial page hint for the browser PDF viewer, `height` controls the embedded frame height in pixels, and `watch: true` enables auto-refresh after Studio observes the changed file in a stable state. Use normal Markdown links for PDFs when embedding is not useful.
 
-To view an existing PDF directly, run `/studio report.pdf` (or `/studio "path with spaces/report.pdf"`). The PDF opens read-only in a focused companion preview, even when the full Studio workspace is already open. A `#page=N` suffix selects the initial page. Auto-refresh is off by default; use `/studio --watch report.pdf` to start with it on, or toggle **Auto-refresh** in the PDF card or focused viewer. Studio checks only while the tab is visible and waits for two matching file-version observations before reloading, which avoids reading a PDF while LaTeX is still writing it. **Cmd/Ctrl+Alt+Shift+R** manually refreshes the focused or visible PDF. This is distinct from `/studio-pdf`, which exports Markdown, LaTeX, code, or the last response to a new PDF.
+To view an existing PDF directly, run `/studio report.pdf` (or `/studio "path with spaces/report.pdf"`). The PDF opens read-only in a focused companion preview, even when the full Studio workspace is already open. A `#page=N` suffix selects the initial page. Auto-refresh is off by default; use `/studio --watch report.pdf` to start with it on, or toggle **Auto-refresh** in the PDF card or focused viewer. Studio checks only while the tab is visible and waits for two matching file-version observations before reloading, which avoids reading a PDF while LaTeX is still writing it. **Cmd/Ctrl+Option/Alt+Shift+R** manually refreshes the focused or visible PDF. This is distinct from `/studio-pdf`, which exports Markdown, LaTeX, code, or the last response to a new PDF.
 
 For a disk-authoritative text or code preview, run `/studio --watch notes.md` or choose **Preview file (follow changes)** from a local-link menu / **Preview (follow)** in Files. This opens a transient read-only companion tab with the preview pane focused; leaving pane focus reveals the same disk-following text as **Source** with a visible **Read-only · follows disk** badge rather than as an editable buffer. Studio polls the canonical file, debounces change bursts, compares SHA-256 content revisions, accepts ordinary and atomic-replacement saves, and never writes back. Each watcher socket is bound to the exact path in a bounded, expiring server-created tab capability; if that identity expires before a reload or reconnect, the tab stays read-only and asks you to open a fresh watched preview. A missing, unreadable, oversized, binary, or path-replaced source leaves the last good preview visible and automatically recovers when the same canonical file becomes readable again. Render failures likewise retain the last successfully staged document rather than replacing it with partial output. On successful updates, Studio restores a nearby stable content anchor where possible and falls back to the previous scroll ratio.
 

package/ROADMAP.md

@@ -6,7 +6,7 @@ This is the current planning source of truth for Studio work. `NEXT-STAGE.md` is
 
 Studio development follows two tracks:
 
-- **Stable `0.9.x` releases** contain one coherent family of fixes or incremental features and keep `main` releasable.
+- **Stable `0.9.x` releases** contain a bounded, explicitly scoped batch of fixes or incremental features and keep `main` releasable.
 - **`0.10.0`** is reserved for the buffer-first document architecture. Risky prereleases should use the npm `next` tag before replacing `latest`.
 
 Changes should be based on capabilities rather than browser, terminal host, or user-agent detection. Muxy, ordinary Chromium browsers, embedded WebKit views, and SSH/headless use are validation environments, not separate product variants.
@@ -19,7 +19,19 @@ Each release should finish with:
 4. exact package-content and byte-level artifact audit;
 5. a fresh npm installation and naturally rendered Studio smoke test.
 
-Publishing, pushing, and tagging remain explicit release actions rather than automatic consequences of merging work.
+Committing, publishing, pushing, and tagging remain explicit actions rather than automatic consequences of implementation or planning approval.
+
+## Agreed next sequence (2026-09-07)
+
+1. Ship **`0.9.60`** as the bounded networking/shortcut release. Do not start buffer architecture in this batch.
+2. After that release, implement **`0.10.0`** around an explicit active Prompt, independently editable documents, context transfer, and parked prompt drafts. The design is in [`BUFFER-DESIGN.md`](https://github.com/omaclaren/pi-studio/blob/main/BUFFER-DESIGN.md).
+3. Keep Derived REPL Transcript, editor-engine migration, and arbitrary pane arrangements outside both batches.
+
+Current status:
+
+- `0.9.60` combines the networking fix with Follow activity, Annotate response, and view-preserving Load response shortcuts, plus accurate draft-replacement protection. The published networking RC remains unchanged.
+- The reporter has not replied to the RC invitation on [issue #4](https://github.com/omaclaren/pi-studio/issues/4) as of 2026-09-07. Exact `sbx` validation remains outstanding; the release proceeds with that limitation documented and the issue open for confirmation or a follow-up fix.
+- `0.10.0` remains design-only. Approval to release `0.9.60` does not authorize buffer implementation.
 
 ## 0.9.52 — Rendering and media consistency (shipped 2026-08-28)
 
@@ -116,9 +128,13 @@ A small workflow refinement for moving Neovim-provided context through Pi and St
 - 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.9.60 — Opt-in container/network binding (`0.9.60-rc.0` prerelease, 2026-09-03)
+## 0.9.60 — Networking and prompt-workflow shortcuts (2026-09-07)
 
-A bounded implementation of GitHub issue #4, separate from REPL transcript and buffer work:
+This release combines the networking portion shipped as `0.9.60-rc.0` on 2026-09-03 with the small shortcut batch below. The published RC remains a reproducible networking test target.
+
+### Networking
+
+A bounded implementation of GitHub issue #4:
 
 - retain `127.0.0.1` as the default and require explicit `--listen-all` intent before binding to `0.0.0.0`;
 - keep the server-lifetime bearer token mandatory and the generated URL on loopback for same-port container publishing;
@@ -127,18 +143,47 @@ A bounded implementation of GitHub issue #4, separate from REPL transcript and b
 - document loopback-only host publishing, private-network limits, and SSH forwarding as the safer option on untrusted networks;
 - validate both default loopback and opt-in wildcard sockets without changing the buffer model, protocol v1, or `pi-repl`.
 
-## 0.10.0 — Buffer-first editing
+### Shortcut and draft-replacement batch
+
+The shortcuts and replacement safeguards below are implemented, with focused regression tests and browser workflow checks using controlled model replies. The buffer architecture remains deferred.
+
+- Include `Cmd/Ctrl+Option/Alt+A` **Follow activity** toggle: retain opt-in persistence, full-workspace scope, modal protections, and key-repeat suppression.
+- Add `Cmd/Ctrl+Option/Alt+Enter` for **Annotate response** from either main pane when the existing action is available. Invoke the same action as the button and retain its busy, response-type, and mode guards. Add Shift (`Cmd/Ctrl+Option/Alt+Shift+Enter`) to invoke **Load response into editor** without switching views, with the same replacement safeguards. Do not reinterpret `Cmd/Ctrl+Enter` as the right pane's primary action.
+- Keep Run's existing active-pane behaviour and REPL/Side question submission shortcuts unchanged in this release.
+- Protect **unsubmitted or unsaved work**, not every non-empty editor. The normal write prompt → accepted Run → response → Annotate response loop must remain confirmation-free when the submitted prompt is still unchanged. Ask before replacing post-submission edits, a new unsent draft, edited response annotations, or unsaved file changes; Cancel preserves text, source identity, and view state. Keep the decision/save-or-copy workflow bounded rather than adding a hidden second editor or a new recovery schema to `0.9.60`.
+- Correlate an editor-text/source snapshot with the accepted submission and compare the current editor against that baseline; do not mark later typing as submitted when an acknowledgement or response arrives. Failed submissions do not establish the baseline, and submitting file text does not mark it saved.
+- Capture the intended response and revalidate the editor after an asynchronous replacement decision; later typing or a changed target must not be overwritten by stale consent.
+- Test both modifier variants, option-modified key values, key repeat, modal ownership, unavailable actions, and unchanged Run/REPL/Side question behaviour. Update the shortcut overlay, tooltips, accessibility metadata, and changelog only as behaviour is implemented.
+
+### Release gate
+
+Run the normal full validation and fresh-package browser smoke over the combined batch, including a confirmation-free submitted-prompt → Annotate response loop and protected replacement/cancellation for genuinely new work. The previous RC verification does not substitute for checking the final artifact.
+
+The networking review and production lifecycle tests support the reported fix; a separate TCP-forward smoke also verified HTML, client JavaScript, and WebSocket state delivery through a non-loopback destination. Neither is an exact `sbx` test. On 2026-09-07, Oliver approved shipping after final validation with this limitation documented and issue #4 left open. Reporter feedback can confirm the fix or lead to a follow-up patch. Any updated prerelease must use a new version, never replace `rc.0`.
+
+Do not include buffer tabs, context-transfer messages, recovery schema v2, or REPL transcript work in this release.
+
+## 0.10.0 — Active Prompt and editable document buffers (planned)
+
+Studio's primary loop is prompt construction and response reading. Documents remain useful editable sources, not implicit submission targets or a replacement for Neovim. The design is **one clearly active Prompt, other prompt drafts that can be parked, and independently editable documents**.
+
+The first architectural release should add:
+
+- a `StudioBufferStore` with stable buffer identity, explicit prompt/document roles, and separate selected-buffer and active-prompt identities;
+- a prominent **Prompt** view with response/Working alongside it, plus editable document tabs with their own previews;
+- recovery schema v2 with non-destructive migration from the single-document schema;
+- buffer-specific text/baseline, dirty state, cursor, selection, scroll, preview context, annotations, and resource directory, preserving existing disk-revision checks;
+- **Add selection to prompt** and **Copy document to prompt**, including an acknowledged handoff from editable companion views to the full workspace's explicit prompt destination;
+- editable context snapshots of the visible text, including unsaved edits and source labels/ranges where known; no automatic submission, replacement, file write, or later live update of the copied text;
+- a lightweight parked-prompt picker, with one active submission draft at a time and no per-draft conversation forks;
+- tabs at ordinary widths, a compact searchable picker at narrow widths, and MRU/next/previous/close/reopen navigation;
+- originating buffer ID, revision, and request ID targeting for asynchronous work, so switching tabs cannot redirect results or destructive actions.
 
-The first architectural `0.10` release should add:
+Opening a document never changes the active prompt. Initially, document views should offer a clear return to Prompt rather than implicitly submit the document or send a hidden prompt. Keep Run's precise shortcut behaviour separate from the buffer model; settle it in the interaction tests before shipping.
 
-- a `StudioBufferStore` with stable document identity;
-- recovery schema v2 with migration from the single-document schema;
-- buffer-specific text/baseline, dirty state, cursor, selection, scroll, preview context, annotations, and resource directory;
-- tabs at ordinary widths and a compact searchable buffer picker at narrow widths;
-- MRU cycling, next/previous, close, and reopen commands;
-- originating buffer ID and revision targeting for asynchronous Pi work.
+**Acceptance workflow:** start a prompt → inspect and edit a document with preview → add context to the prompt → annotate that detached copy → inspect another document → return and submit, without losing edits, changing the original through prompt annotations, or changing the submission destination accidentally.
 
-PDFs remain preview documents, and conversation history remains session-global. Arbitrary multi-pane layouts, project trees, and simultaneous per-buffer Pi conversations are outside the initial `0.10.0` scope.
+PDFs remain preview documents; watched previews remain disk-authoritative and read-only. Conversation history, resource grants, and the exact-session Shared REPL Record remain outside individual buffers. Arbitrary multi-pane layouts, project trees, simultaneous per-buffer Pi conversations, editor-engine migration, and Derived REPL Transcript are outside the initial scope. See [`BUFFER-DESIGN.md`](https://github.com/omaclaren/pi-studio/blob/main/BUFFER-DESIGN.md) for the state, recovery, handoff, and implementation sequence.
 
 ## Validation matrix
 

package/WORKFLOW.md

@@ -1,5 +1,7 @@
 # pi-studio workflow/spec note
 
+This note describes the original single-editor workflow; it is not the current release backlog. See [ROADMAP.md](ROADMAP.md) for the active `0.9.60` networking/shortcut batch and planned `0.10.0` work. The future active-Prompt/editable-document model is recorded in [BUFFER-DESIGN.md](https://github.com/omaclaren/pi-studio/blob/main/BUFFER-DESIGN.md); buffer tabs and context transfer are not implemented yet.
+
 ## Goal
 
 Keep Studio simple while supporting both loops:
@@ -117,8 +119,8 @@ Rules of thumb:
 
 ---
 
-## Non-goals (for now)
+## Non-goals for the single-editor `0.9.x` workflow
 
-- Multi-document tabs
+- Multi-document tabs (planned separately for `0.10.0`)
 - Multi-user collaboration
 - Heavy schema validation

package/client/studio-client.js

@@ -255,6 +255,14 @@
       ) {
         throw new Error("Studio preview resource helpers failed to load.");
       }
+      const editorDraftHelpers = globalThis.PiStudioEditorDraftHelpers;
+      if (!editorDraftHelpers || typeof editorDraftHelpers.createSubmittedEditorDraftTracker !== "function"
+        || typeof editorDraftHelpers.needsDraftReplacementConfirmation !== "function") {
+        throw new Error("Studio editor draft helpers failed to load.");
+      }
+      const submittedEditorDrafts = editorDraftHelpers.createSubmittedEditorDraftTracker();
+      let editorSourceGeneration = 0;
+      let responseReplacementPending = false;
       const showMeHelpers = globalThis.PiStudioShowMeHelpers;
       if (!showMeHelpers || typeof showMeHelpers.chooseStudioShowMeFocus !== "function") {
         throw new Error("Studio Show me helpers failed to load.");
@@ -433,8 +441,8 @@
         rightViewSelect.title = isWatchedFilePreview
           ? "Read-only watched preview follows this file on disk."
           : (isEditorOnlyMode
-          ? "Editor-only views: Editor Preview, contextual Quarto Preview for .qmd/.md/.markdown files, Changes, Files, REPL, or Side questions. F7 cycles; Cmd/Ctrl+Alt+3/5/6/7/8 switch directly to numbered right-pane views, and Cmd/Ctrl+Alt+F/R/Q open Files/REPL/Side questions."
-          : "Right pane view mode. F7 cycles, including contextual Quarto Preview for file-backed .qmd, .md, and .markdown documents; Cmd/Ctrl+Alt+1–8 switches directly between the numbered views. Cmd/Ctrl+Alt+P/E/W/F/R/Q keep mnemonic shortcuts for Preview, Editor Preview, Working, Files, REPL, and Side questions.");
+          ? "Editor-only views: Editor Preview, contextual Quarto Preview for .qmd/.md/.markdown files, Changes, Files, REPL, or Side questions. F7 cycles; Cmd/Ctrl+Option/Alt+3/5/6/7/8 switch directly to numbered right-pane views, and Cmd/Ctrl+Option/Alt+F/R/Q open Files/REPL/Side questions."
+          : "Right pane view mode. F7 cycles, including contextual Quarto Preview for file-backed .qmd, .md, and .markdown documents; Cmd/Ctrl+Option/Alt+1–8 switches directly between the numbered views. Cmd/Ctrl+Option/Alt+P/E/W/F/R/Q keep mnemonic shortcuts for Preview, Editor Preview, Working, Files, REPL, and Side questions.");
       }
 
       function getInitialRightView(source) {
@@ -4524,6 +4532,11 @@
         return true;
       }
 
+      function getEditorDraftSourceKey() {
+        return JSON.stringify([editorSourceGeneration, sourceState.source, sourceState.path,
+          sourceState.draftId, getCurrentResourceDirValue()]);
+      }
+
       function markFileBackedBaseline(text, diskRevision) {
         fileBackedBaselineText = String(text || "");
         fileBackedDiskRevision = normalizeStudioDiskRevision(diskRevision);
@@ -5096,6 +5109,35 @@
         switchRightPaneToView("editor-preview");
       }
 
+      function studioModalBlocksDraftAction() {
+        return Boolean(studioDecisionState || isScratchpadOpen() || isShortcutsOpen() || isQuizOpen()
+          || isStudioPdfFocusOpen() || isStudioHtmlFocusOpen() || isStudioImageFocusOpen());
+      }
+
+      function triggerLoadResponseShortcut() {
+        if (isEditorOnlyMode || isWatchedFilePreview || studioModalBlocksDraftAction()) return false;
+        if (!loadResponseBtn || loadResponseBtn.hidden || loadResponseBtn.disabled) return false;
+        loadResponseBtn.click();
+        return true;
+      }
+
+      function triggerAnnotateResponseShortcut() {
+        if (isEditorOnlyMode || isWatchedFilePreview || studioModalBlocksDraftAction()) return false;
+        if (!annotateResponseBtn || annotateResponseBtn.hidden || annotateResponseBtn.disabled) return false;
+        annotateResponseBtn.click();
+        return true;
+      }
+
+      function triggerActivityTrackingShortcut() {
+        if (studioModalBlocksDraftAction()) return false;
+        if (isEditorOnlyMode || isWatchedFilePreview) {
+          setStatus("Follow activity is available only in the main editable Studio workspace.", "warning");
+          return false;
+        }
+        setActivityTrackingEnabled(!activityTrackingEnabled);
+        return true;
+      }
+
       function cycleActivePaneView(direction) {
         if (activePane === "right") {
           if (!rightViewSelect || rightViewSelect.disabled) {
@@ -5495,6 +5537,36 @@
           return;
         }
 
+        const isLoadResponseShortcut = key === "Enter"
+          && (event.metaKey || event.ctrlKey)
+          && event.altKey
+          && event.shiftKey;
+        if (isLoadResponseShortcut) {
+          event.preventDefault();
+          if (!event.repeat && !event.isComposing) triggerLoadResponseShortcut();
+          return;
+        }
+
+        const isAnnotateResponseShortcut = key === "Enter"
+          && (event.metaKey || event.ctrlKey)
+          && event.altKey
+          && !event.shiftKey;
+        if (isAnnotateResponseShortcut) {
+          event.preventDefault();
+          if (!event.repeat && !event.isComposing) triggerAnnotateResponseShortcut();
+          return;
+        }
+
+        const isActivityTrackingShortcut = (key.toLowerCase() === "a" || code === "KeyA")
+          && (event.metaKey || event.ctrlKey)
+          && event.altKey
+          && !event.shiftKey;
+        if (isActivityTrackingShortcut) {
+          event.preventDefault();
+          if (!event.repeat && !event.isComposing) triggerActivityTrackingShortcut();
+          return;
+        }
+
         const isContentFocusShortcut = key === "F8" && !event.metaKey && !event.ctrlKey && !event.altKey;
         if (isContentFocusShortcut) {
           event.preventDefault();
@@ -7993,7 +8065,7 @@
         refreshBtn.type = "button";
         refreshBtn.className = "studio-pdf-focus-btn studio-pdf-focus-refresh";
         refreshBtn.textContent = "Refresh";
-        refreshBtn.title = "Reload this PDF preview from disk. Shortcut: Cmd/Ctrl+Alt+Shift+R.";
+        refreshBtn.title = "Reload this PDF preview from disk. Shortcut: Cmd/Ctrl+Option/Alt+Shift+R.";
         refreshBtn.setAttribute("aria-label", "Refresh PDF preview from disk");
         refreshBtn.addEventListener("click", () => refreshStudioPdfFocusViewer());
         actions.appendChild(refreshBtn);
@@ -9312,7 +9384,7 @@
           refreshBtn.type = "button";
           refreshBtn.className = "studio-pdf-card-action studio-pdf-card-refresh";
           refreshBtn.textContent = "Refresh";
-          refreshBtn.title = "Reload this PDF preview from disk. Shortcut: Cmd/Ctrl+Alt+Shift+R.";
+          refreshBtn.title = "Reload this PDF preview from disk. Shortcut: Cmd/Ctrl+Option/Alt+Shift+R.";
           refreshBtn.addEventListener("click", (event) => {
             event.preventDefault();
             event.stopPropagation();
@@ -14250,7 +14322,7 @@
         annotateResponseBtn.textContent = annotationWorkspaceReady ? "Response ready to annotate" : "Annotate response";
         annotateResponseBtn.title = annotationWorkspaceReady
           ? "The selected response is exactly in the raw editor with Editor Preview open."
-          : "Load the selected response into the raw editor and show Editor Preview. This replaces the current editor text.";
+          : "Load the selected response into the raw editor and show Editor Preview. Ask before replacing unsubmitted or unsaved work. Shortcut: Cmd/Ctrl+Option/Alt+Enter.";
 
         loadCritiqueNotesBtn.disabled = uiBusy || !isCritiqueResponse || !critiqueNotes || critiqueNotesLoaded;
         loadCritiqueNotesBtn.textContent = critiqueNotesLoaded ? "Critique notes already in editor" : "Load critique notes into editor";
@@ -14649,6 +14721,7 @@
           setStatus("This read-only preview remains bound to its watched file.", "warning");
           return false;
         }
+        editorSourceGeneration += 1;
         sourceState = {
           source: next && next.source ? next.source : "blank",
           label: next && next.label ? next.label : "blank",
@@ -23701,6 +23774,11 @@
           return;
         }
 
+        if (message.type === "run_accepted") {
+          submittedEditorDrafts.accept(message.requestId);
+          return;
+        }
+
         if (message.type === "request_started") {
           pendingRequestId = typeof message.requestId === "string" ? message.requestId : pendingRequestId;
           pendingKind = typeof message.kind === "string" ? message.kind : "unknown";
@@ -24157,6 +24235,7 @@
 
         if (message.type === "busy") {
           if (typeof message.requestId === "string") {
+            submittedEditorDrafts.discard(message.requestId);
             restoreReservedPiEditorDraftSnapshot(message.requestId);
             pendingSaveOperations.delete(message.requestId);
             failPendingCompanionLaunch(message.requestId, "Studio could not start the companion editor because another request was busy.");
@@ -24181,6 +24260,7 @@
 
         if (message.type === "error") {
           if (typeof message.requestId === "string") {
+            submittedEditorDrafts.discard(message.requestId);
             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.");
@@ -24331,6 +24411,7 @@
           quartoPreviewActionRequestId = null;
           sideQuestionMarkdownExportRequest = null;
           pendingPiEditorDraftSnapshots.clear();
+          submittedEditorDrafts.clearPending();
           failAllPendingCompanionLaunches("The originating Studio connection was lost before the companion editor was ready.");
           if (rightView === "editor-quarto-preview") renderQuartoPreviewView();
           setBusy(true);
@@ -25034,27 +25115,56 @@
       }
 
       async function loadSelectedResponseIntoEditor(options) {
-        if (!latestResponseMarkdown.trim()) {
+        if (isEditorOnlyMode || isWatchedFilePreview || uiBusy || responseReplacementPending
+          || studioModalBlocksDraftAction()) return false;
+        const prepareForAnnotation = Boolean(options && options.annotate);
+        if (prepareForAnnotation && latestResponseIsStructuredCritique) return false;
+        if (!prepareForAnnotation && rightView === "editor-quarto-preview") {
+          setStatus("Choose another right-pane view before loading a response without switching views, or use Annotate response.", "warning");
+          return false;
+        }
+        const responseText = latestResponseMarkdown;
+        if (!responseText.trim()) {
           setStatus("No response available yet.", "warning");
           return false;
         }
-        const prepareForAnnotation = Boolean(options && options.annotate);
         const currentEditorText = String(sourceTextEl.value || "");
-        const replacingEditedResponse = prepareForAnnotation
-          && sourceState.source === "last-response"
-          && Boolean(currentEditorText.trim())
-          && normalizeForCompare(currentEditorText) !== latestResponseNormalized;
-        if (replacingEditedResponse) {
-          const confirmed = await requestStudioConfirmation(
-            "Replace your edited response with a fresh copy? Existing edits and annotations will be lost.",
-            { title: "Replace edited response?", confirmLabel: "Replace", destructive: true },
-          );
+        const sourceKey = getEditorDraftSourceKey();
+        const responseIndex = responseHistoryIndex;
+        const responseTimestamp = latestResponseTimestamp;
+        const diskRevision = fileBackedDiskRevision;
+        const needsConfirmation = editorDraftHelpers.needsDraftReplacementConfirmation({
+          text: currentEditorText,
+          responseText,
+          fileBacked: hasRefreshableFilePath(),
+          dirty: editorDiffersFromFileBackedBaseline(),
+          submitted: submittedEditorDrafts.matches(currentEditorText, sourceKey),
+        });
+        if (needsConfirmation) {
+          responseReplacementPending = true;
+          let confirmed;
+          try {
+            confirmed = await requestStudioConfirmation(
+              "Replace the current editor text with the selected response? Unsubmitted edits or unsaved file changes will be lost. Cancel to save or copy them first.",
+              { title: "Replace editor text?", confirmLabel: "Replace", destructive: true },
+            );
+          } finally {
+            responseReplacementPending = false;
+          }
           if (!confirmed) {
             setStatus("Kept the current editor text.");
             return false;
           }
+          if (uiBusy || studioModalBlocksDraftAction() || currentEditorText !== sourceTextEl.value
+            || sourceKey !== getEditorDraftSourceKey() || diskRevision !== fileBackedDiskRevision
+            || responseText !== latestResponseMarkdown || responseIndex !== responseHistoryIndex
+            || responseTimestamp !== latestResponseTimestamp
+            || (!prepareForAnnotation && rightView === "editor-quarto-preview")) {
+            setStatus("Editor, response, or view changed while confirmation was open. Kept the editor text; try again.", "warning");
+            return false;
+          }
         }
-        setEditorText(latestResponseMarkdown, { preserveScroll: false, preserveSelection: false });
+        setEditorText(responseText, { preserveScroll: false, preserveSelection: false });
         setSourceState({ source: "last-response", label: "last model response", path: null });
         if (prepareForAnnotation) {
           if (editorView !== "markdown") setEditorView("markdown");
@@ -25574,6 +25684,7 @@
 
         const requestId = beginUiAction("direct");
         if (!requestId) return;
+        submittedEditorDrafts.remember(requestId, sourceTextEl.value, getEditorDraftSourceKey());
         const piEditorDraftSnapshot = reserveLinkedPiEditorDraftSnapshot(requestId);
 
         const sent = sendMessage({
@@ -25584,6 +25695,7 @@
         });
 
         if (!sent) {
+          submittedEditorDrafts.discard(requestId);
           restoreReservedPiEditorDraftSnapshot(requestId);
           pendingRequestId = null;
           pendingKind = null;
@@ -25605,6 +25717,7 @@
 
           const requestId = makeRequestId();
           clearTitleAttention();
+          submittedEditorDrafts.remember(requestId, sourceTextEl.value, getEditorDraftSourceKey());
           const piEditorDraftSnapshot = reserveLinkedPiEditorDraftSnapshot(requestId);
           const sent = sendMessage({
             type: "send_run_request",
@@ -25613,6 +25726,7 @@
             piEditorDraftSnapshot: piEditorDraftSnapshot || undefined,
           });
           if (!sent) {
+            submittedEditorDrafts.discard(requestId);
             restoreReservedPiEditorDraftSnapshot(requestId);
             return;
           }

package/client/studio-editor-draft-helpers.js

@@ -0,0 +1,64 @@
+(() => {
+  // Page-memory-only. No persistence or authority over Pi's terminal composer.
+  const MAX_TEXT_CHARS = 900_000;
+  const MAX_PENDING = 8;
+  const MAX_PENDING_TEXT_CHARS = 2_700_000;
+
+  function createSubmittedEditorDraftTracker() {
+    const pending = new Map();
+    let pendingChars = 0;
+    let sequence = 0;
+    let accepted = null;
+
+    function discard(requestId) {
+      const snapshot = pending.get(requestId);
+      if (!snapshot) return false;
+      pendingChars -= snapshot.text.length;
+      pending.delete(requestId);
+      return true;
+    }
+
+    return Object.freeze({
+      remember(requestId, text, sourceKey) {
+        if (typeof requestId !== "string" || !requestId || requestId.length > 256
+          || pending.has(requestId) || (accepted && accepted.requestId === requestId)) return false;
+        if (typeof text !== "string" || text.length > MAX_TEXT_CHARS
+          || typeof sourceKey !== "string" || !sourceKey || sourceKey.length > 24_000) return false;
+        while (pending.size >= MAX_PENDING || pendingChars + text.length > MAX_PENDING_TEXT_CHARS) {
+          discard(pending.keys().next().value);
+        }
+        pending.set(requestId, { requestId, text, sourceKey, sequence: ++sequence });
+        pendingChars += text.length;
+        return true;
+      },
+      accept(requestId) {
+        const snapshot = pending.get(requestId);
+        if (!snapshot) return false;
+        discard(requestId);
+        // Late/duplicate acknowledgements cannot replace a newer accepted baseline.
+        if (accepted && snapshot.sequence <= accepted.sequence) return false;
+        accepted = snapshot;
+        return true;
+      },
+      matches(text, sourceKey) {
+        return Boolean(accepted && accepted.text === text && accepted.sourceKey === sourceKey);
+      },
+      discard,
+      clearPending() {
+        pending.clear();
+        pendingChars = 0;
+      },
+    });
+  }
+
+  function needsDraftReplacementConfirmation({ text, responseText, fileBacked, dirty, submitted }) {
+    // Even an empty file buffer can contain an unsaved deletion. Sending it is not saving it.
+    if (fileBacked) return Boolean(dirty);
+    return Boolean(text.trim() && text !== responseText && !submitted);
+  }
+
+  globalThis.PiStudioEditorDraftHelpers = Object.freeze({
+    createSubmittedEditorDraftTracker,
+    needsDraftReplacementConfirmation,
+  });
+})();

package/index.ts

@@ -196,6 +196,7 @@ const STUDIO_NAVIGATION_HELPERS_URL = new URL("./client/studio-navigation-helper
 const STUDIO_PREVIEW_RESOURCE_HELPERS_URL = new URL("./client/studio-preview-resource-helpers.js", import.meta.url);
 const STUDIO_SHOW_ME_HELPERS_URL = new URL("./client/studio-show-me-helpers.js", import.meta.url);
 const STUDIO_SIDE_QUESTION_HELPERS_URL = new URL("./client/studio-side-question-helpers.js", import.meta.url);
+const STUDIO_EDITOR_DRAFT_HELPERS_URL = new URL("./client/studio-editor-draft-helpers.js", import.meta.url);
 const STUDIO_CLIENT_URL = new URL("./client/studio-client.js", import.meta.url);
 
 interface StudioServerState {
@@ -12388,6 +12389,7 @@ function buildStudioHtml(
 	const mermaidHelpersScriptHref = `/studio-mermaid-helpers.js?token=${encodeURIComponent(studioToken ?? "")}`;
 	const navigationHelpersScriptHref = `/studio-navigation-helpers.js?token=${encodeURIComponent(studioToken ?? "")}`;
 	const previewResourceHelpersScriptHref = `/studio-preview-resource-helpers.js?token=${encodeURIComponent(studioToken ?? "")}`;
+	const editorDraftHelpersScriptHref = `/studio-editor-draft-helpers.js?token=${encodeURIComponent(studioToken ?? "")}`;
 	const showMeHelpersScriptHref = `/studio-show-me-helpers.js?token=${encodeURIComponent(studioToken ?? "")}`;
 	const sideQuestionHelpersScriptHref = `/studio-side-question-helpers.js?token=${encodeURIComponent(studioToken ?? "")}`;
 	const clientScriptHref = `/studio-client.js?token=${encodeURIComponent(studioToken ?? "")}`;
@@ -12552,7 +12554,7 @@ ${cssVarsBlock}
                 <option value="editor-top">Layout: Editor above</option>
                 <option value="response-top">Layout: Response above</option>
               </select>
-              <select id="activityTrackingSelect" class="studio-flat-select" aria-label="Follow main Pi activity" title="Optionally follow main Pi activity from Working to the response view; off by default.">
+              <select id="activityTrackingSelect" class="studio-flat-select" aria-label="Follow main Pi activity" aria-keyshortcuts="Meta+Alt+A Control+Alt+A" title="Optionally follow main Pi activity from Working to the response view; off by default. Shortcut: Cmd/Ctrl+Option/Alt+A.">
                 <option value="off">Follow activity: Off</option>
                 <option value="on">Follow activity: On</option>
               </select>
@@ -12655,7 +12657,7 @@ ${cssVarsBlock}
       <div id="rightSectionHeader" class="section-header">
         <div class="section-header-main">
           <span id="rightViewSelectWrap" class="studio-header-select-wrap">
-            <select id="rightViewSelect" aria-label="Response view mode" title="Right pane view mode. F7 cycles when the right pane is active; Cmd/Ctrl+Alt+1–8 switches directly between all right-pane views. Cmd/Ctrl+Alt+P/E/W/F/R/Q keep mnemonic shortcuts for Preview, Editor Preview, Working, Files, REPL, and Side questions.">
+            <select id="rightViewSelect" aria-label="Response view mode" title="Right pane view mode. F7 cycles when the right pane is active; Cmd/Ctrl+Option/Alt+1–8 switches directly between all right-pane views. Cmd/Ctrl+Option/Alt+P/E/W/F/R/Q keep mnemonic shortcuts for Preview, Editor Preview, Working, Files, REPL, and Side questions.">
               <option value="markdown">Response (Raw)</option>
               <option value="preview" selected>Response (Preview)</option>
               <option value="editor-preview">Editor (Preview)</option>
@@ -12730,8 +12732,8 @@ ${cssVarsBlock}
             <button id="historyLastBtn" type="button" title="Jump to the latest loaded response in the current branch history.">Last response ▶|</button>
           </div>
           <div class="response-actions-row response-result-row">
-            <button id="annotateResponseBtn" type="button" title="Load the selected response into the raw editor and show Editor Preview. This replaces the current editor text.">Annotate response</button>
-            <button id="loadResponseBtn" type="button">Load response into editor</button>
+            <button id="annotateResponseBtn" type="button" aria-keyshortcuts="Meta+Alt+Enter Control+Alt+Enter" title="Load the selected response into the raw editor and show Editor Preview. Ask before replacing unsubmitted or unsaved work. Shortcut: Cmd/Ctrl+Option/Alt+Enter.">Annotate response</button>
+            <button id="loadResponseBtn" type="button" aria-keyshortcuts="Meta+Alt+Shift+Enter Control+Alt+Shift+Enter" title="Load the selected response into the editor without switching views. Choose another view first if Quarto Preview is active. Ask before replacing unsubmitted or unsaved work. Shortcut: Cmd/Ctrl+Option/Alt+Shift+Enter.">Load response into editor</button>
             <button id="loadCritiqueNotesBtn" type="button" hidden>Load critique notes into editor</button>
             <button id="loadCritiqueFullBtn" type="button" hidden>Load full critique into editor</button>
             <button id="loadHistoryPromptBtn" type="button" title="Load the prompt that generated the selected response into the editor.">Load response prompt into editor</button>
@@ -12768,13 +12770,13 @@ ${cssVarsBlock}
           <dl>
             <div><dt>F6</dt><dd>Switch between editor and right pane</dd></div>
             <div><dt>F7 / Shift+F7</dt><dd>Cycle the active pane's view</dd></div>
-            <div><dt>Cmd/Ctrl+Alt+1–8</dt><dd>Switch the right pane directly: Response Raw, Response Preview, Editor Preview, Working, Changes, Files, REPL, Side questions</dd></div>
-            <div><dt>Cmd/Ctrl+Alt+P</dt><dd>Switch the right pane directly to Response Preview; in editor-only views, Editor Preview</dd></div>
-            <div><dt>Cmd/Ctrl+Alt+E</dt><dd>Switch the right pane directly to Editor Preview</dd></div>
-            <div><dt>Cmd/Ctrl+Alt+W</dt><dd>Switch the right pane directly to Working</dd></div>
-            <div><dt>Cmd/Ctrl+Alt+F</dt><dd>Switch the right pane directly to Files</dd></div>
-            <div><dt>Cmd/Ctrl+Alt+R</dt><dd>Switch the right pane directly to REPL and focus Quick send when a session is selected</dd></div>
-            <div><dt>Cmd/Ctrl+Alt+Q</dt><dd>Switch the right pane directly to Side questions</dd></div>
+            <div><dt>Cmd/Ctrl+Option/Alt+1–8</dt><dd>Switch the right pane directly: Response Raw, Response Preview, Editor Preview, Working, Changes, Files, REPL, Side questions</dd></div>
+            <div><dt>Cmd/Ctrl+Option/Alt+P</dt><dd>Switch the right pane directly to Response Preview; in editor-only views, Editor Preview</dd></div>
+            <div><dt>Cmd/Ctrl+Option/Alt+E</dt><dd>Switch the right pane directly to Editor Preview</dd></div>
+            <div><dt>Cmd/Ctrl+Option/Alt+W</dt><dd>Switch the right pane directly to Working</dd></div>
+            <div><dt>Cmd/Ctrl+Option/Alt+F</dt><dd>Switch the right pane directly to Files</dd></div>
+            <div><dt>Cmd/Ctrl+Option/Alt+R</dt><dd>Switch the right pane directly to REPL and focus Quick send when a session is selected</dd></div>
+            <div><dt>Cmd/Ctrl+Option/Alt+Q</dt><dd>Switch the right pane directly to Side questions</dd></div>
             <div><dt>F8</dt><dd>Focus editor text</dd></div>
             <div><dt>Shift+F8</dt><dd>Focus right-pane content</dd></div>
             <div><dt>F9</dt><dd>Toggle Zen mode and hide or restore the Studio header</dd></div>
@@ -12786,10 +12788,11 @@ ${cssVarsBlock}
         <section class="shortcuts-group">
           <h3>View</h3>
           <dl>
-            <div><dt>Alt/Option+=</dt><dd>Increase the active pane's text size when not editing text</dd></div>
-            <div><dt>Alt/Option+-</dt><dd>Decrease the active pane's text size when not editing text</dd></div>
-            <div><dt>Alt/Option+0</dt><dd>Reset the active pane's text size when not editing text</dd></div>
-            <div><dt>Cmd/Ctrl+Alt+Shift+R</dt><dd>Refresh the focused or visible PDF preview from disk</dd></div>
+            <div><dt>Option/Alt+=</dt><dd>Increase the active pane's text size when not editing text</dd></div>
+            <div><dt>Option/Alt+-</dt><dd>Decrease the active pane's text size when not editing text</dd></div>
+            <div><dt>Option/Alt+0</dt><dd>Reset the active pane's text size when not editing text</dd></div>
+            <div class="shortcuts-full-only"><dt>Cmd/Ctrl+Option/Alt+A</dt><dd>Toggle Follow activity in the main editable Studio workspace</dd></div>
+            <div><dt>Cmd/Ctrl+Option/Alt+Shift+R</dt><dd>Refresh the focused or visible PDF preview from disk</dd></div>
           </dl>
         </section>
         <section class="shortcuts-group">
@@ -12808,9 +12811,11 @@ ${cssVarsBlock}
         <section class="shortcuts-group shortcuts-full-only">
           <h3>Response</h3>
           <dl>
-            <div><dt>Alt/Option+←</dt><dd>Previous response when not editing text</dd></div>
-            <div><dt>Alt/Option+→</dt><dd>Next response when not editing text</dd></div>
-            <div><dt>Alt/Option+l</dt><dd>Latest response when not editing text</dd></div>
+            <div><dt>Cmd/Ctrl+Option/Alt+Enter</dt><dd>Annotate the selected response from either main pane; protect unsubmitted or unsaved work</dd></div>
+            <div><dt>Cmd/Ctrl+Option/Alt+Shift+Enter</dt><dd>Load the selected response into the editor without switching views; same replacement safeguards</dd></div>
+            <div><dt>Option/Alt+←</dt><dd>Previous response when not editing text</dd></div>
+            <div><dt>Option/Alt+→</dt><dd>Next response when not editing text</dd></div>
+            <div><dt>Option/Alt+l</dt><dd>Latest response when not editing text</dd></div>
           </dl>
         </section>
         <section class="shortcuts-group">
@@ -12863,6 +12868,7 @@ ${cssVarsBlock}
   <script src="${mermaidHelpersScriptHref}"></script>
   <script src="${navigationHelpersScriptHref}"></script>
   <script src="${previewResourceHelpersScriptHref}"></script>
+  <script src="${editorDraftHelpersScriptHref}"></script>
   <script src="${showMeHelpersScriptHref}"></script>
   <script src="${sideQuestionHelpersScriptHref}"></script>
   <script src="${clientScriptHref}"></script>
@@ -15790,6 +15796,7 @@ export default function (pi: ExtensionAPI) {
 
 				try {
 					pi.sendUserMessage(msg.text, { deliverAs: "steer" });
+					sendToClient(client, { type: "run_accepted", requestId: msg.requestId });
 					broadcast({
 						type: "request_queued",
 						requestId: msg.requestId,
@@ -15823,6 +15830,7 @@ export default function (pi: ExtensionAPI) {
 
 			try {
 				pi.sendUserMessage(msg.text);
+				sendToClient(client, { type: "run_accepted", requestId: msg.requestId });
 				reportPiEditorDraftDisposition(client, msg.requestId, msg.piEditorDraftSnapshot);
 			} catch (error) {
 				clearStudioDirectRunState();
@@ -17540,6 +17548,7 @@ export default function (pi: ExtensionAPI) {
 			|| requestUrl.pathname === "/studio-preview-resource-helpers.js"
 			|| requestUrl.pathname === "/studio-show-me-helpers.js"
 			|| requestUrl.pathname === "/studio-side-question-helpers.js"
+			|| requestUrl.pathname === "/studio-editor-draft-helpers.js"
 			|| requestUrl.pathname === "/studio-client.js"
 		) {
 			const token = requestUrl.searchParams.get("token") ?? "";
@@ -17567,7 +17576,9 @@ export default function (pi: ExtensionAPI) {
 								? STUDIO_SHOW_ME_HELPERS_URL
 								: requestUrl.pathname === "/studio-side-question-helpers.js"
 									? STUDIO_SIDE_QUESTION_HELPERS_URL
-									: STUDIO_CLIENT_URL;
+									: requestUrl.pathname === "/studio-editor-draft-helpers.js"
+										? STUDIO_EDITOR_DRAFT_HELPERS_URL
+										: STUDIO_CLIENT_URL;
 			const targetLabel = requestUrl.pathname === "/studio-annotation-helpers.js"
 				? "studio annotation helper script"
 				: requestUrl.pathname === "/studio-mermaid-helpers.js"
@@ -17580,7 +17591,9 @@ export default function (pi: ExtensionAPI) {
 								? "studio Show me helper script"
 								: requestUrl.pathname === "/studio-side-question-helpers.js"
 									? "studio side-question helper script"
-									: "studio client script";
+									: requestUrl.pathname === "/studio-editor-draft-helpers.js"
+										? "studio editor draft helper script"
+										: "studio client script";
 
 			try {
 				const clientScript = readFileSync(targetUrl, "utf-8");

package/package.json

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