@zhushanwen/zcode-subagent-cli 0.4.1 → 0.4.2

package/dist/index.d.ts

@@ -49,6 +49,13 @@ declare class EngineProtocolServer {
      * 应答超时兜底 reject——数据面通道（host/log 等）core 10s 应答，reject 由调用方
      * 吞掉留痕（数据面丢失不拖死主链路）。
      */
+    /**
+     * fire-and-forget 反向请求（`void this.reverseRequestInternal(...)` 形态）的
+     * rejection 兜底：60s 超时（reverseRequestInternal 计时器）或宿主 error 帧
+     * （settleReverse）都会 reject——无 handler 即 unhandled rejection（Node ≥15
+     * 默认崩引擎进程）。失败只降级该次通道上报，warn 留痕不断流。
+     */
+    private warnReverseFailure;
     /** 反向请求发送（公开面：main.ts 的 host/log 桥接消费；内部 run 通道同路）。 */
     reverseRequest(method: string, params: unknown): Promise<unknown>;
     private reverseRequestInternal;
@@ -57,8 +64,12 @@ declare class EngineProtocolServer {
 }
 
 interface ZcodeSourcePaths {
-    /** 桌面登录态 config（唯一凭据源）。缺省 ~/.zcode/v2/config.json。 */
+    /** 个人 provider 注册表源（app-server 注册表对齐）。缺省 ~/.zcode/v2/provider_config.json。 */
+    personalProviderConfigPath?: string;
+    /** launcher 凭据注入的 v2 config 源（ZCODE_ENG_V2_CONFIG 消费——凭据供数面，与模型校验源无关）。缺省 ~/.zcode/v2/config.json。 */
     v2ConfigPath?: string;
+    /** 内建 provider 目录源（reasoningLevel 值域解析）。缺省按 runtime/provider 目录扫描（与 launcher 同型）。 */
+    builtinCatalogPath?: string;
 }
 
 /** ZcodeEngine 构造依赖（全部可注入——测试不依赖真机 CLI/真凭据）。 */
@@ -148,6 +159,24 @@ declare class ZcodeEngine implements EnginePort {
      *   retried：瞬时重试轮标记——失败文案补「已自动重试一次」句（F-1/F-4）。
      */
     private attemptAppServerTurn;
+    /**
+     * [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 第二可重试形态）判据：
+     *   非 RPC error（服务端无明确应答——有应答即精确错误归类，非瞬时崩溃面）且
+     *   conn 不存活。时序可靠性：catch 时刻紧随 onClose 收割，连接重建仅由
+     *   conn.request 惰性触发——本链路中 runTurn finally 的 closeSession 对死连接
+     *   短路（channel 侧 !alive 守卫）、stop 只属 abort/超时入口（前者已被
+     *   signal.aborted 短路、后者走上一分支）——此刻无 request 可重建，判据可靠；
+     * - 其余 → 精确错误终态。
+     */
+    private classifyAppServerTurnFailure;
     /**
      * killChain 后等待连接 finalize 实际完成（child 置空 + onClose 广播）再宣告链终局：
      * shutdown resolve 于 `exit` 事件，而 finalize 挂 `close`（stdio 排空）——两者之间的
@@ -224,11 +253,15 @@ declare class ZcodeEngine implements EnginePort {
     private applyRunFailedOutcome;
     /** parsed 合成终态：content/sessionId/usage 落位 + schema 校验分流 + coarse 事件。 */
     private applyParsedOutcome;
-    /** [U7] 模型可发现性：v2 桌面登录态聚合（带凭据 provider × models），失败安全返回清单本身可能为空。 */
+    /** [U7] 模型可发现性：provider_config 个人 provider 聚合（注册表实况对齐源），失败安全返回清单本身可能为空。 */
     listModels(): Array<{
         id: string;
         name?: string;
     }>;
+    /** 显式模型的最小 reasoning 档（目录 modelRules 值域；per-modelRef 记忆化——
+     *  目录文件在引擎进程生命周期内视为静态，重复 run 不重读）。 */
+    private readonly reasoningMemo;
+    private minimalReasoningFor;
     /**
      * [u-h2 D2-2] 派发同步期 model 校验：委托 resolveZcodeModelRef（与 run prepare 期
      * 显式路径同一函数——canonicalRef 归一化、短名缺省 provider、凭据与清单校验单一
@@ -237,11 +270,11 @@ declare class ZcodeEngine implements EnginePort {
      *
      * [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 时返回空串 canonical（= create 帧省略
+     * model 键、CLI 自身缺省解析——2026-09-29 account 体系迁移后 plan 家族兜底 id
+     * 已不可用；record 留痕侧按 R4/D6-② 空串归一为「用户未指定」条件留空）。帧应答
+     * 形态维持 {canonicalRef: string}（SDK port-contract 契约必填——「帧字段缺席」
+     * 的 optional 对齐需放宽 SDK 契约与 server handler 签名，非本包单方面可完成）。
      */
     validateModel(modelRef: string | undefined): {
         canonicalRef: string;

package/dist/index.js

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

package/dist/main.cjs

@@ -33,7 +33,7 @@ var ZCODE_ENGINE_ID = "zcode";
 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_PERSONAL_PROVIDER_CONFIG_PATH_SUFFIX = [".zcode", "v2", "provider_config.json"];
 var ZCODE_KILL_GRACE_MS = 5e3;
 var ZCODE_ERROR_TAIL_CHARS = 2e3;
 var ZCODE_APPSERVER_REQUEST_TIMEOUT_MS = 15e3;
@@ -160,11 +160,11 @@ var ZcodePrepareError = class extends Error {
 function isRecord(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
-function isProviderEntry(v) {
-  return isRecord(v);
+function strArray(v) {
+  return Array.isArray(v) ? v.filter((m) => typeof m === "string" && m.trim() !== "") : [];
 }
 function readSourceConfig(absPath) {
-  const empty = { providers: /* @__PURE__ */ new Map() };
+  const empty = { providers: /* @__PURE__ */ new Map(), order: [] };
   let raw;
   try {
     raw = fs.readFileSync(absPath, "utf8");
@@ -178,15 +178,30 @@ function readSourceConfig(absPath) {
     return empty;
   }
   if (!isRecord(parsed)) return empty;
-  const conf = { providers: /* @__PURE__ */ new Map() };
-  const provider = parsed["provider"];
-  if (isRecord(provider)) {
-    for (const [id, entry] of Object.entries(provider)) {
-      if (isProviderEntry(entry)) conf.providers.set(id, entry);
-    }
-  }
+  const rules = parsed["config"]?.["providerConfigRules"];
+  const providerRules = !isRecord(rules) ? void 0 : rules["providerRules"];
+  const orderSrc = parsed["config"]?.["providerOrder"];
+  const conf = { providers: /* @__PURE__ */ new Map(), order: strArray(orderSrc) };
+  if (!Array.isArray(providerRules)) return conf;
+  collectProviderRules(providerRules, conf);
   return conf;
 }
+function collectProviderRules(providerRules, conf) {
+  for (const rule of providerRules) {
+    if (!isRecord(rule)) continue;
+    const id = rule["providerId"];
+    if (typeof id !== "string" || id.trim() === "") continue;
+    const cfg = isRecord(rule["config"]) ? rule["config"] : {};
+    const access = isRecord(cfg["access"]) ? cfg["access"] : {};
+    const apiKey = access["apiKey"];
+    const personal = strArray(cfg["personalModelIds"]);
+    conf.providers.set(id, {
+      providerName: typeof rule["providerName"] === "string" ? rule["providerName"] : void 0,
+      apiKey: typeof apiKey === "string" && apiKey !== "" ? apiKey : void 0,
+      models: personal.length > 0 ? personal : strArray(cfg["modelOrder"])
+    });
+  }
+}
 function modelShort(ref) {
   return ref.slice(ref.lastIndexOf("/") + 1);
 }
@@ -197,63 +212,148 @@ function splitZcodeModelRef(modelRef) {
   return { providerId: providerOf(modelRef), modelId: modelShort(modelRef) };
 }
 function hasApiKey(entry) {
-  const key = entry.options?.apiKey;
-  return typeof key === "string" && key !== "";
+  return typeof entry.apiKey === "string" && entry.apiKey !== "";
+}
+function defaultPersonalProviderConfigPath() {
+  return path2.join(os2.homedir(), ...ZCODE_PERSONAL_PROVIDER_CONFIG_PATH_SUFFIX);
 }
 function defaultV2ConfigPath() {
   return path2.join(os2.homedir(), ...ZCODE_V2_CONFIG_PATH_SUFFIX);
 }
-var DEFAULT_PROVIDER_ID = "builtin:bigmodel-coding-plan";
-function defaultProviderForShortName(merged, withKey) {
-  if (merged.has(DEFAULT_PROVIDER_ID)) return DEFAULT_PROVIDER_ID;
+var SEMVER_SEGMENTS = 3;
+function locateZcodeBuiltinCatalog(sources) {
+  if (sources?.builtinCatalogPath !== void 0) return sources.builtinCatalogPath;
+  const fromEnv = process.env["ZCODE_BUILTIN_PROVIDER_CONFIG_FILE"]?.trim();
+  if (fromEnv !== void 0 && fromEnv !== "") return fromEnv;
+  try {
+    const providerRoot = path2.join(os2.homedir(), ".zcode", "v2", "runtime", "provider");
+    const prefix = `${process.platform}-`;
+    const platDirs = fs.readdirSync(providerRoot, { withFileTypes: true }).filter((d) => d.isDirectory() && d.name.startsWith(prefix)).map((d) => d.name);
+    const byVerDesc = (a, b) => {
+      const pa = a.split(".");
+      const pb = b.split(".");
+      for (let i = 0; i < SEMVER_SEGMENTS; i++) {
+        const na = Number.parseInt(pa[i] ?? "", 10) || 0;
+        const nb = Number.parseInt(pb[i] ?? "", 10) || 0;
+        if (na !== nb) return nb - na;
+      }
+      return 0;
+    };
+    for (const plat of platDirs) {
+      const rtRoot = path2.join(providerRoot, plat);
+      let versions = [];
+      try {
+        versions = fs.readdirSync(rtRoot).filter((v) => /^\d+\.\d+/.test(v)).sort(byVerDesc);
+      } catch {
+        continue;
+      }
+      for (const ver of versions) {
+        const verDir = path2.join(rtRoot, ver);
+        let endpoints = [];
+        try {
+          endpoints = fs.readdirSync(verDir).filter((e) => e.startsWith("endpoint-")).sort();
+        } catch {
+          continue;
+        }
+        for (const ep of endpoints) {
+          const candidate = path2.join(verDir, ep, "zcode-builtin.json");
+          if (fs.existsSync(candidate)) return candidate;
+        }
+      }
+    }
+  } catch {
+    return void 0;
+  }
+  return void 0;
+}
+function resolveZcodeMinimalReasoningLevel(modelRef, sources) {
+  const catalogPath = locateZcodeBuiltinCatalog(sources);
+  if (catalogPath === void 0) return void 0;
+  let parsed;
+  try {
+    parsed = JSON.parse(fs.readFileSync(catalogPath, "utf8"));
+  } catch {
+    return void 0;
+  }
+  const modelId = modelShort(modelRef);
+  const rules = parsed["config"];
+  const modelRules = isRecord(rules) && isRecord(rules["modelConfigRules"]) ? rules["modelConfigRules"]["modelRules"] : void 0;
+  if (!Array.isArray(modelRules)) return void 0;
+  return lastMatchingReasoningValues(modelRules, modelId)?.[0];
+}
+function lastMatchingReasoningValues(modelRules, modelId) {
+  let values;
+  for (const rule of modelRules) {
+    if (!isRecord(rule)) continue;
+    const match = rule["modelMatch"];
+    if (typeof match !== "string") continue;
+    let re;
+    try {
+      re = new RegExp(match);
+    } catch {
+      continue;
+    }
+    if (!re.test(modelId)) continue;
+    const spec = rule["config"]?.["optionSpecs"];
+    const level = isRecord(spec) ? spec["reasoningLevel"] : void 0;
+    const vals = isRecord(level) ? strArray(level["values"]) : [];
+    if (vals.length > 0) values = vals;
+  }
+  return values;
+}
+function defaultProviderForShortName(conf, withKey) {
+  const ordered = conf.order.find((id) => {
+    const entry = conf.providers.get(id);
+    return entry !== void 0 && hasApiKey(entry);
+  });
+  if (ordered !== void 0) return ordered;
   return withKey[0][0];
 }
 function resolveZcodeModelRef(requested, sources) {
-  const v2 = readSourceConfig(sources?.v2ConfigPath ?? defaultV2ConfigPath());
-  const merged = v2.providers;
-  const withKey = [...merged.entries()].filter(([, e]) => hasApiKey(e));
+  const srcPath = sources?.personalProviderConfigPath ?? defaultPersonalProviderConfigPath();
+  const conf = readSourceConfig(srcPath);
+  const withKey = [...conf.providers.entries()].filter(([, e]) => hasApiKey(e));
   const wanted = requested?.trim() || void 0;
-  const target = wanted ?? ZCODE_FALLBACK_DEFAULT_MODEL;
   if (withKey.length === 0) {
-    const hint = wanted ? `model="${wanted}" \u4E0D\u80FD\u6821\u9A8C` : `\u9ED8\u8BA4\u6A21\u578B "${target}" \u4E0D\u80FD\u6821\u9A8C`;
+    const hint = wanted ? `model="${wanted}" \u4E0D\u80FD\u6821\u9A8C` : "\u7F3A\u7701\u6A21\u578B\u89E3\u6790\u4E0D\u80FD\u6821\u9A8C";
     throw new ZcodePrepareError(
       "engine_credential_missing",
-      `zcode \u5F15\u64CE\u627E\u4E0D\u5230\u4EFB\u4F55\u5E26 apiKey \u7684 provider\uFF08${hint}\uFF09\u3002\u5DF2\u8BFB\u6E90\uFF1A${sources?.v2ConfigPath ?? defaultV2ConfigPath()}\u3002\u6062\u590D\u6307\u5F15\uFF1A\u5148\u5728 ZCode \u684C\u9762\u7AEF\u767B\u5F55\u5E76\u914D\u7F6E provider\uFF08v2 config \u5185\u5B58\u5728\u542B apiKey \u7684\u6761\u76EE\uFF09\u540E\u91CD\u8BD5\uFF1B\u51ED\u636E\u914D\u7F6E\u8BF4\u660E\u89C1 docs/research/agent-engine-zcode.md\u3002`
+      `zcode \u5F15\u64CE\u627E\u4E0D\u5230\u4EFB\u4F55\u5E26 apiKey \u7684\u4E2A\u4EBA provider\uFF08${hint}\uFF09\u3002\u5DF2\u8BFB\u6E90\uFF1A${srcPath}\u3002\u6062\u590D\u6307\u5F15\uFF1A\u5728 ZCode \u684C\u9762\u7AEF\u914D\u7F6E\u81F3\u5C11\u4E00\u4E2A\u4E2A\u4EBA provider\uFF08provider_config.json \u5185\u5B58\u5728 config.access.apiKey \u975E\u7A7A\u6761\u76EE\uFF09\u540E\u91CD\u8BD5\uFF1Bplan \u5957\u9910\u65CF\uFF08builtin:/account: \u524D\u7F00\uFF09\u7ECF\u8D26\u53F7 entitlement \u95E8\u63A7\uFF0C\u5916\u90E8 spawn \u7684\u5F15\u64CE\u6CE8\u518C\u8868\u4E0D\u88C5\u8F7D\uFF0C\u4E0D\u53EF\u4F5C\u4E3A\u5F15\u64CE\u6A21\u578B\u3002`
     );
   }
-  const provider = target.includes("/") ? providerOf(target) : defaultProviderForShortName(merged, withKey);
-  const short = modelShort(target);
-  const entry = merged.get(provider);
+  if (wanted === void 0) return "";
+  const provider = wanted.includes("/") ? providerOf(wanted) : defaultProviderForShortName(conf, withKey);
+  const short = modelShort(wanted);
+  const entry = conf.providers.get(provider);
   if (!entry) {
     const known = withKey.map(([id]) => id).join(", ");
     throw new ZcodePrepareError(
       "model_not_available",
-      `\u672A\u77E5 provider "${provider}"\uFF08\u5E26\u51ED\u636E\u7684 provider: ${known}\uFF09\u3002\u6062\u590D\u6307\u5F15\uFF1A\u6539\u7528\u4E0A\u8FF0 provider \u4E4B\u4E00\uFF08\u5168\u540D provider/model\uFF09\uFF0C\u6216\u5148\u5728 ZCode \u684C\u9762\u7AEF\u914D\u7F6E\u8BE5 provider \u540E\u91CD\u8BD5\u3002`
+      `\u672A\u77E5 provider "${provider}"\uFF08\u5E26\u51ED\u636E\u7684\u4E2A\u4EBA provider: ${known}\uFF09\u3002\u6062\u590D\u6307\u5F15\uFF1A\u6539\u7528\u4E0A\u8FF0 provider \u4E4B\u4E00\uFF08\u5168\u540D provider/model\uFF09\uFF0C\u6216\u5728 ZCode \u684C\u9762\u7AEF\u914D\u7F6E\u8BE5 provider \u540E\u91CD\u8BD5\uFF1B\u7701\u7565 model \u53C2\u6570\u5219\u8D70\u5F15\u64CE\u7F3A\u7701\u89E3\u6790\uFF08CLI \u81EA\u8EAB\u9009\u53D6\u53EF\u7528\u6A21\u578B\uFF09\u3002`
     );
   }
   if (!hasApiKey(entry)) {
     throw new ZcodePrepareError(
       "engine_credential_missing",
-      `provider "${provider}" \u5B58\u5728\u4F46\u672A\u914D\u7F6E apiKey\u3002\u6062\u590D\u6307\u5F15\uFF1A\u5728 ZCode \u684C\u9762\u7AEF\u4E3A\u8BE5 provider \u767B\u5F55\u914D\u7F6E\u51ED\u636E\uFF0C\u6216\u6539\u7528\u5DF2\u914D\u51ED\u636E\u7684 provider\uFF08${withKey.map(([id]) => id).join(", ")}\uFF09\u540E\u91CD\u8BD5\u3002`
+      `provider "${provider}" \u5B58\u5728\u4F46\u672A\u914D\u7F6E apiKey\u3002\u6062\u590D\u6307\u5F15\uFF1A\u5728 ZCode \u684C\u9762\u7AEF\u4E3A\u8BE5 provider \u914D\u7F6E\u51ED\u636E\uFF0C\u6216\u6539\u7528\u5DF2\u914D\u51ED\u636E\u7684 provider\uFF08${withKey.map(([id]) => id).join(", ")}\uFF09\u540E\u91CD\u8BD5\u3002`
     );
   }
-  const models = Object.keys(entry.models ?? {});
+  const models = entry.models ?? [];
   if (models.length > 0 && !models.includes(short)) {
     throw new ZcodePrepareError(
       "model_not_available",
-      `\u672A\u77E5\u6A21\u578B "${short}"\uFF08provider ${provider} \u4E0B\u53EF\u7528: ${models.join(", ")}\uFF09\u3002\u6062\u590D\u6307\u5F15\uFF1A\u6539\u7528\u8BE5 provider \u4E0B\u7684\u6A21\u578B\uFF0C\u6216\u5148\u5728 ZCode \u684C\u9762\u7AEF\u542F\u7528\u76EE\u6807\u6A21\u578B\u540E\u91CD\u8BD5\u3002`
+      `\u672A\u77E5\u6A21\u578B "${short}"\uFF08provider ${provider} \u4E0B\u53EF\u7528: ${models.join(", ")}\uFF09\u3002\u6062\u590D\u6307\u5F15\uFF1A\u6539\u7528\u8BE5 provider \u4E0B\u7684\u6A21\u578B\uFF0C\u6216\u5728 ZCode \u684C\u9762\u7AEF\u542F\u7528\u76EE\u6807\u6A21\u578B\u540E\u91CD\u8BD5\u3002`
     );
   }
   return `${provider}/${short}`;
 }
 function listZcodeModels(sources) {
-  const v2 = readSourceConfig(sources?.v2ConfigPath ?? defaultV2ConfigPath());
+  const conf = readSourceConfig(sources?.personalProviderConfigPath ?? defaultPersonalProviderConfigPath());
   const out = [];
-  for (const [pid, entry] of v2.providers) {
+  for (const [pid, entry] of conf.providers) {
     if (!hasApiKey(entry)) continue;
-    const providerName = typeof entry["name"] === "string" && entry["name"].trim() !== "" ? entry["name"].trim() : void 0;
-    const models = Object.keys(entry.models ?? {});
-    for (const model of models) {
+    const providerName = entry.providerName !== void 0 && entry.providerName.trim() !== "" ? entry.providerName.trim() : void 0;
+    for (const model of entry.models ?? []) {
       out.push({
         id: `${pid}/${model}`,
         ...providerName !== void 0 ? { name: `${providerName} \xB7 ${model}` } : {}
@@ -281,13 +381,13 @@ const os = require('node:os');
 const CLI_PATH = process.env.ZCODE_ENG_CLI_PATH;
 const V2_PATH = process.env.ZCODE_ENG_V2_CONFIG || path.join(os.homedir(), '.zcode', 'v2', 'config.json');
 const CONFIG_PATH = path.join(os.homedir(), '.zcode', 'cli', 'config.json');
-// \u4E0E constants.ts ZCODE_FALLBACK_DEFAULT_MODEL \u53CC\u6E90\uFF08\u5185\u5D4C\u5B57\u7B26\u4E32\u65E0\u6CD5 import\uFF09\u2014\u2014\u6539\u90A3\u8FB9\u987B\u540C\u6B65\u6B64\u5904
-const FALLBACK_MODEL_MAIN = 'builtin:bigmodel-coding-plan/GLM-5.3';
 
 // \u5408\u5E76\u5F62\u6001\uFF1A\u771F\u5B9E cli config \u539F\u6837\uFF08model/plugins/mcp/subagents \u7B49 worker \u7EE7\u627F\u9762\u4E0D\u53D8\uFF09
 // + v2 \u7684 provider \u5B57\u5178\u6CE8\u5165\uFF0C\u540C id \u65F6 v2 \u6761\u76EE\u6574\u6761\u4F18\u5148\u2014\u2014GUI \u76F4\u4F20 modelConfig \u65F6
 // v2 \u5373\u6743\u5A01\u6E90\uFF08\u8FDB\u7A0B\u5916\u7B49\u4EF7\u590D\u523B\uFF09\uFF1Bcli config \u4E0D\u5728 GUI \u7BA1\u7406\u9762\u3001\u53EF\u80FD\u6B8B\u7559\u5386\u53F2\u9A8C\u8BC1
 // \u914D\u7F6E\uFF082026-08-25 \u4E8B\u6545\uFF1A\u6B8B\u7559\u65E7 key \u538B\u8FC7\u65B0\u51ED\u636E\u81F4 turn 0 401\uFF09\uFF0C\u6545\u4E0D\u53D6 real \u4F18\u5148\u3002
+// model.main \u7F3A\u5931\u65F6\u53EA\u4ECE v2 \u900F\u4F20\uFF08v2 \u4E5F\u6CA1\u6709\u5219\u4E0D\u4F2A\u9020\u2014\u2014CLI \u7F3A\u7701\u89E3\u6790\u81EA\u4F1A\u843D\u5230\u6CE8\u518C\u8868
+// \u53EF\u7528\u6A21\u578B\uFF1Bplan \u5BB6\u65CF id \u5DF2\u4E0D\u53EF\u7528\uFF0C\u4E0D\u518D\u515C\u5E95\u4F2A\u9020\uFF09\u3002
 // \u8FD4\u56DE null = \u65E0\u53EF\u6CE8\u5165\u51ED\u636E\uFF08v2 \u65E0 provider \u6761\u76EE\uFF09\u2014\u2014\u4E0D patch\uFF0C\u8BA9\u539F\u751F\u62A5\u9519\u900F\u51FA\u3002
 // \u8BFB\u6E90\u7ECF readOrig \u95F4\u63A5\u53D6\uFF1Apatch \u524D\u9996\u8C03 = fs.readFileSync \u672C\u4F53\uFF1Bpatch \u540E = \u539F\u51FD\u6570
 // \uFF08\u9632 patch \u540E\u7684\u9012\u5F52\u81EA\u8C03\u7528\uFF09\u3002
@@ -315,9 +415,9 @@ function injectedConfigText() {
   if (Object.keys(injectable).length === 0) return null;
   const merged = { ...real };
   merged.provider = { ...(real.provider && typeof real.provider === 'object' ? real.provider : {}), ...injectable };
-  if (!merged.model || typeof merged.model !== 'object' || !merged.model.main) {
-    const main = (v2.model && v2.model.main) || FALLBACK_MODEL_MAIN;
-    merged.model = { ...(merged.model || {}), main };
+  if ((!merged.model || typeof merged.model !== 'object' || !merged.model.main)
+      && v2.model && typeof v2.model === 'object' && v2.model.main) {
+    merged.model = { ...(merged.model || {}), main: v2.model.main };
   }
   return JSON.stringify(merged);
 }
@@ -415,6 +515,23 @@ if (!process.env.ZCODE_BUILTIN_PROVIDER_CONFIG_FILE) {
     }
   } catch { /* provider \u76EE\u5F55\u7F3A\u5931/\u4E0D\u53EF\u8BFB \u2192 \u4E0D\u8BBE\u952E */ }
   if (located) process.env.ZCODE_BUILTIN_PROVIDER_CONFIG_FILE = located;
+  // endpoint origin \u5BF9\u9F50\uFF082026-09-29 \u8FC1\u79FB\u540C\u6B65\uFF09\uFF1ACLI \u6309 ZCODE_BASE_URL \u6D3E\u751F active
+  // \u76EE\u5F55\u8DEF\u5F84\uFF08sha256(origin) \u524D\u7F00\uFF09\uFF1BGUI \u5B89\u88C5\u7684\u76EE\u5F55\u5728 refresh \u63A7\u5236\u6587\u4EF6\u7684 endpointKey
+  // \u4E0B\uFF08\u5982 https://zcode.z.ai\uFF09\uFF0C\u4E0E CLI \u7F3A\u7701 origin\uFF08bigmodel.cn\uFF09\u4E0D\u540C\u2014\u2014\u4E0D\u6CE8\u5165\u5219
+  // active \u8DEF\u5F84\u7B97\u5230\u4E0D\u5B58\u5728\u7684\u76EE\u5F55\uFF0C\u89E6\u53D1\u65E0\u8C13\u7684\u8054\u7F51\u91CD\u88C5\u5C1D\u8BD5\u3002\u4ECE\u5DF2\u5B9A\u4F4D\u76EE\u5F55\u7684\u90BB\u4F4D\u63A7\u5236
+  // \u6587\u4EF6\u8BFB\u51FA origin \u6CE8\u5165\uFF08\u65E0\u786C\u7F16\u7801\uFF09\uFF1B\u663E\u5F0F env \u4F18\u5148\uFF0C\u4E0D\u8986\u76D6\u3002
+  if (located && !process.env.ZCODE_BASE_URL && !process.env.ZCODE_ENDPOINT_ORIGIN) {
+    try {
+      const ctlPath = path.join(path.dirname(located), 'zcode-builtin-refresh.json');
+      const ctlText = fs.__origReadFileSync
+        ? fs.__origReadFileSync.call(fs, ctlPath, 'utf8')
+        : fs.readFileSync(ctlPath, 'utf8');
+      const ctl = JSON.parse(ctlText);
+      if (ctl && typeof ctl.endpointKey === 'string' && ctl.endpointKey.indexOf('http') === 0) {
+        process.env.ZCODE_BASE_URL = ctl.endpointKey;
+      }
+    } catch { /* \u63A7\u5236\u6587\u4EF6\u7F3A\u5931/\u635F\u574F \u2192 \u4E0D\u6CE8\u5165\uFF08CLI \u7528\u7F3A\u7701 origin \u6D3E\u751F\uFF09 */ }
+  }
 }
 
 // \u4E0A\u6E38 provider bootstrap \u4EE5 argv[1] \u4E3A\u5165\u53E3\u951A\uFF0C\u4ECE\u8BE5\u8DEF\u5F84\u90BB\u8FD1\u5B9A\u4F4D CLI \u5185\u5EFA
@@ -2161,7 +2278,8 @@ var ZcodeEngine = class {
    */
   async attemptAppServerTurn(task, ctx, modelRef, cwd, prompt, opts = {}) {
     const rt = this.ensureAppServerRuntime();
-    const createParams = buildAppServerCreateParams(task, modelRef, cwd);
+    const reasoningLevel = modelRef !== void 0 && modelRef !== "" ? this.minimalReasoningFor(modelRef) : void 0;
+    const createParams = buildAppServerCreateParams(task, modelRef, cwd, reasoningLevel);
     let currentSessionId;
     let signalSessionCreated;
     const sessionCreated = new Promise((resolve2) => {
@@ -2202,26 +2320,52 @@ var ZcodeEngine = class {
       if (ctx.signal?.aborted === true) return abortedAppServerAttempt(ctx);
       return parsedAppServerAttempt(task, r);
     } catch (err) {
-      if (ctx.signal?.aborted === true) return abortedAppServerAttempt(ctx);
-      if (err instanceof TurnTimeoutError) {
-        const stopPath = await this.appServerAbortChain(
-          rt,
-          turn,
-          () => currentSessionId,
-          sessionCreated,
-          { escalateOn: "stop-outcome" }
-        );
-        return timeoutAppServerAttempt(err, currentSessionId, stopPath, { retried: opts.retried });
-      }
-      if (!isAppServerRpcError(err) && !rt.conn.alive) {
-        return failedAppServerAttempt(err, currentSessionId, { retried: opts.retried, transient: "conn-closed" });
-      }
-      return failedAppServerAttempt(err, currentSessionId, { retried: opts.retried });
+      return await this.classifyAppServerTurnFailure(err, ctx, {
+        rt,
+        turn,
+        currentSessionId: () => currentSessionId,
+        sessionCreated,
+        retried: opts.retried
+      });
     } finally {
       if (currentSessionId !== void 0) rt.activeSessions.delete(currentSessionId);
       if (ctx.signal !== void 0) ctx.signal.removeEventListener("abort", onAbort);
     }
   }
+  /**
+   * [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 第二可重试形态）判据：
+   *   非 RPC error（服务端无明确应答——有应答即精确错误归类，非瞬时崩溃面）且
+   *   conn 不存活。时序可靠性：catch 时刻紧随 onClose 收割，连接重建仅由
+   *   conn.request 惰性触发——本链路中 runTurn finally 的 closeSession 对死连接
+   *   短路（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" });
+    }
+    return failedAppServerAttempt(err, args.currentSessionId(), { retried: args.retried });
+  }
   /**
    * killChain 后等待连接 finalize 实际完成（child 置空 + onClose 广播）再宣告链终局：
    * shutdown resolve 于 `exit` 事件，而 finalize 挂 `close`（stdio 排空）——两者之间的
@@ -2476,10 +2620,21 @@ var ZcodeEngine = class {
     }
     for (const ev of synthesizeCoarseEvents(payload.response, payload.usage)) emit(ev);
   }
-  /** [U7] 模型可发现性：v2 桌面登录态聚合（带凭据 provider × models），失败安全返回清单本身可能为空。 */
+  /** [U7] 模型可发现性：provider_config 个人 provider 聚合（注册表实况对齐源），失败安全返回清单本身可能为空。 */
   listModels() {
     return listZcodeModels(this.deps.sources);
   }
+  /** 显式模型的最小 reasoning 档（目录 modelRules 值域；per-modelRef 记忆化——
+   *  目录文件在引擎进程生命周期内视为静态，重复 run 不重读）。 */
+  reasoningMemo = /* @__PURE__ */ new Map();
+  minimalReasoningFor(modelRef) {
+    const memoKey = `${locateZcodeBuiltinCatalog(this.deps.sources) ?? "none"}|${modelRef}`;
+    const hit = this.reasoningMemo.get(memoKey);
+    if (hit !== void 0 || this.reasoningMemo.has(memoKey)) return hit;
+    const level = resolveZcodeMinimalReasoningLevel(modelRef, this.deps.sources);
+    this.reasoningMemo.set(memoKey, level);
+    return level;
+  }
   /**
    * [u-h2 D2-2] 派发同步期 model 校验：委托 resolveZcodeModelRef（与 run prepare 期
    * 显式路径同一函数——canonicalRef 归一化、短名缺省 provider、凭据与清单校验单一
@@ -2488,11 +2643,11 @@ var ZcodeEngine = class {
    *
    * [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 时返回空串 canonical（= create 帧省略
+   * model 键、CLI 自身缺省解析——2026-09-29 account 体系迁移后 plan 家族兜底 id
+   * 已不可用；record 留痕侧按 R4/D6-② 空串归一为「用户未指定」条件留空）。帧应答
+   * 形态维持 {canonicalRef: string}（SDK port-contract 契约必填——「帧字段缺席」
+   * 的 optional 对齐需放宽 SDK 契约与 server handler 签名，非本包单方面可完成）。
    */
   validateModel(modelRef) {
     return { canonicalRef: resolveZcodeModelRef(modelRef, this.deps.sources) };
@@ -2768,10 +2923,13 @@ 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, modelRef, cwd) {
+function buildAppServerCreateParams(task, modelRef, cwd, reasoningLevel) {
   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;
+  const model = modelRef !== void 0 && modelRef !== "" ? {
+    ...splitZcodeModelRef(modelRef),
+    ...reasoningLevel !== void 0 && reasoningLevel !== "" ? { options: { reasoningLevel } } : {}
+  } : void 0;
   return {
     workspacePath: cwd,
     mode: "yolo",
@@ -2917,6 +3075,7 @@ function createDefaultZcodeEngine() {
 var import_subagent_engine_sdk13 = require("@zhushanwen/subagent-engine-sdk");
 
 // src/server.ts
+var logger5 = (0, import_subagent_engine_sdk14.getLogger)("subagents");
 var REVERSE_TIMEOUT_DEFAULT_MS = 6e4;
 var EngineProtocolServer = class {
   write;
@@ -3030,22 +3189,23 @@ var EngineProtocolServer = class {
       ...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;
+    const stream = ctx.streamMode === "stream" ? {
+      onDelta: (delta) => {
+        void this.reverseRequestInternal("host/streamDelta", { runId, delta }).catch(this.warnReverseFailure("host/streamDelta", `run ${runId}`));
+      }
+    } : void 0;
     const runCtx = {
       taskId: runId,
       signal: controller.signal,
       onEvent: (event) => this.emitEvent(runId, event),
       ...ctxModel !== void 0 ? { ctxModel } : {},
       ...stream !== void 0 ? { stream } : {},
-      ...ctx.schemaEnv !== void 0 ? { schemaEnv: ctx.schemaEnv } : {},
       ...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 } : {},
       onHandleReady: (partial) => {
-        void this.reverseRequestInternal("host/handleReady", { runId, sessionRef: partial.sessionRef });
+        void this.reverseRequestInternal("host/handleReady", { runId, sessionRef: partial.sessionRef }).catch(this.warnReverseFailure("host/handleReady", `run ${runId}`));
       }
     };
     try {
@@ -3085,6 +3245,19 @@ var EngineProtocolServer = class {
    * 应答超时兜底 reject——数据面通道（host/log 等）core 10s 应答，reject 由调用方
    * 吞掉留痕（数据面丢失不拖死主链路）。
    */
+  /**
+   * fire-and-forget 反向请求（`void this.reverseRequestInternal(...)` 形态）的
+   * rejection 兜底：60s 超时（reverseRequestInternal 计时器）或宿主 error 帧
+   * （settleReverse）都会 reject——无 handler 即 unhandled rejection（Node ≥15
+   * 默认崩引擎进程）。失败只降级该次通道上报，warn 留痕不断流。
+   */
+  warnReverseFailure(method, context) {
+    return (err) => {
+      logger5.warn(`[protocol] ${method} reverse request failed (${context}); continuing without it`, {
+        detail: (0, import_subagent_engine_sdk4.toErrorMessage)(err)
+      });
+    };
+  }
   /** 反向请求发送（公开面：main.ts 的 host/log 桥接消费；内部 run 通道同路）。 */
   reverseRequest(method, params) {
     return this.reverseRequestInternal(method, params);
@@ -3100,7 +3273,14 @@ var EngineProtocolServer = class {
       if (typeof timer.unref === "function") timer.unref();
       this.reversePending.set(id, { resolve: resolve2, reject, timer });
       this.reverseClock?.started(id);
-      this.write({ id, method, params });
+      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)}`));
+      }
     });
   }
   /** 反向请求应答落位（ack 两阶段：{ack:true}/{unsupported:true}/{ok:true} 均先 ack 计时面）。 */

package/dist/main.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/zcode-subagent-cli",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "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",
@@ -29,6 +29,7 @@
   "taiji": {
     "subagentEngine": {
       "id": "zcode",
+      "processModel": "shared-service",
       "bin": "zcode-subagent-cli",
       "protocol": 1,
       "envPrefixes": [
@@ -61,7 +62,7 @@
     "dist/"
   ],
   "dependencies": {
-    "@zhushanwen/subagent-engine-sdk": "0.6.1"
+    "@zhushanwen/subagent-engine-sdk": "0.7.0"
   },
   "devDependencies": {
     "@types/node": "^24.0.0",