pixivflow 2.17.0 → 2.18.1

package/dist/pixiv-client/PixivFlowPixivClient.d.ts

@@ -35,17 +35,23 @@ export declare class PixivFlowPixivClient implements IPixivClient {
     getRateLimiter(): RateLimitGate;
     getRateLimitStatus(): Promise<import("@redtidev/pixiv-client").RateLimitStatus>;
     searchIllustrations(target: TargetConfig): Promise<PixivIllust[]>;
+    private searchIllustrationsInternal;
     searchNovels(target: TargetConfig): Promise<PixivNovel[]>;
-    getTagAutocomplete(seed: string): Promise<PixivTag[]>;
+    private searchNovelsInternal;
+    getTagAutocomplete(seed: string, options?: {
+        signal?: AbortSignal;
+    }): Promise<PixivTag[]>;
     searchIllustrationsForTags(seed: string, limit: number, options?: {
         startDate?: string;
         endDate?: string;
         includeR18?: boolean;
+        signal?: AbortSignal;
     }): Promise<PixivIllust[]>;
     searchNovelsForTags(seed: string, limit: number, options?: {
         startDate?: string;
         endDate?: string;
         includeR18?: boolean;
+        signal?: AbortSignal;
     }): Promise<PixivNovel[]>;
     getIllustration(id: number): Promise<PixivIllust>;
     getNovel(id: number): Promise<PixivNovel>;

package/dist/pixiv-client/PixivFlowPixivClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PixivFlowPixivClient.d.ts","sourceRoot":"","sources":["../../src/pixiv-client/PixivFlowPixivClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PixivFlowPixivClient.d.ts","sourceRoot":"","sources":["../../src/pixiv-client/PixivFlowPixivClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,IAAI,cAAc,EAC7B,aAAa,EACb,KAAK,mBAAmB,EACxB,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,sBAAsB,EAC3B,KAAK,QAAQ,EACb,KAAK,mBAAmB,EACzB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI/D,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,mBAAmB,CAAC;IAC1B,MAAM,EAAE,gBAAgB,CAAC;IACzB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,4EAA4E;IAC5E,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;GASG;AACH,qBAAa,oBAAqB,YAAW,YAAY;IACvD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAiB;IACrC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;gBAE9B,OAAO,EAAE,2BAA2B;IAsChD,sEAAsE;IACtE,MAAM,IAAI,cAAc;IAIxB,0DAA0D;IAC1D,cAAc,IAAI,aAAa;IAI/B,kBAAkB;IAMlB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAIjE,OAAO,CAAC,2BAA2B;IAKnC,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAIzD,OAAO,CAAC,oBAAoB;IAK5B,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAO,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAI7F,0BAA0B,CACxB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,GAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,WAAW,CAAA;KAAO,GACjG,OAAO,CAAC,WAAW,EAAE,CAAC;IAazB,mBAAmB,CACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,GAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,WAAW,CAAA;KAAO,GACjG,OAAO,CAAC,UAAU,EAAE,CAAC;IAaxB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAIjD,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAIzC,oBAAoB,CAClB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAC5C,OAAO,CAAC,WAAW,EAAE,CAAC;IAIzB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAInG,uBAAuB,CAAC,IAAI,GAAE,MAAc,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAIpG,gBAAgB,CAAC,IAAI,GAAE,MAAc,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAI5F,uBAAuB,CAAC,QAAQ,EAAE,MAAM;;;;IAIxC,sBAAsB,CAAC,OAAO,EAAE,MAAM;;;;IAItC,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAIvD,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAIpD,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAI9D,cAAc,CAAC,QAAQ,EAAE,MAAM;IAI/B,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAIvD,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;CAGzD"}

package/dist/pixiv-client/PixivFlowPixivClient.js

@@ -65,18 +65,24 @@ class PixivFlowPixivClient {
     }
     // -- IPixivClient surface ---------------------------------------------------
     searchIllustrations(target) {
+        return this.searchIllustrationsInternal(target);
+    }
+    searchIllustrationsInternal(target, signal) {
         const requestDelay = this.config.download?.requestDelay ?? 500;
-        return this.searchRunner.searchIllustrations(target, requestDelay);
+        return this.searchRunner.searchIllustrations(target, requestDelay, signal);
     }
     searchNovels(target) {
+        return this.searchNovelsInternal(target);
+    }
+    searchNovelsInternal(target, signal) {
         const requestDelay = this.config.download?.requestDelay ?? 500;
-        return this.searchRunner.searchNovels(target, requestDelay);
+        return this.searchRunner.searchNovels(target, requestDelay, signal);
     }
-    getTagAutocomplete(seed) {
-        return this.kit.tags.autocomplete(seed);
+    getTagAutocomplete(seed, options = {}) {
+        return this.kit.tags.autocomplete(seed, options.signal);
     }
     searchIllustrationsForTags(seed, limit, options = {}) {
-        return this.searchIllustrations({
+        return this.searchIllustrationsInternal({
             type: 'illustration',
             tag: seed,
             searchTarget: 'partial_match_for_tags',
@@ -85,10 +91,10 @@ class PixivFlowPixivClient {
             startDate: options.startDate,
             endDate: options.endDate,
             r18: options.includeR18,
-        });
+        }, options.signal);
     }
     searchNovelsForTags(seed, limit, options = {}) {
-        return this.searchNovels({
+        return this.searchNovelsInternal({
             type: 'novel',
             tag: seed,
             searchTarget: 'partial_match_for_tags',
@@ -97,7 +103,7 @@ class PixivFlowPixivClient {
             startDate: options.startDate,
             endDate: options.endDate,
             r18: options.includeR18,
-        });
+        }, options.signal);
     }
     getIllustration(id) {
         return this.kit.illustrations.get(id);

package/dist/pixiv-client/PixivFlowPixivClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"PixivFlowPixivClient.js","sourceRoot":"","sources":["../../src/pixiv-client/PixivFlowPixivClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PixivFlowPixivClient.js","sourceRoot":"","sources":["../../src/pixiv-client/PixivFlowPixivClient.ts"],"names":[],"mappings":"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"}

package/dist/pixiv-client/TargetSearchRunner.d.ts

@@ -9,8 +9,8 @@ import type { TargetConfig } from '../config';
 export declare class TargetSearchRunner {
     private readonly kit;
     constructor(kit: KitPixivClient);
-    searchIllustrations(target: TargetConfig, requestDelayMs: number): Promise<PixivIllust[]>;
-    searchNovels(target: TargetConfig, requestDelayMs: number): Promise<PixivNovel[]>;
+    searchIllustrations(target: TargetConfig, requestDelayMs: number, signal?: AbortSignal): Promise<PixivIllust[]>;
+    searchNovels(target: TargetConfig, requestDelayMs: number, signal?: AbortSignal): Promise<PixivNovel[]>;
     private mergeTagUnion;
     private searchSingleIllust;
     private searchSingleNovel;

package/dist/pixiv-client/TargetSearchRunner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TargetSearchRunner.d.ts","sourceRoot":"","sources":["../../src/pixiv-client/TargetSearchRunner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,WAAW,IAAI,cAAc,EAC7B,WAAW,EACX,UAAU,EAGX,MAAM,wBAAwB,CAAC;AAMhC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAG9C;;;;;GAKG;AACH,qBAAa,kBAAkB;IACjB,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAAH,GAAG,EAAE,cAAc;IAE1C,mBAAmB,CAAC,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IASzF,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;YASzE,aAAa;YA0Bb,kBAAkB;YAclB,iBAAiB;IAc/B;;;;;;;OAOG;YACW,oBAAoB;IAsFlC,OAAO,CAAC,gBAAgB;IAsCxB,OAAO,CAAC,mBAAmB;CAW5B"}
+{"version":3,"file":"TargetSearchRunner.d.ts","sourceRoot":"","sources":["../../src/pixiv-client/TargetSearchRunner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,WAAW,IAAI,cAAc,EAC7B,WAAW,EACX,UAAU,EAGX,MAAM,wBAAwB,CAAC;AAOhC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAG9C;;;;;GAKG;AACH,qBAAa,kBAAkB;IACjB,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAAH,GAAG,EAAE,cAAc;IAE1C,mBAAmB,CACvB,MAAM,EAAE,YAAY,EACpB,cAAc,EAAE,MAAM,EACtB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,WAAW,EAAE,CAAC;IAQnB,YAAY,CAChB,MAAM,EAAE,YAAY,EACpB,cAAc,EAAE,MAAM,EACtB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,UAAU,EAAE,CAAC;YAQV,aAAa;YA4Bb,kBAAkB;YAgBlB,iBAAiB;IAgB/B;;;;;;;OAOG;YACW,oBAAoB;IA4FlC,OAAO,CAAC,gBAAgB;IAsCxB,OAAO,CAAC,mBAAmB;CAW5B"}

package/dist/pixiv-client/TargetSearchRunner.js

@@ -6,6 +6,7 @@ const logger_1 = require("../logger");
 const date_utils_1 = require("../utils/date-utils");
 const date_utils_2 = require("../utils/date-utils");
 const pixiv_sort_1 = require("../utils/pixiv-sort");
+const errors_1 = require("../utils/errors");
 const query_mapper_1 = require("./query-mapper");
 /**
  * Host-side replacement for the old in-kit SearchService: drives the kit's
@@ -18,25 +19,26 @@ class TargetSearchRunner {
     constructor(kit) {
         this.kit = kit;
     }
-    async searchIllustrations(target, requestDelayMs) {
+    async searchIllustrations(target, requestDelayMs, signal) {
         if (target.tagRelation === 'or') {
-            return this.mergeTagUnion(target, requestDelayMs, (t, tag, d) => this.searchSingleIllust(t, tag, d));
+            return this.mergeTagUnion(target, requestDelayMs, (t, tag, d) => this.searchSingleIllust(t, tag, d, signal), signal);
         }
-        return this.searchSingleIllust(target, target.tag, requestDelayMs);
+        return this.searchSingleIllust(target, target.tag, requestDelayMs, signal);
     }
-    async searchNovels(target, requestDelayMs) {
+    async searchNovels(target, requestDelayMs, signal) {
         if (target.tagRelation === 'or') {
-            return this.mergeTagUnion(target, requestDelayMs, (t, tag, d) => this.searchSingleNovel(t, tag, d));
+            return this.mergeTagUnion(target, requestDelayMs, (t, tag, d) => this.searchSingleNovel(t, tag, d, signal), signal);
         }
-        return this.searchSingleNovel(target, target.tag, requestDelayMs);
+        return this.searchSingleNovel(target, target.tag, requestDelayMs, signal);
     }
-    async mergeTagUnion(target, requestDelayMs, runOne) {
+    async mergeTagUnion(target, requestDelayMs, runOne, signal) {
         const tags = target.tag.split(/\s+/).map((t) => t.trim()).filter(Boolean);
         if (tags.length <= 1)
             return runOne(target, target.tag, requestDelayMs);
         const seen = new Set();
         const merged = [];
         for (let i = 0; i < tags.length; i++) {
+            (0, errors_1.throwIfAborted)(signal, 'search cancelled');
             const part = await runOne(target, tags[i], requestDelayMs);
             for (const item of part) {
                 const key = String(item.id);
@@ -48,16 +50,16 @@ class TargetSearchRunner {
             if (target.limit && merged.length >= target.limit)
                 break;
             if (i < tags.length - 1 && requestDelayMs > 0)
-                await (0, promises_1.setTimeout)(requestDelayMs);
+                await (0, promises_1.setTimeout)(requestDelayMs, undefined, { signal });
         }
         const sorted = (0, pixiv_sort_1.sortPixivItems)(merged, target.sort);
         return target.limit ? sorted.slice(0, target.limit) : sorted;
     }
-    async searchSingleIllust(target, tag, requestDelayMs) {
-        return this.searchWithPagination(target, tag, requestDelayMs, (options) => this.kit.illustrations.searchPage(options), (t, g) => (0, query_mapper_1.mapTargetToIllustQuery)({ ...t, tag: g }));
+    async searchSingleIllust(target, tag, requestDelayMs, signal) {
+        return this.searchWithPagination(target, tag, requestDelayMs, (options) => this.kit.illustrations.searchPage(options), (t, g) => (0, query_mapper_1.mapTargetToIllustQuery)({ ...t, tag: g }), signal);
     }
-    async searchSingleNovel(target, tag, requestDelayMs) {
-        return this.searchWithPagination(target, tag, requestDelayMs, (options) => this.kit.novels.searchPage(options), (t, g) => (0, query_mapper_1.mapTargetToNovelQuery)({ ...t, tag: g }));
+    async searchSingleNovel(target, tag, requestDelayMs, signal) {
+        return this.searchWithPagination(target, tag, requestDelayMs, (options) => this.kit.novels.searchPage(options), (t, g) => (0, query_mapper_1.mapTargetToNovelQuery)({ ...t, tag: g }), signal);
     }
     /**
      * Date-aware pagination. Mirrors the legacy SearchService semantics:
@@ -67,7 +69,7 @@ class TargetSearchRunner {
      * - post-filter popular_desc results by the date range;
      * - final stable sort + target.limit slice.
      */
-    async searchWithPagination(target, tag, requestDelayMs, fetchPage, buildBase) {
+    async searchWithPagination(target, tag, requestDelayMs, fetchPage, buildBase, signal) {
         const fetchOne = fetchPage;
         logger_1.logger.debug('Searching Pixiv', {
             tag,
@@ -95,6 +97,7 @@ class TargetSearchRunner {
         let pageCount = 0;
         let shouldStop = false;
         while ((!fetchLimit || results.length < fetchLimit) && !shouldStop) {
+            (0, errors_1.throwIfAborted)(signal, 'search cancelled');
             pageCount++;
             // Dates are intentionally filtered CLIENT-side below (legacy behavior;
             // PixivFlow needs the early-stop walk on create_date).
@@ -104,6 +107,10 @@ class TargetSearchRunner {
                 searchTarget: base.searchTarget,
                 includeR18: base.includeR18,
                 cursor,
+                // Threaded into the kit transport, which combines it with its per-request
+                // timeout and honours it in retry back-off. Without this the pager could
+                // stay blocked in a single hung request for the rest of the run.
+                signal,
             });
             cursor = page.next;
             for (const item of page.items) {
@@ -120,7 +127,7 @@ class TargetSearchRunner {
             }
             if (cursor && requestDelayMs > 0 && !shouldStop) {
                 logger_1.logger.debug(`Tag "${tag}" page ${pageCount}: total collected ${results.length}, waiting ${requestDelayMs}ms...`);
-                await (0, promises_1.setTimeout)(requestDelayMs);
+                await (0, promises_1.setTimeout)(requestDelayMs, undefined, { signal });
             }
             if (!cursor)
                 break;

package/dist/pixiv-client/TargetSearchRunner.js.map

@@ -1 +1 @@
-{"version":3,"file":"TargetSearchRunner.js","sourceRoot":"","sources":["../../src/pixiv-client/TargetSearchRunner.ts"],"names":[],"mappings":";;;AAAA,mDAA2D;AAS3D,sCAAmC;AACnC,oDAAqD;AACrD,oDAAoD;AACpD,oDAAqD;AAErD,iDAA+E;AAE/E;;;;;GAKG;AACH,MAAa,kBAAkB;IACA;IAA7B,YAA6B,GAAmB;QAAnB,QAAG,GAAH,GAAG,CAAgB;IAAG,CAAC;IAEpD,KAAK,CAAC,mBAAmB,CAAC,MAAoB,EAAE,cAAsB;QACpE,IAAI,MAAM,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAC9D,IAAI,CAAC,kBAAkB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CACnC,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,GAAI,EAAE,cAAc,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAoB,EAAE,cAAsB;QAC7D,IAAI,MAAM,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAC9D,IAAI,CAAC,iBAAiB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAClC,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,GAAI,EAAE,cAAc,CAAC,CAAC;IACrE,CAAC;IAEO,KAAK,CAAC,aAAa,CACzB,MAAoB,EACpB,cAAsB,EACtB,MAA4E;QAE5E,MAAM,IAAI,GAAG,MAAM,CAAC,GAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC3E,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC;YAAE,OAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAI,EAAE,cAAc,CAAC,CAAC;QAEzE,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;QAC/B,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACrC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;YAC3D,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;gBACxB,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC5B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBACnB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBACd,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACpB,CAAC;YACH,CAAC;YACD,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK;gBAAE,MAAM;YACzD,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,cAAc,GAAG,CAAC;gBAAE,MAAM,IAAA,qBAAK,EAAC,cAAc,CAAC,CAAC;QAC7E,CAAC;QACD,MAAM,MAAM,GAAG,IAAA,2BAAc,EAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QACnD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAC/D,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAC9B,MAAoB,EACpB,GAAW,EACX,cAAsB;QAEtB,OAAO,IAAI,CAAC,oBAAoB,CAC9B,MAAM,EACN,GAAG,EACH,cAAc,EACd,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,EACvD,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAA,qCAAsB,EAAC,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CACnD,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC7B,MAAoB,EACpB,GAAW,EACX,cAAsB;QAEtB,OAAO,IAAI,CAAC,oBAAoB,CAC9B,MAAM,EACN,GAAG,EACH,cAAc,EACd,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,EAChD,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAA,oCAAqB,EAAC,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAClD,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACK,KAAK,CAAC,oBAAoB,CAChC,MAAoB,EACpB,GAAW,EACX,cAAsB,EACtB,SAAuE,EACvE,SAA8C;QAE9C,MAAM,QAAQ,GAAG,SAAgH,CAAC;QAClI,eAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE;YAC9B,GAAG;YACH,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,IAAA,2BAAc,EAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAChE,IAAI,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5D,eAAM,CAAC,IAAI,CAAC,uDAAuD,EAAE;gBACnE,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;aACxB,CAAC,CAAC;YACH,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,EAAE,SAAS,IAAI,IAAI,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,EAAE,OAAO,IAAI,IAAI,CAAC;QAExC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,IAAI,WAAW,CAAC;QAC5C,MAAM,aAAa,GAAG,CAAC,CAAC,CAAC,SAAS,IAAI,OAAO,CAAC,CAAC;QAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;QAEnF,MAAM,IAAI,GAAG,SAAS,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QAEhD,MAAM,OAAO,GAAQ,EAAE,CAAC;QACxB,IAAI,MAAM,GAAkB,IAAI,CAAC;QACjC,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,IAAI,UAAU,GAAG,KAAK,CAAC;QAEvB,OAAO,CAAC,CAAC,UAAU,IAAI,OAAO,CAAC,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACnE,SAAS,EAAE,CAAC;YACZ,uEAAuE;YACvE,uDAAuD;YACvD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC;gBAC1B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,MAAM;aACP,CAAC,CAAC;YACH,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC;YAEnB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;gBACnF,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;oBACxB,UAAU,GAAG,IAAI,CAAC;oBAClB,MAAM;gBACR,CAAC;gBACD,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;oBAC3B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACnB,IAAI,UAAU,IAAI,OAAO,CAAC,MAAM,IAAI,UAAU;wBAAE,MAAM;gBACxD,CAAC;YACH,CAAC;YAED,IAAI,MAAM,IAAI,cAAc,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChD,eAAM,CAAC,KAAK,CACV,QAAQ,GAAG,UAAU,SAAS,qBAAqB,OAAO,CAAC,MAAM,aAAa,cAAc,OAAO,CACpG,CAAC;gBACF,MAAM,IAAA,qBAAK,EAAC,cAAc,CAAC,CAAC;YAC9B,CAAC;YACD,IAAI,CAAC,MAAM;gBAAE,MAAM;QACrB,CAAC;QAED,IAAI,YAAY,GAAG,OAAO,CAAC;QAC3B,IAAI,QAAQ,KAAK,cAAc,IAAI,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvE,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;gBACpC,IAAI,CAAC,IAAI,CAAC,WAAW;oBAAE,OAAO,KAAK,CAAC;gBACpC,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACrC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,IAAA,0BAAa,EAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;YACrE,CAAC,CAAC,CAAC;YACH,YAAY,GAAG,KAAK,CAAC;QACvB,CAAC;QAED,MAAM,MAAM,GAAG,IAAA,2BAAc,EAAC,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QACzD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAC/D,CAAC;IAEO,gBAAgB,CACtB,IAAO,EACP,MAAoB,EACpB,SAAsB,EACtB,OAAoB,EACpB,QAAgB;QAEhB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACtE,IAAI,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC,SAAS,IAAI,CAAC,OAAO;gBAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;YAC9E,eAAM,CAAC,KAAK,CAAC,iBAAiB,IAAI,CAAC,EAAE,sBAAsB,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YAC/E,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;QACrD,CAAC;QAED,MAAM,OAAO,GAAG,IAAA,0BAAa,EAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAE5D,IAAI,QAAQ,KAAK,WAAW,IAAI,CAAC,OAAO,EAAE,CAAC;YACzC,IAAI,OAAO,IAAI,QAAQ,GAAG,OAAO,EAAE,CAAC;gBAClC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;YACrD,CAAC;YACD,IAAI,SAAS,IAAI,QAAQ,GAAG,SAAS,EAAE,CAAC;gBACtC,eAAM,CAAC,KAAK,CAAC,yBAAyB,IAAI,CAAC,EAAE,qBAAqB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;gBACtF,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YACpD,CAAC;QACH,CAAC;QACD,IAAI,QAAQ,KAAK,UAAU,IAAI,CAAC,OAAO,EAAE,CAAC;YACxC,IAAI,SAAS,IAAI,QAAQ,GAAG,SAAS;gBAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;YAC1F,IAAI,OAAO,IAAI,QAAQ,GAAG,OAAO,EAAE,CAAC;gBAClC,eAAM,CAAC,KAAK,CAAC,yBAAyB,IAAI,CAAC,EAAE,kBAAkB,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;gBACjF,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YACpD,CAAC;QACH,CAAC;QACD,IAAI,QAAQ,KAAK,cAAc,IAAI,CAAC,OAAO,EAAE,CAAC;YAC5C,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;QACrD,CAAC;QACD,OAAO,EAAE,aAAa,EAAE,OAAO,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IACnF,CAAC;IAEO,mBAAmB,CACzB,KAAyB,EACzB,QAAgB,EAChB,aAAsB;QAEtB,IAAI,CAAC,KAAK;YAAE,OAAO,SAAS,CAAC;QAC7B,IAAI,KAAK,GAAG,EAAE,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,QAAQ,KAAK,cAAc,IAAI,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACxF,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,QAAQ,KAAK,cAAc,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACvF,CAAC;CACF;AA1ND,gDA0NC"}
+{"version":3,"file":"TargetSearchRunner.js","sourceRoot":"","sources":["../../src/pixiv-client/TargetSearchRunner.ts"],"names":[],"mappings":"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"}

package/dist/puppeteer-login-adapter/auth-code.d.ts

@@ -1,7 +1,7 @@
 /**
  * Authorization code extraction utilities
  */
-import { Page } from 'puppeteer';
+import type { Page } from 'puppeteer-core';
 /**
  * Wait for authorization code from redirect URL
  */

package/dist/puppeteer-login-adapter/auth-code.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth-code.d.ts","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/auth-code.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC;;GAEG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAuJ3F"}
+{"version":3,"file":"auth-code.d.ts","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/auth-code.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAE3C;;GAEG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAuJ3F"}

package/dist/puppeteer-login-adapter/browser-launch.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Shared launcher for the login adapters.
+ *
+ * Uses puppeteer-core (NO install-time browser download) plus the system
+ * browser resolver exported by pixiv-token-getter — single implementation of
+ * discovery lives there:
+ *
+ *   explicit PUPPETEER_EXECUTABLE_PATH -> platform-known locations -> PATH
+ *
+ * When no browser exists the error tells the user exactly how to fix it
+ * instead of leaking a raw ENOENT from puppeteer.
+ */
+import type { Browser } from 'puppeteer-core';
+/**
+ * Launch the system browser with PixivFlow's standard hardening flags.
+ *
+ * @param overrides any puppeteer-core launch options to merge (headless, args,
+ *   userDataDir, proxy is handled by callers through `args`)
+ */
+export declare function launchSystemBrowser(overrides?: Record<string, unknown>): Promise<Browser>;
+//# sourceMappingURL=browser-launch.d.ts.map

package/dist/puppeteer-login-adapter/browser-launch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"browser-launch.d.ts","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/browser-launch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAiB9C;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAanG"}

package/dist/puppeteer-login-adapter/browser-launch.js

@@ -0,0 +1,46 @@
+"use strict";
+/**
+ * Shared launcher for the login adapters.
+ *
+ * Uses puppeteer-core (NO install-time browser download) plus the system
+ * browser resolver exported by pixiv-token-getter — single implementation of
+ * discovery lives there:
+ *
+ *   explicit PUPPETEER_EXECUTABLE_PATH -> platform-known locations -> PATH
+ *
+ * When no browser exists the error tells the user exactly how to fix it
+ * instead of leaking a raw ENOENT from puppeteer.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.launchSystemBrowser = launchSystemBrowser;
+const pixiv_token_getter_1 = require("pixiv-token-getter");
+/** Lazily resolved puppeteer-core module (never a hard CLI-boot dependency). */
+function loadPuppeteerCore() {
+    try {
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        return require('puppeteer-core');
+    }
+    catch (error) {
+        throw new Error('puppeteer-core is missing from this installation. ' +
+            'Reinstall pixivflow (npm install -g pixivflow). ' +
+            `Original error: ${error?.message ?? error}`);
+    }
+}
+/**
+ * Launch the system browser with PixivFlow's standard hardening flags.
+ *
+ * @param overrides any puppeteer-core launch options to merge (headless, args,
+ *   userDataDir, proxy is handled by callers through `args`)
+ */
+async function launchSystemBrowser(overrides = {}) {
+    // An explicit path always wins; `undefined` must NOT clobber discovery, so the
+    // key is pulled out before the spread instead of relying on merge order.
+    const { executablePath: explicitPath, ...rest } = overrides;
+    const executablePath = (typeof explicitPath === 'string' && explicitPath) || (0, pixiv_token_getter_1.findBrowserExecutable)();
+    if (!executablePath) {
+        throw new Error((0, pixiv_token_getter_1.browserNotFoundMessage)());
+    }
+    const core = loadPuppeteerCore();
+    return core.launch({ ...rest, executablePath });
+}
+//# sourceMappingURL=browser-launch.js.map

package/dist/puppeteer-login-adapter/browser-launch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"browser-launch.js","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/browser-launch.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;AAyBH,kDAaC;AAnCD,2DAAmF;AAEnF,gFAAgF;AAChF,SAAS,iBAAiB;IACxB,IAAI,CAAC;QACH,8DAA8D;QAC9D,OAAO,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACnC,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CACb,oDAAoD;YAClD,kDAAkD;YAClD,mBAAmB,KAAK,EAAE,OAAO,IAAI,KAAK,EAAE,CAC/C,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,mBAAmB,CAAC,YAAqC,EAAE;IAC/E,+EAA+E;IAC/E,yEAAyE;IACzE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,IAAI,EAAE,GAAG,SAAS,CAAC;IAC5D,MAAM,cAAc,GAClB,CAAC,OAAO,YAAY,KAAK,QAAQ,IAAI,YAAY,CAAC,IAAI,IAAA,0CAAqB,GAAE,CAAC;IAEhF,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,IAAA,2CAAsB,GAAE,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,IAAI,GAAG,iBAAiB,EAAE,CAAC;IACjC,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,EAAE,cAAc,EAAS,CAAC,CAAC;AACzD,CAAC"}

package/dist/puppeteer-login-adapter/environment.js

@@ -59,9 +59,9 @@ async function checkPuppeteerAvailable() {
             // In Electron, we'll still try, but expect it might fail
             // The actual availability will be tested when we try to launch
         }
-        // Try to import puppeteer
+        // Try to import puppeteer-core
         // Use dynamic import to handle cases where module might not be available
-        const puppeteer = await Promise.resolve().then(() => __importStar(require('puppeteer')));
+        const puppeteer = await Promise.resolve().then(() => __importStar(require('puppeteer-core')));
         // Verify that puppeteer has the expected exports
         if (!puppeteer || typeof puppeteer.launch !== 'function') {
             console.warn('[Puppeteer] Module imported but missing expected exports');

package/dist/puppeteer-login-adapter/environment.js.map

@@ -1 +1 @@
-{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/environment.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMH,sDAGC;AAMD,0DAsCC;AAnDD;;;GAGG;AACH,SAAgB,qBAAqB;IACnC,MAAM,EAAE,qBAAqB,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACjF,OAAO,aAAa,EAAE,CAAC;AACzB,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,uBAAuB;IAC3C,IAAI,CAAC;QACH,4CAA4C;QAC5C,IAAI,qBAAqB,EAAE,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,6EAA6E,CAAC,CAAC;YAC3F,OAAO,CAAC,GAAG,CAAC,kGAAkG,CAAC,CAAC;YAChH,yDAAyD;YACzD,+DAA+D;QACjE,CAAC;QAED,0BAA0B;QAC1B,yEAAyE;QACzE,MAAM,SAAS,GAAG,wDAAa,WAAW,GAAC,CAAC;QAE5C,iDAAiD;QACjD,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YACzD,OAAO,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;YACzE,OAAO,KAAK,CAAC;QACf,CAAC;QAED,8EAA8E;QAC9E,0EAA0E;QAC1E,wDAAwD;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,8BAA8B;QAC9B,MAAM,YAAY,GAAG,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;QACrD,MAAM,SAAS,GAAG,KAAK,EAAE,IAAI,CAAC;QAE9B,yCAAyC;QACzC,IAAI,SAAS,KAAK,kBAAkB,IAAI,YAAY,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;YACpF,OAAO,CAAC,KAAK,CAAC,qEAAqE,EAAE,YAAY,CAAC,CAAC;QACrG,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QACvE,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
+{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/environment.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMH,sDAGC;AAMD,0DAsCC;AAnDD;;;GAGG;AACH,SAAgB,qBAAqB;IACnC,MAAM,EAAE,qBAAqB,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACjF,OAAO,aAAa,EAAE,CAAC;AACzB,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,uBAAuB;IAC3C,IAAI,CAAC;QACH,4CAA4C;QAC5C,IAAI,qBAAqB,EAAE,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,6EAA6E,CAAC,CAAC;YAC3F,OAAO,CAAC,GAAG,CAAC,kGAAkG,CAAC,CAAC;YAChH,yDAAyD;YACzD,+DAA+D;QACjE,CAAC;QAED,+BAA+B;QAC/B,yEAAyE;QACzE,MAAM,SAAS,GAAG,wDAAa,gBAAgB,GAAC,CAAC;QAEjD,iDAAiD;QACjD,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YACzD,OAAO,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;YACzE,OAAO,KAAK,CAAC;QACf,CAAC;QAED,8EAA8E;QAC9E,0EAA0E;QAC1E,wDAAwD;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,8BAA8B;QAC9B,MAAM,YAAY,GAAG,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;QACrD,MAAM,SAAS,GAAG,KAAK,EAAE,IAAI,CAAC;QAE9B,yCAAyC;QACzC,IAAI,SAAS,KAAK,kBAAkB,IAAI,YAAY,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;YACpF,OAAO,CAAC,KAAK,CAAC,qEAAqE,EAAE,YAAY,CAAC,CAAC;QACrG,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QACvE,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}

package/dist/puppeteer-login-adapter/login-headless.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login-headless.d.ts","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/login-headless.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAiB,MAAM,SAAS,CAAC;AAOrD;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,WAAW,GAClB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAwP3B"}
+{"version":3,"file":"login-headless.d.ts","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/login-headless.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAiB,MAAM,SAAS,CAAC;AAOrD;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,WAAW,GAClB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAwP3B"}

package/dist/puppeteer-login-adapter/login-headless.js

@@ -3,12 +3,9 @@
  * Headless login using Puppeteer
  * Runs browser in background without visible window
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loginWithPuppeteerHeadless = loginWithPuppeteerHeadless;
-const puppeteer_1 = __importDefault(require("puppeteer"));
+const browser_launch_1 = require("./browser-launch");
 const proxy_1 = require("./proxy");
 const pkce_1 = require("./pkce");
 const constants_1 = require("./constants");
@@ -64,7 +61,7 @@ async function loginWithPuppeteerHeadless(username, password, proxy) {
         console.log('[i]: Starting headless browser...');
         // Try to launch browser
         try {
-            browser = await puppeteer_1.default.launch(launchOptions);
+            browser = await (0, browser_launch_1.launchSystemBrowser)(launchOptions);
         }
         catch (launchError) {
             const errorMsg = launchError?.message || String(launchError);

package/dist/puppeteer-login-adapter/login-headless.js.map

@@ -1 +1 @@
-{"version":3,"file":"login-headless.js","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/login-headless.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"login-headless.js","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/login-headless.ts"],"names":[],"mappings":"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"}

package/dist/puppeteer-login-adapter/login-interactive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login-interactive.d.ts","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/login-interactive.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAiB,MAAM,SAAS,CAAC;AAOrD;;;GAGG;AACH,wBAAsB,6BAA6B,CAAC,KAAK,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CA0JlG"}
+{"version":3,"file":"login-interactive.d.ts","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/login-interactive.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAiB,MAAM,SAAS,CAAC;AAOrD;;;GAGG;AACH,wBAAsB,6BAA6B,CAAC,KAAK,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CA0JlG"}

package/dist/puppeteer-login-adapter/login-interactive.js

@@ -3,12 +3,9 @@
  * Interactive login using Puppeteer
  * Opens a browser window for user to manually log in
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loginWithPuppeteerInteractive = loginWithPuppeteerInteractive;
-const puppeteer_1 = __importDefault(require("puppeteer"));
+const browser_launch_1 = require("./browser-launch");
 const proxy_1 = require("./proxy");
 const pkce_1 = require("./pkce");
 const constants_1 = require("./constants");
@@ -59,7 +56,7 @@ async function loginWithPuppeteerInteractive(proxy) {
         }
         // Try to launch browser
         try {
-            browser = await puppeteer_1.default.launch(launchOptions);
+            browser = await (0, browser_launch_1.launchSystemBrowser)(launchOptions);
         }
         catch (launchError) {
             const errorMsg = launchError?.message || String(launchError);

package/dist/puppeteer-login-adapter/login-interactive.js.map

@@ -1 +1 @@
-{"version":3,"file":"login-interactive.js","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/login-interactive.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;AAeH,sEA0JC;AAvKD,0DAA+C;AAE/C,mCAAqD;AACrD,iCAAqE;AACrE,2CAAwC;AACxC,+CAAsD;AACtD,2CAA8C;AAC9C,qDAAwD;AAExD;;;GAGG;AACI,KAAK,UAAU,6BAA6B,CAAC,KAAmB;IACrE,IAAI,OAAO,GAAmB,IAAI,CAAC;IAEnC,IAAI,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAC;QACpE,OAAO,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC;QAC/D,OAAO,CAAC,GAAG,CAAC,+DAA+D,CAAC,CAAC;QAC7E,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;QAErE,2BAA2B;QAC3B,MAAM,YAAY,GAAG,IAAA,2BAAoB,GAAE,CAAC;QAC5C,MAAM,aAAa,GAAG,MAAM,IAAA,4BAAqB,EAAC,YAAY,CAAC,CAAC;QAEhE,uCAAuC;QACvC,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC;YACtC,cAAc,EAAE,aAAa;YAC7B,qBAAqB,EAAE,MAAM;YAC7B,MAAM,EAAE,eAAe;SACxB,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,GAAG,qBAAS,IAAI,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC;QAE1D,iBAAiB;QACjB,MAAM,aAAa,GAAQ;YACzB,QAAQ,EAAE,KAAK,EAAE,kCAAkC;YACnD,IAAI,EAAE;gBACJ,cAAc;gBACd,0BAA0B;gBAC1B,+CAA+C;gBAC/C,yBAAyB;gBACzB,iCAAiC;gBACjC,gBAAgB;gBAChB,aAAa;gBACb,eAAe;aAChB;YACD,iBAAiB,EAAE,IAAI;SACxB,CAAC;QAEF,0BAA0B;QAC1B,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YAC3B,MAAM,QAAQ,GAAG,IAAA,qBAAa,EAAC,KAAK,CAAC,CAAC;YACtC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,QAAQ,EAAE,CAAC,CAAC;YACtD,OAAO,CAAC,GAAG,CAAC,qBAAqB,QAAQ,EAAE,CAAC,CAAC;QAC/C,CAAC;QAED,wBAAwB;QACxB,IAAI,CAAC;YACH,OAAO,GAAG,MAAM,mBAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAClD,CAAC;QAAC,OAAO,WAAgB,EAAE,CAAC;YAC1B,MAAM,QAAQ,GAAG,WAAW,EAAE,OAAO,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC;YAE7D,yCAAyC;YACzC,IAAI,IAAA,mCAAqB,GAAE,EAAE,CAAC;gBAC5B,OAAO,CAAC,KAAK,CAAC,8DAA8D,CAAC,CAAC;gBAC9E,OAAO,CAAC,KAAK,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;gBACvC,OAAO,CAAC,KAAK,CAAC,qEAAqE,CAAC,CAAC;gBACrF,OAAO,CAAC,KAAK,CAAC,oFAAoF,CAAC,CAAC;gBACpG,MAAM,IAAI,KAAK,CACb,2DAA2D;oBAC3D,gDAAgD;oBAChD,mEAAmE;oBACnE,6DAA6D;oBAC7D,mBAAmB,QAAQ,EAAE,CAC9B,CAAC;YACJ,CAAC;YAED,0DAA0D;YAC1D,MAAM,WAAW,CAAC;QACpB,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QAErC,oCAAoC;QACpC,MAAM,IAAI,CAAC,YAAY,CAAC,iHAAiH,CAAC,CAAC;QAE3I,uCAAuC;QACvC,MAAM,IAAI,CAAC,mBAAmB,CAAC;YAC7B,iBAAiB,EAAE,gBAAgB;SACpC,CAAC,CAAC;QAEH,yBAAyB;QACzB,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;QAChD,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,uDAAuD;YACvD,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;YACtD,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAC/E,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;QAC5D,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC,4DAA4D,CAAC,CAAC;QAC1E,OAAO,CAAC,GAAG,CAAC,+DAA+D,CAAC,CAAC;QAC7E,OAAO,CAAC,GAAG,CAAC,4EAA4E,CAAC,CAAC;QAE1F,sDAAsD;QACtD,MAAM,IAAI,GAAG,MAAM,IAAA,2BAAe,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAEjD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,+DAA+D;YAC/D,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,0BAA0B,UAAU,EAAE,CAAC,CAAC;YAEpD,qDAAqD;YACrD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;gBACnC,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACpD,IAAI,WAAW,EAAE,CAAC;oBAChB,OAAO,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;oBAC7D,MAAM,SAAS,GAAG,MAAM,IAAA,qCAAoB,EAAC,WAAW,EAAE,YAAY,CAAC,CAAC;oBACxE,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;oBACtC,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;oBACtB,OAAO,GAAG,IAAI,CAAC;oBACf,OAAO,SAAS,CAAC;gBACnB,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,0CAA0C;YAC5C,CAAC;YAED,MAAM,IAAI,KAAK,CAAC,oGAAoG,CAAC,CAAC;QACxH,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;QACjD,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;QAExD,0BAA0B;QAC1B,MAAM,SAAS,GAAG,MAAM,IAAA,qCAAoB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAEjE,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;QAE9C,gBAAgB;QAChB,IAAI,CAAC;YACH,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;YACtB,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;QAClF,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;QAErD,UAAU;QACV,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC;gBACH,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;YACxB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,wBAAwB;YAC1B,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"login-interactive.js","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/login-interactive.ts"],"names":[],"mappings":"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"}

package/dist/scheduler/MultiScheduleManager.d.ts

@@ -1,6 +1,6 @@
 import { Database } from '../storage/Database';
 import { ScheduleConfig, StandaloneConfig } from '../config';
-import { JobFailure, JobTelemetry } from './Scheduler';
+import { JobAbandoned, JobFailure, JobTelemetry } from './Scheduler';
 import { ResolvedOccurrence, ScheduleRunOptions } from './OccurrenceResolver';
 import { SlotContext } from './SlotCoordinator';
 export interface MultiScheduleManagerOptions {
@@ -10,6 +10,13 @@ export interface MultiScheduleManagerOptions {
     database?: Database;
     telemetry?: JobTelemetry;
     onFailure?: (config: StandaloneConfig, schedule: ScheduleConfig, failure: JobFailure) => Promise<void> | void;
+    /**
+     * A run outlived its timeout AND the drain window, so it will never be
+     * awaited again. The host must finish the bookkeeping the run cannot: stop
+     * renewing its lease and take its Slot terminal, otherwise the recovery sweep
+     * re-dispatches the same occurrence next to a still-running job.
+     */
+    onAbandoned?: (config: StandaloneConfig, schedule: ScheduleConfig, abandoned: JobAbandoned) => Promise<void> | void;
     onReload?: (result: ConfigReloadResult) => void;
 }
 export interface ConfigReloadResult {
@@ -18,6 +25,12 @@ export interface ConfigReloadResult {
     schedules: string[];
     error?: string;
 }
+/**
+ * How often the manager looks for unfinished occurrences that no live worker
+ * owns. Combined with the slot lease TTL (SlotCoordinator), the worst case for a
+ * slot stranded by a crash/redeploy is roughly TTL + one sweep.
+ */
+export declare const RECOVERY_INTERVAL_MS: number;
 /**
  * Hosts many cron plans in one process. A validated config snapshot replaces
  * the complete cron table at once; invalid updates leave the previous table
@@ -29,10 +42,29 @@ export declare class MultiScheduleManager {
     private activeConfig;
     private generation;
     private reloadTimer;
+    private recoveryTimer;
     private watching;
     private readonly admission;
     constructor(options: MultiScheduleManagerOptions);
     start(initialConfig?: StandaloneConfig): ConfigReloadResult;
+    private startRecoveryLoop;
+    /**
+     * Re-dispatch occurrences that the durable ledger says are unfinished but that
+     * no live worker owns.
+     *
+     * This is NOT catch-up: catch-up guesses from cron that a fire was missed, and
+     * is therefore disabled in `external` mode where a stopped machine is normal.
+     * Recovery instead acts on a slot row that provably exists and has not reached
+     * a terminal state — a worker that crashed, was redeployed, or died between
+     * "occurrence recorded" and "lease claimed". It must run in EVERY mode, or an
+     * autosleep/external deployment silently strands those slots forever.
+     *
+     * Recovery only DISPATCHES. Clearing the lease here would race a healthy owner
+     * that heartbeats between the read and the write; the atomic CAS in
+     * `claimSlotLease` elects the single winner, so duplicate clocks, restarts and
+     * overlapping sweeps all converge on one worker.
+     */
+    private recoverInterruptedSlots;
     /**
      * Self-healing: if the daemon was down across a cron fire (deploy window,
      * crash, restart), the last recorded execution for a schedule is older than

package/dist/scheduler/MultiScheduleManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MultiScheduleManager.d.ts","sourceRoot":"","sources":["../../src/scheduler/MultiScheduleManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAGL,UAAU,EAEV,YAAY,EAEb,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAqB,MAAM,sBAAsB,CAAC;AACjG,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,WAAW,2BAA2B;IAC1C,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,gBAAgB,CAAC;IACnC,OAAO,EAAE,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,kBAAkB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7G,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,CAAC,EAAE,YAAY,CAAC;IACzB,SAAS,CAAC,EAAE,CACV,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,UAAU,KAChB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACjD;AAED,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,OAAO,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAsDD;;;;GAIG;AACH,qBAAa,oBAAoB;IAQnB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAPpC,OAAO,CAAC,UAAU,CAAgC;IAClD,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,WAAW,CAA+B;IAClD,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA6B;gBAE1B,OAAO,EAAE,2BAA2B;IAE1D,KAAK,CAAC,aAAa,CAAC,EAAE,gBAAgB,GAAG,kBAAkB;IAWlE;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IAyClB,MAAM,IAAI,kBAAkB;IAuBnC,OAAO,CAAC,WAAW;IAoDnB,OAAO,CAAC,aAAa;IAsBd,IAAI,IAAI,IAAI;IASnB,gFAAgF;IACzE,cAAc,CAAC,MAAM,GAAE,gBAAoC,GAAG,OAAO;IAI5E;;;;;;OAMG;IACI,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO;IAMjF,kFAAkF;IAC3E,WAAW,IAAI,MAAM,EAAE;IAIvB,SAAS,IAAI,kBAAkB;CAOvC;AAED,kFAAkF;AAClF,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,kBAAkB,GAAG,WAAW,CAY1E"}
+{"version":3,"file":"MultiScheduleManager.d.ts","sourceRoot":"","sources":["../../src/scheduler/MultiScheduleManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAEL,YAAY,EAEZ,UAAU,EAEV,YAAY,EAEb,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAoC,MAAM,sBAAsB,CAAC;AAChH,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,WAAW,2BAA2B;IAC1C,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,gBAAgB,CAAC;IACnC,OAAO,EAAE,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,kBAAkB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7G,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,CAAC,EAAE,YAAY,CAAC;IACzB,SAAS,CAAC,EAAE,CACV,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,UAAU,KAChB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,CACZ,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,YAAY,KACpB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACjD;AAED,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,OAAO,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,QAAY,CAAC;AA6D9C;;;;GAIG;AACH,qBAAa,oBAAoB;IASnB,OAAO,CAAC,QAAQ,CAAC,OAAO;IARpC,OAAO,CAAC,UAAU,CAAgC;IAClD,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,WAAW,CAA+B;IAClD,OAAO,CAAC,aAAa,CAA+B;IACpD,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA6B;gBAE1B,OAAO,EAAE,2BAA2B;IAE1D,KAAK,CAAC,aAAa,CAAC,EAAE,gBAAgB,GAAG,kBAAkB;IAelE,OAAO,CAAC,iBAAiB;IAmBzB;;;;;;;;;;;;;;;OAeG;IACH,OAAO,CAAC,uBAAuB;IA8D/B;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IAyClB,MAAM,IAAI,kBAAkB;IAuBnC,OAAO,CAAC,WAAW;IAqDnB,OAAO,CAAC,aAAa;IAsBd,IAAI,IAAI,IAAI;IAWnB,gFAAgF;IACzE,cAAc,CAAC,MAAM,GAAE,gBAAoC,GAAG,OAAO;IAI5E;;;;;;OAMG;IACI,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO;IAMjF,kFAAkF;IAC3E,WAAW,IAAI,MAAM,EAAE;IAIvB,SAAS,IAAI,kBAAkB;CAOvC;AAED,kFAAkF;AAClF,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,kBAAkB,GAAG,WAAW,CAY1E"}