let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: share cli runtime error handling

Browse Source
This commit is contained in:
Peter Steinberger
2026-01-19 00:52:17 +00:00
parent c532d161c4
commit 1fec41b3df
16 changed files with 288 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/cli/browser-cli-actions-observe.ts
View File

@@ -8,6 +8,14 @@ import {
import { danger } from "../globals.js"; import { danger } from "../globals.js";
import { defaultRuntime } from "../runtime.js"; import { defaultRuntime } from "../runtime.js";
import type { BrowserParentOpts } from "./browser-cli-shared.js"; import type { BrowserParentOpts } from "./browser-cli-shared.js";
import { runCommandWithRuntime } from "./cli-utils.js";
function runBrowserObserve(action: () => Promise<void>) {
return runCommandWithRuntime(defaultRuntime, action, (err) => {
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
});
}
export function registerBrowserActionObserveCommands( export function registerBrowserActionObserveCommands(
browser: Command, browser: Command,
@@ -22,7 +30,7 @@ export function registerBrowserActionObserveCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserObserve(async () => {
const result = await browserConsoleMessages(baseUrl, { const result = await browserConsoleMessages(baseUrl, {
level: opts.level?.trim() || undefined, level: opts.level?.trim() || undefined,
targetId: opts.targetId?.trim() || undefined, targetId: opts.targetId?.trim() || undefined,
@@ -33,10 +41,7 @@ export function registerBrowserActionObserveCommands(
return; return;
} }
defaultRuntime.log(JSON.stringify(result.messages, null, 2)); defaultRuntime.log(JSON.stringify(result.messages, null, 2));
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
browser browser
@@ -47,7 +52,7 @@ export function registerBrowserActionObserveCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserObserve(async () => {
const result = await browserPdfSave(baseUrl, { const result = await browserPdfSave(baseUrl, {
targetId: opts.targetId?.trim() || undefined, targetId: opts.targetId?.trim() || undefined,
profile, profile,
@@ -57,10 +62,7 @@ export function registerBrowserActionObserveCommands(
return; return;
} }
defaultRuntime.log(`PDF: ${result.path}`); defaultRuntime.log(`PDF: ${result.path}`);
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
browser browser
@@ -80,7 +82,7 @@ export function registerBrowserActionObserveCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserObserve(async () => {
const result = await browserResponseBody(baseUrl, { const result = await browserResponseBody(baseUrl, {
url, url,
targetId: opts.targetId?.trim() || undefined, targetId: opts.targetId?.trim() || undefined,
@@ -93,9 +95,6 @@ export function registerBrowserActionObserveCommands(
return; return;
} }
defaultRuntime.log(result.response.body); defaultRuntime.log(result.response.body);
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
} }

43
src/cli/browser-cli-debug.ts
View File

@@ -11,6 +11,14 @@ import {
import { danger } from "../globals.js"; import { danger } from "../globals.js";
import { defaultRuntime } from "../runtime.js"; import { defaultRuntime } from "../runtime.js";
import type { BrowserParentOpts } from "./browser-cli-shared.js"; import type { BrowserParentOpts } from "./browser-cli-shared.js";
import { runCommandWithRuntime } from "./cli-utils.js";
function runBrowserDebug(action: () => Promise<void>) {
return runCommandWithRuntime(defaultRuntime, action, (err) => {
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
});
}
export function registerBrowserDebugCommands( export function registerBrowserDebugCommands(
browser: Command, browser: Command,
@@ -25,7 +33,7 @@ export function registerBrowserDebugCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserDebug(async () => {
const result = await browserHighlight(baseUrl, { const result = await browserHighlight(baseUrl, {
ref: ref.trim(), ref: ref.trim(),
targetId: opts.targetId?.trim() || undefined, targetId: opts.targetId?.trim() || undefined,
@@ -36,10 +44,7 @@ export function registerBrowserDebugCommands(
return; return;
} }
defaultRuntime.log(`highlighted ${ref.trim()}`); defaultRuntime.log(`highlighted ${ref.trim()}`);
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
browser browser
@@ -51,7 +56,7 @@ export function registerBrowserDebugCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserDebug(async () => {
const result = await browserPageErrors(baseUrl, { const result = await browserPageErrors(baseUrl, {
targetId: opts.targetId?.trim() || undefined, targetId: opts.targetId?.trim() || undefined,
clear: Boolean(opts.clear), clear: Boolean(opts.clear),
@@ -70,10 +75,7 @@ export function registerBrowserDebugCommands(
.map((e) => `${e.timestamp} ${e.name ? `${e.name}: ` : ""}${e.message}`) .map((e) => `${e.timestamp} ${e.name ? `${e.name}: ` : ""}${e.message}`)
.join("\n"), .join("\n"),
); );
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
browser browser
@@ -86,7 +88,7 @@ export function registerBrowserDebugCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserDebug(async () => {
const result = await browserRequests(baseUrl, { const result = await browserRequests(baseUrl, {
targetId: opts.targetId?.trim() || undefined, targetId: opts.targetId?.trim() || undefined,
filter: opts.filter?.trim() || undefined, filter: opts.filter?.trim() || undefined,
@@ -111,10 +113,7 @@ export function registerBrowserDebugCommands(
}) })
.join("\n"), .join("\n"),
); );
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
const trace = browser.command("trace").description("Record a Playwright trace"); const trace = browser.command("trace").description("Record a Playwright trace");
@@ -130,7 +129,7 @@ export function registerBrowserDebugCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserDebug(async () => {
const result = await browserTraceStart(baseUrl, { const result = await browserTraceStart(baseUrl, {
targetId: opts.targetId?.trim() || undefined, targetId: opts.targetId?.trim() || undefined,
screenshots: Boolean(opts.screenshots), screenshots: Boolean(opts.screenshots),
@@ -143,10 +142,7 @@ export function registerBrowserDebugCommands(
return; return;
} }
defaultRuntime.log("trace started"); defaultRuntime.log("trace started");
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
trace trace
@@ -158,7 +154,7 @@ export function registerBrowserDebugCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserDebug(async () => {
const result = await browserTraceStop(baseUrl, { const result = await browserTraceStop(baseUrl, {
targetId: opts.targetId?.trim() || undefined, targetId: opts.targetId?.trim() || undefined,
path: opts.out?.trim() || undefined, path: opts.out?.trim() || undefined,
@@ -169,9 +165,6 @@ export function registerBrowserDebugCommands(
return; return;
} }
defaultRuntime.log(`TRACE:${result.path}`); defaultRuntime.log(`TRACE:${result.path}`);
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
} }

113
src/cli/browser-cli-manage.ts
View File

@@ -19,6 +19,14 @@ import { browserAct } from "../browser/client-actions-core.js";
import { danger, info } from "../globals.js"; import { danger, info } from "../globals.js";
import { defaultRuntime } from "../runtime.js"; import { defaultRuntime } from "../runtime.js";
import type { BrowserParentOpts } from "./browser-cli-shared.js"; import type { BrowserParentOpts } from "./browser-cli-shared.js";
import { runCommandWithRuntime } from "./cli-utils.js";
function runBrowserCommand(action: () => Promise<void>) {
return runCommandWithRuntime(defaultRuntime, action, (err) => {
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
});
}
export function registerBrowserManageCommands( export function registerBrowserManageCommands(
browser: Command, browser: Command,
@@ -30,7 +38,7 @@ export function registerBrowserManageCommands(
.action(async (_opts, cmd) => { .action(async (_opts, cmd) => {
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
try { await runBrowserCommand(async () => {
const status = await browserStatus(baseUrl, { const status = await browserStatus(baseUrl, {
profile: parent?.browserProfile, profile: parent?.browserProfile,
}); });
@@ -53,10 +61,7 @@ export function registerBrowserManageCommands(
...(status.detectError ? [`detectError: ${status.detectError}`] : []), ...(status.detectError ? [`detectError: ${status.detectError}`] : []),
].join("\n"), ].join("\n"),
); );
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
browser browser
@@ -66,7 +71,7 @@ export function registerBrowserManageCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserCommand(async () => {
await browserStart(baseUrl, { profile }); await browserStart(baseUrl, { profile });
const status = await browserStatus(baseUrl, { profile }); const status = await browserStatus(baseUrl, { profile });
if (parent?.json) { if (parent?.json) {
@@ -75,10 +80,7 @@ export function registerBrowserManageCommands(
} }
const name = status.profile ?? "clawd"; const name = status.profile ?? "clawd";
defaultRuntime.log(info(`🦞 browser [${name}] running: ${status.running}`)); defaultRuntime.log(info(`🦞 browser [${name}] running: ${status.running}`));
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
browser browser
@@ -88,7 +90,7 @@ export function registerBrowserManageCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserCommand(async () => {
await browserStop(baseUrl, { profile }); await browserStop(baseUrl, { profile });
const status = await browserStatus(baseUrl, { profile }); const status = await browserStatus(baseUrl, { profile });
if (parent?.json) { if (parent?.json) {
@@ -97,10 +99,7 @@ export function registerBrowserManageCommands(
} }
const name = status.profile ?? "clawd"; const name = status.profile ?? "clawd";
defaultRuntime.log(info(`🦞 browser [${name}] running: ${status.running}`)); defaultRuntime.log(info(`🦞 browser [${name}] running: ${status.running}`));
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
browser browser
@@ -110,7 +109,7 @@ export function registerBrowserManageCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserCommand(async () => {
const result = await browserResetProfile(baseUrl, { profile }); const result = await browserResetProfile(baseUrl, { profile });
if (parent?.json) { if (parent?.json) {
defaultRuntime.log(JSON.stringify(result, null, 2)); defaultRuntime.log(JSON.stringify(result, null, 2));
@@ -122,10 +121,7 @@ export function registerBrowserManageCommands(
} }
const dest = result.to ?? result.from; const dest = result.to ?? result.from;
defaultRuntime.log(info(`🦞 browser profile moved to Trash (${dest})`)); defaultRuntime.log(info(`🦞 browser profile moved to Trash (${dest})`));
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
browser browser
@@ -135,7 +131,7 @@ export function registerBrowserManageCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserCommand(async () => {
const tabs = await browserTabs(baseUrl, { profile }); const tabs = await browserTabs(baseUrl, { profile });
if (parent?.json) { if (parent?.json) {
defaultRuntime.log(JSON.stringify({ tabs }, null, 2)); defaultRuntime.log(JSON.stringify({ tabs }, null, 2));
@@ -152,10 +148,7 @@ export function registerBrowserManageCommands(
) )
.join("\n"), .join("\n"),
); );
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
const tab = browser const tab = browser
@@ -165,7 +158,7 @@ export function registerBrowserManageCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserCommand(async () => {
const result = (await browserTabAction(baseUrl, { const result = (await browserTabAction(baseUrl, {
action: "list", action: "list",
profile, profile,
@@ -186,10 +179,7 @@ export function registerBrowserManageCommands(
) )
.join("\n"), .join("\n"),
); );
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
tab tab
@@ -199,7 +189,7 @@ export function registerBrowserManageCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserCommand(async () => {
const result = await browserTabAction(baseUrl, { const result = await browserTabAction(baseUrl, {
action: "new", action: "new",
profile, profile,
@@ -209,10 +199,7 @@ export function registerBrowserManageCommands(
return; return;
} }
defaultRuntime.log("opened new tab"); defaultRuntime.log("opened new tab");
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
tab tab
@@ -228,7 +215,7 @@ export function registerBrowserManageCommands(
defaultRuntime.exit(1); defaultRuntime.exit(1);
return; return;
} }
try { await runBrowserCommand(async () => {
const result = await browserTabAction(baseUrl, { const result = await browserTabAction(baseUrl, {
action: "select", action: "select",
index: Math.floor(index) - 1, index: Math.floor(index) - 1,
@@ -239,10 +226,7 @@ export function registerBrowserManageCommands(
return; return;
} }
defaultRuntime.log(`selected tab ${Math.floor(index)}`); defaultRuntime.log(`selected tab ${Math.floor(index)}`);
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
tab tab
@@ -260,7 +244,7 @@ export function registerBrowserManageCommands(
defaultRuntime.exit(1); defaultRuntime.exit(1);
return; return;
} }
try { await runBrowserCommand(async () => {
const result = await browserTabAction(baseUrl, { const result = await browserTabAction(baseUrl, {
action: "close", action: "close",
index: idx, index: idx,
@@ -271,10 +255,7 @@ export function registerBrowserManageCommands(
return; return;
} }
defaultRuntime.log("closed tab"); defaultRuntime.log("closed tab");
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
browser browser
@@ -285,17 +266,14 @@ export function registerBrowserManageCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserCommand(async () => {
const tab = await browserOpenTab(baseUrl, url, { profile }); const tab = await browserOpenTab(baseUrl, url, { profile });
if (parent?.json) { if (parent?.json) {
defaultRuntime.log(JSON.stringify(tab, null, 2)); defaultRuntime.log(JSON.stringify(tab, null, 2));
return; return;
} }
defaultRuntime.log(`opened: ${tab.url}\nid: ${tab.targetId}`); defaultRuntime.log(`opened: ${tab.url}\nid: ${tab.targetId}`);
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
browser browser
@@ -306,17 +284,14 @@ export function registerBrowserManageCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserCommand(async () => {
await browserFocusTab(baseUrl, targetId, { profile }); await browserFocusTab(baseUrl, targetId, { profile });
if (parent?.json) { if (parent?.json) {
defaultRuntime.log(JSON.stringify({ ok: true }, null, 2)); defaultRuntime.log(JSON.stringify({ ok: true }, null, 2));
return; return;
} }
defaultRuntime.log(`focused tab ${targetId}`); defaultRuntime.log(`focused tab ${targetId}`);
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
browser browser
@@ -327,7 +302,7 @@ export function registerBrowserManageCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserCommand(async () => {
if (targetId?.trim()) { if (targetId?.trim()) {
await browserCloseTab(baseUrl, targetId.trim(), { profile }); await browserCloseTab(baseUrl, targetId.trim(), { profile });
} else { } else {
@@ -338,10 +313,7 @@ export function registerBrowserManageCommands(
return; return;
} }
defaultRuntime.log("closed tab"); defaultRuntime.log("closed tab");
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
// Profile management commands // Profile management commands
@@ -351,7 +323,7 @@ export function registerBrowserManageCommands(
.action(async (_opts, cmd) => { .action(async (_opts, cmd) => {
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
try { await runBrowserCommand(async () => {
const profiles = await browserProfiles(baseUrl); const profiles = await browserProfiles(baseUrl);
if (parent?.json) { if (parent?.json) {
defaultRuntime.log(JSON.stringify({ profiles }, null, 2)); defaultRuntime.log(JSON.stringify({ profiles }, null, 2));
@@ -373,10 +345,7 @@ export function registerBrowserManageCommands(
}) })
.join("\n"), .join("\n"),
); );
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
browser browser
@@ -390,7 +359,7 @@ export function registerBrowserManageCommands(
async (opts: { name: string; color?: string; cdpUrl?: string; driver?: string }, cmd) => { async (opts: { name: string; color?: string; cdpUrl?: string; driver?: string }, cmd) => {
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
try { await runBrowserCommand(async () => {
const result = await browserCreateProfile(baseUrl, { const result = await browserCreateProfile(baseUrl, {
name: opts.name, name: opts.name,
color: opts.color, color: opts.color,
@@ -409,10 +378,7 @@ export function registerBrowserManageCommands(
}`, }`,
), ),
); );
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}, },
); );
@@ -423,7 +389,7 @@ export function registerBrowserManageCommands(
.action(async (opts: { name: string }, cmd) => { .action(async (opts: { name: string }, cmd) => {
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
try { await runBrowserCommand(async () => {
const result = await browserDeleteProfile(baseUrl, opts.name); const result = await browserDeleteProfile(baseUrl, opts.name);
if (parent?.json) { if (parent?.json) {
defaultRuntime.log(JSON.stringify(result, null, 2)); defaultRuntime.log(JSON.stringify(result, null, 2));
@@ -433,9 +399,6 @@ export function registerBrowserManageCommands(
? `🦞 Deleted profile "${result.profile}" (user data removed)` ? `🦞 Deleted profile "${result.profile}" (user data removed)`
: `🦞 Deleted profile "${result.profile}" (no user data found)`; : `🦞 Deleted profile "${result.profile}" (no user data found)`;
defaultRuntime.log(info(msg)); defaultRuntime.log(info(msg));
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
} }

71
src/cli/browser-cli-state.ts
View File

@@ -17,12 +17,20 @@ import { defaultRuntime } from "../runtime.js";
import { parseBooleanValue } from "../utils/boolean.js"; import { parseBooleanValue } from "../utils/boolean.js";
import type { BrowserParentOpts } from "./browser-cli-shared.js"; import type { BrowserParentOpts } from "./browser-cli-shared.js";
import { registerBrowserCookiesAndStorageCommands } from "./browser-cli-state.cookies-storage.js"; import { registerBrowserCookiesAndStorageCommands } from "./browser-cli-state.cookies-storage.js";
import { runCommandWithRuntime } from "./cli-utils.js";
function parseOnOff(raw: string): boolean | null { function parseOnOff(raw: string): boolean | null {
const parsed = parseBooleanValue(raw); const parsed = parseBooleanValue(raw);
return parsed === undefined ? null : parsed; return parsed === undefined ? null : parsed;
} }
function runBrowserCommand(action: () => Promise<void>) {
return runCommandWithRuntime(defaultRuntime, action, (err) => {
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
});
}
export function registerBrowserStateCommands( export function registerBrowserStateCommands(
browser: Command, browser: Command,
parentOpts: (cmd: Command) => BrowserParentOpts, parentOpts: (cmd: Command) => BrowserParentOpts,
@@ -46,7 +54,7 @@ export function registerBrowserStateCommands(
defaultRuntime.exit(1); defaultRuntime.exit(1);
return; return;
} }
try { await runBrowserCommand(async () => {
const result = await browserAct( const result = await browserAct(
baseUrl, baseUrl,
{ {
@@ -62,10 +70,7 @@ export function registerBrowserStateCommands(
return; return;
} }
defaultRuntime.log(`viewport set: ${width}x${height}`); defaultRuntime.log(`viewport set: ${width}x${height}`);
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
set set
@@ -83,7 +88,7 @@ export function registerBrowserStateCommands(
defaultRuntime.exit(1); defaultRuntime.exit(1);
return; return;
} }
try { await runBrowserCommand(async () => {
const result = await browserSetOffline(baseUrl, { const result = await browserSetOffline(baseUrl, {
offline, offline,
targetId: opts.targetId?.trim() || undefined, targetId: opts.targetId?.trim() || undefined,
@@ -94,10 +99,7 @@ export function registerBrowserStateCommands(
return; return;
} }
defaultRuntime.log(`offline: ${offline}`); defaultRuntime.log(`offline: ${offline}`);
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
set set
@@ -109,7 +111,7 @@ export function registerBrowserStateCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserCommand(async () => {
const parsed = JSON.parse(String(opts.json)) as unknown; const parsed = JSON.parse(String(opts.json)) as unknown;
if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) { if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
throw new Error("headers json must be an object"); throw new Error("headers json must be an object");
@@ -128,10 +130,7 @@ export function registerBrowserStateCommands(
return; return;
} }
defaultRuntime.log("headers set"); defaultRuntime.log("headers set");
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
set set
@@ -145,7 +144,7 @@ export function registerBrowserStateCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserCommand(async () => {
const result = await browserSetHttpCredentials(baseUrl, { const result = await browserSetHttpCredentials(baseUrl, {
username: username?.trim() || undefined, username: username?.trim() || undefined,
password, password,
@@ -158,10 +157,7 @@ export function registerBrowserStateCommands(
return; return;
} }
defaultRuntime.log(opts.clear ? "credentials cleared" : "credentials set"); defaultRuntime.log(opts.clear ? "credentials cleared" : "credentials set");
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
set set
@@ -177,7 +173,7 @@ export function registerBrowserStateCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserCommand(async () => {
const result = await browserSetGeolocation(baseUrl, { const result = await browserSetGeolocation(baseUrl, {
latitude: Number.isFinite(latitude) ? latitude : undefined, latitude: Number.isFinite(latitude) ? latitude : undefined,
longitude: Number.isFinite(longitude) ? longitude : undefined, longitude: Number.isFinite(longitude) ? longitude : undefined,
@@ -192,10 +188,7 @@ export function registerBrowserStateCommands(
return; return;
} }
defaultRuntime.log(opts.clear ? "geolocation cleared" : "geolocation set"); defaultRuntime.log(opts.clear ? "geolocation cleared" : "geolocation set");
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
set set
@@ -215,7 +208,7 @@ export function registerBrowserStateCommands(
defaultRuntime.exit(1); defaultRuntime.exit(1);
return; return;
} }
try { await runBrowserCommand(async () => {
const result = await browserSetMedia(baseUrl, { const result = await browserSetMedia(baseUrl, {
colorScheme, colorScheme,
targetId: opts.targetId?.trim() || undefined, targetId: opts.targetId?.trim() || undefined,
@@ -226,10 +219,7 @@ export function registerBrowserStateCommands(
return; return;
} }
defaultRuntime.log(`media colorScheme: ${colorScheme}`); defaultRuntime.log(`media colorScheme: ${colorScheme}`);
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
set set
@@ -241,7 +231,7 @@ export function registerBrowserStateCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserCommand(async () => {
const result = await browserSetTimezone(baseUrl, { const result = await browserSetTimezone(baseUrl, {
timezoneId, timezoneId,
targetId: opts.targetId?.trim() || undefined, targetId: opts.targetId?.trim() || undefined,
@@ -252,10 +242,7 @@ export function registerBrowserStateCommands(
return; return;
} }
defaultRuntime.log(`timezone: ${timezoneId}`); defaultRuntime.log(`timezone: ${timezoneId}`);
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
set set
@@ -267,7 +254,7 @@ export function registerBrowserStateCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserCommand(async () => {
const result = await browserSetLocale(baseUrl, { const result = await browserSetLocale(baseUrl, {
locale, locale,
targetId: opts.targetId?.trim() || undefined, targetId: opts.targetId?.trim() || undefined,
@@ -278,10 +265,7 @@ export function registerBrowserStateCommands(
return; return;
} }
defaultRuntime.log(`locale: ${locale}`); defaultRuntime.log(`locale: ${locale}`);
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
set set
@@ -293,7 +277,7 @@ export function registerBrowserStateCommands(
const parent = parentOpts(cmd); const parent = parentOpts(cmd);
const baseUrl = resolveBrowserControlUrl(parent?.url); const baseUrl = resolveBrowserControlUrl(parent?.url);
const profile = parent?.browserProfile; const profile = parent?.browserProfile;
try { await runBrowserCommand(async () => {
const result = await browserSetDevice(baseUrl, { const result = await browserSetDevice(baseUrl, {
name, name,
targetId: opts.targetId?.trim() || undefined, targetId: opts.targetId?.trim() || undefined,
@@ -304,9 +288,6 @@ export function registerBrowserStateCommands(
return; return;
} }
defaultRuntime.log(`device: ${name}`); defaultRuntime.log(`device: ${name}`);
} catch (err) { });
defaultRuntime.error(danger(String(err)));
defaultRuntime.exit(1);
}
}); });
} }

81
src/cli/channels-cli.ts
View File

@@ -14,6 +14,7 @@ import { defaultRuntime } from "../runtime.js";
import { formatDocsLink } from "../terminal/links.js"; import { formatDocsLink } from "../terminal/links.js";
import { theme } from "../terminal/theme.js"; import { theme } from "../terminal/theme.js";
import { runChannelLogin, runChannelLogout } from "./channel-auth.js"; import { runChannelLogin, runChannelLogout } from "./channel-auth.js";
import { runCommandWithRuntime } from "./cli-utils.js";
import { hasExplicitOptions } from "./command-options.js"; import { hasExplicitOptions } from "./command-options.js";
const optionNamesAdd = [ const optionNamesAdd = [
@@ -44,6 +45,17 @@ const optionNamesAdd = [
const optionNamesRemove = ["channel", "account", "delete"] as const; const optionNamesRemove = ["channel", "account", "delete"] as const;
function runChannelsCommand(action: () => Promise<void>) {
return runCommandWithRuntime(defaultRuntime, action);
}
function runChannelsCommandWithDanger(action: () => Promise<void>, label: string) {
return runCommandWithRuntime(defaultRuntime, action, (err) => {
defaultRuntime.error(danger(`${label}: ${String(err)}`));
defaultRuntime.exit(1);
});
}
export function registerChannelsCli(program: Command) { export function registerChannelsCli(program: Command) {
const channelNames = listChannelPlugins() const channelNames = listChannelPlugins()
.map((plugin) => plugin.id) .map((plugin) => plugin.id)
@@ -66,12 +78,9 @@ export function registerChannelsCli(program: Command) {
.option("--no-usage", "Skip model provider usage/quota snapshots") .option("--no-usage", "Skip model provider usage/quota snapshots")
.option("--json", "Output JSON", false) .option("--json", "Output JSON", false)
.action(async (opts) => { .action(async (opts) => {
try { await runChannelsCommand(async () => {
await channelsListCommand(opts, defaultRuntime); await channelsListCommand(opts, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
channels channels
@@ -81,12 +90,9 @@ export function registerChannelsCli(program: Command) {
.option("--timeout <ms>", "Timeout in ms", "10000") .option("--timeout <ms>", "Timeout in ms", "10000")
.option("--json", "Output JSON", false) .option("--json", "Output JSON", false)
.action(async (opts) => { .action(async (opts) => {
try { await runChannelsCommand(async () => {
await channelsStatusCommand(opts, defaultRuntime); await channelsStatusCommand(opts, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
channels channels
@@ -98,12 +104,9 @@ export function registerChannelsCli(program: Command) {
.option("--timeout <ms>", "Timeout in ms", "10000") .option("--timeout <ms>", "Timeout in ms", "10000")
.option("--json", "Output JSON", false) .option("--json", "Output JSON", false)
.action(async (opts) => { .action(async (opts) => {
try { await runChannelsCommand(async () => {
await channelsCapabilitiesCommand(opts, defaultRuntime); await channelsCapabilitiesCommand(opts, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
channels channels
@@ -115,7 +118,7 @@ export function registerChannelsCli(program: Command) {
.option("--kind <kind>", "Target kind (auto|user|group)", "auto") .option("--kind <kind>", "Target kind (auto|user|group)", "auto")
.option("--json", "Output JSON", false) .option("--json", "Output JSON", false)
.action(async (entries, opts) => { .action(async (entries, opts) => {
try { await runChannelsCommand(async () => {
await channelsResolveCommand( await channelsResolveCommand(
{ {
channel: opts.channel as string | undefined, channel: opts.channel as string | undefined,
@@ -126,10 +129,7 @@ export function registerChannelsCli(program: Command) {
}, },
defaultRuntime, defaultRuntime,
); );
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
channels channels
@@ -139,12 +139,9 @@ export function registerChannelsCli(program: Command) {
.option("--lines <n>", "Number of lines (default: 200)", "200") .option("--lines <n>", "Number of lines (default: 200)", "200")
.option("--json", "Output JSON", false) .option("--json", "Output JSON", false)
.action(async (opts) => { .action(async (opts) => {
try { await runChannelsCommand(async () => {
await channelsLogsCommand(opts, defaultRuntime); await channelsLogsCommand(opts, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
channels channels
@@ -174,13 +171,10 @@ export function registerChannelsCli(program: Command) {
.option("--initial-sync-limit <n>", "Matrix initial sync limit") .option("--initial-sync-limit <n>", "Matrix initial sync limit")
.option("--use-env", "Use env token (default account only)", false) .option("--use-env", "Use env token (default account only)", false)
.action(async (opts, command) => { .action(async (opts, command) => {
try { await runChannelsCommand(async () => {
const hasFlags = hasExplicitOptions(command, optionNamesAdd); const hasFlags = hasExplicitOptions(command, optionNamesAdd);
await channelsAddCommand(opts, defaultRuntime, { hasFlags }); await channelsAddCommand(opts, defaultRuntime, { hasFlags });
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
channels channels
@@ -190,13 +184,10 @@ export function registerChannelsCli(program: Command) {
.option("--account <id>", "Account id (default when omitted)") .option("--account <id>", "Account id (default when omitted)")
.option("--delete", "Delete config entries (no prompt)", false) .option("--delete", "Delete config entries (no prompt)", false)
.action(async (opts, command) => { .action(async (opts, command) => {
try { await runChannelsCommand(async () => {
const hasFlags = hasExplicitOptions(command, optionNamesRemove); const hasFlags = hasExplicitOptions(command, optionNamesRemove);
await channelsRemoveCommand(opts, defaultRuntime, { hasFlags }); await channelsRemoveCommand(opts, defaultRuntime, { hasFlags });
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
channels channels
@@ -206,7 +197,8 @@ export function registerChannelsCli(program: Command) {
.option("--account <id>", "Account id (accountId)") .option("--account <id>", "Account id (accountId)")
.option("--verbose", "Verbose connection logs", false) .option("--verbose", "Verbose connection logs", false)
.action(async (opts) => { .action(async (opts) => {
try { await runChannelsCommandWithDanger(
async () => {
await runChannelLogin( await runChannelLogin(
{ {
channel: opts.channel as string | undefined, channel: opts.channel as string | undefined,
@@ -215,10 +207,9 @@ export function registerChannelsCli(program: Command) {
}, },
defaultRuntime, defaultRuntime,
); );
} catch (err) { },
defaultRuntime.error(danger(`Channel login failed: ${String(err)}`)); "Channel login failed",
defaultRuntime.exit(1); );
}
}); });
channels channels
@@ -227,7 +218,8 @@ export function registerChannelsCli(program: Command) {
.option("--channel <channel>", "Channel alias (default: whatsapp)") .option("--channel <channel>", "Channel alias (default: whatsapp)")
.option("--account <id>", "Account id (accountId)") .option("--account <id>", "Account id (accountId)")
.action(async (opts) => { .action(async (opts) => {
try { await runChannelsCommandWithDanger(
async () => {
await runChannelLogout( await runChannelLogout(
{ {
channel: opts.channel as string | undefined, channel: opts.channel as string | undefined,
@@ -235,9 +227,8 @@ export function registerChannelsCli(program: Command) {
}, },
defaultRuntime, defaultRuntime,
); );
} catch (err) { },
defaultRuntime.error(danger(`Channel logout failed: ${String(err)}`)); "Channel logout failed",
defaultRuntime.exit(1); );
}
}); });
} }

17
src/cli/cli-utils.ts
View File

@@ -29,3 +29,20 @@ export async function withManager<T>(params: {
} }
} }
} }
export async function runCommandWithRuntime(
runtime: { error: (message: string) => void; exit: (code: number) => void },
action: () => Promise<void>,
onError?: (error: unknown) => void,
): Promise<void> {
try {
await action();
} catch (err) {
if (onError) {
onError(err);
return;
}
runtime.error(String(err));
runtime.exit(1);
}
}

8
src/cli/docs-cli.ts
View File

@@ -4,6 +4,7 @@ import { docsSearchCommand } from "../commands/docs.js";
import { defaultRuntime } from "../runtime.js"; import { defaultRuntime } from "../runtime.js";
import { formatDocsLink } from "../terminal/links.js"; import { formatDocsLink } from "../terminal/links.js";
import { theme } from "../terminal/theme.js"; import { theme } from "../terminal/theme.js";
import { runCommandWithRuntime } from "./cli-utils.js";
export function registerDocsCli(program: Command) { export function registerDocsCli(program: Command) {
program program
@@ -15,11 +16,8 @@ export function registerDocsCli(program: Command) {
() => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/docs", "docs.clawd.bot/cli/docs")}\n`, () => `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/docs", "docs.clawd.bot/cli/docs")}\n`,
) )
.action(async (queryParts: string[]) => { .action(async (queryParts: string[]) => {
try { await runCommandWithRuntime(defaultRuntime, async () => {
await docsSearchCommand(queryParts, defaultRuntime); await docsSearchCommand(queryParts, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
} }

37
src/cli/gateway-cli/register.ts
View File

@@ -7,6 +7,7 @@ import { defaultRuntime } from "../../runtime.js";
import { formatDocsLink } from "../../terminal/links.js"; import { formatDocsLink } from "../../terminal/links.js";
import { colorize, isRich, theme } from "../../terminal/theme.js"; import { colorize, isRich, theme } from "../../terminal/theme.js";
import { withProgress } from "../progress.js"; import { withProgress } from "../progress.js";
import { runCommandWithRuntime } from "../cli-utils.js";
import { callGatewayCli, gatewayCallOpts } from "./call.js"; import { callGatewayCli, gatewayCallOpts } from "./call.js";
import type { GatewayDiscoverOpts } from "./discover.js"; import type { GatewayDiscoverOpts } from "./discover.js";
import { import {
@@ -41,6 +42,14 @@ function styleHealthChannelLine(line: string, rich: boolean): string {
return line; return line;
} }
function runGatewayCommand(action: () => Promise<void>, label?: string) {
return runCommandWithRuntime(defaultRuntime, action, (err) => {
const message = String(err);
defaultRuntime.error(label ? `${label}: ${message}` : message);
defaultRuntime.exit(1);
});
}
export function registerGatewayCli(program: Command) { export function registerGatewayCli(program: Command) {
const gateway = addGatewayRunCommand( const gateway = addGatewayRunCommand(
program program
@@ -67,7 +76,7 @@ export function registerGatewayCli(program: Command) {
.argument("<method>", "Method name (health/status/system-presence/cron.*)") .argument("<method>", "Method name (health/status/system-presence/cron.*)")
.option("--params <json>", "JSON object string for params", "{}") .option("--params <json>", "JSON object string for params", "{}")
.action(async (method, opts) => { .action(async (method, opts) => {
try { await runGatewayCommand(async () => {
const params = JSON.parse(String(opts.params ?? "{}")); const params = JSON.parse(String(opts.params ?? "{}"));
const result = await callGatewayCli(method, opts, params); const result = await callGatewayCli(method, opts, params);
if (opts.json) { if (opts.json) {
@@ -79,10 +88,7 @@ export function registerGatewayCli(program: Command) {
`${colorize(rich, theme.heading, "Gateway call")}: ${colorize(rich, theme.muted, String(method))}`, `${colorize(rich, theme.heading, "Gateway call")}: ${colorize(rich, theme.muted, String(method))}`,
); );
defaultRuntime.log(JSON.stringify(result, null, 2)); defaultRuntime.log(JSON.stringify(result, null, 2));
} catch (err) { }, "Gateway call failed");
defaultRuntime.error(`Gateway call failed: ${String(err)}`);
defaultRuntime.exit(1);
}
}), }),
); );
@@ -91,7 +97,7 @@ export function registerGatewayCli(program: Command) {
.command("health") .command("health")
.description("Fetch Gateway health") .description("Fetch Gateway health")
.action(async (opts) => { .action(async (opts) => {
try { await runGatewayCommand(async () => {
const result = await callGatewayCli("health", opts); const result = await callGatewayCli("health", opts);
if (opts.json) { if (opts.json) {
defaultRuntime.log(JSON.stringify(result, null, 2)); defaultRuntime.log(JSON.stringify(result, null, 2));
@@ -110,10 +116,7 @@ export function registerGatewayCli(program: Command) {
defaultRuntime.log(styleHealthChannelLine(line, rich)); defaultRuntime.log(styleHealthChannelLine(line, rich));
} }
} }
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}), }),
); );
@@ -129,12 +132,9 @@ export function registerGatewayCli(program: Command) {
.option("--timeout <ms>", "Overall probe budget in ms", "3000") .option("--timeout <ms>", "Overall probe budget in ms", "3000")
.option("--json", "Output JSON", false) .option("--json", "Output JSON", false)
.action(async (opts) => { .action(async (opts) => {
try { await runGatewayCommand(async () => {
await gatewayStatusCommand(opts, defaultRuntime); await gatewayStatusCommand(opts, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
gateway gateway
@@ -145,7 +145,7 @@ export function registerGatewayCli(program: Command) {
.option("--timeout <ms>", "Per-command timeout in ms", "2000") .option("--timeout <ms>", "Per-command timeout in ms", "2000")
.option("--json", "Output JSON", false) .option("--json", "Output JSON", false)
.action(async (opts: GatewayDiscoverOpts) => { .action(async (opts: GatewayDiscoverOpts) => {
try { await runGatewayCommand(async () => {
const timeoutMs = parseDiscoverTimeoutMs(opts.timeout, 2000); const timeoutMs = parseDiscoverTimeoutMs(opts.timeout, 2000);
const beacons = await withProgress( const beacons = await withProgress(
{ {
@@ -200,9 +200,6 @@ export function registerGatewayCli(program: Command) {
defaultRuntime.log(line); defaultRuntime.log(line);
} }
} }
} catch (err) { }, "gateway discover failed");
defaultRuntime.error(`gateway discover failed: ${String(err)}`);
defaultRuntime.exit(1);
}
}); });
} }

180
src/cli/models-cli.ts
View File

@@ -29,6 +29,11 @@ import {
import { defaultRuntime } from "../runtime.js"; import { defaultRuntime } from "../runtime.js";
import { formatDocsLink } from "../terminal/links.js"; import { formatDocsLink } from "../terminal/links.js";
import { theme } from "../terminal/theme.js"; import { theme } from "../terminal/theme.js";
import { runCommandWithRuntime } from "./cli-utils.js";
function runModelsCommand(action: () => Promise<void>) {
return runCommandWithRuntime(defaultRuntime, action);
}
export function registerModelsCli(program: Command) { export function registerModelsCli(program: Command) {
const models = program const models = program
@@ -51,12 +56,9 @@ export function registerModelsCli(program: Command) {
.option("--json", "Output JSON", false) .option("--json", "Output JSON", false)
.option("--plain", "Plain line output", false) .option("--plain", "Plain line output", false)
.action(async (opts) => { .action(async (opts) => {
try { await runModelsCommand(async () => {
await modelsListCommand(opts, defaultRuntime); await modelsListCommand(opts, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
models models
@@ -70,12 +72,9 @@ export function registerModelsCli(program: Command) {
false, false,
) )
.action(async (opts) => { .action(async (opts) => {
try { await runModelsCommand(async () => {
await modelsStatusCommand(opts, defaultRuntime); await modelsStatusCommand(opts, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
models models
@@ -83,12 +82,9 @@ export function registerModelsCli(program: Command) {
.description("Set the default model") .description("Set the default model")
.argument("<model>", "Model id or alias") .argument("<model>", "Model id or alias")
.action(async (model: string) => { .action(async (model: string) => {
try { await runModelsCommand(async () => {
await modelsSetCommand(model, defaultRuntime); await modelsSetCommand(model, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
models models
@@ -96,12 +92,9 @@ export function registerModelsCli(program: Command) {
.description("Set the image model") .description("Set the image model")
.argument("<model>", "Model id or alias") .argument("<model>", "Model id or alias")
.action(async (model: string) => { .action(async (model: string) => {
try { await runModelsCommand(async () => {
await modelsSetImageCommand(model, defaultRuntime); await modelsSetImageCommand(model, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
const aliases = models.command("aliases").description("Manage model aliases"); const aliases = models.command("aliases").description("Manage model aliases");
@@ -112,12 +105,9 @@ export function registerModelsCli(program: Command) {
.option("--json", "Output JSON", false) .option("--json", "Output JSON", false)
.option("--plain", "Plain output", false) .option("--plain", "Plain output", false)
.action(async (opts) => { .action(async (opts) => {
try { await runModelsCommand(async () => {
await modelsAliasesListCommand(opts, defaultRuntime); await modelsAliasesListCommand(opts, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
aliases aliases
@@ -126,12 +116,9 @@ export function registerModelsCli(program: Command) {
.argument("<alias>", "Alias name") .argument("<alias>", "Alias name")
.argument("<model>", "Model id or alias") .argument("<model>", "Model id or alias")
.action(async (alias: string, model: string) => { .action(async (alias: string, model: string) => {
try { await runModelsCommand(async () => {
await modelsAliasesAddCommand(alias, model, defaultRuntime); await modelsAliasesAddCommand(alias, model, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
aliases aliases
@@ -139,12 +126,9 @@ export function registerModelsCli(program: Command) {
.description("Remove a model alias") .description("Remove a model alias")
.argument("<alias>", "Alias name") .argument("<alias>", "Alias name")
.action(async (alias: string) => { .action(async (alias: string) => {
try { await runModelsCommand(async () => {
await modelsAliasesRemoveCommand(alias, defaultRuntime); await modelsAliasesRemoveCommand(alias, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
const fallbacks = models.command("fallbacks").description("Manage model fallback list"); const fallbacks = models.command("fallbacks").description("Manage model fallback list");
@@ -155,12 +139,9 @@ export function registerModelsCli(program: Command) {
.option("--json", "Output JSON", false) .option("--json", "Output JSON", false)
.option("--plain", "Plain output", false) .option("--plain", "Plain output", false)
.action(async (opts) => { .action(async (opts) => {
try { await runModelsCommand(async () => {
await modelsFallbacksListCommand(opts, defaultRuntime); await modelsFallbacksListCommand(opts, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
fallbacks fallbacks
@@ -168,12 +149,9 @@ export function registerModelsCli(program: Command) {
.description("Add a fallback model") .description("Add a fallback model")
.argument("<model>", "Model id or alias") .argument("<model>", "Model id or alias")
.action(async (model: string) => { .action(async (model: string) => {
try { await runModelsCommand(async () => {
await modelsFallbacksAddCommand(model, defaultRuntime); await modelsFallbacksAddCommand(model, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
fallbacks fallbacks
@@ -181,24 +159,18 @@ export function registerModelsCli(program: Command) {
.description("Remove a fallback model") .description("Remove a fallback model")
.argument("<model>", "Model id or alias") .argument("<model>", "Model id or alias")
.action(async (model: string) => { .action(async (model: string) => {
try { await runModelsCommand(async () => {
await modelsFallbacksRemoveCommand(model, defaultRuntime); await modelsFallbacksRemoveCommand(model, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
fallbacks fallbacks
.command("clear") .command("clear")
.description("Clear all fallback models") .description("Clear all fallback models")
.action(async () => { .action(async () => {
try { await runModelsCommand(async () => {
await modelsFallbacksClearCommand(defaultRuntime); await modelsFallbacksClearCommand(defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
const imageFallbacks = models const imageFallbacks = models
@@ -211,12 +183,9 @@ export function registerModelsCli(program: Command) {
.option("--json", "Output JSON", false) .option("--json", "Output JSON", false)
.option("--plain", "Plain output", false) .option("--plain", "Plain output", false)
.action(async (opts) => { .action(async (opts) => {
try { await runModelsCommand(async () => {
await modelsImageFallbacksListCommand(opts, defaultRuntime); await modelsImageFallbacksListCommand(opts, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
imageFallbacks imageFallbacks
@@ -224,12 +193,9 @@ export function registerModelsCli(program: Command) {
.description("Add an image fallback model") .description("Add an image fallback model")
.argument("<model>", "Model id or alias") .argument("<model>", "Model id or alias")
.action(async (model: string) => { .action(async (model: string) => {
try { await runModelsCommand(async () => {
await modelsImageFallbacksAddCommand(model, defaultRuntime); await modelsImageFallbacksAddCommand(model, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
imageFallbacks imageFallbacks
@@ -237,24 +203,18 @@ export function registerModelsCli(program: Command) {
.description("Remove an image fallback model") .description("Remove an image fallback model")
.argument("<model>", "Model id or alias") .argument("<model>", "Model id or alias")
.action(async (model: string) => { .action(async (model: string) => {
try { await runModelsCommand(async () => {
await modelsImageFallbacksRemoveCommand(model, defaultRuntime); await modelsImageFallbacksRemoveCommand(model, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
imageFallbacks imageFallbacks
.command("clear") .command("clear")
.description("Clear all image fallback models") .description("Clear all image fallback models")
.action(async () => { .action(async () => {
try { await runModelsCommand(async () => {
await modelsImageFallbacksClearCommand(defaultRuntime); await modelsImageFallbacksClearCommand(defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
models models
@@ -273,16 +233,13 @@ export function registerModelsCli(program: Command) {
.option("--set-image", "Set agents.defaults.imageModel to the first image selection", false) .option("--set-image", "Set agents.defaults.imageModel to the first image selection", false)
.option("--json", "Output JSON", false) .option("--json", "Output JSON", false)
.action(async (opts) => { .action(async (opts) => {
try { await runModelsCommand(async () => {
await modelsScanCommand(opts, defaultRuntime); await modelsScanCommand(opts, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
models.action(async (opts) => { models.action(async (opts) => {
try { await runModelsCommand(async () => {
await modelsStatusCommand( await modelsStatusCommand(
{ {
json: Boolean(opts?.statusJson), json: Boolean(opts?.statusJson),
@@ -290,10 +247,7 @@ export function registerModelsCli(program: Command) {
}, },
defaultRuntime, defaultRuntime,
); );
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
const auth = models.command("auth").description("Manage model auth profiles"); const auth = models.command("auth").description("Manage model auth profiles");
@@ -302,12 +256,9 @@ export function registerModelsCli(program: Command) {
.command("add") .command("add")
.description("Interactive auth helper (setup-token or paste token)") .description("Interactive auth helper (setup-token or paste token)")
.action(async () => { .action(async () => {
try { await runModelsCommand(async () => {
await modelsAuthAddCommand({}, defaultRuntime); await modelsAuthAddCommand({}, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
auth auth
@@ -317,7 +268,7 @@ export function registerModelsCli(program: Command) {
.option("--method <id>", "Provider auth method id") .option("--method <id>", "Provider auth method id")
.option("--set-default", "Apply the provider's default model recommendation", false) .option("--set-default", "Apply the provider's default model recommendation", false)
.action(async (opts) => { .action(async (opts) => {
try { await runModelsCommand(async () => {
await modelsAuthLoginCommand( await modelsAuthLoginCommand(
{ {
provider: opts.provider as string | undefined, provider: opts.provider as string | undefined,
@@ -326,10 +277,7 @@ export function registerModelsCli(program: Command) {
}, },
defaultRuntime, defaultRuntime,
); );
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
auth auth
@@ -338,7 +286,7 @@ export function registerModelsCli(program: Command) {
.option("--provider <name>", "Provider id (default: anthropic)") .option("--provider <name>", "Provider id (default: anthropic)")
.option("--yes", "Skip confirmation", false) .option("--yes", "Skip confirmation", false)
.action(async (opts) => { .action(async (opts) => {
try { await runModelsCommand(async () => {
await modelsAuthSetupTokenCommand( await modelsAuthSetupTokenCommand(
{ {
provider: opts.provider as string | undefined, provider: opts.provider as string | undefined,
@@ -346,10 +294,7 @@ export function registerModelsCli(program: Command) {
}, },
defaultRuntime, defaultRuntime,
); );
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
auth auth
@@ -362,7 +307,7 @@ export function registerModelsCli(program: Command) {
"Optional expiry duration (e.g. 365d, 12h). Stored as absolute expiresAt.", "Optional expiry duration (e.g. 365d, 12h). Stored as absolute expiresAt.",
) )
.action(async (opts) => { .action(async (opts) => {
try { await runModelsCommand(async () => {
await modelsAuthPasteTokenCommand( await modelsAuthPasteTokenCommand(
{ {
provider: opts.provider as string | undefined, provider: opts.provider as string | undefined,
@@ -371,10 +316,7 @@ export function registerModelsCli(program: Command) {
}, },
defaultRuntime, defaultRuntime,
); );
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
auth auth
@@ -383,7 +325,7 @@ export function registerModelsCli(program: Command) {
.option("--profile-id <id>", "Auth profile id (default: github-copilot:github)") .option("--profile-id <id>", "Auth profile id (default: github-copilot:github)")
.option("--yes", "Overwrite existing profile without prompting", false) .option("--yes", "Overwrite existing profile without prompting", false)
.action(async (opts) => { .action(async (opts) => {
try { await runModelsCommand(async () => {
await githubCopilotLoginCommand( await githubCopilotLoginCommand(
{ {
profileId: opts.profileId as string | undefined, profileId: opts.profileId as string | undefined,
@@ -391,10 +333,7 @@ export function registerModelsCli(program: Command) {
}, },
defaultRuntime, defaultRuntime,
); );
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
const order = auth.command("order").description("Manage per-agent auth profile order overrides"); const order = auth.command("order").description("Manage per-agent auth profile order overrides");
@@ -406,7 +345,7 @@ export function registerModelsCli(program: Command) {
.option("--agent <id>", "Agent id (default: configured default agent)") .option("--agent <id>", "Agent id (default: configured default agent)")
.option("--json", "Output JSON", false) .option("--json", "Output JSON", false)
.action(async (opts) => { .action(async (opts) => {
try { await runModelsCommand(async () => {
await modelsAuthOrderGetCommand( await modelsAuthOrderGetCommand(
{ {
provider: opts.provider as string, provider: opts.provider as string,
@@ -415,10 +354,7 @@ export function registerModelsCli(program: Command) {
}, },
defaultRuntime, defaultRuntime,
); );
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
order order
@@ -428,7 +364,7 @@ export function registerModelsCli(program: Command) {
.option("--agent <id>", "Agent id (default: configured default agent)") .option("--agent <id>", "Agent id (default: configured default agent)")
.argument("<profileIds...>", "Auth profile ids (e.g. anthropic:claude-cli)") .argument("<profileIds...>", "Auth profile ids (e.g. anthropic:claude-cli)")
.action(async (profileIds: string[], opts) => { .action(async (profileIds: string[], opts) => {
try { await runModelsCommand(async () => {
await modelsAuthOrderSetCommand( await modelsAuthOrderSetCommand(
{ {
provider: opts.provider as string, provider: opts.provider as string,
@@ -437,10 +373,7 @@ export function registerModelsCli(program: Command) {
}, },
defaultRuntime, defaultRuntime,
); );
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
order order
@@ -449,7 +382,7 @@ export function registerModelsCli(program: Command) {
.requiredOption("--provider <name>", "Provider id (e.g. anthropic)") .requiredOption("--provider <name>", "Provider id (e.g. anthropic)")
.option("--agent <id>", "Agent id (default: configured default agent)") .option("--agent <id>", "Agent id (default: configured default agent)")
.action(async (opts) => { .action(async (opts) => {
try { await runModelsCommand(async () => {
await modelsAuthOrderClearCommand( await modelsAuthOrderClearCommand(
{ {
provider: opts.provider as string, provider: opts.provider as string,
@@ -457,9 +390,6 @@ export function registerModelsCli(program: Command) {
}, },
defaultRuntime, defaultRuntime,
); );
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
} }

17
src/cli/program/message/helpers.ts
View File

@@ -4,7 +4,7 @@ import { danger, setVerbose } from "../../../globals.js";
import { CHANNEL_TARGET_DESCRIPTION } from "../../../infra/outbound/channel-target.js"; import { CHANNEL_TARGET_DESCRIPTION } from "../../../infra/outbound/channel-target.js";
import { defaultRuntime } from "../../../runtime.js"; import { defaultRuntime } from "../../../runtime.js";
import { createDefaultDeps } from "../../deps.js"; import { createDefaultDeps } from "../../deps.js";
import { ensureConfigReady } from "../config-guard.js"; import { runCommandWithRuntime } from "../../cli-utils.js";
export type MessageCliHelpers = { export type MessageCliHelpers = {
withMessageBase: (command: Command) => Command; withMessageBase: (command: Command) => Command;
@@ -31,10 +31,11 @@ export function createMessageCliHelpers(
command.requiredOption("-t, --target <dest>", CHANNEL_TARGET_DESCRIPTION); command.requiredOption("-t, --target <dest>", CHANNEL_TARGET_DESCRIPTION);
const runMessageAction = async (action: string, opts: Record<string, unknown>) => { const runMessageAction = async (action: string, opts: Record<string, unknown>) => {
await ensureConfigReady({ runtime: defaultRuntime, migrateState: true });
setVerbose(Boolean(opts.verbose)); setVerbose(Boolean(opts.verbose));
const deps = createDefaultDeps(); const deps = createDefaultDeps();
try { await runCommandWithRuntime(
defaultRuntime,
async () => {
await messageCommand( await messageCommand(
{ {
...(() => { ...(() => {
@@ -49,10 +50,12 @@ export function createMessageCliHelpers(
deps, deps,
defaultRuntime, defaultRuntime,
); );
} catch (err) { },
defaultRuntime.error(danger(String(err))); (err) => {
defaultRuntime.exit(1); defaultRuntime.error(danger(String(err)));
} defaultRuntime.exit(1);
},
);
}; };
// `message` is only used for `message.help({ error: true })`, keep the // `message` is only used for `message.help({ error: true })`, keep the

42
src/cli/program/register.agent.ts
View File

@@ -8,8 +8,8 @@ import { formatDocsLink } from "../../terminal/links.js";
import { theme } from "../../terminal/theme.js"; import { theme } from "../../terminal/theme.js";
import { hasExplicitOptions } from "../command-options.js"; import { hasExplicitOptions } from "../command-options.js";
import { createDefaultDeps } from "../deps.js"; import { createDefaultDeps } from "../deps.js";
import { runCommandWithRuntime } from "../cli-utils.js";
import { collectOption } from "./helpers.js"; import { collectOption } from "./helpers.js";
import { ensureConfigReady } from "./config-guard.js";
export function registerAgentCommands(program: Command, args: { agentChannelOptions: string }) { export function registerAgentCommands(program: Command, args: { agentChannelOptions: string }) {
program program
@@ -54,17 +54,13 @@ Examples:
${theme.muted("Docs:")} ${formatDocsLink("/cli/agent", "docs.clawd.bot/cli/agent")}`, ${theme.muted("Docs:")} ${formatDocsLink("/cli/agent", "docs.clawd.bot/cli/agent")}`,
) )
.action(async (opts) => { .action(async (opts) => {
await ensureConfigReady({ runtime: defaultRuntime, migrateState: false });
const verboseLevel = typeof opts.verbose === "string" ? opts.verbose.toLowerCase() : ""; const verboseLevel = typeof opts.verbose === "string" ? opts.verbose.toLowerCase() : "";
setVerbose(verboseLevel === "on"); setVerbose(verboseLevel === "on");
// Build default deps (keeps parity with other commands; future-proofing). // Build default deps (keeps parity with other commands; future-proofing).
const deps = createDefaultDeps(); const deps = createDefaultDeps();
try { await runCommandWithRuntime(defaultRuntime, async () => {
await agentCliCommand(opts, defaultRuntime, deps); await agentCliCommand(opts, defaultRuntime, deps);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
const agents = program const agents = program
@@ -82,16 +78,12 @@ ${theme.muted("Docs:")} ${formatDocsLink("/cli/agent", "docs.clawd.bot/cli/agent
.option("--json", "Output JSON instead of text", false) .option("--json", "Output JSON instead of text", false)
.option("--bindings", "Include routing bindings", false) .option("--bindings", "Include routing bindings", false)
.action(async (opts) => { .action(async (opts) => {
await ensureConfigReady({ runtime: defaultRuntime, migrateState: true }); await runCommandWithRuntime(defaultRuntime, async () => {
try {
await agentsListCommand( await agentsListCommand(
{ json: Boolean(opts.json), bindings: Boolean(opts.bindings) }, { json: Boolean(opts.json), bindings: Boolean(opts.bindings) },
defaultRuntime, defaultRuntime,
); );
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
agents agents
@@ -104,8 +96,7 @@ ${theme.muted("Docs:")} ${formatDocsLink("/cli/agent", "docs.clawd.bot/cli/agent
.option("--non-interactive", "Disable prompts; requires --workspace", false) .option("--non-interactive", "Disable prompts; requires --workspace", false)
.option("--json", "Output JSON summary", false) .option("--json", "Output JSON summary", false)
.action(async (name, opts, command) => { .action(async (name, opts, command) => {
await ensureConfigReady({ runtime: defaultRuntime, migrateState: true }); await runCommandWithRuntime(defaultRuntime, async () => {
try {
const hasFlags = hasExplicitOptions(command, [ const hasFlags = hasExplicitOptions(command, [
"workspace", "workspace",
"model", "model",
@@ -126,10 +117,7 @@ ${theme.muted("Docs:")} ${formatDocsLink("/cli/agent", "docs.clawd.bot/cli/agent
defaultRuntime, defaultRuntime,
{ hasFlags }, { hasFlags },
); );
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
agents agents
@@ -138,8 +126,7 @@ ${theme.muted("Docs:")} ${formatDocsLink("/cli/agent", "docs.clawd.bot/cli/agent
.option("--force", "Skip confirmation", false) .option("--force", "Skip confirmation", false)
.option("--json", "Output JSON summary", false) .option("--json", "Output JSON summary", false)
.action(async (id, opts) => { .action(async (id, opts) => {
await ensureConfigReady({ runtime: defaultRuntime, migrateState: true }); await runCommandWithRuntime(defaultRuntime, async () => {
try {
await agentsDeleteCommand( await agentsDeleteCommand(
{ {
id: String(id), id: String(id),
@@ -148,19 +135,12 @@ ${theme.muted("Docs:")} ${formatDocsLink("/cli/agent", "docs.clawd.bot/cli/agent
}, },
defaultRuntime, defaultRuntime,
); );
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
agents.action(async () => { agents.action(async () => {
await ensureConfigReady({ runtime: defaultRuntime, migrateState: true }); await runCommandWithRuntime(defaultRuntime, async () => {
try {
await agentsListCommand({}, defaultRuntime); await agentsListCommand({}, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
} }

8
src/cli/program/register.configure.ts
View File

@@ -7,6 +7,7 @@ import {
import { defaultRuntime } from "../../runtime.js"; import { defaultRuntime } from "../../runtime.js";
import { formatDocsLink } from "../../terminal/links.js"; import { formatDocsLink } from "../../terminal/links.js";
import { theme } from "../../terminal/theme.js"; import { theme } from "../../terminal/theme.js";
import { runCommandWithRuntime } from "../cli-utils.js";
export function registerConfigureCommand(program: Command) { export function registerConfigureCommand(program: Command) {
program program
@@ -24,7 +25,7 @@ export function registerConfigureCommand(program: Command) {
[] as string[], [] as string[],
) )
.action(async (opts) => { .action(async (opts) => {
try { await runCommandWithRuntime(defaultRuntime, async () => {
const sections: string[] = Array.isArray(opts.section) const sections: string[] = Array.isArray(opts.section)
? opts.section ? opts.section
.map((value: unknown) => (typeof value === "string" ? value.trim() : "")) .map((value: unknown) => (typeof value === "string" ? value.trim() : ""))
@@ -45,9 +46,6 @@ export function registerConfigureCommand(program: Command) {
} }
await configureCommandWithSections(sections as never, defaultRuntime); await configureCommandWithSections(sections as never, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
} }

29
src/cli/program/register.maintenance.ts
View File

@@ -6,6 +6,7 @@ import { uninstallCommand } from "../../commands/uninstall.js";
import { defaultRuntime } from "../../runtime.js"; import { defaultRuntime } from "../../runtime.js";
import { formatDocsLink } from "../../terminal/links.js"; import { formatDocsLink } from "../../terminal/links.js";
import { theme } from "../../terminal/theme.js"; import { theme } from "../../terminal/theme.js";
import { runCommandWithRuntime } from "../cli-utils.js";
export function registerMaintenanceCommands(program: Command) { export function registerMaintenanceCommands(program: Command) {
program program
@@ -24,7 +25,7 @@ export function registerMaintenanceCommands(program: Command) {
.option("--generate-gateway-token", "Generate and configure a gateway token", false) .option("--generate-gateway-token", "Generate and configure a gateway token", false)
.option("--deep", "Scan system services for extra gateway installs", false) .option("--deep", "Scan system services for extra gateway installs", false)
.action(async (opts) => { .action(async (opts) => {
try { await runCommandWithRuntime(defaultRuntime, async () => {
await doctorCommand(defaultRuntime, { await doctorCommand(defaultRuntime, {
workspaceSuggestions: opts.workspaceSuggestions, workspaceSuggestions: opts.workspaceSuggestions,
yes: Boolean(opts.yes), yes: Boolean(opts.yes),
@@ -34,10 +35,7 @@ export function registerMaintenanceCommands(program: Command) {
generateGatewayToken: Boolean(opts.generateGatewayToken), generateGatewayToken: Boolean(opts.generateGatewayToken),
deep: Boolean(opts.deep), deep: Boolean(opts.deep),
}); });
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
program program
@@ -50,14 +48,11 @@ export function registerMaintenanceCommands(program: Command) {
) )
.option("--no-open", "Print URL but do not launch a browser", false) .option("--no-open", "Print URL but do not launch a browser", false)
.action(async (opts) => { .action(async (opts) => {
try { await runCommandWithRuntime(defaultRuntime, async () => {
await dashboardCommand(defaultRuntime, { await dashboardCommand(defaultRuntime, {
noOpen: Boolean(opts.noOpen), noOpen: Boolean(opts.noOpen),
}); });
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
program program
@@ -73,17 +68,14 @@ export function registerMaintenanceCommands(program: Command) {
.option("--non-interactive", "Disable prompts (requires --scope + --yes)", false) .option("--non-interactive", "Disable prompts (requires --scope + --yes)", false)
.option("--dry-run", "Print actions without removing files", false) .option("--dry-run", "Print actions without removing files", false)
.action(async (opts) => { .action(async (opts) => {
try { await runCommandWithRuntime(defaultRuntime, async () => {
await resetCommand(defaultRuntime, { await resetCommand(defaultRuntime, {
scope: opts.scope, scope: opts.scope,
yes: Boolean(opts.yes), yes: Boolean(opts.yes),
nonInteractive: Boolean(opts.nonInteractive), nonInteractive: Boolean(opts.nonInteractive),
dryRun: Boolean(opts.dryRun), dryRun: Boolean(opts.dryRun),
}); });
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
program program
@@ -103,7 +95,7 @@ export function registerMaintenanceCommands(program: Command) {
.option("--non-interactive", "Disable prompts (requires --yes)", false) .option("--non-interactive", "Disable prompts (requires --yes)", false)
.option("--dry-run", "Print actions without removing files", false) .option("--dry-run", "Print actions without removing files", false)
.action(async (opts) => { .action(async (opts) => {
try { await runCommandWithRuntime(defaultRuntime, async () => {
await uninstallCommand(defaultRuntime, { await uninstallCommand(defaultRuntime, {
service: Boolean(opts.service), service: Boolean(opts.service),
state: Boolean(opts.state), state: Boolean(opts.state),
@@ -114,9 +106,6 @@ export function registerMaintenanceCommands(program: Command) {
nonInteractive: Boolean(opts.nonInteractive), nonInteractive: Boolean(opts.nonInteractive),
dryRun: Boolean(opts.dryRun), dryRun: Boolean(opts.dryRun),
}); });
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
} }

8
src/cli/program/register.onboard.ts
View File

@@ -11,6 +11,7 @@ import type {
import { defaultRuntime } from "../../runtime.js"; import { defaultRuntime } from "../../runtime.js";
import { formatDocsLink } from "../../terminal/links.js"; import { formatDocsLink } from "../../terminal/links.js";
import { theme } from "../../terminal/theme.js"; import { theme } from "../../terminal/theme.js";
import { runCommandWithRuntime } from "../cli-utils.js";
function resolveInstallDaemonFlag( function resolveInstallDaemonFlag(
command: unknown, command: unknown,
@@ -94,7 +95,7 @@ export function registerOnboardCommand(program: Command) {
.option("--node-manager <name>", "Node manager for skills: npm|pnpm|bun") .option("--node-manager <name>", "Node manager for skills: npm|pnpm|bun")
.option("--json", "Output JSON summary", false) .option("--json", "Output JSON summary", false)
.action(async (opts, command) => { .action(async (opts, command) => {
try { await runCommandWithRuntime(defaultRuntime, async () => {
const installDaemon = resolveInstallDaemonFlag(command, { const installDaemon = resolveInstallDaemonFlag(command, {
installDaemon: Boolean(opts.installDaemon), installDaemon: Boolean(opts.installDaemon),
}); });
@@ -147,9 +148,6 @@ export function registerOnboardCommand(program: Command) {
}, },
defaultRuntime, defaultRuntime,
); );
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
} }

8
src/cli/program/register.setup.ts
View File

@@ -5,6 +5,7 @@ import { defaultRuntime } from "../../runtime.js";
import { formatDocsLink } from "../../terminal/links.js"; import { formatDocsLink } from "../../terminal/links.js";
import { theme } from "../../terminal/theme.js"; import { theme } from "../../terminal/theme.js";
import { hasExplicitOptions } from "../command-options.js"; import { hasExplicitOptions } from "../command-options.js";
import { runCommandWithRuntime } from "../cli-utils.js";
export function registerSetupCommand(program: Command) { export function registerSetupCommand(program: Command) {
program program
@@ -25,7 +26,7 @@ export function registerSetupCommand(program: Command) {
.option("--remote-url <url>", "Remote Gateway WebSocket URL") .option("--remote-url <url>", "Remote Gateway WebSocket URL")
.option("--remote-token <token>", "Remote Gateway token (optional)") .option("--remote-token <token>", "Remote Gateway token (optional)")
.action(async (opts, command) => { .action(async (opts, command) => {
try { await runCommandWithRuntime(defaultRuntime, async () => {
const hasWizardFlags = hasExplicitOptions(command, [ const hasWizardFlags = hasExplicitOptions(command, [
"wizard", "wizard",
"nonInteractive", "nonInteractive",
@@ -47,9 +48,6 @@ export function registerSetupCommand(program: Command) {
return; return;
} }
await setupCommand({ workspace: opts.workspace as string | undefined }, defaultRuntime); await setupCommand({ workspace: opts.workspace as string | undefined }, defaultRuntime);
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
} }

49
src/cli/program/register.status-health-sessions.ts
View File

@@ -6,8 +6,22 @@ import { setVerbose } from "../../globals.js";
import { defaultRuntime } from "../../runtime.js"; import { defaultRuntime } from "../../runtime.js";
import { formatDocsLink } from "../../terminal/links.js"; import { formatDocsLink } from "../../terminal/links.js";
import { theme } from "../../terminal/theme.js"; import { theme } from "../../terminal/theme.js";
import { runCommandWithRuntime } from "../cli-utils.js";
import { parsePositiveIntOrUndefined } from "./helpers.js"; import { parsePositiveIntOrUndefined } from "./helpers.js";
import { ensureConfigReady } from "./config-guard.js";
function resolveVerbose(opts: { verbose?: boolean; debug?: boolean }): boolean {
return Boolean(opts.verbose || opts.debug);
}
function parseTimeoutMs(timeout: unknown): number | null | undefined {
const parsed = parsePositiveIntOrUndefined(timeout);
if (timeout !== undefined && parsed === undefined) {
defaultRuntime.error("--timeout must be a positive integer (milliseconds)");
defaultRuntime.exit(1);
return null;
}
return parsed;
}
export function registerStatusHealthSessionsCommands(program: Command) { export function registerStatusHealthSessionsCommands(program: Command) {
program program
@@ -38,16 +52,13 @@ Examples:
`\n${theme.muted("Docs:")} ${formatDocsLink("/cli/status", "docs.clawd.bot/cli/status")}\n`, `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/status", "docs.clawd.bot/cli/status")}\n`,
) )
.action(async (opts) => { .action(async (opts) => {
await ensureConfigReady({ runtime: defaultRuntime, migrateState: false }); const verbose = resolveVerbose(opts);
const verbose = Boolean(opts.verbose || opts.debug);
setVerbose(verbose); setVerbose(verbose);
const timeout = parsePositiveIntOrUndefined(opts.timeout); const timeout = parseTimeoutMs(opts.timeout);
if (opts.timeout !== undefined && timeout === undefined) { if (timeout === null) {
defaultRuntime.error("--timeout must be a positive integer (milliseconds)");
defaultRuntime.exit(1);
return; return;
} }
try { await runCommandWithRuntime(defaultRuntime, async () => {
await statusCommand( await statusCommand(
{ {
json: Boolean(opts.json), json: Boolean(opts.json),
@@ -59,10 +70,7 @@ Examples:
}, },
defaultRuntime, defaultRuntime,
); );
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
program program
@@ -78,16 +86,13 @@ Examples:
`\n${theme.muted("Docs:")} ${formatDocsLink("/cli/health", "docs.clawd.bot/cli/health")}\n`, `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/health", "docs.clawd.bot/cli/health")}\n`,
) )
.action(async (opts) => { .action(async (opts) => {
await ensureConfigReady({ runtime: defaultRuntime, migrateState: false }); const verbose = resolveVerbose(opts);
const verbose = Boolean(opts.verbose || opts.debug);
setVerbose(verbose); setVerbose(verbose);
const timeout = parsePositiveIntOrUndefined(opts.timeout); const timeout = parseTimeoutMs(opts.timeout);
if (opts.timeout !== undefined && timeout === undefined) { if (timeout === null) {
defaultRuntime.error("--timeout must be a positive integer (milliseconds)");
defaultRuntime.exit(1);
return; return;
} }
try { await runCommandWithRuntime(defaultRuntime, async () => {
await healthCommand( await healthCommand(
{ {
json: Boolean(opts.json), json: Boolean(opts.json),
@@ -96,10 +101,7 @@ Examples:
}, },
defaultRuntime, defaultRuntime,
); );
} catch (err) { });
defaultRuntime.error(String(err));
defaultRuntime.exit(1);
}
}); });
program program
@@ -126,7 +128,6 @@ Shows token usage per session when the agent reports it; set agents.defaults.con
`\n${theme.muted("Docs:")} ${formatDocsLink("/cli/sessions", "docs.clawd.bot/cli/sessions")}\n`, `\n${theme.muted("Docs:")} ${formatDocsLink("/cli/sessions", "docs.clawd.bot/cli/sessions")}\n`,
) )
.action(async (opts) => { .action(async (opts) => {
await ensureConfigReady({ runtime: defaultRuntime, migrateState: false });
setVerbose(Boolean(opts.verbose)); setVerbose(Boolean(opts.verbose));
await sessionsCommand( await sessionsCommand(
{ {