@zhushanwen/zcode-subagent-cli 0.4.2 → 0.4.4

package/dist/{chunk-F6YT6OGA.js → chunk-DLLNMF45.js}

@@ -328,9 +328,9 @@ import {
   sessionIdFromHandle
 } from "@zhushanwen/subagent-engine-sdk";
 function replayJournalToSessionView(handle, engineId) {
-  const journalPath = handle.data.journalPath;
-  if (journalPath === void 0) return void 0;
-  const events = replayJournal2(journalPath);
+  const eventsPath = handle.data.eventsPath;
+  if (eventsPath === void 0) return void 0;
+  const events = replayJournal2(eventsPath);
   if (events.length === 0) return void 0;
   return eventsToSessionView(events, engineId, sessionIdFromHandle(handle.data));
 }
@@ -2560,10 +2560,7 @@ var ZcodeEngine = class {
       engineId: ZCODE_ENGINE_ID,
       content: "",
       durationMs: Date.now() - startedAt,
-      ...typeof task.worktree === "object" && task.worktree !== null ? { worktreePath: task.worktree.path } : {},
-      // D9① fallback 留痕：路由层经 RunContext 投影（zcode 无 record 通路，outcome 是
-      // 唯一留痕面；pi 引擎另有 record 投影）
-      ...ctx.engineFallback !== void 0 ? { engineFallback: ctx.engineFallback } : {}
+      ...typeof task.worktree === "object" && task.worktree !== null ? { worktreePath: task.worktree.path } : {}
     };
     const emit = (event) => {
       ctx.onEvent?.(event);
@@ -2658,7 +2655,7 @@ var ZcodeEngine = class {
    * D6 read 三级降级：①sqlite 原生读取 → ②宿主 event journal 重放（对齐点①接线：
    * replayJournalToSessionView 复用 live reducer，重放等价性见 §3.3.6）→ ③outcome-only。
    * sessionId 缺失（解析失败的 run 无法定位 session）跳过①级；②级依赖
-   * handle.journalPath（宿主 run 后回填）。dbPath：新 handle 恒为隔离库绝对路径
+   * handle.eventsPath（宿主 run 后回填）。dbPath：新 handle 恒为隔离库绝对路径
    * （zcodeSessionDbPath(engineDataDir)，tier1 白名单集合见方法体——宿主路径仅
    * 「共享 HOME 时代」存量兼容）；旧 records（池时代）的相对路径仍按池目录锚定
    * 解析（read 兼容旧数据，池目录不存在时自然落②级 journal 降级）。[池抽象降级
@@ -3076,24 +3073,32 @@ function createDefaultZcodeEngine() {
 
 // src/server.ts
 import {
-  ENGINE_PROTOCOL_VERSION,
   EngineSdkError,
-  getLogger as getLogger5,
-  isResponseFrame,
-  isReverseRequestFrame
+  getLogger as getLogger5
 } from "@zhushanwen/subagent-engine-sdk";
 
 // src/port-types.ts
 import { parseCtxModel } from "@zhushanwen/subagent-engine-sdk";
 
 // src/server.ts
+import {
+  assembleFullTask,
+  handleInboundFrame,
+  initializeEngine,
+  notInitializedError,
+  sendReverseRequest,
+  unknownMethodError,
+  writeRunEvent,
+  REVERSE_TIMEOUT_DEFAULT_MS,
+  toProtocolError as toProtocolErrorShared
+} from "@zhushanwen/subagent-engine-sdk/server";
 var logger5 = getLogger5("subagents");
-var REVERSE_TIMEOUT_DEFAULT_MS = 6e4;
 var EngineProtocolServer = class {
   write;
   engine;
   reverseClock;
   reverseTimeoutMs;
+  frameLoop;
   activeRuns = /* @__PURE__ */ new Map();
   reversePending = /* @__PURE__ */ new Map();
   revSeq = 0;
@@ -3103,45 +3108,21 @@ var EngineProtocolServer = class {
     this.engine = opts.engine ?? createDefaultZcodeEngine();
     this.reverseClock = opts.reverseClock;
     this.reverseTimeoutMs = opts.reverseTimeoutMs ?? REVERSE_TIMEOUT_DEFAULT_MS;
+    this.frameLoop = {
+      write: this.write,
+      settleReverse: (id, frame) => this.settleReverse(id, frame),
+      dispatch: (id, method, params) => this.dispatch(id, method, params),
+      toError: (err) => toProtocolError(err)
+    };
   }
   /** 入站帧消费（请求帧 + 反向请求应答帧；main.ts 的行解析器拆行后喂入）。 */
   handleFrame(frame) {
-    if (isResponseFrame(frame)) {
-      this.settleReverse(frame.id, frame);
-      return;
-    }
-    if (isReverseRequestFrame(frame)) {
-      this.write({
-        id: 0,
-        error: {
-          code: "engine_protocol_bad_frame",
-          message: `unexpected reverse request frame from host: ${String(frame.method)}`,
-          recovery: "The engine protocol v1 only carries host/* requests engine\u2192host."
-        }
-      });
-      return;
-    }
-    if (typeof frame === "object" && frame !== null && "id" in frame && "method" in frame && typeof frame.method === "string") {
-      const { id, method, params } = frame;
-      if (typeof id === "number") {
-        void this.dispatch(id, method, params).then(
-          (result) => this.write({ id, result }),
-          (err) => this.write({ id, error: toProtocolError(err) })
-        );
-        return;
-      }
-    }
+    handleInboundFrame(frame, this.frameLoop);
   }
   /** 9 正向方法分发（表驱动：method → 处理器；未知方法 → engine_protocol_unknown_method）。 */
   async dispatch(id, method, params) {
     const handler = this.methodHandlers[method];
-    if (handler === void 0) {
-      throw new EngineSdkError(
-        "engine_protocol_unknown_method",
-        `unknown protocol method: ${method} (request id ${id})`,
-        "The engine speaks protocol v1; check the installed engine package version vs the host."
-      );
-    }
+    if (handler === void 0) throw unknownMethodError(id, method);
     return handler(params);
   }
   /**
@@ -3164,42 +3145,23 @@ var EngineProtocolServer = class {
   };
   // ── initialize：版本协商（越界 → engine_protocol_mismatch）+ 能力应答 ──
   initialize(params) {
-    if (params?.protocolVersion !== ENGINE_PROTOCOL_VERSION) {
-      throw new EngineSdkError(
-        "engine_protocol_mismatch",
-        `host protocol version ${String(params?.protocolVersion)} is not compatible with engine protocol v${ENGINE_PROTOCOL_VERSION}`,
-        `Upgrade the engine package or the host so both speak protocol v${ENGINE_PROTOCOL_VERSION}.`
-      );
-    }
-    this.initialized = true;
-    const models = this.engine.listModels?.() ?? null;
-    return {
-      protocolVersion: ENGINE_PROTOCOL_VERSION,
+    const result = initializeEngine(params, {
       engineId: this.engine.id,
-      engineVersion: ZCODE_ADAPTER_VERSION,
       adapterVersion: ZCODE_ADAPTER_VERSION,
       capabilities: this.engine.capabilities(),
-      ...models !== null ? { models: models.map((m) => ({ id: m.id })) } : {}
-    };
+      listModels: () => this.engine.listModels?.() ?? null
+    });
+    this.initialized = true;
+    return result;
   }
   // ── run：协议载荷 → 本地 AgentCallOpts/RunContext；事件 → 通知/host 通道 ──
   async run(params) {
-    if (!this.initialized) {
-      throw new EngineSdkError(
-        "engine_protocol_not_initialized",
-        "run before initialize is a protocol violation",
-        "The host must complete the initialize handshake before dispatching runs."
-      );
-    }
+    if (!this.initialized) throw notInitializedError();
     const { runId, task, ctx } = params;
     const controller = new AbortController();
     const active = { controller, seq: 0 };
     this.activeRuns.set(runId, active);
-    const fullTask = {
-      ...task,
-      ...ctx.model !== void 0 ? { model: ctx.model } : {},
-      ...ctx.cwd !== void 0 ? { cwd: ctx.cwd } : {}
-    };
+    const fullTask = assembleFullTask(task, ctx);
     const ctxModel = parseCtxModel(ctx.ctxModel);
     const stream = ctx.streamMode === "stream" ? {
       onDelta: (delta) => {
@@ -3212,7 +3174,6 @@ var EngineProtocolServer = class {
       onEvent: (event) => this.emitEvent(runId, event),
       ...ctxModel !== void 0 ? { ctxModel } : {},
       ...stream !== void 0 ? { stream } : {},
-      ...ctx.engineFallback !== void 0 ? { engineFallback: ctx.engineFallback } : {},
       // [U6 / §3.2.6 要点 3] resume 锚点透传（宿主 → 引擎的续聊通道：zcode 锚
       // sessionRef {sessionId, dbPath}，引擎侧 resume 读 + 新 session 注入消费）。
       ...params.resume !== void 0 ? { resume: params.resume } : {},
@@ -3247,9 +3208,7 @@ var EngineProtocolServer = class {
   }
   // ── 出站：事件通知 + 反向请求客户端 ──
   emitEvent(runId, event) {
-    const active = this.activeRuns.get(runId);
-    const seq = active !== void 0 ? ++active.seq : 0;
-    this.write({ method: "event", params: { runId, seq, event } });
+    writeRunEvent(this.write, this.activeRuns, runId, event);
   }
   /**
    * 发反向请求并等应答（帧④必须应答）。计时面登记：发出 → clock.started；收到
@@ -3275,25 +3234,17 @@ var EngineProtocolServer = class {
     return this.reverseRequestInternal(method, params);
   }
   reverseRequestInternal(method, params) {
-    const id = `rev-${++this.revSeq}`;
-    return new Promise((resolve2, reject) => {
-      const timer = setTimeout(() => {
-        this.reversePending.delete(id);
-        this.reverseClock?.settled(id);
-        reject(new Error(`reverse request ${method} (${id}) timed out after ${this.reverseTimeoutMs}ms`));
-      }, this.reverseTimeoutMs);
-      if (typeof timer.unref === "function") timer.unref();
-      this.reversePending.set(id, { resolve: resolve2, reject, timer });
-      this.reverseClock?.started(id);
-      try {
-        this.write({ id, method, params });
-      } catch (err) {
-        this.reversePending.delete(id);
-        clearTimeout(timer);
-        this.reverseClock?.settled(id);
-        reject(new Error(`reverse request ${method} (${id}) could not be written: ${toErrorMessage(err)}`));
-      }
-    });
+    return sendReverseRequest(
+      {
+        write: this.write,
+        pending: this.reversePending,
+        timeoutMs: this.reverseTimeoutMs,
+        ...this.reverseClock !== void 0 ? { clock: this.reverseClock } : {},
+        nextId: () => `rev-${++this.revSeq}`
+      },
+      method,
+      params
+    );
   }
   /** 反向请求应答落位（ack 两阶段：{ack:true}/{unsupported:true}/{ok:true} 均先 ack 计时面）。 */
   settleReverse(id, frame) {
@@ -3310,13 +3261,9 @@ var EngineProtocolServer = class {
 function probeParamsOf(params) {
   return typeof params === "object" && params !== null ? params : void 0;
 }
+var RUN_FAILURE_RECOVERY = "Check the engine process logs (engineDataDir/logs/) and rerun; if persistent, reinstall or upgrade the engine package.";
 function toProtocolError(err) {
-  if (err instanceof EngineSdkError) return err.toStructured();
-  return {
-    code: "engine_run_failed",
-    message: toErrorMessage(err),
-    recovery: "Check the engine process logs (engineDataDir/logs/) and rerun; if persistent, reinstall or upgrade the engine package."
-  };
+  return toProtocolErrorShared(err, RUN_FAILURE_RECOVERY);
 }
 
 export {

package/dist/index.cjs

@@ -104,9 +104,9 @@ var import_subagent_engine_sdk11 = require("@zhushanwen/subagent-engine-sdk");
 var import_subagent_engine_sdk = require("@zhushanwen/subagent-engine-sdk");
 var import_subagent_engine_sdk2 = require("@zhushanwen/subagent-engine-sdk");
 function replayJournalToSessionView(handle, engineId) {
-  const journalPath = handle.data.journalPath;
-  if (journalPath === void 0) return void 0;
-  const events = (0, import_subagent_engine_sdk2.replayJournal)(journalPath);
+  const eventsPath = handle.data.eventsPath;
+  if (eventsPath === void 0) return void 0;
+  const events = (0, import_subagent_engine_sdk2.replayJournal)(eventsPath);
   if (events.length === 0) return void 0;
   return (0, import_subagent_engine_sdk2.eventsToSessionView)(events, engineId, (0, import_subagent_engine_sdk2.sessionIdFromHandle)(handle.data));
 }
@@ -2578,10 +2578,7 @@ var ZcodeEngine = class {
       engineId: ZCODE_ENGINE_ID,
       content: "",
       durationMs: Date.now() - startedAt,
-      ...typeof task.worktree === "object" && task.worktree !== null ? { worktreePath: task.worktree.path } : {},
-      // D9① fallback 留痕：路由层经 RunContext 投影（zcode 无 record 通路，outcome 是
-      // 唯一留痕面；pi 引擎另有 record 投影）
-      ...ctx.engineFallback !== void 0 ? { engineFallback: ctx.engineFallback } : {}
+      ...typeof task.worktree === "object" && task.worktree !== null ? { worktreePath: task.worktree.path } : {}
     };
     const emit = (event) => {
       ctx.onEvent?.(event);
@@ -2676,7 +2673,7 @@ var ZcodeEngine = class {
    * D6 read 三级降级：①sqlite 原生读取 → ②宿主 event journal 重放（对齐点①接线：
    * replayJournalToSessionView 复用 live reducer，重放等价性见 §3.3.6）→ ③outcome-only。
    * sessionId 缺失（解析失败的 run 无法定位 session）跳过①级；②级依赖
-   * handle.journalPath（宿主 run 后回填）。dbPath：新 handle 恒为隔离库绝对路径
+   * handle.eventsPath（宿主 run 后回填）。dbPath：新 handle 恒为隔离库绝对路径
    * （zcodeSessionDbPath(engineDataDir)，tier1 白名单集合见方法体——宿主路径仅
    * 「共享 HOME 时代」存量兼容）；旧 records（池时代）的相对路径仍按池目录锚定
    * 解析（read 兼容旧数据，池目录不存在时自然落②级 journal 降级）。[池抽象降级
@@ -3095,13 +3092,14 @@ function createDefaultZcodeEngine() {
 var import_subagent_engine_sdk13 = require("@zhushanwen/subagent-engine-sdk");
 
 // src/server.ts
+var import_server = require("@zhushanwen/subagent-engine-sdk/server");
 var logger5 = (0, import_subagent_engine_sdk14.getLogger)("subagents");
-var REVERSE_TIMEOUT_DEFAULT_MS = 6e4;
 var EngineProtocolServer = class {
   write;
   engine;
   reverseClock;
   reverseTimeoutMs;
+  frameLoop;
   activeRuns = /* @__PURE__ */ new Map();
   reversePending = /* @__PURE__ */ new Map();
   revSeq = 0;
@@ -3110,46 +3108,22 @@ var EngineProtocolServer = class {
     this.write = opts.write;
     this.engine = opts.engine ?? createDefaultZcodeEngine();
     this.reverseClock = opts.reverseClock;
-    this.reverseTimeoutMs = opts.reverseTimeoutMs ?? REVERSE_TIMEOUT_DEFAULT_MS;
+    this.reverseTimeoutMs = opts.reverseTimeoutMs ?? import_server.REVERSE_TIMEOUT_DEFAULT_MS;
+    this.frameLoop = {
+      write: this.write,
+      settleReverse: (id, frame) => this.settleReverse(id, frame),
+      dispatch: (id, method, params) => this.dispatch(id, method, params),
+      toError: (err) => toProtocolError(err)
+    };
   }
   /** 入站帧消费（请求帧 + 反向请求应答帧；main.ts 的行解析器拆行后喂入）。 */
   handleFrame(frame) {
-    if ((0, import_subagent_engine_sdk14.isResponseFrame)(frame)) {
-      this.settleReverse(frame.id, frame);
-      return;
-    }
-    if ((0, import_subagent_engine_sdk14.isReverseRequestFrame)(frame)) {
-      this.write({
-        id: 0,
-        error: {
-          code: "engine_protocol_bad_frame",
-          message: `unexpected reverse request frame from host: ${String(frame.method)}`,
-          recovery: "The engine protocol v1 only carries host/* requests engine\u2192host."
-        }
-      });
-      return;
-    }
-    if (typeof frame === "object" && frame !== null && "id" in frame && "method" in frame && typeof frame.method === "string") {
-      const { id, method, params } = frame;
-      if (typeof id === "number") {
-        void this.dispatch(id, method, params).then(
-          (result) => this.write({ id, result }),
-          (err) => this.write({ id, error: toProtocolError(err) })
-        );
-        return;
-      }
-    }
+    (0, import_server.handleInboundFrame)(frame, this.frameLoop);
   }
   /** 9 正向方法分发（表驱动：method → 处理器；未知方法 → engine_protocol_unknown_method）。 */
   async dispatch(id, method, params) {
     const handler = this.methodHandlers[method];
-    if (handler === void 0) {
-      throw new import_subagent_engine_sdk14.EngineSdkError(
-        "engine_protocol_unknown_method",
-        `unknown protocol method: ${method} (request id ${id})`,
-        "The engine speaks protocol v1; check the installed engine package version vs the host."
-      );
-    }
+    if (handler === void 0) throw (0, import_server.unknownMethodError)(id, method);
     return handler(params);
   }
   /**
@@ -3172,42 +3146,23 @@ var EngineProtocolServer = class {
   };
   // ── initialize：版本协商（越界 → engine_protocol_mismatch）+ 能力应答 ──
   initialize(params) {
-    if (params?.protocolVersion !== import_subagent_engine_sdk14.ENGINE_PROTOCOL_VERSION) {
-      throw new import_subagent_engine_sdk14.EngineSdkError(
-        "engine_protocol_mismatch",
-        `host protocol version ${String(params?.protocolVersion)} is not compatible with engine protocol v${import_subagent_engine_sdk14.ENGINE_PROTOCOL_VERSION}`,
-        `Upgrade the engine package or the host so both speak protocol v${import_subagent_engine_sdk14.ENGINE_PROTOCOL_VERSION}.`
-      );
-    }
-    this.initialized = true;
-    const models = this.engine.listModels?.() ?? null;
-    return {
-      protocolVersion: import_subagent_engine_sdk14.ENGINE_PROTOCOL_VERSION,
+    const result = (0, import_server.initializeEngine)(params, {
       engineId: this.engine.id,
-      engineVersion: ZCODE_ADAPTER_VERSION,
       adapterVersion: ZCODE_ADAPTER_VERSION,
       capabilities: this.engine.capabilities(),
-      ...models !== null ? { models: models.map((m) => ({ id: m.id })) } : {}
-    };
+      listModels: () => this.engine.listModels?.() ?? null
+    });
+    this.initialized = true;
+    return result;
   }
   // ── run：协议载荷 → 本地 AgentCallOpts/RunContext；事件 → 通知/host 通道 ──
   async run(params) {
-    if (!this.initialized) {
-      throw new import_subagent_engine_sdk14.EngineSdkError(
-        "engine_protocol_not_initialized",
-        "run before initialize is a protocol violation",
-        "The host must complete the initialize handshake before dispatching runs."
-      );
-    }
+    if (!this.initialized) throw (0, import_server.notInitializedError)();
     const { runId, task, ctx } = params;
     const controller = new AbortController();
     const active = { controller, seq: 0 };
     this.activeRuns.set(runId, active);
-    const fullTask = {
-      ...task,
-      ...ctx.model !== void 0 ? { model: ctx.model } : {},
-      ...ctx.cwd !== void 0 ? { cwd: ctx.cwd } : {}
-    };
+    const fullTask = (0, import_server.assembleFullTask)(task, ctx);
     const ctxModel = (0, import_subagent_engine_sdk13.parseCtxModel)(ctx.ctxModel);
     const stream = ctx.streamMode === "stream" ? {
       onDelta: (delta) => {
@@ -3220,7 +3175,6 @@ var EngineProtocolServer = class {
       onEvent: (event) => this.emitEvent(runId, event),
       ...ctxModel !== void 0 ? { ctxModel } : {},
       ...stream !== void 0 ? { stream } : {},
-      ...ctx.engineFallback !== void 0 ? { engineFallback: ctx.engineFallback } : {},
       // [U6 / §3.2.6 要点 3] resume 锚点透传（宿主 → 引擎的续聊通道：zcode 锚
       // sessionRef {sessionId, dbPath}，引擎侧 resume 读 + 新 session 注入消费）。
       ...params.resume !== void 0 ? { resume: params.resume } : {},
@@ -3255,9 +3209,7 @@ var EngineProtocolServer = class {
   }
   // ── 出站：事件通知 + 反向请求客户端 ──
   emitEvent(runId, event) {
-    const active = this.activeRuns.get(runId);
-    const seq = active !== void 0 ? ++active.seq : 0;
-    this.write({ method: "event", params: { runId, seq, event } });
+    (0, import_server.writeRunEvent)(this.write, this.activeRuns, runId, event);
   }
   /**
    * 发反向请求并等应答（帧④必须应答）。计时面登记：发出 → clock.started；收到
@@ -3283,25 +3235,17 @@ var EngineProtocolServer = class {
     return this.reverseRequestInternal(method, params);
   }
   reverseRequestInternal(method, params) {
-    const id = `rev-${++this.revSeq}`;
-    return new Promise((resolve2, reject) => {
-      const timer = setTimeout(() => {
-        this.reversePending.delete(id);
-        this.reverseClock?.settled(id);
-        reject(new Error(`reverse request ${method} (${id}) timed out after ${this.reverseTimeoutMs}ms`));
-      }, this.reverseTimeoutMs);
-      if (typeof timer.unref === "function") timer.unref();
-      this.reversePending.set(id, { resolve: resolve2, reject, timer });
-      this.reverseClock?.started(id);
-      try {
-        this.write({ id, method, params });
-      } catch (err) {
-        this.reversePending.delete(id);
-        clearTimeout(timer);
-        this.reverseClock?.settled(id);
-        reject(new Error(`reverse request ${method} (${id}) could not be written: ${(0, import_subagent_engine_sdk4.toErrorMessage)(err)}`));
-      }
-    });
+    return (0, import_server.sendReverseRequest)(
+      {
+        write: this.write,
+        pending: this.reversePending,
+        timeoutMs: this.reverseTimeoutMs,
+        ...this.reverseClock !== void 0 ? { clock: this.reverseClock } : {},
+        nextId: () => `rev-${++this.revSeq}`
+      },
+      method,
+      params
+    );
   }
   /** 反向请求应答落位（ack 两阶段：{ack:true}/{unsupported:true}/{ok:true} 均先 ack 计时面）。 */
   settleReverse(id, frame) {
@@ -3318,13 +3262,9 @@ var EngineProtocolServer = class {
 function probeParamsOf(params) {
   return typeof params === "object" && params !== null ? params : void 0;
 }
+var RUN_FAILURE_RECOVERY = "Check the engine process logs (engineDataDir/logs/) and rerun; if persistent, reinstall or upgrade the engine package.";
 function toProtocolError(err) {
-  if (err instanceof import_subagent_engine_sdk14.EngineSdkError) return err.toStructured();
-  return {
-    code: "engine_run_failed",
-    message: (0, import_subagent_engine_sdk4.toErrorMessage)(err),
-    recovery: "Check the engine process logs (engineDataDir/logs/) and rerun; if persistent, reinstall or upgrade the engine package."
-  };
+  return (0, import_server.toProtocolError)(err, RUN_FAILURE_RECOVERY);
 }
 
 // src/golden-sample.ts

package/dist/index.d.cts

@@ -1,7 +1,6 @@
 import { EnginePort, ReverseRequestClock, EngineCapabilities, ProbeReport, EngineAgentCallOpts, RunContext, EngineRunResult, EngineHandle, SessionView } from '@zhushanwen/subagent-engine-sdk';
+import { FrameWriter } from '@zhushanwen/subagent-engine-sdk/server';
 
-/** 出站帧写入面（main.ts 注入 process.stdout；测试注入内存缓冲）。 */
-type FrameWriter = (frame: unknown) => void;
 /** 入站帧来源（ readline 已拆行的请求帧 + 反向请求应答帧混流）。 */
 interface EngineProtocolServerOptions {
     /** stdout 写入面（每帧一行 JSON）。 */
@@ -23,6 +22,7 @@ declare class EngineProtocolServer {
     private readonly engine;
     private readonly reverseClock;
     private readonly reverseTimeoutMs;
+    private readonly frameLoop;
     private readonly activeRuns;
     private readonly reversePending;
     private revSeq;
@@ -283,7 +283,7 @@ declare class ZcodeEngine implements EnginePort {
      * D6 read 三级降级：①sqlite 原生读取 → ②宿主 event journal 重放（对齐点①接线：
      * replayJournalToSessionView 复用 live reducer，重放等价性见 §3.3.6）→ ③outcome-only。
      * sessionId 缺失（解析失败的 run 无法定位 session）跳过①级；②级依赖
-     * handle.journalPath（宿主 run 后回填）。dbPath：新 handle 恒为隔离库绝对路径
+     * handle.eventsPath（宿主 run 后回填）。dbPath：新 handle 恒为隔离库绝对路径
      * （zcodeSessionDbPath(engineDataDir)，tier1 白名单集合见方法体——宿主路径仅
      * 「共享 HOME 时代」存量兼容）；旧 records（池时代）的相对路径仍按池目录锚定
      * 解析（read 兼容旧数据，池目录不存在时自然落②级 journal 降级）。[池抽象降级

package/dist/index.d.ts

@@ -1,7 +1,6 @@
 import { EnginePort, ReverseRequestClock, EngineCapabilities, ProbeReport, EngineAgentCallOpts, RunContext, EngineRunResult, EngineHandle, SessionView } from '@zhushanwen/subagent-engine-sdk';
+import { FrameWriter } from '@zhushanwen/subagent-engine-sdk/server';
 
-/** 出站帧写入面（main.ts 注入 process.stdout；测试注入内存缓冲）。 */
-type FrameWriter = (frame: unknown) => void;
 /** 入站帧来源（ readline 已拆行的请求帧 + 反向请求应答帧混流）。 */
 interface EngineProtocolServerOptions {
     /** stdout 写入面（每帧一行 JSON）。 */
@@ -23,6 +22,7 @@ declare class EngineProtocolServer {
     private readonly engine;
     private readonly reverseClock;
     private readonly reverseTimeoutMs;
+    private readonly frameLoop;
     private readonly activeRuns;
     private readonly reversePending;
     private revSeq;
@@ -283,7 +283,7 @@ declare class ZcodeEngine implements EnginePort {
      * D6 read 三级降级：①sqlite 原生读取 → ②宿主 event journal 重放（对齐点①接线：
      * replayJournalToSessionView 复用 live reducer，重放等价性见 §3.3.6）→ ③outcome-only。
      * sessionId 缺失（解析失败的 run 无法定位 session）跳过①级；②级依赖
-     * handle.journalPath（宿主 run 后回填）。dbPath：新 handle 恒为隔离库绝对路径
+     * handle.eventsPath（宿主 run 后回填）。dbPath：新 handle 恒为隔离库绝对路径
      * （zcodeSessionDbPath(engineDataDir)，tier1 白名单集合见方法体——宿主路径仅
      * 「共享 HOME 时代」存量兼容）；旧 records（池时代）的相对路径仍按池目录锚定
      * 解析（read 兼容旧数据，池目录不存在时自然落②级 journal 降级）。[池抽象降级

package/dist/index.js

@@ -10,7 +10,7 @@ import {
   readZcodeSessionView,
   zcodeDbPathAllowlist,
   zcodeSessionDbPath
-} from "./chunk-F6YT6OGA.js";
+} from "./chunk-DLLNMF45.js";
 
 // src/golden-sample.ts
 var ZCODE_APPSERVER_GOLDEN = {

package/dist/main.cjs

@@ -84,9 +84,9 @@ var import_subagent_engine_sdk11 = require("@zhushanwen/subagent-engine-sdk");
 var import_subagent_engine_sdk = require("@zhushanwen/subagent-engine-sdk");
 var import_subagent_engine_sdk2 = require("@zhushanwen/subagent-engine-sdk");
 function replayJournalToSessionView(handle, engineId) {
-  const journalPath = handle.data.journalPath;
-  if (journalPath === void 0) return void 0;
-  const events = (0, import_subagent_engine_sdk2.replayJournal)(journalPath);
+  const eventsPath = handle.data.eventsPath;
+  if (eventsPath === void 0) return void 0;
+  const events = (0, import_subagent_engine_sdk2.replayJournal)(eventsPath);
   if (events.length === 0) return void 0;
   return (0, import_subagent_engine_sdk2.eventsToSessionView)(events, engineId, (0, import_subagent_engine_sdk2.sessionIdFromHandle)(handle.data));
 }
@@ -2558,10 +2558,7 @@ var ZcodeEngine = class {
       engineId: ZCODE_ENGINE_ID,
       content: "",
       durationMs: Date.now() - startedAt,
-      ...typeof task.worktree === "object" && task.worktree !== null ? { worktreePath: task.worktree.path } : {},
-      // D9① fallback 留痕：路由层经 RunContext 投影（zcode 无 record 通路，outcome 是
-      // 唯一留痕面；pi 引擎另有 record 投影）
-      ...ctx.engineFallback !== void 0 ? { engineFallback: ctx.engineFallback } : {}
+      ...typeof task.worktree === "object" && task.worktree !== null ? { worktreePath: task.worktree.path } : {}
     };
     const emit = (event) => {
       ctx.onEvent?.(event);
@@ -2656,7 +2653,7 @@ var ZcodeEngine = class {
    * D6 read 三级降级：①sqlite 原生读取 → ②宿主 event journal 重放（对齐点①接线：
    * replayJournalToSessionView 复用 live reducer，重放等价性见 §3.3.6）→ ③outcome-only。
    * sessionId 缺失（解析失败的 run 无法定位 session）跳过①级；②级依赖
-   * handle.journalPath（宿主 run 后回填）。dbPath：新 handle 恒为隔离库绝对路径
+   * handle.eventsPath（宿主 run 后回填）。dbPath：新 handle 恒为隔离库绝对路径
    * （zcodeSessionDbPath(engineDataDir)，tier1 白名单集合见方法体——宿主路径仅
    * 「共享 HOME 时代」存量兼容）；旧 records（池时代）的相对路径仍按池目录锚定
    * 解析（read 兼容旧数据，池目录不存在时自然落②级 journal 降级）。[池抽象降级
@@ -3075,13 +3072,14 @@ function createDefaultZcodeEngine() {
 var import_subagent_engine_sdk13 = require("@zhushanwen/subagent-engine-sdk");
 
 // src/server.ts
+var import_server = require("@zhushanwen/subagent-engine-sdk/server");
 var logger5 = (0, import_subagent_engine_sdk14.getLogger)("subagents");
-var REVERSE_TIMEOUT_DEFAULT_MS = 6e4;
 var EngineProtocolServer = class {
   write;
   engine;
   reverseClock;
   reverseTimeoutMs;
+  frameLoop;
   activeRuns = /* @__PURE__ */ new Map();
   reversePending = /* @__PURE__ */ new Map();
   revSeq = 0;
@@ -3090,46 +3088,22 @@ var EngineProtocolServer = class {
     this.write = opts.write;
     this.engine = opts.engine ?? createDefaultZcodeEngine();
     this.reverseClock = opts.reverseClock;
-    this.reverseTimeoutMs = opts.reverseTimeoutMs ?? REVERSE_TIMEOUT_DEFAULT_MS;
+    this.reverseTimeoutMs = opts.reverseTimeoutMs ?? import_server.REVERSE_TIMEOUT_DEFAULT_MS;
+    this.frameLoop = {
+      write: this.write,
+      settleReverse: (id, frame) => this.settleReverse(id, frame),
+      dispatch: (id, method, params) => this.dispatch(id, method, params),
+      toError: (err) => toProtocolError(err)
+    };
   }
   /** 入站帧消费（请求帧 + 反向请求应答帧；main.ts 的行解析器拆行后喂入）。 */
   handleFrame(frame) {
-    if ((0, import_subagent_engine_sdk14.isResponseFrame)(frame)) {
-      this.settleReverse(frame.id, frame);
-      return;
-    }
-    if ((0, import_subagent_engine_sdk14.isReverseRequestFrame)(frame)) {
-      this.write({
-        id: 0,
-        error: {
-          code: "engine_protocol_bad_frame",
-          message: `unexpected reverse request frame from host: ${String(frame.method)}`,
-          recovery: "The engine protocol v1 only carries host/* requests engine\u2192host."
-        }
-      });
-      return;
-    }
-    if (typeof frame === "object" && frame !== null && "id" in frame && "method" in frame && typeof frame.method === "string") {
-      const { id, method, params } = frame;
-      if (typeof id === "number") {
-        void this.dispatch(id, method, params).then(
-          (result) => this.write({ id, result }),
-          (err) => this.write({ id, error: toProtocolError(err) })
-        );
-        return;
-      }
-    }
+    (0, import_server.handleInboundFrame)(frame, this.frameLoop);
   }
   /** 9 正向方法分发（表驱动：method → 处理器；未知方法 → engine_protocol_unknown_method）。 */
   async dispatch(id, method, params) {
     const handler = this.methodHandlers[method];
-    if (handler === void 0) {
-      throw new import_subagent_engine_sdk14.EngineSdkError(
-        "engine_protocol_unknown_method",
-        `unknown protocol method: ${method} (request id ${id})`,
-        "The engine speaks protocol v1; check the installed engine package version vs the host."
-      );
-    }
+    if (handler === void 0) throw (0, import_server.unknownMethodError)(id, method);
     return handler(params);
   }
   /**
@@ -3152,42 +3126,23 @@ var EngineProtocolServer = class {
   };
   // ── initialize：版本协商（越界 → engine_protocol_mismatch）+ 能力应答 ──
   initialize(params) {
-    if (params?.protocolVersion !== import_subagent_engine_sdk14.ENGINE_PROTOCOL_VERSION) {
-      throw new import_subagent_engine_sdk14.EngineSdkError(
-        "engine_protocol_mismatch",
-        `host protocol version ${String(params?.protocolVersion)} is not compatible with engine protocol v${import_subagent_engine_sdk14.ENGINE_PROTOCOL_VERSION}`,
-        `Upgrade the engine package or the host so both speak protocol v${import_subagent_engine_sdk14.ENGINE_PROTOCOL_VERSION}.`
-      );
-    }
-    this.initialized = true;
-    const models = this.engine.listModels?.() ?? null;
-    return {
-      protocolVersion: import_subagent_engine_sdk14.ENGINE_PROTOCOL_VERSION,
+    const result = (0, import_server.initializeEngine)(params, {
       engineId: this.engine.id,
-      engineVersion: ZCODE_ADAPTER_VERSION,
       adapterVersion: ZCODE_ADAPTER_VERSION,
       capabilities: this.engine.capabilities(),
-      ...models !== null ? { models: models.map((m) => ({ id: m.id })) } : {}
-    };
+      listModels: () => this.engine.listModels?.() ?? null
+    });
+    this.initialized = true;
+    return result;
   }
   // ── run：协议载荷 → 本地 AgentCallOpts/RunContext；事件 → 通知/host 通道 ──
   async run(params) {
-    if (!this.initialized) {
-      throw new import_subagent_engine_sdk14.EngineSdkError(
-        "engine_protocol_not_initialized",
-        "run before initialize is a protocol violation",
-        "The host must complete the initialize handshake before dispatching runs."
-      );
-    }
+    if (!this.initialized) throw (0, import_server.notInitializedError)();
     const { runId, task, ctx } = params;
     const controller = new AbortController();
     const active = { controller, seq: 0 };
     this.activeRuns.set(runId, active);
-    const fullTask = {
-      ...task,
-      ...ctx.model !== void 0 ? { model: ctx.model } : {},
-      ...ctx.cwd !== void 0 ? { cwd: ctx.cwd } : {}
-    };
+    const fullTask = (0, import_server.assembleFullTask)(task, ctx);
     const ctxModel = (0, import_subagent_engine_sdk13.parseCtxModel)(ctx.ctxModel);
     const stream = ctx.streamMode === "stream" ? {
       onDelta: (delta) => {
@@ -3200,7 +3155,6 @@ var EngineProtocolServer = class {
       onEvent: (event) => this.emitEvent(runId, event),
       ...ctxModel !== void 0 ? { ctxModel } : {},
       ...stream !== void 0 ? { stream } : {},
-      ...ctx.engineFallback !== void 0 ? { engineFallback: ctx.engineFallback } : {},
       // [U6 / §3.2.6 要点 3] resume 锚点透传（宿主 → 引擎的续聊通道：zcode 锚
       // sessionRef {sessionId, dbPath}，引擎侧 resume 读 + 新 session 注入消费）。
       ...params.resume !== void 0 ? { resume: params.resume } : {},
@@ -3235,9 +3189,7 @@ var EngineProtocolServer = class {
   }
   // ── 出站：事件通知 + 反向请求客户端 ──
   emitEvent(runId, event) {
-    const active = this.activeRuns.get(runId);
-    const seq = active !== void 0 ? ++active.seq : 0;
-    this.write({ method: "event", params: { runId, seq, event } });
+    (0, import_server.writeRunEvent)(this.write, this.activeRuns, runId, event);
   }
   /**
    * 发反向请求并等应答（帧④必须应答）。计时面登记：发出 → clock.started；收到
@@ -3263,25 +3215,17 @@ var EngineProtocolServer = class {
     return this.reverseRequestInternal(method, params);
   }
   reverseRequestInternal(method, params) {
-    const id = `rev-${++this.revSeq}`;
-    return new Promise((resolve2, reject) => {
-      const timer = setTimeout(() => {
-        this.reversePending.delete(id);
-        this.reverseClock?.settled(id);
-        reject(new Error(`reverse request ${method} (${id}) timed out after ${this.reverseTimeoutMs}ms`));
-      }, this.reverseTimeoutMs);
-      if (typeof timer.unref === "function") timer.unref();
-      this.reversePending.set(id, { resolve: resolve2, reject, timer });
-      this.reverseClock?.started(id);
-      try {
-        this.write({ id, method, params });
-      } catch (err) {
-        this.reversePending.delete(id);
-        clearTimeout(timer);
-        this.reverseClock?.settled(id);
-        reject(new Error(`reverse request ${method} (${id}) could not be written: ${(0, import_subagent_engine_sdk4.toErrorMessage)(err)}`));
-      }
-    });
+    return (0, import_server.sendReverseRequest)(
+      {
+        write: this.write,
+        pending: this.reversePending,
+        timeoutMs: this.reverseTimeoutMs,
+        ...this.reverseClock !== void 0 ? { clock: this.reverseClock } : {},
+        nextId: () => `rev-${++this.revSeq}`
+      },
+      method,
+      params
+    );
   }
   /** 反向请求应答落位（ack 两阶段：{ack:true}/{unsupported:true}/{ok:true} 均先 ack 计时面）。 */
   settleReverse(id, frame) {
@@ -3298,13 +3242,9 @@ var EngineProtocolServer = class {
 function probeParamsOf(params) {
   return typeof params === "object" && params !== null ? params : void 0;
 }
+var RUN_FAILURE_RECOVERY = "Check the engine process logs (engineDataDir/logs/) and rerun; if persistent, reinstall or upgrade the engine package.";
 function toProtocolError(err) {
-  if (err instanceof import_subagent_engine_sdk14.EngineSdkError) return err.toStructured();
-  return {
-    code: "engine_run_failed",
-    message: (0, import_subagent_engine_sdk4.toErrorMessage)(err),
-    recovery: "Check the engine process logs (engineDataDir/logs/) and rerun; if persistent, reinstall or upgrade the engine package."
-  };
+  return (0, import_server.toProtocolError)(err, RUN_FAILURE_RECOVERY);
 }
 
 // src/main.ts

package/dist/main.js

@@ -1,6 +1,6 @@
 import {
   EngineProtocolServer
-} from "./chunk-F6YT6OGA.js";
+} from "./chunk-DLLNMF45.js";
 
 // src/main.ts
 import {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/zcode-subagent-cli",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "zcode subagent engine as an independent CLI package (W5 of subagent-engine-protocolization): speaks engine-protocol v1 over NDJSON stdio, depends only on @zhushanwen/subagent-engine-sdk (never subagent-core)",
   "type": "module",
   "license": "MIT",
@@ -62,7 +62,7 @@
     "dist/"
   ],
   "dependencies": {
-    "@zhushanwen/subagent-engine-sdk": "0.7.0"
+    "@zhushanwen/subagent-engine-sdk": "0.8.0"
   },
   "devDependencies": {
     "@types/node": "^24.0.0",