pi-studio 0.9.58 → 0.9.60-rc.0

package/CHANGELOG.md

@@ -4,6 +4,23 @@ All notable changes to `pi-studio` are documented here.
 
 ## [Unreleased]
 
+## [0.9.60-rc.0] — 2026-09-03
+
+### Added
+- Add explicit `/studio --listen-all` support for container and trusted private-network workflows. Studio binds to `0.0.0.0` only when requested, retains token authentication, keeps generated browser URLs on `127.0.0.1` for same-port host publishing, reports the active listening address in `/studio --status`, and requires a stop/restart before changing a running localhost server to wildcard binding.
+
+### Security
+- Wildcard network binding remains opt-in and emits a prominent warning that the tokenized URL grants control of Studio for the Pi process, including prompt submission and broad file access through Studio workflows. HTTP routing no longer derives its base authority from the inbound `Host` header. In wildcard mode, a browser-supplied HTTP(S) `Origin` must match that request's `Host`; originless non-browser or embedded clients continue to rely on the URL token. Documentation recommends loopback-only host port publishing, forbids direct public-internet exposure, and retains localhost plus SSH forwarding as the safe default.
+
+## [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 |
@@ -76,8 +83,9 @@ _The video shows an earlier version of the Studio interface. The basic workflow
 | `/studio --last` | Force last response |
 | `/studio --blank` | Force blank editor |
 | `/studio --no-browser` | Start/print the Studio URL without opening a browser, useful for forwarded or phone/browser sessions |
-| `/studio --port <port>` | Bind Studio to a fixed localhost port instead of a random free port |
-| `/studio --status` | Show studio server status |
+| `/studio --port <port>` | Bind Studio to a fixed port instead of a random free port; the default host remains localhost |
+| `/studio --listen-all` | Explicitly bind Studio to all IPv4 interfaces (`0.0.0.0`) for a container or trusted private-network workflow |
+| `/studio --status` | Show studio server status, including its listening address |
 | `/studio --stop` | Stop studio server |
 | `/studio --help` | Show help |
 | `/studio-replace [path\|--blank\|--last]` | Replace the current full Studio view with a new full Studio view |
@@ -111,6 +119,18 @@ Run once without installing:
 pi -e https://github.com/omaclaren/pi-studio
 ```
 
+## Container and network access
+
+Studio binds to `127.0.0.1` by default. For a container or sandbox whose port must be published to the host, opt in explicitly and choose a stable port:
+
+```text
+/studio --no-browser --listen-all --port 4321
+```
+
+This listens on `0.0.0.0:4321` while still printing a tokenized `http://127.0.0.1:4321/...` browser URL. With a same-port mapping such as `sbx run --publish 4321:4321`, open that URL unchanged on the host. `--listen-all` is a server-lifetime setting: if Studio is already running on localhost, use `/studio --stop` before restarting it with the flag.
+
+Treat wildcard binding as a security-sensitive mode. The URL token remains required, but anyone who obtains the full URL can control Studio for that Pi process: they can submit prompts, read or write files through Studio, and expand local-resource access. Studio does not add TLS. Treat the URL like a password, never expose the port directly to the public internet, and bind the host side of a container mapping to loopback when possible—for example, `-p 127.0.0.1:4321:4321`. For access across an untrusted network, keep Studio on its localhost default and use SSH local port forwarding instead.
+
 ## Shared REPL record
 
 Studio remains a standalone REPL client: it can create and use its own tmux sessions without `pi-repl`. When a compatible `pi-repl` installation uses the same tmux session, both clients automatically discover one session-owned clean record and see each other's code and captured output. No package imports or depends on the other.
@@ -213,7 +233,7 @@ Thanks to [Hal Gumbert / CampSoftware](https://github.com/campsoftware) for publ
 
 ## Notes
 
-- Local-only server (`127.0.0.1`) with tokenized Studio URLs.
+- The Studio server is localhost-only (`127.0.0.1`) by default and every Studio URL carries a server-lifetime token. The explicit `--listen-all` option changes the listening address to `0.0.0.0` without changing the advertised loopback URL or removing token authentication; `/studio --status` reports the active binding.
 - When Pi runs inside Muxy or cmux, Studio opens in that terminal app’s built-in browser. Muxy is detected from its pane/socket environment without installing global hooks; cmux targets and focuses the caller’s workspace. If the detected terminal browser is unavailable, disabled, or declines the request, Studio falls back once to the system browser.
 - For remote SSH sessions, keep Studio bound to localhost and use SSH local port forwarding; `/studio` and `/studio --status` print the full tokenized localhost URL. The SSH hint repeats the full URL so it is visible even if your terminal only shows the latest notification. Open that URL through the tunnel, preserving the `?token=...` parameter. If SSH is not auto-detected, use `/studio --no-browser`; for stable forwarding, use `/studio --port <port>` or combine them, e.g. `/studio --no-browser --port 3417`.
 - Full Studio is a singleton per Pi session: use `/studio` to open it, `/studio-replace` to explicitly replace it, and `/studio-editor-only` for extra editing/preview tabs that do not take over the full Studio session view.

package/ROADMAP.md

@@ -106,6 +106,27 @@ 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.9.60 — Opt-in container/network binding (`0.9.60-rc.0` prerelease, 2026-09-03)
+
+A bounded implementation of GitHub issue #4, separate from REPL transcript and buffer work:
+
+- 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;
+- keep inbound `Host` values out of route parsing and require wildcard-mode browser origins to match the request authority;
+- report the actual listening address, emit a prominent exposure warning, and require `/studio --stop` before changing a running server's binding;
+- 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
 
 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,
@@ -41,6 +46,13 @@ import { createStudioPandocHtmlResourceFlagResolver } from "./shared/studio-pand
 import { createStudioResourceGrantRegistry } from "./shared/studio-resource-grants.js";
 import { prepareStudioLatexForPandoc } from "./shared/studio-latex-pandoc-compat.js";
 import { isStudioCmuxSession, openStudioUrlInBrowser } from "./shared/studio-browser-launcher.js";
+import {
+	buildStudioListenAllWarning,
+	isStudioWebSocketOriginAllowed,
+	parseStudioRequestTarget,
+	resolveStudioNetworkBinding,
+	STUDIO_ADVERTISED_HOST,
+} from "./shared/studio-network-binding.js";
 import { buildStudioReplTmuxStartArgs } from "./shared/studio-repl-tmux.js";
 import {
 	REPL_SESSION_RECORD_ID_OPTION,
@@ -192,6 +204,8 @@ interface StudioServerState {
 	clients: Set<WebSocket>;
 	clientModes: Map<WebSocket, StudioUiMode>;
 	port: number;
+	bindHost: string;
+	listenAll: boolean;
 	token: string;
 }
 
@@ -646,10 +660,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 +859,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 +947,7 @@ type IncomingStudioMessage =
 	| WatchFileSubscribeMessage
 	| SendToEditorRequestMessage
 	| GetFromEditorRequestMessage
+	| ClearPiEditorRequestMessage
 	| QuartoPreviewCheckRequestMessage
 	| QuartoPreviewStartRequestMessage
 	| QuartoPreviewStopRequestMessage
@@ -9917,10 +9943,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 +10231,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"
@@ -11836,13 +11874,6 @@ function interruptStudioReplSession(sessionName: string): { ok: true; message: s
 	return { ok: true, message: `Interrupted ${sessionName}.` };
 }
 
-function isAllowedOrigin(_origin: string | undefined, _port: number): boolean {
-	// For local-only studio, token auth is the primary guard. In practice,
-	// browser origin headers can vary (or be omitted) across wrappers/browsers,
-	// so we avoid brittle origin-based rejection here.
-	return true;
-}
-
 function normalizeStudioUiMode(raw: string | null | undefined): StudioUiMode {
 	return raw === "editor-only" ? "editor-only" : "full";
 }
@@ -11907,7 +11938,7 @@ function buildStudioUrl(
 	docId?: string,
 	options?: StudioUrlOptions,
 ): string {
-	return `http://127.0.0.1:${port}${buildStudioRelativeUrl(token, mode, doc, docId, options)}`;
+	return `http://${STUDIO_ADVERTISED_HOST}:${port}${buildStudioRelativeUrl(token, mode, doc, docId, options)}`;
 }
 
 interface StudioLaunchFlags {
@@ -11915,17 +11946,19 @@ interface StudioLaunchFlags {
 	openRemoteBrowser: boolean;
 	noBrowser: boolean;
 	watchPdf: boolean;
+	listenAll: boolean;
 	port?: number;
 	error?: string;
 }
 
 function parseStudioLaunchOpenFlags(rawArgs: string): StudioLaunchFlags {
 	const parsed = tokenizeStudioCommandArgs(rawArgs);
-	if (parsed.error) return { args: rawArgs, openRemoteBrowser: false, noBrowser: false, watchPdf: false, error: parsed.error };
+	if (parsed.error) return { args: rawArgs, openRemoteBrowser: false, noBrowser: false, watchPdf: false, listenAll: false, error: parsed.error };
 	const remaining: string[] = [];
 	let openRemoteBrowser = false;
 	let noBrowser = false;
 	let watchPdf = false;
+	let listenAll = false;
 	let port: number | undefined;
 	for (let i = 0; i < parsed.tokens.length; i += 1) {
 		const token = parsed.tokens[i]!;
@@ -11941,14 +11974,18 @@ function parseStudioLaunchOpenFlags(rawArgs: string): StudioLaunchFlags {
 			watchPdf = true;
 			continue;
 		}
+		if (token === "--listen-all") {
+			listenAll = true;
+			continue;
+		}
 		if (token === "--port" || token.startsWith("--port=")) {
 			const rawPort = token.startsWith("--port=") ? token.slice("--port=".length) : parsed.tokens[++i];
 			if (!rawPort) {
-				return { args: rawArgs, openRemoteBrowser, noBrowser, watchPdf, error: "Missing value for --port." };
+				return { args: rawArgs, openRemoteBrowser, noBrowser, watchPdf, listenAll, error: "Missing value for --port." };
 			}
 			const requestedPort = Number(rawPort);
 			if (!Number.isInteger(requestedPort) || requestedPort < 1 || requestedPort > 65535) {
-				return { args: rawArgs, openRemoteBrowser, noBrowser, watchPdf, error: `Invalid --port value: ${rawPort}. Use an integer from 1 to 65535.` };
+				return { args: rawArgs, openRemoteBrowser, noBrowser, watchPdf, listenAll, error: `Invalid --port value: ${rawPort}. Use an integer from 1 to 65535.` };
 			}
 			port = requestedPort;
 			continue;
@@ -11956,9 +11993,9 @@ function parseStudioLaunchOpenFlags(rawArgs: string): StudioLaunchFlags {
 		remaining.push(token);
 	}
 	if (openRemoteBrowser && noBrowser) {
-		return { args: rawArgs, openRemoteBrowser, noBrowser, watchPdf, port, error: "Use either --no-browser or --open-browser, not both." };
+		return { args: rawArgs, openRemoteBrowser, noBrowser, watchPdf, listenAll, port, error: "Use either --no-browser or --open-browser, not both." };
 	}
-	return { args: remaining.join(" "), openRemoteBrowser, noBrowser, watchPdf, port };
+	return { args: remaining.join(" "), openRemoteBrowser, noBrowser, watchPdf, listenAll, port };
 }
 
 function shouldAutoOpenStudioBrowser(options?: { openRemoteBrowser?: boolean; noBrowser?: boolean }): boolean {
@@ -12385,7 +12422,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 +12463,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 +12490,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 +12797,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 +13688,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 +15799,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 +15823,7 @@ export default function (pi: ExtensionAPI) {
 
 			try {
 				pi.sendUserMessage(msg.text);
+				reportPiEditorDraftDisposition(client, msg.requestId, msg.piEditorDraftSnapshot);
 			} catch (error) {
 				clearStudioDirectRunState();
 				clearActiveRequest();
@@ -16510,7 +16568,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 +16605,7 @@ export default function (pi: ExtensionAPI) {
 					type: "editor_snapshot",
 					requestId: msg.requestId,
 					content,
+					piEditorDraftSnapshot: createStudioPiEditorDraftSnapshot(content),
 				});
 			} catch (error) {
 				sendToClient(client, {
@@ -16556,6 +16616,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) => {
@@ -17357,12 +17454,9 @@ export default function (pi: ExtensionAPI) {
 			return;
 		}
 
-		let requestUrl: URL;
-		try {
-			const host = req.headers.host ?? `127.0.0.1:${serverState.port}`;
-			requestUrl = new URL(req.url ?? "/", `http://${host}`);
-		} catch (error) {
-			respondText(res, 400, `Invalid request URL: ${error instanceof Error ? error.message : String(error)}`);
+		const requestUrl = parseStudioRequestTarget(req.url);
+		if (!requestUrl) {
+			respondText(res, 400, "Invalid request URL");
 			return;
 		}
 
@@ -17955,9 +18049,10 @@ export default function (pi: ExtensionAPI) {
 		res.end(buildStudioHtml(requestInitialDocument, serverState.token, lastCommandCtx?.ui.theme, currentModelLabel, terminalSessionLabel, terminalSessionDetail, contextUsageSnapshot, studioMode));
 	};
 
-	const ensureServer = async (requestedPort?: number): Promise<StudioServerState> => {
+	const ensureServer = async (requestedPort?: number, listenAll = false): Promise<StudioServerState> => {
 		if (serverState) return serverState;
 
+		const binding = resolveStudioNetworkBinding(listenAll);
 		const server = createServer(handleHttpRequest);
 		const wsServer = new WebSocketServer({ noServer: true });
 		const clients = new Set<WebSocket>();
@@ -17969,12 +18064,18 @@ export default function (pi: ExtensionAPI) {
 			clients,
 			clientModes,
 			port: 0,
+			bindHost: binding.bindHost,
+			listenAll: binding.listenAll,
 			token: createSessionToken(),
 		};
 
 		server.on("upgrade", (req, socket, head) => {
-			const host = req.headers.host ?? `127.0.0.1:${state.port}`;
-			const requestUrl = new URL(req.url ?? "/", `http://${host}`);
+			const requestUrl = parseStudioRequestTarget(req.url);
+			if (!requestUrl) {
+				socket.write("HTTP/1.1 400 Bad Request\r\n\r\n");
+				socket.destroy();
+				return;
+			}
 
 			if (requestUrl.pathname !== "/ws") {
 				socket.write("HTTP/1.1 404 Not Found\r\n\r\n");
@@ -17989,7 +18090,9 @@ export default function (pi: ExtensionAPI) {
 				return;
 			}
 
-			if (!isAllowedOrigin(req.headers.origin, state.port)) {
+			const origin = typeof req.headers.origin === "string" ? req.headers.origin : undefined;
+			const requestHost = typeof req.headers.host === "string" ? req.headers.host : undefined;
+			if (!isStudioWebSocketOriginAllowed(origin, requestHost, state.listenAll)) {
 				socket.write("HTTP/1.1 403 Forbidden\r\n\r\n");
 				socket.destroy();
 				return;
@@ -18001,8 +18104,15 @@ export default function (pi: ExtensionAPI) {
 		});
 
 		wsServer.on("connection", (ws, req) => {
-			const host = req.headers.host ?? `127.0.0.1:${state.port}`;
-			const requestUrl = new URL(req.url ?? "/ws", `http://${host}`);
+			const requestUrl = parseStudioRequestTarget(req.url);
+			if (!requestUrl) {
+				try {
+					ws.close(1008, "Invalid request URL");
+				} catch {
+					// Ignore close errors.
+				}
+				return;
+			}
 			const clientMode = normalizeStudioUiMode(requestUrl.searchParams.get("mode"));
 			const requestedWatchedPath = (requestUrl.searchParams.get("watchPath") ?? "").trim();
 			const canonicalWatchedPath = requestedWatchedPath ? resolve(requestedWatchedPath) : "";
@@ -18101,7 +18211,7 @@ export default function (pi: ExtensionAPI) {
 			};
 			server.once("error", onError);
 			server.once("listening", onListening);
-			server.listen(listenPort, "127.0.0.1");
+			server.listen(listenPort, state.bindHost);
 		});
 
 		const address = server.address();
@@ -18974,6 +19084,10 @@ export default function (pi: ExtensionAPI) {
 		if (serverState && launchOpenFlags.port && serverState.port !== launchOpenFlags.port) {
 			ctx.ui.notify(`Studio server is already running on port ${serverState.port}; requested port ${launchOpenFlags.port}. Use /studio --stop, then restart Studio with --port ${launchOpenFlags.port} to change it.`, "warning");
 		}
+		if (serverState && launchOpenFlags.listenAll && !serverState.listenAll) {
+			ctx.ui.notify(`Studio server is already bound to localhost at 127.0.0.1:${serverState.port}. Use /studio --stop, then restart it with --listen-all.`, "warning");
+			return;
+		}
 
 		const parsedLaunchPath = options?.allowPdfPreview ? parsePathArgument(launchArgs) : null;
 		const launchesPdfPreview = parsedLaunchPath
@@ -18993,9 +19107,12 @@ export default function (pi: ExtensionAPI) {
 				if (serverState) {
 					const url = buildStudioUrl(serverState.port, serverState.token, "full");
 					ctx.ui.notify(`Studio URL: ${url}`, "info");
-					const tunnelHint = buildStudioSshTunnelHint(serverState.port, url)
-						?? (launchOpenFlags.noBrowser ? buildStudioForwardingHint(serverState.port, url, { prefix: "Browser auto-open was skipped because --no-browser was used." }) : null);
+					const tunnelHint = serverState.listenAll
+						? null
+						: buildStudioSshTunnelHint(serverState.port, url)
+							?? (launchOpenFlags.noBrowser ? buildStudioForwardingHint(serverState.port, url, { prefix: "Browser auto-open was skipped because --no-browser was used." }) : null);
 					if (tunnelHint) ctx.ui.notify(tunnelHint, "info");
+					if (serverState.listenAll) ctx.ui.notify(buildStudioListenAllWarning(serverState.port, url), "warning");
 				}
 				return;
 			}
@@ -19028,7 +19145,7 @@ export default function (pi: ExtensionAPI) {
 
 		let state: StudioServerState;
 		try {
-			state = await ensureServer(launchOpenFlags.port);
+			state = await ensureServer(launchOpenFlags.port, launchOpenFlags.listenAll);
 		} catch (error) {
 			const message = error instanceof Error ? error.message : String(error);
 			const portText = launchOpenFlags.port ? ` on port ${launchOpenFlags.port}` : "";
@@ -19041,8 +19158,10 @@ export default function (pi: ExtensionAPI) {
 			skipWorkspaceRestore: selection.skipWorkspaceRestore,
 			paneFocus: selection.paneFocus,
 		});
-		const tunnelHint = buildStudioSshTunnelHint(state.port, url)
-			?? (launchOpenFlags.noBrowser ? buildStudioForwardingHint(state.port, url, { prefix: "Browser auto-open was skipped because --no-browser was used." }) : null);
+		const tunnelHint = state.listenAll
+			? null
+			: buildStudioSshTunnelHint(state.port, url)
+				?? (launchOpenFlags.noBrowser ? buildStudioForwardingHint(state.port, url, { prefix: "Browser auto-open was skipped because --no-browser was used." }) : null);
 		const openedLabel = selection.kind === "pdf-preview"
 			? "pi Studio PDF preview"
 			: (selection.kind === "watched-preview"
@@ -19082,11 +19201,12 @@ export default function (pi: ExtensionAPI) {
 		} finally {
 			ctx.ui.notify(`Studio URL: ${url}`, "info");
 			if (tunnelHint) ctx.ui.notify(tunnelHint, "info");
+			if (state.listenAll) ctx.ui.notify(buildStudioListenAllWarning(state.port, url), "warning");
 		}
 	};
 
 	pi.registerCommand("studio", {
-		description: "Open pi Studio browser UI or a read-only watched preview (/studio, /studio <file>, /studio --watch <file>, /studio --blank, /studio --last, /studio --no-browser)",
+		description: "Open pi Studio browser UI or a read-only watched preview (/studio, /studio <file>, /studio --watch <file>, /studio --blank, /studio --last, /studio --no-browser, /studio --listen-all)",
 		handler: async (args: string, ctx: ExtensionCommandContext) => {
 			const trimmed = args.trim();
 
@@ -19104,11 +19224,12 @@ export default function (pi: ExtensionAPI) {
 				const counts = getStudioClientCounts();
 				const url = buildStudioUrl(serverState.port, serverState.token, "full");
 				ctx.ui.notify(
-					`Studio running at ${url} (busy: ${isStudioBusy() ? "yes" : "no"}; full views: ${counts.full}; editor-only views: ${counts.editorOnly})`,
+					`Studio running at ${url} (listening on ${serverState.bindHost}:${serverState.port}; busy: ${isStudioBusy() ? "yes" : "no"}; full views: ${counts.full}; editor-only views: ${counts.editorOnly})`,
 					"info",
 				);
-				const sshTunnelHint = buildStudioSshTunnelHint(serverState.port, url);
+				const sshTunnelHint = serverState.listenAll ? null : buildStudioSshTunnelHint(serverState.port, url);
 				if (sshTunnelHint) ctx.ui.notify(sshTunnelHint, "info");
+				if (serverState.listenAll) ctx.ui.notify(buildStudioListenAllWarning(serverState.port, url), "warning");
 				return;
 			}
 
@@ -19121,7 +19242,8 @@ export default function (pi: ExtensionAPI) {
 						+ "  /studio --blank   Open with blank editor\n"
 						+ "  /studio --last    Open with last model response\n"
 						+ "  /studio --no-browser  Print the Studio URL without opening a browser\n"
-						+ "  /studio --port <port> Bind Studio to a fixed localhost port when starting\n"
+						+ "  /studio --port <port> Bind Studio to a fixed port when starting\n"
+						+ "  /studio --listen-all  Explicitly bind to 0.0.0.0 instead of localhost (security-sensitive)\n"
 						+ "  /studio --open-remote  Over SSH, open the remote browser anyway\n"
 						+ "  /studio --status  Show studio status\n"
 						+ "  /studio --stop    Stop studio server\n"
@@ -19152,7 +19274,8 @@ export default function (pi: ExtensionAPI) {
 						+ "  /studio-replace --blank Replace with blank editor\n"
 						+ "  /studio-replace --last  Replace with last model response\n"
 						+ "  /studio-replace --no-browser  Print URL without opening a browser\n"
-						+ "  /studio-replace --port <port> Bind Studio to a fixed localhost port when starting\n"
+						+ "  /studio-replace --port <port> Bind Studio to a fixed port when starting\n"
+						+ "  /studio-replace --listen-all  Explicitly bind to 0.0.0.0 instead of localhost\n"
 						+ "Editor-only Studio views stay open.",
 					"info",
 				);
@@ -19180,7 +19303,8 @@ export default function (pi: ExtensionAPI) {
 						+ "  /studio-editor-only --blank Open with blank editor\n"
 						+ "  /studio-editor-only --last  Open with last model response loaded into the editor\n"
 						+ "  /studio-editor-only --no-browser  Print URL without opening a browser\n"
-						+ "  /studio-editor-only --port <port> Bind Studio to a fixed localhost port when starting\n"
+						+ "  /studio-editor-only --port <port> Bind Studio to a fixed port when starting\n"
+						+ "  /studio-editor-only --listen-all  Explicitly bind to 0.0.0.0 instead of localhost\n"
 						+ "Multiple editor-only views are allowed in the same Pi session.",
 					"info",
 				);

package/package.json

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

@@ -0,0 +1,103 @@
+export const STUDIO_LOOPBACK_BIND_HOST = "127.0.0.1";
+export const STUDIO_ALL_INTERFACES_BIND_HOST = "0.0.0.0";
+export const STUDIO_ADVERTISED_HOST = STUDIO_LOOPBACK_BIND_HOST;
+
+/**
+ * Resolve Studio's server-lifetime network binding. Listening on every IPv4
+ * interface is deliberately opt-in; generated browser URLs remain loopback URLs
+ * so same-port container publishing does not require URL editing.
+ *
+ * @param {boolean} [listenAll]
+ * @returns {{ bindHost: string, advertisedHost: string, listenAll: boolean }}
+ */
+export function resolveStudioNetworkBinding(listenAll = false) {
+	const enabled = listenAll === true;
+	return {
+		bindHost: enabled ? STUDIO_ALL_INTERFACES_BIND_HOST : STUDIO_LOOPBACK_BIND_HOST,
+		advertisedHost: STUDIO_ADVERTISED_HOST,
+		listenAll: enabled,
+	};
+}
+
+/**
+ * Parse only an HTTP origin-form request target. The inbound Host header is not
+ * needed for Studio routing and must not become the base URL authority.
+ *
+ * @param {string | undefined} requestTarget
+ * @returns {URL | null}
+ */
+export function parseStudioRequestTarget(requestTarget) {
+	const value = typeof requestTarget === "string" ? requestTarget : "/";
+	if (!value.startsWith("/") || value.startsWith("//")) return null;
+	try {
+		const expectedOrigin = `http://${STUDIO_ADVERTISED_HOST}`;
+		const parsed = new URL(value, expectedOrigin);
+		return parsed.origin === expectedOrigin ? parsed : null;
+	} catch {
+		return null;
+	}
+}
+
+/**
+ * Preserve the existing permissive Origin behavior for the localhost server.
+ * In wildcard mode, an omitted Origin remains compatible with embedded and
+ * non-browser clients; a supplied browser Origin must be HTTP(S) and match the
+ * request's Host authority so a cross-origin page cannot drive the WebSocket.
+ *
+ * @param {string | undefined} originHeader
+ * @param {string | undefined} requestHost
+ * @param {boolean} [requireSameHost]
+ * @returns {boolean}
+ */
+export function isStudioWebSocketOriginAllowed(originHeader, requestHost, requireSameHost = false) {
+	if (!originHeader || !requireSameHost) return true;
+	let originUrl;
+	try {
+		originUrl = new URL(originHeader);
+	} catch {
+		return false;
+	}
+	if (originUrl.protocol !== "http:" && originUrl.protocol !== "https:") return false;
+	if (
+		originUrl.username
+		|| originUrl.password
+		|| originUrl.pathname !== "/"
+		|| originUrl.search
+		|| originUrl.hash
+	) return false;
+	if (typeof requestHost !== "string" || requestHost.length === 0) return false;
+
+	try {
+		const requestOrigin = new URL(`http://${requestHost}`);
+		if (
+			requestOrigin.username
+			|| requestOrigin.password
+			|| requestOrigin.pathname !== "/"
+			|| requestOrigin.search
+			|| requestOrigin.hash
+		) return false;
+		return originUrl.host.toLowerCase() === requestOrigin.host.toLowerCase();
+	} catch {
+		return false;
+	}
+}
+
+/**
+ * @param {number} port
+ * @param {string} [studioUrl]
+ * @returns {string}
+ */
+export function buildStudioListenAllWarning(port, studioUrl) {
+	const normalizedPort = Number.isInteger(port) && port > 0 && port <= 65535
+		? port
+		: "<port>";
+	const urlLine = typeof studioUrl === "string" && studioUrl.length > 0
+		? `\nStudio URL: ${studioUrl}`
+		: "";
+	return "Security warning: pi Studio is listening on all IPv4 interfaces at "
+		+ `${STUDIO_ALL_INTERFACES_BIND_HOST}:${normalizedPort}. `
+		+ "Anyone who obtains the tokenized Studio URL can control Studio for this Pi process, including submitting prompts, reading or writing files through Studio, and expanding local-resource access. "
+		+ "Treat the URL like a password. Expose this port only through a trusted local mapping or private network, and prefer SSH tunnelling on untrusted networks. "
+		+ "Use /studio --stop before restarting without --listen-all to return to localhost-only mode."
+		+ urlLine;
+}

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" });
+	}
+}