npm - @pennixrv/trellis - Versions diffs - 0.6.18 → 0.6.19 - Mend

@pennixrv/trellis 0.6.18 → 0.6.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

package/dist/commands/channel/adapters/codex.d.ts CHANGED Viewed

@@ -48,6 +48,8 @@ import type { ParseResult } from "./types.js";
 export interface CodexCtx {
     /** id → label tracking outgoing requests, so adapter can recognise their responses. */
     pending: Map<number, "initialize" | "thread/start" | "turn/start" | "other">;
+    /** Promise waiters used by the handshake; normal turn requests do not wait here. */
+    responseWaiters: Map<number, CodexResponseWaiter>;
     /** Codex item id → stream metadata used to classify interleaved deltas. */
     items: Map<string, CodexItemMeta>;
     /** Whether the current turn has emitted a final user-visible answer. */
@@ -61,6 +63,11 @@ export interface CodexCtx {
     /** Monotonic outbound id allocator. */
     nextId: number;
 }
+export interface CodexResponseWaiter {
+    resolve: (result: unknown) => void;
+    reject: (error: Error) => void;
+    timer: ReturnType<typeof setTimeout>;
+}
 export declare function createCodexCtx(): CodexCtx;
 interface CodexItemMeta {
     type?: string;
@@ -71,6 +78,13 @@ export declare function encodeCodexRequest(ctx: CodexCtx, method: string, params
     id: number;
     line: string;
 };
+export declare function encodeCodexRequestWithResponse(ctx: CodexCtx, method: string, params: unknown, label?: "initialize" | "thread/start" | "turn/start" | "other", timeoutMs?: number): {
+    id: number;
+    line: string;
+    response: Promise<unknown>;
+};
+export declare function waitForCodexResponse(ctx: CodexCtx, id: number, timeoutMs?: number): Promise<unknown>;
+export declare function cancelCodexResponse(ctx: CodexCtx, id: number, error: Error): void;
 export declare function encodeCodexUserMessage(ctx: CodexCtx, text: string): {
     id: number;
     line: string;

package/dist/commands/channel/adapters/codex.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../../src/commands/channel/adapters/codex.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,WAAW,EAAE,MAAM,YAAY,CAAC;AAE5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AAEH,MAAM,WAAW,QAAQ;IACvB,uFAAuF;IACvF,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,GAAG,cAAc,GAAG,YAAY,GAAG,OAAO,CAAC,CAAC;IAC7E,2EAA2E;IAC3E,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAClC,wEAAwE;IACxE,gBAAgB,EAAE,OAAO,CAAC;IAC1B,wEAAwE;IACxE,WAAW,EAAE,OAAO,CAAC;IACrB,8EAA8E;IAC9E,iBAAiB,EAAE,OAAO,CAAC;IAC3B,4DAA4D;IAC5D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uCAAuC;IACvC,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,cAAc,IAAI,QAAQ,~~CASzC~~;AAED,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAqCD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,GAAG,WAAW,CAqCvE;~~AAwcD~~,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,QAAQ,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,EACf,KAAK,GAAE,YAAY,GAAG,cAAc,GAAG,YAAY,GAAG,OAAiB,GACtE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAK9B;AAED,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,MAAM,GACX;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAkB9B;AAED,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,MAAM,GACX;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAM9B;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,EAAE,CAIjE;AAED,gFAAgF;AAChF,MAAM,MAAM,gBAAgB,GACxB,WAAW,GACX,iBAAiB,GACjB,oBAAoB,CAAC;AAEzB,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC,gBAAgB,CAI5D,CAAC;AAEH;oDACoD;AACpD,wBAAgB,qBAAqB,CACnC,CAAC,EAAE,MAAM,GAAG,SAAS,GACpB,gBAAgB,GAAG,SAAS,CAQ9B;AAED,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,MAAM,EACX,YAAY,CAAC,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,gBAAgB,GACzB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsBzB"}
1	+ {"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../../src/commands/channel/adapters/codex.ts"],"names":[],"mappings":"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"}

package/dist/commands/channel/adapters/codex.js CHANGED Viewed

@@ -1,6 +1,7 @@
 export function createCodexCtx() {
     return {
         pending: new Map(),
+        responseWaiters: new Map(),
         items: new Map(),
         finalMessageSeen: false,
         pendingDone: false,
@@ -111,6 +112,17 @@ function handleResponse(msg, ctx) {
     const id = msg.id;
     const label = ctx.pending.get(id);
     ctx.pending.delete(id);
+    const waiter = ctx.responseWaiters.get(id);
+    if (waiter) {
+        ctx.responseWaiters.delete(id);
+        clearTimeout(waiter.timer);
+        if (msg.error) {
+            waiter.reject(new Error(`RPC error for ${label ?? "<unknown>"} (id=${id}): ${msg.error.message ?? ""}`));
+        }
+        else {
+            waiter.resolve(msg.result);
+        }
+    }
     const events = [];
     const side = {
         resolved: [{ id, result: msg.result, error: msg.error }],
@@ -510,6 +522,31 @@ export function encodeCodexRequest(ctx, method, params, label = "other") {
     const line = JSON.stringify({ jsonrpc: "2.0", id, method, params }) + "\n";
     return { id, line };
 }
+export function encodeCodexRequestWithResponse(ctx, method, params, label = "other", timeoutMs = 30_000) {
+    const request = encodeCodexRequest(ctx, method, params, label);
+    const response = waitForCodexResponse(ctx, request.id, timeoutMs);
+    return { ...request, response };
+}
+export function waitForCodexResponse(ctx, id, timeoutMs = 30_000) {
+    return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => {
+            const label = ctx.pending.get(id) ?? "request";
+            ctx.responseWaiters.delete(id);
+            ctx.pending.delete(id);
+            reject(new Error(`Codex ${label} response timed out after ${timeoutMs}ms`));
+        }, timeoutMs);
+        ctx.responseWaiters.set(id, { resolve, reject, timer });
+    });
+}
+export function cancelCodexResponse(ctx, id, error) {
+    const waiter = ctx.responseWaiters.get(id);
+    if (!waiter)
+        return;
+    ctx.responseWaiters.delete(id);
+    ctx.pending.delete(id);
+    clearTimeout(waiter.timer);
+    waiter.reject(error);
+}
 export function encodeCodexUserMessage(ctx, text) {
     if (!ctx.threadId) {
         throw new Error("Codex adapter: thread/start has not completed; cannot send user message yet");

package/dist/commands/channel/adapters/codex.js.map CHANGED Viewed

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

package/dist/commands/channel/adapters/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/channel/adapters/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAQtD,OAAO,~~EAQL~~,KAAK,QAAQ,EACb,KAAK,gBAAgB,EACtB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAM9C,MAAM,MAAM,WAAW,GAAG,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAE5E,qEAAqE;AACrE,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC;AAEjC,MAAM,WAAW,cAAc;IAC7B,8FAA8F;IAC9F,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,yFAAyF;IACzF,OAAO,CAAC,EAAE,gBAAgB,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa,CAAC,GAAG,GAAG,UAAU;IAC7C,6BAA6B;IAC7B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,2DAA2D;IAC3D,SAAS,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,EAAE,CAAC;IAC1C,4DAA4D;IAC5D,SAAS,IAAI,GAAG,CAAC;IACjB;;;;OAIG;IACH,SAAS,CAAC,CAAC,IAAI,EAAE;QACf,KAAK,EAAE,WAAW,CAAC;QACnB,GAAG,EAAE,GAAG,CAAC;QACT,IAAI,EAAE,cAAc,CAAC;KACtB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClB;;;;OAIG;IACH,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC;IAC3B,0EAA0E;IAC1E,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,WAAW,CAAC;IAC/C;;;OAGG;IACH,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,MAAM,CAAC;IAClD;;;OAGG;IACH,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,MAAM,CAAC;CACxD;~~AAqFD~~;;;;;GAKG;AACH,QAAA,MAAM,QAAQ;;;CAGJ,CAAC;AAEX,MAAM,MAAM,QAAQ,GAAG,MAAM,OAAO,QAAQ,CAAC;AAE7C,qEAAqE;AACrE,wBAAgB,aAAa,IAAI,QAAQ,EAAE,CAE1C;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,QAAQ,CAE3D;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,QAAQ,GAAG,aAAa,CAAC,UAAU,CAAC,CAQxE"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/channel/adapters/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAQtD,OAAO,EASL,KAAK,QAAQ,EACb,KAAK,gBAAgB,EACtB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAM9C,MAAM,MAAM,WAAW,GAAG,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAE5E,qEAAqE;AACrE,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC;AAEjC,MAAM,WAAW,cAAc;IAC7B,8FAA8F;IAC9F,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,yFAAyF;IACzF,OAAO,CAAC,EAAE,gBAAgB,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa,CAAC,GAAG,GAAG,UAAU;IAC7C,6BAA6B;IAC7B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,2DAA2D;IAC3D,SAAS,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,EAAE,CAAC;IAC1C,4DAA4D;IAC5D,SAAS,IAAI,GAAG,CAAC;IACjB;;;;OAIG;IACH,SAAS,CAAC,CAAC,IAAI,EAAE;QACf,KAAK,EAAE,WAAW,CAAC;QACnB,GAAG,EAAE,GAAG,CAAC;QACT,IAAI,EAAE,cAAc,CAAC;KACtB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClB;;;;OAIG;IACH,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC;IAC3B,0EAA0E;IAC1E,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,WAAW,CAAC;IAC/C;;;OAGG;IACH,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,MAAM,CAAC;IAClD;;;OAGG;IACH,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,MAAM,CAAC;CACxD;AAiGD;;;;;GAKG;AACH,QAAA,MAAM,QAAQ;;;CAGJ,CAAC;AAEX,MAAM,MAAM,QAAQ,GAAG,MAAM,OAAO,QAAQ,CAAC;AAE7C,qEAAqE;AACrE,wBAAgB,aAAa,IAAI,QAAQ,EAAE,CAE1C;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,QAAQ,CAE3D;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,QAAQ,GAAG,aAAa,CAAC,UAAU,CAAC,CAQxE"}

package/dist/commands/channel/adapters/index.js CHANGED Viewed

@@ -16,7 +16,7 @@
  * `<name>.ts` adapter and registering it here.
  */
 import { buildClaudeArgs, encodeClaudeInterruptMessage, encodeClaudeUserMessage, parseClaudeLine, } from "./claude.js";
-import { buildCodexArgs, buildCodexThreadStartParams, createCodexCtx, encodeCodexInterruptMessage, encodeCodexRequest, encodeCodexUserMessage, parseCodexLine, } from "./codex.js";
+import { buildCodexArgs, buildCodexThreadStartParams, cancelCodexResponse, createCodexCtx, encodeCodexInterruptMessage, encodeCodexRequestWithResponse, encodeCodexUserMessage, parseCodexLine, } from "./codex.js";
 /** Claude adapter — stream-json over stdio, no handshake. */
 const claudeAdapter = {
     provider: "claude",
@@ -55,22 +55,26 @@ const codexAdapter = {
     },
     async handshake({ child, ctx, view }) {
         // 1. initialize
-        const init = encodeCodexRequest(ctx, "initialize", {
+        const init = encodeCodexRequestWithResponse(ctx, "initialize", {
             clientInfo: { name: "trellis-channel", version: "0.1" },
             capabilities: {},
         }, "initialize");
         child.stdin.write(init.line);
-        // 2. wait briefly so initialize lands first
-        await sleep(150);
-        const ts = encodeCodexRequest(ctx, "thread/start", buildCodexThreadStartParams(view.cwd, view.systemPrompt, view.sandbox), "thread/start");
-        child.stdin.write(ts.line);
-        // 3. wait for thread/start response to populate threadId
-        const deadline = Date.now() + 30_000;
-        while (!ctx.threadId && Date.now() < deadline) {
-            await sleep(50);
+        const initResult = await awaitCodexResponse(child, ctx, init.id, init.response, "initialize");
+        if (!isObject(initResult)) {
+            throw new Error("Codex initialize returned an invalid result");
         }
+        // 2. complete the app-server handshake before starting a thread
+        child.stdin.write(JSON.stringify({
+            jsonrpc: "2.0",
+            method: "initialized",
+            params: {},
+        }) + "\n");
+        const ts = encodeCodexRequestWithResponse(ctx, "thread/start", buildCodexThreadStartParams(view.cwd, view.systemPrompt, view.sandbox), "thread/start");
+        child.stdin.write(ts.line);
+        await awaitCodexResponse(child, ctx, ts.id, ts.response, "thread/start");
         if (!ctx.threadId) {
-            throw new Error("Codex thread/start did not produce a threadId within 30s");
+            throw new Error("Codex thread/start returned no threadId");
         }
     },
     isReady(ctx) {
@@ -110,7 +114,39 @@ export function getAdapter(provider) {
     }
     return a;
 }
-function sleep(ms) {
-    return new Promise((r) => setTimeout(r, ms));
+function awaitCodexResponse(child, ctx, id, response, label) {
+    return new Promise((resolve, reject) => {
+        let settled = false;
+        const cleanup = () => {
+            child.removeListener("exit", onExit);
+            child.removeListener("error", onError);
+        };
+        const finish = (fn) => {
+            if (settled)
+                return;
+            settled = true;
+            cleanup();
+            fn();
+        };
+        const onExit = (code, signal) => {
+            const detail = signal ?? (code === null ? "unknown" : `code ${code}`);
+            cancelCodexResponse(ctx, id, new Error(`Codex ${label} response interrupted by child exit (${detail})`));
+            finish(() => reject(new Error(`Codex ${label} response interrupted by child exit (${detail})`)));
+        };
+        const onError = (error) => {
+            cancelCodexResponse(ctx, id, error);
+            finish(() => reject(error));
+        };
+        if (child.exitCode !== null || child.signalCode !== null) {
+            onExit(child.exitCode, child.signalCode);
+            return;
+        }
+        child.once("exit", onExit);
+        child.once("error", onError);
+        response.then((result) => finish(() => resolve(result)), (error) => finish(() => reject(error instanceof Error ? error : new Error(String(error)))));
+    });
+}
+function isObject(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //# sourceMappingURL=index.js.map

package/dist/commands/channel/adapters/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/channel/adapters/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,EACL,eAAe,EACf,4BAA4B,EAC5B,uBAAuB,EACvB,eAAe,GAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,cAAc,EACd,2BAA2B,EAC3B,cAAc,EACd,2BAA2B,EAC3B,~~kBAAkB~~,~~EAClB~~,sBAAsB,EACtB,cAAc,GAGf,MAAM,YAAY,CAAC;AAmEpB,6DAA6D;AAC7D,MAAM,aAAa,GAA6B;IAC9C,QAAQ,EAAE,QAAQ;IAClB,SAAS,CAAC,IAAI;QACZ,OAAO,eAAe,CAAC;YACrB,eAAe,EAAE,IAAI,CAAC,MAAM;YAC5B,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;SACxC,CAAC,CAAC;IACL,CAAC;IACD,SAAS;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO;QACL,OAAO,IAAI,CAAC;IACd,CAAC;IACD,SAAS,CAAC,IAAI;QACZ,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IACD,iBAAiB,CAAC,IAAI;QACpB,OAAO,uBAAuB,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IACD,sBAAsB,CAAC,IAAI;QACzB,OAAO,4BAA4B,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;CACF,CAAC;AAEF,yEAAyE;AACzE,MAAM,YAAY,GAA4B;IAC5C,QAAQ,EAAE,OAAO;IACjB,SAAS,CAAC,IAAI;QACZ,OAAO,cAAc,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC/C,CAAC;IACD,SAAS;QACP,OAAO,cAAc,EAAE,CAAC;IAC1B,CAAC;IACD,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE;QAClC,gBAAgB;QAChB,MAAM,IAAI,GAAG,~~kBAAkB~~,~~CAC7B~~,GAAG,EACH,YAAY,EACZ;YACE,UAAU,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,KAAK,EAAE;YACvD,YAAY,EAAE,EAAE;SACjB,EACD,YAAY,CACb,CAAC;QACF,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7B,~~4CAA4C~~;~~QAC5C~~,MAAM,KAAK,CAAC,~~GAAG~~,CAAC,CAAC;~~QACjB~~,MAAM,EAAE,GAAG,~~kBAAkB~~,~~CAC3B~~,GAAG,EACH,cAAc,EACd,2BAA2B,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,EACtE,cAAc,CACf,CAAC;QACF,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QAC3B,~~yDAAyD;QACzD,~~MAAM,~~QAAQ~~,~~GAAG,IAAI,~~CAAC,~~GAAG~~,EAAE,GAAG,~~MAAM~~,~~CAAC;QACrC~~,~~OAAO,~~CAAC,~~GAAG~~,~~CAAC,QAAQ,IAAI,IAAI,CAAC,GAAG,~~EAAE,~~GAAG,QAAQ,~~EAAE,CAAC~~;YAC9C~~,~~MAAM~~,~~KAAK,CAAC,~~EAAE,~~CAAC~~,CAAC~~;QAClB~~,CAAC;~~QACD~~,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,~~CACb~~,~~0DAA0D~~,~~CAC3D~~,CAAC;~~QACJ~~,CAAC;IACH,CAAC;IACD,OAAO,CAAC,GAAG;QACT,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;IACD,SAAS,CAAC,IAAI,EAAE,GAAG;QACjB,OAAO,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACnC,CAAC;IACD,iBAAiB,CAAC,IAAI,EAAE,GAAG;QACzB,OAAO,sBAAsB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC;IAChD,CAAC;IACD,sBAAsB,CAAC,IAAI,EAAE,GAAG;QAC9B,OAAO,2BAA2B,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC;IACrD,CAAC;CACF,CAAC;AAEF;;;;;GAKG;AACH,MAAM,QAAQ,GAAG;IACf,MAAM,EAAE,aAAa;IACrB,KAAK,EAAE,YAAY;CACX,CAAC;AAIX,qEAAqE;AACrE,MAAM,UAAU,aAAa;IAC3B,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAe,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,KAAa;IACtC,OAAO,KAAK,IAAI,QAAQ,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,QAAkB;IAC3C,MAAM,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC7B,IAAI,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,IAAI,KAAK,CACb,qBAAqB,QAAQ,kBAAkB,aAAa,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAC7E,CAAC;IACJ,CAAC;IACD,OAAO,CAA8B,CAAC;AACxC,CAAC;AAED,SAAS,KAAK,CAAC,~~EAAU~~;~~IACvB~~,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;~~AAC/C~~,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/channel/adapters/index.ts"],"names":[],"mappings":"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"}

package/dist/templates/common/bundled-skills/trellis-channel/SKILL.md CHANGED Viewed

@@ -34,6 +34,7 @@ trellis channel context list <board> --scope global --thread <thread>
 |---|---|
 | "和 codex/claude 讨论一下", "brainstorm with another agent" | `references/workflows.md` |
 | "派一个 implement/check agent", "让 agent review", "spawn a worker" | `references/workflows.md`, then `references/workers.md` |
+| "独立取证", "subnode", "反证/独立审查", "持久化工作节点报告" | `references/subnode-work.md`, then `references/workers.md` |
 | "开 issue 区 / topic 群 / changelog / board", "make a forum" | `references/forum.md` |
 | "看看这个 thread / linked context", "inspect a thread" | `references/forum.md` |
 | "channel 卡住了 / 没输出 / progress 被截断", "worker stalled" | `references/progress-debugging.md` |
@@ -57,6 +58,7 @@ trellis channel context list <board> --scope global --thread <thread>
 - `references/workflows.md` — canonical collaboration patterns A–F (peer brainstorm, spawned review, dispatch-and-wait, forum issue capture, interrupt-and-redirect, one-shot run).
 - `references/forum.md` — forum channels, context, title, rename, changelog forums, thread filtering.
 - `references/workers.md` — spawn, agent cards, context injection (`--file` / `--jsonl`), interrupts, kill semantics.
+- `references/subnode-work.md` — bounded independent-evidence subnodes, their task artifacts, coordinator verification, and counterwork.
 - `references/progress-debugging.md` — progress/raw inspection, stalled worker diagnosis, OOM guard, exit codes.
 - `references/command-reference.md` — current CLI command reference (every subcommand, every flag, output conventions, scope/type model).

package/dist/templates/common/bundled-skills/trellis-channel/references/subnode-work.md ADDED Viewed

@@ -0,0 +1,143 @@
+# Bounded Subnode Work
+Use a `subnode` only when the user explicitly needs independently reviewable
+evidence for a bounded analysis, design, audit, review, counterargument, or
+verification question. It is not the normal path for an ordinary static review,
+implementation, memory retrieval, or routine tool call.
+The coordinator owns task facts, protected targets, acceptance, Git, worker
+lifecycle, and the final result. A subnode owns one evidence report and its own
+append-only worklog. This is a behavioral contract; do not add `--sandbox` or
+claim that path restrictions enforce it.
+## Artifact Setup
+Before spawning, the coordinator must use an active task (`planning` or
+`in_progress`), define one stable `work_id` and
+`subnode_id`, then prepare a brief-draft JSON with the question, independence
+reason, scope, protected targets, lens, evidence method, source snapshot,
+dependencies, stop conditions, deadline, `channel_ref`, `retry_of: null`, and
+`counter_of` (null unless this is intentional counterwork). The helper supplies
+the immutable task identity and report path.
+```bash
+TASK=.trellis/tasks/09-07-example
+WORK_ID=security-audit
+SUBNODE_ID=dependency-evidence
+python3 .trellis/scripts/subnode_artifact.py init \
+  --task "$TASK" \
+  --work-id "$WORK_ID" \
+  --subnode-id "$SUBNODE_ID" \
+  --draft /tmp/subnode-brief.json
+```
+This creates exactly:
+```text
+$TASK/subnodes/$WORK_ID/$SUBNODE_ID/
+  brief.json     # coordinator-owned and immutable after dispatch
+  worklog.md     # subnode appends material progress and corrections
+  report.json    # subnode-owned final pending-review result
+```
+Do not use a terminal Channel message as the report transport. The short final
+message names the already-written `report.json` and its status; the durable
+JSON file carries the reviewable result.
+The subnode copies identity, scope, and lens from `brief.json`, then uses the
+SHA-256 digest of the exact `brief.json` bytes. The minimal complete report is:
+```json
+{
+  "schema_version": 1,
+  "task_id": "task-id-from-brief",
+  "work_id": "work-id-from-brief",
+  "subnode_id": "subnode-id-from-brief",
+  "role_id": "subnode",
+  "brief_digest": "sha256-of-brief-json-bytes",
+  "status": "complete",
+  "scope": ["exact scope copied from brief"],
+  "lens": "exact lens copied from brief",
+  "evidence": [
+    {
+      "id": "stable-evidence-id",
+      "locator": "source path, URL, or command receipt",
+      "summary": "What this independently reviewable evidence establishes."
+    }
+  ],
+  "findings": ["Bounded conclusion."],
+  "uncertainties": [],
+  "corrections": []
+}
+```
+For `blocked`, `incomplete`, or `error`, include the same base fields plus a
+non-empty `completed_scope` list and a non-empty `blocker` string. Never use
+`accepted`, `rejected`, or `deferred` as a report status.
+## Dispatch And Wait
+Inspect the installed role first, then use one native Channel lifecycle:
+```bash
+trellis channel create subnode-example --by main --cwd "$PWD"
+trellis channel spawn subnode-example --agent subnode --provider codex \
+  --as "$SUBNODE_ID" --cwd "$PWD" --timeout 30m
+printf '%s\n' "Read $TASK/subnodes/$WORK_ID/$SUBNODE_ID/brief.json and perform only that bounded work." \
+  | trellis channel send subnode-example --as main --to "$SUBNODE_ID" \
+      --stdin --delivery-mode requireRunningWorker
+trellis channel wait subnode-example --as main --from "$SUBNODE_ID" \
+  --kind done,error --timeout 30m
+```
+Where the host exposes a live wait continuation, establish one waiter and
+continue that same waiter until terminal state. Do not poll messages, create a
+second waiter, or treat an empty transport slice as completion. The normal CLI
+surface uses the documented single `send` followed by native `wait` pattern.
+## Coordinator Review
+After a terminal message, independently validate and then record a task-level
+disposition. `complete` means only that the subnode claims it completed its
+assigned work; it is not acceptance.
+```bash
+REPORT="$TASK/subnodes/$WORK_ID/$SUBNODE_ID/report.json"
+python3 .trellis/scripts/subnode_artifact.py validate --report "$REPORT"
+```
+The coordinator must re-check enough source evidence and protected-target state
+to decide `accepted`, `rejected`, or `deferred`, preserving the reason and named
+checks such as `report_validation`, `source_recheck`, and
+`protected_target_check` in task research or a decision record. The validator
+does not make that decision and does not modify `task.json`.
+Use the separate coordinator work-record helper only for a durable cross-task
+observation, decision, open question, or blocker. It does not substitute for a
+task artifact or subnode worklog.
+```bash
+python3 .trellis/scripts/workspace_note.py \
+  --kind decision \
+  --summary "Accepted independent dependency evidence for the release gate." \
+  --source "$REPORT"
+```
+## Counterwork
+Counterwork is a new, independently scoped subnode, not a retry. It must use a
+different `subnode_id`, lens, and evidence identities, and its brief sets
+`counter_of` to the primary subnode ID. After both reports are complete:
+```bash
+python3 .trellis/scripts/subnode_artifact.py validate-counter \
+  --primary "$TASK/subnodes/$WORK_ID/primary" \
+  --counter "$TASK/subnodes/$WORK_ID/counter"
+```
+The coordinator compares the two reports and retains the comparison as part of
+its own disposition. No scheduler, polling loop, automatic retry, worktree,
+global ledger, or provider-specific transport is introduced by this workflow.

package/dist/templates/shared-hooks/inject-workflow-state.py CHANGED Viewed

@@ -286,13 +286,14 @@ def prompt_has_skip_keyword(prompt: str, keyword: str) -> bool:
 def _resolve_codex_dispatch_mode(config: dict) -> str:
     """Normalize `codex.dispatch_mode` from .trellis/config.yaml to "auto" or "inline".
-    Defaults to `auto`. The legacy `sub-agent` value is an alias for `auto`.
-    Any other explicit value (including invalid ones) falls back to `inline`
+    Defaults to `inline`. `auto` explicitly enables native dispatch; the
+    legacy `sub-agent` value is an alias for `auto`. Any other explicit value
+    (including invalid ones) falls back to `inline`
     without per-turn warnings. Shared by `_codex_mode_banner` (the per-turn
     banner) and `resolve_breadcrumb_key` (the breadcrumb tag key) so the two
     stay in lockstep.
     """
-    mode = "auto"
+    mode = "inline"
     if isinstance(config, dict):
         codex_cfg = config.get("codex")
         if isinstance(codex_cfg, dict):
@@ -310,16 +311,16 @@ def _codex_mode_banner(config: dict) -> str:
     """Emit a `<codex-mode>` banner for the additionalContext payload.
     Reads `codex.dispatch_mode` from .trellis/config.yaml; defaults to
-    `auto`, which dispatches Trellis sub-agents using native Codex context
+    `inline`, so the main session implements and checks directly. `auto`
+    explicitly dispatches Trellis sub-agents using native Codex context
     injection with a child-side fallback. This does not rely on inherited
     parent transcripts: `fork_turns` remains caller-controlled, and
     fresh-history sub-agents still receive their explicit delegated task and
-    inherited session configuration. `inline` is an explicit opt-out; the
-    legacy `sub-agent` value is an alias for `auto`. Invalid explicit values
-    fall back to `inline` without per-turn warnings. The banner makes the
-    active mode explicit to Codex AI per turn, complementing the workflow-state
-    body which is per-status. Mode tells AI which dispatch protocol to follow;
-    workflow-state tells AI what step it's at.
+    inherited session configuration. The legacy `sub-agent` value is an alias
+    for `auto`. Invalid explicit values fall back to `inline` without per-turn
+    warnings. The banner makes the active mode explicit to Codex AI per turn,
+    complementing the workflow-state body which is per-status. Mode tells AI
+    which dispatch protocol to follow; workflow-state tells AI what step it's at.
     """
     mode = _resolve_codex_dispatch_mode(config)
     if mode == "auto":
@@ -341,12 +342,12 @@ def resolve_breadcrumb_key(
 ) -> str:
     """Pick the breadcrumb tag key based on Codex dispatch_mode.
-    Codex defaults to ``auto`` and therefore uses the ordinary ``<status>``
-    breadcrumb for native SubagentStart dispatch with child-side fallback;
-    it does not depend on an inherited parent transcript. ``inline`` selects
-    the parallel ``<status>-inline`` tag; ``sub-agent`` remains an alias for
-    ``auto``. Invalid explicit values fall back to inline without per-turn
-    warnings.
+    Codex defaults to ``inline`` and therefore uses the parallel
+    ``<status>-inline`` breadcrumb for main-session execution. Explicit
+    ``auto`` uses the ordinary ``<status>`` breadcrumb for native
+    SubagentStart dispatch with child-side fallback; ``sub-agent`` remains an
+    alias for ``auto``. Invalid explicit values fall back to inline without
+    per-turn warnings.
     Non-codex platforms return the plain status unchanged.
     """

package/dist/templates/trellis/agents/subnode.md ADDED Viewed

@@ -0,0 +1,63 @@
+---
+name: subnode
+description: |
+  Bounded independent-evidence worker. It preserves its assigned task artifacts,
+  never changes protected target files, and leaves acceptance to the coordinator.
+provider: codex
+labels: [trellis, subnode]
+---
+# Subnode (channel runtime)
+You are a bounded Trellis subnode spawned through `trellis channel`. Your job is
+to produce independently reviewable evidence for one assigned question. You are
+not an implementation worker, task owner, reviewer-of-record, or Git operator.
+## Required Context
+Before starting, read the `brief.json` path named in the coordinator message.
+It fixes your task identity, scope, protected targets, evidence method, source
+snapshot, deadline, stop conditions, channel handle, and final `report_path`.
+Read the necessary current project and external sources needed to answer that
+brief. A source snapshot records evidence; it is not a filesystem allowlist.
+## Ownership And Write Boundary
+You may write only within the artifact directory named by the brief:
+- `worklog.md` — append substantive observations, corrections, blockers, and
+  completion notes as they occur.
+- `report.json` — write your one final pending-review report at the exact path
+  in `brief.json`.
+Do not modify `brief.json`. Do not edit any protected target, business source,
+test, task artifact, project rule, coordinator workspace note, or unrelated
+file. Do not run Git commands that change state (`commit`, `push`, `merge`,
+`rebase`, `reset`, `checkout`, `stash`, or branch/worktree operations). Do not
+spawn or control another worker. These are behavioral requirements, not a
+sandbox claim.
+## Work Method
+1. Confirm the brief identity and artifact paths before doing substantive work.
+2. Inspect evidence using the stated lens and method. Keep the assigned scope
+   narrow; stop when a stop condition is met or the evidence is sufficient.
+3. Append a concise worklog entry when you make a material discovery, retract a
+   conclusion, encounter a blocker, or finish. Preserve corrections rather
+   than silently rewriting the historical trail.
+4. Write `report.json` only when you are ready to stop. Its status is one of
+   `complete`, `blocked`, `incomplete`, or `error`; it is always
+   **pending coordinator review**, never accepted/rejected/deferred.
+5. A complete report includes independently checkable evidence. A non-complete
+   report explains completed scope and the blocker or error. Include the exact
+   identity, scope, lens, and SHA-256 digest of `brief.json` required by the
+   artifact helper.
+6. Send one short terminal Channel message with the status and report path.
+   Do not place the report JSON in Channel text.
+## Report Boundary
+The coordinator independently runs the artifact validator and then records the
+task disposition (`accepted`, `rejected`, or `deferred`) with its own source and
+protected-target checks. Do not claim that a report has been accepted, and do
+not infer a disposition from a successful Channel delivery.

package/dist/templates/trellis/config.yaml CHANGED Viewed

@@ -110,14 +110,14 @@ channel:
 #-------------------------------------------------------------------------------
 # Codex (dispatch behavior)
 #-------------------------------------------------------------------------------
-# Codex-only knob; other platforms ignore it. Default ("auto") dispatches
-# trellis-implement / trellis-check / trellis-research sub-agents. This does
-# not rely on inherited parent transcripts: `fork_turns` remains
-# caller-controlled, while Codex's native SubagentStart hook injects task
-# context when trusted and child-side loading remains the fallback when it is
-# unavailable. Set to "inline" only to keep implementation and checks in the
-# main session. "sub-agent" remains a backwards-compatible alias for "auto".
-# Invalid explicit values safely use inline mode.
+# Codex-only knob; other platforms ignore it. The default is "inline": the
+# main session performs implementation and checks directly. Set "auto" only
+# to opt in to trellis-implement / trellis-check / trellis-research native
+# sub-agents. Their task context does not rely on inherited parent transcripts:
+# `fork_turns` remains caller-controlled, while Codex's native SubagentStart
+# hook injects context when trusted and child-side loading remains the fallback
+# when it is unavailable. "sub-agent" remains a backwards-compatible alias
+# for "auto". Invalid explicit values safely use inline mode.
 #
 # In "auto" mode, dispatched sub-agents inherit the main session's model
 # unless you pin one. To use a cheaper/faster model for implement/check/
@@ -127,7 +127,7 @@ channel:
 # `trellis update` preserves your edits across regeneration.
 #
 # codex:
-#   dispatch_mode: auto  # or "inline"; legacy alias: "sub-agent"
+#   dispatch_mode: auto  # opt in to native sub-agents; default: "inline"; legacy alias: "sub-agent"
 #-------------------------------------------------------------------------------
 # Sub-agent context injection limits