baldart 3.35.0 → 3.35.1

package/CHANGELOG.md

@@ -5,6 +5,26 @@ All notable changes to BALDART will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.35.1] - 2026-05-30
+
+Fixes a **HIGH-severity** bug where `baldart update --reset` could leave a consumer **committed-without-`.framework/`** (broken install, manual recovery only). The reset path wiped `.framework/`, committed the deletion, then handed off to `add()` **programmatically with no repository** — the bin-layer default (`antbald/BALDART`) only applies on the CLI path, so `repo` arrived `undefined`, crashing at `repo.startsWith(...)` ("Cannot read properties of undefined") *after* the wipe was already committed. Three layers now make this unreachable: (1) repo resolved **before** any destructive step, (2) reinstall failures roll back to the pre-reset backup tag, (3) defensive guards + legible errors. **No new `baldart.config.yml` keys** — the schema-propagation rule does not apply.
+
+### Fixed — `update --reset` never leaves the consumer without `.framework/`
+
+- **[src/commands/update.js](src/commands/update.js)** (`runReset`): the upstream repo is now resolved via `State.resolveRepo()` **before** the backup tag / `rm -rf` / reset commit, then threaded **explicitly** into `add()` (was `addCmd(undefined, { yes: true })` — the root cause). The stale v3.28.1 comment claiming "undefined → use default from package.json" (which never existed in `add.js`) is corrected.
+- **[src/commands/update.js](src/commands/update.js)**: the reinstall is wrapped in a `try/catch` that, on **any** failure (undefined repo, network, ignored path, missing hooks), auto-runs `git reset --hard <backupTag>` to restore the pre-reset `.framework/` and prints an explicit recovery command. Safe because reset is gated on a clean working tree — the backup tag holds everything but the reset commit.
+- **[src/commands/add.js](src/commands/add.js)**: new `options.throwOnError` makes `add()` **re-throw** instead of `process.exit(1)` at every reachable failure point (download catch, gitignore-still-ignored, hooks-missing post-flight), so a programmatic caller can recover. CLI behavior is unchanged (flag absent → historical exit-1). Also resolves a falsy `repo` from the ledger as a last resort and fails fast **before** download with a recovery hint.
+- **[src/utils/git.js](src/utils/git.js)** (`normalizeRepoUrl`): guards a falsy/non-string `repo` with a legible `Error` ("repository non specificato …") instead of the cryptic `Cannot read properties of undefined (reading 'startsWith')`.
+
+### Changed — shared repo resolver (de-dup)
+
+- **[src/utils/state.js](src/utils/state.js)**: new exported `resolveRepo(cwd)` (cascade `state.framework_repo → DEFAULT_REPO`, never `undefined`, preserves a consumer's fork) + exported `DEFAULT_REPO` constant. `recordInstall` now uses the constant.
+- **[src/commands/version.js](src/commands/version.js)**: drops its local `REPO_DEFAULT` duplicate in favor of the shared `State.DEFAULT_REPO`.
+
+### Known follow-up (separate fix)
+
+- `--on-divergence` (v3.29.0) is rejected by an **older global CLI** with "unknown option" *before* the `npx baldart@latest` auto-relaunch can self-upgrade (commander validates options first). Tracked separately — workaround: `npm i -g baldart@latest` before using new flags.
+
 ## [3.35.0] - 2026-05-30
 
 De-duplicates the review chain in `/new` and adds a **Review Profile Selector** so the per-card pre-merge gate scales its *depth* by risk instead of running the full multi-agent `/codexreview` on every card — including trivial ones. The per-card gate stays **unconditional** (it always runs); only its breadth varies, and the safety-critical Codex adversarial pass + false-positive gate run on every card regardless of profile. Copertura invariata: every line is still code-reviewed once, every doc doc-reviewed once. **No new `baldart.config.yml` keys** — the profile is computed at runtime from signals already present (the Phase 3.7 high-risk-trigger detector + the QA profile), and lean mode is an internal caller→skill file contract, so the schema-propagation rule does not apply.

package/VERSION

@@ -1 +1 @@
-3.35.0
+3.35.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baldart",
-  "version": "3.35.0",
+  "version": "3.35.1",
   "description": "Claude Agent Framework - Reusable framework for coordinating AI agents and humans in software projects",
   "bin": {
     "baldart": "./bin/baldart.js"

package/src/commands/add.js

@@ -14,6 +14,24 @@ async function add(repo, options) {
   // rm -rf `.framework/` themselves, so `git.frameworkExists()` is false
   // here and the destructive prompt is never reached.
   const nonInteractive = options && options.yes === true;
+  // When `add` is invoked programmatically (e.g. `update --reset`) the caller
+  // wants failures to bubble up so it can roll back, instead of add()'s default
+  // `process.exit(1)` which would kill the parent before it can recover.
+  const throwOnError = options && options.throwOnError === true;
+
+  // Repo resolution safety net. The CLI entrypoint (bin/baldart.js) defaults
+  // `repo` to the upstream before calling here, but programmatic callers may
+  // pass undefined. Resolve from the consumer's ledger (preserves forks) so
+  // we never reach git.addSubtree() with an undefined repo (the crash that
+  // broke `update --reset`: "Cannot read properties of undefined").
+  if (!repo) repo = State.resolveRepo();
+  if (!repo) {
+    UI.error('No framework repository to install from.');
+    UI.info('Expected from .baldart/state.json → framework_repo. Recover with:');
+    UI.info('  npx baldart add <owner/repo> --yes');
+    if (throwOnError) throw new Error('add: repository unresolved (state.json framework_repo empty)');
+    process.exit(1);
+  }
 
   try {
     // Step 1: Verify environment
@@ -114,10 +132,16 @@ async function add(repo, options) {
           UI.error('.framework/ is STILL ignored after auto-heal — install would fail.');
           UI.info(`Source: ${heal.recheck.source}:${heal.recheck.line} (${heal.recheck.pattern})`);
           UI.info('Resolve by removing that rule, then re-run `baldart add`.');
-          process.exit(1);
+          // Deliberate abort — flag it so the local catch propagates instead of
+          // downgrading to a warning, and let the single outer catch decide
+          // throw (throwOnError) vs process.exit (CLI).
+          const e = new Error('.framework/ still ignored after auto-heal');
+          e.fatalInstall = true;
+          throw e;
         }
       }
     } catch (err) {
+      if (err && err.fatalInstall) throw err;
       UI.warning(`Could not check .gitignore for .framework: ${err.message}`);
     }
 
@@ -139,11 +163,12 @@ async function add(repo, options) {
         '  • No internet connection',
         '  • Repository not accessible',
         `  • Invalid repository: ${repo}`,
+        '    (resolved from .baldart/state.json → framework_repo, else default)',
         '',
         'Solution:',
         '  • Check your internet connection',
-        '  • Verify repository exists',
-        '  • Try again later'
+        '  • Verify the repository exists / is reachable',
+        '  • Recover with an explicit repo: npx baldart add <owner/repo> --yes'
       ]);
       throw error;
     }
@@ -293,6 +318,13 @@ async function add(repo, options) {
           : `Hooks missing after install: ${verify.missing.join(', ')}. Install is NOT complete.`
       );
       UI.info('Run `npx baldart doctor` to repair, then re-check `npx baldart status`.');
+      if (throwOnError) {
+        throw new Error(
+          verify.malformed
+            ? 'settings.json malformed — hooks unverifiable'
+            : `hooks missing after install: ${verify.missing.join(', ')}`
+        );
+      }
       process.exit(1);
     }
 
@@ -339,6 +371,9 @@ async function add(repo, options) {
 
   } catch (error) {
     UI.error(`Installation failed: ${error.message}`);
+    // Programmatic callers (update --reset) need the failure to bubble so they
+    // can roll back; the CLI entrypoint keeps the historical exit-1 behavior.
+    if (throwOnError) throw error;
     process.exit(1);
   }
 }

package/src/commands/doctor.js

@@ -36,7 +36,6 @@ const UpdateNotifier = require('../utils/update-notifier');
 const cliPackageJson = require('../../package.json');
 
 const FRAMEWORK_DIR = '.framework';
-const REPO_DEFAULT = 'antbald/BALDART';
 const CONFIG_FILE = 'baldart.config.yml';
 
 // ──────────────────────────────────────────────────────────────────────
@@ -214,7 +213,7 @@ async function detectState(cwd, opts = {}) {
       };
     }
 
-    state.remote = await describeRemote(git, ledger.framework_repo || REPO_DEFAULT, !!opts.offline);
+    state.remote = await describeRemote(git, ledger.framework_repo || State.DEFAULT_REPO, !!opts.offline);
     state.commitsAhead = await commitsAheadOfRemote(git, state.remote);
     state.workingTreeDirty = await localFrameworkChanges(git);
 
@@ -360,7 +359,9 @@ function planActions(state) {
       autoOk: false,
       run: async () => {
         const add = require('./add');
-        await add(REPO_DEFAULT, { branch: 'main' });
+        // Fork-aware: resolve from the ledger (preserves a consumer's fork)
+        // rather than hardcoding the upstream default.
+        await add(State.resolveRepo(state.cwd), { branch: 'main' });
       },
     });
     return actions;

package/src/commands/update.js

@@ -255,6 +255,15 @@ async function runReset(git, options, autoYes) {
     }
   }
 
+  // Resolve the upstream repo BEFORE anything destructive. The reinstall hands
+  // off to add() programmatically (no bin-layer default), so an unresolved repo
+  // would surface as "Downloading from undefined" / "Cannot read properties of
+  // undefined" AFTER .framework/ was already wiped and committed. Resolving here
+  // (state.framework_repo → default, never undefined) makes that unreachable and
+  // preserves a consumer's fork.
+  const repo = State.resolveRepo();
+  UI.info(`Reinstall source: ${repo}`);
+
   // Safety gate #3: backup tag before doing anything destructive.
   const backupTag = await git.createBackupTag();
   UI.success(`Backup tag created: ${backupTag}`);
@@ -310,12 +319,42 @@ async function runReset(git, options, autoYes) {
   UI.newline();
   UI.info('Re-installing framework via `baldart add`…');
   const addCmd = require('./add');
-  // `add(repo, options)` — first arg is the repo URL (undefined → use default
-  // from package.json). Pre-v3.28.1 we incorrectly passed `{ yes: true }` as
-  // the first arg, so `options` was undefined and every interactive prompt
-  // ("Install framework?", "Configure git aliases?", …) fired despite the
-  // parent `update --reset --yes --i-know` having already established intent.
-  await addCmd(undefined, { yes: true });
+  // `add(repo, options)` — the repo MUST be threaded explicitly: the bin-layer
+  // default ('antbald/BALDART') only applies when add is invoked from the CLI,
+  // not on this programmatic path (the v3.28.1 comment claiming "undefined →
+  // default from package.json" was wrong and caused the undefined-repo crash).
+  // `throwOnError` makes add() re-throw instead of process.exit(1), so a failed
+  // reinstall lands in the catch below and we can roll back to the backup tag —
+  // the consumer is NEVER left committed-without-.framework/.
+  try {
+    await addCmd(repo, { yes: true, throwOnError: true });
+  } catch (err) {
+    UI.newline();
+    UI.error(`Reinstall failed: ${err.message}`);
+    UI.warning('Rolling back to pre-reset state…');
+    try {
+      await git.git.raw(['reset', '--hard', backupTag]);
+      // The clean-tree gate (hasCleanWorkingTree → status.isClean(), which counts
+      // untracked) guaranteed ZERO untracked files at backup-tag time, so every
+      // untracked file now is partial-install cruft created by the failed add()
+      // (symlinks, copied templates) — safe to sweep. `-d` dirs, no `-x` so
+      // gitignored paths are left untouched. Non-fatal: .framework/ is already
+      // restored by the reset above regardless.
+      try {
+        await git.git.raw(['clean', '-fd']);
+      } catch (cleanErr) {
+        UI.warning(`Could not sweep partial-install leftovers (${cleanErr.message}). .framework/ is restored; run \`git clean -fd\` to tidy.`);
+      }
+      UI.success(`Restored .framework/ from ${backupTag}. Working tree back to pre-reset state.`);
+    } catch (rollbackErr) {
+      UI.error(`Auto-rollback FAILED: ${rollbackErr.message}`);
+      UI.info(`Recover manually: git reset --hard ${backupTag}`);
+    }
+    UI.newline();
+    UI.info('Then retry, or reinstall explicitly:');
+    UI.info(`  npx baldart add ${repo} --yes`);
+    process.exit(1);
+  }
 
   // Post-restore sanity check — confirm nothing user-owned got clobbered.
   const stillPresent = {

package/src/commands/version.js

@@ -3,7 +3,6 @@ const UI = require('../utils/ui');
 const State = require('../utils/state');
 const UpdateNotifier = require('../utils/update-notifier');
 
-const REPO_DEFAULT = 'antbald/BALDART';
 const FRAMEWORK_DIR = '.framework';
 
 function fmtDate(iso) {
@@ -61,7 +60,7 @@ async function version(opts = {}) {
     const verbose = opts.verbose === true;
 
     // SSOT (v3.25.0+): one query, version-compare authority.
-    const repo = state.framework_repo || REPO_DEFAULT;
+    const repo = state.framework_repo || State.DEFAULT_REPO;
     let status;
     if (opts.offline === true) {
       status = {

package/src/utils/git.js

@@ -144,6 +144,17 @@ class GitUtils {
     // - "https://github.com/owner/repo" -> "https://github.com/owner/repo.git"
     // - "https://github.com/owner/repo.git" -> unchanged
 
+    // Fail loud and legible instead of "Cannot read properties of undefined
+    // (reading 'startsWith')". A falsy repo here means a caller skipped repo
+    // resolution (see State.resolveRepo) — surface that, don't crash cryptically.
+    if (!repo || typeof repo !== 'string') {
+      throw new Error(
+        `normalizeRepoUrl: repository non specificato (got ${JSON.stringify(repo)}). ` +
+        `Risolvilo via .baldart/state.json → framework_repo o passalo esplicito ` +
+        `(es. npx baldart add <owner/repo> --yes).`
+      );
+    }
+
     if (repo.startsWith('http://') || repo.startsWith('https://')) {
       return repo.endsWith('.git') ? repo : `${repo}.git`;
     }

package/src/utils/state.js

@@ -35,6 +35,13 @@ const STATE_FILE = path.join(STATE_DIR, 'state.json');
 const STATE_VERSION = 1;
 const HISTORY_LIMIT = 20;
 
+// Upstream framework repository. SSOT for the "where do we install from"
+// default — duplicated literals in version.js / doctor.js / recordInstall
+// used to drift independently. Always resolve through `resolveRepo()` so a
+// consumer's fork (recorded in state.framework_repo at install time) is
+// preserved instead of being silently overridden by this constant.
+const DEFAULT_REPO = 'antbald/BALDART';
+
 function defaultState() {
   return {
     state_version: STATE_VERSION,
@@ -87,7 +94,7 @@ function recordInstall({ version, repo }, cwd = process.cwd()) {
   const now = new Date().toISOString();
   const wasFirstInstall = !state.installed_version;
   state.installed_version = version;
-  state.framework_repo = repo || state.framework_repo || 'antbald/BALDART';
+  state.framework_repo = repo || state.framework_repo || DEFAULT_REPO;
   if (wasFirstInstall) state.install_date = now;
   state.history = appendHistory(state, {
     event: wasFirstInstall ? 'install' : 'reinstall',
@@ -142,6 +149,20 @@ function recordPush({ from, to, description }, cwd = process.cwd()) {
   return state;
 }
 
+/**
+ * Resolve the upstream framework repository to install/update from. Cascade:
+ * `state.framework_repo` (recorded at install — preserves a consumer's fork)
+ * → DEFAULT_REPO. Never returns undefined, so callers that thread the result
+ * into git.addSubtree() / normalizeRepoUrl() can't trip the "undefined repo"
+ * crash that broke `update --reset` (it called add() with no repo).
+ *
+ * `baldart.config.yml` and the subtree's git remote are intentionally NOT
+ * consulted — neither stores the repo, so they'd be dead lookups.
+ */
+function resolveRepo(cwd = process.cwd()) {
+  return load(cwd).framework_repo || DEFAULT_REPO;
+}
+
 /**
  * Read the framework's VERSION file from .framework/VERSION. Used by version /
  * status commands to cross-check what the symlinked framework reports vs what
@@ -164,7 +185,9 @@ module.exports = {
   recordUpdate,
   recordPush,
   reconcileInstalledVersion,
+  resolveRepo,
   readFrameworkVersion,
+  DEFAULT_REPO,
   STATE_FILE,
   STATE_VERSION,
 };