@bongos/core 1.21.115 → 1.21.116

package/scripts/gds/upgrade.js

@@ -33,7 +33,7 @@ const { parseSemver, compareSemver, isStable, listAvailableVersions } = require(
 const { checkArtistGate } = require('./upgrade-artist-gate');
 // The database side of a move: which command migrates, as which account, and whether that
 // account can reach the database (tasks 1004274, 1002712, 1004512).
-const { preflightDbIdentity, asAccount, ACCOUNT_RE } = require('./upgrade-migrate');
+const { preflightDbIdentity, asAccount, ACCOUNT_RE, teeSpawn, migrateResult, migrateError } = require('./upgrade-migrate');
 
 const CORE_PKG = '@bongos/core';
 const ARTIFACT = 'bongos-core';
@@ -519,13 +519,13 @@ function npmInstall(instanceDir, run = spawnSync) {
   return !r || r.error ? { ok: false, reason: r && r.error ? r.error.message : 'spawn failed' } : { ok: r.status === 0, code: r.status };
 }
 
-function runMigrate(instanceDir, run = spawnSync, account = null) {
+async function runMigrate(instanceDir, run = spawnSync, account = null) {
   const { cmd, args, env } = require('./upgrade-migrate').migratePlan(instanceDir); // its own migrate script, else the core's migrate.sh (task 1004274)
   // `account`: the project's own unix+Postgres identity when the move itself is running as
   // the account that owns the CHECKOUT instead (--migrate-as; upgrade-migrate.js, task 1004512).
   const q = asAccount(account, cmd, args, env ? { INIT_CWD: instanceDir } : {});
-  const r = run(q.cmd, q.args, { cwd: instanceDir, stdio: 'inherit', ...(env ? { env } : {}) });
-  return !r || r.error ? { ok: false, reason: r && r.error ? r.error.message : 'spawn failed' } : { ok: r.status === 0, code: r.status };
+  // TEED, not inherited: still streams live, and a failure names its migration + psql's ERROR line (upgrade-migrate.js, task 1004734)
+  return migrateResult(await (run === spawnSync ? teeSpawn : run)(q.cmd, q.args, { cwd: instanceDir, ...(env ? { env } : {}) }));
 }
 
 // WHICH database will migrate target? (task 1002755)
@@ -1224,9 +1224,9 @@ async function runUpgrade(opts, deps = {}) {
 
   // 4. migrate (additive core_* migrations).
   if (!opts.skipMigrate) {
-    const mig = runMigrate(instanceDir, run, opts.migrateAs || null);
+    const mig = await runMigrate(instanceDir, run, opts.migrateAs || null);
     if (!mig.ok) {
-      const error = `migrate failed (${mig.reason || 'exit ' + mig.code})`;
+      const error = migrateError(mig); // names the failing migration + its ERROR line (task 1004734)
       if (rollbackOnFailure && snapshot) {
         const rb = await doRollback('migrate failed');
         return { ok: false, error, fromVersion, toVersion: targetVersion, rolledBack: true, rollback: rb };

package/src/module-api.js

@@ -75,7 +75,7 @@ const { responsibilityFor, ROLE_RESPONSIBILITIES } = require('./role-responsibil
 // MAJOR (see allowBoxScope below): passes the request through untouched.
 function deprecatedNoopMiddleware(_req, _res, next) { next(); }
 
-const CORE_VERSION = '1.21.115'; // CI auto-patch carrier (ADR 0161); changelog: docs/module-api-changelog.md
+const CORE_VERSION = '1.21.116'; // CI auto-patch carrier (ADR 0161); changelog: docs/module-api-changelog.md
 
 // A namespaced logger so a module's log lines are attributable + consistent.
 // Usage: const log = api.logger('discord'); log.info('mounted');

package/tests/core_upgrade_runner.mjs

@@ -1551,6 +1551,21 @@ await t('a real rollback says rolled back', async () => {
   assert.match(r.error, /failed and was rolled back/);
 });
 
+await t('a failed migrate reaches the stored failure with its migration and psql\'s ERROR line (task 1004734)', async () => {
+  // upgrade.js's REAL migrate result → its real error sentence → its real outcome line, in the
+  // frame its main() writes to stderr (pinned by "upgrade.js ends a failed run…" below).
+  const run = () => ({ status: 3, stdout: 'apply  core_998_ok\napply  core_999_x\n',
+    stderr: 'psql:migrations/core_999_x.sql:7: ERROR:  check constraint "tasks_kind_check" of relation "tasks" is violated by some row\n' });
+  const mig = await U.runMigrate(fs.mkdtempSync(path.join(require('node:os').tmpdir(), 'mig-')), run);
+  const res = { ok: false, error: require('../scripts/gds/upgrade-migrate.js').migrateError(mig), rolledBack: true, rollback: {} };
+  const stderr = `\n✖ ${res.error}\n${require('../scripts/gds/upgrade-outcome.js').outcomeLine(res)}`;
+  const r = await R.coreUpgradeInstance(inst(), upgradeThrows(stderr)(makeDeps()), intent());
+  assert.deepEqual(r.failure, { class: 'unknown', reason: 'migrate_check_violation' });
+  assert.match(r.error, /failed and was rolled back/);
+  assert.match(r.error, /core_999_x/, 'the stored sentence names the migration');
+  assert.match(r.error, /ERROR: +check constraint "tasks_kind_check" of relation "tasks" is violated by some row/, 'and psql\'s own error');
+});
+
 await t('a FAILED rollback is its own outcome, and terminal — never retried unattended', async () => {
   const d = upgradeThrows('\n✖ health check failed after restart\nBONGOS_UPGRADE_OUTCOME {"stage":"rollback_failed","reason":"rollback_failed"}\n')(makeDeps());
   const r = await R.coreUpgradeInstance(inst(), d, intent());

package/tests/instance_db_migrated_on_code_move.mjs

@@ -32,7 +32,7 @@ const tenant = { slug: 'charter', db_name: 'charter_db', hosting_shape: 'co-tena
 
 test('bongos upgrade migrates before it restarts, and only --skip-migrate opts out', () => {
   const src = fs.readFileSync(path.join(ROOT, 'scripts/gds/upgrade.js'), 'utf8');
-  const migrate = src.indexOf('const mig = runMigrate(instanceDir, run, opts.migrateAs || null);');
+  const migrate = src.indexOf('const mig = await runMigrate(instanceDir, run, opts.migrateAs || null);'); // async since task 1004734 (teed output)
   const restart = src.lastIndexOf('restartService({ service: opts.service, restartCmd: opts.restartCmd }');
   assert.ok(migrate > 0, 'the upgrade flow runs migrate');
   assert.ok(restart > migrate, 'the restart that makes new code live comes AFTER migrate');
@@ -47,7 +47,7 @@ test('bongos upgrade migrates before it restarts, and only --skip-migrate opts o
   // provisioned since task 1003369, and the wrong one cannot connect at all: the project's
   // database is owned by its own Postgres login role with CONNECT revoked from PUBLIC.
   // Asserting the CALL SITE, not just the helper — the helper was never the gap.
-  assert.match(src, /const mig = runMigrate\(instanceDir, run, opts\.migrateAs \|\| null\);/,
+  assert.match(src, /const mig = await runMigrate\(instanceDir, run, opts\.migrateAs \|\| null\);/,
     'the migrate step is handed --migrate-as, not left on whoever the move happens to be');
   assert.equal(`bash ${CORE_MIGRATE_SCRIPT}`, INSTANCE_MIGRATE_SCRIPT, 'migrate is the instance scaffold script, i.e. the core migrate.sh');
 });

package/tests/upgrade_migrate.mjs

@@ -23,6 +23,9 @@ import { mkdtempSync, mkdirSync, writeFileSync, readFileSync, realpathSync, syml
 import { tmpdir } from 'node:os';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { EventEmitter } from 'node:events';
+// ESM named imports: knip credits a CJS export only when a test imports it this way.
+import { migrateError, migrateFailureDetail, teeSpawn } from '../scripts/gds/upgrade-migrate.js';
 
 const require = createRequire(import.meta.url);
 const { migratePlan, CORE_MIGRATE_SCRIPT } = require('../scripts/gds/upgrade-migrate.js');
@@ -193,3 +196,81 @@ test('the real fallback command resolves the project as its instance root, despi
   const blind = rootsOf(execFileSync('bash', [CORE_MIGRATE_SCRIPT, '--print-roots'], { cwd: dir, env: base, encoding: 'utf8' }));
   assert.notEqual(blind.INSTANCE_ROOT, dir, 'without INIT_CWD pinned, a stray value decides which project is migrated');
 });
+
+// ── a failed migrate names its migration and psql's ERROR line (task 1004734) ──────────
+// Seen 2026-10-14: toast's move 1.21.20 → 1.21.115 rolled back and the hub kept only
+// "migrate failed (exit 3)". Which file and which error were in the box's journal alone.
+const FAKE_DSN = ['postgres://app', 'Sup3rS3cretPassw0rd@db.internal/prod'].join(':');
+const MIGRATE_OUT = 'skip   core_001_base (already applied)\napply  core_998_ok\napply  core_999_x\n';
+const PSQL_ERR = `psql:node_modules/@bongos/core/migrations/core_999_x.sql:7: ERROR:  check constraint "tasks_kind_check" of relation "tasks" is violated by some row ${FAKE_DSN}\n`;
+
+function failingMigrateRun(calls, opts = {}) {
+  const base = recordingRun(calls, opts);
+  return (cmd, args = [], o = {}) => {
+    if ((cmd === 'bash' && args[0] === CORE_MIGRATE_SCRIPT) || (cmd === 'npm' && args[0] === 'run' && args[1] === 'migrate')) {
+      calls.push({ line: `${cmd} ${args.join(' ')}`.trim(), opts: o });
+      return { status: 3, stdout: MIGRATE_OUT, stderr: PSQL_ERR };
+    }
+    return base(cmd, args, o);
+  };
+}
+
+test('runMigrate: a failing migration comes back with its file name and psql\'s ERROR line', async () => {
+  const mig = await u.runMigrate(adoptedProject(), failingMigrateRun([]));
+  assert.equal(mig.ok, false);
+  assert.equal(mig.code, 3);
+  const error = migrateError(mig);
+  assert.match(error, /^migrate failed \(exit 3\)/, 'the prefix upgrade-outcome.js keys on is unchanged');
+  assert.match(error, /core_999_x/, 'names the migration that was being applied when it stopped');
+  assert.doesNotMatch(error, /core_998_ok/, 'and not an earlier one that applied cleanly');
+  assert.match(error, /ERROR: +check constraint "tasks_kind_check" of relation "tasks" is violated by some row/);
+  assert.doesNotMatch(error, /Sup3rS3cretPassw0rd/, 'a credential in the error never reaches the hub');
+});
+
+test('migrateFailureDetail scrubs secrets and caps the length', () => {
+  const d = migrateFailureDetail(`apply  core_999_x\nERROR:  bad value ${FAKE_DSN} ${'x'.repeat(5000)}\n`);
+  assert.doesNotMatch(d, /Sup3rS3cretPassw0rd/);
+  assert.ok(d.length <= 400, `capped (${d.length})`);
+  assert.match(d, /core_999_x/);
+  assert.equal(migrateFailureDetail('npm error code 1\n'), '', 'nothing recognisable adds nothing');
+  assert.match(migrateFailureDetail('psql:/x/migrations/core_5_y.sql:3: ERROR:  boom\n'), /core_5_y.*ERROR: +boom/, 'psql\'s own file prefix stands in for a missing apply line');
+});
+
+test('a full upgrade whose migrate fails reports the migration, the error, and a CHECK-violation class', async () => {
+  const dir = adoptedProject({ installed: '1.19.312' });
+  const res = await u.runUpgrade(
+    { to: '1.19.1029', registry: true, instance: dir, service: 'mercury', healthCheck: false },
+    {
+      log: () => {}, err: () => {},
+      run: failingMigrateRun([], { dir, installTo: '1.19.1029' }),
+      materialize: () => ({ skills: 0 }), regenerateApiArtifacts: () => ({ ok: true, ran: [] }),
+      databaseUrl: '', pgDatabase: '',
+    },
+  );
+  assert.equal(res.ok, false);
+  assert.match(res.error, /^migrate failed \(exit 3\) at core_999_x: ERROR: +check constraint "tasks_kind_check"/);
+  const outcome = require('../scripts/gds/upgrade-outcome.js');
+  assert.equal(outcome.upgradeReason(res), 'migrate_check_violation');
+  assert.equal(outcome.classifyFailure('migrate_check_violation').class, 'unknown', 'existing rows break the new rule: a person decides, never an unattended retry');
+});
+
+test('teeSpawn streams the child\'s output live AND keeps it for the failure report', async () => {
+  const pipe = () => Object.assign(new EventEmitter(), { setEncoding() {} });
+  let child;
+  const spawnImpl = (cmd, args, opts) => {
+    child = Object.assign(new EventEmitter(), { stdout: pipe(), stderr: pipe(), opts });
+    return child;
+  };
+  const out = [], err = [];
+  const p = teeSpawn('bash', ['m.sh'], { cwd: '/x' }, { spawnImpl, out: { write: (c) => out.push(c) }, err: { write: (c) => err.push(c) } });
+  child.stdout.emit('data', 'apply  core_999_x\n');
+  assert.deepEqual(out, ['apply  core_999_x\n'], 'written through as it arrives, not after the child exits');
+  child.stderr.emit('data', 'ERROR:  boom\n');
+  assert.deepEqual(err, ['ERROR:  boom\n']);
+  child.emit('close', 3);
+  const r = await p;
+  assert.equal(r.status, 3);
+  assert.match(r.output, /apply {2}core_999_x[\s\S]*ERROR: {2}boom/);
+  assert.deepEqual(child.opts.stdio, ['inherit', 'pipe', 'pipe']);
+  assert.equal(child.opts.cwd, '/x');
+});