brainfile 0.19.0 → 0.21.0

package/dist/commands/merge-driver.js

@@ -0,0 +1,195 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeFields = mergeFields;
+exports.mergeBodies = mergeBodies;
+exports.mergeBoardDocuments = mergeBoardDocuments;
+exports.summarizeFieldChanges = summarizeFieldChanges;
+exports.mergeDriverCommand = mergeDriverCommand;
+/**
+ * `brainfile merge-driver <base> <ours> <theirs>` — git merge driver for
+ * board documents (spec-9). Registered by init/migrate/sync as
+ * `merge.brainfile.driver`, selected by `.gitattributes` on the board branch.
+ *
+ * Frontmatter merges field by field: a field changed on one side takes that
+ * side; changed on both, the later `updatedAt` wins and a tie goes to theirs,
+ * so both machines converge on the same answer. The body goes through git's
+ * own three-way text merge; a conflict whose two sides are both list items
+ * (log entries, notes) resolves by union ordered by timestamp. Anything else
+ * keeps git's markers and exits 1 so `sync` can name the file.
+ */
+const fs = __importStar(require("fs"));
+const os = __importStar(require("os"));
+const path = __importStar(require("path"));
+const child_process_1 = require("child_process");
+const core_1 = require("@brainfile/core");
+function parseDoc(content) {
+    const parsed = (0, core_1.parseFrontmatter)(content);
+    if (!parsed)
+        return null;
+    return { data: parsed.data, body: parsed.body };
+}
+function same(a, b) {
+    return JSON.stringify(a ?? null) === JSON.stringify(b ?? null);
+}
+function stamp(data) {
+    const value = data.updatedAt;
+    return typeof value === 'string' ? value : '';
+}
+/** Field-level last-writer-wins; exported for tests. */
+function mergeFields(base, ours, theirs) {
+    const keys = [];
+    for (const key of [...Object.keys(ours), ...Object.keys(theirs), ...Object.keys(base)]) {
+        if (!keys.includes(key))
+            keys.push(key);
+    }
+    const oursWins = stamp(ours) > stamp(theirs);
+    const out = {};
+    for (const key of keys) {
+        const b = base[key];
+        const o = ours[key];
+        const t = theirs[key];
+        let pick;
+        if (same(o, t))
+            pick = o;
+        else if (same(b, o))
+            pick = t;
+        else if (same(b, t))
+            pick = o;
+        else if (key === 'updatedAt')
+            pick = String(o ?? '') > String(t ?? '') ? o : t;
+        else
+            pick = oursWins ? o : t;
+        if (pick !== undefined)
+            out[key] = pick;
+    }
+    return out;
+}
+const CONFLICT = /^<{7}[^\n]*\n([\s\S]*?)^={7}\n([\s\S]*?)^>{7}[^\n]*\n?/gm;
+const LIST_ITEM = /^\s*[-*]\s+/;
+const LEADING_STAMP = /^\s*[-*]\s+(\d{4}-\d{2}-\d{2}T[0-9:.]+Z?)\b/;
+function unionLists(ours, theirs) {
+    const a = ours.split('\n').filter((l) => l.trim().length > 0);
+    const b = theirs.split('\n').filter((l) => l.trim().length > 0);
+    if (![...a, ...b].every((l) => LIST_ITEM.test(l)))
+        return null;
+    const merged = [...a];
+    for (const line of b)
+        if (!merged.includes(line))
+            merged.push(line);
+    if (merged.every((l) => LEADING_STAMP.test(l))) {
+        merged.sort((x, y) => {
+            const sx = LEADING_STAMP.exec(x)?.[1] ?? '';
+            const sy = LEADING_STAMP.exec(y)?.[1] ?? '';
+            return sx < sy ? -1 : sx > sy ? 1 : 0;
+        });
+    }
+    return `${merged.join('\n')}\n`;
+}
+/** Three-way text merge through git, then union-resolve list conflicts. */
+function mergeBodies(base, ours, theirs) {
+    if (ours === theirs)
+        return { content: ours, clean: true };
+    if (base === ours)
+        return { content: theirs, clean: true };
+    if (base === theirs)
+        return { content: ours, clean: true };
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'brainfile-merge-'));
+    try {
+        const files = { base: path.join(dir, 'base'), ours: path.join(dir, 'ours'), theirs: path.join(dir, 'theirs') };
+        fs.writeFileSync(files.base, base);
+        fs.writeFileSync(files.ours, ours);
+        fs.writeFileSync(files.theirs, theirs);
+        const r = (0, child_process_1.spawnSync)('git', ['merge-file', '-p', '-L', 'ours', '-L', 'base', '-L', 'theirs', files.ours, files.base, files.theirs], {
+            encoding: 'utf-8',
+            stdio: ['ignore', 'pipe', 'pipe'],
+        });
+        if (r.status === null || r.status < 0) {
+            return { content: `<<<<<<< ours\n${ours}=======\n${theirs}>>>>>>> theirs\n`, clean: false };
+        }
+        if (r.status === 0)
+            return { content: r.stdout, clean: true };
+        let clean = true;
+        const content = r.stdout.replace(CONFLICT, (whole, oursHunk, theirsHunk) => {
+            const union = unionLists(oursHunk, theirsHunk);
+            if (union === null) {
+                clean = false;
+                return whole;
+            }
+            return union;
+        });
+        return { content, clean };
+    }
+    finally {
+        fs.rmSync(dir, { recursive: true, force: true });
+    }
+}
+/** Merge two board documents against their common base. */
+function mergeBoardDocuments(base, ours, theirs) {
+    const b = parseDoc(base);
+    const o = parseDoc(ours);
+    const t = parseDoc(theirs);
+    if (!o || !t)
+        return mergeBodies(base, ours, theirs);
+    const data = mergeFields(b?.data ?? {}, o.data, t.data);
+    const body = mergeBodies(b?.body ?? '', o.body, t.body);
+    return { content: (0, core_1.serializeFrontmatter)(data, body.content), clean: body.clean };
+}
+/** "column: todo → review; title: …" for the fields that differ; exported for sync. */
+function summarizeFieldChanges(before, after) {
+    const b = parseDoc(before)?.data ?? {};
+    const a = parseDoc(after)?.data ?? {};
+    const parts = [];
+    for (const key of Object.keys(a)) {
+        if (key === 'updatedAt' || same(b[key], a[key]))
+            continue;
+        const render = (v) => (typeof v === 'string' ? v : JSON.stringify(v));
+        parts.push(`${key}: ${b[key] === undefined ? '∅' : render(b[key])} → ${render(a[key])}`);
+    }
+    return parts.join('; ');
+}
+/**
+ * Entry point for git: reads the three files, writes the result over `ours`,
+ * returns the exit code (0 clean, 1 conflicts remain, 2 usage).
+ */
+function mergeDriverCommand(options) {
+    const read = (p) => (fs.existsSync(p) ? fs.readFileSync(p, 'utf-8') : '');
+    if (!options.ours || !options.theirs)
+        return 2;
+    const outcome = mergeBoardDocuments(read(options.base), read(options.ours), read(options.theirs));
+    fs.writeFileSync(options.ours, outcome.content, 'utf-8');
+    return outcome.clean ? 0 : 1;
+}
+//# sourceMappingURL=merge-driver.js.map

package/dist/commands/merge-driver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-driver.js","sourceRoot":"","sources":["../../src/commands/merge-driver.ts"],"names":[],"mappings":"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"}

package/dist/commands/migrate-tracked.d.ts

@@ -0,0 +1,8 @@
+export interface MigrateTrackedOptions {
+    dir?: string;
+    /** After `--to-branch` on a committed board, also commit its removal from the code branch. */
+    commit?: boolean;
+}
+export declare function migrateToBranch(options?: MigrateTrackedOptions): void;
+export declare function migrateToPlain(options?: MigrateTrackedOptions): void;
+//# sourceMappingURL=migrate-tracked.d.ts.map

package/dist/commands/migrate-tracked.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate-tracked.d.ts","sourceRoot":"","sources":["../../src/commands/migrate-tracked.ts"],"names":[],"mappings":"AA+BA,MAAM,WAAW,qBAAqB;IACpC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,8FAA8F;IAC9F,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AA0LD,wBAAgB,eAAe,CAAC,OAAO,GAAE,qBAA0B,GAAG,IAAI,CAuIzE;AAkBD,wBAAgB,cAAc,CAAC,OAAO,GAAE,qBAA0B,GAAG,IAAI,CAgCxE"}

package/dist/commands/migrate-tracked.js

@@ -0,0 +1,428 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.migrateToBranch = migrateToBranch;
+exports.migrateToPlain = migrateToPlain;
+/**
+ * `brainfile migrate --to-branch` / `--to-plain` (spec-9, phase 1).
+ *
+ * Moves an existing board between plain-directory storage and tracked storage
+ * (a linked worktree on the board branch inside a repo, or a standalone
+ * repository outside one). Every path preserves the board's files as they are
+ * on disk, uncommitted edits included; the committed-on-main case also
+ * preserves its history through `git subtree split`. A failed `--to-branch`
+ * rolls back everything it did, so the repository is left as it was found.
+ */
+const crypto = __importStar(require("crypto"));
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const child_process_1 = require("child_process");
+const chalk_1 = __importDefault(require("chalk"));
+const core_1 = require("@brainfile/core");
+const board_repo_1 = require("../utils/board-repo");
+const board_sync_1 = require("../utils/board-sync");
+const SKIP_TOP_LEVEL = new Set(['.git']);
+const STATE_DIR = 'state';
+function locateBoard(rootDir) {
+    const found = (0, core_1.findBrainfile)(rootDir, { stopAtGitRoot: true });
+    if (!found || found.kind !== 'dotdir') {
+        throw new Error(`No .brainfile/ board found from ${rootDir}.`);
+    }
+    return path.dirname(found.absolutePath);
+}
+function copyBoardContents(from, to) {
+    for (const entry of fs.readdirSync(from)) {
+        if (SKIP_TOP_LEVEL.has(entry))
+            continue;
+        // verbatimSymlinks: a relative link must not be rewritten to point into the copy being deleted.
+        fs.cpSync(path.join(from, entry), path.join(to, entry), { recursive: true, force: true, verbatimSymlinks: true });
+    }
+}
+/**
+ * Make `to` hold exactly what `from` holds on disk (its `.git` aside): files
+ * edited, added, or deleted since the last commit all carry over.
+ */
+function mirrorBoardContents(from, to) {
+    for (const entry of fs.readdirSync(to)) {
+        if (SKIP_TOP_LEVEL.has(entry))
+            continue;
+        fs.rmSync(path.join(to, entry), { recursive: true, force: true });
+    }
+    copyBoardContents(from, to);
+}
+/** Every board file (local-only `state/` excluded) mapped to a sha256 of its contents. */
+function hashBoardFiles(dir) {
+    const out = new Map();
+    const walk = (current, prefix) => {
+        for (const entry of fs.readdirSync(current, { withFileTypes: true })) {
+            if (prefix === '' && (SKIP_TOP_LEVEL.has(entry.name) || entry.name === STATE_DIR))
+                continue;
+            const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
+            const full = path.join(current, entry.name);
+            if (entry.isDirectory())
+                walk(full, rel);
+            else if (entry.isSymbolicLink())
+                out.set(rel, `link:${fs.readlinkSync(full)}`);
+            else
+                out.set(rel, crypto.createHash('sha256').update(fs.readFileSync(full)).digest('hex'));
+        }
+    };
+    walk(dir, '');
+    return out;
+}
+function asidePath(dotDir) {
+    const candidate = `${dotDir}.migrating`;
+    if (fs.existsSync(candidate))
+        throw new Error(`${candidate} already exists; remove it before migrating.`);
+    return candidate;
+}
+function restoreAside(aside, dotDir) {
+    if (fs.existsSync(dotDir))
+        fs.rmSync(dotDir, { recursive: true, force: true });
+    fs.renameSync(aside, dotDir);
+}
+/**
+ * Every original file must be in the migrated board with the same contents.
+ * The move may add `.gitattributes` (merge strategies, appended to an
+ * existing one) and `.gitkeep` files; nothing else may differ. Throws on a
+ * mismatch and leaves both copies in place for the caller to roll back.
+ */
+function verifyBoardContents(aside, dotDir) {
+    const before = hashBoardFiles(aside);
+    const after = hashBoardFiles(dotDir);
+    const problems = [];
+    for (const [file, hash] of before) {
+        if (!after.has(file))
+            problems.push(`missing ${file}`);
+        else if (after.get(file) === hash)
+            continue;
+        else if (file === '.gitattributes' && attributesExtend(aside, dotDir))
+            continue;
+        else
+            problems.push(`changed ${file}`);
+    }
+    for (const file of after.keys()) {
+        if (before.has(file))
+            continue;
+        if (file === '.gitattributes' || file.endsWith('/.gitkeep'))
+            continue;
+        problems.push(`unexpected ${file}`);
+    }
+    if (problems.length > 0) {
+        const shown = problems.slice(0, 5).join(', ');
+        const more = problems.length > 5 ? ` (+${problems.length - 5} more)` : '';
+        throw new Error(`Board contents differ after migration: ${shown}${more}.`);
+    }
+}
+function attributesExtend(aside, dotDir) {
+    const lines = (dir) => fs.readFileSync(path.join(dir, '.gitattributes'), 'utf-8').split('\n').map((l) => l.trim());
+    const after = new Set(lines(dotDir));
+    return lines(aside).every((line) => after.has(line));
+}
+/** Staged changes under `relPath` as a binary patch, untrimmed so it applies back verbatim. */
+function stagedPatch(relPath, repoRoot) {
+    const r = (0, child_process_1.spawnSync)('git', ['diff', '--cached', '--binary', '--', relPath], { cwd: repoRoot, encoding: 'utf-8' });
+    return r.status === 0 ? r.stdout : '';
+}
+/** `git apply --cached` with a patch on stdin. */
+function applyToIndex(patch, repoRoot) {
+    const r = (0, child_process_1.spawnSync)('git', ['apply', '--cached', '--binary', '-'], { cwd: repoRoot, input: patch, encoding: 'utf-8' });
+    return r.status === 0;
+}
+/**
+ * Undo log for `--to-branch`. Each step that changes the repository records
+ * itself; `undo()` reverses them so a failure leaves the repo as it was found.
+ */
+class MigrationRollback {
+    constructor(repoRoot, dotDir, aside, branch, relDotDir) {
+        this.repoRoot = repoRoot;
+        this.dotDir = dotDir;
+        this.aside = aside;
+        this.branch = branch;
+        this.relDotDir = relDotDir;
+        this.branchMayExist = false;
+        this.indexChanged = false;
+        this.stagedBefore = '';
+        this.movedAside = false;
+    }
+    /** Call just before anything may create the board branch (it did not exist when the migration started). */
+    creatingBranch() {
+        this.branchMayExist = true;
+    }
+    /** Call just before unstaging the board from the code branch. */
+    changingIndex() {
+        // Board changes the user had already staged are put back as they were.
+        this.stagedBefore = stagedPatch(this.relDotDir, this.repoRoot);
+        this.indexChanged = true;
+    }
+    moveAside() {
+        fs.renameSync(this.dotDir, this.aside);
+        this.movedAside = true;
+    }
+    /** Reverse every recorded step. Returns what could not be undone (empty when fully restored). */
+    undo() {
+        const problems = [];
+        const attempt = (what, step) => {
+            try {
+                step();
+            }
+            catch (error) {
+                problems.push(`${what}: ${error instanceof Error ? error.message : String(error)}`);
+            }
+        };
+        // Once the original is aside, whatever sits at dotDir was made by this
+        // migration. Judge by what exists, not by what reported success: `git
+        // worktree add` can register the worktree and still fail (a failing
+        // post-checkout hook, for one).
+        if (this.movedAside && (0, board_repo_1.boardRepoKind)(this.dotDir) === 'linked') {
+            attempt('remove the board worktree', () => {
+                const removed = (0, board_repo_1.git)(['worktree', 'remove', '--force', this.dotDir], this.repoRoot);
+                if (!removed.ok)
+                    fs.rmSync(this.dotDir, { recursive: true, force: true });
+            });
+        }
+        if (this.movedAside)
+            attempt(`move ${this.aside} back`, () => restoreAside(this.aside, this.dotDir));
+        // The branch did not exist before, so a worktree still claiming it is ours and now stale.
+        if (this.branchMayExist && (0, board_repo_1.listWorktrees)(this.repoRoot).some((w) => w.branch === `refs/heads/${this.branch}`)) {
+            (0, board_repo_1.git)(['worktree', 'prune'], this.repoRoot);
+        }
+        if (this.branchMayExist && (0, board_repo_1.git)(['rev-parse', '--verify', '--quiet', `refs/heads/${this.branch}`], this.repoRoot).ok) {
+            attempt(`delete branch '${this.branch}'`, () => {
+                const deleted = (0, board_repo_1.git)(['branch', '-D', this.branch], this.repoRoot);
+                if (!deleted.ok)
+                    throw new Error(deleted.stderr);
+            });
+        }
+        if (this.indexChanged) {
+            attempt(`restore the index for ${this.relDotDir}`, () => {
+                const reset = (0, board_repo_1.git)(['reset', '-q', '--', this.relDotDir], this.repoRoot);
+                if (!reset.ok)
+                    throw new Error(reset.stderr);
+                if (this.stagedBefore && !applyToIndex(this.stagedBefore, this.repoRoot)) {
+                    throw new Error('could not re-stage the board changes that were staged before');
+                }
+            });
+        }
+        return problems;
+    }
+}
+function migrateToBranch(options = {}) {
+    const rootDir = path.resolve(options.dir || process.cwd());
+    const dotDir = locateBoard(rootDir);
+    const kind = (0, board_repo_1.boardRepoKind)(dotDir);
+    const repoRoot = (0, board_repo_1.gitToplevel)(path.dirname(dotDir));
+    if (kind === 'linked') {
+        console.log(chalk_1.default.green('Board is already a worktree on its own branch.'));
+        console.log(chalk_1.default.gray(`  ${dotDir}`));
+        return;
+    }
+    if (!repoRoot) {
+        if (kind === 'standalone') {
+            console.log(chalk_1.default.green('Board is already its own git repository.'));
+            return;
+        }
+        (0, board_repo_1.initStandaloneBoardRepo)(dotDir);
+        (0, board_sync_1.ensureBoardAttributes)(dotDir);
+        (0, board_sync_1.registerMergeDriver)(dotDir);
+        (0, board_repo_1.commitBoard)(dotDir, { message: 'import board' });
+        console.log(chalk_1.default.green('Board is now its own git repository.'));
+        printMigratedStory(dotDir, null);
+        return;
+    }
+    const branch = (0, board_repo_1.boardBranch)(repoRoot);
+    if ((0, board_repo_1.git)(['rev-parse', '--verify', '--quiet', `refs/heads/${branch}`], repoRoot).ok) {
+        const checkedOut = (0, board_repo_1.listWorktrees)(repoRoot).find((w) => w.branch === `refs/heads/${branch}`);
+        throw new Error(checkedOut
+            ? `Branch '${branch}' is already checked out at ${checkedOut.path}.`
+            : `Branch '${branch}' already exists. Delete it (git branch -D ${branch}) or set brainfile.branch to another name.`);
+    }
+    const relDotDir = path.relative(repoRoot, dotDir).split(path.sep).join('/');
+    const trackedOnCodeBranch = (0, board_repo_1.git)(['ls-files', '--error-unmatch', relDotDir], repoRoot).ok;
+    const aside = asidePath(dotDir);
+    const rollback = new MigrationRollback(repoRoot, dotDir, aside, branch, relDotDir);
+    let done;
+    let uncommittedImported = false;
+    try {
+        if (trackedOnCodeBranch) {
+            // History-preserving split of the board's commits onto the new branch.
+            rollback.creatingBranch();
+            const split = (0, board_repo_1.git)(['subtree', 'split', '--quiet', `--prefix=${relDotDir}`, '-b', branch], repoRoot);
+            if (!split.ok) {
+                console.log(chalk_1.default.yellow('git subtree is unavailable; importing the board without its history.'));
+            }
+            rollback.changingIndex();
+            const rm = (0, board_repo_1.git)(['rm', '-r', '--quiet', '--cached', relDotDir], repoRoot);
+            if (!rm.ok)
+                throw new Error(`git rm --cached failed: ${rm.stderr}`);
+            rollback.moveAside();
+            if (split.ok) {
+                const add = (0, board_repo_1.git)(['worktree', 'add', '--quiet', dotDir, branch], repoRoot);
+                if (!add.ok)
+                    throw new Error(`git worktree add failed: ${add.stderr || `exit status ${add.status}`}.`);
+                // The split carries committed history only. Bring the board over as it
+                // is on disk (uncommitted edits, new or git-ignored files, deletions)
+                // and record the difference as one commit on top of that history.
+                mirrorBoardContents(aside, dotDir);
+                if ((0, board_repo_1.boardIsDirty)(dotDir)) {
+                    if (!(0, board_repo_1.commitBoard)(dotDir, { message: 'import uncommitted board changes' }) || (0, board_repo_1.boardIsDirty)(dotDir)) {
+                        throw new Error('Could not commit the uncommitted board changes on the board branch.');
+                    }
+                    uncommittedImported = true;
+                }
+                // History carried over; the merge setup every tracked board needs did not.
+                (0, board_sync_1.ensureBoardAttributes)(dotDir);
+                (0, board_sync_1.registerMergeDriver)(dotDir);
+                (0, board_repo_1.commitBoard)(dotDir, { message: 'chore: merge attributes' });
+            }
+            else {
+                (0, board_repo_1.createOrphanBoardWorktree)(repoRoot, dotDir, branch);
+                mirrorBoardContents(aside, dotDir);
+                (0, board_sync_1.ensureBoardAttributes)(dotDir);
+                (0, board_sync_1.registerMergeDriver)(dotDir);
+                (0, board_repo_1.commitBoard)(dotDir, { message: 'import board' });
+            }
+            verifyBoardContents(aside, dotDir);
+            done = `Board moved to branch '${branch}'${split.ok ? ' with its history' : ''}.`;
+        }
+        else if (kind === 'standalone') {
+            // Fold the standalone repository's history into the outer repo as the board branch.
+            rollback.creatingBranch();
+            const fetch = (0, board_repo_1.git)(['fetch', '--quiet', dotDir, `HEAD:refs/heads/${branch}`], repoRoot);
+            if (!fetch.ok)
+                throw new Error(`Could not import the board's history: ${fetch.stderr}`);
+            rollback.moveAside();
+            const add = (0, board_repo_1.git)(['worktree', 'add', '--quiet', dotDir, branch], repoRoot);
+            if (!add.ok)
+                throw new Error(`git worktree add failed: ${add.stderr || `exit status ${add.status}`}.`);
+            // Uncommitted work in the standalone repo comes along too.
+            mirrorBoardContents(aside, dotDir);
+            (0, board_sync_1.ensureBoardAttributes)(dotDir);
+            (0, board_sync_1.registerMergeDriver)(dotDir);
+            (0, board_repo_1.commitBoard)(dotDir, { message: 'import board' });
+            verifyBoardContents(aside, dotDir);
+            done = `Board history folded into branch '${branch}'.`;
+        }
+        else {
+            // Plain, untracked (usually gitignored) directory: import as an orphan branch.
+            rollback.moveAside();
+            rollback.creatingBranch();
+            (0, board_repo_1.createOrphanBoardWorktree)(repoRoot, dotDir, branch);
+            mirrorBoardContents(aside, dotDir);
+            (0, board_sync_1.ensureBoardAttributes)(dotDir);
+            (0, board_sync_1.registerMergeDriver)(dotDir);
+            (0, board_repo_1.commitBoard)(dotDir, { message: 'import board' });
+            verifyBoardContents(aside, dotDir);
+            done = `Board imported onto branch '${branch}'.`;
+        }
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        const leftovers = rollback.undo();
+        throw new Error(leftovers.length === 0
+            ? `${message} Nothing was changed: the board is back where it was.`
+            : `${message} Rolling back was incomplete; could not ${leftovers.join('; ')}. The original board is in ${fs.existsSync(aside) ? aside : dotDir}.`);
+    }
+    fs.rmSync(aside, { recursive: true, force: true });
+    (0, board_repo_1.ensureExcludeEntry)(repoRoot);
+    console.log(chalk_1.default.green(done));
+    if (uncommittedImported) {
+        console.log(chalk_1.default.gray('  Board changes that were not committed yet came along as one more commit on that branch.'));
+    }
+    if (trackedOnCodeBranch) {
+        if (options.commit) {
+            const commit = (0, board_repo_1.git)(['commit', '--quiet', '--no-verify', '-m', `chore: move the board to the ${branch} branch`], repoRoot);
+            if (!commit.ok)
+                throw new Error(`Could not commit the removal on the code branch: ${commit.stderr}`);
+            console.log(chalk_1.default.gray('  The old copy on your code branch was removed in a commit; the board itself is on its own branch.'));
+        }
+        else {
+            console.log(chalk_1.default.gray('  Your code branch still tracks the old copy. It is staged to be dropped there (the board itself is safe). Commit that:'));
+            console.log(chalk_1.default.cyan(`    git commit -m "chore: move the board to the ${branch} branch"`));
+        }
+    }
+    printMigratedStory(dotDir, branch);
+}
+function printMigratedStory(dotDir, branch) {
+    const say = (text = '') => console.log(text ? `  ${text}` : '');
+    say();
+    say(`Same files, same place: ${path.relative(process.cwd(), dotDir) || '.'}/`);
+    if (branch) {
+        say(`Every change is now a git commit on a separate '${branch}' branch, kept out`);
+        say('of your code and pull requests. Only on this machine until you share it.');
+        say(chalk_1.default.gray('(A plain git push never sends it; git push --all or --mirror would.)'));
+    }
+    else {
+        say('Every change is now a git commit. It is only on this machine until you share it.');
+    }
+    say();
+    say(`${chalk_1.default.gray('Share it:')}   ${chalk_1.default.cyan('brainfile sync --set-remote origin')}`);
+    say(`${chalk_1.default.gray('Check it:')}   ${chalk_1.default.cyan('brainfile where')}`);
+}
+function migrateToPlain(options = {}) {
+    const rootDir = path.resolve(options.dir || process.cwd());
+    const dotDir = locateBoard(rootDir);
+    const kind = (0, board_repo_1.boardRepoKind)(dotDir);
+    if (kind === null) {
+        console.log(chalk_1.default.green('Board is already a plain directory.'));
+        return;
+    }
+    if (kind === 'standalone') {
+        fs.rmSync(path.join(dotDir, '.git'), { recursive: true, force: true });
+        console.log(chalk_1.default.green('Board is now a plain directory (its git history was removed).'));
+        return;
+    }
+    const repoRoot = (0, board_repo_1.gitToplevel)(path.dirname(dotDir));
+    if (!repoRoot)
+        throw new Error('Could not find the repository that owns this board worktree.');
+    const branch = (0, board_repo_1.boardBranch)(repoRoot);
+    const aside = asidePath(dotDir);
+    fs.mkdirSync(aside);
+    copyBoardContents(dotDir, aside);
+    const remove = (0, board_repo_1.git)(['worktree', 'remove', '--force', dotDir], repoRoot);
+    if (!remove.ok) {
+        fs.rmSync(aside, { recursive: true, force: true });
+        throw new Error(`git worktree remove failed: ${remove.stderr}`);
+    }
+    fs.renameSync(aside, dotDir);
+    (0, board_repo_1.removeExcludeEntry)(repoRoot);
+    console.log(chalk_1.default.green('Board is now a plain directory.'));
+    console.log(chalk_1.default.gray(`  Branch '${branch}' still holds its history. Delete it with: git branch -D ${branch}`));
+    console.log(chalk_1.default.gray('  Add .brainfile/ to .gitignore if it should stay out of the code branch.'));
+}
+//# sourceMappingURL=migrate-tracked.js.map