[AI-assisted] chore(branch): drop unrelated formatting churn

ScientificProgrammer · claude · ScientificProgrammer · commit 69cfeccd7b46 · 2026-05-24T08:05:09.000-05:00
ClawSweeper re-review flagged that nine files in the branch differ from
upstream/main only by auto-formatter line-wrap output (function signatures
and call sites expanded to multi-line; no behavior change). The churn
predates the current proof/cleanup work — likely an oxfmt --write pass
during initial branch construction — and is unrelated to the gateway
handshake-timeout fix this PR is meant to land.

Reset these files to upstream/main so the PR diff stays scoped to the
timeout fix and the drift-diagnostic change:

- extensions/codex/src/app-server/config.test.ts
- extensions/codex/src/app-server/transport-stdio.test.ts
- scripts/generate-npm-shrinkwrap.mjs
- src/agents/model-auth.ts
- src/agents/pi-embedded-runner/model.ts
- src/gateway/server-methods/update-managed-service-handoff.test.ts
- src/plugins/current-plugin-metadata-snapshot.ts
- src/plugins/provider-runtime.ts
- test/scripts/install-ps1.test.ts

Co-Authored-By: Claude Opus 4.7 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/scripts/generate-npm-shrinkwrap.mjs b/scripts/generate-npm-shrinkwrap.mjs
@@ -123,7 +123,9 @@ function mergeOverrides(packageOverrides, workspaceOverrides, pnpmLockOverrides)
   ]) {
     const current = merged[name];
     if (current !== undefined && JSON.stringify(current) !== JSON.stringify(spec)) {
-      throw new Error(`package.json overrides.${name} conflicts with pnpm lock policy for ${name}`);
+      throw new Error(
+        `package.json overrides.${name} conflicts with pnpm lock policy for ${name}`,
+      );
     }
     merged[name] = spec;
   }
diff --git a/src/agents/model-auth.ts b/src/agents/model-auth.ts
@@ -859,11 +859,7 @@ export async function resolveApiKeyForProvider(params: {
     return deferredAuthProfileResult;
   }
 
-  const syntheticLocalAuth = resolveSyntheticLocalProviderAuth({
-    cfg,
-    provider,
-    modelApi: params.modelApi,
-  });
+  const syntheticLocalAuth = resolveSyntheticLocalProviderAuth({ cfg, provider, modelApi: params.modelApi });
   if (syntheticLocalAuth) {
     return syntheticLocalAuth;
   }
diff --git a/src/agents/pi-embedded-runner/model.ts b/src/agents/pi-embedded-runner/model.ts
@@ -941,10 +941,7 @@ function resolveConfiguredFallbackModel(params: {
   }
   const fallbackTransport = resolveProviderTransport({
     provider,
-    api:
-      normalizeResolvedTransportApi(configuredModel?.api) ??
-      resolveConfiguredProviderDefaultApi(providerConfig) ??
-      "openai-responses",
+    api: normalizeResolvedTransportApi(configuredModel?.api) ?? resolveConfiguredProviderDefaultApi(providerConfig) ?? "openai-responses",
     baseUrl: configuredModel?.baseUrl ?? providerConfig?.baseUrl,
     cfg,
     workspaceDir,
diff --git a/src/gateway/server-methods/update-managed-service-handoff.test.ts b/src/gateway/server-methods/update-managed-service-handoff.test.ts
@@ -44,7 +44,8 @@ async function runHelperWithExistingSentinel(params: {
 }) {
   const { execFile } =
     await vi.importActual<typeof import("node:child_process")>("node:child_process");
-  const { startManagedServiceUpdateHandoff } = await import("./update-managed-service-handoff.js");
+  const { startManagedServiceUpdateHandoff } =
+    await import("./update-managed-service-handoff.js");
   const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-handoff-helper-test-"));
   tempDirs.add(tmpDir);
 

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,9 @@ function mergeOverrides(packageOverrides, workspaceOverrides, pnpmLockOverrides)`
`123`	`123`	`]) {`
`124`	`124`	`const current = merged[name];`
`125`	`125`	`if (current !== undefined && JSON.stringify(current) !== JSON.stringify(spec)) {`
`126`		- throw new Error(`package.json overrides.${name} conflicts with pnpm lock policy for ${name}`);
	`126`	`+ throw new Error(`
	`127`	+ `package.json overrides.${name} conflicts with pnpm lock policy for ${name}`,
	`128`	`+ );`
`127`	`129`	`}`
`128`	`130`	`merged[name] = spec;`
`129`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -859,11 +859,7 @@ export async function resolveApiKeyForProvider(params: {`
`859`	`859`	`return deferredAuthProfileResult;`
`860`	`860`	`}`
`861`	`861`
`862`		`- const syntheticLocalAuth = resolveSyntheticLocalProviderAuth({`
`863`		`- cfg,`
`864`		`- provider,`
`865`		`- modelApi: params.modelApi,`
`866`		`- });`
	`862`	`+ const syntheticLocalAuth = resolveSyntheticLocalProviderAuth({ cfg, provider, modelApi: params.modelApi });`
`867`	`863`	`if (syntheticLocalAuth) {`
`868`	`864`	`return syntheticLocalAuth;`
`869`	`865`	`}`