test(parallels): batch POSIX provider config · openclaw/o...

Recent Commits to openclaw:main

steipete · 2026-05-02 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,7 @@ import {`
`12`	`12`	`parseBoolEnv,`
`13`	`13`	`parseMode,`
`14`	`14`	`parseProvider,`
`15`		`-modelTransportConfigJson,`
`16`		`-providerIdFromModelId,`
`17`		`-providerTimeoutConfigJson,`
	`15`	`+modelProviderConfigBatchJson,`
`18`	`16`	`repoRoot,`
`19`	`17`	`resolveHostIp,`
`20`	`18`	`resolveHostPort,`
@@ -690,22 +688,14 @@ rm -rf /root/.openclaw/test-bad-plugin`);
`690`	`688`
`691`	`689`	`private verifyLocalTurn(): void {`
`692`	`690`	`this.guestExec(["openclaw", "models", "set", this.auth.modelId]);`
`693`		`-const providerId = providerIdFromModelId(this.auth.modelId) \|\| this.options.provider;`
`694`		`-const providerTimeoutConfig = providerTimeoutConfigJson(this.auth.modelId, "linux");`
`695`		`-if (providerTimeoutConfig) {`
`696`		`-this.guestBash(`
`697`		-`openclaw config set ${shellQuote(`models.providers.${providerId}`)} ${shellQuote(
`698`		`- providerTimeoutConfig,`
`699`		- )} --strict-json`,
`700`		`-);`
`701`		`-}`
`702`		`-const modelTransportConfig = modelTransportConfigJson(this.auth.modelId);`
`703`		`-if (modelTransportConfig) {`
`704`		`-this.guestBash(`
`705`		-`openclaw config set ${shellQuote(
`706`		- `agents.defaults.models.${this.auth.modelId}`,
`707`		- )} ${shellQuote(modelTransportConfig)} --strict-json`,
`708`		`-);`
	`691`	`+const modelProviderConfigBatch = modelProviderConfigBatchJson(this.auth.modelId, "linux");`
	`692`	`+if (modelProviderConfigBatch) {`
	`693`	+this.guestBash(`provider_config_batch="$(mktemp)"
	`694`	`+cat >"$provider_config_batch" <<'JSON'`
	`695`	`+${modelProviderConfigBatch}`
	`696`	`+JSON`
	`697`	`+openclaw config set --batch-file "$provider_config_batch" --strict-json`
	`698`	+rm -f "$provider_config_batch"`);
`709`	`699`	`}`
`710`	`700`	`this.guestExec([`
`711`	`701`	`"openclaw",`

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,7 @@ import {`
`11`	`11`	`packOpenClaw,`
`12`	`12`	`parseMode,`
`13`	`13`	`parseProvider,`
`14`		`-modelTransportConfigJson,`
`15`		`-providerIdFromModelId,`
`16`		`-providerTimeoutConfigJson,`
	`14`	`+modelProviderConfigBatchJson,`
`17`	`15`	`resolveHostIp,`
`18`	`16`	`resolveHostPort,`
`19`	`17`	`resolveLatestVersion,`
@@ -974,22 +972,16 @@ exit 1`);
`974`	`972`
`975`	`973`	`private verifyTurn(): void {`
`976`	`974`	`this.guestExec([guestNode, guestOpenClawEntry, "models", "set", this.auth.modelId]);`
`977`		`-const providerId = providerIdFromModelId(this.auth.modelId) \|\| this.options.provider;`
`978`		`-const providerTimeoutConfig = providerTimeoutConfigJson(this.auth.modelId, "macos");`
`979`		`-if (providerTimeoutConfig) {`
`980`		`-this.guestSh(`
`981`		-`${shellQuote(guestNode)} ${shellQuote(guestOpenClawEntry)} config set ${shellQuote(
`982`		- `models.providers.${providerId}`,
`983`		- )} ${shellQuote(providerTimeoutConfig)} --strict-json`,
`984`		`-);`
`985`		`-}`
`986`		`-const modelTransportConfig = modelTransportConfigJson(this.auth.modelId);`
`987`		`-if (modelTransportConfig) {`
`988`		`-this.guestSh(`
`989`		-`${shellQuote(guestNode)} ${shellQuote(guestOpenClawEntry)} config set ${shellQuote(
`990`		- `agents.defaults.models.${this.auth.modelId}`,
`991`		- )} ${shellQuote(modelTransportConfig)} --strict-json`,
`992`		`-);`
	`975`	`+const modelProviderConfigBatch = modelProviderConfigBatchJson(this.auth.modelId, "macos");`
	`976`	`+if (modelProviderConfigBatch) {`
	`977`	+this.guestSh(`provider_config_batch="$(mktemp)"
	`978`	`+cat >"$provider_config_batch" <<'JSON'`
	`979`	`+${modelProviderConfigBatch}`
	`980`	`+JSON`
	`981`	`+${shellQuote(guestNode)} ${shellQuote(`
	`982`	`+ guestOpenClawEntry,`
	`983`	`+ )} config set --batch-file "$provider_config_batch" --strict-json`
	`984`	+rm -f "$provider_config_batch"`);
`993`	`985`	`}`
`994`	`986`	`this.guestExec([`
`995`	`987`	`guestNode,`

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,7 @@ import {`
`5`	`5`	`windowsModelProviderTimeoutScript,`
`6`	`6`	`windowsOpenClawResolver,`
`7`	`7`	`} from "./powershell.ts";`
`8`		`-import {`
`9`		`-modelTransportConfigJson,`
`10`		`-providerIdFromModelId,`
`11`		`-providerTimeoutConfigJson,`
`12`		`-} from "./provider-auth.ts";`
	`8`	`+import { modelProviderConfigBatchJson } from "./provider-auth.ts";`
`13`	`9`	`import type { Platform, ProviderAuth } from "./types.ts";`
`14`	`10`
`15`	`11`	`export interface NpmUpdateScriptInput {`
`@@ -23,25 +19,20 @@ function posixModelProviderConfigCommands(`
`23`	`19`	`modelId: string,`
`24`	`20`	`platform: Platform,`
`25`	`21`	`): string {`
`26`		`-const commands: string[] = [];`
`27`		`-const providerId = providerIdFromModelId(modelId);`
`28`		`-const configJson = providerTimeoutConfigJson(modelId, platform);`
`29`		`-if (providerId && configJson) {`
`30`		`-commands.push(`
`31`		-`${command} config set ${shellQuote(`models.providers.${providerId}`)} ${shellQuote(
`32`		`- configJson,`
`33`		- )} --strict-json`,
`34`		`-);`
`35`		`-}`
`36`		`-const transportJson = modelTransportConfigJson(modelId);`
`37`		`-if (transportJson) {`
`38`		`-commands.push(`
`39`		-`${command} config set ${shellQuote(`agents.defaults.models.${modelId}`)} ${shellQuote(
`40`		`- transportJson,`
`41`		- )} --strict-json`,
`42`		`-);`
	`22`	`+const batchJson = modelProviderConfigBatchJson(modelId, platform);`
	`23`	`+if (!batchJson) {`
	`24`	`+return "";`
`43`	`25`	`}`
`44`		`-return commands.join("\n");`
	`26`	+return `provider_config_batch="$(mktemp)"
	`27`	`+cat >"$provider_config_batch" <<'JSON'`
	`28`	`+${batchJson}`
	`29`	`+JSON`
	`30`	`+set +e`
	`31`	`+${command} config set --batch-file "$provider_config_batch" --strict-json`
	`32`	`+provider_config_exit=$?`
	`33`	`+set -e`
	`34`	`+rm -f "$provider_config_batch"`
	`35`	+if [ "$provider_config_exit" -ne 0 ]; then exit "$provider_config_exit"; fi`;
`45`	`36`	`}`
`46`	`37`
`47`	`38`	`function posixAssertAgentOkScript(command: string, input: NpmUpdateScriptInput, sessionId: string) {`

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,26 @@ export function modelTransportConfigJson(modelId: string): string {`
`122`	`122`	`});`
`123`	`123`	`}`
`124`	`124`
	`125`	`+export function modelProviderConfigBatchJson(modelId: string, platform: Platform): string {`
	`126`	`+const commands: Array<{ path: string; value: unknown }> = [];`
	`127`	`+const providerId = providerIdFromModelId(modelId);`
	`128`	`+const providerConfig = providerTimeoutConfigJson(modelId, platform);`
	`129`	`+if (providerId && providerConfig) {`
	`130`	`+commands.push({`
	`131`	+path: `models.providers.${providerId}`,
	`132`	`+value: JSON.parse(providerConfig) as unknown,`
	`133`	`+});`
	`134`	`+}`
	`135`	`+const modelTransportConfig = modelTransportConfigJson(modelId);`
	`136`	`+if (modelTransportConfig) {`
	`137`	`+commands.push({`
	`138`	+path: `agents.defaults.models.${modelId}`,
	`139`	`+value: JSON.parse(modelTransportConfig) as unknown,`
	`140`	`+});`
	`141`	`+}`
	`142`	`+return commands.length === 0 ? "" : JSON.stringify(commands);`
	`143`	`+}`
	`144`	`+`
`125`	`145`	`export function parseProvider(value: string): Provider {`
`126`	`146`	`if (value === "openai" \|\| value === "anthropic" \|\| value === "minimax") {`
`127`	`147`	`return value;`

Original file line number	Diff line number	Diff line change
`@@ -321,10 +321,10 @@ console.log(JSON.stringify(result));`
`321`	`321`	`expect(script, scriptPath).toContain("minimal");`
`322`	`322`	`expect(script, scriptPath).toContain("finalAssistant(Raw\|Visible)Text");`
`323`	`323`	`}`
`324`		`-expect(readFileSync(TS_PATHS.macos, "utf8")).toContain("providerTimeoutConfigJson");`
`325`		`-expect(readFileSync(TS_PATHS.macos, "utf8")).toContain("modelTransportConfigJson");`
`326`		`-expect(readFileSync(TS_PATHS.linux, "utf8")).toContain("providerTimeoutConfigJson");`
`327`		`-expect(readFileSync(TS_PATHS.linux, "utf8")).toContain("modelTransportConfigJson");`
	`324`	`+expect(readFileSync(TS_PATHS.macos, "utf8")).toContain("modelProviderConfigBatchJson");`
	`325`	`+expect(readFileSync(TS_PATHS.macos, "utf8")).toContain("config set --batch-file");`
	`326`	`+expect(readFileSync(TS_PATHS.linux, "utf8")).toContain("modelProviderConfigBatchJson");`
	`327`	`+expect(readFileSync(TS_PATHS.linux, "utf8")).toContain("config set --batch-file");`
`328`	`328`	`expect(readFileSync(TS_PATHS.windows, "utf8")).toContain("windowsModelProviderTimeoutScript");`
`329`	`329`	`expect(readFileSync(TS_PATHS.powershell, "utf8")).toContain("config set --batch-file");`
`330`	`330`
`@@ -336,8 +336,8 @@ console.log(JSON.stringify(result));`
`336`	`336`	`expect(npmUpdateScripts).toContain("finalAssistant(Raw\|Visible)Text");`
`337`	`337`	`expect(npmUpdateScripts).toContain("posixAssertAgentOkScript");`
`338`	`338`	`expect(npmUpdateScripts).toContain("windowsModelProviderTimeoutScript");`
`339`		`-expect(npmUpdateScripts).toContain("modelTransportConfigJson");`
`340`		`-expect(npmUpdateScripts).toContain("agents.defaults.models.${modelId}");`
	`339`	`+expect(npmUpdateScripts).toContain("modelProviderConfigBatchJson");`
	`340`	`+expect(npmUpdateScripts).toContain("config set --batch-file");`
`341`	`341`	`});`
`342`	`342`
`343`	`343`	`it("clears phase timers and applies phase deadlines to guest commands", () => {`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main