@pennixrv/trellis 0.7.0-beta.8 → 0.7.1-beta.0

package/dist/commands/{channel → teamwork}/supervisor/shutdown.js

@@ -21,7 +21,7 @@
  */
 import { appendEvent } from "../store/events.js";
 export function createShutdown(args) {
-    const { channelName, workerName, log, getChild, graceMs, timeoutMs, idleTimeoutMs, } = args;
+    const { sessionId, workerName, log, getChild, graceMs, timeoutMs, idleTimeoutMs, } = args;
     let shutdownReason = null;
     let requestSignal = null;
     let terminalEmitted = false;
@@ -58,7 +58,7 @@ export function createShutdown(args) {
         }, graceMs);
     };
     const writeKilled = async (reason, signal) => {
-        await appendEvent(channelName, {
+        await appendEvent(sessionId, {
             kind: "killed",
             by: `supervisor:${workerName}`,
             reason,
@@ -76,8 +76,6 @@ export function createShutdown(args) {
         return true;
     };
     const request = async (signal, reason) => {
-        if (shutdownReason === "completed")
-            return;
         // The kill ladder + killed-append are one-shot; whether we got here
         // via `claim()` + `request()` (post-spawn error) or a single
         // `request()` (signal / timeout), only run them once.
@@ -92,13 +90,6 @@ export function createShutdown(args) {
         killedPromise = writeKilled(shutdownReason, requestSignal);
         await killedPromise;
     };
-    const complete = () => {
-        if (shutdownReason !== null)
-            return;
-        shutdownReason = "completed";
-        log.write("[supervisor] completed worker; cleaning up runtime\n");
-        startKillLadder(getChild());
-    };
     const finalizeOnExit = async (code, signal) => {
         log.write(`[supervisor] worker exit code=${code ?? "null"} signal=${signal ?? "null"}\n`);
         // #1 fix: synthesise a terminal event so consumers blocked on
@@ -110,13 +101,13 @@ export function createShutdown(args) {
         // The flag is claimed SYNCHRONOUSLY before the await so two
         // concurrent `finalizeOnExit` calls (or `applyParseResult` racing
         // with `child.on("exit")`) can't both pass the guard and emit
-        // duplicate synthetic events. `by` is the worker name (not
-        // `supervisor:<name>`) so `wait --from <worker> --kind done` wakes
+        // duplicate synthetic events. `by` is the teammate name (not
+        // `supervisor:<name>`) so `wait --from <teammate> --kind done` wakes
         // for the synthesised event same as for an adapter-emitted one.
         if (!terminalEmitted && shutdownReason === null) {
             terminalEmitted = true;
             if (code === 0) {
-                await appendEvent(channelName, {
+                await appendEvent(sessionId, {
                     kind: "done",
                     by: workerName,
                     synthesized: true,
@@ -124,10 +115,10 @@ export function createShutdown(args) {
                 });
             }
             else {
-                await appendEvent(channelName, {
+                await appendEvent(sessionId, {
                     kind: "error",
                     by: workerName,
-                    message: `worker exited without terminal event (code=${code ?? "null"}, signal=${signal ?? "null"})`,
+                    message: `teammate exited without terminal event (code=${code ?? "null"}, signal=${signal ?? "null"})`,
                     synthesized: true,
                     exit_code: code,
                     exit_signal: signal,
@@ -141,7 +132,6 @@ export function createShutdown(args) {
     };
     return {
         request,
-        complete,
         claim,
         isShuttingDown: () => shutdownReason !== null,
         reason: () => shutdownReason,

package/dist/commands/teamwork/supervisor/shutdown.js.map

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

package/dist/commands/{channel → teamwork}/supervisor/stdout.d.ts

@@ -42,19 +42,19 @@ export declare function createStdoutDrainControl(): {
  */
 export declare function pumpStdout(stream: Readable, onLine: (line: string) => Promise<void> | void, onError?: (err: Error) => Promise<void> | void, signal?: AbortSignal): Promise<void>;
 /**
- * Translate an adapter `ParseResult` into channel events + adapter-level
+ * Translate an adapter `ParseResult` into Teamwork Session events + adapter-level
  * side-effects (session-id persistence, stdin writes). Also tells the
  * shutdown controller when the adapter emits a `done`/`error` so the
  * fallback synthesiser in `finalizeOnExit` doesn't duplicate.
  */
-export declare function applyParseResult(channelName: string, workerName: string, result: ParseResult, child: Child, shutdown: ShutdownController, turnTracker?: TurnTracker, project?: string, onDone?: () => void): Promise<void>;
+export declare function applyParseResult(sessionId: string, workerName: string, result: ParseResult, child: Child, shutdown: ShutdownController, turnTracker?: TurnTracker): Promise<void>;
 /**
  * Convenience wrapper: wire `pumpStdout` to `applyParseResult` with
  * standard error-event-on-failure handling. The orchestrator just calls
  * this and forgets about line buffering / parse plumbing.
  */
 export declare function startStdoutPump(args: {
-    channelName: string;
+    sessionId: string;
     workerName: string;
     child: Child;
     adapter: WorkerAdapter;
@@ -64,8 +64,6 @@ export declare function startStdoutPump(args: {
     };
     shutdown: ShutdownController;
     turnTracker?: TurnTracker;
-    project?: string;
-    onDone?: () => void;
     processLines?: Promise<boolean>;
     signal?: AbortSignal;
 }): Promise<void>;

package/dist/commands/teamwork/supervisor/stdout.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stdout.d.ts","sourceRoot":"","sources":["../../../../src/commands/teamwork/supervisor/stdout.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,KAAK,EAAe,WAAW,EAAE,MAAM,YAAY,CAAC;AAE3D,KAAK,KAAK,GAAG,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAE/D;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,IAAI;IAC1C,YAAY,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/B,MAAM,EAAE,WAAW,CAAC;IACpB,eAAe,EAAE,MAAM,IAAI,CAAC;IAC5B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,YAAY,EAAE,MAAM,IAAI,CAAC;CAC1B,CAiBA;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CACxB,MAAM,EAAE,QAAQ,EAChB,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,EAC9C,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,EAC9C,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CA2Gf;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,kBAAkB,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,IAAI,CAAC,CAqDf;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,aAAa,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,GAAG,EAAE;QAAE,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,CAAC;IACvC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyChB"}

package/dist/commands/{channel → teamwork}/supervisor/stdout.js

@@ -147,13 +147,12 @@ export function pumpStdout(stream, onLine, onError, signal) {
     return streamFinished.then(() => queue);
 }
 /**
- * Translate an adapter `ParseResult` into channel events + adapter-level
+ * Translate an adapter `ParseResult` into Teamwork Session events + adapter-level
  * side-effects (session-id persistence, stdin writes). Also tells the
  * shutdown controller when the adapter emits a `done`/`error` so the
  * fallback synthesiser in `finalizeOnExit` doesn't duplicate.
  */
-export async function applyParseResult(channelName, workerName, result, child, shutdown, turnTracker, project, onDone) {
-    let doneSeen = false;
+export async function applyParseResult(sessionId, workerName, result, child, shutdown, turnTracker) {
     for (const ev of result.events) {
         // Claim the terminal slot SYNCHRONOUSLY before the await so a
         // racing `child.on("exit") → finalizeOnExit` can't see
@@ -162,41 +161,33 @@ export async function applyParseResult(channelName, workerName, result, child, s
         if (ev.kind === "done" || ev.kind === "error") {
             shutdown.markTerminalEmitted();
         }
-        await appendEvent(channelName, {
+        await appendEvent(sessionId, {
             kind: ev.kind,
             by: workerName,
             ...(ev.payload ?? {}),
-        }, project);
+        });
         if (ev.kind === "done" || ev.kind === "error") {
             const turn = turnTracker?.finish();
             if (turn) {
                 const outcome = ev.kind === "done" ? "done" : "error";
-                await appendEvent(channelName, {
+                await appendEvent(sessionId, {
                     kind: "turn_finished",
                     by: workerName,
                     worker: workerName,
                     inputSeq: turn.inputSeq,
                     turnId: turn.turnId,
                     outcome,
-                }, project);
+                });
             }
         }
-        if (ev.kind === "done")
-            doneSeen = true;
     }
     if (result.side) {
         const { reply, persistSessionId, persistThreadId } = result.side;
         if (persistSessionId) {
-            await appendEvent(channelName, {
-                kind: "session_bound",
-                by: workerName,
-                worker: workerName,
-                sessionId: persistSessionId,
-            }, project);
-            fs.writeFileSync(workerFile(channelName, workerName, "session-id", project), persistSessionId);
+            fs.writeFileSync(workerFile(sessionId, workerName, "session-id"), persistSessionId);
         }
         if (persistThreadId) {
-            fs.writeFileSync(workerFile(channelName, workerName, "thread-id", project), persistThreadId);
+            fs.writeFileSync(workerFile(sessionId, workerName, "thread-id"), persistThreadId);
         }
         if (reply) {
             for (const r of reply) {
@@ -209,8 +200,6 @@ export async function applyParseResult(channelName, workerName, result, child, s
             }
         }
     }
-    if (doneSeen)
-        onDone?.();
 }
 /**
  * Convenience wrapper: wire `pumpStdout` to `applyParseResult` with
@@ -218,20 +207,20 @@ export async function applyParseResult(channelName, workerName, result, child, s
  * this and forgets about line buffering / parse plumbing.
  */
 export function startStdoutPump(args) {
-    const { channelName, workerName, child, adapter, adapterCtx, log, shutdown, turnTracker, project, onDone, processLines, signal, } = args;
+    const { sessionId, workerName, child, adapter, adapterCtx, log, shutdown, turnTracker, processLines, signal, } = args;
     const drained = pumpStdout(child.stdout, async (line) => {
         if (processLines && !(await processLines))
             return;
         log.write(line + "\n");
         const result = adapter.parseLine(line, adapterCtx);
-        await applyParseResult(channelName, workerName, result, child, shutdown, turnTracker, project, onDone);
+        await applyParseResult(sessionId, workerName, result, child, shutdown, turnTracker);
     }, async (err) => {
         log.write(`[supervisor] stdout line handler failed: ${err.message}\n`);
-        await appendEvent(channelName, {
+        await appendEvent(sessionId, {
             kind: "error",
             by: `supervisor:${workerName}`,
             message: `stdout pipeline error: ${err.message}`,
-        }, project).catch(() => undefined);
+        }).catch(() => undefined);
     }, signal);
     return processLines
         ? Promise.all([drained, processLines]).then(() => undefined)

package/dist/commands/teamwork/supervisor/stdout.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stdout.js","sourceRoot":"","sources":["../../../../src/commands/teamwork/supervisor/stdout.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EAAE,MAAM,SAAS,CAAC;AAKzB,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAM/C;;;;;;;GAOG;AACH,MAAM,UAAU,wBAAwB;IAOtC,IAAI,mBAAqD,CAAC;IAC1D,MAAM,YAAY,GAAG,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,EAAE;QACpD,mBAAmB,GAAG,OAAO,CAAC;IAChC,CAAC,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IAEzC,OAAO;QACL,YAAY;QACZ,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,eAAe,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC;QAChD,OAAO,EAAE,GAAG,EAAE;YACZ,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAC3B,UAAU,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC;QACD,YAAY,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE;KACvC,CAAC;AACJ,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,UAAU,CACxB,MAAgB,EAChB,MAA8C,EAC9C,OAA8C,EAC9C,MAAoB;IAEpB,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,IAAI,KAAK,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7C,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB;;;;OAIG;IACH,MAAM,oBAAoB,GAAG,GAAS,EAAE;QACtC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,MAAM,GAAG,IAAI,CAAC;QAChB,CAAC;IACH,CAAC,CAAC;IAEF;;;;OAIG;IACH,MAAM,eAAe,GAAG,GAAS,EAAE;QACjC,IAAI,MAAM,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;YAC5B,MAAM,GAAG,KAAK,CAAC;YACf,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,CAAC;IACH,CAAC,CAAC;IAEF;;;;;OAKG;IACH,MAAM,OAAO,GAAG,CAAC,IAAY,EAAQ,EAAE;QACrC,OAAO,IAAI,CAAC,CAAC;QACb,oBAAoB,EAAE,CAAC;QACvB,KAAK,GAAG,KAAK;aACV,IAAI,CAAC,KAAK,IAAI,EAAE;YACf,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;YACrB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,OAAO,EAAE,CAAC;oBACZ,IAAI,CAAC;wBACH,MAAM,OAAO,CACX,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CACpD,CAAC;oBACJ,CAAC;oBAAC,MAAM,CAAC;wBACP,eAAe;oBACjB,CAAC;gBACH,CAAC;YACH,CAAC;oBAAS,CAAC;gBACT,OAAO,IAAI,CAAC,CAAC;gBACb,eAAe,EAAE,CAAC;YACpB,CAAC;QACH,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC5B,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,CAAC,KAAa,EAAQ,EAAE;QACrC,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAI,EAAU,CAAC;QACf,OAAO,CAAC,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9B,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;YACxB,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;gBAChB,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,eAA4B,CAAC;IACjC,MAAM,cAAc,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QACnD,eAAe,GAAG,OAAO,CAAC;IAC5B,CAAC,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,GAAS,EAAE;QACxB,IAAI,QAAQ;YAAE,OAAO;QACrB,QAAQ,GAAG,IAAI,CAAC;QAChB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3B,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1B,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5B,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC7C,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,CAAC;QACf,CAAC;QACD,GAAG,GAAG,EAAE,CAAC;QACT,eAAe,EAAE,CAAC;IACpB,CAAC,CAAC;IAEF,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1B,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC3B,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7B,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAE1D,IACE,MAAM,EAAE,OAAO;QACf,MAAM,CAAC,aAAa;QACpB,MAAM,CAAC,MAAM;QACb,MAAM,CAAC,SAAS,EAChB,CAAC;QACD,cAAc,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC;IAED,OAAO,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;AAC1C,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,UAAkB,EAClB,MAAmB,EACnB,KAAY,EACZ,QAA4B,EAC5B,WAAyB;IAEzB,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAC/B,8DAA8D;QAC9D,uDAAuD;QACvD,oEAAoE;QACpE,0DAA0D;QAC1D,IAAI,EAAE,CAAC,IAAI,KAAK,MAAM,IAAI,EAAE,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC9C,QAAQ,CAAC,mBAAmB,EAAE,CAAC;QACjC,CAAC;QACD,MAAM,WAAW,CAAC,SAAS,EAAE;YAC3B,IAAI,EAAE,EAAE,CAAC,IAAI;YACb,EAAE,EAAE,UAAU;YACd,GAAG,CAAC,EAAE,CAAC,OAAO,IAAI,EAAE,CAAC;SACtB,CAAC,CAAC;QACH,IAAI,EAAE,CAAC,IAAI,KAAK,MAAM,IAAI,EAAE,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC9C,MAAM,IAAI,GAAG,WAAW,EAAE,MAAM,EAAE,CAAC;YACnC,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,OAAO,GAAgB,EAAE,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;gBACnE,MAAM,WAAW,CAAC,SAAS,EAAE;oBAC3B,IAAI,EAAE,eAAe;oBACrB,EAAE,EAAE,UAAU;oBACd,MAAM,EAAE,UAAU;oBAClB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,OAAO;iBACR,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAChB,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;QACjE,IAAI,gBAAgB,EAAE,CAAC;YACrB,EAAE,CAAC,aAAa,CACd,UAAU,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,CAAC,EAC/C,gBAAgB,CACjB,CAAC;QACJ,CAAC;QACD,IAAI,eAAe,EAAE,CAAC;YACpB,EAAE,CAAC,aAAa,CACd,UAAU,CAAC,SAAS,EAAE,UAAU,EAAE,WAAW,CAAC,EAC9C,eAAe,CAChB,CAAC;QACJ,CAAC;QACD,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;gBACtB,IAAI,CAAC;oBACH,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACvB,CAAC;gBAAC,MAAM,CAAC;oBACP,kDAAkD;gBACpD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,IAW/B;IACC,MAAM,EACJ,SAAS,EACT,UAAU,EACV,KAAK,EACL,OAAO,EACP,UAAU,EACV,GAAG,EACH,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,MAAM,GACP,GAAG,IAAI,CAAC;IACT,MAAM,OAAO,GAAG,UAAU,CACxB,KAAK,CAAC,MAAM,EACZ,KAAK,EAAE,IAAY,EAAE,EAAE;QACrB,IAAI,YAAY,IAAI,CAAC,CAAC,MAAM,YAAY,CAAC;YAAE,OAAO;QAClD,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;QACvB,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACnD,MAAM,gBAAgB,CACpB,SAAS,EACT,UAAU,EACV,MAAM,EACN,KAAK,EACL,QAAQ,EACR,WAAW,CACZ,CAAC;IACJ,CAAC,EACD,KAAK,EAAE,GAAG,EAAE,EAAE;QACZ,GAAG,CAAC,KAAK,CAAC,4CAA4C,GAAG,CAAC,OAAO,IAAI,CAAC,CAAC;QACvE,MAAM,WAAW,CAAC,SAAS,EAAE;YAC3B,IAAI,EAAE,OAAO;YACb,EAAE,EAAE,cAAc,UAAU,EAAE;YAC9B,OAAO,EAAE,0BAA0B,GAAG,CAAC,OAAO,EAAE;SACjD,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC5B,CAAC,EACD,MAAM,CACP,CAAC;IACF,OAAO,YAAY;QACjB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;QAC5D,CAAC,CAAC,OAAO,CAAC;AACd,CAAC"}

package/dist/commands/teamwork/supervisor/turns.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"turns.d.ts","sourceRoot":"","sources":["../../../../src/commands/teamwork/supervisor/turns.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;AAEvD,MAAM,WAAW,gBAAgB;IAC/B,iEAAiE;IACjE,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,wDAAwD;IACxD,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;CAC1B;AAED;;;;;;;;;;GAUG;AACH,qBAAa,WAAW;;gBAIV,KAAK,GAAE,gBAAqB;IAIxC,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU;IAWnC,MAAM,IAAI,UAAU,GAAG,SAAS;IAMhC,YAAY,IAAI,UAAU,GAAG,SAAS;IAMtC,OAAO,IAAI,UAAU,GAAG,SAAS;CAGlC"}

package/dist/commands/teamwork/supervisor/turns.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turns.js","sourceRoot":"","sources":["../../../../src/commands/teamwork/supervisor/turns.ts"],"names":[],"mappings":"AAcA;;;;;;;;;;GAUG;AACH,MAAM,OAAO,WAAW;IACtB,MAAM,GAAiB,EAAE,CAAC;IAC1B,MAAM,CAAmB;IAEzB,YAAY,QAA0B,EAAE;QACtC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,QAAgB;QACpB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;QACzC,MAAM,IAAI,GAAe;YACvB,QAAQ;YACR,MAAM,EAAE,OAAO,QAAQ,EAAE;SAC1B,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,IAAI,OAAO;YAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM;QACJ,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QAC/B,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;QAClE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY;QACV,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QAC/B,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;QAClE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC;CACF"}

package/dist/commands/{channel → teamwork}/supervisor/warning.d.ts

@@ -1,9 +1,9 @@
 /**
  * Supervisor pre-timeout warning scheduler.
  *
- * Emits a one-shot `supervisor_warning` channel event when the worker
+ * Emits a one-shot `supervisor_warning` TeamworkSession event when the teammate
  * is approaching its lifetime timeout, so observers (dispatchers /
- * `trellis channel messages`) can see the impending kill without
+ * `trellis teamwork messages`) can see the impending termination without
  * having to poll. The event is observability-only — it never replaces
  * the eventual `killed` / `done` / `error` terminal event, and is
  * not part of the meaningful-event set so plain `wait` does not wake
@@ -20,7 +20,7 @@ export interface SupervisorShutdownProbe {
     hasTerminalEvent(): boolean;
 }
 export interface ScheduleSupervisorTimeoutWarningArgs {
-    channelName: string;
+    sessionId: string;
     workerName: string;
     timeoutMs: number;
     /** Warning lead time in ms. `<= 0` disables the pre-timeout warning. */
@@ -38,11 +38,11 @@ export interface ScheduleSupervisorTimeoutWarningArgs {
  * (clamped at 0 when the warning lead time is greater than the timeout).
  * Guarded so the warning is emitted at most once, never after shutdown
  * has been requested, never after a terminal event has been emitted,
- * and never after the worker child has exited.
+ * and never after the teammate process has exited.
  *
  * Returns a cancel handle that callers can invoke to drop the pending
  * timer (e.g. on supervisor teardown). Append failures are logged via
- * `log.write` only and do not affect worker lifecycle.
+ * `log.write` only and do not affect teammate lifecycle.
  */
 export declare function scheduleSupervisorTimeoutWarning(args: ScheduleSupervisorTimeoutWarningArgs): () => void;
 //# sourceMappingURL=warning.d.ts.map

package/dist/commands/teamwork/supervisor/warning.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"warning.d.ts","sourceRoot":"","sources":["../../../../src/commands/teamwork/supervisor/warning.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,gFAAgF;AAChF,eAAO,MAAM,uCAAuC,QAAa,CAAC;AAElE,MAAM,WAAW,uBAAuB;IACtC,cAAc,IAAI,OAAO,CAAC;IAC1B,gBAAgB,IAAI,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,oCAAoC;IACnD,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,wEAAwE;IACxE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,uBAAuB,CAAC;IAClC,gFAAgF;IAChF,aAAa,EAAE,MAAM,OAAO,CAAC;IAC7B,GAAG,EAAE;QAAE,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,CAAC;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gCAAgC,CAC9C,IAAI,EAAE,oCAAoC,GACzC,MAAM,IAAI,CAuDZ"}

package/dist/commands/{channel → teamwork}/supervisor/warning.js

@@ -1,9 +1,9 @@
 /**
  * Supervisor pre-timeout warning scheduler.
  *
- * Emits a one-shot `supervisor_warning` channel event when the worker
+ * Emits a one-shot `supervisor_warning` TeamworkSession event when the teammate
  * is approaching its lifetime timeout, so observers (dispatchers /
- * `trellis channel messages`) can see the impending kill without
+ * `trellis teamwork messages`) can see the impending termination without
  * having to poll. The event is observability-only — it never replaces
  * the eventual `killed` / `done` / `error` terminal event, and is
  * not part of the meaningful-event set so plain `wait` does not wake
@@ -21,14 +21,14 @@ export const SUPERVISOR_TIMEOUT_WARNING_REMAINING_MS = 5 * 60_000;
  * (clamped at 0 when the warning lead time is greater than the timeout).
  * Guarded so the warning is emitted at most once, never after shutdown
  * has been requested, never after a terminal event has been emitted,
- * and never after the worker child has exited.
+ * and never after the teammate process has exited.
  *
  * Returns a cancel handle that callers can invoke to drop the pending
  * timer (e.g. on supervisor teardown). Append failures are logged via
- * `log.write` only and do not affect worker lifecycle.
+ * `log.write` only and do not affect teammate lifecycle.
  */
 export function scheduleSupervisorTimeoutWarning(args) {
-    const { channelName, workerName, timeoutMs, shutdown, isChildExited, log } = args;
+    const { sessionId, workerName, timeoutMs, shutdown, isChildExited, log } = args;
     if (timeoutMs <= 0)
         return () => undefined;
     const warnBeforeMs = args.warnBeforeMs ?? SUPERVISOR_TIMEOUT_WARNING_REMAINING_MS;
@@ -51,7 +51,7 @@ export function scheduleSupervisorTimeoutWarning(args) {
         warningEmitted = true;
         void (async () => {
             try {
-                await appendEvent(channelName, {
+                await appendEvent(sessionId, {
                     kind: "supervisor_warning",
                     by: `supervisor:${workerName}`,
                     worker: workerName,

package/dist/commands/teamwork/supervisor/warning.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"warning.js","sourceRoot":"","sources":["../../../../src/commands/teamwork/supervisor/warning.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,gFAAgF;AAChF,MAAM,CAAC,MAAM,uCAAuC,GAAG,CAAC,GAAG,MAAM,CAAC;AAoBlE;;;;;;;;;;GAUG;AACH,MAAM,UAAU,gCAAgC,CAC9C,IAA0C;IAE1C,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,EAAE,GACtE,IAAI,CAAC;IACP,IAAI,SAAS,IAAI,CAAC;QAAE,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC;IAC3C,MAAM,YAAY,GAChB,IAAI,CAAC,YAAY,IAAI,uCAAuC,CAAC;IAC/D,IAAI,YAAY,IAAI,CAAC;QAAE,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC;IAE9C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACpD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC,CAAC;IAEjD,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,IAAI,SAAS,GAAG,KAAK,CAAC;IAEtB,MAAM,IAAI,GAAG,GAAS,EAAE;QACtB,IAAI,SAAS,IAAI,cAAc;YAAE,OAAO;QACxC,IACE,QAAQ,CAAC,cAAc,EAAE;YACzB,QAAQ,CAAC,gBAAgB,EAAE;YAC3B,aAAa,EAAE,EACf,CAAC;YACD,OAAO;QACT,CAAC;QACD,+DAA+D;QAC/D,0CAA0C;QAC1C,cAAc,GAAG,IAAI,CAAC;QACtB,KAAK,CAAC,KAAK,IAAI,EAAE;YACf,IAAI,CAAC;gBACH,MAAM,WAAW,CACf,SAAS,EACT;oBACE,IAAI,EAAE,oBAAoB;oBAC1B,EAAE,EAAE,cAAc,UAAU,EAAE;oBAC9B,MAAM,EAAE,UAAU;oBAClB,MAAM,EAAE,qBAAqB;oBAC7B,UAAU,EAAE,SAAS;oBACrB,YAAY,EAAE,SAAS;iBACxB,EACD,IAAI,CAAC,OAAO,CACb,CAAC;YACJ,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC7D,GAAG,CAAC,KAAK,CAAC,uCAAuC,GAAG,IAAI,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;IACP,CAAC,CAAC;IAEF,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACtC,gEAAgE;IAChE,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;IAEhB,OAAO,GAAG,EAAE;QACV,SAAS,GAAG,IAAI,CAAC;QACjB,YAAY,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAC;AACJ,CAAC"}

package/dist/commands/{channel → teamwork}/supervisor.d.ts

@@ -1,29 +1,29 @@
 /**
- * Supervisor process: owns a single worker (claude or codex) and bridges
- * worker ↔ channel events.jsonl.
+ * Supervisor process: owns one teammate process (Claude Code or Codex) and
+ * bridges teammate messages with the TeamworkSession event log.
  *
- * Run as: `trellis channel __supervisor <channel> <worker> <config-path>`
+ * Run as: `trellis teamwork __supervisor <sessionId> <teammate> <config-path>`
  *
  * Three concurrent loops:
- *   1. stdout reader  — parse worker stdout → adapter → append events
- *   2. inbox watcher  — read events.jsonl for `to=<worker>` say events,
- *                       translate via adapter.encodeUserMessage → worker stdin
- *   3. signal handler — SIGTERM → close worker stdin → 3s → SIGTERM → 3s → SIGKILL
+ *   1. stdout reader  — parse teammate output → adapter → append events
+ *   2. inbox watcher  — read events.jsonl for `to=<teammate>` messages,
+ *                       translate via adapter.encodeUserMessage → process stdin
+ *   3. signal handler — SIGTERM → close process stdin → 3s → SIGTERM → 3s → SIGKILL
  *                       → write `killed` event → exit
  */
-import { type InboxPolicy } from "@pennixrv/trellis-core/channel";
+import { type InboxPolicy } from "@pennixrv/trellis-core/teamwork";
 import type { CodexSandboxMode } from "./adapters/codex.js";
 import { type Provider } from "./adapters/index.js";
 export interface SupervisorConfig {
     provider: Provider;
     cwd: string;
-    /** Combined worker system prompt: channel protocol prefix + agent body.
+    /** Combined teammate system prompt: Teamwork protocol prefix + agent body.
      *  Injected via Claude `--append-system-prompt(-file)` or Codex
      *  `developerInstructions`. The supervisor also persists it to
-     *  `<worker>.system-prompt.md` and exposes the path as
+     *  `<teammate>.system-prompt.md` and exposes the path as
      *  `view.systemPromptFile` so adapters can avoid OS argv-length limits.
-     *  No "initial user prompt" — the worker stays idle until the first
-     *  inbox `send --to <worker>` arrives. */
+     *  No "initial user prompt" — the teammate stays idle until its first
+     *  inbox message arrives. */
     systemPrompt: string;
     /** Extra env vars (TRELLIS_HOOKS=0 etc. are added automatically). */
     env?: Record<string, string>;
@@ -33,19 +33,19 @@ export interface SupervisorConfig {
     resume?: string;
     /** Codex-only: overrides the `thread/start` sandbox mode (default `workspace-write`). */
     sandbox?: CodexSandboxMode;
-    /** Auto-kill worker after this many ms (anti-zombie). */
+    /** Auto-kill the teammate process after this many ms (anti-zombie). */
     timeoutMs?: number;
     /** Emit supervisor_warning this many ms before timeout. `<=0` disables it. */
     warnBeforeMs?: number;
     /**
-     * OOM-guard idle-cleanup TTL in ms. When a running worker stays idle
+     * Teammate-guard idle-cleanup TTL in ms. When a running teammate stays idle
      * for this long (no active turn), the supervisor self-terminates with
      * `killed{reason:"idle-timeout"}`. `<=0` or undefined disables.
      */
     idleTimeoutMs?: number;
     /** Caller identity recorded on the `spawned` event (default "main"). */
     spawnedBy?: string;
-    /** Agent definition name loaded for this worker, if any (recorded on `spawned`). */
+    /** Agent definition loaded for this teammate, if any (recorded on `spawned`). */
     agent?: string;
     /** Relative paths injected via --file / --jsonl (recorded on `spawned`). */
     contextFiles?: string[];
@@ -53,7 +53,7 @@ export interface SupervisorConfig {
      *  (recorded on `spawned` for observability — "I passed --jsonl X but
      *  X contained no real entries"). */
     contextManifests?: string[];
-    /** Worker inbox delivery policy (recorded on `spawned`; default
+    /** Teammate inbox delivery policy (recorded on `spawned`; default
      *  `explicitOnly`). */
     inboxPolicy?: InboxPolicy;
 }
@@ -62,7 +62,7 @@ interface ResolvedProviderPath {
     prefixArgs: string[];
 }
 /**
- * Drain worker stdout before synthesising terminal state and removing the
+ * Drain teammate output before synthesising terminal state and removing the
  * supervisor's runtime files.
  */
 export declare function finalizeSupervisorExit(args: {
@@ -78,14 +78,14 @@ export declare function finalizeSupervisorExit(args: {
  * Resolve the real launch target for npm `.cmd` shims on Windows.
  *
  * @param provider CLI basename for the provider, such as `codex` or `claude`.
- * @param cwd Worker launch directory, used to check local `node_modules/.bin` first.
+ * @param cwd Teammate launch directory, used to check local `node_modules/.bin` first.
  * @returns Command and prefix arguments that can be passed directly to `spawn()`.
  */
 export declare function resolveProviderPath(provider: string, cwd?: string): ResolvedProviderPath;
 /**
- * Entry point invoked by `trellis channel __supervisor <channel> <worker> <config>`.
+ * Entry point invoked by `trellis teamwork __supervisor <sessionId> <teammate> <config>`.
  */
-export declare function runSupervisor(channelName: string, workerName: string, configPath: string): Promise<void>;
-export declare function writeSupervisorConfig(channelName: string, workerName: string, config: SupervisorConfig, project?: string): string;
+export declare function runSupervisor(sessionId: string, workerName: string, configPath: string): Promise<void>;
+export declare function writeSupervisorConfig(sessionId: string, workerName: string, config: SupervisorConfig, project?: string): string;
 export {};
 //# sourceMappingURL=supervisor.d.ts.map

package/dist/commands/teamwork/supervisor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../../../src/commands/teamwork/supervisor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAOH,OAAO,EAEL,KAAK,WAAW,EACjB,MAAM,iCAAiC,CAAC;AAGzC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAc,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAahE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,QAAQ,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ;;;;;;iCAM6B;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,qEAAqE;IACrE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,2DAA2D;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,yFAAyF;IACzF,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,uEAAuE;IACvE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,wEAAwE;IACxE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iFAAiF;IACjF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4EAA4E;IAC5E,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB;;yCAEqC;IACrC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B;2BACuB;IACvB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAMD,UAAU,oBAAoB;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,IAAI,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,IAAI,CAAC;CAClB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBhB;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,GAAG,CAAC,EAAE,MAAM,GACX,oBAAoB,CAsCtB;AAED;;GAEG;AACH,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CA2Wf;AA0DD,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,gBAAgB,EACxB,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAKR"}