Spot it. Save it. Free, local-first Chrome extension for images, videos and prompts. Explore 2,000+ curated cases and connect your library to AI Agents via MCP. 提示词导演
JavaScript ai-artai-videochrome-extensionclaude-codecodexhiggsfieldjimenglocal-firstmcpmidjourneymoodboardprompt-engineeringprompt-libraryprompt-managerreference-libraryseedancevisual-bookmarksweb-clipper
Release 1.23.0: capture, playback and library continuity (#27)
wchao68912ef30232602b
diff --git a/.github/workflows/release-safety.yml b/.github/workflows/release-safety.ymlindex 9beea45..2e2c8f8 100644--- a/.github/workflows/release-safety.yml+++ b/.github/workflows/release-safety.yml@@ -108,6 +108,8 @@ jobs:- run: npm ci- run: python -m pip install playwright==1.58.0- run: python -m playwright install chromium+ - name: Guard import deduplication growth and replacement semantics+ run: node --test test/library-import-dedup.test.js- run: npm run package- name: Check the Windows installation packagerun: |@@ -118,7 +120,7 @@ jobs:with zipfile.ZipFile(f'dist/PromptDirector-{version}.zip') as archive:archive.extractall(destination)env = {**os.environ, 'PROMPTDIRECTOR_E2E_EXTENSION_DIR': str(destination), 'PROMPTDIRECTOR_E2E_BLOCK_EXTERNAL_NETWORK': '1'}- for script in ['project_tree_e2e.py', 'library_import_resources_e2e.py', 'library_import_ui_e2e.py', 'library_import_interruption_e2e.py', 'image_generation_info_e2e.py', 'skill_cover_e2e.py']:+ for script in ['project_tree_e2e.py', 'library_import_resources_e2e.py', 'library_import_ui_e2e.py', 'library_import_preview_e2e.py', 'library_import_interruption_e2e.py', 'image_generation_info_e2e.py', 'skill_cover_e2e.py']:subprocess.run([sys.executable, f'test/{script}'], env=env, check=True)PY- run: npm run test:upgradediff --git a/AGENTS.md b/AGENTS.mdnew file mode 100644index 0000000..85eef0d--- /dev/null+++ b/AGENTS.md@@ -0,0 +1,16 @@+# PromptDirector 开发入口++PromptDirector 是本地优先的视觉创作灵感库,服务用户保存、整理和复用视觉案例及完整创作资料。本仓库维护产品源码、测试和公开发布资料;日常本地测试加载 `extension/`。++## 开始与接续++每次新对话及上下文压缩恢复后,必须读取本文件。维护者工作区存在时,继续读取同级 [Private 开发入口](../PromptDirector-Private/AGENTS.md),按其必读顺序恢复项目、偏好和当前规划,再开始实质工作。++若私有工作区不可访问,明确说明无法恢复维护者上下文;公开贡献以当前请求、README、相关源码和测试为依据,不能宣称已经读取私人规划。++## 开发与交付++- 修改前核对实时 Git 状态,保护已有改动;沿完整用户任务追踪共用规则和消费者。+- 案例、原件、用户编辑与组织关系的延续性优先。质量、能力、权限和费用取舍需透明说明。+- 运行与变更相关的验证;代码完成、自动验证、安装验收、发布验证分别说明。+- 维护者原话、规划、研究、复盘和验证回执按 Private 文档规范写回;本仓库保留面向公开使用者的内容。diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 900da14..5927fbf 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -2,6 +2,17 @@了解每个版本带来的功能变化与使用改善。下载请前往 [GitHub Releases](https://github.com/wchao6891/PromptDirector/releases/latest)。+## 1.23.0++- 网页采集可直接点选图片与正文,补充评论和剪贴板内容;成功项清理,失败项保留重试,重复采集也应用本次明确选择的分类。+- 改善 X 轮播视频、竖版组图及长评论采集,保留主帖与引用内容的归属。+- 新增 Midjourney 作品详情采集,保存当前作品、原始提示词、参数与视频封面;Explore 可采集已加载的作品预览。+- 视频详情提供居中播放按钮,点击后开始加载;网络发现的 HLS 地址接入播放,视频与封面可在授权后使用原页面读取。+- 案例详情支持调整图文分栏与封面,批量修改案例类型;三级标签整理按容量分块,同页失败重试保留已完成结果。+- 改善 ZIP 导入预览、重复校验与媒体补存,保留原始提示词、人工编辑和组织关系。+- 改善兼容 AI 服务的流式响应、参考资料发送和创作会话接续,查看提炼 Skill 后可返回原会话。+- 新增媒体响应观察权限,仅用于已授权站点。旧版内置更新器会拒绝自动写入新增必要权限的版本;请解压新版安装包覆盖原安装目录并在扩展管理页重新加载,勿卸载扩展或清除资料。+## 1.22.4- 修复精选合集包含未署名案例时,插件拒绝显示整包预览的问题;保留已有署名,未知作者保持留空。diff --git a/README.md b/README.mdindex 7a807d1..e855721 100644--- a/README.md+++ b/README.md@@ -19,6 +19,7 @@| Where inspiration lives | What you can bring with you || --- | --- || **Jimeng · Higgsfield · LiblibAI · Krea · LibTV** | Work images, videos and publicly available prompts or creative details. Keep the visual and its context together. |+| **Midjourney** | Save the selected work, public prompt, parameters and video cover; capture loaded previews from Explore. || **HeyBox / 小黑盒 · WeChat articles** | Save a whole article or split clearly structured multi-case posts into selectable image-and-prompt groups. Keep a single HeyBox image gallery with its prompt from the post body. || **Feishu documents** | Capture document bodies, long documents and images within tables, preserving cell placement and merged cells. || **X / Twitter · Xiaohongshu · Weibo · Reddit** | Collect the current post's text and accessible media, including prompts shared by the author. |diff --git a/README.zh-CN.md b/README.zh-CN.mdindex 4577658..9de3a75 100644--- a/README.zh-CN.md+++ b/README.zh-CN.md@@ -19,6 +19,7 @@| 灵感来自哪里 | 值得带走什么 || --- | --- || **即梦 · Higgsfield · LiblibAI · Krea · LibTV** | 作品图片、视频,以及页面公开的提示词和创作信息。把喜欢的画面与创作线索放在一起。 |+| **Midjourney** | 保存当前作品的图片或视频、公开提示词、参数和视频封面;Explore 支持已加载作品预览。 || **小黑盒 · 微信公众号** | 收藏整篇图文,也可将结构清晰的多案例文章拆开,勾选其中的图片与对应提示词,分别保存。小黑盒单案例图片墙可与正文提示词成组收藏。 || **飞书文档** | 保存正文、长文档和表格内图文,保留单元格位置与合并关系,让案例回到对应的位置。 || **X / Twitter · 小红书 · 微博 · Reddit** | 收集当前帖子正文和可获取的媒体,把作者分享的提示词与作品一起留下。 |diff --git a/docs/CAPTURE_SUPPORT.md b/docs/CAPTURE_SUPPORT.mdindex d80b378..dc6c552 100644--- a/docs/CAPTURE_SUPPORT.md+++ b/docs/CAPTURE_SUPPORT.md@@ -16,7 +16,8 @@| Reddit、微博、小红书 | 当前页面的帖子、正文、图片和可读媒体。登录弹层、折叠评论、不可读的播放器或未加载轮播仍可能需要在原页面处理后补采。 || YouTube、Bilibili、TikTok、抖音 | 可读的媒体文件优先保存;来源支持时使用官方独立播放器。Bilibili 保留当前分 P;TikTok 使用视频播放器地址。 || 花瓣、Dribbble、DeviantArt、站酷 | 当前作品页面的可见内容及页面提供的结构化媒体。 |-| TapNow、Lovart、Midjourney、Civitai、Runway、可灵 | 通用可见内容与结构化图片/视频提取。是否提供提示词、原图、可访问节点或完整视频,取决于当前作品页面;没有提供的内容不会推断生成。 |+| Midjourney | 按当前作品与所选序号提取图片或视频、原始提示词、参数及视频封面;Explore 提取已加载预览,无原词的条目会标记不完整。 |+| TapNow、Lovart、Civitai、Runway、可灵 | 通用可见内容与结构化图片/视频提取。是否提供提示词、原图、可访问节点或完整视频,取决于当前作品页面;没有提供的内容不会推断生成。 |不同页面提供的内容可能不同。请打开具体作品或帖子再采集;尚未加载的图片、登录后才能访问的内容和未公开的提示词可能无法保存。@@ -28,5 +29,5 @@- 能取得有效完整视频文件时保存本地;独立在线播放保留原作品地址与单独的播放地址。分段 HLS 使用随扩展打包的开源播放器,音视频在浏览器内处理,不使用外部解析服务。- 在线视频仍依赖来源可用性。登录失效、链接过期、限流或禁止播放时会显示问题,可回到原作品重新采集;不会用封面或网页嵌套冒充视频播放。-- 案例已保存但部分媒体未完整取得时,已保存内容从采集侧栏清除,具体媒体问题保留在案例的来源信息中。真正保存失败的内容留在草稿中。+- 案例正文或部分媒体已保存时,未完成的采集项保留供重试,并显示失败原因;全部完成后清空采集预览。已保存的补充文字与图片从草稿中清除,重试补存到同一案例。- 日常使用不需要卸载扩展或重建案例库。本地版在原目录更新程序,既有案例与媒体继续留在当前浏览器。diff --git a/extension/ai-provider-presets.js b/extension/ai-provider-presets.jsindex 5cb1710..7f6f4ea 100644--- a/extension/ai-provider-presets.js+++ b/extension/ai-provider-presets.js@@ -104,21 +104,21 @@ export const AI_PROVIDER_PRESETS = Object.freeze([}),preset({id: "custom-text",- label: "自定义兼容服务(文字)",+ label: "自定义兼容服务(对话与识别)",category: "custom",endpoint: "",protocol: "chat_completions",discovery: { adapter: "identity" },- capabilities: TEXT_CAPABILITIES+ capabilities: [...TEXT_CAPABILITIES, "imageAnalysis", "videoAnalysis"]}),preset({id: "custom-media",- label: "自定义兼容服务(图片与生成)",+ label: "自定义图片生成服务",category: "custom",endpoint: "",protocol: "chat_completions",discovery: { adapter: "identity" },- capabilities: ["imageAnalysis", "imageGeneration"]+ capabilities: [...TEXT_CAPABILITIES, "imageAnalysis", "imageGeneration"]})]);diff --git a/extension/ai-provider-registry.js b/extension/ai-provider-registry.jsindex efed75b..4b0ea0e 100644--- a/extension/ai-provider-registry.js+++ b/extension/ai-provider-registry.js@@ -12,8 +12,8 @@ export const AI_ASSIGNMENT_TASKS = Object.freeze([]);const CUSTOM_PROVIDER_LABELS = Object.freeze({- "custom-text": "自定义兼容服务(文字)",- "custom-media": "自定义兼容服务(图片与生成)"+ "custom-text": "自定义兼容服务(对话与识别)",+ "custom-media": "自定义图片生成服务"});const ASSIGNMENT_EVIDENCE = new Set(["declared", "protocol_inferred", "manual_unverified"]);@@ -154,7 +154,7 @@ export function availableAiModelsForTask(taskId, profileValue = {}) {? clean(profile.models.imageGeneration) || clean(profile.imageGeneration?.model): taskId === "videoGeneration"? clean(profile.models.videoGeneration) || clean(profile.videoGeneration?.model)- : clean(profile.models[taskId]);+ : clean(profile.models[taskId]) || (taskId === "creativePlanning" ? clean(profile.models.imageAnalysis || profile.models.videoAnalysis) : "");if (!available.length && !profile.discovery.discoveredAt && configuredModel) {return [{id: configuredModel,@@ -274,7 +274,8 @@ function provider(id, value = {}) {const capabilities = [...(preset?.capabilities ?? [])];return {id,- label: clean(value?.label) || preset?.label || CUSTOM_PROVIDER_LABELS[id] || "自定义兼容服务",+ label: ["自定义兼容服务(文字)", "自定义兼容服务(图片与生成)"].includes(clean(value?.label))+ ? preset?.label : clean(value?.label) || preset?.label || CUSTOM_PROVIDER_LABELS[id] || "自定义兼容服务",category: preset?.category ?? "custom",endpoint: clean(value?.endpoint) || preset?.endpoint || "",protocol: clean(value?.protocol) || preset?.protocol || "native",@@ -383,8 +384,8 @@ function providerConfiguredForTask(profile, taskId, selectedModel = "") {);const discovered = profile.discoveredModels.find((item) => item.id === configuredModel);const catalogRequired = profile.catalogRequiredTasks.includes(taskId);- const savedCredential = dedicatedImageCredential- ? Boolean(profile.imageGeneration?.apiKey || profile.imageGeneration?.credentialConfigured)+ const savedCredential = taskId === "imageGeneration"+ ? Boolean(profile.imageGeneration?.apiKey || profile.imageGeneration?.credentialConfigured || (!dedicatedImageCredential && profile.credentialConfigured)): profile.credentialConfigured;return Boolean((catalogRequired@@ -398,9 +399,14 @@ function providerConfiguredForTask(profile, taskId, selectedModel = "") {}function modelAssignmentEvidence(taskId, model = {}, profile = null) {+ if (taskId === "creativePlanning" && (model.tasks ?? []).some(task => ["imageAnalysis", "videoAnalysis"].includes(task))) return "protocol_inferred";if ((model.tasks ?? []).includes(taskId)) {return ASSIGNMENT_EVIDENCE.has(model.confidence) ? model.confidence : "declared";}+ if (profile?.category === "custom" && ["imageAnalysis", "videoAnalysis"].includes(taskId)+ && ((model.outputModalities ?? []).includes("text") || (model.tasks ?? []).some(task => MANUAL_ASSIGNMENT_TASKS.has(task)))) {+ return "manual_unverified";+ }if (model.confidence === "manual_unverified"&& (model.tasks ?? []).length === 0&& (model.inputModalities ?? []).length === 0 && (model.outputModalities ?? []).length === 0) {diff --git a/extension/analysis-batch.js b/extension/analysis-batch.jsindex 881507d..682ea82 100644--- a/extension/analysis-batch.js+++ b/extension/analysis-batch.js@@ -488,7 +488,7 @@ export function failUnfinishedAnalysisItems(value, error = {}) {return job;}-export function stageAnalysisRebuildResults(jobValue, stagingValue, state, results = []) {+export async function stageAnalysisRebuildResults(jobValue, stagingValue, state, results = []) {let job = requireJob(jobValue);if (job.mode !== "rebuild") throw new Error("当前任务不是标签系统重建");const staging = stagingValue?.jobId === job.id && stagingValue.results && typeof stagingValue.results === "object"@@ -501,7 +501,7 @@ export function stageAnalysisRebuildResults(jobValue, stagingValue, state, resulcontinue;}const entry = state.entries?.find((item) => item.id === result.entryId);- if (!entry || canonicalTextAnalysisInput(entry, result.assetId).textRevision !== Math.max(1, Number(result.textRevision) || 1)) {+ if (!await textAnalysisResultIsCurrent(entry, result)) {job = failAnalysisItem(job, result.entryId, result.claimId, {message: "提示词原文已变化,请重新预览",status: 409@@ -530,10 +530,24 @@ export function stageAnalysisRebuildResults(jobValue, stagingValue, state, resul};job = succeedAnalysisItem(job, result.entryId, result.claimId, result.usage, state.facetCatalog.revision, result);}+ // Earlier successes can become stale while later requests are still running.+ if (!job.items.some(item => ["pending", "running"].includes(item.status))) {+ const entriesById = new Map((state.entries ?? []).map(entry => [entry.id, entry]));+ for (const item of job.items) {+ const result = staging.results[item.entryId];+ if (item.status !== "succeeded" || !result) continue;+ if (await textAnalysisResultIsCurrent(entriesById.get(item.entryId), result)) continue;+ item.status = "failed";+ item.error = "提示词原文已变化,请重新预览";+ item.statusCode = 409;+ delete staging.results[item.entryId];+ }+ }+ finishIfSettled(job);return { job, staging };}-export function finalizeAnalysisRebuild(jobValue, stagingValue, state, analyzedAtValue = new Date().toISOString()) {+export async function finalizeAnalysisRebuild(jobValue, stagingValue, state, analyzedAtValue = new Date().toISOString()) {const job = requireJob(jobValue);const summary = analysisBatchSummary(job);if (job.mode !== "rebuild" || summary.status !== "completed" || summary.counts.failed) {@@ -543,14 +557,14 @@ export function finalizeAnalysisRebuild(jobValue, stagingValue, state, analyzedAthrow new Error("重建暂存结果无效,正式标签库保持不变");}const analyzedAt = String(analyzedAtValue || new Date().toISOString());- const working = applyStagedRebuildItems(job, stagingValue, state, job.items, analyzedAt);+ const working = await applyStagedRebuildItems(job, stagingValue, state, job.items, analyzedAt);return {state: working,job: { ...job, resultCatalogRevision: working.facetCatalog.revision }};}-export function finalizePartialAnalysisRebuild(jobValue, stagingValue, state, analyzedAtValue = new Date().toISOString()) {+export async function finalizePartialAnalysisRebuild(jobValue, stagingValue, state, analyzedAtValue = new Date().toISOString()) {const job = requireJob(jobValue);const recovery = analysisRebuildRecovery(job, stagingValue);if (!recovery.recoverable) {@@ -558,7 +572,7 @@ export function finalizePartialAnalysisRebuild(jobValue, stagingValue, state, an}const analyzedAt = String(analyzedAtValue || new Date().toISOString());const succeededItems = job.items.filter((item) => item.status === "succeeded");- const working = applyStagedRebuildItems(job, stagingValue, state, succeededItems, analyzedAt);+ const working = await applyStagedRebuildItems(job, stagingValue, state, succeededItems, analyzedAt);return {state: working,job: {@@ -757,6 +771,14 @@ export async function textFingerprint(value) {return [...new Uint8Array(digest)].map((byte) => byte.toString(16).padStart(2, "0")).join("");}+export async function textAnalysisResultIsCurrent(entry, result = {}) {+ if (!entry) return false;+ const input = canonicalTextAnalysisInput(entry, result.assetId);+ if (result.assetId && input.assetId !== result.assetId) return false;+ if (input.textRevision !== Math.max(1, Number(result.textRevision) || 1)) return false;+ return !result.fingerprint || result.fingerprint === await textFingerprint(input.text);+}+function claimedItem(job, entryId, claimId) {const item = job.items.find((candidate) =>candidate.entryId === entryId &&@@ -860,7 +882,15 @@ function rebuildAnalysisMeta(staged, job, entry, analyzedAt) {};}-function applyStagedRebuildItems(job, stagingValue, state, items, analyzedAt) {+async function applyStagedRebuildItems(job, stagingValue, state, items, analyzedAt) {+ const entriesById = new Map((state.entries ?? []).map(entry => [entry.id, entry]));+ for (const item of items) {+ const staged = stagingValue.results[item.entryId];+ if (!staged) throw new Error("重建暂存结果不完整,正式标签库保持不变");+ if (!await textAnalysisResultIsCurrent(entriesById.get(item.entryId), staged)) {+ throw new Error("提示词原文已变化,正式标签库保持不变,请重新预览");+ }+ }const prepared = prepareFacetRebuild(state.entries, state.facetCatalog);let working = { ...structuredClone(state), entries: prepared.entries, facetCatalog: prepared.catalog };for (const item of items) {diff --git a/extension/analysis-input.js b/extension/analysis-input.jsindex 2147342..7f3eaad 100644--- a/extension/analysis-input.js+++ b/extension/analysis-input.js@@ -1,4 +1,5 @@-import { primaryImageAsset } from "./media.js";+import { entryMediaAssets, primaryMediaAsset } from "./media.js";+import { originalMediaPrompt } from "./prompt-sources.js";function clean(value) {return String(value ?? "").trim();@@ -18,23 +19,20 @@ function revisionFromUpdatedAt(value, fallback = 1) {export function canonicalTextAnalysisInput(entryValue = {}, assetIdValue = "") {const entry = entryValue && typeof entryValue === "object" ? entryValue : {};- const primaryImage = primaryImageAsset(entry);+ const primary = primaryMediaAsset(entry);const requestedAssetId = clean(assetIdValue);- const selectedImage = requestedAssetId- ? (Array.isArray(entry.mediaAssets) ? entry.mediaAssets : [])- .find((item) => item?.id === requestedAssetId && item?.kind === "image" && item?.usage !== "poster")- : primaryImage;- const selectedAssetId = clean(selectedImage?.id);- const mediaPrompt = selectedAssetId- ? (Array.isArray(entry.mediaPrompts) ? entry.mediaPrompts : [])- .find((item) => String(item?.assetId ?? "").trim() === selectedAssetId)- : null;+ const selected = requestedAssetId+ ? entryMediaAssets(entry).find((item) => item?.id === requestedAssetId && item?.usage !== "poster")+ : primary;+ const selectedAssetId = clean(selected?.id);+ const mediaPrompt = selectedAssetId ? originalMediaPrompt(entry, selectedAssetId)+ || entry.mediaPrompts?.find(item => item.assetId === selectedAssetId && item.source === "ai-suggestion") : null;const mediaText = clean(mediaPrompt?.text);if (mediaText) {return {text: mediaText,textRevision: revisionFromUpdatedAt(mediaPrompt?.updatedAt, revisionFromValue(mediaPrompt?.textRevision, 1)),- source: "media_prompt",+ source: mediaPrompt.source === "ai-suggestion" ? "ai_prompt" : "media_prompt",assetId: selectedAssetId};}diff --git a/extension/background.js b/extension/background.jsindex 67cc41b..21f3f3f 100644--- a/extension/background.js+++ b/extension/background.js@@ -1,3 +1,7 @@+import { collectVideoPagePayload, normalizeVideoPagePayload } from "./video-page-capture.js";+import { installVideoDiscovery, addDiscoveredVideos } from "./video-discovery.js";+import { pickPageContent } from "./page-content-picker.js";+import { CAPTURE_SAVED_TEXT_KEY, createTextCandidate } from "./capture-text-candidate.js";import { planImageGenerationPrompts, generationPromptConfirmation } from "./image-generation-ingestion.js";import { readImageGenerationInfo, embeddedMediaPrompts } from "./image-generation-info.js";import { waitForDownload } from "./download-completion.js";@@ -19,6 +23,7 @@ import { analysisRequestCounts } from "./analysis-retry-policy.js";import { articleDocumentText, finalizeArticleDocumentAssets } from "./article-document.js";import {classifyContent,+ classifyCapturedContent,classifyImportedMedia,confirmClassification,createSourceRule@@ -99,7 +104,8 @@ import {retryFailedAnalysisItems,stageAnalysisRebuildResults,succeedAnalysisItem,- textFingerprint+ textFingerprint,+ textAnalysisResultIsCurrent} from "./analysis-batch.js";import { canonicalTextAnalysisInput } from "./analysis-input.js";import { buildAutomaticVisionJob } from "./automatic-vision.js";@@ -195,6 +201,7 @@ import {editCurrentVideoReconstruction,entryMediaAssets,normalizeEntryMedia,+ setCaseCover,replaceCurrentVideoReconstruction,removeTimeNote,setEntryMediaPrompt,@@ -226,7 +233,8 @@ import {LIBRARY_TRANSFER_MODES,LIBRARY_TRANSFER_SOURCES,planLibraryTransfer,- planLibraryTransferBatch+ planLibraryTransferBatch,+ previewLibraryTransferBatch} from "./library-transfer.js";import {claimLibraryImportTransaction,@@ -312,7 +320,6 @@ import {applyPageCaptureSelections,combinePageCaptureCandidates,collectPageCaptureSnapshot,- mergePageCaptureRegionEdit,PAGE_CAPTURE_ADAPTERS,PAGE_CAPTURE_PLATFORM_ADAPTERS,normalizePageCaptureBatch,@@ -328,8 +335,9 @@ import {import { boundedMediaBlobFromResponse, fetchBoundedMedia, isSupportedDocumentMimeType } from "./bounded-media.js";import { downloadPageCaptureVideo } from "./page-capture-video.js";import { resolveXVideoSources } from "./x-video-capture.js";+import { readPageCaptureSupplement } from "./capture-supplement.js";import { PAGE_CAPTURE_VIDEO_FRAME_RULES, resolvePageCaptureVideoFrames } from "./page-capture-frames.js";-import { planPageCaptureRepair, mergePageCaptureRepair, capturedMediaPrompts } from "./page-capture-repair.js";+import { pageCaptureMediaReceipt, planPageCaptureRepair, mergePageCaptureRepair, capturedMediaPrompts } from "./page-capture-repair.js";import { collectPageCaptureDownloads } from "./page-capture-downloads.js";import {discardPageSessionMedia,@@ -660,9 +668,12 @@ chrome.commands.onCommand.addListener(async (command) => {await showResultToast(tab?.id, response.message, !response.ok);});+const discoveredVideosForTab = installVideoDiscovery(chrome);+chrome.action.onClicked.addListener((tab) => {if (!Number.isInteger(tab?.windowId)) return;chrome.sidePanel.open({ windowId: tab.windowId })+ .then(() => chrome.runtime.sendMessage({ type: "OPEN_PAGE_CAPTURE", windowId: tab.windowId }).catch(() => undefined)).catch((error) => console.error("PromptDirector toolbar side panel open failed", error));});@@ -780,16 +791,27 @@ async function handleMessage(message, interaction = {}) {return enqueueCapture(async () => captureRuntime.dispatch("cancel-visible-visual-selection", { sessionId: message.sessionId }));case "CANCEL_REGION_CAPTURE":return captureRuntime.dispatch("cancel-region-capture", { sessionId: message.sessionId });+ case "GET_DISCOVERED_VIDEOS":+ return { ok: true, resources: await discoveredVideosForTab(Number(message.tabId)) };+ case "PICK_PAGE_CONTENT": {+ const tab = await chrome.tabs.get(Number(message.tabId));+ await chrome.scripting.executeScript({ target: { tabId: tab.id }, func: clearPageCapturePageState, args: [{ removeRegionMarkers: false, removePreview: true, removeEditor: true }] });+ const [picked] = await chrome.scripting.executeScript({ target: { tabId: tab.id }, func: pickPageContent, args: [{ commentLimit: 30, timeoutMs: PAGE_CAPTURE_LIMITS.navigationTimeoutMs }] });+ if (!picked?.result?.html) return { ok: false, cancelled: true };+ const [captured] = await chrome.scripting.executeScript({ target: { tabId: tab.id }, func: collectPageCaptureSnapshot,+ args: [{ sessionId: crypto.randomUUID(), manualContentHtml: picked.result.html, maxMedia: PAGE_CAPTURE_LIMITS.maxMediaPerCandidate }] });+ return { ok: true, supplement: picked.result.supplement, batch: { ...captured.result, tabId: tab.id } };+ }case "START_PAGE_CAPTURE":return enqueueCapture(async () => startPageCapture(message.mode, message.targetCount, message.requestId));+ case "READ_PAGE_CAPTURE_SUPPLEMENT":+ return { ok: true, supplement: await readPageCaptureSupplement(message.supplement, chrome) };case "CANCEL_PAGE_CAPTURE":return cancelPageCapture(message.sessionId);case "PREVIEW_PAGE_CAPTURE_REGION":return previewPageCaptureRegion(message.tabId, message.preview);case "CLEAR_PAGE_CAPTURE_MARKERS":return clearPageCaptureMarkers(message.tabId, message.removeRegionMarkers !== false);- case "EDIT_PAGE_CAPTURE_REGION":- return editPageCaptureRegion(message.tabId, message.candidate, message.mode);case "COMMIT_PAGE_CAPTURE":return enqueueCapture(async () => enqueue(async () => commitPageCapture(message.batch, message)));case "PAGE_CAPTURE_VIEWPORT_FALLBACKS":@@ -807,6 +829,8 @@ async function handleMessage(message, interaction = {}) {}));case "REMOVE_CAPTURE_FRAGMENT":return enqueueCapture(async () => captureRuntime.dispatch("remove-fragment", { fragmentId: message.fragmentId }));+ case "CLEAR_SAVED_CAPTURE_FRAGMENTS":+ return enqueueCapture(async () => captureRuntime.dispatch("clear-saved-fragments", { fragmentIds: message.fragmentIds }));case "REORDER_CAPTURE_FRAGMENTS":return enqueueCapture(async () => captureRuntime.dispatch("reorder-fragments", { ids: message.ids }));case "REMOVE_CAPTURE_VISUAL":@@ -836,6 +860,8 @@ async function handleMessage(message, interaction = {}) {return enqueue(async () => deleteEntryVisual(message.entryId, message.visualId));case "ADD_UPLOADED_VISUAL":return enqueue(async () => addUploadedVisual(message.entryId, message.visual, message.generationPromptChoices));+ case "SET_ENTRY_COVER":+ return enqueue(async () => setEntryCover(message.entryId, message.assetId, message.asset));case "SET_ENTRY_PRIMARY_MEDIA":return enqueue(async () => setEntryPrimaryMedia(message.entryId, message.assetId));case "DELETE_ENTRY_MEDIA":@@ -1055,6 +1081,8 @@ async function handleMessage(message, interaction = {}) {return enqueue(async () => updateLocalAssetReferenceAction(message));case "BATCH_ADD_CUSTOM_LABELS":return enqueue(async () => batchAddCustomLabels(message));+ case "BATCH_SET_CLASSIFICATION":+ return enqueue(async () => batchSetClassification(message));case "BATCH_SET_PROJECT":return enqueue(async () => batchSetProject(message));case "CREATE_COLLECTION_FROM_SELECTION":@@ -1225,8 +1253,8 @@ async function captureWorkspace() {: null;const suggested = targetEntry?.classification ?? captureDraftClassification(draft, state);const partContentTypes = Object.fromEntries(draftParts(draft).map((part) => {- const classification = classifyContent({- text: part.text, title: part.sourceTitle, url: part.sourceUrl, visuals: part.visuals+ const classification = classifyCapturedContent({+ text: part.text, title: part.sourceTitle, url: part.sourceUrl, visuals: part.visuals, mediaPrompts: embeddedMediaPrompts(part.visuals), sourceFacts: sourceFactsForCaptureContext(part.sourceContext)}, state.classificationRules, state.taxonomy);const id = classification?.pathIds?.[0] || "";const contentType = state.taxonomy.nodes.find((item) => item.id === id);@@ -1436,6 +1464,7 @@ async function collectPageCaptureTab(tab, options) {siteData = await readPageCaptureSiteData(tab, { installObserver: false, maxCandidates: options.maxCandidates }) || siteData;snapshot = { ...snapshot, candidates: siteData.candidates, siteStatus: siteData.completeness };}+ snapshot = addDiscoveredVideos(snapshot, await discoveredVideosForTab(tab.id));snapshot = await resolvePageCaptureVideoFrames(snapshot, tab.id, chrome.scripting);snapshot = await resolveXVideoSources(snapshot, tab, chrome, { cancelled: () => Boolean(activePageCapture?.cancelled) });return addVisiblePageCaptureFallbacks(snapshot, tab);@@ -1481,6 +1510,11 @@ async function waitForPageCaptureTab(tabId, expectedUrl) {async function readPageCaptureSiteData(tab, { installObserver = true, maxCandidates = PAGE_CAPTURE_LIMITS.maxCandidates } = {}) {if (!tab?.id || !/^https?:/iu.test(tab.url || "")) return null;try {+ if (/^(?:www\.)?(?:youtube\.com|bilibili\.com)$/u.test(new URL(tab.url).hostname)) {+ const [video] = await chrome.scripting.executeScript({ target: { tabId: tab.id }, world: "MAIN", func: collectVideoPagePayload });+ const payload = normalizeVideoPagePayload(video?.result, tab.url);+ if (payload) return payload;+ }if (installObserver) {await chrome.scripting.executeScript({target: { tabId: tab.id },@@ -1632,234 +1666,6 @@ async function clearPageCaptureMarkers(tabIdValue, removeRegionMarkers = true) {}}-async function clearPageCaptureEditorMarkers(tabIdValue) {- const tabId = Number(tabIdValue);- if (!Number.isInteger(tabId)) return;- await chrome.scripting.executeScript({- target: { tabId },- func: clearPageCapturePageState,- args: [{ removeRegionMarkers: false, removePreview: false, removeEditor: true }]- });-}--async function editPageCaptureRegion(tabIdValue, candidateValue, modeValue) {- const tabId = Number(tabIdValue);- const candidate = normalizePageCaptureCandidate(candidateValue);- const mode = modeValue === "exclude" ? "exclude" : "include";- if (!Number.isInteger(tabId) || !candidate?.region?.marker) return { ok: false, message: "请先确认一个仍在当前网页中的主体" };- const token = crypto.randomUUID();- try {- const [result] = await chrome.scripting.executeScript({- target: { tabId },- func: runPageCaptureRegionEditor,- args: [candidate.region.marker, mode, token, candidate.region.edits || [], candidate.region.contentTargets || []]- });- if (!result?.result?.ok) return result?.result || { ok: false, message: "网页区域修正已取消" };- if (!result.result.changed) return { ok: false, cancelled: true, message: "没有修改主体区域" };- const tab = await chrome.tabs.get(tabId);- const snapshot = await collectPageCaptureTab(tab, {- sessionId: `edit:${token}`,- mode: "loaded",- maxCandidates: 1,- editedRegion: { marker: candidate.region.marker, token, region: { ...candidate.region, edits: result.result.edits || [] } }- });- const revised = snapshot.candidates?.[0];- if (!revised) return { ok: false, message: "修正后的区域没有可保存内容,原结果保持不变" };- return {- ok: true,- candidate: mergePageCaptureRegionEdit(candidate, revised),- message: mode === "include" ? "已加入遗漏区域并重建文章预览" : "已排除错误区域并重建文章预览"- };- } catch (error) {- return { ok: false, message: userMessage(error) || "无法修正当前网页区域" };- } finally {- await clearPageCaptureEditorMarkers(tabId).catch(() => undefined);- }-}--function runPageCaptureRegionEditor(markerValue, modeValue, tokenValue, priorEditsValue, contentTargetsValue) {- const overlayId = "promptdirector-page-capture-region-editor";- document.getElementById(overlayId)?.dispatchEvent(new Event("promptdirector-cancel"));- document.getElementById(overlayId)?.remove();- const marker = String(markerValue || "");- const mode = modeValue === "exclude" ? "exclude" : "include";- const token = String(tokenValue || "");- const baseRoot = [...document.querySelectorAll("[data-promptdirector-capture-region]")]- .find((element) => element.getAttribute("data-promptdirector-capture-region") === marker);- if (!baseRoot || !token) return { ok: false, message: "原网页区域已经变化,请重新扫描" };- const includeAttribute = "data-promptdirector-page-edit-include";- const excludeAttribute = "data-promptdirector-page-edit-exclude";- const hoverAttribute = "data-promptdirector-page-edit-hover";- const priorEdits = (Array.isArray(priorEditsValue) ? priorEditsValue : []).filter((edit) => ["include", "exclude"].includes(edit?.mode) && typeof edit?.path === "string");- const contentTargets = (Array.isArray(contentTargetsValue) ? contentTargetsValue : []).filter((target) =>- typeof target?.path === "string" && ["text", "image", "video", "document", "group"].includes(target?.kind));- let edits = priorEdits.map((edit) => ({ mode: edit.mode, path: edit.path }));- let groupMode = false;- const root = document.createElement("div");- root.id = overlayId;- root.setAttribute("role", "dialog");- root.setAttribute("aria-label", mode === "include" ? "添加遗漏区域" : "排除错误区域");- Object.assign(root.style, {- position: "fixed", left: "16px", right: "16px", top: "16px", zIndex: "2147483647",- display: "flex", alignItems: "center", gap: "8px", padding: "10px 12px",- border: "1px solid rgba(255,255,255,.22)", borderRadius: "10px", color: "#fff",- background: "rgba(18,20,22,.96)", boxShadow: "0 12px 40px rgba(0,0,0,.42)",- font: "600 13px/1.4 -apple-system,BlinkMacSystemFont,sans-serif"- });- const copy = document.createElement("span");- copy.style.flex = "1";- copy.textContent = mode === "include"- ? "添加遗漏:点击正文、图片、视频或下载区,可连续选择"- : "排除错误:点击主体内不需要的段落、图片或区域,可连续选择";- const count = document.createElement("span");- const makeButton = (label) => {- const button = document.createElement("button");- button.type = "button";- button.textContent = label;- Object.assign(button.style, { border: "1px solid rgba(255,255,255,.25)", borderRadius: "7px", padding: "6px 10px", color: "#fff", background: "rgba(255,255,255,.1)", cursor: "pointer" });- return button;- };- const undo = makeButton("撤销");- const group = makeButton("整组选择");- const cancel = makeButton("取消");- const finish = makeButton("完成");- finish.style.background = "#86a31d";- root.append(copy, count, group, undo, cancel, finish);- const style = document.createElement("style");- style.textContent = `[${includeAttribute}="${token}"]{outline:4px solid #8fcf3a!important;outline-offset:3px!important}[${excludeAttribute}="${token}"]{outline:4px solid #ff6b5f!important;outline-offset:3px!important;opacity:.48!important}[${hoverAttribute}="${token}"]{outline:3px dashed #ffd65c!important;outline-offset:2px!important}`;- root.append(style);- document.documentElement.append(root);- const changes = [];- const targetSelector = "img,video,iframe,a[download],a[href$='.pdf' i],a[href$='.md' i],a[href$='.txt' i],a[href$='.rtf' i],h1,h2,h3,h4,h5,h6,p,li,blockquote,pre,table,figure,article,section,div";- const updateCount = () => {- count.textContent = `本次修改 ${changes.length} 处`;- undo.disabled = !changes.length;- };- const elementPath = (element) => {- const parts = [];- let current = element;- while (current && current.nodeType === 1) {- const tag = current.tagName.toLocaleLowerCase("en-US");- const siblings = [...(current.parentElement?.children || [])].filter((item) => item.tagName === current.tagName);- parts.unshift(`${tag}:nth-of-type(${Math.max(1, siblings.indexOf(current) + 1)})`);- if (current === document.body) break;- current = current.parentElement;- }- return parts.join(" > ");- };- const applyEdits = () => {- document.querySelectorAll(`[${includeAttribute}],[${excludeAttribute}]`).forEach((element) => {- element.removeAttribute(includeAttribute);- element.removeAttribute(excludeAttribute);- });- for (const edit of edits) {- let element = null;- try { element = document.querySelector(edit.path); } catch { continue; }- if (!element) continue;- element.removeAttribute(edit.mode === "include" ? excludeAttribute : includeAttribute);- element.setAttribute(edit.mode === "include" ? includeAttribute : excludeAttribute, token);- }- };- const resolvedTargets = contentTargets.flatMap((target) => {- try {- const element = document.querySelector(target.path);- return element ? [{ ...target, element }] : [];- } catch {- return [];- }- });- const elementDepth = (element) => {- let depth = 0;- for (let current = element; current?.parentElement; current = current.parentElement) depth += 1;- return depth;- };- const meaningfulFallback = (eventTarget) => {- const closest = eventTarget.closest?.(targetSelector);- if (!closest) return null;- if (!closest.matches?.("div")) return closest;- const text = String(closest.innerText || closest.textContent || "").replace(/\s+/gu, " ").trim();- const hasMediaOrResource = Boolean(closest.querySelector?.("img,video,iframe,a[download],a[href$='.pdf' i],a[href$='.md' i],a[href$='.txt' i],a[href$='.rtf' i]"));- const hasDirectText = [...(closest.childNodes || [])].some((node) => node.nodeType === 3 && String(node.textContent || "").trim());- return hasDirectText || hasMediaOrResource || text ? closest : null;- };- const cleanup = (restore) => {- document.removeEventListener("click", onClick, true);- document.removeEventListener("keydown", onKeydown, true);- document.removeEventListener("pointerover", onPointerOver, true);- if (restore) {- edits = priorEdits.map((edit) => ({ mode: edit.mode, path: edit.path }));- applyEdits();- }- root.remove();- };- const targetFor = (eventTarget) => {- if (!(eventTarget instanceof Element)) return null;- const matching = resolvedTargets.filter((target) => target.element === eventTarget || target.element.contains?.(eventTarget));- const leaf = matching.filter((target) => target.kind !== "group").sort((left, right) => elementDepth(right.element) - elementDepth(left.element))[0];- const selectedTarget = groupMode- ? matching.filter((target) => target.kind === "group" && (!leaf?.groupId || target.id === leaf.groupId))- .sort((left, right) => elementDepth(right.element) - elementDepth(left.element))[0]- : leaf;- const element = selectedTarget?.element || meaningfulFallback(eventTarget);- if (!element || root.contains(element) || element.closest("nav,header,footer,[role=navigation],[role=banner],[role=contentinfo]")) return null;- if (mode === "exclude" && (!baseRoot.contains(element) || element === baseRoot)) return null;- if (mode === "include" && baseRoot.contains(element) && element.getAttribute(excludeAttribute) !== token) return null;- return element;- };- const onPointerOver = (event) => {- document.querySelectorAll(`[${hoverAttribute}]`).forEach((element) => element.removeAttribute(hoverAttribute));- const element = targetFor(event.target);- if (element) element.setAttribute(hoverAttribute, token);- };- const onClick = (event) => {- const element = targetFor(event.target);- if (!element) return;- event.preventDefault();- event.stopImmediatePropagation();- const edit = { mode, path: elementPath(element) };- edits.push(edit);- changes.push(edit);- applyEdits();- updateCount();- };- const onKeydown = (event) => {- if (event.key !== "Escape") return;- event.preventDefault();- cancel.click();- };- document.addEventListener("click", onClick, true);- document.addEventListener("keydown", onKeydown, true);- document.addEventListener("pointerover", onPointerOver, true);- applyEdits();- updateCount();- return new Promise((resolve) => {- root.addEventListener("promptdirector-cancel", () => cancel.click(), { once: true });- group.addEventListener("click", (event) => {- event.stopPropagation();- groupMode = !groupMode;- group.textContent = groupMode ? "整组选择:开" : "整组选择";- group.style.background = groupMode ? "#5f7613" : "rgba(255,255,255,.1)";- });- undo.addEventListener("click", (event) => {- event.stopPropagation();- if (changes.pop()) edits.pop();- applyEdits();- updateCount();- });- cancel.addEventListener("click", (event) => {- event.stopPropagation();- cleanup(true);- resolve({ ok: false, cancelled: true, message: "网页区域修正已取消" });- });- finish.addEventListener("click", (event) => {- event.stopPropagation();- const changed = changes.length > 0;- cleanup(false);- resolve({ ok: true, changed, token, edits });- });- });-}-async function commitPageCapture(batchValue, metadata = {}) {const captureMetadata = createCaptureDraft(metadata);let batch = normalizePageCaptureBatch(batchValue);@@ -1889,15 +1695,17 @@ async function commitPageCapture(batchValue, metadata = {}) {const duplicate = entries.find(entry => candidate.sourceFacts.itemId && entry.sourceFacts?.itemId && entry.sourceFacts?.provider === candidate.sourceFacts.provider? entry.sourceFacts.itemId === candidate.sourceFacts.itemId : entry.url === candidate.canonicalUrl);const repair = duplicate ? await planPageCaptureRepair(duplicate, candidate, async id => Boolean(await getMediaBlob(id))) : null;- const refreshedClassification = duplicate ? classifyContent({ ...duplicate, sourceFacts: candidate.sourceFacts }, state.classificationRules, state.taxonomy) : null;+ const refreshedClassification = duplicate ? classifyCapturedContent({ ...duplicate, sourceFacts: candidate.sourceFacts }, state.classificationRules, state.taxonomy) : null;const classificationChanged = duplicate && JSON.stringify(duplicate.classification?.pathIds) !== JSON.stringify(refreshedClassification.pathIds);- if (duplicate && !repair.pending.length && !repair.obsoleteReferences.size && !repair.promptsChanged && duplicate.sourceFacts?.pageType === candidate.pageType && !classificationChanged) {- results.push({ candidateId: candidate.id, status: "duplicate", entryId: duplicate.id, title: duplicate.title });+ if (duplicate && !repair.pending.length && !repair.obsoleteReferences.size && !repair.promptsChanged && !repair.textAdditions.length && duplicate.sourceFacts?.pageType === candidate.pageType && !classificationChanged) {+ results.push({ candidateId: candidate.id, status: "duplicate", entryId: duplicate.id, title: duplicate.title,+ ...pageCaptureMediaReceipt(candidate, repair.assetIds) });continue;}const mediaAssets = [];const articleAssetIds = new Map(repair?.assetIds);const warnings = [];+ const failedMediaIds = new Set();if (candidate.extraction?.pendingMediaCount) {warnings.push(`正文仍有 ${candidate.extraction.pendingMediaCount} 项媒体未加载,已保存当前可用内容,请回到来源页面核对`);}@@ -1951,6 +1759,7 @@ async function commitPageCapture(batchValue, metadata = {}) {mediaAssets.push(documentAsset);articleAssetIds.set(media.id, documentAsset.id);} catch (error) {+ failedMediaIds.add(media.id);warnings.push(`${media.filename || media.alt || media.url}:本地副本未保存,已保留来源链接(${userMessage(error)})`);}continue;@@ -1982,6 +1791,10 @@ async function commitPageCapture(batchValue, metadata = {}) {try {const blob = await downloadPageCaptureVideo(media.url, {declaredVideo: ["site-original", "video-element"].includes(media.sourceKind)+ }).catch(async error => {+ if (batch.sessionMediaAllowed === false) throw error;+ try { return (await fetchSelectedPageSessionMedia(batch, candidate, media.url, "video")).blob; }+ catch (sessionError) { throw new Error(`${userMessage(error)};${userMessage(sessionError)}`); }});if (blob) {const contentHash = await sha256Blob(blob);@@ -2020,6 +1833,7 @@ async function commitPageCapture(batchValue, metadata = {}) {warnings.push(`${media.alt || candidate.title}:来源未提供直接视频文件,已保留在线来源`);}} catch (error) {+ failedMediaIds.add(media.id);warnings.push(`${media.alt || candidate.title}:视频本地副本未保存,已保留来源链接(${userMessage(error)})`);}if (!videoAsset.posterAssetId && media.posterUrl) {@@ -2027,6 +1841,10 @@ async function commitPageCapture(batchValue, metadata = {}) {const posterBlob = await fetchBoundedMedia(media.posterUrl, {kind: "image", maxBytes: PORTABLE_LIBRARY_LIMITS.maxImageBytes,maxPixels: PORTABLE_LIBRARY_LIMITS.maxImagePixels, timeoutMs: 60_000+ }).catch(async error => {+ if (batch.sessionMediaAllowed === false) throw error;+ try { return (await fetchSelectedPageSessionMedia(batch, candidate, media.posterUrl)).blob; }+ catch (sessionError) { throw new Error(`${userMessage(error)};${userMessage(sessionError)}`); }});const posterId = crypto.randomUUID();await saveMediaBlob(posterId, posterBlob);@@ -2063,7 +1881,7 @@ async function commitPageCapture(batchValue, metadata = {}) {});return { blob, metadata };},- fetchSessionMedia: async (url) => fetchSelectedPageSessionImage(batch, candidate, url),+ fetchSessionMedia: async (url) => fetchSelectedPageSessionMedia(batch, candidate, url),decodeDataUrl: dataUrlToImageBlob});const blob = resolved.blob;@@ -2104,20 +1922,23 @@ async function commitPageCapture(batchValue, metadata = {}) {articleAssetIds.set(media.id, imageAsset.id);if (resolved.usedPixelFallback) warnings.push(`${media.alt || candidate.title}:原图不可用,已保存页面可见画面`);} catch (error) {- warnings.push(`${media.alt || media.url}:${userMessage(error)}`);+ failedMediaIds.add(media.id);+ warnings.push(`${media.alt || media.url || candidate.title}:${userMessage(error)}`);}}- const captureFacts = { ...candidate.sourceFacts, captureWarnings: [...new Set(warnings)],+ if (warnings.length) console.debug("PromptDirector capture diagnostics", { candidateId: candidate.id, warnings: [...new Set(warnings)] });+ const captureFacts = { ...candidate.sourceFacts,status: warnings.length ? "partial" : candidate.sourceFacts.status };if (duplicate) {const repaired = mergePageCaptureRepair(duplicate, { ...candidate, sourceFacts: captureFacts }, repair, mediaAssets, articleAssetIds);const existingAssetIds = new Set((duplicate.mediaAssets ?? []).map(asset => asset.id));const entry = normalizeEntryMedia({ ...repaired,mediaPrompts: [...(repaired.mediaPrompts ?? []), ...embeddedMediaPrompts(mediaAssets.filter(asset => !existingAssetIds.has(asset.id)), repaired.mediaPrompts)],- classification: classifyContent(repaired, state.classificationRules, state.taxonomy)+ classification: classifyCapturedContent(repaired, state.classificationRules, state.taxonomy)});entries = entries.map(item => item.id === entry.id ? entry : item);- results.push({ candidateId: candidate.id, status: warnings.length ? "partial" : "saved", repaired: true, entryId: entry.id, title: entry.title, warnings });+ results.push({ candidateId: candidate.id, status: warnings.length ? "partial" : "saved", repaired: true, entryId: entry.id, title: entry.title, warnings,+ ...pageCaptureMediaReceipt(candidate, articleAssetIds, failedMediaIds) });continue;}const articleText = articleDocumentText(candidate.articleDocument);@@ -2145,21 +1966,24 @@ async function commitPageCapture(batchValue, metadata = {}) {? mediaAssets.find((asset) => asset.kind === "video"): mediaAssets.find((asset) => asset.kind === "image" && asset.usage !== "poster"))?.id|| mediaAssets.find((asset) => asset.usage !== "poster")?.id || "",- classification: classifyContent({ ...base, sourceFacts: candidate.sourceFacts, mediaAssets, mediaPrompts }, state.classificationRules, state.taxonomy),+ classification: classifyCapturedContent({ ...base, sourceFacts: candidate.sourceFacts, mediaAssets, mediaPrompts }, state.classificationRules, state.taxonomy),customLabels: [], metadataLabels: [], facetAssignments: [], analysisCandidates: [], analysisBreakdown: [],rejectedCandidateKeys: [], negativeTerms: [], legacyFacetCandidates: [], analysisPending: false});entries.push(entry);- results.push({ candidateId: candidate.id, status: warnings.length ? "partial" : "saved", entryId: entry.id, title: entry.title, warnings });+ results.push({ candidateId: candidate.id, status: warnings.length ? "partial" : "saved", entryId: entry.id, title: entry.title, warnings,+ ...pageCaptureMediaReceipt(candidate, articleAssetIds, failedMediaIds) });}- if (!results.some((item) => ["saved", "partial"].includes(item.status))) {+ const explicitClassification = captureMetadata.contentTypeExplicit && isValidContentPath(state.taxonomy, [captureMetadata.contentTypeId]);+ const affectedIds = results.filter(item => ["saved", "partial"].includes(item.status)+ || item.status === "duplicate" && explicitClassification).map(item => item.entryId);+ if (!affectedIds.length) {return { ok: true, message: "所选内容均已存在或无法保存", results };}- const affectedIds = results.filter(item => ["saved", "partial"].includes(item.status)).map(item => item.entryId);entries = entries.map(entry => !affectedIds.includes(entry.id) ? entry : {...entry,customLabels: uniqueNames([...(entry.customLabels || []), ...captureMetadata.customLabels]),- classification: captureMetadata.contentTypeExplicit && isValidContentPath(state.taxonomy, [captureMetadata.contentTypeId])+ classification: explicitClassification? { pathIds: [captureMetadata.contentTypeId], status: "confirmed", source: "manual", reason: "保存前人工确认" }: entry.classification});@@ -2198,7 +2022,9 @@ async function commitPageCapture(batchValue, metadata = {}) {}}-async function fetchSelectedPageSessionImage(batch, candidate, value) {+async function fetchSelectedPageSessionMedia(batch, candidate, value, kind = "image") {+ if (batch.sessionMediaAllowed === false) throw new Error("没有获得页面媒体读取权限");+ const maxBytes = kind === "video" ? PORTABLE_LIBRARY_LIMITS.maxVideoBytes : PORTABLE_LIBRARY_LIMITS.maxImageBytes;if (!Number.isInteger(batch?.tabId)) throw new Error("原网页标签页已经不可用");const tab = await chrome.tabs.get(batch.tabId);let currentOrigin;@@ -2222,7 +2048,7 @@ async function fetchSelectedPageSessionImage(batch, candidate, value) {token,url: value,allowedUrls,- maxBytes: PORTABLE_LIBRARY_LIMITS.maxImageBytes,+ maxBytes,chunkBytes: PAGE_SESSION_MEDIA_CHUNK_BYTES}]});@@ -2242,7 +2068,7 @@ async function fetchSelectedPageSessionImage(batch, candidate, value) {const binary = globalThis.atob(String(chunkResult?.result || ""));const bytes = Uint8Array.from(binary, (character) => character.charCodeAt(0));totalBytes += bytes.byteLength;- if (totalBytes > PORTABLE_LIBRARY_LIMITS.maxImageBytes) throw new Error("页面媒体超过本地容量上限");+ if (totalBytes > maxBytes) throw new Error("页面媒体超过本地容量上限");chunks.push(bytes);}if (totalBytes !== prepared.totalBytes) throw new Error("页面媒体传输不完整");@@ -2256,8 +2082,8 @@ async function fetchSelectedPageSessionImage(batch, candidate, value) {const blob = await boundedMediaBlobFromResponse(new Response(combined, {headers: { "content-type": String(prepared.contentType || "application/octet-stream") }}), {- kind: "image",- maxBytes: PORTABLE_LIBRARY_LIMITS.maxImageBytes,+ kind,+ maxBytes,maxPixels: PORTABLE_LIBRARY_LIMITS.maxImagePixels,onMetadata: (value) => { metadata = value; }});@@ -2275,7 +2101,7 @@ async function fetchSelectedPageSessionImage(batch, candidate, value) {function pageCaptureMediaFetchCandidatesForSession(candidate, selectedUrl) {const urls = new Set();for (const media of candidate?.media || []) {- for (const url of pageCaptureMediaFetchCandidates(media)) urls.add(url);+ for (const url of [...pageCaptureMediaFetchCandidates(media), media.posterUrl].filter(Boolean)) urls.add(url);}return urls.has(selectedUrl) ? [...urls] : [];}@@ -2374,6 +2200,19 @@ async function addUploadedVisual(entryId, visualValue, choices = {}) {return { ok: true, message: `图片已加入案例 · 共 ${updated.visuals.length} 张`, entry: updated };}+async function setEntryCover(entryId, assetId, uploadedAsset) {+ const state = await readState();+ let current = findEntry(state, entryId);+ if (uploadedAsset) {+ if (uploadedAsset.kind !== "image" || !uploadedAsset.id || !await getMediaBlob(uploadedAsset.id)) throw new Error("没有读取到封面图片");+ current = addEntryMedia(current, { ...uploadedAsset, usage: "poster", storageMode: "managed" });+ assetId = uploadedAsset.id;+ }+ const updated = touchEntry(setCaseCover(current, assetId));+ await commitLocalChanges({ [STORAGE_KEYS.entries]: state.entries.map(entry => entry.id === entryId ? updated : entry) });+ return { ok: true, message: "封面已更新", entry: updated };+}+async function setEntryPrimaryMedia(entryId, assetId) {const state = await readState();const current = findEntry(state, entryId);@@ -2529,7 +2368,7 @@ async function createMediaCase(assetValue, posterValue, titleValue, textValue =});const promptPlan = await planImageGenerationPrompts(entry, mediaAssets, choices, textValue);if (promptPlan.conflicts.length) return generationPromptConfirmation(promptPlan.conflicts);- entry = promptPlan.entry;+ entry = { ...promptPlan.entry, classification: classifyImportedMedia(promptPlan.entry, state.taxonomy) };const entries = [...state.entries, entry];await retireLastSaveUndo();await commitLocalChanges({@@ -2677,6 +2516,7 @@ async function commitCaptureDraft(duplicateAction = "", placementValue = {}) {const newVisuals = draft.visuals.filter(asset => !entry.mediaAssets.some(item => item.id === asset.id));for (const visual of newVisuals) entry = addEntryVisual(entry, visual);entry = normalizeEntryVisuals({ ...entry, mediaPrompts: [...(entry.mediaPrompts ?? []), ...embeddedMediaPrompts(newVisuals, entry.mediaPrompts)] });+ entry.classification = classifyCapturedContent(entry, state.classificationRules, state.taxonomy);if (draft.primaryVisualExplicit && draft.primaryVisualId) entry = setPrimaryVisual(entry, draft.primaryVisualId);} else {created = true;@@ -2717,7 +2557,7 @@ async function commitCaptureDraft(duplicateAction = "", placementValue = {}) {await commitLocalChanges({[STORAGE_KEYS.entries]: entries,[STORAGE_KEYS.organizerState]: organizerState,- ...captureCommitState(draft, nextDraft),+ ...await captureCommitState(draft, nextDraft),...(created ? { [STORAGE_KEYS.lastSaveUndo]: createEntrySaveUndo(entry.id) } : {})});await notifySaved(entries.length);@@ -2774,7 +2614,7 @@ async function commitCaptureIntoCompound(draft, parts, state, targetCompound, pl[STORAGE_KEYS.entries]: entries,[STORAGE_KEYS.compoundCases]: compounds,[STORAGE_KEYS.organizerState]: organizerState,- ...captureCommitState(draft, nextDraft)+ ...await captureCommitState(draft, nextDraft)});await notifySaved(entries.length);return {@@ -2812,9 +2652,12 @@ function organizerAfterCapturePlacement(organizerValue, entries, entryIds, placereturn normalizeOrganizerState(organizerState, entries.map((entry) => entry.id));}-function captureCommitState(_draft, nextDraft) {+async function captureCommitState(draft, nextDraft) {+ const texts = [...draft.fragments.map(fragment => fragment.text), draftText(draft)];+ const candidates = await Promise.all(texts.map(text => createTextCandidate({ clipboard: text })));return {- [STORAGE_KEYS.captureDraft]: nextDraft+ [STORAGE_KEYS.captureDraft]: nextDraft,+ [CAPTURE_SAVED_TEXT_KEY]: [...new Set(candidates.filter(Boolean).map(candidate => candidate.textFingerprint))]};}@@ -2869,7 +2712,7 @@ function createEntryFromCapturePart(part, draft, state, options = {}) {: part.visuals[0]?.id || "",classification: draft.contentTypeExplicit && isValidContentPath(state.taxonomy, [draft.contentTypeId])? { pathIds: [draft.contentTypeId], status: "confirmed", source: "manual", reason: "保存前人工确认" }- : classifyContent({ text: part.text, title: part.sourceTitle, url: part.sourceUrl, visuals: part.visuals }, state.classificationRules, state.taxonomy),+ : classifyCapturedContent({ text: part.text, title: part.sourceTitle, url: part.sourceUrl, visuals: part.visuals, mediaPrompts: embeddedMediaPrompts(part.visuals), sourceFacts: sourceFactsForCaptureContext(part.sourceContext) }, state.classificationRules, state.taxonomy),customLabels: uniqueNames(draft.customLabels),metadataLabels: [],facetAssignments: [], analysisCandidates: [], analysisBreakdown: [], rejectedCandidateKeys: [],@@ -2886,11 +2729,13 @@ function sourceFactsForCaptureContext(context) {function captureDraftClassification(draft, state) {const text = draftText(draft);const firstSource = draftSourcePages(draft)[0];- return classifyContent({+ return classifyCapturedContent({text,+ sourceFacts: sourceFactsForCaptureContext(sourceContextForUrl(draft, firstSource?.url || draft.visuals[0]?.sourceUrl || "")),title: draft.title || firstSource?.title || draft.visuals[0]?.sourceTitle || "",url: firstSource?.url || draft.visuals[0]?.sourceUrl || "",- visuals: draft.visuals+ visuals: draft.visuals,+ mediaPrompts: embeddedMediaPrompts(draft.visuals)}, state.classificationRules, state.taxonomy);}@@ -4016,7 +3861,7 @@ function importedEntryFromStagedAsset(state, staged, job, item) {mediaAssets,mediaPrompts: embeddedMediaPrompts(mediaAssets),primaryMediaId: staged.assetId,- classification: classifyImportedMedia({ ...base, mediaAssets }, state.taxonomy),+ classification: classifyImportedMedia({ ...base, mediaAssets, mediaPrompts: embeddedMediaPrompts(mediaAssets) }, state.taxonomy),customLabels: uniqueNames(job.options.customLabels), metadataLabels: [], facetAssignments: [], analysisCandidates: [], analysisBreakdown: [],rejectedCandidateKeys: [], negativeTerms: [], legacyFacetCandidates: [], analysisPending: false});@@ -6168,6 +6013,25 @@ async function batchAddCustomLabels(message) {return { ok: true, message: `已为 ${updatedCount} 个案例添加标签`, updatedCount, entries };}+async function batchSetClassification(message) {+ const state = await readState();+ const requested = new Set(uniqueNames(message.entryIds));+ if (!requested.size || !isValidContentPath(state.taxonomy, message.pathIds)) {+ return { ok: false, message: "请选择案例和有效的案例类型" };+ }+ const available = new Set(state.entries.map(entry => entry.id));+ if ([...requested].some(id => !available.has(id))) {+ return { ok: false, message: "部分案例已不存在,请刷新后重新选择" };+ }+ const entries = [];+ for (const entry of state.entries) {+ if (!requested.has(entry.id)) { entries.push(entry); continue; }+ entries.push(touchEntry(confirmClassification(entry, message.pathIds, state.taxonomy)));+ }+ await commitLocalChanges({ [STORAGE_KEYS.entries]: entries });+ return { ok: true, message: `已修改 ${requested.size} 个案例的分类`, updatedCount: requested.size };+}+async function batchSetProject(message) {const state = await readState();const validIds = new Set(state.entries.map((entry) => entry.id));@@ -6478,7 +6342,7 @@ async function commitDeepSeekBatchItem(message) {}const state = await readState();const entry = findEntry(state, message.entryId);- if (canonicalTextAnalysisInput(entry, message.assetId).textRevision !== Math.max(1, Number(message.textRevision) || 1)) {+ if (!await textAnalysisResultIsCurrent(entry, message)) {return failDeepSeekBatchItem({...message,error: { message: "提示词原文已变化,请重新预览", status: 409 }@@ -6547,7 +6411,7 @@ async function commitDeepSeekBatchItems(message) {continue;}const entry = working.entries.find((item) => item.id === result.entryId);- if (!entry || canonicalTextAnalysisInput(entry, result.assetId).textRevision !== Math.max(1, Number(result.textRevision) || 1)) {+ if (!await textAnalysisResultIsCurrent(entry, result)) {job = failAnalysisItem(job, result.entryId, result.claimId, {message: "提示词原文已变化,请重新预览",status: 409@@ -6577,7 +6441,7 @@ async function commitDeepSeekBatchItems(message) {}async function commitStagedRebuildResults(jobValue, stagingValue, state, results) {- const stagedResult = stageAnalysisRebuildResults(jobValue, stagingValue, state, results);+ const stagedResult = await stageAnalysisRebuildResults(jobValue, stagingValue, state, results);let { job } = stagedResult;const { staging } = stagedResult;const summary = analysisBatchSummary(job);@@ -6589,7 +6453,7 @@ async function commitStagedRebuildResults(jobValue, stagingValue, state, resultsreturn { ok: true, analysisBatchJob: summary };}- const finalized = finalizeAnalysisRebuild(job, staging, domainState(state));+ const finalized = await finalizeAnalysisRebuild(job, staging, domainState(state));const working = finalized.state;job = finalized.job;const undo = createAnalysisBatchUndo(job, state);@@ -6678,7 +6542,7 @@ async function applyStagedAnalysisRebuild(jobId) {if (staleCount) {return { ok: false, message: `${staleCount} 条成功案例的原文已变化,不能安全应用旧缓存` };}- const finalized = finalizePartialAnalysisRebuild(+ const finalized = await finalizePartialAnalysisRebuild(job,stored[STORAGE_KEYS.analysisRebuildStaging],domainState(state)@@ -8273,7 +8137,7 @@ function previewLibraryImport(state, library, options = {}) {function previewLibraryImportBatch(state, message = {}) {const inspections = transferInspectionMessages(message.packages);- const result = planLibraryTransferBatch({+ return previewLibraryTransferBatch({currentState: state,inspections,options: {@@ -8281,28 +8145,7 @@ function previewLibraryImportBatch(state, message = {}) {conflictResolutions: message.conflictResolutions}});- return {- ok: true,- planToken: result.planToken,- plan: result.context,- canApply: result.canApply,- conflicts: result.conflicts,- unresolvedConflicts: result.unresolvedConflicts,- packageResults: result.packageResults,- resourceWrites: result.resourceWrites,- createdEntryIds: result.createdEntryIds,- importDiagnostics: result.importDiagnostics,- importStats: result.importStats,- importedCount: result.importedCount,- remappedCount: result.remappedCount,- skippedCount: result.skippedCount,- importedRunCount: result.importedRunCount,- importedOutputCount: result.importedOutputCount,- importedSkillCount: result.importedSkillCount,- skippedSkillCount: result.skippedSkillCount- };}-async function applyLibraryImport(state, message) {const stored = await chrome.storage.local.get(STORAGE_KEYS.libraryImportTransactions);const claim = claimLibraryImportTransaction(stored[STORAGE_KEYS.libraryImportTransactions], {diff --git a/extension/capture-additions.js b/extension/capture-additions.jsindex dfb501e..f07d777 100644--- a/extension/capture-additions.js+++ b/extension/capture-additions.js@@ -32,6 +32,8 @@ export function appendCaptureCandidate(candidate, addition, selection) {if (item.assetId) {const assetId = remapped.get(item.assetId);if (assetId && !blocks.some(b => b.assetId === assetId)) blocks.push({ ...item, id: `added:${addition.id}:${item.id}`, assetId });+ } else if (item.kind === "link" && item.sourceUrl && !blocks.some(block => block.kind === "link" && block.sourceUrl === item.sourceUrl)) {+ blocks.push({ ...item, id: `added:${addition.id}:${item.id}` });} else if (item.text && newTextBlocks.some(b => comparableText(b.text).includes(comparableText(item.text)))) {blocks.push({ ...item, id: remapped.get(item.id) || `added:${addition.id}:${item.id}` });}@@ -72,10 +74,25 @@ function comparableText(value) {return String(value || "").replace(/\s+/gu, " ").trim();}+function candidateSaveResult(batch, candidate, results) {+ return batch.captureMode === "list" && batch.saveMode === "combined"+ ? results.length === 1 ? results[0] : null+ : results.find(item => item.candidateId === candidate.id);+}++export function persistedPageCaptureCandidates(batch, candidates, results) {+ return candidates.flatMap(candidate => {+ const result = candidateSaveResult(batch, candidate, results);+ if (!result?.entryId || !["saved", "partial", "duplicate"].includes(result.status)) return [];+ const savedMedia = new Set(result.savedMediaIds || []);+ return [{ ...candidate, media: candidate.media.filter(media => savedMedia.has(media.id)) }];+ });+}+export function savedPageCaptureCandidateIds(batch, candidates, results) {- const persisted = results.filter(item => item.entryId && ["saved", "partial", "duplicate"].includes(item.status));- if (batch.captureMode === "list" && batch.saveMode === "combined" && persisted.length === 1) {- return new Set(candidates.map(candidate => candidate.id));- }- return new Set(persisted.map(item => item.candidateId));+ return new Set(candidates.filter(candidate => {+ const result = candidateSaveResult(batch, candidate, results);+ return result?.entryId && (["saved", "duplicate"].includes(result.status)+ || result.status === "partial" && result.pendingMediaIds?.length === 0);+ }).map(candidate => candidate.id));}diff --git a/extension/capture-supplement.js b/extension/capture-supplement.jsnew file mode 100644index 0000000..1e852e9--- /dev/null+++ b/extension/capture-supplement.js@@ -0,0 +1,30 @@+import { collectPageCaptureSnapshot } from "./page-capture.js";+import { waitForAgentTab } from "./agent-capture.js";+import { PAGE_CAPTURE_LIMITS } from "./resource-limits.js";++// Read only the selected comment in a temporary tab; leave the source page and draft in place.+export async function readPageCaptureSupplement(item, api) {+ const url = new URL(item.sourceUrl);+ if (url.protocol !== "https:" || !/^(?:www\.)?(?:x|twitter)\.com$/u.test(url.hostname)+ || !/^\/[^/]+\/status\/\d+\/?$/u.test(url.pathname) || url.username || url.password) {+ throw new Error("评论来源不是有效的 X 帖子地址");+ }+ if (!await api.permissions.contains({ origins: [`${url.origin}/*`] })) {+ throw new Error("请先授权该网站的网页采集,再补入评论全文");+ }+ const tab = await api.tabs.create({ url: url.href, active: false });+ try {+ await waitForAgentTab(api.tabs, tab.id);+ const [result] = await api.scripting.executeScript({ target: { tabId: tab.id },+ func: collectPageCaptureSnapshot,+ args: [{ xSupplementUrl: url.href, mediaTimeoutMs: PAGE_CAPTURE_LIMITS.navigationTimeoutMs }] });+ if (result?.error) throw new Error(`未能取得评论全文,当前草稿已保留:${result.error.message || String(result.error)}`);+ const supplement = result?.result?.supplement;+ if (!supplement?.text || supplement.partial !== false || supplement.sourceUrl !== url.href) {+ throw new Error("未能取得评论全文,当前草稿已保留,请检查原评论后重试");+ }+ return { ...supplement, id: item.id };+ } finally {+ await api.tabs.remove(tab.id).catch(() => undefined);+ }+}diff --git a/extension/capture-text-candidate.js b/extension/capture-text-candidate.jsindex 1d4e580..7db7cbb 100644--- a/extension/capture-text-candidate.js+++ b/extension/capture-text-candidate.js@@ -1,3 +1,5 @@+export const CAPTURE_SAVED_TEXT_KEY = "captureSavedTextFingerprints";+export async function createTextCandidate({ selection, clipboard, page } = {}) {const selectedText = normalizeText(selection);const clipboardText = normalizeText(clipboard);diff --git a/extension/capture-workspace.js b/extension/capture-workspace.jsindex 53ab5c3..022be0d 100644--- a/extension/capture-workspace.js+++ b/extension/capture-workspace.js@@ -17,7 +17,7 @@ import {setDraftPrimaryVisual,updateDraftFragment} from "./capture-draft.js";-import { createTextCandidate } from "./capture-text-candidate.js";+import { CAPTURE_SAVED_TEXT_KEY, createTextCandidate } from "./capture-text-candidate.js";import {ensureContinuousCapturePermission,ensurePagePermission,@@ -165,6 +165,8 @@ export function createCaptureWorkspace({return updateFragment(payload.fragmentId, payload.text);case "remove-fragment":return removeFragment(payload.fragmentId);+ case "clear-saved-fragments":+ return clearSavedFragments(payload.fragmentIds);case "reorder-fragments":return reorderFragments(payload.ids);case "remove-visual":@@ -236,6 +238,10 @@ export function createCaptureWorkspace({if (!candidate) {return { ok: true, added: false, reason: "empty-selection", message: "", draft: before };}+ const saved = await chromeApi.storage.local.get(CAPTURE_SAVED_TEXT_KEY);+ if (saved[CAPTURE_SAVED_TEXT_KEY]?.includes(candidate.textFingerprint)) {+ return { ok: true, added: false, reason: "already-saved-selection", message: "", draft: before };+ }const response = await addSelection(candidate, sourceContext);return { ...response, candidateKind: candidate.kind };} catch {@@ -665,6 +671,19 @@ export function createCaptureWorkspace({return { ok: true, message: "高亮文字已移除", draft };}+ async function clearSavedFragments(fragmentIds = []) {+ const current = await readDraft();+ const ids = new Set(fragmentIds);+ const saved = current.fragments.filter(fragment => ids.has(fragment.id));+ const candidates = await Promise.all(saved.map(fragment => createTextCandidate({ clipboard: fragment.text })));+ const draft = saved.reduce((value, fragment) => removeDraftFragment(value, fragment.id), current);+ await chromeApi.storage.local.set({+ [captureDraftStorageKey]: draft,+ ...(saved.length ? { [CAPTURE_SAVED_TEXT_KEY]: [...new Set(candidates.filter(Boolean).map(candidate => candidate.textFingerprint))] } : {})+ });+ return { ok: true, draft };+ }+async function reorderFragments(ids) {const draft = reorderDraftFragments(await readDraft(), ids);await chromeApi.storage.local.set({ [captureDraftStorageKey]: draft });diff --git a/extension/classifier.js b/extension/classifier.jsindex 3a7d0b5..9e22688 100644--- a/extension/classifier.js+++ b/extension/classifier.js@@ -1,3 +1,4 @@+import { PAGE_CAPTURE_ADAPTERS } from "./page-capture-adapter-registry.js";import {CONTENT_ROLES,contentTypeForRole,@@ -6,8 +7,9 @@ import {} from "./taxonomy.js";import { entryHasMedia, normalizeEntryMedia } from "./media.js";import { entryHasVisual } from "./visuals.js";+import { originalMediaPrompts } from "./prompt-sources.js";-export const CLASSIFIER_VERSION = 6;+export const CLASSIFIER_VERSION = 7;const WEIGHT = Object.freeze({ weak: 1, supporting: 2, format: 3, strong: 4, modelBody: 5, decisive: 6 });const THRESHOLD = Object.freeze({ tutorial: 6, tutorialTie: 8, imageCaseText: 360 });@@ -33,12 +35,22 @@ const SIGNALS = Object.freeze({imageFormat: /(?:静帧|画幅|摄影图|肖像|构图|妆容|摄影|插画|绘画|\b(?:still image|portrait|photograph|photography|photo|painting|illustration|rendering|composition|aspect ratio)\b|--ar\b|negative prompt)/i});-export function classifyContent(entry = {}, rules = [], taxonomy = createDefaultTaxonomy()) {+export function classifyContent(entry = {}, rules = [], taxonomy = createDefaultTaxonomy(), { capture = false } = {}) {const existing = normalizeExistingClassification(entry.classification, taxonomy);if (existing && existing.status === "confirmed" && ["manual", "local_import"].includes(existing.source)) {return existing;}+ const platformDefault = classifyPlatform(entry, rules, taxonomy);+ if (platformDefault) return platformDefault;+ if (capture) {+ if (entry.sourceFacts?.pageType === "article") return classificationForRole(taxonomy, CONTENT_ROLES.reference, "文档网页按文章资料归类");+ const hasPrompt = originalMediaPrompts(entry).length > 0+ || (entry.sourceFacts?.originalPromptAvailable !== false && Boolean(String(entry.text ?? "").trim()));+ if (entryHasMedia(entry, "video")) return classificationForRole(taxonomy, hasPrompt ? CONTENT_ROLES.promptVideo : CONTENT_ROLES.videoCase, "按已选视频和采集正文归类");+ if (entryHasMedia(entry, "image")) return classificationForRole(taxonomy, hasPrompt ? CONTENT_ROLES.promptImage : CONTENT_ROLES.imageCase, "按已选图片和采集正文归类");+ }+const facts = entry.sourceFacts;if (facts?.pageType === "article" && ["structured", "readability"].includes(facts.extractionMethod)) {const tutorial = scoreTutorial(String(entry.text || ""), String(entry.title || ""), String(entry.url || "")) >= THRESHOLD.tutorial;@@ -48,7 +60,7 @@ export function classifyContent(entry = {}, rules = [], taxonomy = createDefaultconst video = facts.pageType === "video";const kind = video ? "video" : "image";if (entryHasMedia(entry, kind)) {- const hasPrompt = entry.mediaPrompts?.some(item => item.source !== "ai-suggestion" && String(item.text || "").trim())+ const hasPrompt = originalMediaPrompts(entry).length > 0|| facts.originalPromptAvailable === true|| (facts.originalPromptAvailable !== false && scorePromptShape(String(entry.text || ""), "") >= WEIGHT.supporting);return classificationForRole(taxonomy, video@@ -110,11 +122,13 @@ export function classifyImportedMedia(entry = {}, taxonomy = createDefaultTaxonoconst kinds = new Set(normalizeEntryMedia(entry).mediaAssets.filter((asset) => asset.usage !== "poster").map((asset) => asset.kind));+ const hasPrompt = originalMediaPrompts(entry).length > 0+ || (entry.sourceFacts?.originalPromptAvailable === true && Boolean(String(entry.text ?? "").trim()));if (kinds.has("video")) {- return classificationForRole(taxonomy, CONTENT_ROLES.videoCase, "本机视频按文件形态归类", "local_import");+ return classificationForRole(taxonomy, hasPrompt ? CONTENT_ROLES.promptVideo : CONTENT_ROLES.videoCase, hasPrompt ? "本机视频及原始提示词证据" : "本机视频按文件形态归类", "local_import");}if (kinds.has("image")) {- return classificationForRole(taxonomy, CONTENT_ROLES.imageCase, "本机图片按文件形态归类", "local_import");+ return classificationForRole(taxonomy, hasPrompt ? CONTENT_ROLES.promptImage : CONTENT_ROLES.imageCase, hasPrompt ? "本机图片及原始提示词证据" : "本机图片按文件形态归类", "local_import");}if (kinds.has("document")) {return classificationForRole(taxonomy, CONTENT_ROLES.reference, "本机文档按文件形态归类", "local_import");@@ -128,6 +142,29 @@ export function classifyImportedMedia(entry = {}, taxonomy = createDefaultTaxonoreturn classification([], "needs_review", "local_import", "无法识别本机资料形态");}+// All automatic entry points share platform precedence and content evidence.+export function classifyCapturedContent(entry = {}, rules = [], taxonomy = createDefaultTaxonomy()) {+ return classifyContent(entry, rules, taxonomy, { capture: true });+}++function classifyPlatform(entry, rules, taxonomy) {+ const host = hostnameFor(entry.url);+ const platform = PAGE_CAPTURE_ADAPTERS.find(item => item.hosts.some(domain => host === domain || host.endsWith(`.${domain}`)));+ if (!platform) return null;+ const rule = (Array.isArray(rules) ? rules : []).find(item => item?.enabled !== false && item.hostname === host && validPath(taxonomy, item.pathIds));+ if (rule) return classification(rule.pathIds, "confirmed", "source_rule", "来源规则");+ const videoPlatforms = ["youtube", "bilibili", "douyin", "tiktok"];+ const imagePlatforms = ["pinterest", "behance", "dribbble", "artstation", "deviantart", "designspiration", "huaban", "zcool", "500px", "flickr", "pexels", "imgur"];+ const creationPlatforms = ["jimeng", "libtv", "liblibai", "higgsfield", "krea", "tapnow", "lovart", "midjourney", "civitai", "runway", "kling"];+ if (videoPlatforms.includes(platform.id)) return classificationForRole(taxonomy, CONTENT_ROLES.videoCase, "视频媒体平台默认案例");+ if (imagePlatforms.includes(platform.id)) return classificationForRole(taxonomy, entryHasMedia(entry, "video") ? CONTENT_ROLES.videoCase : CONTENT_ROLES.imageCase, "视觉媒体平台默认案例");+ if (creationPlatforms.includes(platform.id)) {+ const video = entryHasMedia(entry, "video") || entry.sourceFacts?.pageType === "video" || !entryHasMedia(entry, "image") && ["runway", "kling"].includes(platform.id);+ return classificationForRole(taxonomy, video ? CONTENT_ROLES.promptVideo : CONTENT_ROLES.promptImage, "AIGC创作平台默认提示词");+ }+ return null;+}+export function confirmClassification(entry, pathIds, taxonomy = createDefaultTaxonomy()) {if (!validPath(taxonomy, pathIds)) throw new Error("内容分类路径无效");return {diff --git a/extension/collector-page-capture-view.js b/extension/collector-page-capture-view.jsindex 22b076b..e47fc26 100644--- a/extension/collector-page-capture-view.js+++ b/extension/collector-page-capture-view.js@@ -97,7 +97,7 @@ export function createPageCaptureCard(candidate, {if (!listMode) {const locate = captureIconButton("search", "在网页中定位", onLocate, "page-capture-inspect");locate.disabled = busy || !candidate.region?.marker;- actions.append(locate);+ if (candidate.region?.marker) actions.append(locate);}const details = document.createElement("details");details.className = "page-capture-preview-details";@@ -130,7 +130,7 @@ export function createPageCaptureCard(candidate, {text.textContent = item.text;const add = document.createElement("button");add.type = "button";- add.textContent = t(item.partial ? "补入已显示内容" : "补入当前案例");+ add.textContent = t("补入当前案例");add.disabled = busy;add.addEventListener("click", () => onIncludeSupplement(item));section.append(text, add);diff --git a/extension/collector.css b/extension/collector.cssindex 945c964..5adc5a8 100644--- a/extension/collector.css+++ b/extension/collector.css@@ -148,10 +148,7 @@ body.page-capture-active { height: 100dvh; overflow: hidden; }.page-capture h2 { margin: 2px 0 0; font-size: 16px; }.page-capture small, .page-capture > p { color: var(--muted); font-size: 11px; }.page-capture > p { margin: 0; line-height: 1.5; }-.page-capture-tools { background: var(--paper); }-.page-capture-tools > summary { padding: 7px 0; color: var(--muted); cursor: pointer; font-size: 11px; font-weight: 800; }.page-capture-bulk-actions { display: flex; flex-wrap: wrap; gap: 6px; }-.page-capture-tools .page-capture-bulk-actions { padding: 0 0 9px; }.page-capture-bulk-actions button { width: auto; }.page-capture-list-setup, .page-capture-list-result { border: 1px solid var(--line); border-radius: 6px; padding: 9px; background: var(--paper); }.page-capture-list-setup summary { cursor: pointer; font-size: 12px; font-weight: 800; }@@ -195,7 +192,7 @@ body.page-capture-active { height: 100dvh; overflow: hidden; }.confirmed .page-capture-selection { border: 5px solid var(--selection-indicator); }.page-capture-excerpt { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 3; overflow: hidden; margin: 0 0 0 26px; color: var(--muted); font-size: 12px; line-height: 1.6; }.page-capture-thumbnails { display: flex; gap: 6px; overflow-x: auto; margin-left: 26px; padding: 2px 0; }-.page-capture-thumbnails button { flex: 0 0 78px; width: 78px; height: 58px; padding: 0; overflow: hidden; background: var(--raised); }+.page-capture-thumbnails button { color: inherit; flex: 0 0 78px; width: 78px; height: 58px; padding: 0; overflow: hidden; background: var(--raised); }.page-capture-thumbnails img { display: block; width: 100%; height: 100%; object-fit: contain; }.page-capture-card-actions { display: flex; align-items: start; flex-wrap: wrap; gap: 6px; margin-left: 26px; }.page-capture-card-actions > details { flex: 1; min-width: 0; }@@ -624,3 +621,7 @@ main { gap: 12px; padding: 12px 12px 82px; }.add-more-actions > button { display: grid; justify-items: center; align-content: center; gap: 3px; min-height: 48px; }.add-more-actions > button .ui-icon { width: 16px; height: 16px; }++.page-capture-text-row { position: relative; padding-right: 26px; }+.page-capture-text-remove { position: absolute; right: 0; top: 0; border: 0; background: transparent; color: inherit; cursor: pointer; opacity: .55; font-size: 20px; }+.page-capture-text-remove:hover, .page-capture-text-remove:focus-visible { opacity: 1; }diff --git a/extension/collector.html b/extension/collector.htmlindex ff6fc60..6becedc 100644--- a/extension/collector.html+++ b/extension/collector.html@@ -30,7 +30,7 @@<header><div><h2 id="capture-permission-title" data-i18n="一次授权,之后直接采集">一次授权,之后直接采集</h2>- <p data-i18n="本次统一开启网页读取与截图能力,只在你主动采集时使用;不会自动保存案例。">本次统一开启网页读取与截图能力,只在你主动采集时使用;不会自动保存案例。</p>+ <p data-i18n="开启网页读取、截图与媒体识别;不会自动保存案例。">开启网页读取、截图与媒体识别;不会自动保存案例。</p></div></header><div class="app-dialog-body">@@ -82,7 +82,7 @@<div class="capture-actions" aria-label="从当前网页采集" data-i18n-aria-label="从当前网页采集"><button id="start-page-capture" class="primary" type="button"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-library"></use></svg><strong data-i18n="网页采集">网页采集</strong></button><button id="start-smart-visuals" class="smart-visuals" type="button"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-image"></use></svg><strong data-i18n="选图">选图</strong></button>- <button id="start-selection" class="direct-selection" type="button" title="提取选中文字" aria-label="提取选中文字" data-i18n-title="提取选中文字" data-i18n-aria-label="提取选中文字"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-file-text"></use></svg><strong data-i18n="选区">选区</strong></button>+ <button id="start-selection" class="direct-selection" type="button" title="选取内容" aria-label="选取内容" data-i18n-title="选取内容" data-i18n-aria-label="选取内容"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-file-text"></use></svg><strong data-i18n="选取内容">选取内容</strong></button><button id="start-clipboard" type="button"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true"><use href="assets/ui-icons.svg#icon-copy"></use></svg><strong data-i18n="剪贴板">剪贴板</strong></button><div id="other-capture-methods" class="other-capture-methods">@@ -110,17 +110,6 @@<label id="page-capture-combined-title-row" hidden><span data-i18n="合并案例标题">合并案例标题</span><input id="page-capture-combined-title" autocomplete="off" placeholder="默认使用列表页标题" data-i18n-placeholder="默认使用列表页标题" /></label></section><div id="page-capture-list" class="page-capture-list"></div>- <details id="page-capture-tools" class="page-capture-tools" hidden>- <summary data-i18n="调整内容">调整内容</summary>- <div class="page-capture-bulk-actions">- <button id="page-capture-add-region" class="button-secondary compact" type="button" data-i18n="补选">补选</button>- <button id="page-capture-exclude-region" class="button-secondary compact" type="button" data-i18n="排除">排除</button>-- <button id="page-capture-reset-region" class="button-secondary compact" type="button" data-i18n="恢复识别">恢复识别</button>- <button id="page-capture-clear" class="button-secondary compact" type="button" data-i18n="换一项">换一项</button>- </div>- </details>- <div id="page-capture-edit-status" class="page-capture-edit-status" hidden><p id="page-capture-edit-help"></p><button id="page-capture-edit-cancel" class="button-secondary" type="button" data-i18n="取消调整">取消调整</button></div><details id="page-capture-media-review" class="page-capture-media-review" hidden><summary><strong data-i18n="检查媒体">检查媒体</strong><small id="page-capture-media-review-status"></small></summary><div id="page-capture-media-review-list" class="page-capture-media-review-list"></div>@@ -189,7 +178,7 @@</section><div id="capture-add-more-actions" class="add-more-actions"><button id="add-smart-visuals" class="button-secondary" type="button"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true"><use href="assets/ui-icons.svg#icon-image"></use></svg><span data-i18n="选图">选图</span></button>- <button id="add-selection" class="button-secondary" type="button" title="提取选中文字" aria-label="提取选中文字" data-i18n-title="提取选中文字" data-i18n-aria-label="提取选中文字"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true"><use href="assets/ui-icons.svg#icon-file-text"></use></svg><span data-i18n="选区">选区</span></button>+ <button id="add-selection" class="button-secondary" type="button" title="选取内容" aria-label="选取内容" data-i18n-title="选取内容" data-i18n-aria-label="选取内容"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true"><use href="assets/ui-icons.svg#icon-file-text"></use></svg><span data-i18n="选取内容">选取内容</span></button><button id="add-clipboard" class="button-secondary" type="button"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true"><use href="assets/ui-icons.svg#icon-clipboard"></use></svg><span data-i18n="剪贴板">剪贴板</span></button><button id="add-screenshot" class="button-secondary" type="button"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true"><use href="assets/ui-icons.svg#icon-maximize-2"></use></svg><span data-i18n="截图">截图</span></button><button id="add-page-capture" class="button-secondary" type="button"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true"><use href="assets/ui-icons.svg#icon-library"></use></svg><span data-i18n="网页">网页</span></button>diff --git a/extension/collector.js b/extension/collector.jsindex fd05d77..9d3bc5e 100644--- a/extension/collector.js+++ b/extension/collector.js@@ -1,5 +1,6 @@+import { addDiscoveredVideos } from "./video-discovery.js";import { sendWithGenerationPromptConfirmation } from "./image-generation-confirmation.js";-import { appendCaptureCandidate, draftCaptureAddition, savedDraftCaptureItems, savedPageCaptureCandidateIds } from "./capture-additions.js";+import { appendCaptureCandidate, draftCaptureAddition, savedDraftCaptureItems, savedPageCaptureCandidateIds, persistedPageCaptureCandidates } from "./capture-additions.js";import { createPageCaptureCard } from "./collector-page-capture-view.js";import { deleteScreenshotBlob, getScreenshotBlob, saveScreenshotBlob } from "./image-store.js";import { addDraftFragment, addDraftVisual } from "./capture-draft.js";@@ -8,7 +9,7 @@ import {assignVisualPreviewSource,collectorViewState} from "./collector-view.js";-import { classifyContent } from "./classifier.js";+import { classifyCapturedContent } from "./classifier.js";import { sha256Blob } from "./blob-digest.js";import { prepareLocalMedia } from "./local-media.js";import { runCaptureTransaction } from "./capture-workspace.js";@@ -50,10 +51,10 @@ const elements = Object.fromEntries(["save-separate", "start-screenshot", "start-selection", "start-smart-visuals", "start-state", "normal-start","other-capture-methods", "smart-selection", "smart-selection-count", "smart-selection-help", "smart-selection-warning", "smart-selection-cancel", "smart-selection-confirm","start-page-capture", "add-page-capture", "page-capture", "page-capture-title", "page-capture-help", "page-capture-list", "page-capture-scan", "page-capture-cancel", "page-capture-save", "page-capture-save-text-only",- "page-capture-mode", "page-capture-tools", "page-capture-organize", "capture-extra-metadata", "page-capture-edit-status", "page-capture-edit-help", "page-capture-edit-cancel",- "page-capture-clear", "page-capture-media-viewer", "page-capture-media-stage", "page-capture-media-position", "page-capture-media-title", "page-capture-media-meta",+ "page-capture-mode", "page-capture-organize", "capture-extra-metadata",+ "page-capture-media-viewer", "page-capture-media-stage", "page-capture-media-position", "page-capture-media-title", "page-capture-media-meta","page-capture-media-review", "page-capture-media-review-status", "page-capture-media-review-list",- "page-capture-add-region", "page-capture-exclude-region", "page-capture-undo-region", "page-capture-reset-region",+ "page-capture-undo-region","page-capture-media-close", "page-capture-media-prev", "page-capture-media-next","page-capture-list-setup", "page-capture-target-count", "page-capture-list-run", "page-capture-list-result", "page-capture-list-summary","page-capture-save-mode", "page-capture-combined-title-row", "page-capture-combined-title", "page-capture-actions",@@ -76,6 +77,7 @@ let organizing = false;let saving = false;let smartVisualFallback = false;let autoTextCaptureActive = false;+let autoPageCaptureActive = false;let smartVisualSession = null;let smartVisualCommitCreative = false;let regionCaptureState = null;@@ -86,7 +88,6 @@ const draftVisualHashes = new Map();let pageCaptureSession = null;let pageCaptureMediaView = null;let pageCaptureEditHistory = [];-let pageCaptureOriginalCandidates = new Map();let pageCapturePermissionState = { status: "unknown", origin: "", pattern: "" };const visualUrls = new Map();const FEEDBACK_DURATION_MS = 4000;@@ -95,6 +96,8 @@ let feedbackTimer = 0;let pageCaptureRequestId = "";let pageCaptureListRequested = false;let pageCaptureEditing = null;+let manuallyPickedBatchId = "";+let pageCaptureSupplementRequest = null;let pageCaptureCancelling = false;let pageCapturePreviewRequest = 0;const cancelledPageCaptureRequests = new Set();@@ -177,10 +180,6 @@ elements.pageCaptureMode.addEventListener("change", async () => {if (!pageCaptureListRequested && pageCaptureBatch?.captureMode === "list") void startPageCapture("loaded", elements.pageCaptureScan);else render();});-elements.pageCaptureEditCancel.addEventListener("click", async () => {- if (!pageCaptureEditing) return;- await chrome.runtime.sendMessage({ type: "CLEAR_PAGE_CAPTURE_MARKERS", tabId: pageCaptureBatch?.tabId, removeRegionMarkers: false });-});elements.pageCaptureListRun.addEventListener("click", () => startPageListCapture(elements.pageCaptureListRun));elements.pageCaptureSaveMode.addEventListener("change", () => {pageCaptureBatch = normalizePageCaptureBatch({ ...pageCaptureBatch, saveMode: elements.pageCaptureSaveMode.value });@@ -196,11 +195,7 @@ elements.pageCaptureOrganize.addEventListener("click", () => {});elements.pageCaptureSave.addEventListener("click", () => savePageCapture(false));elements.pageCaptureSaveTextOnly.addEventListener("click", () => savePageCapture(true));-elements.pageCaptureClear.addEventListener("click", clearPageCaptureConfirmation);-elements.pageCaptureAddRegion.addEventListener("click", () => editConfirmedPageCaptureRegion("include", elements.pageCaptureAddRegion));-elements.pageCaptureExcludeRegion.addEventListener("click", () => editConfirmedPageCaptureRegion("exclude", elements.pageCaptureExcludeRegion));elements.pageCaptureUndoRegion.addEventListener("click", undoPageCaptureRegionEdit);-elements.pageCaptureResetRegion.addEventListener("click", resetPageCaptureRegionEdit);elements.pageCaptureMediaClose.addEventListener("click", closePageCaptureMediaViewer);elements.pageCaptureMediaPrev.addEventListener("click", () => movePageCaptureMediaViewer(-1));elements.pageCaptureMediaNext.addEventListener("click", () => movePageCaptureMediaViewer(1));@@ -208,6 +203,12 @@ elements.regionCaptureCancel.addEventListener("click", cancelRegionCapture);elements.smartSelectionCancel.addEventListener("click", cancelSmartVisualSelection);elements.smartSelectionConfirm.addEventListener("click", confirmSmartVisualSelection);chrome.runtime.onMessage.addListener((message) => {+ if (message?.type === "OPEN_PAGE_CAPTURE") {+ void chrome.windows.getCurrent().then(window => {+ if (window.id === message.windowId) return pageCaptureBatch ? refreshDiscoveredVideos() : startAutomaticPageCapture();+ }).catch(error => showFeedback(error.message, true));+ return;+ }if (message?.type === "SMART_VISUAL_SELECTION_CHANGED" && message.sessionId === smartVisualSession?.sessionId) {smartVisualSession = { ...smartVisualSession, ...message };render();@@ -272,6 +273,34 @@ elements.captureNewCollectionName.addEventListener("keydown", (event) => {elements.captureNewCollectionName.blur();});+void startAutomaticPageCapture();++async function startAutomaticPageCapture() {+ if (autoPageCaptureActive || pageCaptureBatch || pageCaptureRequestId || pendingCaptureAction+ || !draft || draft.fragments.length || draft.visuals.length || draft.targetCaseId+ || activeCreativePrompt || activeCreativeResult || saving || smartVisualSession || regionCaptureState) return;+ autoPageCaptureActive = true;+ try {+ const tab = await resolveActivePage(chrome.tabs, chrome.scripting);+ if (!/^https?:\/\//u.test(tab?.url || "")) return;+ const permission = await inspectPagePermission(tab.url, chrome.permissions);+ if (permission.status !== "granted") {+ const stored = await chrome.storage.local.get(CAPTURE_PERMISSION_ONBOARDING_STORAGE_KEY);+ if (!normalizeCapturePermissionOnboarding(stored[CAPTURE_PERMISSION_ONBOARDING_STORAGE_KEY]).acknowledgedAt) {+ await runAfterCapturePermissionOnboarding(() => startAutomaticPageCapture());+ }+ return;+ }+ // Permission checks yield; a concurrent clipboard/context-menu capture keeps priority.+ if (pageCaptureBatch || draft.fragments.length || draft.visuals.length || draft.targetCaseId) return;+ await startPageCapture("loaded", elements.startPageCapture, { automatic: true });+ } catch (error) {+ showFeedback(error.message || t("网页采集失败"), true);+ } finally {+ autoPageCaptureActive = false;+ }+}+async function openLibraryTab() {try {const tab = await chrome.tabs.create({ url: chrome.runtime.getURL("library.html"), active: false });@@ -402,21 +431,53 @@ async function tryAutoSelection() {}}+async function refreshDiscoveredVideos() {+ const batch = pageCaptureBatch;+ if (!batch || saving || pageCaptureEditing || batch.status === "saving") return;+ const tab = await resolveActivePage(chrome.tabs, chrome.scripting);+ if (tab?.id !== batch.tabId) return;+ const source = new URL(batch.sourceUrl);+ const current = new URL(tab.url);+ if (source.origin !== current.origin || source.pathname !== current.pathname) return;+ const response = await chrome.runtime.sendMessage({ type: "GET_DISCOVERED_VIDEOS", tabId: tab.id });+ if (!response?.ok || pageCaptureBatch !== batch) return;+ pageCaptureBatch = normalizePageCaptureBatch(addDiscoveredVideos(batch, response.resources || []));+ render();+}+async function extractPageSelection(button) {+ if (saving || pageCaptureEditing || pageCaptureRequestId) return;await withButton(button, async () => {+ const previous = pageCaptureBatch;+ pageCaptureEditing = { mode: "pick" };+ render();try {- const selection = await runCaptureTransaction({- type: "ADD_ACTIVE_SELECTION_TO_DRAFT", chromeApi: chrome, onStatus: showFeedback- });- if (selection.captured?.reason === "empty-selection") {- showFeedback("请先在网页中选中文字");+ const tab = await resolveActivePage(chrome.tabs, chrome.scripting);+ const response = await chrome.runtime.sendMessage({ type: "PICK_PAGE_CONTENT", tabId: tab.id });+ if (!response?.ok) { if (!response?.cancelled) showFeedback(response?.message || "无法选取内容", true); return; }+ const batch = normalizePageCaptureBatch({ ...response.batch, status: "preview" });+ const candidate = batch.candidates[0];+ if (!candidate?.contentText && !candidate?.media.length) return showFeedback("这个区域没有可保存内容", true);+ const previousCandidate = previous?.candidates.find(item => item.id === previous.selections[0]?.candidateId);+ if (previousCandidate && (manuallyPickedBatchId === previous.id || response.supplement === "comments")) {+ appendToPageCapture(candidate);+ render();return;}- draft = selection.draft;- showFeedback(selection.message || "已提取网页高亮文字");- await refresh();- } catch (error) {- showFeedback(error.message || "文字提取失败", true);+ if (previous) pageCaptureEditHistory.push({ batch: structuredClone(previous) });+ pageCaptureBatch = normalizePageCaptureBatch({ ...batch, selections: [{ candidateId: candidate.id,+ selectedTextBlockIds: candidate.textBlocks.map(item => item.id), selectedMediaIds: pageCaptureDefaultMediaIds(candidate), mediaDecision: "pending" }] });+ manuallyPickedBatchId = pageCaptureBatch.id;+ pageCaptureDraftIds = new Set();+ syncDraftIntoPageCapture();+ render();+ } catch (error) { showFeedback(error.message || "选取失败", true); }+ finally {+ pageCaptureEditing = null;+ render();+ if (previous && pageCaptureBatch === previous) {+ await previewPageCaptureRegion(previous.candidates.find(item => item.id === previous.selections[0]?.candidateId));+ }}});}@@ -563,14 +624,14 @@ function render() {elements.pageCapture.hidden = !pageCaptureBatch || Boolean(smartVisualSession || regionCaptureState);document.body.classList.toggle("page-capture-active", Boolean(pageCaptureBatch));if (pageCaptureBatch) {- elements.pageCaptureTools.before(elements.captureAddMoreActions);+ elements.pageCaptureList.after(elements.captureAddMoreActions);if (pageCaptureBatch.captureMode === "list") elements.pageCaptureList.before(elements.captureMetadata);else elements.pageCaptureActions.before(elements.captureMetadata);} else {elements.organizer.before(elements.captureAddMoreActions);elements.captureAddMoreActions.before(elements.captureMetadata);}- elements.captureAddMoreActions.hidden = Boolean(pageCaptureBatch && (pageCaptureAppendBase || pageCaptureBatch.selections.length !== 1));+ elements.captureAddMoreActions.hidden = Boolean(pageCaptureAppendBase);elements.captureMetadata.hidden = pageCaptureBatch ? !pageCaptureBatch.selections.length : !view.showPreview;elements.regionCaptureStatus.hidden = !regionCaptureState;elements.previewState.hidden = Boolean(smartVisualSession || pageCaptureBatch || regionCaptureState) || !view.showPreview;@@ -634,8 +695,9 @@ function render() {elements.draftTitle.value = draft.title || targetEntry?.title || "";}const pageCandidate = pageCaptureBatch?.selections.length === 1 ? applyPageCaptureSelections(finalizePageCaptureSelectionsForSave(pageCaptureBatch))[0] : null;- const pageClassification = pageCandidate ? classifyContent({ text: pageCandidate.contentText,- title: pageCandidate.title, url: pageCandidate.canonicalUrl, sourceFacts: pageCandidate.sourceFacts, mediaAssets: pageCandidate.media },+ const pageClassification = pageCandidate ? classifyCapturedContent({ text: pageCandidate.contentText,+ title: pageCandidate.title, url: pageCandidate.canonicalUrl, sourceFacts: pageCandidate.sourceFacts, mediaAssets: pageCandidate.media,+ mediaPrompts: pageCandidate.media.filter(media => media.originalPrompt).map(media => ({ assetId: media.id, text: media.originalPrompt, source: "webpage" })) },captureClassificationContext.rules, captureClassificationContext.taxonomy) : null;const selectedContentType = draft.contentTypeExplicit ? draft.contentTypeId: pageCandidate ? pageClassification?.pathIds?.[0] : draft.contentTypeId || suggestedContentTypeId;@@ -672,7 +734,7 @@ function render() {elements.otherCaptureMethods.classList.toggle("fallback-highlight", smartVisualFallback);elements.addScreenshot.classList.toggle("fallback-highlight", smartVisualFallback);for (const button of [elements.addSmartVisuals, elements.addSelection, elements.addClipboard, elements.addScreenshot, elements.addPageCapture]) {- button.disabled = saving || button.hasAttribute("aria-busy") || Boolean(pageCaptureBatch && (pageCaptureRequestId || pageCaptureEditing || pageCaptureCancelling || pageCaptureBatch.status === "saving" || pageCaptureBatch.selections.length !== 1));+ button.disabled = saving || button.hasAttribute("aria-busy") || Boolean(pageCaptureBatch && (pageCaptureRequestId || pageCaptureEditing || pageCaptureSupplementRequest || pageCaptureCancelling || pageCaptureBatch.status === "saving" || (button !== elements.addSelection && pageCaptureBatch.selections.length !== 1)));}renderPageCapturePermissionAction();elements.fragmentList.replaceChildren(...draft.fragments.map((fragment, index) =>@@ -710,9 +772,9 @@ function renderPageCapture() {const selectedCount = pageCaptureBatch.selections.length;const listMode = pageCaptureBatch.captureMode === "list";const scanning = pageCaptureBatch.status === "scanning";- const busy = scanning || pageCaptureBatch.status === "saving" || Boolean(pageCaptureEditing) || pageCaptureCancelling;+ const busy = scanning || pageCaptureBatch.status === "saving" || Boolean(pageCaptureEditing || pageCaptureSupplementRequest) || pageCaptureCancelling;elements.pageCaptureTitle.textContent = t("网页采集");- elements.pageCaptureHelp.textContent = scanning ? t("正在扫描…")+ elements.pageCaptureHelp.textContent = pageCaptureSupplementRequest ? t("正在读取评论全文…") : scanning ? t("正在扫描…"): pageCaptureBatch.status === "saving" ? t("正在保存…"): pageCaptureBatch.error || (!pageCaptureBatch.candidates.length ? t("未识别到内容,可重新扫描或返回选择其他采集方式") : "");elements.pageCaptureHelp.hidden = !elements.pageCaptureHelp.textContent;@@ -738,12 +800,6 @@ function renderPageCapture() {elements.pageCaptureListResult.hidden = !listMode;elements.pageCaptureSaveMode.disabled = busy;elements.pageCaptureCombinedTitle.disabled = busy;- elements.pageCaptureTools.hidden = !selectedCount;- if (!selectedCount) elements.pageCaptureTools.open = false;- elements.pageCaptureClear.textContent = listMode ? t("取消选择") : t("换一项");- elements.pageCaptureClear.disabled = busy;- elements.pageCaptureEditStatus.hidden = !pageCaptureEditing;- elements.pageCaptureEditHelp.textContent = pageCaptureEditing?.mode === "include" ? t("点击网页中遗漏的内容,完成后返回") : t("点击网页中不想保存的内容,完成后返回");if (listMode) {const reviewCount = pageCaptureBatch.candidates.filter((candidate) => candidate.batchStructureStatus === "review").length;const incomplete = !scanning && pageCaptureBatch.targetCount > pageCaptureBatch.candidates.length;@@ -788,15 +844,8 @@ function renderPageCapture() {createArticlePreview: () => createPageCaptureArticlePreview(candidate, selections.get(candidate.id)),previewOpen: expandedPreviews.has(candidate.id)})));- const canEditRegion = !busy && !listMode && selectedCount === 1;- elements.pageCaptureAddRegion.disabled = !canEditRegion;- elements.pageCaptureExcludeRegion.disabled = !canEditRegion;- elements.pageCaptureUndoRegion.disabled = !canEditRegion || !pageCaptureEditHistory.length;- elements.pageCaptureResetRegion.disabled = !canEditRegion || !pageCaptureEditHistory.length;- elements.pageCaptureAddRegion.hidden = listMode;- elements.pageCaptureExcludeRegion.hidden = listMode;+ elements.pageCaptureUndoRegion.disabled = saving || !pageCaptureEditHistory.length;elements.pageCaptureUndoRegion.hidden = listMode;- elements.pageCaptureResetRegion.hidden = listMode;renderPageCaptureMediaReview(selections);if (activeCardId) elements.pageCaptureList.querySelector(`[data-candidate-id="${CSS.escape(activeCardId)}"] .page-capture-confirm`)?.focus({ preventScroll: true });if (activeMediaId) elements.pageCaptureMediaReviewList.querySelector(`[data-media-id="${CSS.escape(activeMediaId)}"] button:last-child`)?.focus({ preventScroll: true });@@ -805,17 +854,12 @@ function renderPageCapture() {function createPageCaptureArticlePreview(candidate, selection) {const section = document.createElement("section");section.className = "page-capture-article";- const heading = document.createElement("header");const blocks = candidate.articleDocument?.blocks?.length? candidate.articleDocument.blocks: [...candidate.textBlocks.map((block, sourceOrder) => ({ ...block, kind: block.kind === "section" ? "paragraph" : block.kind, sourceOrder })),...candidate.media.filter((media) => media.placement === "inline").map((media, index) => ({ id: `fallback:${media.id}`, kind: media.kind, assetId: media.id, sourceUrl: media.url, label: media.alt, sourceOrder: candidate.textBlocks.length + index }))];- heading.append(- textNode("strong", candidate.extraction.scope === "selection" ? t("原网页选区") : "完整文章预览")- );- section.append(heading);const mediaById = new Map(candidate.media.map((media) => [media.id, media]));for (const block of blocks.toSorted((left, right) => left.sourceOrder - right.sourceOrder)) {const media = block.assetId ? mediaById.get(block.assetId) : null;@@ -831,7 +875,27 @@ function createPageCaptureArticlePreview(candidate, selection) {: block.kind === "quote" ? "blockquote" : block.kind === "code" ? "pre" : "p";const node = textNode(tagName, block.text || "");if (block.kind === "list") node.textContent = block.text.split("\n").map((item) => `• ${item}`).join("\n");- section.append(node);+ const row = document.createElement("div");+ row.className = "page-capture-text-row";+ const remove = document.createElement("button");+ remove.type = "button";+ remove.className = "page-capture-text-remove";+ remove.textContent = "×";+ remove.setAttribute("aria-label", t("移除"));+ remove.addEventListener("click", () => {+ pageCaptureEditHistory.push({ batch: structuredClone(pageCaptureBatch) });+ const removedIndex = candidate.textBlocks.findIndex(item => item.id === block.id || item.text === block.text);+ const blocks = candidate.textBlocks.filter((item, index) => index !== removedIndex);+ const articleBlocks = candidate.articleDocument.blocks.filter(item => item.id !== block.id);+ const revised = { ...candidate, textBlocks: blocks, contentText: blocks.map(item => item.text).join("\n\n"), articleDocument: { ...candidate.articleDocument, blocks: articleBlocks } };+ pageCaptureBatch = normalizePageCaptureBatch({ ...pageCaptureBatch,+ candidates: pageCaptureBatch.candidates.map(item => item.id === candidate.id ? revised : item),+ selections: pageCaptureBatch.selections.map(item => item.candidateId === candidate.id ? { ...item,+ selectedTextBlockIds: item.selectedTextBlockIds.filter(id => blocks.some(block => block.id === id)) } : item) });+ render();+ });+ row.append(node, remove);+ section.append(row);}return section;}@@ -926,7 +990,7 @@ function syncDraftIntoPageCapture() {}function confirmPageCaptureCandidate(candidate) {- if (pageCaptureRequestId || pageCaptureEditing || pageCaptureCancelling || pageCaptureBatch?.status === "saving") return;+ if (pageCaptureRequestId || pageCaptureEditing || pageCaptureSupplementRequest || pageCaptureCancelling || pageCaptureBatch?.status === "saving") return;if (pageCaptureAppendBase) {const selected = applyPageCaptureSelections(normalizePageCaptureBatch({ ...pageCaptureBatch,selections: [{ candidateId: candidate.id, selectedTextBlockIds: candidate.textBlocks.map(b => b.id),@@ -949,12 +1013,12 @@ function confirmPageCaptureCandidate(candidate) {selections: next ? (pageCaptureBatch.captureMode === "list" ? [...pageCaptureBatch.selections, next] : [next]) : []});syncDraftIntoPageCapture();- previewPageCaptureRegion(candidate);+ if (candidate.region?.marker) previewPageCaptureRegion(candidate);render();}function clearPageCaptureConfirmation() {- if (pageCaptureRequestId || pageCaptureEditing || pageCaptureCancelling || pageCaptureBatch?.status === "saving") return;+ if (pageCaptureRequestId || pageCaptureEditing || pageCaptureSupplementRequest || pageCaptureCancelling || pageCaptureBatch?.status === "saving") return;pageCaptureBatch = normalizePageCaptureBatch({ ...pageCaptureBatch, selections: [] });previewPageCaptureRegion(null);render();@@ -978,57 +1042,50 @@ async function previewPageCaptureRegion(candidate, locate = false) {if (request === pageCapturePreviewRequest && candidate && !response?.ok) showFeedback(response?.message || t("原网页暂时无法高亮定位,请在采集预览中核对内容"));}-async function editConfirmedPageCaptureRegion(mode, button) {- if (pageCaptureRequestId || pageCaptureEditing || pageCaptureCancelling || pageCaptureBatch?.status === "saving") return;- const batchId = pageCaptureBatch?.id;- const selectedId = pageCaptureBatch?.selections?.[0]?.candidateId;- const candidate = pageCaptureBatch?.candidates?.find(item => item.id === selectedId);- if (!candidate) return showFeedback("请先确认一个主体方案", true);- const edit = { mode, batchId };- await withButton(button, async () => {- pageCaptureEditing = edit;- render();- try {- const response = await chrome.runtime.sendMessage({ type: "EDIT_PAGE_CAPTURE_REGION", tabId: pageCaptureBatch.tabId, candidate, mode });- if (pageCaptureEditing !== edit || pageCaptureBatch?.id !== batchId) return;- if (!response?.ok) {- if (!response?.cancelled) showFeedback(response?.message || "网页区域没有修改", true);- void previewPageCaptureRegion(candidate);- return;- }- pageCaptureEditHistory.push({ candidateId: candidate.id, candidate: structuredClone(candidate) });- replacePageCaptureCandidate(response.candidate);- showFeedback(response.message);- } catch (error) {- showFeedback(error.message || "网页区域没有修改", true);- } finally {- if (pageCaptureEditing === edit) pageCaptureEditing = null;- render();- }- });++async function includePageCaptureSupplement(candidate, item) {+ if (pageCaptureSupplementRequest || !candidate.supplements.some(value => value.id === item.id)) return;+ const request = { batchId: pageCaptureBatch.id, candidateId: candidate.id };+ pageCaptureSupplementRequest = request;render();+ try {+ if (item.partial) {+ const response = await chrome.runtime.sendMessage({ type: "READ_PAGE_CAPTURE_SUPPLEMENT", supplement: item });+ if (pageCaptureSupplementRequest !== request || pageCaptureBatch?.id !== request.batchId) return;+ if (!response?.ok) throw new Error(response?.message || t("未能取得评论全文,当前草稿已保留"));+ item = response.supplement;+ }+ candidate = pageCaptureBatch.candidates.find(value => value.id === request.candidateId);+ if (!candidate?.supplements.some(value => value.id === item.id)) return;+ applyPageCaptureSupplement(candidate, item);+ } catch (error) {+ if (pageCaptureSupplementRequest === request) showFeedback(error.message, true);+ } finally {+ if (pageCaptureSupplementRequest === request) { pageCaptureSupplementRequest = null; render(); }+ }}-function includePageCaptureSupplement(candidate, item) {- if (!candidate.supplements.some(value => value.id === item.id)) return;+function applyPageCaptureSupplement(candidate, item) {const paragraph = document.createElement("p");paragraph.textContent = item.text;- const block = { id: item.id, kind: "section", text: item.text, html: paragraph.outerHTML, sourceOrder: candidate.textBlocks.length };+ const block = { id: `added:${candidate.id}:${item.id}`, kind: "section", text: item.text, html: paragraph.outerHTML, sourceOrder: candidate.textBlocks.length };const revised = {...candidate,textBlocks: [...candidate.textBlocks, block],contentText: [candidate.contentText, item.text].filter(Boolean).join("\n\n"),articleDocument: { version: 1, blocks: [...(candidate.articleDocument?.blocks || []),- { id: item.id + ":source", kind: "link", sourceUrl: item.sourceUrl, label: t("作者补充") },+ { id: block.id + ":source", kind: "link", sourceUrl: item.sourceUrl, label: t("作者补充") },{ ...block, kind: "paragraph" }] },supplements: candidate.supplements.filter(value => value.id !== item.id),completeness: item.partial ? "partial" : candidate.completeness,sourceFacts: { ...candidate.sourceFacts, status: item.partial ? "partial" : candidate.sourceFacts.status }};+ const selected = pageCaptureBatch.selections.find(value => value.candidateId === candidate.id);+ pageCaptureEditHistory.push({ candidateId: candidate.id, candidate: structuredClone(candidate), selection: structuredClone(selected) });pageCaptureBatch = normalizePageCaptureBatch({ ...pageCaptureBatch,candidates: pageCaptureBatch.candidates.map(value => value.id === candidate.id ? revised : value),selections: pageCaptureBatch.selections.map(selection => selection.candidateId === candidate.id- ? { ...selection, includeText: true, selectedTextBlockIds: [...(selection.selectedTextBlockIds || (selection.includeText ? candidate.textBlocks.map(value => value.id) : [])), item.id] }+ ? { ...selection, includeText: true, selectedTextBlockIds: [...(selection.selectedTextBlockIds || (selection.includeText ? candidate.textBlocks.map(value => value.id) : [])), block.id] }: selection)});render();@@ -1043,7 +1100,7 @@ function replacePageCaptureCandidate(candidate) {mediaDecision: "pending"}, candidates);pageCaptureBatch = normalizePageCaptureBatch({ ...pageCaptureBatch, candidates, selections: selection ? [selection] : [] });- previewPageCaptureRegion(candidate);+ if (candidate.region?.marker) previewPageCaptureRegion(candidate);render();}@@ -1052,7 +1109,7 @@ function renderPageCaptureMediaReview(selections) {const selection = selections.get(candidate.id);return selection ? candidate.media.map((media, mediaIndex) => ({ candidate, media, mediaIndex, selection })) : [];});- elements.pageCaptureMediaReview.hidden = pageCaptureBatch.selections.length === 0;+ elements.pageCaptureMediaReview.hidden = selected.length === 0;if (!pageCaptureBatch.selections.length) {elements.pageCaptureMediaReviewList.replaceChildren();return;@@ -1090,7 +1147,7 @@ function renderPageCaptureMediaReview(selections) {toggle.className = "button-secondary compact";const included = selection.mediaDecision !== "none" && selection.selectedMediaIds.includes(media.id);toggle.textContent = included ? t("排除") : t("恢复");- toggle.disabled = Boolean(pageCaptureRequestId || pageCaptureEditing || pageCaptureBatch.status === "saving");+ toggle.disabled = Boolean(pageCaptureRequestId || pageCaptureEditing || pageCaptureSupplementRequest || pageCaptureBatch.status === "saving");toggle.addEventListener("click", () => updatePageCaptureMediaSelection(candidate.id, media.id));row.append(preview, copy, toggle);return row;@@ -1149,7 +1206,8 @@ function finalizePageCaptureSelectionsForSave(batchValue, textOnly = false) {function undoPageCaptureRegionEdit() {const previous = pageCaptureEditHistory.pop();if (!previous) return;- if (previous.selection) {+ if (previous.batch) { pageCaptureBatch = normalizePageCaptureBatch(previous.batch); render(); }+ else if (previous.selection) {pageCaptureBatch = normalizePageCaptureBatch({ ...pageCaptureBatch,candidates: pageCaptureBatch.candidates.map(c => c.id === previous.candidate.id ? previous.candidate : c),selections: pageCaptureBatch.selections.map(s => s.candidateId === previous.candidate.id ? previous.selection : s) });@@ -1158,14 +1216,6 @@ function undoPageCaptureRegionEdit() {showFeedback(t("已撤销上次调整"));}-function resetPageCaptureRegionEdit() {- const selectedId = pageCaptureBatch?.selections?.[0]?.candidateId;- const original = pageCaptureOriginalCandidates.get(selectedId);- if (!original) return;- pageCaptureEditHistory = [];- replacePageCaptureCandidate(structuredClone(original));- showFeedback("已恢复本次扫描的自动识别结果");-}function openPageCaptureMediaViewer(candidate, mediaIndex) {pageCaptureMediaView = { candidateId: candidate.id, mediaIndex };@@ -1256,6 +1306,7 @@ async function cancelPageCapture() {pageCaptureRequestId = "";pageCaptureSession = null;pageCaptureEditing = null;+ pageCaptureSupplementRequest = null;pageCapturePreviewRequest += 1;closePageCaptureMediaViewer();render();@@ -1271,7 +1322,6 @@ async function cancelPageCapture() {pageCaptureBatch = null;pageCaptureListRequested = false;pageCaptureEditHistory = [];- pageCaptureOriginalCandidates = new Map();}} finally {pageCaptureCancelling = false;@@ -1459,8 +1509,8 @@ async function beginSmartVisualSelection(button, commitCreative = false) {});}-async function startPageCapture(mode, button) {- if (pageCaptureRequestId || pageCaptureEditing || pageCaptureCancelling || pageCaptureBatch?.status === "saving" || button?.disabled) return;+async function startPageCapture(mode, button, { automatic = false } = {}) {+ if (pageCaptureRequestId || pageCaptureEditing || pageCaptureSupplementRequest || pageCaptureCancelling || pageCaptureBatch?.status === "saving" || button?.disabled) return;if (mode !== "list" && pageCaptureBatch?.selections.length === 1 && button === elements.addPageCapture) {pageCaptureAppendBase = structuredClone(pageCaptureBatch);} else if (!pageCaptureBatch) pageCaptureDraftIds = new Set();@@ -1525,9 +1575,19 @@ async function startPageCapture(mode, button) {mediaDecision: "pending"}, batch.candidates)).filter(Boolean): batch.selections;- pageCaptureBatch = normalizePageCaptureBatch({ ...batch, selections });+ if (automatic && batch.candidates.length === 1 && !selections.length) {+ const candidate = batch.candidates[0];+ selections.push(normalizePageCaptureSelection({ candidateId: candidate.id,+ selectedTextBlockIds: candidate.textBlocks.map(item => item.id),+ selectedMediaIds: pageCaptureDefaultMediaIds(candidate), mediaDecision: "pending"+ }, batch.candidates));+ }+ pageCaptureBatch = normalizePageCaptureBatch({ ...batch, selections: selections.filter(Boolean) });+ if (automatic && pageCaptureBatch.selections.length === 1) {+ syncDraftIntoPageCapture();+ void previewPageCaptureRegion(pageCaptureBatch.candidates[0]);+ }if (!pageCaptureAppendBase) pageCaptureEditHistory = [];- if (!pageCaptureAppendBase) pageCaptureOriginalCandidates = new Map(pageCaptureBatch.candidates.map((candidate) => [candidate.id, structuredClone(candidate)]));pageCaptureSession = null;pageCaptureListRequested = mode === "list";closePageCaptureMediaViewer();@@ -1569,7 +1629,7 @@ async function startPageListCapture(button) {}async function savePageCapture(textOnly = false) {- if (!pageCaptureBatch || pageCaptureRequestId || pageCaptureEditing || pageCaptureBatch.status === "saving") return;+ if (!pageCaptureBatch || pageCaptureRequestId || pageCaptureEditing || pageCaptureSupplementRequest || pageCaptureBatch.status === "saving") return;const trigger = textOnly ? elements.pageCaptureSaveTextOnly : elements.pageCaptureSave;await withButton(trigger, async () => {const reviewBatch = pageCaptureBatch;@@ -1604,17 +1664,23 @@ async function savePageCapture(textOnly = false) {try { await updateDraft({ ...draft, collectionId: response.collectionId, newCollectionName: "" }); }catch (error) { cleanupErrors.push(error.message); }}- const savedDraftItems = savedDraftCaptureItems(draft, selected.filter(c => savedCandidateIds.has(c.id)), pageCaptureDraftIds);- for (const item of savedDraftItems) {+ const savedDraftItems = savedDraftCaptureItems(draft, persistedPageCaptureCandidates(saveBatch, selected, results), pageCaptureDraftIds);+ const savedFragments = savedDraftItems.filter(item => item.kind !== "image");+ if (savedFragments.length) {try {- const cleanup = await chrome.runtime.sendMessage(item.kind === "image"- ? { type: "REMOVE_CAPTURE_VISUAL", visualId: item.id }- : { type: "REMOVE_CAPTURE_FRAGMENT", fragmentId: item.id });+ const cleanup = await chrome.runtime.sendMessage({ type: "CLEAR_SAVED_CAPTURE_FRAGMENTS", fragmentIds: savedFragments.map(item => item.id) });+ if (!cleanup?.ok) throw new Error(cleanup?.message || t("待保存内容没有更新"));+ for (const item of savedFragments) pageCaptureDraftIds.delete(`${item.kind}:${item.id}`);+ } catch (error) { cleanupErrors.push(error.message); }+ }+ for (const item of savedDraftItems.filter(item => item.kind === "image")) {+ try {+ const cleanup = await chrome.runtime.sendMessage({ type: "REMOVE_CAPTURE_VISUAL", visualId: item.id });if (!cleanup?.ok) throw new Error(cleanup?.message || t("待保存内容没有更新"));pageCaptureDraftIds.delete(`${item.kind}:${item.id}`);} catch (error) { cleanupErrors.push(error.message); }}- const failures = results.filter(item => !item.entryId || !["saved", "partial", "duplicate"].includes(item.status));+ const failures = results.filter(item => !item.entryId || item.pendingMediaIds?.length || !["saved", "partial", "duplicate"].includes(item.status));const failureReasons = [...new Set(failures.flatMap(item => item.warnings || []))];pageCaptureBatch = remainingIds.size ? normalizePageCaptureBatch({...saveBatch, status: "preview", error: failureReasons.join(";"),@@ -1622,13 +1688,12 @@ async function savePageCapture(textOnly = false) {selections: saveBatch.selections.filter(selection => remainingIds.has(selection.candidateId))}) : null;pageCaptureEditHistory = [];- pageCaptureOriginalCandidates = new Map();if (!remainingIds.size) {pageCaptureDraftIds = new Set();await clearPageCaptureMarkers(saveBatch.tabId);- } else elements.pageCaptureMediaReview.open = true;- const notice = incomplete.length ? t("{message};部分媒体未完整保存,请在案例库检查", { message: response.message }) : remainingIds.size ? response.message : t("已保存");- const message = [notice, ...(incomplete.length ? [] : response.warnings || []), ...failureReasons, ...cleanupErrors].filter(Boolean).join(";");+ }+ const notice = remainingIds.size ? t("部分内容未保存,已保留供重试") : incomplete.length ? t("{message};部分媒体未完整保存,请在案例库检查", { message: response.message }) : t("已保存");+ const message = [notice, ...(incomplete.length ? [] : response.warnings || []), ...(remainingIds.size ? [] : failureReasons), ...cleanupErrors].filter(Boolean).join(";");showFeedback(message, Boolean(remainingIds.size || cleanupErrors.length));try { await refresh(); }catch (error) { showFeedback(`${message};${error.message}`, true); render(); }diff --git a/extension/composer-library-tools.js b/extension/composer-library-tools.jsindex 7336621..d39a702 100644--- a/extension/composer-library-tools.js+++ b/extension/composer-library-tools.js@@ -3,6 +3,7 @@ import { entryMediaAssets } from './media.js';import { composerSourceText, composerAssetAnalysisText, formatReferenceTime } from './composer-source-text.js';import { buildSearchIndex, searchIndexedEntries } from './search-index.js';import { collectionEntryIds } from './organizer.js';+import { caseOriginalPromptText } from './prompt-sources.js';// Match the library's page size and the reference picker's preview length.const PAGE_SIZE = 24;@@ -171,7 +172,7 @@ export function caseTextPart(entry, part, documents) {const assets = entryMediaAssets(entry);switch (part) {case 'body': return String(entry.text ?? '');- case 'original_prompt': return (entry.mediaPrompts ?? []).filter(item => item.source !== 'ai-suggestion').map(item => item.text).join('\n\n');+ case 'original_prompt': return caseOriginalPromptText(entry);case 'ai_prompt': return assets.map(asset => composerAssetAnalysisText(entry, asset)).filter(Boolean).join('\n\n');case 'document': return documents?.get(entry.id) || '';case 'time_notes': return (entry.timeNotes ?? []).map(note => {diff --git a/extension/composer-page.css b/extension/composer-page.cssindex 47e8c56..0d25b54 100644--- a/extension/composer-page.css+++ b/extension/composer-page.css@@ -155,15 +155,24 @@.composer-input-box:focus-within { border-color: var(--selection-edge); box-shadow: inset 0 0 0 1px var(--focus-ring), 0 8px 32px color-mix(in srgb, var(--ink) 14%, transparent); }.composer-input-box.drag-active { border-color: var(--selection-edge); background: var(--selection); box-shadow: inset 0 0 0 1px var(--focus-ring); }.composer-input-box textarea { width: 100%; min-height: 66px; max-height: 220px; resize: none; border: 0; padding: 2px; color: var(--ink); background: transparent; font-size: 14px; line-height: 1.65; outline: 0; }-.composer-input-footer { display: flex; align-items: end; justify-content: space-between; gap: 12px; margin-top: 7px; }+.composer-input-footer { display: flex; flex-wrap: wrap; align-items: end; justify-content: space-between; gap: 12px; margin-top: 7px; }.composer-input-tools { display: flex; min-width: 0; align-items: center; flex-wrap: nowrap; gap: 7px; }.composer-attachment-local, .composer-library-search { flex: none; width: 36px; min-width: 36px; height: 36px; min-height: 36px; }.composer-library-search[aria-pressed="true"] { border-color: var(--selection-edge); color: var(--accent-ink); background: var(--selection); box-shadow: inset 0 0 0 1px var(--focus-ring); }-.composer-type-switch { display: flex; flex: none; min-height: 36px; margin: 0; border: 1px solid var(--line); border-radius: 9px; padding: 2px; white-space: nowrap; }-.composer-type-switch label { cursor: pointer; }-.composer-type-switch input { position: absolute; opacity: 0; pointer-events: none; }-.composer-type-switch span { display: block; border-radius: 6px; padding: 5px 9px; color: var(--muted); font-size: 10px; font-weight: 850; }-.composer-type-switch input:checked + span { color: var(--ink); background: var(--selection); box-shadow: inset 0 0 0 1px var(--selection-edge); }+.composer-type-switch { display: grid; gap: 2px; min-width: 0; margin: 0; border: 0; padding: 0; white-space: nowrap; }+.composer-type-switch label { position: relative; cursor: pointer; }+.composer-type-switch input { position: absolute; inset: 0; width: 100%; height: 100%; margin: 0; opacity: 0; cursor: pointer; }+.composer-type-switch label > span { display: flex; align-items: center; gap: 8px; min-height: var(--ui-control-height); padding: 7px 8px; border-radius: var(--ui-control-radius); color: var(--ink); font-size: var(--ui-button-size); }+.composer-type-switch input:hover:not(:disabled) + span { background: var(--hover); }+.composer-type-switch input:checked + span { background: var(--raised); }+.composer-type-switch input:focus-visible + span { outline: 2px solid var(--focus-ring); outline-offset: -2px; }+.composer-type-switch input:disabled + span { opacity: .48; cursor: not-allowed; }+.composer-type-switch input:disabled { cursor: not-allowed; }+.composer-toolbar-menu { position: relative; flex: none; }+.composer-toolbar-menu > summary { width: 44px; min-height: var(--ui-control-height); padding: 0 6px; gap: 3px; list-style: none; }+.composer-toolbar-menu > summary::-webkit-details-marker { display: none; }+.composer-toolbar-menu .composer-menu-chevron { width: 10px; height: 10px; color: var(--muted); }+.composer-toolbar-menu > summary[data-originals="true"] { border-color: var(--selection-edge); background: var(--raised); }.composer-compact-field { display: block; }.composer-compact-field input, .composer-compact-field select { min-height: 29px; border-color: var(--line); padding: 4px 8px; font-size: 10px; }.composer-compact-field input { width: 142px; }@@ -194,7 +203,7 @@.composer-options { position: relative; flex: none; }.composer-options > summary { display: grid; width: 36px; min-height: 36px; place-items: center; padding: 0; color: var(--ink); cursor: pointer; list-style: none; }.composer-options > summary::-webkit-details-marker { display: none; }-.composer-options-panel { position: absolute; z-index: 16; bottom: calc(100% + 9px); left: 0; display: grid; width: min(310px, calc(100vw - 32px)); max-height: min(520px, calc(100dvh - 150px)); overflow: auto; gap: 9px; border: 1px solid var(--line); border-radius: 7px; padding: 11px; background: var(--card); box-shadow: 0 14px 42px color-mix(in srgb, var(--ink) 20%, transparent); }+.composer-options-panel { position: absolute; z-index: 16; bottom: calc(100% + 9px); right: 0; display: grid; width: min(310px, calc(100vw - 32px)); max-height: min(520px, calc(100dvh - 150px)); overflow: auto; gap: 9px; border: 1px solid var(--line); border-radius: 7px; padding: 11px; background: var(--card); box-shadow: 0 14px 42px color-mix(in srgb, var(--ink) 20%, transparent); }.composer-options-panel > strong { padding: 2px 2px 4px; font-size: 11px; }.composer-option-field { display: grid; grid-template-columns: 76px minmax(0, 1fr); align-items: center; gap: 10px; color: var(--muted); font-size: 10px; font-weight: 750; }.composer-option-field input, .composer-option-field select { min-height: 34px; border-color: var(--line); padding: 5px 8px; font-size: 11px; }@@ -213,7 +222,7 @@.composer-action { display: grid; flex: none; width: 38px; min-width: 38px; height: 38px; min-height: 38px; place-items: center; border-radius: 50%; padding: 0; font-size: 18px; }.composer-action[data-state="stop"] { border-radius: 12px; background: var(--ink); color: var(--card); font-size: 13px; }.composer-action[data-state="stopping"] { opacity: .65; }-.composer-input-actions { display: flex; flex: none; align-items: center; gap: 8px; }+.composer-input-actions { display: flex; margin-left: auto; flex: none; align-items: center; gap: 8px; }.composer-model-control { position: relative; min-width: 0; }.composer-model-trigger { display: flex; min-width: 0; max-width: 150px; min-height: 36px; align-items: center; gap: 5px; border-color: var(--line); padding: 5px 9px; font-size: 10px; font-weight: 850; }.composer-model-trigger > span:first-child { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }@@ -445,8 +454,8 @@.composer-input-box { width: min(880px, 100%); border-radius: 7px; padding: 12px 13px 9px; box-shadow: 0 10px 32px color-mix(in srgb, var(--ink) 11%, transparent); }.composer-input-box:focus-within { box-shadow: inset 0 0 0 1px var(--focus-ring), 0 10px 32px color-mix(in srgb, var(--ink) 11%, transparent); }.composer-input-box textarea { min-height: 62px; }-.composer-type-switch, .composer-review-toggle { border-radius: 6px; }-.composer-type-switch span, .composer-review-toggle span { border-radius: 4px; }+.composer-review-toggle { border-radius: 6px; }+.composer-review-toggle span { border-radius: 4px; }.composer-reference-trigger, .composer-model-trigger { border-radius: 6px; }.composer-reference-trigger strong { border-radius: 4px; }.composer-action { width: 36px; min-width: 36px; height: 36px; min-height: 36px; border-radius: 6px; }@@ -464,10 +473,9 @@.composer-chat-inner { width: min(100% - 24px, 880px); padding-top: 24px; }.composer-input-area { padding: 8px 10px 12px; }.composer-input-box { border-radius: 7px; }- .composer-input-footer { align-items: center; flex-wrap: wrap; gap: 4px; }- .composer-input-tools { flex-wrap: wrap; gap: 4px; overflow: visible; }+ .composer-input-footer { align-items: center; justify-content: flex-start; flex-wrap: wrap; gap: 4px; }+ .composer-input-tools { display: contents; }.composer-input-actions { gap: 4px; margin-left: auto; }- .composer-type-switch span { padding-inline: 5px; }.composer-model-trigger { max-width: 60px; padding-inline: 5px; }.composer-reference-trigger { padding-inline: 5px; }.composer-options-panel { position: fixed; right: 10px; bottom: 94px; left: 10px; width: auto; max-height: min(520px, calc(100dvh - 116px)); }@@ -507,8 +515,6 @@.composer-case-option { transition: color 140ms ease, background-color 140ms ease, border-color 140ms ease, box-shadow 140ms ease; }}-.composer-image-input-status { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; color: var(--danger); font-size: 12px; }-.composer-image-input-status[hidden] { display: none; }.composer-tool-events { margin: 0 0 1rem 2.5rem; color: var(--muted); font-size: 12px; }.composer-tool-event { margin: .3rem 0; }@@ -535,3 +541,11 @@.composer-input-reference-main { display: grid; grid-template-columns: 48px minmax(0, 1fr); gap: 9px; align-items: center; min-width: 0; border: 0; padding: 0; text-align: left; background: transparent; color: inherit; }.composer-input-reference-remove { padding: 4px; min-width: 0; width: 26px; }++#composer-reference-inputs[hidden], .composer-reference-input-choice[hidden] { display: none; }+.composer-toolbar-menu > .composer-toolbar-panel { position: fixed; inset: auto; width: min(240px, calc(100vw - 2 * var(--ui-popover-viewport-inset))); padding: 8px; gap: 2px; }+.composer-toolbar-panel > p { margin: 5px 8px; color: var(--muted); font-size: var(--ui-meta-size); line-height: 1.5; }+.composer-reference-input-choice { display: flex; align-items: center; gap: 9px; min-height: var(--ui-control-height); padding: 7px 8px; border-radius: var(--ui-control-radius); font-size: var(--ui-button-size); cursor: pointer; }+.composer-reference-input-choice:has(input:enabled):hover { background: var(--hover); }+.composer-reference-input-choice input { flex: none; width: 16px; height: 16px; margin: 0; accent-color: var(--ui-accent); }+.composer-reference-input-choice:has(input:disabled) { color: var(--muted); cursor: default; }diff --git a/extension/composer-page.js b/extension/composer-page.jsindex 46624c1..d39a8df 100644--- a/extension/composer-page.js+++ b/extension/composer-page.js@@ -14,7 +14,6 @@ import {createComposerSession,createReferenceSnapshots,referenceSourcePartsForAsset,- imageReferenceModeAvailability,isMeaningfulComposerSession,isComposerEligibleEntry,failComposerAssemblySnapshot,@@ -45,7 +44,6 @@ import {composerGenerationRequiresPromptAssembly,composerImageEditCapabilities,composerImageAvailability,- composerImageInputAvailability,composerServiceCapabilities,composerServiceCatalog,composerLibraryToolService,@@ -105,10 +103,12 @@ import {await initializeUi();bindUiPreferenceReload();-bindTransientMenus(document, ".composer-options, .composer-session-menu");+bindTransientMenus(document, ".composer-options, .composer-session-menu, .composer-toolbar-menu");const elements = Object.fromEntries(["composer-shell", "composer-nav", "composer-nav-open", "composer-nav-close", "composer-new", "composer-session-list",+ "composer-direction", "composer-direction-trigger", "composer-direction-icon", "composer-reference-inputs-trigger",+ "composer-reference-inputs", "composer-send-images-field", "composer-send-videos-field", "composer-send-images", "composer-send-videos","composer-title", "composer-save-state", "composer-platform", "composer-output-language", "composer-route", "composer-production-review", "composer-reference-open", "composer-reference-count","composer-applied-skills", "composer-skill-menu", "composer-assembly-open", "composer-timeline", "composer-aliases", "composer-instruction", "composer-action", "composer-feedback", "composer-send-note","composer-attachment-files", "composer-attachment-local", "composer-library-search", "composer-temp-reference-row", "composer-temp-references", "composer-temp-reference-save-all",@@ -116,7 +116,6 @@ const elements = Object.fromEntries(["composer-diagnostic-export", "composer-reference-workspace", "composer-reference-close", "composer-reference-cancel", "composer-reference-tab-cases", "composer-reference-tab-skills", "composer-project-list", "composer-projects-panel", "composer-case-picker", "composer-reference-footer", "composer-workspace-title", "composer-workspace-description","composer-case-selection-count", "composer-reference-search", "composer-reference-project-filter", "composer-case-list", "composer-selection-strip","composer-reference-clear", "composer-reference-apply", "composer-reference-feedback", "composer-assembly-dialog", "composer-assembly-close", "composer-assembly-content",- "composer-image-input-status", "composer-image-input-message", "composer-image-input-model"].map((id) => [camel(id), document.querySelector(`#${id}`)]));let entries = [];@@ -201,6 +200,8 @@ function bindEvents() {elements.composerCreateImage.addEventListener("change", safely(updateComposerOutputMode));elements.composerImageSize.addEventListener("change", safely(updateImageGenerationParameters));elements.composerImageQuality.addEventListener("change", safely(updateImageGenerationParameters));+ elements.composerSendImages.addEventListener("change", safely(updateReferenceInputs));+ elements.composerSendVideos.addEventListener("change", safely(updateReferenceInputs));elements.composerImageReferenceMode.addEventListener("change", safely(updateImageReferenceMode));elements.composerVideoDuration.addEventListener("change", safely(updateImageGenerationParameters));elements.composerDiagnosticExport.addEventListener("click", safely(exportComposerDiagnostic));@@ -250,16 +251,30 @@ function bindEvents() {elements.composerOutputLanguage.addEventListener("change", safely(updateComposerPreferences));elements.composerRoute.addEventListener("change", safely(updateComposerPreferences));elements.composerProductionReview.addEventListener("change", safely(updateComposerPreferences));- document.querySelectorAll('input[name="composer-type"]').forEach((input) => input.addEventListener("change", safely(updateComposerPreferences)));+ document.querySelectorAll('input[name="composer-type"]').forEach((input) => input.addEventListener("change", safely(async () => {+ await updateComposerPreferences();+ elements.composerDirection.open = false;+ elements.composerDirectionTrigger.focus();+ })));+ document.querySelectorAll(".composer-toolbar-menu").forEach((menu) => {+ menu.querySelector("summary").addEventListener("click", () => {+ if (!menu.open) positionComposerInputMenu(menu);+ });+ });+ document.querySelectorAll(".composer-toolbar-menu").forEach((menu) => menu.addEventListener("toggle", () => {+ if (menu.open) {+ closeComposerModelMenu();+ positionComposerInputMenu(menu);+ }+ }));+ window.addEventListener("resize", () => {+ document.querySelectorAll(".composer-toolbar-menu[open]").forEach(positionComposerInputMenu);+ });elements.composerReferenceOpen.addEventListener("click", openReferenceWorkspace);elements.composerReferenceTabCases.addEventListener("click", () => setReferenceWorkspaceMode("references"));elements.composerReferenceTabSkills.addEventListener("click", () => setReferenceWorkspaceMode("skills"));elements.composerAssemblyOpen.addEventListener("click", openAssemblyDialog);elements.composerAssemblyClose.addEventListener("click", () => elements.composerAssemblyDialog.close());- elements.composerImageInputModel.addEventListener("click", (event) => {- event.stopPropagation();- openComposerModelMenu();- });elements.composerReferenceClose.addEventListener("click", closeReferenceWorkspace);elements.composerReferenceCancel.addEventListener("click", closeReferenceWorkspace);elements.composerReferenceSearch.addEventListener("input", () => { referenceFocusedEntryId = ""; renderCasePicker(); });@@ -429,6 +444,8 @@ async function createNewSession(referenceIds = [], focus = true) {targetPlatform: composerSettings.lastTargetPlatform,outputLanguage: composerSettings.outputLanguage,routeMode: "auto",+ imageReferenceMode: "text_only",+ videoReferenceMode: "text_only",aiProfile: composerProfileForTaskAssignment(composerAiTaskAssignments.creativePlanning, composerSettings.lastAiProfile),generationAiProfile: composerProfileForTaskAssignment(composerAiTaskAssignments[targetType === "video" ? "videoGeneration" : "imageGeneration"],@@ -1060,11 +1077,6 @@ async function sendComposerTurn() {if (activeOperation) return composerFeedback("另一项创作任务正在运行,请先等待或停止", true);const instruction = elements.composerInstruction.value.trim();if (!instruction) return composerFeedback("请先输入本轮任务", true);- if (sessionHasVideoReferences(composerSession)) {- const service = selectedComposerService(composerSession.aiProfile, composerAiSettings, composerVisionSettings);- if (!service.videoInput) return composerFeedback(`${service.label} 的所选模型未声明视频输入能力,请切换视频模型`, true);- }- if (!renderImageInputStatus().available) return;const answeringQuestion = composerSession.messages.at(-1)?.type === "question";const wasEmpty = composerSession.messages.length === 0 && composerSession.promptVersions.length === 0;let working = appendComposerMessage(clearComposerFailure(composerSession), {@@ -1171,13 +1183,44 @@ async function sendComposerTurn() {}}-function renderImageInputStatus() {- const profile = composerSession.imageReferenceMode === "prompt_only" ? composerSession.aiProfile : activeComposerProfile();- const service = selectedComposerService(profile, composerAiSettings, composerVisionSettings);- const state = composerImageInputAvailability(composerSession, service);- elements.composerImageInputStatus.hidden = state.available;- elements.composerImageInputMessage.textContent = state.available ? "" : t("当前模型无法读取参考原图,请切换支持看图的模型。");- return state;+function positionComposerInputMenu(menu) {+ const panel = menu.querySelector(".composer-toolbar-panel");+ const anchor = menu.querySelector("summary").getBoundingClientRect();+ const style = getComputedStyle(menu);+ const inset = Number.parseFloat(style.getPropertyValue("--ui-popover-viewport-inset"));+ const gap = Number.parseFloat(style.getPropertyValue("--ui-popover-gap"));+ const width = Number.parseFloat(getComputedStyle(panel).width);+ const right = Math.min(document.documentElement.clientWidth, elements.composerShell.getBoundingClientRect().right);+ panel.style.left = `${Math.max(inset, Math.min(anchor.left, right - width - inset))}px`;+ panel.style.bottom = `${innerHeight - anchor.top + gap}px`;+ panel.style.maxHeight = `${Math.max(0, anchor.top - gap - inset)}px`;+}++function renderReferenceInputs() {+ const direction = composerSession.targetType === "video" ? "video" : "image";+ elements.composerDirectionIcon.setAttribute("href", `assets/ui-icons.svg#icon-${direction}`);+ const directionTitle = t("创作方向:{type}。影响提示词和可选参考,不会直接生成成品。", { type: t(direction === "video" ? "视频" : "图片") });+ elements.composerDirectionTrigger.title = directionTitle;+ elements.composerDirectionTrigger.setAttribute("aria-label", directionTitle);+ document.querySelectorAll('input[name="composer-type"]').forEach(input => { input.disabled = Boolean(activeOperation); });+ const hasImages = composerSession.referenceSnapshots.some(reference => reference.imageRefs?.length)+ || libraryRetrievalEnabled && entries.some(entry => entryMediaAssets(entry)+ .some(asset => asset.kind === "image" && asset.usage !== "poster"));+ const hasVideos = sessionHasVideoReferences(composerSession);+ elements.composerReferenceInputs.hidden = !hasImages && !hasVideos;+ if (elements.composerReferenceInputs.hidden) elements.composerReferenceInputs.open = false;+ elements.composerSendImagesField.hidden = !hasImages;+ elements.composerSendVideosField.hidden = !hasVideos;+ elements.composerSendImages.checked = composerSession.imageReferenceMode !== "text_only";+ elements.composerSendVideos.checked = composerSession.videoReferenceMode !== "text_only";+ elements.composerSendImages.disabled = elements.composerSendVideos.disabled = Boolean(activeOperation);+ const images = hasImages && elements.composerSendImages.checked;+ const videos = hasVideos && elements.composerSendVideos.checked;+ const referenceTitle = images && videos ? t("参考输入:文字+原图+原视频")+ : images ? t("参考输入:文字+原图") : videos ? t("参考输入:文字+原视频") : t("参考输入:仅文字");+ elements.composerReferenceInputsTrigger.title = referenceTitle;+ elements.composerReferenceInputsTrigger.setAttribute("aria-label", referenceTitle);+ elements.composerReferenceInputsTrigger.dataset.originals = String(images || videos);}async function retryComposerTurn() {@@ -1339,7 +1382,7 @@ async function runAgentExecution(operation, settingsValue, route, instruction) {let pendingImageIds = preparedImages.map(image => image.visualId);const toolRuntime = createLocalComposerLibraryTools({session: operation.session,- vision: composerLibraryToolService(operation.session, settingsValue.ai, settingsValue.vision).vision,+ vision: operation.session.imageReferenceMode !== "text_only",onEvent: async event => {operation.controller.signal.throwIfAborted();if (event.status === "completed" && event.imageIds) pendingImageIds.push(...event.imageIds);@@ -1691,7 +1734,7 @@ function renderGenerationModelChoices(selectedProfile) {button.setAttribute("role", "menuitemradio");button.setAttribute("aria-checked", String(candidate.serviceId === selectedProfile.serviceId && candidate.model === selectedProfile.model));const copy = document.createElement("span");- copy.append(rawTextEl("b", "", provider.label || provider.id), rawTextEl("small", "", candidate.model));+ copy.append(rawTextEl("b", "", translateUiMessage(provider.label || provider.id)), rawTextEl("small", "", candidate.model));button.append(copy, rawTextEl("span", "", "✓"));button.addEventListener("click", () => safely(() => updateComposerAiProfile(candidate))());return button;@@ -1738,17 +1781,13 @@ function renderImageGenerationSettings() {renderGenerationParameterField(elements.composerImageQualityField, elements.composerImageQuality, capability, secondaryKey, composerSession.generationParameters[secondaryKey], {fallbackLabel: "质量"});- const referenceMode = imageReferenceModeAvailability(composerSession.referenceSnapshots);elements.composerImageReferenceModeField.hidden = composerSession.outputMode !== "create_image"|| !composerSession.referenceSnapshots.some((item) => item.imageRefs?.length);elements.composerImageReferenceMode.value = composerSession.imageReferenceMode;- elements.composerImageReferenceMode.disabled = Boolean(activeOperation) || !referenceMode.canDisableImages;+ elements.composerImageReferenceMode.disabled = Boolean(activeOperation);}const messages = [...state.issues,- ...(!videoTask && !imageReferenceModeAvailability(composerSession.referenceSnapshots).canDisableImages- ? [`还有 ${imageReferenceModeAvailability(composerSession.referenceSnapshots).missingAssetIds.length} 张参考图既没有案例提示词,也没有有效分析文字,暂时必须带原图`]- : []),...(!videoTask && composerSession.referenceSnapshots.some((item) => item.imageRefs?.length)? [t("参考图画幅无需与输出画幅一致。")]: []),@@ -1761,15 +1800,20 @@ function renderImageGenerationSettings() {async function updateImageReferenceMode() {if (!composerSession || activeOperation || composerSession.outputMode !== "create_image") return;const mode = elements.composerImageReferenceMode.value;- const availability = imageReferenceModeAvailability(composerSession.referenceSnapshots);- if (mode !== "conditioned" && !availability.canDisableImages) {- renderImageGenerationSettings();- return composerFeedback(`还有 ${availability.missingAssetIds.length} 张参考图既没有案例提示词,也没有有效分析文字,不能关闭原图`, true);- }composerSession = await saveSession(createComposerSession({ ...composerSession, imageReferenceMode: mode }));renderComposer();}+async function updateReferenceInputs() {+ if (!composerSession || activeOperation) return;+ composerSession = await saveSession(createComposerSession({ ...composerSession,+ imageReferenceMode: elements.composerSendImages.checked+ ? (composerSession.imageReferenceMode === "prompt_only" ? "prompt_only" : "conditioned") : "text_only",+ videoReferenceMode: elements.composerSendVideos.checked ? "original" : "text_only"+ }));+ renderComposer();+}+function generationParameterKey(capability, preferredKeys) {return preferredKeys.find((key) => capability.parameters.some((item) => item.key === key)) ?? preferredKeys[0];}@@ -2621,7 +2665,8 @@ function freezeComposerAssemblySnapshot(session, {const profile = generationMode ? session.generationAiProfile : session.aiProfile;const service = selectedComposerService(profile, composerAiSettings, composerVisionSettings);const selectedImageCount = session.referenceSnapshots.reduce((total, reference) => total + reference.imageRefs.length, 0);- const canSendImages = service.vision === true && session.imageReferenceMode !== "text_only";+ const selectedVideoCount = session.referenceSnapshots.reduce((total, reference) => total + (reference.assetRefs || []).filter(asset => asset.kind === "video").length, 0);+ const canSendImages = session.imageReferenceMode !== "text_only";const expectedSentImageCount = canSendImages ? selectedImageCount : 0;const omittedImageCount = selectedImageCount - expectedSentImageCount;const taskMethod = session.routeMode === "auto"@@ -2664,6 +2709,9 @@ function freezeComposerAssemblySnapshot(session, {retrievedSources: session.retrievedSources,media: {imageReferenceMode: session.imageReferenceMode,+ videoReferenceMode: session.videoReferenceMode,+ selectedVideoCount,+ expectedSentVideoCount: session.videoReferenceMode === "text_only" ? 0 : selectedVideoCount,selectedImageCount,expectedSentImageCount,omittedImageCount,@@ -2701,6 +2749,7 @@ function openAssemblyDialog() {const snapshotSkills = snapshot?.skills.map((skill) => `${skill.order}. /${skill.callName} · ${skill.version}\n${skill.instructions}`).join("\n\n");const mediaSummary = snapshot ? [`手选图片 ${snapshot.media.selectedImageCount} 张;预计发送 ${snapshot.media.expectedSentImageCount} 张`,+ snapshot.media.selectedVideoCount ? `手选视频 ${snapshot.media.selectedVideoCount} 个;预计发送 ${snapshot.media.expectedSentVideoCount} 个` : "",snapshot.media.baseImageIncluded ? `编辑底图已发送${snapshot.media.maskIncluded ? ";局部遮罩已发送" : ""}` : "",snapshot.media.omittedImageCount ? `明确未发送 ${snapshot.media.omittedImageCount} 张:${snapshot.media.omittedReason}` : ""].filter(Boolean).join("\n") : "";@@ -3324,7 +3373,7 @@ function renderSendState() {const descriptions = composerSession.referenceSnapshots.filter((item) => item.referenceKind === "vision").length;const images = composerSession.referenceSnapshots.reduce((sum, item) => sum + item.imageRefs.length, 0);const usage = composerInputUsage(composerSession, elements.composerInstruction.value, composerSettings);- renderImageInputStatus();+ renderReferenceInputs();const toolState = composerSession.libraryTools;const requestLabel = toolState.requestCount ? `本轮已请求 ${toolState.requestCount} 次 · ${toolState.usage && toolState.usageRequestCount === toolState.requestCount ? `输入 ${toolState.usage.promptTokens} / 输出 ${toolState.usage.completionTokens} tokens` : "用量未知"}` : "按任务执行";const retrievalLabel = !libraryRetrievalEnabled ? " · 案例库:关闭" : composerLibraryToolService(composerSession, composerAiSettings, composerVisionSettings).nativeTools ? " · 案例库:按需" : " · 案例库:手动选择";@@ -3597,9 +3646,6 @@ function relativeTime(value) {}async function prepareSelectedReferenceImages(session) {- const profile = ["create_image", "create_video"].includes(session?.outputMode) ? session?.generationAiProfile : session?.aiProfile;- const service = selectedComposerService(profile, composerAiSettings, composerVisionSettings);- if (!service.vision) return [];const temporaryAssetIds = new Set((session?.referenceSnapshots ?? []).filter((reference) => reference.sourceType === TEMP_REFERENCE_SOURCE_TYPES.temporary).flatMap((reference) => reference.assetRefs ?? [])diff --git a/extension/composer-service.js b/extension/composer-service.jsindex dc7095a..0981944 100644--- a/extension/composer-service.js+++ b/extension/composer-service.js@@ -1,5 +1,6 @@import { applyComposerConversation } from './composer-conversation.js';import { runComposerToolLoop } from "./composer-tool-loop.js";+import { readEventStream } from "./event-stream.js";import {DEEPSEEK_ENDPOINT,deepSeekErrorDetails,@@ -215,12 +216,6 @@ export function composerLibraryToolService(session, aiSettings, visionSettings)return service;}-export function composerImageInputAvailability(session, service) {- const imageCount = session?.imageReferenceMode === "text_only" ? 0- : (session?.referenceSnapshots ?? []).reduce((count, reference) => count + (reference.imageRefs?.length ?? 0), 0);- return { available: imageCount === 0 || service?.vision === true, imageCount };-}-export function composerServiceCapabilities(profileValue, visionSettingsValue = {}) {const profile = normalizeComposerAiProfile(profileValue);if (profile.serviceId === "unassigned") return { serviceId: "unassigned", model: "", image: null, video: null };@@ -569,11 +564,6 @@ export async function planComposerTurnWithService(input, settingsValue, options}export async function executeComposerTurnWithService(input, settingsValue, preparedImages = [], options = {}) {- if ((input.session?.referenceSnapshots ?? []).some((reference) =>- (reference.assetRefs ?? []).some((asset) => asset.kind === "video"))) {- const selected = selectedComposerService(input.session.aiProfile, settingsValue.ai, settingsValue.vision);- if (!selected.videoInput) throw new ComposerServiceError(`${selected.label} 的所选模型未声明视频输入能力,请切换视频模型`, 422, { retryable: false });- }const planningProfile = normalizeComposerAiProfile(input.session?.aiProfile);const toolService = composerLibraryToolService(input.session, settingsValue.ai, settingsValue.vision);if (!toolService.nativeTools || !options.toolRuntime?.specs.length) options = { ...options, toolRuntime: undefined };@@ -597,11 +587,10 @@ export async function executeComposerTurnWithService(input, settingsValue, prepa? normalizeComposerAiProfile(input.session?.generationAiProfile): planningProfile;const selected = selectedComposerService(generationMode && input.session?.imageReferenceMode !== "prompt_only" ? executionProfile : planningProfile, settingsValue.ai, settingsValue.vision);- if (!composerImageInputAvailability(input.session, selected).available) {- throw new ComposerServiceError(`${selected.label} 无法读取参考原图,请切换支持看图的模型`, 422, { retryable: false });- }- if (!generationMode && !selected.vision && usesProjectedDeepseekSettings(executionProfile, settingsValue.ai)) {- assertTextReferencesAvailable(input.session);+ const sendsOriginals = referenceImageCount(input.session) > 0+ || (input.session?.videoReferenceMode !== "text_only" && (input.session?.referenceSnapshots ?? [])+ .some(reference => reference.assetRefs?.some(asset => asset.kind === "video")));+ if (!generationMode && !selected.vision && !sendsOriginals && usesProjectedDeepseekSettings(executionProfile, settingsValue.ai)) {return executeDeepSeekTurn(input, settingsValue.ai, options);}const visionRuntime = { ...settingsValue.vision };@@ -949,9 +938,6 @@ function normalizeRemoteVideo(value, expectedServiceId = "") {async function executeVisualTextTurn(input, service, preparedImages, options) {assertComposerInputBudget(input.session, input.userMessage, input.composerSettings);- if ((options.preparedVideos ?? []).length && service.videoInput !== true) {- throw new ComposerServiceError(`${service.label} 的所选模型未声明视频输入能力,请切换视频模型`, 422, { retryable: false });- }const request = executionRequest(input);const route = request.route;const automatic = route === "auto";@@ -1062,7 +1048,7 @@ async function generateImageTurn(input, service, preparedImages, options) {const requestState = normalizeImageGenerationRequest(input.session?.generationAiProfile, options.visionSettings ?? {}, input.session?.generationParameters);if (requestState.issues.length) throw new ComposerServiceError(requestState.issues.join(";"), 422, { retryable: false });const requestParameters = requestState.parameters;- const baseContent = multimodalContent(input.session, request, preparedImages, service.protocol);+ const baseContent = multimodalContent(input.session, request, preparedImages, service.protocol, options.preparedVideos);const content = imageEdit ? imageEditContent(baseContent, imageEdit, service.protocol) : baseContent;if (service.imageGeneration.protocol === "gemini_interactions") {return generateGeminiImageTurn(input, service, request, content, referenceMode, imageEdit, requestParameters, preparedImages, options);@@ -1155,8 +1141,8 @@ async function generateGeminiImageTurn(input, service, request, conditionedContereferenceLimit: { actual: imageBlocks.length, maximum }});}- const interactionInput = imageBlocks.length- ? content.map((item) => item.type === "image" ? geminiImageInput(item.dataUrl) : { type: "text", text: item.text })+ const interactionInput = content.some(item => ["image", "video"].includes(item.type))+ ? content.map((item) => ["image", "video"].includes(item.type) ? geminiMediaInput(item) : { type: "text", text: item.text }): finalPrompt;const responseFormat = { type: "image" };if (requestParameters.aspectRatio) responseFormat.aspect_ratio = requestParameters.aspectRatio;@@ -1198,10 +1184,10 @@ async function generateGeminiImageTurn(input, service, request, conditionedConte};}-function geminiImageInput(dataUrl) {- const match = String(dataUrl ?? "").match(/^data:(image\/(?:png|jpeg|webp));base64,([A-Za-z0-9+/=]+)$/i);- if (!match) throw new ComposerServiceError("Gemini 参考图数据无效,本次没有发送不完整参考", 422, { retryable: false });- return { type: "image", mime_type: match[1].toLocaleLowerCase("en-US"), data: match[2] };+function geminiMediaInput(item) {+ const match = String(item.dataUrl ?? "").match(/^data:((?:image|video)\/[a-z0-9.+-]+);base64,([A-Za-z0-9+/=]+)$/i);+ if (!match || !match[1].startsWith(`${item.type}/`)) throw new ComposerServiceError("Gemini 参考原件数据无效,本次没有发送不完整参考", 422, { retryable: false });+ return { type: item.type, mime_type: match[1].toLocaleLowerCase("en-US"), data: match[2] };}function geminiInteractionImages(payload) {@@ -1279,15 +1265,9 @@ async function assembleImagePrompt(input, preparedImages, options) {...input,session: { ...input.session, outputMode: "text_prompt" }};- const profile = normalizeComposerAiProfile(input.session?.aiProfile);- if (usesProjectedDeepseekSettings(profile, options.aiSettings)) {- assertTextReferencesAvailable(input.session);- const result = await executeDeepSeekTurn(promptInput, options.aiSettings, { ...options, stream: false });- if (result.kind !== "prompt") throw new ComposerServiceError("图片任务没有生成可提交的最终提示词", 422, { retryable: false });- return result;- }- const service = requireVisualService(profile, options.visionSettings, "整理生图提示词");- const result = await executeVisualTextTurn(promptInput, service, preparedImages, { ...options, stream: false });+ const result = await executeComposerTurnWithService(promptInput, {+ ai: options.aiSettings, vision: options.visionSettings+ }, preparedImages, { ...options, stream: false });if (result.kind !== "prompt") throw new ComposerServiceError("图片任务没有生成可提交的最终提示词", 422, { retryable: false });return result;}@@ -1319,11 +1299,11 @@ function multimodalContent(session, request, preparedImages, protocol, preparedVconst videos = new Map((Array.isArray(preparedVideos) ? preparedVideos : []).map((item) => [item.assetId, item]));for (const reference of session?.referenceSnapshots ?? []) {if (reference.referenceKind === "video_sources") {+ if (session?.videoReferenceMode === "text_only") continue;content.push({ type: "text", text: `${reference.alias}\n[本地视频参考]` });for (const [index, assetRef] of (reference.assetRefs ?? []).filter((item) => item.kind === "video").entries()) {const video = videos.get(assetRef.assetId);if (!video?.dataUrl) throw new ComposerServiceError(`${reference.alias}/视频${index + 1} 读取失败,本次没有发送不完整参考`, 422, { retryable: true });- if (protocol === "responses") throw new ComposerServiceError("当前所选模型接口尚未声明视频输入,请切换视频模型", 422, { retryable: false });content.push({ type: "text", text: `${reference.alias}/视频${index + 1}` });content.push({ type: "video", dataUrl: video.dataUrl, mimeType: video.mimeType });}@@ -1545,6 +1525,7 @@ function responsesBody(service, instructions, content, stream) {instructions,input: [{ role: "user", content: content.map((item) => item.type === "image"? { type: "input_image", ...(item.fileId ? { file_id: item.fileId } : { image_url: item.dataUrl }), detail: item.detail }+ : item.type === "video" ? { type: "input_video", video_url: item.dataUrl }: { type: "input_text", text: item.text }) }],...(service.reasoningEffort ? { reasoning: { effort: service.reasoningEffort } } : {})};@@ -1771,13 +1752,6 @@ function requireVisualService(profileValue, visionSettingsValue, action) {};}-function assertTextReferencesAvailable(session) {- const unavailable = (session?.referenceSnapshots ?? []).filter((item) => !String(item.referenceText ?? "").trim() && item.imageRefs?.length);- if (unavailable.length) {- throw new ComposerServiceError(`${unavailable.map((item) => item.alias).join("、")} 只有原图,DeepSeek 无法读取;请切换 OpenAI、米醋或兼容视觉服务`, 422, { retryable: false });- }-}-function compatibleConfigured(vision) {const provider = vision.compatible;return Boolean(vision.consent && provider.endpoint && provider.model && (provider.apiKey || isLoopback(provider.endpoint)));@@ -1979,6 +1953,7 @@ function compatibleReasoningSupported(provider = {}) {}function referenceImageCount(session) {+ if (session?.imageReferenceMode === "text_only") return 0;return (session?.referenceSnapshots ?? []).reduce((total, item) => total + (item.imageRefs?.length || 0), 0);}@@ -2170,50 +2145,21 @@ async function readChatSse(response, service, onDelta = () => undefined, signal)async function readSse(response, applyEvent, service, signal) {if (!response?.body?.getReader) throw new ComposerServiceError(`${service.label} 没有返回流式内容`, 503);- const reader = response.body.getReader();- const onAbort = () => { void reader.cancel(signal.reason).catch(() => undefined); };- signal?.addEventListener("abort", onAbort, { once: true });- const decoder = new TextDecoder();const state = { content: "", usage: emptyUsage(), model: service.model, finishReason: "" };- let buffer = "";- let ended = false;let receivedDone = false;- const consumeLine = (line) => {- if (!line.startsWith("data:")) return;- const data = line.slice(5).trim();- if (!data) return;- if (data === "[DONE]") { receivedDone = true; return; }+ for await (const data of readEventStream(response, { signal })) {+ if (!data.trim()) continue;+ if (data === "[DONE]") { receivedDone = true; continue; }let event;try { event = JSON.parse(data); }catch { throw new ComposerServiceError(`${service.label} 流式内容不完整,已保留收到的内容,请明确重试`, 502); }applyEvent(event, state);- };- try {- while (true) {- signal?.throwIfAborted();- const { done, value } = await reader.read();- signal?.throwIfAborted();- if (done) {- ended = true;- buffer += decoder.decode();- if (buffer) consumeLine(buffer);- break;- }- buffer += decoder.decode(value, { stream: true });- const lines = buffer.split(/\r?\n/);- buffer = lines.pop() ?? "";- for (const line of lines) consumeLine(line);- }- assertTextCompletion(state.finishReason, service);- if ((!state.finishReason && !receivedDone) || !state.content.trim()) {- throw new ComposerServiceError(`${service.label} 没有返回完整内容,已保留收到的内容,请明确重试`, 503);- }- return state;- } finally {- signal?.removeEventListener("abort", onAbort);- if (!ended) await reader.cancel().catch(() => undefined);- reader.releaseLock();}+ assertTextCompletion(state.finishReason, service);+ if ((!state.finishReason && !receivedDone) || !state.content.trim()) {+ throw new ComposerServiceError(`${service.label} 没有返回完整内容,已保留收到的内容,请明确重试`, 503);+ }+ return state;}function assertTextCompletion(reason, service, error) {diff --git a/extension/composer-source-text.js b/extension/composer-source-text.jsindex 699b4b5..f94d12f 100644--- a/extension/composer-source-text.js+++ b/extension/composer-source-text.js@@ -1,5 +1,5 @@import { entryMediaAssets } from "./media.js";-import { detailPromptSources } from "./prompt-sources.js";+import { detailPromptSources, originalMediaPrompts } from "./prompt-sources.js";// Only reusable content belongs in a model reference; source metadata stays local.export function composerSourceText(entry = {}, documentTextByEntryId) {@@ -8,7 +8,7 @@ export function composerSourceText(entry = {}, documentTextByEntryId) {const values = [entry.text,documentTextByEntryId?.get?.(entry.id),- ...(entry.mediaPrompts ?? []).filter(item => item.source !== "ai-suggestion").map(item => item.text),+ ...originalMediaPrompts(entry).map(item => item.text),...assets.map(asset => composerAssetAnalysisText(entry, asset)),...(entry.timeNotes ?? []).map(note => {const text = String(note.text ?? "").trim();diff --git a/extension/composer-tool-draft-ui.js b/extension/composer-tool-draft-ui.jsindex 31c84a2..fa59310 100644--- a/extension/composer-tool-draft-ui.js+++ b/extension/composer-tool-draft-ui.js@@ -6,8 +6,9 @@ export function createToolDraftCard(event,{sessionId,onSaved,busy=false}) {card.append(node('p','',draft.kind==='skill'?draft.description:draft.tags.join('、')));if(draft.savedId) {const link=node('a','button-secondary',draft.kind==='skill'?'在 Skill 中心查看':'查看案例');- link.href=draft.kind==='skill'?`skills.html?view=detail&skill=${encodeURIComponent(draft.savedId)}`:`library.html?case=${encodeURIComponent(draft.savedId)}`;- link.target='_blank'; card.append(link);+ link.href=draft.kind==='skill'?`skills.html?source=composer&session=${encodeURIComponent(sessionId)}&view=detail&skill=${encodeURIComponent(draft.savedId)}`:`library.html?case=${encodeURIComponent(draft.savedId)}`;+ if(draft.kind!=='skill') link.target='_blank';+ card.append(link);} else {const button=node('button','button-secondary','查看并保存');button.type='button'; button.disabled=busy;diff --git a/extension/composer-tool-loop.js b/extension/composer-tool-loop.jsindex 70ef7f6..8f3ac5f 100644--- a/extension/composer-tool-loop.js+++ b/extension/composer-tool-loop.js@@ -1,4 +1,6 @@// Provider-native tool messages stay inside a turn. UI records contain no image bytes or provider secrets.+import { readEventStream } from "./event-stream.js";+export async function runComposerToolLoop({ body, protocol, request, runtime, signal, onDelta = () => {}, maxCharacters, allowImageOutput = false }) {const current = structuredClone(body);const specs = runtime.specs;@@ -93,16 +95,12 @@ export async function readToolResponse(response, protocol, onDelta = () => {}, sif (!String(response.headers.get("content-type") ?? "").includes("text/event-stream")) {return normalizeResponse(await response.json(), protocol, onDelta);}- const reader = response.body.getReader();- const decoder = new TextDecoder();- let buffer = "";let text = "";let terminal = false;let payload = protocol === "responses" ? { output: [] } : { choices: [{ message: { role: "assistant", content: "", tool_calls: [] } }] };const items = new Map();- const consume = block => {- const data = block.split(/\r?\n/).filter(line => line.startsWith("data:")).map(line => line.slice(5).trimStart()).join("\n");- if (!data || data === "[DONE]") return;+ for await (const data of readEventStream(response, { signal })) {+ if (!data.trim() || data === "[DONE]") continue;const event = JSON.parse(data);if (event.error || ["error", "response.failed", "response.incomplete"].includes(event.type)) throw new Error("工具调用连接失败或输出不完整,已停止本轮");if (protocol === "responses") {@@ -136,30 +134,9 @@ export async function readToolResponse(response, protocol, onDelta = () => {}, sif (event.usage) payload.usage = event.usage;if (event.model) payload.model = event.model;}- };- const onAbort = () => { void reader.cancel().catch(() => {}); };- signal?.addEventListener("abort", onAbort, { once: true });- try {- for (;;) {- signal?.throwIfAborted();- const result = await reader.read();- buffer += decoder.decode(result.value ?? new Uint8Array(), { stream: !result.done });- const blocks = buffer.split(/\r?\n\r?\n/);- buffer = blocks.pop() || "";- for (const block of blocks) consume(block);- if (result.done) break;- }- if (buffer.trim()) consume(buffer);- signal?.throwIfAborted();- if (!terminal) throw new Error("工具调用连接中断,未执行不完整调用");- return normalizeResponse(payload, protocol);- } catch (error) {- await reader.cancel().catch(() => undefined);- throw error;- } finally {- signal?.removeEventListener("abort", onAbort);- reader.releaseLock();}+ if (!terminal) throw new Error("工具调用连接中断,未执行不完整调用");+ return normalizeResponse(payload, protocol);}function normalizeResponse(payload, protocol, onDelta) {diff --git a/extension/composer-video-references.js b/extension/composer-video-references.jsindex 1031d65..c7348c3 100644--- a/extension/composer-video-references.js+++ b/extension/composer-video-references.js@@ -13,6 +13,7 @@ export function sessionHasVideoReferences(session) {}export async function prepareComposerVideos(session, options = {}) {+ if (session?.videoReferenceMode === "text_only") return [];const loadVideo = options.loadVideo ?? getMediaBlob;const encode = options.encode ?? videoBlobDataUrl;const videos = [];diff --git a/extension/composer.html b/extension/composer.htmlindex fef6321..51602b8 100644--- a/extension/composer.html+++ b/extension/composer.html@@ -52,17 +52,32 @@</div><textarea id="composer-instruction" rows="2" disabled placeholder="生成提示词、分析资料、提炼方法,或直接讨论…" data-i18n-placeholder="生成提示词、分析资料、提炼方法,或直接讨论…"></textarea><div id="composer-skill-menu" class="composer-skill-menu" role="listbox" aria-label="选择创作 Skill" hidden data-i18n-aria-label="选择创作 Skill"></div>- <div id="composer-image-input-status" class="composer-image-input-status" role="status" hidden><span id="composer-image-input-message"></span><button id="composer-image-input-model" class="button-secondary" type="button" data-i18n="切换模型">切换模型</button></div><div class="composer-input-footer"><div class="composer-input-tools"><button id="composer-attachment-local" class="button-secondary icon-button composer-attachment-local" type="button" aria-label="添加本机文件" data-i18n-aria-label="添加本机文件" title="添加本机文件" data-i18n-title="添加本机文件"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-paperclip"></use></svg></button><input id="composer-attachment-files" class="sr-only" type="file" multiple /><button id="composer-library-search" class="button-secondary icon-button composer-library-search" type="button" aria-pressed="true" aria-label="案例库:按需;仅在你要求查询或参考时使用,点击关闭" data-i18n-aria-label="案例库:按需;仅在你要求查询或参考时使用,点击关闭" title="案例库:按需;仅在你要求查询或参考时使用,点击关闭" data-i18n-title="案例库:按需;仅在你要求查询或参考时使用,点击关闭"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-search"></use></svg></button>- <fieldset class="composer-type-switch" aria-label="生成类型" data-i18n-aria-label="生成类型">- <label><input type="radio" name="composer-type" value="image" checked /><span data-i18n="图片">图片</span></label>- <label><input type="radio" name="composer-type" value="video" /><span data-i18n="视频">视频</span></label>- </fieldset>+ <details id="composer-direction" class="composer-toolbar-menu">+ <summary id="composer-direction-trigger" class="button-secondary" aria-label="创作方向" data-i18n-aria-label="创作方向"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use id="composer-direction-icon" href="assets/ui-icons.svg#icon-image"></use></svg><svg class="ui-icon composer-menu-chevron" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-chevron-down"></use></svg></summary>+ <div class="composer-options-panel composer-toolbar-panel">+ <strong data-i18n="创作方向">创作方向</strong>+ <fieldset class="composer-type-switch" aria-label="创作方向" data-i18n-aria-label="创作方向">+ <label><input type="radio" name="composer-type" value="image" checked /><span><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-image"></use></svg><span data-i18n="图片创作">图片创作</span></span></label>+ <label><input type="radio" name="composer-type" value="video" /><span><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-video"></use></svg><span data-i18n="视频创作">视频创作</span></span></label>+ </fieldset>+ <p data-i18n="影响提示词和可选参考,不会直接生成成品。">影响提示词和可选参考,不会直接生成成品。</p>+ </div>+ </details><button id="composer-reference-open" class="button-secondary composer-reference-trigger" type="button"><span data-i18n="参考">参考</span><strong id="composer-reference-count">0</strong></button>+ <details id="composer-reference-inputs" class="composer-toolbar-menu" hidden>+ <summary id="composer-reference-inputs-trigger" class="button-secondary" aria-label="本轮参考输入" data-i18n-aria-label="本轮参考输入"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-list-checks"></use></svg><svg class="ui-icon composer-menu-chevron" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-chevron-down"></use></svg></summary>+ <div class="composer-options-panel composer-toolbar-panel">+ <strong data-i18n="本轮参考输入">本轮参考输入</strong>+ <label class="composer-reference-input-choice"><input type="checkbox" checked disabled /><span data-i18n="提示词与已有分析文字">提示词与已有分析文字</span></label>+ <label id="composer-send-images-field" class="composer-reference-input-choice"><input id="composer-send-images" type="checkbox" /><span data-i18n="同时发送原图">同时发送原图</span></label>+ <label id="composer-send-videos-field" class="composer-reference-input-choice"><input id="composer-send-videos" type="checkbox" /><span data-i18n="同时发送原视频">同时发送原视频</span></label>+ </div>+ </details><details id="composer-options" class="composer-options"><summary class="button-secondary" aria-label="创作设置" data-i18n-aria-label="创作设置"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-settings"></use></svg></summary><div class="composer-options-panel">@@ -96,7 +111,7 @@<button id="composer-model-compatible" type="button" role="menuitemradio" aria-checked="false"><span><b id="composer-model-compatible-label" data-i18n="兼容视觉服务">兼容视觉服务</b><small data-i18n="读取手选原图与对应提示词">读取手选原图与对应提示词</small></span><span aria-hidden="true">✓</span></button><button id="composer-model-xai" type="button" role="menuitemradio" aria-checked="false"><span><b id="composer-model-xai-label">xAI</b><small data-i18n="使用已配置的 xAI 文字与图片能力">使用已配置的 xAI 文字与图片能力</small></span><span aria-hidden="true">✓</span></button><div id="composer-model-dynamic" class="composer-model-dynamic" hidden></div>- <p data-i18n="多模态服务会在本轮实际请求中读取手选内容图;纯文字服务只读取案例文字或分析。">多模态服务会在本轮实际请求中读取手选内容图;纯文字服务只读取案例文字或分析。</p>+ <p data-i18n="原图和视频是否发送由参考选项决定;模型识别结果以服务实际返回为准。">原图和视频是否发送由参考选项决定;模型识别结果以服务实际返回为准。</p></div></div><button id="composer-action" class="composer-action" type="button" disabled aria-label="发送" data-i18n-aria-label="发送"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-send"></use></svg></button>diff --git a/extension/composer.js b/extension/composer.jsindex 64b90e7..0bb0b50 100644--- a/extension/composer.js+++ b/extension/composer.js@@ -4,11 +4,6 @@ import { normalizeAppliedSkillSnapshots } from "./creative-skills.js";import { currentVideoReconstruction, entryMediaAssets } from "./media.js";import { TEMP_REFERENCE_SOURCE_TYPES } from "./temp-references.js";import { normalizeLocalRelativePath } from "./local-media.js";-import {- hasCompleteReferenceAnalysis,- referenceHasPromptText,- referenceHasUsableLegacyDescription-} from "./reference-readiness.js";import { detailPromptSources } from "./prompt-sources.js";import { composerAssetAnalysisText, composerSourceText, formatReferenceTime } from "./composer-source-text.js";import { AI_PROVIDER_PRESETS } from "./ai-provider-presets.js";@@ -438,7 +433,6 @@ export function createComposerSession(input = {}) {const targetType = input.targetType === "video" ? "video" : "image";const snapshots = normalizeReferenceSnapshots(input.referenceSnapshots);const assemblySnapshots = normalizeComposerAssemblySnapshots(input.assemblySnapshots, input.assemblySnapshot);- const referenceModeAvailability = imageReferenceModeAvailability(snapshots);const requestedReferenceMode = ["conditioned", "prompt_only", "text_only"].includes(input.imageReferenceMode)? input.imageReferenceMode: "conditioned";@@ -455,9 +449,8 @@ export function createComposerSession(input = {}) {? "create_image": input.outputMode === "create_video" && targetType === "video" ? "create_video" : "text_prompt",generationParameters: normalizeGenerationParameters(input.generationParameters, targetType),- imageReferenceMode: requestedReferenceMode === "conditioned" || referenceModeAvailability.canDisableImages- ? requestedReferenceMode- : "conditioned",+ imageReferenceMode: requestedReferenceMode,+ videoReferenceMode: input.videoReferenceMode === "text_only" ? "text_only" : "original",productionReviewEnabled: input.productionReviewEnabled !== false,libraryRetrievalEnabled: input.libraryRetrievalEnabled !== false,libraryTools: normalizeLibraryToolState(input.libraryTools),@@ -590,6 +583,9 @@ function normalizeComposerAssemblySnapshot(value) {imageReferenceMode: ["conditioned", "prompt_only", "text_only"].includes(value.media?.imageReferenceMode)? value.media.imageReferenceMode: "conditioned",+ videoReferenceMode: value.media?.videoReferenceMode === "text_only" ? "text_only" : "original",+ selectedVideoCount: Math.max(0, Math.floor(Number(value.media?.selectedVideoCount) || 0)),+ expectedSentVideoCount: Math.max(0, Math.floor(Number(value.media?.expectedSentVideoCount) || 0)),selectedImageCount: Math.max(0, Math.floor(Number(value.media?.selectedImageCount) || 0)),expectedSentImageCount: Math.max(0, Math.floor(Number(value.media?.expectedSentImageCount) || 0)),omittedImageCount: Math.max(0, Math.floor(Number(value.media?.omittedImageCount) || 0)),@@ -644,22 +640,6 @@ function normalizeRetrievalSnapshot(value) {};}-export function imageReferenceModeAvailability(referenceSnapshots = []) {- const missingAssetIds = [];- for (const reference of Array.isArray(referenceSnapshots) ? referenceSnapshots : []) {- const promptBacked = referenceHasPromptText(reference);- const assets = new Map((Array.isArray(reference?.assets) ? reference.assets : []).map((item) => [item.assetId, item]));- for (const imageRef of Array.isArray(reference?.imageRefs) ? reference.imageRefs : []) {- if (promptBacked) continue;- const assetId = String(imageRef?.visualId ?? "").trim();- const asset = assets.get(assetId);- if (referenceHasUsableLegacyDescription(reference, asset) || hasCompleteReferenceAnalysis(asset)) continue;- if (assetId && !missingAssetIds.includes(assetId)) missingAssetIds.push(assetId);- }- }- return { canDisableImages: missingAssetIds.length === 0, missingAssetIds };-}-export function normalizeGenerationParameters(value = {}, targetType = "image") {const source = value && typeof value === "object" ? value : {};if (targetType === "video") {diff --git a/extension/creative-job-runner.js b/extension/creative-job-runner.jsindex d826900..ed0116b 100644--- a/extension/creative-job-runner.js+++ b/extension/creative-job-runner.js@@ -10,8 +10,7 @@ import {import {ComposerServiceError,executeComposerTurnWithService,- selectedComposerService,- composerLibraryToolService+ selectedComposerService} from "./composer-service.js";import { applyComposerServiceResult } from "./composer-turn-core.js";import { normalizeAiSettings } from "./deepseek.js";@@ -42,7 +41,6 @@ export async function runCreativeJob(job, context = {}) {const videoDialogue = sessionHasVideoReferences(session) && !["create_image", "create_video"].includes(session.outputMode);if (videoDialogue) {const service = selectedComposerService(session.aiProfile, settings.ai, settings.vision);- if (!service.videoInput) throw new ComposerServiceError(`${service.label} 的所选模型未声明视频输入能力,请切换视频模型`, 422, { retryable: false });session = createComposerSession({ ...session, activeTurn: createComposerActiveTurn({turnId: job.id,userMessageId: job.userMessageId,@@ -78,7 +76,7 @@ export async function runCreativeJob(job, context = {}) {const executionSession = createComposerSession(session);recordStage("preparing_media");await context.progress({ phase: "generation", session, actualStages: [...actualStages] });- const preparedImages = session.imageReferenceMode === "text_only" ? [] : await prepareReferenceImages(executionSession, settings);+ const preparedImages = session.imageReferenceMode === "text_only" ? [] : await prepareReferenceImages(executionSession);const preparedVideos = await prepareComposerVideos(executionSession, { signal });const imageEdit = await prepareImageEdit(job.request.imageEdit);recordStage("media_prepared");@@ -110,7 +108,7 @@ export async function runCreativeJob(job, context = {}) {}};const toolRuntime = createLocalComposerLibraryTools({- session, vision: composerLibraryToolService(session, settings.ai, settings.vision).vision,+ session, vision: session.imageReferenceMode !== "text_only",onEvent: async event => {signal?.throwIfAborted();if (event.status === "completed" && event.imageIds) pendingImageIds.push(...event.imageIds);@@ -311,12 +309,7 @@ function readGeneratedVideoMedia(blob, _mimeType, videoAssetId) {});}-async function prepareReferenceImages(session, settings) {- const profile = ["create_image", "create_video"].includes(session.outputMode)- ? session.generationAiProfile- : session.aiProfile;- const service = selectedComposerService(profile, settings.ai, settings.vision);- if (!service.vision) return [];+async function prepareReferenceImages(session) {const refs = [...new Map(session.referenceSnapshots.flatMap((reference) => reference.imageRefs).map((item) => [item.visualId, item])).values()];diff --git a/extension/deepseek.js b/extension/deepseek.jsindex b0838fd..19c464f 100644--- a/extension/deepseek.js+++ b/extension/deepseek.js@@ -1,7 +1,9 @@import { applyComposerConversation } from './composer-conversation.js';import { runComposerToolLoop } from "./composer-tool-loop.js";+import { readEventStream } from "./event-stream.js";import {analysisTaxonomyPayload,+ DETAIL_ORGANIZATION_OUTPUT_TOKENS,validateAnalysisTagResponse,validateDetailOrganizationResponse} from "./tag-taxonomy.js";@@ -298,7 +300,7 @@ export async function organizeDetailTagsWithDeepSeek(chunk, settingsValue, fetchmodel: settings.analysisModel,thinking: { type: "disabled" },temperature: 0,- max_tokens: 4000,+ max_tokens: DETAIL_ORGANIZATION_OUTPUT_TOKENS,messages: [{role: "system",@@ -307,6 +309,7 @@ export async function organizeDetailTagsWithDeepSeek(chunk, settingsValue, fetch{ role: "user", content: JSON.stringify(chunk) }]}, settings), settings, { fetchImpl, timeoutMessage: "AI 整理超时,正式标签库没有改变" });+ if (result.finishReason === "length") throw new DeepSeekApiError("AI 整理输出被截断,正式标签库没有改变", 422);const parsed = parseJsonObject(result.content, "AI 整理结果格式无效,正式标签库没有改变");return {mappings: validateDetailOrganizationResponse(parsed, chunk),@@ -539,24 +542,19 @@ async function readComposerResponse(body, settings, options, signal) {request: nextBody => fetchDeepSeekStream(nextBody, settings, options.fetchImpl ?? fetch, signal, options.onRequestStart) });}const response = await fetchDeepSeekStream(body, settings, options.fetchImpl ?? fetch, signal, options.onRequestStart);- return readDeepSeekSse(response, options.onDelta, provider.label, provider.apiKey);+ return readDeepSeekSse(response, options.onDelta, provider.label, provider.apiKey, signal);}-export async function readDeepSeekSse(response, onDelta = () => undefined, providerLabel = "DeepSeek", apiKey = "") {+export async function readDeepSeekSse(response, onDelta = () => undefined, providerLabel = "DeepSeek", apiKey = "", signal) {if (!response?.body?.getReader) throw new DeepSeekApiError(`${providerLabel} 没有返回流式内容`, 503);- const reader = response.body.getReader();- const decoder = new TextDecoder();- let buffer = "";let content = "";let usage = normalizeUsage();let model = "";let finishReason = "";let done = false;- const consume = (block) => {- const data = block.split(/\r?\n/).filter((line) => line.startsWith("data:"))- .map((line) => line.slice(5).trimStart()).join("\n").trim();- if (!data) return;- if (data === "[DONE]") { done = true; return; }+ for await (const data of readEventStream(response, { signal })) {+ if (!data.trim()) continue;+ if (data === "[DONE]") { done = true; continue; }let event;try { event = JSON.parse(data); } catch { throw new DeepSeekApiError(`${providerLabel} 流式结果格式错误,本次结果未保存`, 422); }if (event?.error) throw new DeepSeekApiError(`${providerLabel} 流式生成失败:${redactSecret(String(event.error.message ?? "服务返回错误"), apiKey)}`, Number(event.error.status) || 503);@@ -569,19 +567,6 @@ export async function readDeepSeekSse(response, onDelta = () => undefined, provionDelta(delta, content);}if (choice?.finish_reason) finishReason = String(choice.finish_reason);- };- try {- for (;;) {- const { value, done: readerDone } = await reader.read();- buffer += decoder.decode(value ?? new Uint8Array(), { stream: !readerDone });- const blocks = buffer.split(/\r?\n\r?\n/);- buffer = blocks.pop() ?? "";- for (const block of blocks) consume(block);- if (readerDone) break;- }- if (buffer.trim()) consume(buffer);- } finally {- reader.releaseLock?.();}if (finishReason === "length") throw new DeepSeekApiError(`${providerLabel} 输出被截断,本次结果未保存`, 422);if (finishReason === "content_filter") throw new DeepSeekApiError(`${providerLabel} 未能返回此内容,本次结果未保存`, 422);diff --git a/extension/detail-split.js b/extension/detail-split.jsnew file mode 100644index 0000000..6579242--- /dev/null+++ b/extension/detail-split.js@@ -0,0 +1,67 @@+// The existing narrow text panel is 340px; keep both panes usable while dragging.+const MIN_PANEL_WIDTH = 340;+const KEYBOARD_STEP = 16;++export function attachDetailSplit(primary, { label, readRatio, saveRatio }) {+ const separator = document.createElement("div");+ separator.className = "detail-split-resizer";+ separator.tabIndex = 0;+ separator.setAttribute("role", "separator");+ separator.setAttribute("aria-label", label);+ separator.setAttribute("aria-orientation", "vertical");+ primary.append(separator);+ let ratio = readRatio();+ let pointer = null;+ let startX = 0;+ let startWidth = 0;+ function bounds() {+ const total = primary.clientWidth;+ const min = Math.min(MIN_PANEL_WIDTH, total / 2);+ return { total, min, max: total - min };+ }+ function apply(width) {+ const { total, min, max } = bounds();+ if (!total) return;+ const value = Math.min(max, Math.max(min, width));+ primary.style.setProperty("--detail-panel-width", `${value}px`);+ separator.setAttribute("aria-valuemin", String(Math.round(min)));+ separator.setAttribute("aria-valuemax", String(Math.round(max)));+ separator.setAttribute("aria-valuenow", String(Math.round(value)));+ return value / total;+ }+ const body = primary.querySelector(":scope > .detail-body");+ const observer = new ResizeObserver(() => {+ if (!separator.getClientRects().length) return;+ apply(ratio == null ? body.getBoundingClientRect().width : primary.clientWidth * ratio);+ });+ observer.observe(primary);+ separator.addEventListener("pointerdown", event => {+ if (event.button !== 0) return;+ event.preventDefault();+ pointer = event.pointerId;+ startX = event.clientX;+ startWidth = body.getBoundingClientRect().width;+ separator.setPointerCapture(pointer);+ separator.classList.add("is-resizing");+ });+ separator.addEventListener("pointermove", event => {+ if (pointer !== event.pointerId) return;+ ratio = apply(startWidth + startX - event.clientX);+ });+ const finish = async event => {+ if (pointer !== event.pointerId) return;+ pointer = null;+ separator.classList.remove("is-resizing");+ if (separator.hasPointerCapture(event.pointerId)) separator.releasePointerCapture(event.pointerId);+ if (ratio != null) await saveRatio(ratio);+ };+ separator.addEventListener("pointerup", finish);+ separator.addEventListener("pointercancel", finish);+ separator.addEventListener("keydown", async event => {+ if (!["ArrowLeft", "ArrowRight"].includes(event.key)) return;+ event.preventDefault();+ ratio = apply(body.getBoundingClientRect().width + (event.key === "ArrowLeft" ? KEYBOARD_STEP : -KEYBOARD_STEP));+ await saveRatio(ratio);+ });+ return () => { observer.disconnect(); separator.remove(); };+}diff --git a/extension/event-stream.js b/extension/event-stream.jsnew file mode 100644index 0000000..77836f7--- /dev/null+++ b/extension/event-stream.js@@ -0,0 +1,56 @@+// SSE framing is shared; each caller owns its model completion and tool rules.+// https://html.spec.whatwg.org/multipage/server-sent-events.html#parsing-an-event-stream+export async function* readEventStream(response, { signal } = {}) {+ signal?.throwIfAborted();+ const reader = response.body.getReader();+ const decoder = new TextDecoder();+ const abort = () => { void reader.cancel(signal.reason).catch(() => undefined); };+ signal?.addEventListener("abort", abort, { once: true });+ let buffer = "";+ let data = [];+ let skipLf = false;+ let ended = false;+ try {+ for (;;) {+ signal?.throwIfAborted();+ const { done, value } = await reader.read();+ signal?.throwIfAborted();+ ended = done;+ let chunk = decoder.decode(value, { stream: !done });+ if (skipLf && chunk.length) {+ if (chunk.startsWith("\n")) chunk = chunk.slice(1);+ skipLf = false;+ }+ buffer += chunk;+ // Compatible providers may close after a complete final payload. Callers+ // still validate JSON and require their own explicit completion state.+ if (done) buffer += "\n\n";+ const newline = /\r\n|\r|\n/g;+ let start = 0;+ for (let match; (match = newline.exec(buffer));) {+ const line = buffer.slice(start, match.index);+ start = newline.lastIndex;+ skipLf = match[0] === "\r" && start === buffer.length;+ if (line === "") {+ if (data.length) {+ const event = data.join("\n");+ data = [];+ yield event;+ }+ } else {+ const colon = line.indexOf(":");+ const field = colon < 0 ? line : line.slice(0, colon);+ if (field !== "data") continue;+ const value = colon < 0 ? "" : line.slice(colon + 1);+ data.push(value.startsWith(" ") ? value.slice(1) : value);+ }+ }+ buffer = buffer.slice(start);+ if (done) break;+ }+ } finally {+ signal?.removeEventListener("abort", abort);+ if (!ended) await reader.cancel().catch(() => undefined);+ reader.releaseLock();+ }+}diff --git a/extension/i18n.js b/extension/i18n.jsindex dab36b4..c566efa 100644--- a/extension/i18n.js+++ b/extension/i18n.js@@ -1,6 +1,30 @@import { normalizeUiPreferences, resolveLocale } from "./preferences.js";const EN = Object.freeze({+ "部分内容未保存,已保留供重试": "Some content could not be saved and has been kept for retry.",+ "播放视频": "Play video",+ "AI 整理输出被截断,正式标签库没有改变": "Tag organization output was truncated; the tag library was not changed.",+ "参考输入:文字+原图+原视频": "Reference inputs: text, images and videos",+ "参考输入:文字+原视频": "Reference inputs: text and videos",+ "参考输入:文字+原图": "Reference inputs: text and images",+ "参考输入:仅文字": "Reference inputs: text only",+ "同时发送原视频": "Also send original videos",+ "同时发送原图": "Also send original images",+ "提示词与已有分析文字": "Prompts and existing analysis text",+ "本轮参考输入": "Reference inputs for this turn",+ "创作方向:{type}。影响提示词和可选参考,不会直接生成成品。": "Creative direction: {type}. Controls prompts and available references; does not start generation.",+ "影响提示词和可选参考,不会直接生成成品。": "Controls prompts and available references; does not start generation.",+ "视频创作": "Video creation",+ "图片创作": "Image creation",+ "创作方向": "Creative direction",+ "已有对话 / 识别 API Key(可选)": "Existing dialogue / understanding API key (optional)",+ "原图和视频是否发送由参考选项决定;模型识别结果以服务实际返回为准。": "Reference options control which images and videos are sent; support depends on the provider response.",+ "图片生成 API Key": "Image generation API key",+ "粘贴图片生成服务提供的 API Key": "Paste the API key for image generation",+ "仅用于生成图片;对话和图片、视频识别在“自定义兼容服务(对话与识别)”配置。已有配置保留。": "For image generation only. Configure dialogue and media understanding under the dialogue service. Existing settings are preserved.",+ "图片生成协议": "Image generation protocol",+ "图片生成接口": "Image generation endpoint",+"完整包会随私人备份保留;PromptDirector 可展示成果封面并读取方法文档,不执行包内程序。": "Private backups retain the complete package. PromptDirector displays the result cover and reads method documents without executing packaged programs.","投稿包含公开方法和一张成果封面,请确认这些内容可以公开分享。": "Submissions include the public method and one result cover. Confirm that you can share this content publicly.","正在读取封面图片,请稍候": "Reading the cover image. Please wait.",@@ -74,7 +98,6 @@ const EN = Object.freeze({"案例库:按需;仅在你要求查询或参考时使用,点击关闭": "Library: on demand. Used only when you ask to search or reference it. Click to turn off.","案例库:关闭,点击开启": "Library: off. Click to enable.","当前模型未声明工具能力,可通过选择案例手动查询;点击关闭案例库": "Tool support is not declared for this model. Search manually using Select cases. Click to disable the library.",- "切换模型": "Switch model","资料库检索已开启,点击关闭": "Library search is on. Click to turn it off.","资料库检索已关闭,点击开启": "Library search is off. Click to turn it on.","当前模型无法读取参考原图,请切换支持看图的模型。": "This model cannot read the original reference images. Switch to a model with image input.",@@ -269,7 +292,7 @@ const EN = Object.freeze({"逆推提示词": "Reconstruct prompt","附加本地视频": "Attach local video","授权并在案例库播放": "Allow and play in the library",- "首次在案例库播放 YouTube,需要授权播放器域名。只影响当前扩展发起的播放器,不读取网页内容。": "Playing YouTube in the library for the first time requires access to the player domain. This only affects players opened by this extension and does not read page content.",+ "允许连接 YouTube 播放器后即可在这里播放。": "Allow access to the YouTube player to play here.","本批视频逆推指令": "Video reconstruction instructions for this batch","所选案例中没有可分析的本地视频": "The selected cases do not contain analyzable local videos","请先选择至少一个带本地视频的案例": "Select at least one case with a local video",@@ -386,6 +409,13 @@ const EN = Object.freeze({"帖子文字": "Post text","打开来源": "Open source","提示词已修改,需要重新分析标签": "The prompt changed. Analyze its tags again.",+ "更换封面": "Change cover",+ "请选择图片": "Please choose an image",+ "封面已更新": "Cover updated",+ "封面更新失败": "Could not update cover",+ "没有读取到封面图片": "Could not read the cover image",+ "播放器暂不可用": "Player temporarily unavailable",+ "媒体暂不可用": "Media temporarily unavailable","播放器正在加载…": "Loading player…","无媒体": "No media","无法解码时用系统播放器打开": "Open in the system player if decoding fails",@@ -518,6 +548,8 @@ const EN = Object.freeze({"选图": "Images","提取选中文字": "Capture selected text","选区": "Select",+ "选取内容": "Select content",+ "开启网页读取、截图与媒体识别;不会自动保存案例。": "Enable page reading, screenshots and media detection. Cases are never saved automatically.","剪贴板": "Paste","截图": "Shot","分类": "Category",@@ -525,7 +557,8 @@ const EN = Object.freeze({"正文尚未展开,当前只会保存已显示内容": "The post is collapsed. Only visible content will be saved.","作者补充": "Author follow-up","作者补充({count})": "Author follow-ups ({count})",- "补入已显示内容": "Add visible content",+ "正在读取评论全文…": "Reading the full comment…",+ "未能取得评论全文,当前草稿已保留": "Could not read the full comment. Your draft is preserved.","补入当前案例": "Add to this case","请先在网页中选中文字": "Select text on the page first","文字提取失败": "Could not capture selected text",@@ -1233,6 +1266,12 @@ const EN = Object.freeze({"同编号案例": "Case with the same ID","切换侧栏详情": "Switch to sidebar detail","切换全屏详情": "Switch to fullscreen detail",+ "案例类型": "Case type",+ "修改分类": "Change category",+ "应用分类": "Apply category",+ "选择案例类型…": "Choose a case type…",+ "将修改 {count} 个案例": "Change {count} cases",+ "调整图文分栏宽度": "Resize media and text panels","调整详情侧栏宽度": "Resize detail sidebar","来源:{project}": "Source: {project}","来源:未归项目": "Source: Unassigned",@@ -2315,8 +2354,8 @@ const EN = Object.freeze({"官方服务": "Official services","聚合平台": "Aggregators","自定义兼容服务": "Custom compatible services",- "自定义兼容服务(文字)": "Custom compatible service (Text)",- "自定义兼容服务(图片与生成)": "Custom compatible service (Images and generation)",+ "自定义兼容服务(对话与识别)": "Custom compatible service (Dialogue and understanding)",+ "自定义图片生成服务": "Custom image generation service","智谱 GLM": "Zhipu GLM","火山引擎": "Volcengine","Skill 提炼": "Skill extraction",diff --git a/extension/library-import-preview-worker.js b/extension/library-import-preview-worker.jsnew file mode 100644index 0000000..ef39da6--- /dev/null+++ b/extension/library-import-preview-worker.js@@ -0,0 +1,6 @@+import { previewLibraryTransferBatch } from "./library-transfer.js";++self.onmessage = ({ data }) => {+ try { self.postMessage({ result: previewLibraryTransferBatch(data) }); }+ catch (error) { self.postMessage({ error: error?.message || "案例包核对失败" }); }+};diff --git a/extension/library-import-preview.js b/extension/library-import-preview.jsnew file mode 100644index 0000000..fec964c--- /dev/null+++ b/extension/library-import-preview.js@@ -0,0 +1,21 @@+// Read-only planning belongs to the open import dialog. Closing or changing it+// terminates calculation; committing still rechecks the snapshot in background.+export function previewLibraryImportInWorker(input, { signal } = {}) {+ signal?.throwIfAborted();+ return new Promise((resolve, reject) => {+ const worker = new Worker(new URL("./library-import-preview-worker.js", import.meta.url), { type: "module" });+ const finish = (error, result) => {+ signal?.removeEventListener("abort", abort);+ worker.terminate();+ if (error) reject(error);+ else resolve(result);+ };+ const abort = () => finish(signal.reason || new DOMException("已取消核对", "AbortError"));+ signal?.addEventListener("abort", abort, { once: true });+ worker.onmessage = ({ data }) => data.error ? finish(new Error(data.error)) : finish(null, data.result);+ worker.onerror = event => { event.preventDefault(); finish(new Error(event.message || "案例包核对失败")); };+ worker.onmessageerror = () => finish(new Error("案例包核对结果无法传递"));+ try { worker.postMessage(input); }+ catch (error) { finish(error); }+ });+}diff --git a/extension/library-model.js b/extension/library-model.jsindex 8b8a480..ab50e8b 100644--- a/extension/library-model.js+++ b/extension/library-model.js@@ -94,8 +94,8 @@ export function entrySourceMetadataRows(entry = {}, sourceLabel = "来源") {const seen = new Set();const english = sourceLabel === "Source";const labels = english- ? { provider: "Provider", itemId: "Work ID", author: "Author", handle: "Account", publishedAt: "Published", model: "Model", dimensions: "Dimensions", favorites: "Favorites", likes: "Likes", uses: "Uses", views: "Views", shares: "Shares" }- : { provider: "来源", itemId: "作品 ID", author: "作者", handle: "账号", publishedAt: "发布时间", model: "模型", dimensions: "尺寸", favorites: "收藏", likes: "点赞", uses: "使用", views: "浏览", shares: "分享" };+ ? { provider: "Provider", itemId: "Work ID", author: "Author", handle: "Account", publishedAt: "Published", model: "Model", dimensions: "Dimensions", favorites: "Favorites", likes: "Likes", uses: "Uses", views: "Views", shares: "Shares", comments: "Comments", coins: "Coins", danmaku: "Danmaku" }+ : { provider: "来源", itemId: "作品 ID", author: "作者", handle: "账号", publishedAt: "发布时间", model: "模型", dimensions: "尺寸", favorites: "收藏", likes: "点赞", uses: "使用", views: "浏览", shares: "分享", comments: "评论", coins: "投币", danmaku: "弹幕" };const addField = (label, value) => {const text = String(value ?? "").trim();const key = `${label}\n${text}`;@@ -107,8 +107,8 @@ export function entrySourceMetadataRows(entry = {}, sourceLabel = "来源") {for (const name of ["provider", "itemId", "author", "handle", "publishedAt", "model", "dimensions"]) {addField(labels[name], sourceFacts[name]);}- if (sourceFacts.description) addField(english ? "Description" : "作品说明", sourceFacts.description);- for (const warning of Array.isArray(sourceFacts.captureWarnings) ? sourceFacts.captureWarnings : []) addField(english ? "Capture issue" : "采集问题", warning);+ const description = String(sourceFacts.description || "").trim();+ if (description && !String(entry.text || "").includes(description)) addField(english ? "Description" : "作品说明", description);for (const [name, amount] of Object.entries(sourceFacts.engagement || {})) {if (Number.isFinite(Number(amount)) && Number(amount) >= 0) addField(labels[name] || name, String(amount));}diff --git a/extension/library-package.js b/extension/library-package.jsindex ac6d130..fd0f9e8 100644--- a/extension/library-package.js+++ b/extension/library-package.js@@ -680,6 +680,18 @@ export function mergeLibraryPackage(current = {}, importedValue = {}, options =next.taxonomy = taxonomyMerge.taxonomy;const { facetIds, nodeIds } = mergeVocabulary(next.facetCatalog, imported.facetCatalog, options);const usedEntryIds = new Set(next.entries.map((entry) => entry.id));+ const entriesById = new Map(next.entries.map((entry) => [entry.id, entry]));+ const entriesByFingerprint = new Map();+ const fingerprintById = new Map();+ function indexEntry(entry) {+ const fingerprint = caseSemanticFingerprint(normalizeEntryMedia(entry));+ if (!fingerprint) return;+ const matches = entriesByFingerprint.get(fingerprint) ?? new Set();+ matches.add(entry);+ entriesByFingerprint.set(fingerprint, matches);+ fingerprintById.set(entry.id, fingerprint);+ }+ for (const entry of next.entries) indexEntry(entry);const usedVisualIds = new Set([...next.entries.flatMap((entry) => normalizeEntryMedia(entry).mediaAssets.map((visual) => visual.id)),...normalizeCreativeRuns(next.creativeRuns).flatMap((run) => run.outputs.map((output) => output.visual.id)),@@ -697,9 +709,7 @@ export function mergeLibraryPackage(current = {}, importedValue = {}, options =for (const source of imported.entries) {let idCollision = usedEntryIds.has(source.id);const sourceFingerprint = caseSemanticFingerprint(normalizeEntryMedia(source));- const identical = sourceFingerprint && next.entries.find((entry) =>- caseSemanticFingerprint(normalizeEntryMedia(entry)) === sourceFingerprint- );+ const identical = sourceFingerprint && entriesByFingerprint.get(sourceFingerprint)?.values().next().value;if (identical) {skippedCount += 1;entryIdMap[source.id] = identical.id;@@ -713,6 +723,12 @@ export function mergeLibraryPackage(current = {}, importedValue = {}, options =}const conflictResolution = clean(options.entryConflictResolutions?.[source.id]);if (idCollision && conflictResolution === "use-incoming") {+ const fingerprint = fingerprintById.get(source.id);+ const matches = entriesByFingerprint.get(fingerprint);+ matches?.delete(entriesById.get(source.id));+ if (matches?.size === 0) entriesByFingerprint.delete(fingerprint);+ fingerprintById.delete(source.id);+ entriesById.delete(source.id);next.entries = next.entries.filter((entry) => entry.id !== source.id);next.organizerState = removeEntriesFromOrganizer(next.organizerState, [source.id]);next.compoundCases = removeEntriesFromCompoundCases(next.compoundCases, current.entries, [source.id]);@@ -720,7 +736,7 @@ export function mergeLibraryPackage(current = {}, importedValue = {}, options =idCollision = false;}if (idCollision && (conflictResolution === "keep-local" || options.skipExistingEntryIds === true)) {- const existing = next.entries.find((entry) => entry.id === source.id);+ const existing = entriesById.get(source.id);skippedCount += 1;entryIdMap[source.id] = source.id;organizerEntryIdMap[source.id] = source.id;@@ -765,6 +781,7 @@ export function mergeLibraryPackage(current = {}, importedValue = {}, options =return { ...visual, id: targetVisualId };});entry.primaryMediaId = visualIdMap[entry.primaryMediaId] ?? entry.primaryMediaId;+ if (entry.coverVisualId) entry.coverVisualId = visualIdMap[entry.coverVisualId] ?? entry.coverVisualId;entry.articleDocument = remapArticleDocumentAssets(entry.articleDocument, visualIdMap);entry.mediaAssets = entry.mediaAssets.map((asset) => ({...asset,@@ -798,6 +815,8 @@ export function mergeLibraryPackage(current = {}, importedValue = {}, options =};});next.entries.push(entry);+ entriesById.set(targetId, entry);+ indexEntry(entry);usedEntryIds.add(targetId);createdEntryIds.push(targetId);entryIdMap[source.id] = targetId;@@ -805,7 +824,7 @@ export function mergeLibraryPackage(current = {}, importedValue = {}, options =importedCount += 1;}for (const targetId of Object.values(entryIdMap)) {- const importedEntry = next.entries.find((item) => item.id === targetId);+ const importedEntry = entriesById.get(targetId);if (!importedEntry?.creationMeta?.sourceEntryIds) continue;importedEntry.creationMeta.sourceEntryIds = importedEntry.creationMeta.sourceEntryIds.map((id) => organizerEntryIdMap[id] ?? id);}@@ -1184,6 +1203,7 @@ function mergeImportedTrashState(currentValue, importedValue, context = {}) {id: remapped.visualIdMap[position.id] ?? position.id}));item.relationships.primaryMediaId = remapped.visualIdMap[item.relationships.primaryMediaId] ?? item.relationships.primaryMediaId;+ if (item.relationships.coverVisualId) item.relationships.coverVisualId = remapped.visualIdMap[item.relationships.coverVisualId] ?? item.relationships.coverVisualId;return item;});return {@@ -1210,6 +1230,7 @@ function remapTrashedEntrySnapshot(entryValue, targetEntryId, usedVisualIds, pre});entry.id = targetEntryId;entry.primaryMediaId = visualIdMap[entry.primaryMediaId] ?? entry.primaryMediaId;+ if (entry.coverVisualId) entry.coverVisualId = visualIdMap[entry.coverVisualId] ?? entry.coverVisualId;entry.articleDocument = remapArticleDocumentAssets(entry.articleDocument, visualIdMap);entry.mediaAssets = entry.mediaAssets.map((asset) => ({...asset,diff --git a/extension/library-selection.js b/extension/library-selection.jsindex fbf50c5..81b9c55 100644--- a/extension/library-selection.js+++ b/extension/library-selection.js@@ -2,6 +2,7 @@ import { expandLogicalCaseIds } from "./compound-cases.js";import { uniqueNames } from "./facets.js";export const LIBRARY_BATCH_ACTIONS = Object.freeze({+ setClassification: "BATCH_SET_CLASSIFICATION",addCustomLabels: "BATCH_ADD_CUSTOM_LABELS",setProject: "BATCH_SET_PROJECT",moveToTrash: "BATCH_MOVE_TO_TRASH"@@ -48,6 +49,11 @@ export function buildLibraryBatchPayload(selectedLogicalCaseIds = [], compoundCaconst entryIds = expandLibrarySelection(selectedLogicalCaseIds, compoundCases);if (!entryIds.length) throw new Error("请至少选择一个案例");+ if (operation.type === LIBRARY_BATCH_ACTIONS.setClassification) {+ if (!operation.contentTypeId) throw new Error("请选择案例类型");+ return { type: operation.type, entryIds, pathIds: [operation.contentTypeId] };+ }+if (operation.type === LIBRARY_BATCH_ACTIONS.addCustomLabels) {return {type: LIBRARY_BATCH_ACTIONS.addCustomLabels,diff --git a/extension/library-transfer.js b/extension/library-transfer.jsindex 7140e3f..965e889 100644--- a/extension/library-transfer.js+++ b/extension/library-transfer.js@@ -530,3 +530,28 @@ function mergeReportStats(sourceValue, inspectedValue) {function clean(value) {return String(value ?? "").trim();}++// Preview and commit share the planner; only commit owns writes and revalidates the token.+export function previewLibraryTransferBatch(input) {+ const result = planLibraryTransferBatch(input);+ return {+ ok: true,+ planToken: result.planToken,+ plan: result.context,+ canApply: result.canApply,+ conflicts: result.conflicts,+ unresolvedConflicts: result.unresolvedConflicts,+ packageResults: result.packageResults,+ resourceWrites: result.resourceWrites,+ createdEntryIds: result.createdEntryIds,+ importDiagnostics: result.importDiagnostics,+ importStats: result.importStats,+ importedCount: result.importedCount,+ remappedCount: result.remappedCount,+ skippedCount: result.skippedCount,+ importedRunCount: result.importedRunCount,+ importedOutputCount: result.importedOutputCount,+ importedSkillCount: result.importedSkillCount,+ skippedSkillCount: result.skippedSkillCount+ };+}diff --git a/extension/library.css b/extension/library.cssindex 4557b72..5ae2320 100644--- a/extension/library.css+++ b/extension/library.css@@ -498,6 +498,15 @@ details:not([open]) > .selection-menu-panel { display: none; }.detail-content:not(.has-primary-media) > .detail-primary > .detail-body { width: min(760px, 100%); min-height: 100dvh; margin: 0 auto; border-left: 0; }.detail-body { min-width: 0; min-height: 0; overflow: visible; border-left: 1px solid var(--line); background: var(--card); }.detail-primary > .detail-body { min-height: 100dvh; align-self: stretch; }+.detail-split-resizer { display: none; }+@media (min-width: 641px) {+ .detail-drawer:not(.detail-sidebar-mode) .has-primary-media > .detail-primary { height: 100dvh; min-height: 0; }+ .detail-drawer:not(.detail-sidebar-mode) .has-primary-media > .detail-primary > .detail-body { height: 100%; min-height: 0; overflow-y: auto; overscroll-behavior: contain; }+ .detail-drawer:not(.detail-sidebar-mode) .has-primary-media > .detail-primary > .detail-visual-gallery { max-height: 100%; overflow-y: auto; }+ .detail-drawer:not(.detail-sidebar-mode) .detail-split-resizer { position: absolute; display: block; z-index: 7; inset-block: 0; right: var(--detail-panel-width); width: 8px; transform: translateX(50%); cursor: col-resize; touch-action: none; }+ .detail-split-resizer::after { position: absolute; inset: 0 3px; content: ""; background: transparent; }+ .detail-split-resizer:hover::after, .detail-split-resizer:focus-visible::after, .detail-split-resizer.is-resizing::after { background: var(--accent); }+}.detail-body > .detail-section:first-child { min-height: 56px; }.detail-content.is-compound-detail { display: grid; overflow: hidden; grid-template-columns: minmax(0, 1fr) var(--detail-panel-width); }.detail-content.is-compound-detail > .detail-body { overflow: auto; }@@ -580,7 +589,7 @@ details:not([open]) > .selection-menu-panel { display: none; }.detail-visual-caption { position: absolute; right: 0; bottom: 0; left: 0; display: flex; align-items: center; justify-content: space-between; gap: 8px; padding: 10px 12px; color: rgba(255, 255, 255, 0.82); background: rgba(4, 6, 10, 0.82); font-size: 11px; }.detail-visual-gallery.is-image-detail .detail-visual-caption { position: static; flex-wrap: wrap; padding: 8px 12px; background: color-mix(in srgb, var(--viewer-bg) 92%, white); }.detail-visual-actions { display: flex; flex-wrap: wrap; justify-content: flex-end; gap: 6px; }-.detail-visual-actions button { min-height: 28px; padding: 4px 8px; color: var(--ink); border-color: var(--line); background: var(--raised); font-size: 11px; }+.detail-visual-actions :is(button, a.button-secondary) { min-height: 28px; padding: 4px 8px; color: var(--ink); border-color: var(--line); background: var(--raised); font-size: 11px; }.detail-placeholder { display: grid; min-height: 260px; place-items: center; color: var(--muted); background: #0d1016; }.detail-audio-wrap, .detail-source-file { display: grid; width: min(620px, calc(100% - 32px)); min-height: 280px; align-content: center; justify-self: center; gap: 10px; margin: 32px auto; border: 1px solid var(--line); border-radius: var(--ui-container-radius); padding: 26px; background: var(--card); }.detail-audio { width: 100%; margin-block: 8px; }@@ -1036,6 +1045,11 @@ details:not([open]) > .selection-menu-panel { display: none; }.gallery-view-controls { min-height: 36px; }.gallery-heading.selection-mode .gallery-heading-copy { display: none; }.selection-simple-actions, .selection-selected-actions { gap: 4px; }+ .share-bar { display: grid; width: 100%; max-width: 100%; grid-template-columns: 1fr auto; }+ .share-bar > strong { grid-column: 1; grid-row: 1; }+ .share-bar > #share-cancel { grid-column: 2; grid-row: 1; }+ .share-bar > .selection-simple-actions { grid-column: 1 / -1; grid-row: 2; }+ .selection-selected-actions { max-width: 100%; flex-wrap: wrap; }.selection-compact-action, .selection-menu > summary { min-height: 36px; padding: 5px 8px; }.selection-menu { position: static; }.selection-menu-panel { position: absolute; top: 100%; right: 0; bottom: auto; left: auto; width: min(430px, 100%); max-height: calc(100dvh - var(--library-topbar-height) - var(--library-management-height)); overflow: auto; }@@ -1103,13 +1117,20 @@ details:not([open]) > .selection-menu-panel { display: none; }.pdf-preview-error::before { content: "PDF"; display: grid; min-height: 210px; place-items: center; color: var(--accent-bright); font-size: 28px; font-weight: 850; }.case-media-icon { font-size: 1.7rem; color: var(--accent-bright); }.detail-video-wrap, .detail-document { width: 100%; display: grid; gap: 10px; justify-items: center; }+.detail-video-surface { position: relative; width: 100%; min-width: 0; }+.detail-video-play.icon-button { position: absolute; top: 50%; left: 50%; translate: -50% -50%; transform: none; width: 64px; height: 64px; border-radius: 50%; border: 1px solid #ffffff80; background: #000000a6; color: white; }+.detail-video-play .ui-icon { width: 28px; height: 28px; }+.detail-video-play[hidden] { display: none; }+@media (min-width: 641px) {+ .detail-drawer:not(.detail-sidebar-mode) .detail-primary > .detail-visual-gallery.is-video-detail { align-self: center; width: 100%; }+}.detail-video { display: block; width: 100%; min-height: 300px; max-height: min(68vh, 760px); border: 0; border-radius: 12px; background: #050708; }.detail-visual-gallery.is-video-detail:not(.is-immersive) { height: auto; min-height: 0; grid-template-rows: auto auto auto; }.detail-visual-gallery.is-video-detail .detail-visual-item { height: auto; }.detail-visual-gallery.is-video-detail .detail-video { aspect-ratio: 16 / 9; min-height: 0; max-height: min(76vh, 860px); border-radius: 0; object-fit: contain; }.detail-visual-gallery.is-video-detail .detail-visual-caption { position: static; flex-wrap: wrap; border-top: 1px solid var(--line); padding: 10px 14px; background: var(--card); }.detail-visual-gallery.is-video-detail .detail-visual-actions { gap: 8px; }-.detail-visual-gallery.is-video-detail .detail-visual-actions button { min-height: 36px; }+.detail-visual-gallery.is-video-detail .detail-visual-actions :is(button, a.button-secondary) { min-height: 36px; }.detail-visual-gallery.is-video-detail .detail-visual-caption > span:first-child { color: var(--muted); font-size: 11px; }.detail-visual-gallery.is-video-detail .detail-visual-actions .button-secondary,.detail-visual-gallery.is-video-detail .detail-visual-actions .button-danger-secondary { min-height: 36px; padding: 7px 12px; font-size: 12px; }@@ -1422,6 +1443,7 @@ details:not([open]) > .selection-menu-panel { display: none; }.import-summary span + span { border-top: 1px solid var(--line); border-left: 0; }.detail-visual-gallery.is-video-detail .detail-visual-caption { align-items: flex-start; flex-direction: column; }.detail-visual-gallery.is-video-detail .detail-visual-actions { width: 100%; }+ .detail-visual-gallery.is-video-detail .detail-visual-actions :is(button, a.button-secondary),.detail-visual-gallery.is-video-detail .detail-visual-actions .button-secondary,.detail-visual-gallery.is-video-detail .detail-visual-actions .button-danger-secondary,.media-playback-actions button,@@ -1590,3 +1612,8 @@ details:not([open]) > .selection-menu-panel { display: none; }#text-batch-dialog .dialog-heading h2 { margin: 0; }#text-batch-dialog .batch-card-heading h3, #text-batch-dialog .advanced-reanalysis { display: none; }#text-batch-dialog .batch-card { margin: 0; border-bottom: 0; padding-bottom: 0; }++.case-cover-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(100px, 1fr)); gap: 8px; margin-bottom: 12px; }+.case-cover-option { padding: 4px; overflow: hidden; }+.case-cover-option img { display: block; width: 100%; height: 100px; object-fit: cover; }+.case-cover-option[aria-pressed="true"] { border-color: var(--accent); }diff --git a/extension/library.html b/extension/library.htmlindex 6df839d..e7f2150 100644--- a/extension/library.html+++ b/extension/library.html@@ -102,6 +102,14 @@</div></details><button id="selection-trash" class="button-secondary quiet-danger selection-compact-action" type="button" disabled aria-label="移入回收站" data-i18n-aria-label="移入回收站" title="移入回收站" data-i18n-title="移入回收站"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-trash-2"></use></svg><span class="selection-action-label" data-i18n="删除">删除</span></button>+ <details id="selection-classification-menu" class="selection-menu">+ <summary aria-label="修改分类" data-i18n-aria-label="修改分类"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-list-checks"></use></svg><span class="selection-action-label" data-i18n="分类">分类</span></summary>+ <div class="project-menu-panel selection-menu-panel">+ <strong id="selection-classification-impact"></strong>+ <select id="selection-content-type" aria-label="案例类型" data-i18n-aria-label="案例类型"></select>+ <button id="selection-set-classification" type="button" class="project-menu-primary" disabled data-i18n="应用分类">应用分类</button>+ </div>+ </details><details id="selection-label-menu" class="selection-menu"><summary aria-label="添加标签" data-i18n-aria-label="添加标签"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-tag"></use></svg><span class="selection-action-label" data-i18n="标签">标签</span></summary><div class="project-menu-panel selection-menu-panel selection-label-panel">diff --git a/extension/library.js b/extension/library.jsindex 7d2cffa..86ce0c4 100644--- a/extension/library.js+++ b/extension/library.js@@ -1,9 +1,11 @@+import { attachDetailSplit } from "./detail-split.js";import { sendWithGenerationPromptConfirmation } from "./image-generation-confirmation.js";import { createGenerationInfoViewReader } from "./image-generation-view.js";import { downloadMediaCopies, showQuickMenu } from "./library-quick-actions.js";import { assetFormatForExtension } from "./asset-formats.js";import { docxImageLoader } from "./docx-ingestion.js";import { applyLibraryImportWithReceipt } from "./library-import-client.js";+import { previewLibraryImportInWorker } from "./library-import-preview.js";import { readZipResources } from "./zip-reader.js";import { attachArticleEditor } from "./article-editor.js";import { renderArticleBlockText } from "./article-text-view.js";@@ -118,6 +120,7 @@ import {} from "./visuals.js";import {entryMediaAssets,+ caseCoverAsset,entryHasMedia,currentVideoReconstruction,normalizeEntryMedia,@@ -239,7 +242,7 @@ const elements = Object.fromEntries(["add-quick-note", "organize-detail-tags", "organize-detail-status", "pause-analysis-batch", "pause-library-maintenance", "preview-analysis-batch", "preview-analysis-reanalyze", "preview-reanalyze", "reanalyze-preview", "result-count", "resume-analysis-batch", "resume-library-maintenance", "retry-analysis-failures", "retry-library-maintenance", "start-analysis-reanalyze","project-selection-actions", "project-selection-cancel", "project-selection-clear", "project-selection-count", "project-selection-save", "project-selection-select-all", "project-selection-select-filtered", "project-selection-title", "project-order-status", "restore-analysis-default", "search-input", "share-bar", "share-cancel", "share-count", "share-export", "start-analysis-batch", "start-compose", "toggle-filters", "undo-analysis-batch", "undo-facet", "vocabulary-facet", "workspace-library", "workspace-unassigned","share-dialog", "share-dialog-public", "share-dialog-public-panel", "share-dialog-close", "share-dialog-title", "share-dialog-meta", "share-dialog-options", "share-dialog-export", "share-dialog-submit", "share-dialog-disclosure", "share-dialog-result", "share-dialog-result-text", "share-dialog-show-files", "share-dialog-open-form",- "text-batch-dialog", "text-batch-close", "text-batch-content", "text-batch-card", "analysis-batch-details", "selection-text-analyze", "add-menu", "export-path-setting", "media-file", "media-folder", "library-name-setting", "save-library-settings", "select-cases", "selection-select-filtered", "selection-clear", "selection-label-input", "selection-add-labels", "selection-add-project", "selection-move-project", "selection-remove-project", "selection-new-project", "selection-combine", "selection-analyze", "selection-video-analyze", "selection-project-impact", "selection-project-target", "selection-trash", "open-settings", "settings-dialog", "settings-close", "settings-update-badge", "open-about", "local-extension-package", "library-settings-feedback", "update-status", "check-extension-update", "apply-extension-update", "update-feedback",+ "text-batch-dialog", "text-batch-close", "text-batch-content", "text-batch-card", "analysis-batch-details", "selection-content-type", "selection-classification-impact", "selection-set-classification", "selection-text-analyze", "add-menu", "export-path-setting", "media-file", "media-folder", "library-name-setting", "save-library-settings", "select-cases", "selection-select-filtered", "selection-clear", "selection-label-input", "selection-add-labels", "selection-add-project", "selection-move-project", "selection-remove-project", "selection-new-project", "selection-combine", "selection-analyze", "selection-video-analyze", "selection-project-impact", "selection-project-target", "selection-trash", "open-settings", "settings-dialog", "settings-close", "settings-update-badge", "open-about", "local-extension-package", "library-settings-feedback", "update-status", "check-extension-update", "apply-extension-update", "update-feedback","project-section", "project-root-drop", "collapse-projects", "project-search", "project-move-feedback", "project-move-undo", "selection-simple-actions", "selection-selected-actions", "show-analysis-diagnostics", "ui-locale", "ui-theme", "ui-motion", "vocabulary-tree","vision-instructions-en", "vision-instructions-zh", "vision-protocol", "vision-settings-form", "vision-settings-status", "restore-vision-default","video-instructions-en", "video-instructions-zh", "video-settings-form", "video-settings-status", "restore-video-default", "video-protocol",@@ -551,6 +554,7 @@ async function previewDeepSeekAnalysisBatch(mode = "incremental") {function renderAnalysisBatch() {const job = analysisBatchJob;const preview = analysisBatchPreview;+ const selectionCompleted = selectedTextBatchCompleted();const active = Boolean(job && ["running", "paused"].includes(job.status));const unfinishedRebuild = Boolean(job?.mode === "rebuild" && ["completed", "partial"].includes(job?.status) && job?.counts.failed && !job.partialApplied);const partialRebuildApplied = Boolean(job?.mode === "rebuild" && job?.partialApplied);@@ -594,7 +598,7 @@ function renderAnalysisBatch() {? t("已选 {count} 个案例", { count: preview.caseCount }) + ((textBatchEntryIds?.length || 0) > preview.caseCount ? t(" · 跳过 {count} 个无文字案例", { count: textBatchEntryIds.length - preview.caseCount }) : ""): t("待补全 {count} 个案例", { count: preview.caseCount })): job ? t("完成 {done}/{total} · 失败 {failed}", { done: job.counts.succeeded, total: job.total, failed: job.counts.failed }) : "";- elements.previewAnalysisBatch.hidden = active || unfinishedRebuild || Boolean(preview?.caseCount);+ elements.previewAnalysisBatch.hidden = active || unfinishedRebuild || Boolean(preview?.caseCount) || selectionCompleted;elements.startAnalysisBatch.hidden = active || unfinishedRebuild || !preview || preview.mode === "rebuild";elements.startAnalysisReanalyze.hidden = active || unfinishedRebuild || !preview || preview.mode !== "rebuild";const textAssignment = aiTaskAssignments.textTags ?? {};@@ -728,7 +732,8 @@ function bindEvents() {analysisDiagnostics: uiPreferences.analysisDiagnostics,sidebarWidth: uiPreferences.sidebarWidth,detailMode: uiPreferences.detailMode,- detailSidebarWidth: uiPreferences.detailSidebarWidth+ detailSidebarWidth: uiPreferences.detailSidebarWidth,+ detailPanelRatio: uiPreferences.detailPanelRatio});});}@@ -821,6 +826,8 @@ function bindEvents() {void addLabelsToSelection();});elements.selectionAddLabels.addEventListener("click", addLabelsToSelection);+ elements.selectionSetClassification.addEventListener("click", setSelectionClassification);+ elements.selectionContentType.addEventListener("change", updateSelectionBar);elements.selectionAddProject.addEventListener("click", addSelectionToProject);elements.selectionMoveProject.addEventListener("click", moveSelectionToProject);elements.selectionRemoveProject.addEventListener("click", removeSelectionFromProject);@@ -829,6 +836,7 @@ function bindEvents() {elements.textBatchClose.addEventListener("click", () => elements.textBatchDialog.close());elements.textBatchDialog.addEventListener("close", () => {clearTimeout(textBatchPollTimer);+ if (selectedTextBatchCompleted()) exitSelectionMode();document.getElementById("settings-tasks-panel").prepend(elements.textBatchCard);textBatchEntryIds = null;textBatchRunningJobId = "";@@ -1524,10 +1532,11 @@ function createCaseCard(entry) {});const mainVisual = primaryMediaAsset(entry);- if (mainVisual?.kind === "image") {+ const cover = caseCoverAsset(entry);+ if (cover && mainVisual?.kind !== "video") {const wrap = el("div", "case-image-wrap");- wrap.classList.toggle("has-alpha-channel", alphaCapableImage(mainVisual));- const dimensions = imageDimensions(mainVisual);+ wrap.classList.toggle("has-alpha-channel", alphaCapableImage(cover));+ const dimensions = imageDimensions(cover);if (dimensions) {wrap.style.aspectRatio = `${dimensions.width} / ${dimensions.height}`;wrap.classList.add("case-image-wrap-fixed");@@ -1535,15 +1544,15 @@ function createCaseCard(entry) {const image = document.createElement("img");image.className = "case-shot";image.alt = translateUiMessage(`${entry.title} 对应画面`);- image.dataset.visualId = mainVisual.id;+ image.dataset.visualId = cover.id;image.decoding = "async";image.loading = "lazy";- const cached = thumbnailUrls.get(mainVisual.id);+ const cached = thumbnailUrls.get(cover.id);if (cached) image.src = cached;wrap.append(image);card.append(wrap);} else if (mainVisual?.kind === "video") {- const poster = posterAssetForVideo(entry, mainVisual);+ const poster = cover;if (poster || mainVisual.storageMode === "managed") {const wrap = el("div", "case-image-wrap case-video-poster");const dimensions = imageDimensions(poster || mainVisual);@@ -2440,6 +2449,11 @@ function updateSelectionBar() {elements.selectionProjectTarget.value = organizerState.collections.some((item) => item.id === selectedProject) ? selectedProject : "";const targetCollection = organizerState.collections.find((item) => item.id === elements.selectionProjectTarget.value);const selectedEntryIds = expandLogicalCaseIds([...selectedCaseIds], compoundCases);+ const selectedType = elements.selectionContentType.value;+ elements.selectionContentType.replaceChildren(option("", t("选择案例类型…")), ...taxonomy.nodes.map(node => option(node.id, node.customized ? node.name : t(node.name))));+ elements.selectionContentType.value = taxonomy.nodes.some(node => node.id === selectedType) ? selectedType : "";+ elements.selectionSetClassification.disabled = !selectedEntryIds.length || !elements.selectionContentType.value;+ elements.selectionClassificationImpact.textContent = t("将修改 {count} 个案例", { count: selectedEntryIds.length });const targetEntryIds = new Set(targetCollection?.entryIds ?? []);const sourceCollection = organizerState.collections.find((item) => item.id === selectedCollectionId);const sourceEntryIds = new Set(sourceCollection?.entryIds ?? []);@@ -2566,6 +2580,17 @@ async function updateSelectionProjectMembership(mode, button, collectionId = ele}}+async function setSelectionClassification() {+ if (!selectedCaseIds.size || !elements.selectionContentType.value) return;+ const payload = buildLibraryBatchPayload([...selectedCaseIds], compoundCases, {+ type: LIBRARY_BATCH_ACTIONS.setClassification, contentTypeId: elements.selectionContentType.value+ });+ const response = await perform(elements.selectionSetClassification, payload, false);+ if (!response?.ok) return;+ exitSelectionMode();+ await refreshLibrary();+}+async function addLabelsToSelection() {if (!selectedCaseIds.size) return;const customLabels = splitInput(elements.selectionLabelInput.value);@@ -2641,6 +2666,11 @@ async function openSelectedTextBatch() {pollSelectedTextBatch();}+function selectedTextBatchCompleted() {+ return Boolean(textBatchRunningJobId && analysisBatchJob?.id === textBatchRunningJobId+ && analysisBatchJob.status === "completed" && !analysisBatchJob.counts.failed);+}+function pollSelectedTextBatch() {clearTimeout(textBatchPollTimer);if (!elements.textBatchDialog.open) return;@@ -2652,7 +2682,7 @@ function pollSelectedTextBatch() {renderAnalysisBatch();}}- if (textBatchRunningJobId && analysisBatchJob?.id === textBatchRunningJobId && analysisBatchJob.status === "completed" && !analysisBatchJob.counts.failed) {+ if (selectedTextBatchCompleted()) {elements.textBatchDialog.close();showFeedback("文字打标已完成");await refreshLibrary();@@ -4097,6 +4127,9 @@ function updateLibraryPackageProgress(batch, item, message) {async function refreshLibraryPackageBatchPlan(batch = pendingLibraryPackageBatch) {if (!batch || pendingLibraryPackageBatch !== batch || batch.submitting) return;+ batch.previewController?.abort();+ const controller = new AbortController();+ batch.previewController = controller;const revision = ++batch.revision;const ready = batch.items.filter((item) => item.status === "ready" && item.inspection);batch.preview = null;@@ -4107,12 +4140,19 @@ async function refreshLibraryPackageBatchPlan(batch = pendingLibraryPackageBatchrenderLibraryPackageBatch();if (!ready.length) return;try {- const response = await chrome.runtime.sendMessage({- type: "PREVIEW_LIBRARY_IMPORT_BATCH",- packages: ready.map(libraryPackageMessage),- preserveLibraryConfiguration: true,- conflictResolutions: batch.conflictResolutions- });+ const snapshot = await chrome.runtime.sendMessage({ type: "GET_FOLDER_BACKUP_STATE" });+ controller.signal.throwIfAborted();+ if (!snapshot?.ok) throw new Error(snapshot?.message || "无法读取资料库");+ const response = await previewLibraryImportInWorker({+ currentState: snapshot,+ inspections: ready.map(item => ({+ sourceType: LIBRARY_TRANSFER_SOURCES.SHARE_PACKAGE,+ state: item.inspection.state,+ report: item.inspection.report,+ resourceIndex: item.inspection.resourceIndex+ })),+ options: { preserveLibraryConfiguration: true, conflictResolutions: batch.conflictResolutions }+ }, { signal: controller.signal });if (!response?.ok) throw new Error(response?.message || "无法检查案例包");if (pendingLibraryPackageBatch !== batch || revision !== batch.revision) return;const plannedBytes = plannedLibraryPackageBatchBytes(response.resourceWrites, ready);@@ -4371,6 +4411,7 @@ function cancelLibraryPackageBatch() {}function finishLibraryPackageBatch() {+ pendingLibraryPackageBatch?.previewController?.abort();pendingLibraryPackageBatch?.controller.abort();pendingLibraryPackageBatch = null;if (elements.libraryPackageImportDialog.open) elements.libraryPackageImportDialog.close();@@ -5127,7 +5168,7 @@ async function confirmPromptEditDiscard() {return true;}-async function renderDetail({ resetScroll = false } = {}) {+async function renderDetail({ resetScroll = false, rebuildMedia = false } = {}) {const renderGeneration = ++detailRenderGeneration;const renderEntryId = currentDetailId;let entry = logicalCases.find((item) => item.id === currentDetailId);@@ -5139,7 +5180,7 @@ async function renderDetail({ resetScroll = false } = {}) {const presentation = usesArticleReader(entry) ? "article" : usesPostReader(entry) ? "post" : "case";const mountedBody = elements.detailContent.querySelector(".detail-primary > .detail-body");const mountedArticle = mountedBody?.querySelector(":scope > .article-document-reader");- if (!resetScroll && usesArticleReader(entry) && elements.detailDrawer.dataset.entryId === entry.id+ if (!rebuildMedia && !resetScroll && usesArticleReader(entry) && elements.detailDrawer.dataset.entryId === entry.id&& mountedBody?.dataset.mediaIdentity === mediaIdentity && mountedBody.dataset.presentation === presentation&& (mountedArticle?.dataset.editing === "true" || mountedArticle?.dataset.articleIdentity === JSON.stringify(normalizeEntryMedia(entry).articleDocument))) {const header = mountedBody.querySelector(":scope > .detail-header-section");@@ -5147,7 +5188,7 @@ async function renderDetail({ resetScroll = false } = {}) {refreshActiveDetailAssetSections(entry);return;}- if (!resetScroll && !entry.compoundCase && !usesPostReader(entry) && !usesArticleReader(entry)+ if (!rebuildMedia && !resetScroll && !entry.compoundCase && !usesPostReader(entry) && !usesArticleReader(entry)&& elements.detailDrawer.dataset.entryId === entry.id && mountedBody?.dataset.mediaIdentity === mediaIdentity && mountedBody.dataset.presentation === presentation) {elements.detailContent.querySelector(".detail-visual-gallery")?.updateEntry?.(entry);refreshActiveDetailAssetSections(entry);@@ -5231,6 +5272,17 @@ async function renderDetail({ resetScroll = false } = {}) {elements.detailContent.replaceChildren(content);if (resetScroll) elements.detailContent.scrollTop = 0;discovery?.mount();+ if (hasMediaStage) {+ const dispose = attachDetailSplit(primary, {+ label: t("调整图文分栏宽度"),+ readRatio: () => uiPreferences.detailPanelRatio,+ saveRatio: async detailPanelRatio => {+ uiPreferences = await updateUiPreferences({ ...uiPreferences, detailPanelRatio });+ }+ });+ const cleanup = () => { dispose(); detailControllerCleanups.delete(cleanup); };+ detailControllerCleanups.add(cleanup);+ }}function createDetailBody(entry) {@@ -5842,7 +5894,13 @@ async function createDetailMediaGallery(entryValue, { immersive = false } = {})stage.replaceChildren(pendingItem);const item = el("figure", `detail-visual-item${asset.id === entry.primaryMediaId ? " is-primary" : ""}`);item.classList.toggle("has-alpha-channel", alphaCapableImage(asset));- const body = await createMediaViewer(asset, imageUrls[activeIndex], entry);+ let body;+ try { body = await createMediaViewer(asset, imageUrls[activeIndex], entry); }+ catch (error) {+ console.debug("PromptDirector media viewer initialization", error);+ body = el("div", "detail-video-wrap");+ body.append(textEl("p", "media-playback-status", "媒体暂不可用"));+ }if (token !== renderToken || currentDetailId !== ownerEntryId) {body.mediaController?.destroy?.();body.releaseMedia?.();@@ -5855,6 +5913,7 @@ async function createDetailMediaGallery(entryValue, { immersive = false } = {})}activeMediaBody = body;const localVideo = body instanceof HTMLVideoElement ? body : body.querySelector?.("video") ?? null;+ if (localVideo) addVideoPlayButton(localVideo);if (asset.kind === "video") {const videoSurface = body.matches?.(".detail-video") ? body : body.querySelector?.(".detail-video");if (videoSurface && asset.width > 0 && asset.height > 0) videoSurface.style.aspectRatio = `${asset.width} / ${asset.height}`;@@ -5869,6 +5928,13 @@ async function createDetailMediaGallery(entryValue, { immersive = false } = {})const position = asset.id === entry.primaryMediaId ? `${t("主要媒体")} · ${activeIndex + 1}/${contentAssets.length}` : `${activeIndex + 1}/${contentAssets.length}`;caption.append(rawTextEl("span", "", [position, mediaMetadataText(asset)].filter(Boolean).join(" · ")));const actions = el("span", "detail-visual-actions");+ if (asset.storageMode === "reference" && (asset.reference?.url || asset.sourceUrl)) {+ const source = textEl("a", "button-secondary media-reference-fallback", "打开来源");+ source.href = asset.reference?.url || asset.sourceUrl;+ source.target = "_blank";+ source.rel = "noopener noreferrer";+ actions.append(source);+ }const download = textEl("button", "button-secondary", "下载副本");const downloadAction = async () => {if (download.disabled) return;@@ -6083,7 +6149,7 @@ function createVideoAnalysisWorkspace(entry, asset, actionTarget) {if (!current) header.append(createPromptRulesAction("video"));if (!running && !["failed", "stopped"].includes(task?.status)) {- const run = textEl("button", "video-analysis-run", "逆推视频提示词");+ const run = textEl("button", "button-secondary video-analysis-run", "逆推视频提示词");run.addEventListener("click", async () => {try {await startVideoAnalysis(entry, asset, run);@@ -6146,7 +6212,7 @@ function createVideoAnalysisTaskStatus(task) {? "上次执行状态未知,未自动重试;服务商可能已收到请求": attempt?.error || (task.providerMayHaveAccepted ? "已停止等待,未保存结果;服务商可能已收到请求" : "已取消,未发送");status.append(rawTextEl("span", "", t(message)));- const retry = textEl("button", "video-analysis-run", "逆推视频提示词");+ const retry = textEl("button", "button-secondary video-analysis-run", "逆推视频提示词");retry.addEventListener("click", async () => {if (!await confirmAppAction({title: "重新发送这次视频分析?",@@ -6304,12 +6370,13 @@ async function createMediaViewer(asset, imageUrl, entry) {const video = document.createElement("video");video.className = "detail-video";video.controls = true;- video.preload = "metadata";+ video.preload = "none";video.autoplay = false;video.playsInline = true;const poster = posterAssetForVideo(entry, asset);if (poster) video.poster = await originalScreenshotUrl(poster.id);- video.src = url;+ video.controls = false;+ video.preparePlayback = () => { if (!video.getAttribute("src")) video.src = url; };wrap.releaseMedia = () => {video.pause();URL.revokeObjectURL(url);@@ -6319,6 +6386,7 @@ async function createMediaViewer(asset, imageUrl, entry) {error.hidden = true;video.addEventListener("error", () => { wrap.classList.add("has-playback-error"); error.hidden = false; });wrap.append(video, error);+ addVideoPlayButton(video);return wrap;}if (asset.kind === "audio") {@@ -6498,6 +6566,21 @@ async function loadRemoteMarkdownImage(assetId, urlValue) {return rememberDetailBlobUrl(blob);}+function addVideoPlayButton(video) {+ if (video.closest(".detail-video-surface")) return;+ const surface = el("div", "detail-video-surface");+ video.replaceWith(surface);+ const button = iconActionButton("play", "播放视频", async () => {+ try { await video.preparePlayback?.(); video.controls = true; await video.play(); }+ catch (error) { showFeedback(error.message, true); }+ });+ button.classList.add("detail-video-play");+ const update = () => { button.hidden = !video.paused && !video.ended || Boolean(video.error); };+ for (const event of ["play", "pause", "ended", "error"]) video.addEventListener(event, update);+ surface.append(video, button);+ update();+}+function rememberDetailBlobUrl(blob) {const url = URL.createObjectURL(blob);detailMediaUrls.add(url);@@ -6514,33 +6597,39 @@ async function createReferencedMediaViewer(asset, entry) {video.className = "detail-video";video.controls = true;video.playsInline = true;- video.preload = "metadata";+ video.preload = "none";+ video.controls = false;const poster = posterAssetForVideo(entry, asset);const blob = poster ? await getMediaBlob(poster.id) : null;if (blob) video.poster = rememberDetailBlobUrl(blob);- const status = textEl("p", "media-playback-status", "播放器正在加载…");- const source = textEl("a", "button-secondary media-reference-fallback", "打开来源");- source.href = url;- source.target = "_blank";- source.rel = "noopener noreferrer";- wrap.append(video, status, source);+ const status = el("p", "media-playback-status");+ status.hidden = true;+ wrap.append(video, status);wrap.mediaController = await attachRemoteVideo(video, asset.reference, (message, failed) => {status.textContent = t(message);status.classList.toggle("error", failed);- });+ status.hidden = !failed;+ }, { defer: true });+ addVideoPlayButton(video);return wrap;}const embedUrl = officialMediaEmbedUrl(url, provider);- if (provider === "youtube" && embedUrl && !await ensureYouTubePlaybackPermission(chrome, { request: false })) {+ let youtubeReady = provider !== "youtube";+ let setupFailed = false;+ if (provider === "youtube" && embedUrl) {+ try { youtubeReady = await ensureYouTubePlaybackPermission(chrome, { request: false }); }+ catch (error) { setupFailed = true; console.debug("PromptDirector YouTube player setup", error); }+ }+ if (provider === "youtube" && embedUrl && !youtubeReady) {return createPlaybackFallback(entry, asset, {providerLabel,- reason: "首次在案例库播放 YouTube,需要授权播放器域名。只影响当前扩展发起的播放器,不读取网页内容。",- actionLabel: "授权并在案例库播放",+ reason: setupFailed ? "播放器暂不可用" : "允许连接 YouTube 播放器后即可在这里播放。",+ actionLabel: setupFailed ? "重试" : "授权并在案例库播放",onAction: async (button) => {button.disabled = true;try {- if (!await ensureYouTubePlaybackPermission(chrome, { request: true })) throw new Error("未获得 YouTube 播放权限");- await renderDetail();+ if (!await ensureYouTubePlaybackPermission(chrome, { request: true })) { button.disabled = false; return; }+ if (currentDetailId === entry.id) await renderDetail({ rebuildMedia: true });} catch (error) {showFeedback(error.message || "YouTube 播放授权失败", true);button.disabled = false;@@ -6568,13 +6657,7 @@ async function createReferencedMediaViewer(asset, entry) {status.classList.toggle("error", failed);}): basicEmbedController(frame, status, providerLabel);- const source = textEl("a", "button-secondary media-reference-fallback", "打开来源");- source.href = provider === "youtube" ? youtubeWatchUrl(url) : url;- source.target = "_blank";- source.rel = "noopener noreferrer";- const actions = el("div", "media-playback-actions");- actions.append(source);- wrap.append(frame, status, actions);+ wrap.append(frame, status);wrap.mediaController = controller;return wrap;}@@ -6582,7 +6665,6 @@ async function createReferencedMediaViewer(asset, entry) {}async function createPlaybackFallback(entry, asset, { providerLabel, reason, actionLabel = "", onAction = null }) {- const url = asset.reference?.url || asset.sourceUrl;const card = el("div", "detail-video-wrap platform-playback-fallback");const stage = el("div", "detail-video unavailable-video-stage");stage.setAttribute("role", "img");@@ -6604,13 +6686,6 @@ async function createPlaybackFallback(entry, asset, { providerLabel, reason, actactions.append(action);}actions.append(createLocalMediaUploadControl(entry, { label: "附加本地视频", accept: "video/*" }));- if (url) {- const open = textEl("a", "button-secondary", "打开来源");- open.href = providerLabel === "YouTube" ? youtubeWatchUrl(url) : url;- open.target = "_blank";- open.rel = "noopener noreferrer";- actions.append(open);- }card.append(stage, status, actions);return card;}@@ -8732,6 +8807,58 @@ async function analyzeEntryVisualSet(entry, button) {await refreshLibrary();}+async function chooseCaseCover(entry) {+ let selectedId = "";+ let uploadedFile = null;+ const result = await showAppDialog({+ title: "更换封面",+ renderBody: ({ body, form }) => {+ const grid = el("div", "case-cover-grid");+ for (const asset of entryMediaAssets(entry).filter(item => item.kind === "image")) {+ const pick = el("button", "button-secondary case-cover-option");+ pick.type = "button";+ pick.setAttribute("aria-label", asset.sourceTitle || t("选择图片"));+ pick.setAttribute("aria-pressed", String(caseCoverAsset(entry)?.id === asset.id));+ pick.dataset.assetId = asset.id;+ const image = document.createElement("img");+ image.alt = asset.sourceTitle || "";+ createThumbnailUrl(asset.id).then(url => { image.src = url; }).catch(() => undefined);+ pick.append(image);+ pick.addEventListener("click", () => { selectedId = asset.id; form.requestSubmit(); });+ grid.append(pick);+ }+ const upload = textEl("button", "button-secondary", "上传图片");+ upload.type = "button";+ const input = document.createElement("input");+ input.type = "file";+ input.accept = "image/*";+ input.hidden = true;+ upload.addEventListener("click", () => input.click());+ input.addEventListener("change", () => { uploadedFile = input.files?.[0]; if (uploadedFile) form.requestSubmit(); });+ body.append(grid, upload, input);+ },+ onReady: ({ form }) => { form.querySelector("footer").hidden = true; },+ onSubmit: async () => {+ let uploadedAsset = null;+ try {+ if (uploadedFile) {+ const prepared = await prepareLocalMedia(uploadedFile, crypto.randomUUID());+ if (prepared.asset.kind !== "image") throw new Error("请选择图片");+ uploadedAsset = prepared.asset;+ await saveMediaBlob(uploadedAsset.id, prepared.blob);+ }+ const response = await chrome.runtime.sendMessage({ type: "SET_ENTRY_COVER", entryId: entry.id, assetId: selectedId, ...(uploadedAsset ? { asset: uploadedAsset } : {}) });+ if (!response?.ok) throw new Error(response?.message || "封面更新失败");+ return response;+ } catch (error) {+ if (uploadedAsset) await chrome.runtime.sendMessage({ type: "DISCARD_UNREFERENCED_MEDIA", assetIds: [uploadedAsset.id] }).catch(() => undefined);+ throw error;+ }+ }+ });+ if (result?.ok) await refreshLibrary();+}+function createEntryEditor(entry, options = {}) {const section = el("details", `${options.inline ? "entry-editor-inline" : "detail-section"} entry-editor`);const summary = textEl("summary", "", "编辑案例");@@ -8750,6 +8877,9 @@ function createEntryEditor(entry, options = {}) {const titleRow = el("div", "entry-edit-row");titleRow.append(titleField, saveTitle);body.append(textEl("h4", "", "案例标题"), titleRow);+ const cover = textEl("button", "button-secondary", "更换封面");+ cover.addEventListener("click", () => chooseCaseCover(entry));+ body.append(cover);const currentAsset = entryMediaAssets(entry).find(asset => asset.id === (activeDetailMediaIdByEntry.get(entry.id) || entry.primaryMediaId));section.dataset.assetId = currentAsset?.id || "";if (!usesArticleReader(entry)) {@@ -9283,9 +9413,9 @@ function renderAiRoutingSummary() {const status = `${providerConnectionLabel(profile)} · ${providerCatalogLabel(profile)}`;const configure = document.createElement("button");configure.className = "icon-button";- configure.title = `${t(profile.credentialConfigured ? "编辑配置" : "配置")} · ${providerDisplayLabel(profile)}`;+ configure.title = `${t(providerHasSavedConnection(profile) ? "编辑配置" : "配置")} · ${providerDisplayLabel(profile)}`;configure.setAttribute("aria-label", configure.title);- configure.append(createUiIcon(profile.credentialConfigured ? "pencil" : "plus"));+ configure.append(createUiIcon(providerHasSavedConnection(profile) ? "pencil" : "plus"));configure.type = "button";configure.addEventListener("click", () => openAiProviderDialog(profile.id));const refresh = document.createElement("button");@@ -9304,7 +9434,7 @@ function renderAiRoutingSummary() {}));for (const row of [...group.children]) {const profile = aiProviderRegistry.providers[row.dataset.providerId];- if (!profile.credentialConfigured && !profile.discovery?.error) moreProviders.append(row);+ if (!providerHasSavedConnection(profile) && !profile.discovery?.error) moreProviders.append(row);}return group.childElementCount ? [group] : [];});@@ -9347,12 +9477,16 @@ function renderAiRoutingView() {aiRoutingPanels.forEach((panel) => { panel.hidden = panel.dataset.aiRoutingPanel !== activeAiRoutingTab; });}+function providerHasSavedConnection(profile = {}) {+ return profile.credentialConfigured === true || profile.imageGeneration?.credentialConfigured === true;+}+function providerConnectionReady(profile = {}) {- return profile.credentialConfigured === true && profile.consent === true;+ return providerHasSavedConnection(profile) && profile.consent === true;}function providerConnectionLabel(profile = {}) {- if (!profile.credentialConfigured) return t("尚未连接");+ if (!providerHasSavedConnection(profile)) return t("尚未连接");if (!profile.consent) return t("API Key 已保存,尚未确认发送授权");return t("已连接");}@@ -9505,7 +9639,8 @@ async function openAiProviderDialog(initialProviderId = "") {id: `provider_${key}_apiKey`,label: micuImageService? t("图片分析 API Key(米醋 vip_2,只用于看图)")- : profile.id === "custom-media" ? t("图片分析 API Key") : "API Key",+ : profile.id === "custom-media" ? t("已有对话 / 识别 API Key(可选)") : "API Key",+ advanced: profile.id === "custom-media",type: "secret",autocomplete: "off",placeholder: profile.credentialConfigured ? t("已保存;留空保持不变") : t("粘贴服务商提供的 API Key"),@@ -9515,13 +9650,13 @@ async function openAiProviderDialog(initialProviderId = "") {id: `provider_${key}_imageApiKey`,label: micuImageService? t("图片生成 API Key(米醋 vip_2_image,需单独创建)")- : t("图片生成 API Key(可与分析 Key 不同)"),+ : t("图片生成 API Key"),type: "secret",autocomplete: "off",placeholder: profile.imageGeneration?.credentialConfigured? t("已保存{hint};留空保持不变", { hint: profile.imageGeneration.credentialHint ? t("(尾号 {hint})", { hint: profile.imageGeneration.credentialHint }) : "" })- : micuImageService ? t("粘贴米醋 vip_2_image 分组 Key") : t("留空则复用上方 API Key"),- help: micuImageService ? t("留空会保留已保存的生图 Key。模型目录可见不等于已获得 Image2 生图分组授权,最终以米醋生成接口返回为准。") : ""+ : micuImageService ? t("粘贴米醋 vip_2_image 分组 Key") : t("粘贴图片生成服务提供的 API Key"),+ help: t("仅用于生成图片;对话和图片、视频识别在“自定义兼容服务(对话与识别)”配置。已有配置保留。")});if (custom) fields.push({ id: `provider_${key}_endpoint`, label: t(profile.id === "custom-media" ? "图片分析接口(高级)" : "接口地址(高级)"), type: "url", value: profile.endpoint, advanced: true },@@ -9541,7 +9676,8 @@ async function openAiProviderDialog(initialProviderId = "") {value: currentModel,options: [{ value: "", label: t("不更改这些任务") }, ...group.options],placeholder: custom ? t("填写这个兼容接口实际调用的模型") : "",- help: t("保存后更新:{tasks}", { tasks: group.taskIds.map(taskDisplayLabel).join("、") })+ help: t("保存后更新:{tasks}", { tasks: group.taskIds.map(taskDisplayLabel).join("、") }),+ advanced: profile.id === "custom-media"});}for (const taskId of ["imageGeneration", "videoGeneration"].filter((taskId) => profile.capabilities.includes(taskId))) {@@ -9559,16 +9695,16 @@ async function openAiProviderDialog(initialProviderId = "") {type: catalogRequired || options.length ? "select" : "text",value: options.some((option) => option.value === configuredModel) ? configuredModel : "",options,- advanced: true+ advanced: profile.id !== "custom-media"});}if (profile.id === "custom-media") fields.push(- { id: `provider_${key}_imageProtocol`, label: t("图片生成协议(高级)"), type: "select", value: profile.imageGeneration?.protocol || "none", advanced: true, options: [+ { id: `provider_${key}_imageProtocol`, label: t("图片生成协议"), type: "select", value: profile.imageGeneration?.protocol || "none", options: [{ value: "none", label: t("不启用图片生成") },{ value: "responses_tool", label: t("OpenAI Responses 生图工具") },{ value: "images_generations", label: "Images Generations / Edits" }] },- { id: `provider_${key}_imageEndpoint`, label: t("图片生成接口(高级)"), type: "url", value: profile.imageGeneration?.endpoint || "", advanced: true },+ { id: `provider_${key}_imageEndpoint`, label: t("图片生成接口"), type: "url", value: profile.imageGeneration?.endpoint || "" },{ id: `provider_${key}_imageEditsEndpoint`, label: t("多图参考 / 编辑接口(高级)"), type: "url", value: profile.imageGeneration?.editsEndpoint || "", advanced: true },{ id: `provider_${key}_imageSizes`, label: t("此服务支持的图片尺寸(能力声明,不是本轮输出值)"), type: "text", value: (profile.imageGeneration?.sizes ?? []).join(", "), advanced: true },{ id: `provider_${key}_imageQualities`, label: t("此服务支持的质量选项(能力声明,不是本轮输出值)"), type: "text", value: (profile.imageGeneration?.qualities ?? []).join(", "), advanced: true }@@ -9631,7 +9767,7 @@ async function openAiProviderDialog(initialProviderId = "") {}if (model) model.value = imagePreset.defaultModel;controls.get(`${prefix}imageSizes`).value = imagePreset.models[imagePreset.defaultModel].sizes.join(", ");- controls.get(`${prefix}apiKey`).focus();+ controls.get(`${prefix}imageApiKey`).focus();});for (const profile of profiles) {if (profile.category === "custom" || !connectionAnalysisTaskIds(profile).length) continue;@@ -9952,6 +10088,7 @@ function modelAssignmentHelp(profile, taskId, selectedValue) {function taskModelOptions(profile, taskId) {if (!profile?.capabilities?.includes(taskId)) return [];+ if (!profile.credentialConfigured && !(taskId === "imageGeneration" && profile.imageGeneration?.credentialConfigured)) return [];const manualModel = profile.catalogRequiredTasks?.includes(taskId) ? "" : profile.models?.[taskId] || "";return discoveredModelOptions(profile, taskId, manualModel);}@@ -10197,31 +10334,44 @@ async function startDeepSeekAnalysisBatch() {}}+let detailOrganizationProgress = null;+async function organizeDetailTags() {+ if (elements.organizeDetailTags.disabled) return;const chunks = createDetailOrganizationChunks(facetCatalog, entries);if (!chunks.length) {elements.organizeDetailStatus.textContent = t("当前没有需要整理的三级标签组。");return;}- const tagCount = chunks.reduce((sum, chunk) => sum + chunk.d.length, 0);- const inputBytes = chunks.reduce((sum, chunk) => sum + new TextEncoder().encode(JSON.stringify(chunk)).length, 0);+ const settings = await privateAiSettings();+ const key = JSON.stringify({ chunks, provider: settings.activeProvider, model: settings.analysisModel, compatible: { endpoint: settings.compatible?.endpoint, model: settings.compatible?.model } });+ const previous = detailOrganizationProgress?.key === key ? detailOrganizationProgress : null;+ const completed = previous?.results.length || 0;+ const pending = chunks.slice(completed);+ const tagCount = pending.reduce((sum, chunk) => sum + chunk.d.length, 0);+ const inputBytes = pending.reduce((sum, chunk) => sum + new TextEncoder().encode(JSON.stringify(chunk)).length, 0);const warning = currentLocale() === "en"- ? `Organize ${tagCount} detail tags in ${chunks.length} paid requests (${inputBytes.toLocaleString("en")} serialized input bytes)? Cases and prompts are not sent.`- : `将用 ${chunks.length} 次付费请求整理 ${tagCount} 个三级标签,序列化输入共 ${inputBytes.toLocaleString("zh-CN")} 字节;不会发送案例原文。确认继续吗?`;+ ? `Organize ${tagCount} detail tags in ${pending.length} paid requests (${inputBytes.toLocaleString("en")} serialized input bytes)? Cases and prompts are not sent.`+ : `将用 ${pending.length} 次付费请求整理 ${tagCount} 个三级标签,序列化输入共 ${inputBytes.toLocaleString("zh-CN")} 字节;不会发送案例原文。确认继续吗?`;if (!await confirmAppAction({ title: "整理三级标签?", description: warning, confirmLabel: "确认并开始" })) return;elements.organizeDetailTags.disabled = true;- const mappings = [];+ detailOrganizationProgress = previous || { key, results: [] };+ const mappings = detailOrganizationProgress.results.flatMap(result => result.mappings);const usage = { promptTokens: 0, completionTokens: 0, totalTokens: 0, cacheHitTokens: 0 };+ for (const result of detailOrganizationProgress.results) {+ for (const name of Object.keys(usage)) usage[name] += Math.max(0, Number(result.usage?.[name]) || 0);+ }try {- const settings = await privateAiSettings();- for (let index = 0; index < chunks.length; index += 1) {+ for (let index = completed; index < chunks.length; index += 1) {elements.organizeDetailStatus.textContent = t("正在整理 {current}/{total}…", { current: index + 1, total: chunks.length });const result = await organizeDetailTagsWithDeepSeek(chunks[index], settings);+ detailOrganizationProgress.results.push(result);mappings.push(...result.mappings);for (const key of Object.keys(usage)) usage[key] += Math.max(0, Number(result.usage?.[key]) || 0);}const response = await chrome.runtime.sendMessage({ type: "APPLY_DETAIL_TAG_ORGANIZATION", mappings });if (!response?.ok) throw new Error(response?.message || "无法应用三级标签整理结果");+ detailOrganizationProgress = null;elements.organizeDetailStatus.textContent = t("{message} · 输入 {input} / 输出 {output} tokens", { message: translateUiMessage(response.message), input: usage.promptTokens, output: usage.completionTokens });await refreshLibrary();} catch (error) {diff --git a/extension/manifest.json b/extension/manifest.jsonindex 078c816..a16dbca 100644--- a/extension/manifest.json+++ b/extension/manifest.json@@ -1,7 +1,7 @@{"manifest_version": 3,"name": "__MSG_extensionName__",- "version": "1.22.4",+ "version": "1.23.0","key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2m8W9ACXJTkJqPAd36sPrtzonmHhOYU34uS7c+D7DXX6ggWNMwB4xZapGFJ4ScBQJv71PeG9KfsEnhcXFZ9RoX/X3wY+57evL19hf6woNX1xxhKOe1rtx5QmzWCEYIr99TzW50k/N9U6tS9Ri+2DHKYA85ssXTC8B2yRQ5zUXhsAWZe/HDU18UFuvUKXYt3ZdIUi31c2vIlgFFBfsyKbIUMny9LlxL/smb4vJzU/+A3LwJDjjvOtS/lmQ2vHoQGjHJItO18bYI6h67fIEvmWk+HJKtO08Ca+5RLS8TYhI+K7l7S0RyDVNujyVWtvhAULot1H0BvteYL87fKu3SNywIDAQAB","homepage_url": "https://github.com/wchao6891/PromptDirector","default_locale": "zh_CN",@@ -22,7 +22,8 @@"sidePanel","scripting","storage",- "unlimitedStorage"+ "unlimitedStorage",+ "webRequest"],"host_permissions": ["https://wchao6891.github.io/*",diff --git a/extension/media-playback.js b/extension/media-playback.jsindex 595c759..0a51f34 100644--- a/extension/media-playback.js+++ b/extension/media-playback.js@@ -32,11 +32,13 @@ export async function ensureYouTubePlaybackPermission(chromeApi, { request = falorigins: [...YOUTUBE_PLAYBACK_HOSTS]};const permissions = chromeApi?.permissions;- const dnr = chromeApi?.declarativeNetRequest;- if (!permissions?.contains || !dnr?.updateSessionRules) return false;- let granted = await permissions.contains(permission);- if (!granted && request) granted = await permissions.request(permission);+ if (!permissions?.contains) return false;+ const granted = request+ ? await permissions.request(permission)+ : await permissions.contains(permission);if (!granted) return false;+ const dnr = chromeApi?.declarativeNetRequest;+ if (!dnr?.updateSessionRules) throw new Error("浏览器暂不支持此播放器,请打开来源观看");const rule = buildYouTubePlaybackRule({extensionId: chromeApi.runtime?.id,homepageUrl: chromeApi.runtime?.getManifest?.().homepage_url@@ -115,6 +117,8 @@ export function localVideoController(video) {video,getCurrentTimeMs: async () => Math.max(0, Math.round(video.currentTime * 1000)),seekToMs: async (value) => {+ await video.preparePlayback?.();+ video.controls = true;video.currentTime = Math.max(0, Number(value) || 0) / 1000;await video.play().catch(() => undefined);}diff --git a/extension/media.js b/extension/media.jsindex 6a08d4f..4a74ef5 100644--- a/extension/media.js+++ b/extension/media.js@@ -146,6 +146,7 @@ export function updateLocalAssetReferenceMetadata(entryValue, assetIdValue, metaexport function normalizeEntryMedia(entryValue = {}) {const entry = structuredClone(entryValue);+ if (entry.sourceFacts) delete entry.sourceFacts.captureWarnings;const mediaAssets = uniqueMediaAssets(Array.isArray(entry.mediaAssets) ? entry.mediaAssets : entry.visuals);@@ -174,6 +175,7 @@ export function normalizeEntryMedia(entryValue = {}) {const contentAssets = mediaAssets.filter((item) => item.usage !== "poster");const requestedPrimary = clean(entry.primaryMediaId || entry.primaryVisualId);entry.mediaAssets = mediaAssets;+ if (!mediaAssets.some(asset => asset.kind === "image" && asset.id === entry.coverVisualId)) delete entry.coverVisualId;entry.primaryMediaId = contentAssets.some((item) => item.id === requestedPrimary) ? requestedPrimary : contentAssets[0]?.id || "";const articleDocument = normalizeArticleDocument(entry.articleDocument);if (articleDocument) entry.articleDocument = articleDocument;@@ -214,6 +216,21 @@ export function primaryMediaAsset(entryValue = {}) {assets.find((item) => item.usage !== "poster") ?? null;}+export function caseCoverAsset(entryValue = {}) {+ const assets = entryMediaAssets(entryValue);+ const selected = assets.find(asset => asset.kind === "image" && asset.id === entryValue.coverVisualId);+ const primary = primaryMediaAsset(entryValue);+ return selected || (primary?.kind === "image" ? primary : primary?.kind === "video" ? posterAssetForVideo(entryValue, primary) : null)+ || assets.find(asset => asset.kind === "image") || null;+}++export function setCaseCover(entryValue, assetId) {+ const entry = normalizeEntryMedia(entryValue);+ const asset = entry.mediaAssets.find(item => item.id === assetId && item.kind === "image");+ if (!asset) throw new Error("没有找到这张图片");+ return { ...entry, coverVisualId: asset.id };+}+export function primaryImageAsset(entryValue = {}) {const assets = entryMediaAssets(entryValue);const primary = assets.find((item) => item.id === entryValue?.primaryMediaId && item.kind === "image" && item.usage !== "poster");@@ -250,6 +267,7 @@ export function removeEntryMedia(entryValue, assetId) {if (item.usage === "poster" && item.derivedFromAssetId === id) removedIds.add(item.id);}entry.mediaAssets = entry.mediaAssets.filter((item) => !removedIds.has(item.id));+ if (removedIds.has(entry.coverVisualId)) delete entry.coverVisualId;entry.mediaAssets = entry.mediaAssets.map((item) => {if (!removedIds.has(item.posterAssetId)) return item;const next = { ...item };diff --git a/extension/page-capture-adapter-registry.js b/extension/page-capture-adapter-registry.jsindex 806217b..80ed3bc 100644--- a/extension/page-capture-adapter-registry.js+++ b/extension/page-capture-adapter-registry.js@@ -25,7 +25,7 @@ export const PAGE_CAPTURE_ADAPTERS = Object.freeze([adapter("krea", "Krea", ["krea.ai"], "verified-declarative", ["a[href^='/feed/']", "[data-testid*=generation]", "[class*=gallery] > *"], {}, ["krea.ai"]),adapter("tapnow", "TapNow", ["tapnow.ai"], "generic", ["[data-testid*=work]", "[class*=gallery] > *"]),adapter("lovart", "Lovart", ["lovart.ai"], "generic", GENERIC_CARD_SELECTORS),- adapter("midjourney", "Midjourney", ["midjourney.com"], "generic", GENERIC_CARD_SELECTORS),+ adapter("midjourney", "Midjourney", ["midjourney.com"], "verified-declarative", ['a[href^="/jobs/"]'], {}, ["cdn.midjourney.com"]),adapter("civitai", "Civitai", ["civitai.com"], "generic", GENERIC_CARD_SELECTORS),adapter("runway", "Runway", ["runwayml.com"], "generic", GENERIC_CARD_SELECTORS),adapter("kling", "可灵", ["klingai.com", "klingai.kuaishou.com"], "generic", GENERIC_CARD_SELECTORS),diff --git a/extension/page-capture-repair.js b/extension/page-capture-repair.jsindex 5905a3b..449bfd3 100644--- a/extension/page-capture-repair.js+++ b/extension/page-capture-repair.js@@ -1,4 +1,5 @@import { remapArticleDocumentAssets } from "./article-document.js";+import { markEntryTextChanged } from "./analysis-revision.js";export function capturedMediaPrompts(candidate, assetIds, existing = []) {const prompts = existing.map(item => ({ ...item }));@@ -18,6 +19,8 @@ function sourceUrls(media) {export function matchingCapturedAsset(entry, candidate, media) {const urls = sourceUrls(media);const assets = (entry.mediaAssets || []).filter(asset => asset.kind === media.kind && asset.usage !== "poster");+ const identical = media.contentHash && assets.find(asset => asset.contentHash === media.contentHash && asset.storageMode === "managed");+ if (identical) return identical;const direct = assets.filter(asset => [...sourceUrls(asset)].some(url => urls.has(url))&& (!media.downloadDataUrl || asset.sourceTitle === media.filename));if (direct.length) return direct.find(asset => asset.storageMode === "managed") || direct[0];@@ -47,7 +50,17 @@ export async function planPageCaptureRepair(entry, candidate, hasBlob) {} else pending.push(media);}const promptsChanged = capturedMediaPrompts(candidate, assetIds, entry.mediaPrompts).length > (entry.mediaPrompts || []).length;- return { pending, matched, assetIds, obsoleteReferences, promptsChanged };+ // Only explicitly appended capture blocks may extend an existing case. A rescan+ // of the source body must not replace text the user already edited in the library.+ const textAdditions = [];+ let knownText = String(entry.text || "");+ for (const block of candidate.textBlocks || []) {+ const text = String(block.text || "").trim();+ if (!block.id?.startsWith("added:") || !text || knownText.includes(text)) continue;+ textAdditions.push({ ...block, text });+ knownText += `\n\n${text}`;+ }+ return { pending, matched, assetIds, obsoleteReferences, promptsChanged, textAdditions };}export function mergePageCaptureRepair(entry, candidate, plan, capturedAssets, assetIds) {@@ -77,8 +90,31 @@ export function mergePageCaptureRepair(entry, candidate, plan, capturedAssets, aif (!assetId || !assets.some(asset => asset.id === assetId && asset.storageMode === "managed")) return block;return { ...block, kind: media.kind, assetId };});+ if (articleDocument) {+ const sourceBlocks = candidate.articleDocument?.blocks || [];+ for (const [index, block] of sourceBlocks.entries()) {+ const assetId = block.assetId && assetIds.get(block.assetId);+ if (!assetId || articleDocument.blocks.some(item => item.id === block.id || item.assetId === assetId)) continue;+ const next = sourceBlocks.slice(index + 1).find(item => articleDocument.blocks.some(saved => saved.id === item.id));+ const position = next ? articleDocument.blocks.findIndex(item => item.id === next.id) : articleDocument.blocks.length;+ articleDocument.blocks.splice(position, 0, { ...block, assetId });+ }+ articleDocument.blocks = articleDocument.blocks.map((block, sourceOrder) => ({ ...block, sourceOrder }));+ }+ const textAdditions = plan.textAdditions || [];+ if (articleDocument) {+ for (const block of textAdditions) {+ const source = candidate.articleDocument?.blocks?.find(item => item.id === `${block.id}:source` && item.kind === "link");+ const content = candidate.articleDocument?.blocks?.find(item => item.id === block.id && item.text === block.text)+ || { id: block.id, kind: "paragraph", text: block.text };+ for (const item of [source, content].filter(Boolean)) articleDocument.blocks.push({ ...item,+ sourceOrder: articleDocument.blocks.reduce((max, current) => Math.max(max, current.sourceOrder ?? 0), -1) + 1+ });+ }+ }+ const nextText = [entry.text, ...textAdditions.map(block => block.text)].filter(Boolean).join("\n\n");return {- ...entry,+ ...(textAdditions.length ? markEntryTextChanged(entry, nextText) : entry),mediaAssets: assets,mediaPrompts: capturedMediaPrompts(candidate, assetIds, entry.mediaPrompts),primaryMediaId: primary?.storageMode === "managed" ? primary.id : preferred?.id || primary?.id || entry.primaryMediaId,@@ -86,3 +122,10 @@ export function mergePageCaptureRepair(entry, candidate, plan, capturedAssets, asourceFacts: { ...entry.sourceFacts, ...candidate.sourceFacts }};}++export function pageCaptureMediaReceipt(candidate, assetIds, failedMediaIds = new Set()) {+ return {+ savedMediaIds: candidate.media.filter(media => assetIds.has(media.id) && !failedMediaIds.has(media.id)).map(media => media.id),+ pendingMediaIds: candidate.media.filter(media => failedMediaIds.has(media.id)).map(media => media.id)+ };+}diff --git a/extension/page-capture-site-adapters.js b/extension/page-capture-site-adapters.jsindex 7367cc0..74219b5 100644--- a/extension/page-capture-site-adapters.js+++ b/extension/page-capture-site-adapters.js@@ -30,6 +30,8 @@ export function installPageCaptureSiteObserver(options = {}) {Object.defineProperty(globalThis, stateKey, { value: state, configurable: true });const safeText = (value, limit = 10000) => clean(value).slice(0, limit);+ const safeMultiline = (value, limit = 10000) => String(value ?? "")+ .replace(/\r\n?/gu, "\n").replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/gu, "").trim().slice(0, limit);const safeInteger = (value) => Number.isSafeInteger(Number(value)) ? Number(value) : 0;const modelKey = (content) => {try {@@ -53,7 +55,8 @@ export function installPageCaptureSiteObserver(options = {}) {common_attr: {id,title: safeText(item?.common_attr?.title, 500),- description: safeText(item?.common_attr?.description),+ description: safeMultiline(item?.common_attr?.description),+ cover_url: safeText(item?.common_attr?.cover_url, 5000),create_time: safeInteger(item?.common_attr?.create_time)},author: {@@ -61,7 +64,13 @@ export function installPageCaptureSiteObserver(options = {}) {uid: safeText(item?.author?.uid, 200)},aigc_image_params: {- text2image_params: { prompt: safeText(item?.aigc_image_params?.text2image_params?.prompt, 30000) }+ text2image_params: { prompt: safeMultiline(item?.aigc_image_params?.text2image_params?.prompt, 30000) },+ text2video_params: { video_gen_inputs: (item?.aigc_image_params?.text2video_params?.video_gen_inputs || []).map(input => ({+ prompt: safeMultiline(input.prompt, 30000),+ unified_edit_input: { meta_list: (input.unified_edit_input?.meta_list || []).filter(part => part.meta_type === "text").map(part => ({+ meta_type: "text", text: safeMultiline(part.text, 30000)+ })) }+ })) }},model_key: safeText(item?.model_key, 200) || modelKey(item?.aigc_draft?.content),statistic: {@@ -72,7 +81,15 @@ export function installPageCaptureSiteObserver(options = {}) {large_images: (Array.isArray(item?.image?.large_images) ? item.image.large_images : []).slice(0, state.maxMedia).map(safeImage)- }+ },+ ...(item?.video?.origin_video ? { video: {+ duration: Number(item.video.duration) || 0,+ origin_video: {+ video_url: safeText(item.video.origin_video.video_url, 5000),+ width: safeInteger(item.video.origin_video.width),+ height: safeInteger(item.video.origin_video.height)+ }+ } } : {})};};const ingestModels = (value) => {@@ -151,6 +168,59 @@ export function collectPageCaptureSitePayload(options = {}) {const maxNodes = Number.isSafeInteger(Number(options.maxCandidates)) && Number(options.maxCandidates) > 0 ? Number(options.maxCandidates) : 0;const maxTextCharacters = Number.isSafeInteger(Number(options.maxTextCharacters)) && Number(options.maxTextCharacters) > 0 ? Number(options.maxTextCharacters) : 0;const host = clean(globalThis.location?.hostname).toLocaleLowerCase("en-US");+ if (host === "midjourney.com" || host.endsWith(".midjourney.com")) {+ const pageUrl = new URL(globalThis.location.href);+ const jobId = /^\/jobs\/([a-f0-9-]+)\/?$/iu.exec(pageUrl.pathname)?.[1];+ const index = pageUrl.searchParams.get("index") || "0";+ const elements = [...document.querySelectorAll("img,video")];+ const mediaFor = (id, selectedIndex, rootElements) => rootElements.flatMap(element => {+ const source = element.currentSrc || element.src || "";+ try {+ const url = new URL(source);+ if (url.hostname !== "cdn.midjourney.com") return [];+ const image = url.pathname.startsWith(`/${id}/0_${selectedIndex}.`);+ const preview = url.pathname.startsWith(`/${id}/0_${selectedIndex}_`);+ const video = element.tagName === "VIDEO" && url.pathname.startsWith(`/video/${id}/${selectedIndex}.`);+ if (!image && !preview && !video) return [];+ return [{ url: url.href, kind: video ? "video" : "image", original: image || video,+ width: element.naturalWidth || element.videoWidth || 0, height: element.naturalHeight || element.videoHeight || 0,+ posterUrl: element.poster || "" }];+ } catch { return []; }+ }).sort((a,b) => Number(b.original)-Number(a.original) || Number(Boolean(b.posterUrl))-Number(Boolean(a.posterUrl)) || b.width-a.width);+ if (jobId) {+ const copyButton = [...document.querySelectorAll("button")].find(button => button.textContent.trim() === "Copy Prompt");+ let scope = copyButton?.parentElement;+ while (scope?.parentElement && !scope.querySelector(".notranslate p")) scope = scope.parentElement;+ const promptNode = scope?.querySelector(".notranslate p");+ const parameters = [...(scope?.querySelectorAll("button > span:first-child") || [])]+ .map(node => node.textContent.trim()).filter(text => text.startsWith("--"));+ const references = new Map();+ for (const button of scope?.querySelectorAll("button[title]") || []) {+ const flag = /\((--[a-z]+)\)/iu.exec(button.title)?.[1];+ const image = button.querySelector("img");+ if (!flag || !image) continue;+ const url = /^https?:/u.test(image.alt) ? image.alt : image.currentSrc || image.src;+ if (!/^https?:/u.test(url)) continue;+ references.set(flag, [...(references.get(flag) || []), url]);+ }+ const prompt = [promptNode?.textContent.trim(), ...new Set(parameters),+ ...[...references].map(([flag,urls]) => `${flag} ${[...new Set(urls)].join(" ")}`)].filter(Boolean).join(" ");+ const media = mediaFor(jobId,index,elements).slice(0,1);+ const author = [...(scope?.querySelectorAll('a[href^="/@"]') || [])].filter(a=>!a.closest("nav")).at(-1)?.textContent.trim() || "";+ return {adapter:"midjourney",pageKind:"detail",canonicalUrl:pageUrl.href,+ items:[{jobId,index,prompt,author,media,canonicalUrl:pageUrl.href}]};+ }+ const items = [...document.querySelectorAll('a[href^="/jobs/"]')].slice(0,maxNodes).flatMap(link => {+ const url = new URL(link.href); const id = /^\/jobs\/([a-f0-9-]+)\/?$/iu.exec(url.pathname)?.[1];+ if (!id) return [];+ const selectedIndex = url.searchParams.get("index") || "0";+ const background = getComputedStyle(link).backgroundImage;+ const urls = [...background.matchAll(/url\(["']?([^"')]+)["']?\)/gu)].map(match=>match[1]);+ const observed = [...link.querySelectorAll("img,video"), ...urls.reverse().map(src=>({src,tagName:"IMG"}))];+ return [{jobId:id,index:selectedIndex,canonicalUrl:url.href,media:mediaFor(id,selectedIndex,observed).slice(0,1),prompt:""}];+ });+ return {adapter:"midjourney",pageKind:"feed",canonicalUrl:pageUrl.href,items};+ }if ((host === "artstation.com" || host.endsWith(".artstation.com"))&& /^\/projects\/[^/]+\/?$/u.test(globalThis.location?.pathname || "")) {const description = globalThis.document?.querySelector?.(".project-description");@@ -511,8 +581,7 @@ export function collectPageCaptureSitePayload(options = {}) {const path = clean(globalThis.location?.pathname);const rawLastPart = path.split("/").filter(Boolean).at(-1) || "";- const workId = /^\d{8,32}$/u.test(rawLastPart) ? rawLastPart : "";- const pageKind = workId ? "detail" : /^\/ai-tool\/(?:home|explore)(?:\/|$)/u.test(path) ? "feed" : "unknown";+ const routeWorkId = /^\d{8,32}$/u.test(rawLastPart) ? rawLastPart : "";// Read only the public work data attached to the current rendered surface.const componentProps = function* (element) {const key = Object.keys(element || {}).find((name) => name.startsWith("__reactFiber$"));@@ -522,6 +591,22 @@ export function collectPageCaptureSitePayload(options = {}) {if (fiber.memoizedProps) yield fiber.memoizedProps;}};+ const visibleDetail = [...globalThis.document?.querySelectorAll?.('[data-detail-container-appearance]') || []]+ .find(element => element.getClientRects?.().length);+ const visibleDialog = [...globalThis.document?.querySelectorAll?.('[role="dialog"]') || []]+ .find(element => element.getClientRects?.().length);+ const detailSurface = visibleDetail || visibleDialog;+ let visibleWorkId = "";+ for (const element of detailSurface ? [detailSurface, ...detailSurface.querySelectorAll?.("img,h1,h2,video") || []] : []) {+ for (const props of componentProps(element)) {+ const id = clean(props.renderModel?.id);+ if (/^\d{8,32}$/u.test(id)) { visibleWorkId = id; break; }+ }+ if (visibleWorkId) break;+ }+ // A work overlay can keep the feed URL. Its own identity wins over background cards.+ const workId = visibleWorkId || routeWorkId;+ const pageKind = workId || visibleDetail ? "detail" : /^\/ai-tool\/(?:home|explore)(?:\/|$)/u.test(path) ? "feed" : "unknown";const feedRoot = globalThis.document?.querySelector?.('[aria-label="Explore content"]');let currentItems = null;for (const props of componentProps(feedRoot)) {@@ -541,7 +626,15 @@ export function collectPageCaptureSitePayload(options = {}) {create_time: item.commonAttr.createTime},author: { name: clean(item.author?.name), uid: clean(item.author?.uid) },- aigc_image_params: { text2image_params: { prompt: String(params?.prompt || "").slice(0, maxTextCharacters) } },+ aigc_image_params: {+ text2image_params: { prompt: String(params?.prompt || "").slice(0, maxTextCharacters) },+ text2video_params: { video_gen_inputs: (item.aigcImageParams?.text2videoParams?.videoGenInputs || []).map(input => ({+ prompt: String(input.prompt || "").slice(0, maxTextCharacters),+ unified_edit_input: { meta_list: (input.unifiedEditInput?.metaList || []).filter(part => part.metaType === "text").map(part => ({+ meta_type: "text", text: String(part.text || "").slice(0, maxTextCharacters)+ })) }+ })) }+ },model_key: clean(item.modelInfo?.modelName || params?.modelConfig?.modelName),statistic: { favorite_num: item.statistic?.favoriteNum, usage_num: item.statistic?.usageNum },image: { large_images: (item.image?.largeImages || []).slice(0, maxMedia).map((image) => ({@@ -603,6 +696,7 @@ export function collectPageCaptureSitePayload(options = {}) {for (const rawItem of scopedItems) {const item = publicItem(rawItem);const id = clean(item?.common_attr?.id);+ if (pageKind === "detail" && !workId) continue;if (workId && id !== workId) continue;if (!workId && maxNodes && byId.size >= maxNodes && !byId.has(id)) break;if (/^\d{8,32}$/u.test(id)) byId.set(id, item);@@ -618,9 +712,7 @@ export function collectPageCaptureSitePayload(options = {}) {const detailFromDom = () => {if (!workId || !globalThis.document?.body) return null;- const root = [...globalThis.document.querySelectorAll?.('[role="dialog"]') || []]- .find((element) => element.getClientRects?.().length)- || globalThis.document.querySelector?.("[data-detail-container-appearance]") || globalThis.document.body;+ const root = detailSurface || globalThis.document.body;for (const heading of root.querySelectorAll?.("h1,h2") || []) {for (const props of componentProps(heading)) {const data = props.data;@@ -725,6 +817,36 @@ export function collectPageCaptureSitePayload(options = {}) {}export function normalizePageCaptureSitePayload(value, canonicalUrlValue = "") {+ if (value?.adapter === "midjourney") {+ const pageKind = value.pageKind === "feed" ? "feed" : "detail";+ const candidates = (value.items || []).flatMap(item => {+ const canonicalUrl = safeHttpUrl(item.canonicalUrl);+ if (!canonicalUrl) return [];+ const source = new URL(canonicalUrl);+ if (!(source.hostname === "midjourney.com" || source.hostname.endsWith(".midjourney.com"))) return [];+ const jobId = /^\/jobs\/([a-f0-9-]+)\/?$/iu.exec(source.pathname)?.[1];+ const index = source.searchParams.get("index") || "0";+ if (!jobId || !/^\d+$/u.test(index)) return [];+ const itemId = `${jobId}:${index}`;+ const prompt = cleanMultiline(item.prompt);+ const media = (item.media || []).flatMap(asset => {+ const url = safeTrustedMediaUrl("midjourney",asset.url);+ if (!url || ![ `/${jobId}/0_${index}.`, `/${jobId}/0_${index}_`, `/video/${jobId}/${index}.` ].some(prefix => new URL(url).pathname.startsWith(prefix))) return [];+ return [{id:`midjourney:${itemId}`,kind:asset.kind === "video" ? "video" : "image",url,+ posterUrl:safeTrustedMediaUrl("midjourney",asset.posterUrl),width:Number(asset.width)||0,height:Number(asset.height)||0,+ placement:"inline",sourceKind:asset.original ? "site-original" : "source",captureMethod:"source",originalPrompt:prompt}];+ });+ if (!media.length) return [];+ const pageType = media.some(asset=>asset.kind === "video") ? "video" : "artwork";+ return [{id:`midjourney:${itemId}`,adapter:"midjourney",pageKind:"detail",pageType,canonicalUrl,+ title:prompt.slice(0,160) || `Midjourney ${jobId.slice(0,8)}`,contentText:prompt,media,+ completeness:prompt && media.every(asset=>asset.sourceKind === "site-original") ? "complete" : "partial",+ sourceFacts:{provider:"midjourney",pageType,itemId,author:clean(item.author),originalPromptAvailable:Boolean(prompt),extractionMethod:"structured"}}];+ });+ return { ...(pageKind === "detail" ? candidates[0] : {}), adapter:"midjourney",pageKind,+ canonicalUrl:safeHttpUrl(value.canonicalUrl || canonicalUrlValue),candidates,+ completeness:candidates.length && candidates.every(item=>item.completeness === "complete") ? "complete" : "partial" };+ }if (value?.adapter === "artstation") {const canonicalUrl = safeHttpUrl(canonicalUrlValue || value.canonicalUrl);if (!canonicalUrl) return null;@@ -752,8 +874,10 @@ export function normalizePageCaptureSitePayload(value, canonicalUrlValue = "") {if (value?.adapter !== "jimeng") return null;const pageKind = ["feed", "detail"].includes(value?.pageKind) ? value.pageKind : "detail";const rawItems = Array.isArray(value?.items) ? value.items : value?.item ? [value.item] : [];+ const workId = clean(value?.workId);const seen = new Set();const candidates = rawItems.flatMap((item) => {+ if (pageKind === "detail" && workId && clean(item?.common_attr?.id) !== workId) return [];const candidate = normalizeJimengItem(item, value?.modelNames);if (!candidate || seen.has(candidate.sourceFacts.itemId)) return [];seen.add(candidate.sourceFacts.itemId);@@ -780,7 +904,7 @@ export function normalizePageCaptureSitePayload(value, canonicalUrlValue = "") {candidates});}- const exact = candidates.find((candidate) => candidate.sourceFacts.itemId === clean(value?.workId)) || candidates[0];+ const exact = candidates[0];return { ...exact, pageKind, candidates: [exact] };}@@ -804,6 +928,7 @@ export function isTrustedPageCaptureMediaUrl(adapterId, value) {if (adapterId === "jimeng") return JIMENG_IMAGE_HOST_PATTERN.test(url.hostname)|| /^p\d+-heycan-hgt-sign\.byteimg\.com$/u.test(url.hostname)|| /^v\d+-artist\.vlabvod\.com$/u.test(url.hostname);+ if (adapterId === "midjourney") return url.hostname === "cdn.midjourney.com";if (adapterId === "libtv") return url.hostname === "libtv-res.liblib.art";if (adapterId === "liblibai") return url.hostname === "liblib.cloud" || url.hostname.endsWith(".liblib.cloud");if (adapterId === "krea") return url.hostname === "krea.ai" || url.hostname.endsWith(".krea.ai");@@ -1268,7 +1393,11 @@ function stableTextHash(value) {function normalizeJimengItem(item, modelNamesValue = {}) {const workId = clean(item?.common_attr?.id);if (!/^\d{8,32}$/u.test(workId)) return null;- const prompt = cleanMultiline(item?.aigc_image_params?.text2image_params?.prompt);+ const videoPrompt = (item?.aigc_image_params?.text2video_params?.video_gen_inputs || []).map(input =>+ cleanMultiline(input.prompt) || (input.unified_edit_input?.meta_list || []).filter(part => part.meta_type === "text")+ .map(part => cleanMultiline(part.text)).filter(Boolean).join("\n")+ ).filter(Boolean).join("\n\n");+ const prompt = videoPrompt || cleanMultiline(item?.aigc_image_params?.text2image_params?.prompt);const description = cleanMultiline(item?.common_attr?.description);const images = Array.isArray(item?.image?.large_images) ? item.image.large_images : [];const modelKey = clean(item?.model_key) || jimengDraftModel(item?.aigc_draft?.content);@@ -1286,6 +1415,7 @@ function normalizeJimengItem(item, modelNamesValue = {}) {id: `jimeng:${workId}:${index + 1}`,kind: "image",originalPrompt: prompt,+ placement: "inline",url,width,height,@@ -1294,14 +1424,17 @@ function normalizeJimengItem(item, modelNamesValue = {}) {variants: [{ url, sourceKind, width, height }]}];});- const videoUrl = safeTrustedMediaUrl("jimeng", item?.video?.url);+ const video = item?.video;+ const originalVideo = video?.origin_video;+ const videoUrl = safeTrustedMediaUrl("jimeng", video?.url || originalVideo?.video_url);if (videoUrl && /^v\d+-artist\.vlabvod\.com$/u.test(new URL(videoUrl).hostname)) {- const sourceKind = item.video.sourceKind === "video-element" ? "video-element" : "site-original";+ const sourceKind = video.sourceKind === "video-element" ? "video-element" : "site-original";media.push({id: `jimeng:${workId}:video`, kind: "video", url: videoUrl, originalPrompt: prompt,- width: positiveInteger(item.video.width), height: positiveInteger(item.video.height),- duration: Number(item.video.duration) || 0,- posterUrl: safeTrustedMediaUrl("jimeng", item.video.poster),+ placement: "inline",+ width: positiveInteger(video.width || originalVideo?.width), height: positiveInteger(video.height || originalVideo?.height),+ duration: Number(video.duration) || 0,+ posterUrl: safeTrustedMediaUrl("jimeng", video.poster || item?.common_attr?.cover_url),sourceKind, captureMethod: "source",variants: [{ url: videoUrl, sourceKind }]});diff --git a/extension/page-capture.js b/extension/page-capture.jsindex 5c73e7d..69c3db0 100644--- a/extension/page-capture.js+++ b/extension/page-capture.js@@ -288,6 +288,7 @@ export function applyPageCaptureSelections(batchValue = {}) {? selectedAllText ? candidate.contentHtml : selectedHtml: "",contentText: hasTextBlockSelection ? selectedText : selection.includeText ? candidate.contentText : "",+ textBlocks: selection.includeText ? selectedTextBlocks : [],excerpt: selection.includeText? selectedAllText ? candidate.excerpt : selectedTextBlocks[0]?.text || "": "",@@ -654,6 +655,28 @@ export async function collectPageCaptureSnapshot(options = {}) {const originalScroll = { x: window.scrollX, y: window.scrollY };try {+ if (options.manualContentHtml) {+ const root = document.createElement("div");+ root.innerHTML = options.manualContentHtml;+ maxMedia = Math.max(maxMedia, root.querySelectorAll("img,video,iframe,canvas").length);+ const candidate = candidateForRoot(root, 0, {+ adapter: { id: "generic", fields: {} }, metadata: { title: document.title }, structured: [],+ article: null, siteData: null, canonicalUrl: location.href, pageType: root.querySelector("article,main") ? "article" : root.querySelector("video,iframe") ? "video" : root.querySelector("img") ? "artwork" : "article", maxMedia,+ contentRoot: root, pageRoot: root+ });+ if (candidate) {+ candidate.title = document.title;+ candidate.id = `manual:${sessionId}`;+ candidate.region = null;+ candidate.textBlocks = candidate.textBlocks.map(block => ({ ...block, kind: "section" }));+ candidate.contentText = candidate.textBlocks.map(block => block.text).join("\n\n");+ const ids = new Map(candidate.media.map(item => [item.id, `${candidate.id}:${item.id}`]));+ candidate.media = candidate.media.map(item => ({ ...item, id: ids.get(item.id) }));+ candidate.articleDocument.blocks = candidate.articleDocument.blocks.map(block => ({ ...block, assetId: ids.get(block.assetId) || block.assetId }));+ }+ return { id: sessionId, sourceUrl: location.href, candidates: candidate ? [candidate] : [], capturedAt };+ }+ if (options.xSupplementUrl) return { supplement: await readXSupplement(options.xSupplementUrl) };const editedRegion = options.editedRegion && typeof options.editedRegion === "object" ? options.editedRegion : null;const editedBaseRoot = editedRegion?.marker? [...document.querySelectorAll?.("[data-promptdirector-capture-region]") || []]@@ -708,7 +731,7 @@ export async function collectPageCaptureSnapshot(options = {}) {siteStatus: siteData.completeness === "complete" ? "complete" : "partial"};}- if (siteData?.adapter === "jimeng" && siteData.pageKind === "detail" && !pageSelection) {+ if (["jimeng", "youtube", "bilibili", "midjourney"].includes(siteData?.adapter) && siteData.pageKind === "detail" && !pageSelection) {return {id: sessionId, sourceUrl: canonicalUrl, adapter: adapter.id,candidates: Array.isArray(siteData.candidates) ? siteData.candidates.slice(0, 1) : [],@@ -716,8 +739,8 @@ export async function collectPageCaptureSnapshot(options = {}) {};}if (adapter.id === "x" && !pageSelection) {- const posts = [...document.querySelectorAll('article[data-testid="tweet"]')];- const current = posts.find(post => ownPostLinks(post).some(link => sameUrl(link.href, canonicalUrl)));+ const posts = [...document.querySelectorAll('article')].filter(post => ownPostLinks(post).length);+ const current = posts.find(post => ownPostLinks(post).some(link => xPostIdentity(link.href) === xPostIdentity(canonicalUrl)));if (current || !wholePage) {const roots = current ? [current] : posts;const candidates = roots.slice(0, maxCandidates).flatMap((root, index) => {@@ -1202,8 +1225,58 @@ export async function collectPageCaptureSnapshot(options = {}) {}function ownPostLinks(root) {- return [...root.querySelectorAll('a[href*="/status/"]')].filter(link =>- link.querySelector("time") && !link.closest('[role="link"][data-testid="quoteTweet"], [data-testid="quoteTweet"], [role="link"][tabindex="0"]'));+ const links = [...root.querySelectorAll('a[href*="/status/"]')].filter(link => !xQuoteContainer(link));+ const dated = links.filter(link => link.querySelector("time"));+ return dated.length ? dated : links.filter(link => {+ const url = safeHttpUrl(link.href);+ return url && /^\/[^/]+\/status\/\d+\/?$/u.test(new URL(url).pathname)+ && cleanText(link.textContent) && !link.querySelector('svg,img') && !link.hasAttribute('aria-label');+ });+ }++ function xPostIdentity(value) {+ try {+ const url = new URL(value);+ return /(^|\.)(x|twitter)\.com$/u.test(url.hostname)+ ? /^\/(?:[^/]+\/status|i\/web\/status)\/(\d+)(?:\/|$)/u.exec(url.pathname)?.[1] || "" : "";+ } catch { return ""; }+ }++ function xPostTextNodes(root) {+ const classic = [...root.querySelectorAll('[data-testid="tweetText"]')];+ // The public X post layout uses a directional, pre-wrapped text container.+ return classic.length ? classic : [...root.querySelectorAll('div[dir="auto"].whitespace-pre-wrap')];+ }++ function xExpandButtons(root) {+ return [...root.querySelectorAll('[data-testid="tweet-text-show-more-link"],button')].filter(button =>+ !xQuoteContainer(button) && (button.dataset.testid === "tweet-text-show-more-link"+ || xPostTextNodes(root).some(node => node.contains(button)) && /^(?:Show more|显示更多|顯示更多)$/iu.test(button.textContent.trim())));+ }++ async function readXSupplement(sourceUrl) {+ const postId = xPostIdentity(sourceUrl);+ if (!postId || xPostIdentity(location.href) !== postId) throw new Error("评论页面已改变,请重新选择评论");+ return new Promise((resolve, reject) => {+ const clicked = new WeakSet();+ const finish = (value, error) => { observer.disconnect(); clearTimeout(timer); error ? reject(error) : resolve(value); };+ const check = () => {+ if (xPostIdentity(location.href) !== postId) return finish(null, new Error("评论页面已改变,请重新选择评论"));+ const root = [...document.querySelectorAll('article')].find(post => ownPostLinks(post).some(link => xPostIdentity(link.href) === postId));+ if (!root) return;+ const buttons = xExpandButtons(root);+ if (buttons.length) {+ for (const button of buttons) if (!clicked.has(button)) { clicked.add(button); button.click(); }+ return;+ }+ const content = xPostContent(root, { textOnly: true, includeQuotes: false });+ if (content?.text) finish({ text: content.text, sourceUrl, partial: false });+ };+ const observer = new MutationObserver(check);+ const timer = setTimeout(() => finish(null, new Error("未能取得评论全文,请检查登录、网络或原评论是否仍可展开;当前草稿已保留")), options.mediaTimeoutMs);+ observer.observe(document.documentElement, { childList: true, subtree: true, characterData: true });+ check();+ });}function copyPostInline(source, target) {@@ -1227,26 +1300,27 @@ export async function collectPageCaptureSnapshot(options = {}) {}}- function xPostContent(root) {- const texts = [...root.querySelectorAll('[data-testid="tweetText"]')];+ function xPostContent(root, { textOnly = false, includeQuotes = true } = {}) {+ const texts = xPostTextNodes(root);if (!texts.length && !root.querySelector("video, [data-testid=tweetPhoto]")) return null;const fragment = document.createElement("div");const content = [];for (const node of texts) {- const value = cleanBlockText(node.innerText || node.textContent);- if (!value) continue;- const quote = node.closest('[data-testid="quoteTweet"], [role="link"][tabindex="0"]');+ const quote = xQuoteContainer(node);+ if (quote && !includeQuotes) continue;const p = document.createElement(quote ? "blockquote" : "p");// Keep inline links and paragraph breaks, without nesting tweet divs inside paragraphs.copyPostInline(node, p);+ const value = readBlockText(p);+ if (!value) continue;fragment.append(p);content.push({ id: "text:x:" + hashText(value), text: value, html: p.outerHTML,kind: quote ? "quote" : "paragraph", relevance: "explicit-creative", sourceOrder: content.length });}- const media = collectMedia(root, maxMedia).filter(item => item.kind !== "image" ||+ const media = textOnly ? [] : collectMedia(root, maxMedia).filter(item => item.kind !== "image" ||!/profile_images|profile_banners/u.test(item.url));return { text: content.map(b => b.text).join("\n\n"), html: fragment.innerHTML, textBlocks: content, media,- partial: Boolean(root.querySelector('[data-testid="tweet-text-show-more-link"]')) };+ partial: xExpandButtons(root).length > 0 };}function candidateForRoot(root, index, context) {@@ -1286,7 +1360,7 @@ export async function collectPageCaptureSnapshot(options = {}) {: null;const textBlocks = post?.textBlocks || pageSelection?.textBlocks || structuredTextBlocks || collectTextBlocks(root, contentHtml, text);const siteMedia = [...(options.feishuDocument?.media || []), ...(Array.isArray(siteData?.media) ? siteData.media : []), ...collectStructuredMedia(structured)];- const domMedia = post?.media || (pageSelection || root.isConnected === false ? [] : captureRoots.flatMap(part => collectMedia(part, context.maxMedia)));+ const domMedia = post?.media || (pageSelection || (root.isConnected === false && !options.manualContentHtml) ? [] : captureRoots.flatMap(part => collectMedia(part, context.maxMedia)));const pairedDomIds = new Set();const pairedSiteMedia = siteMedia.map((item) => {const visible = domMedia.find((candidate) => mediaValuesOverlap(item, candidate));@@ -1516,6 +1590,7 @@ export async function collectPageCaptureSnapshot(options = {}) {}function isPageChrome(element) {+ if (options.manualContentHtml) return false;const semantic = "nav,aside,header,footer,[role=navigation],[role=banner],[role=complementary],[role=contentinfo]";const feishu = location.hostname === "feishu.cn" || location.hostname.endsWith(".feishu.cn");if (!feishu) return Boolean(element.closest?.(`${semantic},[class*=comment],[class*=recommend],[data-testid*=comment],[data-testid*=recommend]`));@@ -1909,7 +1984,13 @@ export async function collectPageCaptureSnapshot(options = {}) {const url = new URL(value);if (url.hostname === "www.tiktok.com" && /^\/player\/v1\/\d+\/?$/u.test(url.pathname)) return true;if (["x.com", "twitter.com"].some(host => url.hostname === host || url.hostname.endsWith(`.${host}`))) return /^\/[^/]+\/status\/\d+\/video\/\d+\/?$/u.test(url.pathname);- return /\.(?:mp4|webm|mov)(?:$|[?#])/iu.test(url.pathname) || ["youtube.com", "youtu.be", "vimeo.com", "bilibili.com", "douyin.com"].some((host) => url.hostname === host || url.hostname.endsWith(`.${host}`));+ const host = url.hostname.replace(/^www\./u, "");+ if (host === "youtube.com" || host.endsWith(".youtube.com")) return url.pathname === "/watch" && Boolean(url.searchParams.get("v")) || /^\/(?:shorts|embed|live)\/[^/]+/u.test(url.pathname);+ if (host === "youtu.be") return /^\/[^/]+\/?$/u.test(url.pathname);+ if (host === "bilibili.com" || host.endsWith(".bilibili.com")) return /^\/video\/(?:BV[\w]+|av\d+)/iu.test(url.pathname);+ if (host === "vimeo.com" || host.endsWith(".vimeo.com")) return /^\/(?:video\/)?\d+\/?$/u.test(url.pathname);+ if (host === "douyin.com" || host.endsWith(".douyin.com")) return /^\/video\/\d+/u.test(url.pathname);+ return /\.(?:mp4|webm|mov)$/iu.test(url.pathname);} catch {return false;}@@ -2040,7 +2121,7 @@ export async function collectPageCaptureSnapshot(options = {}) {return {title: firstText(fields.title),author: firstText(fields.author),- handle: handleFromLink(fields.handle),+ handle: handleFromLink(fields.handle) || (adapter.id === "x" ? new URL(ownPostLinks(root)[0]?.href || location.href).pathname.split('/')[1] : ""),canonicalUrl: adapter.id === "x" ? safeHttpUrl(ownPostLinks(root)[0]?.href) : firstUrl(fields.canonicalUrl),model: firstText(fields.model),publishedAt: adapter.id === "x" ? cleanText(ownPostLinks(root)[0]?.querySelector("time")?.dateTime) : firstText(fields.publishedAt),@@ -2048,6 +2129,13 @@ export async function collectPageCaptureSnapshot(options = {}) {};}+ // Only inspect sources owned by this player. Global network traffic may belong to other works.+ function collectVideoVariants(player) {+ const urls = [player.currentSrc, player.getAttribute("src"), player.getAttribute("data-src"), player.getAttribute("data-video-src"),+ ...[...player.querySelectorAll("source")].flatMap(source => [source.getAttribute("src"), source.getAttribute("data-src")])];+ return [...new Set(urls.map(safeHttpUrl).filter(Boolean))].map(url => ({ url, sourceKind: "video-element" }));+ }+function collectMedia(root, limit) {const media = [];for (const [elementIndex, element] of [...root.querySelectorAll("img,video,iframe,canvas")].entries()) {@@ -2066,7 +2154,8 @@ export async function collectPageCaptureSnapshot(options = {}) {}if (element.matches("iframe") && !isSupportedVideoFrame(element)) continue;const kind = element.matches("video,iframe") ? "video" : "image";- const variants = kind === "image" ? collectImageVariants(element) : [];+ const variants = kind === "image" ? collectImageVariants(element)+ : element.matches("video") ? collectVideoVariants(element) : [];const imageSource = variants[0] || null;const url = imageSource?.url || safeHttpUrl(element.currentSrc || element.src);const posterElement = kind === "video" ? companionPosterForPlayer(element, root) : null;@@ -2083,6 +2172,7 @@ export async function collectPageCaptureSnapshot(options = {}) {kind,url,posterUrl,+ ...(/\.m3u8(?:[?#]|$)/iu.test(url) ? { streamUrl: url } : {}),postMediaUrl: xPostMediaUrl(element), isQuoted: Boolean(xQuoteContainer(element)),alt: cleanText(element.alt),width: imageSource?.declaredWidth || (responsiveCandidate ? 0 : Number(element.naturalWidth || element.videoWidth || element.width) || 0),@@ -2320,15 +2410,17 @@ export async function collectPageCaptureSnapshot(options = {}) {}function xQuoteContainer(element) {- if (!["x.com", "twitter.com"].includes(location.hostname) || !element.closest('article[data-testid="tweet"]')) return null;- return element.closest('[data-testid="quoteTweet"], [role="link"][tabindex="0"]');+ if (!["x.com", "twitter.com"].includes(location.hostname)) return null;+ const post = element.closest('article');+ const quote = element.closest('[data-testid="quoteTweet"], [role="link"][tabindex="0"]');+ return post && quote && post.contains(quote) && post !== quote ? quote : null;}function xPostMediaUrl(element) {const photoUrl = xPostPhotoUrl(element);if (photoUrl) return photoUrl;if (!["x.com", "twitter.com"].includes(location.hostname) || !element.matches("video")) return "";- const post = element.closest('article[data-testid="tweet"]');+ const post = element.closest('article');if (!post) return "";const quote = xQuoteContainer(element);const link = quote@@ -2338,7 +2430,7 @@ export async function collectPageCaptureSnapshot(options = {}) {}function xPostPhotoUrl(element) {- if (!["x.com", "twitter.com"].includes(location.hostname) || !element.closest('article[data-testid="tweet"]')) return "";+ if (!["x.com", "twitter.com"].includes(location.hostname) || !element.closest('article')) return "";const link = element.closest('a[href*="/photo/"]');const url = safeHttpUrl(link?.href);if (!url) return "";@@ -2347,6 +2439,7 @@ export async function collectPageCaptureSnapshot(options = {}) {}function isExcludedMedia(element) {+ if (options.manualContentHtml) return false;if (options.siteData?.adapter === "krea" && options.siteData?.pageKind === "detail") {const link = element.closest?.("a[href]");try {@@ -2356,7 +2449,8 @@ export async function collectPageCaptureSnapshot(options = {}) {} catch { /* This media is not a link to another Krea work. */ }}const postPhoto = Boolean(xPostPhotoUrl(element));- if (!postPhoto && element.closest("nav,aside,header,[role=banner],[aria-label*=广告],[aria-label*=advertisement]")) return true;+ const postVideo = element.matches("video") && Boolean(xPostMediaUrl(element));+ if (!postPhoto && !postVideo && element.closest("nav,aside,header,[role=banner],[aria-label*=广告],[aria-label*=advertisement]")) return true;const rect = element.getBoundingClientRect();if (rect.width <= 0 || rect.height <= 0 || rect.width < 48 || rect.height < 48) return true;const style = typeof globalThis.getComputedStyle === "function" ? globalThis.getComputedStyle(element) : null;diff --git a/extension/page-content-picker.js b/extension/page-content-picker.jsnew file mode 100644index 0000000..0e09754--- /dev/null+++ b/extension/page-content-picker.js@@ -0,0 +1,131 @@+// Runs in the source page; no dependencies may cross this injection boundary.+export function pickPageContent(options = {}) {+ const commentLimit = options.commentLimit || 30;+ let collecting = false;+ let finished = false;+ const id = "promptdirector-content-picker";+ document.getElementById(id)?.dispatchEvent(new Event("cancel"));+ const overlay = document.createElement("div");+ overlay.id = id;+ Object.assign(overlay.style, { position: "fixed", pointerEvents: "none", zIndex: "2147483647", border: "2px solid #bafa00", background: "rgba(186,250,0,.08)", display: "none" });+ const cancel = document.createElement("button");+ cancel.textContent = "取消选取";+ Object.assign(cancel.style, { position: "fixed", top: "16px", right: "16px", zIndex: "2147483647", padding: "10px 16px", borderRadius: "8px", border: "1px solid #777", background: "#161719", color: "white", cursor: "pointer" });+ document.documentElement.append(overlay, cancel);+ let selected;+ const originalScroll = { x: scrollX, y: scrollY };+ const target = event => {+ const node = event.composedPath().find(value => value instanceof Element);+ if (!node || node === cancel || node === overlay) return null;+ const comments = event.composedPath().find(value => value instanceof Element && value.matches("ytd-comments,bili-comments"));+ if (comments) return comments;+ return node.closest("p,li,blockquote,pre,table,figure,img,video,iframe,section,article,div") || node;+ };+ const serialize = node => {+ if (node.nodeType === Node.TEXT_NODE) return document.createTextNode(node.textContent);+ if (!(node instanceof Element) || node.matches("script,style,noscript,button,input,textarea,select")) return document.createDocumentFragment();+ const copy = document.createElement(node.localName.includes("-") ? "div" : node.localName);+ for (const name of ["href", "src", "poster", "alt", "colspan", "rowspan", "width", "height", "srcset", "sizes", "data-src", "data-original", "data-video-src", "download"]) {+ const value = node[name] || node.getAttribute(name);+ if ((typeof value === "string" || typeof value === "number") && value !== "") copy.setAttribute(name, String(value));+ else if (name === "download" && node.hasAttribute(name)) copy.setAttribute(name, "");+ }+ if (node.matches("img,video")) copy.setAttribute("src", node.currentSrc || node.src || "");+ const children = node.localName === "slot" ? node.assignedNodes({ flatten: true }) : (node.shadowRoot || node).childNodes;+ for (const child of children) copy.append(serialize(child));+ return copy;+ };+ const deepAll = (root, selector) => {+ const result = [];+ const visit = node => {+ if (node instanceof Element && node.matches(selector)) result.push(node);+ for (const child of (node.shadowRoot || node).children || []) visit(child);+ };+ visit(root);+ return result;+ };+ const visible = node => Boolean(node?.getClientRects().length) && getComputedStyle(node).visibility !== "hidden";+ const commentNodes = root => deepAll(root, "ytd-comment-view-model,ytd-comment-renderer,bili-comment-renderer,bili-comment-reply-renderer");+ const collectComments = async (area, event) => {+ const wrapper = document.createElement("div");+ const threads = deepAll(area, "ytd-comment-thread-renderer,bili-comment-thread-renderer");+ const clicked = event.composedPath().find(node => threads.includes(node));+ const start = clicked ? threads.indexOf(clicked) : 0;+ const deadline = Date.now() + options.timeoutMs;+ let count = 0;+ const append = node => {+ if (count >= commentLimit || !visible(node)) return;+ const content = deepAll(node, "#content-text,bili-rich-text")[0];+ if (!content) return;+ const author = deepAll(node, "#author-text,#user-name")[0]?.textContent?.trim() || "";+ const body = serialize(content);+ // Emoji belong to the comment, not to the case's image collection.+ for (const image of body.querySelectorAll?.("img") || []) image.replaceWith(document.createTextNode(image.alt || ""));+ const contentText = body.textContent.trim();+ if (!contentText) return;+ const paragraph = document.createElement("p");+ paragraph.textContent = author ? `${author}:${contentText}` : contentText;+ wrapper.append(paragraph); count += 1;+ };+ for (const thread of threads.slice(start)) {+ if (finished || count >= commentLimit) break;+ const parent = commentNodes(thread)[0];+ if (parent) append(parent);+ const replies = deepAll(thread, "ytd-comment-replies-renderer,bili-comment-replies-renderer")[0];+ if (!replies || count >= commentLimit) continue;+ const expand = deepAll(replies, "#more-replies button,#more-replies-sub-thread button,#view-more bili-text-button").find(visible);+ if (expand && Date.now() < deadline) {+ const before = commentNodes(replies).length;+ await new Promise(resolve => {+ const observer = new MutationObserver(() => { if (commentNodes(replies).length > before || finished) done(); });+ const done = () => { clearTimeout(timer); observer.disconnect(); resolve(); };+ const timer = setTimeout(done, Math.max(0, deadline - Date.now()));+ observer.observe(replies.shadowRoot || replies, { childList: true, subtree: true });+ expand.scrollIntoView({ block: "center" });+ expand.click();+ });+ }+ for (const reply of commentNodes(replies)) append(reply);+ }+ return { html: wrapper.innerHTML, supplement: "comments", commentCount: count };+ };+ return new Promise(resolve => {+ const finish = value => {+ if (finished) return;+ finished = true;+ document.removeEventListener("pointerover", hover, true);+ document.removeEventListener("click", click, true);+ document.removeEventListener("keydown", key, true);+ overlay.remove(); cancel.remove();+ if (collecting) window.scrollTo(originalScroll.x, originalScroll.y);+ resolve(value);+ };+ const hover = event => {+ if (collecting) return;+ selected = target(event);+ if (!selected) { overlay.style.display = "none"; return; }+ const rect = selected.getBoundingClientRect();+ Object.assign(overlay.style, { display: "block", left: `${rect.left}px`, top: `${rect.top}px`, width: `${rect.width}px`, height: `${rect.height}px` });+ };+ const click = async event => {+ if (event.composedPath().includes(cancel)) { event.preventDefault(); event.stopImmediatePropagation(); finish({ cancelled: true }); return; }+ if (collecting) return;+ selected = target(event);+ if (!selected) return;+ event.preventDefault(); event.stopImmediatePropagation();+ if (selected.matches("ytd-comments,bili-comments")) {+ collecting = true;+ try { finish(await collectComments(selected, event)); }+ catch (error) { console.debug("PromptDirector comment selection", error); finish({ cancelled: true }); }+ return;+ }+ const wrapper = document.createElement("div"); wrapper.append(serialize(selected));+ finish({ html: wrapper.innerHTML });+ };+ const key = event => { if (event.key === "Escape") { event.preventDefault(); finish({ cancelled: true }); } };+ overlay.addEventListener("cancel", () => finish({ cancelled: true }), { once: true });+ document.addEventListener("pointerover", hover, true);+ document.addEventListener("click", click, true);+ document.addEventListener("keydown", key, true);+ });+}diff --git a/extension/page-session-media.js b/extension/page-session-media.jsindex 18a6bbf..b2db554 100644--- a/extension/page-session-media.js+++ b/extension/page-session-media.js@@ -26,7 +26,7 @@ export async function preparePageSessionMedia(value = {}) {const response = await globalThis.fetch(url.href, {credentials: "include",redirect: "error",- referrerPolicy: "no-referrer",+ referrerPolicy: "strict-origin-when-cross-origin",cache: "no-store"});if (!response?.ok) throw new Error(`页面媒体读取失败(HTTP ${response?.status || 0})`);diff --git a/extension/preferences.js b/extension/preferences.jsindex c40510f..51785ff 100644--- a/extension/preferences.js+++ b/extension/preferences.js@@ -5,7 +5,8 @@ export const DEFAULT_UI_PREFERENCES = Object.freeze({analysisDiagnostics: false,sidebarWidth: 244,detailMode: "fullscreen",- detailSidebarWidth: 760+ detailSidebarWidth: 760,+ detailPanelRatio: null});export const SIDEBAR_WIDTH_LIMITS = Object.freeze({ min: 216, max: 420, default: 244 });@@ -31,7 +32,8 @@ export function normalizeUiPreferences(value = {}) {analysisDiagnostics: value.analysisDiagnostics === true,sidebarWidth: normalizeSidebarWidth(value.sidebarWidth),detailMode: value.detailMode === "sidebar" ? "sidebar" : "fullscreen",- detailSidebarWidth: normalizeDetailSidebarWidth(value.detailSidebarWidth)+ detailSidebarWidth: normalizeDetailSidebarWidth(value.detailSidebarWidth),+ detailPanelRatio: typeof value.detailPanelRatio === "number" && Number.isFinite(value.detailPanelRatio) && value.detailPanelRatio > 0 && value.detailPanelRatio < 1 ? value.detailPanelRatio : null};}diff --git a/extension/prompt-sources.js b/extension/prompt-sources.jsindex 1b307d5..3a39fdb 100644--- a/extension/prompt-sources.js+++ b/extension/prompt-sources.js@@ -4,14 +4,9 @@ import { validReconstructionPrompt } from "./image-prompt.js";import { CONTENT_ROLES, contentRoleForEntry } from "./taxonomy.js";export function detailPromptSources(entry = {}, asset = {}) {- const mediaPrompt = entry.mediaPrompts?.find(item => item.assetId === asset.id && item.source === "manual")- || entry.mediaPrompts?.find(item => item.assetId === asset.id && item.source !== "ai-suggestion");+ const mediaPrompt = originalMediaPrompt(entry, asset.id);const adoptedAi = String(entry.mediaPrompts?.find(item => item.assetId === asset.id && item.source === "ai-suggestion")?.text ?? "").trim();- const sharedPromptAllowed = !usesArticleReader(entry)- && entry.sourceFacts?.originalPromptAvailable !== false- && !entry.mediaPrompts?.some(item => item.source === "webpage")- && ![CONTENT_ROLES.imageCase, CONTENT_ROLES.videoCase].includes(contentRoleForEntry(entry));- const original = String(mediaPrompt?.text ?? "").trim() || (sharedPromptAllowed ? String(entry.text ?? "").trim() : "");+ const original = String(mediaPrompt?.text ?? "").trim() || sharedOriginalPrompt(entry);const record = asset.kind === "video" ? currentVideoReconstruction(entry, asset.id) : null;return {original,@@ -21,3 +16,36 @@ export function detailPromptSources(entry = {}, asset = {}) {record};}++export function originalMediaPrompts(entry = {}) {+ return (entry.mediaPrompts ?? []).filter(item => item.source !== "ai-suggestion" && String(item.text ?? "").trim());+}++export function originalMediaPrompt(entry, assetId) {+ const prompts = originalMediaPrompts(entry).filter(item => item.assetId === assetId);+ return prompts.find(item => item.source === "manual") || prompts[0];+}++export function sharedOriginalPrompt(entry = {}) {+ if (usesArticleReader(entry) || entry.sourceFacts?.originalPromptAvailable === false+ || originalMediaPrompts(entry).some(item => item.source === "webpage")) return "";+ // Explicit source evidence remains readable regardless of browsing category.+ if (entry.sourceFacts?.originalPromptAvailable !== true && (+ [CONTENT_ROLES.imageCase, CONTENT_ROLES.videoCase].includes(contentRoleForEntry(entry))+ )) return "";+ return String(entry.text ?? "").trim();+}++export function caseOriginalPromptText(entry = {}) {+ if (entry.memberEntries?.length) {+ return entry.memberEntries.map(member => {+ const text = caseOriginalPromptText(member);+ return text ? `${member.title || member.id}\n${text}` : "";+ }).filter(Boolean).join("\n\n");+ }+ const prompts = originalMediaPrompts(entry);+ // When only per-media evidence exists, shared prose is not necessarily a prompt.+ const shared = !prompts.length || entry.sourceFacts?.originalPromptAvailable === true+ ? sharedOriginalPrompt(entry) : "";+ return [...new Set([shared, ...prompts.map(item => String(item.text).trim())].filter(Boolean))].join("\n\n");+}diff --git a/extension/remote-video-player.js b/extension/remote-video-player.jsindex 40e82f9..43d4897 100644--- a/extension/remote-video-player.js+++ b/extension/remote-video-player.js@@ -3,7 +3,7 @@ import { localVideoController } from "./media-playback.js";let runtime;const loadHls = () => runtime ||= import("./hls-runtime.js").then(() => globalThis.Hls);-export async function attachRemoteVideo(video, reference, onStatus) {+export async function attachRemoteVideo(video, reference, onStatus, { defer = false } = {}) {const direct = reference.playbackUrl || "";const stream = reference.streamUrl || (/\.m3u8(?:\?|$)/iu.test(direct) ? direct : "");const controller = localVideoController(video);@@ -47,11 +47,15 @@ export async function attachRemoteVideo(video, reference, onStatus) {video.removeAttribute("src");video.load();};- try {- if (stream && (!direct || /\.m3u8(?:\?|$)/iu.test(direct))) {- await startStream();- } else if (direct) video.src = direct;- else fail();- } catch { fail(); }+ let preparation;+ video.preparePlayback = () => preparation ||= (async () => {+ if (disposed) return;+ try {+ if (stream && (!direct || /\.m3u8(?:\?|$)/iu.test(direct))) await startStream();+ else if (direct) video.src = direct;+ else fail();+ } catch { fail(); }+ })();+ if (!defer) await video.preparePlayback();return controller;}diff --git a/extension/skills-page.js b/extension/skills-page.jsindex 23e66dc..0ae794d 100644--- a/extension/skills-page.js+++ b/extension/skills-page.js@@ -243,6 +243,7 @@ async function navigateBack() {const depth = Number(history.state?.depth) || 0;if (activeView === "list") return returnToSource();if (depth > 0) return history.back();+ if (activeView === "detail" && sourcePage === "composer") return returnToSource();const fallback = activeView === "editor" || activeView === "refine"? { view: "detail", skillId: activeSkillId }: { view: "list", skillId: "" };@@ -318,7 +319,7 @@ function renderRoute(route) {function renderContextBack() {const labels = {list: sourcePage === "composer" ? t("返回创作台") : t("返回案例库"),- detail: t("返回 Skill 列表"),+ detail: sourcePage === "composer" && !(Number(history.state?.depth) > 0) ? t("返回创作台") : t("返回 Skill 列表"),create: t("返回 Skill 列表"),editor: t("返回 Skill 详情"),refine: t("返回 Skill 详情")diff --git a/extension/tag-taxonomy.js b/extension/tag-taxonomy.jsindex 8fd6a36..a7c613c 100644--- a/extension/tag-taxonomy.js+++ b/extension/tag-taxonomy.js@@ -4,6 +4,7 @@ export const ANALYSIS_TAG_MAX = 10;export const ANALYSIS_DETAIL_MAX_LENGTH = 80;export const NAV_DETAIL_MIN_CASES = 2;export const NAV_DETAIL_LIMIT = 6;+export const DETAIL_ORGANIZATION_OUTPUT_TOKENS = 4000;const FACETS = [facet("subject", "主体与角色", "Subjects & characters", [@@ -418,6 +419,10 @@ export function createDetailOrganizationChunks(catalogValue, entries = [], maxByused.forEach((id) => counts.set(id, (counts.get(id) ?? 0) + 1));}const chunks = [];+ // UTF-8 bytes conservatively bound token demand for a full mapping response.+ // Keep the existing request budget; split before sending, never truncate tags.+ const fits = chunk => serializedBytes(chunk) <= maxBytes+ && serializedBytes({ m: chunk.d.map(([id, name]) => ({ id, n: name })) }) <= DETAIL_ORGANIZATION_OUTPUT_TOKENS;for (const group of catalog.nodes.filter((item) => !item.parentId && item.status !== "archived")) {const details = catalog.nodes.filter((item) => item.parentId === group.id && item.status !== "archived");if (details.length < 2) continue;@@ -426,13 +431,13 @@ export function createDetailOrganizationChunks(catalogValue, entries = [], maxByfor (const detail of details) {const row = [detail.id, detail.name, counts.get(detail.id) ?? 0];const candidate = { g: path, d: [...current, row] };- if (current.length && serializedBytes(candidate) > maxBytes) {+ if (current.length && !fits(candidate)) {chunks.push({ g: path, d: current });current = [row];} else {current.push(row);}- if (serializedBytes({ g: path, d: current }) > maxBytes) throw new Error("单个三级标签超过整理输入上限");+ if (!fits({ g: path, d: current })) throw new Error("单个三级标签超过整理输入上限");}if (current.length) chunks.push({ g: path, d: current });}diff --git a/extension/trash.js b/extension/trash.jsindex f15081f..cfc4a17 100644--- a/extension/trash.js+++ b/extension/trash.js@@ -181,6 +181,7 @@ export function moveMediaToTrash(contextValue = {}, entryIdValue, mediaIds = [],entryId,positions: removedAssets.map((asset) => ({ id: asset.id, index: before.mediaAssets.findIndex((item) => item.id === asset.id) })),primaryMediaId: removedIds.has(before.primaryMediaId) ? before.primaryMediaId : "",+ coverVisualId: removedIds.has(before.coverVisualId) ? before.coverVisualId : "",timeNotes: relatedValues(before.timeNotes, removedIds, ["assetId", "frameAssetId"]),mediaPrompts: relatedValues(before.mediaPrompts, removedIds, ["assetId"]),videoAnalyses: relatedValues(before.videoAnalyses, removedIds, ["assetId"]),@@ -453,7 +454,8 @@ function restoreMediaItem(item, entries) {mediaPrompts: mergeRelated(entry.mediaPrompts, item.relationships?.mediaPrompts, "assetId"),videoAnalyses: mergeRelated(entry.videoAnalyses, item.relationships?.videoAnalyses, "id"),facetAssignments: mergeRelated(entry.facetAssignments, item.relationships?.facetAssignments, "nodeId"),- primaryMediaId: clean(item.relationships?.primaryMediaId) || entry.primaryMediaId+ primaryMediaId: clean(item.relationships?.primaryMediaId) || entry.primaryMediaId,+ coverVisualId: entry.coverVisualId || clean(item.relationships?.coverVisualId)};const originalDocument = item.relationships?.articleDocument ?? null;if (originalDocument) next.articleDocument = originalDocument;diff --git a/extension/video-discovery.js b/extension/video-discovery.jsnew file mode 100644index 0000000..89def4e--- /dev/null+++ b/extension/video-discovery.js@@ -0,0 +1,59 @@+// Count observed media resources per tab, never byte-range requests or segments.+export function videoResource(details) {+ if (!Number.isInteger(details.tabId) || details.tabId < 0 || details.statusCode >= 400) return null;+ let url;+ try { url = new URL(details.url); } catch { return null; }+ if (!/^https?:$/.test(url.protocol) || /\.(?:ts|m4s|aac|mp3)(?:$)/i.test(url.pathname)) return null;+ const mime = details.responseHeaders?.find(header => header.name.toLowerCase() === 'content-type')?.value?.split(';')[0].trim().toLowerCase() || '';+ const manifest = /\.(m3u8|mpd)$/i.test(url.pathname) || /mpegurl|dash\+xml/.test(mime);+ if (!manifest && !mime.startsWith('video/') && !/\.(mp4|webm|mov|m4v)$/i.test(url.pathname)) return null;+ const key = new URL(url);+ for (const name of ['range', 'bytestart', 'byteend']) key.searchParams.delete(name);+ key.hash = '';+ return { key: key.href, url: url.href, mimeType: mime, manifest };+}++export function installVideoDiscovery(chromeApi) {+ // Session storage survives worker sleep but never becomes a user's library asset.+ let pending = Promise.resolve();+ const run = work => { pending = pending.then(work).catch(error => console.warn('Video discovery:', error.message)); };+ const storageKey = tabId => `videoDiscovery:${tabId}`;+ const badge = (tabId, count) => chromeApi.action.setBadgeText({ tabId, text: count ? String(count) : '' });+ chromeApi.webRequest.onHeadersReceived.addListener(details => {+ const resource = videoResource(details);+ if (!resource) return;+ run(async () => {+ const key = storageKey(details.tabId);+ const stored = (await chromeApi.storage.session.get(key))[key] || [];+ const index = stored.findIndex(item => item.key === resource.key);+ if (index < 0) stored.push(resource); else stored[index] = resource;+ await chromeApi.storage.session.set({ [key]: stored });+ await badge(details.tabId, stored.length);+ });+ }, { urls: ['http://*/*', 'https://*/*'] }, ['responseHeaders']);+ chromeApi.tabs.onUpdated.addListener((tabId, change) => {+ if (!change.url && change.status !== 'loading') return;+ run(async () => { await chromeApi.storage.session.remove(storageKey(tabId)); await badge(tabId, 0); });+ });+ chromeApi.tabs.onRemoved.addListener(tabId => run(() => chromeApi.storage.session.remove(storageKey(tabId))));+ return async tabId => {+ await pending;+ return (await chromeApi.storage.session.get(storageKey(tabId)))[storageKey(tabId)] || [];+ };+}++export function addDiscoveredVideos(batch, resources) {+ if (batch?.candidates?.length !== 1) return batch;+ const candidate = batch.candidates[0];+ const media = [...(candidate.media || [])];+ const known = new Set(media.flatMap(item => [item.id, item.url, ...(item.variants || []).map(value => value.url)]));+ for (const resource of resources) {+ const id = `discovered:${resource.key}`;+ if (known.has(id) || known.has(resource.url)) continue;+ known.add(id);+ const hls = /\.m3u8(?:[?#]|$)/i.test(resource.url) || /mpegurl/i.test(resource.mimeType);+ media.push({ id, kind: 'video', url: resource.url, mimeType: resource.mimeType, placement: 'unplaced',+ ...(hls ? { streamUrl: resource.url } : {}) });+ }+ return { ...batch, candidates: [{ ...candidate, media }] };+}diff --git a/extension/video-page-capture.js b/extension/video-page-capture.jsnew file mode 100644index 0000000..5ab610d--- /dev/null+++ b/extension/video-page-capture.js@@ -0,0 +1,73 @@+// Runs in the page's MAIN world so the current player's data stays tied to its video.+export function collectVideoPagePayload() {+ const url = new URL(location.href);+ const host = url.hostname.replace(/^www\./u, "");+ const text = selector => document.querySelector(selector)?.textContent?.trim() || "";+ const meta = property => document.querySelector(`meta[property="${property}"],meta[name="${property}"]`)?.content || "";+ if (host === "youtube.com" && (url.pathname === "/watch" || /^\/(shorts|live)\//u.test(url.pathname))) {+ const id = url.searchParams.get("v") || url.pathname.split("/")[2];+ if (!id) return null;+ let response = window.ytInitialPlayerResponse;+ // The initial response can belong to the previous video after in-page navigation.+ const current = document.querySelector("#movie_player")?.getPlayerResponse?.();+ if (current?.videoDetails?.videoId === id) response = current;+ const details = response?.videoDetails?.videoId === id ? response.videoDetails : {};+ const micro = details.videoId ? response?.microformat?.playerMicroformatRenderer || {} : {};+ return {+ adapter: "youtube", itemId: id, canonicalUrl: `https://www.youtube.com/watch?v=${encodeURIComponent(id)}`,+ title: details.title || text("ytd-watch-metadata h1") || meta("og:title"),+ description: details.shortDescription ?? text("#description-inline-expander #attributed-snippet-text"),+ author: details.author || text("ytd-watch-metadata #owner #channel-name"),+ posterUrl: details.thumbnail?.thumbnails?.at(-1)?.url || meta("og:image"),+ duration: details.lengthSeconds, publishedAt: micro.publishDate,+ engagement: { views: details.viewCount, likes: micro.likeCount }+ };+ }+ if (host === "bilibili.com" && /^\/video\/(BV\w+|av\d+)/iu.test(url.pathname)) {+ const id = url.pathname.split("/")[2];+ const initial = window.__INITIAL_STATE__?.videoData;+ const data = initial && (initial.bvid === id || `av${initial.aid}` === id) ? initial : {};+ const stat = data.stat || {};+ return {+ adapter: "bilibili", itemId: data.bvid || id, canonicalUrl: `https://www.bilibili.com/video/${data.bvid || id}/`,+ title: data.title || text("h1.video-title") || meta("og:title"),+ description: data.desc ?? text("#v_desc .basic-desc-info"),+ author: data.owner?.name || text(".up-info-container .up-name"),+ posterUrl: data.pic || meta("og:image"), duration: data.duration,+ publishedAt: data.pubdate ? new Date(data.pubdate * 1000).toISOString() : "",+ engagement: { views: stat.view, likes: stat.like, comments: stat.reply, favorites: stat.favorite, shares: stat.share, coins: stat.coin, danmaku: stat.danmaku }+ };+ }+ return null;+}++export function normalizeVideoPagePayload(value, sourceUrl) {+ if (!value || !["youtube", "bilibili"].includes(value.adapter)) return null;+ const source = new URL(sourceUrl);+ const expectedId = value.adapter === "youtube" ? source.searchParams.get("v") || source.pathname.split("/")[2] : source.pathname.split("/")[2];+ if (value.itemId !== expectedId && !/^av\d+$/u.test(expectedId || "")) return null;+ const clean = text => String(text ?? "").trim();+ const title = clean(value.title);+ if (!title) return null;+ const canonicalUrl = clean(value.canonicalUrl);+ const description = clean(value.description);+ let posterUrl = clean(value.posterUrl);+ try {+ const poster = new URL(posterUrl, source);+ if (value.adapter === "bilibili" && (poster.hostname === "hdslb.com" || poster.hostname.endsWith(".hdslb.com"))) poster.protocol = "https:";+ posterUrl = posterUrl ? poster.href : "";+ } catch { posterUrl = ""; }+ const id = `${value.adapter}:${value.itemId}`;+ const mediaId = `${id}:video`;+ const textBlocks = description ? [{ id: `${id}:description`, kind: "section", relevance: "explicit-creative", text: description }] : [];+ const engagement = Object.fromEntries(Object.entries(value.engagement || {}).filter(([, count]) => count !== undefined && count !== null && count !== "" && Number.isFinite(Number(count)) && Number(count) >= 0).map(([key, count]) => [key, Number(count)]));+ const sourceFacts = { provider: value.adapter, pageType: "video", itemId: clean(value.itemId), author: clean(value.author), description,+ publishedAt: clean(value.publishedAt), duration: clean(value.duration), engagement, extractionMethod: "structured", captureScope: "document" };+ return {+ adapter: value.adapter, pageKind: "detail", pageType: "video", canonicalUrl,+ candidates: [{ id, adapter: value.adapter, pageType: "video", title, canonicalUrl, contentText: description, textBlocks, sourceFacts,+ media: [{ id: mediaId, kind: "video", url: canonicalUrl, originalWorkUrl: canonicalUrl, posterUrl, sourceTitle: title, placement: "inline" }],+ articleDocument: { version: 1, blocks: [...textBlocks.map(block => ({ ...block, kind: "paragraph" })), { id: `${id}:player`, kind: "video", assetId: mediaId, sourceUrl: canonicalUrl }] }+ }]+ };+}diff --git a/package-lock.json b/package-lock.jsonindex 61ad350..ca86445 100644--- a/package-lock.json+++ b/package-lock.json@@ -1,12 +1,12 @@{"name": "prompt-case-collector",- "version": "1.22.4",+ "version": "1.23.0","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "prompt-case-collector",- "version": "1.22.4",+ "version": "1.23.0","license": "Apache-2.0","dependencies": {"@jonahschulte/rtf-toolkit": "0.5.0",diff --git a/package.json b/package.jsonindex 8b638ae..6a15205 100644--- a/package.json+++ b/package.json@@ -1,6 +1,6 @@{"name": "prompt-case-collector",- "version": "1.22.4",+ "version": "1.23.0","private": false,"license": "Apache-2.0","repository": "https://github.com/wchao6891/PromptDirector",diff --git a/store/DISTRIBUTION.md b/store/DISTRIBUTION.mdindex 8ef24ec..75b6355 100644--- a/store/DISTRIBUTION.md+++ b/store/DISTRIBUTION.md@@ -6,7 +6,7 @@ Public distribution formats and the permissions used by PromptDirector.- Chrome Web Store item public key: stored in the source `manifest.json` for local identity verification only; `package:release` removes `key` from the upload manifest.- Expected extension ID: `iahakaahijddcjjldidbclicedibgpjm`.-- Current upload artifact: `dist/store/PromptDirector-1.22.4-Chrome-Web-Store.zip`. Keep this artifact local for Web Store submission. The sole GitHub extension installation package is `PromptDirector-1.22.2.zip`, with stable identity and the local updater.+- Current upload artifact: `dist/store/PromptDirector-1.23.0-Chrome-Web-Store.zip`. Keep this artifact local for Web Store submission. The sole GitHub extension installation package is `PromptDirector-1.23.0.zip`, with stable identity and the local updater.- Generate a candidate only with `npm run package:release`; the command verifies the source public key against the expected identity, then removes `key` from the Web Store upload manifest and excludes the local program installer.## Store listing@@ -91,3 +91,5 @@ See the privacy policy for the data handled by user-triggered operations.## Release artifactsRun `npm run package:distribution` to build both channels. Publish only the versioned directory under `dist/github/`: it contains the user installation ZIP and `SHA256SUMS`. The Web Store upload ZIP stays under `dist/store/` for submission. Agent connector assets use the dedicated `agent-connector-v<connector-version>` release, marked as not latest, and are linked from `connector/INSTALL.md`.++- `webRequest`: Observe media response URLs and content types on already authorized sites to populate tab-specific video badges and capture candidates. No request modification, credential collection or browsing-history upload. Cross-origin media still requires host access.diff --git a/store/PRIVACY_POLICY.md b/store/PRIVACY_POLICY.mdindex 275d4bf..0c8ee56 100644--- a/store/PRIVACY_POLICY.md+++ b/store/PRIVACY_POLICY.md@@ -1,6 +1,6 @@# 提示词导演隐私政策-生效日期:2026 年 9 月 10 日+生效日期:2026 年 9 月 20 日提示词导演是一个本地优先的 Chrome 扩展,用于收藏、整理、检索、备份和分享个人创作资料。扩展不提供开发者服务器,不创建账号,不收集使用统计,不投放广告,也不出售用户数据。@@ -17,9 +17,9 @@- 案例文字、媒体、来源、标签、色卡、创作 Skill、设置和 API Key 默认保存在浏览器扩展的本地存储中。- 截图裁剪、压缩、缩略图、色卡提取、资料整理和 ZIP 分享包生成在本机完成。-- 网页采集先在当前标签页本地提出外层主体区域,并在确认后展示内部有意义的正文、媒体、下载和整组内容块。用户可以在原网页添加遗漏内容、排除错误内容、整组修正、撤销或恢复自动识别。正文在主体确认后默认纳入;正文内已定位媒体默认进入保存方案,无法确认文章位置的媒体默认不选并显示为可能遗漏媒体。底部“保存案例”按钮会显示媒体数量;“保存案例”按钮是当前媒体方案的最终授权,用户也可以选择“只保存正文”。+- 网页采集在当前标签页本地识别正文与媒体并展示预览。用户可以直接点选内容、添加遗漏内容、排除错误内容或撤销调整。“保存案例”按钮是当前内容方案的最终授权,用户也可以选择“只保存正文”。- 用户明确启动同一列表批量采集后,扩展可在当前标签页滚动公开列表,并沿同一来源的列表分页链接继续采集;不会自动进入作品详情页,也不会绕过登录、验证码、付费墙、访问控制或反自动化限制。完成后会返回原列表页,并以实际识别数量和停止原因结束。-- 预检会显示主体内识别到的公开媒体地址和预览,但不会在最终保存动作前把媒体写入案例或请求媒体域名权限。只有最终保存方案中的媒体会尝试读取原始文件;公开图片失败时,扩展才会让当前网页使用已有登录会话读取该图片。扩展不读取、导出、保存或传输 Cookie、Token 与登录请求头。+- 预检会显示主体内识别到的公开媒体地址和预览,但不会在最终保存动作前把媒体写入案例或请求媒体域名权限。只有最终保存方案中的媒体会尝试读取原始文件;图片、视频或封面的直接读取失败时,扩展可让当前网页使用已有登录会话读取用户所选媒体。扩展不读取、导出、保存或传输 Cookie、Token 与登录请求头。- PDF、Markdown、SKILL.md、TXT、HTML 和 RTF 只有属于用户最终保存方案时,才会从公开 HTTPS 地址读取,并在真实文件类型和容量限制校验通过后保存本地副本;请求不携带登录凭据。读取失败时只保留原始来源链接。压缩包、程序和未知类型文件不会自动下载,也不会作为 Skill 静默导入。- API Key 不进入导出 ZIP、Markdown、JSON、分享包、创作草稿、诊断包或日志。- 用户主动导出或分享时,扩展在本机生成资料夹或 ZIP 分享包;离线预览只读取包内内容和固定本地脚本,不会上传数据。用户决定分享包中包含哪些资料,并应自行判断分享对象与内容。@@ -31,7 +31,7 @@- AI 功能默认不因安装而自动执行。发送授权是所有真实外部请求的前置条件;已保存 API Key、已选模型或单次付费确认都不能替代发送授权。- 对新增的付费媒体分析或生成,扩展还会要求单次付费确认。该确认只授权当前操作,且与发送授权相互独立;两者不能互相替代。- 发送时,扩展只发送完成当前任务所必需、且由用户明确选择、提交或按其查询和参考意图读取的内容。根据任务,这可能包括文字提示词、用户创作要求、本次选择的参考图片或视频、画面描述、生成参数或当前会话中用户可见的消息。-- 图片创作默认可以使用用户选择的原图。若每项参考已有案例提示词或有效画面分析文字,用户可改为“全程只用案例/分析文字”;该模式不会读取、分析或发送图片,图片载荷为零。+- 新建创作会话默认只使用文字资料。用户可以明确开启原图或视频参考;未开启时不会因引用案例而读取、分析或发送其媒体原件。- 创作台仅在用户要求查询或参考案例库时调用本地工具。搜索返回候选片段,参考创作时按需读取文字并展示来源;普通创作不自动查库。用户可以关闭当前会话的资料库检索,关闭状态在刷新后保留。检索不会自动发送案例图片、视频或原始文档文件。- 扩展不会发送整库或全部案例,不会将 API Key 作为创作内容发送,也不会为了失败恢复而静默改用另一家付费服务、重新发起付费请求。- 图片和视频仅会在用户对相应任务明确选择或提交,并完成上述所需确认后,直接通过 HTTPS 发送给所选第三方 AI 服务或自定义兼容接口。开发者不会接收或中转这些内容。@@ -43,7 +43,6 @@本地数据会保留,直到用户在案例库中修改或删除、清除扩展数据,或卸载扩展。用户可在卸载前创建本地备份,并可在 AI 服务连接设置中清除本地 API Key 和发送授权。-When Agent connection is enabled, requested case content and original files are delivered to the paired local Agent. The Agent host may send these materials to its configured model or services according to the user’s instructions and its own settings. PromptDirector does not control that subsequent processing. Downloaded originals and connection receipts remain locally until the user removes them.## Chrome Web Store Limited Use@@ -53,6 +52,8 @@ When Agent connection is enabled, requested case content and original files are## 权限用途+- `webRequest`:仅在已授权网站上识别媒体响应地址与类型,用于视频数量角标和采集预览。媒体候选保存在浏览器会话中,换页或关闭标签页后清除;不会读取请求凭据、修改请求或上传浏览记录。跨域媒体仍受网站权限约束。+- `activeTab`:仅在用户主动触发的当前标签页操作中访问页面内容;用户明确启动列表批量采集时,可在同一标签页内滚动或沿列表分页继续,并在结束后返回原列表页。- `alarms`:安排本地后台任务的延后、轮询或恢复,不用于跟踪用户。- `contextMenus`:提供右键收藏入口。@@ -64,7 +65,7 @@ When Agent connection is enabled, requested case content and original files are- `https://wchao6891.github.io/*`:读取 PromptDirector 官方精选目录、目录指标、封面和只读预览数据。- `https://github.com/*`:读取用户明确选择保存的官方精选 Release 包,并打开公开的问题反馈或投稿页面;本地开发版还会读取官方更新版本,并在用户确认后下载程序更新包。- `https://objects.githubusercontent.com/*` 与 `https://release-assets.githubusercontent.com/*`:跟随 GitHub Release 的受信下载链读取用户明确选择的精选包及其媒体,或本地开发版的程序更新包;不会读取其他 GitHub 账号数据。-- 可选的 `<all_urls>`:不在安装时授予。只有用户主动使用需要相应站点权限的采集功能或保存第三方 AI 服务、自定义兼容接口时,扩展才会请求相应域名的运行时权限。启用 Agent 连接时会申请网站访问权限,以便配对的 Agent 按指令在独立标签页采集网址;不会被动监控浏览活动。+- 可选的 `<all_urls>`:不在安装时授予。只有用户主动使用需要相应站点权限的采集功能或保存第三方 AI 服务、自定义兼容接口时,扩展才会请求相应域名的运行时权限。启用 Agent 连接时会申请网站访问权限,以便配对的 Agent 按指令在独立标签页采集网址;不会记录或上传浏览历史。- 可选的 `nativeMessaging`:只在用户启用 Agent 连接时申请,用于与用户安装的本机连接器通信。配对的 Agent 可以按指令搜索案例、读取选定原件、采集网址及回存材料,不能通过该接口读取 AI 服务密钥。断开连接后拒绝新请求,已提交任务继续执行。- 可选的 `clipboardRead`:只在用户明确触发需要读取剪贴板内容的功能时请求。- 可选的 `declarativeNetRequestWithHostAccess`:只在用户已授予相应站点访问权限、且功能需要按该权限处理网络请求时使用。@@ -77,7 +78,7 @@ When Agent connection is enabled, requested case content and original files are# PromptDirector Privacy Policy-Effective date: September 10, 2026+Effective date: September 20, 2026PromptDirector is a local-first Chrome extension for collecting, organizing, searching, backing up, and sharing personal creative references. It has no developer-operated data server or user account system, does not collect analytics, does not show ads, and does not sell user data.@@ -91,10 +92,12 @@ Cases, media, tags, settings, Creative Skills, and API keys are stored in the brPromptDirector supports seven separately assigned AI tasks: text tagging, Skill extraction, creative planning, image analysis, video analysis, image generation, and video generation. No external AI request runs merely because the extension is installed. A real request requires the configured service, model, required site permission, and the user's sending consent. Paid media analysis or generation also requires a separate confirmation for the current action.-Content selected, submitted, or read in response to the user’s request to search or reference their library is sent directly over HTTPS to the AI provider or compatible endpoint chosen by the user. Composer invokes local case tools only when the user asks to search or reference the library. Search returns brief candidate excerpts; requested reference work reads relevant text and shows sources. Ordinary creation does not automatically search. Explicitly specified images are sent directly without a separate visual-analysis call. Retrieval can be disabled for the conversation; that choice survives a page reload. Retrieval does not automatically send case images, videos, or original document files. PromptDirector does not send the full library or API keys as creative content, or silently retry a paid action through another provider. In text-only creation mode, images are neither read nor transmitted. The developer does not receive or proxy AI request content; each provider handles received data under its own terms and privacy policy.+Content selected, submitted, or read in response to the user’s request to search or reference their library is sent directly over HTTPS to the AI provider or compatible endpoint chosen by the user. Composer invokes local case tools only when the user asks to search or reference the library. Search returns brief candidate excerpts; requested reference work reads relevant text and shows sources. Ordinary creation does not automatically search. New conversations use text references by default. Original images or videos require an explicit reference-input choice; selected images are sent directly without a separate visual-analysis call. Retrieval can be disabled for the conversation; that choice survives a page reload. Retrieval does not automatically send case images, videos, or original document files. PromptDirector does not send the full library or API keys as creative content, or silently retry a paid action through another provider. In text-only creation mode, images are neither read nor transmitted. The developer does not receive or proxy AI request content; each provider handles received data under its own terms and privacy policy.## Sharing, retention, and deletion+When Agent connection is enabled, requested case content and original files are delivered to the paired local Agent. The Agent host may send these materials to its configured model or services according to the user’s instructions and its own settings. PromptDirector does not control that subsequent processing. Downloaded originals and connection receipts remain locally until the user removes them.+Data leaves local storage only when the user explicitly sends it to a configured AI service, exports or migrates it, or creates and distributes a share package. Local data remains until the user edits or deletes it, clears extension storage, or uninstalls the extension. Users can create a local backup before uninstalling and can remove locally saved API keys and consent in AI service settings.## Chrome Web Store Limited Use@@ -103,6 +106,8 @@ PromptDirector complies with the Limited Use requirements of the Chrome Web Stor## Permission purposes+- `webRequest`: identify media response URLs and types on authorized websites for video counts and capture previews. Candidates stay in the browser session and are cleared on navigation or tab closure. This does not read credentials, modify requests, or upload browsing history; cross-origin media remains subject to site permissions.+- `activeTab`: access the current page only after a user starts capture, visual selection, or another page action.- `alarms`: schedule or resume local background work; never for tracking.- `contextMenus`: provide the explicit right-click capture entry.@@ -114,7 +119,7 @@ PromptDirector complies with the Limited Use requirements of the Chrome Web Stor- `https://wchao6891.github.io/*`: read the official curated catalog, metrics, covers, and read-only previews.- `https://github.com/*`: read an official curated Release package selected by the user and open public feedback or submission pages. Local development builds also check official versions and download program updates after user confirmation.- `https://objects.githubusercontent.com/*` and `https://release-assets.githubusercontent.com/*`: follow GitHub's trusted Release download chain for user-selected curated packages and media, or local development program updates; no other GitHub account data is read.-- Optional `<all_urls>`: not granted at installation. Ordinary capture and AI settings request the necessary origins. Enabling Agent connection requests website access so the paired Agent can capture user-requested URLs in a dedicated tab; browsing is not passively monitored.+- Optional `<all_urls>`: not granted at installation. Ordinary capture and AI settings request the necessary origins. Enabling Agent connection requests website access so the paired Agent can capture user-requested URLs in a dedicated tab; browsing history is not recorded or uploaded.- Optional `nativeMessaging`: requested when the user enables Agent connection, to communicate with the locally installed connector. A paired Agent can search cases, read selected originals, capture URLs and save materials. This interface does not expose AI service credentials. Disconnecting rejects new requests; submitted tasks continue.- Optional `clipboardRead`: requested only for a user-triggered feature that reads clipboard content.- Optional `declarativeNetRequestWithHostAccess`: requested only when a user-granted site permission and the chosen feature require a bounded network rule.diff --git a/test/ai-provider-registry.test.js b/test/ai-provider-registry.test.jsindex 21e7dd7..9de5580 100644--- a/test/ai-provider-registry.test.js+++ b/test/ai-provider-registry.test.js@@ -493,7 +493,8 @@ test("custom media keeps its configured image tasks after registry normalizationimageGeneration: { providerId: "custom-media", model: "image-model" }});const restored = normalizeAiProviderRegistry(registry);- assert.deepEqual(restored.providers["custom-media"].capabilities, ["imageAnalysis", "imageGeneration"]);+ assert.ok(restored.providers["custom-media"].capabilities.includes("creativePlanning"));+ assert.ok(availableAiModelChoicesForTask("creativePlanning", restored).some(choice => choice.providerId === "custom-media" && choice.modelId === "vision-model"));assert.equal(resolveAiProviderAssignment("imageAnalysis", restored, assignments).model, "vision-model");assert.equal(resolveAiProviderAssignment("imageGeneration", restored, assignments).model, "image-model");});@@ -674,3 +675,26 @@ test("connected task choices retain every account-visible model without inventin["account-alpha", "account-beta"]);});++test('a configured compatible dialogue model can be tried for image or video understanding without a second key', () => {+ const registry = normalizeAiProviderRegistry({ providers: { 'custom-text': {+ endpoint: 'https://compatible.example/v1/chat/completions', apiKey: 'one-fixture-key', consent: true,+ models: { creativePlanning: 'account-model', imageAnalysis: 'account-model', videoAnalysis: 'account-model' },+ discoveredModels: [{ id: 'account-model', status: 'available', tasks: ['creativePlanning'], inputModalities: ['text'], outputModalities: ['text'], confidence: 'declared' }]+ } } });+ for (const task of ['imageAnalysis', 'videoAnalysis']) {+ const choice = availableAiModelsForTask(task, registry.providers['custom-text']).find(model => model.id === 'account-model');+ assert.equal(choice.assignmentEvidence, 'manual_unverified');+ assert.equal(resolveAiProviderAssignment(task, registry, {[task]:{providerId:'custom-text',model:'account-model'}}).model,'account-model');+ }+});++test('an image generation connection needs only its own key, including the redacted UI model menu', () => {+ const registry = normalizeAiProviderRegistry({providers:{'custom-media':{consent:true,+ models:{imageGeneration:'account-image'},imageGeneration:{protocol:'images_generations',endpoint:'https://generation.example/v1/images/generations',apiKey:'only-image-key',model:'account-image'}}}});+ const safe=publicAiProviderRegistry(registry);+ assert.equal(safe.providers['custom-media'].credentialConfigured,false);+ assert.equal(safe.providers['custom-media'].imageGeneration.credentialConfigured,true);+ assert.ok(availableAiModelChoicesForTask('imageGeneration',safe).some(choice=>choice.modelId==='account-image'));+ assert.equal(availableAiModelChoicesForTask('creativePlanning',safe).some(choice=>choice.modelId==='account-image'),false);+});diff --git a/test/ai_provider_registry_e2e.py b/test/ai_provider_registry_e2e.pyindex 5e788a4..97f7dcc 100644--- a/test/ai_provider_registry_e2e.py+++ b/test/ai_provider_registry_e2e.py@@ -519,7 +519,7 @@ def main() -> None:expect(library.locator("#ai-provider-list")).to_contain_text("OpenAI")expect(library.locator("#ai-provider-list")).to_contain_text("Google Gemini")expect(library.locator("#ai-provider-list")).to_contain_text("xAI")- expect(library.locator("#ai-provider-list")).to_contain_text("自定义兼容服务(图片与生成)")+ expect(library.locator("#ai-provider-list")).to_contain_text("自定义图片生成服务")expect(library.locator("#ai-provider-list")).to_contain_text("Kimi")expect(library.locator("#open-ai-routing")).to_have_text("连接 AI 服务")expect(library.locator("#ai-provider-list").get_by_role("button", name="编辑配置")).to_have_count(5)@@ -583,7 +583,7 @@ def main() -> None:expect(dialog.locator("#promptdirector-app-dialog-providerEditor option", has_text="官方服务 · 智谱 GLM")).to_have_count(1)expect(dialog.locator("#promptdirector-app-dialog-providerEditor option", has_text="官方服务 · Kimi")).to_have_count(1)expect(dialog.locator("#promptdirector-app-dialog-providerEditor option", has_text="聚合平台 · OpenRouter")).to_have_count(1)- expect(dialog.locator("#promptdirector-app-dialog-providerEditor option", has_text="自定义兼容服务 · 自定义兼容服务(图片与生成)")).to_have_count(1)+ expect(dialog.locator("#promptdirector-app-dialog-providerEditor option", has_text="自定义兼容服务 · 自定义图片生成服务")).to_have_count(1)expect(dialog.locator('[data-field-id="provider_openrouter_model_textAnalysis"]')).to_be_visible()expect(dialog.locator('[data-field-id="provider_openrouter_model_imageAnalysis"]')).to_be_visible()expect(dialog.locator('[data-field-id="provider_openrouter_model_videoAnalysis"]')).to_be_visible()@@ -605,8 +605,11 @@ def main() -> None:analysis_key = dialog.locator("#promptdirector-app-dialog-provider_custom_media_apiKey")image_key = dialog.locator("#promptdirector-app-dialog-provider_custom_media_imageApiKey")image_endpoint = dialog.locator("#promptdirector-app-dialog-provider_custom_media_imageEndpoint")- expect(analysis_key).to_be_visible()+ expect(analysis_key).to_be_hidden()expect(image_key).to_be_visible()+ expect(image_endpoint).to_be_visible()+ dialog.locator(".app-dialog-advanced-settings > summary").click()+ expect(analysis_key).to_be_visible()expect(analysis_key).to_have_attribute("data-secret-input", "true")expect(image_key).to_have_attribute("data-secret-input", "true")expect(analysis_key).to_have_attribute("readonly", "")@@ -621,8 +624,7 @@ def main() -> None:expect(analysis_key).to_have_value("replacement-analysis-secret")expect(image_key).to_have_value("replacement-image-secret")expect(image_key).to_have_attribute("placeholder", "已保存(尾号 cret);留空保持不变")- expect(image_endpoint).to_be_hidden()- dialog.locator(".app-dialog-advanced-settings > summary").click()+ expect(image_endpoint).to_be_visible()micu_preset = dialog.get_by_role("button", name="填入米醋个人中转预设")expect(micu_preset).to_be_visible()micu_preset.click()@@ -693,7 +695,7 @@ def main() -> None:})library.locator('[data-ai-routing-tab="tasks"]').click()- generation_task = library.locator("#ai-assignment-list .ai-assignment-row", has_text="图片生成")+ generation_task = library.locator("#ai-assignment-list .ai-assignment-row").filter(has=library.get_by_text("图片生成", exact=True))generation_task.get_by_role("button", name="更换").click()generation_dialog = library.locator("#promptdirector-app-dialog")expect(generation_dialog.locator('[data-field-id="providerId"] option[value="openai"]')).to_have_count(0)@@ -702,7 +704,7 @@ def main() -> None:expect(generation_dialog).to_be_hidden()image_task = library.locator("#ai-assignment-list .ai-assignment-row", has_text="图片分析")- expect(image_task).to_contain_text("自定义兼容服务(图片与生成) · gpt-5.6-terra")+ expect(image_task).to_contain_text("自定义图片生成服务 · gpt-5.6-terra")image_task.get_by_role("button", name="更换").click()task_dialog = library.locator("#promptdirector-app-dialog")expect(task_dialog.locator('[data-field-id="providerId"]')).to_be_visible()@@ -741,7 +743,7 @@ def main() -> None:assert "imageGeneration" not in preview["tasks"]library.locator('[data-ai-routing-tab="tasks"]').click()- generation_task = library.locator("#ai-assignment-list .ai-assignment-row", has_text="图片生成")+ generation_task = library.locator("#ai-assignment-list .ai-assignment-row").filter(has=library.get_by_text("图片生成", exact=True))generation_task.get_by_role("button", name="更换").click()nano_dialog = library.locator("#promptdirector-app-dialog")nano_dialog.locator('[data-field-id="providerId"] select').select_option("gemini")diff --git a/test/analysis-batch.test.js b/test/analysis-batch.test.jsindex d5249ac..b534a0f 100644--- a/test/analysis-batch.test.js+++ b/test/analysis-batch.test.js@@ -292,21 +292,21 @@ test("rebuild stages failures without changing the live library and switches onlconst originalSnapshot = structuredClone(originalState);let job = await createAnalysisBatchJob(originalState.entries, { id: "rebuild", mode: "rebuild", profileFingerprint: "profile" });let claimed = claimAnalysisItems(job, 2, (() => { let index = 0; return () => `claim-${++index}`; })());- let staged = stageAnalysisRebuildResults(claimed.job, null, originalState, [+ let staged = await stageAnalysisRebuildResults(claimed.job, null, originalState, [{ entryId: "a", claimId: "claim-1", textRevision: 1, tags: [{ g: "style.render", t: "赛璐珞" }], model: "model", usage: { totalTokens: 12 } },{ entryId: "b", claimId: "claim-2", textRevision: 1, error: { message: "busy", status: 503 } }]);assert.deepEqual(originalState, originalSnapshot);assert.equal(analysisBatchSummary(staged.job).counts.failed, 1);- assert.throws(() => finalizeAnalysisRebuild(staged.job, staged.staging, originalState), /尚未全部成功/);+ await assert.rejects(() => finalizeAnalysisRebuild(staged.job, staged.staging, originalState), /尚未全部成功/);job = retryFailedAnalysisItems(staged.job);claimed = claimAnalysisItems(job, 1, () => "retry-b");- staged = stageAnalysisRebuildResults(claimed.job, structuredClone(staged.staging), originalState, [{+ staged = await stageAnalysisRebuildResults(claimed.job, structuredClone(staged.staging), originalState, [{entryId: "b", claimId: "retry-b", textRevision: 1,tags: [{ g: "scene.place", t: "庭院" }], model: "model", usage: { totalTokens: 9 }}]);- const finalized = finalizeAnalysisRebuild(staged.job, staged.staging, originalState, "2026-08-03T00:00:00.000Z");+ const finalized = await finalizeAnalysisRebuild(staged.job, staged.staging, originalState, "2026-08-03T00:00:00.000Z");assert.deepEqual(originalState, originalSnapshot);assert.equal(finalized.state.entries[0].facetAssignments.some((item) => item.source === "manual"), true);assert.equal(finalized.state.entries.every((entry) => entry.analysisPending === false), true);@@ -528,7 +528,7 @@ test("a confirmed partial rebuild applies staged successes and leaves failures presults: {saved: {tags: [{ g: "style.render", t: "赛璐珞" }],- fingerprint: "fingerprint",+ fingerprint: await textFingerprint(state.entries[0].text),textRevision: 1,model: "model",usage: { totalTokens: 10 }@@ -536,7 +536,7 @@ test("a confirmed partial rebuild applies staged successes and leaves failures p}};- const finalized = finalizePartialAnalysisRebuild(job, staging, state, "2026-08-03T01:00:00.000Z");+ const finalized = await finalizePartialAnalysisRebuild(job, staging, state, "2026-08-03T01:00:00.000Z");const saved = finalized.state.entries.find((entry) => entry.id === "saved");const failed = finalized.state.entries.find((entry) => entry.id === "failed");const added = finalized.state.entries.find((entry) => entry.id === "new-after-start");@@ -821,3 +821,34 @@ test("selected text tagging retags unchanged selections, skips empty text, and nconst failed = failAnalysisItem(claimed.job, "selected", claimed.claims[0].claimId, { message: "test failure", status: 422 });assert.deepEqual(retryFailedAnalysisItems(failed).items.map(item => [item.entryId, item.status]), [["selected", "pending"]]);});++test('a staged result cannot overwrite text edited while other cases were still being analyzed', async () => {+ const state={facetCatalog:createFixedFacetCatalog(),entries:[{id:'a',text:'原始画面',textRevision:1},{id:'b',text:'原始场景',textRevision:1}]};+ const job=await createAnalysisBatchJob(state.entries,{id:'staged-edit',mode:'rebuild'});+ const claimed=claimAnalysisItems(job,2,()=>crypto.randomUUID());+ const result=async(index)=>({entryId:claimed.claims[index].entryId,claimId:claimed.claims[index].claimId,+ textRevision:1,fingerprint:await textFingerprint(state.entries[index].text),tags:[{g:'style.render',t:'赛璐珞'}]});+ const first=await stageAnalysisRebuildResults(claimed.job,null,state,[await result(0)]);+ state.entries[0].text='用户后来修订的内容';+ // A restored or replaced record can carry the same revision: fingerprint must also match.+ const before=structuredClone(state);+ const second=await stageAnalysisRebuildResults(first.job,first.staging,state,[await result(1)]);+ assert.equal(analysisBatchSummary(second.job).counts.failed,1);+ assert.equal(second.job.items.find(i=>i.entryId==='b').status,'succeeded');+ assert.equal(second.staging.results.a,undefined);+ assert.ok(second.staging.results.b);+ assert.deepEqual(state,before);+ await assert.rejects(async()=>finalizeAnalysisRebuild(second.job,second.staging,state),/尚未全部成功/);+});++test('applying a completed staged rebuild checks its source again, including unchanged revision numbers', async () => {+ const state={facetCatalog:createFixedFacetCatalog(),entries:[{id:'a',text:'原始画面',textRevision:1}]};+ const job=await createAnalysisBatchJob(state.entries,{id:'staged-apply',mode:'rebuild'});+ const claimed=claimAnalysisItems(job,1,()=> 'claim');+ const staged=await stageAnalysisRebuildResults(claimed.job,null,state,[{entryId:'a',claimId:'claim',+ textRevision:1,fingerprint:await textFingerprint('原始画面'),tags:[{g:'style.render',t:'赛璐珞'}]}]);+ state.entries[0].text='用户替换的新内容';+ const before=structuredClone(state);+ await assert.rejects(async()=>finalizeAnalysisRebuild(staged.job,staged.staging,state),/原文已变化/);+ assert.deepEqual(state,before);+});diff --git a/test/batch_classification_e2e.py b/test/batch_classification_e2e.pynew file mode 100644index 0000000..bdd147a--- /dev/null+++ b/test/batch_classification_e2e.py@@ -0,0 +1,65 @@+"""Batch category change through the real library UI, with isolated storage."""+import os+from pathlib import Path+from playwright.sync_api import expect+from e2e_support import base_entry, extension_session++def main():+ with extension_session('batch-classification-',viewport={'width':1280,'height':844}) as run:+ setup=run.open_page('collector.html')+ entries=[base_entry(f'category-{i}',f'待整理案例{i}',f'保留原始提示词{i}','content:image-case',i) for i in range(3)]+ run.seed_storage(setup,{'entries':entries,'uiPreferences':{'locale':'zh-CN','theme':'dark','motion':'reduced'}})+ page=run.open_page('library.html')+ expect(page.locator('.case-card')).to_have_count(3)+ page.locator('#select-cases').click()+ page.locator('.case-card[data-entry-id="category-0"]').click()+ page.locator('.case-card[data-entry-id="category-1"]').click()+ page.locator('#selection-classification-menu > summary').click()+ expect(page.locator('#selection-classification-impact')).to_have_text('将修改 2 个案例')+ expect(page.locator('#selection-classification-menu label')).to_have_count(0)+ expect(page.get_by_role('combobox', name='案例类型', exact=True)).to_be_visible()+ page.locator('#selection-content-type').select_option('content:prompt:video')+ out=Path(os.environ.get('PD_TEST_SCREENSHOTS','/tmp/pd-batch-category'));out.mkdir(parents=True,exist_ok=True)+ for theme in ['dark','light']:+ page.evaluate('(theme)=>document.documentElement.dataset.theme=theme',theme)+ for width in [1280,390]:+ page.set_viewport_size({'width':width,'height':844})+ page.locator('#selection-classification-menu').evaluate('e=>e.open=true')+ page.screenshot(path=str(out/f'category-{theme}-{width}.png'))+ assert page.evaluate('()=>document.documentElement.scrollWidth<=innerWidth')+ # A transient failure keeps the selected cases and chosen category for retry.+ page.evaluate("""()=>{const send=chrome.runtime.sendMessage.bind(chrome.runtime);window.failCategoryOnce=true;+ chrome.runtime.sendMessage=async m=>{if(m.type==='BATCH_SET_CLASSIFICATION'&&window.failCategoryOnce){window.failCategoryOnce=false;return {ok:false,message:'测试保存失败'};}return send(m);};}""")+ page.locator('#selection-set-classification').click()+ expect(page.locator('.case-card.selected-for-share')).to_have_count(2)+ page.locator('#selection-classification-menu > summary').click()+ expect(page.locator('#selection-content-type')).to_have_value('content:prompt:video')+ page.locator('#selection-set-classification').click()+ expect(page.locator('.case-card.selected-for-share')).to_have_count(0)+ stored=setup.evaluate("async()=>(await chrome.storage.local.get('entries')).entries")+ assert [e['classification']['pathIds'][0] for e in stored]==['content:prompt:video','content:prompt:video','content:image-case'],stored+ assert all(stored[i]['text']==entries[i]['text'] for i in range(3))+ assert all(stored[i]['classification']['source']=='manual' for i in range(2))+ # Invalid/missing targets do not partially update a batch.+ response=setup.evaluate("async()=>chrome.runtime.sendMessage({type:'BATCH_SET_CLASSIFICATION',entryIds:['category-0','missing'],pathIds:['content:reference']})")+ assert response['ok'] is False,response+ assert setup.evaluate("async()=>(await chrome.storage.local.get('entries')).entries[0].classification.pathIds[0]")=='content:prompt:video'+ group=setup.evaluate("async()=>chrome.runtime.sendMessage({type:'CREATE_COMPOUND_CASE',title:'组合分类测试',memberEntryIds:['category-0','category-1']})")+ assert group['ok'],group+ page.reload()+ expect(page.locator('.case-card')).to_have_count(2)+ page.locator('#select-cases').click()+ page.locator(f'.case-card[data-entry-id="{group["compoundCase"]["id"]}"]').click()+ page.locator('#selection-classification-menu > summary').click()+ expect(page.locator('#selection-classification-impact')).to_have_text('将修改 2 个案例')+ expect(page.locator('#selection-classification-menu label')).to_have_count(0)+ expect(page.get_by_role('combobox', name='案例类型', exact=True)).to_be_visible()+ page.locator('#selection-content-type').select_option('content:reference')+ page.locator('#selection-set-classification').click()+ expect(page.locator('.case-card.selected-for-share')).to_have_count(0)+ grouped=setup.evaluate("async()=>(await chrome.storage.local.get('entries')).entries")+ assert [e['classification']['pathIds'][0] for e in grouped]==['content:reference','content:reference','content:image-case']+ assert not run.page_errors,run.page_errors+ print({'batchChanged':2,'unselectedPreserved':True,'textPreserved':True,'missingTargetAtomic':True,'failedSelectionPreserved':True,'compoundMembersChanged':True,'screenshots':str(out)})++if __name__=='__main__':main()diff --git a/test/capture-additions.test.js b/test/capture-additions.test.jsindex 9a91d55..2c062a6 100644--- a/test/capture-additions.test.js+++ b/test/capture-additions.test.js@@ -55,14 +55,49 @@ test('adding a webpage preserves headings and quotes without repeating original});-test("saved capture outcomes consume partial and duplicate cases but preserve unsaved candidates", async () => {+test("partial saves keep incomplete candidates available while completed and duplicate cases close", async () => {const { savedPageCaptureCandidateIds } = await import("../extension/capture-additions.js");const candidates = ["saved", "partial", "duplicate", "failed"].map(id => ({ id }));const results = candidates.map(({ id }) => ({ candidateId: id, status: id, ...(id !== "failed" ? { entryId: `entry:${id}` } : {}) }));- assert.deepEqual([...savedPageCaptureCandidateIds({}, candidates, results)], ["saved", "partial", "duplicate"]);+ assert.deepEqual([...savedPageCaptureCandidateIds({}, candidates, results)], ["saved", "duplicate"]);assert.deepEqual([...savedPageCaptureCandidateIds({}, candidates, [])], []);assert.deepEqual([...savedPageCaptureCandidateIds({captureMode:"list",saveMode:"combined"}, candidates,- [{candidateId:"combined-id",entryId:"saved-entry",status:"partial"}])], candidates.map(item => item.id));+ [{candidateId:"combined-id",entryId:"saved-entry",status:"partial",pendingMediaIds:["missing"]}])], []);assert.deepEqual([...savedPageCaptureCandidateIds({captureMode:"list",saveMode:"combined"}, candidates,[{candidateId:"combined-id",status:"failed"}])], []);});++test('save payload excludes unselected supplemental blocks so they cannot be appended or consumed', () => {+ const draft = { id: 'draft', fragments: [{id:'keep',text:'save this'}, {id:'later',text:'keep pending'}], visuals: [] };+ const addition = draftCaptureAddition(draft);+ const merged = appendCaptureCandidate(candidate(), addition, selection);+ const batch = normalizePageCaptureBatch({ candidates: [merged.candidate], selections: [{+ ...merged.selection, selectedTextBlockIds: ['added:draft:keep']+ }] });+ const selected = applyPageCaptureSelections(batch);+ assert.deepEqual(selected[0].textBlocks.map(block => block.text), ['save this']);+ assert.deepEqual(savedDraftCaptureItems(draft, selected, new Set(addition.consumed)), [{kind:'text',id:'keep'}]);+});++test('partial receipt consumes only saved draft images and keeps failed bytes pending', async () => {+ const { persistedPageCaptureCandidates, savedPageCaptureCandidateIds } = await import('../extension/capture-additions.js');+ const draft = {id:'draft',fragments:[{id:'text',text:'saved words'}],visuals:[{id:'good'},{id:'failed'}]};+ const candidates = [{id:'case',textBlocks:[{id:'added:draft:text',text:'saved words'}],media:[+ {id:'one',localAssetId:'good'},{id:'two',localAssetId:'failed'}]}];+ const results = [{candidateId:'case',entryId:'entry',status:'partial',savedMediaIds:['one'],pendingMediaIds:['two']}];+ for (const batch of [{},{captureMode:'list',saveMode:'combined'}]) {+ assert.deepEqual(savedDraftCaptureItems(draft,persistedPageCaptureCandidates(batch,candidates,results),+ new Set(['text:text','image:good','image:failed'])),[{kind:'text',id:'text'},{kind:'image',id:'good'}]);+ assert.deepEqual([...savedPageCaptureCandidateIds(batch,candidates,results)],[]);+ assert.deepEqual([...savedPageCaptureCandidateIds(batch,candidates,[{...results[0],pendingMediaIds:[]}])],['case']);+ }+});++test('directly selected resource links survive appending without becoming duplicate attachments', () => {+ const addition = { id: 'picked', textBlocks: [], media: [], articleDocument: { blocks: [+ { id: 'resource', kind: 'link', label: 'Selected archive', sourceUrl: 'https://example.com/resource.zip' }+ ] } };+ const first = appendCaptureCandidate(candidate(), addition, selection);+ const second = appendCaptureCandidate(first.candidate, addition, first.selection);+ assert.equal(second.candidate.articleDocument.blocks.filter(block => block.kind === 'link' && block.sourceUrl === 'https://example.com/resource.zip').length, 1);+});diff --git a/test/capture-permission-flow.test.js b/test/capture-permission-flow.test.jsindex 72751a4..a21a37d 100644--- a/test/capture-permission-flow.test.js+++ b/test/capture-permission-flow.test.js@@ -222,7 +222,7 @@ test("collector presents one compact first-use authorization and resumes only th]);assert.match(html, /id="capture-permission-onboarding"/);assert.match(html, /一次授权,之后直接采集/);- assert.match(html, /统一开启网页读取与截图能力/);+ assert.match(html, /开启网页读取、截图与媒体识别/);assert.match(html, /id="capture-permission-clipboard"[^>]*checked/);assert.match(html, /仅在你点击“剪贴板”时读取/);assert.match(html, /不会自动保存案例/);diff --git a/test/capture-runtime-wiring.test.js b/test/capture-runtime-wiring.test.jsindex c3f3e63..2e29159 100644--- a/test/capture-runtime-wiring.test.js+++ b/test/capture-runtime-wiring.test.js@@ -55,7 +55,7 @@ test("captured posts retain real media facts when suggesting a case category", aconst start = source.indexOf("async function commitPageCapture");const end = source.indexOf("async function", start + 20);const save = source.slice(start, end);- assert.match(save, /classifyContent\(\{ \.\.\.base, sourceFacts: candidate\.sourceFacts, mediaAssets, mediaPrompts \}/);+ assert.match(save, /classifyCapturedContent\(\{ \.\.\.base, sourceFacts: candidate\.sourceFacts, mediaAssets, mediaPrompts \}/);assert.doesNotMatch(save, /classificationMediaAssets/);});diff --git a/test/capture-supplement.test.js b/test/capture-supplement.test.jsnew file mode 100644index 0000000..146078e--- /dev/null+++ b/test/capture-supplement.test.js@@ -0,0 +1,50 @@+import test from 'node:test';+import assert from 'node:assert/strict';+import { readPageCaptureSupplement } from '../extension/capture-supplement.js';++const item = { id: 'reply', sourceUrl: 'https://x.com/director/status/124', text: 'preview', partial: true };+function fixture(result, failure) {+ const calls = [];+ const event = { addListener() {}, removeListener() {} };+ const api = {+ permissions: { contains: async () => true },+ tabs: {+ onUpdated: event, onRemoved: event,+ create: async value => { calls.push(['create', value]); return { id: 2 }; },+ get: async () => ({ id: 2, status: 'complete', url: item.sourceUrl }),+ remove: async id => calls.push(['remove', id])+ },+ scripting: { executeScript: async value => { calls.push(['read', value.args]); if (failure) throw failure; return [{ result }]; } }+ };+ return { api, calls };+}++test('selected comment is read in an inactive temporary tab and keeps its identity and full text', async () => {+ const full = 'Full prompt\n'.repeat(2000);+ const { api, calls } = fixture({ supplement: { sourceUrl: item.sourceUrl, text: full, partial: false } });+ const result = await readPageCaptureSupplement(item, api);+ assert.equal(result.id, item.id);+ assert.equal(result.text, full);+ assert.deepEqual(calls[0], ['create', { url: item.sourceUrl, active: false }]);+ assert.deepEqual(calls.at(-1), ['remove', 2]);+ assert.equal(item.text, 'preview');+});++test('unavailable, truncated or substituted replies fail without returning a preview as success', async () => {+ for (const result of [{}, { supplement: { ...item } }, { supplement: { ...item, partial: false, sourceUrl: 'https://x.com/other/status/456' } }]) {+ const { api, calls } = fixture(result);+ await assert.rejects(readPageCaptureSupplement(item, api), /全文/);+ assert.deepEqual(calls.at(-1), ['remove', 2]);+ }+ const { api, calls } = fixture(null, new Error('site unavailable'));+ await assert.rejects(readPageCaptureSupplement(item, api), /site unavailable/);+ assert.deepEqual(calls.at(-1), ['remove', 2]);+});++test('invalid origins and missing site permission cannot open a background page', async () => {+ const { api, calls } = fixture({});+ await assert.rejects(readPageCaptureSupplement({ ...item, sourceUrl: 'https://example.com/status/124' }, api), /有效/);+ api.permissions.contains = async () => false;+ await assert.rejects(readPageCaptureSupplement(item, api), /授权/);+ assert.deepEqual(calls, []);+});diff --git a/test/capture-workspace.test.js b/test/capture-workspace.test.jsindex bca65d7..b5026bd 100644--- a/test/capture-workspace.test.js+++ b/test/capture-workspace.test.js@@ -496,3 +496,28 @@ function fakeChrome(stored, overrides = {}) {}};}++test('returning to a saved clipboard selection does not refill the draft, while explicit capture still works', async () => {+ const { CAPTURE_SAVED_TEXT_KEY, createTextCandidate } = await import('../extension/capture-text-candidate.js');+ const candidate = await createTextCandidate({clipboard:'saved text'});+ const stored = { [CAPTURE_SAVED_TEXT_KEY]: [candidate.textFingerprint] };+ const workspace = createCaptureWorkspace({chromeApi:fakeChrome(stored,{executeScript:async()=>[{result:'saved text'}]}),+ captureDraftStorageKey:'captureDraft',ensureOffscreenDocument:async()=>undefined,deleteVisual:async()=>undefined});+ const automatic=await workspace.dispatch('try-active-selection');+ assert.equal(automatic.added,false);+ assert.equal(automatic.reason,'already-saved-selection');+ assert.equal((await workspace.dispatch('add-active-selection')).added,true);+});++test('page save clears only persisted fragments and suppresses their automatic return', async () => {+ const stored = {};+ const workspace = createCaptureWorkspace({chromeApi:fakeChrome(stored,{executeScript:async()=>[{result:'saved page text'}]}),+ captureDraftStorageKey:'captureDraft',ensureOffscreenDocument:async()=>undefined,deleteVisual:async()=>undefined});+ const first = await workspace.dispatch('add-selection', {fragment:{text:'saved page text'}});+ await workspace.dispatch('add-selection', {fragment:{text:'unsaved text'}});+ const cleared = await workspace.dispatch('clear-saved-fragments', {fragmentIds:[first.draft.fragments[0].id]});+ assert.deepEqual(cleared.draft.fragments.map(item=>item.text), ['unsaved text']);+ await workspace.dispatch('remove-fragment', {fragmentId:cleared.draft.fragments[0].id});+ assert.equal((await workspace.dispatch('try-active-selection')).added, false);+ assert.equal((await workspace.dispatch('add-active-selection')).added, true);+});diff --git a/test/capture_additions_e2e.py b/test/capture_additions_e2e.pyindex 4ee58c0..243c8ce 100644--- a/test/capture_additions_e2e.py+++ b/test/capture_additions_e2e.py@@ -29,6 +29,10 @@ def main():Object.defineProperty(navigator,'clipboard',{configurable:true,value:{read:async()=>[{types:['text/plain'],getType:async()=>new Blob(['剪贴板补充:保持动作连续。'],{type:'text/plain'})}]}});chrome.runtime.sendMessage=async m=>{if(m.type==='START_PAGE_CAPTURE')return {ok:true,batch:window.webSnapshot};+ if(m.type==='PICK_PAGE_CONTENT')return {ok:true,supplement:'comments',batch:{...snapshot,id:'picked-comment',candidates:[{+ ...snapshot.candidates[0],id:'selected-extra',contentText:'网页高亮补充:使用自然光与清晰构图。',+ textBlocks:[{id:'selected-extra',text:'网页高亮补充:使用自然光与清晰构图。'}],media:[]+ }]}};if(m.type==='PREVIEW_PAGE_CAPTURE_REGION'||m.type==='CLEAR_PAGE_CAPTURE_MARKERS')return {ok:true};if(m.type==='START_SMART_VISUAL_SELECTION')return {ok:true,session:{sessionId:'smart',selectedCount:1,candidateCount:1}};if(m.type==='CANCEL_SMART_VISUAL_SELECTION')return {ok:true};@@ -104,6 +108,29 @@ def main():assert all(blobs),blobsdraft=page.evaluate("async()=>(await chrome.runtime.sendMessage({type:'GET_CAPTURE_WORKSPACE'})).draft")assert not draft['fragments'] and not draft['visuals'],draft+ # A later explicit supplement to an already-saved URL must reach the same case+ # before the collector removes its draft. Repeating it must remain idempotent.+ for attempt in range(2):+ page.evaluate("""async attempt=>{+ const {createCaptureDraft}=await import('./capture-draft.js');+ await chrome.runtime.sendMessage({type:'UPDATE_CAPTURE_DRAFT',draft:createCaptureDraft({+ fragments:[{id:'later-'+attempt,text:'第二次补充:必须写回已经保存的案例。',sourceUrl:'https://example.com/post'}]+ })});+ window.dispatchEvent(new Event('focus'));+ }""",attempt)+ expect(page.locator('#preview-state')).to_be_visible()+ page.locator('#add-page-capture').click();page.locator('.page-capture-confirm').click()+ expect(page.locator('.page-capture-excerpt')).to_contain_text('第二次补充')+ page.locator('#page-capture-save').click()+ expect(page.locator('#page-capture')).to_be_hidden(timeout=15000)+ updated=page.evaluate("async()=>(await chrome.runtime.sendMessage({type:'GET_STATE'})).entries")+ assert len(updated)==1 and updated[0]['id']==entry['id'],updated+ assert updated[0]['text'].count('第二次补充:必须写回已经保存的案例。')==1,updated[0]['text']+ for text in ['已有的选中文字','网页主帖','网页高亮补充','剪贴板补充']: assert text in updated[0]['text']+ assert len(updated[0]['mediaAssets'])==2+ remaining_draft=page.evaluate("async()=>(await chrome.runtime.sendMessage({type:'GET_CAPTURE_WORKSPACE'})).draft")+ assert not remaining_draft['fragments'],remaining_draft+ print({'recaptureSupplementSavedToSameCase':True,'retryNoDuplicateText':True})# Text-only save must leave unsaved image bytes available in the draft.page.evaluate('''async()=>{const image=await window.makeImage('pending-image','#551133');diff --git a/test/capture_classification_detail_e2e.py b/test/capture_classification_detail_e2e.pynew file mode 100644index 0000000..20b5cd0--- /dev/null+++ b/test/capture_classification_detail_e2e.py@@ -0,0 +1,94 @@+"""Synthetic capture inputs, real save/readback and detail UI; no user library or network."""+import os+from pathlib import Path+from playwright.sync_api import expect+from e2e_support import extension_session+++def main():+ with extension_session('capture-classification-detail-', viewport={'width':1280,'height':844}) as run:+ page=run.open_page('collector.html')+ run.seed_storage(page, {'entries': [], 'uiPreferences': {'locale':'zh-CN','motion':'reduced'}})+ results=page.evaluate('''async()=>{+ const {saveScreenshotBlob}=await import('./image-store.js');+ const {normalizePageCaptureBatch,applyPageCaptureSelections}=await import('./page-capture.js');+ const {classifyCapturedContent}=await import('./classifier.js');+ const canvas=document.createElement('canvas');canvas.width=720;canvas.height=960;+ const ctx=canvas.getContext('2d');ctx.fillStyle='#476f87';ctx.fillRect(0,0,720,960);+ await saveScreenshotBlob('classification-image',await new Promise(r=>canvas.toBlob(r)));+ const results=[];+ for (const [id,text,pageType,manual] of [+ ['image-text','海面薄雾,孤舟行驶。\\n'.repeat(400),'artwork',false],+ ['image-only','','artwork',false],+ ['document','教程:第一步明确主体,第二步说明为什么这个方法适用于不同场景。','article',false],+ ['manual','海面薄雾,孤舟行驶。','artwork',true],+ ['video-text','图片参考,海面薄雾,孤舟行驶。','artwork',false],+ ['video-only','','artwork',false],+ ['platform-video','Prompt: create a cinematic video. 视频简介','video',false],+ ['platform-image','Prompt: portrait. 作品简介','artwork',false],+ ['platform-aigc','','artwork',false]]) {+ const sourceUrl=id==='platform-video'?'https://www.youtube.com/watch?v=fixture1234':id==='platform-image'?'https://www.pinterest.com/pin/123':id==='platform-aigc'?'https://www.midjourney.com/jobs/123':'https://example.com/'+id;+ const media=[{id:'image',kind:'image',localAssetId:'classification-image',width:720,height:960},+ ...(id.startsWith('video-')?[{id:'video',kind:'video',url:'https://www.youtube.com/watch?v=fixture1234',width:720,height:960}]:[])];+ const batch=normalizePageCaptureBatch({id,sourceUrl,+ candidates:[{id,title:id,canonicalUrl:sourceUrl,pageType,contentText:text,+ textBlocks:text?[{id:'text',kind:'section',text}]:[],+ media,+ sourceFacts:{provider:'example.com',pageType,extractionMethod:'dom'}}],+ selections:[{candidateId:id,includeText:true,selectedTextBlockIds:text?['text']:[],selectedMediaIds:media.map(m=>m.id),mediaDecision:'confirmed'}]});+ const candidate=applyPageCaptureSelections(batch)[0];+ const preview=classifyCapturedContent({url:candidate.canonicalUrl,text:candidate.contentText,sourceFacts:candidate.sourceFacts,mediaAssets:candidate.media});+ const result=await chrome.runtime.sendMessage({type:'COMMIT_PAGE_CAPTURE',batch,+ ...(manual?{contentTypeExplicit:true,contentTypeId:'content:video-case'}:{})});+ if (!result.ok || !result.results?.[0]?.entryId) throw new Error(JSON.stringify(result));+ const stored=await chrome.storage.local.get('entries');+ const entry=stored.entries.find(e=>e.id===result.results[0].entryId);+ results.push({id,preview:preview.pathIds[0],saved:entry.classification.pathIds[0],entryId:entry.id});+ }+ return results;+ }''')+ assert [r['saved'] for r in results]==['content:prompt:image','content:image-case','content:reference','content:video-case','content:prompt:video','content:video-case','content:video-case','content:image-case','content:prompt:image'],results+ assert all(r['saved']==r['preview'] for r in results if r['id']!='manual'),results+ page.goto(f'chrome-extension://{run.extension_id}/library.html')+ page.locator(f'.case-card[data-entry-id="{results[0]["entryId"]}"]').click()+ separator=page.get_by_role('separator',name='调整图文分栏宽度')+ expect(separator).to_be_visible()+ body=page.locator('.detail-primary > .detail-body')+ before=body.bounding_box()+ box=separator.bounding_box()+ page.mouse.move(box['x']+4,box['y']+100)+ page.mouse.down();page.mouse.move(box['x']-110,box['y']+100,steps=10);page.mouse.up()+ page.wait_for_function('async()=>!!(await chrome.storage.local.get("uiPreferences")).uiPreferences.detailPanelRatio')+ after=body.bounding_box()+ assert after['width']>before['width']+90,(before,after)+ separator.focus();separator.press('ArrowLeft')+ page.wait_for_function('(width)=>document.querySelector(".detail-primary > .detail-body").getBoundingClientRect().width>width+10',arg=after['width'])+ gallery=page.locator('.detail-primary > .detail-visual-gallery')+ media_before=gallery.bounding_box()+ expand=body.get_by_role('button',name='展开全文',exact=True)+ if expand.count(): expand.first.click()+ body.evaluate('e=>e.scrollTop=e.scrollHeight')+ assert body.evaluate('e=>e.scrollTop>0 && e.clientHeight<=innerHeight'), 'long prompt must scroll within viewport'+ assert abs(gallery.bounding_box()['y']-media_before['y'])<1+ saved_width=body.bounding_box()['width']+ page.get_by_role('button',name='关闭详情',exact=True).click()+ page.locator(f'.case-card[data-entry-id="{results[0]["entryId"]}"]').click()+ expect(separator).to_be_visible()+ page.wait_for_function('(w)=>Math.abs(document.querySelector(".detail-primary > .detail-body").getBoundingClientRect().width-w)<2',arg=saved_width)+ out=Path(os.environ.get('PD_TEST_SCREENSHOTS','/tmp/pd-capture-detail'))+ out.mkdir(parents=True,exist_ok=True)+ for theme in ['dark','light']:+ page.evaluate('(theme)=>document.documentElement.dataset.theme=theme',theme)+ for width in [1280,900,390]:+ page.set_viewport_size({'width':width,'height':844})+ page.evaluate('()=>new Promise(r=>requestAnimationFrame(()=>requestAnimationFrame(r)))')+ assert page.evaluate('()=>document.documentElement.scrollWidth<=innerWidth')+ if width==390:+ expect(separator).not_to_be_visible()+ assert body.evaluate('e=>getComputedStyle(e).overflowY')=='visible'+ else: expect(separator).to_be_visible()+ page.screenshot(path=str(out/f'detail-{theme}-{width}.png'))+ assert not run.page_errors,run.page_errors+ print({'classificationReadback':results,'splitDragKeyboardRememberScroll':True,'screenshots':str(out)})++if __name__=='__main__': main()diff --git a/test/capture_partial_save_e2e.py b/test/capture_partial_save_e2e.pyindex 57aad5f..a5ba167 100644--- a/test/capture_partial_save_e2e.py+++ b/test/capture_partial_save_e2e.py@@ -40,7 +40,8 @@ def main():assert result['ok'] and result['results'][0]['status']=='partial', resultentries=page.evaluate("async()=> (await chrome.storage.local.get('entries')).entries")assert len(entries)==1 and any(asset['kind']=='video' for asset in entries[0]['mediaAssets']),entries- assert entries[0]['sourceFacts']['captureWarnings'], entries+ assert 'captureWarnings' not in entries[0]['sourceFacts'], entries+ assert result['results'][0]['warnings'], resultexpect(page.locator('#page-capture')).to_be_hidden()expect(page.locator('#feedback')).to_contain_text('已保存')assert len(page.evaluate("async()=> (await chrome.storage.local.get('entries')).entries"))==1@@ -54,7 +55,7 @@ def main():expect(page.locator('#feedback')).to_contain_text('模拟保存失败')expect(page.locator('#page-capture')).to_be_visible()assert len(page.evaluate("async()=> (await chrome.storage.local.get('entries')).entries"))==1- print({'case_saved':True,'warning_retained':True,'saved_sidebar_cleared':True,'unsaved_content_preserved':True})+ print({'case_saved':True,'diagnostics_not_in_case':True,'saved_sidebar_cleared':True,'unsaved_content_preserved':True})if __name__=='__main__':main()diff --git a/test/capture_partial_supplement_e2e.py b/test/capture_partial_supplement_e2e.pynew file mode 100644index 0000000..60a90a3--- /dev/null+++ b/test/capture_partial_supplement_e2e.py@@ -0,0 +1,78 @@+"""Synthetic page and missing local image; production save, receipts and collector cleanup."""+from playwright.sync_api import expect+from e2e_support import extension_session+from pathlib import Path+import os+++def main():+ with extension_session('capture-partial-', viewport={'width':390,'height':844}) as run:+ run.context.route('https://wchao6891.github.io/page-saved-selection', lambda route: route.fulfill(body='<html><meta charset="utf-8"><p id="source">必须保留的补充提示词</p></html>', content_type='text/html'))+ source=run.context.new_page();source.goto('https://wchao6891.github.io/page-saved-selection')+ source.evaluate('()=>{const range=document.createRange();range.selectNodeContents(document.querySelector("#source"));getSelection().addRange(range)}')+ run.context.service_workers[0].evaluate('''async()=>{const query=chrome.tabs.query.bind(chrome.tabs);const [tab]=await query({url:'https://wchao6891.github.io/page-saved-selection'});chrome.tabs.query=async q=>q.active?[tab]:query(q)}''')+ page=run.open_page('collector.html')+ run.seed_storage(page,{'entries':[], 'capturePermissionOnboarding':{'version':1,'acknowledgedAt':'2026-09-19T00:00:00Z','clipboardIncluded':True}})+ page.evaluate('''async()=>{+ const send=chrome.runtime.sendMessage.bind(chrome.runtime);+ const {createCaptureDraft}=await import('./capture-draft.js');+ const {saveScreenshotBlob}=await import('./image-store.js');+ const {sha256Blob}=await import('./blob-digest.js');+ window.restoreImage=async(id,color)=>{+ const canvas=document.createElement('canvas');canvas.width=80;canvas.height=100;+ canvas.getContext('2d').fillStyle=color;canvas.getContext('2d').fillRect(0,0,80,100);+ const blob=await new Promise(r=>canvas.toBlob(r,'image/png'));+ await saveScreenshotBlob(id,blob);+ return {id,mimeType:'image/png',contentHash:await sha256Blob(blob),width:80,height:100};+ };+ const good=await window.restoreImage('good','#336699');+ await send({type:'UPDATE_CAPTURE_DRAFT',draft:createCaptureDraft({+ fragments:[{id:'supplement',text:'必须保留的补充提示词'}],+ visuals:[good,{id:'missing',mimeType:'image/png',width:80,height:100}]+ })});+ chrome.permissions.contains=async()=>true;chrome.permissions.request=async()=>true;+ const query=chrome.tabs.query.bind(chrome.tabs);chrome.tabs.query=async q=>q.active?[{id:999,url:'https://example.com/partial'}]:query(q);+ chrome.runtime.sendMessage=async m=>{+ if(m.type==='START_PAGE_CAPTURE')return {ok:true,batch:{id:'partial',sourceUrl:'https://example.com/partial',candidates:[{+ id:'main',canonicalUrl:'https://example.com/partial',title:'部分媒体保存',pageType:'post',contentText:'原始正文',+ textBlocks:[{id:'body',kind:'section',text:'原始正文'}],media:[],sourceFacts:{provider:'example.com',pageType:'post'}+ }]}};+ if(['PREVIEW_PAGE_CAPTURE_REGION','CLEAR_PAGE_CAPTURE_MARKERS'].includes(m.type))return {ok:true};+ const result=await send(m);if(m.type==='COMMIT_PAGE_CAPTURE')window.lastSave=result;return result;+ };+ window.dispatchEvent(new Event('focus'));+ }''')+ expect(page.locator('#preview-state')).to_be_visible()+ page.locator('#add-page-capture').click();page.locator('.page-capture-confirm').click()+ page.locator('#page-capture-save').click()+ page.wait_for_function('()=>Boolean(window.lastSave)')+ snapshot=page.evaluate('''async()=>({result:window.lastSave,+ draft:(await chrome.runtime.sendMessage({type:'GET_CAPTURE_WORKSPACE'})).draft,+ entries:(await chrome.runtime.sendMessage({type:'GET_STATE'})).entries})''')+ print({'firstSave':snapshot},flush=True)+ expect(page.locator('#page-capture')).to_be_visible()+ assert [v['id'] for v in snapshot['draft']['visuals']]==['missing'],snapshot['draft']+ assert not snapshot['draft']['fragments']+ assert len(snapshot['entries'])==1 and len(snapshot['entries'][0]['mediaAssets'])==1+ expect(page.locator('#page-capture-save')).to_be_enabled()+ out=Path(os.environ.get('PD_TEST_SCREENSHOTS','/tmp/pd-capture-partial'));out.mkdir(parents=True,exist_ok=True)+ for theme in ['dark','light']:+ page.evaluate('(theme)=>document.documentElement.dataset.theme=theme',theme)+ for width in [390,1280]:+ page.set_viewport_size({'width':width,'height':844})+ page.screenshot(path=str(out/f'partial-{theme}-{width}.png'),animations='disabled')+ page.evaluate("()=>window.restoreImage('missing','#993366')")+ page.evaluate('()=>window.lastSave=null')+ page.locator('#page-capture-save').click()+ expect(page.locator('#page-capture')).to_be_hidden()+ final=page.evaluate('''async()=>({draft:(await chrome.runtime.sendMessage({type:'GET_CAPTURE_WORKSPACE'})).draft,+ entries:(await chrome.runtime.sendMessage({type:'GET_STATE'})).entries})''')+ assert len(final['entries'])==1 and len(final['entries'][0]['mediaAssets'])==2,final+ assert len([b for b in final['entries'][0]['articleDocument']['blocks'] if b.get('kind')=='image'])==2,final['entries'][0]['articleDocument']+ assert final['entries'][0]['text'].count('必须保留的补充提示词')==1+ assert not final['draft']['visuals'] and not final['draft']['fragments'],final['draft']+ returned=page.evaluate("async()=>chrome.runtime.sendMessage({type:'TRY_ACTIVE_SELECTION_TO_DRAFT'})")+ assert returned.get('added') is False and returned.get('reason')=='already-saved-selection',returned+ print({'pageSavedSelectionSuppressed':True,'partialRetained':True,'retrySameCase':True,'savedMediaPreserved':True,'completedDraftCleared':True})++if __name__=='__main__':main()diff --git a/test/capture_quick_entry_e2e.py b/test/capture_quick_entry_e2e.pynew file mode 100644index 0000000..5d0ef0b--- /dev/null+++ b/test/capture_quick_entry_e2e.py@@ -0,0 +1,99 @@+"""Entry/permissions/extraction fixtures; production collector selection, save and library readback."""+from pathlib import Path+import os+from playwright.sync_api import expect+from e2e_support import extension_session+from page_capture_e2e import fixture_png++SETUP = '''({count,permission=true})=>{+ window.scanCount=0;window.clickCount=0;+ document.addEventListener('click',()=>window.clickCount++,true);+ const send=chrome.runtime.sendMessage.bind(chrome.runtime);+ chrome.permissions.contains=async()=>permission;+ chrome.tabs.query=async()=>[{id:999,url:'https://example.com/quick',windowId:1}];+ chrome.runtime.sendMessage=async m=>{+ if(m.type==='TRY_ACTIVE_SELECTION_TO_DRAFT')return {ok:true,added:false};+ if(m.type==='PREVIEW_PAGE_CAPTURE_REGION'||m.type==='CLEAR_PAGE_CAPTURE_MARKERS')return {ok:true};+ if(m.type==='START_PAGE_CAPTURE'){+ window.scanCount++;+ return {ok:true,batch:{id:'quick',sourceUrl:'https://example.com/quick',candidates:Array.from({length:count},(_,i)=>({+ id:'case-'+i,title:'自动识别案例 '+i,canonicalUrl:'https://example.com/quick/'+i,pageType:'post',+ contentText:'保留完整提示词 '+i,textBlocks:[{id:'text-'+i,kind:'section',text:'保留完整提示词 '+i}],+ media:i===0?[{id:'image',kind:'image',placement:'inline',url:'https://wchao6891.github.io/quick-entry-image.png',width:800,height:600}]:[],sourceFacts:{provider:'example.com',pageType:'post'}+ }))}};+ }+ return send(m);+ };+}'''+++def main():+ with extension_session('capture-quick-',viewport={'width':390,'height':844}) as run:+ run.context.route('https://wchao6891.github.io/quick-entry-image.png',lambda route:route.fulfill(body=fixture_png('quick-entry-image'),content_type='image/png'))+ setup=run.open_page('collector.html')+ for count in [1,2]:+ run.seed_storage(setup,{'entries':[],'uiPreferences':{'theme':'dark','motion':'reduced'},'capturePermissionOnboarding':{'version':1,'acknowledgedAt':'2026-09-19T00:00:00Z'}})+ page=run.context.new_page()+ page.add_init_script('('+SETUP+')('+str({'count':count}).replace("'",'"')+')')+ page.goto(f'chrome-extension://{run.extension_id}/collector.html')+ expect(page.locator('.page-capture-item')).to_have_count(count)+ if count==2:+ expect(page.locator('#page-capture-save')).to_be_disabled()+ page.locator('.page-capture-confirm').nth(1).click()+ expect(page.locator('#page-capture-save')).to_be_enabled()+ assert page.evaluate('window.scanCount')==1+ if count==1:+ out=Path(os.environ.get('PD_TEST_SCREENSHOTS','/tmp/pd-quick-entry'));out.mkdir(parents=True,exist_ok=True)+ for theme in ['dark','light']:+ page.evaluate('(v)=>document.documentElement.dataset.theme=v',theme)+ for width in [390,1280]:+ page.set_viewport_size({'width':width,'height':844})+ page.screenshot(path=str(out/f'quick-{theme}-{width}.png'),animations='disabled')+ page.locator('#page-capture-save').click()+ expect(page.locator('#page-capture')).to_be_hidden()+ clicks=page.evaluate('window.clickCount')+ assert clicks==count,clicks+ entries=page.evaluate("async()=>(await chrome.runtime.sendMessage({type:'GET_STATE'})).entries")+ assert len(entries)==1 and entries[0]['text']=='保留完整提示词 '+str(count-1),entries+ if count==1:+ assert len(entries[0]['mediaAssets'])==1 and entries[0]['classification']['pathIds']==['content:prompt:image'],entries+ page.evaluate("()=>window.dispatchEvent(new Event('focus'))")+ expect(page.locator('#page-capture')).to_be_hidden()+ assert page.evaluate('window.scanCount')==1+ print({'candidates':count,'collectorClicks':clicks,'toolbarOpenPlusCollector':clicks+1,'focusNoRescan':True},flush=True)+ if count==1:+ window_id=page.evaluate('async()=>(await chrome.windows.getCurrent()).id')+ run.context.service_workers[0].evaluate("async windowId=>{await chrome.runtime.sendMessage({type:'OPEN_PAGE_CAPTURE',windowId}).catch(()=>{})}",window_id)+ expect(page.locator('#page-capture-save')).to_be_enabled()+ assert page.evaluate('window.scanCount')==2+ page.locator('#page-capture-cancel').click()+ print({'existingPanelToolbarReopen':True},flush=True)+ page.close()+ # A durable draft wins over automatic page discovery.+ run.seed_storage(setup,{'entries':[]})+ setup.evaluate("""async()=>{const {createCaptureDraft}=await import('./capture-draft.js');await chrome.runtime.sendMessage({type:'UPDATE_CAPTURE_DRAFT',draft:createCaptureDraft({fragments:[{id:'old',text:'用户未保存的内容'}]})})}""")+ page=run.context.new_page();page.add_init_script('('+SETUP+')({count:1})')+ page.goto(f'chrome-extension://{run.extension_id}/collector.html')+ expect(page.locator('#quick-preview')).to_contain_text('用户未保存的内容')+ assert page.evaluate('window.scanCount')==0+ page.close()+ # First-use permission remains a real permission step, not an empty automatic scan.+ run.seed_storage(setup,{'entries':[]})+ page=run.context.new_page();page.add_init_script('('+SETUP+')({count:1,permission:false})')+ page.goto(f'chrome-extension://{run.extension_id}/collector.html')+ expect(page.locator('#capture-permission-onboarding')).to_be_visible()+ assert page.evaluate('window.scanCount')==0+ page.locator('#capture-permission-cancel').click()+ expect(page.locator('#capture-permission-onboarding')).to_be_hidden()+ page.close()+ # No candidate leaves existing manual capture actions available.+ run.seed_storage(setup,{'entries':[]})+ page=run.context.new_page();page.add_init_script('('+SETUP+')({count:0})')+ page.goto(f'chrome-extension://{run.extension_id}/collector.html')+ expect(page.locator('#page-capture-help')).to_contain_text('未识别到内容')+ expect(page.locator('#page-capture-save')).to_be_disabled()+ page.locator('#page-capture-cancel').click()+ expect(page.locator('#start-clipboard')).to_be_visible()+ print({'draftPreserved':True,'firstPermissionExplicit':True,'emptyPageRecoverable':True})++if __name__=='__main__':main()diff --git a/test/capture_review_regressions_e2e.py b/test/capture_review_regressions_e2e.pynew file mode 100644index 0000000..862727b--- /dev/null+++ b/test/capture_review_regressions_e2e.py@@ -0,0 +1,35 @@+import sys,json+# Synthetic source data; production background save and persisted library readback.+from e2e_support import extension_session++with extension_session('pd-review-commits-') as run:+ page=run.open_page('collector.html')+ run.seed_storage(page,{'entries':[]})+ result=page.evaluate('''async()=>{+ const {normalizePageCaptureBatch}=await import('./page-capture.js');+ const {addDiscoveredVideos,videoResource}=await import('./video-discovery.js');+ const candidate={id:'review-article',title:'Review fixture',canonicalUrl:'https://example.com/review-article',pageType:'article',contentText:'Review fixture text',textBlocks:[{id:'text',text:'Review fixture text'}],media:[],sourceFacts:{provider:'example.com',pageType:'article',extractionMethod:'structured'}};+ const batch=normalizePageCaptureBatch({sourceUrl:candidate.canonicalUrl,candidates:[candidate],selections:[{candidateId:candidate.id,includeText:true,selectedTextBlockIds:['text'],selectedMediaIds:[],mediaDecision:'confirmed'}]});+ const first=await chrome.runtime.sendMessage({type:'COMMIT_PAGE_CAPTURE',batch,contentTypeExplicit:true,contentTypeId:'content:reference'});+ const second=await chrome.runtime.sendMessage({type:'COMMIT_PAGE_CAPTURE',batch,contentTypeExplicit:true,contentTypeId:'content:video-case'});+ const entry=(await chrome.storage.local.get('entries')).entries.find(e=>e.id===first.results[0].entryId);+ await chrome.runtime.sendMessage({type:'COMMIT_PAGE_CAPTURE',batch});+ const preserved=(await chrome.storage.local.get('entries')).entries.find(e=>e.id===entry.id).classification.pathIds[0];+ const next={...candidate,id:'new',canonicalUrl:'https://example.com/new-article'};+ const mixed=normalizePageCaptureBatch({sourceUrl:candidate.canonicalUrl,candidates:[candidate,next],selections:[candidate,next].map(c=>({candidateId:c.id,includeText:true,selectedTextBlockIds:['text'],selectedMediaIds:[],mediaDecision:'confirmed'}))});+ const mixedSaved=await chrome.runtime.sendMessage({type:'COMMIT_PAGE_CAPTURE',batch:mixed,contentTypeExplicit:true,contentTypeId:'content:image-case'});+ const mixedEntries=(await chrome.storage.local.get('entries')).entries;+ const mixedTypes=mixedSaved.results.map(r=>mixedEntries.find(e=>e.id===r.entryId).classification.pathIds[0]);+ const resource=videoResource({tabId:1,statusCode:200,url:'https://media.example.com/playlist.m3u8',responseHeaders:[{name:'Content-Type',value:'application/vnd.apple.mpegurl'}]});+ const discovered=addDiscoveredVideos({sourceUrl:'https://example.com/review-player',candidates:[{id:'review-hls',title:'Review HLS fixture',canonicalUrl:'https://example.com/review-player',pageType:'video',media:[]}]},[resource]);+ discovered.selections=[{candidateId:'review-hls',selectedMediaIds:[discovered.candidates[0].media[0].id],mediaDecision:'confirmed'}];+ const saved=await chrome.runtime.sendMessage({type:'COMMIT_PAGE_CAPTURE',batch:normalizePageCaptureBatch(discovered)});+ const hls=(await chrome.storage.local.get('entries')).entries.find(e=>e.id===saved.results[0].entryId);+ return {preserved,mixedTypes,duplicateClassification:{firstStatus:first.results[0].status,secondStatus:second.results[0].status,requested:'content:video-case',stored:entry.classification.pathIds[0]},hls:{status:saved.results[0].status,media:hls.mediaAssets.map(a=>({kind:a.kind,storageMode:a.storageMode,reference:a.reference}))}};+ }''')+ assert result['duplicateClassification']['stored']=='content:video-case',result+ assert result['duplicateClassification']['secondStatus']=='duplicate',result+ assert result['preserved']=='content:video-case' and result['mixedTypes']==['content:image-case','content:image-case'],result+ reference=result['hls']['media'][0]['reference']+ assert reference.get('streamUrl')=='https://media.example.com/playlist.m3u8',result+ print(json.dumps(result,ensure_ascii=False,indent=2))diff --git a/test/capture_session_video_e2e.py b/test/capture_session_video_e2e.pynew file mode 100644index 0000000..c1423da--- /dev/null+++ b/test/capture_session_video_e2e.py@@ -0,0 +1,60 @@+"""Shared save path: background 403, selected-page media succeeds, persisted poster and full receipt."""+import json, tempfile+from pathlib import Path+from e2e_support import EXTENSION_DIR, extension_session+from page_capture_e2e import fixture_png++WORK='https://www.midjourney.com/jobs/5ca4c5a5-5a4a-49b9-b4c6-bb451381b849?index=0'+CDN='https://cdn.midjourney.com'+VIDEO=CDN+'/video/5ca4c5a5-5a4a-49b9-b4c6-bb451381b849/0.mp4'+POSTER=CDN+'/video/5ca4c5a5-5a4a-49b9-b4c6-bb451381b849/0_640_N.webp'+with tempfile.TemporaryDirectory(prefix='session-video-extension-') as temp:+ extension=Path(temp)+ for file in EXTENSION_DIR.iterdir():+ if file.name!='manifest.json': (extension/file.name).symlink_to(file,target_is_directory=file.is_dir())+ manifest=json.loads((EXTENSION_DIR/'manifest.json').read_text())+ manifest['host_permissions']+=['https://www.midjourney.com/*',CDN+'/*']+ (extension/'manifest.json').write_text(json.dumps(manifest))+ with extension_session('session-video-',extension_dir=extension) as run:+ run.context.route(WORK,lambda r:r.fulfill(body='<html>Selected video source</html>',content_type='text/html'))+ run.context.route(VIDEO,lambda r:r.fulfill(body=(Path(__file__).parent/'fixtures/detail-portrait-smoke.mp4').read_bytes(),content_type='video/mp4',headers={'Access-Control-Allow-Origin':'https://www.midjourney.com','Access-Control-Allow-Credentials':'true'}))+ run.context.route(POSTER,lambda r:r.fulfill(body=fixture_png(POSTER),content_type='image/png',headers={'Access-Control-Allow-Origin':'https://www.midjourney.com','Access-Control-Allow-Credentials':'true'}))+ run.context.route(CDN+'/failed.mp4',lambda r:r.fulfill(status=403))+ source=run.context.new_page();source.goto(WORK)+ page=run.open_page('collector.html');run.seed_storage(page,{'entries':[]})+ # Only background requests fail: page fetch must really traverse the scoped transfer.+ run.context.service_workers[0].evaluate('''()=>{const real=fetch;globalThis.fetch=(url,options)=>String(url).startsWith('https://cdn.midjourney.com')?Promise.resolve(new Response('',{status:403})):real(url,options)}''')+ result=page.evaluate('''async ({work,url,poster})=>{+ const {normalizePageCaptureBatch}=await import('./page-capture.js');+ const [tab]=await chrome.tabs.query({url:work});+ const c={id:'selected',pageType:'video',title:'Session video',canonicalUrl:work,contentText:'Preserve this prompt',media:[{id:'video',kind:'video',url,posterUrl:poster,sourceKind:'site-original'}]};+ const batch=normalizePageCaptureBatch({tabId:tab.id,sourceUrl:work,sessionMediaAllowed:true,candidates:[c],selections:[{candidateId:c.id,includeText:true,selectedMediaIds:['video'],mediaDecision:'confirmed'}]});+ const response=await chrome.runtime.sendMessage({type:'COMMIT_PAGE_CAPTURE',batch});+ const entries=(await chrome.storage.local.get('entries')).entries;+ const e=entries.find(e=>e.id===response.results?.[0]?.entryId);+ const {savedPageCaptureCandidateIds}=await import('./capture-additions.js');+ const {getMediaBlob}=await import('./media-store.js');+ const video=e?.mediaAssets.find(a=>a.kind==='video');+ return {response,video,posterStored:!!(video?.posterAssetId&&await getMediaBlob(video.posterAssetId)),cleared:[...savedPageCaptureCandidateIds(batch,batch.candidates,response.results)]};+ }''',{'work':WORK,'url':VIDEO,'poster':POSTER})+ assert result['video']['storageMode']=='managed',result+ assert result['posterStored'],result+ assert result['cleared']==['selected'],result+ assert result['response']['results'][0]['pendingMediaIds']==[],result+ failed=page.evaluate('''async ({work,url,poster})=>{+ const {normalizePageCaptureBatch}=await import('./page-capture.js');+ const [tab]=await chrome.tabs.query({url:work});+ const c={id:'failed',pageType:'video',title:'Partial session video',canonicalUrl:work+'&failed=1',contentText:'Retain this prompt',media:[{id:'failed-video',kind:'video',url,posterUrl:poster,sourceKind:'site-original'}]};+ const batch=normalizePageCaptureBatch({tabId:tab.id,sourceUrl:work,sessionMediaAllowed:true,candidates:[c],selections:[{candidateId:c.id,includeText:true,selectedMediaIds:['failed-video'],mediaDecision:'confirmed'}]});+ const response=await chrome.runtime.sendMessage({type:'COMMIT_PAGE_CAPTURE',batch});+ const entries=(await chrome.storage.local.get('entries')).entries;+ const e=entries.find(e=>e.id===response.results?.[0]?.entryId);+ const video=e?.mediaAssets.find(a=>a.kind==='video');+ const {getMediaBlob}=await import('./media-store.js');+ const {savedPageCaptureCandidateIds}=await import('./capture-additions.js');+ return {response,video,posterStored:!!(video?.posterAssetId&&await getMediaBlob(video.posterAssetId)),cleared:[...savedPageCaptureCandidateIds(batch,batch.candidates,response.results)]};+ }''',{'work':WORK,'url':CDN+'/failed.mp4','poster':POSTER})+ assert failed['video']['storageMode']=='reference' and failed['posterStored'],failed+ assert failed['cleared']==[] and failed['response']['results'][0]['pendingMediaIds']==['failed-video'],failed+ print({'failedVideoRetainsPosterAndRetry':True})+ print({'background403PageSessionSaved':True,'posterStored':True,'sharedCleanupReceipt':True})diff --git a/test/case_covers_e2e.py b/test/case_covers_e2e.pynew file mode 100644index 0000000..85eab2d--- /dev/null+++ b/test/case_covers_e2e.py@@ -0,0 +1,84 @@+"""Synthetic assets; real library cover selection, upload, persistence and article order."""+from pathlib import Path+import base64+from playwright.sync_api import expect+from e2e_support import extension_session, base_entry+++def main():+ with extension_session('case-covers-', viewport={'width': 1280, 'height': 900}) as run:+ page = run.open_page('collector.html')+ run.seed_storage(page, {'entries': [], 'uiPreferences': {'motion': 'reduced'}})+ image = page.evaluate('''async () => {+ const {saveMediaBlob}=await import('./media-store.js');+ const canvas=document.createElement('canvas');canvas.width=640;canvas.height=360;+ const ctx=canvas.getContext('2d');+ for (const [id,color] of [['first','#396b81'],['second','#b07043']]) {+ ctx.fillStyle=color;ctx.fillRect(0,0,640,360);+ await saveMediaBlob(id,await new Promise(resolve=>canvas.toBlob(resolve)));+ }+ return canvas.toDataURL();+ }''')+ article = base_entry('article-cover', '文章封面测试', '文章原文', 'content:reference', 0)+ article.update(mediaAssets=[{'id': 'doc', 'kind': 'document', 'mimeType': 'text/plain'},+ {'id': 'first', 'kind': 'image', 'sourceTitle': '第一张图', 'width': 640, 'height': 360},+ {'id': 'second', 'kind': 'image', 'sourceTitle': '第二张图', 'width': 640, 'height': 360}], primaryMediaId='doc',+ sourceFacts={'pageType': 'article'}, articleDocument={'version': 1, 'blocks': [+ {'id': 'text', 'kind': 'paragraph', 'text': '文章原文'},+ {'id': 'one', 'kind': 'image', 'assetId': 'first'},+ {'id': 'two', 'kind': 'image', 'assetId': 'second'}]})+ video = base_entry('video-cover', '视频封面测试', '', 'content:video-case', 1)+ video.update(mediaAssets=[{'id': 'video', 'kind': 'video', 'storageMode': 'reference',+ 'sourceUrl': 'https://www.bilibili.com/video/BV1ntYN6NEAi/',+ 'reference': {'url': 'https://www.bilibili.com/video/BV1ntYN6NEAi/', 'provider': 'bilibili', 'playbackMode': 'embed'}}], primaryMediaId='video')+ text = base_entry('text-cover', '纯文字测试', '纯文字内容', 'content:reference', 2)+ text.update(mediaAssets=[], primaryMediaId='')+ run.seed_storage(page, {'entries': [article, video, text], 'uiPreferences': {'motion': 'reduced'}})+ library = run.open_page('library.html')+ expect(library.locator('.case-card[data-entry-id="article-cover"] img')).to_have_attribute('data-visual-id', 'first')+ expect(library.locator('.case-card[data-entry-id="text-cover"] .case-text-cover')).to_be_visible()+ library.locator('.case-card[data-entry-id="article-cover"]').click()+ library.locator('.entry-editor > summary').click()+ library.get_by_role('button', name='更换封面', exact=True).click()+ expect(library.locator('.case-cover-option')).to_have_count(2)+ library.locator('.case-cover-option[data-asset-id="second"]').click()+ expect(library.locator('#promptdirector-app-dialog')).to_have_count(0)+ saved = library.evaluate("async()=>(await chrome.runtime.sendMessage({type:'GET_STATE'})).entries.find(e=>e.id==='article-cover')")+ assert saved['coverVisualId'] == 'second' and saved['primaryMediaId'] == 'doc', saved+ assert [b.get('assetId') for b in saved['articleDocument']['blocks'] if b['kind']=='image'] == ['first', 'second']+ library.locator('#detail-close').click()+ expect(library.locator('.case-card[data-entry-id="article-cover"] img')).to_have_attribute('data-visual-id', 'second')+ library.locator('.case-card[data-entry-id="video-cover"]').click()+ expect(library.get_by_role('button', name='逆推视频提示词', exact=True)).to_have_class('button-secondary video-analysis-run')+ library.screenshot(path='/tmp/pd-b14-video-secondary.png', animations='disabled')+ library.locator('.entry-editor > summary').click()+ library.get_by_role('button', name='更换封面', exact=True).click()+ library.locator('#promptdirector-app-dialog input[type=file]').set_input_files({+ 'name': 'custom-cover.png', 'mimeType': 'image/png', 'buffer': base64.b64decode(image.split(',')[1])})+ expect(library.locator('#promptdirector-app-dialog')).to_have_count(0)+ saved = library.evaluate("async()=>(await chrome.runtime.sendMessage({type:'GET_STATE'})).entries.find(e=>e.id==='video-cover')")+ assert saved['primaryMediaId'] == 'video', saved+ cover_id = saved['coverVisualId']+ assert next(a for a in saved['mediaAssets'] if a['id']==cover_id)['usage'] == 'poster'+ expect(library.locator('.referenced-video-embed iframe')).to_be_visible()+ library.locator('#detail-close').click()+ library.reload()+ expect(library.locator('.case-card[data-entry-id="video-cover"] img')).to_have_attribute('data-visual-id', cover_id)+ library.locator('.case-card[data-entry-id="article-cover"]').click()+ library.locator('.entry-editor > summary').click()+ library.get_by_role('button', name='更换封面', exact=True).click()+ output = Path('/tmp/pd-b14-covers'); output.mkdir(exist_ok=True)+ for theme in ['dark', 'light']:+ library.evaluate('theme=>document.documentElement.dataset.theme=theme', theme)+ for width in [1280, 390]:+ library.set_viewport_size({'width': width, 'height': 900})+ library.screenshot(path=str(output / f'cover-{theme}-{width}.png'), animations='disabled')+ assert library.evaluate('document.documentElement.scrollWidth <= innerWidth')+ library.locator('#promptdirector-app-dialog .app-dialog-close').click()+ assert not run.page_errors, run.page_errors+ print({'articleImageSelection': True, 'articleOrderPreserved': True, 'videoUploadAndPrimaryPreserved': True,+ 'reloadCover': True, 'noImageTextFallback': True, 'secondaryVideoAnalysis': True})+++if __name__ == '__main__':+ main()diff --git a/test/classifier.test.js b/test/classifier.test.jsindex 45d4a76..ad35a78 100644--- a/test/classifier.test.js+++ b/test/classifier.test.js@@ -4,6 +4,7 @@ import assert from "node:assert/strict";import {CLASSIFIER_VERSION,classifyContent,+ classifyCapturedContent,classifyImportedMedia,classifyImageCase,confirmClassification@@ -259,3 +260,48 @@ test("automatic classification targets a user category by stable creative role",const result = classifyContent({ text: "Midjourney prompt: editorial product image --ar 4:5" }, [], taxonomy);assert.deepEqual(result.pathIds, ["content:campaign-prompts"]);});+++test("capture defaults use selected media, with video taking priority over prose and images", () => {+ const image = { id: "image", kind: "image" };+ const video = { id: "video", kind: "video" };+ const entry = { text: "图片构图参考:海面,薄雾,孤舟。", mediaAssets: [image, video] };+ assert.deepEqual(classifyCapturedContent(entry).pathIds, [CONTENT_IDS.promptVideo]);+ assert.deepEqual(classifyCapturedContent({ ...entry, mediaAssets: [image] }).pathIds, [CONTENT_IDS.promptImage]);+ assert.deepEqual(classifyCapturedContent({ ...entry, text: "" }).pathIds, [CONTENT_IDS.videoCase]);+ assert.deepEqual(classifyCapturedContent({ ...entry, text: "", mediaAssets: [image] }).pathIds, [CONTENT_IDS.imageCase]);+});++test("document capture stays reference even with tutorial text and video illustrations", () => {+ const entry = { text: "教程:第一步明确主体,第二步检查构图,最后说明为什么这个方法适用于不同场景。",+ sourceFacts: { pageType: "article", extractionMethod: "dom" }, mediaAssets: [{ id: "v", kind: "video" }] };+ assert.deepEqual(classifyCapturedContent(entry).pathIds, [CONTENT_IDS.reference]);+ assert.deepEqual(classifyCapturedContent(confirmClassification(entry, [CONTENT_IDS.promptImage])).pathIds, [CONTENT_IDS.promptImage]);+});++test("capture respects missing prompt evidence, but per-media original prompts remain usable", () => {+ const entry = { text: "作品宣传介绍", sourceFacts: { pageType: "artwork", originalPromptAvailable: false },+ mediaAssets: [{ id: "v", kind: "video" }, { id: "cover", kind: "image", usage: "poster" }] };+ assert.deepEqual(classifyCapturedContent(entry).pathIds, [CONTENT_IDS.videoCase]);+ assert.deepEqual(classifyCapturedContent({ ...entry, mediaPrompts: [{ assetId: "v", source: "webpage", text: "镜头跟随人物。" }] }).pathIds, [CONTENT_IDS.promptVideo]);+ assert.deepEqual(classifyCapturedContent({ ...entry, mediaAssets: [entry.mediaAssets[1]], text: "" }).pathIds, []);+});+++test("platform defaults agree across capture and later reclassification, regardless of introductory prose", () => {+ for (const classify of [classifyContent, classifyCapturedContent]) {+ for (const host of ["www.youtube.com", "youtu.be", "www.bilibili.com", "www.douyin.com", "www.tiktok.com"]) {+ assert.deepEqual(classify({ url: `https://${host}/video/123`, text: "Prompt: create a cinematic video. 教程简介" }).pathIds, [CONTENT_IDS.videoCase], host);+ }+ for (const host of ["www.pinterest.com", "www.artstation.com", "www.behance.net"]) {+ assert.deepEqual(classify({ url: `https://${host}/work/123`, text: "Prompt: portrait --ar 4:5" }).pathIds, [CONTENT_IDS.imageCase], host);+ }+ assert.deepEqual(classify({ url: "https://higgsfield.ai/asset/123", mediaAssets: [{ id: "v", kind: "video" }], sourceFacts: { originalPromptAvailable: false } }).pathIds, [CONTENT_IDS.promptVideo]);+ assert.deepEqual(classify({ url: "https://www.midjourney.com/jobs/123" }).pathIds, [CONTENT_IDS.promptImage]);+ assert.deepEqual(classify({ url: "https://pinterest.com/pin/123", mediaAssets: [{ id: "v", kind: "video" }] }).pathIds, [CONTENT_IDS.videoCase]);+ assert.deepEqual(classify({ url: "https://youtube.com.evil.example/watch" }).pathIds, []);+ const entry = { url: "https://www.bilibili.com/video/123" };+ assert.deepEqual(classify(confirmClassification(entry, [CONTENT_IDS.promptImage])).pathIds, [CONTENT_IDS.promptImage]);+ assert.deepEqual(classify(entry, [{ hostname: "www.bilibili.com", pathIds: [CONTENT_IDS.reference] }]).pathIds, [CONTENT_IDS.reference]);+ }+});diff --git a/test/clipboard_return_e2e.py b/test/clipboard_return_e2e.pynew file mode 100644index 0000000..40a299a--- /dev/null+++ b/test/clipboard_return_e2e.py@@ -0,0 +1,43 @@+"""Clipboard bytes and active-tab lookup are fixtures; selection read, save and draft state are production."""+from playwright.sync_api import expect+from e2e_support import extension_session++TEXT='剪贴板保存后返回原网页,旧高亮不能自动成为新的待保存案例。'++def main():+ with extension_session('clipboard-return-') as run:+ run.context.route('https://wchao6891.github.io/saved-selection', lambda route: route.fulfill(body=f'<html><meta charset="utf-8"><body><p id="source">{TEXT}</p></body></html>',content_type='text/html'))+ source=run.context.new_page();source.goto('https://wchao6891.github.io/saved-selection')+ worker=run.context.service_workers[0]+ worker.evaluate('''async()=>{const query=chrome.tabs.query.bind(chrome.tabs);const [tab]=await query({url:'https://wchao6891.github.io/saved-selection'});+ chrome.tabs.query=async q=>q.active?[tab]:query(q); }''')+ collector=run.open_page('collector.html')+ run.seed_storage(collector,{'entries':[],'capturePermissionOnboarding':{'version':1,'acknowledgedAt':'2026-09-19T00:00:00Z','clipboardIncluded':True}})+ collector.evaluate('''text=>{+ chrome.permissions.contains=async()=>true;chrome.permissions.request=async()=>true;+ window.clipboardReads=0;+ Object.defineProperty(navigator,'clipboard',{configurable:true,value:{read:async()=>{window.clipboardReads++;return [{types:['text/plain'],getType:async()=>new Blob([text],{type:'text/plain'})}]}}});+ }''',TEXT)+ collector.locator('#start-clipboard').click()+ expect(collector.locator('#quick-preview')).to_contain_text(TEXT)+ source.evaluate("()=>{const range=document.createRange();range.selectNodeContents(document.querySelector('#source'));const s=getSelection();s.removeAllRanges();s.addRange(range)}")+ collector.locator('#save-draft').click()+ expect(collector.locator('#start-state')).to_be_visible()+ library=run.open_page('library.html')+ library.locator('.case-card').first.click()+ expect(library.locator('#detail-drawer')).to_be_visible()+ source.bring_to_front()+ collector.evaluate("()=>window.dispatchEvent(new Event('focus'))")+ # Query the same automatic path explicitly to ensure its async work has settled.+ result=collector.evaluate("async()=>chrome.runtime.sendMessage({type:'TRY_ACTIVE_SELECTION_TO_DRAFT'})")+ workspace=collector.evaluate("async()=>chrome.runtime.sendMessage({type:'GET_CAPTURE_WORKSPACE'})")+ assert workspace['draft']['fragments']==[],(result,workspace['draft'])+ assert collector.evaluate('window.clipboardReads')==1+ expect(collector.locator('#preview-state')).to_be_hidden()+ # Explicit extraction remains available even for identical text.+ collector.locator('#start-selection').click()+ source.locator('#source').click()+ expect(collector.locator('#page-capture')).to_contain_text(TEXT)+ print({'saveOpenCaseReturnNoOldDraft':True,'explicitSelectionStillAvailable':True,'noClipboardWrites':True})++if __name__=='__main__': main()diff --git a/test/collector-view.test.js b/test/collector-view.test.jsindex eb49c2c..7eb05be 100644--- a/test/collector-view.test.js+++ b/test/collector-view.test.js@@ -113,18 +113,13 @@ test("page capture can correct the confirmed DOM region and previews one orderedreadFile(new URL("../extension/background.js", import.meta.url), "utf8"),readFile(new URL("../extension/library.js", import.meta.url), "utf8")]);- assert.match(collectorHtml, /id="page-capture-add-region"/);- assert.match(collectorHtml, /id="page-capture-exclude-region"/);+ assert.match(collectorHtml, /选取内容/);+ assert.doesNotMatch(collectorHtml, /id="page-capture-tools"/);assert.match(collectorHtml, /id="page-capture-undo-region"/);- assert.match(collectorHtml, /id="page-capture-reset-region"/);assert.match(collectorSource, /createPageCaptureArticlePreview/);- assert.match(collectorSource, /EDIT_PAGE_CAPTURE_REGION/);- assert.match(backgroundSource, /runPageCaptureRegionEditor/);- assert.match(backgroundSource, /contentTargetsValue/);- assert.match(backgroundSource, /整组选择/);- assert.match(backgroundSource, /data-promptdirector-page-edit-include/);- assert.match(backgroundSource, /data-promptdirector-page-edit-exclude/);- assert.match(backgroundSource, /data-promptdirector-page-edit-hover/);+ assert.match(collectorSource, /PICK_PAGE_CONTENT/);+ assert.match(backgroundSource, /pickPageContent/);+ assert.doesNotMatch(backgroundSource, /整组选择/);assert.match(backgroundSource, /case "CLEAR_PAGE_CAPTURE_MARKERS"/);assert.match(backgroundSource, /clearPageCapturePageState/);assert.match(collectorSource, /await clearPageCaptureMarkers\(\)/);@@ -194,7 +189,7 @@ test("the collector auto-reads only highlights and reserves clipboard access forassert.doesNotMatch(clipboardOnly, /ADD_ACTIVE_SELECTION_TO_DRAFT/);assert.match(collectorHtml, /id="start-clipboard"/);assert.match(collectorHtml, /id="add-clipboard"/);- assert.match(explicitFlow, /ADD_ACTIVE_SELECTION_TO_DRAFT/);+ assert.match(explicitFlow, /PICK_PAGE_CONTENT/);assert.match(explicitFlow, /ensureClipboardReadPermission/);assert.match(explicitFlow, /readClipboardContentAfterFocus/);assert.match(explicitFlow, /prepareLocalMedia/);@@ -205,8 +200,8 @@ test("the collector auto-reads only highlights and reserves clipboard access forassert.match(backgroundSource, /case "TRY_ACTIVE_SELECTION_TO_DRAFT"/);assert.match(backgroundSource, /case "ADD_CLIPBOARD_TEXT_TO_DRAFT"/);assert.doesNotMatch(backgroundSource, /lastCommittedClipboardFingerprint/);- assert.match(collectorHtml, /id="start-selection"[^>]*>[\s\S]*?<strong[^>]*>选区<\/strong>/);- assert.match(collectorHtml, /id="add-selection"[^>]*>[\s\S]*?选区<\/span><\/button>/);+ assert.match(collectorHtml, /id="start-selection"[^>]*>[\s\S]*?<strong[^>]*>选取内容<\/strong>/);+ assert.match(collectorHtml, /id="add-selection"[^>]*>[\s\S]*?选取内容<\/span><\/button>/);assert.doesNotMatch(collectorHtml, /自动识别已复制文字|id="clipboard-access"|id="enable-clipboard"/);assert.doesNotMatch(collectorSource, /querySelectorAll\("button"\)/);assert.ok(collectorHtml.indexOf('id="start-smart-visuals"') < collectorHtml.indexOf('id="start-selection"'));diff --git a/test/compatible-composer-input.test.js b/test/compatible-composer-input.test.jsnew file mode 100644index 0000000..c262dfe--- /dev/null+++ b/test/compatible-composer-input.test.js@@ -0,0 +1,122 @@+import test from "node:test";+import assert from "node:assert/strict";+import { aiConfigurationFromStorage, projectAiRuntime } from "../extension/ai-runtime.js";+import { createComposerSession } from "../extension/composer.js";+import { executeComposerTurnWithService } from "../extension/composer-service.js";+import { readDeepSeekSse } from "../extension/deepseek.js";+import { runComposerToolLoop } from "../extension/composer-tool-loop.js";++function runtime(protocol) {+ const endpoint = `https://compatible.example/v1/${protocol === "responses" ? "responses" : "chat/completions"}`;+ const configuration = aiConfigurationFromStorage({+ aiProviderRegistry: { version: 4, providers: { "custom-text": {+ endpoint, protocol, apiKey: "fixture-key", consent: true,+ models: { creativePlanning: "account-model" },+ discoveredModels: [{ id: "account-model", status: "available", confidence: "declared",+ tasks: ["creativePlanning"], inputModalities: ["text", "image"], outputModalities: ["text"] }]+ } } },+ aiTaskAssignments: { creativePlanning: { providerId: "custom-text", model: "account-model" } }+ });+ const projected = projectAiRuntime(configuration);+ return { endpoint, settings: { ai: projected.aiSettings, vision: projected.visionSettings } };+}++const image = { visualId: "selected-image", dataUrl: "data:image/png;base64,AQID" };+function session() {+ return createComposerSession({+ aiProfile: { serviceId: "custom-text", model: "account-model" },+ referenceSnapshots: [{ entryId: "selected-case", alias: "@参考1", originalText: "原始文字",+ imageRefs: [{ visualId: image.visualId, mimeType: "image/png" }] }],+ messages: [{ role: "user", type: "request", content: "分析选中的图片" }]+ });+}++function streamedResponse(text) {+ const bytes = new TextEncoder().encode(text);+ // One-byte chunks also split Chinese UTF-8 and CRLF boundaries.+ return new Response(new ReadableStream({ start(controller) {+ for (const byte of bytes) controller.enqueue(Uint8Array.of(byte));+ controller.close();+ } }), { headers: { "Content-Type": "text/event-stream" } });+}++for (const protocol of ["chat_completions", "responses"]) {+ for (const framing of ["lf", "crlf", "cr", "multiline"]) {+ test(`compatible text service preserves selected image and completed ${protocol} reply with ${framing} framing`, async () => {+ const { endpoint, settings } = runtime(protocol);+ const events = protocol === "responses" ? [+ { type: "response.output_text.delta", delta: "图片分析结果" },+ { type: "response.completed", response: { status: "completed", model: "account-model" } }+ ] : [+ { choices: [{ delta: { content: "图片分析结果" }, finish_reason: null }] },+ { choices: [{ delta: {}, finish_reason: "stop" }] }+ ];+ const separator = framing === "crlf" ? "\r\n" : framing === "cr" ? "\r" : "\n";+ const data = events.map(event => {+ const json = JSON.stringify(event, null, framing === "multiline" ? 2 : undefined);+ return json.split("\n").map(line => `data: ${line}`).join(separator) + separator + separator;+ }).join("");+ const calls = [];+ const result = await executeComposerTurnWithService({ session: session(), route: "analyze_materials", instruction: "分析参考" }, settings, [image], {+ fetchImpl: async (url, options) => { calls.push({ url, body: JSON.parse(options.body) }); return streamedResponse(data); }+ });+ assert.equal(result.text, "图片分析结果");+ assert.equal(calls.length, 1, "one paid request, no protocol retry");+ assert.equal(calls[0].url, endpoint);+ assert.equal(calls[0].body.model, "account-model");+ const content = protocol === "responses" ? calls[0].body.input[0].content : calls[0].body.messages[1].content;+ const images = content.filter(part => ["input_image", "image_url"].includes(part.type));+ assert.equal(images.length, 1);+ assert.equal(protocol === "responses" ? images[0].image_url : images[0].image_url.url, image.dataUrl);+ });+ }+ test(`compatible ${protocol} does not save a reply whose terminal event was cut off`, async () => {+ const { settings } = runtime(protocol);+ const delta = protocol === "responses" ? { type: "response.output_text.delta", delta: "部分结果" }+ : { choices: [{ delta: { content: "部分结果" } }] };+ const terminal = protocol === "responses" ? { type: "response.completed", response: { status: "completed" } }+ : { choices: [{ delta: {}, finish_reason: "stop" }] };+ let calls = 0;+ await assert.rejects(executeComposerTurnWithService({ session: session(), route: "analyze_materials" }, settings, [image], {+ fetchImpl: async () => { calls++; return streamedResponse(`data: ${JSON.stringify(delta)}\n\ndata: ${JSON.stringify(terminal).slice(0, -1)}`); }+ }), /完整|中断/);+ assert.equal(calls, 1);+ });+}++test("text generation reads standard CR-only events and the required completion marker", async () => {+ const events = [+ { choices: [{ delta: { content: "中文回复" } }] },+ { choices: [{ delta: {}, finish_reason: "stop" }] }+ ];+ const response = streamedResponse(events.map(event => `data: ${JSON.stringify(event)}\r\r`).join("") + "data: [DONE]\r\r");+ assert.equal((await readDeepSeekSse(response)).content, "中文回复");+});++for (const complete of [true, false]) {+ test(`tool execution requires a complete CR-only event: ${complete}`, async () => {+ let requests = 0;+ let executions = 0;+ const event = { choices: [{ delta: { tool_calls: [{ index: 0, id: "call-1", type: "function",+ function: { name: "search_cases", arguments: '{"query":"雨夜"}' } }] }, finish_reason: "tool_calls" }] };+ const run = runComposerToolLoop({+ body: { model: "fixture", messages: [{ role: "user", content: "查资料" }] }, protocol: "chat_completions", maxCharacters: 10000,+ request: async () => {+ requests++;+ return requests === 1 ? streamedResponse(`data: ${complete ? JSON.stringify(event) + "\r\r" : JSON.stringify(event).slice(0, -1)}`)+ : new Response(JSON.stringify({ choices: [{ message: { content: "找到资料" }, finish_reason: "stop" }] }), { headers: { "Content-Type": "application/json" } });+ },+ runtime: { specs: [{ name: "search_cases", parameters: { type: "object", properties: { query: { type: "string" } } } }],+ execute: async (_name, args) => { executions++; assert.equal(args.query, "雨夜"); return { data: { count: 1 } }; } }+ });+ if (complete) {+ assert.equal((await run).content, "找到资料");+ assert.equal(executions, 1);+ assert.equal(requests, 2);+ } else {+ await assert.rejects(run, /中断|JSON/);+ assert.equal(executions, 0);+ assert.equal(requests, 1);+ }+ });+}diff --git a/test/compatible_composer_stream_e2e.py b/test/compatible_composer_stream_e2e.pynew file mode 100644index 0000000..27467c9--- /dev/null+++ b/test/compatible_composer_stream_e2e.py@@ -0,0 +1,89 @@+"""Synthetic compatible-provider replies through the real Composer UI; no paid calls."""+import json+from playwright.sync_api import expect+from e2e_support import ai_configuration_fixture, base_entry, extension_session, wait_for_async_condition++PNG = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII='+++def run_protocol(protocol):+ endpoint = 'https://compatible.example/v1/' + ('responses' if protocol == 'responses' else 'chat/completions')+ with extension_session('pd-compatible-stream-') as run:+ setup = run.open_page('collector.html')+ entry = base_entry('reference', '选中的图片', '保留原始提示词', 'content:prompt:image')+ entry['mediaAssets'] = [{'id': 'original', 'kind': 'image', 'storageMode': 'managed', 'mimeType': 'image/png', 'width': 1, 'height': 1}]+ entry['primaryMediaId'] = 'original'+ run.seed_storage(setup, {'entries': [entry], **ai_configuration_fixture(providers={'custom-text': {+ 'endpoint': endpoint, 'protocol': protocol, 'apiKey': 'fixture-key', 'consent': True,+ 'models': {'creativePlanning': 'account-model'},+ 'discoveredModels': [{'id': 'account-model', 'status': 'available', 'confidence': 'declared',+ 'tasks': ['creativePlanning'], 'inputModalities': [], 'outputModalities': ['text']}]+ }}, assignments={'creativePlanning': {'providerId': 'custom-text', 'model': 'account-model'}})})+ setup.evaluate('''async png => {+ const {saveMediaBlob} = await import('./media-store.js');+ const {createComposerSession} = await import('./composer.js');+ await saveMediaBlob('original', new Blob([Uint8Array.from(atob(png), c=>c.charCodeAt(0))], {type:'image/png'}));+ const session = createComposerSession({id:'stream-session', routeMode:'analyze_materials',+ aiProfile:{serviceId:'custom-text',model:'account-model'},+ referenceSnapshots:[{entryId:'reference',alias:'@参考1',referenceKind:'prompt',originalText:'保留原始提示词',+ imageRefs:[{visualId:'original',mimeType:'image/png'}]}]});+ const result = await chrome.runtime.sendMessage({type:'UPSERT_COMPOSER_SESSION',session});+ if (!result.ok) throw new Error(result.message);+ }''', PNG)+ requests = []+ truncated = False++ def reply(route):+ requests.append(route.request.post_data_json)+ text = '不完整内容' if truncated else '图片的主体轮廓清晰,原始提示词已读到。'+ events = [+ {'type': 'response.output_text.delta', 'delta': text},+ {'type': 'response.completed', 'response': {'status': 'completed', 'model': 'account-model'}}+ ] if protocol == 'responses' else [+ {'model': 'account-model', 'choices': [{'delta': {'content': text}}]},+ {'choices': [{'delta': {}, 'finish_reason': 'stop'}]}+ ]+ frames = ['\r'.join('data: ' + line for line in json.dumps(event, ensure_ascii=False, indent=2).splitlines()) + '\r\r' for event in events]+ if truncated:+ frames[-1] = frames[-1].rstrip('\r')[:-1]+ route.fulfill(status=200, content_type='text/event-stream', body=''.join(frames), headers={'Access-Control-Allow-Origin': '*'})++ run.context.route(endpoint, reply)+ page = run.open_page('composer.html?session=stream-session', wait_until='networkidle')+ expect(page.locator('.composer-input-reference-card')).to_have_count(1)+ page.locator('#composer-instruction').fill('分析选中原图和原始提示词')+ page.locator('#composer-action').click()+ expect(page.locator('.composer-message.analysis')).to_contain_text('图片的主体轮廓清晰')+ wait_for_async_condition(page, "async()=>!(await chrome.runtime.sendMessage({type:'GET_COMPOSER_SESSION',sessionId:'stream-session'})).session.activeTurn")+ assert len(requests) == 1, requests+ body = requests[0]+ assert body['model'] == 'account-model' and body['stream'] is True+ contents = [part for item in body.get('input', body.get('messages', [])) for part in (item.get('content', []) if isinstance(item.get('content'), list) else [])]+ images = [part for part in contents if part.get('type') in ['input_image', 'image_url']]+ assert len(images) == 1, body+ url = images[0]['image_url'] if protocol == 'responses' else images[0]['image_url']['url']+ assert url == 'data:image/png;base64,' + PNG+ page.reload()+ expect(page.locator('.composer-message.analysis')).to_have_count(1)+ expect(page.locator('.composer-message.analysis')).to_contain_text('图片的主体轮廓清晰')+ completed = page.evaluate("async()=>(await chrome.runtime.sendMessage({type:'GET_COMPOSER_SESSION',sessionId:'stream-session'})).session")++ truncated = True+ page.locator('#composer-instruction').fill('再次分析')+ page.locator('#composer-action').click()+ wait_for_async_condition(page, "async()=>{const {session}=await chrome.runtime.sendMessage({type:'GET_COMPOSER_SESSION',sessionId:'stream-session'});return session?.activeTurn?.status==='failed' && Boolean(session.lastFailure)}")+ page.reload()+ assert len(requests) == 2, 'interrupted provider work must not be sent again automatically'+ expect(page.locator('.composer-message.analysis', has_text='图片的主体轮廓清晰')).to_have_count(1)+ failed = page.evaluate("async()=>(await chrome.runtime.sendMessage({type:'GET_COMPOSER_SESSION',sessionId:'stream-session'})).session")+ assert failed['activeTurn']['partialText'] == '不完整内容'+ assert failed['activeTurn']['status'] == 'failed'+ assert [m for m in failed['messages'] if m['role'] == 'assistant'] == [m for m in completed['messages'] if m['role'] == 'assistant']+ saved = page.evaluate("async()=>(await chrome.storage.local.get('entries')).entries[0]")+ assert saved['text'] == entry['text']+ print(json.dumps({'protocol': protocol, 'originalImageSent': True, 'replyPersisted': True, 'incompleteReplyRejected': True, 'requests': len(requests), 'paidRequests': 0}))+++if __name__ == '__main__':+ for protocol in ['chat_completions', 'responses']:+ run_protocol(protocol)diff --git a/test/composer-page.test.js b/test/composer-page.test.jsindex e8d51e1..9ed3881 100644--- a/test/composer-page.test.js+++ b/test/composer-page.test.js@@ -157,7 +157,7 @@ test("composer reference selection is visual while Skill management stays on itsassert.doesNotMatch(i18nJs, /querySelectorAll\("\[data-i18n-title\]"\).*\.title\s*=/);});-test("composer temporary references share one attachment entry and block text-only sends before the draft is consumed", async () => {+test("composer attachments expose independent original-media choices without a capability veto", async () => {const [composerHtml, composerJs] = await Promise.all([readFile(new URL("../extension/composer.html", import.meta.url), "utf8"),readFile(new URL("../extension/composer-page.js", import.meta.url), "utf8")@@ -168,19 +168,19 @@ test("composer temporary references share one attachment entry and block text-onassert.doesNotMatch(composerHtml, /id="composer-attachment-menu"|id="composer-attachment-library"/);assert.match(composerHtml, /id="composer-temp-references"/);assert.match(composerHtml, /id="composer-temp-reference-save-all"/);- assert.match(composerHtml, /id="composer-image-input-status"/);- assert.match(composerHtml, /id="composer-image-input-model"/);+ assert.doesNotMatch(composerHtml, /id="composer-image-input-status"/);+ assert.doesNotMatch(composerHtml, /id="composer-image-input-model"/);assert.doesNotMatch(composerHtml, /composer-image-blocker/);assert.match(composerJs, /type:\s*"ADD_TEMP_REFERENCES"/);assert.match(composerJs, /type:\s*"REMOVE_TEMP_REFERENCE"/);assert.match(composerJs, /type:\s*"SAVE_TEMP_REFERENCE_AS_CASE"/);assert.doesNotMatch(composerJs, /createComposerAnalysisTaskBridge|START_OR_JOIN_ANALYSIS_TASK/);- assert.match(composerJs, /composerImageInputModel\.addEventListener\("click", \(event\) => \{\s*event\.stopPropagation\(\);\s*openComposerModelMenu\(\);/);assert.match(composerJs, /composerPasteFiles\(event\.clipboardData\)/);assert.match(composerJs, /if \(!files\.length\) return;\s*event\.preventDefault\(\)/s);const sendTurn = composerJs.slice(composerJs.indexOf("async function sendComposerTurn"), composerJs.indexOf("async function retryComposerTurn"));- assert.ok(sendTurn.indexOf("renderImageInputStatus") < sendTurn.indexOf("appendComposerMessage"));- assert.ok(sendTurn.indexOf("renderImageInputStatus") < sendTurn.indexOf("composerInstruction.value = \"\""));+ assert.doesNotMatch(sendTurn, /if \(!service.videoInput\)|if \(!renderImageInputStatus/);+ assert.match(composerHtml, /id="composer-send-images"/);+ assert.match(composerHtml, /id="composer-send-videos"/);assert.doesNotMatch(composerJs, /removeAllImageTempReferences/);});@@ -251,8 +251,8 @@ test("composer keeps one stable creation toolbar and separates result action levassert.ok(footer.indexOf("composer-library-search") < footer.indexOf("composer-type-switch"));assert.match(footer, /id="composer-library-search"[^>]+aria-pressed="true"/);assert.ok(footer.indexOf("composer-type-switch") < footer.indexOf("composer-reference-open"));- assert.ok(footer.indexOf("composer-reference-open") < footer.indexOf("composer-options"));- assert.ok(footer.indexOf("composer-options") < footer.indexOf("composer-model-trigger"));+ assert.ok(footer.indexOf("composer-reference-open") < footer.indexOf('id="composer-options"'));+ assert.ok(footer.indexOf('id="composer-options"') < footer.indexOf("composer-model-trigger"));assert.ok(footer.indexOf("composer-model-trigger") < footer.indexOf("composer-action"));assert.match(composerJs, /composer-result-primary-actions/);assert.match(composerJs, /composer-result-secondary-actions/);diff --git a/test/composer-reference-input.test.js b/test/composer-reference-input.test.jsnew file mode 100644index 0000000..0da38d6--- /dev/null+++ b/test/composer-reference-input.test.js@@ -0,0 +1,56 @@+import test from 'node:test';+import assert from 'node:assert/strict';+import { createComposerSession } from '../extension/composer.js';+import { executeComposerTurnWithService } from '../extension/composer-service.js';+import { prepareComposerVideos } from '../extension/composer-video-references.js';+const image = {visualId:'image-1',dataUrl:'data:image/png;base64,AQID'};+const video = {assetId:'video-1',mimeType:'video/mp4',dataUrl:'data:video/mp4;base64,AQID'};+const refs = [+ {entryId:'image-case',alias:'@参考1',referenceText:'图片原提示词',imageRefs:[{visualId:image.visualId}]},+ {entryId:'video-case',alias:'@参考2',referenceKind:'video_sources',referenceText:'视频原提示词与逆推文字',assetRefs:[{assetId:video.assetId,kind:'video'}]}+];+const settings = serviceId => ({ai:{apiKey:'fixture',consent:true},vision:{providerProfiles:{[serviceId]:{+ id:serviceId,label:serviceId,apiKey:'fixture',consent:true,endpoint:'https://example.test/v1/chat/completions',protocol:'chat_completions',+ capabilities:['creativePlanning'],models:{creativePlanning:serviceId==='deepseek'?'deepseek-flash':'account-model'},+ discoveredModels:[{id:'account-model',tasks:['creativePlanning'],inputModalities:['text'],status:'available'}]+}}}});+for(const serviceId of ['deepseek','custom-text']) for(const originals of [false,true]) {+ test(`${serviceId}: explicit reference choice sends ${originals?'original media':'text only'} without capability veto`, async()=>{+ const session=createComposerSession({aiProfile:{serviceId,model:serviceId==='deepseek'?'deepseek-flash':'account-model'},+ imageReferenceMode:originals?'conditioned':'text_only',videoReferenceMode:originals?'original':'text_only',referenceSnapshots:refs});+ let requests=0;+ const result=await executeComposerTurnWithService({session,route:'chat',instruction:'分析参考'},settings(serviceId),originals?[image]:[],{+ preparedVideos:originals?[video]:[],stream:false,fetchImpl:async(_url,options)=>{+ requests++;const body=JSON.parse(options.body);assert.match(options.body,/视频原提示词与逆推文字/);assert.match(options.body,/图片原提示词/);+ const parts=body.messages.flatMap(m=>Array.isArray(m.content)?m.content:[]);+ assert.equal(parts.filter(p=>p.type==='image_url').length,originals?1:0);+ assert.equal(parts.filter(p=>p.type==='video_url').length,originals?1:0);+ return body.stream ? new Response('data: '+JSON.stringify({choices:[{delta:{content:'参考结果'},finish_reason:'stop'}]})+'\n\ndata: [DONE]\n\n',{headers:{'Content-Type':'text/event-stream'}}) : new Response(JSON.stringify({choices:[{message:{content:'参考结果'},finish_reason:'stop'}]}));+ }});+ assert.equal(result.text,'参考结果');assert.equal(requests,1);+ });+}+test('text-only video never loads or encodes the original',async()=>{+ assert.deepEqual(await prepareComposerVideos({videoReferenceMode:'text_only',referenceSnapshots:refs},{loadVideo:async()=>{throw Error('must not read video')}}),[]);+});+test('user can exclude an image that has no analysis text without silently re-enabling it',()=>{+ assert.equal(createComposerSession({imageReferenceMode:'text_only',referenceSnapshots:[{entryId:'image',imageRefs:[{visualId:'x'}]}]}).imageReferenceMode,'text_only');+});+test('provider refusal remains one explicit failure, no text fallback or retry',async()=>{+ let calls=0;const session=createComposerSession({aiProfile:{serviceId:'custom-text',model:'account-model'},referenceSnapshots:refs,imageReferenceMode:'conditioned',videoReferenceMode:'text_only'});+ await assert.rejects(executeComposerTurnWithService({session,route:'chat'},settings('custom-text'),[image],{fetchImpl:async()=>{+ calls++;return new Response(JSON.stringify({error:{message:'provider rejects this image input'}}),{status:400});}}),/provider rejects this image input/);+ assert.equal(calls,1);+});++test('compatible Responses forwards explicitly selected video using input_video without capability veto', async()=>{+ const config=settings('custom-text');config.vision.providerProfiles['custom-text'].protocol='responses';+ const session=createComposerSession({aiProfile:{serviceId:'custom-text',model:'account-model'},imageReferenceMode:'text_only',videoReferenceMode:'original',referenceSnapshots:refs});+ let requests=0;+ await executeComposerTurnWithService({session,route:'chat'},config,[],{preparedVideos:[video],stream:false,fetchImpl:async(_url,init)=>{+ requests++;const body=JSON.parse(init.body);const videos=body.input.at(-1).content.filter(part=>part.type==='input_video');+ assert.deepEqual(videos,[{type:'input_video',video_url:video.dataUrl}]);+ return new Response(JSON.stringify({output_text:'已接收视频'}));+ }});+ assert.equal(requests,1);+});diff --git a/test/composer-service.test.js b/test/composer-service.test.jsindex 0247cf5..3473b15 100644--- a/test/composer-service.test.js+++ b/test/composer-service.test.js@@ -4,7 +4,6 @@ import assert from "node:assert/strict";import {composerImageEditCapabilities,composerImageAvailability,- composerImageInputAvailability,selectedComposerService,composerGenerationRequiresPromptAssembly,composerServiceCapabilities,@@ -455,23 +454,23 @@ test("video generation keeps Zhipu planning separate from the assigned generatioassert.equal(result.requestModel, "hailuo-account-model");});-test("an assigned provider without creative-planning capability fails instead of using DeepSeek", async () => {+test("a generation-only model cannot be used as a dialogue model", async () => {const providerSettings = visualSettings({providerProfiles: {- kimi: {- id: "kimi",- label: "Kimi",- endpoint: "https://api.moonshot.cn/v1/chat/completions",+ openrouter: {+ id: "openrouter",+ label: "OpenRouter",+ endpoint: "https://openrouter.ai/api/v1",protocol: "chat_completions",- apiKey: "kimi-secret",+ apiKey: "openrouter-secret",consent: true,- capabilities: ["videoAnalysis"],+ capabilities: ["videoGeneration"],models: {},- discoveredModels: [{ id: "video-only-model", tasks: ["videoAnalysis"] }]+ discoveredModels: [{ id: "video-only-model", tasks: ["videoGeneration"], confidence: "declared", inputModalities: ["text"], outputModalities: ["video"] }]}}});- const session = createComposerSession({ aiProfile: { serviceId: "kimi", model: "video-only-model" } });+ const session = createComposerSession({ aiProfile: { serviceId: "openrouter", model: "video-only-model" } });await assert.rejects(() => planComposerTurnWithService({session, userMessage: "", composerSettings: settings@@ -879,7 +878,7 @@ test("GLM Composer sends local video as raw Base64 in the same single multimodalassert.equal(request.model, "glm-5.3-flash");});-test("DeepSeek Pro refuses a pure-image reference instead of silently composing without seeing it", async () => {+test("DeepSeek cannot silently drop an explicitly selected original that failed to load", async () => {const session = createComposerSession({aiProfile: { serviceId: "deepseek", model: "deepseek-v4-pro" },referenceSnapshots: [{ entryId: "pure-image", alias: "@参考1", imageRefs: [{ visualId: "one" }] }]@@ -890,7 +889,7 @@ test("DeepSeek Pro refuses a pure-image reference instead of silently composingcomposerSettings: settings,route: "compose",instruction: "按参考图生成"- }, { ai: { apiKey: "deepseek-secret", consent: true }, vision: {} }, [], { fetchImpl: async () => { throw new Error("不应调用"); } }), /DeepSeek.*无法读取参考原图.*切换支持看图的模型/);+ }, { ai: { apiKey: "deepseek-secret", consent: true }, vision: {} }, [], { fetchImpl: async () => { throw new Error("不应调用"); } }), /图片1 读取失败.*没有发送不完整参考/);});test("OpenAI create-image mode sends original images through the Responses image tool", async () => {@@ -1859,9 +1858,18 @@ test("known image input remains available when a different model is assigned toassert.equal(selectedComposerService({serviceId: "zhipu", model: "account-visual-model"}, {}, {providerProfiles: {zhipu: discovered}}).vision, true);});-test("a saved description cannot silently substitute for selected original images", () => {- const session = createComposerSession({referenceSnapshots: [{entryId: "image", alias: "@参考1", referenceKind: "vision", referenceText: "Saved description", imageRefs: [{visualId: "original"}]}]});- assert.deepEqual(composerImageInputAvailability(session, {vision: false}), {available: false, imageCount: 1});- assert.deepEqual(composerImageInputAvailability(session, {vision: true}), {available: true, imageCount: 1});- assert.deepEqual(composerImageInputAvailability({...session, imageReferenceMode: "text_only"}, {vision: false}), {available: true, imageCount: 0});+test('Gemini generation does not silently discard an explicitly selected video reference', async () => {+ const session=createComposerSession({outputMode:'create_image',imageReferenceMode:'conditioned',videoReferenceMode:'original',+ aiProfile:{serviceId:'gemini',model:'gemini-planning-model'},generationAiProfile:{serviceId:'gemini',model:'account-nano-banana-model'},+ referenceSnapshots:[{entryId:'video',alias:'@参考1',referenceKind:'video_sources',referenceText:'原始视频提示词',assetRefs:[{assetId:'video',kind:'video'}]}]});+ let calls=0;+ await executeComposerTurnWithService({session,route:'compose',instruction:'参考视频构图'},geminiImageSettings(),[],{+ preparedVideos:[{assetId:'video',mimeType:'video/mp4',dataUrl:'data:video/mp4;base64,AQID'}],+ fetchImpl:async(_url,options)=>{+ calls++;const body=JSON.parse(options.body);+ assert.deepEqual(body.input.filter(part=>part.type==='video'),[{type:'video',mime_type:'video/mp4',data:'AQID'}]);+ return response({steps:[{type:'model_output',content:[{type:'image',mime_type:'image/png',data:'aGVsbG8='}]}]});+ }+ });+ assert.equal(calls,1);});diff --git a/test/composer.test.js b/test/composer.test.jsindex a8d8e0b..5a71f53 100644--- a/test/composer.test.js+++ b/test/composer.test.js@@ -18,7 +18,6 @@ import {createComposerAssemblySnapshot,createComposerSession,createReferenceSnapshots,- imageReferenceModeAvailability,isMeaningfulComposerSession,normalizeComposerAiProfile,normalizeComposerSessions,@@ -486,89 +485,12 @@ function completeReconstruction(id, assetId, reconstructionPrompt, createdAt) {};}-test("image reference modes default to conditioned and unlock text-only modes for prompt-backed or independently analyzed assets", () => {- const analyzedReference = {- entryId: "case-a",- alias: "@参考1",- scope: "asset",- referenceText: "完整分析",- imageRefs: [{ visualId: "image-a", mimeType: "image/webp" }],- assets: [{- assetId: "image-a",- imageFingerprint: "a".repeat(64),- analysisVersion: 2,- analysisFingerprint: "b".repeat(64),- reconstructionPrompt: "可独立生图的文字"- }]- };- const defaultSession = createComposerSession({ referenceSnapshots: [analyzedReference] });- assert.equal(defaultSession.imageReferenceMode, "conditioned");- assert.deepEqual(imageReferenceModeAvailability(defaultSession.referenceSnapshots), {- canDisableImages: true,- missingAssetIds: []- });- assert.equal(createComposerSession({- ...defaultSession,- imageReferenceMode: "text_only"- }).imageReferenceMode, "text_only");-- const promptBackedReference = {- entryId: "case-with-prompt",- alias: "@参考1",- originalText: "雨夜石桥上的巨龙",- referenceText: "雨夜石桥上的巨龙",- imageRefs: [{ visualId: "prompt-image", mimeType: "image/webp" }],- assets: [{ assetId: "prompt-image" }]- };- assert.deepEqual(imageReferenceModeAvailability([promptBackedReference]), {- canDisableImages: true,- missingAssetIds: []- });- assert.equal(createComposerSession({- referenceSnapshots: [promptBackedReference],- imageReferenceMode: "text_only"- }).imageReferenceMode, "text_only");-- const unavailable = imageReferenceModeAvailability([{- entryId: "pure-image",- alias: "@参考1",- imageRefs: [{ visualId: "image-a", mimeType: "image/webp" }],- assets: [{ assetId: "image-a", analysisVersion: 1, reconstructionPrompt: "旧描述" }]- }]);- assert.equal(unavailable.canDisableImages, false);- assert.deepEqual(unavailable.missingAssetIds, ["image-a"]);- assert.equal(createComposerSession({- referenceSnapshots: [{ entryId: "pure-image", alias: "@参考1", imageRefs: [{ visualId: "image-a" }], assets: [] }],- imageReferenceMode: "text_only"- }).imageReferenceMode, "conditioned");-- const legacyDescription = imageReferenceModeAvailability([{- entryId: "legacy-described-image",- alias: "@参考旧图",- referenceKind: "vision",- referenceText: "一座被薄雾包围的古代庭院,青绿色冷光。",- imageRefs: [{ visualId: "image-v1", mimeType: "image/webp" }],- assets: [{- assetId: "image-v1",- analysisVersion: 1,- imageFingerprint: "a".repeat(64),- analysisImageFingerprint: "a".repeat(64),- reconstructionPrompt: ""- }]- }]);- assert.deepEqual(legacyDescription, { canDisableImages: true, missingAssetIds: [] });-- const mixed = imageReferenceModeAvailability([- promptBackedReference,- {- entryId: "another-pure-image",- alias: "@参考2",- imageRefs: [{ visualId: "image-b", mimeType: "image/webp" }],- assets: [{ assetId: "image-b" }]- }- ]);- assert.equal(mixed.canDisableImages, false);- assert.deepEqual(mixed.missingAssetIds, ["image-b"]);+test("explicit text-only choice persists even when reference images have no analysis", () => {+ const session = createComposerSession({ imageReferenceMode: "text_only", videoReferenceMode: "text_only",+ referenceSnapshots: [{entryId: "image", imageRefs: [{visualId: "original"}]}] });+ const restored = createComposerSession(JSON.parse(JSON.stringify(session)));+ assert.equal(restored.imageReferenceMode, "text_only");+ assert.equal(restored.videoReferenceMode, "text_only");});test("a saved V2 analysis remains eligible for text-only mode when an older asset omitted its duplicate content hash", () => {@@ -590,10 +512,6 @@ test("a saved V2 analysis remains eligible for text-only mode when an older asse}]});assert.equal(session.imageReferenceMode, "text_only");- assert.deepEqual(imageReferenceModeAvailability(session.referenceSnapshots), {- canDisableImages: true,- missingAssetIds: []- });});test("planner payload sends selected and retrieved text without local titles, IDs, or the rest of the library", () => {diff --git a/test/composer_e2e_support.py b/test/composer_e2e_support.pyindex 6bf8370..e8416a6 100644--- a/test/composer_e2e_support.py+++ b/test/composer_e2e_support.py@@ -19,3 +19,33 @@ def composer_request_payload(body):payload['messages'].append({'role':'user','content':content[-1]['text']})return payloadraise AssertionError('Composer execution context not found in native messages')+++def set_composer_reference_media(page, *, images=None, videos=None):+ """Choose originals through the visible toolbar menu and wait for the saved state."""+ from playwright.sync_api import expect+ menu = page.locator('#composer-reference-inputs')+ trigger = page.locator('#composer-reference-inputs-trigger')+ if not menu.evaluate('node => node.open'):+ trigger.click()+ for selector, value in [('#composer-send-images', images), ('#composer-send-videos', videos)]:+ if value is None:+ continue+ page.locator(selector).set_checked(value)+ image = page.locator('#composer-send-images').is_visible() and page.locator('#composer-send-images').is_checked()+ video = page.locator('#composer-send-videos').is_visible() and page.locator('#composer-send-videos').is_checked()+ title = '参考输入:' + ('文字' + ('+原图' if image else '') + ('+原视频' if video else '') if image or video else '仅文字')+ expect(trigger).to_have_attribute('title', title)+ trigger.click()+++def set_composer_direction(page, direction):+ from playwright.sync_api import expect+ menu = page.locator('#composer-direction')+ trigger = page.locator('#composer-direction-trigger')+ if not menu.evaluate('node => node.open'):+ trigger.click()+ page.locator(f'input[name="composer-type"][value="{direction}"]').check()+ expect(page.locator('#composer-direction-icon')).to_have_attribute('href', f'assets/ui-icons.svg#icon-{direction}')+ if menu.evaluate('node => node.open'):+ trigger.click()diff --git a/test/composer_generation_e2e.py b/test/composer_generation_e2e.pyindex a768377..c20693d 100644--- a/test/composer_generation_e2e.py+++ b/test/composer_generation_e2e.py@@ -7,7 +7,7 @@ from threading import Event, Threadfrom playwright.sync_api import expect-from composer_e2e_support import composer_request_payload+from composer_e2e_support import composer_request_payload, set_composer_reference_media, set_composer_directionfrom e2e_support import ai_configuration_fixture, base_entry, extension_session@@ -405,7 +405,7 @@ def main() -> None:expect(composer.locator(".composer-message.prompt .composer-message-text")).to_have_text("An eastern courtyard in soft backlight.")composer.locator("#composer-new").click()- composer.locator(".composer-type-switch label", has_text="视频").click()+ set_composer_direction(composer, "video")select_composer_setting(composer, "#composer-route", "compose")select_composer_setting(composer, "#composer-output-language", "zh-CN")composer.locator("#composer-instruction").fill("生成庭院人物行走视频")@@ -415,7 +415,7 @@ def main() -> None:assert video_execution["instruction"] == "生成庭院人物行走视频"composer.locator("#composer-new").click()- composer.locator(".composer-type-switch label", has_text="图片").click()+ set_composer_direction(composer, "image")select_composer_setting(composer, "#composer-route", "auto")composer.locator("#composer-instruction").fill("角色应该是什么气质")question_requests_before = len(requests)@@ -538,6 +538,7 @@ def main() -> None:composer.locator("#composer-model-trigger").click()composer.locator("#composer-model-dynamic button", has_text="OpenAI").click()expect(composer.locator("#composer-model-label")).to_have_text("OpenAI")+ set_composer_reference_media(composer, images=True)composer.locator("#composer-instruction").fill("参考1保持三人构图和中间女性聚焦,参考2只负责画面风格")composer.locator("#composer-action").click()expect(composer.locator(".composer-message.prompt .composer-message-text")).to_contain_text("三人电影级长焦构图")@@ -598,8 +599,8 @@ def main() -> None:composer.reload()expect(composer.locator("#composer-model-trigger")).to_be_visible()composer.locator("#composer-model-trigger").click()- composer.locator("#composer-model-dynamic button", has_text="自定义兼容服务(文字)").click()- expect(composer.locator("#composer-model-label")).to_have_text("自定义兼容服务(文字)")+ composer.locator("#composer-model-dynamic button", has_text="自定义兼容服务(对话与识别)").click()+ expect(composer.locator("#composer-model-label")).to_have_text("自定义兼容服务(对话与识别)")CreativeServiceHandler.requests.clear()CreativeServiceHandler.release_image.clear()composer.locator("#composer-options summary").click()diff --git a/test/composer_library_knowledge_e2e.py b/test/composer_library_knowledge_e2e.pyindex 0f9be77..7d1d079 100644--- a/test/composer_library_knowledge_e2e.py+++ b/test/composer_library_knowledge_e2e.py@@ -47,7 +47,8 @@ def main() -> None:delta = {"content": '{"route":"compose","status":"ready"}\n雾夜角色的银色披风在轮廓光下展开。'}finish = "stop"if mode in ["search", "read"] and not tool_results:- assert {"search_cases", "read_case_text", "use_case_images", "get_plugin_help", "draft_skill"} <= {tool["function"]["name"] for tool in request.get("tools", [])}, request+ assert {"search_cases", "read_case_text", "get_plugin_help", "draft_skill"} <= {tool["function"]["name"] for tool in request.get("tools", [])}, request+ assert "use_case_images" not in {tool["function"]["name"] for tool in request.get("tools", [])}, requestdelta = {"tool_calls": [{"index": 0, "id": "search-1", "type": "function", "function": {"name": "search_cases", "arguments": json.dumps({"query": "雾夜"})}}]}finish = "tool_calls"diff --git a/test/composer_reference_inputs_e2e.py b/test/composer_reference_inputs_e2e.pynew file mode 100644index 0000000..e2964c5--- /dev/null+++ b/test/composer_reference_inputs_e2e.py@@ -0,0 +1,141 @@+"""Reference choices through real UI and durable jobs; a local provider records exact payloads."""+import json+import os+import tempfile+import threading+from pathlib import Path+from playwright.sync_api import expect+from e2e_support import ai_configuration_fixture, extension_session, wait_for_async_condition+from composer_video_dialogue_e2e import streaming_provider+from zhipu_glm_analysis_e2e import extension_with_local_provider_permission+from compatible_composer_stream_e2e import PNG+from composer_e2e_support import set_composer_reference_media, set_composer_direction+++def main():+ requests = []+ release = threading.Event()+ release.set()+ with streaming_provider(requests, release) as origin, extension_with_local_provider_permission(origin) as directory, extension_session('reference-inputs-', extension_dir=directory) as run:+ setup = run.open_page('collector.html')+ run.seed_storage(setup, {'entries': [], **ai_configuration_fixture(providers={'custom-text': {+ 'apiKey':'fixture-key', 'endpoint':origin+'/chat/completions','protocol':'chat_completions','consent':True,+ 'models':{'creativePlanning':'unknown-multimodal'},+ 'discoveredModels':[{'id':'unknown-multimodal','tasks':['creativePlanning'],'inputModalities':['text'],'outputModalities':['text'],'status':'available'}]+ }, 'custom-media': {'apiKey':'saved-vision-key','endpoint':origin+'/chat/completions','protocol':'chat_completions','consent':True,+ 'models':{'imageAnalysis':'saved-understanding-model'}}}, assignments={'creativePlanning':{'providerId':'custom-text','model':'unknown-multimodal'}})})+ setup.evaluate('''async png=>{+ const {saveMediaBlob}=await import('./media-store.js');+ const {createComposerSession}=await import('./composer.js');+ await saveMediaBlob('image',new Blob([Uint8Array.from(atob(png),c=>c.charCodeAt(0))],{type:'image/png'}));+ await saveMediaBlob('video',new Blob(['synthetic video'],{type:'video/mp4'}));+ const session=createComposerSession({id:'reference-inputs',targetType:'video',routeMode:'analyze_materials',+ aiProfile:{serviceId:'custom-text',model:'unknown-multimodal'},imageReferenceMode:'text_only',videoReferenceMode:'text_only',+ referenceSnapshots:[{entryId:'image-case',alias:'@参考1',referenceKind:'prompt',referenceText:'图片原始提示词',imageRefs:[{visualId:'image'}]},+ {entryId:'video-case',alias:'@参考2',referenceKind:'video_sources',referenceText:'视频原始提示词和逆推文字',assetRefs:[{assetId:'video',kind:'video',mimeType:'video/mp4'}]}]});+ await chrome.runtime.sendMessage({type:'UPSERT_COMPOSER_SESSION',session});+ }''', PNG)+ page=run.open_page('composer.html?session=reference-inputs', wait_until='networkidle')+ expect(page.locator('#composer-send-images')).not_to_be_checked()+ expect(page.locator('#composer-send-videos')).not_to_be_checked()+ direction = page.locator('#composer-direction-trigger')+ expect(direction).to_have_attribute('title', '创作方向:视频。影响提示词和可选参考,不会直接生成成品。')+ direction.focus(); direction.press('Enter')+ expect(page.locator('#composer-direction input[value="image"]')).to_be_visible()+ page.locator('#composer-direction input[value="image"]').focus()+ page.keyboard.press('Space')+ expect(page.locator('#composer-direction')).not_to_have_attribute('open', '')+ expect(direction).to_be_focused()+ expect(direction).to_have_attribute('title', '创作方向:图片。影响提示词和可选参考,不会直接生成成品。')+ set_composer_direction(page, 'video')+ page.reload()+ expect(page.locator('#composer-direction-icon')).to_have_attribute('href', 'assets/ui-icons.svg#icon-video')+ assert len(requests) == 0+ page.locator('#composer-model-trigger').click()+ expect(page.locator('#composer-model-dynamic')).to_contain_text('saved-understanding-model')+ page.locator('#composer-model-trigger').click()+ for images, videos in [(False,False),(True,False),(False,True),(True,True)]:+ set_composer_reference_media(page, images=images, videos=videos)+ page.reload()+ expect(page.locator('#composer-send-images')).to_be_checked(checked=images)+ expect(page.locator('#composer-send-videos')).to_be_checked(checked=videos)+ count=len(requests)+ page.locator('#composer-instruction').fill('总结已选参考内容')+ page.locator('#composer-action').click()+ wait_for_async_condition(page,"async()=>{const s=await chrome.storage.local.get('creativeJobs');return s.creativeJobs?.items?.at(-1)?.status==='completed'}")+ expect(page.locator('.composer-message.analysis')).to_have_count(count+1)+ assert len(requests)==count+1+ body=requests[-1]+ content=body['messages'][-1]['content']+ assert sum(p['type']=='image_url' for p in content)==int(images), body+ assert sum(p['type']=='video_url' for p in content)==int(videos), body+ assert '视频原始提示词和逆推文字' in json.dumps(body,ensure_ascii=False)+ assert '图片原始提示词' in json.dumps(body,ensure_ascii=False)+ screenshots = Path(os.environ.get('PROMPTDIRECTOR_E2E_ARTIFACT_DIR', Path(tempfile.gettempdir()) / 'promptdirector-reference-inputs'))+ screenshots.mkdir(parents=True, exist_ok=True)+ page.emulate_media(reduced_motion='reduce')+ for width in [1280,900,640,390]:+ page.set_viewport_size({'width':width,'height':900})+ if width <= 640:+ if 'nav-open' in (page.locator('#composer-shell').get_attribute('class') or ''): page.locator('#composer-nav-close').click()+ page.wait_for_function("()=>document.querySelector('#composer-nav').getBoundingClientRect().right<=0")+ assert page.evaluate('()=>document.documentElement.scrollWidth<=innerWidth+1')+ expect(page.locator('.composer-input-tools #composer-reference-inputs')).to_be_visible()+ expect(page.locator('#composer-image-input-status, #composer-image-input-model')).to_have_count(0)+ assert page.locator('#composer-reference-inputs').bounding_box()['y'] >= page.locator('#composer-instruction').bounding_box()['y'] + page.locator('#composer-instruction').bounding_box()['height']+ for theme in ['dark','light']:+ page.evaluate('(theme)=>document.documentElement.dataset.theme=theme',theme)+ page.screenshot(path=str(screenshots/f'{theme}-{width}.png'),full_page=True,animations='disabled')+ page.locator('.composer-input-box').screenshot(path=str(screenshots/f'toolbar-{theme}-{width}.png'),animations='disabled')+ for menu_id in ['composer-direction','composer-reference-inputs','composer-options']:+ menu=page.locator('#'+menu_id)+ trigger=menu.locator('summary')+ trigger.click()+ page.wait_for_function("""id=>{+ const m=document.getElementById(id), p=m.querySelector('.composer-options-panel');+ const r=p.getBoundingClientRect(), a=m.querySelector('summary').getBoundingClientRect();+ return m.open && r.left>=0 && r.right<=document.querySelector('#composer-shell').getBoundingClientRect().right+1 && (id==='composer-options' || r.bottom<=a.top);+ }""",arg=menu_id)+ page.evaluate('async()=>{await new Promise(requestAnimationFrame);await new Promise(requestAnimationFrame)}')+ panel=menu.locator('.composer-options-panel').bounding_box()+ assert panel['x']>=0 and panel['x']+panel['width']<=page.locator('#composer-shell').bounding_box()['width']+1, panel+ assert panel['y']>=0 and panel['y']+panel['height']<=900, panel+ if menu_id != 'composer-options':+ assert panel['y']+panel['height'] <= trigger.bounding_box()['y'], panel+ page.screenshot(path=str(screenshots/f'{theme}-{width}-{menu_id}.png'),full_page=True,animations='disabled')+ page.keyboard.press('Escape')+ expect(menu).not_to_have_attribute('open', '')+ expect(trigger).to_be_focused()+ page.evaluate('()=>document.documentElement.dataset.theme="dark"')+ page.locator('#composer-direction-trigger').click()+ page.locator('#composer-reference-inputs-trigger').click()+ expect(page.locator('#composer-direction')).not_to_have_attribute('open', '')+ page.locator('#composer-instruction').click(position={'x':8,'y':8})+ expect(page.locator('#composer-reference-inputs')).not_to_have_attribute('open', '')+ # New conversations start with text, without modifying older conversations.+ page.set_viewport_size({'width':1280,'height':900})+ page.locator('#composer-new').click()+ page.locator('#composer-attachment-files').set_input_files({'name':'test.png','mimeType':'image/png','buffer':__import__('base64').b64decode(PNG)})+ expect(page.locator('#composer-send-images')).not_to_be_checked()+ # A generation-only connection works without an understanding key.+ from ai_provider_registry_e2e import open_ai_settings+ library = open_ai_settings(run)+ library.locator('[data-ai-routing-tab="providers"]').click()+ library.locator('#open-ai-routing').click()+ dialog = library.locator('#promptdirector-app-dialog')+ dialog.locator('#promptdirector-app-dialog-providerEditor').select_option('custom-media')+ expect(dialog.locator('#promptdirector-app-dialog-provider_custom_media_apiKey')).to_be_hidden()+ key = dialog.locator('#promptdirector-app-dialog-provider_custom_media_imageApiKey')+ key.click(); key.fill('generation-only-fixture')+ dialog.locator('#promptdirector-app-dialog-provider_custom_media_imageProtocol').select_option('images_generations')+ dialog.locator('#promptdirector-app-dialog-provider_custom_media_imageEndpoint').fill(origin+'/images/generations')+ dialog.locator('#promptdirector-app-dialog-provider_custom_media_model_imageGeneration').fill('fixture-image-model')+ dialog.locator('#promptdirector-app-dialog-provider_custom_media_consent').check()+ library.screenshot(path=str(screenshots/'generation-connection.png'),full_page=True)+ library.evaluate('()=>{chrome.permissions.request=async()=>true}')+ dialog.get_by_role('button',name='保存配置',exact=True).click()+ expect(dialog).to_be_hidden()+ expect(library.locator('[data-provider-id="custom-media"]')).to_contain_text('已连接')+ print(json.dumps({'referenceCombinations':4,'savedVisionModelSelectable':True,'narrowLayout':True, 'iconMenus':True, 'keyboardAndOutsideClose':True,'paidRequests':0}))++if __name__=='__main__': main()diff --git a/test/composer_reference_picker_e2e.py b/test/composer_reference_picker_e2e.pyindex 7b20b3e..da37977 100644--- a/test/composer_reference_picker_e2e.py+++ b/test/composer_reference_picker_e2e.py@@ -1,6 +1,7 @@from __future__ import annotationsfrom playwright.sync_api import expect+from composer_e2e_support import set_composer_reference_mediafrom e2e_support import base_entry, extension_session@@ -159,6 +160,7 @@ def main() -> None:composer.locator("#composer-options summary").click()composer.locator("#composer-create-image").check()composer.locator("#composer-options summary").click()+ set_composer_reference_media(composer, images=True)composer.locator("#composer-reference-open").click()for number in [1, 2, 4, 5, 6]:asset_checkbox(composer, number).check()diff --git a/test/composer_temp_references_e2e.py b/test/composer_temp_references_e2e.pyindex 1b1a2d7..e29cc04 100644--- a/test/composer_temp_references_e2e.py+++ b/test/composer_temp_references_e2e.py@@ -7,6 +7,7 @@ from pathlib import Pathfrom playwright.sync_api import expectfrom e2e_support import ai_configuration_fixture, extension_session+from composer_e2e_support import set_composer_reference_mediaPNG_BASE64 = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII="@@ -196,18 +197,16 @@ def main() -> None:assert mobile_geometry["inputBottom"] <= mobile_geometry["viewportHeight"] + 1, mobile_geometryassert mobile_geometry["cardStripOverflow"], mobile_geometrycomposer.set_viewport_size({"width": 1280, "height": 900})+ expect(composer.locator("#composer-send-images")).not_to_be_checked()+ set_composer_reference_media(composer, images=True)+ expect(composer.locator("#composer-image-input-status")).to_have_count(0)composer.locator("#composer-instruction").fill("Use the attached composition")- composer.locator("#composer-action").click()- expect(composer.locator("#composer-image-input-status")).to_be_visible()- expect(composer.locator("#composer-image-input-message")).to_contain_text("切换支持看图的模型")- expect(composer.locator("#composer-image-blocker")).to_have_count(0)- expect(composer.locator("#composer-instruction")).to_have_value("Use the attached composition")assert not vision_requests and not composer_requestsartifact_dir = os.environ.get("PROMPTDIRECTOR_E2E_ARTIFACT_DIR")if artifact_dir:Path(artifact_dir).mkdir(parents=True, exist_ok=True)composer.screenshot(path=str(Path(artifact_dir) / "composer-switch-model.png"), full_page=True)- composer.locator("#composer-image-input-model").click()+ composer.locator("#composer-model-trigger").click()expect(composer.locator("#composer-model-menu")).to_be_visible()composer.locator("#composer-model-dynamic button", has_text="OpenAI").click()expect(composer.locator("#composer-image-input-status")).to_be_hidden()@@ -237,9 +236,9 @@ def main() -> None:})expect(composer.locator(".composer-temp-reference-card")).to_have_count(4)expect(composer.locator(".composer-temp-reference-card").last).to_contain_text("clip.mp4")- composer.locator("#composer-instruction").fill("Read the attached video")- composer.locator("#composer-action").click()- expect(composer.locator("#composer-feedback")).to_contain_text("请切换视频模型")+ expect(composer.locator("#composer-send-videos")).not_to_be_checked()+ set_composer_reference_media(composer, videos=True)+ set_composer_reference_media(composer, videos=False)assert len(composer_requests) == 1, composer_requestscomposer.locator(".composer-temp-reference-card").first.get_by_role("button", name="移除临时附件").click()diff --git a/test/composer_tool_images_e2e.py b/test/composer_tool_images_e2e.pyindex 2e042ff..31edd5d 100644--- a/test/composer_tool_images_e2e.py+++ b/test/composer_tool_images_e2e.py@@ -4,6 +4,7 @@ import jsonimport osfrom pathlib import Pathfrom playwright.sync_api import expect+from composer_e2e_support import set_composer_reference_mediafrom e2e_support import ai_configuration_fixture, base_entry, extension_session, wait_for_async_conditionPNG = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII='@@ -61,6 +62,8 @@ def main():ordinary = send('写一句产品文案', 1)assert 'image_url' not in json.dumps(ordinary)+ expect(page.locator('#composer-send-images')).not_to_be_checked()+ set_composer_reference_media(page, images=True)mode = 'image'sent = send('用A画面的图片做构图参考', 3)assert 'image_url' not in json.dumps(sent[:2])diff --git a/test/composer_workspace_tools_e2e.py b/test/composer_workspace_tools_e2e.pyindex aa043c1..788d8cb 100644--- a/test/composer_workspace_tools_e2e.py+++ b/test/composer_workspace_tools_e2e.py@@ -82,8 +82,15 @@ def main():assert len(requests)==2, 'Saving must not call a model'skill=page.evaluate("async()=> (await chrome.storage.local.get('creativeSkills')).creativeSkills.items[0]")assert skill['callName']=='用户改名的布光'- skills=run.open_page(f"skills.html?view=detail&skill={skill['id']}")- expect(skills.locator('#skill-detail-title')).to_contain_text('用户改名的布光')+ session_id=page.evaluate("new URL(location.href).searchParams.get('session')")+ card.get_by_role('link',name='在 Skill 中心查看').click()+ expect(page.locator('#skill-detail-title')).to_contain_text('用户改名的布光')+ expect(page.locator('#skill-context-back')).to_have_attribute('aria-label','返回创作台')+ page.locator('#skill-context-back').click()+ expect(page.locator('#composer-instruction')).to_be_editable()+ assert page.evaluate("new URL(location.href).searchParams.get('session')")==session_id+ expect(page.get_by_role('link',name='在 Skill 中心查看')).to_be_visible()+ assert len(requests)==2, 'Opening and returning must not send another model request'page.reload();expect(page.get_by_role('link',name='在 Skill 中心查看')).to_be_visible()mode='read';send('使用用户改名的布光 Skill 讨论下一步',3)read=json.loads([m for m in requests[-1]['messages'] if m['role']=='tool'][-1]['content'])diff --git a/test/content-reading-contract.test.js b/test/content-reading-contract.test.jsnew file mode 100644index 0000000..012c067--- /dev/null+++ b/test/content-reading-contract.test.js@@ -0,0 +1,68 @@+import test from 'node:test';+import assert from 'node:assert/strict';+import { detailPromptSources } from '../extension/prompt-sources.js';+import { canonicalTextAnalysisInput } from '../extension/analysis-input.js';+import { caseTextPart } from '../extension/composer-library-tools.js';+import { composerSourceText } from '../extension/composer-source-text.js';+import { createAgentLibrary } from '../extension/agent-library.js';+import { classifyImportedMedia } from '../extension/classifier.js';+import { CONTENT_IDS } from '../extension/taxonomy.js';+import { renderLibraryJson } from '../extension/lib.js';++function fixture(kind) {+ return { id:`case-${kind}`, title:'原始资料', text:'来源中的完整提示词', textRevision:4,+ sourceFacts:{originalPromptAvailable:true},+ classification:{pathIds:[kind==='video'?CONTENT_IDS.videoCase:CONTENT_IDS.imageCase],status:'confirmed',source:'manual'},+ mediaAssets:[{id:'asset',kind,usage:'content'}], primaryMediaId:'asset' };+}+for (const kind of ['image','video']) test(`${kind}: original remains readable across detail, text analysis, composer, Agent and export despite user classification`, async () => {+ const entry = fixture(kind), before = structuredClone(entry);+ const library = createAgentLibrary({loadState:async()=>({entries:[entry]}),libraryUrl:'chrome-extension://fixture/library.html'});+ assert.equal(detailPromptSources(entry,entry.mediaAssets[0]).original,entry.text);+ assert.equal(canonicalTextAnalysisInput(entry).text,entry.text);+ assert.equal(caseTextPart(entry,'original_prompt'),entry.text);+ assert.equal(composerSourceText(entry),entry.text);+ assert.equal((await library.read({caseId:entry.id,part:'original_prompt'})).content,entry.text);+ assert.equal(JSON.parse(renderLibraryJson([entry],{})).entries[0].text,entry.text);+ assert.deepEqual(entry,before);+});+test('video analysis uses its selected original, not a poster or adopted AI text', () => {+ const entry=fixture('video');+ entry.mediaAssets.unshift({id:'poster',kind:'image',usage:'poster'});+ entry.mediaPrompts=[{assetId:'asset',text:'AI推测',source:'ai-suggestion'},+ {assetId:'asset',text:'视频原始输入',source:'manual',textRevision:6}];+ assert.deepEqual(canonicalTextAnalysisInput(entry),{text:'视频原始输入',textRevision:6,source:'media_prompt',assetId:'asset'});+ assert.equal(detailPromptSources(entry,entry.mediaAssets[1]).original,'视频原始输入');+ assert.doesNotMatch(caseTextPart(entry,'original_prompt'),/AI推测/);+});+test('an adopted AI prompt remains analyzable when no original is present, without becoming an original', () => {+ const entry=fixture('image');+ entry.text='';+ entry.sourceFacts.originalPromptAvailable=false;+ entry.mediaPrompts=[{assetId:'asset',text:'用户已采用的AI提示词',source:'ai-suggestion',textRevision:2}];+ assert.deepEqual(canonicalTextAnalysisInput(entry),{text:'用户已采用的AI提示词',textRevision:2,source:'ai_prompt',assetId:'asset'});+ assert.equal(detailPromptSources(entry,entry.mediaAssets[0]).original,'');+ assert.equal(caseTextPart(entry,'original_prompt'),'');+});+test('article and compound reading never promotes article prose to original prompts', () => {+ const article={id:'article',title:'教程',text:'文章正文',articleDocument:{blocks:[{kind:'paragraph',text:'文章正文'}]}};+ const video=fixture('video');+ const compound={id:'compound',text:'文章正文\n来源中的完整提示词',memberEntries:[article,video]};+ assert.equal(caseTextPart(article,'original_prompt'),'');+ assert.match(caseTextPart(compound,'original_prompt'),/来源中的完整提示词/);+ assert.doesNotMatch(caseTextPart(compound,'original_prompt'),/文章正文/);+});+test('new file imports classify from recorded original evidence while respecting manual organization', () => {+ for (const kind of ['image','video']) {+ const entry=fixture(kind);+ const manual=entry.classification;+ assert.deepEqual(classifyImportedMedia(entry).pathIds,manual.pathIds);+ assert.equal(classifyImportedMedia(entry).source,manual.source);+ delete entry.classification;+ assert.deepEqual(classifyImportedMedia(entry).pathIds,[kind==='video'?CONTENT_IDS.promptVideo:CONTENT_IDS.promptImage]);+ entry.sourceFacts={originalPromptAvailable:false};entry.text='随手备注';+ assert.deepEqual(classifyImportedMedia(entry).pathIds,[kind==='video'?CONTENT_IDS.videoCase:CONTENT_IDS.imageCase]);+ entry.mediaPrompts=[{assetId:'asset',source:'embedded',text:'文件中真实原词'}];+ assert.deepEqual(classifyImportedMedia(entry).pathIds,[kind==='video'?CONTENT_IDS.promptVideo:CONTENT_IDS.promptImage]);+ }+});diff --git a/test/creative_feedback_e2e.py b/test/creative_feedback_e2e.pyindex 4c727b6..fbdc82d 100644--- a/test/creative_feedback_e2e.py+++ b/test/creative_feedback_e2e.py@@ -73,7 +73,7 @@ def main() -> None:expect(collector.locator("#normal-start")).to_be_visible()expect(collector.locator("#normal-start .start-copy")).to_have_count(0)expect(collector.locator("#start-smart-visuals")).to_have_text("选图")- expect(collector.locator("#start-selection")).to_have_text("选区")+ expect(collector.locator("#start-selection")).to_have_text("选取内容")expect(collector.locator("#start-screenshot")).to_have_text("截图")expect(collector.locator("#start-clipboard")).to_have_text("剪贴板")normal_geometry = collector.evaluate(diff --git a/test/data-safety-ui.test.js b/test/data-safety-ui.test.jsindex fcd93da..7b02e9a 100644--- a/test/data-safety-ui.test.js+++ b/test/data-safety-ui.test.js@@ -87,7 +87,8 @@ test("share-package batch import preserves local configuration and accepts histolibrary.indexOf("async function importSharedLibraryPackage"),library.indexOf("function backupMediaPaths"));- assert.match(action, /PREVIEW_LIBRARY_IMPORT_BATCH/);+ assert.match(action, /previewLibraryImportInWorker/);+ assert.match(action, /GET_FOLDER_BACKUP_STATE/);assert.match(action, /APPLY_LIBRARY_IMPORT_BATCH/);assert.equal((action.match(/preserveLibraryConfiguration:\s*true/g) ?? []).length, 1);assert.match(action, /plan:\s*batch\.preview\.plan/);@@ -122,7 +123,8 @@ test("multi-ZIP import uses one wide preflight with blocking failures and one baassert.match(flow, /for \(const item of batch\.items\)/);assert.match(flow, /await inspectLibraryPackageBatchItem\(batch, item\)/);assert.match(flow, /batch\.controller\.signal/);- assert.match(flow, /PREVIEW_LIBRARY_IMPORT_BATCH/);+ assert.match(flow, /previewLibraryImportInWorker/);+ assert.match(flow, /previewController\?\.abort/);assert.match(flow, /APPLY_LIBRARY_IMPORT_BATCH/);assert.match(flow, /assertStorageCapacity\(estimate, plannedBytes\)/);const plan = flow.slice(flow.indexOf("async function refreshLibraryPackageBatchPlan"), flow.indexOf("function libraryPackageMessage"));diff --git a/test/detail_tag_organization_e2e.py b/test/detail_tag_organization_e2e.pynew file mode 100644index 0000000..20a1a25--- /dev/null+++ b/test/detail_tag_organization_e2e.py@@ -0,0 +1,39 @@+"""Large tag catalog, fake model responses; real UI chunking, retry and atomic application."""+from playwright.sync_api import expect+from e2e_support import extension_session, ai_configuration_fixture++def main():+ with extension_session('tag-organization-') as run:+ setup=run.open_page('collector.html')+ run.seed_storage(setup,{'entries':[],**ai_configuration_fixture(providers={'deepseek':{'apiKey':'fixture','consent':True,'models':{'textTags':'deepseek-v4-flash'}}},assignments={'textTags':{'providerId':'deepseek','model':'deepseek-v4-flash'}})})+ count=setup.evaluate('''async()=>{+ const {createFixedFacetCatalog,createDetailOrganizationChunks}=await import('./tag-taxonomy.js');+ const facetCatalog=createFixedFacetCatalog();+ for(let i=0;i<400;i++)facetCatalog.nodes.push({id:'detail:'+i,name:'电影写实标签'+i,parentId:'style.render',facetId:'style',status:'active',kind:'detail',origin:'ai',order:i,aliases:[],patterns:[]});+ await chrome.storage.local.set({facetCatalog});return createDetailOrganizationChunks(facetCatalog).length;+ }''')+ page=run.open_page('library.html',wait_until='networkidle')+ page.evaluate('''()=>{+ window.calls=[];window.failOnce=true;const original=window.fetch;+ window.fetch=async(url,options)=>{+ if(!String(url).includes('api.deepseek.com'))return original(url,options);+ const body=JSON.parse(options.body);const chunk=JSON.parse(body.messages.at(-1).content);window.calls.push(chunk.d.map(r=>r[0]));+ if(window.calls.length===2&&window.failOnce){window.failOnce=false;return new Response(JSON.stringify({error:{message:'fixture length limit'}}),{status:400});}+ return new Response(JSON.stringify({choices:[{finish_reason:'stop',message:{content:JSON.stringify({m:[]})}}],usage:{prompt_tokens:1,completion_tokens:1,total_tokens:2}}),{status:200,headers:{'Content-Type':'application/json'}});+ };+ }''')+ if page.locator('#settings-dialog').is_visible(): page.locator('#settings-close').click()+ page.locator('#manage-facets').click();page.locator('[data-manager-tab="vocabulary"]').click()+ button=page.locator('#organize-detail-tags');button.click()+ dialog=page.locator('#promptdirector-app-dialog');expect(dialog).to_contain_text(f'{count} 次付费请求')+ dialog.get_by_role('button',name='确认并开始',exact=True).click()+ expect(page.locator('#organize-detail-status')).to_contain_text('HTTP 400')+ assert page.evaluate('window.calls.length')==2+ button.click();expect(dialog).to_contain_text(f'{count-1} 次付费请求')+ dialog.get_by_role('button',name='确认并开始',exact=True).click()+ expect(page.locator('#organize-detail-status')).to_contain_text('tokens')+ calls=page.evaluate('window.calls')+ assert len(calls)==count+1 and calls[0] not in calls[1:] and calls[1]==calls[2],calls+ print({'chunks':count,'failedChunkRetried':True,'successfulChunkNotRecharged':True,'noRealModelCalls':True})++if __name__=='__main__':main()diff --git a/test/detail_visual_stability_e2e.py b/test/detail_visual_stability_e2e.pyindex b7526ba..7751f96 100644--- a/test/detail_visual_stability_e2e.py+++ b/test/detail_visual_stability_e2e.py@@ -24,7 +24,9 @@ def main():const recorder = new MediaRecorder(stream, {mimeType:'video/webm'});const done = new Promise(resolve => recorder.onstop=resolve);recorder.ondataavailable=e=>chunks.push(e.data); recorder.start();- await new Promise(resolve => setTimeout(resolve,800)); recorder.stop(); await done;+ let frame=0;+ const paint=setInterval(()=>{ctx.fillStyle=frame++%2?'#305070':'#406080';ctx.fillRect(0,0,320,180)},40);+ await new Promise(resolve => setTimeout(resolve,800)); clearInterval(paint); recorder.stop(); await done;stream.getTracks().forEach(t=>t.stop());const {saveMediaBlob}=await import(chrome.runtime.getURL('media-store.js'));await saveMediaBlob('stable-media',new Blob(chunks,{type:'video/webm'}),{checkCapacity:false});@@ -40,6 +42,14 @@ def main():page.locator('.case-card[data-entry-id="stable-video"]').click()player = page.locator("video.detail-video")expect(player).to_be_visible()+ player.evaluate("v=>{v.muted=true;v.loop=true}")+ page.get_by_role("button",name="播放视频",exact=True).click()+ try:+ page.wait_for_function("()=>document.querySelector('video.detail-video')?.readyState>=2")+ except Exception:+ print(player.evaluate("v=>({src:v.src,error:v.error?.message,code:v.error?.code,ready:v.readyState,network:v.networkState,paused:v.paused})"),flush=True)+ print(page.locator('#feedback').text_content(),flush=True)+ raiseplayer.evaluate("async v=>{await new Promise(r=>v.readyState>=2?r():v.addEventListener('loadeddata',r,{once:true})); v.loop=true;v.muted=true;await v.play();window.stablePlayer=v;window.stableUrl=v.src;}")page.wait_for_function("() => !!window.releaseTaskQuery")page.evaluate("() => window.releaseTaskQuery()")@@ -103,6 +113,9 @@ def main():page = s.open_page("library.html", wait_until="networkidle")page.locator('.case-card[data-entry-id="playable-mp4"]').click()mp4_player = page.locator("video.detail-video")+ mp4_player.evaluate("v=>{v.muted=true;v.loop=true}")+ page.get_by_role("button",name="播放视频",exact=True).click()+ page.wait_for_function("()=>document.querySelector('video.detail-video')?.readyState>=2")mp4_player.evaluate("async v=>{if(v.readyState<2)await new Promise(r=>v.addEventListener('loadeddata',r,{once:true}));window.mp4Player=v;window.mp4Url=v.src;v.muted=true;v.loop=true;}")before = mp4_player.bounding_box()frame = mp4_player.evaluate("async v=>{const frame=new Promise(r=>v.requestVideoFrameCallback((now,data)=>r({width:data.width,height:data.height})));await v.play();return frame;}")diff --git a/test/dialog-layout.test.js b/test/dialog-layout.test.jsindex 978a653..070a450 100644--- a/test/dialog-layout.test.js+++ b/test/dialog-layout.test.js@@ -75,7 +75,7 @@ test("video detail sizes from media dimensions and separates native controls froassert.match(source, /localVideo\.videoWidth/);assert.match(css, /is-video-detail\.is-immersive \{ height: auto/);assert.match(css, /\.detail-visual-gallery\.is-video-detail \.detail-visual-caption \{[^}]*position: static;[^}]*border-top: 1px solid var\(--line\)/);- assert.match(css, /detail-visual-actions button \{ min-height: 36px/);+ assert.match(css, /detail-visual-actions :is\(button, a\.button-secondary\) \{ min-height: 36px/);const mobile = css.slice(css.lastIndexOf("@media (max-width: 390px)"));assert.match(mobile, /detail-visual-actions[\s\S]*min-height:\s*44px/);assert.match(css, /button-danger-secondary/);diff --git a/test/event-stream.test.js b/test/event-stream.test.jsnew file mode 100644index 0000000..4814176--- /dev/null+++ b/test/event-stream.test.js@@ -0,0 +1,36 @@+import test from "node:test";+import assert from "node:assert/strict";+import { readEventStream } from "../extension/event-stream.js";++test("SSE combines data lines, ignores comments and preserves meaningful whitespace", async () => {+ const response = new Response("\ufeff: heartbeat\r\nevent: message\r\ndata: 第一行\r\ndata: 第二行\r\n\r\ndata: unfinished");+ const events = [];+ for await (const event of readEventStream(response)) events.push(event);+ assert.deepEqual(events, ["第一行\n 第二行", "unfinished"]);+ assert.equal(response.body.locked, false);+});++test("stopping while waiting for bytes cancels the reader and releases its lock", async () => {+ let cancellations = 0;+ const response = new Response(new ReadableStream({ cancel() { cancellations++; } }));+ const controller = new AbortController();+ const stream = readEventStream(response, { signal: controller.signal });+ const next = stream.next();+ controller.abort();+ await assert.rejects(next, { name: "AbortError" });+ assert.equal(cancellations, 1);+ assert.equal(response.body.locked, false);+});++test("a consumer rejecting an event stops reading the provider response", async () => {+ let cancellations = 0;+ const response = new Response(new ReadableStream({+ start(controller) { controller.enqueue(new TextEncoder().encode("data: rejected\n\n")); },+ cancel() { cancellations++; }+ }));+ await assert.rejects(async () => {+ for await (const _event of readEventStream(response)) throw new Error("provider failure");+ }, /provider failure/);+ assert.equal(cancellations, 1);+ assert.equal(response.body.locked, false);+});diff --git a/test/image_generation_info_e2e.py b/test/image_generation_info_e2e.pyindex 1fac330..859b8f8 100644--- a/test/image_generation_info_e2e.py+++ b/test/image_generation_info_e2e.py@@ -28,6 +28,7 @@ def main():assert prepared['generationInfo']['candidates'][0]['prompt'] == '雨夜书店'saved = page.evaluate("async () => chrome.runtime.sendMessage({type:'CREATE_MEDIA_CASE',asset:window.generationAsset,title:'Generation boundary'})")assert saved['ok'], saved+ assert saved['entry']['classification']['pathIds'] == ['content:prompt:image'], savedentry_id = saved['entry']['id']page.goto(f'chrome-extension://{session.extension_id}/library.html?case={entry_id}', wait_until='networkidle')expect(page.locator('.original-prompt-panel .prompt-text').first).to_contain_text('雨夜书店')diff --git a/test/jimeng-redesign.test.js b/test/jimeng-redesign.test.jsindex 3921d5e..a2bcad2 100644--- a/test/jimeng-redesign.test.js+++ b/test/jimeng-redesign.test.js@@ -168,3 +168,38 @@ test("stale SSR work never replaces the current detail ID", () => {assert.deepEqual(read().items, []);});});++test("a visible image detail on the home route owns capture instead of its background feed", () => {+ inPage({ items: [imageWork("7490123456789012346"), imageWork()] }, doc => {+ const child = fiberElement({ renderModel: { id: workId } });+ const detail = { getClientRects: () => [{}], querySelectorAll: () => [child] };+ const query = doc.querySelector;+ doc.querySelectorAll = selector => selector === '[data-detail-container-appearance]' ? [detail] : [];+ doc.querySelector = selector => selector === '[data-detail-container-appearance]' ? detail : query(selector);+ const result = normalizePageCaptureSitePayload(read());+ assert.equal(result.pageKind, "detail");+ assert.deepEqual(result.candidates.map(candidate => candidate.sourceFacts.itemId), [workId]);+ assert.equal(result.media[0].url, imageUrl);+ });+});++test("loading image detail cannot quietly substitute the background list", () => {+ inPage({ items: [imageWork()] }, doc => {+ const detail = { getClientRects: () => [{}], querySelectorAll: () => [] };+ doc.querySelectorAll = selector => selector === '[data-detail-container-appearance]' ? [detail] : [];+ const result = normalizePageCaptureSitePayload(read());+ assert.equal(result.pageKind, "detail");+ assert.deepEqual(result.candidates, []);+ assert.equal(result.completeness, "partial");+ });+});++test("a hidden image detail does not prevent intentional list capture", () => {+ inPage({ items: [imageWork()] }, doc => {+ doc.querySelectorAll = selector => selector === '[data-detail-container-appearance]'+ ? [{ getClientRects: () => [], querySelectorAll: () => [fiberElement({ renderModel: { id: '7490123456789012346' } })] }] : [];+ const result = normalizePageCaptureSitePayload(read());+ assert.equal(result.pageKind, "feed");+ assert.equal(result.candidates.length, 1);+ });+});diff --git a/test/jimeng-video-response.test.js b/test/jimeng-video-response.test.jsnew file mode 100644index 0000000..eaf4db4--- /dev/null+++ b/test/jimeng-video-response.test.js@@ -0,0 +1,86 @@+import test from 'node:test';+import assert from 'node:assert/strict';+import { installPageCaptureSiteObserver, collectPageCaptureSitePayload, normalizePageCaptureSitePayload } from '../extension/page-capture-site-adapters.js';+import { pageCaptureDefaultMediaIds } from '../extension/page-capture.js';++// Reduced synthetic public get_explore response: field names checked against the live site.+const workId = '7490123456789012345';+const videoUrl = 'https://v6-artist.vlabvod.com/current-original/video/';+const rawVideo = () => ({+ common_attr: { id: workId, title: '当前竖版短片', description: '剧情第一段\n剧情第二段', cover_url: 'https://p3-heycan-hgt-sign.byteimg.com/cover.webp' },+ author: { name: '当前作者' },+ video: { duration: 12, origin_video: { video_url: videoUrl, width: 1080, height: 1920, encryption_key: 'excluded' } },+ permission: { token: 'excluded' }+});+function inPage(run) {+ const names = ['location', 'document', 'fetch', 'XMLHttpRequest', 'setInterval', '__get_explore_result', '__PROMPTDIRECTOR_JIMENG_CAPTURE__'];+ const saved = Object.fromEntries(names.map(key => [key, globalThis[key]]));+ globalThis.location = { hostname: 'jimeng.jianying.com', pathname: '/ai-tool/explore', href: 'https://jimeng.jianying.com/ai-tool/explore' };+ globalThis.document = { scripts: [], querySelector: () => null, querySelectorAll: () => [] };+ globalThis.fetch = undefined;+ globalThis.XMLHttpRequest = undefined;+ globalThis.setInterval = undefined;+ globalThis.__get_explore_result = { data: { item_list: [rawVideo()] } };+ delete globalThis.__PROMPTDIRECTOR_JIMENG_CAPTURE__;+ try { run(); } finally {+ delete globalThis.__PROMPTDIRECTOR_JIMENG_CAPTURE__;+ Object.assign(globalThis, saved);+ }+}+function read() {+ const payload = (0, eval)(`(${collectPageCaptureSitePayload.toString()})`)({ maxCandidates: 100, maxMedia: 24, maxTextCharacters: 100000 });+ return normalizePageCaptureSitePayload(payload, globalThis.location.href);+}+function assertOriginal(candidate) {+ assert.equal(candidate.media.length, 1, 'a video response must retain its original, not save a text-only case');+ assert.equal(candidate.media[0].kind, 'video');+ assert.equal(candidate.media[0].url, videoUrl);+ assert.equal(candidate.media[0].width, 1080);+ assert.equal(candidate.media[0].height, 1920);+ assert.equal(candidate.media[0].originalPrompt, '');+ assert.equal(candidate.contentText, '剧情第一段\n剧情第二段');+ assert.equal(candidate.sourceFacts.itemId, workId);+}+test('initial public video response keeps the original video and paragraph boundaries', () => inPage(() => {+ assertOriginal(read().candidates[0]);+}));+test('observed video response keeps the same original after initial page data is gone', () => inPage(() => {+ (0, eval)(`(${installPageCaptureSiteObserver.toString()})`)({ maxCandidates: 100, maxMedia: 24 });+ delete globalThis.__get_explore_result;+ const retained = globalThis.__PROMPTDIRECTOR_JIMENG_CAPTURE__.items;+ assert.equal(JSON.stringify(retained).includes('excluded'), false);+ assertOriginal(read().candidates[0]);+}));+test('explicit current work never normalizes an unrelated background candidate', () => {+ const result = normalizePageCaptureSitePayload({ adapter: 'jimeng', pageKind: 'detail', workId: '7490123456789012346', items: [rawVideo()] });+ assert.deepEqual(result.candidates, []);+ assert.equal(result.completeness, 'partial');+});+test('the current work video is selected in ordinary review instead of silently saving only text', () => {+ const candidate = normalizePageCaptureSitePayload({ adapter: 'jimeng', pageKind: 'detail', workId, items: [rawVideo()] });+ assert.deepEqual(pageCaptureDefaultMediaIds(candidate), candidate.media.map(media => media.id));+ assert.equal(candidate.media.length, 1);+});++const videoPrompt = '第一段<角色1>\n第二段完整分镜';+test('video unified-edit prompt survives public response observer without collecting input material secrets', () => inPage(() => {+ const item = globalThis.__get_explore_result.data.item_list[0];+ item.aigc_image_params = { text2video_params: { video_gen_inputs: [{ prompt: '', unified_edit_input: {+ meta_list: [{ meta_type: 'text', text: videoPrompt }], material_list: [{ private: 'excluded' }]+ }}] } };+ (0, eval)(`(${installPageCaptureSiteObserver.toString()})`)({ maxCandidates: 100, maxMedia: 24 });+ delete globalThis.__get_explore_result;+ const candidate = read().candidates[0];+ assert.equal(candidate.media[0].originalPrompt, videoPrompt);+ assert.equal(candidate.contentText, videoPrompt);+ assert.equal(JSON.stringify(globalThis.__PROMPTDIRECTOR_JIMENG_CAPTURE__).includes('excluded'), false);+}));+test('SSR AiVideo work reads text2video unified edit prompt and keeps its video pairing', () => inPage(() => {+ globalThis.location.pathname = '/ai-tool/work-detail/' + workId;+ delete globalThis.__get_explore_result;+ const item = { commonAttr: {id:workId}, author:{name:'视频作者'},+ aigcImageParams: {text2videoParams:{videoGenInputs:[{prompt:'', unifiedEditInput:{metaList:[{metaType:'text', text:videoPrompt}]}}]}},+ video: {originVideo:{videoUrl,width:1080,height:1920},duration:12} };+ globalThis.document.scripts = [{textContent:'window._ROUTER_DATA = '+JSON.stringify({loaderData:{'ai-tool/work-detail/page':{workDetail:{ok:true,value:item}}}})}];+ assert.equal(read().candidates[0].media[0].originalPrompt, videoPrompt);+}));diff --git a/test/jimeng_video_capture_e2e.py b/test/jimeng_video_capture_e2e.pynew file mode 100644index 0000000..c4f03cc--- /dev/null+++ b/test/jimeng_video_capture_e2e.py@@ -0,0 +1,132 @@+"""Synthetic video responses with live-checked field names; real capture, save, readback and playback.+The temporary manifest pregrants only fixture origins. Native permission UI is not exercised.+"""+import hashlib+import json+import tempfile+from pathlib import Path++from playwright.sync_api import expect+from e2e_support import EXTENSION_DIR, extension_session+from page_capture_e2e import fixture_png++ORIGIN = 'https://jimeng.jianying.com'+CDN = 'https://v6-artist.vlabvod.com'+IMAGES = 'https://p3-dreamina-sign.byteimg.com'+WORK_ID = '7490123456789012345'+OTHER_ID = '7490123456789012346'+PROMPT = '第一段视频原始提示词\n第二段视频原始提示词'+VIDEO = CDN + '/current-original/video/'+++def main():+ item = {'common_attr': {'id': WORK_ID, 'title': '当前视频作品', 'description': '剧情第一段\n剧情第二段', 'cover_url': IMAGES + '/cover.png'},+ 'author': {'name': '视频作者'}, 'aigc_image_params': {'text2video_params': {'video_gen_inputs': [{'prompt': '', 'unified_edit_input': {'meta_list': [{'meta_type': 'text', 'text': PROMPT}]}}]}},+ 'video': {'duration': 3.2, 'origin_video': {'video_url': VIDEO, 'width': 1080, 'height': 1920}}}+ other = {'common_attr': {'id': OTHER_ID, 'title': '背景图片作品'}, 'author': {'name': '图片作者'},+ 'aigc_image_params': {'text2image_params': {'prompt': '其他作品提示词'}},+ 'image': {'large_images': [{'image_url': IMAGES + '/other.png', 'width': 512, 'height': 512}]}}+ # First unrelated item catches accidental first-item fallback in detail capture.+ payload = {'data': {'item_list': [other, item]}}+ html = '''<!doctype html><meta charset="utf-8"><title>即梦隔离采集样本</title><main>作品列表</main>+ <button id="open-image">打开图片作品</button>+ <section data-detail-container-appearance style="display:none"><img id="detail-image" src="''' + IMAGES + '''/other.png"></section>+ <script>window.__get_explore_result=''' + json.dumps(payload) + ''';+ const detail=document.querySelector('[data-detail-container-appearance]');+ document.querySelector('#detail-image').__reactFiber$fixture={memoizedProps:{renderModel:{id:"''' + OTHER_ID + '''"}},return:null};+ document.querySelector('#open-image').onclick=()=>detail.style.display='block';+ </script>'''+ media_root = Path(__file__).parent / 'fixtures/hls-audio-video'+ video_bytes = b''.join((media_root / name).read_bytes() for name in ['init.mp4', 'stream0.m4s', 'stream1.m4s', 'stream2.m4s'])+ with tempfile.TemporaryDirectory(prefix='jimeng-video-runtime-') as temp:+ extension = Path(temp)+ for file in EXTENSION_DIR.iterdir():+ if file.name not in {'manifest.json', '.git', 'node_modules', 'dist'}:+ (extension / file.name).symlink_to(file, target_is_directory=file.is_dir())+ manifest = json.loads((EXTENSION_DIR / 'manifest.json').read_text())+ manifest['host_permissions'] += [ORIGIN + '/*', CDN + '/*', IMAGES + '/*']+ (extension / 'manifest.json').write_text(json.dumps(manifest))+ with extension_session('jimeng-video-capture-', extension_dir=extension) as run:+ run.context.route(ORIGIN + '/**', lambda route: route.fulfill(body=html, content_type='text/html'))+ run.context.route(CDN + '/**', lambda route: route.fulfill(body=video_bytes, content_type='video/mp4', headers={'Access-Control-Allow-Origin': '*'}))+ run.context.route(IMAGES + '/**', lambda route: route.fulfill(body=fixture_png(route.request.url), content_type='image/png'))+ collector = run.open_page('collector.html')+ run.seed_storage(collector, {'entries': [], 'capturePermissionOnboarding': {'version': 1, 'acknowledgedAt': '2026-09-19T00:00:00Z', 'clipboardIncluded': True}})+ source = run.context.new_page()+ source.goto(ORIGIN + '/ai-tool/explore')+ source.bring_to_front()+ batch = collector.evaluate("async()=>chrome.runtime.sendMessage({type:'START_PAGE_CAPTURE',mode:'loaded'})")+ assert batch['ok'], batch+ candidates = batch['batch']['candidates']+ assert len(candidates) == 2, candidates+ assert {c['sourceFacts']['itemId']: c['media'][0]['kind'] for c in candidates} == {WORK_ID: 'video', OTHER_ID: 'image'}, candidates+ # The observer must retain the video after the page consumes the initial response.+ source.evaluate('()=>delete window.__get_explore_result')+ retained = collector.evaluate("async()=>chrome.runtime.sendMessage({type:'START_PAGE_CAPTURE',mode:'loaded'})")+ assert retained['ok'], retained+ assert [(c['sourceFacts']['itemId'], c['contentText'], [(m['kind'], m['url']) for m in c['media']]) for c in retained['batch']['candidates']] == [(c['sourceFacts']['itemId'], c['contentText'], [(m['kind'], m['url']) for m in c['media']]) for c in candidates]+ # Open the selected work while the unrelated earlier item remains in page state.+ source.goto(ORIGIN + '/ai-tool/work-detail/' + WORK_ID)+ source.bring_to_front()+ collector.evaluate("()=>document.querySelector('#start-page-capture').click()")+ expect(collector.locator('.page-capture-item')).to_have_count(1)+ expect(collector.locator('#page-capture-list')).to_contain_text('当前视频作品')+ expect(collector.locator('#page-capture-list')).not_to_contain_text('背景图片作品')+ collector.locator('.page-capture-confirm').click()+ expect(collector.locator('#page-capture-media-review-list .page-capture-media-review-item')).to_have_count(1)+ collector.locator('#page-capture-save').click()+ expect(collector.locator('#page-capture')).to_be_hidden(timeout=15000)+ entries = collector.evaluate("async()=> (await chrome.runtime.sendMessage({type:'GET_STATE'})).entries")+ assert len(entries) == 1, entries+ entry = entries[0]+ assert entry['sourceFacts']['itemId'] == WORK_ID+ assert '第二段视频原始提示词' in entry['text'] and '其他作品' not in entry['text'], entry+ content_assets = [a for a in entry['mediaAssets'] if a.get('usage') != 'poster']+ assert len(content_assets) == 1, entry+ asset = content_assets[0]+ assert asset['kind'] == 'video' and asset['storageMode'] == 'managed', asset+ assert any(p['assetId'] == asset['id'] and p['text'] == PROMPT for p in entry['mediaPrompts']), entry+ digest = collector.evaluate("""async id=>{+ const blob=await (await import('./media-store.js')).getMediaBlob(id);+ return [...new Uint8Array(await crypto.subtle.digest('SHA-256',await blob.arrayBuffer()))].map(x=>x.toString(16).padStart(2,'0')).join('');+ }""", asset['id'])+ assert digest == hashlib.sha256(video_bytes).hexdigest()+ collector.reload()+ assert len(collector.evaluate("async()=> (await chrome.runtime.sendMessage({type:'GET_STATE'})).entries")) == 1+ library = run.open_page('library.html')+ library.locator('.case-card').first.click()+ expect(library.locator('#detail-drawer')).to_contain_text('第二段视频原始提示词')+ video = library.locator('#detail-drawer video').first+ video.evaluate('(v)=>{v.muted=true;}')+ library.get_by_role('button',name='播放视频',exact=True).click()+ library.wait_for_function("()=>document.querySelector('#detail-drawer video')?.ended")+ assert video.evaluate('v=>v.webkitAudioDecodedByteCount>0 && v.webkitVideoDecodedByteCount>0')+ source.goto(ORIGIN + '/ai-tool/explore')+ source.locator('#open-image').click()+ assert source.url == ORIGIN + '/ai-tool/explore'+ source.bring_to_front()+ collector.evaluate("()=>document.querySelector('#start-page-capture').click()")+ expect(collector.locator('.page-capture-item')).to_have_count(1)+ expect(collector.locator('#page-capture-list')).to_contain_text('背景图片作品')+ expect(collector.locator('#page-capture-list')).not_to_contain_text('当前视频作品')+ collector.locator('.page-capture-confirm').click()+ collector.locator('#page-capture-save').click()+ expect(collector.locator('#page-capture')).to_be_hidden(timeout=15000)+ saved = collector.evaluate("async()=> (await chrome.runtime.sendMessage({type:'GET_STATE'})).entries")+ assert len(saved) == 2, saved+ image_entry = next(e for e in saved if e['sourceFacts']['itemId'] == OTHER_ID)+ assert len(image_entry['mediaAssets']) == 1 and image_entry['mediaAssets'][0]['kind'] == 'image', image_entry+ assert any(p['assetId'] == image_entry['mediaAssets'][0]['id'] and p['text'] == '其他作品提示词' for p in image_entry['mediaPrompts'])+ # Closing the work overlay restores intentional batch capture on the same URL.+ source.evaluate("()=>document.querySelector('[data-detail-container-appearance]').style.display='none'")+ source.bring_to_front()+ restored = collector.evaluate("async()=>chrome.runtime.sendMessage({type:'START_PAGE_CAPTURE',mode:'loaded'})")+ assert restored['ok'] and len(restored['batch']['candidates']) == 2, restored+ print({'mixed_list': True, 'retained_video': True, 'exact_detail': True, 'saved_video_sha256': digest,+ 'prompt_pairing': True, 'sidebar_cleared': True, 'reload_retained': True, 'audio_video_playback': True,+ 'same_url_image_overlay_save': True, 'close_overlay_restores_list': True,+ 'native_permission_ui': 'not exercised; temporary manifest pregrants fixture origins'})+++if __name__ == '__main__':+ main()diff --git a/test/library-import-background.test.js b/test/library-import-background.test.jsindex 500aa01..8b7d5d3 100644--- a/test/library-import-background.test.js+++ b/test/library-import-background.test.js@@ -34,8 +34,7 @@ test("multi-package import previews and commits one batch transaction", () => {assert.match(background, /case "PREVIEW_LIBRARY_IMPORT_BATCH"/);assert.match(background, /case "APPLY_LIBRARY_IMPORT_BATCH"/);- assert.match(preview, /planLibraryTransferBatch/);- assert.match(preview, /canApply: *result\.canApply/);+ assert.match(preview, /return previewLibraryTransferBatch/);assert.match(apply, /sourceValue *= *packages\.map/);assert.match(apply, /planLibraryTransferBatch/);assert.match(apply, /!result\.canApply/);diff --git a/test/library-import-dedup.test.js b/test/library-import-dedup.test.jsindex 0f6e863..7cae168 100644--- a/test/library-import-dedup.test.js+++ b/test/library-import-dedup.test.js@@ -208,3 +208,54 @@ test("managed media without a reliable content hash is preserved as a copy", ()assert.equal(second.importedCount, 1);assert.equal(second.skippedCount, 0);});++test("doubling unique cases does not re-clone every preceding case during import planning", (t) => {+ const clone = globalThis.structuredClone;+ let calls = 0;+ const spy = t.mock.method(globalThis, "structuredClone", (...args) => {+ calls += 1;+ return clone(...args);+ });+ const measure = (count) => {+ const source = portablePackage(Array.from({ length: count }, (_, index) =>+ portableImageEntry(`scale-${index}`, index.toString(16).padStart(64, "0"))));+ calls = 0;+ const result = mergeLibraryPackage(emptyLibrary(), source, { preserveLibraryConfiguration: true });+ assert.equal(result.importedCount, count);+ assert.equal(result.state.entries.length, count);+ return calls;+ };+ try {+ // Count expensive copies instead of asserting machine-dependent milliseconds.+ const small = measure(128);+ const large = measure(256);+ assert.ok(large <= small * 2, `doubling cases grew content-copy work from ${small} to ${large}`);+ } finally {+ spy.mock.restore();+ }+});++test("replacing a local case removes its old identity before later incoming cases are checked", () => {+ const current = mergeLibraryPackage(emptyLibrary(), portablePackage([portableEntry("local")])).state;+ const result = mergeLibraryPackage(current, portablePackage([+ portableEntry("local", { text: "替换后的资料" }),+ portableEntry("incoming-original")+ ]), { preserveLibraryConfiguration: true, entryConflictResolutions: { local: "use-incoming" } });+ assert.equal(result.importedCount, 2);+ assert.equal(result.skippedCount, 0);+ assert.equal(result.entryIdMap["incoming-original"], "incoming-original");+ assert.deepEqual(result.state.entries.map(entry => entry.text), ["替换后的资料", "保留这段创作提示词"]);+});++test("replacing the first of equivalent local cases keeps the remaining duplicate available", () => {+ const current = mergeLibraryPackage(emptyLibrary(), portablePackage([+ portableEntry("first"), portableEntry("second")+ ])).state;+ const result = mergeLibraryPackage(current, portablePackage([+ portableEntry("first", { text: "替换后的资料" }), portableEntry("incoming-original")+ ]), { preserveLibraryConfiguration: true, entryConflictResolutions: { first: "use-incoming" } });+ assert.equal(result.importedCount, 1);+ assert.equal(result.skippedCount, 1);+ assert.equal(result.entryIdMap["incoming-original"], "second");+ assert.deepEqual(result.state.entries.map(entry => entry.id), ["second", "first"]);+});diff --git a/test/library-interaction-regressions.test.js b/test/library-interaction-regressions.test.jsindex a029f63..4dd4abb 100644--- a/test/library-interaction-regressions.test.js+++ b/test/library-interaction-regressions.test.js@@ -1,6 +1,7 @@import test from "node:test";import assert from "node:assert/strict";import { readFile } from "node:fs/promises";+import { load } from "cheerio";const [library, html, css, background, composerHtml, composerCss, i18n] = await Promise.all([readFile(new URL("../extension/library.js", import.meta.url), "utf8"),@@ -128,18 +129,20 @@ test("detail text analysis follows the currently displayed image prompt", () =>assert.doesNotMatch(analyzeSingleEntry, /textFingerprint\(entry\.text\)/);});-test("composer keeps only primary controls exposed and moves secondary choices into one settings menu", () => {+test("composer groups direction and reference inputs in their menus and secondary choices in settings", () => {assert.match(composerHtml, /class="composer-options-panel"/);assert.match(composerHtml, /id="composer-applied-skills"[^>]*hidden/);assert.match(composerHtml, /id="composer-attachment-local"/);assert.match(composerHtml, /id="composer-reference-tab-skills"/);assert.doesNotMatch(composerHtml, /id="composer-skill-manage"|id="composer-attachment-menu"/);- assert.ok(composerHtml.indexOf("composer-type-switch") < composerHtml.indexOf("composer-options-panel"));- assert.ok(composerHtml.indexOf("composer-reference-open") < composerHtml.indexOf("composer-options-panel"));- assert.ok(composerHtml.indexOf("composer-route") > composerHtml.indexOf("composer-options-panel"));- assert.ok(composerHtml.indexOf("composer-platform") > composerHtml.indexOf("composer-options-panel"));- assert.ok(composerHtml.indexOf("composer-output-language") > composerHtml.indexOf("composer-options-panel"));- assert.ok(composerHtml.indexOf("composer-production-review") > composerHtml.indexOf("composer-options-panel"));- assert.ok(composerHtml.indexOf("composer-thinking") > composerHtml.indexOf("composer-options-panel"));+ const $ = load(composerHtml);+ assert.equal($('#composer-direction .composer-type-switch').length, 1);+ assert.equal($('#composer-reference-open').closest('.composer-options-panel').length, 0);+ for (const id of ['composer-send-images', 'composer-send-videos']) {+ assert.equal($(`#composer-reference-inputs #${id}`).length, 1);+ }+ for (const id of ['composer-route', 'composer-platform', 'composer-output-language', 'composer-production-review', 'composer-thinking']) {+ assert.equal($(`#${id}`).closest('details').attr('id'), 'composer-options');+ }assert.match(composerCss, /\.composer-input-tools\s*\{[^}]*flex-wrap:\s*nowrap/);});diff --git a/test/library-model.test.js b/test/library-model.test.jsindex 8413656..68ecd11 100644--- a/test/library-model.test.js+++ b/test/library-model.test.js@@ -175,7 +175,15 @@ test("a compound logical case matches search, content filters, and pending state});-test("saved capture warnings remain readable in source details after the sidebar clears", () => {+test("developer capture diagnostics never appear in saved case details", () => {const rows = entrySourceMetadataRows({sourceFacts:{captureWarnings:["视频文件未保存"]}});- assert.ok(rows.some(row => row.label === "采集问题" && row.value === "视频文件未保存"));+ assert.ok(!rows.some(row => /采集问题|视频文件未保存/.test(row.label + row.value)));+});+++test("video introduction already in the case body is not duplicated in source metadata", () => {+ const rows = entrySourceMetadataRows({ text: "Full introduction\n\nSelected comments", sourceFacts: { description: "Full introduction", engagement: { comments: 3, coins: 2 } } });+ assert.ok(!rows.some(row => row.label === "作品说明"));+ assert.ok(rows.some(row => row.label === "评论" && row.value === "3"));+ assert.ok(rows.some(row => row.label === "投币" && row.value === "2"));});diff --git a/test/library-package.test.js b/test/library-package.test.jsindex 9edbc91..8b14074 100644--- a/test/library-package.test.js+++ b/test/library-package.test.js@@ -53,6 +53,7 @@ function catalog() {test("webpage prompt provenance survives a portable package and media identity collisions", () => {const data = packageData([{ ...entry("remote"), hasScreenshot: false, screenshotPath: undefined,mediaAssets: [{ id: "shared-image", kind: "image", storageMode: "managed", sourceUrl: "https://example.com/remote.png", mimeType: "image/png", assetPath: "images/remote.png" }],+ coverVisualId: "shared-image",mediaPrompts: [{ assetId: "shared-image", source: "webpage", text: "Original source prompt", textRevision: 1 }]}], catalog());const parsed = parseLibraryPackage(data, new Map([["images/remote.png", new Blob(["fixture image"], { type: "image/png" })]]));@@ -65,6 +66,7 @@ test("webpage prompt provenance survives a portable package and media identity cassert.ok(restored);assert.notEqual(restored.mediaAssets[0].id, "shared-image");assert.equal(restored.mediaPrompts[0].assetId, restored.mediaAssets[0].id);+ assert.equal(restored.coverVisualId, restored.mediaAssets[0].id);assert.equal(restored.mediaPrompts[0].source, "webpage");assert.equal(restored.mediaPrompts[0].text, "Original source prompt");});diff --git a/test/library-selection.test.js b/test/library-selection.test.jsindex 98f1cf1..8f07a1a 100644--- a/test/library-selection.test.js+++ b/test/library-selection.test.js@@ -169,3 +169,10 @@ test("trash payload expands compound members and empty selection is rejected", (/至少选择一个案例/);});++test('batch classification expands compound members once and requires an explicit type', () => {+ const compounds=[{id:'compound:one',memberEntryIds:['a','b']}];+ assert.deepEqual(buildLibraryBatchPayload(['compound:one','a'],compounds,{type:LIBRARY_BATCH_ACTIONS.setClassification,contentTypeId:'content:prompt:video'}),+ {type:'BATCH_SET_CLASSIFICATION',entryIds:['a','b'],pathIds:['content:prompt:video']});+ assert.throws(()=>buildLibraryBatchPayload(['a'],[],{type:LIBRARY_BATCH_ACTIONS.setClassification}),/请选择案例类型/);+});diff --git a/test/library_detail_sidebar_responsive_e2e.py b/test/library_detail_sidebar_responsive_e2e.pyindex 644d8d5..e826511 100644--- a/test/library_detail_sidebar_responsive_e2e.py+++ b/test/library_detail_sidebar_responsive_e2e.py@@ -118,6 +118,7 @@ def main() -> None:library.locator('.case-card[data-entry-id="sidebar-video-a"]').click()expect(library.locator("#detail-drawer")).to_have_attribute("data-detail-mode", "sidebar")expect(library.locator("#detail-navigation")).to_be_visible()+ library.get_by_role("button",name="播放视频",exact=True).click()library.wait_for_function("() => document.querySelector('.detail-video')?.readyState>=2")snapshots = []diff --git a/test/library_discovery_e2e.py b/test/library_discovery_e2e.pyindex 6946400..e96c90f 100644--- a/test/library_discovery_e2e.py+++ b/test/library_discovery_e2e.py@@ -1,6 +1,7 @@from __future__ import annotationsimport re+import timefrom urllib.parse import parse_qs, urlparsefrom playwright.sync_api import expect@@ -153,12 +154,14 @@ def main() -> None:while similar.count() < 60:previous_count = similar.count()- library.locator("#detail-content").hover(position={"x": 40, "y": 200})- library.mouse.wheel(0, library.locator("#detail-content").evaluate("element => element.scrollHeight"))- library.wait_for_function(- """previous => document.querySelectorAll('.detail-discovery-grid .local-discovery-item').length > previous""",- arg=previous_count,- )+ deadline = time.monotonic() + 10+ # Wheel dispatch does not wait for scrolling or thumbnail reflow.+ # Keep scrolling like a reader until the next batch is visible.+ while similar.count() == previous_count and time.monotonic() < deadline:+ library.locator("#detail-content").hover(position={"x": 40, "y": 200})+ library.mouse.wheel(0, library.locator("#detail-content").evaluate("element => element.scrollHeight"))+ library.wait_for_timeout(150)+ assert similar.count() > previous_count, "Scrolling must reveal the next similar-case batch"expect(similar).to_have_count(60)target = similar.nth(30)diff --git a/test/library_import_preview_e2e.py b/test/library_import_preview_e2e.pynew file mode 100644index 0000000..78255e8--- /dev/null+++ b/test/library_import_preview_e2e.py@@ -0,0 +1,70 @@+"""Read-only import planning survives background shutdown, cancels, and cannot commit stale data.+The 649 generated cases reproduce case count, not the user's unavailable ZIP/media.+"""+import json+from e2e_support import base_entry, extension_session++with extension_session('pd-import-preview-') as session:+ page = session.open_page('collector.html')+ original = base_entry('local', '本机资料', '保留用户修改', 'content:text-case', 1)+ session.seed_storage(page, {'entries': [original]})+ worker = session.context.service_workers[0]+ cdp = session.context.new_cdp_session(page)+ versions = []+ cdp.on('ServiceWorker.workerVersionUpdated', lambda event: versions.extend(event['versions']))+ cdp.send('ServiceWorker.enable')+ page.evaluate('''async entry => {+ const {renderLibraryJson} = await import('./lib.js');+ window.previewInput = {+ currentState: await chrome.runtime.sendMessage({type:'GET_FOLDER_BACKUP_STATE'}),+ inspections:[{sourceType:'share-package',+ state:JSON.parse(renderLibraryJson(Array.from({length:649}, (_,i) => ({...entry,+ id:`incoming-${i}`, title:`案例${i}`, text:`完整原始提示词${i}`})), {})),+ report:{status:'ready',diagnostics:[],stats:{}},resourceIndex:{mediaAssetIds:[],skillAssetIds:[]}}],+ options:{preserveLibraryConfiguration:true}+ };+ }''', original)+ version = next(v for v in reversed(versions) if v.get('scriptURL') == worker.url and v.get('runningStatus') == 'running')+ cdp.send('ServiceWorker.stopWorker', {'versionId': version['versionId']})+ proof = page.evaluate('''async () => {+ const {previewLibraryImportInWorker} = await import('./library-import-preview.js');+ let ticks = 0;+ const timer = setInterval(() => ticks++, 0);+ const start = performance.now();+ window.preview = await previewLibraryImportInWorker(window.previewInput);+ clearInterval(timer);+ const controller = new AbortController();+ const pending = previewLibraryImportInWorker(window.previewInput,{signal:controller.signal});+ controller.abort();+ let cancelled = false;+ try { await pending; } catch(error) { cancelled=error.name==='AbortError'; }+ return {imported:preview.importedCount,ticks,cancelled,milliseconds:performance.now()-start};+ }''')+ assert proof['imported'] == 649 and proof['ticks'] > 0 and proof['cancelled'], proof+ result = page.evaluate('''async () => {+ const inspection = previewInput.inspections[0];+ window.request = {type:'APPLY_LIBRARY_IMPORT_BATCH', operationId:crypto.randomUUID(),+ planToken:preview.planToken, plan:preview.plan,+ packages:[{library:inspection.state, sourceType:inspection.sourceType,+ importReport:inspection.report, resourceIndex:inspection.resourceIndex}]};+ const result = await chrome.runtime.sendMessage(request);+ const replay = await chrome.runtime.sendMessage(request);+ const entries = (await chrome.storage.local.get('entries')).entries;+ return {result,replay,count:entries.length,original:entries.find(e=>e.id==='local').text};+ }''')+ assert result['result']['ok'] and result['replay'] == result['result'], result+ assert result['count'] == 650 and result['original'] == original['text'], result+ stale = page.evaluate('''async () => {+ const {previewLibraryImportInWorker} = await import('./library-import-preview.js');+ previewInput.currentState = await chrome.runtime.sendMessage({type:'GET_FOLDER_BACKUP_STATE'});+ const preview = await previewLibraryImportInWorker(previewInput);+ const entries = (await chrome.storage.local.get('entries')).entries;+ entries.find(e=>e.id==='local').text = '核对之后的用户编辑';+ await chrome.storage.local.set({entries});+ const result = await chrome.runtime.sendMessage({...request, operationId:crypto.randomUUID(),+ planToken:preview.planToken, plan:preview.plan});+ return {result,text:(await chrome.storage.local.get('entries')).entries.find(e=>e.id==='local').text};+ }''')+ assert not stale['result']['ok'] and '预览后' in stale['result']['message'], stale+ assert stale['text'] == '核对之后的用户编辑', stale+ print(json.dumps({'synthetic_cases':649,'preview':proof,'replay_preserved':True,'stale_write_rejected':True}))diff --git a/test/library_package_pending_e2e.py b/test/library_package_pending_e2e.pyindex 5b0fcd8..8bd9000 100644--- a/test/library_package_pending_e2e.py+++ b/test/library_package_pending_e2e.py@@ -31,7 +31,7 @@ def main():window.planGates = [];window.capacityGates = [];chrome.runtime.sendMessage = async (...args) => {- if (args[0]?.type === 'PREVIEW_LIBRARY_IMPORT_BATCH') {+ if (args[0]?.type === 'GET_FOLDER_BACKUP_STATE') {await new Promise(resolve => planGates.push(resolve));}return send(...args);diff --git a/test/library_zip_scale_e2e.py b/test/library_zip_scale_e2e.pyindex 5dabdb4..60d2a4c 100644--- a/test/library_zip_scale_e2e.py+++ b/test/library_zip_scale_e2e.py@@ -24,6 +24,19 @@ def write_archive(path: Path, library: str, asset_path: str, size: int, method:return digest.hexdigest()+def expect_import_ready(page) -> None:+ try:+ expect(page.locator("#library-package-import-confirm")).to_be_enabled(timeout=300000)+ except AssertionError:+ # Keep the failure, and expose whether parsing or capacity blocked import.+ print(json.dumps({+ "stage": "import_preflight_failed",+ "dialog": page.locator("#library-package-import-dialog").inner_text(),+ "storage": page.evaluate("async () => navigator.storage.estimate()"),+ }, ensure_ascii=False), flush=True)+ raise++def main() -> None:with tempfile.TemporaryDirectory(prefix="promptdirector-zip64-") as temporary, extension_session("promptdirector-zip-scale-") as session:root = Path(temporary)@@ -55,13 +68,13 @@ def main() -> None:page.locator('[data-settings-tab="general"]').click()page.locator("#library-package-file").set_input_files([str(item["path"]) for item in sources])confirm = page.locator("#library-package-import-confirm")- expect(confirm).to_be_enabled(timeout=300000)+ expect_import_ready(page)# Cancellation after actual preflight must leave the existing library untouched.page.locator("#library-package-import-cancel").click()state = page.evaluate("async () => chrome.runtime.sendMessage({type: 'GET_STATE'})")assert [entry["id"] for entry in state["entries"]] == [sentinel["id"]]page.locator("#library-package-file").set_input_files([str(item["path"]) for item in sources])- expect(confirm).to_be_enabled(timeout=300000)+ expect_import_ready(page)confirm.click()expect(page.locator("#library-package-import-dialog")).to_be_hidden(timeout=300000)for source in sources:diff --git a/test/libtv_capture_e2e.py b/test/libtv_capture_e2e.pyindex f42e5dc..2b0e106 100644--- a/test/libtv_capture_e2e.py+++ b/test/libtv_capture_e2e.py@@ -49,7 +49,7 @@ def main():entries = collector.evaluate("async ()=>(await chrome.runtime.sendMessage({type:'GET_STATE'})).entries")assert len(entries) == 2, 'Different public works on one feed URL must remain separate'assert all(not e['text'] and e['sourceFacts']['description'] == 'Public description, not a prompt' for e in entries)- assert all(e['classification']['pathIds'] == ['content:video-case'] for e in entries), entries+ assert all(e['classification']['pathIds'] == ['content:prompt:video'] for e in entries), entriesassert all(any(a['kind'] == 'video' and a['storageMode'] == 'managed' for a in e['mediaAssets']) for e in entries)assert all(next(a for a in e['mediaAssets'] if a['kind']=='video')['sourceUrl'].startswith(CDN+'/video-') for e in entries), entriesrepeated = collector.evaluate("async batch=>chrome.runtime.sendMessage({type:'COMMIT_PAGE_CAPTURE',batch})", batch)diff --git a/test/media-playback.test.js b/test/media-playback.test.jsindex fb6a761..f063071 100644--- a/test/media-playback.test.js+++ b/test/media-playback.test.js@@ -77,3 +77,24 @@ test("TikTok player messages require the matching frame and report real playbackcontroller.destroy();assert.equal(removed, true);});++test('YouTube optional API may only appear after permission is granted; request stays in the click turn', async () => {+ let requested = false;+ let updated = false;+ const api = { runtime: { id: 'abcdefghijklmnopabcdefghijklmnop', getManifest: () => ({ homepage_url: 'https://github.com/example/project' }) },+ permissions: { contains: async () => { throw new Error('must not await before request'); }, request: async () => {+ requested = true;+ api.declarativeNetRequest = { updateSessionRules: async () => { updated = true; } };+ return true;+ } }+ };+ const pending = ensureYouTubePlaybackPermission(api, { request: true });+ assert.equal(requested, true);+ assert.equal(await pending, true);+ assert.equal(updated, true);+});++test('declining YouTube playback permission leaves optional APIs untouched', async () => {+ const api = { permissions: { contains: async () => false, request: async () => false } };+ assert.equal(await ensureYouTubePlaybackPermission(api, { request: true }), false);+});diff --git a/test/media-ui.test.js b/test/media-ui.test.jsindex ea35438..c1a2023 100644--- a/test/media-ui.test.js+++ b/test/media-ui.test.js@@ -16,7 +16,7 @@ test("gallery cards keep static covers and opt into bounded local hover playbackassert.match(card, /case-video-duration/);const viewer = source.slice(source.indexOf("async function createMediaViewer"), source.indexOf("function createReferencedMediaViewer"));assert.match(viewer, /video\.controls\s*=\s*true/);- assert.match(viewer, /video\.preload\s*=\s*"metadata"/);+ assert.match(viewer, /video\.preload\s*=\s*"none"/);assert.match(viewer, /video\.autoplay\s*=\s*false/);});@@ -45,18 +45,22 @@ test("social video references prefer official embeds and never download a platfoconst viewer = source.slice(source.indexOf("function createReferencedMediaViewer"), source.indexOf("function renderTimeNotes"));assert.match(viewer, /unavailable-video-stage/);assert.match(viewer, /referenced-video-embed/);- assert.match(viewer, /target = "_blank"/);+ const gallery = source.slice(source.indexOf("async function createDetailMediaGallery"), source.indexOf("async function createMediaViewer"));+ assert.match(gallery, /source.target = "_blank"/);+ assert.doesNotMatch(viewer, /media-reference-fallback/);assert.doesNotMatch(viewer, /复制直链|readVideoMedia|saveMediaBlob/);});test("YouTube references request scoped playback permission and keep an honest source fallback", () => {const viewer = source.slice(source.indexOf("function createReferencedMediaViewer"), source.indexOf("function renderTimeNotes"));- assert.match(viewer, /youtubeWatchUrl/);+ assert.match(viewer, /officialMediaEmbedUrl\(url, provider\)/);assert.match(viewer, /unavailable-video-stage/);assert.match(viewer, /posterAssetForVideo/);assert.match(viewer, /ensureYouTubePlaybackPermission\(chrome, \{ request: true \}\)/);assert.match(viewer, /youtubeMediaController/);- assert.match(viewer, /打开来源/);+ assert.match(viewer, /renderDetail\(\{ rebuildMedia: true \}\)/);+ assert.match(viewer, /catch \(error\) \{ setupFailed = true/);+ assert.match(source, /"button-secondary media-reference-fallback", "打开来源"/);});test("PDF uses the local document viewer rather than a blob iframe", () => {@@ -89,7 +93,7 @@ test("Markdown uses a safe local reading renderer instead of a preformatted texttest("video cards resolve a saved local poster and referenced video details stay content-sized", () => {const card = source.slice(source.indexOf("function createCaseCard"), source.indexOf("function renderProjectFilters"));- assert.match(card, /posterAssetForVideo/);+ assert.match(card, /caseCoverAsset\(entry\)/);assert.match(card, /dataset\.visualId/);assert.match(card, /mainVisual\.storageMode === "managed"\s*\? createLocalVideoCaseCover\(entry, mainVisual\)/);const localVideoCover = source.slice(source.indexOf("function createLocalVideoCaseCover"), source.indexOf("function createVideoLinkCover"));diff --git a/test/media.test.js b/test/media.test.jsindex cafe24b..fd0949d 100644--- a/test/media.test.js+++ b/test/media.test.js@@ -3,6 +3,8 @@ import assert from "node:assert/strict";import {addEntryMedia,+ caseCoverAsset,+ setCaseCover,addTimeNote,currentVideoReconstruction,editCurrentVideoReconstruction,@@ -460,3 +462,20 @@ test("an explicitly cleared image prompt does not revive a legacy description onassert.equal(primaryVisionDescription(entry), "");assert.equal(entry.mediaAssets[0].visionAnalysis.description, "旧分析文本");});+++test("case covers use available images and preserve the video primary and article reading order", () => {+ const entry = normalizeEntryMedia({ id: "cover-case", primaryMediaId: "video", text: "Original text",+ mediaAssets: [{ id: "video", kind: "video", posterAssetId: "poster" }, { id: "poster", kind: "image", usage: "poster", derivedFromAssetId: "video" }, { id: "image", kind: "image" }],+ articleDocument: { version: 1, blocks: [{ id: "p", kind: "paragraph", text: "Original text" }, { id: "img", kind: "image", assetId: "image" }] } });+ assert.equal(caseCoverAsset(entry).id, "poster");+ const chosen = setCaseCover(entry, "image");+ assert.equal(caseCoverAsset(chosen).id, "image");+ assert.equal(chosen.primaryMediaId, "video");+ assert.deepEqual(chosen.articleDocument, entry.articleDocument);+ assert.equal(caseCoverAsset(removeEntryMedia(chosen, "image")).id, "poster");+ assert.equal(removeEntryMedia(chosen, "image").coverVisualId, undefined);+ assert.equal(caseCoverAsset({ mediaAssets: [{ id: "pdf", kind: "document" }, { id: "i", kind: "image" }], primaryMediaId: "pdf" }).id, "i");+ assert.equal(caseCoverAsset({ text: "text only" }), null);+ assert.throws(() => setCaseCover(entry, "video"), /没有找到这张图片/);+});diff --git a/test/media_reference_cards_e2e.py b/test/media_reference_cards_e2e.pyindex 2636648..af134a2 100644--- a/test/media_reference_cards_e2e.py+++ b/test/media_reference_cards_e2e.py@@ -1,6 +1,8 @@from __future__ import annotationsfrom playwright.sync_api import expect+from pathlib import Path+import osfrom e2e_support import base_entry, extension_session@@ -51,7 +53,7 @@ def main() -> None:expect(card.locator(".unavailable-video-stage")).to_be_visible()expect(library.locator(".referenced-video-embed iframe")).to_have_count(0)expect(card).to_contain_text("授权并在案例库播放" if provider == "youtube" else "暂未取得可在案例库播放的视频")- source = card.locator("a", has_text="打开来源")+ source = library.locator(".detail-visual-caption .media-reference-fallback")expect(source).to_have_attribute("href", url)results.append({"provider": provider, "state": "permission-required" if provider == "youtube" else "video-unavailable"})else:@@ -67,7 +69,46 @@ def main() -> None:library.locator("#detail-close").click()expect(library.locator("#detail-drawer")).not_to_be_visible()- print({"mediaPlaybackStates": results, "downloadedVideoFiles": False})+ # Exercise the permission transition without a native permission dialog.+ library.evaluate("""() => {+ window.playbackGranted = false;+ window.playbackSetupFails = false;+ chrome.permissions.contains = async () => window.playbackGranted;+ chrome.permissions.request = async () => { window.playbackGranted = true; return true; };+ chrome.declarativeNetRequest = { updateSessionRules: async () => {+ if (window.playbackSetupFails) throw new Error('simulated player rule failure');+ }};+ }""")+ youtube = library.locator('.case-card[data-entry-id="reference:youtube"]')+ youtube.click()+ library.get_by_role("button", name="授权并在案例库播放", exact=True).click()+ expect(library.locator(".referenced-video-embed iframe")).to_be_visible()+ expect(library.locator(".detail-title")).to_have_text("YouTube 引用")+ expect(library.locator(".detail-video-wrap .media-reference-fallback")).to_have_count(0)+ expect(library.locator(".detail-visual-caption .media-reference-fallback")).to_be_visible()+ library.locator("#detail-close").click()+ library.evaluate("window.playbackSetupFails = true")+ youtube.click()+ expect(library.locator(".detail-title")).to_have_text("YouTube 引用")+ expect(library.locator(".platform-playback-fallback")).to_be_visible()+ library.evaluate("window.playbackSetupFails = false")+ library.get_by_role("button", name="重试", exact=True).click()+ expect(library.locator(".referenced-video-embed iframe")).to_be_visible()+ library.locator("#detail-close").click()+ youtube.click()+ expect(library.locator(".referenced-video-embed iframe")).to_be_visible()+ expect(library.locator(".detail-title")).to_have_text("YouTube 引用")+ output = Path(os.environ.get("PD_TEST_SCREENSHOTS", "/tmp/pd-b13-player"))+ output.mkdir(parents=True, exist_ok=True)+ for theme in ["dark", "light"]:+ library.evaluate("theme => document.documentElement.dataset.theme = theme", theme)+ for width in [1280, 390]:+ library.set_viewport_size({"width": width, "height": 900})+ library.screenshot(path=str(output / f"player-{theme}-{width}.png"), animations="disabled")+ assert library.evaluate("document.documentElement.scrollWidth <= innerWidth")+ assert not run.page_errors, run.page_errors+ print({"mediaPlaybackStates": results, "permissionTransition": True,+ "setupFailureKeepsDetail": True, "retryAndReopen": True, "downloadedVideoFiles": False})if __name__ == "__main__":diff --git a/test/midjourney_capture_e2e.py b/test/midjourney_capture_e2e.pynew file mode 100644index 0000000..f2fe10e--- /dev/null+++ b/test/midjourney_capture_e2e.py@@ -0,0 +1,31 @@+"""Replay Midjourney detail and feed DOM with observed media URL shapes."""+from e2e_support import extension_session++JOB='5fad7004-2cf7-4480-a037-5c187e33dfb1'+VIDEO='d5901844-7fe3-4c50-b901-f5f51c731723'++def main():+ with extension_session('midjourney-capture-') as run:+ setup=run.open_page('collector.html')+ funcs=setup.evaluate("""async()=>({collect:(await import('./page-capture-site-adapters.js')).collectPageCaptureSitePayload.toString()})""")+ page=run.context.new_page()+ def read(url,html):+ run.context.route(url,lambda route:route.fulfill(body=html,content_type='text/html'))+ page.goto(url)+ raw=page.evaluate('options=>('+funcs['collect']+')(options)',{'maxMedia':24,'maxCandidates':100,'maxTextCharacters':30000})+ return setup.evaluate("async raw=>(await import('./page-capture-site-adapters.js')).normalizePageCaptureSitePayload(raw)",raw)+ sidebar='<aside><a href="/@artist">Artist</a><div class="notranslate"><p>Full original prompt</p></div><button><span>--ar 3:4</span><span>ar 3:4</span></button><button title="Style Reference (--sref)"><img alt="https://s.mj.run/reference" src="https://s.mj.run/reference?thumb=true"></button><button>Copy Prompt</button></aside>'+ image=read(f'https://www.midjourney.com/jobs/{JOB}?index=2',f'<img src="https://cdn.midjourney.com/{JOB}/0_0_640_N.webp"><img src="https://cdn.midjourney.com/{JOB}/0_2_640_N.webp"><img src="https://cdn.midjourney.com/{JOB}/0_2.jpeg">'+sidebar)+ candidate=image['candidates'][0]+ assert len(candidate['media'])==1 and candidate['media'][0]['url'].endswith('/0_2.jpeg'),image+ assert candidate['contentText']=='Full original prompt --ar 3:4 --sref https://s.mj.run/reference',candidate+ assert candidate['sourceFacts']['itemId']==JOB+':2'+ video=read(f'https://www.midjourney.com/jobs/{VIDEO}?index=0',f'<video src="https://cdn.midjourney.com/video/{VIDEO}/0.mp4"></video><video src="https://cdn.midjourney.com/video/{VIDEO}/0.mp4" poster="https://cdn.midjourney.com/video/{VIDEO}/0_640_N.webp"></video>'+sidebar)+ assert video['candidates'][0]['media'][0]['kind']=='video',video+ assert video['candidates'][0]['media'][0]['posterUrl'].endswith('/0_640_N.webp'),video+ feed=read('https://www.midjourney.com/explore?tab=top',f'<a href="/jobs/{JOB}?index=2" style="background-image:image-set(url(https://cdn.midjourney.com/{JOB}/0_2_384_N.webp) 1x,url(https://cdn.midjourney.com/{JOB}/0_2_640_N.webp) 2x)"></a>')+ assert len(feed['candidates'])==1 and not feed['candidates'][0]['sourceFacts']['originalPromptAvailable'],feed+ assert feed['candidates'][0]['media'][0]['url'].endswith('640_N.webp'),feed+ print({'selectedImageOnly':True,'videoOriginal':True,'promptParametersReferences':True,'feedPartialPreviewHonest':True})++if __name__=='__main__':main()diff --git a/test/page-capture-repair.test.js b/test/page-capture-repair.test.jsindex 98940bf..fba69c8 100644--- a/test/page-capture-repair.test.js+++ b/test/page-capture-repair.test.js@@ -58,3 +58,35 @@ test('newly recovered article images return to their original body position',asyassert.equal(result.articleDocument.blocks[1].assetId,'image');assert.equal(result.text,entry.text);});++test('explicit supplemental text on a saved page is appended without overwriting user edits', async () => {+ const entry = { id: 'case', text: 'User edited body', textRevision: 3, title: 'User title', mediaAssets: [],+ articleDocument: { version: 1, blocks: [{ id: 'old', kind: 'paragraph', text: 'User edited body', sourceOrder: 0 }] } };+ const selected = { ...candidate, media: [], textBlocks: [+ { id: 'body', text: 'Changed webpage body must not replace the user edit' },+ { id: 'added:draft:fragment', text: 'Selected additional prompt' }+ ] };+ const plan = await planPageCaptureRepair(entry, selected, async () => true);+ const result = mergePageCaptureRepair(entry, selected, plan, [], plan.assetIds);+ assert.equal(result.text, 'User edited body\n\nSelected additional prompt');+ assert.equal(result.title, 'User title');+ assert.equal(result.textRevision, 4);+ assert.deepEqual(result.articleDocument.blocks.map(b => b.text), ['User edited body', 'Selected additional prompt']);+ const again = await planPageCaptureRepair(result, selected, async () => true);+ assert.deepEqual(again.textAdditions, []);+});++test('media receipt distinguishes downloaded originals from failed source-only video references', async () => {+ const {pageCaptureMediaReceipt} = await import('../extension/page-capture-repair.js');+ const candidate={media:[{id:'image'},{id:'video'},{id:'embed'},{id:'missing'}]};+ const result=pageCaptureMediaReceipt(candidate,new Map([['image','a'],['video','b'],['embed','c']]),new Set(['video','missing']));+ assert.deepEqual(result,{savedMediaIds:['image','embed'],pendingMediaIds:['video','missing']});+});++test('retry recognizes already stored local supplement by content hash after its draft blob is consumed', async () => {+ const {planPageCaptureRepair} = await import('../extension/page-capture-repair.js');+ const plan=await planPageCaptureRepair({mediaAssets:[{id:'stored',kind:'image',storageMode:'managed',contentHash:'same'}]},+ {media:[{id:'local',localAssetId:'consumed',kind:'image',contentHash:'same'}]},async()=>true);+ assert.equal(plan.pending.length,0);+ assert.equal(plan.assetIds.get('local'),'stored');+});diff --git a/test/page-session-media.test.js b/test/page-session-media.test.jsindex 19d6148..4d131be 100644--- a/test/page-session-media.test.js+++ b/test/page-session-media.test.js@@ -26,7 +26,7 @@ test("page-session media reads only the exact selected HTTPS URL with browser crassert.equal(prepared.chunkCount, 1);assert.equal(calls[0].options.credentials, "include");assert.equal(calls[0].options.redirect, "error");- assert.equal(calls[0].options.referrerPolicy, "no-referrer");+ assert.equal(calls[0].options.referrerPolicy, "strict-origin-when-cross-origin");} finally {delete globalThis.__PROMPTDIRECTOR_PAGE_SESSION_MEDIA__;Object.assign(globalThis, original);diff --git a/test/page_capture_e2e.py b/test/page_capture_e2e.pyindex d56779f..0282383 100644--- a/test/page_capture_e2e.py+++ b/test/page_capture_e2e.py@@ -177,43 +177,37 @@ def main() -> None:expect(collector.locator(".page-capture-media-review-group")).to_contain_text("可能遗漏媒体(1)")expect(collector.locator("#page-capture-media-review-status")).to_contain_text("5 项媒体")expect(collector.locator("#page-capture-save")).to_be_enabled()- collector.locator(".page-capture-tools > summary").click()- collector.locator("#page-capture-add-region").click()- fixture.bring_to_front()- expect(fixture.locator("#promptdirector-page-capture-region-editor")).to_be_visible(timeout=8000)- fixture.locator("#appendix").evaluate("element => element.click()")- fixture.get_by_role("button", name="完成").click()+ # Direct picking replaces the automatic scope, then appends subsequent choices.+ for selector in ['article', '#appendix']:+ fixture.bring_to_front()+ collector.evaluate("() => document.querySelector('#add-selection').click()")+ expect(fixture.locator('#promptdirector-content-picker')).to_be_attached(timeout=8000)+ fixture.locator(selector).evaluate("element => element.click()")+ expect(fixture.locator('#promptdirector-content-picker')).to_have_count(0)+ expect(collector.locator('#add-selection')).to_be_enabled()confirmed_article = collector.locator(".page-capture-item.confirmed .page-capture-article")+ collector.locator('.page-capture-preview-details').first.evaluate('node=>node.open=true')expect(confirmed_article).to_contain_text("downloadable production notes", timeout=8000)- expect(fixture.locator("#appendix p")).to_have_attribute("data-promptdirector-capture-highlight", "true")- collector.locator("#page-capture-exclude-region").click()- fixture.bring_to_front()- fixture.locator("article p").nth(1).click()- fixture.get_by_role("button", name="完成").click()- expect(confirmed_article).not_to_contain_text("A second paragraph", timeout=8000)- expect(fixture.locator("article p").nth(1)).not_to_have_attribute("data-promptdirector-capture-highlight", "true")+ row=confirmed_article.locator('.page-capture-text-row').filter(has_text='A second paragraph')+ row.get_by_role('button',name='移除',exact=True).click()+ expect(confirmed_article).not_to_contain_text("A second paragraph")collector.locator("#page-capture-undo-region").click()expect(confirmed_article).to_contain_text("A second paragraph")- collector.locator("#page-capture-exclude-region").click()- fixture.bring_to_front()- fixture.locator("article p").nth(1).click()- fixture.get_by_role("button", name="完成").click()- expect(confirmed_article).not_to_contain_text("A second paragraph", timeout=8000)- expect(fixture.locator("article p").nth(1)).not_to_have_attribute("data-promptdirector-capture-highlight", "true")- expect(collector.locator("#page-capture-media-review-list .page-capture-media-review-item")).to_have_count(7)+ confirmed_article.locator('.page-capture-text-row').filter(has_text='A second paragraph').get_by_role('button',name='移除',exact=True).click()+ expect(confirmed_article).not_to_contain_text("A second paragraph")+ expect(collector.locator("#page-capture-media-review-list .page-capture-media-review-item")).to_have_count(6)expect(collector.locator("#page-capture-media-review-status")).to_contain_text("6 项媒体")expect(collector.locator("#page-capture-save")).to_be_enabled()collector.locator("#page-capture-save").click()- # A committed case leaves the draft; its exact media failure remains in the case.- expect(collector.locator("#page-capture")).to_be_hidden(timeout=8000)+ # Successful content is committed immediately; the failed video remains available for retry.+ expect(collector.locator("#page-capture-help")).to_contain_text("有效视频文件", timeout=8000)+ expect(collector.locator("#page-capture")).to_be_visible()partial_saved = collector.evaluate("() => chrome.storage.local.get('entries').then(({entries}) => entries)")assert len(partial_saved) == 1, partial_savedoriginal_entry_id = partial_saved[0]['id']- assert any('有效视频文件' in warning for warning in partial_saved[0]['sourceFacts']['captureWarnings']), partial_saved+ assert 'captureWarnings' not in partial_saved[0]['sourceFacts'], partial_savedvideo_available = Truefixture.bring_to_front()- collector.locator('#start-page-capture').click()- collector.locator('.page-capture-confirm').first.click()collector.locator("#page-capture-save").click()expect(collector.locator("#page-capture")).to_be_hidden(timeout=8000)expect(fixture.locator("#promptdirector-page-capture-region-preview")).to_have_count(0)diff --git a/test/page_capture_sidebar_e2e.py b/test/page_capture_sidebar_e2e.pyindex e21dedc..c38f463 100644--- a/test/page_capture_sidebar_e2e.py+++ b/test/page_capture_sidebar_e2e.py@@ -39,8 +39,7 @@ def main():expect(panel.locator('.page-capture-item').first).to_be_visible(timeout=10000)if '--highlight' not in sys.argv:panel.locator('.page-capture-confirm').first.click()- panel.locator('.page-capture-tools > summary').click()- panel.locator('#page-capture-clear').click()+ panel.locator('.page-capture-confirm').first.click()expect(panel.locator('#page-capture-save')).to_be_disabled()scans = panel.evaluate("window.captureMessages.filter(t => t === 'START_PAGE_CAPTURE').length")panel.locator('#page-capture-scan').click()@@ -86,11 +85,11 @@ def main():first_media.get_by_role('button', name='恢复', exact=True).click()expect(first_media).to_have_class('page-capture-media-review-item media-proposed media-pending')panel.locator('#page-capture-media-review > summary').click()- panel.locator('.page-capture-tools > summary').click()- panel.locator('#page-capture-add-region').click()- expect(page.locator('#promptdirector-page-capture-region-editor')).to_be_visible()- panel.locator('#page-capture-edit-cancel').click()- expect(page.locator('#promptdirector-page-capture-region-editor')).to_have_count(0)+ page.bring_to_front()+ panel.locator('#add-selection').evaluate('e=>e.click()')+ expect(page.locator('#promptdirector-content-picker')).to_be_attached()+ page.keyboard.press('Escape')+ expect(page.locator('#promptdirector-content-picker')).to_have_count(0)expect(panel.locator('#page-capture-save')).to_be_enabled()expect(target).to_have_attribute('data-promptdirector-capture-highlight', 'true')@@ -115,12 +114,11 @@ def main():assert panel.evaluate('document.documentElement.scrollWidth <= innerWidth')assert panel.locator('.page-capture-confirm').first.evaluate('e => getComputedStyle(e).backgroundColor') != panel.locator('#page-capture-save').evaluate('e => getComputedStyle(e).backgroundColor')panel.screenshot(path=str(Path(tempfile.gettempdir()) / 'promptdirector-capture-sidebar-implemented.png'))- panel.locator('.page-capture-tools > summary').click()- panel.locator('#page-capture-clear').click()+ panel.locator('.page-capture-confirm').first.click()expect(page.locator('[data-promptdirector-capture-highlight]')).to_have_count(0)assert panel.evaluate("() => chrome.storage.local.get('entries').then(s => s.entries.length)") == 0print({'rescan': '--highlight' not in sys.argv, 'selectPreservesScroll': True, 'contentAttachedOutline': True,- 'innerScrollAndResize': True, 'cancelRegionEdit': True, 'lateResponseIgnored': True,+ 'innerScrollAndResize': True, 'cancelDirectSelection': True, 'lateResponseIgnored': True,'saveVisibleAt320And390': True, 'clearRemovesHighlight': True})diff --git a/test/page_content_picker_e2e.py b/test/page_content_picker_e2e.pynew file mode 100644index 0000000..b2f0556--- /dev/null+++ b/test/page_content_picker_e2e.py@@ -0,0 +1,63 @@+"""Synthetic shadow-comment fixture; production picker and extraction, no live-site claim."""+from pathlib import Path+from playwright.sync_api import expect+from e2e_support import extension_session++ROOT=Path(__file__).resolve().parents[1]++def main():+ with extension_session('page-content-picker-') as run:+ run.context.route('https://wchao6891.github.io/picker-fixture',lambda route:route.fulfill(content_type='text/html',body='<html><body></body></html>'))+ page=run.context.new_page()+ page.goto('https://wchao6891.github.io/picker-fixture')+ page.set_content('<nav>Navigation must not be saved</nav><main><h1>Video title</h1><div id="comments"></div></main>')+ page.evaluate('''()=>{const root=document.querySelector('#comments').attachShadow({mode:'open'});root.innerHTML='<div class="comment"><p>用户指定的完整评论提示词,必须可以手动选中保存。</p><p>另一条评论内容。</p></div>';}''')+ picker=(ROOT/'extension/page-content-picker.js').read_text().replace('export function','function',1)+ page.add_script_tag(content=picker)+ page.evaluate('()=>{window.picked=pickPageContent();}')+ page.locator('#comments p').first.click()+ selected=page.evaluate('()=>window.picked')+ assert '用户指定' in selected['html'] and 'Navigation' not in selected['html'] and '另一条' not in selected['html'],selected+ setup=run.open_page('collector.html')+ capture=setup.evaluate("async()=>String((await import('./page-capture.js')).collectPageCaptureSnapshot)")+ result=page.evaluate('async ({source,html})=>await (0,eval)(`(${source})`)({manualContentHtml:html,sessionId:"manual"})',{'source':capture,'html':selected['html']})+ candidate=result['candidates'][0]+ assert '用户指定' in candidate['contentText'] and 'Navigation' not in candidate['contentText'],candidate+ page.evaluate('()=>{window.picked=pickPageContent();}')+ page.keyboard.press('Escape')+ assert page.evaluate('()=>window.picked')=={'cancelled':True}+ # Use the real extension message, preview and save, with an isolated empty library.+ run.seed_storage(setup, {'entries':[], 'uiPreferences':{'theme':'dark','motion':'reduced'}, 'capturePermissionOnboarding':{'version':1,'acknowledgedAt':'2026-09-19T00:00:00Z'}})+ setup.reload(wait_until="networkidle")+ page.bring_to_front()+ setup.evaluate("()=>document.querySelector('#start-selection').click()")+ expect(page.locator('#promptdirector-content-picker')).to_be_attached()+ page.locator('#comments p').first.click()+ expect(setup.locator('.page-capture-item.confirmed')).to_have_count(1)+ expect(setup.locator('.page-capture-article')).to_contain_text('用户指定')+ expect(setup.locator('#add-selection')).to_be_visible()+ expect(setup.locator('#add-selection')).to_be_enabled()+ page.bring_to_front()+ setup.evaluate("()=>document.querySelector('#add-selection').click()")+ expect(page.locator('#promptdirector-content-picker')).to_be_attached()+ page.locator('#comments p').nth(1).click()+ expect(setup.locator('.page-capture-article')).to_contain_text('另一条评论')+ setup.locator('.page-capture-preview-details').evaluate('node=>node.open=true')+ setup.locator('.page-capture-text-row').filter(has_text='另一条评论').get_by_role('button',name='移除',exact=True).click()+ expect(setup.locator('.page-capture-article')).not_to_contain_text('另一条评论')+ setup.locator('#page-capture-undo-region').click()+ expect(setup.locator('.page-capture-article')).to_contain_text('另一条评论')+ setup.locator('#page-capture-undo-region').click()+ expect(setup.locator('.page-capture-article')).not_to_contain_text('另一条评论')+ for theme in ['light','dark']:+ setup.evaluate('(value)=>document.documentElement.dataset.theme=value',theme)+ for width in [390,1280]:+ setup.set_viewport_size({'width':width,'height':844})+ setup.screenshot(path=f'/tmp/pd-picker-{theme}-{width}.png',full_page=True,animations='disabled')+ setup.locator('#page-capture-save').click()+ expect(setup.locator('#page-capture')).to_be_hidden(timeout=15000)+ entries=setup.evaluate("async()=>(await chrome.runtime.sendMessage({type:'GET_STATE'})).entries")+ assert len(entries)==1 and '用户指定' in entries[0]['text'] and '另一条' not in entries[0]['text'],entries+ print('PASS: shadow comments selected; extraction exact; immediate preview; append/undo; real save readback; Escape cancellation')++if __name__=='__main__':main()diff --git a/test/preferences.test.js b/test/preferences.test.jsindex 8bbc903..4e1b68c 100644--- a/test/preferences.test.js+++ b/test/preferences.test.js@@ -16,7 +16,8 @@ test("UI preferences accept only supported locale theme and motion values", () =analysisDiagnostics: false,sidebarWidth: 244,detailMode: "fullscreen",- detailSidebarWidth: 760+ detailSidebarWidth: 760,+ detailPanelRatio: null});assert.deepEqual(normalizeUiPreferences({ locale: "en", theme: "dark", motion: "none", analysisDiagnostics: true }), {locale: "en",@@ -25,7 +26,8 @@ test("UI preferences accept only supported locale theme and motion values", () =analysisDiagnostics: true,sidebarWidth: 244,detailMode: "fullscreen",- detailSidebarWidth: 760+ detailSidebarWidth: 760,+ detailPanelRatio: null});assert.equal(normalizeUiPreferences({ theme: "light", motion: "reduced" }).theme, "light");assert.equal(normalizeUiPreferences({ theme: "system", motion: "reduced" }).theme, "system");diff --git a/test/privacy-policy.test.js b/test/privacy-policy.test.jsindex e0f39c5..5cec837 100644--- a/test/privacy-policy.test.js+++ b/test/privacy-policy.test.js@@ -33,9 +33,9 @@ test("privacy policy makes the two independent execution confirmations explicit"test("privacy policy discloses that composer text-only mode reads and sends zero images", async () => {const policy = await privacyPolicy();- assert.match(policy, /全程只用案例\/分析文字/);- assert.match(policy, /不会读取、分析或发送图片/);- assert.match(policy, /图片载荷为零/);+ assert.match(policy, /新建创作会话默认只使用文字资料/);+ assert.match(policy, /明确开启原图或视频参考/);+ assert.match(policy, /未开启时不会因引用案例而读取、分析或发送其媒体原件/);});test("privacy policy accurately declares local-first handling and manifest permissions", async () => {@@ -66,11 +66,9 @@ test("privacy policy states the Chrome Web Store Limited Use boundary", async ()test("privacy policy explains corrected article regions and safe download handling", async () => {const policy = await privacyPolicy();- assert.match(policy, /添加遗漏内容、排除错误内容、整组修正、撤销或恢复自动识别/);- assert.match(policy, /正文在主体确认后默认纳入/);- assert.match(policy, /正文内已定位媒体默认进入保存方案/);- assert.match(policy, /无法确认文章位置的媒体默认不选/);- assert.match(policy, /“保存案例”按钮是当前媒体方案的最终授权/);+ assert.match(policy, /本地识别正文与媒体并展示预览/);+ assert.match(policy, /直接点选内容、添加遗漏内容、排除错误内容或撤销调整/);+ assert.match(policy, /“保存案例”按钮是当前内容方案的最终授权/);assert.match(policy, /“只保存正文”/);assert.match(policy, /PDF、Markdown、SKILL\.md、TXT、HTML 和 RTF/);assert.match(policy, /只有属于用户最终保存方案时/);diff --git a/test/prompt_panels_e2e.py b/test/prompt_panels_e2e.pyindex 0c3d6b6..2ee6810 100644--- a/test/prompt_panels_e2e.py+++ b/test/prompt_panels_e2e.py@@ -21,6 +21,10 @@ def main():"mimeType": "image/png" if kind == "image" else "video/mp4", "contentHash": "a" * 64}if ai and kind == "image":asset["visionAnalysis"] = {"version": 2, "imageFingerprint": "a" * 64, "reconstructionPrompt": "AI 图片提示词内容"}+ # Original-source evidence must remain visible even in a plain media category.+ if original:+ entry["classification"]["pathIds"] = [f"content:{kind}-case"]+ entry["sourceFacts"] = {"originalPromptAvailable": True}entry["mediaAssets"] = [asset]entry["primaryMediaId"] = asset["id"]if ai and kind == "video":@@ -46,6 +50,18 @@ def main():await saveMediaBlob(asset.id, new Blob([Uint8Array.from(atob(png), x => x.charCodeAt(0))], {type:'image/png'}), {checkCapacity:false});}}""", {"entries": entries + [multi], "png": PNG})+ setup.evaluate("""async () => {+ const {createAgentLibrary}=await import('./agent-library.js');+ const {caseTextPart}=await import('./composer-library-tools.js');+ const {canonicalTextAnalysisInput}=await import('./analysis-input.js');+ const state=await chrome.runtime.sendMessage({type:'GET_STATE'});+ const library=createAgentLibrary({loadState:async()=>state,libraryUrl:chrome.runtime.getURL('library.html')});+ for (const entry of state.entries.filter(e=>e.sourceFacts?.originalPromptAvailable)) {+ const agent=await library.read({caseId:entry.id,part:'original_prompt'});+ if (agent.content!==entry.text || caseTextPart(entry,'original_prompt')!==entry.text ||+ canonicalTextAnalysisInput(entry).text!==entry.text) throw new Error('跨入口原始词不一致');+ }+ }""")page = session.open_page("library.html", wait_until="networkidle")for entry in entries:kind, original, ai = entry["id"].split("-")diff --git a/test/run_e2e.py b/test/run_e2e.pyindex 27001b3..74e244e 100644--- a/test/run_e2e.py+++ b/test/run_e2e.py@@ -35,10 +35,16 @@ SCRIPTS = ["import_job_lifecycle_e2e.py","library_media_actions_e2e.py","video_detail_layout_e2e.py",+ "capture_review_regressions_e2e.py",+ "clipboard_return_e2e.py",+ "midjourney_capture_e2e.py",+ "capture_session_video_e2e.py",+ "detail_tag_organization_e2e.py","prompt_panels_e2e.py","detail_visual_stability_e2e.py","detail_content_editing_e2e.py","case_edit_persistence_e2e.py",+ "case_covers_e2e.py","x_post_capture_e2e.py","media_reference_cards_e2e.py","library_detail_actions_e2e.py",@@ -56,6 +62,7 @@ SCRIPTS = ["composer_library_knowledge_e2e.py","composer_candidate_layout_e2e.py","composer_tool_images_e2e.py",+ "compatible_composer_stream_e2e.py","composer_workspace_tools_e2e.py","composer_reference_remove_e2e.py","composer_video_generation_e2e.py",@@ -65,6 +72,7 @@ SCRIPTS = ["composer_session_layout_e2e.py","sharing_and_data_safety_e2e.py","library_import_interruption_e2e.py",+ "library_import_preview_e2e.py","folder_picker_activation_e2e.py","library_zip_scale_e2e.py","library_image_formats_e2e.py",@@ -75,8 +83,15 @@ SCRIPTS = ["page_capture_e2e.py","page_capture_sidebar_e2e.py","capture_additions_e2e.py",+ "capture_partial_supplement_e2e.py",+ "capture_quick_entry_e2e.py",+ "page_content_picker_e2e.py",+ "video_discovery_e2e.py",+ "video_comments_capture_e2e.py",+ "capture_classification_detail_e2e.py","capture_partial_save_e2e.py","x_capture_extraction_e2e.py",+ "x_comment_capture_e2e.py","x_video_playback_e2e.py","higgsfield_capture_e2e.py","feishu_capture_e2e.py",@@ -88,10 +103,12 @@ SCRIPTS = ["libtv_capture_e2e.py","jimeng_capture_e2e.py","jimeng_redesign_e2e.py",+ "jimeng_video_capture_e2e.py","ai_provider_registry_e2e.py","ai_multimodel_routing_regression_e2e.py","zhipu_glm_analysis_e2e.py","composer_video_dialogue_e2e.py",+ "composer_reference_inputs_e2e.py","creative_skills_e2e.py","skill_cover_e2e.py","skill_source_density_e2e.py",diff --git a/test/single_case_visual_batch_e2e.py b/test/single_case_visual_batch_e2e.pyindex da20ac2..0f9f7fa 100644--- a/test/single_case_visual_batch_e2e.py+++ b/test/single_case_visual_batch_e2e.py@@ -221,8 +221,8 @@ def main() -> None:dialog = library.locator("#promptdirector-app-dialog")expect(dialog).to_be_visible()expect(dialog).to_contain_text("默认补齐 14 张缺失或过期分析")- expect(dialog).to_contain_text("自定义兼容服务(图片与生成) · local-vision-v2")- expect(dialog).to_contain_text("自定义兼容服务(文字) · local-summary")+ expect(dialog).to_contain_text("自定义图片生成服务 · local-vision-v2")+ expect(dialog).to_contain_text("自定义兼容服务(对话与识别) · local-summary")expect(dialog.locator(".visual-analysis-card")).to_have_count(15)expect(dialog.get_by_role("button", name="选择缺失/过期")).to_be_visible()expect(dialog.get_by_role("button", name="全选")).to_be_visible()diff --git a/test/tag-taxonomy.test.js b/test/tag-taxonomy.test.jsindex 8f67d11..a1209bd 100644--- a/test/tag-taxonomy.test.js+++ b/test/tag-taxonomy.test.js@@ -157,3 +157,12 @@ test("detail organization stays below 16 KiB and merges only within the same groassert.equal(new Set(applied.state.entries.slice(0, 2).map((entry) => entry.facetAssignments[0].nodeId)).size, 1);assert.notEqual(applied.state.entries[0].facetAssignments[0].nodeId, applied.state.entries[2].facetAssignments[0].nodeId);});++test('detail organization reserves room for every rename mapping, not just its input', () => {+ const catalog = createFixedFacetCatalog();+ for (let i=0;i<400;i++) catalog.nodes.push({id:`detail:${i}`,name:'电影写实标签'+i,parentId:'style.render',facetId:'style',status:'active'});+ const chunks = createDetailOrganizationChunks(catalog);+ const outputBytes = chunk => new TextEncoder().encode(JSON.stringify({m:chunk.d.map(([id,name])=>({id,n:name}))})).length;+ assert.ok(chunks.every(chunk=>outputBytes(chunk)<=4000), JSON.stringify(chunks.map(outputBytes)));+ assert.equal(chunks.reduce((sum,c)=>sum+c.d.length,0),400);+});diff --git a/test/text_tagging_maintenance_e2e.py b/test/text_tagging_maintenance_e2e.pyindex f73b567..81bda82 100644--- a/test/text_tagging_maintenance_e2e.py+++ b/test/text_tagging_maintenance_e2e.py@@ -100,6 +100,8 @@ def main():assert not next(e for e in result['entries'] if e['id']=='tag-outside').get('analysisMeta')assert worker.evaluate('testTextCalls')==1expect(page.locator('#text-batch-dialog')).not_to_be_visible(timeout=10000)+ expect(page.locator('.case-card.selected-for-share')).to_have_count(0)+ expect(page.locator('#share-bar')).to_be_hidden()# A mixed-result task retains successes; retry sends only its failed item.stale=page.evaluate("async()=>chrome.runtime.sendMessage({type:'CREATE_ANALYSIS_BATCH',mode:'incremental',expectedEntryIds:[]})")assert not stale['ok'] and '已变化' in stale['message']diff --git a/test/transient-menu.test.js b/test/transient-menu.test.jsindex 25adc21..dfd7749 100644--- a/test/transient-menu.test.js+++ b/test/transient-menu.test.js@@ -15,7 +15,7 @@ test("transient menus share outside-click, action, peer-open, and Escape dismissassert.match(source, /!action\.closest\("\.package-preferences"\)/);assert.match(library, /bindTransientMenus\(document, "\.package-menu, \.project-menu, \.detail-project-menu, \.selection-menu"\)/);assert.doesNotMatch(html, /class="detail-analysis-menu"/);- assert.match(composer, /bindTransientMenus\(document, "\.composer-options, \.composer-session-menu"\)/);+ assert.match(composer, /bindTransientMenus\(document, "\.composer-options, \.composer-session-menu, \.composer-toolbar-menu"\)/);assert.doesNotMatch(composer, /\.composer-result-more/);});diff --git a/test/trash.test.js b/test/trash.test.jsindex cc24021..561feef 100644--- a/test/trash.test.js+++ b/test/trash.test.js@@ -605,3 +605,15 @@ test("media trash restores visual-derived labels and permanent cleanup protectsconst taken = takeTrashItems(moved.trashState, moved.movedItemIds, { retainedMediaIds: ["image:shared"] });assert.deepEqual(taken.cleanup.mediaIds, []);});+++test("removing and restoring a selected case cover preserves its selection without changing primary media", () => {+ const entry = { id: "cover-entry", text: "text", primaryMediaId: "video", coverVisualId: "cover",+ mediaAssets: [{ id: "video", kind: "video" }, { id: "cover", kind: "image" }] };+ const moved = moveMediaToTrash({ entries: [entry], trashState: {} }, entry.id, ["cover"]);+ assert.equal(moved.entries[0].coverVisualId, undefined);+ assert.equal(moved.entries[0].primaryMediaId, "video");+ const restored = restoreTrashItems(moved, moved.movedItemIds);+ assert.equal(restored.entries[0].coverVisualId, "cover");+ assert.equal(restored.entries[0].primaryMediaId, "video");+});diff --git a/test/ui_regressions_e2e.py b/test/ui_regressions_e2e.pyindex 3710774..c05c07c 100644--- a/test/ui_regressions_e2e.py+++ b/test/ui_regressions_e2e.py@@ -158,15 +158,20 @@ def main() -> None:"""footer => {const rect = footer.getBoundingClientRect();const controls = [...footer.querySelectorAll('.composer-input-tools > *, .composer-input-actions > *')]- .filter(node => !node.hidden && getComputedStyle(node).display !== 'none')- .map(node => node.getBoundingClientRect());- const groups = ['.composer-input-tools', '.composer-input-actions'].map(selector => footer.querySelector(selector).getBoundingClientRect());+ .filter(node => node.getClientRects().length && !node.classList.contains("sr-only"))+ .map(node => node.getBoundingClientRect()).filter(item => item.width > 0 && item.height > 0);+ const rows = [];+ for (const item of controls) {+ const row = rows.find(row => item.top < row.bottom && item.bottom > row.top);+ if (row) { row.top = Math.min(row.top, item.top); row.bottom = Math.max(row.bottom, item.bottom); }+ else rows.push({top:item.top, bottom:item.bottom});+ }const gap = parseFloat(getComputedStyle(footer).rowGap) || 0;return {- height: rect.height,- compact: rect.height <= groups.reduce((sum, item) => sum + item.height, gap) + 1,- groupsOverlap: groups[0].left < groups[1].right && groups[0].right > groups[1].left && groups[0].top < groups[1].bottom && groups[0].bottom > groups[1].top,- overflow: controls.some(item => item.left < rect.left - 1 || item.right > rect.right + 1)+ height: rect.height, rows, controls: controls.map(item => ({top:item.top,bottom:item.bottom,width:item.width,height:item.height})),+ compact: rows.length <= 2 && rect.height <= rows.reduce((sum, item) => sum + item.bottom - item.top, (rows.length-1)*gap) + 1,+ groupsOverlap: controls.some((item,index) => controls.slice(index+1).some(other => item.left < other.right && item.right > other.left && item.top < other.bottom && item.bottom > other.top)),+ overflow: controls.some(item => item.left < rect.left - 1 || item.right > rect.right + 1 || item.top < rect.top - 1 || item.bottom > rect.bottom + 1)};}""")diff --git a/test/video-discovery.test.js b/test/video-discovery.test.jsnew file mode 100644index 0000000..3987d0d--- /dev/null+++ b/test/video-discovery.test.js@@ -0,0 +1,53 @@+import test from 'node:test';+import assert from 'node:assert/strict';+import { videoResource, installVideoDiscovery, addDiscoveredVideos } from '../extension/video-discovery.js';++test('video discovery rejects audio, segments, failures and non-tab requests', () => {+ for (const details of [ { url: 'https://example.com/one.m4s', mime: 'video/mp4' }, { url:'https://example.com/audio',mime:'audio/mp4' }, {url:'https://example.com/movie.mp4',statusCode:403}, {url:'https://example.com/movie.mp4',tabId:-1} ]) {+ assert.equal(videoResource({tabId:1,statusCode:200,responseHeaders:[{name:'Content-Type',value:details.mime||''}],...details}),null);+ }+});+test('range repeats share identity while distinct videos and stream manifests remain discoverable', () => {+ const resource = url => videoResource({ tabId:1, url, statusCode:206 });+ assert.equal(resource('https://example.com/movie.mp4?range=0-99').key,resource('https://example.com/movie.mp4?range=100-200').key);+ assert.notEqual(resource('https://example.com/movie.mp4?id=1').key,resource('https://example.com/movie.mp4?id=2').key);+ assert.equal(resource('https://example.com/master.m3u8').manifest,true);+});+test('badges and cached resources stay in their tab and clear on navigation', async () => {+ const data={},badges={};let headers,updated,removed;+ const chrome={webRequest:{onHeadersReceived:{addListener:fn=>headers=fn}},tabs:{onUpdated:{addListener:fn=>updated=fn},onRemoved:{addListener:fn=>removed=fn}},+ storage:{session:{get:async key=>({[key]:data[key]}),set:async value=>Object.assign(data,value),remove:async key=>{delete data[key];}}},action:{setBadgeText:async ({tabId,text})=>{badges[tabId]=text;}}};+ const read=installVideoDiscovery(chrome);+ for (const [tabId,range] of [[1,'0-99'],[1,'100-200'],[2,'0-99']]) headers({tabId,url:`https://example.com/video.mp4?range=${range}`,statusCode:206});+ assert.equal((await read(1)).length,1);assert.equal((await read(2)).length,1);+ assert.deepEqual(badges,{1:'1',2:'1'});+ updated(1,{url:'https://example.com/next'});assert.equal((await read(1)).length,0);assert.equal((await read(2)).length,1);+ removed(2);assert.equal((await read(2)).length,0);+});++test('late discovery keeps existing choices and presents new media as optional once', () => {+ const batch={candidates:[{id:'one',contentText:'user text',media:[]}],selections:[{candidateId:'one',selectedMediaIds:[]}]};+ const resources=[{key:'video',url:'https://example.com/video.mp4',mimeType:'video/mp4'}];+ const first=addDiscoveredVideos(batch,resources);+ const second=addDiscoveredVideos(first,resources);+ assert.equal(second.candidates[0].media.length,1);+ assert.equal(second.candidates[0].media[0].placement,'unplaced');+ assert.deepEqual(second.selections,batch.selections);+ assert.equal(second.candidates[0].contentText,'user text');+ const list={...batch,candidates:[...batch.candidates,{id:'two'}]};+ assert.equal(addDiscoveredVideos(list,resources),list);+});++test('network HLS keeps its playback address through candidate normalization without claiming DASH playback', async () => {+ const { normalizePageCaptureCandidate } = await import('../extension/page-capture.js');+ for (const [url,mime,hls] of [+ ['https://example.com/master.m3u8','',true],+ ['https://example.com/stream','application/vnd.apple.mpegurl',true],+ ['https://example.com/master.mpd','application/dash+xml',false]+ ]) {+ const resource=videoResource({tabId:1,statusCode:200,url,responseHeaders:[{name:'Content-Type',value:mime}]});+ const batch=addDiscoveredVideos({candidates:[{id:'one',canonicalUrl:'https://example.com/watch',media:[]}]},[resource]);+ const media=normalizePageCaptureCandidate(batch.candidates[0]).media[0];+ assert.equal(media.streamUrl, hls ? url : undefined);+ }+});diff --git a/test/video-page-capture.test.js b/test/video-page-capture.test.jsnew file mode 100644index 0000000..cc0d598--- /dev/null+++ b/test/video-page-capture.test.js@@ -0,0 +1,65 @@+import test from 'node:test';+import assert from 'node:assert/strict';+import vm from 'node:vm';+import { collectVideoPagePayload, normalizeVideoPagePayload } from '../extension/video-page-capture.js';+import { normalizePageCaptureBatch } from '../extension/page-capture.js';+import { normalizeEntryMedia } from '../extension/media.js';++const capture = (url, window, elements = {}) => vm.runInNewContext(`(${collectVideoPagePayload.toString()})()`, {+ URL, location: { href: url }, window, document: { querySelector: selector => elements[selector] || null }+});++test('YouTube captures this video and full description without promoting hashtags or linked recommendations to videos', () => {+ const url = 'https://www.youtube.com/watch?v=Wh3zKB3_ZHw';+ const payload = capture(url, { ytInitialPlayerResponse: {+ videoDetails: { videoId: 'Wh3zKB3_ZHw', title: 'Current video', shortDescription: 'Full description\n#LTX25 https://youtu.be/other', author: 'Creator', viewCount: '123', lengthSeconds: '608' },+ microformat: { playerMicroformatRenderer: { likeCount: '8' } }+ } });+ const site = normalizeVideoPagePayload(payload, url);+ const candidate = normalizePageCaptureBatch({ candidates: site.candidates }).candidates[0];+ assert.equal(candidate.media.length, 1);+ assert.equal(candidate.media[0].url, url);+ assert.equal(candidate.sourceFacts.author, 'Creator');+ assert.equal(candidate.sourceFacts.itemId, 'Wh3zKB3_ZHw');+ assert.equal(candidate.sourceFacts.model, '');+ assert.equal(candidate.sourceFacts.engagement.views, 123);+ assert.match(candidate.contentText, /Full description\n#LTX25/);+});++test('in-page YouTube navigation uses the current player response instead of previous video metadata', () => {+ const payload = capture('https://www.youtube.com/watch?v=current', { ytInitialPlayerResponse: { videoDetails: { videoId: 'previous', title: 'wrong' } } }, {+ '#movie_player': { getPlayerResponse: () => ({ videoDetails: { videoId: 'current', title: 'right', shortDescription: '' } }) }+ });+ assert.equal(payload.title, 'right');+});++test('Bilibili maps the owning video fields, keeps zero counts, and does not invent missing metrics', () => {+ const url = 'https://www.bilibili.com/video/BV1ntYN6NEAi/';+ const site = normalizeVideoPagePayload(capture(url, { __INITIAL_STATE__: { videoData: {+ bvid: 'BV1ntYN6NEAi', title: 'Title', desc: '', owner: { name: 'Author' }, stat: { view: 3, reply: 0, coin: 2 }, duration: 10+ } } }), url);+ assert.equal(site.candidates[0].sourceFacts.author, 'Author');+ assert.deepEqual(site.candidates[0].sourceFacts.engagement, { views: 3, comments: 0, coins: 2 });+ assert.equal(site.candidates[0].contentText, '');+ assert.equal(site.candidates[0].media.length, 1);+});++test('obsolete capture diagnostics are removed during normalization without changing the source entry or its assets', () => {+ const entry = { id: 'saved', text: 'User content', sourceFacts: { author: 'Creator', captureWarnings: ['internal diagnostic'] } };+ const result = normalizeEntryMedia(entry);+ assert.equal(result.sourceFacts.captureWarnings, undefined);+ assert.equal(result.sourceFacts.author, 'Creator');+ assert.equal(result.text, entry.text);+ assert.deepEqual(entry.sourceFacts.captureWarnings, ['internal diagnostic']);+});+++test('Bilibili HTTP and protocol-relative cover URLs use the CDN HTTPS original through candidate normalization', () => {+ const url = 'https://www.bilibili.com/video/BV1ntYN6NEAi/';+ for (const pic of ['http://i1.hdslb.com/bfs/archive/cover.jpg', '//i1.hdslb.com/bfs/archive/cover.jpg']) {+ const site = normalizeVideoPagePayload(capture(url, { __INITIAL_STATE__: { videoData: { bvid: 'BV1ntYN6NEAi', title: 'Title', pic } } }), url);+ const candidate = normalizePageCaptureBatch({ candidates: site.candidates }).candidates[0];+ assert.equal(candidate.media[0].posterUrl, 'https://i1.hdslb.com/bfs/archive/cover.jpg');+ assert.equal(candidate.media.length, 1);+ }+});diff --git a/test/video_comments_capture_e2e.py b/test/video_comments_capture_e2e.pynew file mode 100644index 0000000..d9a631f--- /dev/null+++ b/test/video_comments_capture_e2e.py@@ -0,0 +1,86 @@+"""Synthetic site-shaped comments; real picker, capture snapshot, collector and save/readback."""+from pathlib import Path+from playwright.sync_api import expect+from e2e_support import extension_session+ROOT = Path(__file__).resolve().parents[1]++def main():+ with extension_session('video-comments-') as run:+ run.context.route('https://wchao6891.github.io/comments-fixture', lambda r:r.fulfill(content_type='text/html',body='<html><title>Fixture</title><body></body></html>'))+ source=run.context.new_page();source.goto('https://wchao6891.github.io/comments-fixture')+ source.evaluate('''()=>{+ document.body.innerHTML='<style>ytd-comments,ytd-comment-thread-renderer,ytd-comment-view-model,ytd-comment-replies-renderer{display:block;margin:8px}</style><nav>Do not collect navigation</nav><ytd-comments></ytd-comments>';+ document.querySelector('ytd-comments').innerHTML=Array.from({length:40},(_,i)=>`<ytd-comment-thread-renderer><ytd-comment-view-model><a id="author-text">Author ${i}</a><div id="content-text">Comment ${i} full text</div></ytd-comment-view-model>${i===0?'<ytd-comment-replies-renderer><div id="more-replies"><button>1 reply</button></div></ytd-comment-replies-renderer>':''}</ytd-comment-thread-renderer>`).join('');+ document.querySelector('button').onclick=e=>{e.target.remove();const r=document.createElement('ytd-comment-view-model');r.innerHTML='<a id="author-text">Reply author</a><div id="content-text">Expanded reply text</div>';document.querySelector('ytd-comment-replies-renderer').append(r);};+ }''')+ setup=run.open_page('collector.html')+ run.seed_storage(setup,{'entries':[],'uiPreferences':{'motion':'reduced'},'capturePermissionOnboarding':{'version':1,'acknowledgedAt':'2026-09-19T00:00:00Z'}})+ # Only auto-entry's source fixture is substituted; picker messages and save run in the extension.+ site=setup.evaluate('''async()=>{const {normalizeVideoPagePayload}=await import('./video-page-capture.js');return normalizeVideoPagePayload({adapter:'youtube',itemId:'Wh3zKB3_ZHw',canonicalUrl:'https://www.youtube.com/watch?v=Wh3zKB3_ZHw',title:'Primary video title',description:'Full video introduction',author:'Video author'},'https://www.youtube.com/watch?v=Wh3zKB3_ZHw');}''')+ page=run.context.new_page()+ import json+ page.add_init_script('''(()=>{const site=SITE;const send=chrome.runtime.sendMessage.bind(chrome.runtime);chrome.permissions.contains=async()=>true;chrome.permissions.request=async()=>true;chrome.runtime.sendMessage=async m=>{if(m.type==='START_PAGE_CAPTURE')return {ok:true,batch:{id:'video',sourceUrl:'https://www.youtube.com/watch?v=Wh3zKB3_ZHw',candidates:site.candidates}};if(m.type==='TRY_ACTIVE_SELECTION_TO_DRAFT')return {ok:true,added:false};const result=await send(m);if(m.type==='COMMIT_PAGE_CAPTURE')window.commitResult=result;return result;};})()'''.replace('SITE',json.dumps(site)))+ source.bring_to_front()+ page.goto(f'chrome-extension://{run.extension_id}/collector.html')+ expect(page.locator('.page-capture-item.confirmed')).to_have_count(1)+ expect(page.locator('.page-capture-article')).to_contain_text('Full video introduction')+ expect(page.locator('.page-capture-article')).not_to_contain_text('Comment 0')+ source.bring_to_front()+ page.evaluate("()=>document.querySelector('#add-selection').click()")+ expect(source.locator('#promptdirector-content-picker')).to_be_attached()+ source.locator('#author-text').first.click()+ expect(page.locator('.page-capture-article')).to_contain_text('Expanded reply text')+ expect(page.locator('.page-capture-article')).to_contain_text('Comment 28 full text')+ expect(page.locator('.page-capture-article')).not_to_contain_text('Comment 29 full text')+ expect(page.locator('.page-capture-item')).to_have_count(1)+ expect(page.locator('.page-capture-item')).to_contain_text('Primary video title')+ expect(page.locator('.page-capture-article')).to_contain_text('Full video introduction')+ # Continuation is explicit: the user scrolls to later comments and selects again.+ source.bring_to_front()+ page.evaluate("()=>document.querySelector('#add-selection').click()")+ expect(source.locator('#promptdirector-content-picker')).to_be_attached()+ source.locator('#author-text').filter(has_text='Author 30').click()+ expect(page.locator('.page-capture-article')).to_contain_text('Comment 39 full text')+ page.locator('#page-capture-undo-region').click()+ expect(page.locator('.page-capture-article')).not_to_contain_text('Comment 39 full text')+ for theme in ['light','dark']:+ page.evaluate('(value)=>document.documentElement.dataset.theme=value',theme)+ for width in [390,1280]:+ page.set_viewport_size({'width':width,'height':844})+ page.screenshot(path=f'/tmp/pd-b12-comments-{theme}-{width}.png',full_page=True,animations='disabled')+ page.locator('#page-capture-save').click()+ try: expect(page.locator('#page-capture')).to_be_hidden(timeout=20000)+ except Exception:+ print(page.evaluate('()=>({commit:window.commitResult,body:document.body.innerText})'),flush=True)+ raise+ entries=page.evaluate("async()=>(await chrome.runtime.sendMessage({type:'GET_STATE'})).entries")+ assert len(entries)==1,entries+ entry=entries[0]+ assert entry['title']=='Primary video title' and entry['sourceFacts']['author']=='Video author',entry+ assert 'Full video introduction' in entry['text'] and 'Expanded reply text' in entry['text'],entry+ assert len(entry['mediaAssets'])==1 and entry['mediaAssets'][0]['kind']=='video',entry+ assert 'Comment 29 full text' not in entry['text'] and 'Do not collect' not in entry['text'],entry+ assert 'captureWarnings' not in entry['sourceFacts'],entry+ print('PASS: video stays primary; comments opt-in; username selects comments; expanded reply included; 30 total cap; explicit continuation/undo; video+description+comments saved as one case')+ # Bilibili nested open shadow roots use the same bounded contract.+ source.evaluate('''()=>{+ document.body.innerHTML='<bili-comments></bili-comments>';+ const area=document.querySelector('bili-comments').attachShadow({mode:'open'});+ area.innerHTML='<bili-comment-thread-renderer></bili-comment-thread-renderer>';+ const thread=area.firstElementChild.attachShadow({mode:'open'});+ thread.innerHTML='<bili-comment-renderer></bili-comment-renderer>';+ const comment=thread.firstElementChild.attachShadow({mode:'open'});+ comment.innerHTML='<bili-comment-user-info></bili-comment-user-info><bili-rich-text></bili-rich-text>';+ comment.firstElementChild.attachShadow({mode:'open'}).innerHTML='<div id="user-name">Bili author</div>';+ comment.lastElementChild.attachShadow({mode:'open'}).innerHTML='<p id="contents">Bili complete comment<img alt="[笑]" src="data:,"></p>';+ }''')+ picker=(ROOT/'extension/page-content-picker.js').read_text().replace('export function','function',1)+ source.add_script_tag(content=picker)+ source.evaluate('()=>{window.picked=pickPageContent({commentLimit:30,timeoutMs:1000});}')+ source.locator('#user-name').click()+ result=source.evaluate('()=>window.picked')+ assert result['supplement']=='comments' and result['commentCount']==1 and 'Bili complete comment[笑]' in result['html'],result+ assert '<img' not in result['html'],result+ print('PASS: Bilibili shadow-root comment text/author/emoji, no avatar or extra media')++if __name__=='__main__':main()diff --git a/test/video_detail_layout_e2e.py b/test/video_detail_layout_e2e.pyindex 362812b..af4c344 100644--- a/test/video_detail_layout_e2e.py+++ b/test/video_detail_layout_e2e.py@@ -106,7 +106,22 @@ def main() -> None:expect(library.locator(".detail-visual-thumb")).to_have_count(2)library.locator(".detail-visual-thumb").nth(1).click()expect(library.locator(".detail-video")).to_be_visible()+ play=library.get_by_role("button",name="播放视频",exact=True)+ expect(play).to_be_visible()+ library.locator('.detail-video').evaluate('(v)=>{v.muted=true;v.loop=true}')+ assert library.locator('.detail-video').evaluate('(v)=>!v.getAttribute("src") && !v.controls'), 'Opening must not start loading a paused video'+ bounds=play.bounding_box()+ library.mouse.move(bounds['x']+bounds['width']/2,bounds['y']+bounds['height']/2)+ library.mouse.down()+ library.wait_for_timeout(160)+ pressed=play.bounding_box()+ assert abs(pressed['x']-bounds['x'])<1 and abs(pressed['y']-bounds['y'])<1, (bounds,pressed)+ library.mouse.up()library.wait_for_function("() => {const v=document.querySelector('.detail-video');return v.readyState>=2 && v.videoHeight>v.videoWidth}")+ library.wait_for_function("()=>document.querySelector('.detail-video').currentTime>0")+ expect(play).to_be_hidden()+ library.locator('.detail-video').evaluate('(v)=>v.pause()')+ expect(play).to_be_visible()expect(library.get_by_role("button", name="设为主要")).to_be_visible()expect(library.get_by_role("button", name="此媒体移入回收站", exact=True)).to_be_visible()expect(library.get_by_role("button", name="逆推视频提示词", exact=True)).to_have_count(1)@@ -129,6 +144,15 @@ def main() -> None:Path(evidence_dir).mkdir(parents=True, exist_ok=True)library.screenshot(path=str(Path(evidence_dir) / 'video-detail-desktop.png'))+ gallery_box=library.locator('.detail-visual-gallery').bounding_box()+ assert abs(gallery_box['y']+gallery_box['height']/2-450)<3,gallery_box+ # A short landscape frame must sit in the middle instead of sticking to the top.+ library.locator('.detail-video').evaluate("v=>{v.style.aspectRatio='16 / 9';v.style.maxHeight='360px'}")+ library.wait_for_function("()=>document.querySelector('.detail-video').getBoundingClientRect().height<=360")+ balanced=library.locator('.detail-visual-gallery').bounding_box()+ assert balanced['y']>0 and abs(balanced['y']+balanced['height']/2-450)<3,balanced+ if evidence_dir: library.screenshot(path=str(Path(evidence_dir)/'video-detail-landscape-layout.png'))+ library.locator('.detail-video').evaluate("v=>{v.style.aspectRatio='180 / 320';v.style.removeProperty('max-height')}")desktop = layout_snapshot(library)assert desktop["safetyBand"] == 1, desktopassert desktop["captionTop"] >= desktop["videoBottom"], desktop@@ -172,6 +196,7 @@ def main() -> None:damaged_card = library.locator('.case-card[data-entry-id="broken-video-layout"]')expect(damaged_card).to_contain_text("封面暂不可用,打开查看视频", timeout=35000)damaged_card.click()+ library.get_by_role('button',name='播放视频',exact=True).click()expect(library.locator('.media-playback-error')).to_be_visible()expect(library.locator('.detail-video')).to_be_hidden()print({"damagedVideoReportsFailure": True})diff --git a/test/video_discovery_e2e.py b/test/video_discovery_e2e.pynew file mode 100644index 0000000..5f25cfa--- /dev/null+++ b/test/video_discovery_e2e.py@@ -0,0 +1,18 @@+"""Real webRequest delivery with routed synthetic responses, not downloadable-video acceptance."""+from e2e_support import extension_session++def main():+ with extension_session('video-discovery-') as run:+ origin='https://wchao6891.github.io'+ run.context.route(origin+'/sniff-*',lambda route:route.fulfill(content_type='video/mp4' if '.mp4' in route.request.url else 'text/html',body=b'fixture'))+ setup=run.open_page('collector.html',wait_until='networkidle')+ page=run.context.new_page();page.goto(origin+'/sniff-page')+ tab=setup.evaluate("async()=> (await chrome.tabs.query({active:true,currentWindow:true}))[0].id")+ page.evaluate("async()=>{await fetch('/sniff-video.mp4?range=0-1');await fetch('/sniff-video.mp4?range=2-3');}")+ setup.wait_for_function("async id=>(await chrome.action.getBadgeText({tabId:id}))==='1'",arg=tab)+ state=setup.evaluate("async id=>(await chrome.storage.session.get('videoDiscovery:'+id))['videoDiscovery:'+id]",tab)+ assert len(state)==1 and state[0]['mimeType']=='video/mp4',state+ page.goto(origin+'/sniff-next')+ setup.wait_for_function("async id=>(await chrome.action.getBadgeText({tabId:id}))===''",arg=tab)+ print('PASS: real network observation; range dedup; badge=1; navigation clears badge')+if __name__=='__main__':main()diff --git a/test/x_capture_extraction_e2e.py b/test/x_capture_extraction_e2e.pyindex 3fde8f8..de23fd5 100644--- a/test/x_capture_extraction_e2e.py+++ b/test/x_capture_extraction_e2e.py@@ -36,6 +36,8 @@ def main():adapters: (await import(chrome.runtime.getURL('page-capture-adapter-registry.js'))).PAGE_CAPTURE_ADAPTERS})""")page=run.context.new_page();page.goto(URL)+ # User sample: X places the primary video in a NAV carousel.+ page.locator('article video').first.evaluate('(video)=>{const nav=document.createElement("nav");video.replaceWith(nav);nav.append(video)}')snapshot=page.evaluate('async options => ('+scanner['fn']+')(options)', {'adapters':scanner['adapters']})assert len(snapshot['candidates'])==1, snapshotc=snapshot['candidates'][0]@@ -91,14 +93,14 @@ def main():const query=chrome.tabs.query.bind(chrome.tabs);chrome.tabs.query=async q=>q.active?[{id:999,url:'https://x.com/director/status/123'}]:query(q);const send=chrome.runtime.sendMessage.bind(chrome.runtime);- chrome.runtime.sendMessage=async m=>m.type==='START_PAGE_CAPTURE'?{ok:true,batch:{...window.captureSnapshot,status:'ready'}}:send(m);+ chrome.runtime.sendMessage=async m=>m.type==='START_PAGE_CAPTURE'?{ok:true,batch:{...window.captureSnapshot,status:'ready'}}:m.type==='READ_PAGE_CAPTURE_SUPPLEMENT'?{ok:true,supplement:{...m.supplement,text:m.supplement.text+' Full author prompt tail.',partial:false}}:send(m);}""",snapshot)run.seed_storage(setup,{'entries':[],'capturePermissionOnboarding':{'version':1,'acknowledgedAt':'2026-09-07T00:00:00Z','clipboardIncluded':True}})setup.locator('#start-page-capture').click()expect(setup.locator('.page-capture-confirm')).to_be_visible()setup.locator('.page-capture-confirm').click()setup.locator('.page-capture-supplements > summary').click()- setup.get_by_role('button',name='补入已显示内容',exact=True).click()+ setup.get_by_role('button',name='补入当前案例',exact=True).click()expect(setup.locator('.page-capture-excerpt')).to_contain_text('Author prompt:')expect(setup.locator('.page-capture-supplements')).to_have_count(0)setup.locator('#page-capture-save-text-only').click()@@ -107,7 +109,8 @@ def main():assert len(entries)==1,entriesfor kept in ['Main filmmaking','Quoted filmmaking','Author prompt:']:assert kept in entries[0]['text'],(kept,entries[0]['text'])- assert entries[0]['sourceFacts']['status']=='partial',entries[0]['sourceFacts']+ assert 'Full author prompt tail.' in entries[0]['text']+ assert entries[0]['sourceFacts']['status']=='complete',entries[0]['sourceFacts']# Group additions are independently selectable and undoable in the production sidebar.setup.evaluate("candidate=>window.captureSnapshot={candidates:[candidate]}",grouped)setup.locator('#start-page-capture').click();setup.locator('.page-capture-confirm').click()diff --git a/test/x_comment_capture_e2e.py b/test/x_comment_capture_e2e.pynew file mode 100644index 0000000..f1f7ee0--- /dev/null+++ b/test/x_comment_capture_e2e.py@@ -0,0 +1,144 @@+"""Reconstructed X comment layouts; production reader and sidebar save, isolated storage."""+import json+import os+import tempfile+from pathlib import Path+from playwright.sync_api import expect+from e2e_support import EXTENSION_DIR, extension_session++MAIN = 'https://x.com/director/status/123'+REPLY = 'https://x.com/director/status/124'+FULL = 'Character prompt:\n\n' + '\n'.join(f'Shot {i}: preserve identity, lighting and continuous motion.' for i in range(180))+++def html(public=False):+ article = '' if public else ' data-testid="tweet"'+ text = 'dir="auto" class="whitespace-pre-wrap"' if public else 'data-testid="tweetText"'+ more = '' if public else ' data-testid="tweet-text-show-more-link"'+ date = 'Today' if public else '<time>Today</time>'+ return f'''<html><head><link rel="canonical" href="{REPLY}"></head><body>+ <article{article}><div data-testid="User-Name"><a href="/other">Other</a></div>+ <div {text}>Unrelated text must never be used.</div><a href="/other/status/999">{date}</a></article>+ <article{article}><div data-testid="User-Name"><a href="/director">Director</a></div>+ <div {text}><span>Character prompt: short preview</span><button{more} onclick="this.parentElement.textContent=window.fullPrompt">Show more</button></div>+ <a href="/director/status/124">{date}</a></article></body></html>'''+++def main():+ with extension_session('pd-x-comment-') as run:+ setup = run.open_page('collector.html')+ scanner = setup.evaluate("""async()=>({fn:(await import('./page-capture.js')).collectPageCaptureSnapshot.toString(),+ adapters:(await import('./page-capture-adapter-registry.js')).PAGE_CAPTURE_ADAPTERS})""")+ page = run.context.new_page()+ run.context.route('https://x.com/**', lambda r: r.fulfill(body=html(), content_type='text/html'))+ page.goto(REPLY)+ for public in (False, True):+ page.set_content(html(public))+ page.evaluate('(text)=>window.fullPrompt=text', FULL)+ result = page.evaluate('async options=>('+scanner['fn']+')(options)',+ {'adapters': scanner['adapters'], 'xSupplementUrl': REPLY, 'mediaTimeoutMs': 1000})+ assert result.get('supplement', {}).get('text') == FULL, result+ assert result['supplement']['partial'] is False+ snapshot = page.evaluate('async options=>('+scanner['fn']+')(options)', {'adapters': scanner['adapters']})+ assert len(snapshot['candidates']) == 1+ assert snapshot['candidates'][0]['contentText'] == FULL+ assert snapshot['candidates'][0]['canonicalUrl'] == REPLY+ page.set_content(html())+ page.locator('button').evaluate('(b)=>b.removeAttribute("onclick")')+ failed = page.evaluate('async options=>{try{return await ('+scanner['fn']+')(options)}catch(e){return {error:e.message}}}',+ {'xSupplementUrl': REPLY, 'mediaTimeoutMs': 100})+ assert '未能取得评论全文' in failed.get('error', ''), failed+ print({'classic_and_public_full_comment': True, 'characters': len(FULL)})+++def sidebar_journey():+ with tempfile.TemporaryDirectory(prefix='x-comment-runtime-') as temp:+ extension = Path(temp)+ for file in EXTENSION_DIR.iterdir():+ if file.name != 'manifest.json':+ (extension / file.name).symlink_to(file, target_is_directory=file.is_dir())+ manifest = json.loads((EXTENSION_DIR / 'manifest.json').read_text())+ manifest['host_permissions'] += ['https://x.com/*']+ (extension / 'manifest.json').write_text(json.dumps(manifest))+ with extension_session('pd-x-comment-save-', extension_dir=extension) as run:+ failure = [True]+ worker = run.context.service_workers[0]+ # Extension-created initial navigations bypass Playwright context routes in this runtime.+ # Pause only that navigation boundary until the harness has attached and loaded its fixture.+ worker.evaluate('''() => {+ const create = chrome.tabs.create.bind(chrome.tabs);+ chrome.tabs.create = async options => {+ const tab = await create({...options, url:'about:blank'});+ await new Promise(resolve => globalThis.fixtureTabReady = resolve);+ return tab;+ };+ }''')+ def add_comment():+ with run.context.expect_page() as opened:+ collector.get_by_role('button', name='补入当前案例', exact=True).click()+ opened.value.goto(REPLY)+ worker.evaluate('() => globalThis.fixtureTabReady()')+ def route(r):+ if r.request.url == REPLY and failure[0]:+ r.fulfill(body="<script>history.replaceState({}, '', '/login')</script>Login required", content_type='text/html')+ return+ body = html().replace('https://x.com/director/status/124', r.request.url)+ if r.request.url == MAIN:+ body = body.replace('/other/status/999', '/director/status/123').replace('href="/other"', 'href="/director"').replace('Other</a>', 'Director</a>').replace('Unrelated text must never be used.', 'Main case text stays unchanged.')+ body += '<script>window.fullPrompt=' + json.dumps(FULL) + '</script>'+ r.fulfill(body=body, content_type='text/html')+ run.context.route('https://x.com/**', route)+ collector = run.open_page('collector.html')+ run.seed_storage(collector, {'entries': [], 'capturePermissionOnboarding': {'version': 1, 'acknowledgedAt': '2026-09-19T00:00:00Z', 'clipboardIncluded': True}})+ source = run.context.new_page()+ source.goto(MAIN)+ source.bring_to_front()+ collector.evaluate("()=>document.querySelector('#start-page-capture').click()")+ expect(collector.locator('.page-capture-confirm')).to_have_count(1)+ collector.locator('.page-capture-confirm').click()+ collector.locator('.page-capture-supplements > summary').click()+ add_comment()+ expect(collector.locator('#feedback')).to_contain_text('当前草稿已保留')+ expect(collector.locator('.page-capture-supplements')).to_have_count(1)+ expect(collector.locator('.page-capture-excerpt')).not_to_contain_text('Shot 179:')+ assert source.url == MAIN+ assert not any(p.url == 'https://x.com/login' for p in run.context.pages), 'temporary failed tab leaked'+ failure[0] = False+ collector.locator('.page-capture-supplements > summary').click()+ add_comment()+ expect(collector.locator('.page-capture-supplements')).to_have_count(0)+ expect(collector.locator('.page-capture-excerpt')).to_contain_text('Shot 179:')+ collector.locator('#page-capture-undo-region').click()+ expect(collector.locator('.page-capture-supplements')).to_have_count(1)+ expect(collector.locator('.page-capture-excerpt')).not_to_contain_text('Shot 179:')+ collector.locator('.page-capture-supplements > summary').click()+ add_comment()+ expect(collector.locator('.page-capture-supplements')).to_have_count(0)+ evidence = Path(os.environ.get('PROMPTDIRECTOR_LAB_EVIDENCE_DIR') or tempfile.mkdtemp(prefix='x-comment-visual-'))+ evidence.mkdir(parents=True, exist_ok=True)+ for theme in ('light', 'dark'):+ collector.evaluate("async theme=>{const {initializeUi}=await import('./i18n.js');await initializeUi({theme,locale:'zh-CN',motion:'reduced'})}", theme)+ for width in (1280, 390):+ collector.set_viewport_size({'width': width, 'height': 900})+ assert collector.locator('#page-capture').evaluate('e=>e.scrollWidth<=e.clientWidth'), (theme, width)+ collector.screenshot(path=str(evidence / f'comment-{theme}-{width}.png'))+ collector.locator('#page-capture-save').click()+ expect(collector.locator('#page-capture')).to_be_hidden(timeout=15000)+ entries = collector.evaluate("async()=> (await chrome.runtime.sendMessage({type:'GET_STATE'})).entries")+ assert len(entries) == 1+ entry = entries[0]+ assert FULL in entry['text'] and entry['text'].count('Shot 179:') == 1, entry['text']+ assert 'short preview' not in entry['text']+ assert any(b.get('sourceUrl') == REPLY for b in entry['articleDocument']['blocks'])+ assert entry['sourceFacts']['status'] == 'complete'+ assert source.url == MAIN+ assert not any(p.url == REPLY for p in run.context.pages), 'temporary success tab leaked'+ library = run.open_page('library.html')+ library.locator('.case-card').first.click()+ expect(library.locator('#detail-drawer')).to_contain_text('Shot 179:')+ print({'failed_read_preserves_draft': True, 'retry_and_undo': True, 'full_saved_once': len(FULL), 'library_readback': True, 'source_page_unchanged': True, 'temporary_tabs_closed': True, 'screenshots': str(evidence)})+++if __name__ == '__main__':+ main()+ sidebar_journey()diff --git a/test/x_video_playback_e2e.py b/test/x_video_playback_e2e.pyindex 9928a95..13c6732 100644--- a/test/x_video_playback_e2e.py+++ b/test/x_video_playback_e2e.py@@ -61,7 +61,8 @@ def main():assert asset['storageMode']=='managed' and asset['byteSize']==len(video_bytes),assetlibrary=run.open_page('library.html');library.locator('.case-card').first.click()video=library.locator('#detail-drawer video').first- video.evaluate('(v)=>{v.muted=true;return v.play();}')+ video.evaluate('(v)=>{v.muted=true;}')+ library.get_by_role('button',name='播放视频',exact=True).click()library.wait_for_function("()=>{const v=document.querySelector('#detail-drawer video');return v?.ended;}")assert video.evaluate('v=>v.webkitAudioDecodedByteCount>0 && v.webkitVideoDecodedByteCount>0')library.locator('#detail-close').click()@@ -81,7 +82,8 @@ def main():library.reload();library.locator('.case-card').first.click()video=library.locator('.referenced-video-stream video');expect(video).to_be_visible()expect(library.locator('.referenced-video-stream iframe')).to_have_count(0)- video.evaluate('(v)=>{v.muted=true;return v.play();}')+ video.evaluate('(v)=>{v.muted=true;}')+ library.get_by_role('button',name='播放视频',exact=True).click()library.wait_for_function("()=>{const v=document.querySelector('.referenced-video-stream video');return v?.currentTime>0.5;}")video.evaluate('(v)=>v.currentTime=2')library.wait_for_function("()=>document.querySelector('.referenced-video-stream video')?.ended")@@ -92,6 +94,7 @@ def main():assert library.evaluate("()=>window.closedPlayer.paused && !window.closedPlayer.getAttribute('src')")run.context.route(CDN+'/stream.m3u8',lambda r:r.fulfill(status=403))library.locator('.case-card').first.click()+ library.get_by_role('button',name='播放视频',exact=True).click()expect(library.locator('.referenced-video-stream .media-playback-status')).to_contain_text('视频暂不可播放')expect(library.locator('.referenced-video-stream iframe')).to_have_count(0)library.locator('#detail-close').click()diff --git a/tools/apply-release-upgrade-fixture.mjs b/tools/apply-release-upgrade-fixture.mjsindex d597a7d..3c83311 100644--- a/tools/apply-release-upgrade-fixture.mjs+++ b/tools/apply-release-upgrade-fixture.mjs@@ -1,27 +1,53 @@import assert from "node:assert/strict";import { readFile, writeFile, mkdir } from "node:fs/promises";-import { join } from "node:path";+import { dirname, join } from "node:path";import { pathToFileURL } from "node:url";+import { readZipBlob } from "../extension/zip.js";+import { compareExtensionVersions } from "../extension/extension-update.js";import { directory, served } from "../test/helpers/local-upgrade-directory.mjs";// Called between launches of one disposable Chromium profile. This invokes the-// historical installer on its actual disk directory; native permission UI is separate.+// historical installer, or the documented manual replacement for added required+// permissions. Native permission UI is separate from data-continuity verification.const [installation, archive] = process.argv.slice(2);if (!installation || !archive) throw new Error("Expected disposable installation directory and final ZIP");const previous = JSON.parse(await readFile(join(installation, "manifest.json"), "utf8"));const updater = await import(pathToFileURL(join(installation, "local-extension-upgrade.js")));const id = await updater.extensionIdForKey(previous.key);const runtime = { id, getManifest: () => previous, getURL: path => `chrome-extension://${id}/${path}` };-const prepared = await updater.prepareLocalUpgrade(new Blob([await readFile(archive)]), runtime);+const archiveBlob = new Blob([await readFile(archive)]);+const files = await readZipBlob(archiveBlob);+const next = JSON.parse(await files.get("manifest.json").text());+const addsPermissions = ["permissions", "host_permissions"].some(key =>+ (next[key] || []).some(value => !(previous[key] || []).includes(value)));const sentinel = "user media must stay byte-identical";await mkdir(join(installation, "media"), { recursive: true });await writeFile(join(installation, "media", "upgrade-fixture.bin"), sentinel);-let record;-await updater.installLocalUpgrade(directory(installation), prepared, {- runtime, fetchFn: served(installation), saveRecord: async value => { record = value; }-});-assert.equal(record.phase, "written");-assert.equal(await readFile(join(installation, "media", "upgrade-fixture.bin"), "utf8"), sentinel);-assert.equal(await updater.verifyRunningUpgrade(record, { ...runtime, getManifest: () => prepared.manifest }, served(installation)), true);-assert.equal(await updater.verifyRecoveredUpgrade(record, runtime, served(join(installation, updater.RECOVERY_DIRECTORY))), true);-console.log(`历史更新器原位安装通过:${previous.version} → ${prepared.manifest.version}(${prepared.files.size} 个文件;已校验恢复记录列出的文件)`);+if (addsPermissions) {+ await assert.rejects(() => updater.prepareLocalUpgrade(archiveBlob, runtime), /增加了必要权限/);+ assert.deepEqual(JSON.parse(await readFile(join(installation, "manifest.json"), "utf8")), previous);+ assert.equal(await updater.extensionIdForKey(next.key), id);+ assert.equal(next.homepage_url, previous.homepage_url);+ assert.equal(next.manifest_version, 3);+ assert.ok(compareExtensionVersions(next.version, previous.version) > 0);+ for (const path of files.keys()) assert.ok(updater.isExtensionProgramPath(path), path);+ for (const [path, blob] of files) {+ const destination = join(installation, path);+ await mkdir(dirname(destination), { recursive: true });+ await writeFile(destination, Buffer.from(await blob.arrayBuffer()));+ }+ for (const [path, blob] of files) assert.deepEqual(await readFile(join(installation, path)), Buffer.from(await blob.arrayBuffer()));+ assert.equal(await readFile(join(installation, "media", "upgrade-fixture.bin"), "utf8"), sentinel);+ console.log(`权限保护拒绝自动安装;手动覆盖通过:${previous.version} → ${next.version}(${files.size} 个文件)`);+} else {+ const prepared = await updater.prepareLocalUpgrade(archiveBlob, runtime);+ let record;+ await updater.installLocalUpgrade(directory(installation), prepared, {+ runtime, fetchFn: served(installation), saveRecord: async value => { record = value; }+ });+ assert.equal(record.phase, "written");+ assert.equal(await readFile(join(installation, "media", "upgrade-fixture.bin"), "utf8"), sentinel);+ assert.equal(await updater.verifyRunningUpgrade(record, { ...runtime, getManifest: () => prepared.manifest }, served(installation)), true);+ assert.equal(await updater.verifyRecoveredUpgrade(record, runtime, served(join(installation, updater.RECOVERY_DIRECTORY))), true);+ console.log(`历史更新器原位安装通过:${previous.version} → ${prepared.manifest.version}(${prepared.files.size} 个文件;已校验恢复记录列出的文件)`);+}diff --git a/tools/local-extension-lab.mjs b/tools/local-extension-lab.mjsindex c96ae26..997c1a4 100644--- a/tools/local-extension-lab.mjs+++ b/tools/local-extension-lab.mjs@@ -11,6 +11,7 @@ const projectRoot = fileURLToPath(new URL("../", import.meta.url));export const REQUIRED_MODEL_CHAIN_SCRIPTS = ["text_and_image_analysis_e2e.py","composer_generation_e2e.py",+ "compatible_composer_stream_e2e.py","composer_video_generation_e2e.py","creative_job_recovery_e2e.py","ai_provider_registry_e2e.py",