pi-studio 0.9.4 → 0.9.6

package/client/studio-client.js

@@ -237,6 +237,7 @@
       const HTML_EXPORT_FETCH_TIMEOUT_MS = 180_000;
       const EDITOR_TAB_TEXT = "  ";
       const QUIZ_DEFAULT_COUNT = 5;
+      const QUIZ_SCOPES = ["editor", "selection", "file", "folder", "repo"];
       const QUIZ_ANGLES = ["general", "scientist", "mathematician", "statistician", "developer", "reviewer"];
       const QUIZ_THINKING_LEVELS = ["off", "minimal", "low", "medium", "high"];
       let quizOverlayEl = null;
@@ -249,6 +250,11 @@
         pending: false,
         sourceText: "",
         sourceLabel: "Studio editor",
+        sourcePath: "",
+        contextPath: "",
+        resourceDir: "",
+        focusPrompt: "",
+        includeEditorContext: false,
         scope: "editor",
         angle: "general",
         thinking: "minimal",
@@ -286,27 +292,33 @@
           return "raw";
         }
       })();
+      function normalizeReplJournalEntry(entry) {
+        if (!entry || typeof entry !== "object") return null;
+        const normalized = {
+          id: typeof entry.id === "string" && entry.id ? entry.id : ("repl-journal-" + Date.now().toString(36) + "-" + Math.random().toString(36).slice(2, 8)),
+          requestId: typeof entry.requestId === "string" ? entry.requestId : "",
+          createdAt: typeof entry.createdAt === "number" && Number.isFinite(entry.createdAt) ? entry.createdAt : Date.now(),
+          updatedAt: typeof entry.updatedAt === "number" && Number.isFinite(entry.updatedAt) ? entry.updatedAt : Date.now(),
+          sessionName: typeof entry.sessionName === "string" ? entry.sessionName : "",
+          runtime: typeof entry.runtime === "string" ? entry.runtime : "python",
+          label: typeof entry.label === "string" ? entry.label : "REPL send",
+          mode: typeof entry.mode === "string" ? entry.mode : "raw",
+          prose: typeof entry.prose === "string" ? entry.prose : "",
+          code: typeof entry.code === "string" ? entry.code : "",
+          output: typeof entry.output === "string" ? entry.output : "",
+          beforeTranscript: "",
+          status: typeof entry.status === "string" ? entry.status : "sent",
+          skippedChunks: Math.max(0, Math.floor(Number(entry.skippedChunks) || 0)),
+        };
+        return (normalized.code.trim() || normalized.prose.trim() || normalized.output.trim()) ? normalized : null;
+      }
+
       function loadPersistedReplJournalEntries() {
         try {
           const raw = window.localStorage ? window.localStorage.getItem("piStudio.replStudioEntries.v1") : null;
           const parsed = raw ? JSON.parse(raw) : [];
           if (!Array.isArray(parsed)) return [];
-          return parsed.map((entry) => ({
-            id: typeof entry.id === "string" && entry.id ? entry.id : ("repl-journal-" + Date.now().toString(36) + "-" + Math.random().toString(36).slice(2, 8)),
-            requestId: typeof entry.requestId === "string" ? entry.requestId : "",
-            createdAt: typeof entry.createdAt === "number" && Number.isFinite(entry.createdAt) ? entry.createdAt : Date.now(),
-            updatedAt: typeof entry.updatedAt === "number" && Number.isFinite(entry.updatedAt) ? entry.updatedAt : Date.now(),
-            sessionName: typeof entry.sessionName === "string" ? entry.sessionName : "",
-            runtime: typeof entry.runtime === "string" ? entry.runtime : "python",
-            label: typeof entry.label === "string" ? entry.label : "REPL send",
-            mode: typeof entry.mode === "string" ? entry.mode : "raw",
-            prose: typeof entry.prose === "string" ? entry.prose : "",
-            code: typeof entry.code === "string" ? entry.code : "",
-            output: typeof entry.output === "string" ? entry.output : "",
-            beforeTranscript: "",
-            status: typeof entry.status === "string" ? entry.status : "sent",
-            skippedChunks: Math.max(0, Math.floor(Number(entry.skippedChunks) || 0)),
-          })).filter((entry) => entry.code.trim() || entry.prose.trim() || entry.output.trim()).slice(-REPL_JOURNAL_MAX_ENTRIES);
+          return parsed.map(normalizeReplJournalEntry).filter(Boolean).slice(-REPL_JOURNAL_MAX_ENTRIES);
         } catch {
           return [];
         }
@@ -336,6 +348,47 @@
         }
       }
 
+      function mergeReplJournalEntries(entries) {
+        if (!Array.isArray(entries) || !entries.length) return false;
+        let changed = false;
+        const next = [...replJournalEntries];
+        for (const rawEntry of entries) {
+          const entry = normalizeReplJournalEntry(rawEntry);
+          if (!entry) continue;
+          const existingIndex = next.findIndex((candidate) => (
+            (entry.requestId && candidate.requestId === entry.requestId)
+            || candidate.id === entry.id
+          ));
+          if (existingIndex >= 0) {
+            const existing = next[existingIndex];
+            const merged = {
+              ...existing,
+              ...entry,
+              label: existing.label || entry.label,
+              mode: existing.mode || entry.mode,
+              prose: existing.prose || entry.prose,
+              beforeTranscript: existing.beforeTranscript || "",
+              createdAt: existing.createdAt || entry.createdAt,
+              updatedAt: Math.max(existing.updatedAt || 0, entry.updatedAt || 0),
+              skippedChunks: existing.skippedChunks || entry.skippedChunks,
+            };
+            if (JSON.stringify(existing) !== JSON.stringify(merged)) {
+              next[existingIndex] = merged;
+              changed = true;
+            }
+          } else {
+            next.push(entry);
+            changed = true;
+          }
+        }
+        if (!changed) return false;
+        replJournalEntries = next
+          .sort((a, b) => (a.createdAt || 0) - (b.createdAt || 0))
+          .slice(-REPL_JOURNAL_MAX_ENTRIES);
+        persistReplJournalEntries();
+        return true;
+      }
+
       let replJournalEntries = loadPersistedReplJournalEntries();
       let activeReplJournalEntryId = "";
       let replJournalCollapsed = (() => {
@@ -919,6 +972,27 @@
         return String(value || "").trim().toLowerCase() === "literate" ? "literate" : "raw";
       }
 
+      function isMacShortcutPlatform() {
+        try {
+          const platform = String((navigator && navigator.platform) || "");
+          return /Mac|iPhone|iPad|iPod/i.test(platform);
+        } catch {
+          return true;
+        }
+      }
+
+      function getStudioShortcutLabel(kind) {
+        const mac = isMacShortcutPlatform();
+        if (kind === "repl-send") return mac ? "⇧⌘↵" : "Ctrl+Shift+Enter";
+        if (kind === "run") return mac ? "⌘↵" : "Ctrl+Enter";
+        return "";
+      }
+
+      function withStudioShortcutLabel(label, kind) {
+        const shortcut = getStudioShortcutLabel(kind);
+        return shortcut ? (label + " " + shortcut) : label;
+      }
+
       function setReplSendMode(mode) {
         replSendMode = normalizeReplSendMode(mode);
         if (replSendModeSelect) replSendModeSelect.value = replSendMode;
@@ -1005,9 +1079,18 @@
       function setActiveReplSession(sessionName) {
         const name = String(sessionName || "").trim();
         if (!name) {
+          if (replActiveSessionName) {
+            replTranscript = "";
+            replCapturedAt = 0;
+          }
           replActiveSessionName = "";
           return;
         }
+        if (replActiveSessionName && replActiveSessionName !== name) {
+          replTranscript = "";
+          replCapturedAt = 0;
+          activeReplJournalEntryId = "";
+        }
         replActiveSessionName = name;
       }
 
@@ -1266,7 +1349,7 @@
 
         const allBlocks = parseMarkdownCodeFences(range.raw);
         if (allBlocks.length) {
-          return { error: "Place the cursor inside a code chunk, select text, or use Run all chunks. Switch send mode to Raw send to send the full editor." };
+          return buildAllChunksReplSendPayload();
         }
 
         return {
@@ -1404,6 +1487,24 @@
         return isEcho ? lines.slice(1).join("\n").replace(/^\s+/, "") : value;
       }
 
+      function stripStudioReplSubmissionEcho(delta) {
+        let value = String(delta || "").replace(/^\s+/, "");
+        // The raw mirror below remains raw; REPL Studio cards hide only the
+        // temp-file wrapper used to submit multiline snippets safely. The
+        // pi-studio-re fragment catches IPython's wrapped pi-studio-repl paths.
+        const submissionEchoPatterns = [
+          /^.*exec\(open\([\s\S]*?pi-studio-re[\s\S]*?globals\(\)\)\s*$/gm,
+          /^.*include\([\s\S]*?pi-studio-re[\s\S]*?\.jl"\)\s*$/gm,
+          /^.*source\([\s\S]*?pi-studio-re[\s\S]*?local\s*=\s*\.GlobalEnv\)\s*$/gm,
+          /^.*:script\s+[\s\S]*?pi-studio-re[\s\S]*?\.ghci"?\s*$/gm,
+          /^.*\(do\s+\(load-file\s+[\s\S]*?pi-studio-re[\s\S]*?:pi-studio\/silent\)\s*$/gm,
+        ];
+        for (const pattern of submissionEchoPatterns) {
+          value = value.replace(pattern, "");
+        }
+        return value.replace(/^(?:\s*\n)+/, "");
+      }
+
       function stripTrailingReplPromptsFromOutput(output) {
         const lines = String(output || "").replace(/\r\n/g, "\n").split("\n");
         while (lines.length > 0 && /^\s*(?:>>>|\.\.\.|In \[\d+\]:|julia>|>|\+|ghci>|Prelude>|\*?[A-Za-z0-9_.:]+>|[^\s>]+=>)\s*$/.test(lines[lines.length - 1] || "")) {
@@ -1420,7 +1521,10 @@
       }
 
       function cleanReplCapturedOutput(delta, entry) {
-        return trimReplJournalOutput(stripTrailingReplPromptsFromOutput(stripSubsequentReplInputsFromOutput(stripSubmittedCodeEchoFromReplDelta(delta, entry))));
+        const withoutSubmissionEcho = stripStudioReplSubmissionEcho(delta);
+        const withoutCodeEcho = stripSubmittedCodeEchoFromReplDelta(withoutSubmissionEcho, entry);
+        const withoutLaterInputs = stripSubsequentReplInputsFromOutput(withoutCodeEcho);
+        return trimReplJournalOutput(stripTrailingReplPromptsFromOutput(withoutLaterInputs));
       }
 
       function updateActiveReplJournalEntryFromTranscript(sessionName, transcript) {
@@ -1446,13 +1550,17 @@
         return fence + (language ? language : "") + "\n" + value.replace(/\s+$/, "") + "\n" + fence;
       }
 
-      function buildReplJournalMarkdown() {
-        const lines = ["# REPL Studio", "", "Generated: " + new Date().toLocaleString(), ""];
-        if (!replJournalEntries.length) {
-          lines.push("_No REPL Studio entries yet._");
+      function buildReplJournalMarkdown(entries) {
+        const visibleEntries = Array.isArray(entries) ? entries : getVisibleReplJournalEntries();
+        const sessionName = getActiveReplJournalSessionName();
+        const lines = ["# REPL Studio", "", "Generated: " + new Date().toLocaleString()];
+        if (sessionName) lines.push("Session: `" + sessionName + "`");
+        lines.push("");
+        if (!visibleEntries.length) {
+          lines.push(sessionName ? ("_No REPL Studio entries for `" + sessionName + "` yet._") : "_No REPL Studio entries yet._");
           return lines.join("\n");
         }
-        replJournalEntries.forEach((entry, index) => {
+        visibleEntries.forEach((entry, index) => {
           lines.push("## " + (index + 1) + ". " + (entry.label || "REPL entry"));
           lines.push("");
           lines.push("- Time: " + new Date(entry.createdAt || Date.now()).toLocaleString());
@@ -1479,53 +1587,62 @@
       }
 
       async function copyReplJournalToClipboard() {
-        if (!replJournalEntries.length) {
-          setStatus("No REPL Studio entries to copy yet.", "warning");
+        const entries = getVisibleReplJournalEntries();
+        if (!entries.length) {
+          setStatus("No REPL Studio entries to copy for this session yet.", "warning");
           return;
         }
-        if (await writeTextToClipboard(buildReplJournalMarkdown())) {
-          setStatus("Copied REPL Studio as Markdown.", "success");
+        if (await writeTextToClipboard(buildReplJournalMarkdown(entries))) {
+          setStatus("Copied REPL Studio session as Markdown.", "success");
         } else {
           setStatus("Clipboard write failed.", "warning");
         }
       }
 
       function exportReplJournalMarkdown() {
-        if (!replJournalEntries.length) {
-          setStatus("No REPL Studio entries to export yet.", "warning");
+        const entries = getVisibleReplJournalEntries();
+        if (!entries.length) {
+          setStatus("No REPL Studio entries to export for this session yet.", "warning");
           return;
         }
-        const blob = new Blob([buildReplJournalMarkdown()], { type: "text/markdown;charset=utf-8" });
+        const blob = new Blob([buildReplJournalMarkdown(entries)], { type: "text/markdown;charset=utf-8" });
         const blobUrl = URL.createObjectURL(blob);
         const link = document.createElement("a");
         const stamp = new Date().toISOString().replace(/[:.]/g, "-").slice(0, 19);
+        const sessionSlug = getActiveReplJournalSessionName().replace(/[^-_.A-Za-z0-9]+/g, "-");
         link.href = blobUrl;
-        link.download = "repl-studio-" + stamp + ".md";
+        link.download = "repl-studio" + (sessionSlug ? "-" + sessionSlug : "") + "-" + stamp + ".md";
         document.body.appendChild(link);
         link.click();
         link.remove();
         window.setTimeout(() => URL.revokeObjectURL(blobUrl), 1000);
-        setStatus("Exported REPL Studio Markdown.", "success");
+        setStatus("Exported REPL Studio session Markdown.", "success");
       }
 
       function clearReplJournal() {
-        replJournalEntries = [];
+        const sessionName = getActiveReplJournalSessionName();
+        if (sessionName) {
+          replJournalEntries = replJournalEntries.filter((entry) => entry.sessionName !== sessionName);
+        } else {
+          replJournalEntries = [];
+        }
         activeReplJournalEntryId = "";
         persistReplJournalEntries();
-        setStatus("Cleared REPL Studio.", "success");
+        setStatus(sessionName ? "Cleared REPL Studio for this session." : "Cleared REPL Studio.", "success");
         renderReplViewIfActive({ force: true });
       }
 
       function loadReplJournalIntoEditor() {
-        if (!replJournalEntries.length) {
-          setStatus("No REPL Studio entries to load yet.", "warning");
+        const entries = getVisibleReplJournalEntries();
+        if (!entries.length) {
+          setStatus("No REPL Studio entries to load for this session yet.", "warning");
           return;
         }
-        const markdown = buildReplJournalMarkdown();
+        const markdown = buildReplJournalMarkdown(entries);
         setEditorText(markdown, { preserveScroll: false, preserveSelection: false });
         setSourceState({ source: "blank", label: "REPL Studio", path: null });
         setEditorLanguage("markdown");
-        setStatus("Loaded REPL Studio into editor.", "success");
+        setStatus("Loaded REPL Studio session into editor.", "success");
       }
 
       function addSelectedReplJournalNote() {
@@ -2095,13 +2212,16 @@
         const actionLineOneEl = makeStudioUiRefreshElement("div", "studio-refresh-action-line");
         if (!isEditorOnlyMode && sendRunBtn) actionLineOneEl.appendChild(sendRunBtn);
         if (!isEditorOnlyMode && queueSteerBtn) actionLineOneEl.appendChild(queueSteerBtn);
-        if (!isEditorOnlyMode && sendReplBtn) actionLineOneEl.appendChild(sendReplBtn);
-        if (!isEditorOnlyMode && replSendModeSelect) actionLineOneEl.appendChild(replSendModeSelect);
+        const replActionLineEl = makeStudioUiRefreshElement("div", "studio-refresh-action-line repl-action-line");
+        replActionLineEl.hidden = true;
+        if (!isEditorOnlyMode && sendReplBtn) replActionLineEl.appendChild(sendReplBtn);
+        if (!isEditorOnlyMode && replSendModeSelect) replActionLineEl.appendChild(replSendModeSelect);
         const actionLineTwoEl = makeStudioUiRefreshElement("div", "studio-refresh-action-line");
         actionLineTwoEl.appendChild(copyDraftBtn);
         if (openCompanionBtn) actionLineTwoEl.appendChild(openCompanionBtn);
         if (!isEditorOnlyMode && sendEditorBtn) actionLineTwoEl.appendChild(sendEditorBtn);
         if (actionLineOneEl.childNodes.length > 0) actionsEl.appendChild(actionLineOneEl);
+        if (replActionLineEl.childNodes.length > 0) actionsEl.appendChild(replActionLineEl);
         actionsEl.appendChild(actionLineTwoEl);
 
         const stateEl = makeStudioUiRefreshElement("div", "studio-refresh-toolbar-state");
@@ -3119,6 +3239,7 @@
           && event.shiftKey
           && activePane === "left"
           && !isEditorOnlyMode
+          && rightView === "repl"
         ) {
           event.preventDefault();
           if (sendReplBtn && !sendReplBtn.hidden && !sendReplBtn.disabled) {
@@ -5006,6 +5127,18 @@
           }
           return;
         }
+        if (action === "copy-attach-command") {
+          const session = getActiveReplSession();
+          const text = getReplAttachCommand(session);
+          if (!text.trim()) {
+            setStatus("Start or select a REPL session first.", "warning");
+            return;
+          }
+          void writeTextToClipboard(text).then((ok) => {
+            setStatus(ok ? "Copied tmux attach command." : "Clipboard write failed.", ok ? "success" : "warning");
+          });
+          return;
+        }
         if (action === "run-all-chunks") {
           sendEditorTextToRepl({ action: "all-chunks" });
           return;
@@ -5327,8 +5460,9 @@
           setStatus("Switch right pane to Response (Preview), Editor (Preview), or REPL Studio to export PDF.", "warning");
           return;
         }
-        if (exportingReplJournal && !replJournalEntries.length) {
-          setStatus("No REPL Studio entries to export yet.", "warning");
+        const replJournalExportEntries = exportingReplJournal ? getVisibleReplJournalEntries() : [];
+        if (exportingReplJournal && !replJournalExportEntries.length) {
+          setStatus("No REPL Studio entries to export for this session yet.", "warning");
           return;
         }
 
@@ -5339,7 +5473,7 @@
         }
 
         const markdown = exportingReplJournal
-          ? buildReplJournalMarkdown()
+          ? buildReplJournalMarkdown(replJournalExportEntries)
           : (rightView === "editor-preview"
             ? prepareEditorTextForPdfExport(sourceTextEl.value)
             : prepareEditorTextForPreview(latestResponseMarkdown));
@@ -5499,13 +5633,14 @@
           setStatus("Switch right pane to Response (Preview), Editor (Preview), or REPL Studio to export HTML.", "warning");
           return;
         }
-        if (exportingReplJournal && !replJournalEntries.length) {
-          setStatus("No REPL Studio entries to export yet.", "warning");
+        const replJournalExportEntries = exportingReplJournal ? getVisibleReplJournalEntries() : [];
+        if (exportingReplJournal && !replJournalExportEntries.length) {
+          setStatus("No REPL Studio entries to export for this session yet.", "warning");
           return;
         }
 
         const htmlArtifactSource = exportingReplJournal ? "" : getRightPaneHtmlArtifactSource();
-        const markdown = exportingReplJournal ? buildReplJournalMarkdown() : (htmlArtifactSource || (rightView === "editor-preview"
+        const markdown = exportingReplJournal ? buildReplJournalMarkdown(replJournalExportEntries) : (htmlArtifactSource || (rightView === "editor-preview"
           ? prepareEditorTextForHtmlExport(sourceTextEl.value)
           : prepareEditorTextForPreview(latestResponseMarkdown)));
         if (!markdown || !markdown.trim()) {
@@ -6003,8 +6138,24 @@
         return remaining < 56;
       }
 
+      function getActiveReplJournalSessionName() {
+        return String(replActiveSessionName || "").trim();
+      }
+
+      function getVisibleReplJournalEntries() {
+        const sessionName = getActiveReplJournalSessionName();
+        if (!sessionName) return replJournalEntries;
+        return replJournalEntries.filter((entry) => entry.sessionName === sessionName);
+      }
+
+      function getHiddenReplJournalEntryCount() {
+        const sessionName = getActiveReplJournalSessionName();
+        if (!sessionName) return 0;
+        return replJournalEntries.filter((entry) => entry.sessionName && entry.sessionName !== sessionName).length;
+      }
+
       function isReplJournalExpanded() {
-        return rightView === "repl" && !replJournalCollapsed && replJournalEntries.length > 0;
+        return rightView === "repl" && !replJournalCollapsed && getVisibleReplJournalEntries().length > 0;
       }
 
       function shouldAutoStickReplView() {
@@ -6190,23 +6341,26 @@
 
       function buildReplStudioActionsHtml() {
         if (replJournalCollapsed) return "";
-        const hasEntries = replJournalEntries.length > 0;
+        const hasEntries = getVisibleReplJournalEntries().length > 0;
         const buttons = "<button type='button' data-repl-action='load-journal'" + (hasEntries ? "" : " disabled") + ">Load in editor</button>"
           + "<button type='button' data-repl-action='copy-journal'" + (hasEntries ? "" : " disabled") + ">Copy Markdown</button>"
           + "<button type='button' data-repl-action='export-journal'" + (hasEntries ? "" : " disabled") + ">Export .md</button>"
-          + "<button type='button' data-repl-action='clear-journal'" + (hasEntries ? "" : " disabled") + ">Clear</button>";
+          + "<button type='button' data-repl-action='clear-journal'" + (hasEntries ? "" : " disabled") + ">Clear session</button>";
         return "<div class='repl-studio-below-actions'><div class='repl-journal-actions'>" + buttons + "</div></div>";
       }
 
       function buildReplJournalHtml(transcript) {
-        const hasEntries = replJournalEntries.length > 0;
-        const entryCount = replJournalEntries.length;
+        const visibleEntries = getVisibleReplJournalEntries();
+        const hasEntries = visibleEntries.length > 0;
+        const entryCount = visibleEntries.length;
+        const hiddenEntryCount = getHiddenReplJournalEntryCount();
+        const sessionName = getActiveReplJournalSessionName();
         const collapsedClass = replJournalCollapsed ? " is-collapsed" : "";
         const toggleButton = "<button type='button' data-repl-action='journal-toggle' aria-expanded='" + (replJournalCollapsed ? "false" : "true") + "'>" + (replJournalCollapsed ? "Show REPL Studio" : "Hide REPL Studio") + "</button>";
         const toggleActions = "<div class='repl-journal-actions'>" + toggleButton + "</div>";
         const summaryText = hasEntries
-          ? (entryCount + " Studio entr" + (entryCount === 1 ? "y" : "ies") + ". Export is Markdown.")
-          : "Studio-sent code and notes will appear here.";
+          ? (entryCount + " Studio entr" + (entryCount === 1 ? "y" : "ies") + (sessionName ? " for " + sessionName : "") + ". Export is Markdown.")
+          : (sessionName ? "No Studio entries for " + sessionName + "." : "Studio-sent code and notes will appear here.");
         if (replJournalCollapsed) {
           return "<section class='repl-journal repl-journal-compact" + collapsedClass + "'>"
             + "<div class='repl-journal-compact-row'>"
@@ -6215,12 +6369,12 @@
             + "</div>"
             + "</section>";
         }
-        const omitted = Math.max(0, replJournalEntries.length - 12);
+        const omitted = Math.max(0, visibleEntries.length - 12);
         const bannerText = extractReplStudioBanner(transcript, getActiveReplRuntime());
         const banner = bannerText
           ? "<pre class='repl-studio-banner'>" + escapeHtml(bannerText) + "</pre>"
           : "";
-        const cards = replJournalEntries.slice(-12).map((entry) => {
+        const cards = visibleEntries.slice(-12).map((entry) => {
           const meta = buildReplStudioMeta(entry);
           const prompt = getReplStudioPrompt(entry.runtime);
           const codeText = String(entry.code || "").trimEnd();
@@ -6246,11 +6400,17 @@
             + pending
             + "</article>";
         }).join("");
+        const emptyText = sessionName
+          ? (String(transcript || "").trim()
+            ? "No REPL Studio entries for this tmux session yet. The raw tmux mirror below still has this session's history; send code from Studio to build a clean record."
+            : "No REPL Studio entries for this tmux session yet. Send code from the editor, or use More → Add note (Literate send) to record prose.")
+          : "No REPL Studio entries yet. Send code from the editor, or use More → Add note (Literate send) to record prose.";
         const terminalContent = banner
-          + (hasEntries ? cards : "<div class='repl-studio-empty'>No REPL Studio entries yet. Send code from the editor, or use More → Add note (Literate send) to record prose.</div>");
+          + (hasEntries ? cards : "<div class='repl-studio-empty'>" + escapeHtml(emptyText) + "</div>");
         return "<section class='repl-journal'>"
-          + "<div class='repl-journal-header'><div><h3>REPL Studio</h3><p>Clean collaborative Studio REPL record. The raw tmux mirror is available below.</p></div>" + toggleActions + "</div>"
-          + (omitted ? "<div class='repl-journal-omitted'>Showing latest 12 entries; " + escapeHtml(String(omitted)) + " older entries remain in export.</div>" : "")
+          + "<div class='repl-journal-header'><div><h3>REPL Studio</h3><p>Clean collaborative Studio REPL record for the selected tmux session. The raw tmux mirror is available below.</p></div>" + toggleActions + "</div>"
+          + (hiddenEntryCount ? "<div class='repl-journal-omitted'>" + escapeHtml(String(hiddenEntryCount)) + " entr" + (hiddenEntryCount === 1 ? "y" : "ies") + " from other REPL sessions hidden.</div>" : "")
+          + (omitted ? "<div class='repl-journal-omitted'>Showing latest 12 entries for this session; " + escapeHtml(String(omitted)) + " older entries remain in export.</div>" : "")
           + "<div class='repl-journal-list'>" + terminalContent + "</div>"
           + "</section>";
       }
@@ -6278,6 +6438,11 @@
           + "</section>";
       }
 
+      function getReplAttachCommand(session) {
+        if (!session || !session.sessionName) return "";
+        return "tmux attach -t " + String(session.sessionName || "");
+      }
+
       function buildReplPanelHtml() {
         const runtimeOptions = [
           ["shell", "Shell"],
@@ -6313,6 +6478,7 @@
           + "<button type='button' data-repl-action='new-session'" + (replBusy || replTmuxAvailable === false ? " disabled" : "") + " title='Start a new additional session for this runtime.'>New session</button>"
           + "<button type='button' data-repl-action='stop-session'" + (canStopActiveSession ? "" : " disabled") + " title='Stop the selected Studio-owned REPL session.'>Stop session</button>"
           + "<button type='button' data-repl-action='interrupt'" + (activeSession && !replBusy ? "" : " disabled") + " title='Send Ctrl+C to the active REPL session.'>Interrupt</button>"
+          + "<button type='button' data-repl-action='copy-attach-command'" + (activeSession ? "" : " disabled") + " title='Copy command for attaching to this tmux session in a terminal.'>Copy attach command</button>"
           + "<button type='button' data-repl-action='run-all-chunks'" + (canSendToActiveSession ? "" : " disabled") + " title='Literate send: send all fenced code chunks matching the active REPL runtime.'>Run all chunks</button>"
           + "<button type='button' data-repl-action='journal-note' title='Add the selected prose/current paragraph to REPL Studio (Literate send) without sending it to the runtime.'>Add note</button>"
           + "<button type='button' data-repl-action='refresh'>Refresh</button>"
@@ -6590,8 +6756,9 @@
 
         const rightPaneShowsPreview = rightView === "preview" || rightView === "editor-preview";
         const exportingReplJournal = rightView === "repl";
+        const replJournalExportEntries = exportingReplJournal ? getVisibleReplJournalEntries() : [];
         const exportText = exportingReplJournal
-          ? (replJournalEntries.length ? buildReplJournalMarkdown() : "")
+          ? (replJournalExportEntries.length ? buildReplJournalMarkdown(replJournalExportEntries) : "")
           : (rightView === "editor-preview" ? prepareEditorTextForPreview(sourceTextEl.value) : latestResponseMarkdown);
         const canExportPreview = (rightPaneShowsPreview || exportingReplJournal) && Boolean(String(exportText || "").trim());
         const htmlArtifactExportSource = canExportPreview && !exportingReplJournal ? getRightPaneHtmlArtifactSource() : "";
@@ -6603,8 +6770,8 @@
             : (exportingReplJournal ? "Export REPL Studio" : "Export right preview");
           if (rightView === "trace") {
             exportPdfBtn.title = "Working view does not support preview export.";
-          } else if (exportingReplJournal && !replJournalEntries.length) {
-            exportPdfBtn.title = "No REPL Studio entries to export yet.";
+          } else if (exportingReplJournal && !replJournalExportEntries.length) {
+            exportPdfBtn.title = "No REPL Studio entries to export for this session yet.";
           } else if (rightView === "markdown") {
             exportPdfBtn.title = "Switch right pane to Response (Preview), Editor (Preview), or REPL Studio to export.";
           } else if (!canExportPreview) {
@@ -6634,7 +6801,7 @@
             ? (exportingReplJournal
               ? "Choose a format and export REPL Studio."
               : (isHtmlArtifactPreview ? "Export this HTML preview." : "Choose a format and export the current right-pane preview."))
-            : (exportingReplJournal ? "No REPL Studio entries to export yet." : "Switch right pane to a non-empty preview before exporting.");
+            : (exportingReplJournal ? "No REPL Studio entries to export for this session yet." : "Switch right pane to a non-empty preview before exporting.");
         }
         if (!canExportPreview || previewExportInProgress) {
           closeExportPreviewMenu();
@@ -7310,6 +7477,21 @@
         return "draft_" + makeRequestId();
       }
 
+      function normalizeQuizScope(scope) {
+        const value = String(scope || "").trim().toLowerCase();
+        return QUIZ_SCOPES.includes(value) ? value : "editor";
+      }
+
+      function getQuizScopeLabel(scope) {
+        switch (normalizeQuizScope(scope)) {
+          case "selection": return "Selection";
+          case "file": return "Current file";
+          case "folder": return "Folder";
+          case "repo": return "Repo";
+          default: return "Editor";
+        }
+      }
+
       function normalizeQuizAngle(angle) {
         const value = String(angle || "").trim().toLowerCase();
         return QUIZ_ANGLES.includes(value) ? value : "general";
@@ -7487,7 +7669,52 @@
 
       function getQuizSourceLabel(scope) {
         const base = sourceState && sourceState.label ? sourceState.label : "Studio editor";
-        return scope === "selection" ? base + " selection" : base;
+        const normalizedScope = normalizeQuizScope(scope);
+        if (normalizedScope === "selection") return base + " selection";
+        if (normalizedScope === "file") return base === "blank" ? "current file" : base;
+        if (normalizedScope === "folder") return "folder context";
+        if (normalizedScope === "repo") return "repo context";
+        return base;
+      }
+
+      function dirnameForDisplayPath(path) {
+        const value = String(path || "").replace(/\\/g, "/");
+        const index = value.lastIndexOf("/");
+        return index > 0 ? value.slice(0, index) : "";
+      }
+
+      function getCurrentResourceDirValue() {
+        return resourceDirInput ? String(resourceDirInput.value || "").trim() : "";
+      }
+
+      function getDefaultQuizContextPath(scope) {
+        const normalizedScope = normalizeQuizScope(scope);
+        const sourcePath = sourceState && sourceState.path ? String(sourceState.path) : "";
+        const resourceDir = getCurrentResourceDirValue();
+        if (normalizedScope === "file") return sourcePath || "";
+        if (normalizedScope === "folder") return resourceDir || dirnameForDisplayPath(sourcePath) || "";
+        if (normalizedScope === "repo") return sourcePath || resourceDir || "";
+        return "";
+      }
+
+      function isQuizContextScope(scope) {
+        const normalizedScope = normalizeQuizScope(scope);
+        return normalizedScope === "file" || normalizedScope === "folder" || normalizedScope === "repo";
+      }
+
+      function getQuizScopeFocusHint(scope) {
+        const normalizedScope = normalizeQuizScope(scope);
+        const focus = String(quizState.focusPrompt || "").toLowerCase();
+        const asksForCode = /\b(code|implementation|technical|source|actual code)\b/.test(focus);
+        const editorLang = normalizeFenceLanguage(editorLanguage || "");
+        const editorLooksLikeDoc = !editorLang || editorLang === "markdown" || editorLang === "latex";
+        if (asksForCode && (normalizedScope === "editor" || normalizedScope === "selection") && editorLooksLikeDoc) {
+          return "Focus guidance only applies to the selected scope. Choose Folder or Repo to include code files.";
+        }
+        if ((normalizedScope === "folder" || normalizedScope === "repo") && asksForCode) {
+          return "Code-focused guidance will prioritize source/test files over README and docs.";
+        }
+        return "";
       }
 
       function ensureQuizOverlay() {
@@ -7500,7 +7727,7 @@
         document.body.appendChild(quizOverlayEl);
         quizDialogEl = quizOverlayEl.querySelector(".studio-quiz-dialog");
         quizOverlayEl.addEventListener("click", (event) => {
-          if (event.target === quizOverlayEl) closeQuizOverlay();
+          if (event.target === quizOverlayEl) minimizeQuizOverlay();
         });
         quizDialogEl.addEventListener("input", (event) => {
           const target = event.target;
@@ -7510,6 +7737,15 @@
             if (card) card.answer = target.value;
             quizState.answer = target.value;
           }
+          if (target.matches("[data-quiz-field='contextPath']")) {
+            quizState.contextPath = target.value;
+          }
+          if (target.matches("[data-quiz-field='focusPrompt']")) {
+            quizState.focusPrompt = target.value;
+          }
+          if (target.matches("[data-quiz-field='includeEditorContext']")) {
+            quizState.includeEditorContext = Boolean(target.checked);
+          }
         });
         quizDialogEl.addEventListener("click", (event) => {
           const target = event.target instanceof Element ? event.target.closest("[data-quiz-action]") : null;
@@ -7517,6 +7753,13 @@
           event.preventDefault();
           handleQuizAction(target.getAttribute("data-quiz-action") || "");
         });
+        quizDialogEl.addEventListener("change", (event) => {
+          const target = event.target;
+          if (!(target instanceof HTMLElement) || !target.matches("[data-quiz-field]")) return;
+          if (target.matches("[data-quiz-field='contextPath']")) return;
+          readQuizSetupFields();
+          renderQuizOverlay({ preserveScroll: true });
+        });
         quizDialogEl.addEventListener("keydown", handleQuizKeydown);
         return quizOverlayEl;
       }
@@ -7524,16 +7767,25 @@
       function resetQuizStateFromEditor() {
         const previousAngle = normalizeQuizAngle(quizState.angle);
         const previousThinking = normalizeQuizThinking(quizState.thinking);
+        const previousFocusPrompt = String(quizState.focusPrompt || "");
+        const previousIncludeEditorContext = Boolean(quizState.includeEditorContext);
         const previousCount = quizState.questionCount || QUIZ_DEFAULT_COUNT;
         const selection = getEditorSelectionRange();
         const hasSelection = Boolean(selection.selected && selection.selected.trim());
         const scope = hasSelection ? "selection" : "editor";
+        const sourcePath = sourceState && sourceState.path ? String(sourceState.path) : "";
+        const resourceDir = getCurrentResourceDirValue();
         quizState = {
           open: true,
           requestId: null,
           pending: false,
           sourceText: hasSelection ? selection.selected : selection.raw,
           sourceLabel: getQuizSourceLabel(scope),
+          sourcePath,
+          contextPath: getDefaultQuizContextPath(scope),
+          resourceDir,
+          focusPrompt: previousFocusPrompt,
+          includeEditorContext: previousIncludeEditorContext,
           scope,
           angle: previousAngle,
           thinking: previousThinking,
@@ -7581,6 +7833,15 @@
         setStatus("Quiz minimized — use Review → Quiz me to resume.", "success");
       }
 
+      function endQuizOverlay() {
+        const hadResumableQuiz = hasResumableQuiz();
+        closeQuizOverlay();
+        resetQuizStateFromEditor();
+        quizState.open = false;
+        syncActionButtons();
+        if (hadResumableQuiz) setStatus("Quiz closed.", "success");
+      }
+
       function handleQuizKeydown(event) {
         if (!event) return;
         const key = typeof event.key === "string" ? event.key : "";
@@ -7624,18 +7885,25 @@
       }
 
       function renderQuizSetupHtml() {
-        const scope = quizState.scope === "selection" ? "selection" : "editor";
+        const scope = normalizeQuizScope(quizState.scope);
         const angle = normalizeQuizAngle(quizState.angle);
         const thinking = normalizeQuizThinking(quizState.thinking);
         const count = Math.max(1, Math.min(8, Math.floor(Number(quizState.questionCount) || QUIZ_DEFAULT_COUNT)));
         const selection = getEditorSelectionRange();
         const hasSelection = Boolean(selection.selected && selection.selected.trim());
+        const contextPath = String(quizState.contextPath || getDefaultQuizContextPath(scope) || "");
+        const includeEditorContext = Boolean(quizState.includeEditorContext);
+        const contextScope = isQuizContextScope(scope);
+        const contextScopeUsesEditor = scope === "file" || includeEditorContext;
+        const focusHint = getQuizScopeFocusHint(scope);
+        const scopeText = scope === "selection"
+          ? selection.selected
+          : ((scope === "editor" || contextScopeUsesEditor) ? selection.raw : "");
         return "<div class='studio-quiz-setup'>"
           + "<p class='studio-quiz-copy'>A short active-recall loop: answer one question, check it, ask about the card if useful, then move on.</p>"
           + "<div class='studio-quiz-fields'>"
           + "<label>Scope<select data-quiz-field='scope'>"
-          + renderQuizOption("editor", scope, "Editor")
-          + (hasSelection ? renderQuizOption("selection", scope, "Selection") : "")
+          + QUIZ_SCOPES.map((candidate) => candidate === "selection" && !hasSelection ? "" : renderQuizOption(candidate, scope, getQuizScopeLabel(candidate))).join("")
           + "</select></label>"
           + "<label>Angle<select data-quiz-field='angle'>"
           + QUIZ_ANGLES.map((candidate) => renderQuizOption(candidate, angle, getQuizAngleLabel(candidate))).join("")
@@ -7645,7 +7913,11 @@
           + "</select></label>"
           + "<label>Questions<input data-quiz-field='count' type='number' min='1' max='8' value='" + String(count) + "'></label>"
           + "</div>"
-          + "<div class='studio-quiz-source-note'>Source: " + escapeHtml(getQuizSourceLabel(scope)) + " · " + escapeHtml(String((scope === "selection" ? selection.selected : selection.raw).trim().length)) + " chars · Studio model: " + escapeHtml(getQuizModelLabel()) + "</div>"
+          + (contextScope ? "<label class='studio-quiz-context-path-label'>Context path<input data-quiz-field='contextPath' type='text' value='" + escapeHtml(contextPath) + "' placeholder='Folder, file, or repo path; blank uses Studio working directory'></label>" : "")
+          + ((scope === "folder" || scope === "repo") ? "<label class='studio-quiz-include-editor-label'><input data-quiz-field='includeEditorContext' type='checkbox'" + (includeEditorContext ? " checked" : "") + "> Include current editor text as an anchor</label>" : "")
+          + "<label class='studio-quiz-focus-label'>Focus guidance<textarea data-quiz-field='focusPrompt' rows='2' placeholder='Optional: e.g. focus on implementation details in code files; avoid README overview questions'>" + escapeHtml(quizState.focusPrompt || "") + "</textarea></label>"
+          + "<div class='studio-quiz-source-note'>Scope: " + escapeHtml(getQuizScopeLabel(scope)) + (scopeText.trim() ? " · " + escapeHtml(String(scopeText.trim().length)) + " active chars" : (scope === "folder" || scope === "repo" ? " · editor text excluded" : "")) + (contextScope && contextPath ? " · Context: " + escapeHtml(contextPath) : "") + " · Studio model: " + escapeHtml(getQuizModelLabel()) + "</div>"
+          + (focusHint ? "<div class='studio-quiz-hint'>" + escapeHtml(focusHint) + "</div>" : "")
           + (quizState.error ? "<div class='studio-quiz-error'>" + escapeHtml(quizState.error) + "</div>" : "")
           + (quizState.status ? "<div class='studio-quiz-status'>" + escapeHtml(quizState.status) + "</div>" : "")
           + "<div class='studio-quiz-actions'><button data-quiz-action='start' type='button'" + (quizState.pending ? " disabled" : "") + ">" + (quizState.pending ? "Generating…" : "Start quiz") + "</button></div>"
@@ -7705,7 +7977,7 @@
           + "<div><div class='studio-quiz-eyebrow'>Review</div><h2>Quiz me</h2></div>"
           + "<div class='studio-quiz-header-actions'>"
           + "<button class='studio-quiz-minimize' data-quiz-action='minimize' type='button'>Minimize</button>"
-          + "<button class='studio-quiz-close' data-quiz-action='close' type='button' aria-label='Close quiz'>Close</button>"
+          + "<button class='studio-quiz-close' data-quiz-action='close' type='button' aria-label='Close and discard quiz' title='Close and discard this quiz'>Close</button>"
           + "</div>"
           + "</div>"
           + bodyHtml;
@@ -7735,20 +8007,34 @@
         const angleEl = quizDialogEl.querySelector("[data-quiz-field='angle']");
         const thinkingEl = quizDialogEl.querySelector("[data-quiz-field='thinking']");
         const countEl = quizDialogEl.querySelector("[data-quiz-field='count']");
+        const contextPathEl = quizDialogEl.querySelector("[data-quiz-field='contextPath']");
+        const focusPromptEl = quizDialogEl.querySelector("[data-quiz-field='focusPrompt']");
+        const includeEditorContextEl = quizDialogEl.querySelector("[data-quiz-field='includeEditorContext']");
         const selection = getEditorSelectionRange();
-        const scope = scopeEl && scopeEl.value === "selection" && selection.selected.trim() ? "selection" : "editor";
+        let scope = normalizeQuizScope(scopeEl ? scopeEl.value : quizState.scope);
+        if (scope === "selection" && !selection.selected.trim()) scope = "editor";
+        const sourcePath = sourceState && sourceState.path ? String(sourceState.path) : "";
+        const resourceDir = getCurrentResourceDirValue();
         quizState.scope = scope;
         quizState.angle = normalizeQuizAngle(angleEl ? angleEl.value : quizState.angle);
         quizState.thinking = normalizeQuizThinking(thinkingEl ? thinkingEl.value : quizState.thinking);
         quizState.questionCount = Math.max(1, Math.min(8, Math.floor(Number(countEl ? countEl.value : quizState.questionCount) || QUIZ_DEFAULT_COUNT)));
-        quizState.sourceText = scope === "selection" ? selection.selected : selection.raw;
-        quizState.sourceLabel = getQuizSourceLabel(scope);
+        quizState.includeEditorContext = Boolean(includeEditorContextEl && includeEditorContextEl.checked);
+        const shouldSendEditorText = scope === "selection" || scope === "editor" || scope === "file" || quizState.includeEditorContext;
+        quizState.sourceText = scope === "selection" ? selection.selected : (shouldSendEditorText ? selection.raw : "");
+        quizState.sourceLabel = shouldSendEditorText ? (sourceState && sourceState.label ? sourceState.label : getQuizSourceLabel(scope)) : getQuizSourceLabel(scope);
+        quizState.sourcePath = sourcePath;
+        quizState.resourceDir = resourceDir;
+        quizState.contextPath = isQuizContextScope(scope)
+          ? String(contextPathEl ? contextPathEl.value : (quizState.contextPath || getDefaultQuizContextPath(scope)) || "").trim()
+          : "";
+        quizState.focusPrompt = String(focusPromptEl ? focusPromptEl.value : quizState.focusPrompt || "").trim();
       }
 
       function startQuizRequest() {
         readQuizSetupFields();
         const sourceText = String(quizState.sourceText || "").trim();
-        if (!sourceText) {
+        if (!sourceText && !isQuizContextScope(quizState.scope)) {
           quizState.error = "Quiz source is empty.";
           renderQuizOverlay({ preserveScroll: true });
           return;
@@ -7764,6 +8050,10 @@
           requestId,
           sourceText,
           sourceLabel: quizState.sourceLabel,
+          sourcePath: quizState.sourcePath || "",
+          contextPath: quizState.contextPath || "",
+          resourceDir: quizState.resourceDir || "",
+          focusPrompt: quizState.focusPrompt || "",
           scope: quizState.scope,
           angle: quizState.angle,
           thinking: quizState.thinking,
@@ -7847,7 +8137,7 @@
 
       function handleQuizAction(action) {
         if (action === "close") {
-          closeQuizOverlay();
+          endQuizOverlay();
           return;
         }
         if (action === "minimize") {
@@ -13056,7 +13346,7 @@
         if (isEditorOnlyMode) {
           if (sendRunBtn) {
             sendRunBtn.textContent = "Run editor text";
-            sendRunBtn.classList.remove("request-stop-active");
+            sendRunBtn.classList.remove("request-stop-active", "repl-secondary-action");
             sendRunBtn.disabled = true;
             sendRunBtn.title = "Run is unavailable in editor-only mode.";
           }
@@ -13069,6 +13359,9 @@
           if (sendReplBtn) {
             sendReplBtn.hidden = true;
             sendReplBtn.disabled = true;
+            sendReplBtn.classList.remove("repl-primary-action");
+            const replActionLine = sendReplBtn.closest(".repl-action-line");
+            if (replActionLine instanceof HTMLElement) replActionLine.hidden = true;
           }
           if (replSendModeSelect) {
             replSendModeSelect.hidden = true;
@@ -13089,11 +13382,12 @@
         }
 
         if (sendRunBtn) {
-          sendRunBtn.textContent = directIsStop ? "Stop" : "Run editor text";
+          sendRunBtn.textContent = directIsStop ? "Stop" : (rightView === "repl" ? withStudioShortcutLabel("Run editor text", "run") : "Run editor text");
           sendRunBtn.classList.toggle("request-stop-active", directIsStop);
+          sendRunBtn.classList.toggle("repl-secondary-action", rightView === "repl" && !directIsStop);
           sendRunBtn.disabled = wsState === "Disconnected" || (!directIsStop && (uiBusy || critiqueIsStop));
           const replHint = rightView === "repl" && getActiveReplSession()
-            ? " Includes active REPL identity for prompts that refer to it."
+            ? " Sends text to Pi, not the REPL; use Send chunk/selection or Send to REPL to execute code in the active REPL."
             : "";
           sendRunBtn.title = directIsStop
             ? "Stop the active run. Shortcut: Esc."
@@ -13113,22 +13407,27 @@
             : "Queue steering is available while Run editor text is active.";
         }
 
+        const hasReplSession = Boolean(getActiveReplSession());
         if (sendReplBtn) {
-          const hasSession = Boolean(getActiveReplSession());
-          sendReplBtn.hidden = rightView !== "repl";
-          sendReplBtn.disabled = wsState === "Disconnected" || uiBusy || replBusy || !hasSession;
-          sendReplBtn.title = hasSession
+          const showReplSend = rightView === "repl";
+          sendReplBtn.hidden = !showReplSend;
+          sendReplBtn.disabled = !showReplSend || wsState === "Disconnected" || uiBusy || replBusy || !hasReplSession;
+          sendReplBtn.classList.toggle("repl-primary-action", showReplSend);
+          sendReplBtn.textContent = showReplSend ? withStudioShortcutLabel(replSendMode === "literate" ? "Send selection/chunks" : "Send to REPL", "repl-send") : "Send to REPL";
+          sendReplBtn.title = hasReplSession
             ? (replSendMode === "literate"
-              ? "Literate send: selected code/prose, or the current fenced code chunk. Shortcut: Cmd/Ctrl+Shift+Enter."
+              ? "Literate send: selection, current fenced code chunk, or all matching chunks if the cursor is outside a chunk. Shortcut: Cmd/Ctrl+Shift+Enter."
               : "Raw send: selection, or full editor if no selection. Shortcut: Cmd/Ctrl+Shift+Enter.")
             : "Start or select a REPL session in the right pane first.";
+          const replActionLine = sendReplBtn.closest(".repl-action-line");
+          if (replActionLine instanceof HTMLElement) replActionLine.hidden = !showReplSend;
         }
         if (replSendModeSelect) {
           replSendModeSelect.hidden = rightView !== "repl";
           replSendModeSelect.disabled = wsState === "Disconnected" || uiBusy || replBusy;
           replSendModeSelect.value = replSendMode;
           replSendModeSelect.title = replSendMode === "literate"
-            ? "Literate send: Send to REPL uses the selection/current fenced code chunk."
+            ? "Literate send: Send to REPL uses the selection, current fenced code chunk, or all matching chunks if the cursor is outside a chunk."
             : "Raw send: Send to REPL uses the selection, or full editor if no selection.";
         }
 
@@ -13478,6 +13777,7 @@
           if (typeof message.activeSessionName === "string" && message.activeSessionName.trim()) {
             setActiveReplSession(message.activeSessionName);
           }
+          const journalChanged = mergeReplJournalEntries(message.journalEntries);
           if (typeof message.transcript === "string") replTranscript = trimReplTranscript(message.transcript);
           if (typeof message.capturedAt === "number") replCapturedAt = message.capturedAt;
           replError = typeof message.replError === "string" ? message.replError : (typeof message.captureError === "string" ? message.captureError : "");
@@ -13492,6 +13792,7 @@
             || previousTranscript !== replTranscript
             || previousError !== replError
             || previousMessage !== replMessage
+            || journalChanged
             || (!previousCapturedAt && replCapturedAt);
           if (viewChanged) renderReplViewIfActive();
           updateReferenceBadge();
@@ -13503,9 +13804,10 @@
             setActiveReplSession(message.sessionName);
           }
           const changed = recordReplToolSend(message);
+          const journalChanged = mergeReplJournalEntries(message.journalEntries);
           if (typeof message.transcript === "string") replTranscript = trimReplTranscript(message.transcript);
           if (typeof message.capturedAt === "number") replCapturedAt = message.capturedAt;
-          if (changed) renderReplViewIfActive({ force: true });
+          if (changed || journalChanged) renderReplViewIfActive({ force: true });
           updateReferenceBadge();
           return;
         }
@@ -13528,13 +13830,13 @@
           if (typeof message.activeSessionName === "string" && message.activeSessionName.trim()) {
             setActiveReplSession(message.activeSessionName);
           }
-          let journalChanged = false;
+          let journalChanged = mergeReplJournalEntries(message.journalEntries);
           if (typeof message.transcript === "string") {
             replTranscript = trimReplTranscript(message.transcript);
             journalChanged = updateActiveReplJournalEntryFromTranscript(
               typeof message.activeSessionName === "string" && message.activeSessionName.trim() ? message.activeSessionName : replActiveSessionName,
               replTranscript
-            );
+            ) || journalChanged;
           }
           if (typeof message.capturedAt === "number") replCapturedAt = message.capturedAt;
           replError = typeof message.replError === "string" ? message.replError : "";
@@ -13557,6 +13859,7 @@
           replBusy = false;
           replMessage = "";
           replError = "";
+          mergeReplJournalEntries(message.journalEntries);
           if (typeof message.requestId === "string") {
             replJournalEntries = replJournalEntries.map((entry) => entry.requestId === message.requestId ? { ...entry, status: "sent", updatedAt: Date.now() } : entry);
             persistReplJournalEntries();
@@ -14635,10 +14938,6 @@
 
       if (quizBtn) {
         quizBtn.addEventListener("click", () => {
-          if (!hasResumableQuiz() && !String(sourceTextEl.value || "").trim()) {
-            setStatus("Add editor text before starting a quiz.", "warning");
-            return;
-          }
           openQuizOverlay();
         });
       }