@officexapp/vidfarm-devcli 0.21.11 → 0.21.14

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

@@ -2529,12 +2529,25 @@ button.rk-clips-thumb{appearance:none;-webkit-appearance:none;border:0;margin:0;
   // Desktop-agents nudge banner: a full-width alert pinned to the top of the
   // /editor and /chat surfaces pointing to the setup guide. Both surfaces embed
   // this chrome script, so gate strictly by pathname. Dismissible per session.
+  // The nudge is aimed at the DIRECTOR (the paid operator who drives Vidfarm with
+  // a desktop AI agent). A client reviewing a shared video in the editor should
+  // NOT be told to go install Claude Code / Codex — so on the editor we suppress
+  // it for free-tier (client / reviewer) sessions, read from the editor boot JSON.
   (function mountDesktopAgentsBanner() {
     try {
       var path = location.pathname;
       var onEditor = path === '/editor' || path.indexOf('/editor/') === 0;
       var onChat = path === '/chat' || path.indexOf('/chat/') === 0;
       if (!onEditor && !onChat) return;
+      if (onEditor) {
+        var bootEl = document.getElementById('hf-boot');
+        if (bootEl) {
+          try {
+            var boot = JSON.parse(bootEl.textContent || '{}');
+            if (boot && boot.freeTier) return;
+          } catch (e) {}
+        }
+      }
       if (document.querySelector('.vf-topbanner')) return;
       if (sessionStorage.getItem('vf-topbanner-dismissed') === '1') return;
       var GUIDE = '/blog/desktop-ai-agents';
@@ -2740,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)
 
@@ -2790,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;
@@ -2820,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'; });
   }
@@ -3373,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
@@ -3392,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,
@@ -3455,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() {
@@ -3708,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
@@ -3828,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);
@@ -3921,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 () {});

package/public/serve-shells/tools-clipper.html

@@ -2116,12 +2116,25 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
   // Desktop-agents nudge banner: a full-width alert pinned to the top of the
   // /editor and /chat surfaces pointing to the setup guide. Both surfaces embed
   // this chrome script, so gate strictly by pathname. Dismissible per session.
+  // The nudge is aimed at the DIRECTOR (the paid operator who drives Vidfarm with
+  // a desktop AI agent). A client reviewing a shared video in the editor should
+  // NOT be told to go install Claude Code / Codex — so on the editor we suppress
+  // it for free-tier (client / reviewer) sessions, read from the editor boot JSON.
   (function mountDesktopAgentsBanner() {
     try {
       var path = location.pathname;
       var onEditor = path === '/editor' || path.indexOf('/editor/') === 0;
       var onChat = path === '/chat' || path.indexOf('/chat/') === 0;
       if (!onEditor && !onChat) return;
+      if (onEditor) {
+        var bootEl = document.getElementById('hf-boot');
+        if (bootEl) {
+          try {
+            var boot = JSON.parse(bootEl.textContent || '{}');
+            if (boot && boot.freeTier) return;
+          } catch (e) {}
+        }
+      }
       if (document.querySelector('.vf-topbanner')) return;
       if (sessionStorage.getItem('vf-topbanner-dismissed') === '1') return;
       var GUIDE = '/blog/desktop-ai-agents';
@@ -2327,6 +2340,23 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
     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)
 
@@ -2377,14 +2407,20 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
   // 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;
@@ -2407,6 +2443,7 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
         loadThreads();
         if (leftMode() === 'cloud') loadTasks();
         consumeHandoff();
+        restoreActiveThread();
       })
       .catch(function () { BOOT_STATE = 'error'; });
   }
@@ -2960,8 +2997,10 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
     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
@@ -2979,6 +3018,9 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
       }
       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,
@@ -3042,6 +3084,7 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
       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() {
@@ -3295,10 +3338,25 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
     // 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
@@ -3415,7 +3473,11 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
     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);
@@ -3508,7 +3570,7 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
       .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/tools-image.html

@@ -3709,12 +3709,25 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
   // Desktop-agents nudge banner: a full-width alert pinned to the top of the
   // /editor and /chat surfaces pointing to the setup guide. Both surfaces embed
   // this chrome script, so gate strictly by pathname. Dismissible per session.
+  // The nudge is aimed at the DIRECTOR (the paid operator who drives Vidfarm with
+  // a desktop AI agent). A client reviewing a shared video in the editor should
+  // NOT be told to go install Claude Code / Codex — so on the editor we suppress
+  // it for free-tier (client / reviewer) sessions, read from the editor boot JSON.
   (function mountDesktopAgentsBanner() {
     try {
       var path = location.pathname;
       var onEditor = path === '/editor' || path.indexOf('/editor/') === 0;
       var onChat = path === '/chat' || path.indexOf('/chat/') === 0;
       if (!onEditor && !onChat) return;
+      if (onEditor) {
+        var bootEl = document.getElementById('hf-boot');
+        if (bootEl) {
+          try {
+            var boot = JSON.parse(bootEl.textContent || '{}');
+            if (boot && boot.freeTier) return;
+          } catch (e) {}
+        }
+      }
       if (document.querySelector('.vf-topbanner')) return;
       if (sessionStorage.getItem('vf-topbanner-dismissed') === '1') return;
       var GUIDE = '/blog/desktop-ai-agents';
@@ -3920,6 +3933,23 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
     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)
 
@@ -3970,14 +4000,20 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
   // 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;
@@ -4000,6 +4036,7 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
         loadThreads();
         if (leftMode() === 'cloud') loadTasks();
         consumeHandoff();
+        restoreActiveThread();
       })
       .catch(function () { BOOT_STATE = 'error'; });
   }
@@ -4553,8 +4590,10 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
     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
@@ -4572,6 +4611,9 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
       }
       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,
@@ -4635,6 +4677,7 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
       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() {
@@ -4888,10 +4931,25 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
     // 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
@@ -5008,7 +5066,11 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
     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);
@@ -5101,7 +5163,7 @@ body.vf-has-topbanner.rk-has-sidebar .rk-content{padding-top:var(--vf-topbanner-
       .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 () {});