Skip to content

Garry's Opinionated OpenClaw/Hermes Agent Brain

TypeScript

fix(cli): jobs watch reads --refresh-ms <n>; doctor --scope=<v> now splits like other value flags (#7624)

garrytan0fbf4a15e6ff
diff --git a/src/cli/flag-equals.ts b/src/cli/flag-equals.ts
index b533f42f7a..0a7aaf7ab2 100644
--- a/src/cli/flag-equals.ts
+++ b/src/cli/flag-equals.ts
@@ -91,9 +91,9 @@ export const EQUALS_READERS: Readonly<Record<string, readonly string[]>> = {
'compile-context': ['--target', '--budget', '--include', '--out', '--source'],
// core/consent.ts:123 parseConsentFlags via enableConsent (decide.ts:348, effects paid); decide reads no --max-* itself.
'decide enable': ['--max-usd', '--max-cost'],
- // doctor/budget.ts parseDoctorScope --scope (both forms, #7624); doctor/budget.ts:68 --tier/--budget-ms; cli/commands/doctor.ts:27 --tier (thin client);
+ // doctor/budget.ts:68 --tier/--budget-ms; cli/commands/doctor.ts:27 --tier (thin client); --scope is split (parseDoctorScope reads both forms, #7624);
// doctor/registry.ts:332 --only; check-resolvable.ts:120 --skills-dir via doctor.ts:460; core/consent.ts:130 --expect (remediate-consent.ts:133).
- doctor: ['--scope', '--tier', '--budget-ms', '--only', '--skills-dir', '--expect'],
+ doctor: ['--tier', '--budget-ms', '--only', '--skills-dir', '--expect'],
// edge-proposals.ts:81 flag() used only by list (:91,:93); other subs take the first numeric token as the id (:86).
'edge-proposals list': ['--status', '--limit'],
// embed.ts:841 parsePaceArgs (--pace bare or =mode); core/consent.ts:126 via embed-consent.ts:129 and held-embedding.ts:234.
@@ -130,7 +130,7 @@ export const EQUALS_READERS: Readonly<Record<string, readonly string[]>> = {
'jobs supervisor': ['--job-isolation'],
// jobs/shared.ts:121 parseJobIsolationFlag via jobs/work.ts:114.
'jobs work': ['--job-isolation'],
- // jobs/watch.ts:11 reads only --refresh-ms=N.
+ // jobs/watch.ts parseRefreshMs reads --refresh-ms N and --refresh-ms=N (#7624).
'jobs watch': ['--refresh-ms'],
// lint.ts:929 runLint.
lint: ['--exclude'],
diff --git a/src/commands/jobs/watch.ts b/src/commands/jobs/watch.ts
index 2a82ceb6a8..f543fa11e0 100644
--- a/src/commands/jobs/watch.ts
+++ b/src/commands/jobs/watch.ts
@@ -1,15 +1,20 @@
/** `gbrain jobs watch` (dispatched by runJobs in src/commands/jobs.ts). */
-import { hasFlag, type JobsCommandContext } from './shared.ts';
+import { hasFlag, parseFlag, type JobsCommandContext } from './shared.ts';
+
+/** `--refresh-ms <n>` or `--refresh-ms=<n>` (#7624); 1000 when absent. */
+export function parseRefreshMs(args: string[]): number {
+ const raw = args.find(a => a.startsWith('--refresh-ms='))?.slice('--refresh-ms='.length) ?? parseFlag(args, '--refresh-ms');
+ return raw === undefined ? 1000 : parseInt(raw, 10);
+}
export async function runJobsWatch({ args, engine, queue }: JobsCommandContext): Promise<void> {
// v0.41 D2 — live dashboard; v0.42.11.0 (#1784) decoupled output from TTY.
// Flags: --json (FORMAT, human default), --follow (LOOP, default=isTTY so
- // non-TTY one-shots), --refresh-ms=N. Non-TTY no-flag → one human snapshot.
+ // non-TTY one-shots), --refresh-ms N (or =N). Non-TTY no-flag → one human snapshot.
try { await queue.ensureSchema(); }
catch (e) { console.error(e instanceof Error ? e.message : String(e)); process.exit(1); }
const { runWatch } = await import('../jobs-watch.ts');
- const refreshArg = args.find(a => a.startsWith('--refresh-ms='));
- const refreshMs = refreshArg ? parseInt(refreshArg.split('=')[1] ?? '1000', 10) : 1000;
+ const refreshMs = parseRefreshMs(args);
const json = hasFlag(args, '--json');
const follow = hasFlag(args, '--follow') ? true : undefined; // undefined → default to isTTY
await runWatch(engine, { refreshMs, json, follow });
diff --git a/test/cli-flag-equals.test.ts b/test/cli-flag-equals.test.ts
index f092a1efb6..5f23858ae2 100644
--- a/test/cli-flag-equals.test.ts
+++ b/test/cli-flag-equals.test.ts
@@ -109,6 +109,10 @@ describe('#7619 table: every registered CLI_ONLY flag', () => {
describe('#7619 split rules', () => {
afterEach(() => _resetCliOptionsForTest());
+ test('doctor --scope=<v> splits into --scope <v>, which doctor reads (#7624)', async () => {
+ expect(await argvFor('doctor', ['--scope=brain'])).toEqual(['--scope', 'brain']);
+ });
+
test('a value containing = splits at the first =', async () => {
expect(await argvFor('serve', ['--public-url=https://brain.example.com/?a=b'])).toEqual(['--public-url', 'https://brain.example.com/?a=b']);
});
@@ -238,7 +242,6 @@ describe('#7619 split rules', () => {
expect(await argvFor('config', ['set', 'k', '--x=true'])).toEqual(['set', 'k', '--x=true']);
expect(await argvFor('pages', ['purge-deleted', '--older-than=72'])).toEqual(['purge-deleted', '--older-than=72']);
expect(await argvFor('embed', ['--pace=gentle'])).toEqual(['--pace=gentle']);
- expect(await argvFor('doctor', ['--scope=brain'])).toEqual(['--scope=brain']);
expect(await argvFor('search', ['--limit=5'])).toEqual(['--limit=5']);
expect(await argvFor('retrieval-upgrade', ['--yes=true'])).toEqual(['--yes=true']);
expect(await argvFor('migrate', ['embeddings', '--to=x'])).toEqual(['embeddings', '--to=x']);
diff --git a/test/jobs-watch-snapshot.test.ts b/test/jobs-watch-snapshot.test.ts
index aa1dc90a87..667c0c0642 100644
--- a/test/jobs-watch-snapshot.test.ts
+++ b/test/jobs-watch-snapshot.test.ts
@@ -15,6 +15,7 @@
import { describe, test, expect } from 'bun:test';
import { renderSnapshot, type WatchSnapshot } from '../src/commands/jobs-watch.ts';
+import { parseRefreshMs } from '../src/commands/jobs/watch.ts';
function emptySnap(opts: Partial<WatchSnapshot> = {}): WatchSnapshot {
return {
@@ -130,3 +131,14 @@ describe('renderSnapshot', () => {
expect(a).toBe(b);
});
});
+
+describe('jobs watch --refresh-ms (#7624)', () => {
+ // Value: protects=gbrain jobs watch --refresh-ms 250 refreshes every 250 ms, as --refresh-ms=250 does;
+ // fails_when=the separate-value form is ignored and the 1000 ms default applies; why_new=no test read
+ // watch's flags; seam=parseRefreshMs; no_claim=validation of the value itself.
+ test('reads --refresh-ms <n> and --refresh-ms=<n>; absent means 1000', () => {
+ expect(parseRefreshMs(['--refresh-ms', '250', '--follow'])).toBe(250);
+ expect(parseRefreshMs(['--refresh-ms=250'])).toBe(250);
+ expect(parseRefreshMs(['--follow'])).toBe(1000);
+ });
+});