vrr/spawn
2
0
Fork 0
mirror of https://github.com/OpenRouterTeam/spawn.git synced 2026-05-19 16:39:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

refactor: use getSpawnCloudConfigPath(), remove dead _cloudName param (#3010) (#3012)

Browse source 
Replace hand-constructed openrouter.json path with getSpawnCloudConfigPath("openrouter")
for single-source-of-truth path resolution. Remove unused _cloudName parameter since
the function delegates ALL cloud credentials unconditionally.

Agent: ux-engineer

Co-authored-by: B <6723574+louisgv@users.noreply.github.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
A 2026-03-26 05:26:09 -07:00 • committed by GitHub
parent fd36ff0e3d
commit 405dbc6ba6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/cli/package.json
View file

@ -1,6 +1,6 @@
{
"name": "@openrouter/spawn",
"version": "0.26.10",
"version": "0.26.11",
"type": "module",
"bin": {
"spawn": "cli.js"

8
packages/cli/src/__tests__/recursive-spawn.test.ts
View file

@ -269,7 +269,7 @@ describe("recursive spawn", () => {
};
// No credential files exist in test sandbox, so should warn and return
await delegateCloudCredentials(mockRunner, "hetzner");
await delegateCloudCredentials(mockRunner);
// Should not have run mkdir since there are no files to delegate
expect(commands.length).toBe(0);
@ -294,7 +294,7 @@ describe("recursive spawn", () => {
downloadFile: async () => {},
};
await delegateCloudCredentials(mockRunner, "hetzner");
await delegateCloudCredentials(mockRunner);
// Should have run mkdir + 2 file writes
expect(commands.length).toBe(3);
@ -326,7 +326,7 @@ describe("recursive spawn", () => {
};
// Should not throw
await delegateCloudCredentials(mockRunner, "hetzner");
await delegateCloudCredentials(mockRunner);
// At least 2 calls: mkdir + file write(s) that fail
expect(callCount).toBeGreaterThanOrEqual(2);
});
@ -351,7 +351,7 @@ describe("recursive spawn", () => {
};
// Should not throw, just warn
await delegateCloudCredentials(mockRunner, "hetzner");
await delegateCloudCredentials(mockRunner);
// mkdir was called and failed
expect(callCount).toBe(1);
});

9
packages/cli/src/shared/orchestrate.ts
View file

@ -14,7 +14,7 @@ import { offerGithubAuth, setupAutoUpdate, wrapSshCall } from "./agent-setup.js"
import { tryTarballInstall } from "./agent-tarball.js";
import { generateEnvConfig } from "./agents.js";
import { getOrPromptApiKey } from "./oauth.js";
import { getSpawnCloudConfigPath, getSpawnPreferencesPath, getUserHome } from "./paths.js";
import { getSpawnCloudConfigPath, getSpawnPreferencesPath } from "./paths.js";
import { asyncTryCatch, asyncTryCatchIf, isOperationalError, tryCatch } from "./result.js";
import { isWindows } from "./shell.js";
import { injectSpawnSkill } from "./spawn-skill.js";
@ -137,7 +137,7 @@ export async function installSpawnCli(runner: CloudRunner): Promise<void> {
}
/** Copy local cloud credentials to the remote VM for recursive spawning. */
export async function delegateCloudCredentials(runner: CloudRunner, _cloudName: string): Promise<void> {
export async function delegateCloudCredentials(runner: CloudRunner): Promise<void> {
logStep("Delegating cloud credentials to VM...");
const filesToDelegate: {
@ -147,7 +147,6 @@ export async function delegateCloudCredentials(runner: CloudRunner, _cloudName:
// Delegate ALL cloud credentials so the child VM can spawn on any cloud,
// not just the one the parent is running on.
const configDir = `${getUserHome()}/.config/spawn`;
const cloudNames = [
"hetzner",
"digitalocean",
@ -166,7 +165,7 @@ export async function delegateCloudCredentials(runner: CloudRunner, _cloudName:
}
// OpenRouter credentials (always needed for child spawns)
const orConfigPath = `${configDir}/openrouter.json`;
const orConfigPath = getSpawnCloudConfigPath("openrouter");
if (existsSync(orConfigPath)) {
filesToDelegate.push({
localPath: orConfigPath,
@ -577,7 +576,7 @@ async function postInstall(
(!enabledSteps || enabledSteps.has("spawn"))
) {
await installSpawnCli(cloud.runner);
await delegateCloudCredentials(cloud.runner, cloud.cloudName);
await delegateCloudCredentials(cloud.runner);
await injectSpawnSkill(cloud.runner, agentName);
}