codex-overleaf-link 2.4.1 → 2.5.1

package/extension/src/content/composerAttachments.js

@@ -6,6 +6,7 @@
     const tx = typeof options.tx === 'function' ? options.tx : (en) => en;
     const tr = typeof options.tr === 'function' ? options.tr : (key) => key;
     const appendPlainLog = typeof options.appendPlainLog === 'function' ? options.appendPlainLog : () => {};
+    const onChange = typeof options.onChange === 'function' ? options.onChange : () => {};
     const limits = options.limits || {};
     const maxAttachments = Number(limits.maxAttachments) || 8;
     const maxAttachmentBytes = Number(limits.maxAttachmentBytes) || 12 * 1024 * 1024;
@@ -15,6 +16,8 @@
     let attachments = [];
     const pendingAttachmentKeys = new Set();
     let pendingAttachmentBytes = 0;
+    let attachmentGeneration = 0;
+    let attachmentRevision = 0;
 
     function handlePaste(event) {
       const files = collectFilesFromDataTransfer(event.clipboardData);
@@ -59,51 +62,68 @@
     }
 
     async function addFiles(files) {
-      for (const file of Array.from(files || [])) {
-        const dedupeKey = buildAttachmentDedupeKey(file);
-        if (isDuplicateAttachmentFile(dedupeKey)) {
-          continue;
-        }
-        if (attachments.length + pendingAttachmentKeys.size >= maxAttachments) {
-          appendPlainLog(tx(
-            `Attachment limit reached (${maxAttachments}).`,
-            `附件数量已达上限（${maxAttachments} 个）。`
-          ));
-          break;
-        }
-        validateAttachmentFile(file);
-        const fileSize = Number(file.size) || 0;
-        if (!canReserveAttachmentBytes(fileSize)) {
-          appendPlainLog(tx(
-            `Attachment total limit reached (${formatFileSize(maxAttachmentTotalBytes)}). Remove attachments or use smaller files.`,
-            `附件总大小已达上限（${formatFileSize(maxAttachmentTotalBytes)}）。请移除部分附件或使用更小的文件。`
-          ));
-          continue;
-        }
-        pendingAttachmentKeys.add(dedupeKey);
-        pendingAttachmentBytes += fileSize;
-        try {
-          const dataUrl = await readFileAsDataUrl(file);
-          const preview = await buildAttachmentPreviewData(file, dataUrl);
-          const attachment = {
-            id: `${Date.now()}-${Math.random().toString(36).slice(2)}`,
-            name: normalizeAttachmentName(file.name),
-            mimeType: String(file.type || ''),
-            size: Number(file.size) || 0,
-            kind: preview.kind,
-            previewDataUrl: preview.previewDataUrl,
-            contentBase64: extractBase64FromDataUrl(dataUrl),
-            dedupeKey
-          };
-          if (!attachments.some(existing => buildAttachmentDedupeKey(existing) === dedupeKey)) {
-            attachments.push(attachment);
+      const generation = attachmentGeneration;
+      try {
+        for (const file of Array.from(files || [])) {
+          if (generation !== attachmentGeneration) return;
+          const dedupeKey = buildAttachmentDedupeKey(file);
+          if (isDuplicateAttachmentFile(dedupeKey)) {
+            continue;
+          }
+          if (attachments.length + pendingAttachmentKeys.size >= maxAttachments) {
+            appendPlainLog(tx(
+              `Attachment limit reached (${maxAttachments}).`,
+              `附件数量已达上限（${maxAttachments} 个）。`
+            ));
+            break;
+          }
+          validateAttachmentFile(file);
+          const fileSize = Number(file.size) || 0;
+          if (!canReserveAttachmentBytes(fileSize)) {
+            appendPlainLog(tx(
+              `Attachment total limit reached (${formatFileSize(maxAttachmentTotalBytes)}). Remove attachments or use smaller files.`,
+              `附件总大小已达上限（${formatFileSize(maxAttachmentTotalBytes)}）。请移除部分附件或使用更小的文件。`
+            ));
+            continue;
+          }
+          attachmentRevision += 1;
+          pendingAttachmentKeys.add(dedupeKey);
+          pendingAttachmentBytes += fileSize;
+          try {
+            const dataUrl = await readFileAsDataUrl(file, tx);
+            if (generation !== attachmentGeneration) return;
+            const preview = await buildAttachmentPreviewData(file, dataUrl);
+            if (generation !== attachmentGeneration) return;
+            const attachment = {
+              id: `${Date.now()}-${Math.random().toString(36).slice(2)}`,
+              name: normalizeAttachmentName(file.name),
+              mimeType: String(file.type || ''),
+              size: Number(file.size) || 0,
+              kind: preview.kind,
+              previewDataUrl: preview.previewDataUrl,
+              contentBase64: extractBase64FromDataUrl(dataUrl),
+              dedupeKey
+            };
+            if (!attachments.some(existing => buildAttachmentDedupeKey(existing) === dedupeKey)) {
+              attachments.push(attachment);
+              attachmentRevision += 1;
+              onChange();
+            }
+          } catch (error) {
+            if (generation !== attachmentGeneration) return;
+            throw error;
+          } finally {
+            // Cleared work no longer owns reservations in the current composer.
+            if (generation === attachmentGeneration) {
+              pendingAttachmentBytes = Math.max(0, pendingAttachmentBytes - fileSize);
+              pendingAttachmentKeys.delete(dedupeKey);
+            }
           }
-        } finally {
-          pendingAttachmentBytes = Math.max(0, pendingAttachmentBytes - fileSize);
-          pendingAttachmentKeys.delete(dedupeKey);
         }
+      } finally {
+        // A partial batch may have accepted files before validation or reading failed.
+        if (generation === attachmentGeneration) renderComposerAttachments();
       }
-      renderComposerAttachments();
     }
 
     function getAttachmentsForRun() {
@@ -144,15 +164,21 @@
       });
     }
 
-    function clear() {
+    function clear(options = {}) {
+      attachmentGeneration += 1;
+      attachmentRevision += 1;
       attachments = [];
       pendingAttachmentKeys.clear();
+      pendingAttachmentBytes = 0;
       renderComposerAttachments();
+      if (options.notify !== false) onChange();
     }
 
     function removeAttachment(id) {
+      const previousLength = attachments.length;
       attachments = attachments.filter(attachment => attachment.id !== id);
       renderComposerAttachments();
+      if (attachments.length !== previousLength) { attachmentRevision += 1; onChange(); }
     }
 
     function isDuplicateAttachmentFile(dedupeKey) {
@@ -260,14 +286,36 @@
       if (!usable.length) {
         return 0;
       }
+      attachmentRevision += 1;
       attachments = usable.map(item => ({ ...item }));
       renderComposerAttachments();
       return attachments.length;
     }
 
+    // Only a just-rejected local-skill submission uses this in-memory recovery.
+    // It keeps the normal composer limits, without durable-draft truncation.
+    function restoreSubmittedAttachments(value, expectedRevision) {
+      if (expectedRevision !== attachmentRevision || attachments.length || pendingAttachmentBytes || pendingAttachmentKeys.size) return false;
+      if (!Array.isArray(value) || value.length > maxAttachments) return false;
+      let total = 0;
+      for (const item of value) {
+        const size = Number(item?.size);
+        if (!item?.name || typeof item.contentBase64 !== 'string' || !Number.isFinite(size) || size < 0 || size > maxAttachmentBytes) return false;
+        total += size;
+      }
+      if (total > maxAttachmentTotalBytes) return false;
+      attachments = value.map((item, index) => ({ ...item, id: `restored-${Date.now()}-${index}`, dedupeKey: buildAttachmentDedupeKey(item) }));
+      attachmentRevision += 1;
+      renderComposerAttachments();
+      onChange();
+      return true;
+    }
+
     return {
       serializePersistableAttachments,
       restorePersistedAttachments,
+      restoreSubmittedAttachments,
+      getRevision: () => attachmentRevision,
       handlePaste,
       handleDragOver,
       handleDragLeave,
@@ -361,54 +409,56 @@
   }
 
   function renderAttachmentPreviewList(attachments = [], container, options = {}) {
-    if (!container) {
-      return;
-    }
+    if (!container) return;
     container.replaceChildren();
     const items = Array.isArray(attachments) ? attachments : [];
     container.hidden = items.length === 0;
     for (const attachment of items) {
       const isImage = attachment.kind === 'image' && attachment.previewDataUrl;
-      const card = document.createElement(isImage ? 'button' : 'div');
+      const label = attachment.name || (options.tx ? options.tx('Attachment', '附件') : 'Attachment');
+      const card = document.createElement('div');
       card.className = 'codex-attachment-preview-card';
       card.dataset.kind = isImage ? 'image' : 'file';
+      card.title = label + ' · ' + formatFileSize(attachment.size);
       if (isImage) {
-        card.type = 'button';
-        card.title = options.tx
-          ? options.tx(`Open ${attachment.name}`, `打开 ${attachment.name}`)
-          : `Open ${attachment.name}`;
-        card.addEventListener('click', () => showAttachmentPreviewDialog(attachment, options));
+        const preview = document.createElement('button');
+        preview.type = 'button';
+        preview.className = 'codex-attachment-preview-open';
+        preview.setAttribute('aria-label', options.tx ? options.tx('Preview ' + label, '预览 ' + label) : 'Preview ' + label);
+        preview.addEventListener('click', () => showAttachmentPreviewDialog(attachment, options));
         const image = document.createElement('img');
         image.src = attachment.previewDataUrl;
-        image.alt = attachment.name || (options.tx ? options.tx('Attached image', '已附加图片') : 'Attached image');
-        card.append(image);
+        image.alt = label;
+        preview.append(image);
+        card.append(preview);
       } else {
         const icon = document.createElement('span');
         icon.className = 'codex-attachment-file-icon';
         icon.textContent = getAttachmentIconLabel(attachment);
+        icon.setAttribute('aria-hidden', 'true');
         card.append(icon);
       }
-
       const meta = document.createElement('span');
       meta.className = 'codex-attachment-preview-meta';
       const name = document.createElement('span');
       name.className = 'codex-attachment-preview-name';
-      name.textContent = attachment.name || (options.tx ? options.tx('Attachment', '附件') : 'Attachment');
-      const size = document.createElement('span');
-      size.className = 'codex-attachment-preview-size';
-      size.textContent = formatFileSize(attachment.size);
-      meta.append(name, size);
+      name.textContent = label;
+      meta.append(name);
+      if (!isImage) {
+        const size = document.createElement('span');
+        size.className = 'codex-attachment-preview-size';
+        size.textContent = formatFileSize(attachment.size);
+        meta.append(size);
+      }
       card.append(meta);
-
       if (options.removable) {
         const remove = document.createElement('button');
         remove.type = 'button';
         remove.className = 'codex-attachment-preview-remove';
         remove.textContent = '×';
-        remove.title = options.tx ? options.tx('Remove attachment', '移除附件') : 'Remove attachment';
-        remove.setAttribute('aria-label', options.tx
-          ? options.tx(`Remove ${attachment.name}`, `移除 ${attachment.name}`)
-          : `Remove ${attachment.name}`);
+        const removeLabel = options.tx ? options.tx('Remove ' + label, '移除 ' + label) : 'Remove ' + label;
+        remove.title = removeLabel;
+        remove.setAttribute('aria-label', removeLabel);
         remove.addEventListener('click', event => {
           event.preventDefault();
           event.stopPropagation();
@@ -494,13 +544,13 @@
       /\.(?:png|jpe?g|gif|webp|bmp|svg)$/i.test(String(attachment.name || ''));
   }
 
-  function readFileAsDataUrl(file) {
+  function readFileAsDataUrl(file, tx = en => en) {
     return new Promise((resolve, reject) => {
       const reader = new FileReader();
       reader.onload = () => {
         resolve(String(reader.result || ''));
       };
-      reader.onerror = () => reject(reader.error || new Error('Could not read selected file'));
+      reader.onerror = () => reject(new Error(tx('Could not read selected file.', '无法读取所选文件。'), { cause: reader.error }));
       reader.readAsDataURL(file);
     });
   }

package/extension/src/content/composerPanel.js

@@ -18,6 +18,7 @@
       <div class="codex-pending-inputs" data-pending-inputs hidden></div>
       <form class="codex-composer" data-composer-form>
         <div class="codex-attachment-strip codex-attachment-preview-list" data-attachment-strip hidden></div>
+        <div class="codex-composer-selection" data-composer-selection hidden></div>
         <div class="codex-composer-skill-context" data-composer-skill-context hidden>
           <span class="codex-composer-skill-icon" aria-hidden="true">◇</span>
           <span data-composer-skill-label></span>
@@ -35,17 +36,31 @@
             <option value="ask">Ask</option>
             <option value="auto">Auto</option>
           </select>
+          <div class="codex-write-preferences">
+            <label class="codex-review-toggle" title="When enabled, Codex checks or switches Overleaf Reviewing/Track Changes before writing. Deletes still require confirmation.">
+              <input type="checkbox" data-require-reviewing>
+              <svg class="codex-composer-option-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
+                <path d="m9 11 8-8 4 4-8 8M9 11l4 4-3 3H6v-4l3-3ZM3 21h7"></path>
+              </svg>
+              <span class="codex-review-label" data-i18n="requireReviewing">Track</span>
+              <svg class="codex-composer-option-check" viewBox="0 0 16 16" aria-hidden="true" focusable="false">
+                <path d="m3.5 8 3 3 6-6"></path>
+              </svg>
+            </label>
+            <label class="codex-recompile-toggle" title="Automatically recompile in Overleaf after Codex writes and record the result. Toggling this setting does not compile immediately. Ask mode does not trigger compilation.">
+              <input type="checkbox" data-auto-recompile>
+              <svg class="codex-composer-option-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
+                <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8ZM14 2v6h6m-11 7 2 2 4-4"></path>
+              </svg>
+              <span class="codex-recompile-label" data-i18n="autoCompile">Auto compile</span>
+              <svg class="codex-composer-option-check" viewBox="0 0 16 16" aria-hidden="true" focusable="false">
+                <path d="m3.5 8 3 3 6-6"></path>
+              </svg>
+            </label>
+          </div>
         </div>
         <div class="codex-composer-toolbar">
           <button type="button" data-add-context title="Add @ context" aria-label="Add @ context" aria-expanded="false">＋</button>
-          <label class="codex-review-toggle" title="When enabled, Codex checks or switches Overleaf Reviewing/Track Changes before writing. Deletes still require confirmation.">
-            <input type="checkbox" data-require-reviewing>
-            <span class="codex-review-label" data-i18n="requireReviewing">Track</span>
-          </label>
-          <label class="codex-recompile-toggle" title="After Codex writes, click Overleaf Recompile and record the compile result for this task. Ask mode will not trigger it.">
-            <input type="checkbox" data-auto-recompile>
-            <span class="codex-recompile-label" data-i18n="autoCompile">Compile</span>
-          </label>
           <div class="codex-model-config" data-model-config>
             <button type="button" class="codex-model-config-button" data-model-config-toggle aria-haspopup="menu" aria-expanded="false">
               <span class="codex-model-speed-indicator" data-speed-indicator hidden aria-hidden="true">
@@ -117,6 +132,7 @@
     `;
 
     bindEvents(instance);
+    bindMenuLayout(instance);
 
     return {
       setRunning: running => setRunning(instance, running),
@@ -178,6 +194,22 @@
     instance.listeners.push({ target, type, listener });
   }
 
+  function bindMenuLayout(instance) {
+    const view = instance.container.ownerDocument?.defaultView || window;
+    const update = () => instance.callbacks.onMenuLayoutChange?.();
+    bind(instance, view, 'resize', update);
+    bind(instance, view.visualViewport, 'resize', update);
+    bind(instance, view.visualViewport, 'scroll', update);
+    const form = instance.container.querySelector('[data-composer-form]');
+    if (form && typeof view.ResizeObserver === 'function') {
+      instance.menuResizeObserver = new view.ResizeObserver(update);
+      instance.menuResizeObserver.observe(form);
+      instance.menuResizeObserver.observe(instance.container);
+      const panel = instance.container.closest?.('#codex-overleaf-panel');
+      if (panel && panel !== instance.container) instance.menuResizeObserver.observe(panel);
+    }
+  }
+
   function setRunning(target, running) {
     const instance = target?._instance || target;
     const runButton = instance?.container?.querySelector('[data-run]');
@@ -261,6 +293,7 @@
   }
 
   function destroy(instance) {
+    instance.menuResizeObserver?.disconnect();
     for (const { target, type, listener } of instance.listeners.splice(0)) {
       target.removeEventListener?.(type, listener);
     }