@moretea-labs/forge 1.8.1 → 1.8.2

package/adapters/computer/chrome-extension/content.js

@@ -1,6 +1,10 @@
 (() => {
   const core = globalThis.ForgeComputerChatgptCore;
   if (!core) throw new Error('FORGE_COMPUTER_CHATGPT_CORE_MISSING');
+  // Declarative document_idle loading and exact-tab receiver recovery can race.
+  // Install one listener set per document or one Send could be handled twice.
+  if (globalThis.__forgeComputerChatgptContentInstalledV1 === true) return;
+  globalThis.__forgeComputerChatgptContentInstalledV1 = true;
   const ASSISTANT = '[data-message-author-role="assistant"], [data-chatgpt-search-unit-key$=":assistant"], [data-content-search-unit-key$=":assistant"]';
   const USER = '[data-message-author-role="user"], [data-chatgpt-search-unit-key$=":user"], [data-content-search-unit-key$=":user"]';
   const COMPOSER = '#prompt-textarea, [data-testid="prompt-textarea"], [data-testid="composer-text-input"], textarea[name="prompt"], textarea[placeholder*="Message"], textarea[placeholder*="消息"], form [contenteditable="true"], div[role="textbox"][contenteditable="true"]';
@@ -52,7 +56,9 @@
   const messageText = (node) => {
     if (!node) return '';
     const semanticContent = node.querySelector?.('[data-chatgpt-selection-message-id]');
-    return core.normalizeText(semanticContent?.innerText ?? semanticContent?.textContent ?? node.innerText ?? node.textContent);
+    // Message line boundaries carry the final Supervisor receipt. Normalizing
+    // them like UI labels destroys the protocol before the owner can parse it.
+    return String(semanticContent?.innerText ?? semanticContent?.textContent ?? node.innerText ?? node.textContent ?? '').trim();
   };
   const roleNodes = (selector) => {
     const seen = new Set();
@@ -111,7 +117,8 @@
     const status = Array.from(document.querySelectorAll('[role="alert"], [role="status"], [aria-live="assertive"], [aria-live="polite"]'))
       .filter(visible);
     const capacity = Array.from(conversationRoot().querySelectorAll('p, span, div'))
-      .filter((node) => visible(node) && !node.closest(TURN) && !node.closest('[data-message-author-role]'))
+      // Exclude message subtrees before layout-dependent visibility reads.
+      .filter((node) => !node.closest(TURN) && !node.closest('[data-message-author-role]') && visible(node))
       .filter((node) => {
         const text = core.normalizeText(node.innerText ?? node.textContent);
         return text.length <= 250 && /(?:你已达到此对话的长度上限|此对话已达到长度上限|you(?:'ve| have) reached the (?:maximum length for this conversation|conversation length limit)|this conversation has reached its maximum length)/i.test(text);
@@ -120,12 +127,46 @@
       .map((node) => core.normalizeText(node.innerText ?? node.textContent))
       .filter(Boolean).slice(-8).join('\n').slice(-PROVIDER_FAILURE_CHARS);
   };
-  const composer = () => document.querySelector(COMPOSER);
-  const composerText = () => core.normalizeText(composer()?.value ?? composer()?.innerText ?? composer()?.textContent);
+  // Project pages can retain hidden SSR editors beside the live hydrated one.
+  // Resolve one visible editor, preferring the active main, or fail closed:
+  // a hidden editor's draft is not proof that the task-owned composer is busy.
+  const composer = () => {
+    const visibleEditors = Array.from(document.querySelectorAll(COMPOSER))
+      .filter((node) => visible(node) && !node.closest?.('[aria-hidden="true"], [hidden], [inert]'));
+    const root = conversationRoot();
+    const inMain = root === document ? [] : visibleEditors.filter((node) => root.contains?.(node));
+    const candidates = inMain.length ? inMain : visibleEditors;
+    return candidates.length === 1 ? candidates[0] : undefined;
+  };
+  // Editor text is a provider payload, not a UI label: preserve its whitespace.
+  const exactComposerText = (value) => String(value ?? '').replace(/\r\n?/g, '\n');
+  const composerText = (editor = composer()) => {
+    const blocks = editor?.isContentEditable ? Array.from(editor.children ?? []) : [];
+    // ChatGPT's ProseMirror writes one P block per entered newline but
+    // HTMLElement.innerText synthesizes TWO newlines between those blocks.
+    // Reconstruct the actual editor payload from its direct paragraphs rather
+    // than comparing synthetic layout whitespace to an immutable effect.
+    const observed = blocks.length > 0 && blocks.every((block) => block.tagName === 'P')
+      ? blocks.map((block) => {
+        // innerText may insert a *visual* newline around auto-linked URLs or
+        // inline styled descendants even inside one ProseMirror paragraph.
+        // One direct <p> is one actual editor line: read its text nodes.
+        const value = exactComposerText(block.textContent ?? block.innerText);
+        return !value.trim() ? '' : value;
+      }).join('\n')
+      : editor?.value ?? editor?.innerText ?? editor?.textContent;
+    const text = exactComposerText(observed);
+    // Only whitespace-only *empty* editors collapse; all nonblank text,
+    // including leading/trailing spaces and intentional blank lines, remains
+    // byte-for-byte subject only to CRLF normalization.
+    return text.trim() ? text : '';
+  };
   const pageSnapshot = (options = {}) => {
     const userNodes = roleNodes(USER);
     const assistantNodes = roleNodes(ASSISTANT);
-    const bodyText = String(document.body?.innerText ?? '');
+    // Reading innerText on the entire page can force layout on every poll.
+    // Only collect it when a caller explicitly requests the full page.
+    const editor = composer();
     return {
       url: location.href,
       title: document.title,
@@ -135,10 +176,15 @@
         userMessages: userNodes.map(messageText).filter(Boolean),
         assistantMessages: assistantNodes.map(messageText).filter(Boolean),
       } : {}),
-      ...(composer() ? { composerText: composerText() } : {}),
+      ...(editor ? { composerText: composerText(editor) } : {}),
+      composerSelectorVersion: 'visible-single-v2',
+      composerReplacementContract: 'exact-backed-up-project-draft-v1',
+      // Read-only hydration attestation for a NEW Project bootstrap tab.
+      // URL/DOM shell visibility alone cannot prove that the React model
+      // picker has mounted or that the provider editor is send-ready.
       providerActivityText: providerActivityText(),
       providerFailureText: providerFailureText(),
-      ...(options.includePageText === true ? { pageText: bodyText.slice(-500000) } : {}),
+      ...(options.includePageText === true ? { pageText: String(document.body?.innerText ?? '').slice(-500000) } : {}),
       latestTurnRole: latestTurnRole(),
       isGenerating: isGenerating(),
     };
@@ -165,98 +211,27 @@
       selection?.removeAllRanges();
     }
   };
-  // Reasoning is a provider UI preference, not a Supervisor effect or workflow
-  // decision. Observe the concrete composer control and fail before inserting
-  // any prompt if the page does not acknowledge the requested level.
-  const reasoningLevel = (value) => {
-    const label = core.normalizeText(value).toLowerCase().replace(/[\s_-]+/g, '');
-    if (/extrahigh|xhigh|超高|极高/.test(label)) return 'xhigh';
-    if (/medium|中等/.test(label) || label === '中') return 'medium';
-    if (/high|高/.test(label)) return 'high';
-    return undefined;
-  };
-  const reasoningControl = () => {
-    const selectors = 'button[aria-haspopup="menu"], button[aria-haspopup="listbox"], [role="button"][aria-haspopup="menu"], button[data-testid*="model"], button[data-testid*="reasoning"]';
-    const candidates = Array.from(conversationRoot().querySelectorAll(selectors)).filter(visible);
-    return candidates.find((node) => {
-      const label = core.normalizeText((node.getAttribute?.('aria-label') ?? '') + ' ' + (node.innerText ?? node.textContent ?? ''));
-      const normalized = label.toLowerCase().replace(/[\s_-]+/g, '');
-      return /^gpt\d/.test(normalized) || normalized.includes('reasoning') || normalized.includes('thinking')
-        || normalized.includes('推理') || normalized.includes('思考') || reasoningLevel(label) !== undefined;
-    });
-  };
-  const reasoningControlLabel = (node) => core.normalizeText((node?.getAttribute?.('aria-label') ?? '') + ' ' + (node?.innerText ?? node?.textContent ?? ''));
-  const selectedReasoningOption = (level) => Array.from(document.querySelectorAll('[role="menuitemradio"], [role="option"], [role="radio"]'))
-    .filter(visible)
-    .find((node) => reasoningLevel(reasoningControlLabel(node)) === level
-      && (node.getAttribute('aria-checked') === 'true' || node.getAttribute('aria-selected') === 'true'));
-  const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-  const ensureReasoning = async (level) => {
-    if (level !== 'medium' && level !== 'high' && level !== 'xhigh') {
-      return { verified: false, reason: 'COMPUTER_CHATGPT_REASONING_INVALID' };
-    }
-    const control = reasoningControl();
-    if (!control) return { verified: false, reason: 'COMPUTER_CHATGPT_REASONING_CONTROL_UNAVAILABLE' };
-    if (reasoningLevel(reasoningControlLabel(control)) === level) return { verified: true, level };
-    control.click();
-    await sleep(80);
-    const menuOptions = Array.from(document.querySelectorAll('[role="menuitemradio"], [role="option"], [role="radio"]'))
-      .filter(visible)
-      .map((node) => ({ node, level: reasoningLevel(reasoningControlLabel(node)), disabled: node.hasAttribute('disabled') || node.getAttribute('aria-disabled') === 'true' }));
-    // xhigh means highest *available*, not a claim that every plan exposes
-    // Extra High. Prefer it, then High, then Medium; record the actual level.
-    const menuLevel = level === 'xhigh'
-      ? ['xhigh', 'high', 'medium'].find((candidate) => menuOptions.some((item) => item.level === candidate && !item.disabled))
-      : level;
-    const option = menuOptions.find((item) => item.level === menuLevel);
-    if (option) {
-      if (option.disabled) return { verified: false, reason: 'COMPUTER_CHATGPT_REASONING_OPTION_DISABLED' };
-      option.node.click();
-      await sleep(80);
-      if (reasoningLevel(reasoningControlLabel(reasoningControl())) === menuLevel || selectedReasoningOption(menuLevel)) {
-        return { verified: true, level: menuLevel };
-      }
-      return { verified: false, reason: 'COMPUTER_CHATGPT_REASONING_NOT_VERIFIED' };
-    }
-    // Older ChatGPT layouts expose a five-position slider in the model menu.
-    // React must acknowledge each navigation by changing aria-valuenow; writing
-    // our own attribute would be a false verification.
-    const sliders = Array.from(document.querySelectorAll('[role="slider"][aria-valuenow]')).filter(visible);
-    if (sliders.length !== 1) return { verified: false, reason: 'COMPUTER_CHATGPT_REASONING_OPTION_UNAVAILABLE' };
-    const slider = sliders[0];
-    const max = Number(slider.getAttribute('aria-valuemax'));
-    const min = Number(slider.getAttribute('aria-valuemin') ?? '0');
-    const target = level === 'xhigh' ? max : level === 'high' ? 3 : 2;
-    const actualLevel = target === 4 ? 'xhigh' : target === 3 ? 'high' : target === 2 ? 'medium' : undefined;
-    let current = Number(slider.getAttribute('aria-valuenow'));
-    if (![min, max, current, target].every(Number.isInteger) || min < 0 || max > 4 || max < 2
-      || current < min || current > max || target < min || target > max || !actualLevel) {
-      return { verified: false, reason: 'COMPUTER_CHATGPT_REASONING_STATE_UNAVAILABLE' };
-    }
-    for (let step = 0; step < Math.abs(target - current); step += 1) {
-      slider.focus?.();
-      slider.dispatchEvent(new KeyboardEvent('keydown', { key: target > current ? 'ArrowRight' : 'ArrowLeft', bubbles: true }));
-      await sleep(40);
-      const next = Number(slider.getAttribute('aria-valuenow'));
-      if (next !== current + (target > current ? 1 : -1)) {
-        return { verified: false, reason: 'COMPUTER_CHATGPT_REASONING_NOT_VERIFIED' };
-      }
-      current = next;
-    }
-    if (Number(slider.getAttribute('aria-valuenow')) !== target) {
-      return { verified: false, reason: 'COMPUTER_CHATGPT_REASONING_NOT_VERIFIED' };
-    }
-    const valueText = slider.getAttribute('aria-valuetext');
-    if (valueText && reasoningLevel(valueText) !== actualLevel) {
-      return { verified: false, reason: 'COMPUTER_CHATGPT_REASONING_NOT_VERIFIED' };
-    }
-    return { verified: true, level: actualLevel };
-  };
-  const dispatchPrompt = async (prompt, mode = 'send', reasoning, expectedConversationId, prepareOnly = false) => {
-    const exactConversationIsCurrent = () => !expectedConversationId
-      || core.parseConversation(location.href)?.conversationId === expectedConversationId;
+  const dispatchPrompt = async (prompt, mode = 'send', expectedConversationId, prepareOnly = false, expectedProjectId) => {
+    const exactConversationIsCurrent = () => expectedConversationId
+      ? core.parseConversation(location.href)?.conversationId === expectedConversationId
+      : expectedProjectId ? core.projectId(location.href) === expectedProjectId && !core.parseConversation(location.href)
+        : true;
     if (!exactConversationIsCurrent()) return { dispatched: false, reason: 'target_identity_changed' };
     if (typeof prompt !== 'string' || !prompt.trim()) return { dispatched: false, reason: 'prompt_required' };
+    // This bounded prepare-only envelope is produced by the canonical
+    // Supervisor only after an exact 0600 on-device backup and operator marker.
+    // It is never part of a sent effect and never authorizes another provider.
+    const replacement = /^<<<FORGE_DRAFT_REPLACE_V1:([a-f0-9]{24}):([a-f0-9]{32})>>>\n/.exec(prompt);
+    if (replacement && (!prepareOnly || !expectedProjectId || mode !== 'send')) {
+      return { dispatched: false, reason: 'composer_replacement_mode_invalid' };
+    }
+    // Prepare-only exact retirement; never submits or retries the stopped task.
+    const retired = /^<<<FORGE_RETIRED_DRAFT_V1:((?:fx|crpe)_[a-zA-Z0-9_-]{8,120}):([a-f0-9]{24})>>>\n/.exec(prompt);
+    if (retired && (!prepareOnly || !expectedProjectId || mode !== 'send' || replacement)) {
+      return { dispatched: false, reason: 'composer_replacement_mode_invalid' };
+    }
+    const actualPrompt = replacement ? prompt.slice(replacement[0].length)
+      : retired ? prompt.slice(retired[0].length) : prompt;
     if (mode === 'recover') {
       const stop = document.querySelector(STOP);
       if (prepareOnly && stop instanceof HTMLElement) return { prepared: false, reason: 'provider_recovery_stop_pending' };
@@ -272,66 +247,114 @@
     } else if (isGenerating()) return { dispatched: false, reason: 'provider_busy' };
     const node = composer();
     if (!node) return { dispatched: false, reason: 'composer_missing' };
-    const supervisor = /^@forge\s+<<<FORGE_WORKFLOW_EFFECT_V1:fx_[a-zA-Z0-9_-]+>>>/.test(prompt.trim());
-    const payload = supervisor ? prompt.trim().replace(/^@forge\s+/, '') : prompt;
-    const expected = core.normalizeText(payload);
-    const triggerDraft = `${payload}\n@`;
-    const triggerText = core.normalizeText(triggerDraft);
-    const boundText = core.normalizeText(`${payload} forge`);
-    const boundChip = () => {
-      const chips = Array.from(node.querySelectorAll('[plugin-mention-name], [app-mention-name]'));
-      return chips.length === 1
-        && chips[0]?.getAttribute('app-mention-name') === 'forge'
-        && chips[0]?.getAttribute('app-mention-path') === 'app://asdk_app_6ac09022b26081918f20ff868c773824'
-        && composerText() === boundText;
-    };
+    // Project instructions select tools. No @forge UI mention is needed.
+    const supervisor = /^(?:@forge\s+)?<<<FORGE_WORKFLOW_EFFECT_V1:(?:fx|crpe)_[a-zA-Z0-9_-]{8,120}>>>/.test(actualPrompt);
+    if (supervisor && !expectedConversationId && !expectedProjectId) return { dispatched: false, reason: 'target_identity_unavailable' };
+    // Strip only the exact legacy prefix on already-durable effects.
+    const payload = supervisor ? actualPrompt.replace(/^@forge\s+(?=<<<FORGE_WORKFLOW_EFFECT_V1:(?:fx|crpe)_[a-zA-Z0-9_-]{8,120}>>>)/, '') : actualPrompt;
+    const expected = exactComposerText(payload);
     const existing = composerText();
-    if (existing && existing !== expected && !(supervisor && (existing === triggerText || boundChip()))) return { dispatched: false, reason: 'composer_not_empty' };
-    let reasoningVerified;
-    if (reasoning !== undefined) {
-      const checked = await ensureReasoning(reasoning);
-      if (!checked.verified) return { dispatched: false, reason: checked.reason };
-      reasoningVerified = checked.level;
+    // A restored draft belongs to this effect only when it matches precisely.
+    // Never overwrite another task's draft or a human-authored message.
+    const ownedDrafts = supervisor
+      ? [expected, expected + '\n', exactComposerText(payload + '\n@'), exactComposerText(payload + '\nforge'), exactComposerText('forge ' + payload)]
+      : [expected];
+    if (node.querySelector('[plugin-mention-name], [app-mention-name]')) return { dispatched: false, reason: 'composer_has_app_mention' };
+    const unowned = Boolean(existing && !ownedDrafts.includes(existing));
+    if (unowned && ((!replacement && !retired) || !supervisor)) return { dispatched: false, reason: 'composer_not_empty' };
+    if (retired && (!unowned || !existing.startsWith(`<<<FORGE_WORKFLOW_EFFECT_V1:${retired[1]}>>>`))) {
+      return { dispatched: false, reason: 'composer_not_empty' };
+    }
+    if (unowned) {
+      // Hash the *currently visible* single editor, not the page or another
+      // tab. If it changed since the backup, do not touch it.
+      if (!globalThis.crypto?.subtle || !globalThis.TextEncoder) return { dispatched: false, reason: 'composer_replacement_digest_unavailable' };
+      const bytes = new TextEncoder().encode('preflight-composer-v1:\0' + existing);
+      const digest = new Uint8Array(await crypto.subtle.digest('SHA-256', bytes));
+      const prefix = Array.from(digest).map((byte) => byte.toString(16).padStart(2, '0')).join('').slice(0, 24);
+      if (prefix !== (replacement ? replacement[1] : retired?.[2])) return { dispatched: false, reason: 'composer_not_empty' };
     }
     if (!exactConversationIsCurrent()) return { dispatched: false, reason: 'target_identity_changed' };
-    if (supervisor && !boundChip()) writeComposer(node, triggerDraft);
-    else if (existing !== expected && !boundChip()) writeComposer(node, payload);
-    await new Promise((resolve) => setTimeout(resolve, 75));
+    // Hashing and model-picker hydration yield to page/user edits. Revalidate
+    // the same single editor before overwriting any bytes observed above.
+    if (composer() !== node || composerText(node) !== existing) return { dispatched: false, reason: 'composer_not_empty' };
+    if (existing !== expected && existing !== expected + '\n') writeComposer(node, payload);
+    // React may acknowledge the exact draft before it enables Send. Observe
+    // this same target for at most two seconds, below the broker deadline;
+    // this is read-only readiness, never another write or Send attempt.
+    const ready = await new Promise((resolve) => {
+      let timer;
+      let settled = false;
+      const finish = (value) => {
+        if (settled) return;
+        settled = true;
+        observer.disconnect();
+        document.removeEventListener('input', check, true);
+        clearTimeout(timer);
+        resolve(value);
+      };
+      const check = (expired = false) => {
+        if (!exactConversationIsCurrent()) { finish({ reason: 'target_identity_changed' }); return; }
+        // ProseMirror may expose one editor-generated final newline. Do not
+        // widen matching beyond that break or tolerate another visible draft.
+        const text = composerText();
+        if (text !== expected && text !== expected + '\n') { finish({ reason: 'composer_write_unconfirmed' }); return; }
+        if (isGenerating()) { finish({ reason: 'provider_busy' }); return; }
+        const buttons = Array.from(document.querySelectorAll(SEND)).filter(visible);
+        const send = buttons.length === 1 ? buttons[0] : undefined;
+        if (send && !send.disabled && send.getAttribute('aria-disabled') !== 'true') { finish({ send }); return; }
+        if (expired === true) finish({ reason: send ? 'send_button_disabled' : 'send_button_missing' });
+      };
+      const observer = new MutationObserver(() => check());
+      observer.observe(document.documentElement, { childList: true, subtree: true, characterData: true, attributes: true });
+      document.addEventListener('input', check, true);
+      timer = setTimeout(() => check(true), 2_000);
+      check();
+    });
+    if (!ready.send) return { dispatched: false, reason: ready.reason };
+    // Await resumes in a new microtask: retain the exact pre-click fences even
+    // if an input/route update was queued alongside the readiness observation.
     if (!exactConversationIsCurrent()) return { dispatched: false, reason: 'target_identity_changed' };
-    if (supervisor) {
-      if (!boundChip()) {
-        if (composerText() !== triggerText) return { dispatched: false, reason: 'composer_write_unconfirmed' };
-        // The final standalone @ paragraph was inserted together with the
-        // payload; typing ` @` later drops the space in live ProseMirror.
-        node.focus();
-        const selection = window.getSelection();
-        if (!selection) return { dispatched: false, reason: 'COMPUTER_CHATGPT_PLUGIN_SELECTION_UNAVAILABLE' };
-        const range = document.createRange(); range.selectNodeContents(node); range.collapse(false);
-        selection.removeAllRanges(); selection.addRange(range);
-        if (!document.execCommand('insertText', false, 'forge')) return { dispatched: false, reason: 'COMPUTER_CHATGPT_PLUGIN_SELECTION_UNAVAILABLE' };
-        await sleep(150);
-        const entries = Array.from(document.querySelectorAll('[data-mention-section-items] > button'));
-        const selected = entries.filter((entry) => {
-          const label = core.normalizeText(entry.innerText ?? entry.textContent);
-          return label === 'forge' || label.startsWith('forge Current Forge 1.8.1');
-        });
-        if (selected.length !== 1) {
-          writeComposer(node, payload);
-          return { dispatched: false, reason: 'COMPUTER_CHATGPT_FORGE_PLUGIN_UNAVAILABLE' };
-        }
-        if (!exactConversationIsCurrent()) return { dispatched: false, reason: 'target_identity_changed' };
-        selected[0].click();
-        await sleep(150);
-      }
-      if (!boundChip()) return { dispatched: false, reason: 'COMPUTER_CHATGPT_FORGE_PLUGIN_CHIP_UNVERIFIED' };
-    } else if (composerText() !== expected) return { dispatched: false, reason: 'composer_write_unconfirmed' };
-    const send = document.querySelector(SEND);
-    if (!send) return { dispatched: false, reason: 'send_button_missing' };
+    const text = composerText();
+    if (text !== expected && text !== expected + '\n') return { dispatched: false, reason: 'composer_write_unconfirmed' };
+    if (isGenerating()) return { dispatched: false, reason: 'provider_busy' };
+    const send = ready.send;
+    if (!send.isConnected || !visible(send)) return { dispatched: false, reason: 'send_button_missing' };
     if (send.disabled || send.getAttribute('aria-disabled') === 'true') return { dispatched: false, reason: 'send_button_disabled' };
-    if (!exactConversationIsCurrent()) return { dispatched: false, reason: 'target_identity_changed' };
     if (prepareOnly) return { prepared: true };
-    send.click();
-    return { dispatched: true, ...(reasoningVerified ? { reasoningVerified } : {}) };
+    // Confirm the committed turn inside the content script, rather than
+    // requesting delayed snapshots from the extension background worker.
+    const beforeSend = roleNodes(USER).at(-1);
+    // Once click starts, an exception cannot prove that the provider did not
+    // receive the message. Keep post-click observation failures outcome-unknown.
+    try {
+      send.click();
+      const confirmed = await new Promise((resolve) => {
+        // Unobserved submission is unknown, never proof that Send did not run.
+        let timer;
+        let settled = false;
+        const finish = (value) => {
+          if (settled) return;
+          settled = true;
+          observer.disconnect();
+          clearTimeout(timer);
+          resolve(value);
+        };
+        const check = () => {
+          if (expectedConversationId && !exactConversationIsCurrent()) return;
+          const latest = roleNodes(USER).at(-1);
+          if (latest && latest !== beforeSend
+            && exactComposerText(messageText(latest)) === expected) finish(true);
+        };
+        const observer = new MutationObserver(check);
+        observer.observe(document.documentElement, { childList: true, subtree: true, characterData: true });
+        timer = setTimeout(() => finish(false), 2_000);
+        check();
+      });
+      return { dispatched: true, confirmed };
+    } catch {
+      return { dispatched: true, confirmed: false };
+    }
   };
   chrome.runtime.onMessage.addListener((message, _sender, sendResponse) => {
     if (!message || message.type === 'forge-computer-chatgpt-scan') { notify(); sendResponse?.({ ok: true }); return false; }
@@ -340,21 +363,22 @@
       return false;
     }
     if (message.type === 'forge-computer-chatgpt-snapshot') { sendResponse(pageSnapshot(message.options ?? {})); return false; }
-    // Read-only exact-tab capability attestation. A stale content script must
-    // never receive an xhigh-required send that it would silently ignore.
+    // Read-only exact-tab attestation for bootstrap/draft target guards.
     if (message.type === 'forge-computer-chatgpt-capabilities') {
-      sendResponse({ reasoningPreflight: 'verified_before_send_v1' });
+      sendResponse({ bootstrapTargetGuard: 'project-checked-before-send-v1',
+        composerReplacementContract: 'exact-backed-up-project-draft-v1' });
       return false;
     }
     if (message.type === 'forge-computer-chatgpt-prepare') {
-      dispatchPrompt(String(message.prompt ?? ''), String(message.mode ?? 'send'), message.reasoning, message.expectedConversationId, true)
-        .then((result) => sendResponse(result?.prepared === true ? { prepared: true }
+      dispatchPrompt(String(message.prompt ?? ''), String(message.mode ?? 'send'), message.expectedConversationId, true, message.expectedProjectId)
+        .then((result) => sendResponse(result?.prepared === true
+          ? { prepared: true }
           : { prepared: false, reason: String(result?.reason ?? 'COMPUTER_CHATGPT_PREPARE_REJECTED') }),
           (error) => sendResponse({ prepared: false, reason: String(error?.message ?? error) }));
       return true;
     }
     if (message.type === 'forge-computer-chatgpt-dispatch') {
-      dispatchPrompt(String(message.prompt ?? ''), String(message.mode ?? 'send'), message.reasoning, message.expectedConversationId)
+      dispatchPrompt(String(message.prompt ?? ''), String(message.mode ?? 'send'), message.expectedConversationId, false, message.expectedProjectId)
         .then(sendResponse, (error) => sendResponse({ dispatched: false, reason: String(error?.message ?? error) }));
       return true;
     }

package/adapters/computer/chrome-extension/manifest.json

@@ -1,12 +1,14 @@
 {
   "manifest_version": 3,
   "name": "Forge Computer ChatGPT Provider",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Computer-owned stable ChatGPT target provider for Forge Runtime.",
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxFzo1eixjsWsZbN1pBuyzdKinJSAAuzTRavD0xFQFwrTIEQ7hxxueEBEhifpGq9nplNnmxmZvIL7PJycEAYT8mrbyXBLCPR1jQBuL4YR775phnlNVpF3dHX5OWDHLWRnHRgOO1FibQ54fM2rKylr66+x+J6/4C7a9dpiSMuxf3fOStXA6wJb0d7A4E22Q1+GGfWgs0NCyVI5k4aczK+J5Ao61ZXKBr8Qw/FCmwhCcDgQdIpURgoMHkyvQH3ryYWocucjRhMVsU8H65adIIKFHkEhPJCiVY64L6bu6kNR2fpf0yJ1GvI5ota6Hf4NAEi7Yt7PL7i3ISyv3pPQWW1nIwIDAQAB",
   "permissions": [
     "nativeMessaging",
+    "storage",
     "tabs",
+    "scripting",
     "alarms"
   ],
   "host_permissions": [

package/adapters/computer/desktop-operator-provider.ts

@@ -290,22 +290,34 @@ export async function callDesktopOperatorComputerBrowserAutomation(
 export function createDesktopOperatorComputerProvider(
   options: DesktopOperatorComputerProviderOptions = {},
 ): DesktopOperatorComputerProvider {
-  let active: { key: string; binding: DesktopOperatorComputerBinding } | undefined;
-  const binding = (): DesktopOperatorComputerBinding => {
+  let active: { key: string; binding: DesktopOperatorComputerBinding; observations?: DesktopOperatorComputerBinding } | undefined;
+  const binding = (observation = false): DesktopOperatorComputerBinding => {
     const endpoint = resolveDesktopOperatorComputerEndpoint(options);
     const key = endpointBindingKey(endpoint);
-    if (active?.key === key) return active.binding;
-    active?.binding.close();
-    active = { key, binding: createBinding(endpoint) };
+    if (active?.key !== key) {
+      active?.binding.close();
+      active?.observations?.close();
+      active = { key, binding: createBinding(endpoint) };
+    }
+    // Desktop Operator executes RPCs serially within each socket connection.
+    // A slow Browser RPC must not head-of-line block native snapshots/capture.
+    // Keep all input, console and legacy Browser requests on their original
+    // ordered stream; target/session locks still serialize observation epochs.
+    if (observation) return active.observations ??= createBinding(endpoint);
     return active.binding;
   };
   return {
     providerId: DESKTOP_OPERATOR_PROVIDER_PLUGIN_ID,
     capabilities: desktopOperatorComputerProviderCapabilities(options),
-    execute: async (request, timeoutMs) => await binding().execute(request, timeoutMs),
+    execute: async (request, timeoutMs) => await binding(
+      request.capability === COMPUTER_OBSERVE_CAPABILITY
+        || request.capability === COMPUTER_ELEMENT_OBSERVE_CAPABILITY
+        || request.capability === COMPUTER_CAPTURE_CAPABILITY,
+    ).execute(request, timeoutMs),
     executeBrowserCompatibility: async (request, timeoutMs) => await binding().executeBrowserCompatibility(request, timeoutMs),
     dispose: () => {
       active?.binding.close();
+      active?.observations?.close();
       active = undefined;
     },
   };

package/adapters/computer/interaction-target-authority.ts

@@ -218,6 +218,7 @@ interface ComputerSurfaceIndexReadyRecord {
   schemaVersion: 1;
   status: 'ready';
   indexedAt: string;
+  terminalBindingIndexReady?: true;
 }
 
 const COMPUTER_SURFACE_INDEX_READY_KEY = 'surface-index-v1-ready';
@@ -231,6 +232,12 @@ function surfaceBindingIndexKey(binding: ComputerSurfaceProviderBinding | undefi
   return `binding-${digest40(`${binding.providerId}:${binding.browserProduct ?? ''}:${binding.windowId}:${binding.tabId}`)}`;
 }
 
+// Migration-only negative evidence; never claims the live tab binding.
+function terminalBindingIndexKey(binding: ComputerSurfaceProviderBinding | undefined): string | undefined {
+  const key = surfaceBindingIndexKey(binding);
+  return key ? `terminal-${key}` : undefined;
+}
+
 function surfaceStableIdentityIndexKey(identity: ComputerSurfaceStableIdentity): string | undefined {
   const normalized = normalizeSurfaceStableIdentity(identity);
   if (!normalized.resource) return undefined;
@@ -282,7 +289,10 @@ function writeSurfaceIndexes(
 ): void {
   // Terminal imports retain stable/alias identity, never a physical tab claim.
   const indexed = status === 'tombstoned' ? { ...target, providerBinding: undefined } : target;
-  for (const key of surfaceIndexKeysForTarget(indexed)) {
+  const keys = surfaceIndexKeysForTarget(indexed);
+  const terminal = status === 'tombstoned' ? terminalBindingIndexKey(target.providerBinding) : undefined;
+  if (terminal) keys.push(terminal);
+  for (const key of keys) {
     const current = transaction.read<ComputerSurfaceIndexRecord>(COMPUTER_TARGET_INDEX_NAMESPACE, COMPUTER_TARGET_SCOPE, key);
     if (current?.value.targetId === target.targetId) continue;
     if (current) {
@@ -311,7 +321,7 @@ function ensureSurfaceIndexes(transaction: ComputerTargetPersistenceTransaction)
     COMPUTER_TARGET_SCOPE,
     COMPUTER_SURFACE_INDEX_READY_KEY,
   );
-  if (ready?.value.status === 'ready') return;
+  if (ready?.value.status === 'ready' && ready.value.terminalBindingIndexReady === true) return;
   const surfaces = transaction.listAll<ComputerInteractionTargetEntry>({
     namespace: COMPUTER_TARGET_NAMESPACE,
     scope: COMPUTER_TARGET_SCOPE,
@@ -324,7 +334,7 @@ function ensureSurfaceIndexes(transaction: ComputerTargetPersistenceTransaction)
     scope: COMPUTER_TARGET_SCOPE,
     key: COMPUTER_SURFACE_INDEX_READY_KEY,
     schemaVersion: 1,
-    value: { schemaVersion: 1, status: 'ready', indexedAt: now() } satisfies ComputerSurfaceIndexReadyRecord,
+    value: { schemaVersion: 1, status: 'ready', indexedAt: now(), terminalBindingIndexReady: true } satisfies ComputerSurfaceIndexReadyRecord,
     action: ready ? 'computer_surface_index_ready_repair' : 'computer_surface_index_ready',
     expectedRevision: ready?.revision ?? null,
   });
@@ -347,9 +357,12 @@ function readIndexedSurfaceRecord(
   const index = transaction.read<ComputerSurfaceIndexRecord>(COMPUTER_TARGET_INDEX_NAMESPACE, COMPUTER_TARGET_SCOPE, indexKey);
   if (!index) return undefined;
   const target = transaction.read<ComputerInteractionTargetEntry>(COMPUTER_TARGET_NAMESPACE, COMPUTER_TARGET_SCOPE, index.value.targetId);
-  if (target?.value.target.kind === 'surface'
-    && (target.value.status === 'active' || !indexKey.startsWith('binding-'))
-    && surfaceIndexKeysForTarget(normalizedSurfaceTarget(target.value.target)).includes(indexKey)) return target;
+  const surface = target?.value.target.kind === 'surface' ? normalizedSurfaceTarget(target.value.target) : undefined;
+  const valid = indexKey.startsWith('terminal-')
+    ? target?.value.status === 'tombstoned' && terminalBindingIndexKey(surface?.providerBinding) === indexKey
+    : (target?.value.status === 'active' || !indexKey.startsWith('binding-'))
+      && Boolean(surface && surfaceIndexKeysForTarget(surface).includes(indexKey));
+  if (target && valid) return target;
   transaction.delete({
     namespace: COMPUTER_TARGET_INDEX_NAMESPACE,
     scope: COMPUTER_TARGET_SCOPE,
@@ -363,8 +376,14 @@ function readIndexedSurfaceRecord(
 function deleteSurfaceIndexes(
   transaction: ComputerTargetPersistenceTransaction,
   target: ComputerSurfaceTarget,
+  status: 'active' | 'tombstoned' = 'active',
 ): void {
-  for (const key of surfaceIndexKeysForTarget(target)) {
+  const keys = surfaceIndexKeysForTarget(target);
+  if (status === 'tombstoned') {
+    const terminal = terminalBindingIndexKey(target.providerBinding);
+    if (terminal) keys.push(terminal);
+  }
+  for (const key of keys) {
     const index = transaction.read<ComputerSurfaceIndexRecord>(COMPUTER_TARGET_INDEX_NAMESPACE, COMPUTER_TARGET_SCOPE, key);
     if (!index || index.value.targetId !== target.targetId) continue;
     transaction.delete({
@@ -607,6 +626,15 @@ export function createComputerInteractionTargetAuthority(
     const inputIndexKeys = surfaceInputIndexKeys({ stableIdentity, visibility, compatibilityAliases, repositoryIds, providerBinding });
     return persistence.transaction(controllerHome, (transaction) => {
       ensureSurfaceIndexes(transaction);
+      // An old repository's import is observation, not permission to revive a
+      // terminal physical tab. Current authoritative writes remain unaffected.
+      if (rawInput.reactivate === false) {
+        const terminalKey = terminalBindingIndexKey(providerBinding);
+        const terminal = terminalKey ? readIndexedSurfaceRecord(transaction, terminalKey) : undefined;
+        if (terminal?.value.status === 'tombstoned' && terminal.value.target.kind === 'surface') {
+          return { target: structuredClone(normalizedSurfaceTarget(terminal.value.target)), status: 'tombstoned', created: false };
+        }
+      }
       const indexed = new Map<string, ComputerTargetPersistenceRecord<ComputerInteractionTargetEntry>>();
       for (const indexKey of inputIndexKeys) {
         const candidate = readIndexedSurfaceRecord(transaction, indexKey);
@@ -674,7 +702,7 @@ export function createComputerInteractionTargetAuthority(
         ...(existing.value.status === 'tombstoned' ? { providerBinding } : providerBinding ? { providerBinding } : {}),
         updatedAt: at,
       };
-      deleteSurfaceIndexes(transaction, currentTarget);
+      deleteSurfaceIndexes(transaction, currentTarget, existing.value.status);
       transaction.write({
         namespace: COMPUTER_TARGET_NAMESPACE,
         scope: COMPUTER_TARGET_SCOPE,
@@ -869,6 +897,7 @@ export function createComputerInteractionTargetAuthority(
         action: 'computer_surface_target_tombstone',
         expectedRevision: current.revision,
       });
+      writeSurfaceIndexes(transaction, normalizedSurfaceTarget(current.value.target), 'tombstoned');
       return true;
     });
   }
@@ -962,6 +991,7 @@ export function createComputerInteractionTargetAuthority(
               action: 'computer_surface_target_tombstone',
               expectedRevision: current.revision,
             });
+            writeSurfaceIndexes(transaction, normalizedSurfaceTarget(current.value.target), 'tombstoned');
           });
           return structuredClone(target);
         },
@@ -1008,7 +1038,7 @@ export function createComputerInteractionTargetAuthority(
           const currentAtMs = Date.parse(current.value.tombstonedAt ?? current.updatedAt);
           const stillExpired = !Number.isFinite(currentAtMs) || nowMs - currentAtMs >= ttlMs;
           if (!stillExpired && !capacityEligible) return false;
-          if (current.value.target.kind === 'surface') deleteSurfaceIndexes(transaction, normalizedSurfaceTarget(current.value.target));
+          if (current.value.target.kind === 'surface') deleteSurfaceIndexes(transaction, normalizedSurfaceTarget(current.value.target), 'tombstoned');
           return transaction.delete({
             namespace: COMPUTER_TARGET_NAMESPACE,
             scope: COMPUTER_TARGET_SCOPE,