@zhushanwen/zcode-subagent-cli 0.4.3 → 0.5.0

package/dist/main.cjs

@@ -41,16 +41,6 @@ var ZCODE_APPSERVER_STDERR_TAIL_CHARS = 400;
 var ZCODE_APPSERVER_STDERR_TAIL_BUFFER_CHARS = 2048;
 var ZCODE_APPSERVER_TURN_READ_TIMEOUT_MS = 5e3;
 var ZCODE_APPSERVER_TURN_CLOSE_TIMEOUT_MS = 1500;
-var ZCODE_TURN_IDLE_TIMEOUT_ENV = "TAIJI_ZCODE_TURN_IDLE_TIMEOUT_MS";
-var ZCODE_TURN_MAX_TIMEOUT_ENV = "TAIJI_ZCODE_TURN_MAX_TIMEOUT_MS";
-var ZCODE_TURN_IDLE_TIMEOUT_MS = 18e5;
-var ZCODE_TURN_MAX_TIMEOUT_MS = 36e5;
-function parseZcodeTurnTimeoutEnv(raw) {
-  if (raw === void 0 || raw === "") return { state: "unset" };
-  const parsed = Number(raw);
-  if (!Number.isFinite(parsed)) return { state: "invalid" };
-  return { state: "valid", ms: parsed };
-}
 var ZCODE_APPSERVER_STOP_TIMEOUT_MS = 3e3;
 var ZCODE_APPSERVER_ABORT_GRACE_MS = 3e3;
 var ZCODE_APPSERVER_STOP_TIMEOUT_ENV = "TAIJI_ZCODE_TEST_STOP_TIMEOUT_MS";
@@ -84,9 +74,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));
 }
@@ -1376,66 +1366,6 @@ function extractResumeTotalTokens(resumeResult) {
   }
   return acc.has ? acc.total : void 0;
 }
-var TurnTimeoutError = class extends Error {
-  kind;
-  elapsed;
-  lastEventAt;
-  thresholdMs;
-  constructor(kind, parts) {
-    super(
-      kind === "idle" ? `zcode turn idle \u5224\u6B7B\uFF1A\u8FDE\u7EED ${parts.thresholdMs}ms \u672A\u89C2\u5BDF\u5230\u672C turn \u4EFB\u4F55\u4E8B\u4EF6\uFF08session/event \u4E0E v4/telemetry/event \u5747\u9759\u9ED8\uFF09\uFF0C\u7EC8\u6001\u672A\u5230\u8FBE\u3002` + (parts.lastEventAt === void 0 ? "\u672C\u8F6E\u81EA send \u8D77\u672A\u89C2\u5BDF\u5230\u4EFB\u4F55\u4E8B\u4EF6\uFF08\u8FDB\u7A0B\u5047\u6B7B/\u534F\u8BAE\u9759\u9ED8\u5F62\u6001\uFF09\u3002" : `\u6700\u540E\u4E8B\u4EF6\u65F6\u523B ${new Date(parts.lastEventAt).toISOString()}\u3002`) + "\u6062\u590D\u6307\u5F15\uFF1A\u76F4\u63A5\u91CD\u8DD1\u672C\u4EFB\u52A1\uFF1B\u82E5\u6301\u7EED\u51FA\u73B0\uFF0C\u68C0\u67E5 ZCode \u684C\u9762\u7AEF\u6A21\u578B\u8FDE\u901A\u6027\u6216\u6539\u7528 engine: pi\u3002" : `zcode turn \u603B\u4E0A\u754C\u5224\u6B7B\uFF1A${parts.thresholdMs}ms \u5185\u672A\u89C2\u5BDF\u5230\u7EC8\u6001\uFF08turn.terminal \u4E0E\u6536\u5C3E\u5E27\u5747\u672A\u5230\u8FBE\uFF1Bidle \u5224\u5B9A\u672A\u89E6\u53D1\u2014\u2014\u4E8B\u4EF6\u6D41\u4ECD\u6D3B\u8DC3\uFF0Cchatty-wedge \u5F62\u6001\uFF09\u3002` + (parts.lastEventAt === void 0 ? "" : `\u6700\u540E\u4E8B\u4EF6\u65F6\u523B ${new Date(parts.lastEventAt).toISOString()}\u3002`) + `\u6062\u590D\u6307\u5F15\uFF1A\u76F4\u63A5\u91CD\u8DD1\u672C\u4EFB\u52A1\uFF1B\u82E5\u672C\u4EFB\u52A1\u5C5E\u5408\u6CD5\u8D85\u957F\u4EFB\u52A1\uFF08\u9884\u671F\u8D85\u8FC7 ${parts.thresholdMs}ms \u603B\u4E0A\u754C\uFF09\uFF0C\u91CD\u8DD1\u524D\u8BBE ${ZCODE_TURN_MAX_TIMEOUT_ENV} \u4E3A\u66F4\u5927\u6BEB\u79D2\u503C\uFF0C\u6216\u8BBE 0 \u5173\u95ED\u603B\u4E0A\u754C\uFF08\u5173\u95ED\u540E chatty \u5F62\u6001\u4E0D\u518D\u81EA\u52A8\u56DE\u6536\uFF0C\u9759\u9ED8 wedged \u4ECD\u7531 idle \u5C42\u515C\u5E95\u2014\u2014\u81EA\u884C\u6743\u8861\uFF09\u3002`
-    );
-    this.name = "TurnTimeoutError";
-    this.kind = kind;
-    this.elapsed = parts.elapsed;
-    this.lastEventAt = parts.lastEventAt;
-    this.thresholdMs = parts.thresholdMs;
-  }
-};
-function clearTurnTimers(turn) {
-  if (turn.idleTimer !== void 0) {
-    clearTimeout(turn.idleTimer);
-    turn.idleTimer = void 0;
-  }
-  if (turn.ceilingTimer !== void 0) {
-    clearTimeout(turn.ceilingTimer);
-    turn.ceilingTimer = void 0;
-  }
-}
-function armTurnTimer(onFire, ms) {
-  const timer = setTimeout(onFire, ms);
-  if (typeof timer.unref === "function") timer.unref();
-  return timer;
-}
-function resolveTurnTimerMs(parts) {
-  let value;
-  let source;
-  if (parts.explicit !== void 0) {
-    value = parts.explicit;
-    source = "\u663E\u5F0F\u4F20\u53C2";
-  } else {
-    const raw = process.env[parts.envName];
-    const parsed = parseZcodeTurnTimeoutEnv(raw);
-    if (parsed.state === "valid") {
-      value = parsed.ms;
-      source = `env ${parts.envName}=${raw}`;
-    } else {
-      if (parsed.state === "invalid") {
-        logger2.warn(
-          `[session-channel] ${parts.envName}="${raw}" \u975E\u6CD5\uFF08\u5E94\u4E3A\u6BEB\u79D2\u6570\u5B57\uFF09\u2014\u2014\u56DE\u843D\u9ED8\u8BA4 ${parts.fallbackMs}ms\uFF08${parts.label}\uFF09\u3002\u8BBE\u7F6E\u6B63\u6BEB\u79D2\u503C\u8986\u76D6\uFF0C\u6216 0 \u663E\u5F0F\u5173\u95ED`
-        );
-      }
-      value = parts.fallbackMs;
-      source = "\u9ED8\u8BA4\u503C";
-    }
-  }
-  if (value <= 0) {
-    logger2.warn(
-      `[session-channel] zcode turn ${parts.label}\u5DF2\u5173\u95ED\uFF08${source}\uFF09\u2014\u2014${parts.offConsequence}\u3002\u8BBE\u6B63\u6BEB\u79D2\u503C\uFF08env ${parts.envName} \u6216\u663E\u5F0F\u4F20\u53C2\uFF09\u6062\u590D\u56DE\u6536\u5C42`
-    );
-  }
-  return value;
-}
 var SessionChannel = class {
   conn;
   /** sessionId → 在途 turn（终态落定后仍保留到 runTurn 收尾——收尾帧数据吸收窗口）。 */
@@ -1461,23 +1391,23 @@ var SessionChannel = class {
       ),
       // 连接崩溃收割：进程死亡（崩溃/我方杀链）立即 fail 全部在途 turn——
       // onClose 契约保证触发时连接层在途 request 已全部 reject，此处补齐
-      // 「无在途 request 的 turn」的收割（否则挂到 turn idle/总上界预算耗尽）
+      // 「无在途 request 的 turn」的收割（否则在途 turn 失去全部终局来源）
       conn.onClose((reason) => this.failAllTurns(`app-server ${reason}`))
     ];
   }
   /**
    * [P0-1 U5/D7] dispose 前收割 + 退订：「退订 = 不会再有事件」在结构上蕴含「在途
    * turn 不应再等」——close 缺失/被吞没形态（onClose 收割主路径未触发）下，在途
-   * turn 于退订前经既有 failAllTurns 收敛为明确失败，不再挂满自身 idle/总上界预算
-   * （设计 §3.4 退化路径闭合；race 窗口在引擎 shutdownRuntimeAndDisposeChannel，
-   * 量级与 awaitConnFinalized 同源 ZCODE_APPSERVER_HARVEST_GRACE_MS）。幂等：与
-   * onClose 收割先到者赢（turn.fail 的 settled 守卫——已落定 turn 不改写），
-   * activeTurns 已空则 no-op。不影响连接自身生命周期（R4）。
+   * turn 于退订前经既有 failAllTurns 收敛为明确失败（设计 §3.4 退化路径闭合；
+   * race 窗口在引擎 shutdownRuntimeAndDisposeChannel，量级与 awaitConnFinalized
+   * 同源 ZCODE_APPSERVER_HARVEST_GRACE_MS）。幂等：与 onClose 收割先到者赢
+   * （turn.fail 的 settled 守卫——已落定 turn 不改写），activeTurns 已空则 no-op。
+   * 不影响连接自身生命周期（R4）。
    */
   dispose() {
     this.disposed = true;
     this.failAllTurns(
-      "zcode session channel \u5DF2 dispose\uFF1A\u8FDE\u63A5 close \u4E8B\u4EF6\u672A\u5728\u6536\u5272\u7A97\u53E3\u5185\u5230\u8FBE\uFF0C\u5728\u9014 turn \u4E8E\u9000\u8BA2\u524D\u6536\u5272\u4E3A\u660E\u786E\u5931\u8D25\uFF08\u4E0D\u518D\u6302\u5230 turn \u81EA\u8EAB\u9884\u7B97\u8017\u5C3D\uFF09\u3002\u6062\u590D\u6307\u5F15\uFF1A\u76F4\u63A5\u91CD\u8DD1\u672C\u4EFB\u52A1\u3002"
+      "zcode session channel \u5DF2 dispose\uFF1A\u8FDE\u63A5 close \u4E8B\u4EF6\u672A\u5728\u6536\u5272\u7A97\u53E3\u5185\u5230\u8FBE\uFF0C\u5728\u9014 turn \u4E8E\u9000\u8BA2\u524D\u6536\u5272\u4E3A\u660E\u786E\u5931\u8D25\u3002\u6062\u590D\u6307\u5F15\uFF1A\u76F4\u63A5\u91CD\u8DD1\u672C\u4EFB\u52A1\u3002"
     );
     for (const off of this.offHandlers.splice(0)) off();
   }
@@ -1607,7 +1537,6 @@ var SessionChannel = class {
         ...opened.turn.lastTerminalError !== void 0 ? { lastTerminalError: opened.turn.lastTerminalError } : {}
       };
     } finally {
-      opened.stopTimers();
       this.activeTurns.delete(sessionId);
       await this.closeSession(sessionId);
     }
@@ -1628,7 +1557,7 @@ var SessionChannel = class {
         onTextDelta: opts.onTextDelta,
         onThinkingDelta: opts.onThinkingDelta,
         // [PR3] tool 执行期活性回调（SessionTurnCallbacks.onActivity 注释——宿主侧
-        // 无进展守护的工具执行期刷新面）
+        // 的工具执行期刷新面）
         onActivity: opts.onActivity
       },
       settled: false,
@@ -1638,83 +1567,25 @@ var SessionChannel = class {
       terminal: void 0,
       lastTerminalStatus: void 0,
       lastTerminalError: void 0,
-      idleMs: 0,
-      ceilingMs: 0,
-      startedAt: Date.now(),
-      lastEventAt: void 0,
-      idleTimer: void 0,
-      ceilingTimer: void 0,
-      // 装配占位：下方 timer 创建后重绑（settle/fail 需要清理两 timer）
+      // 装配占位：下方重绑（settle/fail 闭包引用 turn 本体）
       settle: () => {
       },
       fail: () => {
-      },
-      fireTimeout: () => {
       }
     };
-    turn.idleMs = resolveTurnTimerMs({
-      explicit: opts.idleTimeoutMs,
-      envName: ZCODE_TURN_IDLE_TIMEOUT_ENV,
-      fallbackMs: ZCODE_TURN_IDLE_TIMEOUT_MS,
-      label: "idle \u4E3B\u5224\u5B9A",
-      offConsequence: "\u9759\u9ED8 wedged\uFF08\u65E0\u4E8B\u4EF6\uFF09\u5F62\u6001\u5C06\u65E0\u81EA\u52A8\u56DE\u6536\uFF0C\u4EFB\u52A1\u53EF\u80FD\u6302\u5230\u5BBF\u4E3B\u8FDB\u7A0B\u9000\u51FA"
-    });
-    turn.ceilingMs = resolveTurnTimerMs({
-      explicit: opts.turnTimeoutMs,
-      envName: ZCODE_TURN_MAX_TIMEOUT_ENV,
-      fallbackMs: ZCODE_TURN_MAX_TIMEOUT_MS,
-      label: "\u603B\u4E0A\u754C",
-      offConsequence: "chatty-wedge\uFF08\u6709\u4E8B\u4EF6\u65E0\u7EC8\u6001\uFF09\u5F62\u6001\u5C06\u65E0\u81EA\u52A8\u56DE\u6536\uFF0C\u4EC5\u5269 idle \u9759\u9ED8\u5224\u5B9A\u515C\u5E95"
-    });
-    const fireTimeout = (kind) => {
-      if (turn.settled) return;
-      turn.settled = true;
-      clearTurnTimers(turn);
-      this.activeTurns.delete(sessionId);
-      rejectDone(
-        new TurnTimeoutError(kind, {
-          thresholdMs: kind === "idle" ? turn.idleMs : turn.ceilingMs,
-          elapsed: Date.now() - turn.startedAt,
-          lastEventAt: turn.lastEventAt
-        })
-      );
-    };
-    turn.fireTimeout = fireTimeout;
-    if (turn.idleMs > 0) {
-      turn.idleTimer = armTurnTimer(() => turn.fireTimeout("idle"), turn.idleMs);
-    }
-    if (turn.ceilingMs > 0) {
-      turn.ceilingTimer = armTurnTimer(
-        () => turn.fireTimeout("ceiling"),
-        turn.ceilingMs
-      );
-    }
     turn.settle = (t) => {
       if (turn.settled) return;
       turn.settled = true;
       turn.terminal = t;
-      clearTurnTimers(turn);
       resolveDone(t);
     };
     turn.fail = (err) => {
       if (turn.settled) return;
       turn.settled = true;
-      clearTurnTimers(turn);
       rejectDone(err);
     };
     this.activeTurns.set(sessionId, turn);
-    return { turn, done, stopTimers: () => clearTurnTimers(turn) };
-  }
-  /**
-   * idle 主判定的事件刷新（P0-1 D1）：本 turn 任何事件到达即重置 idle 倒数——
-   * 活跃事件流零误杀的结构保证。总上界不受影响（固定倒数）。已落定 turn 无
-   * timer 可刷新（只剩 lastEventAt 记账）。
-   */
-  refreshIdle(turn) {
-    turn.lastEventAt = Date.now();
-    if (turn.settled || turn.idleTimer === void 0) return;
-    clearTimeout(turn.idleTimer);
-    turn.idleTimer = armTurnTimer(() => turn.fireTimeout("idle"), turn.idleMs);
+    return { turn, done };
   }
   lookupTurn(sessionId) {
     if (sessionId !== void 0) return this.activeTurns.get(sessionId);
@@ -1744,7 +1615,6 @@ var SessionChannel = class {
     if (turn === void 0) return;
     const payload = isRecord3(params) && isRecord3(params.payload) ? params.payload : void 0;
     if (payload === void 0) return;
-    this.refreshIdle(turn);
     if (this.applyFinalFrame(turn, payload)) return;
     if (!this.applyStreamDelta(turn, payload) && !turn.settled) {
       turn.callbacks.onActivity?.();
@@ -1861,7 +1731,6 @@ var SessionChannel = class {
   applyStreamChunkTelemetry(params) {
     const turn = this.lookupTurn(extractPushSessionId(params));
     if (turn === void 0 || turn.settled) return;
-    this.refreshIdle(turn);
     for (const key of ["chunk", "text", "content"]) {
       const v = params[key];
       if (typeof v === "string" && v !== "") {
@@ -2217,30 +2086,19 @@ var ZcodeEngine = class {
    * 只在最终轮终态后合成（不变量 2/5）。
    */
   async runAppServerAttemptsWithRetry(task, ctx, modelRef, cwd, basePrompt, schema, usageAcc) {
-    const attemptStartedAt = Date.now();
     let final = await this.attemptAppServerTurn(task, ctx, modelRef, cwd, basePrompt);
     accumulateUsage(usageAcc, final);
     if (final.kind === "run-failed" && final.transient !== void 0 && ctx.signal?.aborted !== true && !this.disposed) {
-      const budget = resolveTransientRetryBudget(explicitTurnBudgetMs(), Date.now() - attemptStartedAt);
-      if (budget.state === "depleted") {
-        logger4.warn(
-          `[zcode-engine] \u672B\u6B21 attempt \u77AC\u65F6\u5931\u8D25\uFF08${final.transient}\uFF09\u2014\u2014\u663E\u5F0F\u603B\u4E0A\u754C\u9884\u7B97\u5269\u4F59\u4E0D\u8DB3 ${ZCODE_TURN_RETRY_MIN_BUDGET_MS}ms\uFF0C\u4E0D\u91CD\u8BD5\u76F4\u63A5\u7EC8\u6001\u5316\uFF08\u9884\u7B97\u7EE7\u627F\uFF1A\u91CD\u8BD5\u4E0D\u91CD\u7F6E\u603B\u9884\u7B97\uFF09`
-        );
-      } else {
-        logger4.warn(
-          `[zcode-engine] \u672B\u6B21 attempt \u77AC\u65F6\u5931\u8D25\uFF08${final.transient}\uFF09\u2014\u2014\u6B62\u635F\u94FE\u5DF2\u7EC8\u5C40\uFF0C\u65B0\u4F1A\u8BDD\u81EA\u52A8\u91CD\u8BD5\u4E00\u6B21` + (budget.state === "inherit" ? `\uFF08\u9884\u7B97\u7EE7\u627F\uFF1A\u91CD\u8BD5\u8F6E\u603B\u4E0A\u754C=\u5269\u4F59 ${budget.remainingMs}ms\uFF0C\u4E0D\u91CD\u7F6E\u603B\u9884\u7B97\uFF09` : "\uFF08\u65E0\u663E\u5F0F\u603B\u4E0A\u754C\u9884\u7B97\uFF0C\u91CD\u8BD5\u8F6E\u8D70 env/\u9ED8\u8BA4\u4E0A\u754C\uFF09")
-        );
-        const retry = await this.attemptAppServerTurn(task, ctx, modelRef, cwd, basePrompt, {
-          // 预算继承传递点（D2 内部传参面）：显式预算 → 剩余值；无显式预算 → 缺省
-          // （channel 侧走同一 env/默认，与首轮行为一致）
-          ...budget.state === "inherit" ? { turnTimeoutMs: budget.remainingMs } : {},
-          // 重试事实进文案：「已自动重试一次」句仅对真实发生的重试生效（未重试形态
-          // 不含——与行为一致，§5.2 F-1/F-4）
-          retried: true
-        });
-        accumulateUsage(usageAcc, retry);
-        final = retry;
-      }
+      logger4.warn(
+        `[zcode-engine] \u672B\u6B21 attempt \u77AC\u65F6\u5931\u8D25\uFF08${final.transient}\uFF09\u2014\u2014\u6B62\u635F\u94FE\u5DF2\u7EC8\u5C40\uFF0C\u65B0\u4F1A\u8BDD\u81EA\u52A8\u91CD\u8BD5\u4E00\u6B21`
+      );
+      const retry = await this.attemptAppServerTurn(task, ctx, modelRef, cwd, basePrompt, {
+        // 重试事实进文案：「已自动重试一次」句仅对真实发生的重试生效（未重试形态
+        // 不含——与行为一致，§5.2 F-1/F-4）
+        retried: true
+      });
+      accumulateUsage(usageAcc, retry);
+      final = retry;
     }
     if (final.kind === "parsed" && final.schemaResult !== void 0 && !final.schemaResult.ok && schema !== void 0) {
       const retryPrompt = appendSchemaRetryDirective(basePrompt, final.schemaResult.error);
@@ -2272,9 +2130,7 @@ var ZcodeEngine = class {
    * 单轮常驻执行：runTurn 组合面 + D3 abort 链 + 事件前移（text_delta 实时流出；
    * 终态数据经 read 兜底收口后才 resolve——不变量 1/2）。
    *
-   * @param opts turnTimeoutMs：显式总上界传参面（D2 内部传参点）——U4/D6 预算继承
-   *   向重试轮传剩余值；缺省不传（channel 走 env→默认，首轮行为）。
-   *   retried：瞬时重试轮标记——失败文案补「已自动重试一次」句（F-1/F-4）。
+   * @param opts retried：瞬时重试轮标记——失败文案补「已自动重试一次」句（F-1/F-4）。
    */
   async attemptAppServerTurn(task, ctx, modelRef, cwd, prompt, opts = {}) {
     const rt = this.ensureAppServerRuntime();
@@ -2304,12 +2160,10 @@ var ZcodeEngine = class {
         ctx.onHandleReady?.({
           sessionRef: { dbPath: zcodeSessionDbPath(this.deps.engineDataDir()), sessionId }
         });
-      },
-      // 显式总上界传参（D2/U4：缺省缺席——channel 侧 resolveTurnTimerMs 走 env→默认）
-      ...opts.turnTimeoutMs !== void 0 ? { turnTimeoutMs: opts.turnTimeoutMs } : {}
+      }
     });
     const onAbort = () => {
-      void this.appServerAbortChain(rt, turn, () => currentSessionId, sessionCreated, { escalateOn: "turn-settled" });
+      void this.appServerAbortChain(rt, turn, () => currentSessionId, sessionCreated);
     };
     if (ctx.signal !== void 0) {
       if (ctx.signal.aborted) onAbort();
@@ -2335,32 +2189,16 @@ var ZcodeEngine = class {
   /**
    * [attemptAppServerTurn 拆分] 失败分流（catch 半边）：
    * - signal 已 aborted → 中止终态收口；
-   * - [P0-1 U2] 超时入口（D3 v1.1）：turn 已被 channel 判死 reject——升级判据不能
-   *   再挂在 turn 落定上（race 恒真，killChain 结构性不可达的 v1 击穿点），改以
-   *   stop 应答三态裁决。await 链终局（非 fire-and-forget）：outcome 止损文案与
-   *   重试时序（D6，u-z4）都依赖链终局信号——止损完成前不合成终态。timeout 类
-   *   （idle/ceiling 都算）是 D6 明文的可重试形态——结构化标记
-   *   （TurnTimeoutError 类型化判据，不经字符串匹配，D4 同精神）；
-   * - [P0-1 U4] 连接崩溃收割形态（failAllTurns 的错误，D6 第二可重试形态）判据：
+   * - [P0-1 U4] 连接崩溃收割形态（failAllTurns 的错误，D6 可重试形态）判据：
    *   非 RPC error（服务端无明确应答——有应答即精确错误归类，非瞬时崩溃面）且
    *   conn 不存活。时序可靠性：catch 时刻紧随 onClose 收割，连接重建仅由
    *   conn.request 惰性触发——本链路中 runTurn finally 的 closeSession 对死连接
-   *   短路（channel 侧 !alive 守卫）、stop 只属 abort/超时入口（前者已被
-   *   signal.aborted 短路、后者走上一分支）——此刻无 request 可重建，判据可靠；
+   *   短路（channel 侧 !alive 守卫）、stop 只属 abort 链（已被 signal.aborted
+   *   短路）——此刻无 request 可重建，判据可靠；
    * - 其余 → 精确错误终态。
    */
   async classifyAppServerTurnFailure(err, ctx, args) {
     if (ctx.signal?.aborted === true) return abortedAppServerAttempt(ctx);
-    if (err instanceof TurnTimeoutError) {
-      const stopPath = await this.appServerAbortChain(
-        args.rt,
-        args.turn,
-        args.currentSessionId,
-        args.sessionCreated,
-        { escalateOn: "stop-outcome" }
-      );
-      return timeoutAppServerAttempt(err, args.currentSessionId(), stopPath, { retried: args.retried });
-    }
     if (!isAppServerRpcError(err) && !args.rt.conn.alive) {
       return failedAppServerAttempt(err, args.currentSessionId(), { retried: args.retried, transient: "conn-closed" });
     }
@@ -2371,8 +2209,8 @@ var ZcodeEngine = class {
    * shutdown resolve 于 `exit` 事件，而 finalize 挂 `close`（stdio 排空）——两者之间的
    * 事件窗口内 conn.child 仍非 null，紧接的下一任务 request 会复用垂死进程（写入成功
    * 但必败，走崩溃路径）而非触发重建。与 shutdownRuntimeAndDisposeChannel 的
-   * HARVEST_GRACE 同款 race 形态（close 永不到达不挂死）。超时入口的 await 链终局
-   * 语义（D6 重试时序依据）因此是「进程收割确认完成」而非「SIGTERM 已发出」。
+   * HARVEST_GRACE 同款 race 形态（close 永不到达不挂死）。abort 链的 await 终局
+   * 语义因此是「进程收割确认完成」而非「SIGTERM 已发出」。
    */
   async awaitConnFinalized(rt) {
     if (!rt.conn.alive) return;
@@ -2388,25 +2226,14 @@ var ZcodeEngine = class {
     });
   }
   /**
-   * D3 abort 链执行体（双入口分岔，P0-1 U2 参数化，D3 v1.1）：
-   * - **用户取消入口**（`escalateOn: "turn-settled"`，现状语义零改动；fire-and-forget——
-   *   与 turn promise 并行推进）：stop 帧（超时 ZCODE_APPSERVER_STOP_TIMEOUT_MS）→
-   *   grace 窗口内 turn 落定即止（不杀共享进程）→ 超窗 killChain（conn.shutdown 全序：
-   *   SIGTERM→grace→SIGKILL）。turn 的最终落定由 attempt 主路径 await 收口，本链不
-   *   直接产出终态。abort 与 create 竞态（signal 先到、session 未建立）：等会话建立
-   *   （带上限）再发 stop——否则 stop 永远发不出，直接连坐杀共享进程。
-   * - **超时入口**（`escalateOn: "stop-outcome"`，channel 判死后由 catch await 链终局）：
-   *   turn 已 reject，对它 race 恒真不可用（v1 击穿点）——升级判据改挂在 **stop 应答
-   *   三态**：①成功应答 → 服务端接受停 turn，止损确认，链终止；②协议性 error 应答
-   *   （有 error 帧即控制面活的证据，多因 runTurn finally 的 closeSession 先行关会话，
-   *   健康形态竞态）→ 链终止**不升级**（止损由 close 回收 + 服务端自治承担；把
-   *   「stop 报错」一律升级会误杀健康共享进程并连坐并发任务）；③超时/写入失败/进程
-   *   死等连接级失败（控制面死）→ killChain 升级。判据实现依据：error 应答帧 reject
-   *   携带 number code（isAppServerRpcError）；连接级失败是无 code 的新 Error
-   *   （connection.request 三态 reject 形态）。返回值即止损路径（超时入口的 outcome
-   *   文案素材——D3 强制可观测面）。
+   * D3 abort 链执行体（用户取消入口，fire-and-forget——与 turn promise 并行推进）：
+   * stop 帧（超时 ZCODE_APPSERVER_STOP_TIMEOUT_MS）→ grace 窗口内 turn 落定即止
+   * （不杀共享进程）→ 超窗 killChain（conn.shutdown 全序：SIGTERM→grace→SIGKILL）。
+   * turn 的最终落定由 attempt 主路径 await 收口，本链不直接产出终态。abort 与 create
+   * 竞态（signal 先到、session 未建立）：等会话建立（带上限）再发 stop——否则 stop
+   * 永远发不出，直接连坐杀共享进程。
    */
-  async appServerAbortChain(rt, turn, getSessionId, sessionCreated, entry) {
+  async appServerAbortChain(rt, turn, getSessionId, sessionCreated) {
     const graceRaceThenKill = async () => {
       const settled = await Promise.race([
         turn.then(
@@ -2415,49 +2242,31 @@ var ZcodeEngine = class {
         ),
         delayResolved(abortGraceMs(), false)
       ]);
-      if (settled) return "settled-in-grace";
+      if (settled) return;
       logger4.warn(
         `[zcode-engine] abort grace \u7A97\u53E3\u5185\u672A\u89C1\u7EC8\u6001\u2014\u2014killChain \u6536\u5272\u5171\u4EAB\u8FDB\u7A0B\uFF08\u63A5\u53D7\u8FDE\u5750\uFF0C\u5728\u9014\u4EFB\u52A1\u8D70\u5D29\u6E83\u8DEF\u5F84\uFF09`
       );
       await rt.conn.shutdown({ graceMs: ZCODE_KILL_GRACE_MS });
       await this.awaitConnFinalized(rt);
-      return "escalated-kill";
     };
     let sessionId = getSessionId();
     if (sessionId === void 0) {
       await Promise.race([sessionCreated, delayResolved(stopTimeoutMs(), void 0)]);
       sessionId = getSessionId();
       if (sessionId === void 0) {
-        if (entry.escalateOn === "stop-outcome") return "no-session";
         return graceRaceThenKill();
       }
     }
     if (!rt.conn.alive) {
-      if (entry.escalateOn === "stop-outcome") return "stop-unreachable-killed";
       return graceRaceThenKill();
     }
     try {
       await rt.conn.request("session/stop", { sessionId }, { timeoutMs: stopTimeoutMs() });
     } catch (err) {
-      if (entry.escalateOn === "stop-outcome") {
-        if (isAppServerRpcError(err)) {
-          logger4.debug(
-            `[zcode-engine] session/stop \u62A5\u534F\u8BAE\u6027 error\uFF08${errMessage3(err)}\uFF09\u2014\u2014\u4F1A\u8BDD\u5DF2\u56DE\u6536\uFF0C\u63A7\u5236\u9762\u5B58\u6D3B\uFF0C\u4E0D\u5347\u7EA7\u6740\u94FE`
-          );
-          return "stop-rejected";
-        }
-        logger4.warn(
-          `[zcode-engine] session/stop \u65E0\u5E94\u7B54\uFF08${errMessage3(err)}\uFF09\u2014\u2014\u5347\u7EA7 killChain \u6536\u5272\u5171\u4EAB\u8FDB\u7A0B\uFF08\u8D85\u65F6\u5165\u53E3\uFF0C\u63A5\u53D7\u8FDE\u5750\uFF09`
-        );
-        await rt.conn.shutdown({ graceMs: ZCODE_KILL_GRACE_MS });
-        await this.awaitConnFinalized(rt);
-        return "stop-unreachable-killed";
-      }
       logger4.debug(
         `[zcode-engine] session/stop \u5931\u8D25\uFF08${errMessage3(err)}\uFF09\u2014\u2014grace \u540E\u8D70 killChain \u515C\u5E95`
       );
     }
-    if (entry.escalateOn === "stop-outcome") return "stop-acked";
     return graceRaceThenKill();
   }
   // ── 常驻运行时管理（D1/D6）──────────────────────
@@ -2511,15 +2320,15 @@ var ZcodeEngine = class {
    * [R5 修复 R4 既有竞态] shutdown → 等崩溃收割实际发生 → channel 退订。killChain 在
    * `exit` 事件 resolve，而连接 finalize（onClose → channel 的 failAllTurns）挂
    * `close` 事件——两者之间有一个事件循环窗口：shutdown resolve 后立即退订，在途
-   * turn 会错过收割、挂到 turnTimeoutMs（300s）。退订前等 onClose 触发（本方法先于
+   * turn 会错过收割而失去终局来源。退订前等 onClose 触发（本方法先于
    * shutdown 订阅；channel 的订阅在构造期更早——其 failAllTurns 先于本 promise
    * resolve 执行）；ZCODE_APPSERVER_HARVEST_GRACE_MS 兜底防 `close` 永不到达时挂死。
    * [P0-1 U5/D7] grace race 输掉（close 迟到/永不到达——stdio 被孙进程持有排空不
    * 尽等病态形态）时，channel.dispose() 内置的 dispose 收割（failAllTurns 先于退订，
-   * SessionChannel.dispose）兜底在途 turn——退化终点从「挂满 turn 自身 idle/总上界
-   * 预算」收敛为「grace 窗口内明确失败」（设计 §3.4 退化路径闭合）；race 窗口与
-   * awaitConnFinalized 同源同量级（ZCODE_APPSERVER_HARVEST_GRACE_MS）。正常 close
-   * 先到时 onClose 收割先行，dispose 收割幂等 no-op（零回归）。
+   * SessionChannel.dispose）兜底在途 turn——在途 turn 收敛为「grace 窗口内明确失败」
+   * （设计 §3.4 退化路径闭合）；race 窗口与 awaitConnFinalized 同源同量级
+   * （ZCODE_APPSERVER_HARVEST_GRACE_MS）。正常 close 先到时 onClose 收割先行，
+   * dispose 收割幂等 no-op（零回归）。
    */
   async shutdownRuntimeAndDisposeChannel(rt) {
     const harvested = new Promise((resolve2) => {
@@ -2558,10 +2367,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 +2462,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 降级）。[池抽象降级
@@ -2827,16 +2633,6 @@ ${omissionNote}${kept.join("\n")}
 function buildResumeUnavailableNoticeSegment() {
   return "[\u4F1A\u8BDD\u5EF6\u7EED\u63D0\u793A] \u672C\u6D88\u606F\u662F\u540C\u4E00\u4EFB\u52A1\u7684\u5EF6\u7EED\u4F1A\u8BDD\uFF0C\u4F46\u4E0A\u4E00\u4F1A\u8BDD\u7684\u5386\u53F2\u8BB0\u5F55\u4E0D\u53EF\u6062\u590D\uFF08\u539F\u59CB\u4F1A\u8BDD\u5DF2\u5931\u6548\uFF09\u3002\n\u6CA1\u6709\u66F4\u65E9\u7684\u5BF9\u8BDD\u4E0A\u4E0B\u6587\u53EF\u5F15\u7528\u2014\u2014\u8BF7\u57FA\u4E8E\u4E0B\u65B9\u6700\u65B0\u6D88\u606F\u72EC\u7ACB\u5224\u65AD\u5E76\u7EE7\u7EED\u63A8\u8FDB\u4EFB\u52A1\u3002\n\n";
 }
-var ZCODE_TURN_RETRY_MIN_BUDGET_MS = 3e5;
-function resolveTransientRetryBudget(totalBudgetMs, consumedMs) {
-  if (totalBudgetMs === void 0) return { state: "unbounded" };
-  const remainingMs = totalBudgetMs - consumedMs;
-  return remainingMs >= ZCODE_TURN_RETRY_MIN_BUDGET_MS ? { state: "inherit", remainingMs } : { state: "depleted" };
-}
-function explicitTurnBudgetMs() {
-  const parsed = parseZcodeTurnTimeoutEnv(process.env[ZCODE_TURN_MAX_TIMEOUT_ENV]);
-  return parsed.state === "valid" && parsed.ms > 0 ? parsed.ms : void 0;
-}
 function isPlainObject(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
@@ -2982,8 +2778,7 @@ function failedAppServerAttempt(err, currentSessionId, opts = {}) {
     kind: "run-failed",
     output: syntheticAppServerOutput(null),
     message: buildAppServerRunFailedMessage(err, currentSessionId, opts.retried === true),
-    // [P0-1 U4/D6] 瞬时失败形态标记（重试判定判据——timeout 形态走
-    // timeoutAppServerAttempt，此处只承载 conn-closed）
+    // [P0-1 U4/D6] 瞬时失败形态标记（重试判定判据，conn-closed 连接崩溃形态）
     ...opts.transient !== void 0 ? { transient: opts.transient } : {},
     // 错误规格表 -32004 行「按任务失败上报（含会话 id）」：create 成功后运行中失败
     // （-32004/-32010 等）时留痕会话 id——经 applyRunFailedOutcome 落 outcome.sessionId
@@ -2991,38 +2786,6 @@ function failedAppServerAttempt(err, currentSessionId, opts = {}) {
     ...currentSessionId !== void 0 ? { sessionId: currentSessionId } : {}
   };
 }
-function timeoutAppServerAttempt(err, currentSessionId, stopPath, opts = {}) {
-  return {
-    kind: "run-failed",
-    output: syntheticAppServerOutput(null),
-    message: buildAppServerTimeoutMessage(err, currentSessionId, stopPath, opts.retried === true),
-    transient: "timeout",
-    ...currentSessionId !== void 0 ? { sessionId: currentSessionId } : {}
-  };
-}
-function stopPathText(stopPath) {
-  switch (stopPath) {
-    case "stop-acked":
-      return "session/stop \u5DF2\u9001\u8FBE\uFF08\u670D\u52A1\u7AEF\u63A5\u53D7\u505C turn\uFF09";
-    case "stop-rejected":
-      return "session/stop \u62A5\u534F\u8BAE\u6027 error\uFF08\u4F1A\u8BDD\u5DF2\u88AB\u56DE\u6536\uFF0C\u63A7\u5236\u9762\u5B58\u6D3B\u2014\u2014\u6B62\u635F\u7531\u4F1A\u8BDD\u56DE\u6536\u627F\u62C5\uFF0C\u4E0D\u5347\u7EA7\u6740\u94FE\uFF09";
-    case "stop-unreachable-killed":
-      return `session/stop \u65E0\u5E94\u7B54\u5DF2\u5347\u7EA7\u6740\u94FE\uFF08SIGTERM\u2192${ZCODE_KILL_GRACE_MS}ms\u2192SIGKILL \u6536\u5272\u5171\u4EAB\u8FDB\u7A0B\uFF09`;
-    case "no-session":
-      return "\u4F1A\u8BDD\u672A\u5EFA\u7ACB\uFF08\u4EFB\u52A1\u672A\u5F00\u59CB\u6267\u884C\uFF0C\u65E0\u5728\u9014\u6D88\u8017\uFF09";
-    default:
-      return "grace \u7A97\u53E3\u5185\u7EC8\u6001\u843D\u5B9A\u6216\u5DF2\u8D70\u6740\u94FE";
-  }
-}
-function buildAppServerTimeoutMessage(err, sessionId, stopPath, retried = false) {
-  const sid = sessionId !== void 0 ? `\uFF08\u4F1A\u8BDD ${sessionId}\uFF09` : "";
-  const lastEventText = err.lastEventAt !== void 0 ? `\uFF0C\u6700\u540E\u4E8B\u4EF6 ${new Date(err.lastEventAt).toISOString()}` : "\uFF0C\u6574\u8F6E\u672A\u89C2\u5BDF\u5230\u4EFB\u4F55\u4E8B\u4EF6\uFF08\u8FDB\u7A0B\u5047\u6B7B/\u534F\u8BAE\u9759\u9ED8\u5F62\u6001\uFF09";
-  const head = err.kind === "idle" ? `engine_timeout: zcode turn \u8FDE\u7EED\u9759\u9ED8 ${err.thresholdMs}ms\uFF08idle \u5224\u5B9A${lastEventText}\uFF0C\u603B\u8017\u65F6 ${err.elapsed}ms\uFF09${sid}\u3002` : `engine_timeout: zcode turn \u603B\u4E0A\u754C ${err.thresholdMs}ms \u5185\u672A\u89C2\u5BDF\u5230\u7EC8\u6001\uFF08chatty-wedge \u5224\u5B9A\u2014\u2014\u4E8B\u4EF6\u6D41\u4ECD\u6D3B\u8DC3\u800C\u7EC8\u6001\u672A\u5230\u8FBE\uFF0C\u603B\u8017\u65F6 ${err.elapsed}ms\uFF09${sid}\u3002`;
-  const selfHelp = err.kind === "ceiling" ? `\u82E5\u672C\u4EFB\u52A1\u5C5E\u5408\u6CD5\u8D85\u957F\u4EFB\u52A1\uFF08\u9884\u671F\u8D85\u8FC7 ${err.thresholdMs}ms\uFF09\uFF0C\u91CD\u8DD1\u524D\u8BBE ${ZCODE_TURN_MAX_TIMEOUT_ENV} \u4E3A\u66F4\u5927\u6BEB\u79D2\u503C\u6216 0 \u5173\u95ED\u603B\u4E0A\u754C\uFF08\u5173\u95ED\u540E chatty \u5F62\u6001\u4E0D\u518D\u81EA\u52A8\u56DE\u6536\uFF0C\u9759\u9ED8 wedged \u4ECD\u7531 idle \u5C42\u515C\u5E95\u2014\u2014\u81EA\u884C\u6743\u8861\uFF09\u3002` : "";
-  const rerunGuide = retried ? `\u{1F449} \u6062\u590D\u6307\u5F15\uFF1A\u76F4\u63A5\u91CD\u8DD1\u672C\u4EFB\u52A1\uFF08\u77AC\u65F6\u6545\u969C\u5DF2\u81EA\u52A8\u91CD\u8BD5\u4E00\u6B21\u4ECD\u8D85\u65F6\uFF1B\u91CD\u8BD5\u5728\u6B62\u635F\u94FE\u7EC8\u5C40\u540E\u542F\u52A8\uFF0C\u65E0\u65B0\u65E7\u4EFB\u52A1\u53CC\u8DD1\u7A97\uFF09\uFF1B` : `\u{1F449} \u6062\u590D\u6307\u5F15\uFF1A\u76F4\u63A5\u91CD\u8DD1\u672C\u4EFB\u52A1\uFF1B`;
-  return `${head}\u6B62\u635F\u8DEF\u5F84\uFF1A${stopPathText(stopPath)}\u3002
-${rerunGuide}${selfHelp}\u82E5\u6301\u7EED\u51FA\u73B0\uFF0C\u68C0\u67E5 ZCode \u684C\u9762\u7AEF\u6A21\u578B\u8FDE\u901A\u6027\u6216\u6539\u7528 engine: pi\u3002`;
-}
 function isHostTimeoutAbort(ctx) {
   return ctx.signal?.aborted === true && ctx.signal.reason === import_subagent_engine_sdk11.HOST_TIMEOUT_ABORT_REASON;
 }
@@ -3075,13 +2838,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 +2854,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 +2892,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 +2921,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 +2955,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 +2981,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 +3008,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