pi-studio 0.5.37 → 0.5.39

package/CHANGELOG.md

@@ -4,6 +4,28 @@ All notable changes to `pi-studio` are documented here.
 
 ## [Unreleased]
 
+## [0.5.39] — 2026-03-30
+
+### Added
+- Studio now supports the familiar `Cmd/Ctrl+S` shortcut for saving editor content.
+
+### Changed
+- `Cmd/Ctrl+S` now triggers **Save editor** when a direct save path is available, and falls back to **Save editor as…** otherwise.
+- Save button tooltips and the footer shortcut hint now advertise the save shortcut explicitly.
+
+## [0.5.38] — 2026-03-29
+
+### Added
+- Studio now supports `/studio-editor-only` for opening additional editor/preview companion views from the same Pi session, without taking over the main full Studio workspace.
+- Studio now supports `/studio-replace` for explicitly replacing the current full Studio view while leaving editor-only views open.
+
+### Changed
+- Full Studio is now treated as a singleton per Pi session: `/studio` opens the canonical full workspace, while attempts to open another full Studio now guide you toward `/studio-replace` or `/studio-editor-only` instead of silently invalidating the existing full Studio tab.
+- README/help text and Studio status/warning messages now describe the updated full-vs-editor-only session model more clearly.
+
+### Fixed
+- Editor-only Studio views now hide remaining critique/history controls, including the critique-focus dropdown, and keep their WebSocket mode metadata aligned with the server-side full/editor-only view tracking.
+
 ## [0.5.37] — 2026-03-29
 
 ### Added

package/README.md

@@ -15,6 +15,7 @@ Extension for [pi](https://pi.dev) that opens a local two-pane browser workspace
 ## What it does
 
 - Opens a two-pane browser workspace: **Editor** (left) + **Response/Thinking/Editor Preview** (right)
+- Supports one canonical full Studio view per Pi session, plus additional editor-only companion views when you just want extra editing/preview surfaces
 - Runs editor text directly, or asks for structured critique (auto/writing/code focus)
 - Includes a local persistent scratchpad for quick notes you want to keep out of the main editor until you're ready to copy or insert them
 - Browses response history (`Prev/Next/Last`) and loads either:
@@ -43,6 +44,8 @@ Extension for [pi](https://pi.dev) that opens a local two-pane browser workspace
 | `/studio --status` | Show studio server status |
 | `/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 |
+| `/studio-editor-only [path\|--blank\|--last]` | Open an editor-only Studio view; multiple editor-only views may be open at once |
 | `/studio-current <path>` | Load a file into currently open Studio tab(s) without opening a new browser window |
 | `/studio-pdf <path> [options]` | Export a local file to `<name>.studio.pdf` via the Studio PDF pipeline, with optional layout controls |
 
@@ -64,7 +67,8 @@ pi -e https://github.com/omaclaren/pi-studio
 
 ## Notes
 
-- Local-only server (`127.0.0.1`) with rotating tokenized URLs.
+- Local-only server (`127.0.0.1`) with tokenized Studio URLs.
+- 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.
 - Studio is designed as a complement to terminal pi, not a replacement.
 - Editor/code font uses a best-effort terminal-monospace match when the current terminal config exposes it; set `PI_STUDIO_FONT_MONO` to force a specific CSS `font-family` stack.
 - Full preview/PDF quality depends on `pandoc` (and `xelatex` for PDF):

package/client/studio-client.js

@@ -99,6 +99,11 @@
       const scratchpadCloseBtn = document.getElementById("scratchpadCloseBtn");
       const scratchpadDoneBtn = document.getElementById("scratchpadDoneBtn");
 
+      const studioMode = (document.body && document.body.dataset && document.body.dataset.studioMode) === "editor-only"
+        ? "editor-only"
+        : "full";
+      const isEditorOnlyMode = studioMode === "editor-only";
+
       const initialSourceState = {
         source: (document.body && document.body.dataset && document.body.dataset.initialSource) || "blank",
         label: (document.body && document.body.dataset && document.body.dataset.initialLabel) || "blank",
@@ -115,9 +120,9 @@
       let pendingKind = null;
       let stickyStudioKind = null;
       let initialDocumentApplied = false;
-      let editorView = "markdown";
-      let rightView = "preview";
-      let followLatest = true;
+      let editorView = isEditorOnlyMode ? "markdown" : "markdown";
+      let rightView = isEditorOnlyMode ? "editor-preview" : "preview";
+      let followLatest = !isEditorOnlyMode;
       let queuedLatestResponse = null;
       let latestResponseMarkdown = "";
       let latestResponseThinking = "";
@@ -873,6 +878,19 @@
         return true;
       }
 
+      function triggerEditorSaveShortcut() {
+        if (saveOverBtn && !saveOverBtn.disabled && !saveOverBtn.hidden) {
+          saveOverBtn.click();
+          return true;
+        }
+        if (saveAsBtn && !saveAsBtn.disabled && !saveAsBtn.hidden) {
+          saveAsBtn.click();
+          return true;
+        }
+        setStatus("Save is unavailable right now.", "warning");
+        return false;
+      }
+
       function handlePaneShortcut(event) {
         if (!event || event.defaultPrevented) return;
 
@@ -909,6 +927,18 @@
           return;
         }
 
+        const isSaveShortcut =
+          key.toLowerCase() === "s"
+          && (event.metaKey || event.ctrlKey)
+          && !event.altKey
+          && !event.shiftKey;
+
+        if (isSaveShortcut) {
+          event.preventDefault();
+          triggerEditorSaveShortcut();
+          return;
+        }
+
         if (plainEscape) {
           const activeKind = getAbortablePendingKind();
           if (activeKind === "direct" || activeKind === "critique") {
@@ -928,6 +958,7 @@
           && !event.altKey
           && !event.shiftKey
           && activePane === "left"
+          && !isEditorOnlyMode
         ) {
           if (queueSteerBtn && !queueSteerBtn.disabled) {
             event.preventDefault();
@@ -2519,11 +2550,11 @@
 
         var effectivePath = getEffectiveSavePath();
         if (effectivePath) {
-          saveOverBtn.title = "Overwrite file: " + effectivePath;
+          saveOverBtn.title = "Overwrite file: " + effectivePath + " · Shortcut: Cmd/Ctrl+S.";
           return;
         }
 
-        saveOverBtn.title = "Save editor is available after opening a file, setting a working dir, or using Save editor as…";
+        saveOverBtn.title = "Save editor is available after opening a file, setting a working dir, or using Save editor as…. Shortcut: Cmd/Ctrl+S falls back to Save editor as… when needed.";
       }
 
       function syncActionButtons() {
@@ -2532,7 +2563,7 @@
         fileInput.disabled = uiBusy;
         saveAsBtn.disabled = uiBusy;
         saveOverBtn.disabled = uiBusy || !canSaveOver;
-        sendEditorBtn.disabled = uiBusy;
+        sendEditorBtn.disabled = uiBusy || isEditorOnlyMode;
         if (getEditorBtn) getEditorBtn.disabled = uiBusy;
         if (loadGitDiffBtn) loadGitDiffBtn.disabled = uiBusy;
         syncRunAndCritiqueButtons();
@@ -2542,13 +2573,13 @@
         if (annotationModeSelect) annotationModeSelect.disabled = uiBusy;
         if (saveAnnotatedBtn) saveAnnotatedBtn.disabled = uiBusy;
         if (stripAnnotationsBtn) stripAnnotationsBtn.disabled = uiBusy || !hasAnnotationMarkers(sourceTextEl.value);
-        if (compactBtn) compactBtn.disabled = uiBusy || compactInProgress || wsState === "Disconnected";
-        editorViewSelect.disabled = false;
-        rightViewSelect.disabled = false;
-        followSelect.disabled = uiBusy;
-        if (responseHighlightSelect) responseHighlightSelect.disabled = rightView !== "markdown";
-        insertHeaderBtn.disabled = uiBusy;
-        lensSelect.disabled = uiBusy;
+        if (compactBtn) compactBtn.disabled = isEditorOnlyMode || uiBusy || compactInProgress || wsState === "Disconnected";
+        editorViewSelect.disabled = isEditorOnlyMode;
+        rightViewSelect.disabled = isEditorOnlyMode;
+        followSelect.disabled = isEditorOnlyMode || uiBusy;
+        if (responseHighlightSelect) responseHighlightSelect.disabled = isEditorOnlyMode || rightView !== "markdown";
+        insertHeaderBtn.disabled = uiBusy || isEditorOnlyMode;
+        lensSelect.disabled = uiBusy || isEditorOnlyMode;
         updateSaveFileTooltip();
         updateHistoryControls();
         updateResultActionButtons();
@@ -3472,6 +3503,28 @@
         const critiqueIsStop = activeKind === "critique";
         const canQueueSteering = studioRunChainActive && !critiqueIsStop;
 
+        if (isEditorOnlyMode) {
+          if (sendRunBtn) {
+            sendRunBtn.textContent = "Run editor text";
+            sendRunBtn.classList.remove("request-stop-active");
+            sendRunBtn.disabled = true;
+            sendRunBtn.title = "Run is unavailable in editor-only mode.";
+          }
+          if (queueSteerBtn) {
+            queueSteerBtn.hidden = false;
+            queueSteerBtn.disabled = true;
+            queueSteerBtn.classList.remove("request-stop-active");
+            queueSteerBtn.title = "Queue steering is unavailable in editor-only mode.";
+          }
+          if (critiqueBtn) {
+            critiqueBtn.textContent = "Critique editor text";
+            critiqueBtn.classList.remove("request-stop-active");
+            critiqueBtn.disabled = true;
+            critiqueBtn.title = "Critique is unavailable in editor-only mode.";
+          }
+          return;
+        }
+
         if (sendRunBtn) {
           sendRunBtn.textContent = directIsStop ? "Stop" : "Run editor text";
           sendRunBtn.classList.toggle("request-stop-active", directIsStop);
@@ -4174,7 +4227,14 @@
         }
 
         const wsProtocol = window.location.protocol === "https:" ? "wss" : "ws";
-        const wsUrl = wsProtocol + "://" + window.location.host + "/ws?token=" + encodeURIComponent(token) + (DEBUG_ENABLED ? "&debug=1" : "");
+        const wsParams = new URLSearchParams({ token: token });
+        if (studioMode !== "full") {
+          wsParams.set("mode", studioMode);
+        }
+        if (DEBUG_ENABLED) {
+          wsParams.set("debug", "1");
+        }
+        const wsUrl = wsProtocol + "://" + window.location.host + "/ws?" + wsParams.toString();
         const wasReconnect = reconnectAttempt > 0;
         let disconnectHandled = false;
 
@@ -4203,7 +4263,15 @@
             clearScheduledReconnect();
             reconnectAttempt = 0;
             setWsState("Disconnected");
-            setStatus("This tab was invalidated by a newer /studio session.", "warning");
+            setStatus("This full Studio tab was replaced by a newer Studio session.", "warning");
+            return;
+          }
+
+          if (kind === "full_conflict") {
+            clearScheduledReconnect();
+            reconnectAttempt = 0;
+            setWsState("Disconnected");
+            setStatus("Another full Studio view is already active for this session. Use /studio-replace for a fresh full Studio view, or /studio-editor-only for a concurrent editor-only Studio view.", "warning");
             return;
           }
 
@@ -4244,6 +4312,10 @@
             handleDisconnect("invalidated", 4001);
             return;
           }
+          if (event && event.code === 4004) {
+            handleDisconnect("full_conflict", 4004);
+            return;
+          }
           if (event && event.code === 1001) {
             handleDisconnect("shutdown", 1001);
             return;

package/client/studio.css

@@ -240,6 +240,44 @@
       appearance: menulist;
     }
 
+    body[data-studio-mode="editor-only"] #editorViewSelect,
+    body[data-studio-mode="editor-only"] #rightViewSelect,
+    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"] #insertHeaderBtn,
+    body[data-studio-mode="editor-only"] #lensSelect,
+    body[data-studio-mode="editor-only"] #critiqueBtn,
+    body[data-studio-mode="editor-only"] #followSelect,
+    body[data-studio-mode="editor-only"] #responseHighlightSelect,
+    body[data-studio-mode="editor-only"] #pullLatestBtn,
+    body[data-studio-mode="editor-only"] #historyPrevBtn,
+    body[data-studio-mode="editor-only"] #historyIndexBadge,
+    body[data-studio-mode="editor-only"] #historyNextBtn,
+    body[data-studio-mode="editor-only"] #historyLastBtn,
+    body[data-studio-mode="editor-only"] #loadResponseBtn,
+    body[data-studio-mode="editor-only"] #loadCritiqueNotesBtn,
+    body[data-studio-mode="editor-only"] #loadCritiqueFullBtn,
+    body[data-studio-mode="editor-only"] #loadHistoryPromptBtn,
+    body[data-studio-mode="editor-only"] #copyResponseBtn,
+    body[data-studio-mode="editor-only"] #compactBtn,
+    body[data-studio-mode="editor-only"] .reference-meta,
+    body[data-studio-mode="editor-only"] #responseActions {
+      display: none !important;
+    }
+
+    body[data-studio-mode="editor-only"] #leftSectionHeader .section-header-main::before {
+      content: "Editor";
+      font-weight: 600;
+      font-size: 14px;
+    }
+
+    body[data-studio-mode="editor-only"] #rightSectionHeader .section-header-main::before {
+      content: "Preview";
+      font-weight: 600;
+      font-size: 14px;
+    }
+
     .reference-meta {
       padding: 8px 10px;
       border-bottom: 1px solid var(--border-muted);

package/index.ts

@@ -22,6 +22,7 @@ import { escapeStudioPdfLatexTextFragment } from "./shared/studio-pdf-escape.js"
 type Lens = "writing" | "code";
 type RequestedLens = Lens | "auto";
 type StudioRequestKind = "critique" | "annotation" | "direct" | "compact";
+type StudioUiMode = "full" | "editor-only";
 type StudioSourceKind = "file" | "last-response" | "blank";
 type TerminalActivityPhase = "idle" | "running" | "tool" | "responding";
 type StudioPromptMode = "response" | "run" | "effective";
@@ -35,6 +36,7 @@ interface StudioServerState {
 	server: Server;
 	wsServer: WebSocketServer;
 	clients: Set<WebSocket>;
+	clientModes: Map<WebSocket, StudioUiMode>;
 	port: number;
 	token: string;
 }
@@ -5511,9 +5513,14 @@ function isAllowedOrigin(_origin: string | undefined, _port: number): boolean {
 	return true;
 }
 
-function buildStudioUrl(port: number, token: string): string {
-	const encoded = encodeURIComponent(token);
-	return `http://127.0.0.1:${port}/?token=${encoded}`;
+function normalizeStudioUiMode(raw: string | null | undefined): StudioUiMode {
+	return raw === "editor-only" ? "editor-only" : "full";
+}
+
+function buildStudioUrl(port: number, token: string, mode: StudioUiMode = "full"): string {
+	const params = new URLSearchParams({ token });
+	if (mode !== "full") params.set("mode", mode);
+	return `http://127.0.0.1:${port}/?${params.toString()}`;
 }
 
 function formatModelLabel(model: { provider?: string; id?: string } | undefined): string {
@@ -5647,6 +5654,7 @@ function buildStudioHtml(
 	initialModelLabel?: string,
 	initialTerminalLabel?: string,
 	initialContextUsage?: StudioContextUsageSnapshot,
+	studioMode: StudioUiMode = "full",
 ): string {
 	const initialText = escapeHtmlForInline(initialDocument?.text ?? "");
 	const initialSource = initialDocument?.source ?? "blank";
@@ -5702,13 +5710,16 @@ function buildStudioHtml(
 	const clientScriptHref = `/studio-client.js?token=${encodeURIComponent(studioToken ?? "")}`;
 	const faviconHref = buildStudioFaviconDataUri(style);
 	const bootConfigJson = JSON.stringify({ mermaidConfig }).replace(/</g, "\\u003c");
+	const isEditorOnlyMode = studioMode === "editor-only";
+	const appTitle = isEditorOnlyMode ? "π Studio — Editor" : "π Studio";
+	const appSubtitle = isEditorOnlyMode ? "Editor Workspace" : "Editor & Response Workspace";
 
 	return `<!doctype html>
 <html>
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width,initial-scale=1" />
-  <title>π Studio</title>
+  <title>${appTitle}</title>
   <link rel="icon" href="${faviconHref}" type="image/svg+xml" />
   <style>
     :root {
@@ -5717,12 +5728,12 @@ ${cssVarsBlock}
   </style>
   <link rel="stylesheet" href="${stylesheetHref}" />
 </head>
-<body data-initial-source="${initialSource}" data-initial-label="${initialLabel}" data-initial-path="${initialPath}" data-model-label="${initialModel}" data-terminal-label="${initialTerminal}" data-context-tokens="${initialContextTokens}" data-context-window="${initialContextWindow}" data-context-percent="${initialContextPercent}">
+<body data-initial-source="${initialSource}" data-initial-label="${initialLabel}" data-initial-path="${initialPath}" data-model-label="${initialModel}" data-terminal-label="${initialTerminal}" data-context-tokens="${initialContextTokens}" data-context-window="${initialContextWindow}" data-context-percent="${initialContextPercent}" data-studio-mode="${studioMode}">
   <header>
-    <h1><span class="app-logo" aria-hidden="true">π</span> Studio <span class="app-subtitle">Editor & Response Workspace</span></h1>
+    <h1><span class="app-logo" aria-hidden="true">π</span> Studio <span class="app-subtitle">${appSubtitle}</span></h1>
     <div class="controls">
-      <button id="saveAsBtn" type="button" title="Save editor content to a new file path.">Save editor as…</button>
-      <button id="saveOverBtn" type="button" title="Overwrite current file with editor content." disabled>Save editor</button>
+      <button id="saveAsBtn" type="button" title="Save editor content to a new file path. Cmd/Ctrl+S falls back here when no direct save path is available.">Save editor as…</button>
+      <button id="saveOverBtn" type="button" title="Overwrite current file with editor content. Shortcut: Cmd/Ctrl+S.">Save editor</button>
       <label class="file-label" title="Load a local file into editor text.">Load file content<input id="fileInput" type="file" 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" /></label>
       <button id="loadGitDiffBtn" type="button" title="Load the current git diff from the Studio context into the editor.">Load git diff</button>
       <button id="getEditorBtn" type="button" title="Load the current terminal editor draft into Studio.">Load from pi editor</button>
@@ -5873,7 +5884,7 @@ ${cssVarsBlock}
   <footer>
     <span id="statusLine"><span id="statusSpinner" aria-hidden="true"> </span><span id="status">Booting studio…</span></span>
     <span id="footerMeta" class="footer-meta"><span id="footerMetaText" class="footer-meta-text">Model: ${initialModel} · Terminal: ${initialTerminal} · Context: unknown</span><button id="compactBtn" class="footer-compact-btn" type="button" title="Trigger pi context compaction now.">Compact</button></span>
-    <span class="shortcut-hint">Focus pane: F10 (or Cmd/Ctrl+Esc) to toggle · Run / queue steering: Cmd/Ctrl+Enter · Stop request: Esc</span>
+    <span class="shortcut-hint">Focus pane: F10 (or Cmd/Ctrl+Esc) to toggle · Save editor: Cmd/Ctrl+S · Run / queue steering: Cmd/Ctrl+Enter · Stop request: Esc</span>
   </footer>
 
   <div id="scratchpadOverlay" class="scratchpad-overlay" hidden>
@@ -5949,6 +5960,22 @@ export default function (pi: ExtensionAPI) {
 
 	const isStudioDirectRunChainActive = () => Boolean(studioDirectRunChain);
 	const getQueuedStudioSteeringCount = () => queuedStudioDirectRequests.length;
+	const getStudioClientCounts = (): { full: number; editorOnly: number } => {
+		if (!serverState) return { full: 0, editorOnly: 0 };
+		let full = 0;
+		let editorOnly = 0;
+		for (const client of serverState.clients) {
+			if (client.readyState !== WebSocket.OPEN) continue;
+			const mode = serverState.clientModes.get(client) ?? "full";
+			if (mode === "editor-only") {
+				editorOnly += 1;
+			} else {
+				full += 1;
+			}
+		}
+		return { full, editorOnly };
+	};
+	const hasConnectedFullStudioView = () => getStudioClientCounts().full > 0;
 	const canQueueStudioSteeringRequest = () => {
 		if (compactInProgress) return false;
 		if (!agentBusy) return false;
@@ -6664,6 +6691,26 @@ export default function (pi: ExtensionAPI) {
 			}
 		}
 		serverState.clients.clear();
+		serverState.clientModes.clear();
+	};
+
+	const closeStudioClientsByMode = (mode: StudioUiMode, code = 4001, reason = "Session invalidated"): number => {
+		if (!serverState) return 0;
+		let closed = 0;
+		for (const client of Array.from(serverState.clients)) {
+			if (client.readyState !== WebSocket.OPEN) continue;
+			const clientMode = serverState.clientModes.get(client) ?? "full";
+			if (clientMode !== mode) continue;
+			serverState.clients.delete(client);
+			serverState.clientModes.delete(client);
+			closed += 1;
+			try {
+				client.close(code, reason);
+			} catch {
+				// Ignore close errors
+			}
+		}
+		return closed;
 	};
 
 	const handleStudioMessage = (client: WebSocket, msg: IncomingStudioMessage) => {
@@ -7560,7 +7607,8 @@ export default function (pi: ExtensionAPI) {
 			"Cross-Origin-Resource-Policy": "same-origin",
 		});
 		refreshContextUsage();
-		res.end(buildStudioHtml(initialStudioDocument, serverState.token, lastCommandCtx?.ui.theme, currentModelLabel, terminalSessionLabel, contextUsageSnapshot));
+		const studioMode = normalizeStudioUiMode(requestUrl.searchParams.get("mode"));
+		res.end(buildStudioHtml(initialStudioDocument, serverState.token, lastCommandCtx?.ui.theme, currentModelLabel, terminalSessionLabel, contextUsageSnapshot, studioMode));
 	};
 
 	const ensureServer = async (): Promise<StudioServerState> => {
@@ -7569,11 +7617,13 @@ export default function (pi: ExtensionAPI) {
 		const server = createServer(handleHttpRequest);
 		const wsServer = new WebSocketServer({ noServer: true });
 		const clients = new Set<WebSocket>();
+		const clientModes = new Map<WebSocket, StudioUiMode>();
 
 		const state: StudioServerState = {
 			server,
 			wsServer,
 			clients,
+			clientModes,
 			port: 0,
 			token: createSessionToken(),
 		};
@@ -7606,9 +7656,26 @@ export default function (pi: ExtensionAPI) {
 			});
 		});
 
-		wsServer.on("connection", (ws) => {
+		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 clientMode = normalizeStudioUiMode(requestUrl.searchParams.get("mode"));
+			if (clientMode === "full") {
+				for (const client of clients) {
+					if (client.readyState !== WebSocket.OPEN) continue;
+					const existingMode = clientModes.get(client) ?? "full";
+					if (existingMode !== "full") continue;
+					try {
+						ws.close(4004, "Full Studio already active");
+					} catch {
+						// Ignore close errors
+					}
+					return;
+				}
+			}
 			clients.add(ws);
-			emitDebugEvent("studio_ws_connected", { clients: clients.size });
+			clientModes.set(ws, clientMode);
+			emitDebugEvent("studio_ws_connected", { clients: clients.size, mode: clientMode });
 			broadcastState();
 
 			ws.on("message", (data) => {
@@ -7622,11 +7689,13 @@ export default function (pi: ExtensionAPI) {
 
 			ws.on("close", () => {
 				clients.delete(ws);
+				clientModes.delete(ws);
 				emitDebugEvent("studio_ws_disconnected", { clients: clients.size });
 			});
 
 			ws.on("error", () => {
 				clients.delete(ws);
+				clientModes.delete(ws);
 			});
 		});
 
@@ -7710,14 +7779,6 @@ export default function (pi: ExtensionAPI) {
 		});
 	};
 
-	const rotateToken = () => {
-		if (!serverState) return;
-		serverState.token = createSessionToken();
-		clearPreparedPdfExports();
-		closeAllClients(4001, "Session invalidated");
-		broadcastState();
-	};
-
 	const hydrateLatestAssistant = (entries: SessionEntry[]) => {
 		syncStudioResponseHistory(entries);
 	};
@@ -8008,6 +8069,147 @@ export default function (pi: ExtensionAPI) {
 		await stopServer();
 	});
 
+	const resolveStudioLaunchDocument = (
+		trimmed: string,
+		ctx: ExtensionCommandContext,
+		options?: { defaultSource?: "blank" | "last-response"; commandLabel?: string },
+	): InitialStudioDocument | null => {
+		const defaultSource = options?.defaultSource === "blank" ? "blank" : "last-response";
+		const commandLabel = options?.commandLabel ?? "/studio";
+		const latestAssistant =
+			extractLatestAssistantFromEntries(ctx.sessionManager.getBranch())
+				?? extractLatestAssistantFromEntries(ctx.sessionManager.getEntries())
+				?? lastStudioResponse?.markdown
+				?? null;
+
+		if (!trimmed) {
+			if (defaultSource === "last-response" && latestAssistant) {
+				return {
+					text: latestAssistant,
+					label: "last model response",
+					source: "last-response",
+				};
+			}
+			return {
+				text: "",
+				label: "blank",
+				source: "blank",
+			};
+		}
+
+		if (trimmed === "--blank" || trimmed === "blank") {
+			return {
+				text: "",
+				label: "blank",
+				source: "blank",
+			};
+		}
+
+		if (trimmed === "--last" || trimmed === "last") {
+			if (!latestAssistant) {
+				ctx.ui.notify("No assistant response found; opening blank studio.", "warning");
+				return {
+					text: "",
+					label: "blank",
+					source: "blank",
+				};
+			}
+			return {
+				text: latestAssistant,
+				label: "last model response",
+				source: "last-response",
+			};
+		}
+
+		if (trimmed.startsWith("-")) {
+			ctx.ui.notify(`Unknown flag: ${trimmed}. Use ${commandLabel} --help`, "error");
+			return null;
+		}
+
+		const pathArg = parsePathArgument(trimmed);
+		if (!pathArg) {
+			ctx.ui.notify("Invalid file path argument.", "error");
+			return null;
+		}
+
+		const file = readStudioFile(pathArg, ctx.cwd);
+		if (file.ok === false) {
+			ctx.ui.notify(file.message, "error");
+			return null;
+		}
+
+		if (file.text.length > 200_000) {
+			ctx.ui.notify(
+				"Loaded a large file. Studio critique requests currently reject documents over 200k characters.",
+				"warning",
+			);
+		}
+
+		return {
+			text: file.text,
+			label: file.label,
+			source: "file",
+			path: file.resolvedPath,
+		};
+	};
+
+	const openStudioView = async (
+		trimmed: string,
+		ctx: ExtensionCommandContext,
+		mode: StudioUiMode,
+		options?: { defaultSource?: "blank" | "last-response"; commandLabel?: string; replaceExistingFull?: boolean },
+	) => {
+		if (mode === "full" && hasConnectedFullStudioView()) {
+			if (options?.replaceExistingFull) {
+				closeStudioClientsByMode("full", 4001, "Full Studio replaced");
+			} else {
+				ctx.ui.notify("A full pi Studio view is already open for this session. Close it first, use /studio-replace for a fresh full Studio view, or use /studio-editor-only for a concurrent editor-only Studio view.", "warning");
+				if (serverState) {
+					ctx.ui.notify(`Studio URL: ${buildStudioUrl(serverState.port, serverState.token, "full")}`, "info");
+				}
+				return;
+			}
+		}
+
+		await ctx.waitForIdle();
+		lastCommandCtx = ctx;
+		refreshRuntimeMetadata({ cwd: ctx.cwd, model: ctx.model });
+		refreshContextUsage(ctx);
+		syncStudioResponseHistory(ctx.sessionManager.getBranch());
+		broadcastState();
+		broadcastResponseHistory();
+		try {
+			const currentStyle = getStudioThemeStyle(ctx.ui.theme);
+			lastThemeVarsJson = JSON.stringify(buildThemeCssVars(currentStyle));
+		} catch {
+			// ignore theme read errors
+		}
+
+		const selected = resolveStudioLaunchDocument(trimmed, ctx, options);
+		if (!selected) return;
+		initialStudioDocument = selected;
+
+		const state = await ensureServer();
+		const url = buildStudioUrl(state.port, state.token, mode);
+		const openedLabel = mode === "editor-only" ? "pi Studio editor-only view" : "pi Studio";
+
+		try {
+			await openUrlInDefaultBrowser(url);
+			if (selected.source === "file") {
+				ctx.ui.notify(`Opened ${openedLabel} with file loaded: ${selected.label}`, "info");
+			} else if (selected.source === "last-response") {
+				ctx.ui.notify(`Opened ${openedLabel} with last model response (${selected.text.length} chars).`, "info");
+			} else {
+				ctx.ui.notify(`Opened ${openedLabel} with blank editor.`, "info");
+			}
+			ctx.ui.notify(`Studio URL: ${url}`, "info");
+		} catch (error) {
+			ctx.ui.notify(`Failed to open browser: ${error instanceof Error ? error.message : String(error)}`, "error");
+		} finally {
+			void maybeNotifyUpdateAvailable(ctx);
+		}
+	};
+
 	pi.registerCommand("studio", {
 		description: "Open pi Studio browser UI (/studio, /studio <file>, /studio --blank, /studio --last)",
 		handler: async (args: string, ctx: ExtensionCommandContext) => {
@@ -8024,8 +8226,9 @@ export default function (pi: ExtensionAPI) {
 					ctx.ui.notify("Studio server is not running.", "info");
 					return;
 				}
+				const counts = getStudioClientCounts();
 				ctx.ui.notify(
-					`Studio running at http://127.0.0.1:${serverState.port}/ (busy: ${isStudioBusy() ? "yes" : "no"})`,
+					`Studio running at http://127.0.0.1:${serverState.port}/ (busy: ${isStudioBusy() ? "yes" : "no"}; full views: ${counts.full}; editor-only views: ${counts.editorOnly})`,
 					"info",
 				);
 				return;
@@ -8040,6 +8243,9 @@ export default function (pi: ExtensionAPI) {
 						+ "  /studio --last    Open with last model response\n"
 						+ "  /studio --status  Show studio status\n"
 						+ "  /studio --stop    Stop studio server\n"
+						+ "  Note: only one full /studio view is allowed per Pi session.\n"
+						+ "  /studio-replace [path]  Replace the current full Studio view with a new one\n"
+						+ "  /studio-editor-only [path]  Open another Studio tab in editor-only mode\n"
 						+ "  /studio-current <path>  Load a file into currently open Studio tab(s)\n"
 						+ "  /studio-pdf <path>      Export a file to <name>.studio.pdf via Studio PDF",
 					"info",
@@ -8047,115 +8253,53 @@ export default function (pi: ExtensionAPI) {
 				return;
 			}
 
-			await ctx.waitForIdle();
-			lastCommandCtx = ctx;
-			refreshRuntimeMetadata({ cwd: ctx.cwd, model: ctx.model });
-			refreshContextUsage(ctx);
-			syncStudioResponseHistory(ctx.sessionManager.getBranch());
-			broadcastState();
-			broadcastResponseHistory();
-			// Seed theme vars so first ping doesn't trigger a false update
-			try {
-				const currentStyle = getStudioThemeStyle(ctx.ui.theme);
-				lastThemeVarsJson = JSON.stringify(buildThemeCssVars(currentStyle));
-			} catch { /* ignore */ }
+			await openStudioView(trimmed, ctx, "full", { defaultSource: "last-response", commandLabel: "/studio" });
+		},
+	});
 
-			const latestAssistant =
-				extractLatestAssistantFromEntries(ctx.sessionManager.getBranch())
-				?? extractLatestAssistantFromEntries(ctx.sessionManager.getEntries())
-				?? lastStudioResponse?.markdown
-				?? null;
-			let selected: InitialStudioDocument | null = null;
-
-			if (!trimmed) {
-				if (latestAssistant) {
-					selected = {
-						text: latestAssistant,
-						label: "last model response",
-						source: "last-response",
-					};
-				} else {
-					selected = {
-						text: "",
-						label: "blank",
-						source: "blank",
-					};
-				}
-			} else if (trimmed === "--blank" || trimmed === "blank") {
-				selected = {
-					text: "",
-					label: "blank",
-					source: "blank",
-				};
-			} else if (trimmed === "--last" || trimmed === "last") {
-				if (!latestAssistant) {
-					ctx.ui.notify("No assistant response found; opening blank studio.", "warning");
-					selected = {
-						text: "",
-						label: "blank",
-						source: "blank",
-					};
-				} else {
-					selected = {
-						text: latestAssistant,
-						label: "last model response",
-						source: "last-response",
-					};
-				}
-			} else if (trimmed.startsWith("-")) {
-				ctx.ui.notify(`Unknown flag: ${trimmed}. Use /studio --help`, "error");
+	pi.registerCommand("studio-replace", {
+		description: "Replace the current full pi Studio view (/studio-replace, /studio-replace <file>)",
+		handler: async (args: string, ctx: ExtensionCommandContext) => {
+			const trimmed = args.trim();
+			if (trimmed === "help" || trimmed === "--help" || trimmed === "-h") {
+				ctx.ui.notify(
+					"Usage: /studio-replace [path|--blank|--last]\n"
+						+ "  /studio-replace         Replace the current full Studio view (default: last response, fallback: blank)\n"
+						+ "  /studio-replace <path>  Replace the current full Studio view with file preloaded\n"
+						+ "  /studio-replace --blank Replace with blank editor\n"
+						+ "  /studio-replace --last  Replace with last model response\n"
+						+ "Editor-only Studio views stay open.",
+					"info",
+				);
 				return;
-			} else {
-				const pathArg = parsePathArgument(trimmed);
-				if (!pathArg) {
-					ctx.ui.notify("Invalid file path argument.", "error");
-					return;
-				}
-
-				const file = readStudioFile(pathArg, ctx.cwd);
-				if (file.ok === false) {
-					ctx.ui.notify(file.message, "error");
-					return;
-				}
-
-				selected = {
-					text: file.text,
-					label: file.label,
-					source: "file",
-					path: file.resolvedPath,
-				};
-				if (file.text.length > 200_000) {
-					ctx.ui.notify(
-						"Loaded a large file. Studio critique requests currently reject documents over 200k characters.",
-						"warning",
-					);
-				}
 			}
 
-			initialStudioDocument = selected;
-
-			const state = await ensureServer();
-			rotateToken();
-			const url = buildStudioUrl(state.port, state.token);
+			await openStudioView(trimmed, ctx, "full", {
+				defaultSource: "last-response",
+				commandLabel: "/studio-replace",
+				replaceExistingFull: true,
+			});
+		},
+	});
 
-			try {
-				await openUrlInDefaultBrowser(url);
-				if (initialStudioDocument?.source === "file") {
-					ctx.ui.notify(`Opened pi Studio with file loaded: ${initialStudioDocument.label}`, "info");
-				} else if (initialStudioDocument?.source === "last-response") {
-					ctx.ui.notify(
-						`Opened pi Studio with last model response (${initialStudioDocument.text.length} chars).`,
-						"info",
-					);
-				} else {
-					ctx.ui.notify("Opened pi Studio with blank editor.", "info");
-				}
-				ctx.ui.notify(`Studio URL: ${url}`, "info");
-			} catch (error) {
-				ctx.ui.notify(`Failed to open browser: ${error instanceof Error ? error.message : String(error)}`, "error");
-			} finally {
-				void maybeNotifyUpdateAvailable(ctx);
+	pi.registerCommand("studio-editor-only", {
+		description: "Open pi Studio in editor-only mode (/studio-editor-only, /studio-editor-only <file>)",
+		handler: async (args: string, ctx: ExtensionCommandContext) => {
+			const trimmed = args.trim();
+			if (trimmed === "help" || trimmed === "--help" || trimmed === "-h") {
+				ctx.ui.notify(
+					"Usage: /studio-editor-only [path|--blank|--last]\n"
+						+ "  /studio-editor-only         Open an editor-only Studio view (default: blank editor)\n"
+						+ "  /studio-editor-only <path>  Open an editor-only Studio view with file preloaded\n"
+						+ "  /studio-editor-only --blank Open with blank editor\n"
+						+ "  /studio-editor-only --last  Open with last model response loaded into the editor\n"
+						+ "Multiple editor-only views are allowed in the same Pi session.",
+					"info",
+				);
+				return;
 			}
+
+			await openStudioView(trimmed, ctx, "editor-only", { defaultSource: "blank", commandLabel: "/studio-editor-only" });
 		},
 	});
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-studio",
-  "version": "0.5.37",
+  "version": "0.5.39",
   "description": "Two-pane browser workspace for pi with prompt/response editing, annotations, critiques, prompt/response history, and live Markdown/LaTeX/code preview",
   "type": "module",
   "license": "MIT",