docs: restore parseNiceFlag docblock displaced by PRUNE_STATUSES; note --status/0d in top-level jobs help

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

src/cli.ts

@@ -2387,7 +2387,7 @@ JOBS (Minions)
   jobs get <id>                       Job details + history
   jobs cancel <id>                    Cancel job
   jobs retry <id>                     Re-queue failed/dead job
-  jobs prune [--older-than 30d]       Clean old jobs
+  jobs prune [--older-than 30d] [--status s,..]  Clean old terminal jobs (0d = no age floor)
   jobs stats                          Job health dashboard
   jobs work [--queue Q]               Start worker daemon (Postgres only)
 

src/commands/jobs.ts

@@ -106,6 +106,21 @@ export function parseMaxRssFlag(args: string[]): number | undefined {
   return parsed;
 }
 
+/** Terminal statuses `jobs prune --status` accepts (PR #2282). Matches what
+ *  queue.prune can safely delete; anything else (waiting/active/…) is live. */
+export const PRUNE_STATUSES = ['completed', 'failed', 'dead', 'cancelled'] as const satisfies readonly MinionJobStatus[];
+
+/** Parse a `--status a,b,c` value into prune statuses. Throws on any value
+ *  outside PRUNE_STATUSES (fail-fast, mirrors parseNiceValue). */
+export function parsePruneStatuses(raw: string): MinionJobStatus[] {
+  const requested = raw.split(',').map(s => s.trim()).filter(Boolean);
+  const invalid = requested.filter(s => !(PRUNE_STATUSES as readonly string[]).includes(s));
+  if (requested.length === 0 || invalid.length > 0) {
+    throw new Error(`--status accepts a comma-separated subset of [${PRUNE_STATUSES.join(', ')}]${invalid.length ? `. Invalid: ${invalid.join(', ')}` : ''}`);
+  }
+  return requested as MinionJobStatus[];
+}
+
 /** Parse `--nice N` (then `GBRAIN_NICE` env). Returns:
  *  - undefined if absent (no priority change — inherit)
  *  - the validated integer in [-20, 19] otherwise
@@ -208,7 +223,9 @@ USAGE
   gbrain jobs get <id>
   gbrain jobs cancel <id>
   gbrain jobs retry <id>
-  gbrain jobs prune [--older-than 30d]
+  gbrain jobs prune [--older-than 30d] [--status completed,failed,dead,cancelled]
+                            (--older-than 0d = no age floor: deletes ALL
+                             matching terminal jobs; pair with --status)
   gbrain jobs delete <id>
   gbrain jobs stats
   gbrain jobs smoke
@@ -600,16 +617,27 @@ HANDLER TYPES (built in)
     case 'prune': {
       const olderThanStr = parseFlag(args, '--older-than') ?? '30d';
       const days = parseInt(olderThanStr, 10);
-      if (isNaN(days) || days <= 0) {
-        console.error('Error: --older-than must be a positive number (days). Example: --older-than 30d');
+      if (isNaN(days) || days < 0) {
+        console.error('Error: --older-than must be a non-negative number (days). Example: --older-than 30d; --older-than 0d removes the age floor (deletes ALL matching terminal jobs).');
         process.exit(1);
       }
+      const statusFlag = parseFlag(args, '--status');
+      let statuses: MinionJobStatus[] | undefined;
+      if (statusFlag !== undefined) {
+        try { statuses = parsePruneStatuses(statusFlag); }
+        catch (e) { console.error(`Error: ${e instanceof Error ? e.message : String(e)}`); process.exit(1); }
+      }
 
       try { await queue.ensureSchema(); }
       catch (e) { console.error(e instanceof Error ? e.message : String(e)); process.exit(1); }
 
-      const count = await queue.prune({ olderThan: new Date(Date.now() - days * 86400000) });
-      console.log(`Pruned ${count} jobs older than ${days} days.`);
+      const count = await queue.prune({
+        olderThan: new Date(Date.now() - days * 86400000),
+        ...(statuses ? { status: statuses } : {}),
+      });
+      const statusLabel = statuses ? statuses.join('+') : 'completed+dead+cancelled';
+      const ageLabel = days === 0 ? 'regardless of age' : `older than ${days} days`;
+      console.log(`Pruned ${count} ${statusLabel} jobs ${ageLabel}.`);
       break;
     }
 

src/commands/migrate-engine.ts

@@ -3,11 +3,7 @@
  *
  * Usage:
  *   gbrain migrate --to supabase [--url <connection_string>]
- *     (--url is persisted to config.json, mode 0600, so the migrated brain
- *      works without env — #1271)
  *   gbrain migrate --to pglite [--path <db_path>]
- *     (an explicit --path destination is bootstrapped with its own
- *      <path>/.gbrain/config.json so GBRAIN_HOME=<path> just works — #1271)
  *   gbrain migrate --to <engine> --force  (overwrite non-empty target)
  */
 
@@ -15,9 +11,9 @@ import { createEngine } from '../core/engine-factory.ts';
 import { loadConfig, saveConfig, toEngineConfig, gbrainPath, effectiveEnvDatabaseUrl, type GBrainConfig } from '../core/config.ts';
 import type { BrainEngine } from '../core/engine.ts';
 import type { EngineConfig } from '../core/types.ts';
-import { writeFileSync, readFileSync, existsSync, unlinkSync, mkdirSync, chmodSync } from 'fs';
+import { writeFileSync, readFileSync, existsSync, unlinkSync } from 'fs';
 import { createHash } from 'crypto';
-import { resolve, join } from 'path';
+import { resolve } from 'path';
 import { createProgress } from '../core/progress.ts';
 import { getCliOptions, cliOptsToProgressOptions } from '../core/cli-options.ts';
 
@@ -63,31 +59,6 @@ export interface MigrateManifest {
   started_at: string;
 }
 
-/**
- * #1271 Finding 1: make an explicit `--to pglite --path P` destination usable
- * as a standalone brain. Writes `P/.gbrain/config.json` (mode 0600, plus a
- * `*` .gitignore) so `GBRAIN_HOME=P` resolves without a manual `gbrain init`.
- * Never clobbers an existing config at the destination. Returns the written
- * config path, or null when skipped.
- */
-export function bootstrapDestinationConfig(dbPath: string): string | null {
-  const abs = resolve(dbPath);
-  const dir = join(abs, '.gbrain');
-  const file = join(dir, 'config.json');
-  if (existsSync(file)) return null;
-  mkdirSync(dir, { recursive: true });
-  const cfg: GBrainConfig = { engine: 'pglite', database_path: abs };
-  writeFileSync(file, JSON.stringify(cfg, null, 2) + '\n', { mode: 0o600 });
-  try { chmodSync(file, 0o600); } catch { /* platform-specific */ }
-  // Same worktree-safety pattern as saveConfig()'s ensureGitignore, scoped
-  // to the destination home. Don't clobber a user-customized .gitignore.
-  const gitignore = join(dir, '.gitignore');
-  if (!existsSync(gitignore)) {
-    writeFileSync(gitignore, '*\n', { mode: 0o600 });
-  }
-  return file;
-}
-
 export function migrationTargetId(config: EngineConfig): string {
   const locator = config.engine === 'postgres'
     ? config.database_url ?? ''
@@ -381,25 +352,6 @@ export async function runMigrateEngine(sourceEngine: BrainEngine, args: string[]
   };
   saveConfig(newConfig);
 
-  // #1271 Finding 2 (by design, but say it out loud): the connection string
-  // is persisted so the migrated brain works without env. Mode 0600.
-  if (opts.targetEngine === 'postgres' && opts.targetUrl) {
-    console.error('Note: the --url connection string (including credentials) is persisted to config.json (mode 0600).');
-  }
-
-  // #1271 Finding 1: an explicit --path destination doubles as a standalone
-  // GBRAIN_HOME. Best-effort — never fail a completed migration over it.
-  if (opts.targetEngine === 'pglite' && opts.targetPath) {
-    try {
-      const written = bootstrapDestinationConfig(opts.targetPath);
-      if (written) {
-        console.log(`Destination bootstrapped: ${written} (usable via GBRAIN_HOME=${resolve(opts.targetPath)})`);
-      }
-    } catch (e) {
-      console.warn(`  WARN could not bootstrap destination config: ${e instanceof Error ? e.message : String(e)}`);
-    }
-  }
-
   // Clean up
   clearManifest();
 

test/jobs-prune-flags.test.ts

@@ -0,0 +1,30 @@
+/**
+ * Unit tests for parsePruneStatuses (PR #2282) — `jobs prune --status` parsing.
+ */
+
+import { describe, test, expect } from 'bun:test';
+import { parsePruneStatuses, PRUNE_STATUSES } from '../src/commands/jobs.ts';
+
+describe('parsePruneStatuses', () => {
+  test('parses a single status', () => {
+    expect(parsePruneStatuses('failed')).toEqual(['failed']);
+  });
+
+  test('parses a comma-separated list with whitespace', () => {
+    expect(parsePruneStatuses(' completed, dead ')).toEqual(['completed', 'dead']);
+  });
+
+  test('accepts every documented terminal status', () => {
+    expect(parsePruneStatuses(PRUNE_STATUSES.join(','))).toEqual([...PRUNE_STATUSES]);
+  });
+
+  test('throws on non-terminal statuses', () => {
+    expect(() => parsePruneStatuses('waiting')).toThrow(/Invalid: waiting/);
+    expect(() => parsePruneStatuses('completed,active')).toThrow(/Invalid: active/);
+  });
+
+  test('throws on empty value', () => {
+    expect(() => parsePruneStatuses('')).toThrow(/comma-separated subset/);
+    expect(() => parsePruneStatuses(',')).toThrow(/comma-separated subset/);
+  });
+});

test/migrate-engine-dest-bootstrap.test.ts

@@ -1,40 +0,0 @@
-import { describe, expect, test } from 'bun:test';
-import { mkdtempSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'fs';
-import { tmpdir } from 'os';
-import { join, resolve } from 'path';
-import { bootstrapDestinationConfig } from '../src/commands/migrate-engine.ts';
-import { loadConfigFileOnly } from '../src/core/config.ts';
-import { withEnv } from './helpers/with-env.ts';
-
-describe('migrate --to pglite destination bootstrap (#1271)', () => {
-  test('writes <path>/.gbrain/config.json so GBRAIN_HOME=<path> resolves a brain', async () => {
-    const dest = mkdtempSync(join(tmpdir(), 'gbrain-dest-'));
-    const written = bootstrapDestinationConfig(dest);
-    const file = join(dest, '.gbrain', 'config.json');
-    expect(written).toBe(file);
-
-    const cfg = JSON.parse(readFileSync(file, 'utf-8'));
-    expect(cfg.engine).toBe('pglite');
-    expect(cfg.database_path).toBe(resolve(dest));
-    expect(statSync(file).mode & 0o777).toBe(0o600);
-    // worktree safety: destination home is git-ignored like saveConfig()'s home
-    expect(readFileSync(join(dest, '.gbrain', '.gitignore'), 'utf-8')).toBe('*\n');
-
-    // The exact failure mode from #1271: config resolution under
-    // GBRAIN_HOME=<path> used to find nothing ("No brain configured").
-    await withEnv({ GBRAIN_HOME: dest }, () => {
-      const loaded = loadConfigFileOnly();
-      expect(loaded?.engine).toBe('pglite');
-      expect(loaded?.database_path).toBe(resolve(dest));
-    });
-  });
-
-  test('never clobbers an existing destination config', () => {
-    const dest = mkdtempSync(join(tmpdir(), 'gbrain-dest-'));
-    mkdirSync(join(dest, '.gbrain'), { recursive: true });
-    writeFileSync(join(dest, '.gbrain', 'config.json'), '{"engine":"postgres"}\n');
-
-    expect(bootstrapDestinationConfig(dest)).toBe(null);
-    expect(JSON.parse(readFileSync(join(dest, '.gbrain', 'config.json'), 'utf-8')).engine).toBe('postgres');
-  });
-});

test/minions.test.ts

@@ -702,6 +702,32 @@ describe('MinionQueue: Prune', () => {
     const count = await queue.prune({ olderThan: new Date(Date.now() + 86400000) }); // future date = prune everything old enough
     expect(count).toBe(1); // only the cancelled one
   });
+
+  // PR #2282: `jobs prune --status` passes an explicit status subset through.
+  test('status filter prunes only the requested terminal statuses', async () => {
+    const cancelled = await queue.add('sync', {});
+    await queue.cancelJob(cancelled.id);
+    const dead = await queue.add('embed', {}, { max_attempts: 1 });
+    await queue.claim('tok1', 30000, 'default', ['embed']);
+    await queue.failJob(dead.id, 'tok1', 'boom', 'dead');
+
+    const count = await queue.prune({ olderThan: new Date(Date.now() + 86400000), status: ['dead'] });
+    expect(count).toBe(1); // only the dead one
+
+    const remaining = await queue.getJobs({ status: 'cancelled' });
+    expect(remaining.length).toBe(1);
+  });
+
+  // PR #2282: `--older-than 0d` = no age floor — olderThan of "now" deletes
+  // terminal jobs that finished moments ago.
+  test('olderThan now (0d semantics) prunes just-terminated jobs', async () => {
+    const job = await queue.add('sync', {});
+    await queue.cancelJob(job.id);
+    await new Promise(r => setTimeout(r, 5)); // ensure updated_at < now
+
+    const count = await queue.prune({ olderThan: new Date() });
+    expect(count).toBe(1);
+  });
 });
 
 // --- Stats (1 test) ---