@officexapp/vidfarm-devcli 0.21.12 → 0.21.14

package/dist/src/devcli/process-scan.js

@@ -0,0 +1,173 @@
+// Detect (and optionally reap) local vidfarm / hyperframes server processes.
+//
+// Two failure modes this exists for:
+//   1. Concurrency — a customer runs several local video jobs; `doctor` should
+//      show which serve/preview boxes are up and on what ports.
+//   2. Orphans — when the devcli is upgraded, renamed (e.g. @mevdragon →
+//      @officexapp), or its package dir is pruned, any still-running serve /
+//      hyperframes-preview process keeps holding its port but now executes from
+//      a DELETED path. Such a process serves broken assets forever (the classic
+//      "Studio bundle missing" / "Waiting for preview server…" hang) yet never
+//      exits. We flag those as `orphaned` (their script file no longer exists)
+//      so they can be reaped and the port reclaimed.
+//
+// Backend-free: only `node:child_process` (ps) + `node:fs`. POSIX only — on
+// win32 we return an empty list with a note rather than guessing at wmic.
+import { spawnSync } from "node:child_process";
+import { existsSync } from "node:fs";
+// A command line is one of OUR long-running local servers only if it drives a
+// `vidfarm serve` (or its `cli.js serve` runtime) or a `hyperframes preview`
+// server. Short-lived commands (`vidfarm jobs`, `vidfarm render`, …) are NOT
+// servers and must not appear — they hold no port and would only add noise.
+function classify(command) {
+    const c = command.toLowerCase();
+    const isPreview = /hyperframes\b.*\bpreview\b/.test(c) || /\bpreview\b\s.*--port/.test(c);
+    if (isPreview)
+        return "preview";
+    const isVidfarm = /\bvidfarm\b/.test(c) || /vidfarm-devcli/.test(c) || /\/cli\.js\b/.test(c);
+    if (isVidfarm && /\bserve\b/.test(c))
+        return "serve";
+    return null;
+}
+function parsePort(command) {
+    const m = command.match(/--port(?:[=\s]+)(\d{2,5})\b/);
+    if (m)
+        return Number(m[1]);
+    return null;
+}
+// Fallback when the command line carries no --port (the default port, or an
+// auto-advanced one): ask lsof for the pid's listening TCP socket. Best-effort
+// and cheap — one lsof per matched SERVER process, not per ps row.
+function detectListeningPort(pid) {
+    const lsof = spawnSync("lsof", ["-nP", "-a", "-p", String(pid), "-iTCP", "-sTCP:LISTEN", "-Fn"], {
+        encoding: "utf8",
+        timeout: 2_000
+    });
+    if (lsof.status !== 0 || !lsof.stdout)
+        return null;
+    // -Fn emits lines like `n*:3001` / `n127.0.0.1:3001` per listening socket.
+    const m = lsof.stdout.match(/^n.*:(\d{2,5})$/m);
+    return m ? Number(m[1]) : null;
+}
+// Pull the launched script path (the first `.../something.js` token after the
+// node executable) so we can test whether it still exists on disk.
+function parseScriptPath(command) {
+    const m = command.match(/\s(\/[^\s]+?\.(?:js|mjs|cjs))\b/);
+    return m ? m[1] : null;
+}
+/**
+ * Enumerate local vidfarm/hyperframes server processes via `ps`. Best-effort:
+ * any parsing failure yields an empty (but `supported:true`) list rather than
+ * throwing, so callers can treat this as advisory.
+ */
+export function scanLocalServers() {
+    if (process.platform === "win32") {
+        return { supported: false, note: "process scan is POSIX-only (macOS/Linux)", servers: [] };
+    }
+    const ps = spawnSync("ps", ["-Ao", "pid=,command="], { encoding: "utf8", maxBuffer: 8 * 1024 * 1024 });
+    if (ps.status !== 0 || !ps.stdout) {
+        return { supported: false, note: "could not run `ps`", servers: [] };
+    }
+    const servers = [];
+    for (const line of ps.stdout.split("\n")) {
+        const trimmed = line.trim();
+        if (!trimmed)
+            continue;
+        const spaceIdx = trimmed.indexOf(" ");
+        if (spaceIdx === -1)
+            continue;
+        const pid = Number(trimmed.slice(0, spaceIdx));
+        if (!Number.isInteger(pid))
+            continue;
+        const command = trimmed.slice(spaceIdx + 1).trim();
+        // Skip our own scanning invocation (the `ps` line itself and this grep-like
+        // command) and anything that isn't a vidfarm/hyperframes server.
+        const kind = classify(command);
+        if (!kind)
+            continue;
+        const scriptPath = parseScriptPath(command);
+        // Orphaned = launched from a script file that no longer exists on disk.
+        // Only assert this when we actually resolved a path (else unknown, not orphaned).
+        const orphaned = Boolean(scriptPath) && !existsSync(scriptPath);
+        servers.push({
+            pid,
+            command,
+            kind,
+            port: parsePort(command) ?? detectListeningPort(pid),
+            scriptPath,
+            orphaned,
+            isSelf: pid === process.pid
+        });
+    }
+    return { supported: true, servers };
+}
+/** True when `pid` is still alive (signal 0 probes without delivering). */
+export function isAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch (error) {
+        // ESRCH = gone; EPERM = alive but not ours to signal.
+        return error.code === "EPERM";
+    }
+}
+/**
+ * Reap the given pids (never self): SIGTERM first, then — after `graceMs` —
+ * SIGKILL any that ignored it. Returns per-pid outcomes with the strongest
+ * signal delivered and whether the process is confirmed gone. Async so the
+ * grace period doesn't block the event loop.
+ */
+export async function reapProcesses(pids, graceMs = 1500) {
+    const results = new Map();
+    const pending = [];
+    for (const pid of pids) {
+        if (pid === process.pid) {
+            results.set(pid, { pid, signal: null, killed: false, error: "refusing to kill self" });
+            continue;
+        }
+        try {
+            process.kill(pid, "SIGTERM");
+            results.set(pid, { pid, signal: "SIGTERM", killed: false });
+            pending.push(pid);
+        }
+        catch (error) {
+            const code = error.code;
+            // ESRCH → already gone (success); anything else → real failure.
+            results.set(pid, {
+                pid,
+                signal: null,
+                killed: code === "ESRCH",
+                error: code === "ESRCH" ? undefined : (error instanceof Error ? error.message : String(error))
+            });
+        }
+    }
+    if (pending.length > 0) {
+        await new Promise((resolve) => setTimeout(resolve, graceMs));
+        for (const pid of pending) {
+            const result = results.get(pid);
+            if (!isAlive(pid)) {
+                result.killed = true;
+                continue;
+            }
+            // Ignored SIGTERM — escalate to SIGKILL, which cannot be caught or
+            // ignored. A successful delivery (or ESRCH = already gone) means the
+            // process is reaped; we do NOT re-probe immediately because the kernel
+            // may not have torn it down yet (and a child pid lingers as a zombie
+            // until waited on). Only EPERM/other errors are real failures.
+            try {
+                process.kill(pid, "SIGKILL");
+                result.signal = "SIGKILL";
+                result.killed = true;
+            }
+            catch (error) {
+                const code = error.code;
+                result.killed = code === "ESRCH";
+                if (!result.killed)
+                    result.error = error instanceof Error ? error.message : String(error);
+            }
+        }
+    }
+    return pids.map((pid) => results.get(pid));
+}
+//# sourceMappingURL=process-scan.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@officexapp/vidfarm-devcli",
-  "version": "0.21.12",
+  "version": "0.21.14",
   "description": "Local bridge for the Vidfarm Trackpad Editor. `vidfarm serve <template_id>` boots the FULL editor on localhost (disk-backed records/storage, free in-process render); edit composition.html on disk (Claude Code, Codex, etc.) and the browser live-morphs it.",
   "type": "module",
   "bin": {
@@ -21,6 +21,8 @@
     "dist/src/devcli/local-backend.js",
     "dist/src/devcli/local-frontend-server.js",
     "dist/src/devcli/local-render.js",
+    "dist/src/devcli/port-utils.js",
+    "dist/src/devcli/process-scan.js",
     "dist/src/devcli/skills.js",
     "dist/src/devcli/speech.js",
     "dist/src/devcli/stills.js",

package/public/serve-shells/editor.html

@@ -1490,6 +1490,23 @@ html,body{margin:0;background:#050604;color:#fffbe6}
     setLeftMode('');   // show the conversation, not the Files/History drawer
     openThread(id);
   }
+  var hadHandoff = !!handoffThread;
+  // Sticky active thread per template so a page refresh reopens the SAME
+  // conversation instead of a blank chat (server routes deliberately never
+  // attach ?thread= to editor URLs — the browser owns "which chat is active").
+  function activeThreadKey() { return 'rk-chat-active:' + TEMPLATE_ID; }
+  function saveActiveThread(id) {
+    try { if (id) localStorage.setItem(activeThreadKey(), id); else localStorage.removeItem(activeThreadKey()); } catch (e) {}
+  }
+  var restoredActive = false;
+  function restoreActiveThread() {
+    if (restoredActive || hadHandoff) return;
+    restoredActive = true;
+    if (convo.length) return; // user already chatting — don't clobber
+    var saved = null;
+    try { saved = localStorage.getItem(activeThreadKey()); } catch (e) {}
+    if (saved) openThread(saved);
+  }
   var busy = false;
   var pendingAbort = null; // AbortController for the in-flight reply (Stop button)
 
@@ -1540,14 +1557,20 @@ html,body{margin:0;background:#050604;color:#fffbe6}
   // outgoing user turn — verbatim to what the SPA's own chat sends — so the agent
   // knows which fork to read (video_context) and mutate (editor_action). Only the
   // /editor dock has this bridge; elsewhere it returns ''.
+  // Async: the Option-B bridge's getSnapshot() returns a PROMISE (it re-reads the
+  // composition through the files API). The old sync call JSON.stringify'd the
+  // Promise itself, sending the model a literal "{}" editor_context — no fork id,
+  // no layers, no viral DNA. Always resolve before serializing.
   function editorContextBlock() {
-    if (!isEditorDock) return '';
+    if (!isEditorDock) return Promise.resolve('');
     var bridge = (typeof window !== 'undefined') ? window.__vidfarmEditorAction : null;
-    if (!bridge || typeof bridge.getSnapshot !== 'function') return '';
+    if (!bridge || typeof bridge.getSnapshot !== 'function') return Promise.resolve('');
     var snap; try { snap = bridge.getSnapshot(); } catch (e) { snap = null; }
-    if (!snap) return '';
-    try { return '\n\n<editor_context>\n' + JSON.stringify(snap, null, 2) + '\n</editor_context>'; }
-    catch (e) { return ''; }
+    return Promise.resolve(snap).then(function (s) {
+      if (!s) return '';
+      try { return '\n\n<editor_context>\n' + JSON.stringify(s, null, 2) + '\n</editor_context>'; }
+      catch (e) { return ''; }
+    }, function () { return ''; });
   }
   function loadBoot() {
     if (BOOT_STATE === 'ready' || BOOT_STATE === 'loading') return;
@@ -1570,6 +1593,7 @@ html,body{margin:0;background:#050604;color:#fffbe6}
         loadThreads();
         if (leftMode() === 'cloud') loadTasks();
         consumeHandoff();
+        restoreActiveThread();
       })
       .catch(function () { BOOT_STATE = 'error'; });
   }
@@ -2123,8 +2147,10 @@ html,body{margin:0;background:#050604;color:#fffbe6}
     setBusy(true);
     if (!threadId) threadId = genId('thread');
     // Attach a fresh <editor_context> to the current (last) user turn only, so the
-    // model sees the composition state without bloating persisted history.
-    var ctxBlock = editorContextBlock();
+    // model sees the composition state without bloating persisted history. The
+    // block resolves asynchronously (files-API read) — wait for it before building
+    // the outgoing messages so the model actually receives the composition state.
+    editorContextBlock().then(function (ctxBlock) {
     // Attachments (pasted files OR files picked from the directory explorer) must
     // ride in the model messages as file content parts + a URL text line — the
     // backend only feeds the model messages[].content, NOT user_message.attachments
@@ -2142,6 +2168,9 @@ html,body{margin:0;background:#050604;color:#fffbe6}
       }
       return { role: m.role, content: content };
     });
+    // The send is what turns a freshly minted thread id into a real saved
+    // thread — make it the sticky-restore target from this moment on.
+    saveActiveThread(threadId);
     var body = {
       messages: outMessages,
       thread_id: threadId,
@@ -2205,6 +2234,7 @@ html,body{margin:0;background:#050604;color:#fffbe6}
       if (!API_KEY) msg = msg + '\n\nAdd an AI provider key in Settings to chat on your own keys.';
       view.fail(msg); setBusy(false); if (input) input.focus();
     });
+    }); // end editorContextBlock().then
   }
 
   function resetConversation() {
@@ -2458,10 +2488,25 @@ html,body{margin:0;background:#050604;color:#fffbe6}
     // fall through to chat-attach for folders / non-placeable files.
     if (isEditorDock && it && it.viewUrl) {
       var bridge = (typeof window !== 'undefined') ? window.__vidfarmEditorAction : null;
-      if (bridge && typeof bridge.placeMediaAtPlayhead === 'function') {
-        var res = bridge.placeMediaAtPlayhead({ url: it.viewUrl, name: it.name, contentType: it.contentType });
-        if (res && res.ok) { editorPlaceToast('Added \u201c' + (it.name || 'media') + '\u201d to the timeline'); return; }
-        // Non-placeable (folder / doc / not-ready): fall through to chat-attach.
+      // Placeability must be decided SYNCHRONOUSLY (the Option-B bridge returns a
+      // Promise, so we can't branch on its result to decide chat-attach fallback —
+      // checking ".ok" on the Promise made EVERY click fall through, placing the
+      // media AND attaching it to chat, with no toast). Only image/video/audio go
+      // on the timeline; folders/docs still fall through to chat-attach.
+      var ct = String(it.contentType || '');
+      if (bridge && typeof bridge.placeMediaAtPlayhead === 'function'
+          && (ct.indexOf('image/') === 0 || ct.indexOf('video/') === 0 || ct.indexOf('audio/') === 0)) {
+        var placedName = it.name || 'media';
+        var settlePlace = function (r) {
+          if (r && r.ok) { editorPlaceToast('Added \u201c' + placedName + '\u201d to the timeline'); }
+          else { editorPlaceToast('Couldn\u2019t add \u201c' + placedName + '\u201d' + ((r && r.error) ? ': ' + r.error : ''), true); }
+        };
+        try {
+          var res = bridge.placeMediaAtPlayhead({ url: it.viewUrl, name: it.name, contentType: it.contentType });
+          if (res && typeof res.then === 'function') { res.then(settlePlace, function (e) { settlePlace({ ok: false, error: (e && e.message) ? e.message : String(e) }); }); }
+          else { settlePlace(res); }
+        } catch (e) { settlePlace({ ok: false, error: (e && e.message) ? e.message : String(e) }); }
+        return;
       }
     }
     // Files-only drawer (opened from the /chat page) has no chat composer of its
@@ -2578,7 +2623,11 @@ html,body{margin:0;background:#050604;color:#fffbe6}
     return wrap;
   }
   function setActiveThread(id) {
-    threadId = id;
+    // null = "fresh unsaved chat": KEEP the freshly minted threadId (sends must
+    // always carry a real thread_id or the server silently skips persistence)
+    // and clear the sticky restore key; a real id becomes both current + sticky.
+    if (id) { threadId = id; saveActiveThread(id); }
+    else { saveActiveThread(null); }
     if (!histBody) return;
     var rows = histBody.querySelectorAll('.rk-aichat-frow');
     for (var i = 0; i < rows.length; i++) rows[i].classList.toggle('is-active', rows[i].getAttribute('data-id') === id);
@@ -2671,7 +2720,7 @@ html,body{margin:0;background:#050604;color:#fffbe6}
       .then(function (r) {
         if (!r.ok && r.status !== 404) throw new Error('http ' + r.status);
         threads = threads.filter(function (t) { return t.id !== id; });
-        if (id === threadId) resetConversation();
+        if (id === threadId) { resetConversation(); saveActiveThread(null); }
         renderHistory();
       })
       .catch(function () {});

package/public/serve-shells/library-files.html

@@ -1799,6 +1799,23 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
     setLeftMode('');   // show the conversation, not the Files/History drawer
     openThread(id);
   }
+  var hadHandoff = !!handoffThread;
+  // Sticky active thread per template so a page refresh reopens the SAME
+  // conversation instead of a blank chat (server routes deliberately never
+  // attach ?thread= to editor URLs — the browser owns "which chat is active").
+  function activeThreadKey() { return 'rk-chat-active:' + TEMPLATE_ID; }
+  function saveActiveThread(id) {
+    try { if (id) localStorage.setItem(activeThreadKey(), id); else localStorage.removeItem(activeThreadKey()); } catch (e) {}
+  }
+  var restoredActive = false;
+  function restoreActiveThread() {
+    if (restoredActive || hadHandoff) return;
+    restoredActive = true;
+    if (convo.length) return; // user already chatting — don't clobber
+    var saved = null;
+    try { saved = localStorage.getItem(activeThreadKey()); } catch (e) {}
+    if (saved) openThread(saved);
+  }
   var busy = false;
   var pendingAbort = null; // AbortController for the in-flight reply (Stop button)
 
@@ -1849,14 +1866,20 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
   // outgoing user turn — verbatim to what the SPA's own chat sends — so the agent
   // knows which fork to read (video_context) and mutate (editor_action). Only the
   // /editor dock has this bridge; elsewhere it returns ''.
+  // Async: the Option-B bridge's getSnapshot() returns a PROMISE (it re-reads the
+  // composition through the files API). The old sync call JSON.stringify'd the
+  // Promise itself, sending the model a literal "{}" editor_context — no fork id,
+  // no layers, no viral DNA. Always resolve before serializing.
   function editorContextBlock() {
-    if (!isEditorDock) return '';
+    if (!isEditorDock) return Promise.resolve('');
     var bridge = (typeof window !== 'undefined') ? window.__vidfarmEditorAction : null;
-    if (!bridge || typeof bridge.getSnapshot !== 'function') return '';
+    if (!bridge || typeof bridge.getSnapshot !== 'function') return Promise.resolve('');
     var snap; try { snap = bridge.getSnapshot(); } catch (e) { snap = null; }
-    if (!snap) return '';
-    try { return '\n\n<editor_context>\n' + JSON.stringify(snap, null, 2) + '\n</editor_context>'; }
-    catch (e) { return ''; }
+    return Promise.resolve(snap).then(function (s) {
+      if (!s) return '';
+      try { return '\n\n<editor_context>\n' + JSON.stringify(s, null, 2) + '\n</editor_context>'; }
+      catch (e) { return ''; }
+    }, function () { return ''; });
   }
   function loadBoot() {
     if (BOOT_STATE === 'ready' || BOOT_STATE === 'loading') return;
@@ -1879,6 +1902,7 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
         loadThreads();
         if (leftMode() === 'cloud') loadTasks();
         consumeHandoff();
+        restoreActiveThread();
       })
       .catch(function () { BOOT_STATE = 'error'; });
   }
@@ -2432,8 +2456,10 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
     setBusy(true);
     if (!threadId) threadId = genId('thread');
     // Attach a fresh <editor_context> to the current (last) user turn only, so the
-    // model sees the composition state without bloating persisted history.
-    var ctxBlock = editorContextBlock();
+    // model sees the composition state without bloating persisted history. The
+    // block resolves asynchronously (files-API read) — wait for it before building
+    // the outgoing messages so the model actually receives the composition state.
+    editorContextBlock().then(function (ctxBlock) {
     // Attachments (pasted files OR files picked from the directory explorer) must
     // ride in the model messages as file content parts + a URL text line — the
     // backend only feeds the model messages[].content, NOT user_message.attachments
@@ -2451,6 +2477,9 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
       }
       return { role: m.role, content: content };
     });
+    // The send is what turns a freshly minted thread id into a real saved
+    // thread — make it the sticky-restore target from this moment on.
+    saveActiveThread(threadId);
     var body = {
       messages: outMessages,
       thread_id: threadId,
@@ -2514,6 +2543,7 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
       if (!API_KEY) msg = msg + '\n\nAdd an AI provider key in Settings to chat on your own keys.';
       view.fail(msg); setBusy(false); if (input) input.focus();
     });
+    }); // end editorContextBlock().then
   }
 
   function resetConversation() {
@@ -2767,10 +2797,25 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
     // fall through to chat-attach for folders / non-placeable files.
     if (isEditorDock && it && it.viewUrl) {
       var bridge = (typeof window !== 'undefined') ? window.__vidfarmEditorAction : null;
-      if (bridge && typeof bridge.placeMediaAtPlayhead === 'function') {
-        var res = bridge.placeMediaAtPlayhead({ url: it.viewUrl, name: it.name, contentType: it.contentType });
-        if (res && res.ok) { editorPlaceToast('Added \u201c' + (it.name || 'media') + '\u201d to the timeline'); return; }
-        // Non-placeable (folder / doc / not-ready): fall through to chat-attach.
+      // Placeability must be decided SYNCHRONOUSLY (the Option-B bridge returns a
+      // Promise, so we can't branch on its result to decide chat-attach fallback —
+      // checking ".ok" on the Promise made EVERY click fall through, placing the
+      // media AND attaching it to chat, with no toast). Only image/video/audio go
+      // on the timeline; folders/docs still fall through to chat-attach.
+      var ct = String(it.contentType || '');
+      if (bridge && typeof bridge.placeMediaAtPlayhead === 'function'
+          && (ct.indexOf('image/') === 0 || ct.indexOf('video/') === 0 || ct.indexOf('audio/') === 0)) {
+        var placedName = it.name || 'media';
+        var settlePlace = function (r) {
+          if (r && r.ok) { editorPlaceToast('Added \u201c' + placedName + '\u201d to the timeline'); }
+          else { editorPlaceToast('Couldn\u2019t add \u201c' + placedName + '\u201d' + ((r && r.error) ? ': ' + r.error : ''), true); }
+        };
+        try {
+          var res = bridge.placeMediaAtPlayhead({ url: it.viewUrl, name: it.name, contentType: it.contentType });
+          if (res && typeof res.then === 'function') { res.then(settlePlace, function (e) { settlePlace({ ok: false, error: (e && e.message) ? e.message : String(e) }); }); }
+          else { settlePlace(res); }
+        } catch (e) { settlePlace({ ok: false, error: (e && e.message) ? e.message : String(e) }); }
+        return;
       }
     }
     // Files-only drawer (opened from the /chat page) has no chat composer of its
@@ -2887,7 +2932,11 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
     return wrap;
   }
   function setActiveThread(id) {
-    threadId = id;
+    // null = "fresh unsaved chat": KEEP the freshly minted threadId (sends must
+    // always carry a real thread_id or the server silently skips persistence)
+    // and clear the sticky restore key; a real id becomes both current + sticky.
+    if (id) { threadId = id; saveActiveThread(id); }
+    else { saveActiveThread(null); }
     if (!histBody) return;
     var rows = histBody.querySelectorAll('.rk-aichat-frow');
     for (var i = 0; i < rows.length; i++) rows[i].classList.toggle('is-active', rows[i].getAttribute('data-id') === id);
@@ -2980,7 +3029,7 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
       .then(function (r) {
         if (!r.ok && r.status !== 404) throw new Error('http ' + r.status);
         threads = threads.filter(function (t) { return t.id !== id; });
-        if (id === threadId) resetConversation();
+        if (id === threadId) { resetConversation(); saveActiveThread(null); }
         renderHistory();
       })
       .catch(function () {});

package/public/serve-shells/library-raws.html

@@ -2753,6 +2753,23 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
     setLeftMode('');   // show the conversation, not the Files/History drawer
     openThread(id);
   }
+  var hadHandoff = !!handoffThread;
+  // Sticky active thread per template so a page refresh reopens the SAME
+  // conversation instead of a blank chat (server routes deliberately never
+  // attach ?thread= to editor URLs — the browser owns "which chat is active").
+  function activeThreadKey() { return 'rk-chat-active:' + TEMPLATE_ID; }
+  function saveActiveThread(id) {
+    try { if (id) localStorage.setItem(activeThreadKey(), id); else localStorage.removeItem(activeThreadKey()); } catch (e) {}
+  }
+  var restoredActive = false;
+  function restoreActiveThread() {
+    if (restoredActive || hadHandoff) return;
+    restoredActive = true;
+    if (convo.length) return; // user already chatting — don't clobber
+    var saved = null;
+    try { saved = localStorage.getItem(activeThreadKey()); } catch (e) {}
+    if (saved) openThread(saved);
+  }
   var busy = false;
   var pendingAbort = null; // AbortController for the in-flight reply (Stop button)
 
@@ -2803,14 +2820,20 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
   // outgoing user turn — verbatim to what the SPA's own chat sends — so the agent
   // knows which fork to read (video_context) and mutate (editor_action). Only the
   // /editor dock has this bridge; elsewhere it returns ''.
+  // Async: the Option-B bridge's getSnapshot() returns a PROMISE (it re-reads the
+  // composition through the files API). The old sync call JSON.stringify'd the
+  // Promise itself, sending the model a literal "{}" editor_context — no fork id,
+  // no layers, no viral DNA. Always resolve before serializing.
   function editorContextBlock() {
-    if (!isEditorDock) return '';
+    if (!isEditorDock) return Promise.resolve('');
     var bridge = (typeof window !== 'undefined') ? window.__vidfarmEditorAction : null;
-    if (!bridge || typeof bridge.getSnapshot !== 'function') return '';
+    if (!bridge || typeof bridge.getSnapshot !== 'function') return Promise.resolve('');
     var snap; try { snap = bridge.getSnapshot(); } catch (e) { snap = null; }
-    if (!snap) return '';
-    try { return '\n\n<editor_context>\n' + JSON.stringify(snap, null, 2) + '\n</editor_context>'; }
-    catch (e) { return ''; }
+    return Promise.resolve(snap).then(function (s) {
+      if (!s) return '';
+      try { return '\n\n<editor_context>\n' + JSON.stringify(s, null, 2) + '\n</editor_context>'; }
+      catch (e) { return ''; }
+    }, function () { return ''; });
   }
   function loadBoot() {
     if (BOOT_STATE === 'ready' || BOOT_STATE === 'loading') return;
@@ -2833,6 +2856,7 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
         loadThreads();
         if (leftMode() === 'cloud') loadTasks();
         consumeHandoff();
+        restoreActiveThread();
       })
       .catch(function () { BOOT_STATE = 'error'; });
   }
@@ -3386,8 +3410,10 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
     setBusy(true);
     if (!threadId) threadId = genId('thread');
     // Attach a fresh <editor_context> to the current (last) user turn only, so the
-    // model sees the composition state without bloating persisted history.
-    var ctxBlock = editorContextBlock();
+    // model sees the composition state without bloating persisted history. The
+    // block resolves asynchronously (files-API read) — wait for it before building
+    // the outgoing messages so the model actually receives the composition state.
+    editorContextBlock().then(function (ctxBlock) {
     // Attachments (pasted files OR files picked from the directory explorer) must
     // ride in the model messages as file content parts + a URL text line — the
     // backend only feeds the model messages[].content, NOT user_message.attachments
@@ -3405,6 +3431,9 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
       }
       return { role: m.role, content: content };
     });
+    // The send is what turns a freshly minted thread id into a real saved
+    // thread — make it the sticky-restore target from this moment on.
+    saveActiveThread(threadId);
     var body = {
       messages: outMessages,
       thread_id: threadId,
@@ -3468,6 +3497,7 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
       if (!API_KEY) msg = msg + '\n\nAdd an AI provider key in Settings to chat on your own keys.';
       view.fail(msg); setBusy(false); if (input) input.focus();
     });
+    }); // end editorContextBlock().then
   }
 
   function resetConversation() {
@@ -3721,10 +3751,25 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
     // fall through to chat-attach for folders / non-placeable files.
     if (isEditorDock && it && it.viewUrl) {
       var bridge = (typeof window !== 'undefined') ? window.__vidfarmEditorAction : null;
-      if (bridge && typeof bridge.placeMediaAtPlayhead === 'function') {
-        var res = bridge.placeMediaAtPlayhead({ url: it.viewUrl, name: it.name, contentType: it.contentType });
-        if (res && res.ok) { editorPlaceToast('Added \u201c' + (it.name || 'media') + '\u201d to the timeline'); return; }
-        // Non-placeable (folder / doc / not-ready): fall through to chat-attach.
+      // Placeability must be decided SYNCHRONOUSLY (the Option-B bridge returns a
+      // Promise, so we can't branch on its result to decide chat-attach fallback —
+      // checking ".ok" on the Promise made EVERY click fall through, placing the
+      // media AND attaching it to chat, with no toast). Only image/video/audio go
+      // on the timeline; folders/docs still fall through to chat-attach.
+      var ct = String(it.contentType || '');
+      if (bridge && typeof bridge.placeMediaAtPlayhead === 'function'
+          && (ct.indexOf('image/') === 0 || ct.indexOf('video/') === 0 || ct.indexOf('audio/') === 0)) {
+        var placedName = it.name || 'media';
+        var settlePlace = function (r) {
+          if (r && r.ok) { editorPlaceToast('Added \u201c' + placedName + '\u201d to the timeline'); }
+          else { editorPlaceToast('Couldn\u2019t add \u201c' + placedName + '\u201d' + ((r && r.error) ? ': ' + r.error : ''), true); }
+        };
+        try {
+          var res = bridge.placeMediaAtPlayhead({ url: it.viewUrl, name: it.name, contentType: it.contentType });
+          if (res && typeof res.then === 'function') { res.then(settlePlace, function (e) { settlePlace({ ok: false, error: (e && e.message) ? e.message : String(e) }); }); }
+          else { settlePlace(res); }
+        } catch (e) { settlePlace({ ok: false, error: (e && e.message) ? e.message : String(e) }); }
+        return;
       }
     }
     // Files-only drawer (opened from the /chat page) has no chat composer of its
@@ -3841,7 +3886,11 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
     return wrap;
   }
   function setActiveThread(id) {
-    threadId = id;
+    // null = "fresh unsaved chat": KEEP the freshly minted threadId (sends must
+    // always carry a real thread_id or the server silently skips persistence)
+    // and clear the sticky restore key; a real id becomes both current + sticky.
+    if (id) { threadId = id; saveActiveThread(id); }
+    else { saveActiveThread(null); }
     if (!histBody) return;
     var rows = histBody.querySelectorAll('.rk-aichat-frow');
     for (var i = 0; i < rows.length; i++) rows[i].classList.toggle('is-active', rows[i].getAttribute('data-id') === id);
@@ -3934,7 +3983,7 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
       .then(function (r) {
         if (!r.ok && r.status !== 404) throw new Error('http ' + r.status);
         threads = threads.filter(function (t) { return t.id !== id; });
-        if (id === threadId) resetConversation();
+        if (id === threadId) { resetConversation(); saveActiveThread(null); }
         renderHistory();
       })
       .catch(function () {});