pixivflow 2.19.4 → 2.20.0

package/dist/storage/DatabaseMigration.js

@@ -99,6 +99,15 @@ class DatabaseMigration {
             lease_owner TEXT,
             lease_until INTEGER,
             heartbeat_at INTEGER,
+            -- Request UUID of a remote manual replacement ("重抓"). NULL for a
+            -- scheduled occurrence. Persisted in the SAME transaction that
+            -- opens the manual slot, so the acceptance ACK and the caller's
+            -- retry converge on one row instead of racing a second slot.
+            manual_request_id TEXT,
+            -- Opaque caller correlation (review chain / review id). Recorded so
+            -- the terminal outcome can be reported back to the requester
+            -- without this service learning anything about the review.
+            correlation_id TEXT,
             created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
             started_at DATETIME,
             completed_at DATETIME,
@@ -227,6 +236,8 @@ class DatabaseMigration {
                 lease_owner: 'ALTER TABLE schedule_slots ADD COLUMN lease_owner TEXT',
                 lease_until: 'ALTER TABLE schedule_slots ADD COLUMN lease_until INTEGER',
                 heartbeat_at: 'ALTER TABLE schedule_slots ADD COLUMN heartbeat_at INTEGER',
+                manual_request_id: 'ALTER TABLE schedule_slots ADD COLUMN manual_request_id TEXT',
+                correlation_id: 'ALTER TABLE schedule_slots ADD COLUMN correlation_id TEXT',
             };
             const columnAlters = [];
             for (const [col, sql] of Object.entries(slotColumnMigrations)) {

package/dist/storage/repositories/DeliveryRepository.d.ts

@@ -60,6 +60,18 @@ export declare class DeliveryRepository extends BaseRepository {
     isDelivered(deliveryTarget: string, workType: string, pixivId: string): boolean;
     /** Batch form for candidate-pipeline pre-lock dedupe. */
     deliveredIds(deliveryTarget: string, workType: string, pixivIds: string[]): Set<string>;
+    /**
+     * Batch pre-lock dedupe for CANDIDATE SELECTION: works already delivered, or
+     * whose review submission is still PENDING.
+     *
+     * Deliberately broader than `deliveredIds`: a pending intent is a work already
+     * submitted for human review that has not been answered yet. Re-selecting it
+     * would submit the same work a second time, which is the user-visible defect
+     * this scan exists to prevent. Within-slot RESUME keeps using `isDelivered`:
+     * a cell resuming its OWN pending work is continuing it, not duplicating it.
+     */
+    submittedIds(deliveryTarget: string, workType: string, pixivIds: string[]): Set<string>;
+    private idsByStatus;
     recordAck(id: string, ack: {
         status: DeliveryStatus;
         remoteId?: string;

package/dist/storage/repositories/DeliveryRepository.js

@@ -71,16 +71,33 @@ class DeliveryRepository extends BaseRepository_1.BaseRepository {
     }
     /** Batch form for candidate-pipeline pre-lock dedupe. */
     deliveredIds(deliveryTarget, workType, pixivIds) {
+        return this.idsByStatus(deliveryTarget, workType, pixivIds, ['delivered', 'duplicate']);
+    }
+    /**
+     * Batch pre-lock dedupe for CANDIDATE SELECTION: works already delivered, or
+     * whose review submission is still PENDING.
+     *
+     * Deliberately broader than `deliveredIds`: a pending intent is a work already
+     * submitted for human review that has not been answered yet. Re-selecting it
+     * would submit the same work a second time, which is the user-visible defect
+     * this scan exists to prevent. Within-slot RESUME keeps using `isDelivered`:
+     * a cell resuming its OWN pending work is continuing it, not duplicating it.
+     */
+    submittedIds(deliveryTarget, workType, pixivIds) {
+        return this.idsByStatus(deliveryTarget, workType, pixivIds, ['pending', 'delivered', 'duplicate']);
+    }
+    idsByStatus(deliveryTarget, workType, pixivIds, statuses) {
         const out = new Set();
         if (pixivIds.length === 0)
             return out;
+        const statusList = statuses.map((status) => `'${status}'`).join(',');
         const CHUNK = 400;
         for (let i = 0; i < pixivIds.length; i += CHUNK) {
             const slice = pixivIds.slice(i, i + CHUNK);
             const placeholders = slice.map(() => '?').join(',');
             const rows = this.db
                 .prepare(`SELECT DISTINCT pixiv_id FROM deliveries
-           WHERE delivery_target = ? AND work_type = ? AND status IN ('delivered','duplicate')
+           WHERE delivery_target = ? AND work_type = ? AND status IN (${statusList})
              AND pixiv_id IN (${placeholders})`)
                 .all(deliveryTarget, workType, ...slice);
             for (const r of rows)

package/dist/storage/repositories/SlotRepository.d.ts

@@ -25,6 +25,10 @@ export interface SlotRecord {
     leaseOwner: string | null;
     leaseUntil: number | null;
     heartbeatAt: number | null;
+    /** Request UUID of a remote manual replacement; null for scheduled slots. */
+    manualRequestId: string | null;
+    /** Opaque caller correlation (review chain / review id); null unless manual. */
+    correlationId: string | null;
 }
 export interface SlotItemRecord {
     id: number;
@@ -65,6 +69,10 @@ export declare class SlotRepository extends BaseRepository {
         triggerSource?: string;
         slotDate?: string;
         slotName?: string;
+        /** Remote manual replacement request UUID (opens a `manual-` slot). */
+        manualRequestId?: string | null;
+        /** Opaque caller correlation recorded with a manual slot. */
+        correlationId?: string | null;
     }): {
         slot: SlotRecord;
         created: boolean;

package/dist/storage/repositories/SlotRepository.js

@@ -21,10 +21,10 @@ class SlotRepository extends BaseRepository_1.BaseRepository {
     getOrCreateSlot(id, data) {
         const insert = this.db.prepare(`INSERT INTO schedule_slots
          (id, schedule_id, occurrence_at, occurrence_date, occurrence_label, timezone, target_ids,
-          status, trigger_source, slot_date, slot_name)
+          status, trigger_source, slot_date, slot_name, manual_request_id, correlation_id)
        VALUES
          (@id, @scheduleId, @occurrenceAt, @occurrenceDate, @occurrenceLabel, @timezone, @targetIds,
-          'pending', @triggerSource, @slotDate, @slotName)
+          'pending', @triggerSource, @slotDate, @slotName, @manualRequestId, @correlationId)
        ON CONFLICT(id) DO NOTHING`);
         const info = insert.run({
             id,
@@ -37,6 +37,8 @@ class SlotRepository extends BaseRepository_1.BaseRepository {
             triggerSource: data.triggerSource ?? null,
             slotDate: data.slotDate ?? data.occurrenceDate ?? '',
             slotName: data.slotName ?? '',
+            manualRequestId: data.manualRequestId ?? null,
+            correlationId: data.correlationId ?? null,
         });
         const created = info.changes > 0;
         return { slot: this.getSlot(id), created };
@@ -359,6 +361,8 @@ class SlotRepository extends BaseRepository_1.BaseRepository {
             leaseOwner: row.lease_owner ?? null,
             leaseUntil: row.lease_until ?? null,
             heartbeatAt: row.heartbeat_at ?? null,
+            manualRequestId: row.manual_request_id ?? null,
+            correlationId: row.correlation_id ?? null,
         };
     }
     toItem(row) {

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BUILD = void 0;
 // GENERATED by scripts/write-version.js — do not edit manually.
-exports.BUILD = { version: '2.19.4', commit: 'f331cd4bb164' };
+exports.BUILD = { version: '2.20.0', commit: '2229fb7b45a6' };
 //# sourceMappingURL=version.js.map

package/dist/webui/package.json

@@ -1,6 +1,6 @@
 {
   "type": "commonjs",
   "name": "pixivflow-webui-backend",
-  "version": "2.19.4",
+  "version": "2.20.0",
   "description": "PixivFlow WebUI Backend - CommonJS module"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pixivflow",
-  "version": "2.19.4",
+  "version": "2.20.0",
   "description": "🎨 智能的 Pixiv 自动化下载工具 - 支持批量下载插画和小说、定时任务、Docker部署 | Intelligent Pixiv Automation Downloader with batch download, scheduler, and Docker support",
   "repository": {
     "type": "git",