pi-studio 0.9.21 → 0.9.23

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to `pi-studio` are documented here.
 
+## [0.9.23] — 2026-05-31
+
+### Changed
+- Studio now treats Pi `/tree` navigation as an explicit response-history sync: it preserves the selected response only when that response still exists on the new branch, otherwise selects the latest response on the current branch and shows a status note that editor text was left unchanged.
+
+## [0.9.22] — 2026-05-29
+
+### Added
+- Added **Open current file in new editor tab** and **Open current text as copy in new editor tab** to Source & context for explicit file-backed vs detached-copy tab opening.
+- Added `Cmd/Ctrl+Alt+P` to switch the right pane directly back to Preview without cycling through Files, REPL, or Working.
+
+### Changed
+- Changed the editor toolbar's detached-copy action into **New editor tab** for opening a blank editor tab, moved **Send current text to Pi editor** into Source & context, separated the passive origin summary from explicit **Detach from file** / **Reset origin** actions, and aligned local link menus with Files-view wording (**Open file tab** / **Convert tab**).
+
+### Fixed
+- New Studio tabs opened from Files, local preview links, preview exports, or editor-tab actions now skip cloned browser-tab workspace restore on first load, preventing inherited Files/preview state from briefly flashing and replacing the requested document preview.
+
 ## [0.9.21] — 2026-05-28
 
 ### Added

package/client/studio-client.js

@@ -177,6 +177,7 @@
       const isSshStudioSession = Boolean(document.body && document.body.dataset && document.body.dataset.sshSession === "1");
 
       const initialQueryParams = new URLSearchParams(window.location.search || "");
+      const skipInitialWorkspaceRestore = initialQueryParams.get("skipWorkspaceRestore") === "1";
       const explicitDocumentIdentityFromUrl = initialQueryParams.has("docId")
         || initialQueryParams.has("docSource")
         || initialQueryParams.has("docLabel")
@@ -232,6 +233,10 @@
       let pendingKind = null;
       let stickyStudioKind = null;
       const pendingCompanionWindows = new Map();
+      let sourceOriginSummaryEl = null;
+      let sourceResetOriginBtn = null;
+      let sourceOpenCurrentFileTabBtn = null;
+      let sourceOpenCurrentTextCopyTabBtn = null;
       let initialDocumentApplied = false;
       function normalizeRightViewValue(nextView) {
         const raw = String(nextView || "").trim();
@@ -258,8 +263,8 @@
           option.disabled = isEditorOnlyMode && !editorOnlyAllowed.has(option.value);
         });
         rightViewSelect.title = isEditorOnlyMode
-          ? "Editor-only views: editor preview, Files, or REPL. Shortcut: F7 when the right pane is active; F6 switches panes."
-          : "Right pane view mode. Shortcut: F7 when the right pane is active; F6 switches panes.";
+          ? "Editor-only views: editor preview, Files, or REPL. F7 cycles when the right pane is active; Cmd/Ctrl+Alt+P switches directly to Preview."
+          : "Right pane view mode. F7 cycles when the right pane is active; Cmd/Ctrl+Alt+P switches directly to Preview.";
       }
 
       function getInitialRightView(source) {
@@ -2405,8 +2410,66 @@
           suggestCompletionOptionsBtn.hidden = false;
           if (completionContextSelect) completionContextSelect.hidden = true;
           contextMenu = makeStudioUiRefreshMenu(suggestCompletionOptionsBtn, "context", "studio-refresh-context-anchor");
-          if (sourceBadgeEl) appendStudioUiRefreshMenuSection(contextMenu.menu, "Document", [sourceBadgeEl]);
+          sourceOriginSummaryEl = makeStudioUiRefreshElement("div", "source-badge source-origin-summary", "Origin: blank");
+          sourceOriginSummaryEl.setAttribute("aria-label", "Current editor origin");
+          sourceResetOriginBtn = makeStudioUiRefreshElement("button", "source-reset-origin-btn", "Reset origin");
+          sourceResetOriginBtn.type = "button";
+          sourceResetOriginBtn.title = "Reset the editor origin and keep the current text in a new draft.";
+          sourceResetOriginBtn.addEventListener("click", (event) => {
+            event.preventDefault();
+            event.stopPropagation();
+            closeStudioUiRefreshMenus();
+            resetEditorOrigin();
+          });
+          sourceOpenCurrentFileTabBtn = makeStudioUiRefreshElement("button", "source-open-file-tab-btn", "Open current file in new editor tab");
+          sourceOpenCurrentFileTabBtn.type = "button";
+          sourceOpenCurrentFileTabBtn.title = "Open this file-backed document in a new refreshable editor-only Studio tab.";
+          sourceOpenCurrentFileTabBtn.addEventListener("click", (event) => {
+            event.preventDefault();
+            event.stopPropagation();
+            const path = sourceState && sourceState.path ? String(sourceState.path) : "";
+            if (!path) {
+              setStatus("Open current file in new editor tab is only available for file-backed documents.", "warning");
+              return;
+            }
+            closeStudioUiRefreshMenus();
+            const targetUrl = buildAuthedStudioUrl("/", {
+              mode: "editor-only",
+              docSource: "file",
+              docLabel: sourceState && sourceState.label ? sourceState.label : basenameForStudioPath(path),
+              docPath: path,
+              resourceDir: getCurrentResourceDirValue() || dirnameForDisplayPath(path),
+              skipWorkspaceRestore: "1",
+            });
+            try {
+              window.open(targetUrl, "_blank", "noopener");
+              setStatus("Opening current file in a new editor tab.", "success");
+            } catch (error) {
+              setStatus((error && error.message) ? error.message : String(error || "Could not open file tab."), "warning");
+            }
+          });
+          sourceOpenCurrentTextCopyTabBtn = makeStudioUiRefreshElement("button", "source-open-text-copy-tab-btn", "Open current text as copy in new editor tab");
+          sourceOpenCurrentTextCopyTabBtn.type = "button";
+          sourceOpenCurrentTextCopyTabBtn.title = "Open a detached copy of the current editor text in a new editor-only Studio tab.";
+          sourceOpenCurrentTextCopyTabBtn.addEventListener("click", (event) => {
+            event.preventDefault();
+            event.stopPropagation();
+            const content = String(sourceTextEl.value || "");
+            if (!content.trim()) {
+              setStatus("Editor is empty. Use New editor tab for a blank editor.", "warning");
+              return;
+            }
+            closeStudioUiRefreshMenus();
+            requestOpenEditorOnlyDocument(content, {
+              label: sourceState && sourceState.label ? sourceState.label : "current editor",
+              path: sourceState && sourceState.path ? sourceState.path : undefined,
+              resourceDir: getCurrentResourceDirValue() || undefined,
+            });
+          });
+          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]);
           const cursorContextBtn = makeStudioUiRefreshElement("button", "completion-context-option", "Editor only");
           cursorContextBtn.type = "button";
           cursorContextBtn.setAttribute("data-completion-context-mode", "cursor");
@@ -2484,7 +2547,6 @@
         actionLineTwoEl.appendChild(copyDraftBtn);
         if (suggestCompletionBtn) actionLineTwoEl.appendChild(suggestCompletionBtn);
         if (openCompanionBtn) actionLineTwoEl.appendChild(openCompanionBtn);
-        if (!isEditorOnlyMode && sendEditorBtn) actionLineTwoEl.appendChild(sendEditorBtn);
         const replActionLineEl = makeStudioUiRefreshElement("div", "studio-refresh-action-line repl-action-line");
         replActionLineEl.hidden = true;
         if (sendReplBtn) replActionLineEl.appendChild(sendReplBtn);
@@ -3213,13 +3275,26 @@
 
       function updateSourceBadge() {
         const label = sourceState && sourceState.label ? sourceState.label : "blank";
-        sourceBadgeEl.textContent = (studioUiRefreshEnabled ? "Origin: " : "Editor origin: ") + label + (hasRefreshableFilePath() ? " · file" : "");
+        const originText = (studioUiRefreshEnabled ? "Origin: " : "Editor origin: ") + label + (hasRefreshableFilePath() ? " · file" : "");
         const descriptor = getCurrentStudioDocumentDescriptor();
         if (sourceBadgeEl) {
+          sourceBadgeEl.textContent = originText;
           sourceBadgeEl.title = descriptor.fileBacked
             ? ("Editor origin: " + label + "\nClick to reset origin and detach the current editor text into a new draft. The file on disk will not be changed.")
             : ("Editor origin: " + label + "\nClick to reset origin and start a new independent draft while keeping the current text and local notes.");
         }
+        if (sourceOriginSummaryEl) {
+          sourceOriginSummaryEl.textContent = originText;
+          sourceOriginSummaryEl.title = descriptor.fileBacked
+            ? ("File-backed editor: " + (descriptor.path || label))
+            : ("Detached editor origin: " + label);
+        }
+        if (sourceResetOriginBtn) {
+          sourceResetOriginBtn.textContent = descriptor.fileBacked ? "Detach from file" : "Reset origin";
+          sourceResetOriginBtn.title = descriptor.fileBacked
+            ? "Detach the current editor text from this file and keep it in a new draft. The file on disk will not be changed."
+            : "Reset the editor origin and keep the current text in a new draft.";
+        }
         // Show "Set working dir" button when not file-backed
         var isFileBacked = hasRefreshableFilePath();
         if (isFileBacked) {
@@ -3560,6 +3635,17 @@
         setStatus("Right pane content focused.");
       }
 
+      function switchRightPaneToPrimaryPreview() {
+        const targetView = isEditorOnlyMode ? "editor-preview" : "preview";
+        const snapshot = snapshotStudioScrollablePositions();
+        setRightView(targetView);
+        scheduleStudioScrollablePositionRestore(snapshot);
+        const label = rightViewSelect && rightViewSelect.selectedOptions && rightViewSelect.selectedOptions[0]
+          ? rightViewSelect.selectedOptions[0].textContent
+          : (isEditorOnlyMode ? "Editor (Preview)" : "Response (Preview)");
+        setStatus("Right pane view: " + String(label || "Preview") + ".");
+      }
+
       function cycleActivePaneView(direction) {
         if (activePane === "right") {
           if (!rightViewSelect || rightViewSelect.disabled) {
@@ -3858,6 +3944,16 @@
           return;
         }
 
+        const isPreviewShortcut = (key.toLowerCase() === "p" || code === "KeyP")
+          && (event.metaKey || event.ctrlKey)
+          && event.altKey
+          && !event.shiftKey;
+        if (isPreviewShortcut) {
+          event.preventDefault();
+          switchRightPaneToPrimaryPreview();
+          return;
+        }
+
         const isContentFocusShortcut = key === "F8" && !event.metaKey && !event.ctrlKey && !event.altKey;
         if (isContentFocusShortcut) {
           event.preventDefault();
@@ -9908,6 +10004,14 @@
 
         fileInput.disabled = uiBusy;
         if (sourceBadgeEl) sourceBadgeEl.disabled = uiBusy;
+        if (sourceResetOriginBtn) sourceResetOriginBtn.disabled = uiBusy;
+        if (sourceOpenCurrentFileTabBtn) {
+          sourceOpenCurrentFileTabBtn.disabled = uiBusy || !hasRefreshableFilePath();
+          sourceOpenCurrentFileTabBtn.title = hasRefreshableFilePath()
+            ? "Open this file-backed document in a new refreshable editor-only Studio tab."
+            : "Available after opening a file-backed document.";
+        }
+        if (sourceOpenCurrentTextCopyTabBtn) sourceOpenCurrentTextCopyTabBtn.disabled = uiBusy || wsState !== "Ready" || !String(sourceTextEl.value || "").trim();
         saveAsBtn.disabled = uiBusy;
         saveOverBtn.disabled = uiBusy || !canSaveOver;
         if (refreshFromDiskBtn) refreshFromDiskBtn.disabled = uiBusy || !canRefreshFromDisk;
@@ -10030,6 +10134,7 @@
       }
 
       function shouldRestorePersistedWorkspaceState(state) {
+        if (skipInitialWorkspaceRestore) return false;
         if (!state || typeof state.text !== "string") return false;
         const storedSourceState = normalizeWorkspaceSourceState(state.sourceState);
         const initialIdentity = getWorkspaceStateIdentity(initialSourceState);
@@ -10951,6 +11056,7 @@
           else params.delete("docPath");
           if (nextDraftId) params.set("draftId", nextDraftId);
           else params.delete("draftId");
+          params.delete("skipWorkspaceRestore");
           window.history.replaceState(null, "", currentUrl.toString());
         } catch {
           // Ignore URL-state update failures.
@@ -11166,10 +11272,10 @@
           appendPreviewLinkMenuButton(menu, "Open PDF preview", "open-pdf");
           appendPreviewLinkMenuButton(menu, "Open in new Studio tab", "open-preview-new");
         } else if (kind === "text") {
-          appendPreviewLinkMenuButton(menu, "Open in new editor", "open-new");
+          appendPreviewLinkMenuButton(menu, "Open file tab", "open-new");
           appendPreviewLinkMenuButton(menu, "Open here", "open-here");
         } else if (kind === "office") {
-          appendPreviewLinkMenuButton(menu, "Convert in new editor", "open-new");
+          appendPreviewLinkMenuButton(menu, "Convert tab", "open-new");
           appendPreviewLinkMenuButton(menu, "Convert here", "open-here");
         } else if (kind === "image") {
           appendPreviewLinkMenuButton(menu, "Open image preview", "open-image");
@@ -11306,10 +11412,11 @@
           return;
         }
         const popup = pendingWindow || window.open("", "_blank");
+        const openingLabel = getPreviewLocalLinkKind(href) === "office" ? "Opening converted document…" : "Opening file tab…";
         try {
           if (popup && popup.document && popup.document.body) {
-            popup.document.title = "Opening linked file…";
-            popup.document.body.innerHTML = "<p style=\"font: 13px -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; padding: 16px;\">Opening linked file…</p>";
+            popup.document.title = openingLabel;
+            popup.document.body.innerHTML = "<p style=\"font: 13px -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; padding: 16px;\">" + escapeHtml(openingLabel) + "</p>";
           }
         } catch {}
         try {
@@ -11322,12 +11429,12 @@
             try {
               popup.opener = null;
               popup.location.href = targetUrl;
-              setStatus(payload && payload.converted ? "Opening converted document in a new editor." : "Opening linked file in a new editor.", "success");
+              setStatus(payload && payload.converted ? "Opening converted document in a new editor." : "Opening file-backed document in a new editor.", "success");
               return;
             } catch {}
           }
           window.open(targetUrl, "_blank", "noopener");
-          setStatus(payload && payload.converted ? "Opening converted document in a new editor." : "Opening linked file in a new editor.", "success");
+          setStatus(payload && payload.converted ? "Opening converted document in a new editor." : "Opening file-backed document in a new editor.", "success");
         } catch (error) {
           if (popup && !popup.closed) {
             try { popup.close(); } catch {}
@@ -18344,9 +18451,10 @@
         }
 
         if (message.type === "response_history") {
+          const isTreeSync = message.reason === "tree";
           setResponseHistory(message.items, {
-            autoSelectLatest: followLatest,
-            preserveSelection: !followLatest,
+            autoSelectLatest: isTreeSync ? true : followLatest,
+            preserveSelection: isTreeSync ? true : !followLatest,
             silent: true,
           });
           return;
@@ -18502,11 +18610,11 @@
           const opened = navigatePendingCompanionWindow(responseRequestId, targetUrl);
           const readyMessage = typeof message.message === "string" && message.message.trim()
             ? message.message.trim()
-            : "Opened companion editor with a detached copy of the current editor text.";
+            : "Opened editor tab with a detached copy of the current editor text.";
           setStatus(
             opened
               ? readyMessage
-              : (targetUrl ? "Companion editor ready: " + targetUrl : "Companion editor is ready, but Studio did not receive a URL."),
+              : (targetUrl ? "Editor tab ready: " + targetUrl : "Editor tab is ready, but Studio did not receive a URL."),
             opened ? "success" : "warning",
           );
           return;
@@ -18826,8 +18934,8 @@
         try {
           companionWindow = window.open("", "_blank");
           if (companionWindow && companionWindow.document && companionWindow.document.body) {
-            companionWindow.document.title = "Opening companion editor…";
-            companionWindow.document.body.innerHTML = "<p style=\"font: 13px -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; padding: 16px;\">Opening companion editor…</p>";
+            companionWindow.document.title = "Opening editor tab…";
+            companionWindow.document.body.innerHTML = "<p style=\"font: 13px -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; padding: 16px;\">Opening editor tab…</p>";
           }
         } catch {
           companionWindow = null;
@@ -18883,6 +18991,28 @@
         }
       }
 
+      function requestOpenEditorOnlyDocument(content, options) {
+        const requestId = beginUiAction("open_editor_only");
+        if (!requestId) return false;
+        openPendingCompanionWindow(requestId);
+        const config = options && typeof options === "object" ? options : {};
+        const sent = sendMessage({
+          type: "open_editor_only_request",
+          requestId,
+          content: String(content || ""),
+          label: config.label || "current editor",
+          path: config.path || undefined,
+          resourceDir: config.resourceDir || undefined,
+        });
+        if (!sent) {
+          closePendingCompanionWindow(requestId);
+          pendingRequestId = null;
+          pendingKind = null;
+          setBusy(false);
+        }
+        return sent;
+      }
+
       function describeSourceForAnnotation() {
         if (sourceState.source === "file" && sourceState.label) {
           return "file " + sourceState.label;
@@ -19498,27 +19628,10 @@
 
       if (openCompanionBtn) {
         openCompanionBtn.addEventListener("click", () => {
-          const content = sourceTextEl.value;
-
-          const requestId = beginUiAction("open_editor_only");
-          if (!requestId) return;
-          openPendingCompanionWindow(requestId);
-
-          const sent = sendMessage({
-            type: "open_editor_only_request",
-            requestId,
-            content,
-            label: sourceState && sourceState.label ? sourceState.label : "current editor",
-            path: sourceState && sourceState.path ? sourceState.path : undefined,
+          requestOpenEditorOnlyDocument("", {
+            label: "blank",
             resourceDir: getCurrentResourceDirValue() || undefined,
           });
-
-          if (!sent) {
-            closePendingCompanionWindow(requestId);
-            pendingRequestId = null;
-            pendingKind = null;
-            setBusy(false);
-          }
         });
       }
 
@@ -20038,7 +20151,7 @@
       }
       if (sourceBadgeEl) {
         sourceBadgeEl.addEventListener("click", () => {
-          resetEditorOrigin();
+          if (!studioUiRefreshEnabled) resetEditorOrigin();
         });
       }
       if (resourceDirBtn) {

package/client/studio.css

@@ -5176,6 +5176,15 @@
       font-weight: 450;
     }
 
+    body.studio-ui-refresh .studio-refresh-menu-item > .source-origin-summary {
+      width: 100%;
+      border-color: var(--border-subtle);
+      background: var(--panel-2);
+      color: var(--studio-info-text, var(--muted));
+      white-space: normal;
+      line-height: 1.35;
+    }
+
     body.studio-ui-refresh .studio-refresh-menu #critiqueBtn {
       justify-content: flex-start;
       text-align: left;

package/index.ts

@@ -6991,7 +6991,7 @@ async function respondLocalPreviewLinkJson(req: IncomingMessage, res: ServerResp
 		}
 		const document = buildStudioLocalResourcePreviewDocument(resource);
 		const docId = storeTransientStudioDocument(document);
-		const url = buildStudioUrl(serverState.port, serverState.token, "editor-only", document, docId);
+		const url = buildStudioUrl(serverState.port, serverState.token, "editor-only", document, docId, { skipWorkspaceRestore: true });
 		const parsedUrl = new URL(url);
 		respondJson(res, 200, {
 			...basePayload,
@@ -7056,7 +7056,7 @@ async function respondLocalPreviewLinkJson(req: IncomingMessage, res: ServerResp
 	}
 
 	const docId = storeTransientStudioDocument(document);
-	const url = buildStudioUrl(serverState.port, serverState.token, "editor-only", document, docId);
+	const url = buildStudioUrl(serverState.port, serverState.token, "editor-only", document, docId, { skipWorkspaceRestore: true });
 	const parsedUrl = new URL(url);
 	respondJson(res, 200, {
 		...basePayload,
@@ -9525,6 +9525,7 @@ function buildStudioUrl(
 	mode: StudioUiMode = "full",
 	doc?: InitialStudioDocument | null,
 	docId?: string,
+	options?: { skipWorkspaceRestore?: boolean },
 ): string {
 	const params = new URLSearchParams({ token });
 	if (mode !== "full") params.set("mode", mode);
@@ -9534,6 +9535,7 @@ function buildStudioUrl(
 	if (doc?.path) params.set("docPath", doc.path);
 	if (doc?.draftId) params.set("draftId", doc.draftId);
 	if (doc?.resourceDir) params.set("resourceDir", doc.resourceDir);
+	if (options?.skipWorkspaceRestore) params.set("skipWorkspaceRestore", "1");
 	return `http://127.0.0.1:${port}/?${params.toString()}`;
 }
 
@@ -9994,8 +9996,8 @@ ${cssVarsBlock}
                 <option value="cursor" selected>Context: editor only</option>
                 <option value="session">Context: editor + latest response</option>
               </select>
-              <button id="openCompanionBtn" type="button" title="Open a detached copy of the current editor text in a new editor-only Studio tab.">New editor</button>
-              <button id="sendEditorBtn" type="button">Send to pi editor</button>
+              <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>
             </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>
@@ -10116,7 +10118,7 @@ ${cssVarsBlock}
               <div class="scratchpad-header">
                 <div>
                   <h2 id="reviewNotesTitle">Comments</h2>
-                  <p class="scratchpad-description">Local comments for editor text and editor previews. They stay out of the text; source-anchored comments can be converted into inline <span class="review-notes-inline-token">[an: ...]</span> annotations.</p>
+                  <p class="scratchpad-description">Local comments for editor text and editor previews. They stay out of the text; can be converted into inline <span class="review-notes-inline-token">[an: ...]</span> annotations.</p>
                 </div>
                 <button id="reviewNotesCloseBtn" type="button" class="scratchpad-close-btn" aria-label="Hide comments" title="Hide comments">✕</button>
               </div>
@@ -10145,7 +10147,7 @@ ${cssVarsBlock}
     <section id="rightPane">
       <div id="rightSectionHeader" class="section-header">
         <div class="section-header-main">
-          <select id="rightViewSelect" aria-label="Response view mode" title="Right pane view mode. Shortcut: F7 when the right pane is active; F6 switches panes.">
+          <select id="rightViewSelect" aria-label="Response view mode" title="Right pane view mode. F7 cycles when the right pane is active; Cmd/Ctrl+Alt+P switches directly to Preview.">
             <option value="markdown">Response (Raw)</option>
             <option value="preview" selected>Response (Preview)</option>
             <option value="editor-preview">Editor (Preview)</option>
@@ -10237,6 +10239,7 @@ ${cssVarsBlock}
           <dl>
             <div><dt>F6</dt><dd>Switch between editor and right pane</dd></div>
             <div><dt>F7 / Shift+F7</dt><dd>Cycle the active pane's view</dd></div>
+            <div><dt>Cmd/Ctrl+Alt+P</dt><dd>Switch the right pane directly to Preview</dd></div>
             <div><dt>F8</dt><dd>Focus editor text</dd></div>
             <div><dt>Shift+F8</dt><dd>Focus right-pane content</dd></div>
             <div><dt>F9</dt><dd>Toggle Zen mode</dd></div>
@@ -10932,10 +10935,11 @@ export default function (pi: ExtensionAPI) {
 		};
 	};
 
-	const broadcastResponseHistory = () => {
+	const broadcastResponseHistory = (extra?: Record<string, unknown>) => {
 		broadcast({
 			type: "response_history",
 			items: studioResponseHistory,
+			...(extra ?? {}),
 		});
 	};
 
@@ -11696,7 +11700,7 @@ export default function (pi: ExtensionAPI) {
 				resourceDir,
 			};
 			const docId = storeTransientStudioDocument(document);
-			const url = buildStudioUrl(serverState.port, serverState.token, "editor-only", document, docId);
+			const url = buildStudioUrl(serverState.port, serverState.token, "editor-only", document, docId, { skipWorkspaceRestore: true });
 			const parsedUrl = new URL(url);
 			sendToClient(client, {
 				type: "editor_only_ready",
@@ -11704,8 +11708,8 @@ export default function (pi: ExtensionAPI) {
 				url,
 				relativeUrl: `${parsedUrl.pathname}${parsedUrl.search}`,
 				message: hasContent
-					? "Companion editor is ready with a detached copy of the current editor text."
-					: "Blank companion editor is ready.",
+					? "Editor tab is ready with a detached copy of the current editor text."
+					: "Blank editor tab is ready.",
 			});
 			return;
 		}
@@ -13070,7 +13074,7 @@ export default function (pi: ExtensionAPI) {
 					resourceDir: dirname(exportedPath),
 				};
 				const docId = storeTransientStudioDocument(document);
-				const url = buildStudioUrl(serverState.port, serverState.token, "editor-only", document, docId);
+				const url = buildStudioUrl(serverState.port, serverState.token, "editor-only", document, docId, { skipWorkspaceRestore: true });
 				const parsedUrl = new URL(url);
 				respondJson(res, 200, {
 					ok: true,
@@ -13217,7 +13221,7 @@ export default function (pi: ExtensionAPI) {
 					draftId: exportedPath ? undefined : createStudioDraftId(),
 				};
 				const docId = storeTransientStudioDocument(document);
-				const url = buildStudioUrl(serverState.port, serverState.token, "editor-only", document, docId);
+				const url = buildStudioUrl(serverState.port, serverState.token, "editor-only", document, docId, { skipWorkspaceRestore: true });
 				const parsedUrl = new URL(url);
 				respondJson(res, 200, {
 					ok: true,
@@ -13838,13 +13842,32 @@ export default function (pi: ExtensionAPI) {
 	});
 
 
-	pi.on("session_tree", async (_event, ctx) => {
+	pi.on("session_tree", async (event, ctx) => {
 		latestModelRequestCtx = ctx;
-		hydrateLatestAssistant(ctx.sessionManager.getBranch());
+		const branchEntries = ctx.sessionManager.getBranch();
+		hydrateLatestAssistant(branchEntries);
 		refreshRuntimeMetadata({ cwd: ctx.cwd, model: ctx.model });
 		refreshContextUsage(ctx);
-		broadcastResponseHistory();
+		emitDebugEvent("session_tree", {
+			oldLeafId: event.oldLeafId ?? null,
+			newLeafId: event.newLeafId ?? null,
+			branchEntryCount: branchEntries.length,
+			responseHistoryCount: studioResponseHistory.length,
+		});
+		broadcastResponseHistory({
+			reason: "tree",
+			oldLeafId: event.oldLeafId ?? null,
+			newLeafId: event.newLeafId ?? null,
+			responseHistoryCount: studioResponseHistory.length,
+		});
 		broadcastState();
+		broadcast({
+			type: "info",
+			level: "info",
+			message: studioResponseHistory.length > 0
+				? "Pi session tree changed; Studio response history now follows the current branch. Editor text was left unchanged."
+				: "Pi session tree changed; this branch has no assistant responses yet. Editor text was left unchanged.",
+		});
 	});
 
 	pi.on("model_select", async (event, ctx) => {

package/package.json

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