@zhushanwen/zcode-subagent-cli 0.8.1 → 0.8.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/zcode-subagent-cli.mjs +1 -1
- package/dist/{chunk-L3M3CMFJ.js → chunk-X36GXWMP.js} +677 -99
- package/dist/index.cjs +677 -99
- package/dist/index.d.cts +39 -30
- package/dist/index.d.ts +39 -30
- package/dist/index.js +1 -1
- package/dist/main.cjs +677 -99
- package/dist/main.js +1 -1
- package/package.json +6 -3
package/dist/main.cjs
CHANGED
|
@@ -404,41 +404,97 @@ function resolveAccountModelRef(wanted, wantedProvider, sources) {
|
|
|
404
404
|
`\u672A\u77E5 account provider "${wantedProvider}"\uFF08\u5185\u5EFA\u76EE\u5F55\u65E0\u6B64\u89C4\u5219\uFF09\u3002\u6062\u590D\u6307\u5F15\uFF1A\u6539\u7528\u76EE\u5F55\u5185 account:* \u89C4\u5219\uFF08\u5982 account:zai-individual-coding-plan / account:bigmodel-individual-coding-plan\uFF09\u3002`
|
|
405
405
|
);
|
|
406
406
|
}
|
|
407
|
-
|
|
408
|
-
return wanted;
|
|
407
|
+
return `${wantedProvider}/${normalizeAccountModel(accountRule, wanted, wantedProvider)}`;
|
|
409
408
|
}
|
|
410
409
|
function findAccountProviderRule(catalog, wantedProvider) {
|
|
411
410
|
const catalogRules = isRecord(catalog) && isRecord(catalog["config"]) && isRecord(catalog["config"]["providerConfigRules"]) ? catalog["config"]["providerConfigRules"]["providerRules"] : void 0;
|
|
412
411
|
const accountRule = Array.isArray(catalogRules) ? catalogRules.find((r) => isRecord(r) && r["providerId"] === wantedProvider) : void 0;
|
|
413
412
|
return isRecord(accountRule) ? accountRule : void 0;
|
|
414
413
|
}
|
|
415
|
-
function
|
|
414
|
+
function normalizeAccountModel(accountRule, wanted, wantedProvider) {
|
|
416
415
|
const accountConfig = isRecord(accountRule["config"]) ? accountRule["config"] : {};
|
|
417
416
|
const modelIds = accountConfig["builtinModelIds"] ?? accountConfig["personalModelIds"];
|
|
418
417
|
const short = modelShort(wanted);
|
|
419
|
-
if (Array.isArray(modelIds)
|
|
418
|
+
if (!Array.isArray(modelIds) || modelIds.length === 0) return short;
|
|
419
|
+
const matched = modelIds.find((m) => typeof m === "string" && m.toLowerCase() === short.toLowerCase());
|
|
420
|
+
if (matched === void 0) {
|
|
420
421
|
throw new ZcodePrepareError(
|
|
421
422
|
"model_not_available",
|
|
422
|
-
`\u672A\u77E5\u6A21\u578B "${short}"\uFF08account provider ${wantedProvider} \u4E0B\u53EF\u7528: ${modelIds.join(", ")}\uFF09\u3002`
|
|
423
|
+
`\u672A\u77E5\u6A21\u578B "${short}"\uFF08account provider ${wantedProvider} \u4E0B\u53EF\u7528: ${modelIds.filter((m) => typeof m === "string").join(", ")}\uFF09\u3002`
|
|
423
424
|
);
|
|
424
425
|
}
|
|
426
|
+
return matched;
|
|
427
|
+
}
|
|
428
|
+
var PI_TO_ZCODE_PROVIDER_MAP = {
|
|
429
|
+
"zai-coding-cn": "account:bigmodel-individual-coding-plan"
|
|
430
|
+
};
|
|
431
|
+
function translatePiModelRefToZcode(requested, sources) {
|
|
432
|
+
if (!requested.includes("/")) return requested;
|
|
433
|
+
const piProvider = providerOf(requested);
|
|
434
|
+
const target = PI_TO_ZCODE_PROVIDER_MAP[piProvider];
|
|
435
|
+
if (target === void 0) return requested;
|
|
436
|
+
const catalogPath = locateZcodeBuiltinCatalog(sources);
|
|
437
|
+
if (catalogPath === void 0) {
|
|
438
|
+
throw new ZcodePrepareError(
|
|
439
|
+
"model_not_available",
|
|
440
|
+
`\u6A21\u578B\u901A\u9053\u7FFB\u8BD1\u5931\u8D25\uFF1Api \u4FA7 "${piProvider}" \u5728 zcode \u4FA7\u5BF9\u5E94 ${target}\uFF0C\u4F46\u5185\u5EFA\u76EE\u5F55\u5B9A\u4F4D\u5931\u8D25\uFF08ZCODE_BUILTIN_PROVIDER_CONFIG_FILE \u4E0E runtime/provider \u626B\u63CF\u5747\u672A\u547D\u4E2D\uFF09\u3002\u6062\u590D\u6307\u5F15\uFF1A\u786E\u8BA4 ZCode \u5DF2\u5B89\u88C5\u540E\u91CD\u8BD5\u3002`
|
|
441
|
+
);
|
|
442
|
+
}
|
|
443
|
+
let catalog;
|
|
444
|
+
try {
|
|
445
|
+
catalog = JSON.parse(fs.readFileSync(catalogPath, "utf8"));
|
|
446
|
+
} catch (err) {
|
|
447
|
+
throw new ZcodePrepareError(
|
|
448
|
+
"model_not_available",
|
|
449
|
+
`\u6A21\u578B\u901A\u9053\u7FFB\u8BD1\u5931\u8D25\uFF1A\u5185\u5EFA\u76EE\u5F55\u4E0D\u53EF\u8BFB\uFF08${err instanceof Error ? err.message : String(err)}\uFF09\u3002`
|
|
450
|
+
);
|
|
451
|
+
}
|
|
452
|
+
const accountRule = findAccountProviderRule(catalog, target);
|
|
453
|
+
if (accountRule === void 0) {
|
|
454
|
+
throw new ZcodePrepareError(
|
|
455
|
+
"model_not_available",
|
|
456
|
+
`pi \u4FA7 "${piProvider}" \u7684 zcode \u5BF9\u5E94\u901A\u9053 ${target} \u4E0D\u53EF\u7528\uFF08\u5185\u5EFA\u76EE\u5F55\u65E0\u6B64\u89C4\u5219\uFF09\u3002\u6062\u590D\u6307\u5F15\uFF1A\u5728 ZCode \u684C\u9762\u7AEF\u5B8C\u6210\u8BE5 plan \u7684\u8D26\u53F7\u767B\u5F55/\u914D\u7F6E\u540E\u91CD\u8BD5\u3002`
|
|
457
|
+
);
|
|
458
|
+
}
|
|
459
|
+
const accountConfig = isRecord(accountRule["config"]) ? accountRule["config"] : {};
|
|
460
|
+
const modelIds = accountConfig["builtinModelIds"] ?? accountConfig["personalModelIds"];
|
|
461
|
+
if (!Array.isArray(modelIds) || modelIds.length === 0) {
|
|
462
|
+
return `${target}/${modelShort(requested)}`;
|
|
463
|
+
}
|
|
464
|
+
const wanted = modelShort(requested).toLowerCase();
|
|
465
|
+
const matched = modelIds.find((m) => typeof m === "string" && m.toLowerCase() === wanted);
|
|
466
|
+
if (matched === void 0) {
|
|
467
|
+
throw new ZcodePrepareError(
|
|
468
|
+
"model_not_available",
|
|
469
|
+
`\u6A21\u578B "${modelShort(requested)}" \u5728 ${target} \u4E0B\u65E0\u7B49\u4EF7\u6A21\u578B\uFF08\u53EF\u7528: ${modelIds.filter((m) => typeof m === "string").join(", ")}\uFF09\u3002\u6062\u590D\u6307\u5F15\uFF1A\u6539\u7528\u4E0A\u8FF0\u6A21\u578B\u4E4B\u4E00\uFF0C\u6216\u7701\u7565 model \u53C2\u6570\u8D70\u5F15\u64CE\u7F3A\u7701\u3002`
|
|
470
|
+
);
|
|
471
|
+
}
|
|
472
|
+
return `${target}/${matched}`;
|
|
473
|
+
}
|
|
474
|
+
function translateToAccountModelRef(wanted, sources) {
|
|
475
|
+
const translated = translatePiModelRefToZcode(wanted, sources);
|
|
476
|
+
const translatedProvider = translated.includes("/") ? providerOf(translated) : void 0;
|
|
477
|
+
if (translatedProvider !== void 0 && translatedProvider.startsWith("account:")) {
|
|
478
|
+
return resolveAccountModelRef(translated, translatedProvider, sources);
|
|
479
|
+
}
|
|
480
|
+
return void 0;
|
|
425
481
|
}
|
|
426
482
|
function resolveZcodeModelRef(requested, sources) {
|
|
427
483
|
const { conf, sourceDesc } = readPersonalProviderView(sources);
|
|
428
484
|
const withKey = [...conf.providers.entries()].filter(([, e]) => hasApiKey(e));
|
|
429
485
|
const wanted = requested?.trim() || void 0;
|
|
486
|
+
if (wanted !== void 0) {
|
|
487
|
+
const accountRef = translateToAccountModelRef(wanted, sources);
|
|
488
|
+
if (accountRef !== void 0) return accountRef;
|
|
489
|
+
}
|
|
430
490
|
if (withKey.length === 0) {
|
|
431
491
|
const hint = wanted ? `model="${wanted}" \u4E0D\u80FD\u6821\u9A8C` : "\u7F3A\u7701\u6A21\u578B\u89E3\u6790\u4E0D\u80FD\u6821\u9A8C";
|
|
432
492
|
throw new ZcodePrepareError(
|
|
433
493
|
"engine_credential_missing",
|
|
434
|
-
`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\
|
|
494
|
+
`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\u4E2D account: \u524D\u7F00\u7ECF\u8D26\u53F7 entitlement \u76F4\u901A\u53EF\u7528\uFF08builtin: \u524D\u7F00\u4E0D\u88C5\u8F7D\uFF0C\u4E0D\u53EF\u4F5C\u4E3A\u5F15\u64CE\u6A21\u578B\uFF09\u3002` + TAIJI_SYNC_GUIDANCE
|
|
435
495
|
);
|
|
436
496
|
}
|
|
437
497
|
if (wanted === void 0) return "";
|
|
438
|
-
const wantedProvider = wanted.includes("/") ? providerOf(wanted) : void 0;
|
|
439
|
-
if (wantedProvider !== void 0 && wantedProvider.startsWith("account:")) {
|
|
440
|
-
return resolveAccountModelRef(wanted, wantedProvider, sources);
|
|
441
|
-
}
|
|
442
498
|
const provider = wanted.includes("/") ? providerOf(wanted) : defaultProviderForShortName(conf, withKey);
|
|
443
499
|
const short = modelShort(wanted);
|
|
444
500
|
const entry = conf.providers.get(provider);
|
|
@@ -467,16 +523,58 @@ function resolveZcodeModelRef(requested, sources) {
|
|
|
467
523
|
function listZcodeModels(sources) {
|
|
468
524
|
const { conf } = readPersonalProviderView(sources);
|
|
469
525
|
const out = [];
|
|
526
|
+
const seen = /* @__PURE__ */ new Set();
|
|
470
527
|
for (const [pid, entry] of conf.providers) {
|
|
471
528
|
if (!hasApiKey(entry)) continue;
|
|
472
529
|
const providerName = entry.providerName !== void 0 && entry.providerName.trim() !== "" ? entry.providerName.trim() : void 0;
|
|
473
530
|
for (const model of entry.models ?? []) {
|
|
531
|
+
if (seen.has(`${pid}/${model}`)) continue;
|
|
532
|
+
seen.add(`${pid}/${model}`);
|
|
474
533
|
out.push({
|
|
475
534
|
id: `${pid}/${model}`,
|
|
476
535
|
...providerName !== void 0 ? { name: `${providerName} \xB7 ${model}` } : {}
|
|
477
536
|
});
|
|
478
537
|
}
|
|
479
538
|
}
|
|
539
|
+
for (const entry of listAccountFamilyModels(sources)) {
|
|
540
|
+
if (seen.has(entry.id)) continue;
|
|
541
|
+
seen.add(entry.id);
|
|
542
|
+
out.push(entry);
|
|
543
|
+
}
|
|
544
|
+
return out;
|
|
545
|
+
}
|
|
546
|
+
function readCatalogProviderRules(catalog) {
|
|
547
|
+
const rules = isRecord(catalog) && isRecord(catalog["config"]) && isRecord(catalog["config"]["providerConfigRules"]) ? catalog["config"]["providerConfigRules"]["providerRules"] : void 0;
|
|
548
|
+
return Array.isArray(rules) ? rules : [];
|
|
549
|
+
}
|
|
550
|
+
function pushAccountFamilyRuleModels(rule, out) {
|
|
551
|
+
if (!isRecord(rule)) return;
|
|
552
|
+
const providerId = rule["providerId"];
|
|
553
|
+
if (typeof providerId !== "string" || !providerId.startsWith("account:")) return;
|
|
554
|
+
const cfg = isRecord(rule["config"]) ? rule["config"] : {};
|
|
555
|
+
const models = Array.isArray(cfg["builtinModelIds"]) ? cfg["builtinModelIds"] : cfg["personalModelIds"];
|
|
556
|
+
const providerName = typeof rule["providerName"] === "string" && rule["providerName"].trim() !== "" ? rule["providerName"].trim() : void 0;
|
|
557
|
+
for (const model of Array.isArray(models) ? models : []) {
|
|
558
|
+
if (typeof model !== "string" || model.trim() === "") continue;
|
|
559
|
+
out.push({
|
|
560
|
+
id: `${providerId}/${model}`,
|
|
561
|
+
...providerName !== void 0 ? { name: `${providerName} \xB7 ${model}` } : {}
|
|
562
|
+
});
|
|
563
|
+
}
|
|
564
|
+
}
|
|
565
|
+
function listAccountFamilyModels(sources) {
|
|
566
|
+
const catalogPath = locateZcodeBuiltinCatalog(sources);
|
|
567
|
+
if (catalogPath === void 0) return [];
|
|
568
|
+
let catalog;
|
|
569
|
+
try {
|
|
570
|
+
catalog = JSON.parse(fs.readFileSync(catalogPath, "utf8"));
|
|
571
|
+
} catch {
|
|
572
|
+
return [];
|
|
573
|
+
}
|
|
574
|
+
const out = [];
|
|
575
|
+
for (const rule of readCatalogProviderRules(catalog)) {
|
|
576
|
+
pushAccountFamilyRuleModels(rule, out);
|
|
577
|
+
}
|
|
480
578
|
return out;
|
|
481
579
|
}
|
|
482
580
|
|
|
@@ -487,6 +585,475 @@ var path3 = __toESM(require("path"), 1);
|
|
|
487
585
|
// src/error-message.ts
|
|
488
586
|
var import_subagent_engine_sdk5 = require("@zhushanwen/subagent-engine-sdk");
|
|
489
587
|
|
|
588
|
+
// src/appserver-launcher-patches.ts
|
|
589
|
+
var CLI_PATCH_SECTION = `
|
|
590
|
+
// [2026-10-13 account \u76F4\u901A\u2461] CLI bundle \u6E90\u7801\u5185\u5B58\u8865\u4E01\uFF1A\u5916\u90E8 spawn \u7684\u8D26\u53F7\u6761\u76EE\u6784\u5EFA
|
|
591
|
+
// \u786C\u7F16\u7801 entitled:!1\uFF08YXe\uFF09\uFF0C\u6570\u636E\u9762\u6CE8\u5165\uFF08\u76EE\u5F55 entitled \u5B57\u6BB5\uFF09\u88AB\u5176\u65E0\u89C6\u2014\u2014\u6309\u7528\u6237\u88C1\u51B3
|
|
592
|
+
// \u6539 zcode \u6E90\u7801\u7ED5\u8FC7\uFF1A\u62E6\u622A CLI bundle \u6E90\u7801\u8BFB\u53D6\uFF0C\u5185\u5B58\u66FF\u6362\u8BE5\u5B57\u9762\u91CF\u4E3A !0\uFF08ZCode.app
|
|
593
|
+
// \u78C1\u76D8\u6587\u4EF6\u96F6\u89E6\u78B0\uFF1B\u951A\u4E32\u542B ]]:[] \u5C3E\u7F00\u552F\u4E00\u547D\u4E2D YXe \u6784\u9020\uFF0C\u53E6\u4E00\u5904\u540C\u540D\u6761\u4EF6\u903B\u8F91\u4E0D\u53D7\u5F71\u54CD\uFF09\u3002
|
|
594
|
+
// \u951A\u4E0D\u547D\u4E2D\uFF08\u4E0A\u6E38\u6DF7\u6DC6\u5F62\u6001\u53D8\u5316\uFF09\u2192 \u539F\u6587\u900F\u51FA\uFF1A\u4EC5 account \u5BB6\u65CF\u7EE7\u7EED\u88AB\u62D2\uFF0C\u4E2A\u4EBA provider
|
|
595
|
+
// \u4E0D\u53D7\u5F71\u54CD\u3002
|
|
596
|
+
// \u8865\u4E01\u6BB5\u5185\u8054\u626B\u63CF\u5668\uFF082026-10 review\xB7MF-1-5\uFF09\uFF1A\u8DF3\u8FC7\u5B57\u7B26\u4E32/\u6A21\u677F\u5B57\u9762\u91CF/\u6CE8\u91CA\uFF0C\u8BA9\u62EC\u53F7
|
|
597
|
+
// \u914D\u5E73\u4E0E\u53C2\u6570\u5207\u5206\u53EA\u5728\u4EE3\u7801\u9762\u4E0A\u8FDB\u884C\u2014\u2014bundle \u5185\u8054\u4E32\u91CC\u7684 ')' \u66FE\u628A\u8C03\u7528\u70B9\u53C2\u6570\u914D\u5E73\u5E26\u504F\u3002
|
|
598
|
+
// \u8FD4\u56DE -1 = \u8BE5\u4F4D\u7F6E\u4E0D\u662F\u5B57\u9762\u91CF/\u6CE8\u91CA\u8D77\u70B9\uFF08\u6B63\u5E38\u4EE3\u7801\u5B57\u7B26\uFF09\u3002
|
|
599
|
+
function __skipLiteralOrComment(src, i) {
|
|
600
|
+
const ch = src[i];
|
|
601
|
+
if (ch === '"' || ch === "'") {
|
|
602
|
+
i++;
|
|
603
|
+
while (i < src.length) {
|
|
604
|
+
if (src.charCodeAt(i) === 92) { i += 2; continue; }
|
|
605
|
+
if (src[i] === ch) return i + 1;
|
|
606
|
+
i++;
|
|
607
|
+
}
|
|
608
|
+
return i;
|
|
609
|
+
}
|
|
610
|
+
if (ch === '\`') {
|
|
611
|
+
i++;
|
|
612
|
+
while (i < src.length) {
|
|
613
|
+
if (src.charCodeAt(i) === 92) { i += 2; continue; }
|
|
614
|
+
const c = src[i];
|
|
615
|
+
if (c === '\`') return i + 1;
|
|
616
|
+
if (c === '$' && src[i + 1] === '{') {
|
|
617
|
+
let depth = 1;
|
|
618
|
+
i += 2;
|
|
619
|
+
while (i < src.length && depth > 0) {
|
|
620
|
+
const cc = src[i];
|
|
621
|
+
if (cc === '"' || cc === "'" || cc === '\`') { i = __skipLiteralOrComment(src, i); continue; }
|
|
622
|
+
if (cc === '/' && src[i + 1] === '/') { const nl = src.indexOf('\\n', i + 2); i = nl < 0 ? src.length : nl + 1; continue; }
|
|
623
|
+
if (cc === '/' && src[i + 1] === '*') { const end = src.indexOf('*/', i + 2); i = end < 0 ? src.length : end + 2; continue; }
|
|
624
|
+
if (cc === '{') depth++;
|
|
625
|
+
else if (cc === '}') depth--;
|
|
626
|
+
i++;
|
|
627
|
+
}
|
|
628
|
+
continue;
|
|
629
|
+
}
|
|
630
|
+
i++;
|
|
631
|
+
}
|
|
632
|
+
return i;
|
|
633
|
+
}
|
|
634
|
+
if (ch === '/' && src[i + 1] === '/') {
|
|
635
|
+
const nl = src.indexOf('\\n', i + 2);
|
|
636
|
+
return nl < 0 ? src.length : nl + 1;
|
|
637
|
+
}
|
|
638
|
+
if (ch === '/' && src[i + 1] === '*') {
|
|
639
|
+
const end = src.indexOf('*/', i + 2);
|
|
640
|
+
return end < 0 ? src.length : end + 2;
|
|
641
|
+
}
|
|
642
|
+
return -1;
|
|
643
|
+
}
|
|
644
|
+
// \u4E0E openIdx \u5904 '(' \u914D\u5BF9\u7684\u95ED\u62EC\u53F7\uFF08\u8DF3\u8FC7\u5B57\u9762\u91CF/\u6CE8\u91CA\uFF09\uFF1B-1 = \u4E0D\u914D\u5E73\u3002
|
|
645
|
+
function __matchingParen(src, openIdx) {
|
|
646
|
+
let depth = 0;
|
|
647
|
+
for (let i = openIdx; i < src.length; i++) {
|
|
648
|
+
const skip = __skipLiteralOrComment(src, i);
|
|
649
|
+
if (skip >= 0) { i = skip - 1; continue; }
|
|
650
|
+
const c = src[i];
|
|
651
|
+
if (c === '(') depth++;
|
|
652
|
+
else if (c === ')') { depth--; if (depth === 0) return i; }
|
|
653
|
+
}
|
|
654
|
+
return -1;
|
|
655
|
+
}
|
|
656
|
+
// [start,end) \u5185\u6309\u9876\u5C42\u9017\u53F7\u5207\u5206\uFF08\u62EC\u53F7/\u65B9\u62EC\u53F7/\u5BF9\u8C61\u5B57\u9762\u91CF\u4E0E\u5B57\u9762\u91CF\u5185\u7684\u9017\u53F7\u4E0D\u8BA1\uFF09\uFF1B
|
|
657
|
+
// \u8FD4\u56DE\u7EDD\u5BF9\u504F\u79FB\u6BB5\u5217\u8868\u3002
|
|
658
|
+
function __splitTopLevel(src, start, end) {
|
|
659
|
+
const parts = [];
|
|
660
|
+
let depth = 0;
|
|
661
|
+
let segStart = start;
|
|
662
|
+
for (let i = start; i < end; i++) {
|
|
663
|
+
const skip = __skipLiteralOrComment(src, i);
|
|
664
|
+
if (skip >= 0) { i = Math.min(skip, end) - 1; continue; }
|
|
665
|
+
const c = src[i];
|
|
666
|
+
if (c === '(' || c === '[' || c === '{') depth++;
|
|
667
|
+
else if (c === ')' || c === ']' || c === '}') depth--;
|
|
668
|
+
else if (c === ',' && depth === 0) { parts.push({ start: segStart, end: i }); segStart = i + 1; }
|
|
669
|
+
}
|
|
670
|
+
parts.push({ start: segStart, end: end });
|
|
671
|
+
return parts;
|
|
672
|
+
}
|
|
673
|
+
const __cliPatchCache = new Map();
|
|
674
|
+
// \u5E94\u7528\u6001\u6807\u5FD7\u53D1\u5E03\uFF082026-10 review\uFF09\uFF1A\u5B89\u88C5\u95E8\u66FE\u4EE5\u8865\u4E01\u4EA7\u7269\u5B50\u4E32\u5224\u5B9A header-port\u2014\u2014\u771F\u5B9E
|
|
675
|
+
// 3.15.3 bundle \u672C\u5C31\u542B 8 \u5904 'providerRuntimeHeadersPort:'\uFF082 \u5904 ',providerRuntimeHeadersPort:'\uFF09
|
|
676
|
+
// \u2192 \u5B50\u4E32\u5224\u5B9A\u6052\u771F\u3001\u5BF9\u951A\u70B9\u6F02\u79FB\u96F6\u68C0\u6D4B\u529B\u3002\u6539\u7531\u8865\u4E01\u51FD\u6570\u672C\u8EAB\u53D1\u5E03 {entitled,standalone,
|
|
677
|
+
// headerPort}\uFF08\u7F13\u5B58\u547D\u4E2D\u4ECD\u53EF\u8BFB\uFF09\uFF0C\u95E8\u53EA\u8BFB\u6807\u5FD7\uFF08\u4E09\u5904\u5224\u5B9A\u5404\u81EA\u5177\u540D\uFF0C\u6F02\u79FB\u4E0D\u9759\u9ED8\uFF09\u3002
|
|
678
|
+
const __cliPatchStatus = new Map();
|
|
679
|
+
function patchedCliSource(path) {
|
|
680
|
+
if (__cliPatchCache.has(path)) return __cliPatchCache.get(path);
|
|
681
|
+
let result = null;
|
|
682
|
+
let entitledApplied = false;
|
|
683
|
+
let standaloneApplied = false;
|
|
684
|
+
let portInjected = false;
|
|
685
|
+
try {
|
|
686
|
+
const readOrig = fs.__origReadFileSync || fs.readFileSync;
|
|
687
|
+
let src = readOrig(path, 'utf8');
|
|
688
|
+
// \u2460 \u7248\u672C\u9C81\u68D2\u951A\uFF082026-10-13 \u4FEE\u8BA2\uFF09\uFF1Aminified \u6807\u8BC6\u7B26\uFF08Uk/I3 \u7B49\uFF09\u968F zcode \u91CD\u65B0\u6253\u5305
|
|
689
|
+
// \u6F02\u79FB\uFF0C\u5C5E\u6027\u540D\uFF08zcodeBuiltinProviders / zhipu-account / entitled\uFF09\u662F\u6570\u636E/\u5951\u7EA6
|
|
690
|
+
// \u771F\u540D\u4E0D\u88AB\u6DF7\u6DC6\u2014\u2014\u4EE5\u5C5E\u6027\u540D\u5B9A\u4F4D + 600 \u5B57\u7B26\u7A97\u53E3\u5185\u628A\u8D26\u53F7\u6761\u76EE\u6784\u5EFA\u7684 entitled:!1
|
|
691
|
+
// \u7FFB\u8F6C\u4E3A !0\u3002\u7A97\u53E3\u96F6\u547D\u4E2D = \u4E0A\u6E38\u5F62\u6001\u6F02\u79FB \u2192 \u539F\u6587\u900F\u51FA + stderr warn\uFF08\u6F02\u79FB\u53EF\u89C1\uFF0C
|
|
692
|
+
// \u8FDB app-server stderr \u65E5\u5FD7\uFF09\u3002
|
|
693
|
+
const anchorIdx = src.indexOf('zcodeBuiltinProviders.entries()');
|
|
694
|
+
if (anchorIdx >= 0) {
|
|
695
|
+
const window = src.slice(anchorIdx, Math.min(src.length, anchorIdx + 600));
|
|
696
|
+
if (window.indexOf('zhipu-account') >= 0 && window.indexOf('entitled:!1') >= 0) {
|
|
697
|
+
src = src.slice(0, anchorIdx)
|
|
698
|
+
+ window.split('entitled:!1').join('entitled:!0')
|
|
699
|
+
+ src.slice(anchorIdx + 600);
|
|
700
|
+
entitledApplied = true;
|
|
701
|
+
}
|
|
702
|
+
}
|
|
703
|
+
if (!entitledApplied) {
|
|
704
|
+
process.stderr.write('[zcode-launcher] account bypass: CLI bundle anchor not found (zcode upstream shape drifted?) - account family stays gated\\n');
|
|
705
|
+
}
|
|
706
|
+
// \u2461 [2026-10-16 standalone account] \u534F\u8BAE\u8DEF\u5F84\u7684 provider registry \u6052\u4EE5 host-account
|
|
707
|
+
// \u6A21\u5F0F\u521B\u5EFA\uFF08\u6E90\u7801\uFF1Acreate:r(()=>xCt(z),"create") \u4E0D\u4F20 standalone\uFF09\u2014\u2014\u8BE5\u6A21\u5F0F\u4E0B
|
|
708
|
+
// account \u65CF\u8BF7\u6C42\u5FC5\u987B\u7531\u5BBF\u4E3B\u5E94\u7B54 providerRuntimeHeaders\uFF1Btaiji \u7684 headless spawn \u65E0
|
|
709
|
+
// \u5BBF\u4E3B\u53C2\u4E0E\u8BE5\u534F\u8BAE\uFF0C\u5E94\u7B54\u5E27\u7578\u5F62 \u2192 zod invalid_union(headersApplied)\uFF082026-10-16 \u771F\u673A
|
|
710
|
+
// \u4E8B\u6545\u6839\u56E0\uFF1B\u5BBF\u4E3B\u65E5\u5FD7\u96F6\u8E2A\u8FF9 = \u8BF7\u6C42\u4ECE\u672A\u5230\u8FBE\u4EFB\u4F55 host \u5B9E\u73B0\uFF09\u3002\u672C\u8865\u4E01\u7ED9\u8BE5\u8C03\u7528\u6CE8\u5165
|
|
711
|
+
// {standalone:{}}\uFF1Astandalone \u6A21\u5F0F\u81EA\u5EFA\u672C\u5730\u8D26\u53F7\u6E90\uFF08entitled \u7531\u51ED\u636E\u5B58\u5728\u6027\u8BA1\u7B97\uFF0C
|
|
712
|
+
// \u8BFB credentials.json\uFF09\u5E76\u6CE8\u5165\u672C\u5730 providerRuntimeHeaders \u7AEF\u53E3\u2014\u2014\u8D26\u53F7\u65CF\u5168\u94FE\u672C\u5730
|
|
713
|
+
// \u5B8C\u6210\u3001\u96F6\u5BBF\u4E3B\u4F9D\u8D56\u3002\u951A\u70B9\u4E24\u5904\u7A33\u5B9A\u4E32\uFF08\u975E minified\uFF09\uFF1A\u6A21\u5757\u5BFC\u51FA\u6620\u5C04
|
|
714
|
+
// startProcessProviderRegistryRuntime:()=> \u53D6\u51FD\u6570\u540D + \u8C03\u7528\u70B9 create:r(()=><fn>(\u3002
|
|
715
|
+
const exportAnchor = 'startProcessProviderRegistryRuntime:()=>';
|
|
716
|
+
const exportIdx = src.indexOf(exportAnchor);
|
|
717
|
+
if (exportIdx >= 0) {
|
|
718
|
+
// \u540D\u79F0\u5C3E\u90E8\u987B\u662F\u5206\u9694\u7B26\uFF08\u771F\u5B9E\u5F62\u6001 = \u5BFC\u51FA\u6620\u5C04\u5BF9\u8C61 ',' / '}'\uFF09\uFF1A'{0,10}' \u4E0A\u9650\u4F1A\u9759\u9ED8
|
|
719
|
+
// \u622A\u65AD\u66F4\u957F\u7684 minified \u540D \u2192 \u53D6\u5230\u9519\u8BEF\u51FD\u6570\u540D\uFF1B\u8981\u6C42\u5206\u9694\u7B26\u540E\u622A\u65AD\u4E0D\u6210\u7ACB\uFF08\u6F02\u79FB\u53EF\u89C1\uFF09\u3002
|
|
720
|
+
const nameMatch = /^([A-Za-z_$][A-Za-z0-9_$]*)(?=[,}:])/.exec(src.slice(exportIdx + exportAnchor.length));
|
|
721
|
+
const fnName = nameMatch ? nameMatch[1] : null;
|
|
722
|
+
if (fnName) {
|
|
723
|
+
// \u951A\u70B9 A\uFF08\u9996\u9009\uFF0C\u6297\u6F02\u79FB\u6700\u5F3A\uFF09\uFF1A\u51FD\u6570\u5B9A\u4E49\u9ED8\u8BA4\u53C2\u6570\u6CD5\u2014\u2014
|
|
724
|
+
// 'function <fnName>(e,t={}){' \u2192 'function <fnName>(e,t={standalone:{}}){'\u3002
|
|
725
|
+
// \u8BED\u4E49\uFF1A\u8C03\u7528\u65B9\u7701\u7565\u7B2C\u4E8C\u53C2\uFF08\u534F\u8BAE\u8DEF\u5F84 xCt(z)\uFF09\u2192 t = {standalone:{}}\uFF1B\u663E\u5F0F\u4F20
|
|
726
|
+
// {}\uFF08skipUserConfig \u8DEF\u5F84\uFF09\u6216 {standalone:{...}}\uFF08TUI \u8DEF\u5F84\uFF09\u4E0D\u53D7\u5F71\u54CD\u3002
|
|
727
|
+
const defAnchor = 'function ' + fnName + '(';
|
|
728
|
+
// \u7ED3\u6784\u6821\u9A8C\uFF082026-10 review\xB7MF-1-5\uFF09\uFF1A\u66FE\u53D6\u9996\u4E2A\u6587\u672C\u547D\u4E2D\u2014\u2014\u771F\u5B9E bundle \u6709\u6570\u767E\u4E2A
|
|
729
|
+
// \u91CD\u540D function \u5B9A\u4E49\uFF08\u540C\u540D\u4E0D\u4EE3\u8868\u552F\u4E00\uFF09\uFF0C\u9519\u6539\u4E00\u5904\u4ECD\u662F\u8BED\u6CD5\u5408\u6CD5 bundle\uFF0C\u81EA\u68C0\u65E0\u6CD5
|
|
730
|
+
// \u53D1\u73B0\u4E14\u95E8\u4F1A\u62A5 armed\u3002\u5B9A\u4E49\u5FC5\u987B**\u552F\u4E00**\u4E14\u4F4D\u4E8E\u5BFC\u51FA\u6620\u5C04\u4E4B\u524D\uFF1B\u7B2C\u4E8C\u5904\u51FA\u73B0\u6216\u5B9A\u4E49
|
|
731
|
+
// \u843D\u5728\u5BFC\u51FA\u6620\u5C04\u4E4B\u540E = \u65E0\u6CD5\u786E\u5B9A\u5BFC\u51FA\u5BF9\u8C61\u6307\u5411\u7684\u5B9E\u73B0 \u2192 \u653E\u5F03\u672C\u951A\uFF08\u56DE\u9000\u8C03\u7528\u70B9\u951A /
|
|
732
|
+
// not armed\uFF09\uFF0C\u5B81\u53EF\u6F0F\u8865\u4E5F\u4E0D\u9ED8\u9ED8\u6539\u9519\u4F4D\u7F6E\u3002
|
|
733
|
+
let defCount = 0;
|
|
734
|
+
let defIdx = -1;
|
|
735
|
+
for (let scan = src.indexOf(defAnchor); scan >= 0; scan = src.indexOf(defAnchor, scan + 1)) {
|
|
736
|
+
defCount++;
|
|
737
|
+
if (scan < exportIdx) defIdx = scan;
|
|
738
|
+
}
|
|
739
|
+
if (defCount !== 1) defIdx = -1;
|
|
740
|
+
if (defIdx >= 0) {
|
|
741
|
+
const paramsEnd = __matchingParen(src, defIdx + defAnchor.length - 1);
|
|
742
|
+
if (paramsEnd > defIdx) {
|
|
743
|
+
// \u5FC5\u987B\u6070\u597D\u4E24\u4E2A\u9876\u5C42\u53C2\u6570\u4E14\u7B2C\u4E8C\u4E2A\u4EE5 '={}' \u6536\u5C3E\uFF1A\u66FE\u53EA\u8981\u6C42 '={}' \u552F\u4E00\u2014\u2014
|
|
744
|
+
// function f(e={},t) \u4F1A\u628A standalone \u6CE8\u5165\u7B2C\u4E00\u4E2A\u53C2\u6570\uFF08\u8BED\u6CD5\u5408\u6CD5\u3001\u8BED\u4E49\u9519\u8BEF\uFF09\uFF0C
|
|
745
|
+
// function f(e,t={},o={}) \u4E5F\u4E0D\u786E\u5B9A\u6CE8\u5165\u70B9\uFF08\u65E2\u6709\u56DE\u9000\u7528\u4F8B\uFF09\u3002
|
|
746
|
+
const params = __splitTopLevel(src, defIdx + defAnchor.length, paramsEnd);
|
|
747
|
+
if (params.length === 2) {
|
|
748
|
+
const second = params[1];
|
|
749
|
+
let secondEnd = second.end;
|
|
750
|
+
while (secondEnd > second.start && src.charCodeAt(secondEnd - 1) <= 32) secondEnd--;
|
|
751
|
+
// \u51FD\u6570\u4F53\u7A97\u53E3\u4EE4\u724C\uFF08\u53EF\u9009\u4FDD\u9669\uFF09\uFF1A\u771F\u5B9E\u6CE8\u518C\u6E90\u5B9E\u88C5\u5F15\u7528 .standalone /
|
|
752
|
+
// credentialStore\u2014\u2014\u540C\u540D\u4F46\u65E0\u5173\u7684\u5B9A\u4E49\uFF08\u6216\u5B57\u7B26\u4E32\u5185\u4F2A\u547D\u4E2D\uFF09\u4E0D\u5F97\u88AB\u6539\u5199\u3002
|
|
753
|
+
const bodyWindow = src.slice(paramsEnd + 1, paramsEnd + 500);
|
|
754
|
+
if (secondEnd - second.start > 3 && src.slice(secondEnd - 3, secondEnd) === '={}'
|
|
755
|
+
&& (bodyWindow.indexOf('standalone') >= 0 || bodyWindow.indexOf('credentialStore') >= 0)) {
|
|
756
|
+
const at = secondEnd - 3;
|
|
757
|
+
src = src.slice(0, at) + '={standalone:{}}' + src.slice(secondEnd);
|
|
758
|
+
standaloneApplied = true;
|
|
759
|
+
}
|
|
760
|
+
}
|
|
761
|
+
}
|
|
762
|
+
}
|
|
763
|
+
// \u951A\u70B9 B\uFF08\u56DE\u9000\uFF09\uFF1A\u8C03\u7528\u70B9\u6CE8\u5165 create:r(()=><fn>( \u2192 (<arg>,{standalone:{}})\u3002
|
|
764
|
+
// \u7ED3\u6784\u6821\u9A8C\u4E0E\u5B9A\u4E49\u951A\u540C\u53E3\u5F84\uFF082026-10 review\xB7N-1\uFF09\uFF1A\u5168\u6587\u4EF6\u51FA\u73B0\u6B21\u6570\u5FC5\u987B\u6070\u597D 1
|
|
765
|
+
// \u2014\u2014\u66FE\u53D6\u9996\u4E2A\u6587\u672C\u547D\u4E2D\uFF0C\u672A\u6765\u7248\u672C\u51FA\u73B0\u4E24\u5904\u540C\u6B3E\u8C03\u7528\u65F6\u6CE8\u5165\u843D\u5728\u65E0\u5173\u8C03\u7528\u4E0A\u3001
|
|
766
|
+
// standaloneApplied \u4ECD\u7F6E true = \u771F\u5B9E\u534F\u8BAE\u8DEF\u5F84 host \u6A21\u5F0F\u800C\u95E8\u62A5 armed \u7684\u5047\u6210\u529F\u3002
|
|
767
|
+
// count > 1 = \u65E0\u6CD5\u786E\u5B9A\u534F\u8BAE\u8DEF\u5F84\u8C03\u7528\u70B9 \u2192 \u653E\u5F03\u672C\u951A\uFF08not armed\uFF09\u3002
|
|
768
|
+
if (!standaloneApplied) {
|
|
769
|
+
const callAnchor = 'create:r(()=>' + fnName + '(';
|
|
770
|
+
let callCount = 0;
|
|
771
|
+
let callIdx = -1;
|
|
772
|
+
for (let scan = src.indexOf(callAnchor); scan >= 0; scan = src.indexOf(callAnchor, scan + 1)) {
|
|
773
|
+
callCount++;
|
|
774
|
+
callIdx = scan;
|
|
775
|
+
}
|
|
776
|
+
if (callCount === 1) {
|
|
777
|
+
const argStart = callIdx + callAnchor.length;
|
|
778
|
+
// \u62EC\u53F7\u914D\u5E73\u627E\u4E0E fnName( \u914D\u5BF9\u7684\u95ED\u62EC\u53F7\uFF08\u626B\u63CF\u5668\u8DF3\u8FC7\u5B57\u9762\u91CF/\u6A21\u677F/\u6CE8\u91CA\u2014\u2014\u5B9E\u53C2
|
|
779
|
+
// \u542B\u5185\u8054\u4E32\u6216\u5185\u5C42\u8C03\u7528\u65F6\u9996\u4E2A ')' \u843D\u5728\u9519\u8BEF\u5C42\u7EA7 = \u6CE8\u5165\u9519\u4F4D\u7684\u5047\u6210\u529F\uFF09
|
|
780
|
+
const closeIdx = __matchingParen(src, argStart - 1);
|
|
781
|
+
if (closeIdx > argStart) {
|
|
782
|
+
src = src.slice(0, closeIdx) + ',{standalone:{}}' + src.slice(closeIdx);
|
|
783
|
+
standaloneApplied = true;
|
|
784
|
+
}
|
|
785
|
+
}
|
|
786
|
+
}
|
|
787
|
+
}
|
|
788
|
+
}
|
|
789
|
+
if (!standaloneApplied) {
|
|
790
|
+
process.stderr.write('[zcode-launcher] standalone account: CLI bundle anchor not found (zcode upstream shape drifted?) - account family stays host-dependent\\n');
|
|
791
|
+
}
|
|
792
|
+
// \u2462 [2026-10-16 standalone account\xB7\u7AEF\u53E3\u6CE8\u5165] \u534F\u8BAE\u8DEF\u5F84\u7684 app \u521B\u5EFA\uFF08
|
|
793
|
+
// createZCodeApp:r((ut={})=>INn({...q0c(...)}) \u552F\u4E00\u547D\u4E2D\uFF09\u672A\u4F20
|
|
794
|
+
// providerRuntimeHeadersPort\u2014\u2014app \u56E0\u6B64\u56DE\u843D host \u8BF7\u6C42\u7AEF\u53E3\uFF08mai\uFF09\uFF0C\u800C taiji \u94FE\u4E0A\u65E0
|
|
795
|
+
// \u5BBF\u4E3B\u4EFB\u5E94\u7B54 \u2192 zod invalid_union(headersApplied)\uFF08\u2461\u53EA\u4FEE\u4E86 registry \u4FA7\uFF1Aprovider
|
|
796
|
+
// \u5DF2\u80FD\u8FDB\u6CE8\u518C\u8868\uFF0C\u4F46\u8BA4\u8BC1\u5934\u4ECD\u8D70 host \u8BF7\u6C42\uFF09\u3002\u672C\u6B65\u628A registry runtime \u5BF9\u8C61\u4E0A\u7684
|
|
797
|
+
// providerRuntimeHeadersPort\uFF08standalone \u6A21\u5F0F = \u672C\u5730\u7AEF\u53E3\uFF09\u6CE8\u5165\u8BE5 app \u521B\u5EFA\u9009\u9879\uFF1A
|
|
798
|
+
// \u8D26\u53F7\u65CF\u8BA4\u8BC1\u5934\u7531\u672C\u8FDB\u7A0B\u672C\u5730\u89E3\u6790\uFF08\u51ED\u636E = credentials.json \u4E2D ZCode \u81EA\u6709\u9879\uFF09\u3002
|
|
799
|
+
const appAnchor = 'createZCodeApp:r(';
|
|
800
|
+
const appIdx = src.indexOf(appAnchor);
|
|
801
|
+
if (appIdx >= 0) {
|
|
802
|
+
const closeAnchor = '}),"createZCodeApp")';
|
|
803
|
+
const closeIdx = src.indexOf(closeAnchor, appIdx);
|
|
804
|
+
// \u641C\u7D22\u7A97\u4EE5\u6536\u53E3\u951A\u4E3A\u754C\uFF08\u66FE\u7528 appIdx+1600 \u56FA\u5B9A\u7A97\u2014\u2014\u7A97\u53E3\u8D8A\u8FC7\u6536\u53E3\u4F1A\u6355\u83B7\u9009\u9879\u5BF9\u8C61\u5916
|
|
805
|
+
// \u7684\u65E0\u5173\u540C\u540D\u5F62\u6001\uFF0C\u6CE8\u5165\u9519\u8BEF\u53D8\u91CF\u540D \u2192 \u52A0\u8F7D\u671F ReferenceError \u4E14\u8865\u4E01\u5C42\u65E0 warn\uFF09
|
|
806
|
+
const regMatch = closeIdx > appIdx
|
|
807
|
+
? /([A-Za-z_$][A-Za-z0-9_$]*).runtime.registryService/.exec(src.slice(appIdx, closeIdx))
|
|
808
|
+
: null;
|
|
809
|
+
if (closeIdx > appIdx && regMatch) {
|
|
810
|
+
// \u6761\u4EF6 spread\uFF082026-10 review\xB7S-4\uFF09\uFF1A\u4E0A\u6E38 kEt \u4EE5 \`n.providerRuntimeHeadersPort ??
|
|
811
|
+
// mai(e,t)\` \u628A\u5BBF\u4E3B\u8BF7\u6C42\u7AEF\u53E3\u663E\u5F0F\u4EA4\u7ED9 createZCodeApp\uFF08...q0c($0c(ut,n),...) \u5DF2\u542B\u8BE5\u503C\uFF09\uFF1B
|
|
812
|
+
// \u65E0\u6761\u4EF6\u5C3E\u63D2 <reg>.providerRuntimeHeadersPort \u5728 standalone \u672A\u6B66\u88C5\u5F62\u6001\uFF08\u503C\u4E3A
|
|
813
|
+
// undefined\uFF09\u4F1A shadow \u6389\u5BBF\u4E3B\u7AEF\u53E3\u3001\u62B9\u9664 host \u56DE\u843D\u3002\u6539\u4E3A\u4EC5\u5728\u672C\u5730\u7AEF\u53E3\u5B58\u5728\u65F6\u8986\u76D6\uFF1A
|
|
814
|
+
// standalone \u5F62\u6001\u5B57\u8282\u7B49\u4EF7\uFF0Chost \u5F62\u6001\u4FDD\u7559\u8C03\u7528\u65B9\u503C\u3002
|
|
815
|
+
const reg = regMatch[1];
|
|
816
|
+
src = src.slice(0, closeIdx)
|
|
817
|
+
+ ',...(' + reg + '.providerRuntimeHeadersPort?{providerRuntimeHeadersPort:' + reg + '.providerRuntimeHeadersPort}:{})'
|
|
818
|
+
+ src.slice(closeIdx);
|
|
819
|
+
portInjected = true;
|
|
820
|
+
}
|
|
821
|
+
}
|
|
822
|
+
if (!portInjected) {
|
|
823
|
+
process.stderr.write('[zcode-launcher] standalone account: header-port injection anchor not found (zcode upstream shape drifted?) - account auth stays host-dependent\\n');
|
|
824
|
+
}
|
|
825
|
+
// \u4EA4\u4ED8\u6761\u4EF6\u542B portInjected\uFF082026-10 review \u4FEE\u6B63\uFF09\uFF1A\u66FE\u53EA\u8BA4 entitled/standalone\u2014\u2014
|
|
826
|
+
// \u7AEF\u53E3\u951A\u5355\u72EC\u547D\u4E2D\u65F6\u8865\u4E01\u4EA7\u7269\u88AB\u9759\u9ED8\u4E22\u5F03\uFF08\u2462 \u5F62\u540C\u865A\u8BBE\uFF0C\u65E0\u4EFB\u4F55\u4FE1\u53F7\uFF09\u3002
|
|
827
|
+
if (entitledApplied || standaloneApplied || portInjected) {
|
|
828
|
+
// \u7F13\u5B58\u524D\u8BED\u6CD5\u81EA\u68C0\uFF08\u5EC9\u4EF7\u4FDD\u9669\uFF09\uFF1A\u951A\u6F02\u79FB\u5F62\u6001\u4E0B\u63D2\u9519\u4F4D\u7F6E\u4F1A\u4EA7\u51FA\u8BED\u6CD5\u975E\u6CD5 bundle\uFF0C
|
|
829
|
+
// app-server \u542F\u52A8\u5373\u88F8 SyntaxError \u4E14\u96BE\u5F52\u56E0\u8865\u4E01\u5C42\u2014\u2014\u7F13\u5B58\u524D try \u7F16\u8BD1\u4E00\u6B21\uFF0C
|
|
830
|
+
// \u5931\u8D25\u56DE\u9000\u539F\u6587 + stderr warn\uFF08\u8D70\u65E2\u6709\u300C\u539F\u6587\u900F\u51FA\u300D\u964D\u7EA7\u8BED\u4E49\uFF09\u3002BOM/shebang \u5265\u79BB
|
|
831
|
+
// \u4E0E .js \u6269\u5C55\u5904\u7406\u5668\u540C\u6B3E\uFF08\u5426\u5219\u5408\u6CD5 CJS \u88AB\u8BEF\u5224\u975E\u6CD5\uFF09\u3002
|
|
832
|
+
let check = src;
|
|
833
|
+
if (check.charCodeAt(0) === 0xfeff) check = check.slice(1);
|
|
834
|
+
if (check.startsWith('#!')) check = check.slice(check.indexOf('\\n') + 1);
|
|
835
|
+
try {
|
|
836
|
+
new Function(check);
|
|
837
|
+
result = src;
|
|
838
|
+
} catch (syntaxErr) {
|
|
839
|
+
process.stderr.write('[zcode-launcher] cli-source patch produced invalid JS (' + ((syntaxErr && syntaxErr.message) || 'unknown') + ') - falling back to unpatched source\\n');
|
|
840
|
+
result = null;
|
|
841
|
+
}
|
|
842
|
+
} else {
|
|
843
|
+
result = null;
|
|
844
|
+
}
|
|
845
|
+
} catch { result = null; }
|
|
846
|
+
__cliPatchCache.set(path, result);
|
|
847
|
+
// \u6807\u5FD7\u53EA\u63CF\u8FF0\u300C\u5DF2\u4EA4\u4ED8\u4EA7\u7269\u300D\uFF1A\u8BED\u6CD5\u81EA\u68C0\u5931\u8D25/\u5F02\u5E38\u56DE\u9000\uFF08result=null\uFF09\u65F6\u5168\u90E8 false\u2014\u2014
|
|
848
|
+
// \u95E8\u4E0D\u5F97\u628A\u672A\u751F\u6548\u7684\u8865\u4E01\u62A5\u6210 armed\u3002
|
|
849
|
+
__cliPatchStatus.set(path, {
|
|
850
|
+
entitled: result !== null && entitledApplied,
|
|
851
|
+
standalone: result !== null && standaloneApplied,
|
|
852
|
+
headerPort: result !== null && portInjected,
|
|
853
|
+
});
|
|
854
|
+
return result;
|
|
855
|
+
}`;
|
|
856
|
+
var ACCOUNT_METADATA_SECTION = `
|
|
857
|
+
// [2026-10-16 standalone account metadata] standalone \u8D26\u53F7\u6E90\u8981\u6C42
|
|
858
|
+
// account-provider:<planProviderId>:identity / :auth-source \u4E24\u6761**\u5143\u6570\u636E**\u952E\u624D\u627F\u8BA4
|
|
859
|
+
// account provider\uFF08\u7F3A identity \u76F4\u63A5\u4E22\u5F03\u8BE5 provider \u2192 \u6D3E\u53D1\u62A5\u300CProvider Registry \u4E2D
|
|
860
|
+
// \u4E0D\u5B58\u5728 Model\u300D\uFF09\u3002\u4E24\u952E\u975E\u79D8\u5BC6\uFF08\u8EAB\u4EFD ID / \u8BA4\u8BC1\u6765\u6E90\uFF09\uFF0C\u771F\u51ED\u636E\u4ECD\u662F ZCode \u81EA\u6709\u9879
|
|
861
|
+
// \uFF08oauth token \u6216 plan api-key\uFF0C\u5747\u5728 credentials.json\uFF0C\u7531 ZCode \u767B\u5F55/\u914D\u7F6E\u5199\u5165\uFF09\u3002
|
|
862
|
+
// \u672C\u6B65\u5E42\u7B49\u4F9B\u7ED9\uFF1A\u7F3A\u65F6\u8FFD\u52A0 + **\u5B64\u513F\u503C\u77EB\u6B63**\uFF082026-10 review\xB7MF-1-1\uFF09\u2014\u2014\u6D3E\u751F\u503C\u6BCF\u6B21
|
|
863
|
+
// spawn \u91CD\u7B97\uFF0C\u65E2\u6709\u975E\u7A7A\u503C\u4ECD\u662F\u6743\u5A01\uFF08\u4E0D\u65E0\u5DEE\u522B\u8986\u5199\uFF09\uFF0C\u4EC5\u5F53\u5176\u80CC\u540E\u51ED\u636E\u5DF2\u4E0D\u5B58\u5728\u65F6\u624D
|
|
864
|
+
// \u6539\u5199\uFF08oauth \u64A4\u9500 / plan key \u8F6E\u6362 / \u8D26\u53F7\u5207\u6362\uFF09\uFF1B\u5426\u5219\u65E7\u8EAB\u4EFD/\u65E7\u6765\u6E90\u4F1A\u6C38\u4E45\u95E8\u63A7\u8BE5
|
|
865
|
+
// provider \u4E14\u6C38\u4E0D\u6536\u655B\u3002\u4EFB\u4F55\u5931\u8D25\u53EA warn \u4E0D\u963B\u65AD spawn\uFF08\u7F3A\u952E\u7684\u62A5\u9519\u8DEF\u5F84\u4E0E\u6062\u590D\u6307\u5F15\u7531
|
|
866
|
+
// \u5F15\u64CE\u4FA7\u65E2\u6709\u6587\u6848\u627F\u8F7D\uFF09\u3002catches\uFF1A\u6587\u4EF6\u7F3A\u5931/\u574F JSON/\u76EE\u5F55\u4E0D\u53EF\u5199\u3002
|
|
867
|
+
// \u5E76\u53D1\u8FB9\u754C\uFF08ADR-0143 \u767B\u8BB0\uFF09\uFF1A\u5BF9\u4E0E GUI \u5171\u4EAB\u7684\u51ED\u636E\u5E93\u505A\u65E0\u9501 read-modify-write \u5168\u91CF
|
|
868
|
+
// \u5199\u56DE\uFF0C\u4E0E GUI token \u5237\u65B0\u5E76\u53D1\u5B58\u5728\u6BEB\u79D2\u7EA7\u4E22\u66F4\u65B0\u7A97\u53E3\u2014\u2014\u540E\u679C\u81EA\u6108\uFF08GUI \u4FA7\u91CD\u8BD5\u5237\u65B0 /
|
|
869
|
+
// \u672C\u4FA7\u7F3A\u952E\u4E0B\u6B21 spawn \u5E42\u7B49\u8865\u9F50\uFF09\uFF0C\u4E8B\u5B9E\u9A71\u52A8\u539F\u5219\u4E0B\u4E0D\u52A0\u9501\u3001\u4E0D\u505A\u65F6\u95F4\u8865\u507F\u3002\u5143\u6570\u636E\u952E
|
|
870
|
+
// \u9762\u53E6\u52A0 compare-and-skip \u9632\u7EBF\uFF082026-10 review\xB7N-3\uFF09\uFF1A\u5199\u56DE\u524D\u91CD\u8BFB\u78C1\u76D8\u6BD4\u5BF9
|
|
871
|
+
// identity/auth-source \u4E24\u952E\uFF0C\u68C0\u6D4B\u5230\u5E76\u53D1\u5199\u5165\u5373\u653E\u5F03\u672C\u6B21\u5199\u5165\uFF08\u89C1\u843D\u5E93\u6BB5\u6CE8\u91CA\uFF09\u3002
|
|
872
|
+
// \u8C03\u7528\u5951\u7EA6\uFF082026-10 review\xB7S-3\uFF09\uFF1A\u4EC5\u5728\u5B89\u88C5\u95E8\u786E\u8BA4 standalone \u4E0E header-port \u4E24\u951A
|
|
873
|
+
// \u5747\u5DF2\u6B66\u88C5\u65F6\u8C03\u7528\u2014\u2014\u8FD9\u4E9B\u5143\u6570\u636E\u952E\u53EA\u88AB standalone \u8D26\u53F7\u6E90\u6D88\u8D39\uFF0C\u4E14\u8D26\u53F7\u94FE\u8981\u6210\u7ACB\u8FD8\u8981\u6C42
|
|
874
|
+
// \u8BA4\u8BC1\u5934\u8D70\u672C\u5730\u7AEF\u53E3\uFF1B\u4EFB\u4E00\u951A\u6F02\u79FB\uFF08\u7248\u672C\u4E0D\u652F\u6301\uFF09\u65F6\u5199\u5165\u7528\u6237\u5171\u4EAB credentials.json \u65E0
|
|
875
|
+
// \u4EFB\u4F55\u8FD0\u884C\u65F6\u6536\u76CA\uFF0C\u53EA\u589E\u98CE\u9669\u3002
|
|
876
|
+
function ensureAccountMetadata() {
|
|
877
|
+
try {
|
|
878
|
+
const credPath = path.join(os.homedir(), '.zcode', 'v2', 'credentials.json');
|
|
879
|
+
const readOrig = fs.__origReadFileSync || fs.readFileSync;
|
|
880
|
+
if (!fs.existsSync(credPath)) return;
|
|
881
|
+
const creds = JSON.parse(readOrig.call(fs, credPath, 'utf8'));
|
|
882
|
+
if (!creds || typeof creds !== 'object' || Array.isArray(creds)) return;
|
|
883
|
+
if (!CATALOG_PATH) return;
|
|
884
|
+
let planIds = [];
|
|
885
|
+
try {
|
|
886
|
+
const cat = JSON.parse(readOrig.call(fs, CATALOG_PATH, 'utf8'));
|
|
887
|
+
const pcr = (cat && cat.config && cat.config.providerConfigRules) || {};
|
|
888
|
+
const rules = Array.isArray(pcr.providerRules) ? pcr.providerRules : [];
|
|
889
|
+
planIds = rules
|
|
890
|
+
// \u8FC7\u6EE4\u9762\u523B\u610F\u5BBD\u4E8E 3.15.3 standalone \u5FEB\u7167\u7684\u6D88\u8D39\u5224\u636E\uFF08\u6E90\u7801 NNn\uFF1Atype=zhipu-account
|
|
891
|
+
// && mode=individual-coding-plan && accountType \u975E\u7A7A && builtinModelIds \u975E\u7A7A\uFF1B
|
|
892
|
+
// \u771F\u5B9E\u76EE\u5F55 10 \u6761\u547D\u4E2D\u3001\u4EC5 2 \u6761\u88AB individual \u5FEB\u7167\u6D88\u8D39\uFF09\uFF1A\u591A\u5199\u7684\u952E\u662F\u975E\u79D8\u5BC6\u5143\u6570\u636E\u3001
|
|
893
|
+
// \u7F3A\u65F6\u8FFD\u52A0\u6210\u672C\u2248\u96F6\uFF1B\u800C mode \u503C\u57DF\uFF08individual/team/start/off-peak/
|
|
894
|
+
// highspeed\uFF09\u8DE8 CLI \u7248\u672C\u4ECD\u5728\u6F14\u5316\uFF0C\u6309\u5F53\u524D\u7248\u672C\u6536\u7A84\u4F1A\u8BA9\u522B\u7684\u7248\u672C/\u672A\u6765\u6D88\u8D39\u9762
|
|
895
|
+
// \u9759\u9ED8\u7F3A\u952E\u3002\u5BBD\u5EA6\u662F\u6709\u610F\u7684\uFF0C\u4E0D\u6309 3.15.3 \u6536\u7A84\uFF082026-10 review\xB7S-5 \u6838\u5B9E\u540E\u4FDD\u7559\uFF09\u3002
|
|
896
|
+
.filter(function (r) { return r && r.config && r.config.access && r.config.access.type === 'zhipu-account'; })
|
|
897
|
+
.map(function (r) { return String(r.providerId || ''); })
|
|
898
|
+
.filter(Boolean);
|
|
899
|
+
} catch (e) {
|
|
900
|
+
// \u76EE\u5F55\u635F\u574F/\u4E0D\u53EF\u8BFB = identity/auth-source \u65E0\u6CD5\u4F9B\u7ED9\u7684\u771F\u56E0\uFF0C\u4E0D\u80FD\u9759\u9ED8\u8FD4\u56DE\uFF08\u5426\u5219
|
|
901
|
+
// standalone \u6D3E\u53D1\u62A5\u300CProvider Registry \u4E2D\u4E0D\u5B58\u5728 Model\u300D\u65F6\u6392\u969C\u65E0\u5165\u53E3\uFF09
|
|
902
|
+
process.stderr.write('[zcode-launcher] account metadata: builtin catalog unreadable (' + ((e && e.message) || String(e)) + ') - skipping account provider metadata\\n');
|
|
903
|
+
return;
|
|
904
|
+
}
|
|
905
|
+
const added = [];
|
|
906
|
+
const reconciled = [];
|
|
907
|
+
// compare-and-skip \u57FA\u7EBF\uFF082026-10 review\xB7N-3\uFF09\uFF1A\u5168\u90E8 plan \u4E24\u952E\u7684\u8BFB\u65F6\u539F\u59CB\u503C\uFF08\u9996\u89C1
|
|
908
|
+
// \u6355\u83B7\u2014\u2014\u540E\u7EED\u6539\u5199 creds \u4E0D\u5F71\u54CD\u57FA\u7EBF\uFF09\u3002\u5199\u56DE\u524D\u91CD\u8BFB\u78C1\u76D8\u9010\u952E\u6BD4\u5BF9\uFF0C\u68C0\u6D4B\u300C\u5FEB\u7167\u8BFB\u53D6
|
|
909
|
+
// \u2192\u5199\u56DE\u300D\u7A97\u53E3\u5185\u7684 GUI/\u767B\u5F55\u5E76\u53D1\u5199\u5165\uFF0C\u9632\u9648\u65E7\u5FEB\u7167\u8986\u76D6\u6743\u5A01\u65B0\u503C\u3002
|
|
910
|
+
const metaBaseline = Object.create(null);
|
|
911
|
+
for (const pid of planIds) {
|
|
912
|
+
const idKey = 'account-provider:' + pid + ':identity';
|
|
913
|
+
const srcKey = 'account-provider:' + pid + ':auth-source';
|
|
914
|
+
if (metaBaseline[idKey] === undefined) metaBaseline[idKey] = creds[idKey];
|
|
915
|
+
if (metaBaseline[srcKey] === undefined) metaBaseline[srcKey] = creds[srcKey];
|
|
916
|
+
// host \u6001 plan api-key \u952E\u540D\u6A21\u677F\uFF1Aaccount-provider:coding-plan:<pid>:account:<identity>:api-key
|
|
917
|
+
const apiKeyPrefix = 'account-provider:coding-plan:' + pid + ':account:';
|
|
918
|
+
const apiKeySuffix = ':api-key';
|
|
919
|
+
const hasPlanApiKey = (id) => {
|
|
920
|
+
if (!id) return false;
|
|
921
|
+
return Boolean(creds[apiKeyPrefix + encodeURIComponent(id) + apiKeySuffix]);
|
|
922
|
+
};
|
|
923
|
+
let identity = typeof creds[idKey] === 'string' ? creds[idKey] : '';
|
|
924
|
+
const authSource = typeof creds[srcKey] === 'string' ? creds[srcKey] : '';
|
|
925
|
+
// \u6D3E\u751F\u8EAB\u4EFD\u6BCF\u6B21 spawn \u91CD\u7B97\uFF08\u4E0D\u8BFB\u65E2\u6709\u952E\uFF09\u3002\u591A plan api-key\uFF08\u65E7+\u65B0 account / \u8F6E\u6362
|
|
926
|
+
// \u6B8B\u7559\uFF09\u65F6\u300CObject.keys \u9996\u4E2A\u547D\u4E2D\u300D\u4F1A\u6C38\u4E45\u6307\u5411\u9648\u65E7 account \u4E14 hasPlanApiKey \u6052\u771F\u3001
|
|
927
|
+
// \u6C38\u4E0D\u81EA\u6108\uFF082026-10 review\xB7DG-R2-01\uFF09\u2014\u2014\u6D3E\u751F\u4F18\u5148\u7EA7\uFF1A
|
|
928
|
+
// \u2460 project-key-location:v1:[origin,family,identity,...] \u952E\u5185\u5D4C identity
|
|
929
|
+
// \uFF08ZCode \u767B\u5F55\u5199\u5165\u7684\u786E\u5B9A\u6027\u4FE1\u53F7\uFF1B\u952E\u540D\u5C3E\u6BB5 URL \u7F16\u7801 JSON \u6570\u7EC4\uFF0C\u7B2C 2/3 \u5143\u7D20
|
|
930
|
+
// = family/identity\uFF0Cfamily \u4E0E pid \u524D\u7F00\u5339\u914D\u540C oauth \u5BB6\u65CF\u5224\u636E\uFF09\u5168\u4F53\u53BB\u91CD\u540E
|
|
931
|
+
// \u552F\u4E00\u4E14\u8BE5 identity \u540D\u4E0B\u786E\u6709 plan api-key \u2192 \u7528\u5B83\uFF1B
|
|
932
|
+
// \u2461 \u65E0\u2460\u4FE1\u53F7\u65F6\uFF0C\u8BE5 pid \u540D\u4E0B plan api-key \u952E\u7684 identity \u53BB\u91CD\u540E\u552F\u4E00 \u2192 \u7528\u5B83
|
|
933
|
+
// \uFF08\u5355 account \u5E38\u6001\uFF09\uFF1B
|
|
934
|
+
// \u2462 \u591A\u5019\u9009\u4E14\u65E0\u2460\u786E\u5B9A\u6027\u4FE1\u53F7 \u2192 \u4E0D\u731C\u6D4B\uFF1A\u4E0D\u6D3E\u751F\uFF08\u4FDD\u7559\u65E2\u6709 stored identity\uFF09\u5E76
|
|
935
|
+
// log \u6B67\u4E49\u2014\u2014\u731C\u6D4B\u6539\u5199\u6BD4\u4FDD\u7559\u9648\u65E7\u503C\u66F4\u7CDF\uFF08\u9648\u65E7\u503C\u81F3\u5C11\u662F\u767B\u5F55\u6D41\u7A0B\u5199\u8FC7\u7684\uFF09\u3002
|
|
936
|
+
let derivedIdentity = '';
|
|
937
|
+
let ambiguousIdentity = false;
|
|
938
|
+
const keyLocPrefix = 'project-key-location:v1:';
|
|
939
|
+
const keyLocIds = [];
|
|
940
|
+
for (const k of Object.keys(creds)) {
|
|
941
|
+
if (k.indexOf(keyLocPrefix) !== 0) continue;
|
|
942
|
+
try {
|
|
943
|
+
const arr = JSON.parse(decodeURIComponent(k.slice(keyLocPrefix.length)));
|
|
944
|
+
if (Array.isArray(arr) && typeof arr[1] === 'string' && typeof arr[2] === 'string'
|
|
945
|
+
&& pid.indexOf('account:' + arr[1]) === 0 && keyLocIds.indexOf(arr[2]) === -1) {
|
|
946
|
+
keyLocIds.push(arr[2]);
|
|
947
|
+
}
|
|
948
|
+
} catch (e2) { /* \u5F62\u6001\u5916\u952E\uFF08\u635F\u574F/\u975E\u6570\u7EC4\uFF09\u4E0D\u6784\u6210\u786E\u5B9A\u6027\u4FE1\u53F7 */ }
|
|
949
|
+
}
|
|
950
|
+
if (keyLocIds.length === 1 && hasPlanApiKey(keyLocIds[0])) {
|
|
951
|
+
derivedIdentity = keyLocIds[0];
|
|
952
|
+
} else {
|
|
953
|
+
const apiKeyIds = [];
|
|
954
|
+
for (const k of Object.keys(creds)) {
|
|
955
|
+
if (k.indexOf(apiKeyPrefix) !== 0 || k.slice(-apiKeySuffix.length) !== apiKeySuffix) continue;
|
|
956
|
+
const mid = k.slice(apiKeyPrefix.length, k.length - apiKeySuffix.length);
|
|
957
|
+
if (!mid) continue;
|
|
958
|
+
let id; try { id = decodeURIComponent(mid); } catch (e2) { id = mid; }
|
|
959
|
+
if (apiKeyIds.indexOf(id) === -1) apiKeyIds.push(id);
|
|
960
|
+
}
|
|
961
|
+
if (apiKeyIds.length === 1) derivedIdentity = apiKeyIds[0];
|
|
962
|
+
else if (apiKeyIds.length > 1) ambiguousIdentity = true;
|
|
963
|
+
}
|
|
964
|
+
if (ambiguousIdentity) {
|
|
965
|
+
process.stderr.write('[zcode-launcher] account metadata: multiple plan api-key identities for ' + pid + ', no deterministic signal - keeping stored identity\\n');
|
|
966
|
+
}
|
|
967
|
+
// oauth \u5BB6\u65CF\u51ED\u636E\u5B58\u5728\u6027\uFF1A\u626B oauth:<family>:access_token\uFF0Cprovider id \u4EE5
|
|
968
|
+
// account:<family> \u5F00\u5934\u5373\u7ED1\u5B9A\u8BE5\u5BB6\u65CF\uFF08\u96F6\u5BB6\u65CF\u540D\u5199\u6B7B\uFF09\u3002
|
|
969
|
+
let oauthBacked = false;
|
|
970
|
+
const oauthPrefix = 'oauth:';
|
|
971
|
+
const oauthSuffix = ':access_token';
|
|
972
|
+
for (const k of Object.keys(creds)) {
|
|
973
|
+
if (k.indexOf(oauthPrefix) !== 0 || k.slice(-oauthSuffix.length) !== oauthSuffix) continue;
|
|
974
|
+
const fam = k.slice(oauthPrefix.length, k.length - oauthSuffix.length);
|
|
975
|
+
if (!fam) continue;
|
|
976
|
+
const token = creds[k];
|
|
977
|
+
if (typeof token !== 'string' || token === '') continue;
|
|
978
|
+
if (pid.indexOf('account:' + fam) === 0) { oauthBacked = true; break; }
|
|
979
|
+
}
|
|
980
|
+
// \u2460 \u8EAB\u4EFD\u5B64\u513F\u77EB\u6B63\uFF1A\u65E2\u6709\u975E\u7A7A\u8EAB\u4EFD\u662F\u6743\u5A01\u5199\u5165\uFF0C\u4F46\u53EA\u5728\u300C\u8BA4\u8BC1\u5F62\u6001\u8981\u6C42\u8EAB\u4EFD\u5BF9\u5E94 plan
|
|
981
|
+
// api-key\u300D\u65F6\u5224\u5B9A\u5B64\u513F\u2014\u2014oauth \u5F62\u6001\u4E0B\u8EAB\u4EFD\u4E0D\u53C2\u4E0E\u51ED\u636E\u67E5\u627E\uFF08CLI \u767B\u5F55\u5199\u5165\u7684\u8EAB\u4EFD
|
|
982
|
+
// \u53EF\u80FD\u6C38\u65E0 api-key\uFF09\uFF0C\u4E0D\u5F97\u7528\u6B8B\u7559\u952E\u540D\u8986\u5199\u3002\u5B64\u513F = \u65E0\u5BF9\u5E94 api-key \u4E14\u5F53\u524D\u53EF\u6D3E\u751F
|
|
983
|
+
// \u2192 \u6539\u6210\u5F53\u524D\u8EAB\u4EFD\uFF08\u5426\u5219 manual \u67E5\u65E7\u8EAB\u4EFD\u51ED\u636E\u6052\u5931\u8D25\u3001\u6C38\u4E0D\u6536\u655B\uFF09\u3002\u65E5\u5FD7\u5728\u843D\u5E93
|
|
984
|
+
// \u70B9\u53D1\uFF08\u65E0\u53EF\u7528 auth-source \u65F6 continue\uFF0C\u4E0D\u5F97\u7559\u4E0B\u201C\u5DF2\u77EB\u6B63\u201D\u800C\u672A\u5199\u76D8\u7684\u5047\u65E5\u5FD7\uFF09\u3002
|
|
985
|
+
let identityCorrectedFrom = '';
|
|
986
|
+
if (identity && !hasPlanApiKey(identity) && (authSource === 'manual' || !oauthBacked)
|
|
987
|
+
&& derivedIdentity && derivedIdentity !== identity) {
|
|
988
|
+
identityCorrectedFrom = identity;
|
|
989
|
+
identity = derivedIdentity;
|
|
990
|
+
}
|
|
991
|
+
if (!identity) identity = derivedIdentity;
|
|
992
|
+
if (!identity) continue;
|
|
993
|
+
// \u2461 auth-source \u6D3E\u751F + \u5B64\u513F\u77EB\u6B63\uFF1Aoauth \u9700\u5339\u914D\u5BB6\u65CF\u7684 access_token\uFF1Bmanual \u9700\u8BE5
|
|
994
|
+
// \u8EAB\u4EFD\u540D\u4E0B\u7684 plan api-key\u3002\u65E2\u6709\u503C\u4E0E\u5F53\u524D\u4E8B\u5B9E\u4E00\u81F4\u65F6\u539F\u6837\u4FDD\u7559\uFF08GUI/\u767B\u5F55\u5199\u5165\u7684
|
|
995
|
+
// manual \u5728 oauth \u540C\u65F6\u5B58\u5728\u65F6\u4ECD\u662F\u6743\u5A01\u2014\u2014\u66FE\u65E0\u5DEE\u522B\u8986\u5199\u5DEE\u5F02\u503C\uFF09\u3002
|
|
996
|
+
const derivedAuthSource = oauthBacked ? 'oauth' : (hasPlanApiKey(identity) ? 'manual' : '');
|
|
997
|
+
let nextAuthSource = authSource || derivedAuthSource;
|
|
998
|
+
if (authSource === 'oauth' && !oauthBacked) nextAuthSource = derivedAuthSource;
|
|
999
|
+
else if (authSource === 'manual' && !hasPlanApiKey(identity)) nextAuthSource = derivedAuthSource;
|
|
1000
|
+
if (!nextAuthSource) continue;
|
|
1001
|
+
// \u843D\u5E93\u5224\u5B9A\uFF1A\u7F3A\u5931\u6001\uFF08\u7A7A\u4E32/\u975E\u4E32\uFF09\u8BB0 provisioned\uFF0C\u975E\u7A7A\u65E7\u503C\u88AB\u77EB\u6B63\u8BB0 reconciled\u3002
|
|
1002
|
+
if (creds[idKey] !== identity) {
|
|
1003
|
+
if (identityCorrectedFrom) {
|
|
1004
|
+
reconciled.push(idKey + ' (' + identityCorrectedFrom + ' -> ' + identity + ')');
|
|
1005
|
+
} else if (typeof creds[idKey] !== 'string' || creds[idKey] === '') {
|
|
1006
|
+
added.push(idKey);
|
|
1007
|
+
}
|
|
1008
|
+
creds[idKey] = identity;
|
|
1009
|
+
}
|
|
1010
|
+
if (creds[srcKey] !== nextAuthSource) {
|
|
1011
|
+
if (typeof creds[srcKey] === 'string' && creds[srcKey] !== '') {
|
|
1012
|
+
reconciled.push(srcKey + ' (' + creds[srcKey] + ' -> ' + nextAuthSource + ')');
|
|
1013
|
+
} else added.push(srcKey);
|
|
1014
|
+
creds[srcKey] = nextAuthSource;
|
|
1015
|
+
}
|
|
1016
|
+
}
|
|
1017
|
+
if (added.length === 0 && reconciled.length === 0) return;
|
|
1018
|
+
// compare-and-skip\uFF082026-10 review\xB7N-3\uFF09\uFF1A\u65E0\u9501 RMW \u7684\u9648\u65E7\u8986\u76D6\u9632\u7EBF\u2014\u2014\u5199\u56DE\u524D\u91CD\u8BFB
|
|
1019
|
+
// \u78C1\u76D8\uFF0C\u4EFB\u4E00 plan \u4E24\u952E\u5F53\u524D\u503C \u2260 \u8BFB\u65F6\u57FA\u7EBF = \u7A97\u53E3\u5185 GUI/\u767B\u5F55\u5DF2\u5B8C\u6210\u6743\u5A01\u5199\u5165 \u2192 \u653E\u5F03
|
|
1020
|
+
// \u672C\u6B21\u5199\u5165\uFF08log \u8BF4\u660E\uFF0C\u4E0B\u6B21 spawn \u5E42\u7B49\u91CD\u7B97\uFF1B\u653E\u5F03\u540E\u7684\u6062\u590D = \u91CD\u65B0\u767B\u5F55/\u914D\u7F6E\u6216\u5220\u9664
|
|
1021
|
+
// \u8BE5\u952E\uFF0CADR-0143 \u5E76\u53D1\u8FB9\u754C\uFF09\u3002\u91CD\u8BFB/\u89E3\u6790\u5931\u8D25 = \u7A97\u53E3\u4E0D\u53EF\u5224\u5B9A\uFF0C\u540C\u6837\u4FDD\u5B88\u653E\u5F03\u3002
|
|
1022
|
+
try {
|
|
1023
|
+
const reread = JSON.parse(readOrig.call(fs, credPath, 'utf8'));
|
|
1024
|
+
if (!reread || typeof reread !== 'object' || Array.isArray(reread)) {
|
|
1025
|
+
throw new Error('credentials reread is not an object');
|
|
1026
|
+
}
|
|
1027
|
+
for (const mk of Object.keys(metaBaseline)) {
|
|
1028
|
+
if ((reread[mk] || '') !== (metaBaseline[mk] || '')) {
|
|
1029
|
+
throw new Error('concurrent write detected on ' + mk);
|
|
1030
|
+
}
|
|
1031
|
+
}
|
|
1032
|
+
} catch (skipErr) {
|
|
1033
|
+
process.stderr.write('[zcode-launcher] account metadata skipped (' + ((skipErr && skipErr.message) || String(skipErr)) + ') - retry on next spawn\\n');
|
|
1034
|
+
return;
|
|
1035
|
+
}
|
|
1036
|
+
const tmp = credPath + '.taiji-tmp-' + process.pid;
|
|
1037
|
+
// rename \u6362 inode\u2014\u2014tmp \u4E0D\u5E26 mode \u843D\u76D8\u4F1A\u628A GUI \u4FA7\u6536\u7D27\u8FC7\u7684\u6587\u4EF6\u6743\u9650\u9759\u9ED8\u653E\u5BBD\u4E3A
|
|
1038
|
+
// \u7F3A\u7701 umask \u503C\uFF0C\u5199\u524D\u8BFB\u65E2\u6709 mode \u968F\u5199\u4F20\u9012\uFF08stat \u5931\u8D25\u56DE\u9000 0600\uFF09\uFF1B\u5199/rename
|
|
1039
|
+
// \u5931\u8D25\u6E05\u7406 tmp\uFF0C\u4E0D\u5728\u7528\u6237\u51ED\u636E\u76EE\u5F55\u7559\u6B8B\u7247\u3002
|
|
1040
|
+
let writeMode = 0o600;
|
|
1041
|
+
try { writeMode = fs.statSync(credPath).mode & 0o777; } catch { /* \u7F3A\u7701 0600 */ }
|
|
1042
|
+
try {
|
|
1043
|
+
fs.writeFileSync(tmp, JSON.stringify(creds, null, 2), { mode: writeMode });
|
|
1044
|
+
fs.renameSync(tmp, credPath);
|
|
1045
|
+
} catch (err) {
|
|
1046
|
+
try { fs.unlinkSync(tmp); } catch { /* tmp \u672A\u751F\u6210\u6216\u5DF2 rename */ }
|
|
1047
|
+
throw err;
|
|
1048
|
+
}
|
|
1049
|
+
if (added.length > 0) process.stderr.write('[zcode-launcher] account metadata provisioned: ' + added.join(', ') + '\\n');
|
|
1050
|
+
if (reconciled.length > 0) process.stderr.write('[zcode-launcher] account metadata reconciled: ' + reconciled.join(', ') + '\\n');
|
|
1051
|
+
} catch (err) {
|
|
1052
|
+
process.stderr.write('[zcode-launcher] account metadata provisioning failed (non-blocking): ' + ((err && err.message) || String(err)) + '\\n');
|
|
1053
|
+
}
|
|
1054
|
+
}
|
|
1055
|
+
`;
|
|
1056
|
+
|
|
490
1057
|
// src/appserver-launcher.ts
|
|
491
1058
|
var ZCODE_APPSERVER_LAUNCHER_NAME = "appserver-launcher.cjs";
|
|
492
1059
|
var APPSERVER_LAUNCHER_SOURCE = `'use strict';
|
|
@@ -507,7 +1074,7 @@ const CONFIG_PATH = path.join(os.homedir(), '.zcode', 'cli', 'config.json');
|
|
|
507
1074
|
|
|
508
1075
|
// \u5408\u5E76\u5F62\u6001\uFF1A\u771F\u5B9E cli config \u539F\u6837\uFF08model/plugins/mcp/subagents \u7B49 worker \u7EE7\u627F\u9762\u4E0D\u53D8\uFF09
|
|
509
1076
|
// + v2 \u7684 provider \u5B57\u5178\u6CE8\u5165\uFF0C\u540C id \u65F6 v2 \u6761\u76EE\u6574\u6761\u4F18\u5148\u2014\u2014GUI \u76F4\u4F20 modelConfig \u65F6
|
|
510
|
-
// v2 \u5373\u6743\u5A01\u6E90\uFF08\u8FDB\u7A0B\u5916\u7B49\u4EF7\u590D\u523B\uFF09\uFF1Bcli config \u4E0D\u5728 GUI \u7BA1\u7406\
|
|
1077
|
+
// v2 \u5373\u6743\u5A01\u6E90\uFF08\u8FDB\u7A0B\u5916\u7B49\u4EF7\u590D\u523B\uFF09\uFF1Bcli config \u4E0D\u5728 GUI \u7BA1\u7406\u4FA7\u3001\u53EF\u80FD\u6B8B\u7559\u5386\u53F2\u9A8C\u8BC1
|
|
511
1078
|
// \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
|
|
512
1079
|
// 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
|
|
513
1080
|
// \u53EF\u7528\u6A21\u578B\uFF1Bplan \u5BB6\u65CF id \u5DF2\u4E0D\u53EF\u7528\uFF0C\u4E0D\u518D\u515C\u5E95\u4F2A\u9020\uFF09\u3002
|
|
@@ -536,12 +1103,16 @@ function injectedConfigText() {
|
|
|
536
1103
|
const v2Providers = v2.provider && typeof v2.provider === 'object' ? v2.provider : {};
|
|
537
1104
|
const hasKey = (entry) => entry && typeof entry === 'object'
|
|
538
1105
|
&& entry.options && typeof entry.options.apiKey === 'string' && entry.options.apiKey !== '';
|
|
539
|
-
|
|
1106
|
+
// \u65E0\u539F\u578B\u5B57\u5178\uFF08DG-R2-02\uFF09\uFF1Aprovider id \u503C\u57DF\u542B '__proto__'/'toString' \u7B49\u5371\u9669\u952E
|
|
1107
|
+
//\uFF08runtime \u4FA7\u6709\u610F\u4EA7\u51FA\uFF0CS-17\uFF09\u2014\u2014\u666E\u901A\u5BF9\u8C61\u4E0A\u5BF9 __proto__ \u952E\u8D4B\u503C\u89E6\u53D1\u539F\u578B setter
|
|
1108
|
+
// \u9759\u9ED8\u4E22\u6761\u76EE\u3001\u8BFB toString \u952E\u843D\u5230\u539F\u578B\u65B9\u6CD5\u8BEF\u5224\u5DF2\u5B58\u5728\u3002Object.create(null) \u4F7F
|
|
1109
|
+
// \u952E\u8BFB\u5199\u5747\u843D\u5728 own property\u3002
|
|
1110
|
+
const injectable = Object.create(null);
|
|
540
1111
|
for (const [id, entry] of Object.entries(v2Providers)) {
|
|
541
1112
|
if (hasKey(entry)) injectable[id] = entry;
|
|
542
1113
|
}
|
|
543
1114
|
// provider_config.json \u8865\u6CE8\u5165\uFF08\u8BFB\u53D6\u5931\u8D25\u9759\u9ED8\u964D\u7EA7\u2014\u2014\u6821\u9A8C\u6E90\u7F3A\u5E2D\u65F6\u5F15\u64CE\u4FA7\u6821\u9A8C\u540C\u6837\u4E0D\u53EF
|
|
544
|
-
// \u7528\uFF0C\u6CE8\u5165\
|
|
1115
|
+
// \u7528\uFF0C\u6CE8\u5165\u70B9\u7EF4\u6301 v2-only \u73B0\u72B6\uFF1BproviderRules \u7F3A\u5931\u4E0D\u6784\u6210\u51ED\u636E\u9519\u8BEF\uFF09\u3002
|
|
545
1116
|
try {
|
|
546
1117
|
const pc = JSON.parse(readOrig(PROVIDER_CONFIG_PATH, 'utf8'));
|
|
547
1118
|
const pcCfg = pc && typeof pc.config === 'object' && pc.config ? pc.config : {};
|
|
@@ -549,7 +1120,9 @@ function injectedConfigText() {
|
|
|
549
1120
|
const rules = Array.isArray(pcr.providerRules) ? pcr.providerRules : [];
|
|
550
1121
|
const mcr = typeof pcCfg.modelConfigRules === 'object' && pcCfg.modelConfigRules ? pcCfg.modelConfigRules : {};
|
|
551
1122
|
const modelRules = Array.isArray(mcr.providerModelRules) ? mcr.providerModelRules : [];
|
|
552
|
-
|
|
1123
|
+
// \u65E0\u539F\u578B\u5B57\u5178\uFF08DG-R2-02 \u540C\u65CF\uFF09\uFF1Aid \u4E3A 'constructor' \u7B49\u539F\u578B\u65B9\u6CD5\u540D\u65F6\u666E\u901A\u5BF9\u8C61\u8BFB\u53D6
|
|
1124
|
+
// \u843D\u5230\u539F\u578B Function\uFF0Cfor...of \u76F4\u63A5 TypeError \u88AB catch \u9759\u9ED8\u541E\u6389\u8BE5 rule \u7684\u5408\u6210
|
|
1125
|
+
const modelMeta = Object.create(null);
|
|
553
1126
|
for (const mr of modelRules) {
|
|
554
1127
|
if (!mr || typeof mr !== 'object' || typeof mr.providerId !== 'string' || typeof mr.modelId !== 'string') continue;
|
|
555
1128
|
(modelMeta[mr.providerId] = modelMeta[mr.providerId] || []).push(mr);
|
|
@@ -560,8 +1133,10 @@ function injectedConfigText() {
|
|
|
560
1133
|
const cfg = rule.config && typeof rule.config === 'object' ? rule.config : {};
|
|
561
1134
|
const access = cfg.access && typeof cfg.access === 'object' ? cfg.access : {};
|
|
562
1135
|
const api = cfg.api && typeof cfg.api === 'object' ? cfg.api : {};
|
|
563
|
-
// v2/real \u5DF2\u6709 \u2192 \u4E0D\u91CD\u590D\u5408\u6210\uFF08v2 \u6761\u76EE\u66F4\u5168\uFF0C\u6574\u6761\u4F18\u5148\u8BED\u4E49\u4E0D\u53D7\u5F71\u54CD\uFF09
|
|
564
|
-
|
|
1136
|
+
// v2/real \u5DF2\u6709 \u2192 \u4E0D\u91CD\u590D\u5408\u6210\uFF08v2 \u6761\u76EE\u66F4\u5168\uFF0C\u6574\u6761\u4F18\u5148\u8BED\u4E49\u4E0D\u53D7\u5F71\u54CD\uFF09\u3002
|
|
1137
|
+
// realProviders \u662F JSON.parse \u666E\u901A\u5BF9\u8C61\uFF08\u6709\u539F\u578B\uFF09\u2014\u2014id \u4E3A 'toString' \u7B49
|
|
1138
|
+
// \u539F\u578B\u65B9\u6CD5\u540D\u65F6\u76F4\u63A5\u4E0B\u6807\u8BFB\u53D6\u6052 truthy \u8BEF\u5224 real \u5DF2\u6709\uFF0C\u987B own-property \u68C0\u67E5
|
|
1139
|
+
if (!id || injectable[id] || Object.prototype.hasOwnProperty.call(realProviders, id)) continue;
|
|
565
1140
|
// hasKey \u7EAA\u5F8B\u540C\u6B3E\uFF1A\u65E0 apiKey \u4E0D\u5408\u6210\uFF1B\u65E0 baseUrl\uFF08endpoint \u7531\u6A21\u677F\u63D0\u4F9B\u7684\u5F62\u6001\uFF09
|
|
566
1141
|
// \u4E0D\u5408\u6210\u2014\u2014\u6B8B\u7F3A\u6761\u76EE\u6BD4\u4E0D\u6CE8\u5165\u66F4\u7CDF\uFF0C\u539F\u751F\u300C\u4E0D\u5B58\u5728 Model\u300D\u62A5\u9519\u7167\u65E7\u900F\u51FA
|
|
567
1142
|
if (typeof access.apiKey !== 'string' || access.apiKey === '') continue;
|
|
@@ -593,7 +1168,7 @@ function injectedConfigText() {
|
|
|
593
1168
|
models: models,
|
|
594
1169
|
};
|
|
595
1170
|
}
|
|
596
|
-
} catch { /* provider_config \u7F3A\u5931/\u635F\u574F \u2192 \u8865\u6CE8\u5165\
|
|
1171
|
+
} catch { /* provider_config \u7F3A\u5931/\u635F\u574F \u2192 \u8865\u6CE8\u5165\u70B9\u9759\u9ED8\u964D\u7EA7\uFF08v2 \u6CE8\u5165\u4E0D\u53D7\u5F71\u54CD\uFF09 */ }
|
|
597
1172
|
if (Object.keys(injectable).length === 0) return null;
|
|
598
1173
|
const merged = { ...real };
|
|
599
1174
|
merged.provider = { ...realProviders, ...injectable };
|
|
@@ -607,7 +1182,7 @@ function injectedConfigText() {
|
|
|
607
1182
|
// [merge-fn-start]\uFF08\u5BF9\u8D26\u5355\u6D4B\u63D0\u53D6\u951A\u2014\u2014appserver-launcher.test.ts \u6309\u6807\u8BB0\u622A\u53D6\u672C\u51FD\u6570
|
|
608
1183
|
// eval \u6267\u884C\uFF1Bpreparer.ts mergePersonalProviderConfig \u4E0E\u672C\u51FD\u6570\u540C\u89C4\u5219\u9501\u6B65\uFF0C\u6539\u4EFB\u4E00\u4FA7
|
|
609
1184
|
// \u987B\u540C\u6B65\u53E6\u4E00\u4FA7\u5E76\u8DD1\u5BF9\u8D26\u5355\u6D4B\uFF09
|
|
610
|
-
// merge(\u771F\u5B9E, \u526F\u672C)\u2014\u2014D3 \u6362\
|
|
1185
|
+
// merge(\u771F\u5B9E, \u526F\u672C)\u2014\u2014D3 \u5207\u6362\u7248\u89C4\u5219\uFF1A
|
|
611
1186
|
// - \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
|
|
612
1187
|
// - \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
|
|
613
1188
|
// \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
|
|
@@ -627,7 +1202,10 @@ function mergeProviderConfig(realObj, copyObj) {
|
|
|
627
1202
|
};
|
|
628
1203
|
const strArr = (v) => (Array.isArray(v) ? v.filter((s) => typeof s === 'string' && s.trim() !== '') : []);
|
|
629
1204
|
const mergedRules = [];
|
|
630
|
-
|
|
1205
|
+
// \u65E0\u539F\u578B\u5B57\u5178\uFF08DG-R2-02\uFF09\uFF1AproviderId \u4E3A '__proto__'/'toString' \u7B49\u5371\u9669\u952E\u65F6\u666E\u901A\u5BF9\u8C61
|
|
1206
|
+
// \u7684 seen \u8BFB\u5199\u90FD\u4F1A\u649E\u539F\u578B\u94FE\uFF08__proto__ \u8D4B\u503C\u88AB setter \u541E / toString \u8BFB\u5230\u539F\u578B\u65B9\u6CD5
|
|
1207
|
+
// \u8BEF\u5224\u5DF2\u89C1 \u2192 \u526F\u672C\u72EC\u6709\u6761\u76EE\u88AB\u4E22\uFF0C\u4E0E TS \u4FA7 Set \u5B9E\u88C5\u5206\u6B67\uFF09\u3002Object.create(null) \u6D88\u9664\u3002
|
|
1208
|
+
const seen = Object.create(null);
|
|
631
1209
|
for (const rule of rulesOf(realObj)) {
|
|
632
1210
|
mergedRules.push(rule);
|
|
633
1211
|
if (isRec(rule) && typeof rule.providerId === 'string' && rule.providerId !== '') seen[rule.providerId] = true;
|
|
@@ -654,7 +1232,7 @@ function mergeProviderConfig(realObj, copyObj) {
|
|
|
654
1232
|
}
|
|
655
1233
|
// [merge-fn-end]
|
|
656
1234
|
|
|
657
|
-
// D3 \u6362\
|
|
1235
|
+
// D3 \u5207\u6362\u88C5\u8F7D\u901A\u9053\uFF1A\u547D\u4E2D\u771F\u5B9E provider_config.json \u7684\u8BFB\u53D6\u91CD\u5B9A\u5411\u4E3A merge(\u771F\u5B9E\u5B9E\u65F6
|
|
658
1236
|
// \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
|
|
659
1237
|
// \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
|
|
660
1238
|
// \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
|
|
@@ -713,42 +1291,9 @@ function catalogPatchText(path) {
|
|
|
713
1291
|
return result;
|
|
714
1292
|
}
|
|
715
1293
|
|
|
716
|
-
|
|
717
|
-
// \u786C\u7F16\u7801 entitled:!1\uFF08YXe\uFF09\uFF0C\u6570\u636E\u9762\u6CE8\u5165\uFF08\u76EE\u5F55 entitled \u5B57\u6BB5\uFF09\u88AB\u5176\u65E0\u89C6\u2014\u2014\u6309\u7528\u6237\u88C1\u51B3
|
|
718
|
-
// \u6539 zcode \u6E90\u7801\u7ED5\u8FC7\uFF1A\u62E6\u622A CLI bundle \u6E90\u7801\u8BFB\u53D6\uFF0C\u5185\u5B58\u66FF\u6362\u8BE5\u5B57\u9762\u91CF\u4E3A !0\uFF08ZCode.app
|
|
719
|
-
// \u78C1\u76D8\u6587\u4EF6\u96F6\u89E6\u78B0\uFF1B\u951A\u4E32\u542B ]]:[] \u5C3E\u7F00\u552F\u4E00\u547D\u4E2D YXe \u6784\u9020\uFF0C\u53E6\u4E00\u5904\u540C\u540D\u6761\u4EF6\u903B\u8F91\u4E0D\u53D7\u5F71\u54CD\uFF09\u3002
|
|
720
|
-
// \u951A\u4E0D\u547D\u4E2D\uFF08\u4E0A\u6E38\u6DF7\u6DC6\u5F62\u6001\u53D8\u5316\uFF09\u2192 \u539F\u6587\u900F\u51FA\uFF1A\u4EC5 account \u5BB6\u65CF\u7EE7\u7EED\u88AB\u62D2\uFF0C\u4E2A\u4EBA provider
|
|
721
|
-
// \u4E0D\u53D7\u5F71\u54CD\u3002
|
|
722
|
-
const __cliPatchCache = new Map();
|
|
723
|
-
function patchedCliSource(path) {
|
|
724
|
-
if (__cliPatchCache.has(path)) return __cliPatchCache.get(path);
|
|
725
|
-
let result = null;
|
|
726
|
-
try {
|
|
727
|
-
const readOrig = fs.__origReadFileSync || fs.readFileSync;
|
|
728
|
-
const src = readOrig(path, 'utf8');
|
|
729
|
-
// \u7248\u672C\u9C81\u68D2\u951A\uFF082026-10-13 \u4FEE\u8BA2\uFF09\uFF1Aminified \u6807\u8BC6\u7B26\uFF08Uk/I3 \u7B49\uFF09\u968F zcode \u91CD\u65B0\u6253\u5305
|
|
730
|
-
// \u6F02\u79FB\uFF0C\u5C5E\u6027\u540D\uFF08zcodeBuiltinProviders / zhipu-account / entitled\uFF09\u662F\u6570\u636E/\u5951\u7EA6
|
|
731
|
-
// \u771F\u540D\u4E0D\u88AB\u6DF7\u6DC6\u2014\u2014\u4EE5\u5C5E\u6027\u540D\u5B9A\u4F4D + 600 \u5B57\u7B26\u7A97\u53E3\u5185\u628A\u8D26\u53F7\u6761\u76EE\u6784\u5EFA\u7684 entitled:!1
|
|
732
|
-
// \u7FFB\u8F6C\u4E3A !0\u3002\u7A97\u53E3\u96F6\u547D\u4E2D = \u4E0A\u6E38\u5F62\u6001\u6F02\u79FB \u2192 \u539F\u6587\u900F\u51FA + stderr warn\uFF08\u6F02\u79FB\u53EF\u89C1\uFF0C
|
|
733
|
-
// \u8FDB app-server stderr \u65E5\u5FD7\uFF09\uFF0C\u4E2A\u4EBA provider \u4E0D\u53D7\u5F71\u54CD\u3002
|
|
734
|
-
const anchorIdx = src.indexOf('zcodeBuiltinProviders.entries()');
|
|
735
|
-
if (anchorIdx >= 0) {
|
|
736
|
-
const window = src.slice(anchorIdx, Math.min(src.length, anchorIdx + 600));
|
|
737
|
-
if (window.indexOf('zhipu-account') >= 0 && window.indexOf('entitled:!1') >= 0) {
|
|
738
|
-
result = src.slice(0, anchorIdx)
|
|
739
|
-
+ window.split('entitled:!1').join('entitled:!0')
|
|
740
|
-
+ src.slice(anchorIdx + 600);
|
|
741
|
-
}
|
|
742
|
-
}
|
|
743
|
-
if (result === null) {
|
|
744
|
-
process.stderr.write('[zcode-launcher] account bypass: CLI bundle anchor not found (zcode upstream shape drifted?) - account family stays gated, personal providers unaffected\\n');
|
|
745
|
-
}
|
|
746
|
-
} catch { result = null; }
|
|
747
|
-
__cliPatchCache.set(path, result);
|
|
748
|
-
return result;
|
|
749
|
-
}
|
|
1294
|
+
${CLI_PATCH_SECTION}
|
|
750
1295
|
|
|
751
|
-
// \u5185\u5EFA provider \u914D\u7F6E\u5B9A\u4F4D\uFF08\u6F02\u79FB\
|
|
1296
|
+
// \u5185\u5EFA provider \u914D\u7F6E\u5B9A\u4F4D\uFF08\u6F02\u79FB\u98CE\u9669\u2461\uFF09\uFF1A3.12.x \u8D77\u914D\u7F6E\u6587\u4EF6\u632A\u4F4D + CLI \u4F9D\u8D56\u5BBF\u4E3B\u6CE8\u5165
|
|
752
1297
|
// ZCODE_BUILTIN_PROVIDER_CONFIG_FILE \u76F4\u63A5\u5B9A\u4F4D\uFF1BZCode \u684C\u9762 spawn \u94FE\u81EA\u5E26\u8BE5\u952E\uFF0C
|
|
753
1298
|
// \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
|
|
754
1299
|
// <plat>-<arch> \u4F18\u5148\uFF0CRust arch \u53D8\u4F53\u5982 darwin-aarch64 \u5B57\u5178\u5E8F\u8DDF\u540E\uFF09\xD7 \u7248\u672C\u76EE\u5F55
|
|
@@ -820,15 +1365,32 @@ if (!process.env.ZCODE_BUILTIN_PROVIDER_CONFIG_FILE) {
|
|
|
820
1365
|
}
|
|
821
1366
|
}
|
|
822
1367
|
|
|
1368
|
+
${ACCOUNT_METADATA_SECTION}
|
|
1369
|
+
|
|
823
1370
|
// \u5B89\u88C5\u95E8\uFF1A\u4EFB\u4E00 patch \u6E90\u53EF\u7528\u5373\u5B89\u88C5\u62E6\u622A\u5C42\uFF1B\u51B3\u7B56\u4E24\u6001\u90FD\u51FA\u58F0\uFF08\u88C5\u4E86\u54EA\u4E9B patch / \u4E3A\u4F55
|
|
824
1371
|
// \u8DF3\u8FC7\uFF09\u2014\u2014\u8865\u4E01\u5C42\u7684\u5931\u6548\u5F62\u6001\u662F\u9759\u9ED8\u7684\uFF08account \u76F4\u901A\u5931\u6548 = plan \u5BB6\u65CF\u62A5\u300C\u4E0D\u5B58\u5728
|
|
825
1372
|
// Model\u300D\u800C\u65E0\u4EFB\u4F55\u65E5\u5FD7\uFF09\uFF0C\u8DF3\u8FC7\u540C\u6837\u5FC5\u987B\u7559\u75D5\u3002
|
|
826
1373
|
const text = injectedConfigText();
|
|
827
1374
|
const catalogPatch = CATALOG_PATH !== null ? catalogPatchText(CATALOG_PATH) : null;
|
|
828
|
-
|
|
1375
|
+
const cliPatchProbe = CLI_PATH ? patchedCliSource(CLI_PATH) : null;
|
|
1376
|
+
// \u4E09\u5904\u6539\u5199\u7684\u5E94\u7528\u6001\u7531 patchedCliSource \u53D1\u5E03\uFF08__cliPatchStatus\uFF09\u2014\u2014\u66FE\u4EE5\u4EA7\u7269\u5B50\u4E32\u5224\u5B9A\uFF1A
|
|
1377
|
+
// header-port \u5728\u672A\u6253\u8865\u4E01\u7684 3.15.3 bundle \u4E0A\u6052\u771F\uFF088 \u5904\u65E2\u6709\u540C\u540D\u5C5E\u6027\uFF09\u2192 \u95E8\u5BF9\u951A\u70B9
|
|
1378
|
+
// \u6F02\u79FB\u96F6\u68C0\u6D4B\u529B\uFF1Bstandalone \u540C\u7406\u7531\u6807\u5FD7\u9A71\u52A8\uFF08\u4E09\u5904\u5224\u5B9A\u5404\u81EA\u5177\u540D\uFF09\u3002cli-source-bypass
|
|
1379
|
+
// \u7684\u62EC\u53F7\u540E\u7F00\u628A\u4E09\u951A\u9010\u4E00\u5217\u51FA\uFF082026-10 review\xB7S-2\uFF09\uFF1Aentitled \u6807\u5FD7\u66FE\u53D1\u5E03\u4F46\u65E0\u6D88\u8D39\u65B9\uFF0C
|
|
1380
|
+
// \u8BE5\u951A\u5355\u72EC\u6F02\u79FB\u65F6\u516D\u9879\u77E9\u9635\u4F1A\u5168\u90E8 armed\u2014\u2014\u9010\u951A\u53EF\u89C1\u624D\u80FD\u5B9A\u4F4D\u6F02\u79FB\uFF08\u516D\u9879\u53E3\u5F84\u4E0D\u53D8\uFF09\u3002
|
|
1381
|
+
const cliPatchStatus = CLI_PATH ? __cliPatchStatus.get(CLI_PATH) : null;
|
|
1382
|
+
const anchorFlags = cliPatchStatus
|
|
1383
|
+
? '(entitled=' + (cliPatchStatus.entitled ? 'on' : 'off')
|
|
1384
|
+
+ ',standalone=' + (cliPatchStatus.standalone ? 'on' : 'off')
|
|
1385
|
+
+ ',port=' + (cliPatchStatus.headerPort ? 'on' : 'off') + ')'
|
|
1386
|
+
: '';
|
|
1387
|
+
if (text !== null || catalogPatch !== null || cliPatchProbe !== null) {
|
|
829
1388
|
process.stderr.write('[zcode-launcher] \u8865\u4E01\u5C42\u5DF2\u5B89\u88C5: cli-config-inject=' + (text !== null ? 'on' : 'off')
|
|
830
1389
|
+ ', catalog-entitled=' + (catalogPatch !== null ? 'on' : 'off')
|
|
831
|
-
+ ', provider-merge=' + (PI_SYNCED_PATH ? 'armed' : 'off')
|
|
1390
|
+
+ ', provider-merge=' + (PI_SYNCED_PATH ? 'armed' : 'off')
|
|
1391
|
+
+ ', cli-source-bypass=' + (cliPatchProbe !== null ? 'armed' : 'off') + anchorFlags
|
|
1392
|
+
+ ', standalone-account=' + (cliPatchStatus && cliPatchStatus.standalone ? 'armed' : 'off')
|
|
1393
|
+
+ ', header-port=' + (cliPatchStatus && cliPatchStatus.headerPort ? 'armed' : 'off') + '\\n');
|
|
832
1394
|
// encoding \u5F52\u4E00\uFF08Node \u522B\u540D\u9762\uFF09\uFF1A'utf8'/'utf-8'/\u5927\u5C0F\u5199\u53D8\u4F53\u7EDF\u4E00\u6309 string \u8FD4\u56DE\u2014\u2014
|
|
833
1395
|
// \u771F\u5B9E bundle \u7684 config \u8BFB\u53D6\u6070\u7528 'utf-8' \u5F62\u6001\uFF0C\u4EC5\u5339\u914D 'utf8' \u4F1A\u9519\u56DE Buffer
|
|
834
1396
|
// \uFF08\u5F53\u4E0B\u6E38\u4E0D\u53EA JSON.parse \u800C\u505A\u5B57\u7B26\u4E32\u8FD0\u7B97\u65F6\u5373 TypeError\uFF09
|
|
@@ -842,12 +1404,17 @@ if (text !== null || catalogPatch !== null) {
|
|
|
842
1404
|
return Buffer.from(value);
|
|
843
1405
|
};
|
|
844
1406
|
fs.__origReadFileSync = fs.readFileSync;
|
|
1407
|
+
// standalone \u8D26\u53F7\u5143\u6570\u636E\u952E\u4F9B\u7ED9\uFF08ADR-0143\uFF09\uFF1A\u4EC5\u5F53 standalone \u4E0E header-port \u4E24\u951A
|
|
1408
|
+
// \u5747\u5DF2\u6B66\u88C5\u65F6\u6267\u884C\uFF082026-10 review\xB7S-3\uFF09\u2014\u2014\u53EA\u6B66\u88C5 standalone \u65F6\u8BA4\u8BC1\u5934\u4ECD\u56DE\u843D\u5BBF\u4E3B
|
|
1409
|
+
// \u8BF7\u6C42\u7AEF\u53E3\uFF08\u65E0\u5BBF\u4E3B\u4EFB\u5E94\u7B54 = \u8D26\u53F7\u94FE\u4ECD\u4E0D\u53EF\u7528\uFF09\uFF0C\u6B64\u65F6\u5199\u7528\u6237\u5171\u4EAB credentials.json
|
|
1410
|
+
// \u65E0\u8FD0\u884C\u65F6\u6536\u76CA\u3001\u53EA\u589E\u98CE\u9669\uFF1B\u6B64\u5904\u8BFB\u6E90\u4ECD\u662F\u539F\u751F fs\uFF08readFileSync \u62E6\u622A\u5C1A\u672A\u5B89\u88C5\uFF09\u3002
|
|
1411
|
+
if (cliPatchStatus && cliPatchStatus.standalone && cliPatchStatus.headerPort) ensureAccountMetadata();
|
|
845
1412
|
fs.readFileSync = function (p, ...rest) {
|
|
846
1413
|
if (typeof p === 'string' && p === CONFIG_PATH) {
|
|
847
1414
|
const cur = injectedConfigText();
|
|
848
1415
|
if (cur !== null) return shape(rest, cur);
|
|
849
1416
|
}
|
|
850
|
-
// D3 \u6362\
|
|
1417
|
+
// D3 \u5207\u6362\uFF1ARegistry \u76F4\u8BFB\u771F\u5B9E provider_config.json \u2192 merge(\u771F\u5B9E, \u526F\u672C) \u89C6\u56FE
|
|
851
1418
|
if (typeof p === 'string' && p === REAL_PROVIDER_CONFIG_PATH) {
|
|
852
1419
|
const cur = mergedProviderConfigText();
|
|
853
1420
|
if (cur !== null) return shape(rest, cur);
|
|
@@ -904,8 +1471,8 @@ if (text !== null || catalogPatch !== null) {
|
|
|
904
1471
|
|
|
905
1472
|
// existsSync \u62E6\u622A\uFF1A\u771F\u5B9E bundle \u7684\u7528\u6237 config \u8BFB\u53D6\uFF08loadFileConfig\uFF09\u4EE5 existsSync
|
|
906
1473
|
// \u4E3A\u77ED\u8DEF\u95E8\u2014\u2014\u6587\u4EF6\u4E0D\u5B58\u5728\u65F6\u8FD4\u56DE\u7A7A config \u4E14 readFileSync \u4E0D\u88AB\u8C03\u7528\uFF0CGUI-only
|
|
907
|
-
// \u767B\u5F55\u5BBF\u4E3B\uFF08cli/config.json \u4ECE\u672A\u88AB CLI \u4FA7\u5199\u8FC7\uFF09\u4E0A\u6CE8\u5165\u53EA\u6302\u5728\u8BFB\
|
|
908
|
-
// D3 \u6362\
|
|
1474
|
+
// \u767B\u5F55\u5BBF\u4E3B\uFF08cli/config.json \u4ECE\u672A\u88AB CLI \u4FA7\u5199\u8FC7\uFF09\u4E0A\u6CE8\u5165\u53EA\u6302\u5728\u8BFB\u4FA7 = \u4E0D\u53EF\u89C1\u3002
|
|
1475
|
+
// D3 \u5207\u6362\uFF1A\u771F\u5B9E provider_config.json \u7684\u5B58\u5728\u6027 = \u771F\u5B9E\u6216\u526F\u672C\u4EFB\u4E00\u5B58\u5728\u5373 true
|
|
909
1476
|
//\uFF08\u771F\u5B9E\u7F3A\u5931 + \u526F\u672C\u5B58\u5728\u65F6 Registry \u7684 existsSync \u95E8\u4E0D\u5F97\u62E6\u6389 merge \u89C6\u56FE\u8BFB\u53D6\uFF09
|
|
910
1477
|
fs.__origExistsSync = fs.existsSync;
|
|
911
1478
|
fs.existsSync = function (p) {
|
|
@@ -1292,7 +1859,7 @@ var AppServerConnection = class {
|
|
|
1292
1859
|
killChainPromise;
|
|
1293
1860
|
generation = 0;
|
|
1294
1861
|
pushHandlers = /* @__PURE__ */ new Map();
|
|
1295
|
-
/** [R4]
|
|
1862
|
+
/** [R4] 连接级崩溃通知侧(onClose 订阅者集合;与 pushHandlers 同构的 refCount 形态)。 */
|
|
1296
1863
|
closeHandlers = /* @__PURE__ */ new Set();
|
|
1297
1864
|
capturedProtocolInfo = null;
|
|
1298
1865
|
constructor(opts) {
|
|
@@ -1312,7 +1879,7 @@ var AppServerConnection = class {
|
|
|
1312
1879
|
get pid() {
|
|
1313
1880
|
return this.child?.pid;
|
|
1314
1881
|
}
|
|
1315
|
-
/**
|
|
1882
|
+
/** 当前代是否有活进程(关闭原语与重建测试的观测范围)。 */
|
|
1316
1883
|
get alive() {
|
|
1317
1884
|
return this.child !== null;
|
|
1318
1885
|
}
|
|
@@ -1593,7 +2160,7 @@ var AppServerConnection = class {
|
|
|
1593
2160
|
return false;
|
|
1594
2161
|
}
|
|
1595
2162
|
}
|
|
1596
|
-
/** stderr 实时 append 落盘(懒打开 + 尺寸轮转 +
|
|
2163
|
+
/** stderr 实时 append 落盘(懒打开 + 尺寸轮转 + 过期清理;失败静默——取证侧不
|
|
1597
2164
|
* 能拖垮主通道)。 */
|
|
1598
2165
|
appendStderrLog(chunk) {
|
|
1599
2166
|
if (this.stderrStreamFailed) return;
|
|
@@ -1779,7 +2346,7 @@ var SessionChannel = class {
|
|
|
1779
2346
|
/**
|
|
1780
2347
|
* [P0-1 U5/D7] dispose 标志:dispose 收割后 closeSession 短路——收割形态下连接
|
|
1781
2348
|
* 可能仍 alive(close 事件迟到,finalize 未跑、child 非 null),此时发 close
|
|
1782
|
-
* request
|
|
2349
|
+
* request 会写死进程(请求挂到控制范围超时)或触发惰性重建(凭空 spawn 无人使用的
|
|
1783
2350
|
* 进程,违背 dispose 防泄漏语义);进程随即被引擎杀链回收,会话驻留随之消亡。
|
|
1784
2351
|
*/
|
|
1785
2352
|
disposed = false;
|
|
@@ -1803,10 +2370,10 @@ var SessionChannel = class {
|
|
|
1803
2370
|
/**
|
|
1804
2371
|
* [P0-1 U5/D7] dispose 前收割 + 退订:「退订 = 不会再有事件」在结构上蕴含「在途
|
|
1805
2372
|
* turn 不应再等」——close 缺失/被吞没形态(onClose 收割主路径未触发)下,在途
|
|
1806
|
-
* turn 于退订前经既有 failAllTurns 收敛为明确失败(设计 §3.4
|
|
2373
|
+
* turn 于退订前经既有 failAllTurns 收敛为明确失败(设计 §3.4 退化路径完成;
|
|
1807
2374
|
* race 窗口在引擎 shutdownRuntimeAndDisposeChannel,量级与 awaitConnFinalized
|
|
1808
2375
|
* 同源 ZCODE_APPSERVER_HARVEST_GRACE_MS)。幂等:与 onClose 收割先到者赢
|
|
1809
|
-
* (turn.fail 的 settled
|
|
2376
|
+
* (turn.fail 的 settled 检查——已落定 turn 不改写),activeTurns 已空则 no-op。
|
|
1810
2377
|
* 不影响连接自身生命周期(R4)。
|
|
1811
2378
|
*/
|
|
1812
2379
|
dispose() {
|
|
@@ -1878,7 +2445,7 @@ var SessionChannel = class {
|
|
|
1878
2445
|
* 原样上抛(调用方决定降级形态——引擎侧 warn 后注入锚失效声明段继续执行,
|
|
1879
2446
|
* run 不失败,[U3])。
|
|
1880
2447
|
* 经 conn.request 惰性启动连接(resume 是 run 的**首个**请求——调用时点连接
|
|
1881
|
-
* 可能尚未启动,与 readBestEffort 的「已死跳过」判据不同场景,不做 alive
|
|
2448
|
+
* 可能尚未启动,与 readBestEffort 的「已死跳过」判据不同场景,不做 alive 检查)。
|
|
1882
2449
|
*/
|
|
1883
2450
|
async resumeSession(sessionId) {
|
|
1884
2451
|
return this.conn.request("session/resume", { sessionId }, { timeoutMs: ZCODE_APPSERVER_TURN_READ_TIMEOUT_MS });
|
|
@@ -2027,7 +2594,7 @@ var SessionChannel = class {
|
|
|
2027
2594
|
}
|
|
2028
2595
|
/**
|
|
2029
2596
|
* 收尾帧判定与吸收(A.2 ⑤ 两种形态:payload.response / stopReason+content 变体)。
|
|
2030
|
-
* 命中任一形态则落 finalText/finalUsage 并以 final-frame
|
|
2597
|
+
* 命中任一形态则落 finalText/finalUsage 并以 final-frame 宽松终态收尾,返回 true。
|
|
2031
2598
|
*/
|
|
2032
2599
|
applyFinalFrame(turn, payload) {
|
|
2033
2600
|
if (typeof payload.response === "string" && payload.response !== "") {
|
|
@@ -2104,7 +2671,7 @@ var SessionChannel = class {
|
|
|
2104
2671
|
* - "interrupted":用户中断形态,debug(stderr 兜底对 debug no-op——对齐
|
|
2105
2672
|
* SDK logger CONSOLE_SINK 语义,host/log 反向请求侧仍可观测);
|
|
2106
2673
|
* - 失败类(isFailedTerminalStatus,与引擎失败分流同口径)与 unknown/未识别
|
|
2107
|
-
* status:保守 warn(原样 status
|
|
2674
|
+
* status:保守 warn(原样 status 已写入文案)——假成功识破的防御机制,理论
|
|
2108
2675
|
* 不可达但保留,宁可误报不静默。
|
|
2109
2676
|
*/
|
|
2110
2677
|
logLateTerminal(turn, status) {
|
|
@@ -2145,7 +2712,7 @@ var SessionChannel = class {
|
|
|
2145
2712
|
}
|
|
2146
2713
|
}
|
|
2147
2714
|
}
|
|
2148
|
-
/** 终态后 read(A.2 ⑥)。失败/超时不抛——降级链由 runTurn
|
|
2715
|
+
/** 终态后 read(A.2 ⑥)。失败/超时不抛——降级链由 runTurn 收尾(read 只兜底不致命)。
|
|
2149
2716
|
* 连接已死时跳过(与 closeSession 同判——对死连接发请求会凭空重建进程)。 */
|
|
2150
2717
|
async readBestEffort(sessionId) {
|
|
2151
2718
|
if (!this.conn.alive) return void 0;
|
|
@@ -2300,7 +2867,7 @@ function sweepExpiredZcodeSessions(dbPath, opts = {}) {
|
|
|
2300
2867
|
return { swept, keptActive };
|
|
2301
2868
|
} catch (err) {
|
|
2302
2869
|
logger3.warn(
|
|
2303
|
-
`[zcode-ttl] sweep \u5931\u8D25\uFF08\u8F85\u52A9\u8D44\u6E90\
|
|
2870
|
+
`[zcode-ttl] sweep \u5931\u8D25\uFF08\u8F85\u52A9\u8D44\u6E90\u4FA7\uFF0C\u4E0D\u5F71\u54CD run \u4E3B\u94FE\u8DEF\uFF1B\u4E0B\u4E2A\u8282\u6D41\u7A97\u91CD\u8BD5\uFF09: ${err instanceof Error ? err.message : String(err)}`,
|
|
2304
2871
|
{ dbPath }
|
|
2305
2872
|
);
|
|
2306
2873
|
return noOp;
|
|
@@ -2378,7 +2945,7 @@ var ZcodeEngine = class {
|
|
|
2378
2945
|
permissionMode: "native",
|
|
2379
2946
|
// [D3-④] 无 turn_end 语义,轮数上限不可兑现(预检 gate 据此同步拒绝)
|
|
2380
2947
|
maxTurns: false,
|
|
2381
|
-
// [subagent-model-switch] zcode
|
|
2948
|
+
// [subagent-model-switch] zcode 引擎不在模型切换设计范围(协议范围引擎中立预留,
|
|
2382
2949
|
// 后续另立项接入)——setModel 通路未接通,unsupported 如实声明
|
|
2383
2950
|
setModel: "unsupported"
|
|
2384
2951
|
};
|
|
@@ -2446,7 +3013,7 @@ var ZcodeEngine = class {
|
|
|
2446
3013
|
* 常驻路径主编排:模型解析(v2 单源校验)→ 惰性连接 + runTurn(事件时序前移:
|
|
2447
3014
|
* text_delta 流式、终态后 message_end/turn_end)→ schema 仿真重试 → outcome/handle。
|
|
2448
3015
|
* onHandleReady 在 create 应答后(§3.4 不变量 3;原 onPoolResolved prepare 期
|
|
2449
|
-
* 声明已随 [池抽象降级 2026-09-13] poolKey
|
|
3016
|
+
* 声明已随 [池抽象降级 2026-09-13] poolKey 协议范围退役删除)。
|
|
2450
3017
|
*/
|
|
2451
3018
|
async runViaAppServer(task, ctx) {
|
|
2452
3019
|
const startedAt = Date.now();
|
|
@@ -2466,7 +3033,7 @@ var ZcodeEngine = class {
|
|
|
2466
3033
|
const outcome = this.finalizeOutcome(task, ctx, final, usageAcc, startedAt);
|
|
2467
3034
|
return { handle: this.appServerHandle(outcome), outcome };
|
|
2468
3035
|
}
|
|
2469
|
-
/** pre-aborted
|
|
3036
|
+
/** pre-aborted 短路收尾:合成中止 outcome + 'shared' 锚定 handle。 */
|
|
2470
3037
|
abortedAppServerRun(task, ctx, startedAt) {
|
|
2471
3038
|
const outcome = this.finalizeOutcome(
|
|
2472
3039
|
task,
|
|
@@ -2486,11 +3053,11 @@ var ZcodeEngine = class {
|
|
|
2486
3053
|
* 新建会话)。重试轮 prompt 用 basePrompt 原样重跑(失败形态非 schema),文案补
|
|
2487
3054
|
* 「已自动重试一次」句(retried 标记仅对真实发生的重试生效)。
|
|
2488
3055
|
*
|
|
2489
|
-
* 两次重试一次封顶各自独立(D6
|
|
3056
|
+
* 两次重试一次封顶各自独立(D6 不采用①:多次重试/指数退避不做——重跑一轮=整任务
|
|
2490
3057
|
* 重算,一次封顶)。组合序:瞬时重试在前、schema 重试在后——瞬时重试轮 parsed 且
|
|
2491
3058
|
* 校验失败时仍进 schema 重试(末次 attempt 语义,schema 重试编排保持现状不动)。
|
|
2492
3059
|
*
|
|
2493
|
-
* 重试轮是独立会话的独立 LLM 调用:token 计入 outcome.usage
|
|
3060
|
+
* 重试轮是独立会话的独立 LLM 调用:token 计入 outcome.usage 总量;事件范围
|
|
2494
3061
|
* text_delta 按实际流出(含失败轮——journal 记录真实流水),message_end/turn_end
|
|
2495
3062
|
* 只在最终轮终态后合成(不变量 2/5)。
|
|
2496
3063
|
*/
|
|
@@ -2537,7 +3104,7 @@ var ZcodeEngine = class {
|
|
|
2537
3104
|
}
|
|
2538
3105
|
/**
|
|
2539
3106
|
* 单轮常驻执行:runTurn 组合面 + D3 abort 链 + 事件前移(text_delta 实时流出;
|
|
2540
|
-
* 终态数据经 read
|
|
3107
|
+
* 终态数据经 read 兜底收尾后才 resolve——不变量 1/2)。
|
|
2541
3108
|
*
|
|
2542
3109
|
* @param opts retried:瞬时重试轮标记——失败文案补「已自动重试一次」句(F-1/F-4)。
|
|
2543
3110
|
*/
|
|
@@ -2560,7 +3127,7 @@ var ZcodeEngine = class {
|
|
|
2560
3127
|
// 等,真机探针实证每 ~1s 一帧)→ activity 事件(零载荷纯活性信号——宿主无进展
|
|
2561
3128
|
// 守护对任何事件类型刷新;reducer no-op、不落 journal)。zcode 引擎声明
|
|
2562
3129
|
// conversation:"cold"(续聊 = session-store 冷恢复重建 + 新 run + resume 锚点,
|
|
2563
|
-
// 无热 steering/chat 域接线),run
|
|
3130
|
+
// 无热 steering/chat 域接线),run 域是唯一发射点。
|
|
2564
3131
|
onActivity: () => ctx.onEvent?.({ type: "activity" }),
|
|
2565
3132
|
onSessionCreated: (sessionId) => {
|
|
2566
3133
|
currentSessionId = sessionId;
|
|
@@ -2597,12 +3164,12 @@ var ZcodeEngine = class {
|
|
|
2597
3164
|
}
|
|
2598
3165
|
/**
|
|
2599
3166
|
* [attemptAppServerTurn 拆分] 失败分流(catch 半边):
|
|
2600
|
-
* - signal 已 aborted →
|
|
3167
|
+
* - signal 已 aborted → 中止终态收尾;
|
|
2601
3168
|
* - [P0-1 U4] 连接崩溃收割形态(failAllTurns 的错误,D6 可重试形态)判据:
|
|
2602
|
-
* 非 RPC error
|
|
3169
|
+
* 非 RPC error(服务端无明确应答——有应答即精确错误归类,非瞬时崩溃)且
|
|
2603
3170
|
* conn 不存活。时序可靠性:catch 时刻紧随 onClose 收割,连接重建仅由
|
|
2604
3171
|
* conn.request 惰性触发——本链路中 runTurn finally 的 closeSession 对死连接
|
|
2605
|
-
* 短路(channel 侧 !alive
|
|
3172
|
+
* 短路(channel 侧 !alive 检查)、stop 只属 abort 链(已被 signal.aborted
|
|
2606
3173
|
* 短路)——此刻无 request 可重建,判据可靠;
|
|
2607
3174
|
* - 其余 → 精确错误终态。
|
|
2608
3175
|
*/
|
|
@@ -2638,7 +3205,7 @@ var ZcodeEngine = class {
|
|
|
2638
3205
|
* D3 abort 链执行体(用户取消入口,fire-and-forget——与 turn promise 并行推进):
|
|
2639
3206
|
* stop 帧(超时 ZCODE_APPSERVER_STOP_TIMEOUT_MS)→ grace 窗口内 turn 落定即止
|
|
2640
3207
|
* (不杀共享进程)→ 超窗 killChain(conn.shutdown 全序:SIGTERM→grace→SIGKILL)。
|
|
2641
|
-
* turn 的最终落定由 attempt 主路径 await
|
|
3208
|
+
* turn 的最终落定由 attempt 主路径 await 收尾,本链不直接产出终态。abort 与 create
|
|
2642
3209
|
* 竞态(signal 先到、session 未建立):等会话建立(带上限)再发 stop——否则 stop
|
|
2643
3210
|
* 永远发不出,直接连坐杀共享进程。
|
|
2644
3211
|
*/
|
|
@@ -2687,7 +3254,7 @@ var ZcodeEngine = class {
|
|
|
2687
3254
|
* workspace.workspacePath 按任务传递——D10 基线不预设任务级进程 cwd)。
|
|
2688
3255
|
* spawn 经 fs 拦截 wrapper(appserver-launcher:cli config 读取重定向为
|
|
2689
3256
|
* 「真实文件 + v2 provider 注入」——CLI 形态 app-server 在共享宿主 HOME 下的
|
|
2690
|
-
*
|
|
3257
|
+
* 唯一凭据供数通路,机制与漂移风险见该文件头注)。
|
|
2691
3258
|
*/
|
|
2692
3259
|
ensureAppServerRuntime() {
|
|
2693
3260
|
if (this.appserverRuntime !== void 0) return this.appserverRuntime;
|
|
@@ -2736,7 +3303,7 @@ var ZcodeEngine = class {
|
|
|
2736
3303
|
* [P0-1 U5/D7] grace race 输掉(close 迟到/永不到达——stdio 被孙进程持有排空不
|
|
2737
3304
|
* 尽等病态形态)时,channel.dispose() 内置的 dispose 收割(failAllTurns 先于退订,
|
|
2738
3305
|
* SessionChannel.dispose)兜底在途 turn——在途 turn 收敛为「grace 窗口内明确失败」
|
|
2739
|
-
* (设计 §3.4
|
|
3306
|
+
* (设计 §3.4 退化路径完成);race 窗口与 awaitConnFinalized 同源同量级
|
|
2740
3307
|
* (ZCODE_APPSERVER_HARVEST_GRACE_MS)。正常 close 先到时 onClose 收割先行,
|
|
2741
3308
|
* dispose 收割幂等 no-op(零回归)。
|
|
2742
3309
|
*/
|
|
@@ -2752,10 +3319,10 @@ var ZcodeEngine = class {
|
|
|
2752
3319
|
rt.channel.dispose();
|
|
2753
3320
|
}
|
|
2754
3321
|
/**
|
|
2755
|
-
* [R1 D6 主体]
|
|
3322
|
+
* [R1 D6 主体] 引擎停机路径:①fire 全部在途会话的 session/close 帧(不等待
|
|
2756
3323
|
* 应答——D6① 顺序规定:close 帧必须先于 SIGTERM,否则对面来不及处理即被杀)→
|
|
2757
|
-
* ②同步 SIGTERM(conn.shutdown 调用内 killChain
|
|
2758
|
-
* Promise 前完成)→ ③grace → SIGKILL
|
|
3324
|
+
* ②同步 SIGTERM(conn.shutdown 调用内 killChain 前缀同步执行——同步部分在返回
|
|
3325
|
+
* Promise 前完成)→ ③grace → SIGKILL(异步侧,Promise resolve 于进程退出)。
|
|
2759
3326
|
* 幂等:运行时字段取走即置空,二次调用零副作用;dispose 后首个 run 经
|
|
2760
3327
|
* ensureAppServerRuntime 自动重建(与崩溃重建同一代码路径,不变量 4)。
|
|
2761
3328
|
*/
|
|
@@ -2794,7 +3361,7 @@ var ZcodeEngine = class {
|
|
|
2794
3361
|
/** abort 合成终态:exitCode=null(record 正常收尾,不留僵尸)。 */
|
|
2795
3362
|
applyAbortedOutcome(outcome, task, ctx, final, emit) {
|
|
2796
3363
|
outcome.exitCode = null;
|
|
2797
|
-
outcome.error = isHostTimeoutAbort(ctx) ? (0, import_subagent_engine_sdk12.synthesizeTimeoutOutcome)(task, final.output.stdoutText, ZCODE_ENGINE_ID).error ?? (0, import_subagent_engine_sdk12.engineTimeoutDetail)(final.output.stdoutText) : final.abortMessage ?? `engine_run_failed: zcode \u4EFB\u52A1\u88AB\u4E2D\u6B62\uFF08app-server abort \u94FE\u6536\
|
|
3364
|
+
outcome.error = isHostTimeoutAbort(ctx) ? (0, import_subagent_engine_sdk12.synthesizeTimeoutOutcome)(task, final.output.stdoutText, ZCODE_ENGINE_ID).error ?? (0, import_subagent_engine_sdk12.engineTimeoutDetail)(final.output.stdoutText) : final.abortMessage ?? `engine_run_failed: zcode \u4EFB\u52A1\u88AB\u4E2D\u6B62\uFF08app-server abort \u94FE\u6536\u5C3E\uFF0C\u5BBF\u4E3B\u5408\u6210\u7EC8\u6001\uFF09\u3002\u8F93\u51FA\u5C3E\u90E8: ${final.output.stdoutText.slice(-ZCODE_ERROR_TAIL_CHARS)}`;
|
|
2798
3365
|
emit({ type: "error", message: outcome.error });
|
|
2799
3366
|
}
|
|
2800
3367
|
/**
|
|
@@ -2840,6 +3407,17 @@ var ZcodeEngine = class {
|
|
|
2840
3407
|
listModels() {
|
|
2841
3408
|
return listZcodeModels(this.deps.sources);
|
|
2842
3409
|
}
|
|
3410
|
+
/**
|
|
3411
|
+
* [engine-ref-translation D1] 派发期模型 ref 翻译(EnginePort 可选成员实装):
|
|
3412
|
+
* pi 词汇 ref → zcode 原生 ref(zai-coding-cn/* → account:bigmodel-individual-*
|
|
3413
|
+
* 大小写归一,2026-10-16 用户裁决(证据驱动修正目标家族)),其余透传。编排层在 record stamp 前调用——
|
|
3414
|
+
* record/上报侧呈现实际发给引擎的 ref;翻译失败抛错 = 显式失败(不静默回落)。
|
|
3415
|
+
* 幂等:翻译产物(account:/个人 id)再入恒等,引擎内 resolveZcodeModelRef 的
|
|
3416
|
+
* 同名翻译分支零冲突。
|
|
3417
|
+
*/
|
|
3418
|
+
translateModelRef(modelRef) {
|
|
3419
|
+
return translatePiModelRefToZcode(modelRef, this.deps.sources);
|
|
3420
|
+
}
|
|
2843
3421
|
/** 模型 reasoning 值域缓存(目录 modelRules 值域;per-modelRef 记忆化——
|
|
2844
3422
|
* 目录文件在引擎进程生命周期内视为静态,重复 run 不重读)。 */
|
|
2845
3423
|
reasoningMemo = /* @__PURE__ */ new Map();
|
|
@@ -2871,9 +3449,9 @@ var ZcodeEngine = class {
|
|
|
2871
3449
|
* 权威,无双实现)。校验失败原样抛 ZcodePrepareError,由编排层
|
|
2872
3450
|
* (engine/model-validation.ts)包装成「引擎与模型不配套」文案。
|
|
2873
3451
|
*
|
|
2874
|
-
* [R4/D6-②] 缺席语义:本实现是进程内形态 +
|
|
3452
|
+
* [R4/D6-②] 缺席语义:本实现是进程内形态 + 协议诊断范围(宿主 cli 形态消费的是
|
|
2875
3453
|
* RemoteEngine 的 manifest 本地判定,不经本方法——SDK protocol methods.ts 明示
|
|
2876
|
-
* validateModel
|
|
3454
|
+
* validateModel 为诊断范围)。缺席 modelRef 时返回空串 canonical(= create 帧省略
|
|
2877
3455
|
* model 键、CLI 自身缺省解析——2026-09-29 account 体系迁移后 plan 家族兜底 id
|
|
2878
3456
|
* 已不可用;record 留痕侧按 R4/D6-② 空串归一为「用户未指定」条件留空)。帧应答
|
|
2879
3457
|
* 形态维持 {canonicalRef: string}(SDK port-contract 契约必填——「帧字段缺席」
|
|
@@ -2890,7 +3468,7 @@ var ZcodeEngine = class {
|
|
|
2890
3468
|
* (zcodeSessionDbPath(engineDataDir),tier1 白名单集合见方法体——宿主路径仅
|
|
2891
3469
|
* 「共享 HOME 时代」存量兼容);旧 records(池时代)的相对路径仍按池目录锚定
|
|
2892
3470
|
* 解析(read 兼容旧数据,池目录不存在时自然落②级 journal 降级)。[池抽象降级
|
|
2893
|
-
* 2026-09-13] 锚定 key 用常量 SHARED_POOL_KEY
|
|
3471
|
+
* 2026-09-13] 锚定 key 用常量 SHARED_POOL_KEY 承载——协议范围 poolKey 已删,池
|
|
2894
3472
|
* 时代真实池 key 不再随 handle 传输;若旧 record 的池目录恰为 shared 布局则①级
|
|
2895
3473
|
* 仍可达,其余池 key 的旧 record 直接走②级 journal 降级(30 天 TTL 同尺度衰减,
|
|
2896
3474
|
* 行为安全)。
|
|
@@ -2987,8 +3565,8 @@ var ZcodeEngine = class {
|
|
|
2987
3565
|
* [U6 / §3.2.6 要点 3] resume 锚 → 历史前缀(interact-resume 的读半段)。
|
|
2988
3566
|
*
|
|
2989
3567
|
* 无锚 / 非 zcode 锚形态 → undefined(行为不变)。读通道失败(会话失效 / 控制
|
|
2990
|
-
* 面错误)=
|
|
2991
|
-
* 于 create 应答,分钟级窗 +
|
|
3568
|
+
* 面错误)= 锚真失效的权威信号——宿主侧库派生视图预检查已退役(app-server 写盘滞后
|
|
3569
|
+
* 于 create 应答,分钟级窗 + 部分行永不写盘,预检查系统性误判;resume 走
|
|
2992
3570
|
* app-server resident 内存态才是真实活性判据),因此此处不再静默降级为无前缀
|
|
2993
3571
|
* 裸跑,而是返回锚失效声明段:让模型知情「延续但无历史」,基于最新消息独立
|
|
2994
3572
|
* 续推,而非在缺上下文时臆测连续性。用户消息照常执行,不炸轮。
|
|
@@ -3082,7 +3660,7 @@ function stopTimeoutMs() {
|
|
|
3082
3660
|
return resolveAppserverTimingMs(
|
|
3083
3661
|
ZCODE_APPSERVER_STOP_TIMEOUT_ENV,
|
|
3084
3662
|
ZCODE_APPSERVER_STOP_TIMEOUT_MS,
|
|
3085
|
-
"stop \u63A7\u5236\
|
|
3663
|
+
"stop \u63A7\u5236\u8303\u56F4\u8D85\u65F6"
|
|
3086
3664
|
);
|
|
3087
3665
|
}
|
|
3088
3666
|
function abortGraceMs() {
|
|
@@ -3386,10 +3964,10 @@ var EngineProtocolServer = class {
|
|
|
3386
3964
|
(0, import_server.writeRunEvent)(this.write, this.activeRuns, runId, event);
|
|
3387
3965
|
}
|
|
3388
3966
|
/**
|
|
3389
|
-
*
|
|
3967
|
+
* 发反向请求并等应答(帧④必须应答)。计时侧登记:发出 → clock.started;收到
|
|
3390
3968
|
* ack 形态应答 → clock.acked(两阶段第一段,等待不计超时);终结 → clock.settled。
|
|
3391
|
-
* 应答超时兜底 reject
|
|
3392
|
-
*
|
|
3969
|
+
* 应答超时兜底 reject——数据范围通道(host/log 等)core 10s 应答,reject 由调用方
|
|
3970
|
+
* 吞掉留痕(数据范围丢失不拖死主链路)。
|
|
3393
3971
|
*/
|
|
3394
3972
|
/**
|
|
3395
3973
|
* fire-and-forget 反向请求(`void this.reverseRequestInternal(...)` 形态)的
|
|
@@ -3404,7 +3982,7 @@ var EngineProtocolServer = class {
|
|
|
3404
3982
|
});
|
|
3405
3983
|
};
|
|
3406
3984
|
}
|
|
3407
|
-
/**
|
|
3985
|
+
/** 反向请求发送(对外公开:main.ts 的 host/log 桥接消费;内部 run 通道同路)。 */
|
|
3408
3986
|
reverseRequest(method, params) {
|
|
3409
3987
|
return this.reverseRequestInternal(method, params);
|
|
3410
3988
|
}
|
|
@@ -3421,7 +3999,7 @@ var EngineProtocolServer = class {
|
|
|
3421
3999
|
params
|
|
3422
4000
|
);
|
|
3423
4001
|
}
|
|
3424
|
-
/** 反向请求应答落位(ack 两阶段:{ack:true}/{unsupported:true}/{ok:true} 均先 ack
|
|
4002
|
+
/** 反向请求应答落位(ack 两阶段:{ack:true}/{unsupported:true}/{ok:true} 均先 ack 计时侧)。 */
|
|
3425
4003
|
settleReverse(id, frame) {
|
|
3426
4004
|
const pending = this.reversePending.get(String(id));
|
|
3427
4005
|
if (pending === void 0) return;
|