@on-par/factory-core 0.9.28-next.13 → 0.9.28-next.15

package/dist/phases/ship-open-pr.js

@@ -0,0 +1,71 @@
+// packages/core/src/phases/ship-open-pr.ts — SHIP draft PR creation and already-exists recovery
+import { briefSummaryLine, renderPrBody, stripBriefIds } from '../reports/pr-body.js';
+import { issueNumberOf } from '../work/work-key.js';
+import { SHIP_BASE_BRANCH } from './ship-options.js';
+import { findOpenPR, isPullAlreadyExistsError } from './ship-pr-lookup.js';
+import { readRisk, readSpecBody } from './ship-spec.js';
+import { renderStackOrderLine } from './stack-order.js';
+export async function openOrFindPr(ctx) {
+    const { opts, inlineWork, stack, base, owner, repoName, walkthrough } = ctx;
+    const { octokit, issue, branch, checkSummary, log } = opts;
+    let prNumber;
+    // Get title from issue (skipped for a non-github work source — no such issue exists)
+    const title = inlineWork
+        ? inlineWork.title
+        : (await octokit.rest.issues.get({ owner, repo: repoName, issue_number: issueNumberOf(issue) })).data.title;
+    const slice = inlineWork ? undefined : opts.slice;
+    const finalSlice = !slice || slice.index >= slice.count;
+    // A brief is a local file reviewers cannot open, so the body describes it by its title and links the
+    // open PR it builds on (a --stack or --base-branch base), never its id, digest or path.
+    const basePr = inlineWork && base !== SHIP_BASE_BRANCH ? await findOpenPR(octokit, owner, repoName, base) : undefined;
+    const summaryLine = inlineWork
+        ? briefSummaryLine(title, basePr?.status === 'found' ? basePr.prNumber : undefined)
+        : slice
+            ? `Implements slice ${slice.index}/${slice.count} of #${issue}.`
+            : `Implements #${issue}.`;
+    const prTitle = inlineWork
+        ? stripBriefIds(title)
+        : slice
+            ? `${title} — slice ${slice.index}/${slice.count} (#${issue})`
+            : `${title} (#${issue})`;
+    // Create PR
+    try {
+        const { data: pr } = await octokit.rest.pulls.create({
+            owner,
+            repo: repoName,
+            head: branch,
+            base,
+            title: prTitle,
+            draft: true,
+            body: renderPrBody({
+                summaryLine,
+                footer: opts.footer,
+                stackOrder: stack ? renderStackOrderLine(stack) : undefined,
+                specBody: await readSpecBody(opts.specPath),
+                checkSummary,
+                reworkRounds: opts.reworkRounds,
+                risk: await readRisk(opts.specPath),
+                walkthrough: await walkthrough.walkthrough(),
+                typescriptLines: await walkthrough.counts(),
+                closes: inlineWork || !finalSlice ? undefined : issue,
+                partOf: !inlineWork && !finalSlice ? issue : undefined,
+            }),
+        });
+        prNumber = pr.number;
+        log('pr_opened', `opened PR #${prNumber} for committed work on ${branch} (base ${base})`);
+    }
+    catch (err) {
+        if (!isPullAlreadyExistsError(err))
+            throw err;
+        const existing = await findOpenPR(octokit, owner, repoName, branch);
+        if (existing.status !== 'found') {
+            const reason = `pulls.create reported an existing PR for ${branch} but re-querying did not find it (${existing.status === 'error' ? existing.detail : 'no open PR listed'})`;
+            log('ship', `${reason} — aborting`);
+            return { stop: { ok: false, reason } };
+        }
+        prNumber = existing.prNumber;
+        log('recovered', `PR #${prNumber} already existed for ${branch}; reusing it`);
+    }
+    return { prNumber };
+}
+//# sourceMappingURL=ship-open-pr.js.map

package/dist/phases/ship-open-pr.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ship-open-pr.js","sourceRoot":"","sources":["../../src/phases/ship-open-pr.ts"],"names":[],"mappings":"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"}

package/dist/phases/ship-options.d.ts

@@ -0,0 +1,76 @@
+import type { Octokit } from '@octokit/rest';
+import type { ApprovalGate } from '../approvals/index.js';
+import type { LifecycleBus } from '../bus/index.js';
+import type { EventKind } from '../events/kinds.js';
+import type { ReviewRouting } from '../review/routing.js';
+import type { CheckSummary } from '../types/index.js';
+import type { watchChecksWithInfraRerun } from '../utils/ci-watch.js';
+import type { WorkRequest } from '../work/index.js';
+import type { WorkKey } from '../work/work-key.js';
+import type { CommandRunner } from './ship-git.js';
+import type { PreviewGate } from './ship-preview.js';
+import type { WalkthroughShipOpts } from './ship-walkthrough.js';
+import type { StackPosition } from './stack-order.js';
+/** Ship opens PRs against, and watches required checks of, this branch. */
+export declare const SHIP_BASE_BRANCH = "main";
+export interface ShipPhaseOptions {
+    issue: WorkKey;
+    repo: string;
+    worktree: string;
+    branch: string;
+    octokit: Octokit;
+    watchCI?: boolean;
+    /** Resolved pr.footer; undefined uses the default, empty string omits it. */
+    footer?: string;
+    /** Stop at the draft PR: skip mark-ready (#3449). */
+    draft?: boolean;
+    /** Post the evidence pack as a PR comment (pr.evidenceComment); default off. */
+    evidenceComment?: boolean;
+    log: (type: EventKind, msg: string) => void;
+    run?: CommandRunner;
+    /** Runs the gh rerun argv for the CI infra rescue (#2365); default runCommand. */
+    rerun?: (argv: readonly string[]) => Promise<{
+        ok: boolean;
+    }>;
+    approvalGate?: ApprovalGate;
+    checkSummary?: CheckSummary;
+    specPath?: string;
+    eventsFile?: string;
+    startedAt?: string;
+    logsDir?: string;
+    reworkRounds?: number;
+    /** PR classifier decision (#1724), rendered into the evidence pack. */
+    reviewRouting?: ReviewRouting;
+    /** Model pins that were not honored (#2511), rendered into the evidence pack. */
+    pinNotes?: string[];
+    /** The run's resolved work request; when its kind is not 'github-issue', the PR
+     *  title/body come from it instead of fetching the (nonexistent) issue (#507). */
+    work?: Pick<WorkRequest, 'id' | 'kind' | 'title' | 'reference'>;
+    /** The ADR-0147 slice this run ships; titles the PR `slice k/n` and only the final slice closes the issue. */
+    slice?: {
+        index: number;
+        count: number;
+    };
+    /** Stack-mode (ADR-0161) position: the PR opens on `stack.base` and its body names the stack order. Ignored for inline work. */
+    stack?: StackPosition;
+    /** PR base for a non-stack run started from another branch (#3764); default main. */
+    baseBranch?: string;
+    /** Lane id stamped onto emitted lifecycle events; defaults to `issue-<issue>` (#591). */
+    laneId?: string;
+    /** Lifecycle bus to emit onto; defaults to the process-wide `lifecycleBus` (#591). */
+    bus?: LifecycleBus;
+    /** origin/<branch> SHA recorded at worktree creation (#1868). When set, the new-PR push
+     *  replaces that stale head under a lease on this SHA, and fails closed if the remote moved (#1869). */
+    recordedRemoteSha?: string;
+    /** SHIP re-entry after a CI rework round (#2816): same open PR, plain push, watch the pushed SHA. */
+    reentry?: {
+        prNumber: number;
+        previousHeadSha?: string;
+    };
+    /** CI watch deadline (#3569); default DEFAULT_CI_DEADLINE_MS. */
+    ciDeadlineMs?: number;
+    walkthrough?: WalkthroughShipOpts['walkthrough'];
+    previewGate?: PreviewGate;
+    ciWatch?: typeof watchChecksWithInfraRerun;
+}
+//# sourceMappingURL=ship-options.d.ts.map

package/dist/phases/ship-options.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ship-options.d.ts","sourceRoot":"","sources":["../../src/phases/ship-options.ts"],"names":[],"mappings":"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"}

package/dist/phases/ship-options.js

@@ -0,0 +1,4 @@
+// packages/core/src/phases/ship-options.ts — SHIP phase options and the base branch it ships against
+/** Ship opens PRs against, and watches required checks of, this branch. */
+export const SHIP_BASE_BRANCH = 'main';
+//# sourceMappingURL=ship-options.js.map

package/dist/phases/ship-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ship-options.js","sourceRoot":"","sources":["../../src/phases/ship-options.ts"],"names":[],"mappings":"AAAA,qGAAqG;AAiBrG,2EAA2E;AAC3E,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC"}

package/dist/phases/ship-reentry.d.ts

@@ -0,0 +1,20 @@
+import { type CommandRunner } from './ship-git.js';
+import type { ShipPhaseOptions } from './ship-options.js';
+import type { ShipResult } from './ship-types.js';
+export declare function pushReentry(ctx: {
+    run: CommandRunner;
+    worktree: string;
+    branch: string;
+    prNumber: number | undefined;
+    reentry: {
+        prNumber: number;
+        previousHeadSha?: string;
+    };
+    log: ShipPhaseOptions['log'];
+}): Promise<{
+    stop: ShipResult;
+} | {
+    watchRef: string;
+    headSha: string;
+}>;
+//# sourceMappingURL=ship-reentry.d.ts.map

package/dist/phases/ship-reentry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ship-reentry.d.ts","sourceRoot":"","sources":["../../src/phases/ship-reentry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,aAAa,EAAsD,MAAM,eAAe,CAAC;AACvG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,wBAAsB,WAAW,CAAC,GAAG,EAAE;IACrC,GAAG,EAAE,aAAa,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,OAAO,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,GAAG,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC;CAC9B,GAAG,OAAO,CAAC;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAyCxE"}

package/dist/phases/ship-reentry.js

@@ -0,0 +1,47 @@
+// packages/core/src/phases/ship-reentry.ts — SHIP re-entry push after a CI rework round
+import { shellEscape } from '../utils/index.js';
+import { describePushFailure, shortDetail, verifyRemoteHead } from './ship-git.js';
+export async function pushReentry(ctx) {
+    const { run, worktree, branch, prNumber, reentry, log } = ctx;
+    if (prNumber !== reentry.prNumber) {
+        const reason = `re-entry expected open PR #${reentry.prNumber} for ${branch} but found ${prNumber === undefined ? 'none' : `#${prNumber}`}`;
+        log('ship', reason);
+        return { stop: { ok: false, reason } };
+    }
+    let localSha;
+    try {
+        localSha = (await run('git rev-parse HEAD', { cwd: worktree })).stdout.trim();
+    }
+    catch (err) {
+        const reason = `could not read local HEAD on re-entry (${shortDetail(err)})`;
+        log('ship', reason);
+        return { stop: { ok: false, prNumber, reason } };
+    }
+    if (localSha && localSha === reentry.previousHeadSha) {
+        const reason = `CI rework produced no new commit on ${branch}`;
+        log('ship', reason);
+        return { stop: { ok: false, prNumber, ciOutcome: 'failure', reason, headSha: localSha } };
+    }
+    try {
+        await run(`git push origin ${shellEscape(branch)}`, { cwd: worktree });
+    }
+    catch (err) {
+        const { kind, detail } = describePushFailure(err);
+        const reason = `re-entry push of ${branch} failed (${kind}): ${detail}`;
+        log('ship', reason);
+        return { stop: { ok: false, prNumber, reason } };
+    }
+    const remoteHead = await verifyRemoteHead(run, worktree, branch);
+    if (remoteHead.status !== 'match') {
+        const reason = remoteHead.status === 'mismatch'
+            ? `remote head ${remoteHead.remoteSha} does not match local HEAD ${remoteHead.localSha} for ${branch} after re-entry push`
+            : `could not verify the remote head for ${branch} after re-entry push (${remoteHead.detail})`;
+        log('ship', reason);
+        return { stop: { ok: false, prNumber, reason } };
+    }
+    const watchRef = remoteHead.remoteSha;
+    const headSha = remoteHead.remoteSha;
+    log('ship', `re-entry pushed ${branch} @ ${headSha}`);
+    return { watchRef, headSha };
+}
+//# sourceMappingURL=ship-reentry.js.map

package/dist/phases/ship-reentry.js.map

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

package/dist/phases/ship.d.ts

@@ -1,79 +1,7 @@
-import { type WorkKey } from '../work/work-key.js';
-import type { Octokit } from '@octokit/rest';
-import type { ApprovalGate } from '../approvals/index.js';
-import { type LifecycleBus } from '../bus/index.js';
-import type { EventKind } from '../events/kinds.js';
-import { type WalkthroughShipOpts } from './ship-walkthrough.js';
-import { type StackPosition } from './stack-order.js';
-import type { ReviewRouting } from '../review/routing.js';
-import { type CommandRunner } from './ship-git.js';
-import { type PreviewGate } from './ship-preview.js';
-import type { CheckSummary } from '../types/index.js';
-import { type watchChecksWithInfraRerun } from '../utils/ci-watch.js';
-import type { WorkRequest } from '../work/index.js';
-import { findMergedPR, findOpenPR, isPullAlreadyExistsError } from './ship-pr-lookup.js';
+import { type ShipPhaseOptions } from './ship-options.js';
+import { findMergedPR, findOpenPR } from './ship-pr-lookup.js';
 import type { PrLookup, ShipResult } from './ship-types.js';
-export { findMergedPR, findOpenPR, isPullAlreadyExistsError };
+export { findMergedPR, findOpenPR };
 export type { PrLookup, ShipResult };
-export declare function shipPhase(opts: Parameters<typeof shipPhaseImpl>[0]): Promise<ShipResult>;
-declare function shipPhaseImpl(opts: {
-    issue: WorkKey;
-    repo: string;
-    worktree: string;
-    branch: string;
-    octokit: Octokit;
-    watchCI?: boolean;
-    /** Resolved pr.footer; undefined uses the default, empty string omits it. */
-    footer?: string;
-    /** Stop at the draft PR: skip mark-ready (#3449). */
-    draft?: boolean;
-    /** Post the evidence pack as a PR comment (pr.evidenceComment); default off. */
-    evidenceComment?: boolean;
-    log: (type: EventKind, msg: string) => void;
-    run?: CommandRunner;
-    /** Runs the gh rerun argv for the CI infra rescue (#2365); default runCommand. */
-    rerun?: (argv: readonly string[]) => Promise<{
-        ok: boolean;
-    }>;
-    approvalGate?: ApprovalGate;
-    checkSummary?: CheckSummary;
-    specPath?: string;
-    eventsFile?: string;
-    startedAt?: string;
-    logsDir?: string;
-    reworkRounds?: number;
-    /** PR classifier decision (#1724), rendered into the evidence pack. */
-    reviewRouting?: ReviewRouting;
-    /** Model pins that were not honored (#2511), rendered into the evidence pack. */
-    pinNotes?: string[];
-    /** The run's resolved work request; when its kind is not 'github-issue', the PR
-     *  title/body come from it instead of fetching the (nonexistent) issue (#507). */
-    work?: Pick<WorkRequest, 'id' | 'kind' | 'title' | 'reference'>;
-    /** The ADR-0147 slice this run ships; titles the PR `slice k/n` and only the final slice closes the issue. */
-    slice?: {
-        index: number;
-        count: number;
-    };
-    /** Stack-mode (ADR-0161) position: the PR opens on `stack.base` and its body names the stack order. Ignored for inline work. */
-    stack?: StackPosition;
-    /** PR base for a non-stack run started from another branch (#3764); default main. */
-    baseBranch?: string;
-    /** Lane id stamped onto emitted lifecycle events; defaults to `issue-<issue>` (#591). */
-    laneId?: string;
-    /** Lifecycle bus to emit onto; defaults to the process-wide `lifecycleBus` (#591). */
-    bus?: LifecycleBus;
-    /** origin/<branch> SHA recorded at worktree creation (#1868). When set, the new-PR push
-     *  replaces that stale head under a lease on this SHA, and fails closed if the remote moved (#1869). */
-    recordedRemoteSha?: string;
-    /** SHIP re-entry after a CI rework round (#2816): same open PR, plain push, watch the pushed SHA. */
-    reentry?: {
-        prNumber: number;
-        previousHeadSha?: string;
-    };
-    /** CI watch deadline (#3569); default DEFAULT_CI_DEADLINE_MS. */
-    ciDeadlineMs?: number;
-    walkthrough?: WalkthroughShipOpts['walkthrough'];
-    previewGate?: PreviewGate;
-    ciWatch?: typeof watchChecksWithInfraRerun;
-}): Promise<ShipResult>;
+export declare function shipPhase(opts: ShipPhaseOptions): Promise<ShipResult>;
 //# sourceMappingURL=ship.d.ts.map

package/dist/phases/ship.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ship.d.ts","sourceRoot":"","sources":["../../src/phases/ship.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAIlE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,iBAAiB,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAIpD,OAAO,EAAmB,KAAK,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAAwB,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EACL,KAAK,aAAa,EAOnB,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAE,KAAK,WAAW,EAAwC,MAAM,mBAAmB,CAAC;AAK3F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAA0B,KAAK,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAG9F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AACzF,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,wBAAwB,EAAE,CAAC;AAC9D,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;AAOrC,wBAAsB,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAiB9F;AAED,iBAAe,aAAa,CAAC,IAAI,EAAE;IACjC,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,6EAA6E;IAC7E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,qDAAqD;IACrD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,gFAAgF;IAChF,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,GAAG,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,GAAG,CAAC,EAAE,aAAa,CAAC;IACpB,kFAAkF;IAClF,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAC9D,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uEAAuE;IACvE,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,iFAAiF;IACjF,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB;sFACkF;IAClF,IAAI,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,MAAM,GAAG,OAAO,GAAG,WAAW,CAAC,CAAC;IAChE,8GAA8G;IAC9G,KAAK,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,gIAAgI;IAChI,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,qFAAqF;IACrF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yFAAyF;IACzF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,sFAAsF;IACtF,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB;4GACwG;IACxG,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qGAAqG;IACrG,OAAO,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACzD,iEAAiE;IACjE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,mBAAmB,CAAC,aAAa,CAAC,CAAC;IACjD,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,OAAO,CAAC,EAAE,OAAO,yBAAyB,CAAC;CAC5C,GAAG,OAAO,CAAC,UAAU,CAAC,CA6WtB"}
+{"version":3,"file":"ship.d.ts","sourceRoot":"","sources":["../../src/phases/ship.ts"],"names":[],"mappings":"AAeA,OAAO,EAAoB,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG5D,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;AACpC,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;AAIrC,wBAAsB,SAAS,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC,CAiB3E"}