@rpamis/comet 0.4.0-beta.4 → 0.4.0-beta.6

package/dist/domains/comet-classic/classic-branch-binding.d.ts

@@ -0,0 +1,51 @@
+export declare function liveGitBranch(cwd: string): string | null;
+export declare function isGitWorkTree(cwd: string): boolean;
+export type BranchBindingVerdict = {
+    status: 'not-applicable';
+} | {
+    status: 'ok';
+} | {
+    status: 'needs-heal';
+    branch: string;
+} | {
+    status: 'unbound-detached';
+} | {
+    status: 'drift';
+    boundBranch: string;
+    currentBranch: string | null;
+};
+export declare const BOUND_BRANCH_ISOLATIONS: readonly ["current", "branch", "worktree"];
+export declare function requiresBranchBinding(isolation: string | null): boolean;
+export declare function evaluateBranchBinding(input: {
+    isolation: string | null;
+    boundBranch: string | null;
+    currentBranch: string | null;
+    gitWorkTree?: boolean;
+}): BranchBindingVerdict;
+/**
+ * A `BranchBindingVerdict` joined with the live git facts it was computed
+ * from, so callers never re-derive them (or re-read the state file).
+ */
+export type BranchBindingOutcome = (BranchBindingVerdict | {
+    status: 'healed';
+    branch: string;
+}) & {
+    bindingRequired: boolean;
+    currentBranch: string | null;
+};
+/**
+ * Single entry point for every consumer of the branch binding: reads
+ * isolation/bound_branch straight from `.comet.yaml` (typed — a yaml `null`
+ * is a JS null, never a "null" string), spawns git lazily, and optionally
+ * performs the lazy heal. Read-only paths (the PreToolUse hook) must pass
+ * `heal: false` so resolving never writes to disk.
+ */
+export declare function resolveBranchBinding(changeDir: string, options: {
+    heal: boolean;
+    cwd: string;
+}): Promise<BranchBindingOutcome>;
+export declare function healBoundBranch(changeDir: string, branch: string): Promise<void>;
+export declare function driftBlockedMessage(change: string, boundBranch: string, currentBranch: string | null): string;
+export declare function driftStaleReason(change: string, boundBranch: string, currentBranch: string | null): string;
+export declare function unboundDetachedMessage(change: string): string;
+//# sourceMappingURL=classic-branch-binding.d.ts.map

package/dist/domains/comet-classic/classic-branch-binding.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"classic-branch-binding.d.ts","sourceRoot":"","sources":["../../../domains/comet-classic/classic-branch-binding.ts"],"names":[],"mappings":"AAMA,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAWxD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAYlD;AAED,MAAM,MAAM,oBAAoB,GAC5B;IAAE,MAAM,EAAE,gBAAgB,CAAA;CAAE,GAC5B;IAAE,MAAM,EAAE,IAAI,CAAA;CAAE,GAChB;IAAE,MAAM,EAAE,YAAY,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACxC;IAAE,MAAM,EAAE,kBAAkB,CAAA;CAAE,GAC9B;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAE3E,eAAO,MAAM,uBAAuB,4CAA6C,CAAC;AAElF,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAEvE;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,GAAG,oBAAoB,CAYvB;AAED;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,oBAAoB,GAAG;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG;IACjG,eAAe,EAAE,OAAO,CAAC;IACzB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,CAAC;AAEF;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GACtC,OAAO,CAAC,oBAAoB,CAAC,CAwB/B;AAED,wBAAsB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYtF;AAMD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,GAAG,IAAI,GAC3B,MAAM,CAKR;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,GAAG,IAAI,GAC3B,MAAM,CAER;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE7D"}

package/dist/domains/comet-classic/classic-branch-binding.js

@@ -0,0 +1,107 @@
+import { execFileSync } from 'child_process';
+import { randomUUID } from 'crypto';
+import { promises as fs } from 'fs';
+import path from 'path';
+import { parseDocument } from 'yaml';
+export function liveGitBranch(cwd) {
+    try {
+        const branch = execFileSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
+            cwd,
+            encoding: 'utf8',
+            stdio: ['ignore', 'pipe', 'ignore'],
+        }).trim();
+        return branch && branch !== 'HEAD' ? branch : null;
+    }
+    catch {
+        return null;
+    }
+}
+export function isGitWorkTree(cwd) {
+    try {
+        return (execFileSync('git', ['rev-parse', '--is-inside-work-tree'], {
+            cwd,
+            encoding: 'utf8',
+            stdio: ['ignore', 'pipe', 'ignore'],
+        }).trim() === 'true');
+    }
+    catch {
+        return false;
+    }
+}
+export const BOUND_BRANCH_ISOLATIONS = ['current', 'branch', 'worktree'];
+export function requiresBranchBinding(isolation) {
+    return BOUND_BRANCH_ISOLATIONS.includes(isolation);
+}
+export function evaluateBranchBinding(input) {
+    if (!requiresBranchBinding(input.isolation))
+        return { status: 'not-applicable' };
+    if (input.boundBranch === null && input.currentBranch === null && input.gitWorkTree === false) {
+        return { status: 'not-applicable' };
+    }
+    if (input.boundBranch === null) {
+        return input.currentBranch === null
+            ? { status: 'unbound-detached' }
+            : { status: 'needs-heal', branch: input.currentBranch };
+    }
+    if (input.currentBranch === input.boundBranch)
+        return { status: 'ok' };
+    return { status: 'drift', boundBranch: input.boundBranch, currentBranch: input.currentBranch };
+}
+/**
+ * Single entry point for every consumer of the branch binding: reads
+ * isolation/bound_branch straight from `.comet.yaml` (typed — a yaml `null`
+ * is a JS null, never a "null" string), spawns git lazily, and optionally
+ * performs the lazy heal. Read-only paths (the PreToolUse hook) must pass
+ * `heal: false` so resolving never writes to disk.
+ */
+export async function resolveBranchBinding(changeDir, options) {
+    const file = path.join(changeDir, '.comet.yaml');
+    const document = parseDocument(await fs.readFile(file, 'utf8'), { uniqueKeys: false });
+    if (document.errors.length > 0) {
+        throw new Error(`Invalid .comet.yaml: ${document.errors[0].message}`);
+    }
+    const record = (document.toJS() ?? {});
+    const isolation = typeof record.isolation === 'string' ? record.isolation : null;
+    const boundBranch = typeof record.bound_branch === 'string' && record.bound_branch !== ''
+        ? record.bound_branch
+        : null;
+    const bindingRequired = requiresBranchBinding(isolation);
+    const currentBranch = liveGitBranch(options.cwd);
+    const gitWorkTree = bindingRequired && boundBranch === null && currentBranch === null
+        ? isGitWorkTree(options.cwd)
+        : true;
+    const verdict = evaluateBranchBinding({ isolation, boundBranch, currentBranch, gitWorkTree });
+    if (verdict.status === 'needs-heal' && options.heal) {
+        await healBoundBranch(changeDir, verdict.branch);
+        return { status: 'healed', branch: verdict.branch, bindingRequired, currentBranch };
+    }
+    return { ...verdict, bindingRequired, currentBranch };
+}
+export async function healBoundBranch(changeDir, branch) {
+    const file = path.join(changeDir, '.comet.yaml');
+    const document = parseDocument(await fs.readFile(file, 'utf8'), { uniqueKeys: false });
+    document.set('bound_branch', branch);
+    const temporary = `${file}.${randomUUID()}.tmp`;
+    try {
+        await fs.writeFile(temporary, document.toString(), 'utf8');
+        await fs.rename(temporary, file);
+    }
+    catch (error) {
+        await fs.rm(temporary, { force: true });
+        throw error;
+    }
+}
+function branchLabel(currentBranch) {
+    return currentBranch ?? 'detached HEAD';
+}
+export function driftBlockedMessage(change, boundBranch, currentBranch) {
+    return (`change '${change}' is bound to branch '${boundBranch}', but current branch is '${branchLabel(currentBranch)}'.\n` +
+        `Next: ask the user to confirm — switch back to '${boundBranch}', or run \`comet state rebind ${change}\` after explicit confirmation.`);
+}
+export function driftStaleReason(change, boundBranch, currentBranch) {
+    return `change '${change}' is bound to branch '${boundBranch}', but current branch is '${branchLabel(currentBranch)}'`;
+}
+export function unboundDetachedMessage(change) {
+    return `change '${change}' uses a branch-bound workspace mode but has no bound branch and HEAD is detached; checkout a branch first before continuing.`;
+}
+//# sourceMappingURL=classic-branch-binding.js.map

package/dist/domains/comet-classic/classic-branch-binding.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"classic-branch-binding.js","sourceRoot":"","sources":["../../../domains/comet-classic/classic-branch-binding.ts"],"names":[],"mappings":"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"}

package/dist/domains/comet-classic/classic-current-change.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"classic-current-change.d.ts","sourceRoot":"","sources":["../../../domains/comet-classic/classic-current-change.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,CAAC,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,MAAM,MAAM,uBAAuB,GAC/B;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,sBAAsB,CAAA;CAAE,GACzD;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,GACrB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAExC,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAE7D;AA4ED,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,sBAAsB,CAAC,CAkBjC;AAED,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC,CA+BhG;AAED,wBAAsB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3E"}
+{"version":3,"file":"classic-current-change.d.ts","sourceRoot":"","sources":["../../../domains/comet-classic/classic-current-change.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,CAAC,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,MAAM,MAAM,uBAAuB,GAC/B;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,sBAAsB,CAAA;CAAE,GACzD;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,GACrB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAExC,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAE7D;AAgED,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,sBAAsB,CAAC,CA4BjC;AAED,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAkDhG;AAED,wBAAsB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3E"}

package/dist/domains/comet-classic/classic-current-change.js

@@ -1,25 +1,12 @@
-import { execFileSync } from 'child_process';
 import { randomUUID } from 'crypto';
 import { promises as fs } from 'fs';
 import path from 'path';
+import { driftStaleReason, resolveBranchBinding, unboundDetachedMessage, } from './classic-branch-binding.js';
 import { assertOpenSpecChangeName } from './classic-paths.js';
 import { readClassicState } from './classic-store.js';
 export function currentChangeFile(projectRoot) {
     return path.join(projectRoot, '.comet', 'current-change.json');
 }
-function currentBranch(projectRoot) {
-    try {
-        const branch = execFileSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
-            cwd: projectRoot,
-            encoding: 'utf8',
-            stdio: ['ignore', 'pipe', 'ignore'],
-        }).trim();
-        return branch && branch !== 'HEAD' ? branch : null;
-    }
-    catch {
-        return null;
-    }
-}
 function changeDirectory(projectRoot, changeName) {
     return path.join(projectRoot, 'openspec', 'changes', changeName);
 }
@@ -64,21 +51,32 @@ function parseSelection(source) {
         throw new Error('current change selection change must be a string');
     }
     assertOpenSpecChangeName(record.change);
-    if (record.branch !== null && typeof record.branch !== 'string') {
+    // `branch` may be absent in files written by early 0.4.0-beta.6 builds.
+    if (record.branch !== undefined && record.branch !== null && typeof record.branch !== 'string') {
         throw new Error('current change selection branch must be a string or null');
     }
     return {
         version: 1,
         change: record.change,
-        branch: record.branch,
+        branch: record.branch ?? null,
     };
 }
 export async function selectCurrentChange(projectRoot, changeName) {
     await validateActiveChange(projectRoot, changeName);
+    const outcome = await resolveBranchBinding(changeDirectory(projectRoot, changeName), {
+        heal: true,
+        cwd: projectRoot,
+    });
+    if (outcome.status === 'drift') {
+        throw new Error(driftStaleReason(changeName, outcome.boundBranch, outcome.currentBranch));
+    }
+    if (outcome.status === 'unbound-detached') {
+        throw new Error(unboundDetachedMessage(changeName));
+    }
     const selection = {
         version: 1,
         change: changeName,
-        branch: currentBranch(projectRoot),
+        branch: outcome.currentBranch,
     };
     const file = currentChangeFile(projectRoot);
     const temporary = `${file}.${randomUUID()}.tmp`;
@@ -117,11 +115,30 @@ export async function resolveCurrentChange(projectRoot) {
             reason: error instanceof Error ? error.message : String(error),
         };
     }
-    const branch = currentBranch(projectRoot);
-    if (selection.branch !== null && branch !== selection.branch) {
+    // Resolution is a read path (the PreToolUse hook runs it on every tool
+    // call), so it never heals: heal happens on select/check/guard instead.
+    const outcome = await resolveBranchBinding(changeDirectory(projectRoot, selection.change), {
+        heal: false,
+        cwd: projectRoot,
+    });
+    if (outcome.status === 'drift') {
+        return {
+            status: 'stale',
+            reason: driftStaleReason(selection.change, outcome.boundBranch, outcome.currentBranch),
+        };
+    }
+    if (outcome.status === 'unbound-detached') {
+        return { status: 'stale', reason: unboundDetachedMessage(selection.change) };
+    }
+    if (outcome.status === 'ok') {
+        return { status: 'selected', selection };
+    }
+    // No bound branch governs yet (isolation unset or binding not healed):
+    // fall back to comparing against the branch recorded at selection time.
+    if (selection.branch !== null && outcome.currentBranch !== selection.branch) {
         return {
             status: 'stale',
-            reason: `current change '${selection.change}' was selected on branch '${selection.branch}', current branch is '${branch ?? 'detached HEAD'}'`,
+            reason: `current change '${selection.change}' was selected on branch '${selection.branch}', current branch is '${outcome.currentBranch ?? 'detached HEAD'}'`,
         };
     }
     return { status: 'selected', selection };

package/dist/domains/comet-classic/classic-current-change.js.map

@@ -1 +1 @@
-{"version":3,"file":"classic-current-change.js","sourceRoot":"","sources":["../../../domains/comet-classic/classic-current-change.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAatD,MAAM,UAAU,iBAAiB,CAAC,WAAmB;IACnD,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,EAAE,qBAAqB,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,aAAa,CAAC,WAAmB;IACxC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE;YACxE,GAAG,EAAE,WAAW;YAChB,QAAQ,EAAE,MAAM;YAChB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC;SACpC,CAAC,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,MAAM,IAAI,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IACrD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,WAAmB,EAAE,UAAkB;IAC9D,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AACnE,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,WAAmB,EAAE,UAAkB;IACzE,wBAAwB,CAAC,UAAU,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAC3D,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC;IACvD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACvD,MAAM,IAAI,KAAK,CACb,iCAAiC,UAAU,kCAAkC,EAC7E;gBACE,KAAK,EAAE,KAAK;aACb,CACF,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IACzE,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,iCAAiC,UAAU,gCAAgC,CAAC,CAAC;IAC/F,CAAC;IACD,IAAI,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,iCAAiC,UAAU,uBAAuB,CAAC,CAAC;IACtF,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,MAAc;IACpC,IAAI,KAAc,CAAC;IACnB,IAAI,CAAC;QACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,mDAAmD,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAC3G,EAAE,KAAK,EAAE,KAAK,EAAE,CACjB,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,MAAM,GAAG,KAAgC,CAAC;IAChD,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,CAAC;IACD,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACxC,IAAI,MAAM,CAAC,MAAM,KAAK,IAAI,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAChE,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAC9E,CAAC;IACD,OAAO;QACL,OAAO,EAAE,CAAC;QACV,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,MAAM,EAAE,MAAM,CAAC,MAAuB;KACvC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,WAAmB,EACnB,UAAkB;IAElB,MAAM,oBAAoB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACpD,MAAM,SAAS,GAA2B;QACxC,OAAO,EAAE,CAAC;QACV,MAAM,EAAE,UAAU;QAClB,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC;KACnC,CAAC;IACF,MAAM,IAAI,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC5C,MAAM,SAAS,GAAG,GAAG,IAAI,IAAI,UAAU,EAAE,MAAM,CAAC;IAChD,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC;QACjF,MAAM,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACxC,MAAM,KAAK,CAAC;IACd,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,WAAmB;IAC5D,IAAI,MAAc,CAAC;IACnB,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,CAAC;IACrE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QACrF,OAAO;YACL,MAAM,EAAE,OAAO;YACf,MAAM,EAAE,yCAAyC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;SAC1G,CAAC;IACJ,CAAC;IAED,IAAI,SAAiC,CAAC;IACtC,IAAI,CAAC;QACH,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QACnC,MAAM,oBAAoB,CAAC,WAAW,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAC5D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,MAAM,EAAE,OAAO;YACf,MAAM,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;SAC/D,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;IAC1C,IAAI,SAAS,CAAC,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;QAC7D,OAAO;YACL,MAAM,EAAE,OAAO;YACf,MAAM,EAAE,mBAAmB,SAAS,CAAC,MAAM,6BAA6B,SAAS,CAAC,MAAM,yBAAyB,MAAM,IAAI,eAAe,GAAG;SAC9I,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;AAC3C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,WAAmB;IAC1D,MAAM,EAAE,CAAC,EAAE,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC/D,CAAC"}
+{"version":3,"file":"classic-current-change.js","sourceRoot":"","sources":["../../../domains/comet-classic/classic-current-change.ts"],"names":[],"mappings":"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"}

package/dist/domains/comet-classic/classic-guard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"classic-guard.d.ts","sourceRoot":"","sources":["../../../domains/comet-classic/classic-guard.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAwB,MAAM,kBAAkB,CAAC;AA64BpF,eAAO,MAAM,mBAAmB,EAAE,qBAmDjC,CAAC"}
+{"version":3,"file":"classic-guard.d.ts","sourceRoot":"","sources":["../../../domains/comet-classic/classic-guard.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAwB,MAAM,kBAAkB,CAAC;AAu7BpF,eAAO,MAAM,mBAAmB,EAAE,qBAmDjC,CAAC"}

package/dist/domains/comet-classic/classic-guard.js

@@ -12,6 +12,7 @@ import { CLASSIC_GUARD_TRANSITION_EVENT, applyClassicTransition } from './classi
 import { classicValidateCommand } from './classic-validate-command.js';
 import { readClassicState } from './classic-store.js';
 import { readClassicConfigValue } from './classic-project-config.js';
+import { driftBlockedMessage, resolveBranchBinding, unboundDetachedMessage, } from './classic-branch-binding.js';
 const GREEN = '\u001b[32m';
 const RED = '\u001b[31m';
 const YELLOW = '\u001b[33m';
@@ -411,17 +412,43 @@ async function planTasksAllDone(changeDir) {
     }
     return pass();
 }
+async function boundBranchMatches(changeDir, change) {
+    let outcome;
+    try {
+        outcome = await resolveBranchBinding(changeDir, { heal: true, cwd: process.cwd() });
+    }
+    catch (error) {
+        throw new GuardFailure(`ERROR: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    switch (outcome.status) {
+        case 'drift':
+            return fail(driftBlockedMessage(change, outcome.boundBranch, outcome.currentBranch));
+        case 'unbound-detached':
+            return fail(unboundDetachedMessage(change));
+        case 'healed':
+            return pass(`bound_branch lazily set to ${outcome.branch}`);
+        case 'needs-heal':
+        case 'ok':
+        case 'not-applicable':
+            return pass();
+        default: {
+            const exhaustive = outcome;
+            throw new Error(`unhandled branch binding status: ${JSON.stringify(exhaustive)}`);
+        }
+    }
+}
 async function isolationSelected(changeDir, change) {
     const isolation = await readField(changeDir, 'isolation');
-    if (isolation === 'branch' || isolation === 'worktree')
+    if (isolation === 'current' || isolation === 'branch' || isolation === 'worktree')
         return pass();
-    return fail(`isolation must be branch or worktree, got '${isolation || 'null'}'\nNext: ask the user to choose branch or worktree, create the chosen isolation, then run:\n  node "$COMET_STATE" set ${change} isolation <branch|worktree>`);
+    const allowedValues = '<current|branch|worktree>';
+    return fail(`isolation must be current, branch, or worktree, got '${isolation || 'null'}'\nNext: choose a valid workspace mode, prepare it when needed, then run:\n  comet state set ${change} isolation ${allowedValues}`);
 }
 async function buildModeSelected(changeDir, change) {
     const buildMode = await readField(changeDir, 'build_mode');
     if (['subagent-driven-development', 'executing-plans', 'direct'].includes(buildMode))
         return pass();
-    return fail(`build_mode must be selected before leaving build, got '${buildMode || 'null'}'\nNext: ask the user to choose an execution mode, then run:\n  node "$COMET_STATE" set ${change} build_mode <subagent-driven-development|executing-plans>`);
+    return fail(`build_mode must be selected before leaving build, got '${buildMode || 'null'}'\nNext: ask the user to choose an execution mode, then run:\n  comet state set ${change} build_mode <subagent-driven-development|executing-plans>`);
 }
 async function buildModeAllowedForWorkflow(changeDir) {
     const workflow = await readField(changeDir, 'workflow');
@@ -442,7 +469,7 @@ async function subagentDispatchConfirmed(changeDir, change) {
         return pass();
     if (subagentDispatch === 'confirmed')
         return pass();
-    return fail(`subagent_dispatch must be confirmed before using build_mode=subagent-driven-development\nNext: confirm the current platform has a real background subagent/Task/multi-agent dispatcher, then run:\n  node "$COMET_STATE" set ${change} subagent_dispatch confirmed\nOr ask the user to switch to executing-plans and run:\n  node "$COMET_STATE" set ${change} build_mode executing-plans`);
+    return fail(`subagent_dispatch must be confirmed before using build_mode=subagent-driven-development\nNext: confirm the current platform has a real background subagent/Task/multi-agent dispatcher, then run:\n  comet state set ${change} subagent_dispatch confirmed\nIf dispatch is unavailable, return to /comet-build Step 2 with subagent-driven-development removed. When executing-plans is the only valid mode, run:\n  comet state set ${change} build_mode executing-plans`);
 }
 async function tddModeSelected(changeDir, change) {
     const workflow = await readField(changeDir, 'workflow');
@@ -451,7 +478,7 @@ async function tddModeSelected(changeDir, change) {
     const tddMode = await readField(changeDir, 'tdd_mode');
     if (tddMode === 'tdd' || tddMode === 'direct')
         return pass();
-    return fail(`tdd_mode must be tdd or direct for full workflow, got '${tddMode || 'null'}'\nNext: ask the user to choose TDD enforcement level, then run:\n  node "$COMET_STATE" set ${change} tdd_mode <tdd|direct>`);
+    return fail(`tdd_mode must be tdd or direct for full workflow, got '${tddMode || 'null'}'\nNext: ask the user to choose TDD enforcement level, then run:\n  comet state set ${change} tdd_mode <tdd|direct>`);
 }
 async function reviewModeSelected(changeDir, change) {
     const workflow = await readField(changeDir, 'workflow');
@@ -461,7 +488,7 @@ async function reviewModeSelected(changeDir, change) {
     if (reviewMode === 'off' || reviewMode === 'standard' || reviewMode === 'thorough') {
         return pass();
     }
-    return fail(`review_mode must be off, standard, or thorough before leaving build, got '${reviewMode || 'null'}'\nNext: ask the user to choose review strength, then run:\n  node "$COMET_STATE" set ${change} review_mode <off|standard|thorough>`);
+    return fail(`review_mode must be off, standard, or thorough before leaving build, got '${reviewMode || 'null'}'\nNext: ask the user to choose review strength, then run:\n  comet state set ${change} review_mode <off|standard|thorough>`);
 }
 async function verificationReportExists(changeDir) {
     const report = await readField(changeDir, 'verification_report');
@@ -493,7 +520,7 @@ async function designDocRecorded(changeDir, change) {
     const designDoc = await readField(changeDir, 'design_doc');
     if (designDoc && designDoc !== 'null' && existsSync(designDoc))
         return pass();
-    return fail(`design_doc must point to an existing Superpowers Design Doc for full workflow before leaving design.\nNext: create the Design Doc and run: node "$COMET_STATE" set ${change} design_doc <path>`);
+    return fail(`design_doc must point to an existing Superpowers Design Doc for full workflow before leaving design.\nNext: create the Design Doc and run: comet state set ${change} design_doc <path>`);
 }
 async function designHandoffContextValid(changeDir, change) {
     const context = await readField(changeDir, 'handoff_context');
@@ -502,18 +529,18 @@ async function designHandoffContextValid(changeDir, change) {
         return fail(`handoff_context is missing from .comet.yaml\nNext: run node "$COMET_HANDOFF" ${change} design --write before invoking Superpowers.`);
     }
     if (!(await nonempty(context))) {
-        return fail(`handoff_context does not point to a non-empty file: ${context}\nNext: regenerate the design handoff with comet-handoff.mjs.`);
+        return fail(`handoff_context does not point to a non-empty file: ${context}\nNext: regenerate the design handoff with comet handoff ${change} design --write.`);
     }
     if (!/^[a-f0-9]{64}$/u.test(recordedHash)) {
-        return fail(`handoff_hash is missing or invalid: ${recordedHash || 'null'}\nNext: regenerate the design handoff with comet-handoff.mjs.`);
+        return fail(`handoff_hash is missing or invalid: ${recordedHash || 'null'}\nNext: regenerate the design handoff with comet handoff ${change} design --write.`);
     }
     const actualHash = await computeHandoffHash(changeDir);
     if (actualHash !== recordedHash) {
-        return fail(`OpenSpec artifacts changed after handoff was generated.\nExpected handoff_hash: ${recordedHash}\nActual handoff_hash:   ${actualHash}\nNext: rerun comet-handoff.mjs so Superpowers receives the current OpenSpec context.`);
+        return fail(`OpenSpec artifacts changed after handoff was generated.\nExpected handoff_hash: ${recordedHash}\nActual handoff_hash:   ${actualHash}\nNext: run comet handoff ${change} design --write so Superpowers receives the current OpenSpec context.`);
     }
     const markdown = `${context.replace(/\.json$/u, '')}.md`;
     if (!(await nonempty(markdown))) {
-        return fail(`design handoff markdown is missing or empty: ${markdown}\nNext: regenerate the design handoff with comet-handoff.mjs.`);
+        return fail(`design handoff markdown is missing or empty: ${markdown}\nNext: regenerate the design handoff with comet handoff ${change} design --write.`);
     }
     return pass();
 }
@@ -660,6 +687,7 @@ async function guardDesignChecks(output, changeDir, change) {
 }
 async function guardBuildChecks(output, changeDir, change, run) {
     return runChecks(output, [
+        check('bound branch matches workspace mode', () => boundBranchMatches(changeDir, change)),
         check('isolation selected', () => isolationSelected(changeDir, change)),
         check('build_mode selected', () => buildModeSelected(changeDir, change)),
         check('build_mode allowed for workflow', () => buildModeAllowedForWorkflow(changeDir)),
@@ -686,6 +714,7 @@ async function guardBuildChecks(output, changeDir, change, run) {
 }
 async function guardVerifyChecks(output, changeDir, change, run) {
     return runChecks(output, [
+        check('bound branch matches workspace mode', () => boundBranchMatches(changeDir, change)),
         check('tasks.md all tasks checked', () => tasksAllDone(changeDir)),
         // Verification command runs after tasks check — no point running tests
         // if tasks.md is incomplete.
@@ -700,21 +729,26 @@ async function guardVerifyChecks(output, changeDir, change, run) {
                 return pass();
             return documentLanguageMatchesConfigured(changeDir, report);
         }),
-        check('branch_status=handled', async () => (await branchStatusHandled(changeDir)) ? pass() : fail('')),
     ]);
 }
-async function guardArchiveChecks(output, changeDir) {
+async function guardArchiveChecks(output, changeDir, change) {
     return runChecks(output, [
+        check('bound branch matches workspace mode', () => boundBranchMatches(changeDir, change)),
         check('archived is true', async () => ((await archivedIsTrue(changeDir)) ? pass() : fail(''))),
         check('proposal.md exists', async () => (await nonempty(path.join(changeDir, 'proposal.md'))) ? pass() : fail('')),
         check('design.md exists', async () => (await nonempty(path.join(changeDir, 'design.md'))) ? pass() : fail('')),
         check('tasks.md all tasks checked', () => tasksAllDone(changeDir)),
+        check('branch_status=handled', async () => (await branchStatusHandled(changeDir)) ? pass() : fail('')),
     ]);
 }
-async function applyStateUpdate(output, change, changeDir, phase, context) {
+async function applyStateUpdate(output, change, changeDir, phase) {
     const event = CLASSIC_GUARD_TRANSITION_EVENT[phase];
     if (!event)
         return;
+    // Re-read instead of reusing the run context captured before the checks:
+    // boundBranchMatches may have lazily healed bound_branch on disk, and a
+    // stale projection would write the pre-heal null back over it.
+    const context = await ensureClassicRuntimeRun(changeDir);
     const result = applyClassicTransition(context.classic, event);
     await transitionClassicRuntimeRun(changeDir, result.classic, context.run, {
         event,
@@ -768,7 +802,7 @@ export const classicGuardCommand = async (args, options) => {
         else if (phase === 'verify')
             blocked = await guardVerifyChecks(output, changeDir, change, runContext.run);
         else
-            blocked = await guardArchiveChecks(output, changeDir);
+            blocked = await guardArchiveChecks(output, changeDir, change);
         if (blocked) {
             output.stderr.push('');
             output.stderr.push(red('BLOCKED — fix failing checks before proceeding to next phase'));
@@ -777,7 +811,7 @@ export const classicGuardCommand = async (args, options) => {
         output.stderr.push('');
         output.stderr.push(green('ALL CHECKS PASSED — ready for next phase'));
         if (flag === '--apply') {
-            await applyStateUpdate(output, change, changeDir, phase, runContext);
+            await applyStateUpdate(output, change, changeDir, phase);
         }
         return output.toResult(0);
     }