@zhushanwen/zcode-subagent-cli 0.8.1 → 0.8.2
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/dist/{chunk-L3M3CMFJ.js → chunk-Z6IPBSKG.js} +544 -46
- package/dist/index.cjs +544 -46
- package/dist/index.d.cts +9 -0
- package/dist/index.d.ts +9 -0
- package/dist/index.js +1 -1
- package/dist/main.cjs +544 -46
- package/dist/main.js +1 -1
- package/package.json +4 -1
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,406 @@ 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:{}})
|
|
764
|
+
if (!standaloneApplied) {
|
|
765
|
+
const callAnchor = 'create:r(()=>' + fnName + '(';
|
|
766
|
+
const callIdx = src.indexOf(callAnchor);
|
|
767
|
+
if (callIdx >= 0) {
|
|
768
|
+
const argStart = callIdx + callAnchor.length;
|
|
769
|
+
// \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
|
|
770
|
+
// \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
|
|
771
|
+
const closeIdx = __matchingParen(src, argStart - 1);
|
|
772
|
+
if (closeIdx > argStart) {
|
|
773
|
+
src = src.slice(0, closeIdx) + ',{standalone:{}}' + src.slice(closeIdx);
|
|
774
|
+
standaloneApplied = true;
|
|
775
|
+
}
|
|
776
|
+
}
|
|
777
|
+
}
|
|
778
|
+
}
|
|
779
|
+
}
|
|
780
|
+
if (!standaloneApplied) {
|
|
781
|
+
process.stderr.write('[zcode-launcher] standalone account: CLI bundle anchor not found (zcode upstream shape drifted?) - account family stays host-dependent\\n');
|
|
782
|
+
}
|
|
783
|
+
// \u2462 [2026-10-16 standalone account\xB7\u7AEF\u53E3\u6CE8\u5165] \u534F\u8BAE\u8DEF\u5F84\u7684 app \u521B\u5EFA\uFF08
|
|
784
|
+
// createZCodeApp:r((ut={})=>INn({...q0c(...)}) \u552F\u4E00\u547D\u4E2D\uFF09\u672A\u4F20
|
|
785
|
+
// providerRuntimeHeadersPort\u2014\u2014app \u56E0\u6B64\u56DE\u843D host \u8BF7\u6C42\u7AEF\u53E3\uFF08mai\uFF09\uFF0C\u800C taiji \u94FE\u4E0A\u65E0
|
|
786
|
+
// \u5BBF\u4E3B\u4EFB\u5E94\u7B54 \u2192 zod invalid_union(headersApplied)\uFF08\u2461\u53EA\u4FEE\u4E86 registry \u4FA7\uFF1Aprovider
|
|
787
|
+
// \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
|
|
788
|
+
// providerRuntimeHeadersPort\uFF08standalone \u6A21\u5F0F = \u672C\u5730\u7AEF\u53E3\uFF09\u6CE8\u5165\u8BE5 app \u521B\u5EFA\u9009\u9879\uFF1A
|
|
789
|
+
// \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
|
|
790
|
+
const appAnchor = 'createZCodeApp:r(';
|
|
791
|
+
const appIdx = src.indexOf(appAnchor);
|
|
792
|
+
if (appIdx >= 0) {
|
|
793
|
+
const closeAnchor = '}),"createZCodeApp")';
|
|
794
|
+
const closeIdx = src.indexOf(closeAnchor, appIdx);
|
|
795
|
+
// \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
|
|
796
|
+
// \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
|
|
797
|
+
const regMatch = closeIdx > appIdx
|
|
798
|
+
? /([A-Za-z_$][A-Za-z0-9_$]*).runtime.registryService/.exec(src.slice(appIdx, closeIdx))
|
|
799
|
+
: null;
|
|
800
|
+
if (closeIdx > appIdx && regMatch) {
|
|
801
|
+
// \u6761\u4EF6 spread\uFF082026-10 review\xB7S-4\uFF09\uFF1A\u4E0A\u6E38 kEt \u4EE5 \`n.providerRuntimeHeadersPort ??
|
|
802
|
+
// 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
|
|
803
|
+
// \u65E0\u6761\u4EF6\u5C3E\u63D2 <reg>.providerRuntimeHeadersPort \u5728 standalone \u672A\u6B66\u88C5\u5F62\u6001\uFF08\u503C\u4E3A
|
|
804
|
+
// 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
|
|
805
|
+
// standalone \u5F62\u6001\u5B57\u8282\u7B49\u4EF7\uFF0Chost \u5F62\u6001\u4FDD\u7559\u8C03\u7528\u65B9\u503C\u3002
|
|
806
|
+
const reg = regMatch[1];
|
|
807
|
+
src = src.slice(0, closeIdx)
|
|
808
|
+
+ ',...(' + reg + '.providerRuntimeHeadersPort?{providerRuntimeHeadersPort:' + reg + '.providerRuntimeHeadersPort}:{})'
|
|
809
|
+
+ src.slice(closeIdx);
|
|
810
|
+
portInjected = true;
|
|
811
|
+
}
|
|
812
|
+
}
|
|
813
|
+
if (!portInjected) {
|
|
814
|
+
process.stderr.write('[zcode-launcher] standalone account: header-port injection anchor not found (zcode upstream shape drifted?) - account auth stays host-dependent\\n');
|
|
815
|
+
}
|
|
816
|
+
// \u4EA4\u4ED8\u6761\u4EF6\u542B portInjected\uFF082026-10 review \u4FEE\u6B63\uFF09\uFF1A\u66FE\u53EA\u8BA4 entitled/standalone\u2014\u2014
|
|
817
|
+
// \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
|
|
818
|
+
if (entitledApplied || standaloneApplied || portInjected) {
|
|
819
|
+
// \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
|
|
820
|
+
// 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
|
|
821
|
+
// \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
|
|
822
|
+
// \u4E0E .js \u6269\u5C55\u5904\u7406\u5668\u540C\u6B3E\uFF08\u5426\u5219\u5408\u6CD5 CJS \u88AB\u8BEF\u5224\u975E\u6CD5\uFF09\u3002
|
|
823
|
+
let check = src;
|
|
824
|
+
if (check.charCodeAt(0) === 0xfeff) check = check.slice(1);
|
|
825
|
+
if (check.startsWith('#!')) check = check.slice(check.indexOf('\\n') + 1);
|
|
826
|
+
try {
|
|
827
|
+
new Function(check);
|
|
828
|
+
result = src;
|
|
829
|
+
} catch (syntaxErr) {
|
|
830
|
+
process.stderr.write('[zcode-launcher] cli-source patch produced invalid JS (' + ((syntaxErr && syntaxErr.message) || 'unknown') + ') - falling back to unpatched source\\n');
|
|
831
|
+
result = null;
|
|
832
|
+
}
|
|
833
|
+
} else {
|
|
834
|
+
result = null;
|
|
835
|
+
}
|
|
836
|
+
} catch { result = null; }
|
|
837
|
+
__cliPatchCache.set(path, result);
|
|
838
|
+
// \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
|
|
839
|
+
// \u95E8\u4E0D\u5F97\u628A\u672A\u751F\u6548\u7684\u8865\u4E01\u62A5\u6210 armed\u3002
|
|
840
|
+
__cliPatchStatus.set(path, {
|
|
841
|
+
entitled: result !== null && entitledApplied,
|
|
842
|
+
standalone: result !== null && standaloneApplied,
|
|
843
|
+
headerPort: result !== null && portInjected,
|
|
844
|
+
});
|
|
845
|
+
return result;
|
|
846
|
+
}`;
|
|
847
|
+
var ACCOUNT_METADATA_SECTION = `
|
|
848
|
+
// [2026-10-16 standalone account metadata] standalone \u8D26\u53F7\u6E90\u8981\u6C42
|
|
849
|
+
// account-provider:<planProviderId>:identity / :auth-source \u4E24\u6761**\u5143\u6570\u636E**\u952E\u624D\u627F\u8BA4
|
|
850
|
+
// account provider\uFF08\u7F3A identity \u76F4\u63A5\u4E22\u5F03\u8BE5 provider \u2192 \u6D3E\u53D1\u62A5\u300CProvider Registry \u4E2D
|
|
851
|
+
// \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
|
|
852
|
+
// \uFF08oauth token \u6216 plan api-key\uFF0C\u5747\u5728 credentials.json\uFF0C\u7531 ZCode \u767B\u5F55/\u914D\u7F6E\u5199\u5165\uFF09\u3002
|
|
853
|
+
// \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
|
|
854
|
+
// 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
|
|
855
|
+
// \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
|
|
856
|
+
// 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
|
|
857
|
+
// \u5F15\u64CE\u4FA7\u65E2\u6709\u6587\u6848\u627F\u8F7D\uFF09\u3002catches\uFF1A\u6587\u4EF6\u7F3A\u5931/\u574F JSON/\u76EE\u5F55\u4E0D\u53EF\u5199\u3002
|
|
858
|
+
// \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
|
|
859
|
+
// \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 /
|
|
860
|
+
// \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
|
|
861
|
+
// \u8C03\u7528\u5951\u7EA6\uFF082026-10 review\xB7S-3\uFF09\uFF1A\u4EC5\u5728\u5B89\u88C5\u95E8\u786E\u8BA4 standalone \u4E0E header-port \u4E24\u951A
|
|
862
|
+
// \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
|
|
863
|
+
// \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
|
|
864
|
+
// \u4EFB\u4F55\u8FD0\u884C\u65F6\u6536\u76CA\uFF0C\u53EA\u589E\u98CE\u9669\u3002
|
|
865
|
+
function ensureAccountMetadata() {
|
|
866
|
+
try {
|
|
867
|
+
const credPath = path.join(os.homedir(), '.zcode', 'v2', 'credentials.json');
|
|
868
|
+
const readOrig = fs.__origReadFileSync || fs.readFileSync;
|
|
869
|
+
if (!fs.existsSync(credPath)) return;
|
|
870
|
+
const creds = JSON.parse(readOrig.call(fs, credPath, 'utf8'));
|
|
871
|
+
if (!creds || typeof creds !== 'object' || Array.isArray(creds)) return;
|
|
872
|
+
if (!CATALOG_PATH) return;
|
|
873
|
+
let planIds = [];
|
|
874
|
+
try {
|
|
875
|
+
const cat = JSON.parse(readOrig.call(fs, CATALOG_PATH, 'utf8'));
|
|
876
|
+
const pcr = (cat && cat.config && cat.config.providerConfigRules) || {};
|
|
877
|
+
const rules = Array.isArray(pcr.providerRules) ? pcr.providerRules : [];
|
|
878
|
+
planIds = rules
|
|
879
|
+
// \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
|
|
880
|
+
// && mode=individual-coding-plan && accountType \u975E\u7A7A && builtinModelIds \u975E\u7A7A\uFF1B
|
|
881
|
+
// \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
|
|
882
|
+
// \u7F3A\u65F6\u8FFD\u52A0\u6210\u672C\u2248\u96F6\uFF1B\u800C mode \u503C\u57DF\uFF08individual/team/start/off-peak/
|
|
883
|
+
// 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
|
|
884
|
+
// \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
|
|
885
|
+
.filter(function (r) { return r && r.config && r.config.access && r.config.access.type === 'zhipu-account'; })
|
|
886
|
+
.map(function (r) { return String(r.providerId || ''); })
|
|
887
|
+
.filter(Boolean);
|
|
888
|
+
} catch (e) {
|
|
889
|
+
// \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
|
|
890
|
+
// standalone \u6D3E\u53D1\u62A5\u300CProvider Registry \u4E2D\u4E0D\u5B58\u5728 Model\u300D\u65F6\u6392\u969C\u65E0\u5165\u53E3\uFF09
|
|
891
|
+
process.stderr.write('[zcode-launcher] account metadata: builtin catalog unreadable (' + ((e && e.message) || String(e)) + ') - skipping account provider metadata\\n');
|
|
892
|
+
return;
|
|
893
|
+
}
|
|
894
|
+
const added = [];
|
|
895
|
+
const reconciled = [];
|
|
896
|
+
for (const pid of planIds) {
|
|
897
|
+
const idKey = 'account-provider:' + pid + ':identity';
|
|
898
|
+
const srcKey = 'account-provider:' + pid + ':auth-source';
|
|
899
|
+
// host \u6001 plan api-key \u952E\u540D\u6A21\u677F\uFF1Aaccount-provider:coding-plan:<pid>:account:<identity>:api-key
|
|
900
|
+
const apiKeyPrefix = 'account-provider:coding-plan:' + pid + ':account:';
|
|
901
|
+
const apiKeySuffix = ':api-key';
|
|
902
|
+
const hasPlanApiKey = (id) => {
|
|
903
|
+
if (!id) return false;
|
|
904
|
+
return Boolean(creds[apiKeyPrefix + encodeURIComponent(id) + apiKeySuffix]);
|
|
905
|
+
};
|
|
906
|
+
let identity = typeof creds[idKey] === 'string' ? creds[idKey] : '';
|
|
907
|
+
const authSource = typeof creds[srcKey] === 'string' ? creds[srcKey] : '';
|
|
908
|
+
// \u6D3E\u751F\u8EAB\u4EFD\u6BCF\u6B21 spawn \u91CD\u7B97\uFF08\u4E0D\u8BFB\u65E2\u6709\u952E\uFF09\uFF1A\u5F53\u524D host \u6001\u952E\u540D\u9996\u547D\u4E2D\uFF08\u4FDD\u6301\u65E2\u6709\u4F18\u5148\u7EA7\uFF09\u3002
|
|
909
|
+
let derivedIdentity = '';
|
|
910
|
+
for (const k of Object.keys(creds)) {
|
|
911
|
+
if (k.indexOf(apiKeyPrefix) === 0 && k.slice(-apiKeySuffix.length) === apiKeySuffix) {
|
|
912
|
+
const mid = k.slice(apiKeyPrefix.length, k.length - apiKeySuffix.length);
|
|
913
|
+
if (mid) { try { derivedIdentity = decodeURIComponent(mid); } catch (e2) { derivedIdentity = mid; } break; }
|
|
914
|
+
}
|
|
915
|
+
}
|
|
916
|
+
// oauth \u5BB6\u65CF\u51ED\u636E\u5B58\u5728\u6027\uFF1A\u626B oauth:<family>:access_token\uFF0Cprovider id \u4EE5
|
|
917
|
+
// account:<family> \u5F00\u5934\u5373\u7ED1\u5B9A\u8BE5\u5BB6\u65CF\uFF08\u96F6\u5BB6\u65CF\u540D\u5199\u6B7B\uFF09\u3002
|
|
918
|
+
let oauthBacked = false;
|
|
919
|
+
const oauthPrefix = 'oauth:';
|
|
920
|
+
const oauthSuffix = ':access_token';
|
|
921
|
+
for (const k of Object.keys(creds)) {
|
|
922
|
+
if (k.indexOf(oauthPrefix) !== 0 || k.slice(-oauthSuffix.length) !== oauthSuffix) continue;
|
|
923
|
+
const fam = k.slice(oauthPrefix.length, k.length - oauthSuffix.length);
|
|
924
|
+
if (!fam) continue;
|
|
925
|
+
const token = creds[k];
|
|
926
|
+
if (typeof token !== 'string' || token === '') continue;
|
|
927
|
+
if (pid.indexOf('account:' + fam) === 0) { oauthBacked = true; break; }
|
|
928
|
+
}
|
|
929
|
+
// \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
|
|
930
|
+
// 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
|
|
931
|
+
// \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
|
|
932
|
+
// \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
|
|
933
|
+
// \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
|
|
934
|
+
let identityCorrectedFrom = '';
|
|
935
|
+
if (identity && !hasPlanApiKey(identity) && (authSource === 'manual' || !oauthBacked)
|
|
936
|
+
&& derivedIdentity && derivedIdentity !== identity) {
|
|
937
|
+
identityCorrectedFrom = identity;
|
|
938
|
+
identity = derivedIdentity;
|
|
939
|
+
}
|
|
940
|
+
if (!identity) identity = derivedIdentity;
|
|
941
|
+
if (!identity) continue;
|
|
942
|
+
// \u2461 auth-source \u6D3E\u751F + \u5B64\u513F\u77EB\u6B63\uFF1Aoauth \u9700\u5339\u914D\u5BB6\u65CF\u7684 access_token\uFF1Bmanual \u9700\u8BE5
|
|
943
|
+
// \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
|
|
944
|
+
// 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
|
|
945
|
+
const derivedAuthSource = oauthBacked ? 'oauth' : (hasPlanApiKey(identity) ? 'manual' : '');
|
|
946
|
+
let nextAuthSource = authSource || derivedAuthSource;
|
|
947
|
+
if (authSource === 'oauth' && !oauthBacked) nextAuthSource = derivedAuthSource;
|
|
948
|
+
else if (authSource === 'manual' && !hasPlanApiKey(identity)) nextAuthSource = derivedAuthSource;
|
|
949
|
+
if (!nextAuthSource) continue;
|
|
950
|
+
// \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
|
|
951
|
+
if (creds[idKey] !== identity) {
|
|
952
|
+
if (identityCorrectedFrom) {
|
|
953
|
+
reconciled.push(idKey + ' (' + identityCorrectedFrom + ' -> ' + identity + ')');
|
|
954
|
+
} else if (typeof creds[idKey] !== 'string' || creds[idKey] === '') {
|
|
955
|
+
added.push(idKey);
|
|
956
|
+
}
|
|
957
|
+
creds[idKey] = identity;
|
|
958
|
+
}
|
|
959
|
+
if (creds[srcKey] !== nextAuthSource) {
|
|
960
|
+
if (typeof creds[srcKey] === 'string' && creds[srcKey] !== '') {
|
|
961
|
+
reconciled.push(srcKey + ' (' + creds[srcKey] + ' -> ' + nextAuthSource + ')');
|
|
962
|
+
} else added.push(srcKey);
|
|
963
|
+
creds[srcKey] = nextAuthSource;
|
|
964
|
+
}
|
|
965
|
+
}
|
|
966
|
+
if (added.length === 0 && reconciled.length === 0) return;
|
|
967
|
+
const tmp = credPath + '.taiji-tmp-' + process.pid;
|
|
968
|
+
// 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
|
|
969
|
+
// \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
|
|
970
|
+
// \u5931\u8D25\u6E05\u7406 tmp\uFF0C\u4E0D\u5728\u7528\u6237\u51ED\u636E\u76EE\u5F55\u7559\u6B8B\u7247\u3002
|
|
971
|
+
let writeMode = 0o600;
|
|
972
|
+
try { writeMode = fs.statSync(credPath).mode & 0o777; } catch { /* \u7F3A\u7701 0600 */ }
|
|
973
|
+
try {
|
|
974
|
+
fs.writeFileSync(tmp, JSON.stringify(creds, null, 2), { mode: writeMode });
|
|
975
|
+
fs.renameSync(tmp, credPath);
|
|
976
|
+
} catch (err) {
|
|
977
|
+
try { fs.unlinkSync(tmp); } catch { /* tmp \u672A\u751F\u6210\u6216\u5DF2 rename */ }
|
|
978
|
+
throw err;
|
|
979
|
+
}
|
|
980
|
+
if (added.length > 0) process.stderr.write('[zcode-launcher] account metadata provisioned: ' + added.join(', ') + '\\n');
|
|
981
|
+
if (reconciled.length > 0) process.stderr.write('[zcode-launcher] account metadata reconciled: ' + reconciled.join(', ') + '\\n');
|
|
982
|
+
} catch (err) {
|
|
983
|
+
process.stderr.write('[zcode-launcher] account metadata provisioning failed (non-blocking): ' + ((err && err.message) || String(err)) + '\\n');
|
|
984
|
+
}
|
|
985
|
+
}
|
|
986
|
+
`;
|
|
987
|
+
|
|
490
988
|
// src/appserver-launcher.ts
|
|
491
989
|
var ZCODE_APPSERVER_LAUNCHER_NAME = "appserver-launcher.cjs";
|
|
492
990
|
var APPSERVER_LAUNCHER_SOURCE = `'use strict';
|
|
@@ -713,40 +1211,7 @@ function catalogPatchText(path) {
|
|
|
713
1211
|
return result;
|
|
714
1212
|
}
|
|
715
1213
|
|
|
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
|
-
}
|
|
1214
|
+
${CLI_PATCH_SECTION}
|
|
750
1215
|
|
|
751
1216
|
// \u5185\u5EFA provider \u914D\u7F6E\u5B9A\u4F4D\uFF08\u6F02\u79FB\u9762\u2461\uFF09\uFF1A3.12.x \u8D77\u914D\u7F6E\u6587\u4EF6\u632A\u4F4D + CLI \u4F9D\u8D56\u5BBF\u4E3B\u6CE8\u5165
|
|
752
1217
|
// ZCODE_BUILTIN_PROVIDER_CONFIG_FILE \u76F4\u63A5\u5B9A\u4F4D\uFF1BZCode \u684C\u9762 spawn \u94FE\u81EA\u5E26\u8BE5\u952E\uFF0C
|
|
@@ -820,15 +1285,32 @@ if (!process.env.ZCODE_BUILTIN_PROVIDER_CONFIG_FILE) {
|
|
|
820
1285
|
}
|
|
821
1286
|
}
|
|
822
1287
|
|
|
1288
|
+
${ACCOUNT_METADATA_SECTION}
|
|
1289
|
+
|
|
823
1290
|
// \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
1291
|
// \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
1292
|
// Model\u300D\u800C\u65E0\u4EFB\u4F55\u65E5\u5FD7\uFF09\uFF0C\u8DF3\u8FC7\u540C\u6837\u5FC5\u987B\u7559\u75D5\u3002
|
|
826
1293
|
const text = injectedConfigText();
|
|
827
1294
|
const catalogPatch = CATALOG_PATH !== null ? catalogPatchText(CATALOG_PATH) : null;
|
|
828
|
-
|
|
1295
|
+
const cliPatchProbe = CLI_PATH ? patchedCliSource(CLI_PATH) : null;
|
|
1296
|
+
// \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
|
|
1297
|
+
// 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
|
|
1298
|
+
// \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
|
|
1299
|
+
// \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
|
|
1300
|
+
// \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
|
|
1301
|
+
const cliPatchStatus = CLI_PATH ? __cliPatchStatus.get(CLI_PATH) : null;
|
|
1302
|
+
const anchorFlags = cliPatchStatus
|
|
1303
|
+
? '(entitled=' + (cliPatchStatus.entitled ? 'on' : 'off')
|
|
1304
|
+
+ ',standalone=' + (cliPatchStatus.standalone ? 'on' : 'off')
|
|
1305
|
+
+ ',port=' + (cliPatchStatus.headerPort ? 'on' : 'off') + ')'
|
|
1306
|
+
: '';
|
|
1307
|
+
if (text !== null || catalogPatch !== null || cliPatchProbe !== null) {
|
|
829
1308
|
process.stderr.write('[zcode-launcher] \u8865\u4E01\u5C42\u5DF2\u5B89\u88C5: cli-config-inject=' + (text !== null ? 'on' : 'off')
|
|
830
1309
|
+ ', catalog-entitled=' + (catalogPatch !== null ? 'on' : 'off')
|
|
831
|
-
+ ', provider-merge=' + (PI_SYNCED_PATH ? 'armed' : 'off')
|
|
1310
|
+
+ ', provider-merge=' + (PI_SYNCED_PATH ? 'armed' : 'off')
|
|
1311
|
+
+ ', cli-source-bypass=' + (cliPatchProbe !== null ? 'armed' : 'off') + anchorFlags
|
|
1312
|
+
+ ', standalone-account=' + (cliPatchStatus && cliPatchStatus.standalone ? 'armed' : 'off')
|
|
1313
|
+
+ ', header-port=' + (cliPatchStatus && cliPatchStatus.headerPort ? 'armed' : 'off') + '\\n');
|
|
832
1314
|
// 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
1315
|
// \u771F\u5B9E bundle \u7684 config \u8BFB\u53D6\u6070\u7528 'utf-8' \u5F62\u6001\uFF0C\u4EC5\u5339\u914D 'utf8' \u4F1A\u9519\u56DE Buffer
|
|
834
1316
|
// \uFF08\u5F53\u4E0B\u6E38\u4E0D\u53EA JSON.parse \u800C\u505A\u5B57\u7B26\u4E32\u8FD0\u7B97\u65F6\u5373 TypeError\uFF09
|
|
@@ -842,6 +1324,11 @@ if (text !== null || catalogPatch !== null) {
|
|
|
842
1324
|
return Buffer.from(value);
|
|
843
1325
|
};
|
|
844
1326
|
fs.__origReadFileSync = fs.readFileSync;
|
|
1327
|
+
// standalone \u8D26\u53F7\u5143\u6570\u636E\u952E\u4F9B\u7ED9\uFF08ADR-0143\uFF09\uFF1A\u4EC5\u5F53 standalone \u4E0E header-port \u4E24\u951A
|
|
1328
|
+
// \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
|
|
1329
|
+
// \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
|
|
1330
|
+
// \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
|
|
1331
|
+
if (cliPatchStatus && cliPatchStatus.standalone && cliPatchStatus.headerPort) ensureAccountMetadata();
|
|
845
1332
|
fs.readFileSync = function (p, ...rest) {
|
|
846
1333
|
if (typeof p === 'string' && p === CONFIG_PATH) {
|
|
847
1334
|
const cur = injectedConfigText();
|
|
@@ -2840,6 +3327,17 @@ var ZcodeEngine = class {
|
|
|
2840
3327
|
listModels() {
|
|
2841
3328
|
return listZcodeModels(this.deps.sources);
|
|
2842
3329
|
}
|
|
3330
|
+
/**
|
|
3331
|
+
* [engine-ref-translation D1] 派发期模型 ref 翻译(EnginePort 可选成员实装):
|
|
3332
|
+
* pi 词汇 ref → zcode 原生 ref(zai-coding-cn/* → account:bigmodel-individual-*
|
|
3333
|
+
* 大小写归一,2026-10-16 用户裁决(证据驱动修正目标家族)),其余透传。编排层在 record stamp 前调用——
|
|
3334
|
+
* record/上报面呈现实际发给引擎的 ref;翻译失败抛错 = 显式失败(不静默回落)。
|
|
3335
|
+
* 幂等:翻译产物(account:/个人 id)再入恒等,引擎内 resolveZcodeModelRef 的
|
|
3336
|
+
* 同名翻译分支零冲突。
|
|
3337
|
+
*/
|
|
3338
|
+
translateModelRef(modelRef) {
|
|
3339
|
+
return translatePiModelRefToZcode(modelRef, this.deps.sources);
|
|
3340
|
+
}
|
|
2843
3341
|
/** 模型 reasoning 值域缓存(目录 modelRules 值域;per-modelRef 记忆化——
|
|
2844
3342
|
* 目录文件在引擎进程生命周期内视为静态,重复 run 不重读)。 */
|
|
2845
3343
|
reasoningMemo = /* @__PURE__ */ new Map();
|