Skip to content

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. 提示词导演

补齐批量分析后台恢复与审查缺口

MigenAI0c81e4f122d3
diff --git a/ai-provider-registry.js b/ai-provider-registry.js
index 4762aed..33684d5 100644
--- a/ai-provider-registry.js
+++ b/ai-provider-registry.js
@@ -1,4 +1,5 @@
import { AI_PROVIDER_PRESETS, getAiProviderPreset } from "./ai-provider-presets.js";
+import { getAiModelCapability } from "./ai-model-capabilities.js";
export const AI_ASSIGNMENT_TASKS = Object.freeze([
{ id: "textTags", label: "文字标签" },
@@ -51,11 +52,26 @@ export function normalizeAiTaskAssignments(value = {}, registryValue = {}) {
? source.evidence
: inferredEvidence === "manual_unverified" ? inferredEvidence : "";
if (evidence) assignment.evidence = evidence;
- assignment.concurrency = normalizeTaskConcurrency(task.id, source.concurrency, discovered?.concurrencyLimit?.value);
+ assignment.concurrency = normalizeTaskConcurrency(
+ task.id,
+ source.concurrency,
+ modelConcurrencyLimit(assignment.providerId, assignment.model, registryValue)
+ );
return [task.id, assignment];
}));
}
+export function modelConcurrencyLimit(providerIdValue, modelValue, registryValue = {}) {
+ const providerId = clean(providerIdValue);
+ const model = clean(modelValue).replace(/^models\//, "");
+ if (!providerId || !model) return null;
+ const profile = registryValue?.providers?.[providerId];
+ const discoveredLimit = Number(profile?.discoveredModels?.find((item) => item.id === model)?.concurrencyLimit?.value);
+ if (Number.isInteger(discoveredLimit) && discoveredLimit >= 2) return discoveredLimit;
+ const officialLimit = Number(getAiModelCapability(providerId, model)?.concurrencyLimit?.value);
+ return Number.isInteger(officialLimit) && officialLimit >= 2 ? officialLimit : null;
+}
+
export function publicAiProviderRegistry(value = {}) {
const registry = normalizeAiProviderRegistry(value);
return {
diff --git a/analysis-batch.js b/analysis-batch.js
index 0797ea1..65607ea 100644
--- a/analysis-batch.js
+++ b/analysis-batch.js
@@ -127,7 +127,8 @@ export function previewVisionBatch(entries = [], options = {}) {
: [primaryImageAsset(entry)].filter(Boolean);
for (const visual of candidates) {
if (!visual?.id) continue;
- if (!reanalyze && visual.visionAnalysis?.description) {
+ const hasCompleteAnalysis = Boolean(visual.visionAnalysis?.description) && visual.visionAnalysis?.quality !== "partial";
+ if (!reanalyze && hasCompleteAnalysis) {
skippedAnalyzedCount += 1;
continue;
}
@@ -135,7 +136,7 @@ export function previewVisionBatch(entries = [], options = {}) {
entryId: String(entry.id),
visualId: String(visual.id),
title: String(entry.title ?? ""),
- alreadyAnalyzed: Boolean(visual.visionAnalysis?.description)
+ alreadyAnalyzed: hasCompleteAnalysis
});
}
}
@@ -401,6 +402,15 @@ export function pauseAnalysisBatch(value) {
export function resumeAnalysisBatch(value) {
const job = requireJob(value);
if (job.status === "canceled") throw new Error("已取消的批量任务不能继续");
+ if (job.items.some((item) => ["pending", "running"].includes(item.status))) job.status = "running";
+ else finishIfSettled(job);
+ touch(job);
+ return job;
+}
+
+export function recoverInterruptedAnalysisBatch(value) {
+ const job = requireJob(value);
+ if (job.status === "canceled") return job;
for (const item of job.items) {
if (item.status !== "running") continue;
item.status = "pending";
@@ -420,9 +430,6 @@ export function retryFailedAnalysisItems(value) {
item.status = "pending";
item.error = "";
item.statusCode = 0;
- item.serviceRequests = 0;
- item.outputCorrectionRequests = 0;
- item.cacheHit = false;
count += 1;
}
if (!count) throw new Error("没有可重试的失败案例");
@@ -588,9 +595,9 @@ function normalizeRetryPolicy(value) {
}
function recordItemExecution(item, metadata = {}) {
- item.serviceRequests = Math.max(0, Number(metadata.attempts?.serviceRequests ?? metadata.serviceRequests) || 0);
- item.outputCorrectionRequests = Math.max(0, Number(metadata.attempts?.outputCorrectionRequests ?? metadata.outputCorrectionRequests) || 0);
- item.cacheHit = metadata.cacheHit === true;
+ item.serviceRequests += Math.max(0, Number(metadata.attempts?.serviceRequests ?? metadata.serviceRequests) || 0);
+ item.outputCorrectionRequests += Math.max(0, Number(metadata.attempts?.outputCorrectionRequests ?? metadata.outputCorrectionRequests) || 0);
+ item.cacheHit = item.cacheHit || metadata.cacheHit === true;
}
function failureCategory(status) {
diff --git a/analysis-runner.js b/analysis-runner.js
deleted file mode 100644
index e811f44..0000000
--- a/analysis-runner.js
+++ /dev/null
@@ -1,54 +0,0 @@
-export async function runAnalysisClaimsIndependently(options = {}) {
- const claims = Array.isArray(options.claims) ? options.claims : [];
- if (typeof options.analyze !== "function" || typeof options.commit !== "function") {
- throw new TypeError("批量分析执行器缺少分析或保存函数");
- }
- if (!Number.isFinite(options.timeoutMs) || options.timeoutMs <= 0) {
- throw new TypeError("批量分析执行器缺少有效的超时时间");
- }
- if (typeof options.timeoutResult !== "function") {
- throw new TypeError("批量分析执行器缺少超时结果函数");
- }
-
- return Promise.allSettled(claims.map((claim) => runClaim(claim, options)));
-}
-
-async function runClaim(claim, options) {
- if (options.signal?.aborted) return { status: "aborted" };
- const controller = new AbortController();
- let timeoutId = 0;
- let removeAbortListener = () => undefined;
-
- const timeout = new Promise((resolve) => {
- timeoutId = setTimeout(() => {
- resolve({ kind: "timeout" });
- controller.abort();
- }, options.timeoutMs);
- });
- const stopped = new Promise((resolve) => {
- if (!options.signal) return;
- const onAbort = () => {
- resolve({ kind: "aborted" });
- controller.abort();
- };
- options.signal.addEventListener("abort", onAbort, { once: true });
- removeAbortListener = () => options.signal.removeEventListener("abort", onAbort);
- });
- const analysis = Promise.resolve()
- .then(() => options.analyze(claim, controller.signal))
- .then(
- (value) => ({ kind: "result", value }),
- (error) => ({ kind: "error", error })
- );
-
- try {
- const outcome = await Promise.race([analysis, timeout, stopped]);
- if (outcome.kind === "aborted") return { status: "aborted" };
- if (outcome.kind === "error") throw outcome.error;
- const result = outcome.kind === "timeout" ? options.timeoutResult(claim) : outcome.value;
- return { status: "committed", response: await options.commit(result, claim) };
- } finally {
- clearTimeout(timeoutId);
- removeAbortListener();
- }
-}
diff --git a/analysis-scheduler.js b/analysis-scheduler.js
index dc2e87a..14fbb73 100644
--- a/analysis-scheduler.js
+++ b/analysis-scheduler.js
@@ -8,14 +8,19 @@ export function scheduleAnalysis(keyValue, concurrencyValue, task) {
const key = String(keyValue ?? "").trim();
if (!key || typeof task !== "function") throw new Error("分析调度参数无效");
const concurrency = normalizedConcurrency(concurrencyValue);
- const state = schedulers.get(key) ?? { active: 0, limit: concurrency, effectiveLimit: concurrency, queue: [], throttledUntil: 0 };
- state.limit = concurrency;
- state.effectiveLimit = state.throttledUntil
- ? Math.min(state.effectiveLimit, concurrency)
- : concurrency;
+ const state = schedulers.get(key) ?? {
+ active: 0,
+ limit: concurrency,
+ effectiveLimit: concurrency,
+ queue: [],
+ activeItems: new Set(),
+ throttledUntil: 0
+ };
+ state.activeItems ??= new Set();
if (!schedulers.has(key)) schedulers.set(key, state);
return new Promise((resolve, reject) => {
- state.queue.push({ task, resolve, reject });
+ state.queue.push({ task, resolve, reject, concurrency });
+ synchronizeLimit(state);
drain(state);
});
}
@@ -50,9 +55,11 @@ export async function runScheduledAnalysisWithRetries(options = {}) {
}
function drain(state) {
+ synchronizeLimit(state);
while (state.active < state.effectiveLimit && state.queue.length) {
const item = state.queue.shift();
state.active += 1;
+ state.activeItems.add(item);
Promise.resolve().then(item.task).then((value) => {
if (state.throttledUntil && Date.now() >= state.throttledUntil) {
state.effectiveLimit = Math.min(state.limit, state.effectiveLimit + 1);
@@ -67,11 +74,21 @@ function drain(state) {
item.reject(error);
}).finally(() => {
state.active -= 1;
+ state.activeItems.delete(item);
+ synchronizeLimit(state);
drain(state);
});
}
}
+function synchronizeLimit(state) {
+ const requestedLimits = [...state.activeItems, ...state.queue].map((item) => item.concurrency);
+ if (requestedLimits.length) state.limit = Math.min(...requestedLimits);
+ state.effectiveLimit = state.throttledUntil
+ ? Math.min(state.effectiveLimit, state.limit)
+ : state.limit;
+}
+
function isRetryable(error) {
if (error?.status === undefined || error?.status === null) return false;
const status = Number(error.status) || 0;
diff --git a/background.js b/background.js
index d6d863a..1611d8a 100644
--- a/background.js
+++ b/background.js
@@ -45,6 +45,7 @@ import {
ANALYSIS_PROMPT_VERSION,
analysisProfileFingerprint,
analysisTaxonomyPrompt,
+ analyzeTextDetailedWithDeepSeek,
publicAiSettings,
summarizeVisualSetWithAi
} from "./deepseek.js";
@@ -72,6 +73,7 @@ import {
previewAnalysisBatch,
previewVisionBatch,
reconcileVisionBatchResults,
+ recoverInterruptedAnalysisBatch,
restoreAnalysisBatchUndo,
resumeAnalysisBatch,
retryFailedAnalysisItems,
@@ -268,6 +270,7 @@ import {
availableAiModelsForTask,
availableAiProvidersForTask,
mergeAiProviderRegistry,
+ modelConcurrencyLimit,
normalizeAiTaskAssignments,
publicAiProviderRegistry
} from "./ai-provider-registry.js";
@@ -439,10 +442,13 @@ let maintenanceRunnerActive = false;
let maintenanceRunnerTimer = 0;
let automaticVisionRunnerActive = false;
let automaticVisionRunnerTimer = 0;
+let analysisBatchRunnerActive = false;
+let analysisBatchRunnerTimer = 0;
let importRunnerActive = false;
let importRunnerTimer = 0;
const LIBRARY_MAINTENANCE_ALARM = "prompt-director-library-maintenance";
const AUTOMATIC_VISION_ALARM = "prompt-director-automatic-vision";
+const ANALYSIS_BATCH_ALARM = "prompt-director-analysis-batch";
const IMPORT_JOB_ALARM = "prompt-director-local-import";
const MAINTENANCE_SLICE_TARGET_MS = 250;
const captureRuntime = createCaptureWorkspace({
@@ -481,10 +487,12 @@ chrome.sidePanel.setPanelBehavior({ openPanelOnActionClick: false }).catch((erro
chrome.alarms.onAlarm.addListener((alarm) => {
if (alarm.name === LIBRARY_MAINTENANCE_ALARM) scheduleLibraryMaintenanceRunner();
if (alarm.name === AUTOMATIC_VISION_ALARM) scheduleAutomaticVisionRunner();
+ if (alarm.name === ANALYSIS_BATCH_ALARM) scheduleAnalysisBatchRunner();
if (alarm.name === IMPORT_JOB_ALARM) scheduleImportRunner();
});
scheduleLibraryMaintenanceRunner();
scheduleAutomaticVisionRunner();
+scheduleAnalysisBatchRunner();
recoverCreativeJobs().catch((error) => console.error("PromptDirector creative job recovery failed", error));
recoverImportJobs().catch((error) => console.error("PromptDirector local import recovery failed", error));
@@ -4422,6 +4430,13 @@ async function applyDetailTagOrganization(message) {
async function updateAiProviderConfiguration(message = {}) {
const current = await loadAiConfiguration();
const registry = mergeAiProviderRegistry(current.registry, message.registry);
+ for (const [taskId, assignment] of Object.entries(message.assignments ?? {})) {
+ const requested = Number(assignment?.concurrency);
+ const limit = modelConcurrencyLimit(assignment?.providerId, assignment?.model, registry);
+ if (Number.isInteger(requested) && Number.isInteger(limit) && requested > limit) {
+ throw new Error(`${taskId} 的并发数 ${requested} 超过所选模型官方上限 ${limit}`);
+ }
+ }
const assignments = normalizeAiTaskAssignments(message.assignments ?? current.assignments, registry);
const configuration = {
registry,
@@ -4572,7 +4587,8 @@ async function getAiTaskRuntime(taskIdValue, allowUnconfigured = false, assignme
...storedConfiguration.assignments,
[taskId]: {
providerId: requestedProviderId || storedConfiguration.assignments[taskId]?.providerId,
- model: requestedModel || storedConfiguration.assignments[taskId]?.model
+ model: requestedModel || storedConfiguration.assignments[taskId]?.model,
+ concurrency: assignmentOverride?.concurrency ?? storedConfiguration.assignments[taskId]?.concurrency
}
}, storedConfiguration.registry)
} : storedConfiguration;
@@ -4732,6 +4748,7 @@ async function analyzeEntryImage(entryId, visualIdValue, outputLocale, batchJobI
entry: applied.state.entries.find((item) => item.id === current.id),
usage: result.usage,
cacheHit: result.cacheHit,
+ attempts: result.attempts,
quality: result.quality,
missingFields: result.missingFields,
...publicDomainState(applied.state),
@@ -4779,7 +4796,8 @@ async function analyzeVisionBlobWithScheduler({ blob, catalog, locale, measuredC
}
};
const schedulerKey = `${assignment.providerId}:${assignment.model}:imageAnalysis`;
- const requestKey = `${schedulerKey}:${fingerprint}:${locale}:${catalog?.revision ?? 0}`;
+ const requestMode = bypassCache ? "reanalyze" : (previousAnalysis?.quality === "partial" || cached?.quality === "partial") ? "complete" : "analyze";
+ const requestKey = `${schedulerKey}:${fingerprint}:${profileFingerprint}:${locale}:${catalog?.revision ?? 0}:${requestMode}`;
let serviceRequests = 0;
let coalesced = false;
let result;
@@ -5250,6 +5268,8 @@ async function createDeepSeekBatch(outputLocale, mode = "incremental") {
changes[STORAGE_KEYS.analysisBatchUndo] = createAnalysisBatchUndo(job, state);
}
await commitLocalChanges(changes);
+ await ensureAnalysisBatchAlarm(true);
+ scheduleAnalysisBatchRunner();
return { ok: true, message: `已创建 ${job.items.length} 条批量分析任务`, analysisBatchJob: analysisBatchSummary(job) };
}
@@ -5450,6 +5470,12 @@ async function updateDeepSeekBatch(action, jobId) {
};
const next = actions[action](current);
await commitLocalChanges({ [STORAGE_KEYS.batchJob]: next });
+ if (next.status === "running") {
+ await ensureAnalysisBatchAlarm(true);
+ scheduleAnalysisBatchRunner();
+ } else {
+ await ensureAnalysisBatchAlarm(false);
+ }
if (action === "cancel" && current.mode === "rebuild") {
await chrome.storage.local.remove(STORAGE_KEYS.analysisRebuildStaging);
}
@@ -5514,7 +5540,7 @@ async function recoverDeepSeekBatch() {
if (!job || !job.items.some((item) => item.status === "running")) {
return { ok: true, analysisBatchJob: analysisBatchSummary(job) };
}
- const recovered = resumeAnalysisBatch(job);
+ const recovered = recoverInterruptedAnalysisBatch(job);
await commitLocalChanges({ [STORAGE_KEYS.batchJob]: recovered });
return { ok: true, message: "已从上次中断处继续", analysisBatchJob: analysisBatchSummary(recovered) };
}
@@ -5589,6 +5615,8 @@ async function createVisionBatchTask(message) {
});
await commitLocalChanges({ [STORAGE_KEYS.batchJob]: job });
await chrome.storage.local.remove(STORAGE_KEYS.analysisBatchUndo);
+ await ensureAnalysisBatchAlarm(true);
+ scheduleAnalysisBatchRunner();
return {
ok: true,
message: `已创建 ${job.requestCount} 张图片分析任务`,
@@ -5665,6 +5693,12 @@ async function updateVisionBatch(action, jobId) {
};
const next = actions[action](current);
await commitLocalChanges({ [STORAGE_KEYS.batchJob]: next });
+ if (next.status === "running") {
+ await ensureAnalysisBatchAlarm(true);
+ scheduleAnalysisBatchRunner();
+ } else {
+ await ensureAnalysisBatchAlarm(false);
+ }
return {
ok: true,
message: ({ pause: "批量画面分析已暂停", resume: "批量画面分析已继续", cancel: "批量画面分析已取消", retry: "失败图片已重新加入队列" })[action],
@@ -5672,6 +5706,209 @@ async function updateVisionBatch(action, jobId) {
};
}
+function scheduleAnalysisBatchRunner() {
+ if (analysisBatchRunnerActive || analysisBatchRunnerTimer) return;
+ analysisBatchRunnerTimer = setTimeout(() => {
+ analysisBatchRunnerTimer = 0;
+ void runPersistedAnalysisBatch();
+ }, 0);
+}
+
+async function runPersistedAnalysisBatch() {
+ if (analysisBatchRunnerActive) return;
+ analysisBatchRunnerActive = true;
+ let continueRunning = false;
+ try {
+ const stored = await chrome.storage.local.get(STORAGE_KEYS.batchJob);
+ const initial = normalizeAnalysisBatchJob(stored[STORAGE_KEYS.batchJob]);
+ if (!initial || initial.status !== "running") {
+ await ensureAnalysisBatchAlarm(false);
+ return;
+ }
+ if (initial.kind === "vision") {
+ continueRunning = await runPersistedVisionBatchSlice(initial.id);
+ } else {
+ continueRunning = await runPersistedTextBatchSlice(initial.id);
+ }
+ await ensureAnalysisBatchAlarm(continueRunning);
+ } catch (error) {
+ console.error("PromptDirector persisted analysis batch failed", error);
+ const stored = await chrome.storage.local.get(STORAGE_KEYS.batchJob).catch(() => ({}));
+ continueRunning = normalizeAnalysisBatchJob(stored[STORAGE_KEYS.batchJob])?.status === "running";
+ await ensureAnalysisBatchAlarm(continueRunning);
+ } finally {
+ analysisBatchRunnerActive = false;
+ if (continueRunning) scheduleAnalysisBatchRunner();
+ }
+}
+
+async function runPersistedTextBatchSlice(jobId) {
+ const configuration = await loadAiConfiguration();
+ const prepared = await enqueue(async () => {
+ const stored = await chrome.storage.local.get(STORAGE_KEYS.batchJob);
+ let job = requireAnalysisBatch(stored[STORAGE_KEYS.batchJob], jobId, "text_tags");
+ if (job.status !== "running") return { job, claims: [], settings: null };
+ const snapshotConfiguration = configurationForAssignment(configuration, "textTags", job);
+ let settings;
+ try {
+ settings = resolveTextTaskSettings("textTags", snapshotConfiguration);
+ } catch (error) {
+ job = pauseAnalysisBatch(job);
+ await commitLocalChanges({ [STORAGE_KEYS.batchJob]: job });
+ console.warn("PromptDirector text batch paused because its service snapshot is unavailable", userMessage(error));
+ return { job, claims: [], settings: null };
+ }
+ const currentProfile = await analysisProfileFingerprint(settings, job.outputLocale);
+ if (job.profileFingerprint && currentProfile !== job.profileFingerprint) {
+ job = pauseAnalysisBatch(job);
+ await commitLocalChanges({ [STORAGE_KEYS.batchJob]: job });
+ return { job, claims: [], settings: null };
+ }
+ job = recoverInterruptedAnalysisBatch(job);
+ const claimed = claimAnalysisItems(job);
+ await commitLocalChanges({ [STORAGE_KEYS.batchJob]: claimed.job });
+ return { job: claimed.job, claims: claimed.claims, settings };
+ });
+ if (!prepared.claims.length || !prepared.settings) return false;
+ const state = await readState();
+ const entryById = new Map(state.entries.map((entry) => [entry.id, entry]));
+ const results = await Promise.all(prepared.claims.map((claim) => analyzePersistedTextClaim(
+ prepared.job,
+ claim,
+ entryById.get(claim.entryId),
+ state.facetCatalog,
+ prepared.settings
+ )));
+ const committed = await enqueue(() => commitDeepSeekBatchItems({ jobId, results }));
+ return committed.analysisBatchJob?.status === "running";
+}
+
+async function analyzePersistedTextClaim(job, claim, entry, catalog, settings) {
+ if (!entry) return persistedTextFailure(claim, "案例已不存在", 404);
+ let serviceRequests = 0;
+ try {
+ const result = await runScheduledAnalysisWithRetries({
+ key: `${job.providerId}:${job.model || job.analysisModel}:textTags`,
+ concurrency: job.concurrency,
+ task: async () => {
+ serviceRequests += 1;
+ return analyzeTextDetailedWithDeepSeek(entry, catalog, {
+ ...settings,
+ outputLocale: job.outputLocale
+ });
+ }
+ });
+ return {
+ entryId: claim.entryId,
+ claimId: claim.claimId,
+ fingerprint: await textFingerprint(entry.text),
+ textRevision: claim.textRevision,
+ tags: result.tags,
+ normalizationDiagnostics: result.normalizationDiagnostics,
+ attempts: {
+ serviceRequests,
+ outputCorrectionRequests: Number(result.attempts?.outputCorrectionRequests) || 0
+ },
+ usage: result.usage,
+ model: result.model
+ };
+ } catch (error) {
+ return persistedTextFailure(
+ claim,
+ userMessage(error),
+ Number(error?.status) || 0,
+ error?.usage,
+ {
+ serviceRequests,
+ outputCorrectionRequests: Math.max(0, Number(error?.attempts?.outputCorrectionRequests) || 0)
+ }
+ );
+ }
+}
+
+function persistedTextFailure(claim, message, status, usage, attempts) {
+ return {
+ entryId: claim.entryId,
+ claimId: claim.claimId,
+ textRevision: claim.textRevision,
+ error: { message, status, usage, attempts }
+ };
+}
+
+async function runPersistedVisionBatchSlice(jobId) {
+ const configuration = await loadAiConfiguration();
+ const prepared = await enqueue(async () => {
+ const state = await readState();
+ const stored = await chrome.storage.local.get(STORAGE_KEYS.batchJob);
+ let job = requireAnalysisBatch(stored[STORAGE_KEYS.batchJob], jobId, "vision");
+ if (job.status !== "running") return { job, claims: [] };
+ job = reconcileVisionBatchResults(recoverInterruptedAnalysisBatch(job), state.entries).job;
+ const snapshotConfiguration = configurationForAssignment(configuration, "imageAnalysis", job);
+ const settings = resolveVisionTaskSettings("imageAnalysis", snapshotConfiguration, { requireConfigured: false });
+ const snapshotReady = publicVisionSettings(settings)[settings.activeProvider]?.configured === true;
+ if (!snapshotReady || !settings.consent) {
+ job = pauseAnalysisBatch(job);
+ await commitLocalChanges({ [STORAGE_KEYS.batchJob]: job });
+ return { job, claims: [] };
+ }
+ const claimed = claimAnalysisItems(job);
+ await commitLocalChanges({ [STORAGE_KEYS.batchJob]: claimed.job });
+ return { job: claimed.job, claims: claimed.claims };
+ });
+ if (!prepared.claims.length) return false;
+ await Promise.all(prepared.claims.map(async (claim) => {
+ let result;
+ try {
+ result = await analyzeEntryImage(
+ claim.entryId,
+ claim.visualId,
+ prepared.job.outputLocale,
+ prepared.job.id,
+ prepared.job.reanalyze,
+ prepared.job
+ );
+ } catch (error) {
+ result = {
+ ok: false,
+ message: userMessage(error),
+ status: Number(error?.status) || 0,
+ usage: error?.usage,
+ attempts: error?.attempts
+ };
+ }
+ await enqueue(() => result.ok
+ ? completeVisionBatchItem({
+ jobId,
+ entryId: claim.entryId,
+ visualId: claim.visualId,
+ claimId: claim.claimId,
+ usage: result.usage,
+ cacheHit: result.cacheHit,
+ attempts: result.attempts,
+ quality: result.quality
+ })
+ : failVisionBatchItem({
+ jobId,
+ entryId: claim.entryId,
+ visualId: claim.visualId,
+ claimId: claim.claimId,
+ error: {
+ message: result.message,
+ status: result.status,
+ usage: result.usage,
+ attempts: result.attempts
+ }
+ }));
+ }));
+ const stored = await chrome.storage.local.get(STORAGE_KEYS.batchJob);
+ return normalizeAnalysisBatchJob(stored[STORAGE_KEYS.batchJob])?.status === "running";
+}
+
+async function ensureAnalysisBatchAlarm(running) {
+ if (running) await chrome.alarms.create(ANALYSIS_BATCH_ALARM, { periodInMinutes: 1 });
+ else await chrome.alarms.clear(ANALYSIS_BATCH_ALARM);
+}
+
async function queueAutomaticVisionAnalysis(entryIdsValue, options = {}) {
const entryIds = [...new Set((Array.isArray(entryIdsValue) ? entryIdsValue : []).map(String).filter(Boolean))];
if (!entryIds.length) return false;
@@ -5732,7 +5969,7 @@ async function runAutomaticVisionItem() {
return;
}
const state = await readState();
- job = resumeAnalysisBatch(job);
+ job = recoverInterruptedAnalysisBatch(job);
job = reconcileVisionBatchResults(job, state.entries).job;
const claimed = claimAnalysisItems(job);
job = claimed.job;
diff --git a/i18n.js b/i18n.js
index 2c8fd6a..603d0c0 100644
--- a/i18n.js
+++ b/i18n.js
@@ -374,6 +374,7 @@ const EN = Object.freeze({
"{failed} 张失败,已成功 {completed} 张且不会重复请求。可直接重试失败项。": "{failed} images failed. {completed} succeeded and will not be requested again. You can retry only the failed items.",
"{failed} 张失败,{partial} 张待补全,已成功 {completed} 张且不会重复请求。可直接重试失败或待补全项。": "{failed} images failed, {partial} need completion, and {completed} succeeded without repeat requests. Retry only failed or incomplete items.",
"批量分析并发数": "Batch analysis concurrency",
+ "批量分析并发数不能超过所选模型的官方上限 {count}": "Batch analysis concurrency cannot exceed the selected model's official limit of {count}",
"文字任务默认 20,图片和视频任务默认 10;调整只对新任务生效。": "Text tasks default to 20; image and video tasks default to 10. Changes apply only to new jobs.",
"我确认高于 20 的并发可能明显增加瞬时费用、内存占用和错误数量": "I understand concurrency above 20 may sharply increase burst cost, memory use, and errors",
"官方并发上限:{count}": "Official concurrency limit: {count}",
diff --git a/library.js b/library.js
index 5b626cd..e37b8f3 100644
--- a/library.js
+++ b/library.js
@@ -37,19 +37,15 @@ import {
isEntryPending
} from "./library-model.js";
import {
- DeepSeekApiError,
- ANALYSIS_CLAIM_TIMEOUT_MS,
ANALYSIS_PROMPT_VERSION,
- ANALYSIS_SERVICE_RETRY_LIMIT,
DEFAULT_ANALYSIS_INSTRUCTIONS_BY_LOCALE,
analysisProfileFingerprint,
analysisProtocolDescription,
analyzeTextDetailedWithDeepSeek,
- isRetryableDeepSeekError,
normalizeAiSettings,
organizeDetailTagsWithDeepSeek
} from "./deepseek.js";
-import { runAnalysisClaimsIndependently } from "./analysis-runner.js";
+import { runScheduledAnalysisWithRetries } from "./analysis-scheduler.js";
import {
COMPOSER_METHOD_VERSION,
DEFAULT_TASK_METHODS,
@@ -113,7 +109,8 @@ import { confirmAppAction, promptAppText, showAppDialog } from "./ui-dialogs.js"
import {
AI_ASSIGNMENT_TASKS,
availableAiModelsForTask,
- availableAiProvidersForTask
+ availableAiProvidersForTask,
+ modelConcurrencyLimit
} from "./ai-provider-registry.js";
import { buildSearchIndex, searchIndexedEntries } from "./search-index.js";
import {
@@ -289,8 +286,6 @@ let analysisBatchJob = null;
let visionBatchJob = null;
let canUndoAnalysisBatch = false;
let analysisBatchPreview = null;
-let batchRunnerActive = false;
-let batchRunnerAbortController = null;
let analysisDiagnostics = [];
let analysisDiagnosticStartedAt = 0;
let analysisDiagnosticWrite = Promise.resolve();
@@ -314,9 +309,7 @@ const ERROR_FEEDBACK_DURATION_MS = 8000;
let syncStatus = {};
let dataSafetyOperationActive = false;
let dataSafetyOperationType = "";
-let visionBatchRunnerActive = false;
const activeDetailMediaIdByEntry = new Map();
-let cancelVisionBatchAfterCurrent = false;
let promptEditState = null;
const visionStatusByEntry = new Map();
let activeFilterCount = 0;
@@ -369,7 +362,7 @@ window.addEventListener("scroll", () => {
scheduleVisibleMediaHydration();
}, { passive: true });
chrome.storage.onChanged.addListener((changes, areaName) => {
- if (areaName !== "local" || !["entries", "organizerState", "compoundCases"].some((key) => changes[key])) return;
+ if (areaName !== "local" || !["entries", "organizerState", "compoundCases", "batchJob"].some((key) => changes[key])) return;
externalLibraryRefreshPending = true;
scheduleExternalLibraryRefresh();
});
@@ -634,7 +627,7 @@ function bindEvents() {
});
elements.visionBatchClose.addEventListener("click", () => elements.visionBatchDialog.close());
elements.visionBatchDialog.addEventListener("click", (event) => {
- if (event.target === elements.visionBatchDialog && !visionBatchRunnerActive) elements.visionBatchDialog.close();
+ if (event.target === elements.visionBatchDialog) elements.visionBatchDialog.close();
});
for (const checkbox of [elements.visionBatchAllImages, elements.visionBatchReanalyze]) {
checkbox.addEventListener("change", previewSelectedVisionBatch);
@@ -643,7 +636,7 @@ function bindEvents() {
elements.visionBatchPause.addEventListener("click", () => updateVisionBatchAction("PAUSE_VISION_BATCH"));
elements.visionBatchResume.addEventListener("click", () => updateVisionBatchAction("RESUME_VISION_BATCH"));
elements.visionBatchRetry.addEventListener("click", () => updateVisionBatchAction("RETRY_VISION_BATCH_FAILURES"));
- elements.visionBatchCancel.addEventListener("click", cancelVisionBatch);
+ elements.visionBatchCancel.addEventListener("click", () => updateVisionBatchAction("CANCEL_VISION_BATCH"));
elements.saveLibrarySettings.addEventListener("click", saveLibrarySettings);
elements.libraryNameSetting.addEventListener("input", updateLibrarySettingsSaveState);
elements.exportPathSetting.addEventListener("input", updateLibrarySettingsSaveState);
@@ -792,15 +785,9 @@ function bindEvents() {
elements.startAnalysisBatch.addEventListener("click", startDeepSeekAnalysisBatch);
elements.startAnalysisReanalyze.addEventListener("click", startDeepSeekAnalysisBatch);
elements.pauseAnalysisBatch.addEventListener("click", () => controlAnalysisBatch("PAUSE_ANALYSIS_BATCH"));
- elements.resumeAnalysisBatch.addEventListener("click", async () => {
- await controlAnalysisBatch("RESUME_ANALYSIS_BATCH");
- runAnalysisBatch();
- });
+ elements.resumeAnalysisBatch.addEventListener("click", () => controlAnalysisBatch("RESUME_ANALYSIS_BATCH"));
elements.cancelAnalysisBatch.addEventListener("click", () => controlAnalysisBatch("CANCEL_ANALYSIS_BATCH"));
- elements.retryAnalysisFailures.addEventListener("click", async () => {
- await controlAnalysisBatch("RETRY_ANALYSIS_FAILURES");
- runAnalysisBatch();
- });
+ elements.retryAnalysisFailures.addEventListener("click", () => controlAnalysisBatch("RETRY_ANALYSIS_FAILURES"));
elements.applyStagedAnalysisRebuild.addEventListener("click", applyStagedAnalysisRebuild);
elements.copyAnalysisDiagnostics.addEventListener("click", () => copyTextWithFeedback(
elements.copyAnalysisDiagnostics,
@@ -931,7 +918,6 @@ async function refreshLibrary() {
if (elements.managerDialog.open) renderManager();
if (elements.settingsDialog.open && activeSettingsTab === "tasks") renderBatchManager();
if (currentDetailId && logicalCases.some((entry) => entry.id === currentDetailId) && !promptEditState?.dirty) await renderDetail();
- if (analysisBatchJob?.status === "running") runAnalysisBatch();
scheduleMaintenanceStatusPoll();
if (response.restoredArchivedFacetCount) {
showFeedback(`已自动恢复 ${response.restoredArchivedFacetCount} 个误归档维度,原案例标签没有丢失`);
@@ -2448,9 +2434,9 @@ function renderVisionBatchDialog(preview = null) {
elements.visionBatchReanalyze.disabled = Boolean(active);
elements.visionBatchStart.hidden = Boolean(job);
elements.visionBatchStart.disabled = !requestCount;
- elements.visionBatchPause.hidden = !job || job.status !== "running" || !visionBatchRunnerActive;
- elements.visionBatchResume.hidden = !job || !active || visionBatchRunnerActive;
- elements.visionBatchRetry.hidden = !job || !(counts.failed || counts.partial) || visionBatchRunnerActive;
+ elements.visionBatchPause.hidden = !job || job.status !== "running";
+ elements.visionBatchResume.hidden = !job || job.status !== "paused";
+ elements.visionBatchRetry.hidden = !job || !(counts.failed || counts.partial) || job.status === "running";
elements.visionBatchRetry.textContent = currentLocale() === "en"
? `Retry failed/incomplete (${(counts.failed || 0) + (counts.partial || 0)} expected items)`
: `重试失败/待补全(预计新增 ${(counts.failed || 0) + (counts.partial || 0)} 项)`;
@@ -2459,6 +2445,7 @@ function renderVisionBatchDialog(preview = null) {
const total = job.usage?.totalTokens ?? 0;
const label = job.status === "completed" ? (currentLocale() === "en" ? "Completed" : "全部完成")
: job.status === "failed" ? (currentLocale() === "en" ? "Failed" : "全部失败")
+ : job.status === "canceled" ? (currentLocale() === "en" ? "Canceled" : "已取消")
: (currentLocale() === "en" ? "Partially completed" : "部分完成,可重试失败或待补全项");
showVisionBatchFeedback(`${label} · ${total} tokens` , job.status === "failed");
}
@@ -2477,7 +2464,6 @@ async function startSelectedVisionBatch() {
if (!response?.ok) throw new Error(response?.message || "无法创建批量画面分析");
visionBatchJob = response.visionBatchJob;
renderVisionBatchDialog();
- await runVisionBatch();
} catch (error) {
showVisionBatchFeedback(error.message, true);
} finally {
@@ -2485,84 +2471,6 @@ async function startSelectedVisionBatch() {
}
}
-async function runVisionBatch() {
- if (visionBatchRunnerActive || !visionBatchJob || visionBatchJob.status !== "running") return;
- visionBatchRunnerActive = true;
- cancelVisionBatchAfterCurrent = false;
- renderVisionBatchDialog();
- try {
- while (visionBatchJob?.status === "running") {
- const claimed = await chrome.runtime.sendMessage({
- type: "CLAIM_VISION_BATCH_ITEM",
- jobId: visionBatchJob.id
- });
- if (!claimed?.ok) throw new Error(claimed?.message || "无法领取下一张图片");
- visionBatchJob = claimed.visionBatchJob;
- const claims = claimed.claims ?? (claimed.claim ? [claimed.claim] : []);
- if (!claims.length) break;
- showVisionBatchFeedback(currentLocale() === "en"
- ? `Analysing ${claims.length} images concurrently…`
- : `正在并发分析 ${claims.length} 张图片…`);
- const settled = await Promise.allSettled(claims.map(async (claim) => {
- const result = await chrome.runtime.sendMessage({
- type: "ANALYZE_ENTRY_IMAGE",
- entryId: claim.entryId,
- visualId: claim.visualId,
- outputLocale: visionBatchJob.outputLocale,
- batchJobId: visionBatchJob.id,
- bypassCache: visionBatchJob.reanalyze === true,
- assignment: {
- providerId: visionBatchJob.providerId,
- model: visionBatchJob.model,
- concurrency: visionBatchJob.concurrency
- }
- });
- const update = result?.ok
- ? await chrome.runtime.sendMessage({
- type: "COMPLETE_VISION_BATCH_ITEM",
- jobId: visionBatchJob.id,
- entryId: claim.entryId,
- visualId: claim.visualId,
- claimId: claim.claimId,
- usage: result.usage,
- cacheHit: result.cacheHit,
- attempts: result.attempts,
- quality: result.quality
- })
- : await chrome.runtime.sendMessage({
- type: "FAIL_VISION_BATCH_ITEM",
- jobId: visionBatchJob.id,
- entryId: claim.entryId,
- visualId: claim.visualId,
- claimId: claim.claimId,
- error: { message: result?.message || "图片分析失败", status: Number(result?.status) || 0 }
- });
- if (!update?.ok) throw new Error(update?.message || "无法保存批量任务进度");
- visionBatchJob = update.visionBatchJob;
- }));
- const rejected = settled.find((item) => item.status === "rejected");
- if (rejected) throw rejected.reason;
- renderVisionBatchDialog();
- if (cancelVisionBatchAfterCurrent) {
- await updateVisionBatchAction("CANCEL_VISION_BATCH");
- break;
- }
- }
- } catch (error) {
- showVisionBatchFeedback(error.message, true);
- } finally {
- visionBatchRunnerActive = false;
- renderVisionBatchDialog();
- if (visionBatchJob && !["running", "paused"].includes(visionBatchJob.status)) {
- selectionMode = "";
- projectSelectionId = "";
- selectedCaseIds.clear();
- updateSelectionBar();
- await refreshLibrary();
- }
- }
-}
-
async function updateVisionBatchAction(type) {
if (!visionBatchJob) return;
try {
@@ -2571,21 +2479,11 @@ async function updateVisionBatchAction(type) {
visionBatchJob = response.visionBatchJob;
showVisionBatchFeedback(response.message);
renderVisionBatchDialog();
- if (type === "RESUME_VISION_BATCH" || type === "RETRY_VISION_BATCH_FAILURES") await runVisionBatch();
} catch (error) {
showVisionBatchFeedback(error.message, true);
}
}
-async function cancelVisionBatch() {
- if (visionBatchRunnerActive) {
- cancelVisionBatchAfterCurrent = true;
- showVisionBatchFeedback(t("当前图片完成后取消,不会再发送下一张"));
- return;
- }
- await updateVisionBatchAction("CANCEL_VISION_BATCH");
-}
-
function showVisionBatchFeedback(message, isError = false) {
elements.visionBatchFeedback.textContent = message;
elements.visionBatchFeedback.classList.toggle("error", isError);
@@ -7445,6 +7343,10 @@ async function openAiTaskAssignmentDialog(taskId) {
const concurrency = supportsBatchConcurrency ? Number(values.concurrency) : initialConcurrency;
if (supportsBatchConcurrency && (!Number.isInteger(concurrency) || concurrency < 2)) throw new Error(t("批量分析并发数必须是大于或等于 2 的整数"));
if (supportsBatchConcurrency && concurrency > 20 && values.highConcurrencyConfirmed !== true) throw new Error(t("并发高于 20,请先确认费用和稳定性风险"));
+ const officialLimit = modelConcurrencyLimit(values.providerId, values.model, aiProviderRegistry);
+ if (supportsBatchConcurrency && Number.isInteger(officialLimit) && concurrency > officialLimit) {
+ throw new Error(t("批量分析并发数不能超过所选模型的官方上限 {count}", { count: officialLimit }));
+ }
const response = await chrome.runtime.sendMessage({
type: "UPDATE_AI_PROVIDER_CONFIGURATION",
assignments: { ...aiTaskAssignments, [taskId]: { providerId: values.providerId, model: values.model, concurrency } }
@@ -7988,7 +7890,6 @@ async function startDeepSeekAnalysisBatch() {
beginAnalysisDiagnostics();
renderAnalysisBatch();
showFeedback(response.message);
- runAnalysisBatch();
} catch (error) {
showFeedback(error.message, true);
} finally {
@@ -8033,9 +7934,6 @@ async function organizeDetailTags() {
async function controlAnalysisBatch(type) {
if (!analysisBatchJob?.id) return;
- if (["PAUSE_ANALYSIS_BATCH", "CANCEL_ANALYSIS_BATCH"].includes(type)) {
- batchRunnerAbortController?.abort();
- }
const buttons = {
PAUSE_ANALYSIS_BATCH: elements.pauseAnalysisBatch,
RESUME_ANALYSIS_BATCH: elements.resumeAnalysisBatch,
@@ -8085,166 +7983,37 @@ async function applyStagedAnalysisRebuild() {
}
}
-async function runAnalysisBatch() {
- if (batchRunnerActive || analysisBatchJob?.status !== "running") return;
- batchRunnerActive = true;
- recordAnalysisDiagnostic("runner_started");
- const runnerController = new AbortController();
- batchRunnerAbortController = runnerController;
+async function analyzeEntryWithRetry(entry, catalog, settingsValue, outputLocale = currentLocale(), signal, onDiagnostic) {
+ const reportDiagnostic = typeof onDiagnostic === "function"
+ ? (event) => onDiagnostic(event.stage, event)
+ : undefined;
+ let serviceRequests = 0;
try {
- await navigator.locks.request("love-prompt-analysis-runner", { ifAvailable: true }, async (lock) => {
- if (!lock) return;
- const recovered = await chrome.runtime.sendMessage({ type: "RECOVER_ANALYSIS_BATCH" });
- if (recovered?.analysisBatchJob) analysisBatchJob = recovered.analysisBatchJob;
- recordAnalysisDiagnostic("job_recovered");
- const settingsValue = await privateAiSettings({
- providerId: analysisBatchJob.providerId,
- model: analysisBatchJob.model || analysisBatchJob.analysisModel,
- concurrency: analysisBatchJob.concurrency
- });
- const currentProfile = await analysisProfileFingerprint(settingsValue, analysisBatchJob.outputLocale);
- if (analysisBatchJob.profileFingerprint && currentProfile !== analysisBatchJob.profileFingerprint) {
- const paused = await chrome.runtime.sendMessage({ type: "PAUSE_ANALYSIS_BATCH", jobId: analysisBatchJob.id });
- if (paused?.analysisBatchJob) analysisBatchJob = paused.analysisBatchJob;
- throw new Error(t("分析设置已变化,任务已暂停;请先取消旧任务,再重新生成预览"));
- }
- while (analysisBatchJob?.status === "running") {
- const response = await chrome.runtime.sendMessage({
- type: "CLAIM_ANALYSIS_ITEMS",
- jobId: analysisBatchJob.id
- });
- if (!response?.ok) throw new Error(response?.message || "无法领取批量任务");
- analysisBatchJob = response.analysisBatchJob;
- recordAnalysisDiagnostic("items_claimed", { count: response.claims?.length || 0 });
- renderAnalysisBatch();
- if (!response.claims?.length) break;
- const entryById = new Map(entries.map((entry) => [entry.id, entry]));
- const claims = response.claims.map((claim) => {
- const entry = entryById.get(claim.entryId);
- return {
- ...claim,
- entry: {
- id: entry?.id ?? claim.entryId,
- title: entry?.title ?? "",
- text: entry?.text ?? "",
- classification: entry?.classification
- }
- };
- });
- const settled = await runAnalysisClaimsIndependently({
- claims,
- signal: runnerController.signal,
- timeoutMs: ANALYSIS_CLAIM_TIMEOUT_MS,
- analyze: (claim, signal) => runAnalysisClaim(claim, facetCatalog, settingsValue, signal),
- timeoutResult: (claim) => analysisClaimFailure(claim, "AI 分析超时,本次没有写入任何标签", 408),
- commit: (result) => commitAnalysisClaimResult(analysisBatchJob.id, result)
+ const result = await runScheduledAnalysisWithRetries({
+ key: `${settingsValue.providerId}:${settingsValue.analysisModel || settingsValue.compatible?.model}:textTags`,
+ concurrency: settingsValue.concurrency,
+ wait: (milliseconds) => wait(milliseconds, signal),
+ task: async () => {
+ serviceRequests += 1;
+ return analyzeTextDetailedWithDeepSeek(entry, catalog, { ...settingsValue, outputLocale }, fetch, {
+ signal,
+ onDiagnostic: reportDiagnostic
});
- if (runnerController.signal.aborted) break;
- const rejected = settled.find((item) => item.status === "rejected");
- if (rejected) throw rejected.reason;
- const state = await chrome.runtime.sendMessage({
- type: "GET_ANALYSIS_BATCH_STATUS",
- jobId: analysisBatchJob.id
- });
- if (!state?.ok) throw new Error(state?.message || "无法读取批量进度");
- analysisBatchJob = state.analysisBatchJob;
- renderAnalysisBatch();
}
});
- } catch (error) {
- showFeedback(error.message || "批量分析已停止", true);
- } finally {
- if (batchRunnerAbortController === runnerController) batchRunnerAbortController = null;
- batchRunnerActive = false;
- await analysisDiagnosticWrite;
- await refreshLibrary();
- }
-}
-
-async function commitAnalysisClaimResult(jobId, result) {
- recordAnalysisDiagnostic("commit_started");
- const response = await chrome.runtime.sendMessage({
- type: "COMMIT_ANALYSIS_ITEM",
- jobId,
- ...result
- });
- if (!response?.ok) throw new Error(response?.message || "无法保存批量分析结果");
- if (response.facetCatalog) facetCatalog = normalizeFacetCatalog(response.facetCatalog);
- if (response.analysisBatchJob) {
- analysisBatchJob = response.analysisBatchJob;
- renderAnalysisBatch();
- }
- recordAnalysisDiagnostic("commit_completed", { failed: Boolean(result.error) });
- return response;
-}
-
-async function runAnalysisClaim(claim, catalog, settingsValue, signal) {
- try {
- const result = await analyzeEntryWithRetry(
- claim.entry,
- catalog,
- settingsValue,
- analysisBatchJob.outputLocale,
- signal,
- recordAnalysisDiagnostic
- );
return {
- entryId: claim.entryId,
- claimId: claim.claimId,
- fingerprint: claim.fingerprint,
- textRevision: claim.textRevision,
- tags: result.tags,
- normalizationDiagnostics: result.normalizationDiagnostics,
- attempts: result.attempts,
- usage: result.usage,
- model: result.model
+ ...result,
+ attempts: {
+ serviceRequests,
+ outputCorrectionRequests: Number(result.attempts?.outputCorrectionRequests) || 0
+ }
};
} catch (error) {
- if (error?.name === "AbortError") throw error;
- return analysisClaimFailure(claim, error.message || "分析失败", error.status || 0, error.usage, error.attempts);
- }
-}
-
-function analysisClaimFailure(claim, message, status, usage, attempts) {
- return {
- entryId: claim.entryId,
- claimId: claim.claimId,
- textRevision: claim.textRevision,
- error: { message, status, usage, attempts }
- };
-}
-
-async function analyzeEntryWithRetry(entry, catalog, settingsValue, outputLocale = currentLocale(), signal, onDiagnostic) {
- let serviceRetries = 0;
- const reportDiagnostic = typeof onDiagnostic === "function"
- ? (event) => onDiagnostic(event.stage, event)
- : undefined;
- for (;;) {
- try {
- const result = await analyzeTextDetailedWithDeepSeek(entry, catalog, { ...settingsValue, outputLocale }, fetch, {
- signal,
- onDiagnostic: reportDiagnostic
- });
- return {
- ...result,
- attempts: {
- serviceRequests: serviceRetries + 1,
- outputCorrectionRequests: Number(result.attempts?.outputCorrectionRequests) || 0
- }
- };
- } catch (error) {
- if (isRetryableDeepSeekError(error) && serviceRetries < ANALYSIS_SERVICE_RETRY_LIMIT) {
- const delay = error.retryAfterMs || [1000, 3000][serviceRetries] + Math.floor(Math.random() * 501);
- serviceRetries += 1;
- await wait(Math.min(delay, 30_000), signal);
- continue;
- }
- error.attempts = {
- serviceRequests: serviceRetries + 1,
- outputCorrectionRequests: Math.max(0, Number(error?.attempts?.outputCorrectionRequests) || 0)
- };
- throw error;
- }
+ error.attempts = {
+ serviceRequests,
+ outputCorrectionRequests: Math.max(0, Number(error?.attempts?.outputCorrectionRequests) || 0)
+ };
+ throw error;
}
}
@@ -8280,7 +8049,11 @@ async function analyzeSingleEntry(entry, button) {
async function privateAiSettings(assignment = null) {
const response = await chrome.runtime.sendMessage({ type: "GET_AI_TASK_RUNTIME", taskId: "textTags", assignment });
if (!response?.ok) throw new Error(response?.message || "无法读取文字标签服务");
- return normalizeAiSettings(response.aiSettings);
+ return {
+ ...normalizeAiSettings(response.aiSettings),
+ providerId: String(response.assignment?.providerId ?? "").trim(),
+ concurrency: Math.max(2, Number(response.assignment?.concurrency) || 20)
+ };
}
function wait(milliseconds, signal) {
diff --git a/tag-taxonomy.js b/tag-taxonomy.js
index 2e309f5..8fd6a36 100644
--- a/tag-taxonomy.js
+++ b/tag-taxonomy.js
@@ -159,15 +159,17 @@ export function analysisTaxonomyPayload(catalogValue, locale = "zh-CN") {
}
export function validateAnalysisTagResponse(value, catalogValue, options = {}) {
- if (!value || typeof value !== "object" || Array.isArray(value) || !Array.isArray(value.tags)) {
+ const tagField = knownField(value, ["tags", "tagList"]);
+ if (!value || typeof value !== "object" || Array.isArray(value) || tagField.conflict || !Array.isArray(tagField.value)) {
throw new Error("AI 返回格式无效,本次没有写入任何标签");
}
+ const sourceTags = tagField.value;
const minimum = options.allowEmpty === true ? 0 : ANALYSIS_TAG_MIN;
const maximum = Math.min(ANALYSIS_TAG_MAX, Math.max(minimum, Number(options.maxTags) || ANALYSIS_TAG_MAX));
const diagnostics = Array.isArray(options.diagnostics) ? options.diagnostics : null;
- const extraRootFields = Object.keys(value).filter((key) => key !== "tags").length;
+ const extraRootFields = Object.keys(value).filter((key) => key !== tagField.key).length;
if (extraRootFields) diagnostics?.push({ field: "root", code: "extra_fields_ignored", count: extraRootFields });
- if (value.tags.length < minimum) {
+ if (sourceTags.length < minimum) {
throw new Error(`AI 必须返回 ${minimum}–${maximum} 个标签,本次没有写入`);
}
const catalog = catalogValue && Array.isArray(catalogValue.nodes) ? catalogValue : createFixedFacetCatalog();
@@ -177,21 +179,28 @@ export function validateAnalysisTagResponse(value, catalogValue, options = {}) {
const seen = new Set();
const tags = [];
let unknownCount = 0;
- for (let index = 0; index < value.tags.length; index += 1) {
- const item = value.tags[index];
+ for (let index = 0; index < sourceTags.length; index += 1) {
+ const item = sourceTags[index];
if (!item || typeof item !== "object" || Array.isArray(item)) {
diagnostics?.push({ field: "tags", code: "invalid_tag_dropped", count: 1 });
continue;
}
- const extraFields = Object.keys(item).filter((key) => !["g", "groupId", "group_id", "group", "t", "detail", "tag", "label"].includes(key)).length;
+ const groupField = knownField(item, ["g", "groupId", "group"]);
+ const detailField = knownField(item, ["t", "detail", "tag", "label"]);
+ if (groupField.conflict || detailField.conflict) {
+ diagnostics?.push({ field: "tags", code: "conflicting_aliases_dropped", count: 1 });
+ continue;
+ }
+ const consumedKeys = new Set([groupField.key, detailField.key].filter(Boolean));
+ const extraFields = Object.keys(item).filter((key) => !consumedKeys.has(key)).length;
if (extraFields) diagnostics?.push({ field: "tags", code: "extra_fields_ignored", count: extraFields });
- const groupId = String(item.g ?? item.groupId ?? item.group_id ?? item.group ?? "").trim();
+ const groupId = String(groupField.value ?? "").trim();
if (!groups.has(groupId)) {
unknownCount += 1;
diagnostics?.push({ field: "tags", code: "unknown_path_dropped", count: 1 });
continue;
}
- const detailValue = item.t ?? item.detail ?? item.tag ?? item.label;
+ const detailValue = detailField.value;
const detail = String(detailValue ?? "").trim()
? [...normalizeDetailLabel(detailValue)].slice(0, ANALYSIS_DETAIL_MAX_LENGTH).join("")
: "";
@@ -203,18 +212,52 @@ export function validateAnalysisTagResponse(value, catalogValue, options = {}) {
seen.add(key);
tags.push(detail ? { g: groupId, t: detail } : { g: groupId });
if (tags.length >= maximum) {
- const capped = value.tags.length - index - 1;
+ const capped = sourceTags.length - index - 1;
if (capped) diagnostics?.push({ field: "tags", code: "over_limit_dropped", count: capped });
break;
}
}
- if (tags.length < minimum || (!tags.length && value.tags.length)) {
+ if (tags.length < minimum || (!tags.length && sourceTags.length)) {
if (unknownCount) throw new Error("AI 返回了未知分类路径,本次没有写入");
throw new Error(`AI 必须返回 ${minimum}–${maximum} 个标签,本次没有写入`);
}
return tags;
}
+function knownField(value, aliases) {
+ if (!value || typeof value !== "object" || Array.isArray(value)) {
+ return { key: "", value: undefined, conflict: false };
+ }
+ const accepted = new Set(aliases.map(normalizedFieldKey));
+ const matches = Object.keys(value).filter((key) => accepted.has(normalizedFieldKey(key)));
+ const firstValue = matches.length ? value[matches[0]] : undefined;
+ return {
+ key: matches[0] ?? "",
+ value: firstValue,
+ conflict: matches.slice(1).some((key) => !equivalentKnownFieldValue(firstValue, value[key]))
+ };
+}
+
+function normalizedFieldKey(value) {
+ return String(value ?? "").toLocaleLowerCase("en-US").replace(/[\s_-]+/g, "");
+}
+
+function equivalentKnownFieldValue(left, right) {
+ try {
+ return JSON.stringify(canonicalKnownFieldValue(left)) === JSON.stringify(canonicalKnownFieldValue(right));
+ } catch {
+ return false;
+ }
+}
+
+function canonicalKnownFieldValue(value) {
+ if (Array.isArray(value)) return value.map(canonicalKnownFieldValue);
+ if (value && typeof value === "object") {
+ return Object.fromEntries(Object.keys(value).sort().map((key) => [key, canonicalKnownFieldValue(value[key])]));
+ }
+ return typeof value === "string" ? value.trim() : value ?? null;
+}
+
export function mapLegacyAnalysisCandidate(value = {}) {
const groupId = inferGroupId([
value.dimensionName,
diff --git a/temp-references.js b/temp-references.js
index 00feb9e..dc111ee 100644
--- a/temp-references.js
+++ b/temp-references.js
@@ -98,18 +98,22 @@ export function imageTempReferenceBlock(referenceSnapshots, service) {
}
export function unreadReferenceImageAssets(reference) {
- if (String(reference?.referenceText ?? "").trim()) return [];
+ const analyzedAssets = new Map((Array.isArray(reference?.assets) ? reference.assets : [])
+ .map((item) => [String(item?.assetId ?? "").trim(), item]));
+ if (String(reference?.referenceText ?? "").trim() && !analyzedAssets.size) return [];
const assets = [];
const seen = new Set();
for (const asset of Array.isArray(reference?.assetRefs) ? reference.assetRefs : []) {
const assetId = String(asset?.assetId ?? "").trim();
if (asset?.kind !== "image" || !assetId || seen.has(assetId)) continue;
+ if (hasCompleteReferenceAnalysis(analyzedAssets.get(assetId))) continue;
seen.add(assetId);
assets.push({ ...asset, assetId });
}
for (const image of Array.isArray(reference?.imageRefs) ? reference.imageRefs : []) {
const assetId = String(image?.visualId ?? "").trim();
if (!assetId || seen.has(assetId)) continue;
+ if (hasCompleteReferenceAnalysis(analyzedAssets.get(assetId))) continue;
seen.add(assetId);
assets.push({
assetId,
@@ -121,6 +125,15 @@ export function unreadReferenceImageAssets(reference) {
return assets;
}
+function hasCompleteReferenceAnalysis(value) {
+ return Boolean(value
+ && Number(value.analysisVersion) === 2
+ && String(value.analysisFingerprint ?? "").trim()
+ && String(value.reconstructionPrompt ?? "").trim()
+ && String(value.imageFingerprint ?? "").trim()
+ && value.imageFingerprint === value.analysisImageFingerprint);
+}
+
export function tempReferenceAssetIds(reference) {
if (reference?.sourceType !== TEMP_REFERENCE_SOURCE_TYPES.temporary) return [];
return [...new Set((Array.isArray(reference.assetRefs) ? reference.assetRefs : [])
diff --git a/test/ai-provider-registry.test.js b/test/ai-provider-registry.test.js
index 1680560..446af4b 100644
--- a/test/ai-provider-registry.test.js
+++ b/test/ai-provider-registry.test.js
@@ -7,6 +7,7 @@ import {
availableAiProvidersForTask,
createAiTaskAssignment,
mergeAiProviderRegistry,
+ modelConcurrencyLimit,
normalizeAiProviderRegistry,
normalizeAiTaskAssignments,
publicAiProviderRegistry,
@@ -238,6 +239,15 @@ test("explicit task assignments survive v5 normalization with task defaults", ()
assert.equal(configuredRegistry().providers.deepseek.apiKey, "deepseek-secret");
});
+test("official concurrency remains enforceable even before model discovery", () => {
+ const registry = normalizeAiProviderRegistry({});
+ assert.equal(modelConcurrencyLimit("deepseek", "deepseek-v4-flash-vision-exp", registry), 2500);
+ const assignments = normalizeAiTaskAssignments({
+ imageAnalysis: { providerId: "deepseek", model: "deepseek-v4-flash-vision-exp", concurrency: 3000 }
+ }, registry);
+ assert.equal(assignments.imageAnalysis.concurrency, 2500);
+});
+
test("public provider registry never exposes credentials", () => {
const publicRegistry = publicAiProviderRegistry(configuredRegistry());
assert.equal(JSON.stringify(publicRegistry).includes("secret"), false);
diff --git a/test/analysis-batch.test.js b/test/analysis-batch.test.js
index dd66be6..69ebf82 100644
--- a/test/analysis-batch.test.js
+++ b/test/analysis-batch.test.js
@@ -11,6 +11,7 @@ import {
createAnalysisBatchJob,
finalizeAnalysisRebuild,
failAnalysisItem,
+ pauseAnalysisBatch,
partiallySucceedAnalysisItem,
previewAnalysisBatch,
finalizePartialAnalysisRebuild,
@@ -23,7 +24,8 @@ import {
textFingerprint,
previewVisionBatch,
createVisionBatchJob,
- reconcileVisionBatchResults
+ reconcileVisionBatchResults,
+ recoverInterruptedAnalysisBatch
} from "../analysis-batch.js";
import { ANALYSIS_PROMPT_VERSION } from "../deepseek.js";
import { createFixedFacetCatalog } from "../tag-taxonomy.js";
@@ -38,6 +40,19 @@ test("analysis-file import wires the legacy baseline helper into the background
assert.match(backgroundSource, /await backfillLegacyAnalysisMeta\(importedEntries\)/);
});
+test("vision in-flight identity includes the analysis profile and request mode", () => {
+ assert.match(backgroundSource, /requestKey = `\$\{schedulerKey\}:\$\{fingerprint\}:\$\{profileFingerprint\}/);
+ assert.match(backgroundSource, /:\$\{requestMode\}`/);
+ assert.match(backgroundSource, /return \{[\s\S]*?ok: true,[\s\S]*?attempts: result\.attempts,[\s\S]*?quality: result\.quality/);
+});
+
+test("manual text and vision batches run from the persistent background queue", () => {
+ assert.match(backgroundSource, /scheduleAnalysisBatchRunner\(\)/);
+ assert.match(backgroundSource, /runPersistedTextBatchSlice\(initial\.id\)/);
+ assert.match(backgroundSource, /runPersistedVisionBatchSlice\(initial\.id\)/);
+ assert.match(backgroundSource, /chrome\.alarms\.create\(ANALYSIS_BATCH_ALARM/);
+});
+
test("batch preview selects only text cases that are new or changed", async () => {
const unchanged = await textFingerprint("same prompt");
const preview = await previewAnalysisBatch([
@@ -173,7 +188,7 @@ test("legacy DeepSeek results receive a text baseline instead of being sent agai
assert.equal(baseline.entries[0].analysisMeta.textFingerprint, undefined);
});
-test("batch jobs claim stable references and resume interrupted work", async () => {
+test("pausing and immediately resuming preserves active claims to prevent duplicate paid requests", async () => {
let job = await createAnalysisBatchJob([{ id: "a", text: "one" }, { id: "b", text: "two" }], { id: "job", now: "2026-07-18T00:00:00Z", outputLocale: "en" });
assert.equal(job.outputLocale, "en");
const claimed = claimAnalysisItems(job, 1, () => "claim-a");
@@ -181,9 +196,13 @@ test("batch jobs claim stable references and resume interrupted work", async ()
assert.equal(claimed.claims[0].entryId, "a");
assert.equal(job.items[0].status, "running");
+ job = pauseAnalysisBatch(job);
job = resumeAnalysisBatch(job);
- assert.equal(job.items[0].status, "pending");
+ assert.equal(job.items[0].status, "running");
+ assert.equal(job.items[0].claimId, "claim-a");
assert.equal(job.status, "running");
+ job = succeedAnalysisItem(job, "a", "claim-a", {}, 1);
+ assert.equal(job.items[0].status, "succeeded");
});
test("recovering an old stalled rebuild preserves completed work and queues only unfinished cases", async () => {
@@ -195,7 +214,7 @@ test("recovering an old stalled rebuild preserves completed work and queues only
job.items[index].claimId = `old-claim-${index}`;
}
- const recovered = resumeAnalysisBatch(job);
+ const recovered = recoverInterruptedAnalysisBatch(job);
const summary = analysisBatchSummary(recovered);
assert.deepEqual(summary.counts, { pending: 5, running: 0, succeeded: 586, partial: 0, failed: 0 });
assert.equal(summary.status, "running");
@@ -375,6 +394,23 @@ test("batch summary exposes actual requests, output corrections, cache hits, and
assert.deepEqual(summary.failureCategories, { rate_limit: 1 });
});
+test("retry keeps lifetime request and correction counts instead of hiding earlier paid attempts", async () => {
+ let job = await createAnalysisBatchJob([{ id: "a", text: "one" }], { id: "lifetime-counts" });
+ let claimed = claimAnalysisItems(job, 1, () => "claim-1");
+ job = failAnalysisItem(claimed.job, "a", "claim-1", {
+ message: "busy", status: 503, attempts: { serviceRequests: 3, outputCorrectionRequests: 1 }
+ });
+ job = retryFailedAnalysisItems(job);
+ claimed = claimAnalysisItems(job, 1, () => "claim-2");
+ job = succeedAnalysisItem(claimed.job, "a", "claim-2", {}, 1, {
+ attempts: { serviceRequests: 1, outputCorrectionRequests: 0 }, cacheHit: true
+ });
+ const summary = analysisBatchSummary(job);
+ assert.equal(summary.requestAttempts, 4);
+ assert.equal(summary.outputCorrectionRequests, 1);
+ assert.equal(summary.cacheHitCount, 1);
+});
+
test("batch jobs snapshot configured concurrency and vision claims use it", () => {
const job = createVisionBatchJob([{
id: "one",
@@ -403,8 +439,8 @@ test("vision batch defaults to one primary image per selected case and can inclu
primaryMediaId: "one-a",
mediaAssets: [
{ id: "one-a", kind: "image", usage: "content" },
- { id: "one-b", kind: "image", usage: "content", visionAnalysis: { description: "already analysed" } },
- { id: "one-c", kind: "image", usage: "content" },
+ { id: "one-b", kind: "image", usage: "content", visionAnalysis: { description: "already analysed", quality: "complete" } },
+ { id: "one-c", kind: "image", usage: "content", visionAnalysis: { description: "usable partial", quality: "partial", missingFields: ["canvas"] } },
{ id: "one-poster", kind: "image", usage: "poster" }
]
}, {
diff --git a/test/analysis-runner.test.js b/test/analysis-runner.test.js
deleted file mode 100644
index 46ecd6e..0000000
--- a/test/analysis-runner.test.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import test from "node:test";
-import assert from "node:assert/strict";
-import { readFile } from "node:fs/promises";
-
-import { runAnalysisClaimsIndependently } from "../analysis-runner.js";
-
-const delay = (milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds));
-
-test("a stalled analysis cannot prevent completed siblings from being committed", async () => {
- const committed = [];
- const claims = [{ entryId: "a" }, { entryId: "b" }, { entryId: "stalled" }];
-
- const settled = await runAnalysisClaimsIndependently({
- claims,
- timeoutMs: 30,
- analyze: async (claim) => {
- if (claim.entryId === "stalled") return new Promise(() => {});
- if (claim.entryId === "b") await delay(5);
- return { entryId: claim.entryId, tags: [] };
- },
- commit: async (result) => {
- committed.push(result);
- return result.entryId;
- },
- timeoutResult: (claim) => ({
- entryId: claim.entryId,
- error: { message: "AI analysis timed out", status: 408 }
- })
- });
-
- assert.deepEqual(committed.slice(0, 2).map((item) => item.entryId), ["a", "b"]);
- assert.deepEqual(committed[2], {
- entryId: "stalled",
- error: { message: "AI analysis timed out", status: 408 }
- });
- assert.equal(settled.every((item) => item.status === "fulfilled"), true);
-});
-
-test("pausing aborts active analyses without committing them as failures", async () => {
- const controller = new AbortController();
- const committed = [];
- const startedAt = Date.now();
- const running = runAnalysisClaimsIndependently({
- claims: [{ entryId: "active" }],
- timeoutMs: 5_000,
- signal: controller.signal,
- analyze: async () => new Promise(() => {}),
- commit: async (result) => committed.push(result),
- timeoutResult: (claim) => ({ entryId: claim.entryId, error: { status: 408 } })
- });
-
- await delay(10);
- controller.abort();
- const settled = await running;
-
- assert.equal(Date.now() - startedAt < 500, true);
- assert.deepEqual(committed, []);
- assert.deepEqual(settled, [{ status: "fulfilled", value: { status: "aborted" } }]);
-});
-
-test("batch progress distinguishes active, queued, and failed cases", async () => {
- const library = await readFile(new URL("../library.js", import.meta.url), "utf8");
- assert.match(library, /job\.counts\.running[^\n]+处理中/);
- assert.match(library, /job\.counts\.pending[^\n]+等待中/);
- assert.match(library, /继续完成重建/);
- assert.match(library, /成功结果已安全暂存/);
- assert.match(library, /应用已成功结果/);
-});
diff --git a/test/analysis-scheduler.test.js b/test/analysis-scheduler.test.js
index 1710642..436b444 100644
--- a/test/analysis-scheduler.test.js
+++ b/test/analysis-scheduler.test.js
@@ -50,3 +50,23 @@ test("analysis scheduler does not mistake local JSON validation errors for netwo
}), /JSON 无效/);
assert.equal(calls, 1);
});
+
+test("shared work honors the lowest active job snapshot instead of the last caller", async () => {
+ let active = 0;
+ let lowLimitActive = 0;
+ let maximumWhileLowLimitActive = 0;
+ const task = async (lowLimit) => {
+ active += 1;
+ if (lowLimit) lowLimitActive += 1;
+ if (lowLimitActive) maximumWhileLowLimitActive = Math.max(maximumWhileLowLimitActive, active);
+ await delay(5);
+ if (lowLimit) lowLimitActive -= 1;
+ active -= 1;
+ };
+ await Promise.all([
+ scheduleAnalysis("shared-snapshot-limit", 2, () => task(true)),
+ scheduleAnalysis("shared-snapshot-limit", 2, () => task(true)),
+ ...Array.from({ length: 6 }, () => scheduleAnalysis("shared-snapshot-limit", 6, () => task(false)))
+ ]);
+ assert.equal(maximumWhileLowLimitActive, 2);
+});
diff --git a/test/tag-taxonomy.test.js b/test/tag-taxonomy.test.js
index 113abbf..2c3bc6a 100644
--- a/test/tag-taxonomy.test.js
+++ b/test/tag-taxonomy.test.js
@@ -58,6 +58,20 @@ test("analysis response keeps valid tags while dropping unknown, duplicate, extr
assert.equal(bounded.length, ANALYSIS_TAG_MAX);
});
+test("analysis response accepts common root and tag field casing or snake-camel aliases", () => {
+ const catalog = createFixedFacetCatalog();
+ assert.deepEqual(validateAnalysisTagResponse({ Tag_List: [
+ { Group_ID: "style.render", groupId: "style.render", Label: "赛璐珞", detail: "赛璐珞" },
+ { groupId: "light.direction", Detail: "侧逆光" }
+ ] }, catalog), [
+ { g: "style.render", t: "赛璐珞" },
+ { g: "light.direction", t: "侧逆光" }
+ ]);
+ const duplicateRoot = [{ g: "style.render", t: "赛璐珞" }];
+ assert.deepEqual(validateAnalysisTagResponse({ tags: duplicateRoot, Tags: structuredClone(duplicateRoot) }, catalog), duplicateRoot);
+ assert.throws(() => validateAnalysisTagResponse({ tags: duplicateRoot, Tags: [{ g: "light.direction" }] }, catalog), /格式无效/);
+});
+
test("analysis can assign a group directly and reuses normalized detail labels", () => {
let state = { facetCatalog: createFixedFacetCatalog(), entries: [{ id: "one", facetAssignments: [] }] };
state = applyFixedAnalysisTags(state, "one", [
diff --git a/test/temp-references.test.js b/test/temp-references.test.js
index e2e078e..5ec429c 100644
--- a/test/temp-references.test.js
+++ b/test/temp-references.test.js
@@ -7,6 +7,7 @@ import {
extractTempReferenceText,
imageTempReferenceBlock,
namePastedTempReferenceFile,
+ unreadReferenceImageAssets,
validateTempReferenceFile
} from "../temp-references.js";
import { createComposerSession } from "../composer.js";
@@ -130,6 +131,30 @@ test("a text-only service blocks image attachments without choosing another serv
});
});
+test("a partial temporary-image analysis remains eligible for completion", () => {
+ const base = {
+ referenceText: "已保存的可见描述",
+ assetRefs: [{ assetId: "temp-reference-asset:partial", kind: "image", mimeType: "image/png" }],
+ imageRefs: [{ visualId: "temp-reference-asset:partial", mimeType: "image/png" }]
+ };
+ const partial = {
+ ...base,
+ assets: [{
+ assetId: "temp-reference-asset:partial",
+ imageFingerprint: "image-hash",
+ analysisImageFingerprint: "image-hash",
+ analysisVersion: 2,
+ analysisFingerprint: "profile-hash",
+ reconstructionPrompt: ""
+ }]
+ };
+ assert.deepEqual(unreadReferenceImageAssets(partial).map((item) => item.assetId), ["temp-reference-asset:partial"]);
+ assert.deepEqual(unreadReferenceImageAssets({
+ ...partial,
+ assets: [{ ...partial.assets[0], reconstructionPrompt: "可独立复用的重建提示词" }]
+ }), []);
+});
+
test("text, Markdown, and HTML attachments expose readable text without script content", async () => {
const parser = (html) => ({
body: {