@generacy-ai/orchestrator 0.6.0 → 0.8.0

package/dist/services/merge-conflict-monitor-service.js

@@ -0,0 +1,295 @@
+/**
+ * #898 T014 — Poll-based monitor that enqueues `resolve-merge-conflicts`
+ * queue items for issues sitting at `waiting-for:merge-conflicts` + `agent:paused`.
+ *
+ * Shape template: `pr-feedback-monitor-service.ts`.
+ * Contract: `specs/898-found-during-cockpit-v1/contracts/monitor-contract.md`.
+ *
+ * Dedup mechanism: sole use of `QueueManager.enqueueIfAbsent(itemKey)` — no
+ * `phase-tracker:*:resume:*` key. In-flight collisions collapse silently.
+ * Blocked-label pre-enqueue skip mirrors the `#883` pattern.
+ */
+import { GhAuthError, } from '@generacy-ai/workflow-engine';
+import { JitTokenError } from '@generacy-ai/control-plane';
+import { filterByAssignee } from './identity.js';
+const WAITING_FOR_MERGE_CONFLICTS_LABEL = 'waiting-for:merge-conflicts';
+const AGENT_PAUSED_LABEL = 'agent:paused';
+const MIN_POLL_INTERVAL_MS = 10_000;
+/**
+ * Adaptive polling divisor — halves poll interval when webhook stream goes
+ * quiet. Matches `PrFeedbackMonitorService` (Q divisor from #869).
+ */
+const ADAPTIVE_DIVISOR = 2;
+/**
+ * MergeConflictMonitorService — enqueues `resolve-merge-conflicts` work when
+ * the pause state (`waiting-for:merge-conflicts + agent:paused`) is detected
+ * on an assigned open issue.
+ */
+export class MergeConflictMonitorService {
+    logger;
+    createClient;
+    tokenProvider;
+    queueManager;
+    options;
+    clusterGithubUsername;
+    authHealth;
+    githubAppCredentialId;
+    abortController = null;
+    state;
+    constructor(logger, createClient, queueManager, config, repositories, clusterGithubUsername, tokenProvider, authHealth, githubAppCredentialId) {
+        this.logger = logger;
+        this.createClient = createClient;
+        this.tokenProvider = tokenProvider;
+        this.queueManager = queueManager;
+        this.clusterGithubUsername = clusterGithubUsername;
+        this.authHealth = authHealth ?? { recordResult: () => undefined };
+        this.githubAppCredentialId = githubAppCredentialId;
+        this.options = {
+            repositories,
+            pollIntervalMs: config.pollIntervalMs,
+            adaptivePolling: config.adaptivePolling,
+            maxConcurrentPolls: config.maxConcurrentPolls,
+        };
+        this.state = {
+            isPolling: false,
+            webhookHealthy: true,
+            lastWebhookEvent: null,
+            currentPollIntervalMs: config.pollIntervalMs,
+            basePollIntervalMs: config.pollIntervalMs,
+        };
+    }
+    // ==========================================================================
+    // Event Processing
+    // ==========================================================================
+    /**
+     * Process a merge-conflict event: verify precondition, check blocked-label
+     * skip, resolve workflow name, enqueue via `enqueueIfAbsent`.
+     *
+     * Returns true if enqueued, false if skipped or duplicate.
+     */
+    async processMergeConflictEvent(event) {
+        const { owner, repo, issueNumber, issueLabels, source } = event;
+        // Precondition: both waiting-for:merge-conflicts AND agent:paused must be
+        // present. Missing agent:paused → drop (pause is not actually in place).
+        const hasWaitingFor = issueLabels.includes(WAITING_FOR_MERGE_CONFLICTS_LABEL);
+        const hasPaused = issueLabels.includes(AGENT_PAUSED_LABEL);
+        if (!hasWaitingFor || !hasPaused) {
+            this.logger.debug({
+                owner, repo, issueNumber, source,
+                hasWaitingFor, hasPaused,
+            }, 'Precondition failed for merge-conflict enqueue (need waiting-for + agent:paused)');
+            return false;
+        }
+        // Blocked-label skip: any `blocked:*` on the issue → do not enqueue.
+        // Operator removes the block label → next poll re-enables enqueue naturally.
+        const blockedLabel = issueLabels.find((l) => l.startsWith('blocked:'));
+        if (blockedLabel) {
+            this.logger.info({
+                owner, repo, issueNumber,
+                blockedLabel,
+                reason: 'blocked-label-present',
+            }, 'Skipping merge-conflict enqueue while blocked:* label is present');
+            return false;
+        }
+        // Resolve workflow name from labels; default speckit-feature.
+        const workflowLabel = issueLabels.find((l) => l.startsWith('workflow:'));
+        const workflowName = workflowLabel
+            ? workflowLabel.slice('workflow:'.length)
+            : 'speckit-feature';
+        // Build queue item.
+        const queueItem = {
+            owner,
+            repo,
+            issueNumber,
+            workflowName,
+            command: 'resolve-merge-conflicts',
+            priority: Date.now(),
+            enqueuedAt: new Date().toISOString(),
+            metadata: {},
+            queueReason: 'resume',
+        };
+        // Atomic enqueue via in-flight dedupe (#862/#879 pattern).
+        const itemKey = `${owner}/${repo}#${issueNumber}`;
+        const enqueued = await this.queueManager.enqueueIfAbsent(queueItem);
+        if (!enqueued) {
+            this.logger.info({ itemKey, reason: 'in-flight', owner, repo, issueNumber }, 'Dropping merge-conflict enqueue (item already in flight)');
+            return false;
+        }
+        this.logger.info({ owner, repo, issueNumber, command: queueItem.command, source }, 'Merge-conflict resolution enqueued');
+        return true;
+    }
+    // ==========================================================================
+    // Polling
+    // ==========================================================================
+    async startPolling() {
+        if (this.state.isPolling) {
+            this.logger.warn('Merge-conflict monitor polling already running');
+            return;
+        }
+        const ac = new AbortController();
+        this.abortController = ac;
+        this.state.isPolling = true;
+        this.logger.info({ intervalMs: this.state.currentPollIntervalMs, repos: this.options.repositories.length }, 'Starting merge-conflict monitor polling');
+        while (!ac.signal.aborted) {
+            try {
+                await this.poll();
+            }
+            catch (error) {
+                this.logger.error({ err: error }, 'Error during merge-conflict poll cycle');
+            }
+            if (this.options.adaptivePolling) {
+                this.updateAdaptivePolling();
+            }
+            await this.sleep(this.state.currentPollIntervalMs, ac.signal);
+        }
+        this.state.isPolling = false;
+        this.logger.info('Merge-conflict monitor polling loop stopped');
+    }
+    stopPolling() {
+        if (this.abortController) {
+            this.abortController.abort();
+            this.abortController = null;
+            this.logger.info('Merge-conflict monitor polling stop requested');
+        }
+    }
+    async poll() {
+        const repos = this.options.repositories;
+        if (repos.length === 0)
+            return;
+        const semaphore = new Semaphore(this.options.maxConcurrentPolls);
+        const pollTasks = repos.map(({ owner, repo }) => semaphore.acquire().then(async (release) => {
+            try {
+                await this.pollRepo(owner, repo);
+            }
+            finally {
+                release();
+            }
+        }));
+        await Promise.allSettled(pollTasks);
+    }
+    /**
+     * Poll a single repository for issues sitting at `waiting-for:merge-conflicts`.
+     * Filters by assignee, then processes each via `processMergeConflictEvent`.
+     */
+    async pollRepo(owner, repo) {
+        const client = this.createClient(undefined, this.tokenProvider);
+        let allIssues;
+        try {
+            allIssues = await client.listIssuesWithLabel(owner, repo, WAITING_FOR_MERGE_CONFLICTS_LABEL);
+            if (this.githubAppCredentialId) {
+                this.authHealth.recordResult(this.githubAppCredentialId, { ok: true });
+            }
+        }
+        catch (error) {
+            if (error instanceof JitTokenError) {
+                this.logger.warn({ code: error.code, message: error.message, owner, repo }, 'JIT GitHub token refresh failed — skipping merge-conflict monitor cycle');
+                return;
+            }
+            if (error instanceof GhAuthError) {
+                if (this.githubAppCredentialId) {
+                    this.authHealth.recordResult(this.githubAppCredentialId, { ok: false, statusCode: error.statusCode });
+                }
+                this.logger.warn({ credentialId: this.githubAppCredentialId, statusCode: error.statusCode, owner, repo }, 'GitHub authentication failing on merge-conflict monitor — investigate credential refresh chain');
+                return;
+            }
+            this.logger.warn({ err: String(error), owner, repo }, 'Error polling repository for merge-conflict pauses');
+            return;
+        }
+        const issues = filterByAssignee(allIssues, this.clusterGithubUsername, this.logger);
+        if (issues.length === 0) {
+            this.logger.debug({ owner, repo }, 'No merge-conflict pauses found this cycle');
+            return;
+        }
+        this.logger.info({ owner, repo, count: issues.length }, 'Merge-conflict pauses found');
+        for (const issue of issues) {
+            const event = {
+                owner,
+                repo,
+                issueNumber: issue.number,
+                issueLabels: issue.labels.map((l) => l.name),
+                source: 'poll',
+            };
+            try {
+                await this.processMergeConflictEvent(event);
+            }
+            catch (err) {
+                this.logger.warn({ err: String(err), owner, repo, issueNumber: issue.number }, 'Error processing merge-conflict event — continuing to next issue');
+            }
+        }
+    }
+    // ==========================================================================
+    // Adaptive Polling
+    // ==========================================================================
+    recordWebhookEvent() {
+        this.state.lastWebhookEvent = Date.now();
+        const wasUnhealthy = !this.state.webhookHealthy;
+        this.state.webhookHealthy = true;
+        if (wasUnhealthy) {
+            this.state.currentPollIntervalMs = this.state.basePollIntervalMs;
+            this.logger.info({ intervalMs: this.state.currentPollIntervalMs }, 'Webhook reconnected, restoring merge-conflict monitor poll interval');
+        }
+    }
+    updateAdaptivePolling() {
+        if (this.state.lastWebhookEvent === null)
+            return;
+        const timeSinceLastWebhook = Date.now() - this.state.lastWebhookEvent;
+        const unhealthyThreshold = this.state.basePollIntervalMs * 2;
+        if (timeSinceLastWebhook > unhealthyThreshold && this.state.webhookHealthy) {
+            this.state.webhookHealthy = false;
+            this.state.currentPollIntervalMs = Math.max(MIN_POLL_INTERVAL_MS, Math.floor(this.state.basePollIntervalMs / ADAPTIVE_DIVISOR));
+            this.logger.info({ intervalMs: this.state.currentPollIntervalMs, timeSinceLastWebhook }, 'Webhooks appear unhealthy, increasing merge-conflict poll frequency');
+        }
+    }
+    // ==========================================================================
+    // State access
+    // ==========================================================================
+    getState() {
+        return { ...this.state };
+    }
+    // ==========================================================================
+    // Utilities
+    // ==========================================================================
+    sleep(ms, signal) {
+        return new Promise((resolve) => {
+            if (signal.aborted) {
+                resolve();
+                return;
+            }
+            const timer = setTimeout(resolve, ms);
+            const onAbort = () => {
+                clearTimeout(timer);
+                resolve();
+            };
+            signal.addEventListener('abort', onAbort, { once: true });
+        });
+    }
+}
+/**
+ * Simple semaphore for bounded concurrency.
+ */
+class Semaphore {
+    count;
+    waiting = [];
+    constructor(max) {
+        this.count = max;
+    }
+    async acquire() {
+        if (this.count > 0) {
+            this.count--;
+            return () => this.release();
+        }
+        return new Promise((resolve) => {
+            this.waiting.push(() => {
+                this.count--;
+                resolve(() => this.release());
+            });
+        });
+    }
+    release() {
+        this.count++;
+        const next = this.waiting.shift();
+        if (next)
+            next();
+    }
+}
+//# sourceMappingURL=merge-conflict-monitor-service.js.map

package/dist/services/merge-conflict-monitor-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-conflict-monitor-service.js","sourceRoot":"","sources":["../../src/services/merge-conflict-monitor-service.ts"],"names":[],"mappings":"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"}

package/dist/services/orchestrator-version.d.ts

@@ -0,0 +1,2 @@
+export declare function resolveOrchestratorVersion(): string;
+//# sourceMappingURL=orchestrator-version.d.ts.map

package/dist/services/orchestrator-version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"orchestrator-version.d.ts","sourceRoot":"","sources":["../../src/services/orchestrator-version.ts"],"names":[],"mappings":"AAMA,wBAAgB,0BAA0B,IAAI,MAAM,CAkBnD"}

package/dist/services/orchestrator-version.js

@@ -0,0 +1,23 @@
+import { readFileSync } from 'node:fs';
+function isRealVersion(candidate) {
+    return candidate !== undefined && candidate !== '' && candidate !== '0.0.0';
+}
+export function resolveOrchestratorVersion() {
+    const envValue = process.env.ORCHESTRATOR_VERSION;
+    if (isRealVersion(envValue)) {
+        return envValue;
+    }
+    try {
+        const raw = readFileSync(new URL('../../package.json', import.meta.url), 'utf-8');
+        const parsed = JSON.parse(raw);
+        const pkgVersion = typeof parsed.version === 'string' ? parsed.version : undefined;
+        if (isRealVersion(pkgVersion)) {
+            return pkgVersion;
+        }
+    }
+    catch {
+        // fall through to sentinel
+    }
+    return 'unknown';
+}
+//# sourceMappingURL=orchestrator-version.js.map

package/dist/services/orchestrator-version.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"orchestrator-version.js","sourceRoot":"","sources":["../../src/services/orchestrator-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,SAAS,aAAa,CAAC,SAA6B;IAClD,OAAO,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,EAAE,IAAI,SAAS,KAAK,OAAO,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,0BAA0B;IACxC,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;IAClD,IAAI,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,GAAG,CAAC,oBAAoB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;QAClF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAA0B,CAAC;QACxD,MAAM,UAAU,GAAG,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QACnF,IAAI,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9B,OAAO,UAAU,CAAC;QACpB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,2BAA2B;IAC7B,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/services/phase-tracker-service.d.ts

@@ -27,6 +27,16 @@ export declare class PhaseTrackerService implements PhaseTracker {
     clear(owner: string, repo: string, issue: number, phase: string): Promise<void>;
     tryMarkProcessed(owner: string, repo: string, issue: number, phase: string): Promise<boolean>;
     markProcessed(owner: string, repo: string, issue: number, phase: string): Promise<void>;
+    /**
+     * Raw-key duplicate check (#892). Semantically identical to `isDuplicate`
+     * but with caller-owned key namespace. Enables `base-advance-tracker:` keys
+     * sitting alongside the phase-tracker namespace without an interface split.
+     */
+    isDuplicateRaw(key: string): Promise<boolean>;
+    /**
+     * Raw-key mark-processed (#892). Caller-owned key namespace.
+     */
+    markProcessedRaw(key: string): Promise<void>;
 }
 export {};
 //# sourceMappingURL=phase-tracker-service.d.ts.map

package/dist/services/phase-tracker-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"phase-tracker-service.d.ts","sourceRoot":"","sources":["../../src/services/phase-tracker-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAItD,UAAU,MAAM;IACd,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACtD,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACtD,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACxD;AAED,MAAM,WAAW,mBAAmB;IAClC,2DAA2D;IAC3D,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;GAIG;AACH,qBAAa,mBAAoB,YAAW,YAAY;IACtD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IACrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAExB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,EAAE,OAAO,CAAC,EAAE,mBAAmB;IAM9E,OAAO,CAAC,QAAQ;IAIV,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAuBxF,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB/E,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAyB7F,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAkB9F"}
+{"version":3,"file":"phase-tracker-service.d.ts","sourceRoot":"","sources":["../../src/services/phase-tracker-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAItD,UAAU,MAAM;IACd,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACtD,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACtD,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACxD;AAED,MAAM,WAAW,mBAAmB;IAClC,2DAA2D;IAC3D,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;GAIG;AACH,qBAAa,mBAAoB,YAAW,YAAY;IACtD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IACrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAExB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,EAAE,OAAO,CAAC,EAAE,mBAAmB;IAM9E,OAAO,CAAC,QAAQ;IAIV,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAuBxF,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB/E,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAyB7F,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB7F;;;;OAIG;IACG,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqBnD;;OAEG;IACG,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAgBnD"}

package/dist/services/phase-tracker-service.js

@@ -78,5 +78,43 @@ export class PhaseTrackerService {
             this.logger.warn({ err: error, key }, 'Redis error in markProcessed, deduplication may not work for this event');
         }
     }
+    /**
+     * Raw-key duplicate check (#892). Semantically identical to `isDuplicate`
+     * but with caller-owned key namespace. Enables `base-advance-tracker:` keys
+     * sitting alongside the phase-tracker namespace without an interface split.
+     */
+    async isDuplicateRaw(key) {
+        if (!this.redis) {
+            this.logger.warn('Redis unavailable for phase tracker, treating as not duplicate');
+            return false;
+        }
+        try {
+            const exists = await this.redis.exists(key);
+            if (exists) {
+                this.logger.info({ key }, 'Duplicate event detected (raw key)');
+            }
+            return exists === 1;
+        }
+        catch (error) {
+            this.logger.warn({ err: error, key }, 'Redis error in isDuplicateRaw, treating as not duplicate');
+            return false;
+        }
+    }
+    /**
+     * Raw-key mark-processed (#892). Caller-owned key namespace.
+     */
+    async markProcessedRaw(key) {
+        if (!this.redis) {
+            this.logger.warn('Redis unavailable for phase tracker, skipping markProcessedRaw');
+            return;
+        }
+        try {
+            await this.redis.set(key, '1', 'EX', this.ttlSeconds);
+            this.logger.info({ key, ttl: this.ttlSeconds }, 'Marked processed (raw key)');
+        }
+        catch (error) {
+            this.logger.warn({ err: error, key }, 'Redis error in markProcessedRaw, deduplication may not work for this event');
+        }
+    }
 }
 //# sourceMappingURL=phase-tracker-service.js.map

package/dist/services/phase-tracker-service.js.map

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

package/dist/services/post-activation-dispatch.d.ts

@@ -0,0 +1,18 @@
+import type { FastifyBaseLogger } from 'fastify';
+import { PostActivationRetryService } from './post-activation-retry.js';
+import { BootResumeService } from './boot-resume-service.js';
+export type DispatchOutcome = 'retry' | 'resume' | 'noop';
+export interface DispatchOptions {
+    logger: FastifyBaseLogger;
+    sendRelayEvent?: (channel: string, payload: unknown) => void;
+    retryServiceFactory?: (deps: {
+        logger: FastifyBaseLogger;
+        sendRelayEvent?: (channel: string, payload: unknown) => void;
+    }) => PostActivationRetryService;
+    resumeServiceFactory?: (deps: {
+        logger: FastifyBaseLogger;
+        sendRelayEvent?: (channel: string, payload: unknown) => void;
+    }) => BootResumeService;
+}
+export declare function runPostActivationBranch(opts: DispatchOptions): Promise<DispatchOutcome>;
+//# sourceMappingURL=post-activation-dispatch.d.ts.map

package/dist/services/post-activation-dispatch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"post-activation-dispatch.d.ts","sourceRoot":"","sources":["../../src/services/post-activation-dispatch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE1D,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,iBAAiB,CAAC;IAC1B,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAE7D,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE;QAC3B,MAAM,EAAE,iBAAiB,CAAC;QAC1B,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;KAC9D,KAAK,0BAA0B,CAAC;IACjC,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE;QAC5B,MAAM,EAAE,iBAAiB,CAAC;QAC1B,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;KAC9D,KAAK,iBAAiB,CAAC;CACzB;AAYD,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,CA4B7F"}

package/dist/services/post-activation-dispatch.js

@@ -0,0 +1,30 @@
+import { PostActivationRetryService } from './post-activation-retry.js';
+import { BootResumeService } from './boot-resume-service.js';
+const defaultRetryFactory = (deps) => new PostActivationRetryService(deps);
+const defaultResumeFactory = (deps) => new BootResumeService(deps);
+export async function runPostActivationBranch(opts) {
+    const retryService = (opts.retryServiceFactory ?? defaultRetryFactory)({
+        logger: opts.logger,
+        sendRelayEvent: opts.sendRelayEvent,
+    });
+    const state = retryService.checkPostActivationState();
+    if (state.needsRetry) {
+        opts.logger.info('Post-activation incomplete on restart — triggering retry');
+        retryService.triggerPostActivationRetry().catch((err) => {
+            opts.logger.error({ err }, 'Post-activation retry failed');
+        });
+        return 'retry';
+    }
+    if (state.activated && state.postActivationComplete) {
+        const resumeService = (opts.resumeServiceFactory ?? defaultResumeFactory)({
+            logger: opts.logger,
+            sendRelayEvent: opts.sendRelayEvent,
+        });
+        resumeService.triggerBootResume().catch((err) => {
+            opts.logger.error({ err }, 'Boot resume failed');
+        });
+        return 'resume';
+    }
+    return 'noop';
+}
+//# sourceMappingURL=post-activation-dispatch.js.map

package/dist/services/post-activation-dispatch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"post-activation-dispatch.js","sourceRoot":"","sources":["../../src/services/post-activation-dispatch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAkB7D,MAAM,mBAAmB,GAAG,CAAC,IAG5B,EAA8B,EAAE,CAAC,IAAI,0BAA0B,CAAC,IAAI,CAAC,CAAC;AAEvE,MAAM,oBAAoB,GAAG,CAAC,IAG7B,EAAqB,EAAE,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC;AAErD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,IAAqB;IACjE,MAAM,YAAY,GAAG,CAAC,IAAI,CAAC,mBAAmB,IAAI,mBAAmB,CAAC,CAAC;QACrE,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,cAAc,EAAE,IAAI,CAAC,cAAc;KACpC,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,YAAY,CAAC,wBAAwB,EAAE,CAAC;IAEtD,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;QAC7E,YAAY,CAAC,0BAA0B,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACtD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,8BAA8B,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,sBAAsB,EAAE,CAAC;QACpD,MAAM,aAAa,GAAG,CAAC,IAAI,CAAC,oBAAoB,IAAI,oBAAoB,CAAC,CAAC;YACxE,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,cAAc,EAAE,IAAI,CAAC,cAAc;SACpC,CAAC,CAAC;QACH,aAAa,CAAC,iBAAiB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YAC9C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,oBAAoB,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/services/post-activation-retry.d.ts

@@ -7,6 +7,7 @@ export interface PostActivationState {
 export interface PostActivationRetryOptions {
     completionFlagPath?: string;
     keyFilePath?: string;
+    wizardCredsPath?: string;
     controlPlaneSocket?: string;
     controlPlaneWaitTimeout?: number;
     logger: FastifyBaseLogger;
@@ -16,12 +17,14 @@ export interface PostActivationRetryOptions {
 export declare class PostActivationRetryService {
     private readonly completionFlagPath;
     private readonly keyFilePath;
+    private readonly wizardCredsPath;
     private readonly controlPlaneSocket;
     private readonly controlPlaneWaitTimeout;
     private readonly logger;
     private readonly sendRelayEvent?;
     private readonly statusReporter;
     constructor(options: PostActivationRetryOptions);
+    private readGhToken;
     checkPostActivationState(): PostActivationState;
     triggerPostActivationRetry(): Promise<void>;
     private handleRetryFailure;

package/dist/services/post-activation-retry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"post-activation-retry.d.ts","sourceRoot":"","sources":["../../src/services/post-activation-retry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAIjD,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,sBAAsB,EAAE,OAAO,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,0BAA0B;IACzC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,MAAM,EAAE,iBAAiB,CAAC;IAC1B,mEAAmE;IACnE,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;CAC9D;AAOD,qBAAa,0BAA0B;IACrC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;IAC5C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;IAC5C,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAS;IACjD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;IAC3C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAA8C;IAC9E,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;gBAEpC,OAAO,EAAE,0BAA0B;IAU/C,wBAAwB,IAAI,mBAAmB;IAUzC,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC;YAsCnC,kBAAkB;IAWhC,OAAO,CAAC,mBAAmB;CA0C5B"}
+{"version":3,"file":"post-activation-retry.d.ts","sourceRoot":"","sources":["../../src/services/post-activation-retry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAIjD,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,sBAAsB,EAAE,OAAO,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,0BAA0B;IACzC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,MAAM,EAAE,iBAAiB,CAAC;IAC1B,mEAAmE;IACnE,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;CAC9D;AAQD,qBAAa,0BAA0B;IACrC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;IAC5C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;IAC5C,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAS;IACjD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;IAC3C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAA8C;IAC9E,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;gBAEpC,OAAO,EAAE,0BAA0B;IAY/C,OAAO,CAAC,WAAW;IAiBnB,wBAAwB,IAAI,mBAAmB;IAwBzC,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC;YAsCnC,kBAAkB;IAWhC,OAAO,CAAC,mBAAmB;CA0C5B"}

package/dist/services/post-activation-retry.js

@@ -1,14 +1,16 @@
-import { existsSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
 import http from 'node:http';
 import { probeControlPlaneSocket } from './control-plane-probe.js';
 import { StatusReporter } from './status-reporter.js';
 const DEFAULT_COMPLETION_FLAG = '/var/lib/generacy/post-activation-complete';
 const DEFAULT_KEY_FILE = '/var/lib/generacy/cluster-api-key';
+const DEFAULT_WIZARD_CREDS = '/var/lib/generacy/wizard-credentials.env';
 const DEFAULT_SOCKET = '/run/generacy-control-plane/control.sock';
 const DEFAULT_WAIT_TIMEOUT = 15;
 export class PostActivationRetryService {
     completionFlagPath;
     keyFilePath;
+    wizardCredsPath;
     controlPlaneSocket;
     controlPlaneWaitTimeout;
     logger;
@@ -17,19 +19,49 @@ export class PostActivationRetryService {
     constructor(options) {
         this.completionFlagPath = options.completionFlagPath ?? DEFAULT_COMPLETION_FLAG;
         this.keyFilePath = options.keyFilePath ?? DEFAULT_KEY_FILE;
+        this.wizardCredsPath =
+            options.wizardCredsPath ?? process.env['WIZARD_CREDS_PATH'] ?? DEFAULT_WIZARD_CREDS;
         this.controlPlaneSocket = options.controlPlaneSocket ?? DEFAULT_SOCKET;
         this.controlPlaneWaitTimeout = options.controlPlaneWaitTimeout ?? DEFAULT_WAIT_TIMEOUT;
         this.logger = options.logger;
         this.sendRelayEvent = options.sendRelayEvent;
         this.statusReporter = new StatusReporter({ socketPath: this.controlPlaneSocket });
     }
+    readGhToken() {
+        try {
+            const raw = readFileSync(this.wizardCredsPath, 'utf8');
+            for (const line of raw.split(/\r?\n/)) {
+                const idx = line.indexOf('=');
+                if (idx < 0)
+                    continue;
+                const key = line.slice(0, idx);
+                if (key !== 'GH_TOKEN')
+                    continue;
+                const value = line.slice(idx + 1).trim();
+                return value.length > 0 ? { sealed: true, token: value } : { sealed: false };
+            }
+            return { sealed: false };
+        }
+        catch {
+            return { sealed: false };
+        }
+    }
     checkPostActivationState() {
         const activated = existsSync(this.keyFilePath);
         const postActivationComplete = existsSync(this.completionFlagPath);
+        const ghTokenSealed = this.readGhToken().sealed;
+        const needsRetry = activated && !postActivationComplete && ghTokenSealed;
+        if (activated && !postActivationComplete && !ghTokenSealed) {
+            this.logger.info({ wizardCredsPath: this.wizardCredsPath }, 'Post-activation retry deferred — GH_TOKEN not sealed in wizard-credentials.env');
+            this.sendRelayEvent?.('cluster.bootstrap', {
+                status: 'deferred',
+                reason: 'github-token-not-sealed',
+            });
+        }
         return {
             activated,
             postActivationComplete,
-            needsRetry: activated && !postActivationComplete,
+            needsRetry,
         };
     }
     async triggerPostActivationRetry() {

package/dist/services/post-activation-retry.js.map

@@ -1 +1 @@
-{"version":3,"file":"post-activation-retry.js","sourceRoot":"","sources":["../../src/services/post-activation-retry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAkBtD,MAAM,uBAAuB,GAAG,4CAA4C,CAAC;AAC7E,MAAM,gBAAgB,GAAG,mCAAmC,CAAC;AAC7D,MAAM,cAAc,GAAG,0CAA0C,CAAC;AAClE,MAAM,oBAAoB,GAAG,EAAE,CAAC;AAEhC,MAAM,OAAO,0BAA0B;IACpB,kBAAkB,CAAS;IAC3B,WAAW,CAAS;IACpB,kBAAkB,CAAS;IAC3B,uBAAuB,CAAS;IAChC,MAAM,CAAoB;IAC1B,cAAc,CAA+C;IAC7D,cAAc,CAAiB;IAEhD,YAAY,OAAmC;QAC7C,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,IAAI,uBAAuB,CAAC;QAChF,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,gBAAgB,CAAC;QAC3D,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,IAAI,cAAc,CAAC;QACvE,IAAI,CAAC,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,IAAI,oBAAoB,CAAC;QACvF,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;QAC7C,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;IACpF,CAAC;IAED,wBAAwB;QACtB,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC/C,MAAM,sBAAsB,GAAG,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACnE,OAAO;YACL,SAAS;YACT,sBAAsB;YACtB,UAAU,EAAE,SAAS,IAAI,CAAC,sBAAsB;SACjD,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,0BAA0B;QAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC;QAElF,sBAAsB;QACtB,IAAI,CAAC,cAAc,EAAE,CAAC,mBAAmB,EAAE;YACzC,MAAM,EAAE,UAAU;YAClB,MAAM,EAAE,4BAA4B;YACpC,OAAO,EAAE,SAAS;SACnB,CAAC,CAAC;QAEH,gCAAgC;QAChC,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC,uBAAuB,EAAE,OAAO,EAAE,EAAE,CAAC;YACxE,KAAK,GAAG,MAAM,uBAAuB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAC/D,IAAI,KAAK;gBAAE,MAAM;YACjB,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;QAChD,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,MAAM,GAAG,2BAA2B,CAAC;YAC3C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uEAAuE,IAAI,CAAC,uBAAuB,GAAG,CAAC,CAAC;YAC1H,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,2CAA2C,CAAC,CAAC;YACnF,OAAO;QACT,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;QAExF,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;QACtF,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,MAAM,GAAG,yBAAyB,CAAC;YACzC,MAAM,QAAQ,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAClE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,iCAAiC,QAAQ,EAAE,CAAC,CAAC;YACxE,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,MAAc,EAAE,KAAa;QAC5D,MAAM,YAAY,GAAG,sCAAsC,KAAK,EAAE,CAAC;QACnE,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAE/D,IAAI,CAAC,cAAc,EAAE,CAAC,mBAAmB,EAAE;YACzC,MAAM,EAAE,QAAQ;YAChB,MAAM;YACN,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IAEO,mBAAmB;QACzB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;QAE9D,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CACtB;gBACE,UAAU,EAAE,IAAI,CAAC,kBAAkB;gBACnC,IAAI,EAAE,+BAA+B;gBACrC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;oBACzC,0BAA0B,EAAE,QAAQ;oBACpC,6BAA6B,EAAE,uBAAuB;iBACvD;aACF,EACD,CAAC,GAAG,EAAE,EAAE;gBACN,IAAI,IAAI,GAAG,EAAE,CAAC;gBACd,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,GAAG,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC9C,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;oBACjB,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC;wBACpE,OAAO,EAAE,CAAC;oBACZ,CAAC;yBAAM,CAAC;wBACN,MAAM,CAAC,IAAI,KAAK,CAAC,6BAA6B,GAAG,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;oBAC5E,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CACF,CAAC;YAEF,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE;gBAC1B,GAAG,CAAC,OAAO,EAAE,CAAC;gBACd,MAAM,CAAC,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC,CAAC;YAC1D,CAAC,CAAC,CAAC;YAEH,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACtB,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,CAAC,CAAC,CAAC;YAEH,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAChB,GAAG,CAAC,GAAG,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"post-activation-retry.js","sourceRoot":"","sources":["../../src/services/post-activation-retry.ts"],"names":[],"mappings":"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"}