fix(onboard): stop dropping onboard-check remediations on the --apply --auto path

Takeover of #2161. runRemediation ignored onboard-check extras in three
places: the pre-flight plan, the initial recommendation build, and the D7
mid-run recheck that rebuilds recs after every completed step. The --check
path threaded extras correctly, so `gbrain onboard --apply --auto` reported
"Nothing to do" when the only remediable work came from onboard checks —
and even with the first two sites fixed (the original PR diff), any plan
with 2+ steps dropped all remaining extras after step 1 via the recheck.

- Add RemediationOpts.extraRemediations; thread it through the pre-flight
  plan, initial recs, and the mid-run recheck.
- Recheck filters extras to ids not already processed this run: extras
  carry static status:'remediable', so unfiltered threading would resubmit
  completed extras forever.
- Wire the CLI --auto path (onboard.ts) AND the MCP run_onboard auto path
  (operations.ts), which already computed the scope-filtered allowedExtras
  and then dropped it.
- Regression test: extras-only plan on an empty brain runs BOTH extras
  exactly once and terminates (serial file: mock.module queue stub +
  GBRAIN_HOME tmpdir).

Co-authored-by: brettdavies <brettdavies@users.noreply.github.com>
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

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

src/commands/onboard.ts

@@ -142,12 +142,16 @@ export async function runOnboard(engine: BrainEngine, args: string[]): Promise<v
 
   // --auto path: runs through the T2 library orchestrator. Hooks emit CLI
   // progress to stderr; the final result lands as JSON on stdout (or human
-  // summary).
+  // summary). extraRemediations (gathered above from runAllOnboardChecks)
+  // is threaded into the runner so the onboard-check remediations
+  // (extract-ner, extract-timeline-from-meetings, etc.) reach the planner
+  // — the same wiring the --check path uses above.
   const result = await runRemediation(
     engine,
     {
       targetScore,
       maxUsd,
+      extraRemediations,
       // --auto --yes opts into the prompt_required tier too; library
       // doesn't distinguish auto_apply vs prompt_required, it just runs
       // every remediation in the plan. The plan-building side (T12 render)

src/core/operations.ts

@@ -4957,7 +4957,7 @@ const run_onboard: Operation = {
     // typo, the underlying queue.add would reject. Defense-in-depth.
     const result = await runRemediation(
       ctx.engine,
-      { targetScore, maxUsd },
+      { targetScore, maxUsd, extraRemediations: allowedExtras },
       {},
     );
 

src/core/remediation/run.ts

@@ -66,9 +66,10 @@ export async function runRemediation(
   } = await import('../remediation-checkpoint.ts');
 
   const ctx = await loadRecommendationContext(engine);
+  const extraRemediations = opts.extraRemediations ?? [];
 
   // Pre-flight ceiling check via the shared plan computation.
-  const initialPlan = await computeRemediationPlan(engine, { targetScore });
+  const initialPlan = await computeRemediationPlan(engine, { targetScore, extraRemediations });
   if (initialPlan.target_unreachable) {
     hooks.onTargetUnreachable?.(targetScore, initialPlan.max_reachable_score);
     return {
@@ -87,7 +88,7 @@ export async function runRemediation(
   }
 
   const initialHealth = await engine.getHealth();
-  let recs: RemediationStep[] = computeRecommendations(initialHealth, ctx)
+  let recs: RemediationStep[] = computeRecommendations(initialHealth, ctx, extraRemediations)
     .filter((r) => r.status === 'remediable');
   if (recs.length === 0) {
     hooks.onNothingToDo?.(initialHealth.brain_score, targetScore);
@@ -305,7 +306,13 @@ export async function runRemediation(
       // steps with bumped retry suffix (D1).
       if (recs.length === 0 || stepCount >= maxJobs) break;
       const freshHealth = await engine.getHealth();
-      recs = computeRecommendations(freshHealth, ctx).filter((r) => r.status === 'remediable');
+      // Extras carry a static status:'remediable' — a fresh health snapshot
+      // never ages them out the way health-derived steps drop. Filter out
+      // ids this run already processed (any terminal status), or the recheck
+      // would resubmit completed extras every iteration, forever.
+      const processedIds = new Set(submitted.map((s) => s.id));
+      const pendingExtras = extraRemediations.filter((r) => !processedIds.has(r.id));
+      recs = computeRecommendations(freshHealth, ctx, pendingExtras).filter((r) => r.status === 'remediable');
     }
   };
 

src/core/remediation/types.ts

@@ -63,6 +63,16 @@ export interface RemediationOpts {
   resumePlanHash?: string;
   /** Whether to attempt resume at all (default false). */
   resume?: boolean;
+  /**
+   * Caller-supplied RemediationStep entries threaded into the planner.
+   * Mirrors RemediationPlanOpts.extraRemediations so onboard's --apply
+   * --auto path (and MCP run_onboard auto modes) forward the same
+   * onboard-check remediations the --check path already passes through
+   * computeRemediationPlan. Without this the runner saw only generic
+   * brain_score remediations and reported "Nothing to do" whenever the
+   * only applicable work was an extra (e.g. extract-ner).
+   */
+  extraRemediations?: RemediationStep[];
 }
 
 /**

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/remediation-run-extras.serial.test.ts

@@ -0,0 +1,108 @@
+// test/remediation-run-extras.serial.test.ts
+// Regression for PR #2161 takeover: `gbrain onboard --apply --auto` dropped
+// onboard-check extraRemediations. Two distinct halves of the bug:
+//   1. runRemediation built the pre-flight plan + initial recs WITHOUT the
+//      extras, so an extras-only plan reported "Nothing to do".
+//   2. The D7 mid-run recheck rebuilt recs WITHOUT the extras after every
+//      completed step, so with 2+ plannable steps all remaining extras were
+//      dropped after step 1. The recheck must also filter out extras this
+//      run already processed — extras carry static status:'remediable', so
+//      unfiltered threading would resubmit completed extras forever.
+//
+// SERIAL: mock.module (queue + wait-for-completion stubs, R2) + GBRAIN_HOME
+// env mutation so checkpoint files land in a tmpdir, not ~/.gbrain.
+
+import { describe, expect, test, beforeAll, afterAll, mock } from 'bun:test';
+import { mkdtempSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { PGLiteEngine } from '../src/core/pglite-engine.ts';
+import { makeRemediationStep } from '../src/core/remediation-step.ts';
+
+// Stub the Minion queue: every submitted job is immediately 'completed'.
+// runRemediation only calls queue.add + waitForCompletion(queue, id).
+let nextJobId = 1;
+const submittedJobs: Array<{ name: string }> = [];
+mock.module('../src/core/minions/queue.ts', () => ({
+  MinionQueue: class {
+    async add(name: string) {
+      submittedJobs.push({ name });
+      return { id: nextJobId++, status: 'completed' };
+    }
+  },
+}));
+mock.module('../src/core/minions/wait-for-completion.ts', () => ({
+  waitForCompletion: async () => ({ status: 'completed' }),
+}));
+
+let engine: PGLiteEngine;
+let home: string;
+const prevHome = process.env.GBRAIN_HOME;
+
+beforeAll(async () => {
+  home = mkdtempSync(join(tmpdir(), 'gbrain-remextras-'));
+  process.env.GBRAIN_HOME = home;
+  engine = new PGLiteEngine();
+  await engine.connect({});
+  await engine.initSchema();
+}, 120_000);
+
+afterAll(async () => {
+  await engine.disconnect();
+  if (prevHome === undefined) delete process.env.GBRAIN_HOME;
+  else process.env.GBRAIN_HOME = prevHome;
+  rmSync(home, { recursive: true, force: true });
+});
+
+function extra(id: string, job: string) {
+  return makeRemediationStep({
+    id,
+    job,
+    params: {},
+    severity: 'medium',
+    est_seconds: 5,
+    est_usd_cost: 0,
+    rationale: 'synthetic onboard-check extra',
+    status: 'remediable',
+  });
+}
+
+describe('runRemediation extraRemediations threading', () => {
+  test('extras-only plan runs BOTH extras and terminates (no Nothing-to-do, no resubmit loop)', async () => {
+    // Empty PGLite brain → zero health-derived recommendations. Without the
+    // fix, half 1 makes this run return submitted: [] via onNothingToDo.
+    // With only half 1 (the original PR #2161 diff), the mid-run recheck
+    // drops the second extra after step 1 — submitted has 1 entry, not 2.
+    const { runRemediation } = await import('../src/core/remediation/run.ts');
+    let nothingToDo = false;
+    const result = await runRemediation(
+      engine,
+      {
+        targetScore: 1,
+        extraRemediations: [
+          extra('onboard.extract_ner', 'extract-ner'),
+          extra('onboard.extract_timeline', 'extract-timeline-from-meetings'),
+        ],
+        // Safety bound: an unfiltered recheck would resubmit completed
+        // extras forever; maxJobs turns that regression into a fast fail
+        // (extra count > 1 below) instead of a hung test.
+        maxJobs: 5,
+      },
+      { onNothingToDo: () => { nothingToDo = true; } },
+    );
+
+    expect(nothingToDo).toBe(false);
+    const ids = result.submitted.map((s) => s.id);
+    expect(ids).toContain('onboard.extract_ner');
+    expect(ids).toContain('onboard.extract_timeline');
+    // Each extra ran exactly once — the recheck must not re-plan extras the
+    // run already processed.
+    expect(ids.filter((i) => i === 'onboard.extract_ner').length).toBe(1);
+    expect(ids.filter((i) => i === 'onboard.extract_timeline').length).toBe(1);
+    expect(result.submitted.every((s) => s.status === 'completed')).toBe(true);
+    expect(submittedJobs.map((j) => j.name).sort()).toEqual([
+      'extract-ner',
+      'extract-timeline-from-meetings',
+    ]);
+  });
+});