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
保护跨版本资料延续并交付直接项目拖动与原位更新
MigenAI49cb081e0321
diff --git a/.github/workflows/release-safety.yml b/.github/workflows/release-safety.ymlindex 103e960..93e5d4a 100644--- a/.github/workflows/release-safety.yml+++ b/.github/workflows/release-safety.yml@@ -69,3 +69,39 @@ jobs:path: dist/*.zipif-no-files-found: errorretention-days: 14++ windows-portability:+ name: Windows packaged data and project interactions+ needs: source-contracts+ runs-on: windows-latest+ defaults:+ run:+ shell: bash+ steps:+ - uses: actions/checkout@v6+ with:+ fetch-depth: 0+ - uses: actions/setup-node@v6+ with:+ node-version: 22+ cache: npm+ - uses: actions/setup-python@v6+ with:+ python-version: "3.12"+ - run: npm ci+ - run: python -m pip install playwright==1.58.0+ - run: python -m playwright install chromium+ - run: npm run package+ - name: Check the Windows installation package+ run: |+ python - <<'PY'+ import json, os, pathlib, subprocess, sys, zipfile+ version = json.loads(pathlib.Path('manifest.json').read_text())['version']+ destination = pathlib.Path(os.environ['RUNNER_TEMP']) / 'PromptDirector'+ with zipfile.ZipFile(f'dist/PromptDirector-{version}-FIXED-ID-DEV.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']:+ subprocess.run([sys.executable, f'test/{script}'], env=env, check=True)+ PY+ - run: npm run test:upgradediff --git a/CHANGELOG.md b/CHANGELOG.mdindex bcf9b4c..b297e45 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -1,5 +1,12 @@# Changelog+## 1.20.5++- 案例库项目侧栏支持直接拖动、搜索定位和移动到指定项目;保持项目关系及案例归属,提供移动撤销。+- 大 ZIP 读取校验移至独立线程,显示字节进度;加速校验与批量资源写入,保留损坏检查和失败整体回滚。兼容部分工具提前生成的 ZIP64 目录。+- 本地升级记住已验证的原安装目录,目录名称不影响实际版本;复用授权,不搬运案例或媒体。+- 修复恢复中断后的接续、成功回执丢失和回退重复执行;保留结果未知的媒体及程序恢复副本,升级与清理共用操作锁。+## 1.20.4- 修复本地版升级因哈希依赖文件被旧更新器拒绝的问题;保持插件身份和原安装目录,案例与媒体无需导出或重新导入。diff --git a/README.md b/README.mdindex 0ab6016..ed4586c 100644--- a/README.md+++ b/README.md@@ -27,13 +27,13 @@ PromptDirector 是一个免费、开源、本地优先的 Chrome 扩展。它把普通用户请直接从 [Chrome Web Store 安装 PromptDirector](https://chromewebstore.google.com/detail/iahakaahijddcjjldidbclicedibgpjm),由商店完成安装与后续自动更新。-需要检查源码或参与开发时,可从 [GitHub Releases](https://github.com/wchao6891/PromptDirector/releases) 下载名称带 `FIXED-ID-DEV` 的最新 ZIP 并解压。在 Chrome 或 Edge 的扩展管理页开启“开发者模式”,选择“加载已解压的扩展程序”,然后选择解压后的目录。这个包保留 Chrome Web Store 分配的固定扩展身份,适合本地开发验证。+需要检查源码或参与开发时,可从 [GitHub Releases](https://github.com/wchao6891/PromptDirector/releases) 下载名称带 `FIXED-ID-DEV` 的最新 ZIP。首次安装时,将包内程序文件解压到固定的 `PromptDirector` 文件夹(不带版本号),确保 `manifest.json` 位于该文件夹第一层。在 Chrome 或 Edge 的扩展管理页开启“开发者模式”,选择“加载已解压的扩展程序”,然后选择解压后的目录。这个包保留 Chrome Web Store 分配的固定扩展身份,适合本地开发验证。不带 `FIXED-ID-DEV` 的同版本 ZIP 仅供维护者上传 Chrome Web Store,清单中按商店要求移除了 `key`,不要把它作为本地解压安装包。同一扩展身份下的常规更新不需要导出或重新导入案例;如曾使用其他扩展 ID,请按[扩展身份迁移说明](docs/EXTENSION_ID_MIGRATION.md)恢复资料。## 本地版更新-已具备本地升级功能的版本:在“设置”检查更新,点击“升级本地版”,选择 Chrome 当前加载的安装文件夹并授权。程序更新后重启插件,重新打开设置核对版本;如出现“清理升级临时文件”,点击完成清理。案例和媒体继续使用当前浏览器中的原资料库。+已具备本地升级功能的版本:在“设置”检查更新,点击“升级本地版”,首次选择 Chrome 当前加载的安装文件夹并授权,之后复用这个安装位置;授权失效时再授权。已有文件夹即使带旧版本号也可继续使用,无需重命名、移动或重新安装。程序更新后重启插件,重新打开设置核对版本;如出现“清理升级临时文件”,点击完成清理。案例和媒体继续使用当前浏览器中的原资料库。旧版本首次接入:下载新版 `FIXED-ID-DEV` ZIP,将包内程序文件覆盖到 Chrome 当前加载的原目录,再到扩展管理页点击重新加载。保持原插件与固定身份,无需卸载,也无需备份再导入案例。源码工作目录通过 Git 更新。diff --git a/background.js b/background.jsindex 186229a..a91e8dd 100644--- a/background.js+++ b/background.js@@ -217,6 +217,7 @@ import {import {claimLibraryImportTransaction,failLibraryImportTransaction,+ normalizeLibraryImportTransactionsState,succeedLibraryImportTransaction} from "./library-import-transaction.js";import {@@ -628,10 +629,21 @@ async function handleMessage(message, interaction = {}) {return enqueue(async () => ({ ok: true, ...folderBackupState(await readState()) }));case "GET_CAPTURE_WORKSPACE":return enqueueCapture(async () => captureWorkspace());+ case "GET_LIBRARY_ASSET_RETENTION":+ return enqueue(async () => {+ const ids = Array.isArray(message.assetIds) ? message.assetIds : [];+ const stored = await chrome.storage.local.get(STORAGE_KEYS.libraryImportTransactions);+ const transactions = normalizeLibraryImportTransactionsState(stored[STORAGE_KEYS.libraryImportTransactions]);+ if (transactions.items.some(item => item.status === "pending")) {+ return { ok: true, assetIds: ids };+ }+ const retained = collectRetainedLocalAssetIds(await readState());+ return { ok: true, assetIds: ids.filter(id => retained.has(id)) };+ });case "GET_DATA_SAFETY_STATUS":return enqueue(async () => dataSafetyStatus(await readState()));case "RESTORE_LIBRARY_REPLACEMENT_POINT":- return enqueue(async () => restoreLibraryReplacementPoint(await readState()));+ return enqueue(async () => restoreLibraryReplacementPoint(await readState(), message));case "GET_SYNC_RUN_STATUS":return Promise.resolve({ ok: true, syncStatus: manualSyncController.status() });case "CANCEL_SYNC": {@@ -8063,7 +8075,7 @@ async function applyLibraryImport(state, message) {stateValue: state,sourceValue: message.library,planValue: message.plan- });+ }, { resumePending: true });if (claim.replayed) return claim.result;if (!claim.acquired) {throw Object.assign(new Error("这次导入仍在提交中,请稍后重试"), {@@ -8095,7 +8107,6 @@ async function applyLibraryImport(state, message) {throw Object.assign(new Error("导入计划已经变化,请重新检查"), { code: "IMPORT_PLAN_STALE" });}response = libraryImportResponse(result);- const completed = succeedLibraryImportTransaction(claim.state, claim.receipt, response);const exactReplace = result.context.mode === LIBRARY_TRANSFER_MODES.EXACT_REPLACE;const previousRecoveryPoint = normalizeLibraryReplacementRecoveryPoint(state.libraryReplacementRecoveryPoint);const recoveryPoint = exactReplace@@ -8103,6 +8114,8 @@ async function applyLibraryImport(state, message) {retainedAssetIds: result.rollback.retainedAssetIds}): previousRecoveryPoint;+ if (exactReplace) response.recoveryPointCreatedAt = recoveryPoint.createdAt;+ const completed = succeedLibraryImportTransaction(claim.state, claim.receipt, response);const update = {...storagePayload(result.targetState),[STORAGE_KEYS.settings]: normalizeSettings(result.targetState.settings ?? state.settings),@@ -8117,25 +8130,32 @@ async function applyLibraryImport(state, message) {...(exactReplace ? { [STORAGE_KEYS.libraryReplacementRecoveryPoint]: recoveryPoint } : {})};await commitLocalChanges(update);- if (exactReplace) {- const obsoleteAssetIds = obsoleteRecoveryAssetIds(- previousRecoveryPoint,- [...collectRetainedLocalAssetIds(result.targetState)],- recoveryPoint- );- await deleteMediaBlobs(obsoleteAssetIds).catch((error) => {- console.error("Obsolete library recovery media cleanup failed", error);- });- response = { ...response, recoveryPointCreatedAt: recoveryPoint.createdAt };- }} catch (error) {- const failed = failLibraryImportTransaction(claim.state, claim.receipt);+ const stored = await chrome.storage.local.get(STORAGE_KEYS.libraryImportTransactions);+ const current = stored[STORAGE_KEYS.libraryImportTransactions];+ const completed = current?.items?.find(item => item.operationId === claim.receipt.operationId && item.status === "completed");+ if (completed) return completed.result;+ const failed = failLibraryImportTransaction(current, claim.receipt);await commitLocalChanges({[STORAGE_KEYS.libraryImportTransactions]: failed}, { markSyncDirty: false }).catch(() => undefined);throw error;}+ if (result.context.mode === LIBRARY_TRANSFER_MODES.EXACT_REPLACE) {+ try {+ const stored = await chrome.storage.local.get(STORAGE_KEYS.libraryReplacementRecoveryPoint);+ const obsoleteAssetIds = obsoleteRecoveryAssetIds(+ state.libraryReplacementRecoveryPoint,+ [...collectRetainedLocalAssetIds({ ...state, ...result.targetState, libraryReplacementRecoveryPoint: stored[STORAGE_KEYS.libraryReplacementRecoveryPoint] })],+ stored[STORAGE_KEYS.libraryReplacementRecoveryPoint]+ );+ await deleteMediaBlobs(obsoleteAssetIds);+ } catch (error) {+ console.error("Obsolete library recovery media cleanup failed", error);+ }+ }+const importedEntryIds = result.createdEntryIds;if (importedEntryIds.length) {const importedEntryIdSet = new Set(importedEntryIds);@@ -8160,7 +8180,7 @@ async function applyLibraryImportBatch(state, message) {stateValue: state,sourceValue,planValue: message.plan- });+ }, { resumePending: true });if (claim.replayed) return claim.result;if (!claim.acquired) {throw Object.assign(new Error("这次导入仍在提交中,请稍后重试"), {@@ -8200,7 +8220,11 @@ async function applyLibraryImportBatch(state, message) {[STORAGE_KEYS.libraryImportTransactions]: completed.state});} catch (error) {- const failed = failLibraryImportTransaction(claim.state, claim.receipt);+ const stored = await chrome.storage.local.get(STORAGE_KEYS.libraryImportTransactions);+ const current = stored[STORAGE_KEYS.libraryImportTransactions];+ const completed = current?.items?.find(item => item.operationId === claim.receipt.operationId && item.status === "completed");+ if (completed) return completed.result;+ const failed = failLibraryImportTransaction(current, claim.receipt);await commitLocalChanges({[STORAGE_KEYS.libraryImportTransactions]: failed}, { markSyncDirty: false }).catch(() => undefined);@@ -8220,12 +8244,21 @@ async function applyLibraryImportBatch(state, message) {return response;}-async function restoreLibraryReplacementPoint(state) {+async function restoreLibraryReplacementPoint(state, message) {const point = normalizeLibraryReplacementRecoveryPoint(state.libraryReplacementRecoveryPoint);if (!point) return { ok: false, message: "当前没有可回退的资料库状态" };+ const operationId = String(message?.operationId || "").trim();+ const expectedPointId = String(message?.expectedPointId || "").trim();+ if (operationId && point.restoreReceipt?.operationId === operationId && point.restoreReceipt.sourcePointId === expectedPointId) {+ return libraryReplacementRestoreResponse(point);+ }+ if (!operationId || expectedPointId !== point.id) {+ return { ok: false, message: "回退点已经变化,请刷新资料库后重新确认" };+ }const currentManagedState = folderBackupState(state);const swapped = swapLibraryReplacementRecoveryPoint(currentManagedState, point, {- retainedAssetIds: [...collectRetainedLocalAssetIds(currentManagedState)]+ retainedAssetIds: [...collectRetainedLocalAssetIds(currentManagedState)],+ restoreReceipt: { operationId, sourcePointId: expectedPointId }});await commitLocalChanges({...storagePayload(swapped.targetState),@@ -8239,10 +8272,14 @@ async function restoreLibraryReplacementPoint(state) {[STORAGE_KEYS.creativeSkills]: normalizeCreativeSkillsState(swapped.targetState.creativeSkills),[STORAGE_KEYS.libraryReplacementRecoveryPoint]: swapped.recoveryPoint});+ return libraryReplacementRestoreResponse(swapped.recoveryPoint);+}++function libraryReplacementRestoreResponse(point) {return {ok: true,message: "已回退到上一次精确替换前的资料库;刚才的状态已保存为新的回退点",- recoveryPointCreatedAt: swapped.recoveryPoint.createdAt+ recoveryPointCreatedAt: point.createdAt};}@@ -8611,6 +8648,7 @@ async function dataSafetyStatus(state) {videoCount: media.filter((asset) => asset.kind === "video").length,documentCount: media.filter((asset) => asset.kind === "document").length,canRestoreReplacementPoint: Boolean(state.libraryReplacementRecoveryPoint),+ replacementPointId: state.libraryReplacementRecoveryPoint?.id || "",replacementPointCreatedAt: state.libraryReplacementRecoveryPoint?.createdAt || "",syncStatus: state.syncStatus};diff --git a/docs/DATA_COMPATIBILITY.md b/docs/DATA_COMPATIBILITY.mdindex 0d7c68c..da77c64 100644--- a/docs/DATA_COMPATIBILITY.md+++ b/docs/DATA_COMPATIBILITY.md@@ -18,6 +18,8 @@ PromptDirector 把正式发布的数据格式视为长期产品契约。应用- 完成标记有效但单个内容资源后来损坏时,恢复会降级为明确的救援流程,只隔离具体坏项并禁止精确替换;无法定位到具体坏项的解析错误仍停止,不以容错隐藏程序故障。- 同步保留版本合并和可见冲突副本;只有完整内容指纹能够证明相同的不同编号案例才会收敛。缺少完整媒体哈希时保留两份,不猜测覆盖。- 同步发现本机媒体确已缺失时会列出对应案例和文件,清理该坏引用后继续同步其他资料;媒体存储读取异常仍停止且不提交部分结果。+- 恢复提交与成功回执一起持久化。后台中断后,同一次操作只能继续原确认方案或读取已提交结果;资料已变化时要求重新预检,不能重复替换。回复丢失且结果无法确认时保留本次媒体,不按失败清理。+- 回退请求绑定用户确认的回退点和操作编号。同一次请求重发只返回原结果,不能把资料库再次交换回去。- 媒体物理删除只能发生在资料状态提交成功之后。清理失败只允许留下额外字节,并在后续手动同步重试;活动资料、回收站、创作记录、暂存任务和恢复回退点仍引用的媒体不得删除。## 权威清单@@ -26,6 +28,8 @@ PromptDirector 把正式发布的数据格式视为长期产品契约。应用- `test/fixtures/compat/provenance.json`:历史分享包夹具的来源与真实性边界。- `tools/check-data-compatibility.mjs`:比较当前代码、上一正式标签和固定夹具的可执行门禁。- `test/release_upgrade_e2e.py`:上一正式版与当前最终固定 ID 包共用 Chrome Profile 的升级演练。+- `test/local_upgrade_native_e2e.py`:旧版实际安装器对最终 ZIP 使用真实 Chrome 文件句柄写入原目录,再执行插件重启并核对身份、案例和媒体;临时目录权限预先授予,不替代日常 Chrome 原生授权验收。+- `test/library_import_interruption_e2e.py`:在提交前后实际停止 Chrome 后台,验证恢复接续、回执重放、媒体保留和回退幂等。夹具是脱敏或重建的确定性回归证据,不冒充用户不可用的原始故障资料。取得新的真实事故样本后,应保留最小脱敏复现和来源说明,不能用新生成的正常文件替代故障证据。@@ -41,7 +45,7 @@ PromptDirector 把正式发布的数据格式视为长期产品契约。应用## 共享媒体边界与迭代回归-资料库 ZIP、文件夹备份和恢复按实际文件与目标可用空间处理,支持 ZIP64。资料搬迁使用 `LIBRARY_TRANSFER_LIMITS` 表达浏览器可精确表示的字节和计数范围;网页采集与模型附件使用独立的资源预算。路径安全、文件声明大小、CRC、备份哈希和内容关系仍须完整校验。多 ZIP 逐包检查,原件按流读取;取消检查应停止读取,正式导入失败应保持原资料库并清理本次暂存资源。+资料库 ZIP、文件夹备份和恢复按实际文件与目标可用空间处理,支持 ZIP64。资料搬迁使用 `LIBRARY_TRANSFER_LIMITS` 表达浏览器可精确表示的字节和计数范围;网页采集与模型附件使用独立的资源预算。路径安全、文件声明大小、CRC、备份哈希和内容关系仍须完整校验。多 ZIP 逐包检查,原件在独立读取线程中按流校验并报告进度,导入资源以 Blob 句柄整组写入事务,失败整组回滚;取消检查应停止读取,正式导入明确失败应保持原资料库,并仅清理确定未被活动资料、暂存任务或回退点引用的本次资源;结果未知时先保留。备份按钮在有效用户点击链路中立即打开目录选择器,随后检查资料,得到必要确认后才创建备份子目录。写入并回读验证通过后才生成完成标记;未写入完成标记的目录只能尝试救援恢复。@@ -50,3 +54,5 @@ PromptDirector 把正式发布的数据格式视为长期产品契约。应用原文件字节与衍生封面分别保存。增加媒体类型或修改大小策略时,同时验证案例、回收站、临时参考、生成结果及附件;至少有一项“导出后走默认导入入口”的回归,不能只用生产者自行放宽参数的读回测试。产品版本、持久数据格式与界面实现分开演进。新界面或运行机制可以替换,原始资料、用户编辑、来源归属、历史恢复能力和付费请求的真实状态必须继续有行为测试;版本号升级不等于擅自改变数据协议或固化当前布局。++安装目录授权仅保存在当前浏览器的升级器数据库,与可迁移案例资料分离;升级临时记录清理后仍保留已验证的安装位置。不能把旧设备目录句柄作为新设备的有效授权。目录名称不参与软件版本判断,也不以改名或搬库完成常规升级。diff --git a/docs/KNOWN_LIMITATIONS.md b/docs/KNOWN_LIMITATIONS.mdindex abff4c1..494d0f4 100644--- a/docs/KNOWN_LIMITATIONS.md+++ b/docs/KNOWN_LIMITATIONS.md@@ -14,6 +14,9 @@ PromptDirector 目前依赖 Chrome 的原生媒体解码能力。遇到浏览器## 本地程序升级-本地升级需要 Chrome 开发者模式和当前安装目录的读写授权。旧版首次接入需原目录覆盖程序;以后使用设置页升级。不同扩展 ID、非当前安装目录或新增必要权限的更新包会停止自动写入。只创建程序恢复副本,不复制案例和媒体。+本地升级需要 Chrome 开发者模式和当前安装目录的读写授权。旧版首次接入需原目录覆盖程序;以后使用设置页升级,复用已验证的安装目录;权限失效时重新授权。版本以设置页显示的实际运行版本为准,原目录带旧版本名称不影响原位更新。不同扩展 ID、非当前安装目录或新增必要权限的更新包会停止自动写入。只创建程序恢复副本,不复制案例和媒体。若写入中断后无法运行,在扩展管理页加载原目录内的 `PromptDirector-Update-Recovery` 程序副本,以相同身份恢复原版本;不要先卸载插件。目录写权限在重启后可能需要再次授权才能清理临时程序文件。+++原版本已恢复可用但仍有更新记录时,通过“清理升级临时文件”完成收尾后可继续升级。清理会确认当前实际加载的目录,正在运行的程序恢复副本会保留。diff --git a/i18n.js b/i18n.jsindex 04f63ed..4e9b67b 100644--- a/i18n.js+++ b/i18n.js@@ -1,6 +1,14 @@import { normalizeUiPreferences, resolveLocale } from "./preferences.js";const EN = Object.freeze({+ "读取校验 · {done} / {total}": "Reading and verifying · {done} / {total}",+ "检查图片 · {done}/{total}": "Checking images · {done}/{total}",+ "保存资源 · {done} / {total}": "Saving files · {done} / {total}",+ "正在提交案例…": "Committing cases…",+ "继续升级": "Continue update",+ "更新到原安装位置:{folder}。案例保留,文件夹名称不影响版本。": "Update in place: {folder}. Cases are retained; the folder name does not determine the version.",+ "选择 Chrome 当前加载的插件文件夹,以后复用此位置。文件夹名称不影响版本。": "Select the extension folder loaded by Chrome. Future updates reuse it; its name does not determine the version.",+ "需要安装目录的写入授权才能更新,案例未改变": "Allow writing to the installation folder to update. Cases are unchanged.","取消选择": "Clear selection","扫描已停止,可重新扫描": "Scan stopped. You can rescan.","采集网页内容": "Capture page content",@@ -460,6 +468,29 @@ const EN = Object.freeze({"这个来源已经保存过": "This source has already been saved","有可用更新": "Update available","管理项目顺序": "Manage project order",+ "全部折叠": "Collapse all",+ "搜索项目": "Search projects",+ "搜索项目名称或路径": "Search project name or path",+ "移动到…": "Move to…",+ "项目根目录": "Project root",+ "目标项目": "Destination project",+ "移动位置": "Placement",+ "放入项目": "Move inside",+ "放在前面": "Place before",+ "放在后面": "Place after",+ "根级末尾": "End of root level",+ "移动项目“{project}”": "Move project “{project}”",+ "{project} → {destination} · {position}": "{project} → {destination} · {position}",+ "请从搜索结果中选择目标项目": "Choose a destination from the search results",+ "请选择移动位置": "Choose a placement",+ "选择移动位置": "Choose a placement",+ "目标项目不存在": "Destination project no longer exists",+ "没有匹配的项目": "No matching projects",+ "结束案例选择后可移动项目": "Finish selecting cases to move projects",+ "已移动:{project}": "Moved: {project}",+ "已撤销移动:{project}": "Move undone: {project}",+ "{position}:{project}": "{position}: {project}",+ "不能把项目移入自身或其子项目": "A project cannot be moved into itself or its descendants","管理项目结构": "Manage project structure","移到根级": "Move to root","项目树": "Project tree",diff --git a/library-import-client.js b/library-import-client.jsnew file mode 100644index 0000000..b6ff2d8--- /dev/null+++ b/library-import-client.js@@ -0,0 +1,29 @@+// Data and its completed receipt are one storage commit. Read that receipt locally+// when a worker reply is lost; never infer failure from a disconnected channel.+export async function applyLibraryImportWithReceipt(message, {+ send = request => chrome.runtime.sendMessage(request),+ readReceipts = () => chrome.storage.local.get("libraryImportTransactions")+} = {}) {+ const completedResult = async () => {+ const stored = await readReceipts();+ const receipt = stored?.libraryImportTransactions?.items?.find(item =>+ item.operationId === message.operationId && item.planToken === message.planToken && item.status === "completed"+ );+ return receipt?.result;+ };+ try {+ return await send(message);+ } catch {+ const completed = await completedResult().catch(() => undefined);+ if (completed) return completed;+ }+ try {+ return await send(message);+ } catch (cause) {+ const completed = await completedResult().catch(() => undefined);+ if (completed) return completed;+ throw Object.assign(new Error("恢复连接中断,暂时无法确认结果。已保留本次媒体,请重新打开资料库确认后再继续。", { cause }), {+ code: "IMPORT_OUTCOME_UNKNOWN"+ });+ }+}diff --git a/library-import-media.js b/library-import-media.jsindex 1227f1b..a54caa8 100644--- a/library-import-media.js+++ b/library-import-media.js@@ -1,15 +1,20 @@-export async function findInvalidImportedImageIds(images, validateImage) {+export async function findInvalidImportedImageIds(images, validateImage, { signal, onProgress } = {}) {if (!(images instanceof Map) || typeof validateImage !== "function") {throw new Error("图片校验输入无效");}const invalidIds = new Set();+ let completed = 0;for (const [assetId, blob] of images) {+ signal?.throwIfAborted();if (!(blob instanceof Blob) || !clean(assetId)) throw new Error("图片校验输入无效");try {await validateImage(blob);} catch {+ signal?.throwIfAborted();invalidIds.add(assetId);}+ signal?.throwIfAborted();+ onProgress?.({ completed: ++completed, total: images.size });}return invalidIds;}diff --git a/library-import-transaction.js b/library-import-transaction.jsindex ac3f03b..c24fa50 100644--- a/library-import-transaction.js+++ b/library-import-transaction.js@@ -74,6 +74,13 @@ export function claimLibraryImportTransaction(stateValue, request = {}, optionspending: false};}+ // Only the background's serialized write queue may resume: once this callback+ // runs, no earlier apply is still executing in this worker. A completed write+ // always includes its receipt, so a remaining pending claim was interrupted.+ if (options.resumePending === true) {+ assertLibraryImportPlanCurrent(planToken, request.stateValue, request.sourceValue, request.planValue);+ return { state, receipt: current, acquired: true, replayed: false, pending: true };+ }return {state,receipt: current,diff --git a/library-recovery-point.js b/library-recovery-point.jsindex 7738e2a..5cf869c 100644--- a/library-recovery-point.js+++ b/library-recovery-point.js@@ -9,7 +9,8 @@ export function createLibraryReplacementRecoveryPoint(stateValue, options = {})id,createdAt,state,- retainedAssetIds: uniqueIds(options.retainedAssetIds)+ retainedAssetIds: uniqueIds(options.retainedAssetIds),+ ...restoreReceipt(options.restoreReceipt)};}@@ -23,7 +24,8 @@ export function normalizeLibraryReplacementRecoveryPoint(value) {id,createdAt,state: cloneManagedState(value.state),- retainedAssetIds: uniqueIds(value.retainedAssetIds)+ retainedAssetIds: uniqueIds(value.retainedAssetIds),+ ...restoreReceipt(value.restoreReceipt)};}@@ -35,7 +37,8 @@ export function swapLibraryReplacementRecoveryPoint(currentStateValue, pointValurecoveryPoint: createLibraryReplacementRecoveryPoint(currentStateValue, {id: options.id,createdAt: options.createdAt,- retainedAssetIds: options.retainedAssetIds+ retainedAssetIds: options.retainedAssetIds,+ restoreReceipt: options.restoreReceipt})};}@@ -72,3 +75,9 @@ function isoString(value) {const timestamp = Date.parse(String(value ?? "").trim());return Number.isFinite(timestamp) ? new Date(timestamp).toISOString() : "";}++function restoreReceipt(value) {+ const operationId = clean(value?.operationId);+ const sourcePointId = clean(value?.sourcePointId);+ return operationId && sourcePointId ? { restoreReceipt: { operationId, sourcePointId } } : {};+}diff --git a/library-transfer.js b/library-transfer.jsindex 2f23655..7140e3f 100644--- a/library-transfer.js+++ b/library-transfer.js@@ -28,6 +28,8 @@ export async function inspectLibraryTransfer({files = new Map(),limits = {},validateImage,+ signal,+ onImageProgress,sourceReport} = {}) {if (!SOURCE_TYPES.has(sourceType)) throw new Error("资料检查缺少有效来源类型");@@ -58,7 +60,7 @@ export async function inspectLibraryTransfer({inspected = parseLibraryPackage(library, files, { ...limits, salvageInvalidMedia: true });}if (validateImage !== undefined) {- const invalidImageIds = await findInvalidImportedImageIds(inspected.images, validateImage);+ const invalidImageIds = await findInvalidImportedImageIds(inspected.images, validateImage, { signal, onProgress: onImageProgress });if (invalidImageIds.size) {const salvageFiles = filesWithoutInvalidLibraryImages(library, files, invalidImageIds);inspected = parseLibraryPackage(library, salvageFiles, { ...limits, salvageInvalidMedia: true });diff --git a/library.css b/library.cssindex c8d7e8c..c392c19 100644--- a/library.css+++ b/library.css@@ -318,7 +318,7 @@ details:not([open]) > .selection-menu-panel { display: none; }.project-disclosure { display: grid; width: 18px; min-height: 28px; place-items: center; padding: 0; color: var(--muted); border: 0; background: transparent; }.project-disclosure .ui-icon { width: 13px; height: 13px; }.project-disclosure.is-placeholder { visibility: hidden; }-.project-row.project-ordering {+.project-row.project-draggable {border: 1px solid transparent;border-radius: var(--ui-container-radius);cursor: grab;@@ -326,11 +326,11 @@ details:not([open]) > .selection-menu-panel { display: none; }-webkit-user-select: none;user-select: none;}-.project-row.project-ordering:hover,-.project-row.project-ordering:focus-visible { border-color: var(--selection-edge); background: var(--selection-hover); }-.project-row.project-ordering:active,-.project-row.project-ordering.is-dragging { cursor: grabbing; }-.project-row.project-ordering.is-dragging {+.project-row.project-draggable:hover,+.project-row.project-draggable:focus-visible { border-color: var(--selection-edge); background: var(--selection-hover); }+.project-row.project-draggable:active,+.project-row.project-draggable.is-dragging { cursor: grabbing; }+.project-row.project-draggable.is-dragging {z-index: 4;border-color: var(--accent-emphasis);background: var(--card);@@ -342,7 +342,7 @@ details:not([open]) > .selection-menu-panel { display: none; }.project-row.drop-before::before { top: -3px; }.project-row.drop-after::after { bottom: -3px; }.project-row.drop-inside { border-color: var(--accent-emphasis); background: var(--selection); }-.project-row.project-ordering .project-filter { pointer-events: none; }+.project-row.project-draggable .project-filter { cursor: grab; }.project-list.is-project-dragging .project-row:not(.is-dragging) { transition: transform var(--ui-motion-fast) ease; }.project-root-drop { min-height: 34px; border: 1px dashed var(--line); border-radius: var(--ui-container-radius); padding: 8px; color: var(--muted); font-size: 11px; font-weight: 700; text-align: center; }.project-root-drop.is-drop-target { border-color: var(--accent-emphasis); color: var(--accent-ink); background: var(--selection); }@@ -1465,3 +1465,16 @@ details:not([open]) > .selection-menu-panel { display: none; }.settings-dialog { --settings-top: max(20px, calc((100dvh - 680px) / 2)); inset: var(--settings-top) 0 auto; margin: 0 auto; max-height: calc(100dvh - var(--settings-top) - 20px); }.settings-dialog:has(.compact-general:not([hidden])) { height: auto; }}++.project-search { width: 100%; min-height: 30px; padding: 5px 8px; font-size: 12px; }+.project-search-label, .project-search-path { display: block; min-width: 0; }+.project-search-path { margin-top: 3px; color: var(--muted); font-size: 10px; overflow-wrap: anywhere; }+.project-search-empty, .project-move-preview { color: var(--muted); font-size: 12px; }+.project-move-feedback { position: fixed; bottom: 20px; left: 20px; z-index: 90; display: flex; align-items: center; gap: 10px; max-width: min(440px, calc(100vw - 40px)); border: 1px solid var(--line); border-radius: var(--ui-control-radius); padding: 10px 12px; color: var(--ink); background: var(--card); box-shadow: var(--shadow); }+.project-move-feedback p { flex: 1; min-width: 0; margin: 0; font-size: 11px; overflow-wrap: anywhere; }+.project-move-feedback button { flex: none; min-height: 28px; padding: 4px 7px; font-size: 11px; }+.project-drag-preview { position: fixed; z-index: 100; pointer-events: none; max-width: min(320px, 80vw); border: 1px solid var(--selection-edge); border-radius: var(--ui-control-radius); padding: 7px 10px; color: var(--ink); background: var(--card); box-shadow: var(--shadow); font-size: 12px; }+.project-root-drop { position: fixed; z-index: 12; background: var(--sidebar); }+.project-tree-tools { position: sticky; top: -15px; z-index: 10; display: grid; gap: 8px; padding-block: 8px; background: var(--sidebar); }++.project-row.project-search-result { grid-template-columns: minmax(0, 1fr) auto; }diff --git a/library.html b/library.htmlindex 2e182f9..079a8c4 100644--- a/library.html+++ b/library.html@@ -52,10 +52,13 @@<button id="open-skills" class="workspace-navigation-item" type="button"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-wand-sparkles"></use></svg><span data-i18n="创作 Skill">创作 Skill</span></button></nav><section id="project-section" class="project-section">- <div class="filter-heading"><strong data-i18n="项目">项目</strong><span><button id="create-collection" type="button"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-plus"></use></svg><span data-i18n="新建">新建</span></button><button id="manage-project-order" class="icon-button" type="button" aria-label="管理项目结构" title="管理项目结构" data-i18n-aria-label="管理项目结构" data-i18n-title="管理项目结构"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-sliders-horizontal"></use></svg></button></span></div>+ <div class="project-tree-tools">+ <div class="filter-heading"><strong data-i18n="项目">项目</strong><span><button id="create-collection" type="button"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-plus"></use></svg><span data-i18n="新建">新建</span></button><button id="collapse-projects" class="icon-button" type="button" aria-label="全部折叠" title="全部折叠" data-i18n-aria-label="全部折叠" data-i18n-title="全部折叠"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="assets/ui-icons.svg#icon-chevron-left"></use></svg></button></span></div>+ <input id="project-search" class="project-search" type="search" aria-label="搜索项目" placeholder="搜索项目" data-i18n-aria-label="搜索项目" data-i18n-placeholder="搜索项目" />+ </div><div id="project-root-drop" class="project-root-drop" hidden data-i18n="移到根级">移到根级</div><div id="collection-filters" class="project-list" role="tree" aria-label="项目树" data-i18n-aria-label="项目树"></div>- <p id="project-order-status" class="sr-only" role="status" aria-live="polite"></p>+ <div id="project-move-feedback" class="project-move-feedback" hidden><p id="project-order-status" role="status" aria-live="polite"></p><button id="project-move-undo" class="button-secondary" type="button" data-i18n="撤销">撤销</button><button class="icon-button project-move-dismiss" type="button" aria-label="关闭" data-i18n-aria-label="关闭"><svg class="ui-icon" viewBox="0 0 24 24" aria-hidden="true"><use href="assets/ui-icons.svg#icon-x"></use></svg></button></div></section><section class="sidebar-trash-section"><button id="open-trash" class="workspace-navigation-item" type="button"><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 data-i18n="回收站">回收站</span><strong id="trash-count" class="workspace-navigation-count" hidden></strong></button>diff --git a/library.js b/library.jsindex 465d91d..d922a0b 100644--- a/library.js+++ b/library.js@@ -1,3 +1,5 @@+import { applyLibraryImportWithReceipt } from "./library-import-client.js";+import { readZipResources } from "./zip-reader.js";import { attachArticleEditor } from "./article-editor.js";import { renderArticleBlockText } from "./article-text-view.js";import { libraryTitleForLocale, libraryTitleForStorage, renderLibraryJson, screenshotStorageKey } from "./lib.js";@@ -15,7 +17,8 @@ import {saveDerivedMetadata,saveDerivedMedia,saveMediaBlob,- savePortableAssetBlob+ savePortableAssetBlob,+ savePortableAssetBlobs} from "./media-store.js";import { projectPackageEntryIds } from "./library-package.js";import {@@ -199,6 +202,7 @@ import { CURATED_SUBMISSION_URL } from "./curated-config.js";import { moveProjectLogicalCase, sortLibraryCases } from "./library-view.js";import { createTagEditor, normalizeTagValue } from "./tag-editor.js";import { attachProjectCombobox } from "./project-combobox.js";+import { createProjectTreeInteractions, projectTreeRows, readProjectExpansion } from "./project-tree.js";import {DETAIL_SIDEBAR_WIDTH_LIMITS,SIDEBAR_WIDTH_LIMITS,@@ -230,7 +234,7 @@ const elements = Object.fromEntries(["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-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","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", "manage-project-order", "selection-simple-actions", "selection-selected-actions", "show-analysis-diagnostics", "ui-locale", "ui-theme", "ui-motion", "vocabulary-tree",+ "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","open-curated", "open-skills", "open-trash", "trash-count", "trash-dialog", "trash-close", "trash-list", "trash-feedback", "trash-restore-all", "trash-empty", "data-safety-dialog", "data-safety-count", "data-safety-status", "data-safety-feedback",@@ -309,10 +313,9 @@ let unassignedViewActive = false;let caseSortMode = "added-desc";let caseOrderManagementActive = false;let caseOrderDragState = null;-let projectOrderManagementActive = false;-let projectOrderSaving = false;-let projectDragState = null;-const expandedProjectIds = new Set();+let projectTreeInteractions;+let lastProjectSelection = "";+const expandedProjectIds = readProjectExpansion();let selectionProjectTargetTouched = false;let caseSelectionSweep = null;let caseSelectionSweepUiFrame = 0;@@ -668,7 +671,13 @@ function bindEvents() {renderGalleryResults({ refreshNavigation: false });});elements.manageCaseOrder.addEventListener("click", toggleCaseOrderManagement);- elements.manageProjectOrder.addEventListener("click", toggleProjectOrderManagement);+ elements.collapseProjects.addEventListener("click", () => {+ projectTreeController().cancel();+ expandedProjectIds.clear();+ elements.projectSearch.value = "";+ renderProjectFilters();+ });+ elements.projectSearch.addEventListener("input", renderProjectFilters);elements.projectSelectionSelectFiltered.addEventListener("click", () => selectVisionCases("filtered"));elements.projectSelectionSelectAll.addEventListener("click", () => selectVisionCases("all"));elements.projectSelectionClear.addEventListener("click", clearVisionSelection);@@ -1844,54 +1853,39 @@ async function extractAndCachePdfText(assetId, blob, derived) {}function renderProjectFilters() {+ const openProjectId = elements.collectionFilters.querySelector(".project-menu[open]")+ ?.closest(".project-row")?.dataset.collectionId;const fragment = document.createDocumentFragment();const subtreeEntryIdsByProject = collectionSubtreeEntryIdsById(organizerState);const pathLabelsByProject = collectionPathLabelsById(organizerState);const childrenByParent = indexProjectChildren();+ const query = elements.projectSearch.value.trim();const projectOrderingUnavailable = Boolean(selectionMode);- elements.manageProjectOrder.hidden = false;- elements.manageProjectOrder.disabled = projectOrderingUnavailable;- const managementLabel = projectOrderingUnavailable- ? "结束案例选择后可管理项目结构"- : projectOrderManagementActive ? "完成项目结构管理" : "管理项目结构";- elements.manageProjectOrder.setAttribute("aria-label", managementLabel);- elements.manageProjectOrder.title = managementLabel;- elements.manageProjectOrder.replaceChildren(createUiIcon(projectOrderManagementActive ? "circle-check-big" : "sliders-horizontal"));- elements.projectRootDrop.hidden = !projectOrderManagementActive;- if (selectedCollectionId) {+ if (selectedCollectionId !== lastProjectSelection) {+ lastProjectSelection = selectedCollectionId;for (const ancestor of collectionPath(organizerState, selectedCollectionId).slice(0, -1)) expandedProjectIds.add(ancestor.id);}- const visibleCollections = [];- const pendingCollections = [...(childrenByParent.get(null) ?? [])]- .reverse()- .map((collection) => ({ collection, depth: 0 }));- while (pendingCollections.length) {- const current = pendingCollections.pop();- visibleCollections.push(current);- if (!expandedProjectIds.has(current.collection.id)) continue;- const children = childrenByParent.get(current.collection.id) ?? [];- for (let index = children.length - 1; index >= 0; index -= 1) {- pendingCollections.push({ collection: children[index], depth: current.depth + 1 });- }- }+ elements.collapseProjects.disabled = !expandedProjectIds.size;+ const visibleCollections = projectTreeRows(childrenByParent, expandedProjectIds, query, pathLabelsByProject);for (const [projectIndex, { collection, depth }] of visibleCollections.entries()) {const children = childrenByParent.get(collection.id) ?? [];const siblings = childrenByParent.get(collection.parentId) ?? [];const row = el("div", "project-row");row.dataset.collectionId = collection.id;- row.style.setProperty("--project-depth", String(depth));+ row.style.setProperty("--project-depth", String(query ? 0 : depth));row.setAttribute("role", "treeitem");- row.setAttribute("aria-level", String(depth + 1));- row.setAttribute("aria-setsize", String(siblings.length));- row.setAttribute("aria-posinset", String(siblings.findIndex((item) => item.id === collection.id) + 1));- if (children.length) row.setAttribute("aria-expanded", String(expandedProjectIds.has(collection.id)));- row.classList.toggle("project-ordering", projectOrderManagementActive);- row.tabIndex = projectOrderManagementActive ? 0 : -1;- row.setAttribute("aria-label", projectOrderManagementActive ? `移动项目:${pathLabelsByProject.get(collection.id)},树中位置 ${projectIndex + 1}` : collection.name);+ row.setAttribute("aria-level", String(query ? 1 : depth + 1));+ row.setAttribute("aria-setsize", String(query ? visibleCollections.length : siblings.length));+ row.setAttribute("aria-posinset", String(query ? projectIndex + 1 : siblings.findIndex((item) => item.id === collection.id) + 1));+ if (children.length && !query) row.setAttribute("aria-expanded", String(expandedProjectIds.has(collection.id)));+ row.classList.toggle("project-draggable", !projectOrderingUnavailable);+ row.classList.toggle("project-search-result", Boolean(query));+ row.tabIndex = -1;+ row.setAttribute("aria-label", query ? pathLabelsByProject.get(collection.id) : collection.name);const disclosure = el("button", "project-disclosure");disclosure.type = "button";disclosure.tabIndex = -1;- disclosure.disabled = projectOrderManagementActive;+ disclosure.hidden = Boolean(query);disclosure.setAttribute("aria-label", expandedProjectIds.has(collection.id) ? `折叠 ${collection.name}` : `展开 ${collection.name}`);disclosure.classList.toggle("is-placeholder", !children.length);if (children.length) disclosure.append(createUiIcon(expandedProjectIds.has(collection.id) ? "chevron-down" : "chevron-right"));@@ -1904,25 +1898,30 @@ function renderProjectFilters() {.map((id) => logicalIdByEntryId.get(id)).filter(Boolean)).size;const filter = el("button", "project-filter");filter.type = "button";- filter.tabIndex = projectOrderManagementActive ? -1 : 0;+ filter.tabIndex = 0;filter.disabled = ["project", "vision", "combine"].includes(selectionMode);filter.setAttribute("aria-pressed", String(selectedCollectionId === collection.id));filter.setAttribute("aria-label", `${collection.name} ${logicalCount}`);const meta = el("span", "project-filter-meta");meta.append(rawTextEl("span", "project-filter-count", String(logicalCount)));filter.addEventListener("click", () => {- if (projectOrderManagementActive) return;caseOrderManagementActive = false;unassignedViewActive = false;selectedCollectionId = selectedCollectionId === collection.id ? "" : collection.id;+ if (query) elements.projectSearch.value = "";renderGallery();});if (collection.visibility === COLLECTION_VISIBILITY.projectOnly) {meta.append(textEl("span", "project-visibility", "仅项目"));}- filter.append(rawTextEl("span", "project-filter-name", collection.name), meta);+ const name = rawTextEl("span", "project-filter-name", collection.name);+ if (query) {+ const label = el("span", "project-search-label");+ label.append(name, rawTextEl("small", "project-search-path", pathLabelsByProject.get(collection.id)));+ filter.append(label, meta);+ } else filter.append(name, meta);const menu = el("details", "project-menu");- menu.hidden = projectOrderManagementActive || ["project", "vision", "combine"].includes(selectionMode);+ menu.hidden = ["project", "vision", "combine"].includes(selectionMode);const summary = el("summary", "");summary.append(createUiIcon("ellipsis"));summary.setAttribute("aria-label", `${t("管理项目")}:${collection.name}`);@@ -1936,6 +1935,13 @@ function renderProjectFilters() {"button-secondary",collection.visibility === COLLECTION_VISIBILITY.projectOnly ? "资料库可见" : "仅项目可见");+ const move = textEl("button", "button-secondary", "移动到…");+ move.disabled = projectOrderingUnavailable;+ move.title = projectOrderingUnavailable ? t("结束案例选择后可移动项目") : "";+ move.addEventListener("click", () => {+ menu.open = false;+ void projectTreeController().openMove(collection);+ });const rename = textEl("button", "button-secondary", "重命名");const remove = textEl("button", "quiet-danger", "仅删除项目");const removeWithEntries = textEl("button", "quiet-danger", "删除项目及案例");@@ -1946,14 +1952,19 @@ function renderProjectFilters() {rename.addEventListener("click", () => renameProjectCollection(collection));remove.addEventListener("click", () => deleteProjectCollection(collection));removeWithEntries.addEventListener("click", () => deleteProjectCollectionWithEntries(collection, removeWithEntries));- actions.append(manage, analyze, share, visibility, rename, remove, removeWithEntries);+ actions.append(manage, move, analyze, share, visibility, rename, remove, removeWithEntries);menu.append(summary, actions);- if (projectOrderManagementActive) bindProjectOrderInteractions(row, collection);- else bindProjectTreeNavigation(row, collection);+ bindProjectTreeNavigation(row, collection);row.append(disclosure, filter, menu);fragment.append(row);}+ if (!visibleCollections.length && query) fragment.append(textEl("p", "project-search-empty", "没有匹配的项目"));elements.collectionFilters.replaceChildren(fragment);+ if (openProjectId) {+ const menu = elements.collectionFilters.querySelector(`[data-collection-id="${CSS.escape(openProjectId)}"] .project-menu`);+ if (menu && !menu.hidden) menu.open = true;+ }+ projectTreeController().sync();}function projectChildren(parentId = null) {@@ -1973,145 +1984,21 @@ function indexProjectChildren() {return result;}-function toggleProjectOrderManagement() {- if (selectionMode) return;- cancelProjectDrag();- projectOrderManagementActive = !projectOrderManagementActive;- if (projectOrderManagementActive) {- for (const parentId of indexProjectChildren().keys()) if (parentId) expandedProjectIds.add(parentId);- }- renderProjectFilters();-}--function bindProjectOrderInteractions(row, collection) {- row.addEventListener("pointerdown", (event) => {- if (projectOrderSaving || event.button > 0) return;- event.preventDefault();- row.focus({ preventScroll: true });- projectDragState = {- pointerId: event.pointerId,- row,- collectionId: collection.id,- startY: event.clientY,- moved: false,- drop: null- };- try { row.setPointerCapture(event.pointerId); } catch {}+function projectTreeController() {+ return projectTreeInteractions ??= createProjectTreeInteractions({+ elements,+ expanded: expandedProjectIds,+ getState: () => organizerState,+ unavailable: () => Boolean(selectionMode),+ render: renderProjectFilters,+ onState: (state) => { organizerState = state; renderGallery(); },+ feedback: showFeedback});- row.addEventListener("pointermove", (event) => {- const drag = projectDragState;- if (!drag || drag.row !== row || drag.pointerId !== event.pointerId) return;- if (!drag.moved && Math.abs(event.clientY - drag.startY) < 4) return;- event.preventDefault();- drag.moved = true;- row.classList.add("is-dragging");- elements.collectionFilters.classList.add("is-project-dragging");- clearProjectDropIndicators();- const hit = document.elementFromPoint(event.clientX, event.clientY);- if (hit?.closest?.("#project-root-drop")) {- elements.projectRootDrop.classList.add("is-drop-target");- drag.drop = { parentId: null, index: projectChildren(null).filter((item) => item.id !== collection.id).length };- return;- }- const targetRow = hit?.closest?.(".project-row");- if (!targetRow || targetRow === row) return;- const target = organizerState.collections.find((item) => item.id === targetRow.dataset.collectionId);- if (!target) return;- const rect = targetRow.getBoundingClientRect();- const ratio = (event.clientY - rect.top) / Math.max(1, rect.height);- const position = ratio < .28 ? "before" : ratio > .72 ? "after" : "inside";- targetRow.classList.add(`drop-${position}`);- drag.drop = projectDropPlan(collection.id, target, position);- });- const finish = (event) => {- const drag = projectDragState;- if (!drag || drag.row !== row || drag.pointerId !== event.pointerId) return;- const moved = drag.moved;- const drop = drag.drop;- cancelProjectDrag();- if (!moved || !drop) return;- void persistProjectCollectionMove(collection.id, drop.parentId, drop.index);- };- row.addEventListener("pointerup", finish);- row.addEventListener("pointercancel", () => {- cancelProjectDrag();- renderProjectFilters();- });- row.addEventListener("keydown", (event) => {- if (!projectOrderManagementActive || projectOrderSaving || !["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Home", "End"].includes(event.key)) return;- event.preventDefault();- const siblings = projectChildren(collection.parentId);- const index = siblings.findIndex((item) => item.id === collection.id);- if (event.key === "Home" || event.key === "End") {- const target = event.key === "Home" ? siblings[0] : siblings.at(-1);- return focusProjectRow(target?.id);- }- if (event.key === "ArrowUp" && index > 0) return void persistProjectCollectionMove(collection.id, collection.parentId, index - 1);- if (event.key === "ArrowDown" && index >= 0 && index < siblings.length - 1) return void persistProjectCollectionMove(collection.id, collection.parentId, index + 1);- if (event.key === "ArrowRight" && index > 0) {- const parent = siblings[index - 1];- expandedProjectIds.add(parent.id);- return void persistProjectCollectionMove(collection.id, parent.id, projectChildren(parent.id).length);- }- if (event.key === "ArrowLeft" && collection.parentId) {- const parent = organizerState.collections.find((item) => item.id === collection.parentId);- if (!parent) return;- const parentSiblings = projectChildren(parent.parentId).filter((item) => item.id !== collection.id);- const parentIndex = parentSiblings.findIndex((item) => item.id === parent.id);- return void persistProjectCollectionMove(collection.id, parent.parentId, parentIndex + 1);- }- });-}--function projectDropPlan(collectionId, target, position) {- if (position === "inside") {- return { parentId: target.id, index: projectChildren(target.id).filter((item) => item.id !== collectionId).length };- }- const siblings = projectChildren(target.parentId).filter((item) => item.id !== collectionId);- const targetIndex = siblings.findIndex((item) => item.id === target.id);- return { parentId: target.parentId, index: targetIndex + (position === "after" ? 1 : 0) };-}--function clearProjectDropIndicators() {- elements.projectRootDrop.classList.remove("is-drop-target");- for (const item of elements.collectionFilters.querySelectorAll(".drop-before, .drop-inside, .drop-after")) {- item.classList.remove("drop-before", "drop-inside", "drop-after");- }-}--function cancelProjectDrag() {- const drag = projectDragState;- if (!drag) return;- if (drag.row.hasPointerCapture?.(drag.pointerId)) {- try { drag.row.releasePointerCapture(drag.pointerId); } catch {}- }- drag.row.classList.remove("is-dragging");- elements.collectionFilters.classList.remove("is-project-dragging");- clearProjectDropIndicators();- projectDragState = null;-}--async function persistProjectCollectionMove(collectionId, parentId, index) {- if (projectOrderSaving) return;- projectOrderSaving = true;- try {- const response = await chrome.runtime.sendMessage({ type: "MOVE_COLLECTION", collectionId, parentId, index });- if (!response?.ok) throw new Error(response?.message || "项目结构保存失败");- organizerState = response.organizerState ?? organizerState;- const project = organizerState.collections.find((item) => item.id === collectionId);- elements.projectOrderStatus.textContent = `已移动“${project?.name || "项目"}”到 ${collectionPathLabel(organizerState, collectionId)}`;- renderProjectFilters();- queueMicrotask(() => focusProjectRow(collectionId));- } catch (error) {- showFeedback(error.message || "项目结构保存失败", true);- renderProjectFilters();- } finally {- projectOrderSaving = false;- }}function bindProjectTreeNavigation(row, collection) {row.addEventListener("keydown", (event) => {+ if (event.target.closest(".project-menu")) return;const rows = [...elements.collectionFilters.querySelectorAll(".project-row")];const index = rows.indexOf(row);if (event.key === "ArrowDown" || event.key === "ArrowUp" || event.key === "Home" || event.key === "End") {@@ -2120,20 +2007,20 @@ function bindProjectTreeNavigation(row, collection) {: event.key === "End" ? rows.at(-1): rows[index + (event.key === "ArrowDown" ? 1 : -1)];target?.querySelector(".project-filter")?.focus();- } else if (event.key === "ArrowRight") {+ } else if (event.key === "ArrowRight" && !elements.projectSearch.value.trim()) {event.preventDefault();if (projectChildren(collection.id).length && !expandedProjectIds.has(collection.id)) {expandedProjectIds.add(collection.id);renderProjectFilters();- queueMicrotask(() => focusProjectRow(collection.id, true));- } else if (projectChildren(collection.id).length) focusProjectRow(projectChildren(collection.id)[0].id, true);- } else if (event.key === "ArrowLeft") {+ queueMicrotask(() => focusProjectRow(collection.id));+ } else if (projectChildren(collection.id).length) focusProjectRow(projectChildren(collection.id)[0].id);+ } else if (event.key === "ArrowLeft" && !elements.projectSearch.value.trim()) {event.preventDefault();if (expandedProjectIds.has(collection.id)) {expandedProjectIds.delete(collection.id);renderProjectFilters();- queueMicrotask(() => focusProjectRow(collection.id, true));- } else if (collection.parentId) focusProjectRow(collection.parentId, true);+ queueMicrotask(() => focusProjectRow(collection.id));+ } else if (collection.parentId) focusProjectRow(collection.parentId);} else if (event.key.length === 1 && !event.ctrlKey && !event.metaKey && !event.altKey) {const match = rows.find((candidate, candidateIndex) => candidateIndex > index && candidate.querySelector(".project-filter-name")?.textContent?.toLocaleLowerCase().startsWith(event.key.toLocaleLowerCase()))?? rows.find((candidate) => candidate.querySelector(".project-filter-name")?.textContent?.toLocaleLowerCase().startsWith(event.key.toLocaleLowerCase()));@@ -2142,9 +2029,9 @@ function bindProjectTreeNavigation(row, collection) {});}-function focusProjectRow(collectionId, filter = false) {+function focusProjectRow(collectionId) {const row = elements.collectionFilters.querySelector(`[data-collection-id="${CSS.escape(collectionId || "")}"]`);- (filter ? row?.querySelector(".project-filter") : row)?.focus({ preventScroll: true });+ row?.querySelector(".project-filter")?.focus({ preventScroll: true });}async function updateProjectVisibility(collection, button) {@@ -2221,7 +2108,7 @@ async function enterProjectSelection(collectionId) {selectionMode = "project";projectSelectionId = collection.id;caseOrderManagementActive = false;- projectOrderManagementActive = false;+ projectTreeInteractions?.cancel();unassignedViewActive = false;selectedCollectionId = collection.id;selectedCaseIds.clear();@@ -2250,7 +2137,7 @@ async function enterVisionSelection(collection) {selectionMode = "vision";projectSelectionId = collection.id;caseOrderManagementActive = false;- projectOrderManagementActive = false;+ projectTreeInteractions?.cancel();unassignedViewActive = false;selectedCollectionId = collection.id;replaceSelectedCaseIds(getVisionSelectableEntries("all").map((entry) => entry.id));@@ -2266,7 +2153,7 @@ async function enterSelectMode() {cancelCaseSelectionSweep();selectionMode = "select";caseOrderManagementActive = false;- projectOrderManagementActive = false;+ projectTreeInteractions?.cancel();selectionProjectTargetTouched = false;elements.selectionProjectTarget.value = "";selectedCaseIds.clear();@@ -2957,6 +2844,7 @@ function applyLibraryReturnSnapshot(snapshot) {selectedCollectionId = organizerState.collections.some((item) => item.id === snapshot.collectionId)? snapshot.collectionId: "";+ lastProjectSelection = selectedCollectionId;caseSortMode = snapshot.sortMode;selectedContentId = snapshot.contentId;selectedFacets = new Map();@@ -3008,7 +2896,7 @@ async function openRequestedLibraryTarget() {selectedContentId = "";selectedFacets.clear();caseOrderManagementActive = false;- projectOrderManagementActive = false;+ projectTreeInteractions?.cancel();elements.pendingFilter.checked = false;elements.searchInput.value = "";libraryReturnScrollY = null;@@ -3954,7 +3842,7 @@ async function restoreCompleteFolderBackup() {showDataSafetyFeedback(`${translateUiMessage(response.message)} · ${t("{label}已按预检方案完成", { label: recoveryLabel })}`);await renderDataSafetyStatus();} catch (error) {- const retained = applySucceeded+ const retained = (applySucceeded || error?.code === "IMPORT_OUTCOME_UNKNOWN")? new Set(savedIds): applyStarted ? await committedMediaIds(savedIds) : new Set();await Promise.allSettled(savedIds.filter((id) => !retained.has(id)).map((id) => deleteMediaBlob(id)));@@ -3966,6 +3854,7 @@ async function restoreCompleteFolderBackup() {async function restoreLastLibraryReplacementPoint() {if (dataSafetyOperationActive) return showDataSafetyFeedback(t("当前操作仍在进行,请等待完成"), true);+ const expectedPointId = elements.restoreLibraryReplacementPoint.dataset.pointId;const approved = await confirmAppAction({title: t("回退上次精确恢复?"),description: t("资料库会回到上次精确恢复前的状态;当前状态也会保存成新的回退点,因此仍可再次切换回来。"),@@ -3975,7 +3864,7 @@ async function restoreLastLibraryReplacementPoint() {if (!approved) return;await runDataSafetyAction(elements.restoreLibraryReplacementPoint,- { type: "RESTORE_LIBRARY_REPLACEMENT_POINT" }+ { type: "RESTORE_LIBRARY_REPLACEMENT_POINT", expectedPointId, operationId: crypto.randomUUID() });}@@ -4039,14 +3928,21 @@ async function inspectLibraryPackageBatchItem(batch, item) {const libraryText = await libraryFile.text();try { library = JSON.parse(libraryText); }catch { throw new Error("library.json 已损坏"); }- const resources = await reader.read(reader.names.filter((name) => name !== "library.json"), { signal: batch.controller.signal });+ const resources = await readZipResources(file, reader.names.filter((name) => name !== "library.json"), limits, {+ signal: batch.controller.signal,+ onProgress: ({ extractedBytes }) => updateLibraryPackageProgress(batch, item,+ t("读取校验 · {done} / {total}", { done: formatBytes(extractedBytes), total: formatBytes(reader.expandedBytes - libraryFile.size) }))+ });for (const [name, blob] of resources) files.set(name, blob);const inspection = await inspectLibraryTransfer({sourceType: LIBRARY_TRANSFER_SOURCES.SHARE_PACKAGE,library,files,limits,- validateImage: validateImportedImage+ validateImage: validateImportedImage,+ signal: batch.controller.signal,+ onImageProgress: ({ completed, total }) => updateLibraryPackageProgress(batch, item,+ t("检查图片 · {done}/{total}", { done: completed, total }))});if (pendingLibraryPackageBatch !== batch || !batch.items.includes(item)) return;item.status = "ready";@@ -4061,6 +3957,14 @@ async function inspectLibraryPackageBatchItem(batch, item) {renderLibraryPackageBatch();}+function updateLibraryPackageProgress(batch, item, message) {+ if (pendingLibraryPackageBatch !== batch || !batch.items.includes(item)) return;+ item.progress = message;+ const row = elements.libraryPackageImportList.children[batch.items.indexOf(item)];+ const status = row?.querySelector(".library-package-import-status");+ if (status) status.textContent = message;+}+async function refreshLibraryPackageBatchPlan(batch = pendingLibraryPackageBatch) {if (!batch || pendingLibraryPackageBatch !== batch || batch.submitting) return;const revision = ++batch.revision;@@ -4168,7 +4072,7 @@ function createLibraryPackageBatchRow(batch, item, sourceIndex) {? (batch.preview?.conflicts ?? []).filter((conflict) => conflict.sourceIndex === sourceIndex && conflict.requiresResolution): [];const status = el("div", `library-package-import-status${item.status === "error" ? " error" : ""}`);- if (item.status === "checking") status.textContent = t("检查中");+ if (item.status === "checking") status.textContent = item.progress || t("检查中");else if (item.status === "error") status.textContent = translateUiMessage(item.error);else if (conflicts.some((conflict) => conflict.unresolved)) status.textContent = t("待选择");else if (importReport) {@@ -4245,6 +4149,7 @@ async function removeLibraryPackageItem(batch, item) {async function retryLibraryPackageItem(batch, item) {if (pendingLibraryPackageBatch !== batch || batch.submitting) return;item.status = "checking";+ item.progress = "";item.error = "";item.inspection = null;batch.conflictResolutions = {};@@ -4270,15 +4175,24 @@ async function applyLibraryPackageBatch() {batch.submitting = true;renderLibraryPackageBatch();try {- for (const write of batch.preview.resourceWrites ?? []) {+ const resourceWrites = (batch.preview.resourceWrites ?? []).map(write => {const source = ready[write.sourceIndex]?.inspection?.resources;const blob = write.resourceType === "skill"? source?.skillAssets.get(write.sourceId): source?.assets.get(write.sourceId);if (!(blob instanceof Blob)) throw new Error("预检后的案例包资源已经变化,请重新检查");- await savePortableAssetBlob(write.targetId, blob, { checkCapacity: false });- savedIds.push(write.targetId);- }+ return { assetId: write.targetId, blob };+ });+ await savePortableAssetBlobs(resourceWrites, {+ checkCapacity: false,+ onProgress: ({ writtenBytes, totalBytes }) => {+ elements.libraryPackageImportFeedback.textContent = t("保存资源 · {done} / {total}", {+ done: formatBytes(writtenBytes), total: formatBytes(totalBytes)+ });+ }+ });+ for (const write of resourceWrites) savedIds.push(write.assetId);+ elements.libraryPackageImportFeedback.textContent = t("正在提交案例…");applyStarted = true;const operationId = createLibraryImportOperationId();const response = await applyLibraryImportWithReceipt({@@ -4297,7 +4211,7 @@ async function applyLibraryPackageBatch() {await renderDataSafetyStatus();if (ordinaryItems.length) await prepareLocalImport(ordinaryItems, { source: ordinaryItems.some((item) => item.relativePath.includes("/")) ? "folder" : "files" });} catch (error) {- const retained = applySucceeded+ const retained = (applySucceeded || error?.code === "IMPORT_OUTCOME_UNKNOWN")? new Set(savedIds): applyStarted ? await committedMediaIds(savedIds) : new Set();await Promise.allSettled(savedIds.filter((id) => !retained.has(id)).map((id) => deleteMediaBlob(id)));@@ -4330,17 +4244,6 @@ function createLibraryImportOperationId() {return `library-import:${crypto.randomUUID()}`;}-async function applyLibraryImportWithReceipt(message) {- try {- return await chrome.runtime.sendMessage(message);- } catch (firstError) {- try {- return await chrome.runtime.sendMessage(message);- } catch {- throw firstError;- }- }-}function backupMediaPaths(library) {return new Set([@@ -4557,22 +4460,9 @@ async function importCreativeExperimentArchive() {async function committedMediaIds(ids) {try {- const response = await chrome.runtime.sendMessage({ type: "GET_STATE" });+ const response = await chrome.runtime.sendMessage({ type: "GET_LIBRARY_ASSET_RETENTION", assetIds: ids });if (!response?.ok) return new Set(ids);- const targets = new Set(ids);- const retained = [- ...(response.entries ?? []).flatMap((entry) => entry.mediaAssets ?? entry.visuals ?? []).map((asset) => asset.id),- ...(response.creativeSkills?.items ?? []).flatMap((skill) => skill.packageFiles ?? []).map((file) => file.assetId),- ...(response.creativeRuns ?? []).flatMap((run) => run.outputs ?? []).map((output) => output.visual?.id),- ...(response.composerSessions ?? []).flatMap((session) => session.referenceSnapshots ?? [])- .flatMap((reference) => reference.assetRefs ?? []).map((asset) => asset.assetId),- ...(response.trashState?.items ?? []).flatMap((item) => {- if (item?.kind === "entry") return item.snapshot?.mediaAssets ?? item.snapshot?.visuals ?? [];- if (item?.kind === "media") return item.snapshot?.mediaAssets ?? [];- return [];- }).map((asset) => asset.id)- ];- return new Set(retained.filter((id) => targets.has(id)));+ return new Set(response.assetIds);} catch {return new Set(ids);}@@ -5017,7 +4907,7 @@ function clearFilters() {selectedCollectionId = "";unassignedViewActive = false;caseOrderManagementActive = false;- projectOrderManagementActive = false;+ projectTreeInteractions?.cancel();selectedContentId = "";selectedFacets.clear();elements.pendingFilter.checked = false;@@ -5029,7 +4919,7 @@ function openUnassignedView() {selectedCollectionId = "";unassignedViewActive = true;caseOrderManagementActive = false;- projectOrderManagementActive = false;+ projectTreeInteractions?.cancel();selectedContentId = "";selectedFacets.clear();elements.pendingFilter.checked = false;@@ -10635,6 +10525,7 @@ async function renderDataSafetyStatus() {elements.cancelSync.disabled = syncStatus.cancelRequested === true;elements.dataSafetyPassword.hidden = !(needsFolder || needsUnlock);elements.disconnectSyncFolder.hidden = !syncStatus.connected;+ elements.restoreLibraryReplacementPoint.dataset.pointId = response.replacementPointId || "";elements.restoreLibraryReplacementPoint.hidden = !response.canRestoreReplacementPoint;elements.restoreLibraryReplacementPoint.disabled = dataSafetyOperationActive || !response.canRestoreReplacementPoint;elements.restoreLibraryReplacementPoint.title = response.replacementPointCreatedAt@@ -10780,7 +10671,9 @@ async function runDataSafetyAction(button, message, refresh = true, options = {}String(message.password ?? "").length < 8) {throw new Error(t("同步密码至少需要 8 个字符"));}- const response = await chrome.runtime.sendMessage(message);+ const response = message.type === "RESTORE_LIBRARY_REPLACEMENT_POINT"+ ? await applyLibraryImportWithReceipt(message)+ : await chrome.runtime.sendMessage(message);if (!response?.ok) throw new Error(response?.message || t("操作失败"));elements.syncPassword.value = "";showDataSafetyFeedback(response.message || t("操作完成"));diff --git a/local-extension-upgrade-ui.js b/local-extension-upgrade-ui.jsindex 326a75a..556c020 100644--- a/local-extension-upgrade-ui.js+++ b/local-extension-upgrade-ui.js@@ -1,6 +1,7 @@import { showAppDialog } from "./ui-dialogs.js";import { t } from "./i18n.js";-import { blobDigest, installLocalUpgrade, localReleasePackageUrl, localUpgradeRecord, prepareLocalUpgrade, RECOVERY_DIRECTORY, verifyRecoveredUpgrade, verifyRunningUpgrade } from "./local-extension-upgrade.js";+import { blobDigest, cleanupLocalUpgrade, installLocalUpgrade, localInstallationDirectory, localReleasePackageUrl, localUpgradeRecord, prepareLocalUpgrade, RECOVERY_DIRECTORY, verifyRecoveredUpgrade, verifyRunningUpgrade, withLocalUpgradeLock } from "./local-extension-upgrade.js";+import { resolveLocalInstallationDirectory } from "./local-installation-directory.js";let active = false;@@ -11,10 +12,11 @@ export async function openLocalUpgrade(status, archive = null) {try {const pending = await localUpgradeRecord();if (pending) {- if (pending.phase !== "preparing" && !await verifyRunningUpgrade(pending, chrome.runtime)) throw new Error(t("上次升级尚未完成,请先处理升级恢复提示"));+ const recovered = pending.phase !== "preparing" && await verifyRecoveredUpgrade(pending, chrome.runtime);+ if (pending.phase !== "preparing" && !recovered && !await verifyRunningUpgrade(pending, chrome.runtime)) throw new Error(t("上次升级尚未完成,请先处理升级恢复提示"));const cleared = await showAppDialog({title: "清理上次程序恢复副本",- description: pending.phase === "preparing" ? "上次准备更新中断,原插件未更改。清理临时程序副本后继续。" : "已确认上次升级成功。允许清理程序恢复副本后继续;不会删除案例。",+ description: recovered ? "原版本可用,清理上次更新记录后继续;案例保持不变。" : pending.phase === "preparing" ? "上次准备更新中断,原插件未更改。清理临时程序副本后继续。" : "已确认上次升级成功。允许清理程序恢复副本后继续;不会删除案例。",confirmLabel: "允许并继续",onSubmit: finishLocalUpgrade});@@ -45,10 +47,13 @@ export async function openLocalUpgrade(status, archive = null) {});if (!ready) return;let writing = false;+ let savedDirectory = await localInstallationDirectory();await showAppDialog({title: t("升级到 {version}", { version: prepared.manifest.version }),- description: "请选择 Chrome 当前加载的插件文件夹。无需卸载、备份或导入案例。",- confirmLabel: "选择安装文件夹并升级",+ description: savedDirectory+ ? t("更新到原安装位置:{folder}。案例保留,文件夹名称不影响版本。", { folder: savedDirectory.name })+ : "选择 Chrome 当前加载的插件文件夹,以后复用此位置。文件夹名称不影响版本。",+ confirmLabel: savedDirectory ? "继续升级" : "选择安装文件夹并升级",pendingLabel: "正在核对安装目录…",dismissOnBackdrop: false,onReady: ({ dialog }) => {@@ -58,14 +63,17 @@ export async function openLocalUpgrade(status, archive = null) {},onSubmit: async (_values, controls) => {let root;- try { root = await window.showDirectoryPicker({ mode: "readwrite" }); }- catch (error) { if (error.name === "AbortError") return false; throw error; }+ try { root = await resolveLocalInstallationDirectory(savedDirectory); }+ catch (error) {+ savedDirectory = await localInstallationDirectory();+ if (error.name === "AbortError") return false;+ throw error;+ }writing = true;const beforeUnload = event => { event.preventDefault(); event.returnValue = ""; };window.addEventListener("beforeunload", beforeUnload);try {- await navigator.locks.request("promptdirector-extension-upgrade", { ifAvailable: true }, async lock => {- if (!lock) throw new Error(t("另一个页面正在升级,请等待完成"));+ await withLocalUpgradeLock(async () => {await installLocalUpgrade(root, prepared, {runtime: chrome.runtime,saveRecord: localUpgradeRecord,@@ -93,21 +101,18 @@ export async function runningUpgradeFeedback() {if (!record) return { message: "", cleanupRequired: false };if (record.phase === "preparing") return { message: t("上次准备更新中断,原插件未更改。清理临时程序副本后继续。"), cleanupRequired: true };if (await verifyRecoveredUpgrade(record, chrome.runtime)) {- // The recovery folder may now be the active installation. Never delete it here.- await localUpgradeRecord(null);- return { message: t("已恢复原版本,案例与媒体仍在原资料库"), cleanupRequired: false };+ return { message: t("已恢复原版本,案例与媒体仍在原资料库"), cleanupRequired: true };}if (!await verifyRunningUpgrade(record, chrome.runtime)) {return { message: t("上次升级未完成。请在 Chrome 扩展管理中加载安装目录内的 {folder},恢复原版本;无需卸载或导入案例。", { folder: RECOVERY_DIRECTORY }), cleanupRequired: false };}let cleanupRequired = true;+ await localInstallationDirectory(record.root);if (await record.root.queryPermission({ mode: "readwrite" }) === "granted") {try {- await record.root.removeEntry(RECOVERY_DIRECTORY, { recursive: true });- await localUpgradeRecord(null);- cleanupRequired = false;+ cleanupRequired = !await clearLocalUpgradeRecord(record);} catch (error) {- console.warn("Upgrade verified; program recovery cleanup pending", error);+ if (error?.code !== "UPGRADE_BUSY") console.warn("Upgrade verified; program recovery cleanup pending", error);}}return { message: t("已升级到 {version}", { version: record.targetVersion }), cleanupRequired };@@ -117,11 +122,17 @@ export async function finishLocalUpgrade() {const record = await localUpgradeRecord();if (!record) return true;if (await record.root.requestPermission({ mode: "readwrite" }) !== "granted") return false;- if (record.phase !== "preparing" && !await verifyRunningUpgrade(record, chrome.runtime)) {- throw new Error(t("上次升级尚未完成,请先处理升级恢复提示"));- }- try { await record.root.removeEntry(RECOVERY_DIRECTORY, { recursive: true }); }- catch (error) { if (error.name !== "NotFoundError") throw error; }- await localUpgradeRecord(null);- return true;+ return clearLocalUpgradeRecord(record);+}++async function clearLocalUpgradeRecord(record) {+ return withLocalUpgradeLock(async () => {+ const current = await localUpgradeRecord();+ if (!current) return true;+ if (current.targetVersion !== record.targetVersion || current.phase !== record.phase) return false;+ if (!await cleanupLocalUpgrade(current, { runtime: chrome.runtime })) return false;+ await localInstallationDirectory(current.root);+ await localUpgradeRecord(null);+ return true;+ });}diff --git a/local-extension-upgrade.js b/local-extension-upgrade.jsindex 4e7216e..9a40d8d 100644--- a/local-extension-upgrade.js+++ b/local-extension-upgrade.js@@ -9,7 +9,7 @@ export function isExtensionProgramPath(path) {return /^(?:[^/]+\.(?:js|css|html)|manifest\.json|LICENSE|NOTICE|THIRD_PARTY_NOTICES\.md)$/u.test(path)|| /^assets\/(?:ui-icons\.svg|icons\/(?:icon-source\.svg|icon-(?:16|32|48|128)\.png))$/u.test(path)|| /^_locales\/[^/]+\/messages\.json$/u.test(path)- || /^vendor\/(?:pdfjs|document-ingestion)\/.+/u.test(path);+ || /^vendor\/(?:pdfjs|document-ingestion|noble-hashes)\/.+/u.test(path);}export async function extensionIdForKey(key) {@@ -82,34 +82,52 @@ async function* programFiles(root, prefix = "") {for await (const [name, handle] of root.entries()) {const path = prefix + name;if (handle.kind === "file" && isExtensionProgramPath(path)) yield [path, await handle.getFile()];- if (handle.kind === "directory" && ["assets", "assets/icons", "_locales", "vendor", "vendor/pdfjs", "vendor/document-ingestion"].some(base => path === base || path.startsWith(base + "/"))) {+ if (handle.kind === "directory" && ["assets", "assets/icons", "_locales", "vendor", "vendor/pdfjs", "vendor/document-ingestion", "vendor/noble-hashes"].some(base => path === base || path.startsWith(base + "/"))) {yield* programFiles(handle, path + "/");}}}export async function verifyInstallationDirectory(root, runtime, fetchFn = fetch) {- try {- await root.getDirectoryHandle(".git");- throw new Error("这是源码工作目录,请通过项目更新代码,避免覆盖尚未发布的修改");- } catch (error) { if (error.name !== "NotFoundError") throw error; }+ for await (const [name] of root.entries()) {+ if (name === ".git") throw new Error("这是源码工作目录,请通过项目更新代码,避免覆盖尚未发布的修改");+ }const disk = await readFile(root, "manifest.json");if (!disk) throw new Error("所选文件夹不是插件安装目录");const manifest = JSON.parse(await disk.text());if (manifest.version !== runtime.getManifest().version || await extensionIdForKey(manifest.key) !== runtime.id) {throw new Error("所选目录与正在运行的插件不一致");}+ if (!await isRunningDirectory(root, runtime, fetchFn)) {+ throw new Error("请选择 Chrome 当前实际加载的安装目录,不能选择另一份解压副本");+ }+}++async function isRunningDirectory(root, runtime, fetchFn) {const name = `promptdirector-directory-check-${crypto.randomUUID()}.txt`;const token = crypto.randomUUID();try {await writeFile(root, name, new Blob([token]));const response = await fetchFn(runtime.getURL(name), { cache: "no-store" });- if (!response.ok || await response.text() !== token) throw new Error("请选择 Chrome 当前实际加载的安装目录,不能选择另一份解压副本");+ return response.ok && await response.text() === token;} finally {await root.removeEntry(name).catch(error => { if (error.name !== "NotFoundError") throw error; });}}+export async function cleanupLocalUpgrade(record, { runtime, fetchFn = fetch }) {+ if (record.phase !== "preparing" && !await verifyRunningUpgrade(record, runtime, fetchFn)+ && !await verifyRecoveredUpgrade(record, runtime, fetchFn)) {+ throw new Error("上次升级尚未完成,请先处理升级恢复提示");+ }+ // The recovery copy can itself be the active install. Only remove it when the+ // original directory is proven active; otherwise leave all its files intact.+ if (!await isRunningDirectory(record.root, runtime, fetchFn)) return false;+ try { await record.root.removeEntry(RECOVERY_DIRECTORY, { recursive: true }); }+ catch (error) { if (error.name !== "NotFoundError") throw error; }+ return true;+}+export async function installLocalUpgrade(root, prepared, { runtime, fetchFn = fetch, saveRecord, onProgress = () => undefined }) {await verifyInstallationDirectory(root, runtime, fetchFn);// Do not overwrite a recovery point left by an interrupted upgrade.@@ -167,6 +185,14 @@ export async function installLocalUpgrade(root, prepared, { runtime, fetchFn = f}export async function localUpgradeRecord(value = undefined) {+ return updaterState(RECORD_KEY, value);+}++export async function localInstallationDirectory(value = undefined) {+ return updaterState("installation-directory", value);+}++async function updaterState(key, value) {const db = await new Promise((resolve, reject) => {const request = indexedDB.open("promptdirector-extension-updater", 1);request.onupgradeneeded = () => request.result.createObjectStore("state");@@ -177,7 +203,7 @@ export async function localUpgradeRecord(value = undefined) {return await new Promise((resolve, reject) => {const transaction = db.transaction("state", value === undefined ? "readonly" : "readwrite");const store = transaction.objectStore("state");- const request = value === undefined ? store.get(RECORD_KEY) : value === null ? store.delete(RECORD_KEY) : store.put(value, RECORD_KEY);+ const request = value === undefined ? store.get(key) : value === null ? store.delete(key) : store.put(value, key);transaction.oncomplete = () => resolve(request.result);transaction.onerror = () => reject(transaction.error);transaction.onabort = () => reject(transaction.error || new Error("无法记录升级进度"));@@ -198,3 +224,10 @@ export async function verifyRecoveredUpgrade(record, runtime, fetchFn = fetch) {if (!record.oldHashes || !Object.keys(record.oldHashes).length) return false;return verifyRunningUpgrade({ targetVersion: record.previousVersion, hashes: record.oldHashes }, runtime, fetchFn);}++export async function withLocalUpgradeLock(task) {+ return navigator.locks.request("promptdirector-extension-upgrade", { ifAvailable: true }, async lock => {+ if (!lock) throw Object.assign(new Error("另一个页面正在升级,请等待完成"), { code: "UPGRADE_BUSY" });+ return task();+ });+}diff --git a/local-installation-directory.js b/local-installation-directory.jsnew file mode 100644index 0000000..7c1dba8--- /dev/null+++ b/local-installation-directory.js@@ -0,0 +1,27 @@+import { localInstallationDirectory, verifyInstallationDirectory } from "./local-extension-upgrade.js";++// The handle stays in this browser's updater database, outside portable case data.+export async function resolveLocalInstallationDirectory(saved, {+ runtime = chrome.runtime,+ pickDirectory = () => window.showDirectoryPicker({ mode: "readwrite", id: "promptdirector-installation" }),+ remember = localInstallationDirectory,+ fetchFn = fetch+} = {}) {+ let root = saved;+ if (root) {+ if (await root.queryPermission({ mode: "readwrite" }) !== "granted"+ && await root.requestPermission({ mode: "readwrite" }) !== "granted") {+ throw new Error("需要安装目录的写入授权才能更新,案例未改变");+ }+ } else {+ root = await pickDirectory();+ }+ try {+ await verifyInstallationDirectory(root, runtime, fetchFn);+ } catch (error) {+ if (saved) await remember(null);+ throw error;+ }+ await remember(root);+ return root;+}diff --git a/manifest.json b/manifest.jsonindex 963ec3b..74c0b4b 100644--- a/manifest.json+++ b/manifest.json@@ -1,7 +1,7 @@{"manifest_version": 3,"name": "__MSG_extensionName__",- "version": "1.20.4",+ "version": "1.20.5","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",diff --git a/media-store.js b/media-store.jsindex cf9ca4d..431e3f1 100644--- a/media-store.js+++ b/media-store.js@@ -26,6 +26,42 @@ export async function savePortableAssetBlob(assetId, blob, options = {}) {return writeMediaBlob(assetId, blob, options);}+export async function savePortableAssetBlobs(items, options = {}) {+ if (!Array.isArray(items)) throw new Error("媒体文件列表无效");+ const ids = new Set();+ let bytes = 0;+ for (const { assetId, blob } of items) {+ validateAssetId(assetId);+ validatePortableAssetBlob(blob);+ if (ids.has(assetId)) throw new Error("媒体文件编号重复");+ ids.add(assetId);+ bytes += blob.size;+ }+ if (!items.length) return;+ if (options.checkCapacity !== false) assertStorageCapacity(await storageEstimate(options.estimateStorage), bytes);+ const transaction = (await openDatabase()).transaction(MEDIA_STORE, "readwrite");+ const completed = transactionAsPromise(transaction);+ try {+ const store = transaction.objectStore(MEDIA_STORE);+ let written = 0;+ let writtenBytes = 0;+ // Queue Blob handles in one transaction; no full-file ArrayBuffer copies.+ // Only transaction completion makes this staged resource group durable.+ for (const { assetId, blob } of items) {+ store.put(blob, assetId).onsuccess = () => {+ written += 1;+ writtenBytes += blob.size;+ options.onProgress?.({ completed: written, total: items.length, writtenBytes, totalBytes: bytes });+ };+ }+ await completed;+ } catch (error) {+ try { transaction.abort(); } catch {}+ await completed.catch(() => {});+ throw mediaStorageWriteError(error);+ }+}+async function writeMediaBlob(assetId, blob, options = {}) {if (options.checkCapacity !== false) {const estimate = await storageEstimate(options.estimateStorage);diff --git a/package-lock.json b/package-lock.jsonindex 3ed04f9..faefd11 100644--- a/package-lock.json+++ b/package-lock.json@@ -1,12 +1,12 @@{"name": "prompt-case-collector",- "version": "1.20.4",+ "version": "1.20.5","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "prompt-case-collector",- "version": "1.20.4",+ "version": "1.20.5","license": "Apache-2.0","dependencies": {"@jonahschulte/rtf-toolkit": "0.5.0",diff --git a/package.json b/package.jsonindex 0614ba2..574aa87 100644--- a/package.json+++ b/package.json@@ -1,6 +1,6 @@{"name": "prompt-case-collector",- "version": "1.20.4",+ "version": "1.20.5","private": false,"license": "Apache-2.0","repository": "https://github.com/wchao6891/PromptDirector",diff --git a/project-tree.js b/project-tree.jsnew file mode 100644index 0000000..43dbb5a--- /dev/null+++ b/project-tree.js@@ -0,0 +1,324 @@+import { collectionPathLabelsById, collectionSubtreeIds } from "./organizer.js";+import { attachProjectCombobox } from "./project-combobox.js";+import { showAppDialog } from "./ui-dialogs.js";+import { t } from "./i18n.js";++const EXPANSION_KEY = "promptdirector-project-tree-expanded";+// Keep the existing pointer threshold; a deliberate pause opens a folded branch.+const DRAG_THRESHOLD = 4;+const HOVER_EXPAND_MS = 600;++export function readProjectExpansion(storage = sessionStorage) {+ try {+ const ids = JSON.parse(storage.getItem(EXPANSION_KEY) || "[]");+ return new Set(Array.isArray(ids) ? ids.filter((id) => typeof id === "string") : []);+ } catch { return new Set(); }+}++export function saveProjectExpansion(ids, storage = sessionStorage) {+ try { storage.setItem(EXPANSION_KEY, JSON.stringify([...ids])); } catch { /* View preference only. */ }+}++export function projectTreeRows(childrenByParent, expanded, query = "", paths = new Map()) {+ const rows = [];+ const search = query.trim().toLocaleLowerCase();+ const pending = [...(childrenByParent.get(null) ?? [])].reverse().map((collection) => ({ collection, depth: 0 }));+ while (pending.length) {+ const current = pending.pop();+ if (!search || (paths.get(current.collection.id) || current.collection.name).toLocaleLowerCase().includes(search)) rows.push(current);+ if (!search && !expanded.has(current.collection.id)) continue;+ const children = childrenByParent.get(current.collection.id) ?? [];+ for (let i = children.length - 1; i >= 0; i -= 1) pending.push({ collection: children[i], depth: current.depth + 1 });+ }+ return rows;+}++export function projectMovePlan(state, sourceId, targetId, position = "inside") {+ const excluded = new Set(collectionSubtreeIds(state, sourceId));+ if (!state.collections.some((item) => item.id === sourceId)) throw new Error(t("项目不存在"));+ if (targetId && excluded.has(targetId)) throw new Error(t("不能把项目移入自身或其子项目"));+ const target = targetId ? state.collections.find((item) => item.id === targetId) : null;+ if (targetId && !target) throw new Error(t("目标项目不存在"));+ if (!["inside", "before", "after"].includes(position) || (!target && position !== "inside")) throw new Error(t("请选择移动位置"));+ const parentId = position === "inside" ? target?.id ?? null : target.parentId;+ const siblings = state.collections.filter((item) => item.parentId === parentId && item.id !== sourceId)+ .sort((a, b) => a.order - b.order || a.name.localeCompare(b.name, "zh-CN"));+ return { parentId, index: position === "inside" ? siblings.length : siblings.findIndex((item) => item.id === targetId) + (position === "after" ? 1 : 0) };+}++export function createProjectTreeInteractions({ elements, expanded, getState, unavailable, render, onState, feedback }) {+ const list = elements.collectionFilters;+ const root = elements.projectRootDrop;+ const status = elements.projectOrderStatus;+ const undoButton = elements.projectMoveUndo;+ const scroller = list.closest(".filter-sidebar");+ document.body.append(elements.projectMoveFeedback);+ elements.projectMoveFeedback.querySelector(".project-move-dismiss").addEventListener("click", () => {+ elements.projectMoveFeedback.hidden = true;+ });+ let saving = false;+ let undo = null;+ let drag = null;+ let suppressClick = false;++ // Keep a bottom-row menu inside the viewport without changing other app menus.+ function positionMenu(menu) {+ const panel = menu.querySelector(".project-menu-panel");+ const anchor = menu.querySelector("summary").getBoundingClientRect();+ panel.popover = "manual";+ if (!panel.matches(":popover-open")) panel.showPopover();+ panel.style.position = "fixed";+ panel.style.margin = "0";+ panel.style.bottom = "auto";+ panel.style.maxHeight = `${window.innerHeight - 16}px`;+ panel.style.overflowY = "auto";+ panel.style.right = "auto";+ panel.style.left = `${Math.max(8, Math.min(anchor.right - panel.offsetWidth, window.innerWidth - panel.offsetWidth - 8))}px`;+ panel.style.top = `${Math.max(8, Math.min(anchor.bottom + 5, window.innerHeight - panel.offsetHeight - 8))}px`;+ }+ list.addEventListener("toggle", (event) => {+ if (!event.target.matches?.(".project-menu")) return;+ if (event.target.open) positionMenu(event.target);+ else {+ const panel = event.target.querySelector(".project-menu-panel");+ if (panel.matches(":popover-open")) panel.hidePopover();+ }+ }, true);+ scroller.addEventListener("scroll", () => {+ for (const menu of list.querySelectorAll(".project-menu[open]")) positionMenu(menu);+ }, { passive: true });+ window.addEventListener("resize", () => {+ for (const menu of list.querySelectorAll(".project-menu[open]")) positionMenu(menu);+ });++ function focus(id) {+ list.querySelector(`[data-collection-id="${CSS.escape(id)}"] .project-filter`)?.focus({ preventScroll: true });+ }++ async function move(id, parentId, index, { undoing = false } = {}) {+ if (saving || unavailable()) throw new Error(t("结束案例选择后可移动项目"));+ const before = getState().collections.find((item) => item.id === id);+ if (!before) throw new Error(t("项目不存在"));+ const siblings = getState().collections.filter((item) => item.parentId === before.parentId);+ const previous = { id, parentId: before.parentId, index: siblings.findIndex((item) => item.id === id) };+ saving = true;+ undoButton.disabled = true;+ list.setAttribute("aria-busy", "true");+ try {+ const response = await chrome.runtime.sendMessage({ type: "MOVE_COLLECTION", collectionId: id, parentId, index });+ if (!response?.ok) throw new Error(response?.message || t("项目结构保存失败"));+ onState(response.organizerState);+ undo = undoing ? null : previous;+ const paths = collectionPathLabelsById(getState());+ status.textContent = t(undoing ? "已撤销移动:{project}" : "已移动:{project}", { project: paths.get(id) });+ undoButton.hidden = !undo;+ elements.projectMoveFeedback.hidden = false;+ focus(id);+ return true;+ } finally {+ saving = false;+ list.removeAttribute("aria-busy");+ undoButton.disabled = unavailable();+ }+ }++ undoButton.addEventListener("click", () => {+ if (undo) void move(undo.id, undo.parentId, undo.index, { undoing: true }).catch((error) => feedback(error.message, true));+ });++ async function openMove(collection) {+ if (saving || unavailable()) return;+ const state = getState();+ const excluded = new Set(collectionSubtreeIds(state, collection.id));+ const paths = collectionPathLabelsById(state);+ const rootId = crypto.randomUUID();+ const projects = [{ id: rootId, pathLabel: t("项目根目录") }, ...state.collections.filter((item) => !excluded.has(item.id)).map((item) => ({ ...item, pathLabel: paths.get(item.id) }))];+ let combobox;+ await showAppDialog({+ title: t("移动项目“{project}”", { project: collection.name }),+ confirmLabel: t("移动"),+ fields: [+ { id: "destination", label: t("目标项目"), placeholder: t("搜索项目名称或路径"), required: true },+ { id: "position", label: t("移动位置"), type: "select", value: "inside", options: [+ { value: "inside", label: t("放入项目") }, { value: "before", label: t("放在前面") }, { value: "after", label: t("放在后面") }+ ] }+ ],+ onReady: ({ controls, body }) => {+ const input = controls.get("destination");+ const position = controls.get("position");+ combobox = attachProjectCombobox(input, { projects, destroyOnDialogClose: true });+ combobox.setSelected(collection.parentId || rootId);+ const preview = document.createElement("p");+ preview.className = "project-move-preview";+ preview.setAttribute("aria-live", "polite");+ body.append(preview);+ const update = () => {+ const isRoot = input.dataset.projectId === rootId;+ position.disabled = isRoot;+ if (isRoot) position.value = "inside";+ preview.textContent = t("{project} → {destination} · {position}", {+ project: collection.name, destination: input.value,+ position: isRoot ? t("根级末尾") : position.selectedOptions[0].textContent+ });+ };+ input.addEventListener("input", update);+ input.addEventListener("change", () => queueMicrotask(() => {+ combobox.close();+ if (!position.disabled) position.focus();+ }));+ position.addEventListener("change", update);+ update();+ },+ onSubmit: async (values, { form }) => {+ const targetId = form.elements.namedItem("destination").dataset.projectId;+ if (!projects.some((item) => item.id === targetId)) throw new Error(t("请从搜索结果中选择目标项目"));+ const plan = projectMovePlan(getState(), collection.id, targetId === rootId ? null : targetId, values.position);+ await move(collection.id, plan.parentId, plan.index);+ }+ });+ combobox?.destroy();+ focus(collection.id);+ }++ function clearIndicators() {+ root.classList.remove("is-drop-target");+ for (const row of list.querySelectorAll(".drop-before, .drop-after, .drop-inside")) row.classList.remove("drop-before", "drop-after", "drop-inside");+ }++ function cancel() {+ if (!drag) return;+ const previous = drag;+ drag = null;+ previous.events.abort();+ cancelAnimationFrame(previous.frame);+ clearTimeout(previous.hoverTimer);+ previous.preview?.remove();+ if (list.hasPointerCapture?.(previous.pointerId)) list.releasePointerCapture(previous.pointerId);+ root.hidden = true;+ clearIndicators();+ list.classList.remove("is-project-dragging");+ if (previous.moved) {+ expanded.clear();+ for (const id of previous.expansion) expanded.add(id);+ render();+ suppressClick = true;+ setTimeout(() => { suppressClick = false; }, 0);+ }+ }++ function updateDrop() {+ if (!drag?.moved) return;+ const bounds = scroller.getBoundingClientRect();+ root.style.left = `${bounds.left + 8}px`;+ root.style.top = `${Math.max(8, bounds.top + 8)}px`;+ root.style.width = `${bounds.width - 16}px`;+ clearIndicators();+ drag.drop = null;+ const hit = document.elementFromPoint(drag.x, drag.y);+ const row = hit?.closest?.(".project-row");+ const targetId = row?.dataset.collectionId;+ const rect = row?.getBoundingClientRect();+ const ratio = rect ? (drag.y - rect.top) / Math.max(1, rect.height) : 0;+ const position = ratio < .28 ? "before" : ratio > .72 ? "after" : "inside";+ const hoverId = row && position === "inside" && !drag.excluded.has(targetId) ? targetId : null;+ if (drag.hoverId !== hoverId) {+ clearTimeout(drag.hoverTimer);+ drag.hoverId = hoverId;+ if (hoverId && !expanded.has(hoverId) && getState().collections.some((item) => item.parentId === hoverId)) {+ drag.hoverTimer = setTimeout(() => {+ if (!drag || drag.hoverId !== hoverId) return;+ expanded.add(hoverId);+ render();+ updateDrop();+ }, HOVER_EXPAND_MS);+ }+ }+ let label = t("选择移动位置");+ try {+ if (hit?.closest?.("#project-root-drop")) {+ drag.drop = projectMovePlan(getState(), drag.id, null);+ root.classList.add("is-drop-target");+ label = t("移到根级");+ } else if (row && !drag.excluded.has(targetId)) {+ drag.drop = projectMovePlan(getState(), drag.id, targetId, position);+ row.classList.add(`drop-${position}`);+ label = t("{position}:{project}", { position: t(position === "inside" ? "放入项目" : position === "before" ? "放在前面" : "放在后面"), project: row.querySelector(".project-filter-name").textContent });+ }+ } catch (error) { label = error.message; }+ drag.preview.textContent = label;+ drag.preview.style.left = `${Math.min(drag.x + 12, window.innerWidth - drag.preview.offsetWidth)}px`;+ drag.preview.style.top = `${Math.min(drag.y + 16, window.innerHeight - drag.preview.offsetHeight)}px`;+ }++ function tick(time) {+ if (!drag?.moved) return;+ const bounds = scroller.getBoundingClientRect();+ const rowHeight = list.querySelector(".project-row")?.getBoundingClientRect().height || 30;+ const edge = rowHeight * 2;+ const top = Math.max(0, bounds.top);+ const bottom = Math.min(window.innerHeight, bounds.bottom);+ if (drag.x >= bounds.left && drag.x <= bounds.right && drag.y >= top && drag.y <= bottom) {+ const amount = drag.y < top + edge ? -Math.min(1, (top + edge - drag.y) / edge)+ : drag.y > bottom - edge ? Math.min(1, (drag.y - bottom + edge) / edge) : 0;+ const elapsed = Math.min(32, time - (drag.time || time));+ scroller.scrollTop += amount * rowHeight * elapsed / 32;+ }+ drag.time = time;+ updateDrop();+ drag.frame = requestAnimationFrame(tick);+ }++ list.addEventListener("click", (event) => {+ if (suppressClick) { event.preventDefault(); event.stopImmediatePropagation(); suppressClick = false; }+ }, true);+ list.addEventListener("dragstart", (event) => event.preventDefault());+ list.addEventListener("pointerdown", (event) => {+ if (saving || unavailable() || event.button > 0 || drag || event.target.closest(".project-disclosure, .project-menu")) return;+ const row = event.target.closest(".project-row");+ if (!row) return;+ const events = new AbortController();+ const options = { signal: events.signal };+ drag = { id: row.dataset.collectionId, pointerId: event.pointerId, x: event.clientX, y: event.clientY, startX: event.clientX, startY: event.clientY, moved: false, events, expansion: new Set(expanded) };+ document.addEventListener("pointermove", (next) => {+ if (!drag || next.pointerId !== drag.pointerId) return;+ drag.x = next.clientX;+ drag.y = next.clientY;+ if (!drag.moved && Math.hypot(drag.x - drag.startX, drag.y - drag.startY) < DRAG_THRESHOLD) return;+ next.preventDefault();+ if (!drag.moved) {+ drag.moved = true;+ drag.excluded = new Set(collectionSubtreeIds(getState(), drag.id));+ expanded.delete(drag.id);+ render();+ root.hidden = false;+ list.classList.add("is-project-dragging");+ try { list.setPointerCapture(drag.pointerId); } catch { /* Synthetic pointers cannot be captured. */ }+ drag.preview = document.createElement("div");+ drag.preview.className = "project-drag-preview";+ document.body.append(drag.preview);+ drag.frame = requestAnimationFrame(tick);+ }+ updateDrop();+ }, { ...options, passive: false });+ document.addEventListener("pointerup", (next) => {+ if (!drag || next.pointerId !== drag.pointerId) return;+ if (drag.moved) { drag.x = next.clientX; drag.y = next.clientY; updateDrop(); }+ const { id, drop } = drag;+ cancel();+ if (drop) void move(id, drop.parentId, drop.index).catch((error) => feedback(error.message, true));+ }, options);+ document.addEventListener("pointercancel", cancel, options);+ document.addEventListener("keydown", (next) => { if (next.key === "Escape") { next.preventDefault(); cancel(); } }, options);+ window.addEventListener("blur", cancel, options);+ });++ return {+ openMove, cancel,+ sync() {+ if (unavailable()) cancel();+ undoButton.disabled = saving || unavailable();+ if (drag?.moved) list.querySelector(`[data-collection-id="${CSS.escape(drag.id)}"]`)?.classList.add("is-dragging");+ else saveProjectExpansion(expanded);+ }+ };+}diff --git a/store/CHROME_WEB_STORE_SUBMISSION.md b/store/CHROME_WEB_STORE_SUBMISSION.mdindex 1aa1a0d..0b3267a 100644--- a/store/CHROME_WEB_STORE_SUBMISSION.md+++ b/store/CHROME_WEB_STORE_SUBMISSION.md@@ -6,7 +6,7 @@ This file is the source-of-truth worksheet for the current PromptDirector manife- 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/PromptDirector-1.20.4.zip`. The GitHub `FIXED-ID-DEV` artifact is for local installations only.+- Current upload artifact: `dist/PromptDirector-1.20.5.zip`. The GitHub `FIXED-ID-DEV` artifact is for local installations only.- 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. Record the generated ZIP size and SHA-256 from the final release assets.## Store listingdiff --git a/test/data-safety-ui.test.js b/test/data-safety-ui.test.jsindex 5d27d36..ea08c15 100644--- a/test/data-safety-ui.test.js+++ b/test/data-safety-ui.test.js@@ -128,7 +128,8 @@ test("multi-ZIP import uses one wide preflight with blocking failures and one baassert.match(flow, /retryLibraryPackageItem/);assert.match(flow, /removeLibraryPackageItem/);assert.match(flow, /batch\.preview\?\.unresolvedConflicts/);- assert.match(flow, /savePortableAssetBlob\(write\.targetId, blob, \{ checkCapacity: false \}\)/);+ assert.match(flow, /await savePortableAssetBlobs\(resourceWrites,/);+ assert.match(flow, /readZipResources\(file,/);});test("data safety cannot be dismissed accidentally while a storage operation is running", async () => {diff --git a/test/fixtures/zip/optional-zip64.zip b/test/fixtures/zip/optional-zip64.zipnew file mode 100644index 0000000..4fffad1Binary files /dev/null and b/test/fixtures/zip/optional-zip64.zip differdiff --git a/test/import-ui.test.js b/test/import-ui.test.jsindex fe14e65..8ac0109 100644--- a/test/import-ui.test.js+++ b/test/import-ui.test.js@@ -160,10 +160,10 @@ test("active import restoration and every terminal job action stay wired", () =>test("folder restore and ZIP import retry one response loss with the same operation receipt", () => {assert.match(js, /function createLibraryImportOperationId/);- assert.match(js, /async function applyLibraryImportWithReceipt/);+ assert.match(js, /import \{ applyLibraryImportWithReceipt \} from "\.\/library-import-client\.js"/);assert.equal(js.match(/const operationId\s*=\s*createLibraryImportOperationId\(\)/g)?.length, 2);assert.equal(js.match(/applyLibraryImportWithReceipt\(\{[\s\S]{0,180}?operationId,/g)?.length, 2);- assert.match(js, /await chrome\.runtime\.sendMessage\(message\)[\s\S]*await chrome\.runtime\.sendMessage\(message\)/);+});test("shared ZIP and degraded folders salvage individual failures while verified folders stay strict", () => {@@ -182,5 +182,5 @@ test("a committed import never deletes restored non-case media during later UI rassert.equal(js.match(/let applySucceeded\s*=\s*false/g)?.length, 2);assert.equal(js.match(/applySucceeded\s*=\s*true/g)?.length, 2);assert.match(js, /creativeRuns[\s\S]*composerSessions[\s\S]*trashState/);- assert.match(js, /applySucceeded\s*\?\s*new Set\(savedIds\)/);+ assert.match(js, /\(applySucceeded \|\| error\?\.code === "IMPORT_OUTCOME_UNKNOWN"\)\s*\?\s*new Set\(savedIds\)/);});diff --git a/test/library-import-client.test.js b/test/library-import-client.test.jsnew file mode 100644index 0000000..1af07c6--- /dev/null+++ b/test/library-import-client.test.js@@ -0,0 +1,28 @@+import test from "node:test";+import assert from "node:assert/strict";+import { applyLibraryImportWithReceipt } from "../library-import-client.js";+const message = { operationId: "fixture-operation", planToken: "fixture-plan" };+const result = { ok: true, recoveryPointCreatedAt: "fixture-date" };+const receipt = { ...message, status: "completed", result };+const readReceipts = async () => ({ libraryImportTransactions: { items: [receipt] } });+test("a completed restore whose reply was lost returns its durable result without applying again", async () => {+ let calls = 0;+ assert.deepEqual(await applyLibraryImportWithReceipt(message, {+ send: async () => { calls++; throw new Error("channel closed"); }, readReceipts+ }), result);+ assert.equal(calls, 1);+});+test("a pre-commit disconnection resumes the same operation and confirmed plan", async () => {+ let calls = 0;+ assert.deepEqual(await applyLibraryImportWithReceipt(message, {+ send: async request => { assert.equal(request, message); if (!calls++) throw new Error("channel closed"); return result; },+ readReceipts: async () => ({})+ }), result);+ assert.equal(calls, 2);+});+test("unconfirmed outcomes preserve staged media and are never reported as a failed commit", async () => {+ await assert.rejects(applyLibraryImportWithReceipt(message, {+ send: async () => { throw new Error("channel closed"); },+ readReceipts: async () => ({ libraryImportTransactions: { items: [{ ...receipt, planToken: "other-plan" }] } })+ }), { code: "IMPORT_OUTCOME_UNKNOWN" });+});diff --git a/test/library-import-media.test.js b/test/library-import-media.test.jsindex cbcfa32..725b081 100644--- a/test/library-import-media.test.js+++ b/test/library-import-media.test.js@@ -90,3 +90,9 @@ test("rescue validation removes undecodable images from every private backup scoassert.deepEqual([...salvageFiles.keys()], []);assert.equal(files.size, 4);});++test('cancelling image validation stops subsequent reads without classifying cancellation as damage',async()=>{+ const controller=new AbortController();let reads=0;const progress=[];+ await assert.rejects(findInvalidImportedImageIds(new Map([['a',new Blob(['a'])],['b',new Blob(['b'])]]),async()=>{reads++;controller.abort();throw controller.signal.reason;},{signal:controller.signal,onProgress:value=>progress.push(value)}),{name:'AbortError'});+ assert.equal(reads,1);assert.equal(progress.length,0);+});diff --git a/test/library-import-transaction.test.js b/test/library-import-transaction.test.jsindex 98ebc43..db2c1b0 100644--- a/test/library-import-transaction.test.js+++ b/test/library-import-transaction.test.js@@ -318,3 +318,16 @@ function makeImportSource() {creativeSkills: { items: [] }};}++test("serialized recovery resumes a worker-interrupted claim only while its confirmed plan is current", () => {+ const before = makeCurrentLibrary();+ const source = makeImportSource();+ const request = { operationId: "interrupted", planToken: createLibraryImportPlanToken(before, source), stateValue: before, sourceValue: source };+ const pending = claimLibraryImportTransaction({}, request);+ const resumed = claimLibraryImportTransaction(pending.state, request, { resumePending: true });+ assert.equal(resumed.acquired, true);+ assert.equal(resumed.receipt.operationId, pending.receipt.operationId);+ assert.throws(() => claimLibraryImportTransaction(pending.state, {+ ...request, stateValue: { ...before, entries: [] }+ }, { resumePending: true }), { code: "IMPORT_PLAN_STALE" });+});diff --git a/test/library-navigation.test.js b/test/library-navigation.test.jsindex 4d7a1b0..c009e35 100644--- a/test/library-navigation.test.js+++ b/test/library-navigation.test.js@@ -74,14 +74,14 @@ test("share and combine are contextual actions after entering selection mode", (assert.match(selection, /id="selection-more-menu"/);});-test("project heading keeps only creation and ordering while selected projects toggle off in place", () => {+test("project heading keeps only creation and collapse while selected projects toggle off in place", () => {const sidebar = html.slice(html.indexOf('<aside id="filter-sidebar"'), html.indexOf('</aside>'));assert.doesNotMatch(html, /id="active-filter-bar"|id="active-filters"/);assert.doesNotMatch(sidebar, /id="clear-filters"|id="active-filter-badge"|sidebar-filter-tools|清除全部筛选/);const projectHeading = sidebar.slice(sidebar.indexOf('id="project-section"'), sidebar.indexOf('id="collection-filters"'));assert.match(projectHeading, /id="create-collection"[\s\S]*icon-plus[\s\S]*data-i18n="新建"/);- assert.match(projectHeading, /id="manage-project-order"/);- assert.ok(projectHeading.indexOf('id="create-collection"') < projectHeading.indexOf('id="manage-project-order"'));+ assert.match(projectHeading, /id="collapse-projects"/);+ assert.ok(projectHeading.indexOf('id="create-collection"') < projectHeading.indexOf('id="collapse-projects"'));assert.match(source, /selectedCollectionId = selectedCollectionId === collection\.id \? "" : collection\.id/);assert.match(source, /toggleFilters\.dataset\.filterCount/);});diff --git a/test/library-sorting-ui.test.js b/test/library-sorting-ui.test.jsindex 6f30741..2508d9b 100644--- a/test/library-sorting-ui.test.js+++ b/test/library-sorting-ui.test.js@@ -8,7 +8,7 @@ const [html, source, css] = await Promise.all([readFile(new URL("../library.css", import.meta.url), "utf8")]);-test("library exposes four case sorts and keeps project structure management on demand", () => {+test("library exposes four case sorts and allows project management without a mode switch", () => {const gallerySort = html.slice(html.indexOf('id="gallery-sort"'), html.indexOf("</select>", html.indexOf('id="gallery-sort"')));assert.match(gallerySort, /value="added-desc"[^>]*>最近加入/);assert.match(gallerySort, /value="updated-desc"[^>]*>最近更新/);@@ -18,7 +18,8 @@ test("library exposes four case sorts and keeps project structure management onassert.match(html, /id="manage-case-order"[^>]*aria-label="管理案例顺序"/);assert.doesNotMatch(html, /id="project-sort"|最近创建|项目排序/);- assert.match(html, /id="manage-project-order"[^>]*aria-label="管理项目结构"/);+ assert.match(html, /id="collapse-projects"[^>]*aria-label="全部折叠"/);+ assert.match(html, /id="project-search"/);});test("sidebar derives an unassigned workspace without persisting smart or import-batch views", () => {@@ -50,29 +51,19 @@ test("case manual ordering is gated to an unfiltered project and project tree usassert.match(css, /\.case-card\.manual-project-order\s*\{[^}]*cursor:\s*grab/);assert.match(css, /\.case-card\.case-order-drop-before::before/);assert.doesNotMatch(css, /\.case-reorder-controls/);- assert.match(source, /projectOrderManagementActive/);- assert.match(source, /createUiIcon\(caseOrderManagementActive \? "circle-check-big" : "sliders-horizontal"\)/);- assert.match(source, /row\.addEventListener\("pointerdown"/);- assert.match(source, /row\.addEventListener\("pointermove"/);- assert.match(source, /"ArrowLeft", "ArrowRight", "Home", "End"/);- assert.match(source, /type: "MOVE_COLLECTION", collectionId, parentId, index/);- assert.match(source, /position === "inside"/);- assert.match(source, /menu\.hidden = projectOrderManagementActive/);- assert.match(css, /\.project-row\.project-ordering/);- assert.match(css, /\.project-row\.project-ordering\s*\{[^}]*user-select:\s*none/);- assert.match(source, /elements\.manageProjectOrder\.disabled = projectOrderingUnavailable/);- assert.match(source, /"结束案例选择后可管理项目结构"/);- assert.doesNotMatch(source, /elements\.manageProjectOrder\.hidden = Boolean\(selectionMode\)/);- assert.doesNotMatch(source, /createUiIcon\("arrow-(?:up|down)"\)/);+ assert.match(source, /createProjectTreeInteractions/);+ assert.match(source, /move.disabled = projectOrderingUnavailable/);+ assert.match(css, /\.project-row\.project-draggable\s*\{[^}]*user-select:\s*none/);+ assert.doesNotMatch(source, /projectOrderManagementActive|toggleProjectOrderManagement/);});test("project tree rendering indexes children once and traverses deep trees iteratively", () => {const render = source.slice(source.indexOf("function renderProjectFilters"), source.indexOf("function projectChildren"));assert.match(render, /const childrenByParent = indexProjectChildren\(\)/);- assert.match(render, /while \(pendingCollections\.length\)/);+ assert.match(render, /projectTreeRows/);assert.doesNotMatch(render, /appendVisible|renderProjectFilters\([^)]*depth/);- const index = source.slice(source.indexOf("function indexProjectChildren"), source.indexOf("function toggleProjectOrderManagement"));+ const index = source.slice(source.indexOf("function indexProjectChildren"), source.indexOf("function projectTreeController"));assert.match(index, /const result = new Map\(\)/);assert.match(index, /for \(const collection of organizerState\.collections\)/);});diff --git a/test/library_import_benchmark.py b/test/library_import_benchmark.pynew file mode 100644index 0000000..0a29c5c--- /dev/null+++ b/test/library_import_benchmark.py@@ -0,0 +1,40 @@+"""Opt-in 2 GiB synthetic transport timing; not a user-machine acceptance test."""+import sys, json, tempfile, zipfile+from pathlib import Path+from e2e_support import extension_session, base_entry+with tempfile.TemporaryDirectory(prefix='pd-import-benchmark-') as temporary, extension_session('pd-import-perf-') as s:+ root=Path(temporary)+ p=s.open_page('collector.html')+ archive=root/'synthetic-2g.zip'+ if not archive.exists():+ entry=base_entry('perf-case','Synthetic 2 GiB transport','Synthetic original attachments; not user data','content:prompt:text')+ entry['mediaAssets']=[dict(id=f'perf-{i}',kind='attachment',storageMode='managed',mimeType='image/vnd.adobe.photoshop',sourceFormat='psd',byteSize=4*1024*1024,capturedAt='2026-09-09T00:00:00.000Z',assetPath=f'attachments/{i}.psd') for i in range(512)]+ entry['primaryMediaId']='perf-0'+ library=p.evaluate("async entry => (await import(chrome.runtime.getURL('lib.js'))).renderLibraryJson([entry])", entry)+ block=bytes(range(256))*16384+ with zipfile.ZipFile(archive,'w',compression=zipfile.ZIP_STORED) as z:+ z.writestr('library.json',library)+ for a in entry['mediaAssets']: z.writestr(a['assetPath'],block)+ p.evaluate("() => { const input=document.createElement('input'); input.type='file'; input.id='perf-file';document.body.append(input); }")+ p.locator('#perf-file').set_input_files(str(archive))+ result=p.evaluate('''async mode => {+ const {openZipBlob}=await import(chrome.runtime.getURL('zip.js'));+ const {inspectLibraryTransfer}=await import(chrome.runtime.getURL('library-transfer.js'));+ const store=await import(chrome.runtime.getURL('media-store.js'));+ const {libraryTransferLimits}=await import(chrome.runtime.getURL('resource-limits.js'));+ const start=performance.now(); const reader=await openZipBlob(document.querySelector('#perf-file').files[0],libraryTransferLimits());+ const indexed=performance.now();+ const {readZipResources}=await import(chrome.runtime.getURL('zip-reader.js'));+ const files=mode==='worker' ? await readZipResources(document.querySelector('#perf-file').files[0],null,libraryTransferLimits()) : await reader.read();+ const read=performance.now();+ const library=JSON.parse(await files.get('library.json').text());+ const inspection=await inspectLibraryTransfer({sourceType:'share-package',library,files,limits:libraryTransferLimits()});+ const checked=performance.now();+ const writes=[...inspection.resources.assets].map(([assetId,blob])=>({assetId,blob}));+ if(mode!=='serial') await store.savePortableAssetBlobs(writes,{checkCapacity:false});+ else for(const {assetId,blob} of writes) await store.savePortableAssetBlob(assetId,blob,{checkCapacity:false});+ const saved=performance.now(); let bytes=0;+ for(const {assetId,blob} of writes) { const actual=await store.getMediaBlob(assetId); if(actual.size!==blob.size) throw Error('Byte size differs');bytes+=actual.size; }+ return {mode,bytes,files:writes.length,indexMs:indexed-start,readCrcMs:read-indexed,inspectMs:checked-read,writeMs:saved-checked,totalMs:saved-start};+ }''',sys.argv[1] if len(sys.argv)>1 else 'worker')+ print(json.dumps(result),flush=True)diff --git a/test/library_import_interruption_e2e.py b/test/library_import_interruption_e2e.pynew file mode 100644index 0000000..5dd2193--- /dev/null+++ b/test/library_import_interruption_e2e.py@@ -0,0 +1,95 @@+"""Stop the real worker at the restore commit boundary; retain cases and media.+Fault injection pauses storage acknowledgement only, never supplies an apply result.+"""+import json+from e2e_support import base_entry, extension_session, wait_for_async_condition+++def check_interruption(phase):+ with extension_session(f"pd-restore-{phase}-") as session:+ page = session.open_page("collector.html")+ old = base_entry("before-restore", "本机原案例", "必须能回退", "content:image-case", 1)+ old["mediaAssets"] = [{"id": "before-media", "kind": "image", "usage": "content", "storageMode": "managed", "mimeType": "image/png"}]+ session.seed_storage(page, {"entries": [old]})+ page.evaluate("""async () => {+ const {saveMediaBlob} = await import('./media-store.js');+ await saveMediaBlob('before-media', new Blob(['original-media-fixture'], {type:'image/png'}));+ }""")+ 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")+ worker.evaluate("""phase => {+ const set = chrome.storage.local.set.bind(chrome.storage.local);+ chrome.storage.local.set = async payload => {+ await set(payload);+ if (payload.libraryImportTransactions?.items?.some(item => item.status === phase)) {+ await new Promise(() => {});+ }+ };+ }""", phase)+ incoming = base_entry("incoming-restore", "备份里的案例", "恢复后正文", "content:text-case", 2)+ page.evaluate("""async entry => {+ const {renderLibraryJson} = await import('./lib.js');+ const {applyLibraryImportWithReceipt} = await import('./library-import-client.js');+ const library = JSON.parse(renderLibraryJson([entry], {}));+ const preview = await chrome.runtime.sendMessage({type:'PREVIEW_LIBRARY_IMPORT', library,+ sourceType:'complete-backup', mode:'exact-replace', resourceIndex:{mediaAssetIds:[],skillAssetIds:[]}});+ if (!preview.ok) throw new Error(preview.message);+ window.restoreRequest = {type:'APPLY_LIBRARY_IMPORT', library, plan:preview.plan,+ planToken:preview.planToken, operationId:crypto.randomUUID()};+ applyLibraryImportWithReceipt(window.restoreRequest, {send: async request => {+ try { return await chrome.runtime.sendMessage(request); }+ catch (error) { window.channelError = error.message; throw error; }+ }}).then(result => window.restoreResult=result, error => window.restoreError=error.message);+ }""", incoming)+ wait_for_async_condition(page, """async phase =>+ (await chrome.storage.local.get('libraryImportTransactions')).libraryImportTransactions?.items?.some(item=>item.status===phase)+ """, arg=phase)+ 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"]})+ page.wait_for_function("() => window.restoreResult || window.restoreError")+ proof = page.evaluate("""async () => {+ const stored = await chrome.storage.local.get(['entries','libraryReplacementRecoveryPoint','libraryImportTransactions']);+ const {getMediaBlob} = await import('./media-store.js');+ const point = stored.libraryReplacementRecoveryPoint;+ const replay = await chrome.runtime.sendMessage(window.restoreRequest);+ const afterReplay = (await chrome.storage.local.get('libraryReplacementRecoveryPoint')).libraryReplacementRecoveryPoint;+ return {result:window.restoreResult, error:window.restoreError, channelError:window.channelError,+ entries:stored.entries.map(entry=>({id:entry.id,text:entry.text})),+ recoveryEntries:point?.state?.entries?.map(entry=>entry.id),+ media:await (await getMediaBlob('before-media')).text(),+ replay, recoveryIdUnchanged:point?.id===afterReplay?.id,+ receipt:stored.libraryImportTransactions.items[0].status};+ }""")+ assert "message channel closed before a response was received" in proof["channelError"], proof+ assert proof["result"]["ok"] and proof["receipt"] == "completed", proof+ assert proof["entries"] == [{"id": incoming["id"], "text": incoming["text"]}], proof+ assert proof["recoveryEntries"] == [old["id"]], proof+ assert proof["media"] == "original-media-fixture", proof+ assert proof["replay"] == proof["result"] and proof["recoveryIdUnchanged"], proof+ rollback = page.evaluate("""async () => {+ const point = (await chrome.storage.local.get('libraryReplacementRecoveryPoint')).libraryReplacementRecoveryPoint;+ const request = {type:'RESTORE_LIBRARY_REPLACEMENT_POINT', expectedPointId:point.id, operationId:crypto.randomUUID()};+ const first = await chrome.runtime.sendMessage(request);+ const second = await chrome.runtime.sendMessage(request);+ const stored = await chrome.storage.local.get(['entries','libraryReplacementRecoveryPoint']);+ return {first, second, entries:stored.entries.map(entry=>entry.id)};+ }""")+ assert rollback["first"] == rollback["second"] and rollback["entries"] == [old["id"]], rollback+ assert page.evaluate("""async () => {+ const {withLocalUpgradeLock} = await import('./local-extension-upgrade.js');+ return withLocalUpgradeLock(async () => {+ let entered = false;+ try { await withLocalUpgradeLock(() => {entered=true;}); }+ catch (error) { return error.code==='UPGRADE_BUSY' && !entered; }+ return false;+ });+ }""")+ print(json.dumps({"phase": phase, "worker_stop_recovered": True, "case_and_recovery_media_preserved": True}), flush=True)+++if __name__ == "__main__":+ for phase in ["pending", "completed"]:+ check_interruption(phase)diff --git a/test/library_import_resources_e2e.py b/test/library_import_resources_e2e.pynew file mode 100644index 0000000..39d1311--- /dev/null+++ b/test/library_import_resources_e2e.py@@ -0,0 +1,50 @@+"""Real IndexedDB atomicity and worker transport; synthetic bytes, isolated profile."""+from e2e_support import extension_session+++def main():+ with extension_session('pd-import-resources-') as session:+ page=session.open_page('collector.html')+ result=page.evaluate('''async () => {+ const {savePortableAssetBlobs,getMediaBlob}=await import('./media-store.js');+ const {createZipBlob}=await import('./zip.js');+ const {readZipResources}=await import('./zip-reader.js');+ const {sha256Blob}=await import('./blob-digest.js');+ const bytes=crypto.getRandomValues(new Uint8Array(65536));+ const blob=new Blob([bytes,bytes,bytes],{type:'application/octet-stream'});+ const archive=await createZipBlob(Array.from({length:24},(_,i)=>({name:`attachments/${i}.psd`,data:blob})));+ const progress=[];+ const files=await readZipResources(archive,null,{}, {onProgress:value=>progress.push(value)});+ if(!progress.length) throw Error('Missing worker progress');+ const expected=await sha256Blob(blob);+ const items=[...files].map(([name,blob])=>({assetId:name,blob}));+ const originalPut=IDBObjectStore.prototype.put;+ let inserted=0;+ IDBObjectStore.prototype.put=function(...args){+ if(this.name==='media' && ++inserted===3) throw new DOMException('Injected write failure','DataError');+ return originalPut.apply(this,args);+ };+ let failed=false;+ try { await savePortableAssetBlobs(items,{checkCapacity:false}); }+ catch(error){failed=error.code==='storage_write_failed';}+ finally { IDBObjectStore.prototype.put=originalPut; }+ if(!failed) throw Error('Expected write failure');+ for(const {assetId} of items) if(await getMediaBlob(assetId)) throw Error('Partial resource leaked after abort');+ const writes=[];+ await savePortableAssetBlobs(items,{onProgress:value=>writes.push(value)});+ for(const {assetId} of items) if(await sha256Blob(await getMediaBlob(assetId))!==expected) throw Error('Original bytes differ');+ if(writes.at(-1).completed!==items.length) throw Error('Missing write progress');+ const controller=new AbortController();+ let aborted=false;+ try { await readZipResources(archive,null,{}, {signal:controller.signal,onProgress:()=>controller.abort()}); }+ catch(error){aborted=error.name==='AbortError';}+ if(!aborted) throw Error('Worker cancellation did not stop reading');+ const damaged=new Blob([archive.slice(0,60),new Uint8Array([99]),archive.slice(61)]);+ let rejected=false;+ try { await readZipResources(damaged,null,{}); } catch { rejected=true; }+ if(!rejected) throw Error('Corrupt ZIP accepted');+ return {resources:items.length,rollback:true,originalHashes:true,cancellation:true,corruption:true};+ }''')+ print(result,flush=True)++if __name__=='__main__': main()diff --git a/test/library_navigation_e2e.py b/test/library_navigation_e2e.pyindex 61c942d..0810494 100644--- a/test/library_navigation_e2e.py+++ b/test/library_navigation_e2e.py@@ -64,7 +64,7 @@ def main() -> None:expect(library.locator('.top-actions > #open-curated, .top-actions > #open-skills')).to_have_count(0)expect(library.locator(".workspace-navigation > button")).to_have_count(4)expect(library.locator("#workspace-library")).to_have_attribute("aria-current", "page")- expect(library.locator('input[type="search"]')).to_have_count(1)+ expect(library.locator('header input[type="search"]')).to_have_count(1)expect(library.locator("#collection-filters .project-filter")).to_have_count(1)expect(library.locator("#collection-filters .project-filter-name")).to_have_text("导航验收项目")expect(library.locator("#collection-filters .project-filter-count")).to_have_text("1")@@ -81,14 +81,9 @@ def main() -> None:project_filter.click()expect(project_filter).to_have_attribute("aria-pressed", "false")expect(library.locator("#project-sort")).to_have_count(0)- expect(library.locator(".project-row.project-ordering")).to_have_count(0)- library.locator("#manage-project-order").click()- expect(library.locator(".project-row.project-ordering")).to_have_count(1)- expect(library.locator(".project-row > .project-menu")).to_be_hidden()- expect(library.locator("#manage-project-order use")).to_have_attribute("href", re.compile(r"assets/ui-icons\.svg#icon-circle-check-big$"))- library.locator("#manage-project-order").click()- expect(library.locator(".project-row.project-ordering")).to_have_count(0)+ expect(library.locator(".project-row.project-draggable")).to_have_count(1)expect(library.locator(".project-row > .project-menu")).to_be_visible()+ expect(library.locator("#collapse-projects")).to_be_visible()resizer = library.locator("#sidebar-resizer")expect(resizer).to_be_visible()@@ -157,8 +152,7 @@ def main() -> None:library.locator("#select-cases").click()expect(library.locator("#result-count")).to_be_hidden()expect(library.locator("#gallery-view-controls")).to_be_hidden()- expect(library.locator("#manage-project-order")).to_be_visible()- expect(library.locator("#manage-project-order")).to_be_disabled()+ expect(library.locator(".project-row.project-draggable")).to_have_count(0)expect(library.locator("#share-count")).to_have_text("已选 0")expect(library.locator("#selection-selected-actions")).to_be_hidden()selection_first_card_top = library.locator("#case-list > .case-card").first.evaluate("node => node.getBoundingClientRect().top")@@ -237,7 +231,7 @@ def main() -> None:expect(library.locator("#selection-select-filtered")).to_be_visible()expect(library.locator(".case-card.selected-for-share")).to_have_count(0)library.locator("#share-cancel").click()- expect(library.locator("#manage-project-order")).to_be_enabled()+ expect(library.locator(".project-row.project-draggable")).to_have_count(1)project_filter.click()expect(project_filter).to_have_attribute("aria-pressed", "true")expect(library.locator("#case-list > .case-card")).to_have_count(1)diff --git a/test/local-extension-upgrade.test.js b/test/local-extension-upgrade.test.jsindex 0ce06a8..48ba6e3 100644--- a/test/local-extension-upgrade.test.js+++ b/test/local-extension-upgrade.test.js@@ -4,7 +4,7 @@ import { mkdtemp, mkdir, readFile, readdir, rm, writeFile } from "node:fs/promisimport { tmpdir } from "node:os";import { join } from "node:path";import { createZipBlob } from "../zip.js";-import { extensionIdForKey, installLocalUpgrade, isExtensionProgramPath, localReleasePackageUrl, prepareLocalUpgrade, RECOVERY_DIRECTORY, verifyInstallationDirectory, verifyRecoveredUpgrade, verifyRunningUpgrade } from "../local-extension-upgrade.js";+import { extensionIdForKey, cleanupLocalUpgrade, installLocalUpgrade, isExtensionProgramPath, localReleasePackageUrl, prepareLocalUpgrade, RECOVERY_DIRECTORY, verifyInstallationDirectory, verifyRecoveredUpgrade, verifyRunningUpgrade } from "../local-extension-upgrade.js";const manifest = JSON.parse(await readFile(new URL("../manifest.json", import.meta.url)));const id = await extensionIdForKey(manifest.key);const nextVersion = [...manifest.version.split(".").slice(0, -1), Number(manifest.version.split(".").at(-1)) + 1].join(".");@@ -102,3 +102,36 @@ test("a source checkout or existing recovery point is never overwritten", asyncawait mkdir(join(f.path, RECOVERY_DIRECTORY));await assert.rejects(installLocalUpgrade(f.root, await prepareLocalUpgrade(await packageFor(), runtime), { runtime, fetchFn: f.fetchFn, saveRecord: async () => {} }), /恢复副本/);});++test("recovery retains hash modules from historical installations, not only files in the incoming ZIP", async t => {+ const f = await fixture(t);+ await mkdir(join(f.path, "vendor/noble-hashes"), { recursive: true });+ await writeFile(join(f.path, "vendor/noble-hashes/sha2.js"), "export const legacyHash = true;");+ await writeFile(join(f.path, "vendor/noble-hashes/LICENSE"), "upstream license fixture");+ let record;+ await installLocalUpgrade(f.root, await prepareLocalUpgrade(await packageFor(), runtime), {+ runtime, fetchFn: f.fetchFn, saveRecord: async value => { record = value; }+ });+ assert.ok(record.oldHashes["vendor/noble-hashes/sha2.js"]);+ assert.equal(await readFile(join(f.path, RECOVERY_DIRECTORY, "vendor/noble-hashes/sha2.js"), "utf8"), "export const legacyHash = true;");+});++test("restored original installations can clear the recovery folder and update again", async t => {+ const f = await fixture(t);+ const prepared = await prepareLocalUpgrade(await packageFor(), runtime);+ let record;+ await installLocalUpgrade(f.root, prepared, {runtime, fetchFn:f.fetchFn, saveRecord:async value=>{record=value;}});+ for (const path of Object.keys(record.oldHashes)) await writeFile(join(f.path,path), await readFile(join(f.path,RECOVERY_DIRECTORY,path)));+ await cleanupLocalUpgrade(record, {runtime, fetchFn:f.fetchFn});+ assert.equal((await readdir(f.path)).includes(RECOVERY_DIRECTORY), false);+ await installLocalUpgrade(f.root, prepared, {runtime, fetchFn:f.fetchFn, saveRecord:async()=>{}});+});++test("cleanup after loading a recovery copy cannot delete the running installation", async t => {+ const f = await fixture(t);+ const prepared = await prepareLocalUpgrade(await packageFor(), runtime);+ let record;+ await installLocalUpgrade(f.root, prepared, {runtime, fetchFn:f.fetchFn, saveRecord:async value=>{record=value;}});+ await cleanupLocalUpgrade(record, {runtime, fetchFn:served(join(f.path, RECOVERY_DIRECTORY))});+ assert.equal(await readFile(join(f.path,RECOVERY_DIRECTORY,'background.js'),'utf8'), 'old background');+});diff --git a/test/local-installation-directory.test.js b/test/local-installation-directory.test.jsnew file mode 100644index 0000000..e851e62--- /dev/null+++ b/test/local-installation-directory.test.js@@ -0,0 +1,46 @@+import test from 'node:test';+import assert from 'node:assert/strict';+import { mkdtemp, writeFile, rm, readFile } from 'node:fs/promises';+import { tmpdir } from 'node:os';+import { join } from 'node:path';+import { directory, served } from './helpers/local-upgrade-directory.mjs';+import { extensionIdForKey } from '../local-extension-upgrade.js';+import { resolveLocalInstallationDirectory } from '../local-installation-directory.js';+const manifest = JSON.parse(await readFile(new URL('../manifest.json', import.meta.url)));+const id = await extensionIdForKey(manifest.key);+const runtime = { id, getManifest:()=>manifest, getURL:path=>`chrome-extension://${id}/${path}` };+async function fixture(t) {+ const path = await mkdtemp(join(tmpdir(),'pd-retained-install-'));+ t.after(()=>rm(path,{recursive:true,force:true}));+ await writeFile(join(path,'manifest.json'),JSON.stringify(manifest));+ const root = directory(path);+ root.queryPermission = async()=> 'granted';+ return { root, fetchFn:served(path), runtime };+}+test('verified installation handle is reused regardless of its version-like folder name',async t=>{+ const f=await fixture(t); f.root.name='PromptDirector-1.20.1';+ let remembered;+ const selected=await resolveLocalInstallationDirectory(f.root,{...f,pickDirectory:()=>{throw Error('must not ask again');},remember:async root=>{remembered=root;}});+ assert.equal(selected,f.root); assert.equal(remembered,f.root);+});+test('first installation selection is remembered only after proving it is the running directory',async t=>{+ const f=await fixture(t);let remembered;let picks=0;+ assert.equal(await resolveLocalInstallationDirectory(null,{...f,pickDirectory:async()=>{picks++;return f.root;},remember:async root=>{remembered=root;}}),f.root);+ assert.equal(picks,1); assert.equal(remembered,f.root);+});+test('revoked permission is requested again without replacing the installation or its library',async t=>{+ const f=await fixture(t);let requested=0;let remembered;+ f.root.queryPermission=async()=> 'prompt';f.root.requestPermission=async()=>{requested++;return 'granted';};+ await resolveLocalInstallationDirectory(f.root,{...f,remember:async root=>{remembered=root;}});+ assert.equal(requested,1);assert.equal(remembered,f.root);+});+test('denied permission does not silently choose a different directory',async t=>{+ const f=await fixture(t);f.root.queryPermission=async()=> 'denied';f.root.requestPermission=async()=> 'denied';+ await assert.rejects(resolveLocalInstallationDirectory(f.root,{...f,pickDirectory:()=>{throw Error('wrong path');},remember:()=>{throw Error('must not replace');}}),/写入授权/);+});+test('an inactive remembered copy is cleared without writing program files',async t=>{+ const f=await fixture(t);const copy=await fixture(t);let remembered='unset';+ await assert.rejects(resolveLocalInstallationDirectory(copy.root,{...f,remember:async root=>{remembered=root;}}),/实际加载/);+ assert.equal(remembered,null);+ assert.deepEqual(JSON.parse(await (await copy.root.getFileHandle('manifest.json')).getFile().then(blob=>blob.text())),manifest);+});diff --git a/test/local_upgrade_native_e2e.py b/test/local_upgrade_native_e2e.pynew file mode 100644index 0000000..2838d18--- /dev/null+++ b/test/local_upgrade_native_e2e.py@@ -0,0 +1,155 @@+"""Real Chrome file handles + installed updater + final ZIP + runtime reload.+Only directory consent and the release download transport are supplied by fixtures.+The temporary browser profile never contains user data.+"""+import argparse+import json+import shutil+import tempfile+import time+import zipfile+from pathlib import Path++from playwright.sync_api import expect, sync_playwright+from e2e_support import base_entry, seed_extension_storage+++def grant_directory_by_drop(page, context, installed):+ page.evaluate("""() => {+ window.addEventListener('dragover', event => {event.preventDefault();event.stopImmediatePropagation();}, {capture:true,once:true});+ window.addEventListener('drop', async event => {+ event.preventDefault();event.stopImmediatePropagation();+ window.installationHandle=await event.dataTransfer.items[0].getAsFileSystemHandle();+ }, {capture:true,once:true});+ }""")+ cdp = context.new_cdp_session(page)+ data = {"items": [], "files": [str(installed)], "dragOperationsMask": 1}+ for kind in ["dragEnter", "dragOver", "drop"]:+ cdp.send("Input.dispatchDragEvent", {"type": kind, "x": 50, "y": 50, "data": data})+ page.wait_for_function("() => Boolean(window.installationHandle)")+ assert page.evaluate("() => installationHandle.queryPermission({mode:'readwrite'})") == "granted"+++def main():+ parser = argparse.ArgumentParser()+ parser.add_argument("previous_directory", type=Path)+ parser.add_argument("current_archive", type=Path)+ args = parser.parse_args()+ package = args.current_archive.read_bytes()+ with zipfile.ZipFile(args.current_archive) as archive:+ target = json.loads(archive.read("manifest.json"))+ with tempfile.TemporaryDirectory(prefix="pd-native-release-") as temp, sync_playwright() as playwright:+ root = Path(temp)+ installed = root / "installation"+ shutil.copytree(args.previous_directory, installed)+ previous = json.loads((installed / "manifest.json").read_text())+ assert previous["version"] != target["version"]+ profile = root / "profile"+ preferences = profile / "Default" / "Preferences"+ preferences.parent.mkdir(parents=True)+ preferences.write_text(json.dumps({"profile": {"default_content_setting_values": {"file_system_write_guard": 1}}}))+ context = playwright.chromium.launch_persistent_context(+ str(profile), headless=True, channel="chromium", viewport={"width": 1280, "height": 900},+ args=[f"--disable-extensions-except={installed}", f"--load-extension={installed}"]+ )+ try:+ setup = context.new_page()+ setup.goto("chrome://extensions")+ if not setup.locator("#devMode").evaluate("element => element.checked"):+ setup.locator("#devMode").click()+ setup.close()+ release_url = f"{target['homepage_url']}/releases/tag/v{target['version']}"+ download_url = f"{target['homepage_url']}/releases/download/v{target['version']}/PromptDirector-{target['version']}-FIXED-ID-DEV.zip"+ context.route("https://**/*", lambda route: route.fulfill(status=200, content_type="application/zip", body=package)+ if route.request.url == download_url else route.abort())+ worker = context.service_workers[0] if context.service_workers else context.wait_for_event("serviceworker")+ extension_id = worker.url.split("/")[2]+ page = context.new_page()+ page.goto(f"chrome-extension://{extension_id}/collector.html")+ entry = base_entry("native-upgrade-case", "升级前案例", "升级后正文保持", "content:image-case", 1)+ entry["mediaAssets"] = [{"id":"native-upgrade-media", "kind":"image", "usage":"content", "storageMode":"managed", "mimeType":"image/png"}]+ seed_extension_storage(page, {"entries": [entry]})+ before = page.evaluate("""async () => {+ const {saveMediaBlob} = await import('./media-store.js');+ await saveMediaBlob('native-upgrade-media',new Blob([Uint8Array.from(atob('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+jRZkAAAAASUVORK5CYII='),c=>c.charCodeAt(0))],{type:'image/png'}));+ return {entries:(await chrome.storage.local.get('entries')).entries, media:Array.from(new Uint8Array(await(await(await import('./media-store.js')).getMediaBlob('native-upgrade-media')).arrayBuffer()))};+ }""")+ page.goto(f"chrome-extension://{extension_id}/library.html")+ grant_directory_by_drop(page, context, installed)+ page.evaluate("""({version,releaseUrl}) => {+ window.showDirectoryPicker=async()=>window.installationHandle;+ import('./local-extension-upgrade-ui.js').then(module=>module.openLocalUpgrade({latestVersion:version,releaseUrl}));+ }""", {"version": target["version"], "releaseUrl": release_url})+ page.get_by_role("button", name="下载更新包", exact=True).click()+ button = page.get_by_role("button", name="选择安装文件夹并升级", exact=True)+ expect(button).to_be_visible(timeout=60_000)+ button.click()+ deadline = time.monotonic() + 240+ last_progress = ""+ while not page.is_closed() and time.monotonic() < deadline:+ try:+ status = page.locator(".app-dialog-status")+ if status.count():+ progress = status.inner_text()+ if progress != last_progress and ("error" in (status.get_attribute("class") or "")):+ raise AssertionError(progress)+ last_progress = progress+ page.wait_for_timeout(200)+ except Exception:+ # runtime.reload intentionally closes this page. Success is+ # established below from a new page and the reloaded extension.+ if not page.is_closed():+ raise+ assert page.is_closed(), f"Updater did not reload: {last_progress}"+ check = context.new_page()+ check.goto("chrome://extensions")+ check.wait_for_function("""async ({id,version}) =>+ (await chrome.developerPrivate.getExtensionsInfo({includeDisabled:true,includeTerminated:true}))+ .some(extension=>extension.id===id&&extension.version===version&&extension.state==='ENABLED')+ """, arg={"id": extension_id, "version": target["version"]})+ check.goto(f"chrome-extension://{extension_id}/collector.html")+ proof = check.evaluate("""async () => {+ const upgrade=await import('./local-extension-upgrade.js');+ const record=await upgrade.localUpgradeRecord();+ const {getMediaBlob}=await import('./media-store.js');+ return {id:chrome.runtime.id,version:chrome.runtime.getManifest().version,+ entries:(await chrome.storage.local.get('entries')).entries,+ media:Array.from(new Uint8Array(await(await getMediaBlob('native-upgrade-media')).arrayBuffer())),+ verified:await upgrade.verifyRunningUpgrade(record,chrome.runtime)};+ }""")+ assert proof["verified"] and proof["entries"] == before["entries"] and proof["media"] == before["media"], proof+ assert proof["id"] == extension_id and proof["version"] == target["version"], proof+ # A reload may revoke write consent. Retain the location even then.+ retained = check.evaluate("""async () => {+ const upgrade=await import('./local-extension-upgrade.js');+ const feedback=await (await import('./local-extension-upgrade-ui.js')).runningUpgradeFeedback();+ const saved=await upgrade.localInstallationDirectory();+ const record=await upgrade.localUpgradeRecord();+ return {saved:!!saved,name:saved?.name,cleanupRequired:feedback.cleanupRequired,+ same:!record || await saved.isSameEntry(record.root)};+ }""")+ assert retained['saved'] and retained['same'] and retained['name']==installed.name, retained+ # Supply renewed consent by a real directory drop; no replacement chooser.+ grant_directory_by_drop(check, context, installed)+ directory_proof = check.evaluate("""async () => {+ const upgrade=await import('./local-extension-upgrade.js');+ const ui=await import('./local-extension-upgrade-ui.js');+ const directory=await import('./local-installation-directory.js');+ await ui.runningUpgradeFeedback();+ const saved=await upgrade.localInstallationDirectory();+ if(!saved || await upgrade.localUpgradeRecord()) throw Error('Cleanup must retain the installed directory');+ const root=await directory.resolveLocalInstallationDirectory(saved, {+ pickDirectory:()=>{throw Error('Must reuse the installed folder after upgrade');}+ });+ return {name:root.name,reused:true};+ }""")+ assert directory_proof["reused"] and directory_proof["name"] == installed.name, directory_proof+ print(json.dumps({"native_in_place_upgrade": "passed", "previous": previous["version"], "current": target["version"],+ "case_media_identity_retained": True, "installation_directory_reused": True,+ "permission": "preauthorized isolated profile"}), flush=True)+ finally:+ context.close()+++if __name__ == "__main__":+ main()diff --git a/test/media-ui.test.js b/test/media-ui.test.jsindex e4abf0e..fbf6ec1 100644--- a/test/media-ui.test.js+++ b/test/media-ui.test.js@@ -102,7 +102,9 @@ test("video cards resolve a saved local poster and referenced video details stay});test("one top search surface keeps only a concise placeholder hint", () => {- assert.equal((html.match(/type="search"/g) ?? []).length, 1);+ const header = html.slice(html.indexOf("<header"), html.indexOf("</header>"));+ assert.equal((header.match(/type="search"/g) ?? []).length, 1);+ assert.match(html, /id="project-search"[^>]*aria-label="搜索项目"/);assert.match(html, /placeholder="[^"]*type:video[^"]*"/);assert.doesNotMatch(html, /id="search-help"|source:x\.com.*tag:电影感.*has:video/);});diff --git a/test/project-tree.test.js b/test/project-tree.test.jsnew file mode 100644index 0000000..7045f8e--- /dev/null+++ b/test/project-tree.test.js@@ -0,0 +1,63 @@+import test from "node:test";+import assert from "node:assert/strict";+import { projectMovePlan, projectTreeRows, readProjectExpansion, saveProjectExpansion } from "../project-tree.js";+import { collectionPathLabelsById, moveCollection, normalizeOrganizerState } from "../organizer.js";++function fixture() {+ return normalizeOrganizerState({ collections: [+ { id: "a", name: "广告", parentId: null, order: 0, entryIds: ["case-a"] },+ { id: "b", name: "视频", parentId: "a", order: 0, entryIds: ["case-b"] },+ { id: "c", name: "游戏", parentId: null, order: 1, entryIds: ["case-a"] },+ { id: "d", name: "视频", parentId: "c", order: 0, entryIds: ["case-d"] },+ { id: "e", name: "九月素材", parentId: null, order: 2, entryIds: [] }+ ] });+}++test("search reaches folded descendants, distinguishes duplicate names by path, and preserves expansion", () => {+ const state = fixture();+ const children = new Map();+ for (const item of state.collections) children.set(item.parentId, [...(children.get(item.parentId) || []), item]);+ const expanded = new Set(["c"]);+ const rows = () => projectTreeRows(children, expanded).map((row) => row.collection.id);+ assert.deepEqual(rows(), ["a", "c", "d", "e"]);+ assert.deepEqual(projectTreeRows(children, expanded, "视频", collectionPathLabelsById(state)).map((row) => row.collection.id), ["b", "d"]);+ assert.deepEqual(rows(), ["a", "c", "d", "e"]);+});++test("far moves before, after, inside and to root preserve descendants and case relationships", () => {+ const original = fixture();+ for (const [target, position, parent, order] of [["c", "before", null, 0], ["c", "after", null, 1], ["c", "inside", "c", 1]]) {+ const plan = projectMovePlan(original, "a", target, position);+ const moved = moveCollection(original, "a", plan.parentId, plan.index);+ assert.equal(moved.collections.find((item) => item.id === "a").parentId, parent);+ assert.equal(moved.collections.find((item) => item.id === "a").order, order);+ assert.equal(moved.collections.find((item) => item.id === "b").parentId, "a");+ for (const item of original.collections) assert.deepEqual(moved.collections.find((row) => row.id === item.id).entryIds, item.entryIds);+ }+ const plan = projectMovePlan(original, "b", null);+ assert.equal(plan.parentId, null);+ assert.equal(plan.index, 3);+ assert.equal(original.collections.find((item) => item.id === "b").parentId, "a");+});++test("a project cannot target itself, descendants, or a destination deleted while choosing", () => {+ for (const target of ["a", "b", "deleted"]) assert.throws(() => projectMovePlan(fixture(), "a", target));+ assert.throws(() => projectMovePlan(fixture(), "deleted", "c"));+ assert.throws(() => projectMovePlan(fixture(), "a", null, "before"));+});++test("same-parent placement counts siblings after removing the moving project", () => {+ const state = fixture();+ const plan = projectMovePlan(state, "a", "e", "after");+ assert.equal(plan.index, 2);+ const moved = moveCollection(state, "a", plan.parentId, plan.index);+ const restored = moveCollection(moved, "a", null, 0);+ assert.deepEqual(restored, state);+});++test("folded view can be restored after reload and invalid saved view cannot break library loading", () => {+ const storage = { value: "broken", getItem() { return this.value; }, setItem(key, value) { this.value = value; } };+ assert.deepEqual([...readProjectExpansion(storage)], []);+ saveProjectExpansion(new Set(["a"]), storage);+ assert.deepEqual([...readProjectExpansion(storage)], ["a"]);+});diff --git a/test/project_tree_e2e.py b/test/project_tree_e2e.pynew file mode 100644index 0000000..67b3106--- /dev/null+++ b/test/project_tree_e2e.py@@ -0,0 +1,172 @@+from __future__ import annotations++import os+from pathlib import Path+from playwright.sync_api import expect+from e2e_support import base_entry, extension_session+++def row(page, project_id):+ return page.locator(f'.project-row[data-collection-id="{project_id}"]')+++def move_dialog(page, source, query, label, position='inside'):+ row(page, source).locator('summary').click()+ row(page, source).get_by_role('button', name='移动到…', exact=True).click()+ dialog = page.locator('#promptdirector-app-dialog')+ dialog.locator('[name="destination"]').fill(query)+ dialog.get_by_role('option', name=label, exact=True).click()+ if dialog.locator('[name="position"]').is_enabled():+ dialog.locator('[name="position"]').select_option(position)+ return dialog+++def state(page):+ return page.evaluate("async () => (await chrome.runtime.sendMessage({type:'GET_STATE'})).organizerState.collections")+++def drag_to(page, source, target, position='inside'):+ source_box = row(page, source).locator('.project-filter').bounding_box()+ page.mouse.move(source_box['x'] + source_box['width'] / 2, source_box['y'] + source_box['height'] / 2)+ page.mouse.down()+ page.mouse.move(source_box['x'] + source_box['width'] / 2, source_box['y'] + source_box['height'] / 2 + 8)+ target_box = row(page, target).bounding_box()+ y = target_box['y'] + (3 if position == 'before' else target_box['height'] - 3 if position == 'after' else target_box['height'] / 2)+ page.mouse.move(target_box['x'] + target_box['width'] / 2, y, steps=6)+++def main():+ # Synthetic long library exercises distances; never touches the installed profile.+ projects = [dict(id=f'p{i}', name=f'项目 {i:03}', parentId=None, order=i, entryIds=[]) for i in range(100)]+ projects += [dict(id='child', name='子项目', parentId='p0', order=0, entryIds=['case']),+ dict(id='grandchild', name='深层项目', parentId='child', order=0, entryIds=['case']),+ dict(id='other-child', name='子项目', parentId='p1', order=0, entryIds=[])]+ with extension_session('prompt-director-project-tree-') as session:+ setup = session.open_page('collector.html')+ session.seed_storage(setup, {'schemaVersion':24, 'entries':[base_entry('case','案例','项目关系必须保留','content:prompt:image')], 'organizerState':{'version':4,'collections':projects}})+ page = session.open_page('library.html', wait_until='networkidle')+ expect(page.locator('body')).to_have_attribute('data-library-state','ready')+ expect(page.locator('#manage-project-order')).to_have_count(0)+ expect(page.locator('.project-row')).to_have_count(100)+ row(page,'p0').locator('.project-filter').click()+ expect(row(page,'p0').locator('.project-filter')).to_have_attribute('aria-pressed','true')+ row(page,'p0').locator('.project-filter').press('ArrowRight')+ expect(row(page,'child')).to_be_visible()+ page.reload(wait_until='networkidle')+ expect(row(page,'child')).to_be_visible()+ row(page,'child').locator('.project-filter').click()+ page.locator('#collapse-projects').click()+ expect(row(page,'child')).to_have_count(0)+ page.reload(wait_until='networkidle')+ expect(row(page,'child')).to_have_count(0)+ row(page,'p0').locator('.project-filter').click()+ page.locator('#project-search').fill('子项目')+ expect(page.locator('.project-row')).to_have_count(3)+ expect(row(page,'child').locator('.project-search-path')).to_contain_text('项目 000')+ expect(row(page,'other-child').locator('.project-search-path')).to_contain_text('项目 001')+ assert row(page,'child').locator('.project-filter').bounding_box()['width'] > 100+ page.locator('#project-search').fill('')+ expect(row(page,'child')).to_have_count(0)+ # A distant target is chosen by name, with no long drag or full expansion.+ page.locator('#project-search').fill('099')+ dialog = move_dialog(page,'p99','000','项目 000','before')+ dialog.get_by_role('button',name='移动',exact=True).click()+ expect(dialog).to_have_count(0)+ page.locator('#project-search').fill('')+ expect(page.locator('.project-filter-name').first).to_have_text('项目 099')+ page.locator('#project-move-undo').click()+ expect(page.locator('.project-filter-name').first).to_have_text('项目 000')+ # Menu at the bottom of the viewport must stay reachable.+ row(page,'p99').scroll_into_view_if_needed()+ row(page,'p99').locator('summary').click()+ panel = row(page,'p99').locator('.project-menu-panel')+ expect(panel.get_by_role('button',name='移动到…',exact=True)).to_be_in_viewport()+ assert panel.bounding_box()['y'] >= 0+ page.keyboard.press('Escape')+ # Move a whole subtree and undo without changing membership.+ page.locator('#project-search').fill('000')+ dialog = move_dialog(page,'p0','001','项目 001')+ dialog.get_by_role('button',name='移动',exact=True).click()+ expect(dialog).to_have_count(0)+ moved = {p['id']:p for p in state(page)}+ assert moved['p0']['parentId'] == 'p1'+ assert moved['child']['parentId'] == 'p0' and moved['child']['entryIds'] == ['case']+ assert moved['grandchild']['entryIds'] == ['case']+ page.locator('#project-move-undo').click()+ expect(page.locator('#project-order-status')).to_contain_text('已撤销')+ page.locator('#project-search').fill('')+ # Root moves are accessible through the same picker, with a visible root placement.+ page.locator('#project-search').fill('深层项目')+ dialog = move_dialog(page,'grandchild','项目根目录','项目根目录')+ expect(dialog.locator('[name="position"]')).to_be_disabled()+ dialog.get_by_role('button',name='移动',exact=True).click()+ expect(dialog).to_have_count(0)+ assert next(p for p in state(page) if p['id']=='grandchild')['parentId'] is None+ page.locator('#project-move-undo').click()+ expect(page.locator('#project-order-status')).to_contain_text('已撤销')+ page.locator('#project-search').fill('')+ # Direct pointer drag, without a manage-mode click.+ row(page,'p0').scroll_into_view_if_needed()+ drag_to(page,'p2','p1','before')+ page.mouse.up()+ expect(page.locator('.project-filter-name').nth(1)).to_have_text('项目 002')+ page.locator('#project-move-undo').click()+ expect(page.locator('.project-filter-name').nth(1)).to_have_text('项目 001')+ # Hover expansion is temporary and Escape restores the folded view.+ drag_to(page,'p2','p0')+ expect(row(page,'child')).to_be_visible(timeout=3000)+ page.keyboard.press('Escape')+ page.mouse.up()+ expect(row(page,'child')).to_have_count(0)+ # Leaving all targets must clear the last valid drop.+ baseline = state(page)+ drag_to(page,'p2','p0')+ page.mouse.move(750,450)+ page.mouse.up()+ assert state(page) == baseline+ # Edge scrolling continues while the pointer is stationary.+ drag_to(page,'p2','p3')+ sidebar = page.locator('#filter-sidebar')+ box = sidebar.bounding_box()+ before = sidebar.evaluate('node => node.scrollTop')+ page.mouse.move(box['x']+box['width']/2,box['y']+box['height']-8)+ page.wait_for_function('(before) => document.querySelector("#filter-sidebar").scrollTop > before + 120',arg=before)+ page.keyboard.press('Escape')+ page.mouse.up()+ # Failure is explicit and does not claim success or change data.+ page.locator('#project-search').fill('002')+ dialog = move_dialog(page,'p2','001','项目 001')+ page.evaluate("""() => {window.originalSend=chrome.runtime.sendMessage;chrome.runtime.sendMessage=(m,...args)=>m.type==='MOVE_COLLECTION'?Promise.resolve({ok:false,message:'模拟项目保存失败'}):window.originalSend.call(chrome.runtime,m,...args)}""")+ baseline = state(page)+ dialog.get_by_role('button',name='移动',exact=True).click()+ expect(dialog.locator('.app-dialog-status')).to_have_text('模拟项目保存失败')+ assert state(page) == baseline+ dialog.get_by_role('button',name='取消',exact=True).click()+ page.evaluate('() => {chrome.runtime.sendMessage=window.originalSend}')+ page.locator('#project-search').fill('')+ row(page,'p0').scroll_into_view_if_needed()+ # Keep toolbar reachable after a long scroll and menu usable in a narrow window.+ row(page,'p99').scroll_into_view_if_needed()+ expect(page.locator('#project-search')).to_be_in_viewport()+ page.set_viewport_size({'width':760,'height':740})+ if not row(page,'p99').is_visible():+ page.locator('#toggle-filters').click()+ row(page,'p99').scroll_into_view_if_needed()+ row(page,'p99').locator('summary').click()+ expect(row(page,'p99').get_by_role('button',name='移动到…',exact=True)).to_be_in_viewport()+ page.keyboard.press('Escape')+ page.set_viewport_size({'width':1280,'height':900})+ page.locator('#filter-sidebar').evaluate('node => node.scrollTop = 0')+ if os.environ.get('PROMPTDIRECTOR_PROJECT_TREE_EVIDENCE'):+ folder = Path(os.environ['PROMPTDIRECTOR_PROJECT_TREE_EVIDENCE'])+ folder.mkdir(parents=True,exist_ok=True)+ page.screenshot(path=str(folder/'project-tree.png'))+ dialog = move_dialog(page,'p2','000','项目 000')+ dialog.locator('[name="position"]').focus()+ expect(dialog.locator('.project-combobox-listbox')).to_be_hidden()+ page.screenshot(path=str(folder/'project-move.png'))+ dialog.get_by_role('button',name='取消',exact=True).click()+ print('Project tree: direct drag, folded reload/search, long move, menu placement, subtree retention, undo, hover/cancel, invalid drop, autoscroll and save failure passed.')++if __name__ == '__main__':+ main()diff --git a/test/projects_and_categories_e2e.py b/test/projects_and_categories_e2e.pyindex 83d0530..4b3fe17 100644--- a/test/projects_and_categories_e2e.py+++ b/test/projects_and_categories_e2e.py@@ -5,6 +5,7 @@ import refrom playwright.sync_api import expectfrom e2e_support import base_entry, extension_session, wait_for_async_condition+from project_tree_e2e import move_dialogdef main() -> None:@@ -39,16 +40,14 @@ def main() -> None:)library = session.open_page("library.html", wait_until="networkidle")expect(library.locator("body")).to_have_attribute("data-library-state", "ready")- expect(library.locator(".project-row.project-ordering")).to_have_count(0)+ expect(library.locator(".project-row.project-draggable")).to_have_count(2)long_name = library.locator(".project-filter-name", has_text="完整长项目名称")expect(long_name).to_be_visible()assert long_name.evaluate("node => getComputedStyle(node).whiteSpace") == "normal"- library.locator("#manage-project-order").click()- expect(library.locator("#manage-project-order")).to_have_attribute("aria-label", "完成项目结构管理")- expect(library.locator(".project-row.project-ordering")).to_have_count(2)- assert library.locator(".project-row.project-ordering").first.evaluate("node => getComputedStyle(node).userSelect") == "none"- expect(library.locator(".project-row > .project-menu:visible")).to_have_count(0)- expect(library.locator(".project-row.project-ordering .project-filter").first).to_have_attribute("tabindex", "-1")+ expect(library.locator(".project-row.project-draggable")).to_have_count(2)+ assert library.locator(".project-row.project-draggable").first.evaluate("node => getComputedStyle(node).userSelect") == "none"+ expect(library.locator(".project-row > .project-menu:visible")).to_have_count(2)+ expect(library.locator(".project-row.project-draggable .project-filter").first).to_have_attribute("tabindex", "0")source_box = library.locator(".project-row", has_text="辅助项目").bounding_box()target_box = library.locator(".project-row", has_text="项目与分类验收").bounding_box()assert source_box and target_box@@ -59,7 +58,8 @@ def main() -> None:assert library.evaluate("window.getSelection()?.toString() || ''") == ""expect(library.locator(".project-filter-name").first).to_have_text("辅助项目")library.locator(".project-row", has_text="辅助项目").focus()- library.locator(".project-row", has_text="辅助项目").press("ArrowDown")+ dialog = move_dialog(library, "collection:e2e-extra", "项目与分类验收", "项目与分类验收的完整长项目名称", "after")+ dialog.get_by_role("button", name="移动", exact=True).click()expect(library.locator("#project-order-status")).to_contain_text("辅助项目")expect(library.locator(".project-filter-name").first).to_contain_text("项目与分类验收")@@ -95,10 +95,11 @@ def main() -> None:expect(library.locator(".project-filter-name").first).to_have_text("辅助项目")library.evaluate("""() => { chrome.runtime.sendMessage = window.__originalProjectSendMessage; }""")library.locator(".project-row", has_text="项目与分类验收").focus()- library.locator(".project-row", has_text="项目与分类验收").press("ArrowRight")+ dialog = move_dialog(library, project_id, "辅助项目", "辅助项目")+ dialog.get_by_role("button", name="移动", exact=True).click()+ library.locator('.project-row[data-collection-id="collection:e2e-extra"] .project-disclosure').click()expect(library.locator(".project-row", has_text="项目与分类验收")).to_have_attribute("aria-level", "2")- library.locator("#manage-project-order").click()- expect(library.locator(".project-row.project-ordering")).to_have_count(0)+ expect(library.locator(".project-row.project-draggable")).to_have_count(2)expect(library.locator(".project-row > .project-menu:visible")).to_have_count(2)library.locator(".project-filter", has_text="辅助项目").click()@@ -162,9 +163,8 @@ def main() -> None:library.locator("#search-input").fill("project-case")expect(library.locator(".case-card")).to_have_count(2)library.locator("#select-cases").click()- expect(library.locator("#manage-project-order")).to_be_visible()- expect(library.locator("#manage-project-order")).to_be_disabled()- expect(library.locator("#manage-project-order")).to_have_attribute("title", "结束案例选择后可管理项目结构")+ expect(library.locator(".project-row.project-draggable")).to_have_count(0)+ expect(library.locator("#collapse-projects")).to_be_visible()library.locator(".case-card").nth(0).click()library.locator(".case-card").nth(1).click()library.locator("#selection-more-menu > summary").click()diff --git a/test/run_e2e.py b/test/run_e2e.pyindex 9587d9a..294ccfe 100644--- a/test/run_e2e.py+++ b/test/run_e2e.py@@ -18,6 +18,7 @@ SCRIPTS = ["curated_skills_install_e2e.py","curated_video_workflow_e2e.py","library_import_ui_e2e.py",+ "library_import_resources_e2e.py","historical_zip_salvage_e2e.py","import_job_lifecycle_e2e.py","library_media_actions_e2e.py",@@ -33,6 +34,7 @@ SCRIPTS = ["library_responsive_layout_e2e.py","library_discovery_e2e.py","projects_and_categories_e2e.py",+ "project_tree_e2e.py","project_deletion_e2e.py","text_and_image_analysis_e2e.py","single_case_visual_batch_e2e.py",@@ -44,6 +46,7 @@ SCRIPTS = ["composer_temp_references_e2e.py","composer_session_layout_e2e.py","sharing_and_data_safety_e2e.py",+ "library_import_interruption_e2e.py","folder_picker_activation_e2e.py","library_zip_scale_e2e.py","library_image_formats_e2e.py",@@ -90,6 +93,7 @@ CASE_MANAGEMENT_SCRIPTS = ["library_responsive_layout_e2e.py","library_discovery_e2e.py","projects_and_categories_e2e.py",+ "project_tree_e2e.py","case_management_batch_regression_e2e.py",]diff --git a/test/zip.test.js b/test/zip.test.jsindex b697e18..e819041 100644--- a/test/zip.test.js+++ b/test/zip.test.js@@ -223,3 +223,41 @@ function deflatedZipWithDeclaredSize({ name, data, declaredSize }) {return new Blob([local, nameBytes, compressed, central, nameBytes, end], { type: "application/zip" });}++test("ZIP64 written before the ZIP32 boundary remains importable across tools", async () => {+ const { readFile } = await import("node:fs/promises");+ // Python zipfile emits a ZIP64 trailer even when ordinary end fields still fit.+ const archive = new Blob([await readFile(new URL("fixtures/zip/optional-zip64.zip", import.meta.url))]);+ const files = await readZipBlob(archive);+ assert.equal(await files.get("library.json").text(), '{"fixture":"optional ZIP64, not user data"}');+});++test('optional ZIP64 rejects conflicting directory fields and accepts the maximum ZIP comment', async () => {+ const { readFile } = await import('node:fs/promises');+ const bytes = new Uint8Array(await readFile(new URL('fixtures/zip/optional-zip64.zip', import.meta.url)));+ const bad = bytes.slice();+ const view = new DataView(bad.buffer);+ view.setUint16(bad.length - 22 + 10, 2, true);+ view.setUint16(bad.length - 22 + 8, 2, true);+ await assert.rejects(readZipBlob(new Blob([bad])), /ZIP/);+ const commented = bytes.slice();+ new DataView(commented.buffer).setUint16(commented.length - 2, 0xffff, true);+ const files = await readZipBlob(new Blob([commented,new Uint8Array(0xffff)]));+ assert.equal(files.size,1);+});++test('accelerated ZIP CRC matches independent bytewise CRC across odd lengths and stream chunks', async () => {+ const bytes = new Uint8Array(65539);+ for(let i=0;i<bytes.length;i++) bytes[i]=(i*17+(i>>>8))&255;+ for(const length of [1,7,8,9,15,16,17,65535,65539]) {+ const source = bytes.subarray(0,length);+ let crc = 0xffffffff;+ for(const byte of source) {+ crc ^= byte;+ for(let bit=0;bit<8;bit++) crc=(crc>>>1)^((crc&1)?0xedb88320:0);+ }+ const archive = await createZipBlob([{name:'attachment.psd',data:source}]);+ const header = new DataView(await archive.slice(0,30).arrayBuffer());+ assert.equal(header.getUint32(14,true),(crc^0xffffffff)>>>0);+ }+});diff --git a/tools/apply-release-upgrade-fixture.mjs b/tools/apply-release-upgrade-fixture.mjsindex 1a620e2..d597a7d 100644--- a/tools/apply-release-upgrade-fixture.mjs+++ b/tools/apply-release-upgrade-fixture.mjs@@ -24,4 +24,4 @@ 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} 个文件;恢复副本完整)`);+console.log(`历史更新器原位安装通过:${previous.version} → ${prepared.manifest.version}(${prepared.files.size} 个文件;已校验恢复记录列出的文件)`);diff --git a/tools/extension-package-variants.mjs b/tools/extension-package-variants.mjsindex 815e68e..591a643 100644--- a/tools/extension-package-variants.mjs+++ b/tools/extension-package-variants.mjs@@ -19,7 +19,7 @@ export function packageRuntimeFiles(files, { release = false } = {}) {files = packageHashRuntime(files);if (!release) return files;return files- .filter(file => file.name !== "local-extension-upgrade.js")+ .filter(file => !["local-extension-upgrade.js", "local-installation-directory.js"].includes(file.name)).map(file => file.name === "local-extension-upgrade-ui.js"? { ...file, data: storeUpdateUi }: file);diff --git a/tools/local-extension-lab.mjs b/tools/local-extension-lab.mjsindex 8671a08..38a4658 100644--- a/tools/local-extension-lab.mjs+++ b/tools/local-extension-lab.mjs@@ -24,6 +24,9 @@ export const REQUIRED_DATA_CONTINUITY_SCRIPTS = ["historical_zip_salvage_e2e.py","folder_picker_activation_e2e.py","library_zip_scale_e2e.py",+ "library_import_resources_e2e.py",+ "library_import_interruption_e2e.py",+ "project_tree_e2e.py","library_image_formats_e2e.py","manual_sync_e2e.py"];diff --git a/tools/run-release-upgrade-e2e.mjs b/tools/run-release-upgrade-e2e.mjsindex 6399662..a811cfc 100644--- a/tools/run-release-upgrade-e2e.mjs+++ b/tools/run-release-upgrade-e2e.mjs@@ -57,6 +57,14 @@ try {PROMPTDIRECTOR_PREVIOUS_RELEASE_TAG: baselineTag}});+ const nativePreviousDirectory = join(temporaryRoot, "native-previous-release");+ await mkdir(nativePreviousDirectory);+ execFileSync("tar", ["-xf", previousArchive, "-C", nativePreviousDirectory], { stdio: "inherit" });+ execFileSync(python, [join(projectRoot, "test", "local_upgrade_native_e2e.py"), nativePreviousDirectory, currentArchive], {+ cwd: projectRoot,+ stdio: "inherit",+ env: process.env+ });process.stdout.write(`升级演练通过:${baselineTag} 资料 → ${manifest.version} 最终固定 ID 包\n`);} catch (error) {process.stderr.write(`升级演练失败:${error.message}\n`);diff --git a/zip-reader-worker.js b/zip-reader-worker.jsnew file mode 100644index 0000000..cddf5de--- /dev/null+++ b/zip-reader-worker.js@@ -0,0 +1,19 @@+import { openZipBlob } from "./zip.js";++self.onmessage = async ({ data: { archive, names, limits } }) => {+ try {+ const reader = await openZipBlob(archive, limits);+ let lastReport = -Infinity;+ const report = progress => {+ // Ten updates per second keep progress legible without flooding the UI.+ const now = performance.now();+ if (now - lastReport < 100 && progress.completed !== progress.total) return;+ lastReport = now;+ self.postMessage({ type: "progress", progress });+ };+ const files = await reader.read(names, { onReadProgress: report, onProgress: report });+ self.postMessage({ type: "complete", files });+ } catch (error) {+ self.postMessage({ type: "error", message: error?.message || "案例包读取失败" });+ }+};diff --git a/zip-reader.js b/zip-reader.jsnew file mode 100644index 0000000..f651ea1--- /dev/null+++ b/zip-reader.js@@ -0,0 +1,24 @@+// A dedicated worker keeps byte validation off the interactive library page.+export function readZipResources(archive, names, limits, { signal, onProgress } = {}) {+ signal?.throwIfAborted();+ return new Promise((resolve, reject) => {+ const worker = new Worker(new URL("./zip-reader-worker.js", import.meta.url), { type: "module" });+ const finish = (error, files) => {+ signal?.removeEventListener("abort", abort);+ worker.terminate();+ if (error) reject(error);+ else resolve(files);+ };+ const abort = () => finish(signal.reason || new DOMException("已取消读取", "AbortError"));+ signal?.addEventListener("abort", abort, { once: true });+ worker.onmessage = ({ data }) => {+ if (data.type === "progress") onProgress?.(data.progress);+ else if (data.type === "complete") finish(null, data.files);+ else if (data.type === "error") finish(new Error(data.message));+ };+ worker.onerror = event => { event.preventDefault(); finish(new Error(event.message || "案例包读取失败")); };+ worker.onmessageerror = () => finish(new Error("案例包读取结果无法传递"));+ try { worker.postMessage({ archive, names, limits }); }+ catch (error) { finish(error); }+ });+}diff --git a/zip.js b/zip.jsindex bdf65a0..e0fb7e6 100644--- a/zip.js+++ b/zip.js@@ -67,8 +67,15 @@ export async function openZipBlob(archive, limitsValue = {}) {if (disk || directoryDisk || diskCount !== fileCount) throw new Error("暂不支持分卷 ZIP");if (endOffset + 22 + commentLength !== archive.size) throw invalidZip();let directoryEnd = endOffset;- if (fileCount === ZIP16_MAX || directorySize === ZIP32_MAX || directoryOffset === ZIP32_MAX) {- ({ fileCount, directorySize, directoryOffset, directoryEnd } = await readZip64Directory(archive, endOffset));+ const locatorBytes = endOffset >= 20 && directoryOffset + directorySize !== endOffset+ ? await readBlobBytes(archive, endOffset - 20, endOffset) : null;+ const hasZip64Locator = locatorBytes && dataView(locatorBytes).getUint32(0, true) === 0x07064b50;+ if (fileCount === ZIP16_MAX || directorySize === ZIP32_MAX || directoryOffset === ZIP32_MAX || hasZip64Locator) {+ const extended = await readZip64Directory(archive, endOffset);+ if ((fileCount !== ZIP16_MAX && fileCount !== extended.fileCount)+ || (directorySize !== ZIP32_MAX && directorySize !== extended.directorySize)+ || (directoryOffset !== ZIP32_MAX && directoryOffset !== extended.directoryOffset)) throw invalidZip();+ ({ fileCount, directorySize, directoryOffset, directoryEnd } = extended);}if (fileCount > limits.maxFileCount) throw new Error(`ZIP 文件数量超过 ${limits.maxFileCount} 个上限`);if (zipSafeInteger(directoryOffset + directorySize) !== directoryEnd || fileCount > directorySize / 46) throw invalidZip();@@ -144,6 +151,7 @@ export async function openZipBlob(archive, limitsValue = {}) {const onProgress = typeof options.onProgress === "function" ? options.onProgress : () => undefined;const files = new Map();let extractedBytes = 0;+ const totalBytes = targets.reduce((sum, record) => sum + record.size, 0);for (let index = 0; index < targets.length; index += 1) {options.signal?.throwIfAborted();const record = targets[index];@@ -151,11 +159,15 @@ export async function openZipBlob(archive, limitsValue = {}) {const compressed = archive.slice(dataOffset, dataEnd);let data;let actualChecksum;+ const onBytes = bytes => options.onReadProgress?.({+ completed: index, total: targets.length, name: record.name,+ extractedBytes: extractedBytes + bytes, totalBytes+ });if (record.method === STORE_METHOD) {data = compressed.slice(0, compressed.size, mimeTypeForPath(record.name));- actualChecksum = await crc32Blob(data, options.signal);+ actualChecksum = await crc32Blob(data, options.signal, onBytes);} else {- const inflated = await inflateRaw(compressed, record.size, record.name, options.signal);+ const inflated = await inflateRaw(compressed, record.size, record.name, options.signal, onBytes);data = inflated.blob.slice(0, inflated.blob.size, mimeTypeForPath(record.name));actualChecksum = inflated.checksum;}@@ -205,7 +217,7 @@ async function resolveLocalRecord(archive, record, directoryOffset) {return { dataOffset, dataEnd };}-async function inflateRaw(compressedBlob, expectedSize, name, signal) {+async function inflateRaw(compressedBlob, expectedSize, name, signal, onBytes) {if (typeof DecompressionStream !== "function") throw new Error("当前浏览器不支持读取压缩 ZIP");let total = 0;let checksum = 0xffffffff;@@ -218,6 +230,7 @@ async function inflateRaw(compressedBlob, expectedSize, name, signal) {total += value.byteLength;if (total > expectedSize) throw new Error(`ZIP 解压内容超过声明大小:${name}`);checksum = crc32Update(checksum, value);+ onBytes?.(total);controller.enqueue(value);}}), { signal });@@ -237,15 +250,18 @@ function dataView(bytes) {return new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);}-async function crc32Blob(blob, signal) {+async function crc32Blob(blob, signal, onBytes) {const reader = blob.stream().getReader();let checksum = 0xffffffff;+ let total = 0;try {while (true) {signal?.throwIfAborted();const { done, value } = await reader.read();if (done) break;checksum = crc32Update(checksum, value);+ total += value.byteLength;+ onBytes?.(total);}} finally {reader.releaseLock();@@ -331,7 +347,16 @@ function mimeTypeForPath(path) {function crc32Update(initial, bytes) {let checksum = initial;- for (let index = 0; index < bytes.length; index += 1) {+ let index = 0;+ // Eight-byte slicing computes the same ZIP CRC with fewer dependent lookups.+ for (; index + 8 <= bytes.length; index += 8) {+ const word = checksum ^ (bytes[index] | bytes[index + 1] << 8 | bytes[index + 2] << 16 | bytes[index + 3] << 24);+ checksum = CRC_SLICES[7][word & 255] ^ CRC_SLICES[6][word >>> 8 & 255]+ ^ CRC_SLICES[5][word >>> 16 & 255] ^ CRC_SLICES[4][word >>> 24]+ ^ CRC_SLICES[3][bytes[index + 4]] ^ CRC_SLICES[2][bytes[index + 5]]+ ^ CRC_SLICES[1][bytes[index + 6]] ^ CRC_SLICES[0][bytes[index + 7]];+ }+ for (; index < bytes.length; index += 1) {checksum = CRC_TABLE[(checksum ^ bytes[index]) & 0xff] ^ (checksum >>> 8);}return checksum >>> 0;@@ -349,3 +374,8 @@ for (let index = 0; index < CRC_TABLE.length; index += 1) {}CRC_TABLE[index] = value >>> 0;}++const CRC_SLICES = [CRC_TABLE];+for (let slice = 1; slice < 8; slice += 1) {+ CRC_SLICES.push(CRC_SLICES[slice - 1].map(value => CRC_TABLE[value & 255] ^ (value >>> 8)));+}