@zhushanwen/zcode-subagent-cli 0.6.0 → 0.7.0

package/dist/{chunk-PWNJ5JYZ.js → chunk-33XN65H4.js}

@@ -369,6 +369,7 @@ function synthesizeCoarseEvents(response, usage) {
 import * as fs2 from "fs";
 import * as os2 from "os";
 import * as path2 from "path";
+import { resolveEngineDataDir, ZCODE_PI_SYNCED_PROVIDER_CONFIG_SEGMENTS } from "@zhushanwen/subagent-engine-sdk";
 var ZcodePrepareError = class extends Error {
   code;
   constructor(code, message) {
@@ -377,35 +378,81 @@ var ZcodePrepareError = class extends Error {
     this.code = code;
   }
 };
+var TAIJI_SYNC_GUIDANCE = "\u82E5\u4F7F\u7528 taiji \u540C\u6B65\u526F\u672C/\u9ED8\u8BA4\u6A21\u578B\uFF0C\u5230 taiji settings \u6838\u5BF9\u6216\u91CD\u9009\uFF0C\u91CD\u542F taiji \u751F\u6548\u3002";
 function isRecord(v) {
   return typeof v === "object" && v !== null && !Array.isArray(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(), order: [] };
+function readSourceJsonOrUndefined(absPath) {
   let raw;
   try {
     raw = fs2.readFileSync(absPath, "utf8");
   } catch {
-    return empty;
+    return void 0;
   }
-  let parsed;
   try {
-    parsed = JSON.parse(raw);
+    return JSON.parse(raw);
   } catch {
-    return empty;
-  }
-  if (!isRecord(parsed)) return empty;
-  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 void 0;
+  }
+}
+function extractSourceConfig(parsed) {
+  const conf = { providers: /* @__PURE__ */ new Map(), order: [] };
+  if (!isRecord(parsed)) return conf;
+  const config = parsed["config"];
+  if (!isRecord(config)) return conf;
+  conf.order = strArray(config["providerOrder"]);
+  const rules = config["providerConfigRules"];
+  const providerRules = isRecord(rules) ? rules["providerRules"] : void 0;
+  if (Array.isArray(providerRules)) collectProviderRules(providerRules, conf);
   return conf;
 }
+function readSourceConfig(absPath) {
+  return extractSourceConfig(readSourceJsonOrUndefined(absPath));
+}
+function mergePersonalProviderConfig(realObj, copyObj) {
+  if (!isRecord(copyObj)) return realObj;
+  if (!isRecord(realObj)) return copyObj;
+  const cfgOf = (obj) => isRecord(obj["config"]) ? obj["config"] : {};
+  const rulesOf = (obj) => {
+    const pcr = cfgOf(obj)["providerConfigRules"];
+    const rules = isRecord(pcr) ? pcr["providerRules"] : void 0;
+    return Array.isArray(rules) ? rules : [];
+  };
+  const mergedRules = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const rule of rulesOf(realObj)) {
+    mergedRules.push(rule);
+    if (isRecord(rule)) {
+      const id = rule["providerId"];
+      if (typeof id === "string" && id !== "") seen.add(id);
+    }
+  }
+  for (const rule of rulesOf(copyObj)) {
+    if (!isRecord(rule)) continue;
+    const id = rule["providerId"];
+    if (typeof id !== "string" || id === "") continue;
+    if (seen.has(id)) continue;
+    seen.add(id);
+    mergedRules.push(rule);
+  }
+  const mergedOrder = [];
+  for (const id of [...strArray(cfgOf(realObj)["providerOrder"]), ...strArray(cfgOf(copyObj)["providerOrder"])]) {
+    if (!mergedOrder.includes(id)) mergedOrder.push(id);
+  }
+  const realCfg = cfgOf(realObj);
+  const realPcr = isRecord(realCfg["providerConfigRules"]) ? realCfg["providerConfigRules"] : {};
+  return {
+    ...realObj,
+    config: {
+      ...realCfg,
+      providerOrder: mergedOrder,
+      providerConfigRules: { ...realPcr, providerRules: mergedRules }
+    }
+  };
+}
 function collectProviderRules(providerRules, conf) {
   for (const rule of providerRules) {
     if (!isRecord(rule)) continue;
@@ -440,6 +487,40 @@ function defaultPersonalProviderConfigPath() {
 function defaultV2ConfigPath() {
   return path2.join(os2.homedir(), ...ZCODE_V2_CONFIG_PATH_SUFFIX);
 }
+function piSyncedProviderConfigPath(engineDataDir) {
+  return path2.join(engineDataDir, ...ZCODE_PI_SYNCED_PROVIDER_CONFIG_SEGMENTS);
+}
+function envEngineDataDirOrUndefined() {
+  try {
+    return resolveEngineDataDir(process.env);
+  } catch {
+    return void 0;
+  }
+}
+function resolvePersonalProviderSource(sources, engineDataDir) {
+  const explicit = sources?.personalProviderConfigPath;
+  if (explicit !== void 0) return { kind: "explicit", path: explicit };
+  const dataDir = engineDataDir ?? envEngineDataDirOrUndefined();
+  if (dataDir !== void 0 && fs2.existsSync(piSyncedProviderConfigPath(dataDir))) {
+    return { kind: "copy", path: piSyncedProviderConfigPath(dataDir), realPath: defaultPersonalProviderConfigPath() };
+  }
+  return { kind: "real", path: defaultPersonalProviderConfigPath() };
+}
+function resolvePersonalProviderConfigPath(sources, engineDataDir) {
+  return resolvePersonalProviderSource(sources, engineDataDir).path;
+}
+function readPersonalProviderView(sources) {
+  const resolution = resolvePersonalProviderSource(sources);
+  if (resolution.kind !== "copy") {
+    return { conf: readSourceConfig(resolution.path), sourceDesc: resolution.path };
+  }
+  const copyJson = readSourceJsonOrUndefined(resolution.path);
+  const realJson = readSourceJsonOrUndefined(resolution.realPath);
+  return {
+    conf: extractSourceConfig(mergePersonalProviderConfig(realJson, copyJson)),
+    sourceDesc: `merge(\u771F\u5B9E ${resolution.realPath} + \u526F\u672C ${resolution.path})`
+  };
+}
 var SEMVER_SEGMENTS = 3;
 function locateZcodeBuiltinCatalog(sources) {
   if (sources?.builtinCatalogPath !== void 0) return sources.builtinCatalogPath;
@@ -530,15 +611,14 @@ function defaultProviderForShortName(conf, withKey) {
   return withKey[0][0];
 }
 function resolveZcodeModelRef(requested, sources) {
-  const srcPath = sources?.personalProviderConfigPath ?? defaultPersonalProviderConfigPath();
-  const conf = readSourceConfig(srcPath);
+  const { conf, sourceDesc } = readPersonalProviderView(sources);
   const withKey = [...conf.providers.entries()].filter(([, e]) => hasApiKey(e));
   const wanted = requested?.trim() || void 0;
   if (withKey.length === 0) {
     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\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`
+      `zcode \u5F15\u64CE\u627E\u4E0D\u5230\u4EFB\u4F55\u5E26 apiKey \u7684\u4E2A\u4EBA provider\uFF08${hint}\uFF09\u3002\u5DF2\u8BFB\u6E90\uFF1A${sourceDesc}\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` + TAIJI_SYNC_GUIDANCE
     );
   }
   if (wanted === void 0) return "";
@@ -549,26 +629,26 @@ function resolveZcodeModelRef(requested, sources) {
     const known = withKey.map(([id]) => id).join(", ");
     throw new ZcodePrepareError(
       "model_not_available",
-      `\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`
+      `\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` + TAIJI_SYNC_GUIDANCE
     );
   }
   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 \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` + TAIJI_SYNC_GUIDANCE
     );
   }
   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\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` + TAIJI_SYNC_GUIDANCE
     );
   }
   return `${provider}/${short}`;
 }
 function listZcodeModels(sources) {
-  const conf = readSourceConfig(sources?.personalProviderConfigPath ?? defaultPersonalProviderConfigPath());
+  const { conf } = readPersonalProviderView(sources);
   const out = [];
   for (const [pid, entry] of conf.providers) {
     if (!hasApiKey(entry)) continue;
@@ -600,7 +680,12 @@ 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 PROVIDER_CONFIG_PATH = process.env.ZCODE_ENG_PROVIDER_CONFIG || path.join(os.homedir(), '.zcode', 'v2', 'provider_config.json');
+// \u771F\u5B9E provider_config.json\uFF08Registry \u76F4\u8BFB\u8DEF\u5F84\uFF0CA0 \u63A2\u9488\u5B9E\u8BC1\uFF09\u2014\u2014\u4E0E CONFIG_PATH \u540C\u6B3E
+// homedir \u63A8\u5BFC\u5F62\u6001\uFF0C\u4E0D\u53D7 env \u91CD\u5B9A\u5411\uFF08merge \u5206\u652F\u8981\u8BFB\u7684\u6B63\u662F\u8FD9\u4E2A\u771F\u5B9E\u8DEF\u5F84\u672C\u8EAB\uFF09
+const REAL_PROVIDER_CONFIG_PATH = path.join(os.homedir(), '.zcode', 'v2', 'provider_config.json');
+// taiji \u540C\u6B65\u526F\u672C\u8DEF\u5F84\uFF08ZCODE_ENG_PROVIDER_CONFIG \u8BED\u4E49\u6536\u7A84\uFF1B'' = \u672A\u8BBE \u2192 merge \u5206\u652F\u4E0D\u6FC0\u6D3B\uFF09
+const PI_SYNCED_PATH = process.env.ZCODE_ENG_PROVIDER_CONFIG || '';
+const PROVIDER_CONFIG_PATH = process.env.ZCODE_ENG_PROVIDER_CONFIG || REAL_PROVIDER_CONFIG_PATH;
 const CONFIG_PATH = path.join(os.homedir(), '.zcode', 'cli', 'config.json');
 
 // \u5408\u5E76\u5F62\u6001\uFF1A\u771F\u5B9E cli config \u539F\u6837\uFF08model/plugins/mcp/subagents \u7B49 worker \u7EE7\u627F\u9762\u4E0D\u53D8\uFF09
@@ -678,11 +763,14 @@ function injectedConfigText() {
       for (const mid of order) {
         if (typeof mid === 'string' && mid !== '' && !(mid in models)) models[mid] = {};
       }
+      // kind \u6309\u6761\u76EE api.type \u6D3E\u751F\uFF08D3\uFF09\uFF1Aanthropic-messages \u2192 anthropic\uFF0C\u5176\u4F59
+      // \uFF08openai-chat-completions / api.type \u7F3A\u5E2D / \u672A\u77E5\u503C\uFF09\u2192 openai-compatible
+      // \u2014\u2014\u5BF9\u9F50 v2 config.json \u65E2\u6709 kind \u4E24\u503C\u5F62\u6001\uFF1B\u4F5C\u7528\u4E8E\u8865\u6CE8\u5165\u6BB5\u5168\u90E8\u6761\u76EE\uFF08\u542B\u900F\u4F20
+      // \u771F\u5B9E\u6761\u76EE\uFF0Canthropic \u534F\u8BAE\u771F\u5B9E\u6761\u76EE\u4ECE\u65E7\u9519\u914D\u503C openai-compatible \u987A\u5E26\u4FEE\u6B63\uFF09\u3002
+      // \u672A\u77E5\u534F\u8BAE\u503C\u9519\u914D\u65F6\u8BF7\u6C42\u671F\u534F\u8BAE\u9519\u8BEF\u53EF\u89C1\uFF08\u4E0D\u963B\u585E\u6CE8\u518C\u8868\u88C5\u8F7D\uFF09\uFF0C\u771F\u673A\u6F02\u79FB\u4FE1\u53F7\u660E\u786E
       injectable[id] = {
         name: typeof rule.providerName === 'string' ? rule.providerName : id,
-        // provider_config.json \u4E0D\u643A\u5E26\u534F\u8BAE\u5F62\u6001\u2014\u2014standard-personal \u7EC4\u4EE5 openai-compatible
-        // \u4E3A\u591A\u6570\u5148\u4F8B\uFF1B\u9519\u914D\u65F6\u8BF7\u6C42\u671F\u534F\u8BAE\u9519\u8BEF\u53EF\u89C1\uFF08\u4E0D\u963B\u585E\u6CE8\u518C\u8868\u88C5\u8F7D\uFF09\uFF0C\u771F\u673A\u6F02\u79FB\u4FE1\u53F7\u660E\u786E
-        kind: 'openai-compatible',
+        kind: api.type === 'anthropic-messages' ? 'anthropic' : 'openai-compatible',
         options: { apiKey: access.apiKey, baseURL: api.baseUrl },
         source: 'custom',
         models: models,
@@ -699,6 +787,77 @@ function injectedConfigText() {
   return JSON.stringify(merged);
 }
 
+// [merge-fn-start]\uFF08\u5BF9\u8D26\u5355\u6D4B\u63D0\u53D6\u951A\u2014\u2014appserver-launcher.test.ts \u6309\u6807\u8BB0\u622A\u53D6\u672C\u51FD\u6570
+// eval \u6267\u884C\uFF1Bpreparer.ts mergePersonalProviderConfig \u4E0E\u672C\u51FD\u6570\u540C\u89C4\u5219\u9501\u6B65\uFF0C\u6539\u4EFB\u4E00\u4FA7
+// \u987B\u540C\u6B65\u53E6\u4E00\u4FA7\u5E76\u8DD1\u5BF9\u8D26\u5355\u6D4B\uFF09
+// merge(\u771F\u5B9E, \u526F\u672C)\u2014\u2014D3 \u6362\u8F68\u7248\u89C4\u5219\uFF1A
+//   - \u526F\u672C\u975E\u5BF9\u8C61 \u2192 \u539F\u6837\u8FD4\u56DE real\uFF08\u526F\u672C\u7F3A\u5E2D\u56DE\u843D\u8BED\u4E49\uFF1Bwrapper \u4FA7\u66F4\u65E9\u77ED\u8DEF\uFF0C\u9632\u5FA1\u5F62\u6001\uFF09
+//   - \u771F\u5B9E\u975E\u5BF9\u8C61\uFF08ENOENT/\u635F\u574F\uFF09\u2192 \u539F\u6837\u8FD4\u56DE copy\uFF08\u526F\u672C\u72EC\u6709\u6761\u76EE\u4E3A\u5168\u96C6\uFF1AproviderRules
+//     \u4EC5\u526F\u672C\u6761\u76EE + order \u4EC5\u526F\u672C\u5E8F\uFF0C\u9876\u5C42\u5B57\u6BB5\u968F\u526F\u672C\u4FDD\u6301\u5F62\u6001\u5B8C\u6574\uFF09
+//   - providerRules\uFF1A\u771F\u5B9E\u6761\u76EE\u6574\u6761\u4FDD\u7559\u5728\u524D\uFF0C\u526F\u672C\u72EC\u6709 id \u8FFD\u52A0\uFF08\u771F\u5B9E\u4F18\u5148 = \u540C\u540D\u8BA9\u4F4D
+//     \u7684\u8FD0\u884C\u65F6\u7B2C\u4E8C\u9053\u9632\u7EBF\uFF09\uFF1B\u65E0\u6709\u6548 providerId \u7684\u526F\u672C\u6761\u76EE\u4E22\u5F03\uFF0C\u771F\u5B9E\u6761\u76EE\u539F\u6837\u4FDD\u7559
+//   - providerOrder\uFF1A\u771F\u5B9E\u73B0\u503C\u5E8F + \u526F\u672C\u72EC\u6709 id \u8FFD\u52A0\uFF08\u53BB\u91CD\u4FDD\u5E8F\uFF09
+//   - \u5176\u4F59\u5B57\u6BB5\uFF08\u542B config \u5185\u5176\u4ED6\u952E\uFF09\u53D6\u771F\u5B9E\u73B0\u503C
+function mergeProviderConfig(realObj, copyObj) {
+  const isRec = (v) => v && typeof v === 'object' && !Array.isArray(v);
+  if (!isRec(copyObj)) return realObj;
+  if (!isRec(realObj)) return copyObj;
+  const cfgOf = (obj) => (isRec(obj.config) ? obj.config : {});
+  const rulesOf = (obj) => {
+    const pcr = cfgOf(obj).providerConfigRules;
+    const r = isRec(pcr) ? pcr.providerRules : undefined;
+    return Array.isArray(r) ? r : [];
+  };
+  const strArr = (v) => (Array.isArray(v) ? v.filter((s) => typeof s === 'string' && s.trim() !== '') : []);
+  const mergedRules = [];
+  const seen = {};
+  for (const rule of rulesOf(realObj)) {
+    mergedRules.push(rule);
+    if (isRec(rule) && typeof rule.providerId === 'string' && rule.providerId !== '') seen[rule.providerId] = true;
+  }
+  for (const rule of rulesOf(copyObj)) {
+    if (!isRec(rule) || typeof rule.providerId !== 'string' || rule.providerId === '') continue;
+    if (seen[rule.providerId]) continue;
+    seen[rule.providerId] = true;
+    mergedRules.push(rule);
+  }
+  const mergedOrder = [];
+  for (const id of strArr(cfgOf(realObj).providerOrder).concat(strArr(cfgOf(copyObj).providerOrder))) {
+    if (mergedOrder.indexOf(id) === -1) mergedOrder.push(id);
+  }
+  const outCfg = Object.assign({}, cfgOf(realObj), {
+    providerOrder: mergedOrder,
+    providerConfigRules: Object.assign(
+      {},
+      isRec(cfgOf(realObj).providerConfigRules) ? cfgOf(realObj).providerConfigRules : {},
+      { providerRules: mergedRules },
+    ),
+  });
+  return Object.assign({}, realObj, { config: outCfg });
+}
+// [merge-fn-end]
+
+// D3 \u6362\u8F68\u88C5\u8F7D\u901A\u9053\uFF1A\u547D\u4E2D\u771F\u5B9E provider_config.json \u7684\u8BFB\u53D6\u91CD\u5B9A\u5411\u4E3A merge(\u771F\u5B9E\u5B9E\u65F6
+// \u5185\u5BB9, taiji \u540C\u6B65\u526F\u672C)\u2014\u2014\u6BCF\u6B21\u8BFB\u53D6\u91CD\u7B97\uFF08\u4E8B\u5B9E\u9A71\u52A8\uFF0C\u65E0\u7F13\u5B58/\u65F6\u95F4\u7A97\uFF0CZCode \u7AEF\u53D8\u66F4
+// \u5B9E\u65F6\u751F\u6548\uFF09\u3002\u526F\u672C\u7F3A\u5931/\u4E0D\u53EF\u8BFB \u2192 null = \u8C03\u7528\u65B9\u77ED\u8DEF\u56DE\u539F\u6587\u4EF6\uFF08\u56DE\u843D\u771F\u5B9E\u6587\u4EF6\u8BED\u4E49\uFF0C
+// \u96F6\u884C\u4E3A\u53D8\u5316\uFF09\uFF1Benv \u672A\u8BBE \u2192 null\uFF08\u5206\u652F\u4E0D\u6FC0\u6D3B\uFF09\u3002\u8BFB\u53D6\u4E00\u5F8B\u7ECF readOrig \u95F4\u63A5\u53D6\uFF08\u9632
+// patch \u9762\u9012\u5F52\u81EA\u8C03\u7528\uFF09\u3002
+function mergedProviderConfigText() {
+  if (!PI_SYNCED_PATH) return null;
+  const readOrig = fs.__origReadFileSync || fs.readFileSync;
+  let copyObj;
+  try {
+    copyObj = JSON.parse(readOrig(PI_SYNCED_PATH, 'utf8'));
+  } catch { return null; }
+  if (!copyObj || typeof copyObj !== 'object' || Array.isArray(copyObj)) return null;
+  let realObj = null;
+  try {
+    const parsed = JSON.parse(readOrig(REAL_PROVIDER_CONFIG_PATH, 'utf8'));
+    if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) realObj = parsed;
+  } catch { /* ENOENT/\u635F\u574F \u2192 \u526F\u672C\u72EC\u6709\u6761\u76EE\u4E3A\u5168\u96C6 */ }
+  return JSON.stringify(mergeProviderConfig(realObj, copyObj));
+}
+
 if (!CLI_PATH) {
   process.stderr.write('[zcode-launcher] ZCODE_ENG_CLI_PATH \u672A\u8BBE\u7F6E\uFF0C\u65E0\u6CD5\u542F\u52A8 app-server\uFF08\u8BE5 env \u7531\u5F15\u64CE\u81EA\u52A8\u8BBE\u7F6E\uFF1B\u624B\u5DE5\u8FD0\u884C wrapper \u9700\u663E\u5F0F\u4F20\u5165\uFF09\\n');
   process.exit(2);
@@ -722,6 +881,11 @@ if (text !== null) {
       const cur = injectedConfigText();
       if (cur !== null) return shape(rest, cur);
     }
+    // D3 \u6362\u8F68\uFF1ARegistry \u76F4\u8BFB\u771F\u5B9E provider_config.json \u2192 merge(\u771F\u5B9E, \u526F\u672C) \u89C6\u56FE
+    if (typeof p === 'string' && p === REAL_PROVIDER_CONFIG_PATH) {
+      const cur = mergedProviderConfigText();
+      if (cur !== null) return shape(rest, cur);
+    }
     return fs.__origReadFileSync.call(fs, p, ...rest);
   };
   fs.promises.__origReadFile = fs.promises.readFile;
@@ -730,17 +894,27 @@ if (text !== null) {
       const cur = injectedConfigText();
       if (cur !== null) return Promise.resolve(shape(rest, cur));
     }
+    if (typeof p === 'string' && p === REAL_PROVIDER_CONFIG_PATH) {
+      const cur = mergedProviderConfigText();
+      if (cur !== null) return Promise.resolve(shape(rest, cur));
+    }
     return fs.promises.__origReadFile.call(fs.promises, p, ...rest);
   };
   // existsSync \u62E6\u622A\uFF1A\u771F\u5B9E bundle \u7684\u7528\u6237 config \u8BFB\u53D6\uFF08loadFileConfig\uFF09\u4EE5 existsSync
   // \u4E3A\u77ED\u8DEF\u95E8\u2014\u2014\u6587\u4EF6\u4E0D\u5B58\u5728\u65F6\u8FD4\u56DE\u7A7A config \u4E14 readFileSync \u4E0D\u88AB\u8C03\u7528\uFF0CGUI-only
-  // \u767B\u5F55\u5BBF\u4E3B\uFF08cli/config.json \u4ECE\u672A\u88AB CLI \u4FA7\u5199\u8FC7\uFF09\u4E0A\u6CE8\u5165\u53EA\u6302\u5728\u8BFB\u53D6\u9762 = \u4E0D\u53EF\u89C1
+  // \u767B\u5F55\u5BBF\u4E3B\uFF08cli/config.json \u4ECE\u672A\u88AB CLI \u4FA7\u5199\u8FC7\uFF09\u4E0A\u6CE8\u5165\u53EA\u6302\u5728\u8BFB\u53D6\u9762 = \u4E0D\u53EF\u89C1\u3002
+  // D3 \u6362\u8F68\uFF1A\u771F\u5B9E provider_config.json \u7684\u5B58\u5728\u6027 = \u771F\u5B9E\u6216\u526F\u672C\u4EFB\u4E00\u5B58\u5728\u5373 true
+  //\uFF08\u771F\u5B9E\u7F3A\u5931 + \u526F\u672C\u5B58\u5728\u65F6 Registry \u7684 existsSync \u95E8\u4E0D\u5F97\u62E6\u6389 merge \u89C6\u56FE\u8BFB\u53D6\uFF09
   fs.__origExistsSync = fs.existsSync;
   fs.existsSync = function (p) {
     if (typeof p === 'string' && p === CONFIG_PATH) {
       const cur = injectedConfigText();
       if (cur !== null) return true;
     }
+    if (typeof p === 'string' && p === REAL_PROVIDER_CONFIG_PATH && PI_SYNCED_PATH) {
+      if (fs.__origExistsSync.call(fs, REAL_PROVIDER_CONFIG_PATH)) return true;
+      return fs.__origExistsSync.call(fs, PI_SYNCED_PATH);
+    }
     return fs.__origExistsSync.call(fs, p);
   };
 }
@@ -2350,7 +2524,7 @@ var ZcodeEngine = class {
     const env = buildAppServerEnv(this.deps.processEnv ?? process.env);
     env.ZCODE_ENG_CLI_PATH = cliPath;
     env.ZCODE_ENG_V2_CONFIG = this.deps.sources?.v2ConfigPath ?? defaultV2ConfigPath();
-    env.ZCODE_ENG_PROVIDER_CONFIG = this.deps.sources?.personalProviderConfigPath ?? defaultPersonalProviderConfigPath();
+    env.ZCODE_ENG_PROVIDER_CONFIG = resolvePersonalProviderConfigPath(this.deps.sources, engineDataDir);
     const sessionDbPath = zcodeSessionDbPath(engineDataDir);
     env.ZCODE_SESSION_DB_PATH = sessionDbPath;
     delete env.ZCODE_SESSION_DB;
@@ -2884,9 +3058,9 @@ async function defaultProbeVersion(cliPath, dataDir) {
 }
 
 // src/registration.ts
-import { resolveEngineDataDir } from "@zhushanwen/subagent-engine-sdk";
+import { resolveEngineDataDir as resolveEngineDataDir2 } from "@zhushanwen/subagent-engine-sdk";
 function defaultEngineDataDir() {
-  return resolveEngineDataDir(process.env);
+  return resolveEngineDataDir2(process.env);
 }
 function createZcodeEngine(deps) {
   return new ZcodeEngine(deps);