dorfl 0.14.2 → 0.15.0

package/dist/merge-answer.js

@@ -0,0 +1,60 @@
+import { isEntryAnswered, } from './sidecar.js';
+/**
+ * Parse the human's plain free-text answer into the deterministic
+ * {@link MergeActionVerb}. The merge-question surfacer renders
+ * `merge | hold | drop` in the entry's `default` as a human-readable hint, so
+ * the human typically types one of those words verbatim. We accept any text
+ * whose first whole word (case-insensitive) is one of `merge` / `hold` / `drop`
+ * — this is the same machine-parseable choice shape the surfacer's applied
+ * answer q1 documents ("a DETERMINISTIC CHOICE shape … the human picks and the
+ * system parses unambiguously").
+ *
+ * Returns `undefined` on ANYTHING else (an empty answer, a typo, a long
+ * narrative without one of the three words at the start) so the caller can
+ * route the ambiguity HONESTLY — never default-to-merge on a malformed answer,
+ * which would invent a land the human did not authorise.
+ */
+export function parseMergeAnswer(text) {
+    const trimmed = text.trim().toLowerCase();
+    if (trimmed === '')
+        return undefined;
+    // The first whole alphabetic word; trailing punctuation (a comma, em-dash,
+    // period) and any following commentary are tolerated. We deliberately do
+    // NOT consume hyphens / apostrophes — the three verbs are plain ASCII
+    // words, and over-tolerating typo-shapes would silently invent a verb the
+    // human did not pick.
+    const match = /^([a-z]+)/.exec(trimmed);
+    if (match === null)
+        return undefined;
+    const word = match[1];
+    if (word === 'merge' || word === 'hold' || word === 'drop') {
+        return word;
+    }
+    return undefined;
+}
+/**
+ * `detectAnsweredMergeAction` (`apply-merge-action.ts`) over an already-parsed sidecar model (the
+ * selection path reads sidecars itself, in place and from a mirror ref). The
+ * same ordering rules apply.
+ */
+export function answeredMergeActionIn(model) {
+    // (1) Unanswered `kind: merge` follow-up ⇒ re-paused; the apply must NOT fire.
+    for (const entry of model.entries) {
+        if (entry.kind === 'merge' && !isEntryAnswered(entry))
+            return undefined;
+    }
+    // (2) LATEST answered `kind: merge` entry — a fresh follow-up beats a stale one.
+    for (let i = model.entries.length - 1; i >= 0; i--) {
+        const entry = model.entries[i];
+        if (entry.kind !== 'merge')
+            continue;
+        if (!isEntryAnswered(entry))
+            continue;
+        const verb = parseMergeAnswer(entry.answer);
+        if (verb !== undefined) {
+            return { verb, entry };
+        }
+    }
+    return undefined;
+}
+//# sourceMappingURL=merge-answer.js.map

package/dist/merge-answer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-answer.js","sourceRoot":"","sources":["../src/merge-answer.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,eAAe,GAGf,MAAM,cAAc,CAAC;AAsBtB;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC1C,IAAI,OAAO,KAAK,EAAE;QAAE,OAAO,SAAS,CAAC;IACrC,2EAA2E;IAC3E,yEAAyE;IACzE,sEAAsE;IACtE,0EAA0E;IAC1E,sBAAsB;IACtB,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxC,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IACrC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IACtB,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QAC5D,OAAO,IAAI,CAAC;IACb,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CACpC,KAAmB;IAEnB,+EAA+E;IAC/E,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QACnC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;IACzE,CAAC;IACD,iFAAiF;IACjF,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACpD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;YAAE,SAAS;QACrC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;YAAE,SAAS;QACtC,MAAM,IAAI,GAAG,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,EAAC,IAAI,EAAE,KAAK,EAAC,CAAC;QACtB,CAAC;IACF,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC"}

package/dist/merge-question-surfacer.d.ts

@@ -1,4 +1,5 @@
 import { type SurfacePersistOptions, type SurfacePersistResult } from './surface-persist.js';
+import type { LockEntry } from './item-lock.js';
 /**
  * The **MERGE-QUESTION SURFACER** (spec `land-time-reverify-and-parallel-merge-ceiling`,
  * task `merge-question-surfacer`, US #14) — the SECOND, STATE-sourced surfacer
@@ -21,28 +22,41 @@ import { type SurfacePersistOptions, type SurfacePersistResult } from './surface
  *
  * Layered like the spec asks: the FLOOR (git-alone reachability) is the
  * authoritative enumerator — it works against a bare `--bare` arbiter with
- * `NoneProvider`. The CEILING (`gh pr list` PR metadata) is pure ENRICHMENT
- * layered on top when a GitHub host is configured; the surfacer functions
- * identically without it.
+ * `NoneProvider`. The CEILING (`gh pr list`) runs when a GitHub host is
+ * configured, and there it FILTERS (task
+ * `wire-merge-questions-into-the-advance-tick`, decision 1): an open PR already
+ * IS the human's land decision (merge or close it), so a branch with an open PR
+ * gets no merge question. Merge questions are for branches with no PR: the
+ * git-alone floor, or a branch whose PR was closed unmerged.
  *
- * OUT OF SCOPE for this task (covered by sibling tasks of the same spec):
+ * Which branches it asks about (decisions 1, 4 and 6 of that task), in order:
  *
- *   - The APPLY rung dispatch that lands an answered `kind: merge` through the
- *     land primitive (rebase → re-verify → advance). Task
- *     `apply-rung-merge-disposition`.
- *   - The GATE axis that decides whether this surfacer runs at all on a given
- *     advance tick. Task `merge-questions-gate-axis`.
+ *   - the task body rests in `tasks/ready/` or `tasks/backlog/` (a body in
+ *     `done/` or `cancelled/` is terminal, which also covers a squash-merged PR
+ *     whose branch was not deleted);
+ *   - the sidecar carries no merge question yet (pending or answered);
+ *   - no open PR (GitHub only; an unreadable PR list asks nothing);
+ *   - the item's lock is not held, or is held WITH the `propose-pr` marker (a
+ *     finished propose build keeps it until its work lands); a lock held without
+ *     it is a live build, including the rebuild of a bounced task's kept branch;
+ *   - the branch tip carries the done-move (`work/tasks/done/<slug>.md`), the
+ *     state the answered-merge land (the committed-recovery tail) lands. A
+ *     bounced build's kept work stops before its done-move, so it is not asked
+ *     about.
+ *
+ * WIRED by `merge-question-tick.ts` (the laptop bare `advance` and the CI
+ * `surface-merge-questions` job), behind the `mergeQuestions: off | ask` gate.
  *
  * Tests inject the two seams ({@link listUnmergedWorkBranches},
  * {@link listOpenPullRequests}) so they NEVER hit real GitHub — the floor uses
  * `git for-each-ref` against a throwaway repo, the ceiling is the injected
  * `gh pr list` stub.
  */
-/** A `work/<slug>` branch whose tip is not reachable from `<base>`. */
+/** A task build branch (`work/task-<slug>`) whose tip is not reachable from `<base>`. */
 export interface UnmergedWorkBranch {
-    /** The full short ref, e.g. `work/foo`. */
+    /** The branch name as it is on the arbiter, e.g. `work/task-foo`. */
     ref: string;
-    /** The bare slug (`work/` prefix stripped), e.g. `foo`. */
+    /** The bare task slug, parsed by `parseWorkBranchRef`, e.g. `foo`. */
     slug: string;
     /** Branch tip SHA (advisory). */
     sha?: string;
@@ -58,6 +72,12 @@ export interface MergeQuestionPullRequest {
 export interface ListUnmergedInput {
     cwd: string;
     base: string;
+    /**
+     * The arbiter's remote NAME in `cwd` (default `origin`). In a clone the
+     * arbiter's branches are read from `refs/remotes/<arbiter>/`; ignored in the
+     * hub mirror, whose local heads ARE the arbiter's branches.
+     */
+    arbiter?: string;
     env?: NodeJS.ProcessEnv;
 }
 export interface ListPullRequestsInput {
@@ -78,6 +98,12 @@ export interface SurfaceMergeQuestionsOptions {
     arbiterUrl?: string;
     /** The base branch reachability is checked against. Default `main`. */
     base?: string;
+    /**
+     * The arbiter's remote NAME in `cwd` (default `origin`), whose
+     * remote-tracking refs the FLOOR reads in a clone. See
+     * {@link listUnmergedWorkBranchesViaGit}.
+     */
+    arbiter?: string;
     /** The `gh` CLI binary to invoke for the ceiling. Default `gh` on PATH. */
     ghBin?: string;
     /** Environment for spawned git/gh processes. */
@@ -98,6 +124,12 @@ export interface SurfaceMergeQuestionsOptions {
     listOpenPullRequests?: (input: ListPullRequestsInput) => Map<string, MergeQuestionPullRequest>;
     /** Seam: persist a single merge-question. Defaults to {@link persistSurfacedQuestions}. */
     persist?: (options: SurfacePersistOptions) => SurfacePersistResult;
+    /**
+     * The per-item locks held on the arbiter (`listItemLockEntries`), read by the
+     * caller. A task whose lock is held WITHOUT the `propose-pr` marker is a live
+     * build and is skipped (`lock-held`). Omitted ⇒ no lock is held.
+     */
+    locks?: readonly LockEntry[];
 }
 /** One surfaced merge-question (a row in the result). */
 export interface MergeQuestionSurfaced {
@@ -105,14 +137,12 @@ export interface MergeQuestionSurfaced {
     item: string;
     /** The bare slug. */
     slug: string;
-    /** The `work/<slug>` ref the question is about. */
+    /** The `work/task-<slug>` branch the question is about. */
     ref: string;
     /** The sidecar path the persist touched (repo-relative). */
     sidecarPath: string;
     /** The persist commit (`undefined` if the persist was a no-op). */
     commit?: string;
-    /** PR url when a GitHub ceiling matched the branch (advisory). */
-    prUrl?: string;
 }
 /**
  * One branch the surfacer considered but did not surface (with the reason).
@@ -127,7 +157,19 @@ export interface MergeQuestionSkipped {
     ref: string;
     slug: string;
     /** PROVISIONAL vocabulary — see {@link MergeQuestionSkipped}. */
-    reason: 'no-item-body' | 'already-pending-merge-question' | 'persist-nothing';
+    reason: 'no-item-body'
+    /** The body rests in `tasks/done/` or `tasks/cancelled/`. */
+     | 'terminal' | 'already-pending-merge-question'
+    /** An answered merge question awaits its apply. */
+     | 'merge-question-answered'
+    /** The branch has an open PR (GitHub): the PR is the land decision. */
+     | 'open-pr'
+    /** GitHub, but the open PRs could not be listed: nothing is asked. */
+     | 'pr-state-unknown'
+    /** The item's lock is held without the `propose-pr` marker (a live build). */
+     | 'lock-held'
+    /** The branch tip does not carry the task's done-move. */
+     | 'no-done-move' | 'persist-nothing';
 }
 /** Aggregate result of one surfacer pass. */
 export interface SurfaceMergeQuestionsResult {
@@ -137,6 +179,14 @@ export interface SurfaceMergeQuestionsResult {
     surfaced: MergeQuestionSurfaced[];
     /** The branches that were considered but skipped, with the reason. */
     skipped: MergeQuestionSkipped[];
+    /**
+     * Set when the arbiter is GitHub-shaped but its open PRs could not be listed
+     * (`gh pr list` failed: no credential, no `gh`, an outage). The pass then
+     * asks about no branch (`pr-state-unknown`); a caller reports it as a FAILED
+     * pass rather than a quiet one (the `surface-merge-questions` command exits
+     * non-zero). Absent when the listing succeeded or was not needed.
+     */
+    prListingError?: string;
 }
 /** Raised for fatal usage errors (a missing repo, etc.). */
 export declare class MergeQuestionSurfacerError extends Error {
@@ -146,9 +196,10 @@ export declare class MergeQuestionSurfacerError extends Error {
  * Surface merge-questions for every unmerged `work/*` branch in `cwd`.
  *
  * The FLOOR (git reachability) is authoritative; the CEILING (`gh pr list`)
- * runs only when {@link isGitHubArbiterUrl} accepts the arbiter URL, and is
- * pure enrichment (a missing/failed `gh` degrades silently — the floor still
- * surfaces the question).
+ * runs only when {@link isGitHubArbiterUrl} accepts the arbiter URL. On GitHub
+ * it is load-bearing (an open PR is the land decision), so a failed listing
+ * asks about NO branch and is reported on
+ * {@link SurfaceMergeQuestionsResult.prListingError}.
  *
  * Idempotency: a branch whose sidecar ALREADY carries a PENDING `kind: merge`
  * entry is SKIPPED (with `already-pending-merge-question`). A branch with no
@@ -159,22 +210,46 @@ export declare class MergeQuestionSurfacerError extends Error {
  */
 export declare function surfaceMergeQuestions(options: SurfaceMergeQuestionsOptions): SurfaceMergeQuestionsResult;
 /**
- * Production FLOOR: enumerate every `refs/heads/work/*` whose tip is NOT
- * reachable from `<base>`. A repo with no `<base>` (e.g. a fresh init before
- * the first commit) yields the empty list — the surfacer is a no-op until
- * `main` exists.
+ * Production FLOOR: enumerate the ARBITER's task build branches
+ * (`work/task-<slug>`, the {@link workBranchRef} form) whose tip is NOT
+ * reachable from the arbiter's `<base>`.
+ *
+ * WHERE the arbiter's refs live depends on the repo `cwd` is:
+ *
+ *   - A **clone** (non-bare, with an `<arbiter>` remote): the arbiter's branches
+ *     are the remote-tracking refs `refs/remotes/<arbiter>/work/*`, checked
+ *     against `refs/remotes/<arbiter>/<base>`. Local `refs/heads/work/*` in a
+ *     clone are this machine's own (possibly unpushed or stale) heads, not the
+ *     arbiter's, so they are NOT listed.
+ *   - The **hub mirror** (a `--bare` clone, or a worktree added from one, where
+ *     `core.bare` reads `true`) or a repo with no `<arbiter>` remote (the repo IS
+ *     the arbiter's ref store): the local heads `refs/heads/work/*`, checked
+ *     against the local `<base>`.
+ *
+ * The item slug comes from {@link parseWorkBranchRef}, never from slicing the
+ * ref. Only the plain BUILD branch of a task (`namespace: 'task'`, no producer)
+ * is listed: an intake branch (`work/intake-*`) creates an item rather than
+ * building one, a spec branch (`work/spec-*`) carries tasking, and an
+ * un-namespaced `work/<slug>` is a pre-cutover ref `parseWorkBranchRef` refuses
+ * (the clean-break stance). None of those is what a `kind: merge` answer lands.
+ *
+ * Purely local: it reads refs already in `cwd` (no fetch, no `ls-remote`); the
+ * caller refreshes them. A repo whose `<base>` does not resolve (e.g. a fresh
+ * init before the first commit, or a clone that never fetched `<base>`) yields
+ * the empty list: without a base, "unmerged" is meaningless and every branch
+ * would over-surface.
  */
 export declare function listUnmergedWorkBranchesViaGit(input: ListUnmergedInput): UnmergedWorkBranch[];
 /**
  * Production CEILING: shell `gh pr list --state open --json …` and index the
- * results by their `headRefName` so the surfacer can enrich the matching
- * branch's question. A non-zero / missing `gh` is treated as "no host
- * metadata available" — the floor still surfaces every unmerged branch.
+ * results by their `headRefName`, so the surfacer can skip a branch with an
+ * open PR. A non-zero `gh` (or output that is not a JSON array) THROWS: the
+ * surfacer then asks about no branch this pass, rather than asking about
+ * branches whose PR it cannot see.
  *
- * Best-effort enrichment. The git-reachability FLOOR is authoritative; the
- * `--state open`, `--base <base>`, and `--limit 200` arguments are DELIBERATE
- * ceilings — a PR targeting a non-`main` base (e.g. a stacked PR) or the case
- * of >200 open PRs degrades to floor-only output, never corrupts it.
+ * The `--state open`, `--base <base>`, and `--limit 200` arguments are
+ * DELIBERATE ceilings: a PR targeting a non-`main` base (e.g. a stacked PR) or
+ * the case of >200 open PRs is not seen, so its branch may still be asked about.
  */
 export declare function listOpenPullRequestsViaGh(input: ListPullRequestsInput): Map<string, MergeQuestionPullRequest>;
 //# sourceMappingURL=merge-question-surfacer.d.ts.map

package/dist/merge-question-surfacer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-question-surfacer.d.ts","sourceRoot":"","sources":["../src/merge-question-surfacer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"merge-question-surfacer.d.ts","sourceRoot":"","sources":["../src/merge-question-surfacer.ts"],"names":[],"mappings":"AAUA,OAAO,EAEN,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EACzB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAE9C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDG;AAEH,yFAAyF;AACzF,MAAM,WAAW,kBAAkB;IAClC,qEAAqE;IACrE,GAAG,EAAE,MAAM,CAAC;IACZ,sEAAsE;IACtE,IAAI,EAAE,MAAM,CAAC;IACb,iCAAiC;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;CACb;AAED,yEAAyE;AACzE,MAAM,WAAW,wBAAwB;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED,uDAAuD;AACvD,MAAM,WAAW,iBAAiB;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACxB;AAED,MAAM,WAAW,qBAAqB;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACxB;AAED,8EAA8E;AAC9E,MAAM,WAAW,4BAA4B;IAC5C,wEAAwE;IACxE,GAAG,EAAE,MAAM,CAAC;IACZ;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,uEAAuE;IACvE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,2EAA2E;IAC3E,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gDAAgD;IAChD,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,8CAA8C;IAC9C,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC;;;;OAIG;IACH,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,kBAAkB,EAAE,CAAC;IAC9E;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,CACtB,KAAK,EAAE,qBAAqB,KACxB,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IAC3C,2FAA2F;IAC3F,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,qBAAqB,KAAK,oBAAoB,CAAC;IACnE;;;;OAIG;IACH,KAAK,CAAC,EAAE,SAAS,SAAS,EAAE,CAAC;CAC7B;AAED,yDAAyD;AACzD,MAAM,WAAW,qBAAqB;IACrC,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,qBAAqB;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,2DAA2D;IAC3D,GAAG,EAAE,MAAM,CAAC;IACZ,4DAA4D;IAC5D,WAAW,EAAE,MAAM,CAAC;IACpB,mEAAmE;IACnE,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,oBAAoB;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,iEAAiE;IACjE,MAAM,EACH,cAAc;IAChB,6DAA6D;OAC3D,UAAU,GACV,gCAAgC;IAClC,mDAAmD;OACjD,yBAAyB;IAC3B,uEAAuE;OACrE,SAAS;IACX,sEAAsE;OACpE,kBAAkB;IACpB,8EAA8E;OAC5E,WAAW;IACb,0DAA0D;OACxD,cAAc,GACd,iBAAiB,CAAC;CACrB;AAED,6CAA6C;AAC7C,MAAM,WAAW,2BAA2B;IAC3C,6EAA6E;IAC7E,UAAU,EAAE,MAAM,CAAC;IACnB,qDAAqD;IACrD,QAAQ,EAAE,qBAAqB,EAAE,CAAC;IAClC,sEAAsE;IACtE,OAAO,EAAE,oBAAoB,EAAE,CAAC;IAChC;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,4DAA4D;AAC5D,qBAAa,0BAA2B,SAAQ,KAAK;gBACxC,OAAO,EAAE,MAAM;CAI3B;AAmBD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,qBAAqB,CACpC,OAAO,EAAE,4BAA4B,GACnC,2BAA2B,CAiJ7B;AAmID;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,8BAA8B,CAC7C,KAAK,EAAE,iBAAiB,GACtB,kBAAkB,EAAE,CAqEtB;AAqBD;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CACxC,KAAK,EAAE,qBAAqB,GAC1B,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAoDvC"}