otacon 0.1.3 → 0.1.4

package/dist/daemon/queue.js

@@ -1,4 +1,4 @@
-// Per-session disk-backed FIFO event queue with waiter parking (DESIGN.md §6, §7).
+// Per-session disk-backed FIFO event queue with waiter parking.
 //
 // Every method is synchronous: Node's single thread therefore cannot interleave
 // an enqueue between a queue-empty check and a waiter parking — the whole
@@ -85,19 +85,19 @@ export class SessionQueue {
     /**
      * Detach from disk forever (DELETE /api/sessions/:id evicted this instance):
      * flush and requeue become no-ops. A delivered-but-unacked event's
-     * post-response ack callback can fire after `otacon clean` archives the
-     * session dir — writing then would recreate .otacon/<id>/ next to the
-     * archive (writeFileAtomic mkdirs). The events file leaves with the dir.
+     * post-response ack callback can fire after the delete removes the home
+     * session dir: writing then would recreate ~/.otacon/sessions/<id>/
+     * (writeFileAtomic mkdirs). The events file leaves with the dir.
      */
     close() {
         this.closed = true;
     }
     /**
      * Detach from disk AND wake every parked waiter with one terminal event
-     * (DELETE of a *pending* session, DESIGN.md §12): set `closed` first so
-     * flush/requeue/dispatch all become no-ops — the synthetic event is never
+     * (DELETE of a live session, approval and archive lifecycle): set `closed` first so
+     * flush/requeue/dispatch all become no-ops (the synthetic event is never
      * persisted or requeued, and a late post-response ack can't recreate the
-     * `.otacon/<id>/` dir the caller is about to hard-remove — then hand each
+     * `~/.otacon/sessions/<id>/` dir the caller is about to remove), then hand each
      * parked waiter the same payload so its long-poll resolves cleanly instead of
      * 404ing on the next call. No waiter parked = nobody to wake (an agent that
      * is not parked discovers the delete via its next call's 404). The synthetic

package/dist/daemon/queue.js.map

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

package/dist/daemon/store.js

@@ -1,5 +1,5 @@
 // Global session registry, per-session daemon state, and revision snapshots
-// (DESIGN.md §7, §12). All state is plain JSON written atomically — temp file +
+// (session registry and switcher, approval and archive lifecycle). All state is plain JSON written atomically — temp file +
 // rename — so a crash can never leave a half-written file (DECISIONS.md
 // "Storage: plain JSON files, not SQLite"). A file that is corrupt anyway
 // (manual edit, disk fault) is quarantined, never fatal: it is renamed aside
@@ -106,10 +106,10 @@ function parseState(raw) {
     return file;
 }
 /** Highest r<N>.md snapshot on disk — the revision counter's source of truth. */
-function recoverRevision(repo, id) {
+function recoverRevision(id) {
     let max = 0;
     try {
-        for (const name of readdirSync(paths.sessionDir(repo, id))) {
+        for (const name of readdirSync(paths.sessionDir(id))) {
             const match = /^r(\d+)\.md$/.exec(name);
             if (match)
                 max = Math.max(max, Number(match[1]));
@@ -127,14 +127,14 @@ function recoverRevision(repo, id) {
  * loosely (no thread validation): a half-corrupt file should still surrender
  * every id it can.
  */
-function recoverCounters(repo, id) {
+function recoverCounters(id) {
     const counters = { batch: 0, thread: 0, question: 0, eventSeq: 0 };
     const see = (key, raw, re) => {
         const match = typeof raw === "string" ? re.exec(raw) : null;
         if (match)
             counters[key] = Math.max(counters[key], Number(match[1]));
     };
-    const threadsRaw = readJsonOr(paths.threadsPath(repo, id));
+    const threadsRaw = readJsonOr(paths.threadsPath(id));
     for (const t of Array.isArray(threadsRaw?.threads) ? threadsRaw.threads : []) {
         const thread = t;
         see("thread", thread?.id, /^t(\d+)$/);
@@ -142,11 +142,11 @@ function recoverCounters(repo, id) {
         see("batch", thread?.batch, /^b(\d+)$/);
     }
     // Agent grill questions share the q counter with user-question threads.
-    const transcriptRaw = readJsonOr(paths.transcriptPath(repo, id));
+    const transcriptRaw = readJsonOr(paths.transcriptPath(id));
     for (const e of Array.isArray(transcriptRaw?.entries) ? transcriptRaw.entries : []) {
         see("question", e?.id, /^q(\d+)$/);
     }
-    const eventsRaw = readJsonOr(paths.eventsPath(repo, id));
+    const eventsRaw = readJsonOr(paths.eventsPath(id));
     for (const e of Array.isArray(eventsRaw?.events) ? eventsRaw.events : []) {
         const event = e;
         if (typeof event?.seq === "number") {
@@ -162,9 +162,10 @@ function recoverCounters(repo, id) {
 }
 const BASE36 = "0123456789abcdefghijklmnopqrstuvwxyz";
 /**
- * Owns `$OTACON_HOME/registry.json` plus each session's `.otacon/<id>/` state in
- * its repo. Event seqs and the b/t/q stable ids are minted here (bumpCounter)
- * so they survive queue drains and daemon restarts.
+ * Owns `$OTACON_HOME/registry.json` plus each session's working state in the
+ * home store (`~/.otacon/sessions/<id>/`). Event seqs and the b/t/q stable ids
+ * are minted here (bumpCounter) so they survive queue drains and daemon
+ * restarts.
  */
 export class Store {
     registryFile;
@@ -180,8 +181,9 @@ export class Store {
             this.registry = parsed;
             return;
         }
-        // Sessions registered there are forgotten (their .otacon/ dirs survive for
-        // manual recovery); the alternative is a daemon that can never boot again.
+        // Sessions registered there are forgotten (their ~/.otacon/sessions/<id>/
+        // dirs survive for manual recovery); the alternative is a daemon that can
+        // never boot again.
         quarantineCorruptFile(this.registryFile, "session registry");
         this.registry = { version: 1, sessions: {} };
         this.flushRegistry();
@@ -207,16 +209,17 @@ export class Store {
             updatedAt: now,
         };
         // State files first, registry entry last: the registry is the commit point.
-        // A crash in between leaves an orphan .otacon/<id>/ dir (harmless), never a
-        // registered session whose state files are missing (wedged forever).
+        // A crash in between leaves an orphan ~/.otacon/sessions/<id>/ dir
+        // (harmless), never a registered session whose state files are missing
+        // (wedged forever).
         const state = {
             id,
             revision: 0,
             lastReviewedRevision: 0,
             counters: { batch: 0, thread: 0, question: 0, eventSeq: 0 },
         };
-        writeFileAtomic(paths.sessionStatePath(input.repo, id), stringify(state));
-        writeFileAtomic(paths.eventsPath(input.repo, id), stringify({ version: 1, events: [] }));
+        writeFileAtomic(paths.sessionStatePath(id), stringify(state));
+        writeFileAtomic(paths.eventsPath(id), stringify({ version: 1, events: [] }));
         this.registry.sessions[id] = session;
         this.flushRegistry();
         return { ...session };
@@ -229,8 +232,8 @@ export class Store {
         return { ...session };
     }
     /**
-     * Remove a session from the registry (otacon clean, DESIGN.md §12); the
-     * .otacon/<id>/ dir in its repo is the CLI's to archive afterwards.
+     * Remove a session from the registry (otacon clean, approval and archive lifecycle); its home
+     * dir `~/.otacon/sessions/<id>/` is the CLI's/daemon's to remove afterwards.
      */
     deleteSession(id) {
         const session = this.require(id);
@@ -239,39 +242,18 @@ export class Store {
         return { ...session };
     }
     /**
-     * Hard-remove a session's working dir `.otacon/<id>/` (the UI deleting a
-     * *pending* session, DESIGN.md §12): permanent, no archive — for a session
-     * with no committed artifact. `repo` is passed explicitly because the caller
-     * deregisters first, so require() would already throw. Idempotent: a missing
-     * dir is fine (force).
+     * Permanently remove a session's home dir `~/.otacon/sessions/<id>/` (UI delete
+     * and `otacon clean`, all statuses): no archive, nothing recoverable from
+     * otacon itself. The durable copies are the Save copy under `plans.dir` and
+     * (for Implement plans) the PR. Called after the caller deregisters, so it
+     * takes the id directly. Idempotent: a missing dir is fine (force).
      */
-    removeSessionDir(repo, id) {
-        rmSync(paths.sessionDir(repo, id), { recursive: true, force: true });
-    }
-    /**
-     * Archive a session's working dir `.otacon/<id>/` → `.otacon/archive/<id>/`
-     * in its repo (numeric suffix on name collision); returns the destination, or
-     * null when there was no dir. The recoverable counterpart to removeSessionDir,
-     * for a session whose plan is already preserved in the home archive (approved):
-     * `otacon clean` and the UI's delete of an approved session both archive
-     * through here. `repo` is
-     * passed explicitly because the caller deregisters first (require() throws).
-     */
-    archiveSessionDir(repo, id) {
-        const source = paths.sessionDir(repo, id);
-        if (!existsSync(source))
-            return null;
-        const base = join(paths.otaconDir(repo), "archive");
-        mkdirSync(base, { recursive: true });
-        let dest = join(base, id);
-        for (let n = 2; existsSync(dest); n++)
-            dest = join(base, `${id}-${n}`);
-        renameSync(source, dest);
-        return dest;
+    removeSessionDir(id) {
+        rmSync(paths.sessionDir(id), { recursive: true, force: true });
     }
     readState(id) {
-        const session = this.require(id);
-        const path = paths.sessionStatePath(session.repo, id);
+        this.require(id);
+        const path = paths.sessionStatePath(id);
         if (existsSync(path)) {
             const parsed = parseState(readJsonOr(path));
             if (parsed && parsed.id === id)
@@ -286,9 +268,9 @@ export class Store {
         // degrades to "previous revision", which the user can re-select.
         const state = {
             id,
-            revision: recoverRevision(session.repo, id),
+            revision: recoverRevision(id),
             lastReviewedRevision: 0,
-            counters: recoverCounters(session.repo, id),
+            counters: recoverCounters(id),
         };
         writeFileAtomic(path, stringify(state));
         return state;
@@ -299,36 +281,33 @@ export class Store {
      * backwards — older baselines stay reachable via the diff endpoint's ?from=.
      */
     markReviewed(id, n) {
-        const session = this.require(id);
-        const state = this.readState(id);
+        const state = this.readState(id); // throws on unknown id
         if (n > state.lastReviewedRevision) {
             state.lastReviewedRevision = Math.min(n, state.revision);
-            writeFileAtomic(paths.sessionStatePath(session.repo, id), stringify(state));
+            writeFileAtomic(paths.sessionStatePath(id), stringify(state));
         }
         return state.lastReviewedRevision;
     }
     /**
-     * Arm a deferred approval (comment & approve, DESIGN.md §6, §12): the session
+     * Arm a deferred approval (comment & approve): the session
      * has flipped to `finalizing`, and the agent's next clean `submit` finalizes,
      * carrying the `implement` choice and the swept comment-thread ids. Persisted
      * on session.json (not the registry) — daemon-owned detail, like the counters.
      */
     setPendingApproval(id, pendingApproval) {
-        const session = this.require(id);
-        const state = this.readState(id);
+        const state = this.readState(id); // throws on unknown id
         state.pendingApproval = pendingApproval;
-        writeFileAtomic(paths.sessionStatePath(session.repo, id), stringify(state));
+        writeFileAtomic(paths.sessionStatePath(id), stringify(state));
     }
     /** Disarm the deferred approval once it has finalized (or been force-escaped). */
     clearPendingApproval(id) {
-        const session = this.require(id);
-        const state = this.readState(id);
+        const state = this.readState(id); // throws on unknown id
         if (state.pendingApproval === undefined)
             return;
         delete state.pendingApproval;
-        writeFileAtomic(paths.sessionStatePath(session.repo, id), stringify(state));
+        writeFileAtomic(paths.sessionStatePath(id), stringify(state));
     }
-    /** Increment one daemon-owned counter (DESIGN.md §6 stable ids) and persist it. */
+    /** Increment one daemon-owned counter (review loop and daemon API stable ids) and persist it. */
     bumpCounter(id, key) {
         return this.bumpCounters(id, { [key]: 1 })[key];
     }
@@ -338,17 +317,16 @@ export class Store {
      * updated counter values.
      */
     bumpCounters(id, by) {
-        const session = this.require(id);
-        const state = this.readState(id);
+        const state = this.readState(id); // throws on unknown id
         for (const key of Object.keys(by)) {
             state.counters[key] += by[key] ?? 0;
         }
-        writeFileAtomic(paths.sessionStatePath(session.repo, id), stringify(state));
+        writeFileAtomic(paths.sessionStatePath(id), stringify(state));
         return { ...state.counters };
     }
     /**
      * Store the next revision snapshot r<N>.md plus the lint warnings it was
-     * accepted with (r<N>.warnings.json — the UI's L6 badges; DESIGN.md §12)
+     * accepted with (r<N>.warnings.json — the UI's L6 badges; approval and archive lifecycle)
      * and the agent's changelog when one accompanied it (r<N>.changelog.md);
      * returns N.
      */
@@ -356,25 +334,25 @@ export class Store {
         const session = this.require(id);
         const state = this.readState(id);
         state.revision += 1;
-        writeFileAtomic(paths.revisionPath(session.repo, id, state.revision), content);
-        writeFileAtomic(paths.revisionWarningsPath(session.repo, id, state.revision), stringify(warnings));
+        writeFileAtomic(paths.revisionPath(id, state.revision), content);
+        writeFileAtomic(paths.revisionWarningsPath(id, state.revision), stringify(warnings));
         if (changelog !== undefined && changelog.trim() !== "") {
-            writeFileAtomic(paths.revisionChangelogPath(session.repo, id, state.revision), changelog);
+            writeFileAtomic(paths.revisionChangelogPath(id, state.revision), changelog);
         }
-        writeFileAtomic(paths.sessionStatePath(session.repo, id), stringify(state));
+        writeFileAtomic(paths.sessionStatePath(id), stringify(state));
         session.updatedAt = new Date().toISOString();
         this.flushRegistry();
         return state.revision;
     }
     readRevision(id, n) {
-        const session = this.require(id);
-        return readFileSync(paths.revisionPath(session.repo, id, n), "utf8");
+        this.require(id); // throws on unknown id
+        return readFileSync(paths.revisionPath(id, n), "utf8");
     }
     /** The changelog submitted with r<n>.md; null when none was (r1, typically). */
     readRevisionChangelog(id, n) {
-        const session = this.require(id);
+        this.require(id); // throws on unknown id
         try {
-            return readFileSync(paths.revisionChangelogPath(session.repo, id, n), "utf8");
+            return readFileSync(paths.revisionChangelogPath(id, n), "utf8");
         }
         catch {
             return null;
@@ -385,25 +363,34 @@ export class Store {
      * badges are presentation metadata, never worth quarantine machinery.
      */
     readRevisionWarnings(id, n) {
-        const session = this.require(id);
-        const raw = readJsonOr(paths.revisionWarningsPath(session.repo, id, n));
+        this.require(id); // throws on unknown id
+        const raw = readJsonOr(paths.revisionWarningsPath(id, n));
         return Array.isArray(raw) ? raw : [];
     }
     /** Where this session's SessionQueue persists — for the daemon to wire queues. */
     eventsPath(id) {
-        return paths.eventsPath(this.require(id).repo, id);
+        this.require(id); // throws on unknown id
+        return paths.eventsPath(id);
     }
     /** Where this session's review threads persist (src/daemon/threads.ts). */
     threadsPath(id) {
-        return paths.threadsPath(this.require(id).repo, id);
+        this.require(id); // throws on unknown id
+        return paths.threadsPath(id);
     }
     /** Where this session's grill transcript persists (src/daemon/transcript.ts). */
     transcriptPath(id) {
-        return paths.transcriptPath(this.require(id).repo, id);
+        this.require(id); // throws on unknown id
+        return paths.transcriptPath(id);
     }
     /** Where this session's live-activity feed persists (src/daemon/activity.ts). */
     activityPath(id) {
-        return paths.activityPath(this.require(id).repo, id);
+        this.require(id); // throws on unknown id
+        return paths.activityPath(id);
+    }
+    /** Where this session's normalized live-activity stream persists (src/daemon/capture/stream-store.ts). */
+    streamPath(id) {
+        this.require(id); // throws on unknown id
+        return paths.streamPath(id);
     }
     require(id) {
         const session = this.registry.sessions[id];

package/dist/daemon/store.js.map

@@ -1 +1 @@
-{"version":3,"file":"store.js","sourceRoot":"","sources":["../../src/daemon/store.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,gFAAgF;AAChF,wEAAwE;AACxE,0EAA0E;AAC1E,6EAA6E;AAC7E,+EAA+E;AAC/E,4EAA4E;AAC5E,6BAA6B;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC9G,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,KAAK,KAAK,MAAM,oBAAoB,CAAC;AAG5C,IAAI,SAAS,GAAG,CAAC,CAAC;AAClB,IAAI,gBAAgB,GAAG,CAAC,CAAC;AAEzB,yFAAyF;AACzF,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,IAAY;IACxD,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACpC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,OAAO,CAAC,GAAG,IAAI,SAAS,EAAE,EAAE,CAAC,CAAC;IAC5D,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACzB,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,oEAAoE;AACpE,MAAM,UAAU,SAAS,CAAC,KAAc;IACtC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC;AAC/C,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAAY,EAAE,IAAY;IAC9D,MAAM,KAAK,GAAG,GAAG,IAAI,YAAY,IAAI,CAAC,GAAG,EAAE,IAAI,gBAAgB,EAAE,EAAE,CAAC;IACpE,IAAI,CAAC;QACH,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,2EAA2E;QAC3E,yEAAyE;QACzE,0EAA0E;QAC1E,6DAA6D;QAC7D,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,YAAY,IAAI,OAAO,IAAI,6CAA6C,OAAO,kCAAkC,CAClH,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,YAAY,IAAI,OAAO,IAAI,4BAA4B,KAAK,oCAAoC,CACjG,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAChD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC,CAAC,8CAA8C;IAClE,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,GAAY;IACjC,MAAM,IAAI,GAAG,GAAmB,CAAC;IACjC,MAAM,KAAK,GACT,OAAO,IAAI,KAAK,QAAQ;QACxB,IAAI,KAAK,IAAI;QACb,IAAI,CAAC,OAAO,KAAK,CAAC;QAClB,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ;QACjC,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC;IACzB,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AAClC,CAAC;AAED,SAAS,UAAU,CAAC,GAAY;IAC9B,MAAM,IAAI,GAAG,GAAuB,CAAC;IACrC,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,CAAC;IAChC,MAAM,KAAK,GACT,OAAO,IAAI,KAAK,QAAQ;QACxB,IAAI,KAAK,IAAI;QACb,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ;QAC3B,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ;QACjC,OAAO,QAAQ,KAAK,QAAQ;QAC5B,QAAQ,KAAK,IAAI;QACjB,OAAO,QAAQ,CAAC,KAAK,KAAK,QAAQ;QAClC,OAAO,QAAQ,CAAC,MAAM,KAAK,QAAQ;QACnC,OAAO,QAAQ,CAAC,QAAQ,KAAK,QAAQ;QACrC,OAAO,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC;IACxC,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,6EAA6E;IAC7E,6EAA6E;IAC7E,6EAA6E;IAC7E,yEAAyE;IACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAA+B,CAAC;IACtD,IAAI,CAAC,oBAAoB;QACvB,OAAO,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,CAAC;YACxE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC;YACnC,CAAC,CAAC,CAAC,CAAC;IACR,+EAA+E;IAC/E,wEAAwE;IACxE,0EAA0E;IAC1E,6EAA6E;IAC7E,MAAM,OAAO,GAAG,IAAI,CAAC,eAA0B,CAAC;IAChD,IACE,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,KAAK,IAAI;QAChB,OAAQ,OAAmC,CAAC,SAAS,KAAK,SAAS;QACnE,KAAK,CAAC,OAAO,CAAE,OAAiC,CAAC,OAAO,CAAC;QACxD,OAAkC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,EAC/E,CAAC;QACD,IAAI,CAAC,eAAe,GAAG,OAA8C,CAAC;IACxE,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,iFAAiF;AACjF,SAAS,eAAe,CAAC,IAAY,EAAE,EAAU;IAC/C,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,IAAI,CAAC;QACH,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC;YAC3D,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxC,IAAI,KAAK;gBAAE,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,kCAAkC;IACpC,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;GAMG;AACH,SAAS,eAAe,CAAC,IAAY,EAAE,EAAU;IAC/C,MAAM,QAAQ,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;IACnE,MAAM,GAAG,GAAG,CAAC,GAA0B,EAAE,GAAY,EAAE,EAAU,EAAQ,EAAE;QACzE,MAAM,KAAK,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC5D,IAAI,KAAK;YAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC,CAAC;IACF,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAwC,CAAC;IAClG,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAC7E,MAAM,MAAM,GAAG,CAAsC,CAAC;QACtD,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;QACtC,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;QACxC,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IAC1C,CAAC;IACD,wEAAwE;IACxE,MAAM,aAAa,GAAG,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC,CAElD,CAAC;IACd,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACnF,GAAG,CAAC,UAAU,EAAG,CAAsB,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;IAC3D,CAAC;IACD,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,CAAuC,CAAC;IAC/F,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACzE,MAAM,KAAK,GAAG,CAAsF,CAAC;QACrG,IAAI,OAAO,KAAK,EAAE,GAAG,KAAK,QAAQ,EAAE,CAAC;YACnC,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7D,CAAC;QACD,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAChD,GAAG,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;QAChD,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YACnF,GAAG,CAAC,QAAQ,EAAG,IAA6B,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,MAAM,GAAG,sCAAsC,CAAC;AAUtD;;;;GAIG;AACH,MAAM,OAAO,KAAK;IACC,YAAY,CAAS;IAC9B,QAAQ,CAAe;IAE/B;QACE,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;QACzC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,QAAQ,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;YAC7C,OAAO;QACT,CAAC;QACD,MAAM,MAAM,GAAG,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;QAC5D,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC;YACvB,OAAO;QACT,CAAC;QACD,2EAA2E;QAC3E,2EAA2E;QAC3E,qBAAqB,CAAC,IAAI,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;QAC7D,IAAI,CAAC,QAAQ,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QAC7C,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAED,YAAY;QACV,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,UAAU,CAAC,EAAU;QACnB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC3C,OAAO,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9C,CAAC;IAED,aAAa,CAAC,KAAyB;QACrC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACrC,MAAM,OAAO,GAAoB;YAC/B,EAAE;YACF,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,EAAE;YAC1B,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,KAAK;YAC3B,MAAM,EAAE,OAAO;YACf,SAAS,EAAE,GAAG;YACd,SAAS,EAAE,GAAG;SACf,CAAC;QACF,4EAA4E;QAC5E,4EAA4E;QAC5E,qEAAqE;QACrE,MAAM,KAAK,GAAqB;YAC9B,EAAE;YACF,QAAQ,EAAE,CAAC;YACX,oBAAoB,EAAE,CAAC;YACvB,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE;SAC5D,CAAC;QACF,eAAe,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1E,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;QACzF,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC;QACrC,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,aAAa,CACX,EAAU,EACV,KAAmE;QAEnE,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACjC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC9B,OAAO,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC7C,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC;IACxB,CAAC;IAED;;;OAGG;IACH,aAAa,CAAC,EAAU;QACtB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAClC,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC;IACxB,CAAC;IAED;;;;;;OAMG;IACH,gBAAgB,CAAC,IAAY,EAAE,EAAU;QACvC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACvE,CAAC;IAED;;;;;;;;OAQG;IACH,iBAAiB,CAAC,IAAY,EAAE,EAAU;QACxC,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAC;QACrC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC;QACpD,SAAS,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACrC,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;YAAE,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACvE,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,SAAS,CAAC,EAAU;QAClB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACjC,MAAM,IAAI,GAAG,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACtD,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACrB,MAAM,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5C,IAAI,MAAM,IAAI,MAAM,CAAC,EAAE,KAAK,EAAE;gBAAE,OAAO,MAAM,CAAC;YAC9C,qBAAqB,CAAC,IAAI,EAAE,qBAAqB,EAAE,EAAE,CAAC,CAAC;QACzD,CAAC;QACD,0EAA0E;QAC1E,yEAAyE;QACzE,uEAAuE;QACvE,mEAAmE;QACnE,qEAAqE;QACrE,iEAAiE;QACjE,MAAM,KAAK,GAAqB;YAC9B,EAAE;YACF,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;YAC3C,oBAAoB,EAAE,CAAC;YACvB,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;SAC5C,CAAC;QACF,eAAe,CAAC,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QACxC,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,EAAU,EAAE,CAAS;QAChC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,KAAK,CAAC,oBAAoB,EAAE,CAAC;YACnC,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;YACzD,eAAe,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9E,CAAC;QACD,OAAO,KAAK,CAAC,oBAAoB,CAAC;IACpC,CAAC;IAED;;;;;OAKG;IACH,kBAAkB,CAAC,EAAU,EAAE,eAA0D;QACvF,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACjC,KAAK,CAAC,eAAe,GAAG,eAAe,CAAC;QACxC,eAAe,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,kFAAkF;IAClF,oBAAoB,CAAC,EAAU;QAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACjC,IAAI,KAAK,CAAC,eAAe,KAAK,SAAS;YAAE,OAAO;QAChD,OAAO,KAAK,CAAC,eAAe,CAAC;QAC7B,eAAe,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,mFAAmF;IACnF,WAAW,CAAC,EAAU,EAAE,GAAuC;QAC7D,OAAO,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;IAClD,CAAC;IAED;;;;OAIG;IACH,YAAY,CACV,EAAU,EACV,EAA+D;QAE/D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACjC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAA2C,EAAE,CAAC;YAC5E,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACtC,CAAC;QACD,eAAe,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QAC5E,OAAO,EAAE,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC/B,CAAC;IAED;;;;;OAKG;IACH,YAAY,CACV,EAAU,EACV,OAAe,EACf,WAAwB,EAAE,EAC1B,SAAkB;QAElB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACjC,KAAK,CAAC,QAAQ,IAAI,CAAC,CAAC;QACpB,eAAe,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;QAC/E,eAAe,CACb,KAAK,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,QAAQ,CAAC,EAC5D,SAAS,CAAC,QAAQ,CAAC,CACpB,CAAC;QACF,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACvD,eAAe,CAAC,KAAK,CAAC,qBAAqB,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAC;QAC5F,CAAC;QACD,eAAe,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QAC5E,OAAO,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC7C,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC,QAAQ,CAAC;IACxB,CAAC;IAED,YAAY,CAAC,EAAU,EAAE,CAAS;QAChC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACjC,OAAO,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IACvE,CAAC;IAED,gFAAgF;IAChF,qBAAqB,CAAC,EAAU,EAAE,CAAS;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACjC,IAAI,CAAC;YACH,OAAO,YAAY,CAAC,KAAK,CAAC,qBAAqB,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAChF,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,oBAAoB,CAAC,EAAU,EAAE,CAAS;QACxC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACjC,MAAM,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QACxE,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAE,GAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;IACxD,CAAC;IAED,kFAAkF;IAClF,UAAU,CAAC,EAAU;QACnB,OAAO,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,2EAA2E;IAC3E,WAAW,CAAC,EAAU;QACpB,OAAO,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACtD,CAAC;IAED,iFAAiF;IACjF,cAAc,CAAC,EAAU;QACvB,OAAO,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,iFAAiF;IACjF,YAAY,CAAC,EAAU;QACrB,OAAO,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACvD,CAAC;IAEO,OAAO,CAAC,EAAU;QACxB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC3C,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;QACxD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,+EAA+E;IACvE,MAAM;QACZ,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC;YAC9C,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,CAAC,CAAC;gBAAE,MAAM,IAAI,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;YAC/D,MAAM,EAAE,GAAG,OAAO,MAAM,EAAE,CAAC;YAC3B,IAAI,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAAE,OAAO,EAAE,CAAC;QACjD,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IAEO,aAAa;QACnB,eAAe,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/D,CAAC;CACF"}
+{"version":3,"file":"store.js","sourceRoot":"","sources":["../../src/daemon/store.ts"],"names":[],"mappings":"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"}

package/dist/daemon/threads.js

@@ -1,6 +1,6 @@
 // Per-session thread persistence: .otacon/<id>/threads.json holds every
 // comment and question thread so the review UI's rail can render the whole
-// conversation on any load (DESIGN.md §9, §12) — the event queue drains, so
+// conversation on any load (threaded review and revision, approval and archive lifecycle) — the event queue drains, so
 // it cannot be the rail's source. Same storage posture as the rest of the
 // daemon: atomic writes, corrupt files quarantined and rebuilt empty, never
 // fatal (DECISIONS.md "Threads: one threads.json per session").
@@ -14,6 +14,16 @@ function isAnchor(raw) {
     const anchor = raw;
     return typeof anchor === "object" && typeof anchor.section === "string";
 }
+/** The reviewer-close stamp (`resolved`) on either thread variant; absent = open. */
+function isResolved(raw) {
+    if (raw === undefined)
+        return true;
+    const resolved = raw;
+    return (typeof resolved === "object" &&
+        resolved !== null &&
+        typeof resolved.revision === "number" &&
+        typeof resolved.at === "string");
+}
 function isThread(raw) {
     const thread = raw;
     if (typeof thread !== "object" || thread === null)
@@ -27,18 +37,28 @@ function isThread(raw) {
     if (thread.kind === "comment") {
         if (typeof thread.batch !== "string")
             return false;
-        const { resolution } = thread;
-        if (resolution === undefined)
+        if (thread.replyTo !== undefined && typeof thread.replyTo !== "string")
+            return false;
+        if (!isResolved(thread.resolved))
+            return false;
+        // A leftover legacy `resolution` (an old-code in-flight session, normalized
+        // to `reply` in normalizeThread) is tolerated with the new `reply` shape.
+        const reply = thread.reply ?? thread.resolution;
+        if (reply === undefined)
             return true;
-        return (typeof resolution === "object" &&
-            resolution !== null &&
-            typeof resolution.body === "string" &&
-            typeof resolution.revision === "number" &&
-            typeof resolution.resolvedAt === "string");
+        return (typeof reply === "object" &&
+            reply !== null &&
+            typeof reply.body === "string" &&
+            typeof reply.revision === "number" &&
+            // accept either the new `repliedAt` or the legacy `resolvedAt`
+            (typeof reply.repliedAt === "string" ||
+                typeof reply.resolvedAt === "string"));
     }
     if (thread.kind === "question") {
         if (thread.replyTo !== undefined && typeof thread.replyTo !== "string")
             return false;
+        if (!isResolved(thread.resolved))
+            return false;
         const { answer } = thread;
         if (answer === undefined)
             return true;
@@ -49,6 +69,21 @@ function isThread(raw) {
     }
     return false;
 }
+/**
+ * Read-path normalization: an in-flight session written by the pre-Phase-2 code
+ * stores the agent's response as `resolution: {body, revision, resolvedAt}`. Map
+ * it onto the current `reply: {body, revision, repliedAt}` so the old session is
+ * never quarantined (and the rest of the daemon only ever sees `reply`).
+ */
+function normalizeThread(thread) {
+    const legacy = thread;
+    if (thread.kind === "comment" && thread.reply === undefined && legacy.resolution !== undefined) {
+        const { body, revision, resolvedAt } = legacy.resolution;
+        thread.reply = { body, revision, repliedAt: resolvedAt };
+        delete legacy.resolution;
+    }
+    return thread;
+}
 // Every element is validated, not just the envelope: a JSON-valid file with a
 // corrupt element would otherwise flow a non-Thread into answerQuestion (500)
 // and the rail (render crash) — exactly the "never fatal" failures quarantine
@@ -60,7 +95,9 @@ function parseThreads(raw) {
         file.version === 1 &&
         Array.isArray(file.threads) &&
         file.threads.every(isThread);
-    return valid ? file : undefined;
+    // Normalize the legacy `resolution` field to `reply` post-validation, so an
+    // in-flight old-code session reads (and re-writes) as the current shape.
+    return valid ? { ...file, threads: file.threads.map(normalizeThread) } : undefined;
 }
 /** All threads, oldest first. Missing file = no threads yet; corrupt = quarantined, []. */
 export function readThreads(path) {
@@ -97,9 +134,10 @@ export function answerQuestion(path, id, body) {
 }
 /**
  * Apply an accepted revision to the threads file, in one read + one atomic
- * write: record the resolution replies on their comment threads (lint L5 has
- * already vouched for them; re-resolving overwrites — at-least-once), then
- * re-locate every thread's anchor in the new plan (DESIGN.md §4) — lost or
+ * write: record the agent's replies on their comment threads (lint L5 has
+ * already vouched for them; re-replying overwrites — at-least-once) — a reply is
+ * a *response*, not a close (the reviewer closes via resolveThread) — then
+ * re-locate every thread's anchor in the new plan (plan structure, lint, and anchoring) — lost or
  * ambiguous quotes turn anchorState "orphaned", re-found ones recover.
  * Returns the threads that changed, for the daemon's SSE `thread` upserts.
  */
@@ -108,16 +146,16 @@ export function applyRevisionToThreads(path, opts) {
     if (threads.length === 0)
         return [];
     const changed = new Map();
-    const resolvedAt = new Date().toISOString();
+    const repliedAt = new Date().toISOString();
     // Segment the new plan once for the whole pass (lazily — a rail of
     // whole-plan threads never needs it), not per anchored thread.
     let units;
     for (const thread of threads) {
         if (thread.kind === "comment" && opts.replies[thread.id] !== undefined) {
-            thread.resolution = {
+            thread.reply = {
                 body: opts.replies[thread.id],
                 revision: opts.revision,
-                resolvedAt,
+                repliedAt,
             };
             changed.set(thread.id, thread);
         }
@@ -144,21 +182,69 @@ export function applyRevisionToThreads(path, opts) {
     }
     return [...changed.values()];
 }
-/** Comment threads with their resolved state — the daemon's L5 context input. */
+/**
+ * Set or clear the reviewer's close on a thread (the Resolve verb), in one read +
+ * one atomic write: `resolved:true` stamps `{revision, at}` (pass the session's
+ * current revision in), `false` clears it. Returns the updated thread, or
+ * undefined when no thread with that id exists. Mirrors answerQuestion — at-least-
+ * once delivery makes a duplicate resolve a shrug (re-stamps the same close).
+ */
+export function resolveThread(path, id, resolved, revision) {
+    const threads = readThreads(path);
+    const thread = threads.find((t) => t.id === id);
+    if (!thread)
+        return undefined;
+    if (resolved)
+        thread.resolved = { revision, at: new Date().toISOString() };
+    else
+        delete thread.resolved;
+    writeFileAtomic(path, stringify({ version: 1, threads }));
+    return thread;
+}
+/**
+ * The reviewer-resolved comment conversation ROOTS — a comment thread carrying
+ * `resolved` is a root (the Resolve verb lands on the root), so its id is what a
+ * follow-up turn keys on. Resolving the root withdraws every turn of the
+ * conversation at once.
+ */
+function resolvedCommentRoots(threads) {
+    return new Set(threads
+        .filter((t) => t.kind === "comment" && t.resolved !== undefined)
+        .map((t) => t.id));
+}
+/**
+ * Per-comment-turn states L5 needs to skip a turn — the daemon's L5 context
+ * input, one entry per comment thread (root or follow-up): `replied` (this turn
+ * has an agent response) and `resolved` (the turn's CONVERSATION ROOT is
+ * reviewer-closed). Resolving the root withdraws all its turns from L5 at once,
+ * because a follow-up keys its `resolved` on `replyTo ?? id`. L5 demands a reply
+ * only for a turn that is neither replied nor (root-)resolved.
+ */
 export function commentThreadStates(path) {
-    return readThreads(path)
+    const threads = readThreads(path);
+    const resolvedRootIds = resolvedCommentRoots(threads);
+    return threads
         .filter((t) => t.kind === "comment")
-        .map((t) => ({ id: t.id, resolved: t.resolution !== undefined }));
+        .map((t) => ({
+        id: t.id,
+        replied: t.reply !== undefined,
+        resolved: resolvedRootIds.has(t.replyTo ?? t.id),
+    }));
 }
 /**
- * The still-open comment threads (no resolution) — what a **comment & approve**
- * fold-in sweeps (DESIGN.md §6, §12): each is re-delivered to the agent in the
- * `final:true` comments batch and replayed into the committed `## Review notes`.
- * Pure over an already-read thread list so the approve handler reads disk once.
- * Open *questions* are not swept — they are answered via `otacon answer`, never
- * folded into the plan, and an open one at approve still drops as today.
+ * The comment turns still owed a response — no agent `reply` on this turn AND the
+ * turn's conversation root is not reviewer-`resolved` (a resolved/withdrawn
+ * conversation owes nothing). This is what a **comment & approve** fold-in
+ * sweeps: each is re-delivered to the agent in the `final:true` comments batch
+ * and replayed into the committed `## Review notes`. Pure over an already-read
+ * thread list so the approve handler reads disk once. Open *questions* are not
+ * swept — they are answered via `otacon answer`, never folded into the plan, and
+ * an open one at approve still drops as today.
  */
 export function openCommentThreads(threads) {
-    return threads.filter((t) => t.kind === "comment" && t.resolution === undefined);
+    const resolvedRootIds = resolvedCommentRoots(threads);
+    return threads.filter((t) => t.kind === "comment" &&
+        t.reply === undefined &&
+        !resolvedRootIds.has(t.replyTo ?? t.id));
 }
 //# sourceMappingURL=threads.js.map