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/extract.ts

@@ -43,7 +43,7 @@ import {
 } from '../core/link-extraction.ts';
 import { createProgress } from '../core/progress.ts';
 import { getCliOptions, cliOptsToProgressOptions } from '../core/cli-options.ts';
-import { pathToSlug, slugifyPath, pruneDir, isSyncable } from '../core/sync.ts';
+import { pathToSlug, pruneDir, isSyncable } from '../core/sync.ts';
 // v0.41.18.0: withRetry + isRetryableConnError + WithRetryOpts moved to
 // src/core/retry.ts as the canonical primitive. Engine methods
 // (addLinksBatch/addTimelineEntriesBatch/upsertChunks) now self-retry via
@@ -269,24 +269,14 @@ export function extractMarkdownLinks(content: string): { name: string; relTarget
 export function resolveSlug(fileDir: string, relTarget: string, allSlugs: Set<string>): string | null {
   const targetNoExt = relTarget.endsWith('.md') ? relTarget.slice(0, -3) : relTarget;
 
-  // Issue #1964: wikilinks carry raw Obsidian paths (`[[llm-wiki/entities/AI 3.0]]`)
-  // but allSlugs holds sync-slugified slugs (`llm-wiki/entities/ai-3.0`). Try the
-  // raw candidate first (back-compat), then the sync-consistent slugified form.
-  const hit = (candidate: string): string | null => {
-    if (allSlugs.has(candidate)) return candidate;
-    const slugified = slugifyPath(candidate);
-    if (slugified !== candidate && allSlugs.has(slugified)) return slugified;
-    return null;
-  };
-
-  const s1 = hit(join(fileDir, targetNoExt));
-  if (s1) return s1;
+  const s1 = join(fileDir, targetNoExt);
+  if (allSlugs.has(s1)) return s1;
 
   const parts = fileDir.split('/').filter(Boolean);
   for (let strip = 1; strip <= parts.length; strip++) {
     const ancestor = parts.slice(0, parts.length - strip).join('/');
-    const candidate = hit(ancestor ? join(ancestor, targetNoExt) : targetNoExt);
-    if (candidate) return candidate;
+    const candidate = ancestor ? join(ancestor, targetNoExt) : targetNoExt;
+    if (allSlugs.has(candidate)) return candidate;
   }
 
   return null;

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/core/link-extraction.ts

@@ -14,7 +14,6 @@
 import type { BrainEngine } from './engine.ts';
 import type { PageType } from './types.ts';
 import { ensureWellFormed } from './text-safe.ts';
-import { slugifyPath } from './sync.ts';
 
 /**
  * v0.42.7 — link-extraction version stamp. Bump this ISO timestamp whenever the
@@ -483,29 +482,14 @@ export async function extractPageLinks(
     // pre-v0.40.8.2 behavior of dropping bare wikilinks outside
     // DIR_PATTERN.
     if (ref.needsResolution) {
-      if (typeof resolver.resolveBasenameMatches !== 'function') continue;
+      if (!opts.globalBasename || typeof resolver.resolveBasenameMatches !== 'function') {
+        continue;
+      }
       // Issue #972 (codex): resolve by the wikilink TARGET (ref.slug — the
       // text inside `[[...]]` before any `|`), NOT the display alias
       // (ref.name = match[2]). `[[struktura|the project]]` must resolve
       // `struktura`, not "the project". The display text is for context only.
-      //
-      // Issue #1964: a dir-qualified wikilink (`[[llm-wiki/entities/AI 3.0]]`)
-      // carries a raw Obsidian path while page slugs are sync-slugified
-      // (`llm-wiki/entities/ai-3.0`). Slugify the path the same way sync does,
-      // then match by exact slug or path-suffix (wiki-root-relative authoring).
-      // This runs regardless of global_basename — it's dir-qualified, so the
-      // cross-dir false-positive risk the flag guards against doesn't apply.
-      // Mirrors the FS path's resolveSlug ancestor walk. Bare `[[name]]`
-      // wikilinks still require the global_basename flag.
-      let matches: string[] = [];
-      const slugified = ref.slug.includes('/') ? slugifyPath(ref.slug) : '';
-      if (slugified.includes('/')) {
-        const tail = slugified.slice(slugified.lastIndexOf('/') + 1);
-        matches = (await resolver.resolveBasenameMatches(tail))
-          .filter(m => m === slugified || m.endsWith(`/${slugified}`));
-      } else if (opts.globalBasename) {
-        matches = await resolver.resolveBasenameMatches(ref.slug);
-      }
+      const matches = await resolver.resolveBasenameMatches(ref.slug);
       if (matches.length === 0) continue;
       const idx = content.indexOf(ref.slug);
       const context = idx >= 0 ? excerpt(content, idx, 240) : ref.name;

test/extract-fs.test.ts

@@ -389,33 +389,6 @@ describe('resolveSlugAll', () => {
   });
 });
 
-// ─── issue #1964: cross-directory wikilinks — slug/path mismatch ──────────
-
-describe('issue #1964: raw Obsidian wikilink paths resolve to sync-slugified slugs', () => {
-  test('resolveSlug slugifies the candidate (sync-consistent), no flag needed', () => {
-    const all = new Set(['llm-wiki/entities/ai-3.0']);
-    // Wikilink literal `[[llm-wiki/entities/AI 3.0]]` — spaces + uppercase.
-    expect(resolveSlug('llm-wiki/notes', 'llm-wiki/entities/AI 3.0.md', all))
-      .toBe('llm-wiki/entities/ai-3.0');
-  });
-
-  test('resolveSlug slugifies raw (unslugified) fileDir too', () => {
-    const all = new Set(['llm-wiki/entities/ai-3.0']);
-    // fileDir comes from dirname(relPath) — the raw on-disk directory.
-    expect(resolveSlug('LLM Wiki/Notes', 'entities/AI 3.0.md', all))
-      .toBe('llm-wiki/entities/ai-3.0');
-  });
-
-  test('extractLinksFromFile resolves cross-directory wikilink with flag OFF as a typed edge', async () => {
-    const allSlugs = new Set(['llm-wiki/entities/ai-3.0', 'llm-wiki/notes/roadmap']);
-    const content = '---\ntitle: Roadmap\ntype: concept\n---\n\nSee [[llm-wiki/entities/AI 3.0]].\n';
-    const links = await extractLinksFromFile(content, 'llm-wiki/notes/roadmap.md', allSlugs);
-    expect(links.map(l => l.to_slug)).toEqual(['llm-wiki/entities/ai-3.0']);
-    // Dir-qualified path resolution is exact, NOT the basename fallback.
-    expect(links[0].link_type).not.toBe('wikilink_basename');
-  });
-});
-
 describe('issue #972 repro: bare wikilinks resolve when flag is on', () => {
   // End-to-end: reproduces the issue's exact repro inside a tempdir +
   // PGLite, then asserts edge count under both flag states.

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/link-extraction.test.ts

@@ -9,8 +9,6 @@ import {
   parseTimelineEntries,
   isAutoLinkEnabled,
   FRONTMATTER_LINK_MAP,
-  buildBasenameIndex,
-  queryBasenameIndex,
   type SlugResolver,
 } from '../src/core/link-extraction.ts';
 import type { BrainEngine } from '../src/core/engine.ts';
@@ -426,46 +424,6 @@ describe('extractPageLinks', () => {
     expect(strk!.linkType).toBe('wikilink_basename');
   });
 
-  // ─── issue #1964: dir-qualified wikilinks with raw Obsidian paths ────────
-
-  test('#1964: dir-qualified wikilink resolves via sync-consistent slugification (flag OFF)', async () => {
-    // `[[llm-wiki/entities/AI 3.0]]` is a raw Obsidian path; the page slug
-    // is the sync-slugified `llm-wiki/entities/ai-3.0`. Must resolve WITHOUT
-    // global_basename (it's dir-qualified) and must NOT leak to a same-tail
-    // page in a different directory.
-    const resolver: SlugResolver = {
-      resolve: async () => null,
-      resolveBasenameMatches: async (name) =>
-        name === 'ai-3.0' ? ['other/ai-3.0', 'llm-wiki/entities/ai-3.0'] : [],
-    };
-    const { candidates } = await extractPageLinks(
-      'llm-wiki/notes/roadmap',
-      'See [[llm-wiki/entities/AI 3.0]] for the model.',
-      {}, 'concept', resolver,
-      // opts.globalBasename omitted (= false) — path is dir-qualified
-    );
-    expect(candidates.map(c => c.targetSlug)).toEqual(['llm-wiki/entities/ai-3.0']);
-    expect(candidates[0].linkType).toBe('wikilink_basename');
-    expect(candidates[0].linkSource).toBe('wikilink-resolved');
-  });
-
-  test('#1964: path-suffix match resolves wiki-root-relative paths against a real index', async () => {
-    // Author writes `[[llm-wiki/entities/AI 3.0]]` but the brain nests the
-    // wiki under a vault dir. Suffix match rescues it; queried through the
-    // REAL basename index so the tail-key lookup is exercised end to end.
-    const idx = buildBasenameIndex(['vault/llm-wiki/entities/ai-3.0', 'people/ai-3.0']);
-    const resolver: SlugResolver = {
-      resolve: async () => null,
-      resolveBasenameMatches: async (name) => queryBasenameIndex(idx, name),
-    };
-    const { candidates } = await extractPageLinks(
-      'vault/llm-wiki/notes/roadmap',
-      'See [[llm-wiki/entities/AI 3.0]].',
-      {}, 'concept', resolver,
-    );
-    expect(candidates.map(c => c.targetSlug)).toEqual(['vault/llm-wiki/entities/ai-3.0']);
-  });
-
   test('opts.skipFrontmatter suppresses the frontmatter pass', async () => {
     // Real resolver shape that WOULD resolve frontmatter source: too,
     // but skipFrontmatter blocks the path entirely.

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) ---