mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-11-16 17:09:09 +00:00
Merged via /merge-batch (2026-10-18). The opt-in ZCode image-runtime helper gains the hash-guarded numeric-provider-code-v1 step: code-based business-error detection requires a numeric provider code, so GLM tool-call text in the finish record no longer kills valid long turns (the intermittent 502). Explicit failure markers still fail as before. Integration on top: merged release/v3.8.52 (after #16926 landed) — the three add/add conflicts resolved to this PR's version, which is exactly #16926's tip content plus this PR's commit; dropped the already-consumed #16926 changelog fragment and added one for this PR. Evidence: zcode executor/image-runtime/protocol/provider suites 27/27, changelog-integrity + docs-sync OK. Remaining CI reds are the inherited base-red #15306. Thanks @megamen32!
98 lines
4.6 KiB
JavaScript
98 lines
4.6 KiB
JavaScript
#!/usr/bin/env node
|
|
/** Explicit opt-in: prepare an isolated ZCode worker; never edit the installed source. */
|
|
import { createHash } from "node:crypto";
|
|
import { cpSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
|
import { dirname, join, resolve } from "node:path";
|
|
import { pathToFileURL } from "node:url";
|
|
|
|
export const SUPPORTED_ZCODE_SHA256 =
|
|
"fad4c35c4c36ec210d8a06d3fa0e77de23c8545e2eb6ff90aea1eb38d1e6275f";
|
|
const sha256 = (text) => createHash("sha256").update(text).digest("hex");
|
|
|
|
export function patchZcodeImageProtocol(source) {
|
|
const before =
|
|
'm.object({role:m.literal("user"),content:m.string()}).strict(),m.object({role:m.literal("assistant"),content:m.string(),toolCalls:';
|
|
const content =
|
|
'm.union([m.string(),m.array(m.discriminatedUnion("type",[m.object({type:m.literal("text"),text:m.string()}).strict(),m.object({type:m.literal("image"),dataUrl:m.string().startsWith("data:image/"),mediaType:m.enum(["image/png","image/jpeg","image/webp","image/gif"])}).strict()])).min(1)])';
|
|
if (source.split(before).length !== 2)
|
|
throw new Error("Unsupported ZCode protocol: expected exactly one user-message schema");
|
|
return source.replace(before, before.replace("content:m.string()", `content:${content}`));
|
|
}
|
|
|
|
/**
|
|
* The native finish/stream detectors treat ANY non-empty `code` string on a
|
|
* record as a provider business failure, so GLM's own generated tool-call text
|
|
* inside a finish record was misread as a provider refusal and killed valid
|
|
* streams (intermittent 502 "Provider returned a business error"). Real Z.ai
|
|
* failure codes are numeric; restrict code-based failure detection to numeric
|
|
* codes. Explicit failure markers (`success:false`, `event:"error"`,
|
|
* ProviderBusinessError instances) still fail exactly as before.
|
|
*/
|
|
export function patchZcodeNumericProviderCode(source) {
|
|
const guard = {
|
|
// detectProviderBusinessFinishError (lG): finish-record code path. This is
|
|
// the exact guard deployed to production on 2026-10-18; the CDe/SRs sites
|
|
// intentionally keep upstream behavior (no change beyond the applied fix).
|
|
before:
|
|
'a=o.providerCode??Pb(t.providerCode)??Pb(s?.code);if(!(a!==void 0||n==="provider_success_false"',
|
|
after:
|
|
'a=o.providerCode??Pb(t.providerCode)??Pb(s?.code);if(a!==void 0&&!/^-?[0-9]+$/.test(String(a).trim()))a=void 0;if(!(a!==void 0||n==="provider_success_false"',
|
|
};
|
|
if (source.split(guard.before).length !== 2)
|
|
throw new Error("Unsupported ZCode build: expected exactly one finish-record detection site");
|
|
const patched = source.replace(guard.before, guard.after);
|
|
return patched;
|
|
}
|
|
|
|
export const PATCH_STEPS = [
|
|
{ id: "user-text-and-image-v1", apply: patchZcodeImageProtocol },
|
|
{ id: "numeric-provider-code-v1", apply: patchZcodeNumericProviderCode },
|
|
];
|
|
|
|
export function applyZcodePatchSteps(source) {
|
|
let patched = source;
|
|
for (const step of PATCH_STEPS) patched = step.apply(patched);
|
|
return patched;
|
|
}
|
|
|
|
export function prepareZcodeImageRuntime(sourceFile, outputDirectory) {
|
|
const sourcePath = resolve(sourceFile);
|
|
const outputPath = resolve(outputDirectory);
|
|
if (outputPath === dirname(sourcePath) || outputPath.startsWith(dirname(sourcePath) + "/"))
|
|
throw new Error("Output must be isolated from the installed ZCode runtime");
|
|
const original = readFileSync(sourcePath, "utf8");
|
|
if (sha256(original) !== SUPPORTED_ZCODE_SHA256)
|
|
throw new Error("Unsupported ZCode build: review the protocol patch before updating");
|
|
const patched = applyZcodePatchSteps(original);
|
|
const target = join(outputPath, "zcode.cjs");
|
|
if (existsSync(outputPath)) {
|
|
if (!existsSync(target) || sha256(readFileSync(target)) !== sha256(patched))
|
|
throw new Error("Output already exists with different contents");
|
|
} else {
|
|
mkdirSync(dirname(outputPath), { recursive: true, mode: 0o700 });
|
|
cpSync(dirname(sourcePath), outputPath, { recursive: true, dereference: false });
|
|
writeFileSync(target, patched, { mode: 0o600 });
|
|
}
|
|
const receipt = {
|
|
sourceSha256: sha256(original),
|
|
patchedSha256: sha256(patched),
|
|
entry: target,
|
|
patch: PATCH_STEPS.map((step) => step.id).join("+"),
|
|
steps: PATCH_STEPS.map((step) => step.id),
|
|
};
|
|
writeFileSync(
|
|
join(outputPath, "omniroute-image-patch.json"),
|
|
JSON.stringify(receipt, null, 2) + "\n",
|
|
{ mode: 0o600 }
|
|
);
|
|
return receipt;
|
|
}
|
|
|
|
if (process.argv[1] && import.meta.url === pathToFileURL(resolve(process.argv[1])).href) {
|
|
if (process.argv.length !== 4)
|
|
throw new Error(
|
|
"Usage: node scripts/ops/zcode-image-runtime.mjs <installed-zcode.cjs> <isolated-output-directory>"
|
|
);
|
|
console.log(JSON.stringify(prepareZcodeImageRuntime(process.argv[2], process.argv[3])));
|
|
}
|