@zhushanwen/zcode-subagent-cli 0.3.2 → 0.4.1

package/dist/index.cjs

@@ -46,7 +46,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/server.ts
-var import_subagent_engine_sdk13 = require("@zhushanwen/subagent-engine-sdk");
+var import_subagent_engine_sdk14 = require("@zhushanwen/subagent-engine-sdk");
 
 // src/constants.ts
 var ZCODE_ENGINE_ID = "zcode";
@@ -54,7 +54,6 @@ var ZCODE_ADAPTER_VERSION = "2.0.0";
 var ZCODE_CLI_DEFAULT_PATH = "/Applications/ZCode.app/Contents/Resources/glm/zcode.cjs";
 var ZCODE_V2_CONFIG_PATH_SUFFIX = [".zcode", "v2", "config.json"];
 var ZCODE_FALLBACK_DEFAULT_MODEL = "builtin:bigmodel-coding-plan/GLM-5.3";
-var ZCODE_HOST_DB_SUFFIX = [".zcode", "cli", "db", "db.sqlite"];
 var ZCODE_KILL_GRACE_MS = 5e3;
 var ZCODE_ERROR_TAIL_CHARS = 2e3;
 var ZCODE_APPSERVER_REQUEST_TIMEOUT_MS = 15e3;
@@ -93,13 +92,13 @@ var ZCODE_RESUME_CHARS_PER_TOKEN = 4;
 var ZCODE_SESSION_SWEEP_DEFER_MS = 50;
 
 // src/registration.ts
-var import_subagent_engine_sdk11 = require("@zhushanwen/subagent-engine-sdk");
+var import_subagent_engine_sdk12 = require("@zhushanwen/subagent-engine-sdk");
 
 // src/zcode-engine.ts
 var fs6 = __toESM(require("fs"), 1);
 var path4 = __toESM(require("path"), 1);
-var import_subagent_engine_sdk9 = require("@zhushanwen/subagent-engine-sdk");
 var import_subagent_engine_sdk10 = require("@zhushanwen/subagent-engine-sdk");
+var import_subagent_engine_sdk11 = require("@zhushanwen/subagent-engine-sdk");
 
 // src/journal-io.ts
 var import_subagent_engine_sdk = require("@zhushanwen/subagent-engine-sdk");
@@ -115,11 +114,12 @@ function replayJournalToSessionView(handle, engineId) {
 // src/db-path.ts
 var os = __toESM(require("os"), 1);
 var path = __toESM(require("path"), 1);
+var import_subagent_engine_sdk3 = require("@zhushanwen/subagent-engine-sdk");
 function zcodeSessionDbPath(engineDataDir) {
-  return path.join(engineDataDir, "engines", "zcode", "session-db", "db.sqlite");
+  return path.join(engineDataDir, ...import_subagent_engine_sdk3.ZCODE_ISOLATED_DB_SEGMENTS);
 }
 function hostZcodeDbPath() {
-  return path.join(os.homedir(), ...ZCODE_HOST_DB_SUFFIX);
+  return path.join(os.homedir(), ...import_subagent_engine_sdk3.ZCODE_HOST_DB_SUFFIX);
 }
 function zcodeDbPathAllowlist(dataDir) {
   return [zcodeSessionDbPath(dataDir), hostZcodeDbPath()];
@@ -288,7 +288,7 @@ var fs2 = __toESM(require("fs"), 1);
 var path3 = __toESM(require("path"), 1);
 
 // src/error-message.ts
-var import_subagent_engine_sdk3 = require("@zhushanwen/subagent-engine-sdk");
+var import_subagent_engine_sdk4 = require("@zhushanwen/subagent-engine-sdk");
 
 // src/appserver-launcher.ts
 var ZCODE_APPSERVER_LAUNCHER_NAME = "appserver-launcher.cjs";
@@ -388,8 +388,63 @@ if (text !== null) {
   };
 }
 
-// \u4EE5\u539F argv \u5F62\u6001\u542F\u52A8 zcode.cjs\uFF08argv[0]=node, argv[1]=\u672C wrapper\uFF0Cargv[2]=app-server\u2014\u2014
-// zcode.cjs \u7684 includes('app-server') \u5224\u5B9A\u4E0D\u53D7\u5F71\u54CD\uFF09\u3002import() \u517C\u5BB9 CJS/ESM \u5165\u53E3\u3002
+// \u5185\u5EFA provider \u914D\u7F6E\u5B9A\u4F4D\uFF08\u6F02\u79FB\u9762\u2461\uFF09\uFF1A3.12.x \u8D77\u914D\u7F6E\u6587\u4EF6\u632A\u4F4D + CLI \u4F9D\u8D56\u5BBF\u4E3B\u6CE8\u5165
+// ZCODE_BUILTIN_PROVIDER_CONFIG_FILE \u76F4\u63A5\u5B9A\u4F4D\uFF1BZCode \u684C\u9762 spawn \u94FE\u81EA\u5E26\u8BE5\u952E\uFF0C
+// \u672C wrapper \u94FE\u9700\u81EA\u7ED9\u3002\u663E\u5F0F\u4F20\u5165\u4F18\u5148 \u2192 v2 runtime \u76EE\u5F55\u4E0B\u5E73\u53F0\u76EE\u5F55\uFF08\u7CBE\u786E
+// <plat>-<arch> \u4F18\u5148\uFF0CRust arch \u53D8\u4F53\u5982 darwin-aarch64 \u5B57\u5178\u5E8F\u8DDF\u540E\uFF09\xD7 \u7248\u672C\u76EE\u5F55
+// \uFF08semver \u6700\u5927\uFF09\u7684 endpoint-*/zcode-builtin.json \u2192 \u90FD\u627E\u4E0D\u5230\u5219\u4E0D\u8BBE\u952E\uFF0C\u8BA9 CLI
+// \u539F\u751F\u62A5\u9519\u900F\u51FA\uFF08\u9519\u8BEF\u6587\u6848\u542B\u6062\u590D\u6307\u5F15\uFF09\u3002
+if (!process.env.ZCODE_BUILTIN_PROVIDER_CONFIG_FILE) {
+  let located = null;
+  try {
+    const providerRoot = path.join(os.homedir(), '.zcode', 'v2', 'runtime', 'provider');
+    // \u5E73\u53F0\u76EE\u5F55\u53CC\u547D\u540D\uFF1ANode \u5F62\u6001 <plat>-<arch>\uFF08darwin-arm64\uFF09\u4E0E\u684C\u9762 app \u7684 Rust
+    // arch \u547D\u540D\uFF08darwin-aarch64/linux-x86_64\uFF09\u5E76\u5B58\u2014\u2014\u6309\u5E73\u53F0\u524D\u7F00\u6536\u96C6\u5B50\u76EE\u5F55\uFF0C
+    // \u7CBE\u786E\u5F62\u6001\u6392\u6700\u5148\uFF08\u5411\u540E\u517C\u5BB9\u81EA\u5EFA\u5E03\u5C40\uFF09\uFF0CRust \u53D8\u4F53\u6309\u5B57\u5178\u5E8F\u8DDF\u540E\u9010\u4E2A\u5C1D\u8BD5
+    const exact = process.platform + '-' + process.arch;
+    const platDirs = fs.readdirSync(providerRoot, { withFileTypes: true })
+      .filter((d) => d.isDirectory() && d.name.startsWith(process.platform + '-'))
+      .map((d) => d.name)
+      .sort((a, b) => {
+        if ((a === exact) !== (b === exact)) return a === exact ? -1 : 1;
+        return a < b ? -1 : a > b ? 1 : 0;
+      });
+    const byVerDesc = (a, b) => {
+      const pa = a.split('.'), pb = b.split('.');
+      for (let i = 0; i < 3; i++) {
+        const na = parseInt(pa[i], 10) || 0, nb = parseInt(pb[i], 10) || 0;
+        if (na !== nb) return nb - na;
+      }
+      return 0;
+    };
+    for (const plat of platDirs) {
+      const rtRoot = path.join(providerRoot, plat);
+      let vers = [];
+      try { vers = fs.readdirSync(rtRoot).filter((v) => /^\\d+\\.\\d+/.test(v)).sort(byVerDesc); } catch { /* \u5E73\u53F0\u76EE\u5F55\u4E0D\u53EF\u8BFB \u2192 \u8BD5\u4E0B\u4E00\u4E2A */ }
+      for (const ver of vers) {
+        const verDir = path.join(rtRoot, ver);
+        let endpoints = [];
+        try { endpoints = fs.readdirSync(verDir).filter((e) => e.startsWith('endpoint-')).sort(); } catch { /* \u7248\u672C\u76EE\u5F55\u4E0D\u53EF\u8BFB \u2192 \u8DF3\u8FC7 */ }
+        for (const ep of endpoints) {
+          const candidate = path.join(verDir, ep, 'zcode-builtin.json');
+          if (fs.existsSync(candidate)) { located = candidate; break; }
+        }
+        if (located) break;
+      }
+      if (located) break;
+    }
+  } catch { /* provider \u76EE\u5F55\u7F3A\u5931/\u4E0D\u53EF\u8BFB \u2192 \u4E0D\u8BBE\u952E */ }
+  if (located) process.env.ZCODE_BUILTIN_PROVIDER_CONFIG_FILE = located;
+}
+
+// \u4E0A\u6E38 provider bootstrap \u4EE5 argv[1] \u4E3A\u5165\u53E3\u951A\uFF0C\u4ECE\u8BE5\u8DEF\u5F84\u90BB\u8FD1\u5B9A\u4F4D CLI \u5185\u5EFA
+// provider \u914D\u7F6E\u2014\u2014wrapper \u5F62\u6001\u4E0B argv[1] = \u672C wrapper \u843D\u76D8\u8DEF\u5F84\uFF0Cbootstrap \u4F1A\u5728
+// wrapper \u90BB\u57DF\u627E provider \u914D\u7F6E\u800C\u5931\u8D25\uFF08\u771F\u673A\u62A5\u300C\u65E0\u6CD5\u5B9A\u4F4D CLI ZCode Built-in Provider
+// Config\u300D\u542F\u52A8\u5373\u9000\uFF09\u3002import \u524D\u628A argv[1] \u6539\u5199\u4E3A CLI_PATH\uFF1ACLI \u770B\u5230\u7684 argv \u5E8F\u5217\u4E0E
+// \u65E0 wrapper \u76F4\u8DD1\uFF08node <cliPath> app-server ...\uFF09\u9010\u4F4D\u4E00\u81F4\uFF0Cargv[0]=node\u3001
+// argv[2]='app-server' \u4E0D\u53D8\uFF0Cincludes('app-server') \u5B50\u547D\u4EE4\u5224\u5B9A\u4E0D\u53D7\u5F71\u54CD\u3002
+// import() \u517C\u5BB9 CJS/ESM \u5165\u53E3\u3002
+process.argv[1] = CLI_PATH;
 import(CLI_PATH).catch((err) => {
   process.stderr.write('[zcode-launcher] zcode.cjs \u52A0\u8F7D\u5931\u8D25: ' + (err && err.message || err) + '\\n');
   process.exit(3);
@@ -406,7 +461,7 @@ function ensureAppServerLauncher(engineDataDir) {
     fs2.writeFileSync(tmp, APPSERVER_LAUNCHER_SOURCE);
     fs2.renameSync(tmp, file);
   } catch (err) {
-    const reason = (0, import_subagent_engine_sdk3.toErrorMessage)(err);
+    const reason = (0, import_subagent_engine_sdk4.toErrorMessage)(err);
     throw new Error(
       `zcode app-server launcher \u843D\u76D8\u5931\u8D25: ${file}\uFF08${reason}\uFF09\u3002\u6062\u590D\uFF1A\u68C0\u67E5\u5F15\u64CE\u6570\u636E\u76EE\u5F55 \u5199\u6743\u9650\u4E0E\u78C1\u76D8\u7A7A\u95F4\uFF08engineDataDir \u7531\u5BBF\u4E3B\u4F20\u5165\uFF0C\u8DEF\u5F84\u89C1\u4E0A\uFF09\u540E\u91CD\u8BD5\u3002`
     );
@@ -457,26 +512,40 @@ function usageFromStepFinish(part) {
     cacheWrite: finiteOr2(cache.write, 0)
   };
 }
-function toolFromPart(part) {
-  const toolName = typeof part.tool === "string" ? part.tool : "unknown";
-  let state;
+function stateFromString(raw) {
+  try {
+    const v = JSON.parse(raw);
+    return typeof v === "object" && v !== null && !Array.isArray(v) ? v : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function stateFromPart(part) {
+  if (typeof part.state === "object" && part.state !== null && !Array.isArray(part.state)) {
+    return part.state;
+  }
   if (typeof part.state === "string") {
-    try {
-      const v = JSON.parse(part.state);
-      state = typeof v === "object" && v !== null ? v : void 0;
-    } catch {
-      state = void 0;
-    }
+    return stateFromString(part.state);
   }
+  return void 0;
+}
+function toolResultFromOutput(errorText, output) {
+  if (errorText !== void 0) return { content: [errorText] };
+  if (typeof output === "string") return { content: [output] };
+  if (typeof output === "object" && output !== null) return { details: output };
+  return void 0;
+}
+function toolFromPart(part) {
+  const toolName = typeof part.tool === "string" ? part.tool : "unknown";
+  const state = stateFromPart(part);
   const status = typeof state?.status === "string" ? state.status : "unknown";
   const output = state?.output;
+  const errorText = status !== "completed" && typeof state?.error === "string" ? state.error : void 0;
+  const result = toolResultFromOutput(errorText, output);
   return {
     toolName,
     ...state?.input !== void 0 ? { args: state.input } : {},
-    // 输出形态（实测）：string（内容）或 object（结构化）——分别映射到 pi ToolCallResult
-    // 的 content[] / details，不发明第二形状
-    ...typeof output === "string" ? { result: { content: [output] } } : {},
-    ...typeof output === "object" && output !== null ? { result: { details: output } } : {},
+    ...result !== void 0 ? { result } : {},
     ...status !== "completed" ? { isError: true } : {}
   };
 }
@@ -650,21 +719,21 @@ async function readZcodeSessionView(dbPath, sessionId) {
 var fs4 = __toESM(require("fs"), 1);
 var import_node_path = require("path");
 var import_node_os = require("os");
-var import_subagent_engine_sdk6 = require("@zhushanwen/subagent-engine-sdk");
+var import_subagent_engine_sdk7 = require("@zhushanwen/subagent-engine-sdk");
 
 // src/logs/stderr-rotation.ts
-var import_subagent_engine_sdk4 = require("@zhushanwen/subagent-engine-sdk");
 var import_subagent_engine_sdk5 = require("@zhushanwen/subagent-engine-sdk");
+var import_subagent_engine_sdk6 = require("@zhushanwen/subagent-engine-sdk");
 var ZCODE_STDERR_LOG_PREFIX = "zcode-appserver-stderr-";
 function stderrLogPathFor(engineDataDir, pid) {
-  return (0, import_subagent_engine_sdk4.stderrLogPathFor)(engineDataDir, pid, ZCODE_STDERR_LOG_PREFIX);
+  return (0, import_subagent_engine_sdk5.stderrLogPathFor)(engineDataDir, pid, ZCODE_STDERR_LOG_PREFIX);
 }
 function cleanupSiblingStderrLogs(logPath, env, now) {
-  return (0, import_subagent_engine_sdk4.cleanupSiblingStderrLogs)(logPath, env, ZCODE_STDERR_LOG_PREFIX, now);
+  return (0, import_subagent_engine_sdk5.cleanupSiblingStderrLogs)(logPath, env, ZCODE_STDERR_LOG_PREFIX, now);
 }
 
 // src/connection.ts
-var logger = (0, import_subagent_engine_sdk6.getLogger)("subagents");
+var logger = (0, import_subagent_engine_sdk7.getLogger)("subagents");
 var RAW_FRAME_LOG_CHARS = 200;
 var RUNTIME_PREFERENCES = Object.freeze({
   nativeSearchEnhancementsEnabled: true,
@@ -686,11 +755,11 @@ function frameIdOf(frame) {
   return typeof id === "string" || typeof id === "number" ? id : void 0;
 }
 function errMessage(err) {
-  return (0, import_subagent_engine_sdk3.toErrorMessage)(err);
+  return (0, import_subagent_engine_sdk4.toErrorMessage)(err);
 }
 function buildAppServerEnv(baseEnv = process.env) {
   return {
-    ...(0, import_subagent_engine_sdk6.buildNestedSpawnEnv)(baseEnv),
+    ...(0, import_subagent_engine_sdk7.buildNestedSpawnEnv)(baseEnv),
     ZCODE_MODEL_TELEMETRY_ENABLED: "false"
   };
 }
@@ -840,7 +909,7 @@ var AppServerConnection = class {
   close() {
     const child = this.child;
     if (child === null || this.killChainPromise !== void 0) return;
-    this.killChainPromise = (0, import_subagent_engine_sdk6.killChain)(child, { graceMs: ZCODE_KILL_GRACE_MS });
+    this.killChainPromise = (0, import_subagent_engine_sdk7.killChain)(child, { graceMs: ZCODE_KILL_GRACE_MS });
   }
   /**
    * 异步完整关闭面：SIGTERM → grace → SIGKILL 杀链走完（含收尸），resolve 于进程
@@ -852,7 +921,7 @@ var AppServerConnection = class {
     if (this.killChainPromise === void 0) {
       const child = this.child;
       if (child === null) return;
-      this.killChainPromise = (0, import_subagent_engine_sdk6.killChain)(child, { graceMs: opts?.graceMs ?? ZCODE_KILL_GRACE_MS });
+      this.killChainPromise = (0, import_subagent_engine_sdk7.killChain)(child, { graceMs: opts?.graceMs ?? ZCODE_KILL_GRACE_MS });
     }
     await this.killChainPromise;
   }
@@ -871,10 +940,10 @@ var AppServerConnection = class {
     this.generation += 1;
     const gen = this.generation;
     const script = this.launcherScript ?? this.cliPath;
-    const child = (0, import_subagent_engine_sdk6.spawnEngineChild)({
+    const child = (0, import_subagent_engine_sdk7.spawnEngineChild)({
       command: this.nodeBin,
       args: [script, "app-server", "--cwd", this.cwd],
-      env: (0, import_subagent_engine_sdk6.buildEngineChildEnv)(this.env, {
+      env: (0, import_subagent_engine_sdk7.buildEngineChildEnv)(this.env, {
         // L0 TAIJI_AGENT_DATA_DIR 缺省链：显式传参 > 宿主注入 env > tmpdir 占位
         //（app-server 不消费该键，占位仅满足 L0 必注入契约；生产调用方
         // zcode-engine.ensureAppServerRuntime 恒传 engineDataDir）。
@@ -912,7 +981,7 @@ var AppServerConnection = class {
         }
       }
     };
-    (0, import_subagent_engine_sdk6.pumpNdjsonLines)(child.stdout, (line) => this.handleLine(line));
+    (0, import_subagent_engine_sdk7.pumpNdjsonLines)(child.stdout, (line) => this.handleLine(line));
     child.stderr?.setEncoding("utf8");
     child.stderr?.on("data", (chunk) => {
       this.stderrTail = (this.stderrTail + chunk).slice(-ZCODE_APPSERVER_STDERR_TAIL_BUFFER_CHARS);
@@ -1053,8 +1122,8 @@ var AppServerConnection = class {
     }
     this.stderrStream.write(chunk);
     if (this.activeStderrLogPath !== null) {
-      const params = (0, import_subagent_engine_sdk5.stderrRotationParams)(process.env);
-      if ((0, import_subagent_engine_sdk5.rotateStderrLogIfNeeded)(this.activeStderrLogPath, params)) {
+      const params = (0, import_subagent_engine_sdk6.stderrRotationParams)(process.env);
+      if ((0, import_subagent_engine_sdk6.rotateStderrLogIfNeeded)(this.activeStderrLogPath, params)) {
         this.closeStderrStream();
       }
     }
@@ -1072,8 +1141,8 @@ var AppServerConnection = class {
 
 // src/session-channel.ts
 var import_node_crypto = require("crypto");
-var import_subagent_engine_sdk7 = require("@zhushanwen/subagent-engine-sdk");
-var logger2 = (0, import_subagent_engine_sdk7.getLogger)("subagents");
+var import_subagent_engine_sdk8 = require("@zhushanwen/subagent-engine-sdk");
+var logger2 = (0, import_subagent_engine_sdk8.getLogger)("subagents");
 var SUBSCRIBE_DELIVERY_KIND = "desktop-continuous";
 var WORKSPACE_KEY_HASH_CHARS = 16;
 var CREATE_REPLY_LOG_CHARS = 300;
@@ -1082,7 +1151,7 @@ function isRecord3(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
 function errMessage2(err) {
-  return (0, import_subagent_engine_sdk3.toErrorMessage)(err);
+  return (0, import_subagent_engine_sdk4.toErrorMessage)(err);
 }
 function stableWorkspaceKey(workspacePath) {
   return "ws-" + (0, import_node_crypto.createHash)("sha256").update(workspacePath).digest("hex").slice(0, WORKSPACE_KEY_HASH_CHARS);
@@ -1374,7 +1443,8 @@ var SessionChannel = class {
    * session/resume 读通道（[U6 / §3.2.6 要点 3，P-1 探针实证]）：应答自带完整
    * 双向 messages 历史（user/assistant 全量、tokens、parts）——zcode 续聊选型的
    * 历史来源（读通道成立；原地 resume 续写被 -32031 卡死，写通道不可用）。错误
-   * 原样上抛（调用方决定降级形态——引擎侧 warn 后无历史前缀开新会话）。
+   * 原样上抛（调用方决定降级形态——引擎侧 warn 后注入锚失效声明段继续执行，
+   * run 不失败，[U3]）。
    * 经 conn.request 惰性启动连接（resume 是 run 的**首个**请求——调用时点连接
    * 可能尚未启动，与 readBestEffort 的「已死跳过」判据不同场景，不做 alive 守卫）。
    */
@@ -1729,8 +1799,8 @@ var SessionChannel = class {
 
 // src/session-db-maintenance.ts
 var fs5 = __toESM(require("fs"), 1);
-var import_subagent_engine_sdk8 = require("@zhushanwen/subagent-engine-sdk");
-var logger3 = (0, import_subagent_engine_sdk8.getLogger)("subagents");
+var import_subagent_engine_sdk9 = require("@zhushanwen/subagent-engine-sdk");
+var logger3 = (0, import_subagent_engine_sdk9.getLogger)("subagents");
 var ZCODE_SESSION_TTL_MS = 2592e6;
 var ZCODE_SESSION_SWEEP_INTERVAL_MS = 864e5;
 var SWEEP_BUSY_TIMEOUT_MS = 5e3;
@@ -1886,7 +1956,7 @@ function maybeSweepExpiredZcodeSessions(dbPath, opts = {}) {
 }
 
 // src/zcode-engine.ts
-var logger4 = (0, import_subagent_engine_sdk9.getLogger)("subagents");
+var logger4 = (0, import_subagent_engine_sdk10.getLogger)("subagents");
 var PROBE_VERSION_TIMEOUT_MS = 15e3;
 var COMMON_THOUGHT_LEVELS = ["low", "high", "max"];
 var ZcodeEngine = class {
@@ -1922,8 +1992,9 @@ var ZcodeEngine = class {
       personaInjection: "prompt",
       // app-server 推送流实时流出（session/event payload.delta → text_delta）
       eventGranularity: "stream",
-      // 首期未接 worktree 隔离（公共层 worktree-manager 接入后升 emulated）
-      sandbox: "none",
+      // 无 OS sandbox；worktree 隔离由公共层 worktree-manager 承担（引擎侧仅消费
+      // task.cwd → session/create 的 workspacePath）= emulated（pi 同款声明语义）
+      sandbox: "emulated",
       // sqlite 三级 JOIN 完整重建 turns（reader 实测）
       sessionRead: "full",
       // --resume 冷启动可用（实测）
@@ -2007,8 +2078,9 @@ var ZcodeEngine = class {
     if (ctx.signal?.aborted === true) {
       return this.abortedAppServerRun(task, ctx, startedAt);
     }
-    const modelRef = resolveZcodeModelRef(task.model, this.deps.sources);
-    this.warnIgnoredCtxModel(task, ctx, modelRef);
+    const requestedModel = task.model?.trim();
+    const modelRef = requestedModel !== void 0 && requestedModel !== "" ? resolveZcodeModelRef(requestedModel, this.deps.sources) : void 0;
+    this.warnIgnoredCtxModel(task, ctx);
     this.warnThoughtLevelUncommon(task, ctx);
     const cwd = task.cwd ?? process.cwd();
     const schema = isPlainObject(task.schema) ? task.schema : void 0;
@@ -2109,8 +2181,7 @@ var ZcodeEngine = class {
    */
   async attemptAppServerTurn(task, ctx, modelRef, cwd, prompt, opts = {}) {
     const rt = this.ensureAppServerRuntime();
-    const { providerId, modelId } = splitZcodeModelRef(modelRef);
-    const createParams = buildAppServerCreateParams(task, providerId, modelId, cwd);
+    const createParams = buildAppServerCreateParams(task, modelRef, cwd);
     let currentSessionId;
     let signalSessionCreated;
     const sessionCreated = new Promise((resolve2) => {
@@ -2383,7 +2454,7 @@ var ZcodeEngine = class {
   /** abort 合成终态：exitCode=null（record 正常收尾，不留僵尸）。 */
   applyAbortedOutcome(outcome, task, ctx, final, emit) {
     outcome.exitCode = null;
-    outcome.error = isHostTimeoutAbort(ctx) ? (0, import_subagent_engine_sdk10.synthesizeTimeoutOutcome)(task, final.output.stdoutText, ZCODE_ENGINE_ID).error ?? (0, import_subagent_engine_sdk10.engineTimeoutDetail)(final.output.stdoutText) : final.abortMessage ?? `engine_run_failed: zcode \u4EFB\u52A1\u88AB\u4E2D\u6B62\uFF08app-server abort \u94FE\u6536\u53E3\uFF0C\u5BBF\u4E3B\u5408\u6210\u7EC8\u6001\uFF09\u3002\u8F93\u51FA\u5C3E\u90E8: ${final.output.stdoutText.slice(-ZCODE_ERROR_TAIL_CHARS)}`;
+    outcome.error = isHostTimeoutAbort(ctx) ? (0, import_subagent_engine_sdk11.synthesizeTimeoutOutcome)(task, final.output.stdoutText, ZCODE_ENGINE_ID).error ?? (0, import_subagent_engine_sdk11.engineTimeoutDetail)(final.output.stdoutText) : final.abortMessage ?? `engine_run_failed: zcode \u4EFB\u52A1\u88AB\u4E2D\u6B62\uFF08app-server abort \u94FE\u6536\u53E3\uFF0C\u5BBF\u4E3B\u5408\u6210\u7EC8\u6001\uFF09\u3002\u8F93\u51FA\u5C3E\u90E8: ${final.output.stdoutText.slice(-ZCODE_ERROR_TAIL_CHARS)}`;
     emit({ type: "error", message: outcome.error });
   }
   /**
@@ -2431,10 +2502,17 @@ var ZcodeEngine = class {
   }
   /**
    * [u-h2 D2-2] 派发同步期 model 校验：委托 resolveZcodeModelRef（与 run prepare 期
-   * 同一函数——canonicalRef 归一化、短名缺省 provider、凭据与清单校验单一权威，无双实现）。
-   * modelRef undefined = 返回引擎缺省模型 canonical 全名（ZCODE_FALLBACK_DEFAULT_MODEL，
-   * D2-1 ctxModel 不透传的承接面）。校验失败原样抛 ZcodePrepareError，由编排层
+   * 显式路径同一函数——canonicalRef 归一化、短名缺省 provider、凭据与清单校验单一
+   * 权威，无双实现）。校验失败原样抛 ZcodePrepareError，由编排层
    * （engine/model-validation.ts）包装成「引擎与模型不配套」文案。
+   *
+   * [R4/D6-②] 缺席语义：本实现是进程内形态 + 协议诊断面（宿主 cli 形态消费的是
+   * RemoteEngine 的 manifest 本地判定，不经本方法——SDK protocol methods.ts 明示
+   * validateModel 为诊断面）。缺席 modelRef 时返回 ZCODE_FALLBACK_DEFAULT_MODEL
+   * canonical 全名作为「引擎缺省模型」的呈现值（诊断面只读不 create，不参与
+   * create 缺席不携带的 G3 行为链）。帧应答形态维持 {canonicalRef: string}（SDK
+   * port-contract 契约必填——「帧字段缺席」的 optional 对齐需放宽 SDK 契约与
+   * server handler 签名，非本包单方面可完成）。
    */
   validateModel(modelRef) {
     return { canonicalRef: resolveZcodeModelRef(modelRef, this.deps.sources) };
@@ -2470,7 +2548,7 @@ var ZcodeEngine = class {
         }
       } else {
         const poolDir = path4.resolve(
-          (0, import_subagent_engine_sdk10.resolvePoolDir)(this.deps.engineDataDir(), ZCODE_ENGINE_ID, import_subagent_engine_sdk10.SHARED_POOL_KEY)
+          (0, import_subagent_engine_sdk11.resolvePoolDir)(this.deps.engineDataDir(), ZCODE_ENGINE_ID, import_subagent_engine_sdk11.SHARED_POOL_KEY)
         );
         const resolved = path4.resolve(poolDir, dbPathRaw);
         if (resolved.startsWith(poolDir + path4.sep)) {
@@ -2488,7 +2566,7 @@ var ZcodeEngine = class {
           logger4.warn("[zcode-engine] native session read failed, degrade to journal replay", {
             dbPath,
             sessionId,
-            reason: (0, import_subagent_engine_sdk3.toErrorMessage)(err)
+            reason: (0, import_subagent_engine_sdk4.toErrorMessage)(err)
           });
         }
       }
@@ -2518,30 +2596,33 @@ var ZcodeEngine = class {
   }
   /**
    * [F16b] ctxModel 忽略留痕：ctxModel 是 pi 链路的第三层兜底（port.ts 契约——
-   * 依赖 pi resolveModel 链的引擎才消费它），zcode 自带 provider 体系与缺省模型
-   * （resolveZcodeModelRef：requested > ZCODE_FALLBACK_DEFAULT_MODEL），不消费
-   * ctxModel。「调用方给了 ctxModel 但 task.model 未显式指定」时出声一行，说明
-   * 实际落引擎缺省模型（含实际 model id）——防静默降档无据可查。只在「ctx 有模型
-   * 但被忽略」场景输出：显式 task.model 走正常解析链、ctx 本就无模型属预期缺省，
-   * 均不出声（避免噪音）。
+   * 依赖 pi resolveModel 链的引擎才消费它），zcode 不消费。「调用方给了 ctxModel 但
+   * task.model 未显式指定」时出声一行。只在「ctx 有模型但被忽略」场景输出：显式
+   * task.model 走正常解析链、ctx 本就无模型属预期缺省，均不出声（避免噪音）。
+   * [R4/G3] 文案更新：缺席 model 时 create 不携带 model 键（缺省模型由 zcode 自身
+   * 解析——用户 defaultModelSelection 优先），不再声称「实际使用引擎缺省模型
+   * <fallback>」（恒传时代的表述，与缺席不携带的新行为不符）。modelRef 参数已随
+   * R4 条件携带移除——warn 可达即缺席态（显式 task.model 在 requested 非空早退处
+   * 返回），无第三形态。
    */
-  warnIgnoredCtxModel(task, ctx, modelRef) {
+  warnIgnoredCtxModel(task, ctx) {
     if (ctx.ctxModel === void 0) return;
     const requested = task.model?.trim();
     if (requested !== void 0 && requested !== "") return;
     logger4.warn(
-      `[zcode-engine] ctx.ctxModel\uFF08${ctx.ctxModel.id}\uFF09\u88AB\u5FFD\u7565\u2014\u2014ctxModel \u662F pi \u94FE\u8DEF\u515C\u5E95\uFF0Czcode \u4E0D\u6D88\u8D39\uFF1Btask.model \u672A\u663E\u5F0F\u6307\u5B9A\uFF0C\u5B9E\u9645\u4F7F\u7528\u5F15\u64CE\u7F3A\u7701\u6A21\u578B ${modelRef}`,
+      `[zcode-engine] ctx.ctxModel\uFF08${ctx.ctxModel.id}\uFF09\u88AB\u5FFD\u7565\u2014\u2014ctxModel \u662F pi \u94FE\u8DEF\u515C\u5E95\uFF0Czcode \u4E0D\u6D88\u8D39\uFF1Btask.model \u672A\u663E\u5F0F\u6307\u5B9A\uFF0Ccreate \u4E0D\u643A\u5E26 model \u952E\uFF0C\u7F3A\u7701\u6A21\u578B\u7531 zcode \u81EA\u8EAB\u89E3\u6790\uFF08\u7528\u6237 defaultModelSelection \u4F18\u5148\uFF09`,
       { taskId: ctx.taskId }
     );
   }
   /**
    * [U6 / §3.2.6 要点 3] resume 锚 → 历史前缀（interact-resume 的读半段）。
    *
-   * 无锚 / 非 zcode 锚形态 → undefined（行为不变）。读通道失败（条目被 TTL 清 /
-   * 会话失效 / 控制面错误）= 宿主侧锚判据通过后、引擎派发前的窄竞态窗——降级为
-   * **无历史前缀的新会话**（warn 留痕；宿主 reopen 摘要承担主降级面），不炸轮：
-   * 续聊消息本身仍可送达（模型缺历史上下文，比整轮失败可用性高，与 reopen 降级
-   * 的「带摘要重开」语义同族）。
+   * 无锚 / 非 zcode 锚形态 → undefined（行为不变）。读通道失败（会话失效 / 控制
+   * 面错误）= 锚真失效的权威信号——宿主侧库投影预检查已退役（app-server 落库滞后
+   * 于 create 应答，分钟级窗 + 部分行永不落库，预检查系统性误判；resume 走
+   * app-server resident 内存态才是真实活性判据），因此此处不再静默降级为无前缀
+   * 裸跑，而是返回锚失效声明段：让模型知情「延续但无历史」，基于最新消息独立
+   * 续推，而非在缺上下文时臆测连续性。用户消息照常执行，不炸轮。
    */
   async buildResumeHistoryPrefix(ctx) {
     const anchor = zcodeResumeAnchorOf(ctx, this.deps.engineDataDir());
@@ -2555,10 +2636,10 @@ var ZcodeEngine = class {
       tokens = extractResumeTotalTokens(result);
     } catch (err) {
       logger4.warn(
-        `[zcode-engine] session/resume \u8BFB\u5386\u53F2\u5931\u8D25\uFF08\u951A ${anchor.sessionId}\uFF09\u2014\u2014\u964D\u7EA7\u4E3A\u65E0\u5386\u53F2\u524D\u7F00\u7684\u65B0\u4F1A\u8BDD: ${errMessage3(err)}`,
+        `[zcode-engine] session/resume \u8BFB\u5386\u53F2\u5931\u8D25\uFF08\u951A ${anchor.sessionId}\uFF09\u2014\u2014\u5224\u5B9A\u951A\u771F\u5931\u6548\uFF0C\u6CE8\u5165\u951A\u5931\u6548\u58F0\u660E\u6BB5\u7EE7\u7EED\u6267\u884C: ${errMessage3(err)}`,
         { taskId: ctx.taskId }
       );
-      return void 0;
+      return buildResumeUnavailableNoticeSegment();
     }
     if (history.length === 0) return void 0;
     return buildResumeInjectionSegment(history, anchor.sessionId, tokens);
@@ -2572,7 +2653,7 @@ var ZcodeEngine = class {
   buildPrompt(task, schema) {
     const segments = [...task.appendSystemPrompt ?? []];
     segments.push(task.prompt);
-    if (schema !== void 0) segments.push((0, import_subagent_engine_sdk10.buildSchemaEmulationSegment)(schema));
+    if (schema !== void 0) segments.push((0, import_subagent_engine_sdk11.buildSchemaEmulationSegment)(schema));
     return segments.join("\n\n");
   }
 };
@@ -2608,6 +2689,9 @@ ${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" };
@@ -2622,7 +2706,7 @@ function isPlainObject(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
 function errMessage3(err) {
-  return (0, import_subagent_engine_sdk3.toErrorMessage)(err);
+  return (0, import_subagent_engine_sdk4.toErrorMessage)(err);
 }
 function resolveAppserverTimingMs(envName, fallbackMs, label) {
   const raw = process.env[envName];
@@ -2704,15 +2788,16 @@ function appendSchemaRetryDirective(basePrompt, validationError) {
 Your previous answer failed schema validation: ${validationError}
 Answer again. Output ONLY the JSON value conforming to the schema above \u2014 no prose, no markdown fences, no extra text.`;
 }
-function buildAppServerCreateParams(task, providerId, modelId, cwd) {
+function buildAppServerCreateParams(task, modelRef, cwd) {
   const denyTools = (task.denyTools ?? []).filter((t) => typeof t === "string" && t.trim() !== "");
   const thoughtLevel = task.thinkingLevel?.trim();
+  const model = modelRef !== void 0 && modelRef !== "" ? splitZcodeModelRef(modelRef) : void 0;
   return {
     workspacePath: cwd,
     mode: "yolo",
-    // per-session model（G3）：create 参数透传（A.2 ① strict 对象）——同进程任务
-    // 各用各的模型，互不干扰
-    model: { providerId, modelId },
+    // per-session model（G3）：显式指定时 create 参数透传（A.2 ① strict 对象）——同进程任务
+    // 各用各的模型，互不干扰；缺席不设键（zcode 自身缺省解析）
+    ...model !== void 0 ? { model } : {},
     ...thoughtLevel !== void 0 && thoughtLevel !== "" ? { thoughtLevel } : {},
     ...denyTools.length > 0 ? { toolDenylist: denyTools } : {}
   };
@@ -2730,7 +2815,7 @@ function parsedAppServerAttempt(task, r) {
     kind: "parsed",
     output: syntheticAppServerOutput(0),
     payload: turnResultToPayload(r),
-    ...schema !== void 0 ? { schemaResult: (0, import_subagent_engine_sdk10.extractAndValidateStructuredOutput)(r.response, schema) } : {}
+    ...schema !== void 0 ? { schemaResult: (0, import_subagent_engine_sdk11.extractAndValidateStructuredOutput)(r.response, schema) } : {}
   };
 }
 function failedTerminalAppServerAttempt(r) {
@@ -2801,16 +2886,16 @@ function buildAppServerTimeoutMessage(err, sessionId, stopPath, retried = false)
 ${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_sdk10.HOST_TIMEOUT_ABORT_REASON;
+  return ctx.signal?.aborted === true && ctx.signal.reason === import_subagent_engine_sdk11.HOST_TIMEOUT_ABORT_REASON;
 }
 var PROBE_STDOUT_CAP_CHARS = 4096;
 async function defaultProbeVersion(cliPath, dataDir) {
   try {
     return await new Promise((resolve2, reject) => {
-      const child = (0, import_subagent_engine_sdk10.spawnEngineChild)({
+      const child = (0, import_subagent_engine_sdk11.spawnEngineChild)({
         command: "node",
         args: [cliPath, "--version"],
-        env: (0, import_subagent_engine_sdk10.buildEngineChildEnv)(process.env, { dataDir }),
+        env: (0, import_subagent_engine_sdk11.buildEngineChildEnv)(process.env, { dataDir }),
         stdout: "pipe",
         stderr: "ignore",
         signal: AbortSignal.timeout(PROBE_VERSION_TIMEOUT_MS)
@@ -2828,7 +2913,7 @@ async function defaultProbeVersion(cliPath, dataDir) {
     });
   } catch (err) {
     logger4.debug(
-      `[zcode-engine] probe version check failed (best-effort continue): ${(0, import_subagent_engine_sdk3.toErrorMessage)(err)}`
+      `[zcode-engine] probe version check failed (best-effort continue): ${(0, import_subagent_engine_sdk4.toErrorMessage)(err)}`
     );
     return void 0;
   }
@@ -2836,7 +2921,7 @@ async function defaultProbeVersion(cliPath, dataDir) {
 
 // src/registration.ts
 function defaultEngineDataDir() {
-  return (0, import_subagent_engine_sdk11.resolveEngineDataDir)(process.env);
+  return (0, import_subagent_engine_sdk12.resolveEngineDataDir)(process.env);
 }
 function createZcodeEngine(deps) {
   return new ZcodeEngine(deps);
@@ -2849,7 +2934,7 @@ function createDefaultZcodeEngine() {
 }
 
 // src/port-types.ts
-var import_subagent_engine_sdk12 = require("@zhushanwen/subagent-engine-sdk");
+var import_subagent_engine_sdk13 = require("@zhushanwen/subagent-engine-sdk");
 
 // src/server.ts
 var REVERSE_TIMEOUT_DEFAULT_MS = 6e4;
@@ -2870,11 +2955,11 @@ var EngineProtocolServer = class {
   }
   /** 入站帧消费（请求帧 + 反向请求应答帧；main.ts 的行解析器拆行后喂入）。 */
   handleFrame(frame) {
-    if ((0, import_subagent_engine_sdk13.isResponseFrame)(frame)) {
+    if ((0, import_subagent_engine_sdk14.isResponseFrame)(frame)) {
       this.settleReverse(frame.id, frame);
       return;
     }
-    if ((0, import_subagent_engine_sdk13.isReverseRequestFrame)(frame)) {
+    if ((0, import_subagent_engine_sdk14.isReverseRequestFrame)(frame)) {
       this.write({
         id: 0,
         error: {
@@ -2900,7 +2985,7 @@ var EngineProtocolServer = class {
   async dispatch(id, method, params) {
     const handler = this.methodHandlers[method];
     if (handler === void 0) {
-      throw new import_subagent_engine_sdk13.EngineSdkError(
+      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."
@@ -2928,17 +3013,17 @@ var EngineProtocolServer = class {
   };
   // ── initialize：版本协商（越界 → engine_protocol_mismatch）+ 能力应答 ──
   initialize(params) {
-    if (params?.protocolVersion !== import_subagent_engine_sdk13.ENGINE_PROTOCOL_VERSION) {
-      throw new import_subagent_engine_sdk13.EngineSdkError(
+    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_sdk13.ENGINE_PROTOCOL_VERSION}`,
-        `Upgrade the engine package or the host so both speak protocol v${import_subagent_engine_sdk13.ENGINE_PROTOCOL_VERSION}.`
+        `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_sdk13.ENGINE_PROTOCOL_VERSION,
+      protocolVersion: import_subagent_engine_sdk14.ENGINE_PROTOCOL_VERSION,
       engineId: this.engine.id,
       engineVersion: ZCODE_ADAPTER_VERSION,
       adapterVersion: ZCODE_ADAPTER_VERSION,
@@ -2949,7 +3034,7 @@ var EngineProtocolServer = class {
   // ── run：协议载荷 → 本地 AgentCallOpts/RunContext；事件 → 通知/host 通道 ──
   async run(params) {
     if (!this.initialized) {
-      throw new import_subagent_engine_sdk13.EngineSdkError(
+      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."
@@ -2959,8 +3044,12 @@ var EngineProtocolServer = class {
     const controller = new AbortController();
     const active = { controller, seq: 0 };
     this.activeRuns.set(runId, active);
-    const fullTask = { ...task, ...ctx.model !== void 0 ? { model: ctx.model } : {} };
-    const ctxModel = (0, import_subagent_engine_sdk12.parseCtxModel)(ctx.ctxModel);
+    const fullTask = {
+      ...task,
+      ...ctx.model !== void 0 ? { model: ctx.model } : {},
+      ...ctx.cwd !== void 0 ? { cwd: ctx.cwd } : {}
+    };
+    const ctxModel = (0, import_subagent_engine_sdk13.parseCtxModel)(ctx.ctxModel);
     const stream = ctx.streamMode === "stream" ? { onDelta: (delta) => {
       void this.reverseRequestInternal("host/streamDelta", { runId, delta });
     } } : void 0;
@@ -2996,7 +3085,7 @@ var EngineProtocolServer = class {
   }
   validateModel(params) {
     if (this.engine.validateModel === void 0) {
-      throw new import_subagent_engine_sdk13.EngineSdkError(
+      throw new import_subagent_engine_sdk14.EngineSdkError(
         "engine_capability_unsupported",
         "engine does not implement validateModel",
         "Manifest omits modelCatalog; model validation falls back to run-time engine checks."
@@ -3042,7 +3131,7 @@ var EngineProtocolServer = class {
     clearTimeout(pending.timer);
     this.reverseClock?.acked(String(id));
     this.reverseClock?.settled(String(id));
-    if (frame.error !== void 0) pending.reject(new Error(`reverse request ${String(id)} rejected: ${(0, import_subagent_engine_sdk3.toErrorMessage)(frame.error)}`));
+    if (frame.error !== void 0) pending.reject(new Error(`reverse request ${String(id)} rejected: ${(0, import_subagent_engine_sdk4.toErrorMessage)(frame.error)}`));
     else pending.resolve(frame.result);
   }
 };
@@ -3050,10 +3139,10 @@ function probeParamsOf(params) {
   return typeof params === "object" && params !== null ? params : void 0;
 }
 function toProtocolError(err) {
-  if (err instanceof import_subagent_engine_sdk13.EngineSdkError) return err.toStructured();
+  if (err instanceof import_subagent_engine_sdk14.EngineSdkError) return err.toStructured();
   return {
     code: "engine_run_failed",
-    message: (0, import_subagent_engine_sdk3.toErrorMessage)(err),
+    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."
   };
 }