brainfile 0.22.0 → 0.22.1

package/dist/{chunk-BNE7R5GK.mjs → chunk-CWUTU5VV.mjs}

@@ -1608,7 +1608,7 @@ var require_boardRepo = __commonJS({
       };
     })();
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.DEFAULT_BOARD_NAME = exports.LEGACY_REMOTE_BRANCH_CONFIG_KEY = exports.BOARD_NAME_CONFIG_KEY = exports.BOARD_REF_NAMESPACE = exports.BOARD_BRANCH_CONFIG_KEY = exports.DEFAULT_BOARD_BRANCH = void 0;
+    exports.IGNORE_STATE_MESSAGE = exports.UNTRACK_STATE_MESSAGE = exports.BOARD_STATE_DIR = exports.DEFAULT_BOARD_NAME = exports.LEGACY_REMOTE_BRANCH_CONFIG_KEY = exports.BOARD_NAME_CONFIG_KEY = exports.BOARD_REF_NAMESPACE = exports.BOARD_BRANCH_CONFIG_KEY = exports.DEFAULT_BOARD_BRANCH = void 0;
     exports.remoteBoardRef = remoteBoardRef2;
     exports.boardTrackingRef = boardTrackingRef2;
     exports.gitNetwork = gitNetwork2;
@@ -1633,6 +1633,8 @@ var require_boardRepo = __commonJS({
     exports.boardDirtyFiles = boardDirtyFiles2;
     exports.onBoardCommitted = onBoardCommitted2;
     exports.ensureBoardDirs = ensureBoardDirs2;
+    exports.unstageBoardState = unstageBoardState;
+    exports.keepBoardStateLocal = keepBoardStateLocal;
     exports.commitBoard = commitBoard2;
     exports.commitHandEdits = commitHandEdits2;
     exports.homeBoardDir = homeBoardDir2;
@@ -1666,6 +1668,11 @@ var require_boardRepo = __commonJS({
     var FALLBACK_IDENTITY_EMAIL = "brainfile@localhost";
     var MAX_MESSAGE_LENGTH = 72;
     var BOARD_SUBDIRS = ["board", "logs"];
+    exports.BOARD_STATE_DIR = "state";
+    var BOARD_PATHSPEC = ["--", ".", `:(exclude)${exports.BOARD_STATE_DIR}`];
+    var STATE_IGNORE_LINES = ["state/", "state", "/state/", "/state"];
+    exports.UNTRACK_STATE_MESSAGE = "untrack state/: this machine's sync bookkeeping never travels";
+    exports.IGNORE_STATE_MESSAGE = "chore: keep state/ out of git";
     function git2(args, cwd, env, timeoutMs) {
       const result = (0, child_process_1.spawnSync)("git", args, {
         cwd,
@@ -1943,7 +1950,7 @@ ${EXCLUDE_ENTRY}
         throw new Error(`Could not initialize a git repository in ${dotDir}: ${r.stderr}`);
     }
     function boardIsDirty2(dotDir) {
-      const r = git2(["status", "--porcelain"], dotDir);
+      const r = git2(["status", "--porcelain", ...BOARD_PATHSPEC], dotDir);
       return r.ok && r.stdout.length > 0;
     }
     function boardHasCommits2(dotDir) {
@@ -1954,7 +1961,7 @@ ${EXCLUDE_ENTRY}
       return r.ok ? r.stdout.split("\n").map((l) => l.trim()).filter(Boolean) : [];
     }
     function boardDirtyFiles2(dotDir) {
-      const r = git2(["status", "--porcelain"], dotDir);
+      const r = git2(["status", "--porcelain", ...BOARD_PATHSPEC], dotDir);
       if (!r.ok || !r.stdout)
         return [];
       return r.stdout.split("\n").map((line) => line.replace(/^[ MADRCU?!]{1,2}\s+/, "").replace(/^.* -> /, "").trim()).filter(Boolean);
@@ -1996,27 +2003,74 @@ ${EXCLUDE_ENTRY}
       }
       return created;
     }
+    function commitIndex(dotDir, message) {
+      const r = git2([...identityArgs(dotDir), "-c", "commit.gpgsign=false", "commit", "--quiet", "--no-verify", "-m", message], dotDir);
+      if (r.ok)
+        notifyCommitted(dotDir);
+      return r.ok;
+    }
+    function ensureStateIgnored(dotDir) {
+      const file = path8.join(dotDir, ".gitignore");
+      let existing = "";
+      try {
+        existing = fs8.readFileSync(file, "utf-8");
+      } catch {
+      }
+      if (existing.split(/\r?\n/).some((line) => STATE_IGNORE_LINES.includes(line.trim())))
+        return false;
+      const separator = existing.length > 0 && !existing.endsWith("\n") ? "\n" : "";
+      try {
+        fs8.writeFileSync(file, `${existing}${separator}${STATE_IGNORE_LINES[0]}
+`, "utf-8");
+        return true;
+      } catch {
+        return false;
+      }
+    }
+    function unstageBoardState(dotDir, env) {
+      return git2(["rm", "-r", "--cached", "--quiet", "--ignore-unmatch", "--", exports.BOARD_STATE_DIR], dotDir, env).ok;
+    }
+    function keepBoardStateLocal(dotDir) {
+      if (!isTrackedBoard2(dotDir))
+        return false;
+      if (unmergedFiles2(dotDir).length > 0)
+        return false;
+      if (git2(["rev-parse", "--verify", "--quiet", "MERGE_HEAD"], dotDir).ok)
+        return false;
+      const staged = git2(["ls-files", "--cached", "--", exports.BOARD_STATE_DIR], dotDir).stdout.length > 0;
+      const committed = git2(["rev-parse", "--verify", "--quiet", `HEAD:${exports.BOARD_STATE_DIR}`], dotDir).ok;
+      if (!staged && !committed && !fs8.existsSync(path8.join(dotDir, exports.BOARD_STATE_DIR)))
+        return false;
+      const ignoreChanged = ensureStateIgnored(dotDir);
+      if (staged && !unstageBoardState(dotDir))
+        return false;
+      if (!committed && !ignoreChanged || !boardHasCommits2(dotDir))
+        return false;
+      if (ignoreChanged && !git2(["add", "--", ".gitignore"], dotDir).ok)
+        return false;
+      return commitIndex(dotDir, committed ? exports.UNTRACK_STATE_MESSAGE : exports.IGNORE_STATE_MESSAGE);
+    }
     function commitBoard2(dotDir, options) {
       if (!isTrackedBoard2(dotDir))
         return false;
       ensureBoardDirs2(dotDir);
       if (unmergedFiles2(dotDir).length > 0)
         return false;
+      const kept = keepBoardStateLocal(dotDir);
       if (!git2(["add", "-A"], dotDir).ok)
-        return false;
+        return kept;
+      if (!unstageBoardState(dotDir))
+        return kept;
       if (!boardIsDirty2(dotDir))
-        return false;
+        return kept;
       const agent = options.agent?.replace(/[[\]<>\r\n]/g, "").trim();
       const suffix = agent ? ` [${agent}]` : "";
-      const message = oneLine2(options.message, suffix);
-      const r = git2([...identityArgs(dotDir), "-c", "commit.gpgsign=false", "commit", "--quiet", "--no-verify", "-m", message], dotDir);
-      if (r.ok)
-        notifyCommitted(dotDir);
-      return r.ok;
+      return commitIndex(dotDir, oneLine2(options.message, suffix)) || kept;
     }
     function commitHandEdits2(dotDir) {
       if (!isTrackedBoard2(dotDir))
         return false;
+      keepBoardStateLocal(dotDir);
       const keepOnly = (f) => f.endsWith(".gitkeep") || BOARD_SUBDIRS.some((sub) => f === `${sub}/`);
       if (ensureBoardDirs2(dotDir) && boardDirtyFiles2(dotDir).every(keepOnly)) {
         commitBoard2(dotDir, { message: "chore: keep board/ and logs/ in git" });
@@ -2318,7 +2372,7 @@ var require_boardSync = __commonJS({
     exports.URL_REMOTE_NAME = "board";
     exports.MERGE_DRIVER_NAME = "brainfile";
     exports.DEFAULT_MERGE_DRIVER_COMMAND = "brainfile merge-driver %O %A %B";
-    var SYNC_STATE_FILE = path8.join("state", "sync.json");
+    var SYNC_STATE_FILE = path8.join(boardRepo_1.BOARD_STATE_DIR, "sync.json");
     exports.BOARD_GITATTRIBUTES = [
       "logs/ledger.jsonl merge=union",
       "board/*.md merge=brainfile",
@@ -2447,7 +2501,7 @@ var require_boardSync = __commonJS({
     }
     function writeSyncState(dotDir, state) {
       try {
-        fs8.mkdirSync(path8.join(dotDir, "state"), { recursive: true });
+        fs8.mkdirSync(path8.join(dotDir, boardRepo_1.BOARD_STATE_DIR), { recursive: true });
         fs8.writeFileSync(path8.join(dotDir, SYNC_STATE_FILE), `${JSON.stringify(state, null, 2)}
 `, "utf-8");
       } catch {
@@ -2516,14 +2570,53 @@ ${entryLine}
       }
       return resolved;
     }
+    function saveLocalState(dotDir, incoming) {
+      const saved = /* @__PURE__ */ new Map();
+      const r = (0, boardRepo_1.git)(["diff", "--name-only", "-z", "--no-renames", `HEAD...${incoming}`, "--", boardRepo_1.BOARD_STATE_DIR], dotDir);
+      if (!r.ok)
+        return saved;
+      for (const rel of r.stdout.split("\0").filter(Boolean)) {
+        try {
+          saved.set(rel, fs8.readFileSync(path8.join(dotDir, rel)));
+        } catch {
+          saved.set(rel, null);
+        }
+      }
+      return saved;
+    }
+    function restoreLocalState(dotDir, saved) {
+      for (const [rel, content] of saved) {
+        const file = path8.join(dotDir, rel);
+        try {
+          if (content === null) {
+            fs8.rmSync(file, { force: true });
+          } else {
+            fs8.mkdirSync(path8.dirname(file), { recursive: true });
+            fs8.writeFileSync(file, content);
+          }
+        } catch {
+        }
+      }
+    }
     function mergeIncoming(dotDir, incoming, result) {
       if ((0, boardRepo_1.git)(["merge-base", "--is-ancestor", incoming, "HEAD"], dotDir).ok)
         return { ok: true, pulled: 0 };
+      const saved = saveLocalState(dotDir, incoming);
+      try {
+        return mergeIncomingInto(dotDir, incoming, result);
+      } finally {
+        restoreLocalState(dotDir, saved);
+      }
+    }
+    function mergeIncomingInto(dotDir, incoming, result) {
       const before = (0, boardRepo_1.git)(["rev-parse", "HEAD"], dotDir).stdout;
       const id = identityArgs(dotDir);
       const merge = (0, boardRepo_1.git)([...id, "merge", "--quiet", "--no-edit", incoming], dotDir);
       if (!merge.ok) {
         resolveCompleteVersusEdit2(dotDir);
+        if ((0, boardRepo_1.git)(["rev-parse", "--verify", "--quiet", "MERGE_HEAD"], dotDir).ok) {
+          (0, boardRepo_1.unstageBoardState)(dotDir);
+        }
         const remaining = (0, boardRepo_1.unmergedFiles)(dotDir);
         if (remaining.length > 0) {
           return {
@@ -2599,6 +2692,7 @@ ${entryLine}
             return finish(dotDir, merged.result);
           result.pulled += merged.pulled;
         }
+        (0, boardRepo_1.keepBoardStateLocal)(dotDir);
       }
       if (push) {
         const known = (0, boardRepo_1.git)(["rev-parse", "--verify", "--quiet", tracking], dotDir).ok;
@@ -3693,7 +3787,9 @@ var require_consolidate = __commonJS({
       const index = path8.join(ctx.common, `brainfile-index-${process.pid}-${Date.now()}`);
       const env = { GIT_DIR: ctx.common, GIT_WORK_TREE: dir, GIT_INDEX_FILE: index };
       try {
-        must((0, boardRepo_1.git)(["add", "-A", "--", ".", ":(exclude)state", ":(exclude).git"], dir, env), `read ${dir}`);
+        must((0, boardRepo_1.git)(["add", "-A", "--", ".", ":(exclude).git"], dir, env), `read ${dir}`);
+        if (!(0, boardRepo_1.unstageBoardState)(dir, env))
+          throw new Error(`read ${dir}: could not leave out state/`);
         return must((0, boardRepo_1.git)(["write-tree"], dir, env), `snapshot ${dir}`);
       } finally {
         fs8.rmSync(index, { force: true });
@@ -3843,7 +3939,7 @@ var require_consolidate = __commonJS({
       }
       for (const c of present) {
         (0, boardRepo_1.commitHandEdits)(c.path);
-        if (real(c.path) !== ctx.home && (0, boardRepo_1.git)(["status", "--porcelain"], c.path).stdout) {
+        if (real(c.path) !== ctx.home && (0, boardRepo_1.boardIsDirty)(c.path)) {
           throw new Error(`The board branch is also checked out at ${c.path} with files git could not commit. Clear them there first. Nothing else was changed.`);
         }
       }

package/dist/cli.mjs

@@ -65,7 +65,7 @@ import {
   validationError,
   validationError2,
   workspaceRootFromBrainfilePath
-} from "./chunk-BNE7R5GK.mjs";
+} from "./chunk-CWUTU5VV.mjs";
 import {
   require_dist
 } from "./chunk-XFDTTLSW.mjs";
@@ -3507,7 +3507,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "brainfile",
-      version: "0.22.0",
+      version: "0.22.1",
       description: "Command-line interface for Brainfile task management",
       main: "dist/index.js",
       types: "dist/index.d.ts",
@@ -3544,7 +3544,7 @@ var require_package = __commonJS({
         access: "public"
       },
       dependencies: {
-        "@brainfile/core": "^0.22.0",
+        "@brainfile/core": "^0.22.1",
         chalk: "^4.1.2",
         chokidar: "^4.0.3",
         commander: "^14.0.3",
@@ -44537,7 +44537,7 @@ function columnsRemoveCommand(column, options, logger = defaultLogger) {
 
 // src/program.ts
 async function runTui(options) {
-  const { tuiCommand } = await import("./tui-IR3JKS4Y.mjs");
+  const { tuiCommand } = await import("./tui-D6RMFL6X.mjs");
   return tuiCommand(options);
 }
 var packageJson = JSON.parse(

package/dist/{tui-IR3JKS4Y.mjs → tui-D6RMFL6X.mjs}

@@ -21,7 +21,7 @@ import {
   require_source,
   resolveCliBrainfilePath,
   shouldSuggestV2Migration
-} from "./chunk-BNE7R5GK.mjs";
+} from "./chunk-CWUTU5VV.mjs";
 import {
   require_dist
 } from "./chunk-XFDTTLSW.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "brainfile",
-  "version": "0.22.0",
+  "version": "0.22.1",
   "description": "Command-line interface for Brainfile task management",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -37,7 +37,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@brainfile/core": "^0.22.0",
+    "@brainfile/core": "^0.22.1",
     "chalk": "^4.1.2",
     "chokidar": "^4.0.3",
     "commander": "^14.0.3",