refactor(run): extract 4 helpers from 243-line cmdRunHeadless#3345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
la14-1 wants to merge 1 commit into
base:main
Choose a base branch
from
Open

refactor(run): extract 4 helpers from 243-line cmdRunHeadless #3345

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
314 changes: 184 additions & 130 deletions packages/cli/src/commands/run.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -985,17 +985,19 @@ function runBundleHeadless(
});
}

export async function cmdRunHeadless(agent: string, cloud: string, opts: HeadlessOptions = {}): Promise<void> {
const { prompt, debug, outputFormat, spawnName } = opts;

// Funnel entry for headless runs. No picker to instrument — headless either
// validates and proceeds straight to runOrchestration, or it errors out.
// The orchestrate.ts funnel_* events cover the rest.
captureEvent("spawn_launched", {
mode: "headless",
});
interface HeadlessValidated {
manifest: Manifest;
resolvedAgent: string;
resolvedCloud: string;
}

// Phase 1: Validate inputs (exit code 3)
/** Phase 1: validate inputs, load manifest, resolve names, check credentials */
async function validateHeadlessInputs(
agent: string,
cloud: string,
prompt: string | undefined,
outputFormat: string | undefined,
): Promise<HeadlessValidated> {
const validationResult = tryCatch(() => {
validateIdentifier(agent, "Agent name");
validateIdentifier(cloud, "Cloud name");
Expand All@@ -1007,18 +1009,15 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
headlessError(agent, cloud, "VALIDATION_ERROR", getErrorMessage(validationResult.error), outputFormat, 3);
}

// Load manifest (silently - no spinner in headless mode)
const manifestResult = await asyncTryCatch(loadManifest);
if (!manifestResult.ok) {
headlessError(agent, cloud, "MANIFEST_ERROR", getErrorMessage(manifestResult.error), outputFormat, 3);
}
const manifest = manifestResult.data;

// Resolve agent/cloud names
const resolvedAgent = resolveAgentKey(manifest, agent) ?? agent;
const resolvedCloud = resolveCloudKey(manifest, cloud) ?? cloud;

// Validate entities exist
if (!manifest.agents[resolvedAgent]) {
headlessError(resolvedAgent, resolvedCloud, "UNKNOWN_AGENT", `Unknown agent: ${resolvedAgent}`, outputFormat, 3);
}
Expand All@@ -1038,7 +1037,6 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
);
}

// Check credentials upfront
const cloudAuth = manifest.clouds[resolvedCloud].auth;
if (cloudAuth.toLowerCase() !== "none") {
const authVars = parseAuthEnvVars(cloudAuth);
Expand All@@ -1055,164 +1053,220 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
}
}

// Phase 2+3: Load and execute
let exitCode: number;
return {
manifest,
resolvedAgent,
resolvedCloud,
};
}

if (isWindows()) {
// Windows: download JS bundle and run with bun (bash wrappers won't work)
const cliDir = process.env.SPAWN_CLI_DIR;
let localMainResolved = "";

if (cliDir) {
const hasBadChars = (s: string) => s.includes("..") || s.includes("/") || s.includes("\\");
if (!hasBadChars(resolvedCloud) && !hasBadChars(resolvedAgent)) {
const resolvedCliDir = resolveTrustedCliDir(cliDir);
const candidatePath = path.join(resolvedCliDir, "packages", "cli", "src", resolvedCloud, "main.ts");
const realResult = tryCatchIf(isFileError, () => fs.realpathSync(candidatePath));
if (realResult.ok) {
const prefix = resolvedCliDir.endsWith(path.sep) ? resolvedCliDir : resolvedCliDir + path.sep;
if (realResult.data.startsWith(prefix)) {
localMainResolved = realResult.data;
}
/** Windows path: resolve local bundle or download from GitHub, then run with bun */
async function fetchAndRunWindows(
resolvedAgent: string,
resolvedCloud: string,
opts: {
prompt?: string;
debug?: boolean;
outputFormat?: string;
spawnName?: string;
},
): Promise<number> {
const { prompt, debug, outputFormat, spawnName } = opts;
const cliDir = process.env.SPAWN_CLI_DIR;
let localMainResolved = "";

if (cliDir) {
const hasBadChars = (s: string) => s.includes("..") || s.includes("/") || s.includes("\\");
if (!hasBadChars(resolvedCloud) && !hasBadChars(resolvedAgent)) {
const resolvedCliDir = resolveTrustedCliDir(cliDir);
const candidatePath = path.join(resolvedCliDir, "packages", "cli", "src", resolvedCloud, "main.ts");
const realResult = tryCatchIf(isFileError, () => fs.realpathSync(candidatePath));
if (realResult.ok) {
const prefix = resolvedCliDir.endsWith(path.sep) ? resolvedCliDir : resolvedCliDir + path.sep;
if (realResult.data.startsWith(prefix)) {
localMainResolved = realResult.data;
}
}
}
}

if (debug) {
console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud} (Windows bundle mode)...`);
if (debug) {
console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud} (Windows bundle mode)...`);
}

if (localMainResolved) {
return runBundleHeadless(localMainResolved, resolvedAgent, prompt, debug, spawnName);
}

const bundleUrl = `https://github.com/${REPO}/releases/download/${resolvedCloud}-latest/${resolvedCloud}.js`;
const fetchResult = await asyncTryCatch(async () => {
const res = await fetch(bundleUrl, {
signal: AbortSignal.timeout(FETCH_TIMEOUT),
redirect: "follow",
});
if (!res.ok) {
headlessError(
resolvedAgent,
resolvedCloud,
"DOWNLOAD_ERROR",
`Bundle not found (HTTP ${res.status})`,
outputFormat,
2,
);
}
return res.text();
});
if (!fetchResult.ok) {
headlessError(
resolvedAgent,
resolvedCloud,
"DOWNLOAD_ERROR",
`Failed to download bundle: ${getErrorMessage(fetchResult.error)}`,
outputFormat,
2,
);
}

if (localMainResolved) {
exitCode = await runBundleHeadless(localMainResolved, resolvedAgent, prompt, debug, spawnName);
} else {
const bundleUrl = `https://github.com/${REPO}/releases/download/${resolvedCloud}-latest/${resolvedCloud}.js`;
const fetchResult = await asyncTryCatch(async () => {
const res = await fetch(bundleUrl, {
signal: AbortSignal.timeout(FETCH_TIMEOUT),
redirect: "follow",
});
if (!res.ok) {
headlessError(
resolvedAgent,
resolvedCloud,
"DOWNLOAD_ERROR",
`Bundle not found (HTTP ${res.status})`,
outputFormat,
2,
);
}
return res.text();
});
if (!fetchResult.ok) {
headlessError(
resolvedAgent,
resolvedCloud,
"DOWNLOAD_ERROR",
`Failed to download bundle: ${getErrorMessage(fetchResult.error)}`,
outputFormat,
2,
);
}
// Write bundle to temp file and run with bun
const tmpFile = path.join(fs.mkdtempSync(path.join(tmpdir(), "spawn-")), `${resolvedCloud}.js`);
fs.writeFileSync(tmpFile, fetchResult.data);
exitCode = await runBundleHeadless(tmpFile, resolvedAgent, prompt, debug, spawnName);
tryCatchIf(isFileError, () => fs.unlinkSync(tmpFile));
const tmpFile = path.join(fs.mkdtempSync(path.join(tmpdir(), "spawn-")), `${resolvedCloud}.js`);
fs.writeFileSync(tmpFile, fetchResult.data);
const exitCode = await runBundleHeadless(tmpFile, resolvedAgent, prompt, debug, spawnName);
tryCatchIf(isFileError, () => fs.unlinkSync(tmpFile));
return exitCode;
}

/** macOS/Linux path: resolve local script or download from CDN/GitHub, then run via shell */
async function fetchAndRunUnix(
resolvedAgent: string,
resolvedCloud: string,
opts: {
prompt?: string;
debug?: boolean;
outputFormat?: string;
spawnName?: string;
},
): Promise<number> {
const { prompt, debug, outputFormat, spawnName } = opts;
let scriptContent: string;
const cliDir = process.env.SPAWN_CLI_DIR;
const localScriptResolved = cliDir ? resolveLocalWrapperScript(cliDir, resolvedCloud, resolvedAgent) : "";

if (localScriptResolved) {
scriptContent = fs.readFileSync(localScriptResolved, "utf-8");
if (debug) {
console.error(`[headless] Using local script: ${localScriptResolved}`);
}
} else {
// macOS/Linux: download bash wrapper script
let scriptContent: string;
const cliDir = process.env.SPAWN_CLI_DIR;
const localScriptResolved = cliDir ? resolveLocalWrapperScript(cliDir, resolvedCloud, resolvedAgent) : "";

if (localScriptResolved) {
scriptContent = fs.readFileSync(localScriptResolved, "utf-8");
if (debug) {
console.error(`[headless] Using local script: ${localScriptResolved}`);
const url = `https://openrouter.ai/labs/spawn/${resolvedCloud}/${resolvedAgent}.sh`;
const ghUrl = `${RAW_BASE}/sh/${resolvedCloud}/${resolvedAgent}.sh`;

const fetchResult = await asyncTryCatch(async () => {
const res = await fetch(url, {
signal: AbortSignal.timeout(FETCH_TIMEOUT),
});
if (res.ok) {
return res.text();
}
} else {
const url = `https://openrouter.ai/labs/spawn/${resolvedCloud}/${resolvedAgent}.sh`;
const ghUrl = `${RAW_BASE}/sh/${resolvedCloud}/${resolvedAgent}.sh`;

const fetchResult = await asyncTryCatch(async () => {
const res = await fetch(url, {
signal: AbortSignal.timeout(FETCH_TIMEOUT),
});
if (res.ok) {
return res.text();
}
const ghRes = await fetch(ghUrl, {
signal: AbortSignal.timeout(FETCH_TIMEOUT),
});
if (!ghRes.ok) {
headlessError(
resolvedAgent,
resolvedCloud,
"DOWNLOAD_ERROR",
`Script not found (HTTP ${res.status} primary, ${ghRes.status} fallback)`,
outputFormat,
2,
);
}
return ghRes.text();
const ghRes = await fetch(ghUrl, {
signal: AbortSignal.timeout(FETCH_TIMEOUT),
});
if (!fetchResult.ok) {
if (!ghRes.ok) {
headlessError(
resolvedAgent,
resolvedCloud,
"DOWNLOAD_ERROR",
`Failed to download script: ${getErrorMessage(fetchResult.error)}`,
`Script not found (HTTP ${res.status} primary, ${ghRes.status} fallback)`,
outputFormat,
2,
);
}
scriptContent = fetchResult.data;
}

if (debug) {
console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud}...`);
return ghRes.text();
});
if (!fetchResult.ok) {
headlessError(
resolvedAgent,
resolvedCloud,
"DOWNLOAD_ERROR",
`Failed to download script: ${getErrorMessage(fetchResult.error)}`,
outputFormat,
2,
);
}

exitCode = await runScriptHeadless(scriptContent, prompt, debug, spawnName);
scriptContent = fetchResult.data;
}

if (exitCode !== 0) {
headlessError(
resolvedAgent,
resolvedCloud,
"EXECUTION_ERROR",
`Script exited with code ${exitCode}`,
outputFormat,
1,
);
if (debug) {
console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud}...`);
}

// Read the spawn record saved during orchestration to populate connection fields.
// Validate each field individually — silently omit any that fail validation to avoid
// surfacing attacker-controlled data from a tampered history file in headless output.
return runScriptHeadless(scriptContent, prompt, debug, spawnName);
}

/** Extract validated connection fields from the most recent matching spawn record */
function extractConnectionFields(
resolvedAgent: string,
resolvedCloud: string,
): Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> {
const history = loadHistory();
const record = history
.filter((r) => r.agent === resolvedAgent && r.cloud === resolvedCloud && r.connection && !r.connection.deleted)
.pop();

const connectionFields: Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> = {};
const fields: Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> = {};
if (record?.connection) {
const conn = record.connection;
if (conn.ip && tryCatch(() => validateConnectionIP(conn.ip)).ok) {
connectionFields.ip_address = conn.ip;
fields.ip_address = conn.ip;
}
if (conn.user && tryCatch(() => validateUsername(conn.user)).ok) {
connectionFields.ssh_user = conn.user;
fields.ssh_user = conn.user;
}
const serverId = conn.server_id;
if (serverId && tryCatch(() => validateServerIdentifier(serverId)).ok) {
connectionFields.server_id = serverId;
fields.server_id = serverId;
}
const serverName = conn.server_name;
if (serverName && tryCatch(() => validateServerIdentifier(serverName)).ok) {
connectionFields.server_name = serverName;
fields.server_name = serverName;
}
}
return fields;
}

export async function cmdRunHeadless(agent: string, cloud: string, opts: HeadlessOptions = {}): Promise<void> {
const { prompt, debug, outputFormat, spawnName } = opts;

captureEvent("spawn_launched", {
mode: "headless",
});

const { resolvedAgent, resolvedCloud } = await validateHeadlessInputs(agent, cloud, prompt, outputFormat);

const exitCode = isWindows()
? await fetchAndRunWindows(resolvedAgent, resolvedCloud, {
prompt,
debug,
outputFormat,
spawnName,
})
: await fetchAndRunUnix(resolvedAgent, resolvedCloud, {
prompt,
debug,
outputFormat,
spawnName,
});

if (exitCode !== 0) {
headlessError(
resolvedAgent,
resolvedCloud,
"EXECUTION_ERROR",
`Script exited with code ${exitCode}`,
outputFormat,
1,
);
}

const connectionFields = extractConnectionFields(resolvedAgent, resolvedCloud);

const result: SpawnResult = {
status: "success",
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
refactor(run): extract 4 helpers from 243-line cmdRunHeadless#3345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

la14-1
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


refactor(run): extract 4 helpers from 243-line cmdRunHeadless
#3345
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


314 changes: 184 additions & 130 deletions
packages/cli/src/commands/run.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -985,17 +985,19 @@ function runBundleHeadless(
 });
}

export async function cmdRunHeadless(agent: string, cloud: string, opts: HeadlessOptions = {}): Promise<void> {
 const { prompt, debug, outputFormat, spawnName } = opts;

 // Funnel entry for headless runs. No picker to instrument — headless either
 // validates and proceeds straight to runOrchestration, or it errors out.
 // The orchestrate.ts funnel_* events cover the rest.
 captureEvent("spawn_launched", {
 mode: "headless",
 });
interface HeadlessValidated {
 manifest: Manifest;
 resolvedAgent: string;
 resolvedCloud: string;
}

 // Phase 1: Validate inputs (exit code 3)
/** Phase 1: validate inputs, load manifest, resolve names, check credentials */
async function validateHeadlessInputs(
 agent: string,
 cloud: string,
 prompt: string | undefined,
 outputFormat: string | undefined,
): Promise<HeadlessValidated> {
 const validationResult = tryCatch(() => {
 validateIdentifier(agent, "Agent name");
 validateIdentifier(cloud, "Cloud name");
Expand All@@ -1007,18 +1009,15 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 headlessError(agent, cloud, "VALIDATION_ERROR", getErrorMessage(validationResult.error), outputFormat, 3);
 }

 // Load manifest (silently - no spinner in headless mode)
 const manifestResult = await asyncTryCatch(loadManifest);
 if (!manifestResult.ok) {
 headlessError(agent, cloud, "MANIFEST_ERROR", getErrorMessage(manifestResult.error), outputFormat, 3);
 }
 const manifest = manifestResult.data;

 // Resolve agent/cloud names
 const resolvedAgent = resolveAgentKey(manifest, agent) ?? agent;
 const resolvedCloud = resolveCloudKey(manifest, cloud) ?? cloud;

 // Validate entities exist
 if (!manifest.agents[resolvedAgent]) {
 headlessError(resolvedAgent, resolvedCloud, "UNKNOWN_AGENT", `Unknown agent: ${resolvedAgent}`, outputFormat, 3);
 }
Expand All@@ -1038,7 +1037,6 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 );
 }

 // Check credentials upfront
 const cloudAuth = manifest.clouds[resolvedCloud].auth;
 if (cloudAuth.toLowerCase() !== "none") {
 const authVars = parseAuthEnvVars(cloudAuth);
Expand All@@ -1055,164 +1053,220 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 }
 }

 // Phase 2+3: Load and execute
 let exitCode: number;
 return {
 manifest,
 resolvedAgent,
 resolvedCloud,
 };
}

 if (isWindows()) {
 // Windows: download JS bundle and run with bun (bash wrappers won't work)
 const cliDir = process.env.SPAWN_CLI_DIR;
 let localMainResolved = "";

 if (cliDir) {
 const hasBadChars = (s: string) => s.includes("..") || s.includes("/") || s.includes("\\");
 if (!hasBadChars(resolvedCloud) && !hasBadChars(resolvedAgent)) {
 const resolvedCliDir = resolveTrustedCliDir(cliDir);
 const candidatePath = path.join(resolvedCliDir, "packages", "cli", "src", resolvedCloud, "main.ts");
 const realResult = tryCatchIf(isFileError, () => fs.realpathSync(candidatePath));
 if (realResult.ok) {
 const prefix = resolvedCliDir.endsWith(path.sep) ? resolvedCliDir : resolvedCliDir + path.sep;
 if (realResult.data.startsWith(prefix)) {
 localMainResolved = realResult.data;
 }
/** Windows path: resolve local bundle or download from GitHub, then run with bun */
async function fetchAndRunWindows(
 resolvedAgent: string,
 resolvedCloud: string,
 opts: {
 prompt?: string;
 debug?: boolean;
 outputFormat?: string;
 spawnName?: string;
 },
): Promise<number> {
 const { prompt, debug, outputFormat, spawnName } = opts;
 const cliDir = process.env.SPAWN_CLI_DIR;
 let localMainResolved = "";

 if (cliDir) {
 const hasBadChars = (s: string) => s.includes("..") || s.includes("/") || s.includes("\\");
 if (!hasBadChars(resolvedCloud) && !hasBadChars(resolvedAgent)) {
 const resolvedCliDir = resolveTrustedCliDir(cliDir);
 const candidatePath = path.join(resolvedCliDir, "packages", "cli", "src", resolvedCloud, "main.ts");
 const realResult = tryCatchIf(isFileError, () => fs.realpathSync(candidatePath));
 if (realResult.ok) {
 const prefix = resolvedCliDir.endsWith(path.sep) ? resolvedCliDir : resolvedCliDir + path.sep;
 if (realResult.data.startsWith(prefix)) {
 localMainResolved = realResult.data;
 }
 }
 }
 }

 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud} (Windows bundle mode)...`);
 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud} (Windows bundle mode)...`);
 }

 if (localMainResolved) {
 return runBundleHeadless(localMainResolved, resolvedAgent, prompt, debug, spawnName);
 }

 const bundleUrl = `https://github.com/${REPO}/releases/download/${resolvedCloud}-latest/${resolvedCloud}.js`;
 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(bundleUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 redirect: "follow",
 });
 if (!res.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Bundle not found (HTTP ${res.status})`,
 outputFormat,
 2,
 );
 }
 return res.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download bundle: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }

 if (localMainResolved) {
 exitCode = await runBundleHeadless(localMainResolved, resolvedAgent, prompt, debug, spawnName);
 } else {
 const bundleUrl = `https://github.com/${REPO}/releases/download/${resolvedCloud}-latest/${resolvedCloud}.js`;
 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(bundleUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 redirect: "follow",
 });
 if (!res.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Bundle not found (HTTP ${res.status})`,
 outputFormat,
 2,
 );
 }
 return res.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download bundle: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }
 // Write bundle to temp file and run with bun
 const tmpFile = path.join(fs.mkdtempSync(path.join(tmpdir(), "spawn-")), `${resolvedCloud}.js`);
 fs.writeFileSync(tmpFile, fetchResult.data);
 exitCode = await runBundleHeadless(tmpFile, resolvedAgent, prompt, debug, spawnName);
 tryCatchIf(isFileError, () => fs.unlinkSync(tmpFile));
 const tmpFile = path.join(fs.mkdtempSync(path.join(tmpdir(), "spawn-")), `${resolvedCloud}.js`);
 fs.writeFileSync(tmpFile, fetchResult.data);
 const exitCode = await runBundleHeadless(tmpFile, resolvedAgent, prompt, debug, spawnName);
 tryCatchIf(isFileError, () => fs.unlinkSync(tmpFile));
 return exitCode;
}

/** macOS/Linux path: resolve local script or download from CDN/GitHub, then run via shell */
async function fetchAndRunUnix(
 resolvedAgent: string,
 resolvedCloud: string,
 opts: {
 prompt?: string;
 debug?: boolean;
 outputFormat?: string;
 spawnName?: string;
 },
): Promise<number> {
 const { prompt, debug, outputFormat, spawnName } = opts;
 let scriptContent: string;
 const cliDir = process.env.SPAWN_CLI_DIR;
 const localScriptResolved = cliDir ? resolveLocalWrapperScript(cliDir, resolvedCloud, resolvedAgent) : "";

 if (localScriptResolved) {
 scriptContent = fs.readFileSync(localScriptResolved, "utf-8");
 if (debug) {
 console.error(`[headless] Using local script: ${localScriptResolved}`);
 }
 } else {
// macOS/Linux: download bash wrapper script
let scriptContent: string;
 const cliDir = process.env.SPAWN_CLI_DIR;
 const localScriptResolved = cliDir ? resolveLocalWrapperScript(cliDir, resolvedCloud, resolvedAgent) : "";

if (localScriptResolved) {
scriptContent = fs.readFileSync(localScriptResolved, "utf-8");
 if (debug) {
console.error(`[headless] Using local script: ${localScriptResolved}`);
const url = `https://openrouter.ai/labs/spawn/${resolvedCloud}/${resolvedAgent}.sh`;
const ghUrl = `${RAW_BASE}/sh/${resolvedCloud}/${resolvedAgent}.sh`;

 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(url, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
});
 if (res.ok) {
return res.text();
 }
 } else {
 const url = `https://openrouter.ai/labs/spawn/${resolvedCloud}/${resolvedAgent}.sh`;
 const ghUrl = `${RAW_BASE}/sh/${resolvedCloud}/${resolvedAgent}.sh`;

 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(url, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (res.ok) {
 return res.text();
 }
 const ghRes = await fetch(ghUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (!ghRes.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Script not found (HTTP ${res.status} primary, ${ghRes.status} fallback)`,
 outputFormat,
 2,
 );
 }
 return ghRes.text();
 const ghRes = await fetch(ghUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (!fetchResult.ok) {
 if (!ghRes.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download script: ${getErrorMessage(fetchResult.error)}`,
 `Script not found (HTTP ${res.status} primary, ${ghRes.status} fallback)`,
 outputFormat,
 2,
 );
 }
 scriptContent = fetchResult.data;
 }

 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud}...`);
 return ghRes.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download script: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }

 exitCode = await runScriptHeadless(scriptContent, prompt, debug, spawnName);
 scriptContent = fetchResult.data;
 }

 if (exitCode !== 0) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "EXECUTION_ERROR",
 `Script exited with code ${exitCode}`,
 outputFormat,
 1,
 );
 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud}...`);
 }

 // Read the spawn record saved during orchestration to populate connection fields.
 // Validate each field individually — silently omit any that fail validation to avoid
 // surfacing attacker-controlled data from a tampered history file in headless output.
 return runScriptHeadless(scriptContent, prompt, debug, spawnName);
}

/** Extract validated connection fields from the most recent matching spawn record */
function extractConnectionFields(
 resolvedAgent: string,
 resolvedCloud: string,
): Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> {
 const history = loadHistory();
 const record = history
 .filter((r) => r.agent === resolvedAgent && r.cloud === resolvedCloud && r.connection && !r.connection.deleted)
 .pop();

 const connectionFields: Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> = {};
 const fields: Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> = {};
 if (record?.connection) {
 const conn = record.connection;
 if (conn.ip && tryCatch(() => validateConnectionIP(conn.ip)).ok) {
connectionFields.ip_address = conn.ip;
fields.ip_address = conn.ip;
 }
 if (conn.user && tryCatch(() => validateUsername(conn.user)).ok) {
connectionFields.ssh_user = conn.user;
fields.ssh_user = conn.user;
 }
 const serverId = conn.server_id;
 if (serverId && tryCatch(() => validateServerIdentifier(serverId)).ok) {
connectionFields.server_id = serverId;
fields.server_id = serverId;
 }
 const serverName = conn.server_name;
 if (serverName && tryCatch(() => validateServerIdentifier(serverName)).ok) {
connectionFields.server_name = serverName;
fields.server_name = serverName;
 }
 }
 return fields;
}

export async function cmdRunHeadless(agent: string, cloud: string, opts: HeadlessOptions = {}): Promise<void> {
 const { prompt, debug, outputFormat, spawnName } = opts;

 captureEvent("spawn_launched", {
 mode: "headless",
 });

 const { resolvedAgent, resolvedCloud } = await validateHeadlessInputs(agent, cloud, prompt, outputFormat);

 const exitCode = isWindows()
 ? await fetchAndRunWindows(resolvedAgent, resolvedCloud, {
 prompt,
 debug,
 outputFormat,
 spawnName,
 })
 : await fetchAndRunUnix(resolvedAgent, resolvedCloud, {
 prompt,
 debug,
 outputFormat,
 spawnName,
 });

 if (exitCode !== 0) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "EXECUTION_ERROR",
 `Script exited with code ${exitCode}`,
 outputFormat,
 1,
 );
 }

 const connectionFields = extractConnectionFields(resolvedAgent, resolvedCloud);

 const result: SpawnResult = {
 status: "success",
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(run): extract 4 helpers from 243-line cmdRunHeadless#3345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

la14-1
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


refactor(run): extract 4 helpers from 243-line cmdRunHeadless
#3345
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


314 changes: 184 additions & 130 deletions
packages/cli/src/commands/run.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -985,17 +985,19 @@ function runBundleHeadless(
 });
}

export async function cmdRunHeadless(agent: string, cloud: string, opts: HeadlessOptions = {}): Promise<void> {
 const { prompt, debug, outputFormat, spawnName } = opts;

 // Funnel entry for headless runs. No picker to instrument — headless either
 // validates and proceeds straight to runOrchestration, or it errors out.
 // The orchestrate.ts funnel_* events cover the rest.
 captureEvent("spawn_launched", {
 mode: "headless",
 });
interface HeadlessValidated {
 manifest: Manifest;
 resolvedAgent: string;
 resolvedCloud: string;
}

 // Phase 1: Validate inputs (exit code 3)
/** Phase 1: validate inputs, load manifest, resolve names, check credentials */
async function validateHeadlessInputs(
 agent: string,
 cloud: string,
 prompt: string | undefined,
 outputFormat: string | undefined,
): Promise<HeadlessValidated> {
 const validationResult = tryCatch(() => {
 validateIdentifier(agent, "Agent name");
 validateIdentifier(cloud, "Cloud name");
Expand All@@ -1007,18 +1009,15 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 headlessError(agent, cloud, "VALIDATION_ERROR", getErrorMessage(validationResult.error), outputFormat, 3);
 }

 // Load manifest (silently - no spinner in headless mode)
 const manifestResult = await asyncTryCatch(loadManifest);
 if (!manifestResult.ok) {
 headlessError(agent, cloud, "MANIFEST_ERROR", getErrorMessage(manifestResult.error), outputFormat, 3);
 }
 const manifest = manifestResult.data;

 // Resolve agent/cloud names
 const resolvedAgent = resolveAgentKey(manifest, agent) ?? agent;
 const resolvedCloud = resolveCloudKey(manifest, cloud) ?? cloud;

 // Validate entities exist
 if (!manifest.agents[resolvedAgent]) {
 headlessError(resolvedAgent, resolvedCloud, "UNKNOWN_AGENT", `Unknown agent: ${resolvedAgent}`, outputFormat, 3);
 }
Expand All@@ -1038,7 +1037,6 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 );
 }

 // Check credentials upfront
 const cloudAuth = manifest.clouds[resolvedCloud].auth;
 if (cloudAuth.toLowerCase() !== "none") {
 const authVars = parseAuthEnvVars(cloudAuth);
Expand All@@ -1055,164 +1053,220 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 }
 }

 // Phase 2+3: Load and execute
 let exitCode: number;
 return {
 manifest,
 resolvedAgent,
 resolvedCloud,
 };
}

 if (isWindows()) {
 // Windows: download JS bundle and run with bun (bash wrappers won't work)
 const cliDir = process.env.SPAWN_CLI_DIR;
 let localMainResolved = "";

 if (cliDir) {
 const hasBadChars = (s: string) => s.includes("..") || s.includes("/") || s.includes("\\");
 if (!hasBadChars(resolvedCloud) && !hasBadChars(resolvedAgent)) {
 const resolvedCliDir = resolveTrustedCliDir(cliDir);
 const candidatePath = path.join(resolvedCliDir, "packages", "cli", "src", resolvedCloud, "main.ts");
 const realResult = tryCatchIf(isFileError, () => fs.realpathSync(candidatePath));
 if (realResult.ok) {
 const prefix = resolvedCliDir.endsWith(path.sep) ? resolvedCliDir : resolvedCliDir + path.sep;
 if (realResult.data.startsWith(prefix)) {
 localMainResolved = realResult.data;
 }
/** Windows path: resolve local bundle or download from GitHub, then run with bun */
async function fetchAndRunWindows(
 resolvedAgent: string,
 resolvedCloud: string,
 opts: {
 prompt?: string;
 debug?: boolean;
 outputFormat?: string;
 spawnName?: string;
 },
): Promise<number> {
 const { prompt, debug, outputFormat, spawnName } = opts;
 const cliDir = process.env.SPAWN_CLI_DIR;
 let localMainResolved = "";

 if (cliDir) {
 const hasBadChars = (s: string) => s.includes("..") || s.includes("/") || s.includes("\\");
 if (!hasBadChars(resolvedCloud) && !hasBadChars(resolvedAgent)) {
 const resolvedCliDir = resolveTrustedCliDir(cliDir);
 const candidatePath = path.join(resolvedCliDir, "packages", "cli", "src", resolvedCloud, "main.ts");
 const realResult = tryCatchIf(isFileError, () => fs.realpathSync(candidatePath));
 if (realResult.ok) {
 const prefix = resolvedCliDir.endsWith(path.sep) ? resolvedCliDir : resolvedCliDir + path.sep;
 if (realResult.data.startsWith(prefix)) {
 localMainResolved = realResult.data;
 }
 }
 }
 }

 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud} (Windows bundle mode)...`);
 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud} (Windows bundle mode)...`);
 }

 if (localMainResolved) {
 return runBundleHeadless(localMainResolved, resolvedAgent, prompt, debug, spawnName);
 }

 const bundleUrl = `https://github.com/${REPO}/releases/download/${resolvedCloud}-latest/${resolvedCloud}.js`;
 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(bundleUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 redirect: "follow",
 });
 if (!res.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Bundle not found (HTTP ${res.status})`,
 outputFormat,
 2,
 );
 }
 return res.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download bundle: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }

 if (localMainResolved) {
 exitCode = await runBundleHeadless(localMainResolved, resolvedAgent, prompt, debug, spawnName);
 } else {
 const bundleUrl = `https://github.com/${REPO}/releases/download/${resolvedCloud}-latest/${resolvedCloud}.js`;
 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(bundleUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 redirect: "follow",
 });
 if (!res.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Bundle not found (HTTP ${res.status})`,
 outputFormat,
 2,
 );
 }
 return res.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download bundle: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }
 // Write bundle to temp file and run with bun
 const tmpFile = path.join(fs.mkdtempSync(path.join(tmpdir(), "spawn-")), `${resolvedCloud}.js`);
 fs.writeFileSync(tmpFile, fetchResult.data);
 exitCode = await runBundleHeadless(tmpFile, resolvedAgent, prompt, debug, spawnName);
 tryCatchIf(isFileError, () => fs.unlinkSync(tmpFile));
 const tmpFile = path.join(fs.mkdtempSync(path.join(tmpdir(), "spawn-")), `${resolvedCloud}.js`);
 fs.writeFileSync(tmpFile, fetchResult.data);
 const exitCode = await runBundleHeadless(tmpFile, resolvedAgent, prompt, debug, spawnName);
 tryCatchIf(isFileError, () => fs.unlinkSync(tmpFile));
 return exitCode;
}

/** macOS/Linux path: resolve local script or download from CDN/GitHub, then run via shell */
async function fetchAndRunUnix(
 resolvedAgent: string,
 resolvedCloud: string,
 opts: {
 prompt?: string;
 debug?: boolean;
 outputFormat?: string;
 spawnName?: string;
 },
): Promise<number> {
 const { prompt, debug, outputFormat, spawnName } = opts;
 let scriptContent: string;
 const cliDir = process.env.SPAWN_CLI_DIR;
 const localScriptResolved = cliDir ? resolveLocalWrapperScript(cliDir, resolvedCloud, resolvedAgent) : "";

 if (localScriptResolved) {
 scriptContent = fs.readFileSync(localScriptResolved, "utf-8");
 if (debug) {
 console.error(`[headless] Using local script: ${localScriptResolved}`);
 }
 } else {
// macOS/Linux: download bash wrapper script
let scriptContent: string;
 const cliDir = process.env.SPAWN_CLI_DIR;
 const localScriptResolved = cliDir ? resolveLocalWrapperScript(cliDir, resolvedCloud, resolvedAgent) : "";

if (localScriptResolved) {
scriptContent = fs.readFileSync(localScriptResolved, "utf-8");
 if (debug) {
console.error(`[headless] Using local script: ${localScriptResolved}`);
const url = `https://openrouter.ai/labs/spawn/${resolvedCloud}/${resolvedAgent}.sh`;
const ghUrl = `${RAW_BASE}/sh/${resolvedCloud}/${resolvedAgent}.sh`;

 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(url, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
});
 if (res.ok) {
return res.text();
 }
 } else {
 const url = `https://openrouter.ai/labs/spawn/${resolvedCloud}/${resolvedAgent}.sh`;
 const ghUrl = `${RAW_BASE}/sh/${resolvedCloud}/${resolvedAgent}.sh`;

 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(url, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (res.ok) {
 return res.text();
 }
 const ghRes = await fetch(ghUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (!ghRes.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Script not found (HTTP ${res.status} primary, ${ghRes.status} fallback)`,
 outputFormat,
 2,
 );
 }
 return ghRes.text();
 const ghRes = await fetch(ghUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (!fetchResult.ok) {
 if (!ghRes.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download script: ${getErrorMessage(fetchResult.error)}`,
 `Script not found (HTTP ${res.status} primary, ${ghRes.status} fallback)`,
 outputFormat,
 2,
 );
 }
 scriptContent = fetchResult.data;
 }

 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud}...`);
 return ghRes.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download script: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }

 exitCode = await runScriptHeadless(scriptContent, prompt, debug, spawnName);
 scriptContent = fetchResult.data;
 }

 if (exitCode !== 0) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "EXECUTION_ERROR",
 `Script exited with code ${exitCode}`,
 outputFormat,
 1,
 );
 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud}...`);
 }

 // Read the spawn record saved during orchestration to populate connection fields.
 // Validate each field individually — silently omit any that fail validation to avoid
 // surfacing attacker-controlled data from a tampered history file in headless output.
 return runScriptHeadless(scriptContent, prompt, debug, spawnName);
}

/** Extract validated connection fields from the most recent matching spawn record */
function extractConnectionFields(
 resolvedAgent: string,
 resolvedCloud: string,
): Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> {
 const history = loadHistory();
 const record = history
 .filter((r) => r.agent === resolvedAgent && r.cloud === resolvedCloud && r.connection && !r.connection.deleted)
 .pop();

 const connectionFields: Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> = {};
 const fields: Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> = {};
 if (record?.connection) {
 const conn = record.connection;
 if (conn.ip && tryCatch(() => validateConnectionIP(conn.ip)).ok) {
connectionFields.ip_address = conn.ip;
fields.ip_address = conn.ip;
 }
 if (conn.user && tryCatch(() => validateUsername(conn.user)).ok) {
connectionFields.ssh_user = conn.user;
fields.ssh_user = conn.user;
 }
 const serverId = conn.server_id;
 if (serverId && tryCatch(() => validateServerIdentifier(serverId)).ok) {
connectionFields.server_id = serverId;
fields.server_id = serverId;
 }
 const serverName = conn.server_name;
 if (serverName && tryCatch(() => validateServerIdentifier(serverName)).ok) {
connectionFields.server_name = serverName;
fields.server_name = serverName;
 }
 }
 return fields;
}

export async function cmdRunHeadless(agent: string, cloud: string, opts: HeadlessOptions = {}): Promise<void> {
 const { prompt, debug, outputFormat, spawnName } = opts;

 captureEvent("spawn_launched", {
 mode: "headless",
 });

 const { resolvedAgent, resolvedCloud } = await validateHeadlessInputs(agent, cloud, prompt, outputFormat);

 const exitCode = isWindows()
 ? await fetchAndRunWindows(resolvedAgent, resolvedCloud, {
 prompt,
 debug,
 outputFormat,
 spawnName,
 })
 : await fetchAndRunUnix(resolvedAgent, resolvedCloud, {
 prompt,
 debug,
 outputFormat,
 spawnName,
 });

 if (exitCode !== 0) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "EXECUTION_ERROR",
 `Script exited with code ${exitCode}`,
 outputFormat,
 1,
 );
 }

 const connectionFields = extractConnectionFields(resolvedAgent, resolvedCloud);

 const result: SpawnResult = {
 status: "success",
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(run): extract 4 helpers from 243-line cmdRunHeadless#3345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

la14-1
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


refactor(run): extract 4 helpers from 243-line cmdRunHeadless
#3345
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


314 changes: 184 additions & 130 deletions
packages/cli/src/commands/run.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -985,17 +985,19 @@ function runBundleHeadless(
 });
}

export async function cmdRunHeadless(agent: string, cloud: string, opts: HeadlessOptions = {}): Promise<void> {
 const { prompt, debug, outputFormat, spawnName } = opts;

 // Funnel entry for headless runs. No picker to instrument — headless either
 // validates and proceeds straight to runOrchestration, or it errors out.
 // The orchestrate.ts funnel_* events cover the rest.
 captureEvent("spawn_launched", {
 mode: "headless",
 });
interface HeadlessValidated {
 manifest: Manifest;
 resolvedAgent: string;
 resolvedCloud: string;
}

 // Phase 1: Validate inputs (exit code 3)
/** Phase 1: validate inputs, load manifest, resolve names, check credentials */
async function validateHeadlessInputs(
 agent: string,
 cloud: string,
 prompt: string | undefined,
 outputFormat: string | undefined,
): Promise<HeadlessValidated> {
 const validationResult = tryCatch(() => {
 validateIdentifier(agent, "Agent name");
 validateIdentifier(cloud, "Cloud name");
Expand All@@ -1007,18 +1009,15 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 headlessError(agent, cloud, "VALIDATION_ERROR", getErrorMessage(validationResult.error), outputFormat, 3);
 }

 // Load manifest (silently - no spinner in headless mode)
 const manifestResult = await asyncTryCatch(loadManifest);
 if (!manifestResult.ok) {
 headlessError(agent, cloud, "MANIFEST_ERROR", getErrorMessage(manifestResult.error), outputFormat, 3);
 }
 const manifest = manifestResult.data;

 // Resolve agent/cloud names
 const resolvedAgent = resolveAgentKey(manifest, agent) ?? agent;
 const resolvedCloud = resolveCloudKey(manifest, cloud) ?? cloud;

 // Validate entities exist
 if (!manifest.agents[resolvedAgent]) {
 headlessError(resolvedAgent, resolvedCloud, "UNKNOWN_AGENT", `Unknown agent: ${resolvedAgent}`, outputFormat, 3);
 }
Expand All@@ -1038,7 +1037,6 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 );
 }

 // Check credentials upfront
 const cloudAuth = manifest.clouds[resolvedCloud].auth;
 if (cloudAuth.toLowerCase() !== "none") {
 const authVars = parseAuthEnvVars(cloudAuth);
Expand All@@ -1055,164 +1053,220 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 }
 }

 // Phase 2+3: Load and execute
 let exitCode: number;
 return {
 manifest,
 resolvedAgent,
 resolvedCloud,
 };
}

 if (isWindows()) {
 // Windows: download JS bundle and run with bun (bash wrappers won't work)
 const cliDir = process.env.SPAWN_CLI_DIR;
 let localMainResolved = "";

 if (cliDir) {
 const hasBadChars = (s: string) => s.includes("..") || s.includes("/") || s.includes("\\");
 if (!hasBadChars(resolvedCloud) && !hasBadChars(resolvedAgent)) {
 const resolvedCliDir = resolveTrustedCliDir(cliDir);
 const candidatePath = path.join(resolvedCliDir, "packages", "cli", "src", resolvedCloud, "main.ts");
 const realResult = tryCatchIf(isFileError, () => fs.realpathSync(candidatePath));
 if (realResult.ok) {
 const prefix = resolvedCliDir.endsWith(path.sep) ? resolvedCliDir : resolvedCliDir + path.sep;
 if (realResult.data.startsWith(prefix)) {
 localMainResolved = realResult.data;
 }
/** Windows path: resolve local bundle or download from GitHub, then run with bun */
async function fetchAndRunWindows(
 resolvedAgent: string,
 resolvedCloud: string,
 opts: {
 prompt?: string;
 debug?: boolean;
 outputFormat?: string;
 spawnName?: string;
 },
): Promise<number> {
 const { prompt, debug, outputFormat, spawnName } = opts;
 const cliDir = process.env.SPAWN_CLI_DIR;
 let localMainResolved = "";

 if (cliDir) {
 const hasBadChars = (s: string) => s.includes("..") || s.includes("/") || s.includes("\\");
 if (!hasBadChars(resolvedCloud) && !hasBadChars(resolvedAgent)) {
 const resolvedCliDir = resolveTrustedCliDir(cliDir);
 const candidatePath = path.join(resolvedCliDir, "packages", "cli", "src", resolvedCloud, "main.ts");
 const realResult = tryCatchIf(isFileError, () => fs.realpathSync(candidatePath));
 if (realResult.ok) {
 const prefix = resolvedCliDir.endsWith(path.sep) ? resolvedCliDir : resolvedCliDir + path.sep;
 if (realResult.data.startsWith(prefix)) {
 localMainResolved = realResult.data;
 }
 }
 }
 }

 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud} (Windows bundle mode)...`);
 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud} (Windows bundle mode)...`);
 }

 if (localMainResolved) {
 return runBundleHeadless(localMainResolved, resolvedAgent, prompt, debug, spawnName);
 }

 const bundleUrl = `https://github.com/${REPO}/releases/download/${resolvedCloud}-latest/${resolvedCloud}.js`;
 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(bundleUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 redirect: "follow",
 });
 if (!res.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Bundle not found (HTTP ${res.status})`,
 outputFormat,
 2,
 );
 }
 return res.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download bundle: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }

 if (localMainResolved) {
 exitCode = await runBundleHeadless(localMainResolved, resolvedAgent, prompt, debug, spawnName);
 } else {
 const bundleUrl = `https://github.com/${REPO}/releases/download/${resolvedCloud}-latest/${resolvedCloud}.js`;
 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(bundleUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 redirect: "follow",
 });
 if (!res.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Bundle not found (HTTP ${res.status})`,
 outputFormat,
 2,
 );
 }
 return res.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download bundle: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }
 // Write bundle to temp file and run with bun
 const tmpFile = path.join(fs.mkdtempSync(path.join(tmpdir(), "spawn-")), `${resolvedCloud}.js`);
 fs.writeFileSync(tmpFile, fetchResult.data);
 exitCode = await runBundleHeadless(tmpFile, resolvedAgent, prompt, debug, spawnName);
 tryCatchIf(isFileError, () => fs.unlinkSync(tmpFile));
 const tmpFile = path.join(fs.mkdtempSync(path.join(tmpdir(), "spawn-")), `${resolvedCloud}.js`);
 fs.writeFileSync(tmpFile, fetchResult.data);
 const exitCode = await runBundleHeadless(tmpFile, resolvedAgent, prompt, debug, spawnName);
 tryCatchIf(isFileError, () => fs.unlinkSync(tmpFile));
 return exitCode;
}

/** macOS/Linux path: resolve local script or download from CDN/GitHub, then run via shell */
async function fetchAndRunUnix(
 resolvedAgent: string,
 resolvedCloud: string,
 opts: {
 prompt?: string;
 debug?: boolean;
 outputFormat?: string;
 spawnName?: string;
 },
): Promise<number> {
 const { prompt, debug, outputFormat, spawnName } = opts;
 let scriptContent: string;
 const cliDir = process.env.SPAWN_CLI_DIR;
 const localScriptResolved = cliDir ? resolveLocalWrapperScript(cliDir, resolvedCloud, resolvedAgent) : "";

 if (localScriptResolved) {
 scriptContent = fs.readFileSync(localScriptResolved, "utf-8");
 if (debug) {
 console.error(`[headless] Using local script: ${localScriptResolved}`);
 }
 } else {
// macOS/Linux: download bash wrapper script
let scriptContent: string;
 const cliDir = process.env.SPAWN_CLI_DIR;
 const localScriptResolved = cliDir ? resolveLocalWrapperScript(cliDir, resolvedCloud, resolvedAgent) : "";

if (localScriptResolved) {
scriptContent = fs.readFileSync(localScriptResolved, "utf-8");
 if (debug) {
console.error(`[headless] Using local script: ${localScriptResolved}`);
const url = `https://openrouter.ai/labs/spawn/${resolvedCloud}/${resolvedAgent}.sh`;
const ghUrl = `${RAW_BASE}/sh/${resolvedCloud}/${resolvedAgent}.sh`;

 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(url, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
});
 if (res.ok) {
return res.text();
 }
 } else {
 const url = `https://openrouter.ai/labs/spawn/${resolvedCloud}/${resolvedAgent}.sh`;
 const ghUrl = `${RAW_BASE}/sh/${resolvedCloud}/${resolvedAgent}.sh`;

 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(url, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (res.ok) {
 return res.text();
 }
 const ghRes = await fetch(ghUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (!ghRes.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Script not found (HTTP ${res.status} primary, ${ghRes.status} fallback)`,
 outputFormat,
 2,
 );
 }
 return ghRes.text();
 const ghRes = await fetch(ghUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (!fetchResult.ok) {
 if (!ghRes.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download script: ${getErrorMessage(fetchResult.error)}`,
 `Script not found (HTTP ${res.status} primary, ${ghRes.status} fallback)`,
 outputFormat,
 2,
 );
 }
 scriptContent = fetchResult.data;
 }

 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud}...`);
 return ghRes.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download script: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }

 exitCode = await runScriptHeadless(scriptContent, prompt, debug, spawnName);
 scriptContent = fetchResult.data;
 }

 if (exitCode !== 0) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "EXECUTION_ERROR",
 `Script exited with code ${exitCode}`,
 outputFormat,
 1,
 );
 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud}...`);
 }

 // Read the spawn record saved during orchestration to populate connection fields.
 // Validate each field individually — silently omit any that fail validation to avoid
 // surfacing attacker-controlled data from a tampered history file in headless output.
 return runScriptHeadless(scriptContent, prompt, debug, spawnName);
}

/** Extract validated connection fields from the most recent matching spawn record */
function extractConnectionFields(
 resolvedAgent: string,
 resolvedCloud: string,
): Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> {
 const history = loadHistory();
 const record = history
 .filter((r) => r.agent === resolvedAgent && r.cloud === resolvedCloud && r.connection && !r.connection.deleted)
 .pop();

 const connectionFields: Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> = {};
 const fields: Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> = {};
 if (record?.connection) {
 const conn = record.connection;
 if (conn.ip && tryCatch(() => validateConnectionIP(conn.ip)).ok) {
connectionFields.ip_address = conn.ip;
fields.ip_address = conn.ip;
 }
 if (conn.user && tryCatch(() => validateUsername(conn.user)).ok) {
connectionFields.ssh_user = conn.user;
fields.ssh_user = conn.user;
 }
 const serverId = conn.server_id;
 if (serverId && tryCatch(() => validateServerIdentifier(serverId)).ok) {
connectionFields.server_id = serverId;
fields.server_id = serverId;
 }
 const serverName = conn.server_name;
 if (serverName && tryCatch(() => validateServerIdentifier(serverName)).ok) {
connectionFields.server_name = serverName;
fields.server_name = serverName;
 }
 }
 return fields;
}

export async function cmdRunHeadless(agent: string, cloud: string, opts: HeadlessOptions = {}): Promise<void> {
 const { prompt, debug, outputFormat, spawnName } = opts;

 captureEvent("spawn_launched", {
 mode: "headless",
 });

 const { resolvedAgent, resolvedCloud } = await validateHeadlessInputs(agent, cloud, prompt, outputFormat);

 const exitCode = isWindows()
 ? await fetchAndRunWindows(resolvedAgent, resolvedCloud, {
 prompt,
 debug,
 outputFormat,
 spawnName,
 })
 : await fetchAndRunUnix(resolvedAgent, resolvedCloud, {
 prompt,
 debug,
 outputFormat,
 spawnName,
 });

 if (exitCode !== 0) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "EXECUTION_ERROR",
 `Script exited with code ${exitCode}`,
 outputFormat,
 1,
 );
 }

 const connectionFields = extractConnectionFields(resolvedAgent, resolvedCloud);

 const result: SpawnResult = {
 status: "success",
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
refactor(run): extract 4 helpers from 243-line cmdRunHeadless#3345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

la14-1
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


refactor(run): extract 4 helpers from 243-line cmdRunHeadless
#3345
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


314 changes: 184 additions & 130 deletions
packages/cli/src/commands/run.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -985,17 +985,19 @@ function runBundleHeadless(
 });
}

export async function cmdRunHeadless(agent: string, cloud: string, opts: HeadlessOptions = {}): Promise<void> {
 const { prompt, debug, outputFormat, spawnName } = opts;

 // Funnel entry for headless runs. No picker to instrument — headless either
 // validates and proceeds straight to runOrchestration, or it errors out.
 // The orchestrate.ts funnel_* events cover the rest.
 captureEvent("spawn_launched", {
 mode: "headless",
 });
interface HeadlessValidated {
 manifest: Manifest;
 resolvedAgent: string;
 resolvedCloud: string;
}

 // Phase 1: Validate inputs (exit code 3)
/** Phase 1: validate inputs, load manifest, resolve names, check credentials */
async function validateHeadlessInputs(
 agent: string,
 cloud: string,
 prompt: string | undefined,
 outputFormat: string | undefined,
): Promise<HeadlessValidated> {
 const validationResult = tryCatch(() => {
 validateIdentifier(agent, "Agent name");
 validateIdentifier(cloud, "Cloud name");
Expand All@@ -1007,18 +1009,15 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 headlessError(agent, cloud, "VALIDATION_ERROR", getErrorMessage(validationResult.error), outputFormat, 3);
 }

 // Load manifest (silently - no spinner in headless mode)
 const manifestResult = await asyncTryCatch(loadManifest);
 if (!manifestResult.ok) {
 headlessError(agent, cloud, "MANIFEST_ERROR", getErrorMessage(manifestResult.error), outputFormat, 3);
 }
 const manifest = manifestResult.data;

 // Resolve agent/cloud names
 const resolvedAgent = resolveAgentKey(manifest, agent) ?? agent;
 const resolvedCloud = resolveCloudKey(manifest, cloud) ?? cloud;

 // Validate entities exist
 if (!manifest.agents[resolvedAgent]) {
 headlessError(resolvedAgent, resolvedCloud, "UNKNOWN_AGENT", `Unknown agent: ${resolvedAgent}`, outputFormat, 3);
 }
Expand All@@ -1038,7 +1037,6 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 );
 }

 // Check credentials upfront
 const cloudAuth = manifest.clouds[resolvedCloud].auth;
 if (cloudAuth.toLowerCase() !== "none") {
 const authVars = parseAuthEnvVars(cloudAuth);
Expand All@@ -1055,164 +1053,220 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 }
 }

 // Phase 2+3: Load and execute
 let exitCode: number;
 return {
 manifest,
 resolvedAgent,
 resolvedCloud,
 };
}

 if (isWindows()) {
 // Windows: download JS bundle and run with bun (bash wrappers won't work)
 const cliDir = process.env.SPAWN_CLI_DIR;
 let localMainResolved = "";

 if (cliDir) {
 const hasBadChars = (s: string) => s.includes("..") || s.includes("/") || s.includes("\\");
 if (!hasBadChars(resolvedCloud) && !hasBadChars(resolvedAgent)) {
 const resolvedCliDir = resolveTrustedCliDir(cliDir);
 const candidatePath = path.join(resolvedCliDir, "packages", "cli", "src", resolvedCloud, "main.ts");
 const realResult = tryCatchIf(isFileError, () => fs.realpathSync(candidatePath));
 if (realResult.ok) {
 const prefix = resolvedCliDir.endsWith(path.sep) ? resolvedCliDir : resolvedCliDir + path.sep;
 if (realResult.data.startsWith(prefix)) {
 localMainResolved = realResult.data;
 }
/** Windows path: resolve local bundle or download from GitHub, then run with bun */
async function fetchAndRunWindows(
 resolvedAgent: string,
 resolvedCloud: string,
 opts: {
 prompt?: string;
 debug?: boolean;
 outputFormat?: string;
 spawnName?: string;
 },
): Promise<number> {
 const { prompt, debug, outputFormat, spawnName } = opts;
 const cliDir = process.env.SPAWN_CLI_DIR;
 let localMainResolved = "";

 if (cliDir) {
 const hasBadChars = (s: string) => s.includes("..") || s.includes("/") || s.includes("\\");
 if (!hasBadChars(resolvedCloud) && !hasBadChars(resolvedAgent)) {
 const resolvedCliDir = resolveTrustedCliDir(cliDir);
 const candidatePath = path.join(resolvedCliDir, "packages", "cli", "src", resolvedCloud, "main.ts");
 const realResult = tryCatchIf(isFileError, () => fs.realpathSync(candidatePath));
 if (realResult.ok) {
 const prefix = resolvedCliDir.endsWith(path.sep) ? resolvedCliDir : resolvedCliDir + path.sep;
 if (realResult.data.startsWith(prefix)) {
 localMainResolved = realResult.data;
 }
 }
 }
 }

 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud} (Windows bundle mode)...`);
 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud} (Windows bundle mode)...`);
 }

 if (localMainResolved) {
 return runBundleHeadless(localMainResolved, resolvedAgent, prompt, debug, spawnName);
 }

 const bundleUrl = `https://github.com/${REPO}/releases/download/${resolvedCloud}-latest/${resolvedCloud}.js`;
 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(bundleUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 redirect: "follow",
 });
 if (!res.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Bundle not found (HTTP ${res.status})`,
 outputFormat,
 2,
 );
 }
 return res.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download bundle: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }

 if (localMainResolved) {
 exitCode = await runBundleHeadless(localMainResolved, resolvedAgent, prompt, debug, spawnName);
 } else {
 const bundleUrl = `https://github.com/${REPO}/releases/download/${resolvedCloud}-latest/${resolvedCloud}.js`;
 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(bundleUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 redirect: "follow",
 });
 if (!res.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Bundle not found (HTTP ${res.status})`,
 outputFormat,
 2,
 );
 }
 return res.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download bundle: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }
 // Write bundle to temp file and run with bun
 const tmpFile = path.join(fs.mkdtempSync(path.join(tmpdir(), "spawn-")), `${resolvedCloud}.js`);
 fs.writeFileSync(tmpFile, fetchResult.data);
 exitCode = await runBundleHeadless(tmpFile, resolvedAgent, prompt, debug, spawnName);
 tryCatchIf(isFileError, () => fs.unlinkSync(tmpFile));
 const tmpFile = path.join(fs.mkdtempSync(path.join(tmpdir(), "spawn-")), `${resolvedCloud}.js`);
 fs.writeFileSync(tmpFile, fetchResult.data);
 const exitCode = await runBundleHeadless(tmpFile, resolvedAgent, prompt, debug, spawnName);
 tryCatchIf(isFileError, () => fs.unlinkSync(tmpFile));
 return exitCode;
}

/** macOS/Linux path: resolve local script or download from CDN/GitHub, then run via shell */
async function fetchAndRunUnix(
 resolvedAgent: string,
 resolvedCloud: string,
 opts: {
 prompt?: string;
 debug?: boolean;
 outputFormat?: string;
 spawnName?: string;
 },
): Promise<number> {
 const { prompt, debug, outputFormat, spawnName } = opts;
 let scriptContent: string;
 const cliDir = process.env.SPAWN_CLI_DIR;
 const localScriptResolved = cliDir ? resolveLocalWrapperScript(cliDir, resolvedCloud, resolvedAgent) : "";

 if (localScriptResolved) {
 scriptContent = fs.readFileSync(localScriptResolved, "utf-8");
 if (debug) {
 console.error(`[headless] Using local script: ${localScriptResolved}`);
 }
 } else {
// macOS/Linux: download bash wrapper script
let scriptContent: string;
 const cliDir = process.env.SPAWN_CLI_DIR;
 const localScriptResolved = cliDir ? resolveLocalWrapperScript(cliDir, resolvedCloud, resolvedAgent) : "";

if (localScriptResolved) {
scriptContent = fs.readFileSync(localScriptResolved, "utf-8");
 if (debug) {
console.error(`[headless] Using local script: ${localScriptResolved}`);
const url = `https://openrouter.ai/labs/spawn/${resolvedCloud}/${resolvedAgent}.sh`;
const ghUrl = `${RAW_BASE}/sh/${resolvedCloud}/${resolvedAgent}.sh`;

 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(url, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
});
 if (res.ok) {
return res.text();
 }
 } else {
 const url = `https://openrouter.ai/labs/spawn/${resolvedCloud}/${resolvedAgent}.sh`;
 const ghUrl = `${RAW_BASE}/sh/${resolvedCloud}/${resolvedAgent}.sh`;

 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(url, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (res.ok) {
 return res.text();
 }
 const ghRes = await fetch(ghUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (!ghRes.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Script not found (HTTP ${res.status} primary, ${ghRes.status} fallback)`,
 outputFormat,
 2,
 );
 }
 return ghRes.text();
 const ghRes = await fetch(ghUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (!fetchResult.ok) {
 if (!ghRes.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download script: ${getErrorMessage(fetchResult.error)}`,
 `Script not found (HTTP ${res.status} primary, ${ghRes.status} fallback)`,
 outputFormat,
 2,
 );
 }
 scriptContent = fetchResult.data;
 }

 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud}...`);
 return ghRes.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download script: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }

 exitCode = await runScriptHeadless(scriptContent, prompt, debug, spawnName);
 scriptContent = fetchResult.data;
 }

 if (exitCode !== 0) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "EXECUTION_ERROR",
 `Script exited with code ${exitCode}`,
 outputFormat,
 1,
 );
 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud}...`);
 }

 // Read the spawn record saved during orchestration to populate connection fields.
 // Validate each field individually — silently omit any that fail validation to avoid
 // surfacing attacker-controlled data from a tampered history file in headless output.
 return runScriptHeadless(scriptContent, prompt, debug, spawnName);
}

/** Extract validated connection fields from the most recent matching spawn record */
function extractConnectionFields(
 resolvedAgent: string,
 resolvedCloud: string,
): Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> {
 const history = loadHistory();
 const record = history
 .filter((r) => r.agent === resolvedAgent && r.cloud === resolvedCloud && r.connection && !r.connection.deleted)
 .pop();

 const connectionFields: Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> = {};
 const fields: Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> = {};
 if (record?.connection) {
 const conn = record.connection;
 if (conn.ip && tryCatch(() => validateConnectionIP(conn.ip)).ok) {
connectionFields.ip_address = conn.ip;
fields.ip_address = conn.ip;
 }
 if (conn.user && tryCatch(() => validateUsername(conn.user)).ok) {
connectionFields.ssh_user = conn.user;
fields.ssh_user = conn.user;
 }
 const serverId = conn.server_id;
 if (serverId && tryCatch(() => validateServerIdentifier(serverId)).ok) {
connectionFields.server_id = serverId;
fields.server_id = serverId;
 }
 const serverName = conn.server_name;
 if (serverName && tryCatch(() => validateServerIdentifier(serverName)).ok) {
connectionFields.server_name = serverName;
fields.server_name = serverName;
 }
 }
 return fields;
}

export async function cmdRunHeadless(agent: string, cloud: string, opts: HeadlessOptions = {}): Promise<void> {
 const { prompt, debug, outputFormat, spawnName } = opts;

 captureEvent("spawn_launched", {
 mode: "headless",
 });

 const { resolvedAgent, resolvedCloud } = await validateHeadlessInputs(agent, cloud, prompt, outputFormat);

 const exitCode = isWindows()
 ? await fetchAndRunWindows(resolvedAgent, resolvedCloud, {
 prompt,
 debug,
 outputFormat,
 spawnName,
 })
 : await fetchAndRunUnix(resolvedAgent, resolvedCloud, {
 prompt,
 debug,
 outputFormat,
 spawnName,
 });

 if (exitCode !== 0) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "EXECUTION_ERROR",
 `Script exited with code ${exitCode}`,
 outputFormat,
 1,
 );
 }

 const connectionFields = extractConnectionFields(resolvedAgent, resolvedCloud);

 const result: SpawnResult = {
 status: "success",
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(run): extract 4 helpers from 243-line cmdRunHeadless#3345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

la14-1
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


refactor(run): extract 4 helpers from 243-line cmdRunHeadless
#3345
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


314 changes: 184 additions & 130 deletions
packages/cli/src/commands/run.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -985,17 +985,19 @@ function runBundleHeadless(
 });
}

export async function cmdRunHeadless(agent: string, cloud: string, opts: HeadlessOptions = {}): Promise<void> {
 const { prompt, debug, outputFormat, spawnName } = opts;

 // Funnel entry for headless runs. No picker to instrument — headless either
 // validates and proceeds straight to runOrchestration, or it errors out.
 // The orchestrate.ts funnel_* events cover the rest.
 captureEvent("spawn_launched", {
 mode: "headless",
 });
interface HeadlessValidated {
 manifest: Manifest;
 resolvedAgent: string;
 resolvedCloud: string;
}

 // Phase 1: Validate inputs (exit code 3)
/** Phase 1: validate inputs, load manifest, resolve names, check credentials */
async function validateHeadlessInputs(
 agent: string,
 cloud: string,
 prompt: string | undefined,
 outputFormat: string | undefined,
): Promise<HeadlessValidated> {
 const validationResult = tryCatch(() => {
 validateIdentifier(agent, "Agent name");
 validateIdentifier(cloud, "Cloud name");
Expand All@@ -1007,18 +1009,15 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 headlessError(agent, cloud, "VALIDATION_ERROR", getErrorMessage(validationResult.error), outputFormat, 3);
 }

 // Load manifest (silently - no spinner in headless mode)
 const manifestResult = await asyncTryCatch(loadManifest);
 if (!manifestResult.ok) {
 headlessError(agent, cloud, "MANIFEST_ERROR", getErrorMessage(manifestResult.error), outputFormat, 3);
 }
 const manifest = manifestResult.data;

 // Resolve agent/cloud names
 const resolvedAgent = resolveAgentKey(manifest, agent) ?? agent;
 const resolvedCloud = resolveCloudKey(manifest, cloud) ?? cloud;

 // Validate entities exist
 if (!manifest.agents[resolvedAgent]) {
 headlessError(resolvedAgent, resolvedCloud, "UNKNOWN_AGENT", `Unknown agent: ${resolvedAgent}`, outputFormat, 3);
 }
Expand All@@ -1038,7 +1037,6 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 );
 }

 // Check credentials upfront
 const cloudAuth = manifest.clouds[resolvedCloud].auth;
 if (cloudAuth.toLowerCase() !== "none") {
 const authVars = parseAuthEnvVars(cloudAuth);
Expand All@@ -1055,164 +1053,220 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 }
 }

 // Phase 2+3: Load and execute
 let exitCode: number;
 return {
 manifest,
 resolvedAgent,
 resolvedCloud,
 };
}

 if (isWindows()) {
 // Windows: download JS bundle and run with bun (bash wrappers won't work)
 const cliDir = process.env.SPAWN_CLI_DIR;
 let localMainResolved = "";

 if (cliDir) {
 const hasBadChars = (s: string) => s.includes("..") || s.includes("/") || s.includes("\\");
 if (!hasBadChars(resolvedCloud) && !hasBadChars(resolvedAgent)) {
 const resolvedCliDir = resolveTrustedCliDir(cliDir);
 const candidatePath = path.join(resolvedCliDir, "packages", "cli", "src", resolvedCloud, "main.ts");
 const realResult = tryCatchIf(isFileError, () => fs.realpathSync(candidatePath));
 if (realResult.ok) {
 const prefix = resolvedCliDir.endsWith(path.sep) ? resolvedCliDir : resolvedCliDir + path.sep;
 if (realResult.data.startsWith(prefix)) {
 localMainResolved = realResult.data;
 }
/** Windows path: resolve local bundle or download from GitHub, then run with bun */
async function fetchAndRunWindows(
 resolvedAgent: string,
 resolvedCloud: string,
 opts: {
 prompt?: string;
 debug?: boolean;
 outputFormat?: string;
 spawnName?: string;
 },
): Promise<number> {
 const { prompt, debug, outputFormat, spawnName } = opts;
 const cliDir = process.env.SPAWN_CLI_DIR;
 let localMainResolved = "";

 if (cliDir) {
 const hasBadChars = (s: string) => s.includes("..") || s.includes("/") || s.includes("\\");
 if (!hasBadChars(resolvedCloud) && !hasBadChars(resolvedAgent)) {
 const resolvedCliDir = resolveTrustedCliDir(cliDir);
 const candidatePath = path.join(resolvedCliDir, "packages", "cli", "src", resolvedCloud, "main.ts");
 const realResult = tryCatchIf(isFileError, () => fs.realpathSync(candidatePath));
 if (realResult.ok) {
 const prefix = resolvedCliDir.endsWith(path.sep) ? resolvedCliDir : resolvedCliDir + path.sep;
 if (realResult.data.startsWith(prefix)) {
 localMainResolved = realResult.data;
 }
 }
 }
 }

 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud} (Windows bundle mode)...`);
 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud} (Windows bundle mode)...`);
 }

 if (localMainResolved) {
 return runBundleHeadless(localMainResolved, resolvedAgent, prompt, debug, spawnName);
 }

 const bundleUrl = `https://github.com/${REPO}/releases/download/${resolvedCloud}-latest/${resolvedCloud}.js`;
 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(bundleUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 redirect: "follow",
 });
 if (!res.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Bundle not found (HTTP ${res.status})`,
 outputFormat,
 2,
 );
 }
 return res.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download bundle: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }

 if (localMainResolved) {
 exitCode = await runBundleHeadless(localMainResolved, resolvedAgent, prompt, debug, spawnName);
 } else {
 const bundleUrl = `https://github.com/${REPO}/releases/download/${resolvedCloud}-latest/${resolvedCloud}.js`;
 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(bundleUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 redirect: "follow",
 });
 if (!res.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Bundle not found (HTTP ${res.status})`,
 outputFormat,
 2,
 );
 }
 return res.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download bundle: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }
 // Write bundle to temp file and run with bun
 const tmpFile = path.join(fs.mkdtempSync(path.join(tmpdir(), "spawn-")), `${resolvedCloud}.js`);
 fs.writeFileSync(tmpFile, fetchResult.data);
 exitCode = await runBundleHeadless(tmpFile, resolvedAgent, prompt, debug, spawnName);
 tryCatchIf(isFileError, () => fs.unlinkSync(tmpFile));
 const tmpFile = path.join(fs.mkdtempSync(path.join(tmpdir(), "spawn-")), `${resolvedCloud}.js`);
 fs.writeFileSync(tmpFile, fetchResult.data);
 const exitCode = await runBundleHeadless(tmpFile, resolvedAgent, prompt, debug, spawnName);
 tryCatchIf(isFileError, () => fs.unlinkSync(tmpFile));
 return exitCode;
}

/** macOS/Linux path: resolve local script or download from CDN/GitHub, then run via shell */
async function fetchAndRunUnix(
 resolvedAgent: string,
 resolvedCloud: string,
 opts: {
 prompt?: string;
 debug?: boolean;
 outputFormat?: string;
 spawnName?: string;
 },
): Promise<number> {
 const { prompt, debug, outputFormat, spawnName } = opts;
 let scriptContent: string;
 const cliDir = process.env.SPAWN_CLI_DIR;
 const localScriptResolved = cliDir ? resolveLocalWrapperScript(cliDir, resolvedCloud, resolvedAgent) : "";

 if (localScriptResolved) {
 scriptContent = fs.readFileSync(localScriptResolved, "utf-8");
 if (debug) {
 console.error(`[headless] Using local script: ${localScriptResolved}`);
 }
 } else {
// macOS/Linux: download bash wrapper script
let scriptContent: string;
 const cliDir = process.env.SPAWN_CLI_DIR;
 const localScriptResolved = cliDir ? resolveLocalWrapperScript(cliDir, resolvedCloud, resolvedAgent) : "";

if (localScriptResolved) {
scriptContent = fs.readFileSync(localScriptResolved, "utf-8");
 if (debug) {
console.error(`[headless] Using local script: ${localScriptResolved}`);
const url = `https://openrouter.ai/labs/spawn/${resolvedCloud}/${resolvedAgent}.sh`;
const ghUrl = `${RAW_BASE}/sh/${resolvedCloud}/${resolvedAgent}.sh`;

 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(url, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
});
 if (res.ok) {
return res.text();
 }
 } else {
 const url = `https://openrouter.ai/labs/spawn/${resolvedCloud}/${resolvedAgent}.sh`;
 const ghUrl = `${RAW_BASE}/sh/${resolvedCloud}/${resolvedAgent}.sh`;

 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(url, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (res.ok) {
 return res.text();
 }
 const ghRes = await fetch(ghUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (!ghRes.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Script not found (HTTP ${res.status} primary, ${ghRes.status} fallback)`,
 outputFormat,
 2,
 );
 }
 return ghRes.text();
 const ghRes = await fetch(ghUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (!fetchResult.ok) {
 if (!ghRes.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download script: ${getErrorMessage(fetchResult.error)}`,
 `Script not found (HTTP ${res.status} primary, ${ghRes.status} fallback)`,
 outputFormat,
 2,
 );
 }
 scriptContent = fetchResult.data;
 }

 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud}...`);
 return ghRes.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download script: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }

 exitCode = await runScriptHeadless(scriptContent, prompt, debug, spawnName);
 scriptContent = fetchResult.data;
 }

 if (exitCode !== 0) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "EXECUTION_ERROR",
 `Script exited with code ${exitCode}`,
 outputFormat,
 1,
 );
 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud}...`);
 }

 // Read the spawn record saved during orchestration to populate connection fields.
 // Validate each field individually — silently omit any that fail validation to avoid
 // surfacing attacker-controlled data from a tampered history file in headless output.
 return runScriptHeadless(scriptContent, prompt, debug, spawnName);
}

/** Extract validated connection fields from the most recent matching spawn record */
function extractConnectionFields(
 resolvedAgent: string,
 resolvedCloud: string,
): Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> {
 const history = loadHistory();
 const record = history
 .filter((r) => r.agent === resolvedAgent && r.cloud === resolvedCloud && r.connection && !r.connection.deleted)
 .pop();

 const connectionFields: Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> = {};
 const fields: Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> = {};
 if (record?.connection) {
 const conn = record.connection;
 if (conn.ip && tryCatch(() => validateConnectionIP(conn.ip)).ok) {
connectionFields.ip_address = conn.ip;
fields.ip_address = conn.ip;
 }
 if (conn.user && tryCatch(() => validateUsername(conn.user)).ok) {
connectionFields.ssh_user = conn.user;
fields.ssh_user = conn.user;
 }
 const serverId = conn.server_id;
 if (serverId && tryCatch(() => validateServerIdentifier(serverId)).ok) {
connectionFields.server_id = serverId;
fields.server_id = serverId;
 }
 const serverName = conn.server_name;
 if (serverName && tryCatch(() => validateServerIdentifier(serverName)).ok) {
connectionFields.server_name = serverName;
fields.server_name = serverName;
 }
 }
 return fields;
}

export async function cmdRunHeadless(agent: string, cloud: string, opts: HeadlessOptions = {}): Promise<void> {
 const { prompt, debug, outputFormat, spawnName } = opts;

 captureEvent("spawn_launched", {
 mode: "headless",
 });

 const { resolvedAgent, resolvedCloud } = await validateHeadlessInputs(agent, cloud, prompt, outputFormat);

 const exitCode = isWindows()
 ? await fetchAndRunWindows(resolvedAgent, resolvedCloud, {
 prompt,
 debug,
 outputFormat,
 spawnName,
 })
 : await fetchAndRunUnix(resolvedAgent, resolvedCloud, {
 prompt,
 debug,
 outputFormat,
 spawnName,
 });

 if (exitCode !== 0) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "EXECUTION_ERROR",
 `Script exited with code ${exitCode}`,
 outputFormat,
 1,
 );
 }

 const connectionFields = extractConnectionFields(resolvedAgent, resolvedCloud);

 const result: SpawnResult = {
 status: "success",
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(run): extract 4 helpers from 243-line cmdRunHeadless#3345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

la14-1
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


refactor(run): extract 4 helpers from 243-line cmdRunHeadless
#3345
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


314 changes: 184 additions & 130 deletions
packages/cli/src/commands/run.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -985,17 +985,19 @@ function runBundleHeadless(
 });
}

export async function cmdRunHeadless(agent: string, cloud: string, opts: HeadlessOptions = {}): Promise<void> {
 const { prompt, debug, outputFormat, spawnName } = opts;

 // Funnel entry for headless runs. No picker to instrument — headless either
 // validates and proceeds straight to runOrchestration, or it errors out.
 // The orchestrate.ts funnel_* events cover the rest.
 captureEvent("spawn_launched", {
 mode: "headless",
 });
interface HeadlessValidated {
 manifest: Manifest;
 resolvedAgent: string;
 resolvedCloud: string;
}

 // Phase 1: Validate inputs (exit code 3)
/** Phase 1: validate inputs, load manifest, resolve names, check credentials */
async function validateHeadlessInputs(
 agent: string,
 cloud: string,
 prompt: string | undefined,
 outputFormat: string | undefined,
): Promise<HeadlessValidated> {
 const validationResult = tryCatch(() => {
 validateIdentifier(agent, "Agent name");
 validateIdentifier(cloud, "Cloud name");
Expand All@@ -1007,18 +1009,15 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 headlessError(agent, cloud, "VALIDATION_ERROR", getErrorMessage(validationResult.error), outputFormat, 3);
 }

 // Load manifest (silently - no spinner in headless mode)
 const manifestResult = await asyncTryCatch(loadManifest);
 if (!manifestResult.ok) {
 headlessError(agent, cloud, "MANIFEST_ERROR", getErrorMessage(manifestResult.error), outputFormat, 3);
 }
 const manifest = manifestResult.data;

 // Resolve agent/cloud names
 const resolvedAgent = resolveAgentKey(manifest, agent) ?? agent;
 const resolvedCloud = resolveCloudKey(manifest, cloud) ?? cloud;

 // Validate entities exist
 if (!manifest.agents[resolvedAgent]) {
 headlessError(resolvedAgent, resolvedCloud, "UNKNOWN_AGENT", `Unknown agent: ${resolvedAgent}`, outputFormat, 3);
 }
Expand All@@ -1038,7 +1037,6 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 );
 }

 // Check credentials upfront
 const cloudAuth = manifest.clouds[resolvedCloud].auth;
 if (cloudAuth.toLowerCase() !== "none") {
 const authVars = parseAuthEnvVars(cloudAuth);
Expand All@@ -1055,164 +1053,220 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 }
 }

 // Phase 2+3: Load and execute
 let exitCode: number;
 return {
 manifest,
 resolvedAgent,
 resolvedCloud,
 };
}

 if (isWindows()) {
 // Windows: download JS bundle and run with bun (bash wrappers won't work)
 const cliDir = process.env.SPAWN_CLI_DIR;
 let localMainResolved = "";

 if (cliDir) {
 const hasBadChars = (s: string) => s.includes("..") || s.includes("/") || s.includes("\\");
 if (!hasBadChars(resolvedCloud) && !hasBadChars(resolvedAgent)) {
 const resolvedCliDir = resolveTrustedCliDir(cliDir);
 const candidatePath = path.join(resolvedCliDir, "packages", "cli", "src", resolvedCloud, "main.ts");
 const realResult = tryCatchIf(isFileError, () => fs.realpathSync(candidatePath));
 if (realResult.ok) {
 const prefix = resolvedCliDir.endsWith(path.sep) ? resolvedCliDir : resolvedCliDir + path.sep;
 if (realResult.data.startsWith(prefix)) {
 localMainResolved = realResult.data;
 }
/** Windows path: resolve local bundle or download from GitHub, then run with bun */
async function fetchAndRunWindows(
 resolvedAgent: string,
 resolvedCloud: string,
 opts: {
 prompt?: string;
 debug?: boolean;
 outputFormat?: string;
 spawnName?: string;
 },
): Promise<number> {
 const { prompt, debug, outputFormat, spawnName } = opts;
 const cliDir = process.env.SPAWN_CLI_DIR;
 let localMainResolved = "";

 if (cliDir) {
 const hasBadChars = (s: string) => s.includes("..") || s.includes("/") || s.includes("\\");
 if (!hasBadChars(resolvedCloud) && !hasBadChars(resolvedAgent)) {
 const resolvedCliDir = resolveTrustedCliDir(cliDir);
 const candidatePath = path.join(resolvedCliDir, "packages", "cli", "src", resolvedCloud, "main.ts");
 const realResult = tryCatchIf(isFileError, () => fs.realpathSync(candidatePath));
 if (realResult.ok) {
 const prefix = resolvedCliDir.endsWith(path.sep) ? resolvedCliDir : resolvedCliDir + path.sep;
 if (realResult.data.startsWith(prefix)) {
 localMainResolved = realResult.data;
 }
 }
 }
 }

 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud} (Windows bundle mode)...`);
 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud} (Windows bundle mode)...`);
 }

 if (localMainResolved) {
 return runBundleHeadless(localMainResolved, resolvedAgent, prompt, debug, spawnName);
 }

 const bundleUrl = `https://github.com/${REPO}/releases/download/${resolvedCloud}-latest/${resolvedCloud}.js`;
 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(bundleUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 redirect: "follow",
 });
 if (!res.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Bundle not found (HTTP ${res.status})`,
 outputFormat,
 2,
 );
 }
 return res.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download bundle: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }

 if (localMainResolved) {
 exitCode = await runBundleHeadless(localMainResolved, resolvedAgent, prompt, debug, spawnName);
 } else {
 const bundleUrl = `https://github.com/${REPO}/releases/download/${resolvedCloud}-latest/${resolvedCloud}.js`;
 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(bundleUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 redirect: "follow",
 });
 if (!res.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Bundle not found (HTTP ${res.status})`,
 outputFormat,
 2,
 );
 }
 return res.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download bundle: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }
 // Write bundle to temp file and run with bun
 const tmpFile = path.join(fs.mkdtempSync(path.join(tmpdir(), "spawn-")), `${resolvedCloud}.js`);
 fs.writeFileSync(tmpFile, fetchResult.data);
 exitCode = await runBundleHeadless(tmpFile, resolvedAgent, prompt, debug, spawnName);
 tryCatchIf(isFileError, () => fs.unlinkSync(tmpFile));
 const tmpFile = path.join(fs.mkdtempSync(path.join(tmpdir(), "spawn-")), `${resolvedCloud}.js`);
 fs.writeFileSync(tmpFile, fetchResult.data);
 const exitCode = await runBundleHeadless(tmpFile, resolvedAgent, prompt, debug, spawnName);
 tryCatchIf(isFileError, () => fs.unlinkSync(tmpFile));
 return exitCode;
}

/** macOS/Linux path: resolve local script or download from CDN/GitHub, then run via shell */
async function fetchAndRunUnix(
 resolvedAgent: string,
 resolvedCloud: string,
 opts: {
 prompt?: string;
 debug?: boolean;
 outputFormat?: string;
 spawnName?: string;
 },
): Promise<number> {
 const { prompt, debug, outputFormat, spawnName } = opts;
 let scriptContent: string;
 const cliDir = process.env.SPAWN_CLI_DIR;
 const localScriptResolved = cliDir ? resolveLocalWrapperScript(cliDir, resolvedCloud, resolvedAgent) : "";

 if (localScriptResolved) {
 scriptContent = fs.readFileSync(localScriptResolved, "utf-8");
 if (debug) {
 console.error(`[headless] Using local script: ${localScriptResolved}`);
 }
 } else {
// macOS/Linux: download bash wrapper script
let scriptContent: string;
 const cliDir = process.env.SPAWN_CLI_DIR;
 const localScriptResolved = cliDir ? resolveLocalWrapperScript(cliDir, resolvedCloud, resolvedAgent) : "";

if (localScriptResolved) {
scriptContent = fs.readFileSync(localScriptResolved, "utf-8");
 if (debug) {
console.error(`[headless] Using local script: ${localScriptResolved}`);
const url = `https://openrouter.ai/labs/spawn/${resolvedCloud}/${resolvedAgent}.sh`;
const ghUrl = `${RAW_BASE}/sh/${resolvedCloud}/${resolvedAgent}.sh`;

 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(url, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
});
 if (res.ok) {
return res.text();
 }
 } else {
 const url = `https://openrouter.ai/labs/spawn/${resolvedCloud}/${resolvedAgent}.sh`;
 const ghUrl = `${RAW_BASE}/sh/${resolvedCloud}/${resolvedAgent}.sh`;

 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(url, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (res.ok) {
 return res.text();
 }
 const ghRes = await fetch(ghUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (!ghRes.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Script not found (HTTP ${res.status} primary, ${ghRes.status} fallback)`,
 outputFormat,
 2,
 );
 }
 return ghRes.text();
 const ghRes = await fetch(ghUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (!fetchResult.ok) {
 if (!ghRes.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download script: ${getErrorMessage(fetchResult.error)}`,
 `Script not found (HTTP ${res.status} primary, ${ghRes.status} fallback)`,
 outputFormat,
 2,
 );
 }
 scriptContent = fetchResult.data;
 }

 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud}...`);
 return ghRes.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download script: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }

 exitCode = await runScriptHeadless(scriptContent, prompt, debug, spawnName);
 scriptContent = fetchResult.data;
 }

 if (exitCode !== 0) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "EXECUTION_ERROR",
 `Script exited with code ${exitCode}`,
 outputFormat,
 1,
 );
 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud}...`);
 }

 // Read the spawn record saved during orchestration to populate connection fields.
 // Validate each field individually — silently omit any that fail validation to avoid
 // surfacing attacker-controlled data from a tampered history file in headless output.
 return runScriptHeadless(scriptContent, prompt, debug, spawnName);
}

/** Extract validated connection fields from the most recent matching spawn record */
function extractConnectionFields(
 resolvedAgent: string,
 resolvedCloud: string,
): Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> {
 const history = loadHistory();
 const record = history
 .filter((r) => r.agent === resolvedAgent && r.cloud === resolvedCloud && r.connection && !r.connection.deleted)
 .pop();

 const connectionFields: Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> = {};
 const fields: Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> = {};
 if (record?.connection) {
 const conn = record.connection;
 if (conn.ip && tryCatch(() => validateConnectionIP(conn.ip)).ok) {
connectionFields.ip_address = conn.ip;
fields.ip_address = conn.ip;
 }
 if (conn.user && tryCatch(() => validateUsername(conn.user)).ok) {
connectionFields.ssh_user = conn.user;
fields.ssh_user = conn.user;
 }
 const serverId = conn.server_id;
 if (serverId && tryCatch(() => validateServerIdentifier(serverId)).ok) {
connectionFields.server_id = serverId;
fields.server_id = serverId;
 }
 const serverName = conn.server_name;
 if (serverName && tryCatch(() => validateServerIdentifier(serverName)).ok) {
connectionFields.server_name = serverName;
fields.server_name = serverName;
 }
 }
 return fields;
}

export async function cmdRunHeadless(agent: string, cloud: string, opts: HeadlessOptions = {}): Promise<void> {
 const { prompt, debug, outputFormat, spawnName } = opts;

 captureEvent("spawn_launched", {
 mode: "headless",
 });

 const { resolvedAgent, resolvedCloud } = await validateHeadlessInputs(agent, cloud, prompt, outputFormat);

 const exitCode = isWindows()
 ? await fetchAndRunWindows(resolvedAgent, resolvedCloud, {
 prompt,
 debug,
 outputFormat,
 spawnName,
 })
 : await fetchAndRunUnix(resolvedAgent, resolvedCloud, {
 prompt,
 debug,
 outputFormat,
 spawnName,
 });

 if (exitCode !== 0) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "EXECUTION_ERROR",
 `Script exited with code ${exitCode}`,
 outputFormat,
 1,
 );
 }

 const connectionFields = extractConnectionFields(resolvedAgent, resolvedCloud);

 const result: SpawnResult = {
 status: "success",
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
refactor(run): extract 4 helpers from 243-line cmdRunHeadless#3345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

la14-1
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


refactor(run): extract 4 helpers from 243-line cmdRunHeadless
#3345
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


314 changes: 184 additions & 130 deletions
packages/cli/src/commands/run.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -985,17 +985,19 @@ function runBundleHeadless(
 });
}

export async function cmdRunHeadless(agent: string, cloud: string, opts: HeadlessOptions = {}): Promise<void> {
 const { prompt, debug, outputFormat, spawnName } = opts;

 // Funnel entry for headless runs. No picker to instrument — headless either
 // validates and proceeds straight to runOrchestration, or it errors out.
 // The orchestrate.ts funnel_* events cover the rest.
 captureEvent("spawn_launched", {
 mode: "headless",
 });
interface HeadlessValidated {
 manifest: Manifest;
 resolvedAgent: string;
 resolvedCloud: string;
}

 // Phase 1: Validate inputs (exit code 3)
/** Phase 1: validate inputs, load manifest, resolve names, check credentials */
async function validateHeadlessInputs(
 agent: string,
 cloud: string,
 prompt: string | undefined,
 outputFormat: string | undefined,
): Promise<HeadlessValidated> {
 const validationResult = tryCatch(() => {
 validateIdentifier(agent, "Agent name");
 validateIdentifier(cloud, "Cloud name");
Expand All@@ -1007,18 +1009,15 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 headlessError(agent, cloud, "VALIDATION_ERROR", getErrorMessage(validationResult.error), outputFormat, 3);
 }

 // Load manifest (silently - no spinner in headless mode)
 const manifestResult = await asyncTryCatch(loadManifest);
 if (!manifestResult.ok) {
 headlessError(agent, cloud, "MANIFEST_ERROR", getErrorMessage(manifestResult.error), outputFormat, 3);
 }
 const manifest = manifestResult.data;

 // Resolve agent/cloud names
 const resolvedAgent = resolveAgentKey(manifest, agent) ?? agent;
 const resolvedCloud = resolveCloudKey(manifest, cloud) ?? cloud;

 // Validate entities exist
 if (!manifest.agents[resolvedAgent]) {
 headlessError(resolvedAgent, resolvedCloud, "UNKNOWN_AGENT", `Unknown agent: ${resolvedAgent}`, outputFormat, 3);
 }
Expand All@@ -1038,7 +1037,6 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 );
 }

 // Check credentials upfront
 const cloudAuth = manifest.clouds[resolvedCloud].auth;
 if (cloudAuth.toLowerCase() !== "none") {
 const authVars = parseAuthEnvVars(cloudAuth);
Expand All@@ -1055,164 +1053,220 @@ export async function cmdRunHeadless(agent: string, cloud: string, opts: Headles
 }
 }

 // Phase 2+3: Load and execute
 let exitCode: number;
 return {
 manifest,
 resolvedAgent,
 resolvedCloud,
 };
}

 if (isWindows()) {
 // Windows: download JS bundle and run with bun (bash wrappers won't work)
 const cliDir = process.env.SPAWN_CLI_DIR;
 let localMainResolved = "";

 if (cliDir) {
 const hasBadChars = (s: string) => s.includes("..") || s.includes("/") || s.includes("\\");
 if (!hasBadChars(resolvedCloud) && !hasBadChars(resolvedAgent)) {
 const resolvedCliDir = resolveTrustedCliDir(cliDir);
 const candidatePath = path.join(resolvedCliDir, "packages", "cli", "src", resolvedCloud, "main.ts");
 const realResult = tryCatchIf(isFileError, () => fs.realpathSync(candidatePath));
 if (realResult.ok) {
 const prefix = resolvedCliDir.endsWith(path.sep) ? resolvedCliDir : resolvedCliDir + path.sep;
 if (realResult.data.startsWith(prefix)) {
 localMainResolved = realResult.data;
 }
/** Windows path: resolve local bundle or download from GitHub, then run with bun */
async function fetchAndRunWindows(
 resolvedAgent: string,
 resolvedCloud: string,
 opts: {
 prompt?: string;
 debug?: boolean;
 outputFormat?: string;
 spawnName?: string;
 },
): Promise<number> {
 const { prompt, debug, outputFormat, spawnName } = opts;
 const cliDir = process.env.SPAWN_CLI_DIR;
 let localMainResolved = "";

 if (cliDir) {
 const hasBadChars = (s: string) => s.includes("..") || s.includes("/") || s.includes("\\");
 if (!hasBadChars(resolvedCloud) && !hasBadChars(resolvedAgent)) {
 const resolvedCliDir = resolveTrustedCliDir(cliDir);
 const candidatePath = path.join(resolvedCliDir, "packages", "cli", "src", resolvedCloud, "main.ts");
 const realResult = tryCatchIf(isFileError, () => fs.realpathSync(candidatePath));
 if (realResult.ok) {
 const prefix = resolvedCliDir.endsWith(path.sep) ? resolvedCliDir : resolvedCliDir + path.sep;
 if (realResult.data.startsWith(prefix)) {
 localMainResolved = realResult.data;
 }
 }
 }
 }

 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud} (Windows bundle mode)...`);
 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud} (Windows bundle mode)...`);
 }

 if (localMainResolved) {
 return runBundleHeadless(localMainResolved, resolvedAgent, prompt, debug, spawnName);
 }

 const bundleUrl = `https://github.com/${REPO}/releases/download/${resolvedCloud}-latest/${resolvedCloud}.js`;
 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(bundleUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 redirect: "follow",
 });
 if (!res.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Bundle not found (HTTP ${res.status})`,
 outputFormat,
 2,
 );
 }
 return res.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download bundle: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }

 if (localMainResolved) {
 exitCode = await runBundleHeadless(localMainResolved, resolvedAgent, prompt, debug, spawnName);
 } else {
 const bundleUrl = `https://github.com/${REPO}/releases/download/${resolvedCloud}-latest/${resolvedCloud}.js`;
 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(bundleUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 redirect: "follow",
 });
 if (!res.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Bundle not found (HTTP ${res.status})`,
 outputFormat,
 2,
 );
 }
 return res.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download bundle: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }
 // Write bundle to temp file and run with bun
 const tmpFile = path.join(fs.mkdtempSync(path.join(tmpdir(), "spawn-")), `${resolvedCloud}.js`);
 fs.writeFileSync(tmpFile, fetchResult.data);
 exitCode = await runBundleHeadless(tmpFile, resolvedAgent, prompt, debug, spawnName);
 tryCatchIf(isFileError, () => fs.unlinkSync(tmpFile));
 const tmpFile = path.join(fs.mkdtempSync(path.join(tmpdir(), "spawn-")), `${resolvedCloud}.js`);
 fs.writeFileSync(tmpFile, fetchResult.data);
 const exitCode = await runBundleHeadless(tmpFile, resolvedAgent, prompt, debug, spawnName);
 tryCatchIf(isFileError, () => fs.unlinkSync(tmpFile));
 return exitCode;
}

/** macOS/Linux path: resolve local script or download from CDN/GitHub, then run via shell */
async function fetchAndRunUnix(
 resolvedAgent: string,
 resolvedCloud: string,
 opts: {
 prompt?: string;
 debug?: boolean;
 outputFormat?: string;
 spawnName?: string;
 },
): Promise<number> {
 const { prompt, debug, outputFormat, spawnName } = opts;
 let scriptContent: string;
 const cliDir = process.env.SPAWN_CLI_DIR;
 const localScriptResolved = cliDir ? resolveLocalWrapperScript(cliDir, resolvedCloud, resolvedAgent) : "";

 if (localScriptResolved) {
 scriptContent = fs.readFileSync(localScriptResolved, "utf-8");
 if (debug) {
 console.error(`[headless] Using local script: ${localScriptResolved}`);
 }
 } else {
// macOS/Linux: download bash wrapper script
let scriptContent: string;
 const cliDir = process.env.SPAWN_CLI_DIR;
 const localScriptResolved = cliDir ? resolveLocalWrapperScript(cliDir, resolvedCloud, resolvedAgent) : "";

if (localScriptResolved) {
scriptContent = fs.readFileSync(localScriptResolved, "utf-8");
 if (debug) {
console.error(`[headless] Using local script: ${localScriptResolved}`);
const url = `https://openrouter.ai/labs/spawn/${resolvedCloud}/${resolvedAgent}.sh`;
const ghUrl = `${RAW_BASE}/sh/${resolvedCloud}/${resolvedAgent}.sh`;

 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(url, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
});
 if (res.ok) {
return res.text();
 }
 } else {
 const url = `https://openrouter.ai/labs/spawn/${resolvedCloud}/${resolvedAgent}.sh`;
 const ghUrl = `${RAW_BASE}/sh/${resolvedCloud}/${resolvedAgent}.sh`;

 const fetchResult = await asyncTryCatch(async () => {
 const res = await fetch(url, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (res.ok) {
 return res.text();
 }
 const ghRes = await fetch(ghUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (!ghRes.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Script not found (HTTP ${res.status} primary, ${ghRes.status} fallback)`,
 outputFormat,
 2,
 );
 }
 return ghRes.text();
 const ghRes = await fetch(ghUrl, {
 signal: AbortSignal.timeout(FETCH_TIMEOUT),
 });
 if (!fetchResult.ok) {
 if (!ghRes.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download script: ${getErrorMessage(fetchResult.error)}`,
 `Script not found (HTTP ${res.status} primary, ${ghRes.status} fallback)`,
 outputFormat,
 2,
 );
 }
 scriptContent = fetchResult.data;
 }

 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud}...`);
 return ghRes.text();
 });
 if (!fetchResult.ok) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "DOWNLOAD_ERROR",
 `Failed to download script: ${getErrorMessage(fetchResult.error)}`,
 outputFormat,
 2,
 );
 }

 exitCode = await runScriptHeadless(scriptContent, prompt, debug, spawnName);
 scriptContent = fetchResult.data;
 }

 if (exitCode !== 0) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "EXECUTION_ERROR",
 `Script exited with code ${exitCode}`,
 outputFormat,
 1,
 );
 if (debug) {
 console.error(`[headless] Executing ${resolvedAgent} on ${resolvedCloud}...`);
 }

 // Read the spawn record saved during orchestration to populate connection fields.
 // Validate each field individually — silently omit any that fail validation to avoid
 // surfacing attacker-controlled data from a tampered history file in headless output.
 return runScriptHeadless(scriptContent, prompt, debug, spawnName);
}

/** Extract validated connection fields from the most recent matching spawn record */
function extractConnectionFields(
 resolvedAgent: string,
 resolvedCloud: string,
): Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> {
 const history = loadHistory();
 const record = history
 .filter((r) => r.agent === resolvedAgent && r.cloud === resolvedCloud && r.connection && !r.connection.deleted)
 .pop();

 const connectionFields: Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> = {};
 const fields: Partial<Pick<SpawnResult, "ip_address" | "ssh_user" | "server_id" | "server_name">> = {};
 if (record?.connection) {
 const conn = record.connection;
 if (conn.ip && tryCatch(() => validateConnectionIP(conn.ip)).ok) {
connectionFields.ip_address = conn.ip;
fields.ip_address = conn.ip;
 }
 if (conn.user && tryCatch(() => validateUsername(conn.user)).ok) {
connectionFields.ssh_user = conn.user;
fields.ssh_user = conn.user;
 }
 const serverId = conn.server_id;
 if (serverId && tryCatch(() => validateServerIdentifier(serverId)).ok) {
connectionFields.server_id = serverId;
fields.server_id = serverId;
 }
 const serverName = conn.server_name;
 if (serverName && tryCatch(() => validateServerIdentifier(serverName)).ok) {
connectionFields.server_name = serverName;
fields.server_name = serverName;
 }
 }
 return fields;
}

export async function cmdRunHeadless(agent: string, cloud: string, opts: HeadlessOptions = {}): Promise<void> {
 const { prompt, debug, outputFormat, spawnName } = opts;

 captureEvent("spawn_launched", {
 mode: "headless",
 });

 const { resolvedAgent, resolvedCloud } = await validateHeadlessInputs(agent, cloud, prompt, outputFormat);

 const exitCode = isWindows()
 ? await fetchAndRunWindows(resolvedAgent, resolvedCloud, {
 prompt,
 debug,
 outputFormat,
 spawnName,
 })
 : await fetchAndRunUnix(resolvedAgent, resolvedCloud, {
 prompt,
 debug,
 outputFormat,
 spawnName,
 });

 if (exitCode !== 0) {
 headlessError(
 resolvedAgent,
 resolvedCloud,
 "EXECUTION_ERROR",
 `Script exited with code ${exitCode}`,
 outputFormat,
 1,
 );
 }

 const connectionFields = extractConnectionFields(resolvedAgent, resolvedCloud);

 const result: SpawnResult = {
 status: "success",
Expand Down
Loading