@open-agent-toolkit/cli 0.3.37 → 0.3.39

package/dist/commands/project/delivery/evidence.js

@@ -596,6 +596,12 @@ function readReviewRows(lines) {
 function placeholder(cell) {
     return cell === '' || cell === '-' || cell === '—';
 }
+function reviewArtifactPath(cell) {
+    const artifact = cell.replace(/^\.\//, '');
+    return (!posix.isAbsolute(artifact) &&
+        posix.normalize(artifact) === artifact &&
+        artifact.startsWith('reviews/'));
+}
 /**
  * Review rows record evidence: rows may be added and their status, date and
  * lineage cells updated, but no row disappears and an existing row's
@@ -622,24 +628,15 @@ function judgeReviewRows(beforeLines, afterLines) {
 const PROGRESS_FIELD = /^(?:-[ \t]+)?\*\*(Status|Head|Completed|Updated|Last Updated|Started|Total):\*\*\s*(.*)$/;
 const PLACEHOLDER_FIELD = /^(?:-[ \t]+)?\*\*[^*\n]+:\*\*\s*(?:-|—|pending|tbd|null)?\s*$/i;
 const EXTRACTION_MARKER = /^\*\*(?:Status:\*\*\s+extracted|Extracted to:\*\*)/;
-/**
- * The journal is append-mostly: progress fields and placeholders may be
- * rewritten and tables re-rendered, but no recorded observation is removed
- * or rewritten, and marking a phase extracted changes scope.
- */
-function judgeJournalChange(before, after) {
-    const previous = splitFrontmatter(before);
-    const next = splitFrontmatter(after);
-    if (previous === null || next === null) {
-        return refuse('implementation.md frontmatter could not be parsed');
-    }
+function listJournalRewrites(previousBody, nextBody) {
+    const rewrites = [];
     const remaining = new Map();
-    for (const line of next.body.split('\n')) {
+    for (const line of nextBody.split('\n')) {
         const key = line.trimEnd();
         remaining.set(key, (remaining.get(key) ?? 0) + 1);
     }
     const previousLines = new Set();
-    for (const line of previous.body.split('\n')) {
+    for (const line of previousBody.split('\n')) {
         const key = line.trimEnd();
         previousLines.add(key.trim());
         const count = remaining.get(key) ?? 0;
@@ -655,15 +652,58 @@ function judgeJournalChange(before, after) {
             (progress !== null &&
                 !(progress[1] === 'Status' && /^extracted\b/.test(progress[2] ?? '')));
         if (!mutable) {
-            return refuse(`recorded journal line "${trimmed}" was removed or rewritten`);
+            rewrites.push({ kind: 'recorded-line-rewritten', line: trimmed });
         }
     }
-    for (const line of next.body.split('\n')) {
+    for (const line of nextBody.split('\n')) {
         const trimmed = line.trim();
         if (EXTRACTION_MARKER.test(trimmed) && !previousLines.has(trimmed)) {
-            return refuse(`"${trimmed}" marks a phase extracted`);
+            rewrites.push({ kind: 'extraction-marker', line: trimmed });
         }
     }
+    return rewrites;
+}
+/**
+ * List every recorded journal line removed or rewritten by `after`, followed
+ * by every newly introduced extraction marker. Mutable progress fields,
+ * placeholders, table rendering, and append-only additions are excluded.
+ */
+export function journalRewrites(before, after) {
+    const previous = splitFrontmatter(before);
+    const next = splitFrontmatter(after);
+    if (previous === null || next === null) {
+        return [
+            {
+                kind: 'frontmatter-unparseable',
+                line: '',
+                side: previous === null && next === null
+                    ? 'both'
+                    : previous === null
+                        ? 'before'
+                        : 'after',
+            },
+        ];
+    }
+    return listJournalRewrites(previous.body, next.body);
+}
+/**
+ * The journal is append-mostly: progress fields and placeholders may be
+ * rewritten and tables re-rendered, but no recorded observation is removed
+ * or rewritten, and marking a phase extracted changes scope.
+ */
+function judgeJournalChange(before, after) {
+    const previous = splitFrontmatter(before);
+    const next = splitFrontmatter(after);
+    if (previous === null || next === null) {
+        return refuse('implementation.md frontmatter could not be parsed');
+    }
+    const [first] = listJournalRewrites(previous.body, next.body);
+    if (first?.kind === 'recorded-line-rewritten') {
+        return refuse(`recorded journal line "${first.line}" was removed or rewritten`);
+    }
+    if (first?.kind === 'extraction-marker') {
+        return refuse(`"${first.line}" marks a phase extracted`);
+    }
     return OK;
 }
 const UNREVIEWED_RESOLUTIONS = new Set(['no_gate', 'project_disabled']);
@@ -750,6 +790,76 @@ export async function evaluateGateCarrier(carrier, expected, successor) {
     }
     return { outcome, freshness: 'fresh', reason: null };
 }
+/**
+ * Evaluate a delivery's exit carrier without letting callers bypass stack
+ * topology. A stack is recorded base to tip: every lower observed head must
+ * be the tip or its ancestor, then only the tip is published to the carrier.
+ * Missing and unreviewed carriers delegate before topology because they are
+ * not head-bound. Other delivery kinds retain every-member evaluation.
+ */
+export async function evaluateDeliveryExitCarrier(carrier, expected, successor) {
+    const { delivery, git, scope } = successor;
+    const publishedHeads = delivery.members.map((member) => member.observed_head);
+    if (carrier === null || isUnreviewedResolution(carrier)) {
+        return evaluateGateCarrier(carrier, expected, {
+            git,
+            scope,
+            publishedHeads,
+        });
+    }
+    if (delivery.kind !== 'stack') {
+        return evaluateGateCarrier(carrier, expected, {
+            git,
+            scope,
+            publishedHeads,
+        });
+    }
+    const stale = (reason) => ({
+        outcome: carrier.status === 'allowed' ? 'allowed' : 'blocked',
+        freshness: 'stale',
+        reason,
+    });
+    if (publishedHeads.length === 0) {
+        return stale('member-missing: the stack has no members');
+    }
+    const unobserved = publishedHeads.findIndex((head) => head === null);
+    if (unobserved >= 0) {
+        return stale(`member-unobserved: stack member ${unobserved} has no observed head`);
+    }
+    const resolvedHeads = [];
+    try {
+        for (const head of publishedHeads) {
+            const resolved = await resolveCommit(git, scope.repoRoot, head);
+            if (resolved === null) {
+                return stale(`missing-object: commit ${head} is not available locally`);
+            }
+            resolvedHeads.push(resolved);
+        }
+    }
+    catch (error) {
+        return stale(`inspection-failed: commit resolution failed: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    const tip = resolvedHeads.at(-1);
+    try {
+        for (const [index, lower] of resolvedHeads.slice(0, -1).entries()) {
+            const ancestry = await git.run(['merge-base', '--is-ancestor', lower, tip], { cwd: scope.repoRoot, allowFailure: true });
+            if (ancestry.code === 1) {
+                return stale(`stack-order: member ${index} head ${lower} is not an ancestor of tip ${tip}`);
+            }
+            if (ancestry.code !== 0) {
+                return stale(`inspection-failed: ancestry inspection failed for member ${index}: ${ancestry.stderr || `git exited ${ancestry.code}`}`);
+            }
+        }
+    }
+    catch (error) {
+        return stale(`inspection-failed: ancestry inspection failed: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    return evaluateGateCarrier(carrier, expected, {
+        git,
+        scope,
+        publishedHeads: [tip],
+    });
+}
 /**
  * Evaluate a registered delivery's integrated review against its observed
  * members (A2): each member's reviewed revision must cover its observed head
@@ -856,6 +966,39 @@ export function reviewRowsFor(reviews, labels) {
             ids.some((id) => cell === id || cell.startsWith(`${id}:`)));
     });
 }
+/**
+ * Artifacts emitted by the configured gate run that produced `carrier`.
+ * These join the shared bookkeeping allowlist only; they never join a
+ * delivery's own evidence set or integrated-review selection.
+ */
+export function gateEvidenceArtifacts(reviews, carrier) {
+    if (carrier?.reviewed_head === null ||
+        carrier?.reviewed_head === undefined ||
+        placeholder(carrier.reviewed_head)) {
+        return [];
+    }
+    return reviews
+        .filter((review) => review.type === 'code' &&
+        review.invocation === 'gate' &&
+        review.reviewedHead === carrier.reviewed_head &&
+        reviewArtifactPath(review.artifact) &&
+        !placeholder(review.artifact))
+        .map((review) => review.artifact);
+}
+/**
+ * The newest active registry entry for a milestone. Registration-in-progress
+ * and superseded entries cannot carry the milestone's current evidence.
+ */
+export function latestDeliveryForMilestone(deliveries, milestone) {
+    for (let index = deliveries.length - 1; index >= 0; index -= 1) {
+        const delivery = deliveries[index];
+        if (delivery.milestone === milestone &&
+            (delivery.status === 'open' || delivery.status === 'at_endpoint')) {
+            return delivery;
+        }
+    }
+    return undefined;
+}
 /**
  * The one evidence scope for a registered delivery, shared by `delivery
  * check`, `delivery refresh` and the closeout boundary: the review rows
@@ -883,7 +1026,10 @@ export function deliveryEvidenceScope(project, deliveries, delivery) {
     return {
         repoRoot: project.repoRoot,
         projectDir: project.projectDir,
-        evidenceArtifacts: deliveryEvidenceArtifacts(delivery, reviewRowsFor(project.state.reviews, labels).map((row) => row.artifact), sharing),
+        evidenceArtifacts: [
+            ...deliveryEvidenceArtifacts(delivery, reviewRowsFor(project.state.reviews, labels).map((row) => row.artifact), sharing),
+            ...gateEvidenceArtifacts(project.state.reviews, project.evidenceCarrier ?? null),
+        ],
         ownEvidenceArtifacts,
     };
 }

package/dist/commands/project/delivery/refresh.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/delivery/refresh.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/delivery/refresh.ts"],"names":[],"mappings":"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"}

package/dist/commands/project/delivery/refresh.js

@@ -10,7 +10,7 @@ import { normalizeMilestoneId, } from '@open-agent-toolkit/control-plane';
 import { Command } from 'commander';
 import YAML, { isMap, isScalar, isSeq } from 'yaml';
 import { DEFAULT_DELIVERY_PROJECT_DEPENDENCIES, deliveryEffectiveScope, loadGoalDeliveryProject, } from './check.js';
-import { deliveryEvidenceScope, evaluateDeliveryReview, evaluateGateCarrier, } from './evidence.js';
+import { deliveryEvidenceScope, evaluateDeliveryExitCarrier, evaluateDeliveryReview, latestDeliveryForMilestone, } from './evidence.js';
 /** The only frontmatter keys a refresh writes under. */
 const REFRESH_WRITE_ROOTS = new Set(['oat_deliveries', 'oat_milestone_gates']);
 const MEMBER_OBSERVATION_LEAVES = new Set([
@@ -235,28 +235,22 @@ export async function planDeliveryRefresh(project, runners) {
     // registered delivery. Refresh records only staleness: it never upgrades a
     // carrier to fresh, which only implement's scoped closeout writes.
     const exitCarriers = [];
-    const latestByMilestone = new Map();
-    for (const delivery of deliveries) {
-        const observed = observedById.get(delivery.delivery_id);
-        if (observed && observed.milestone !== null) {
-            latestByMilestone.set(observed.milestone, observed);
-        }
-    }
-    for (const [milestone, delivery] of latestByMilestone) {
+    const observedDeliveries = [...observedById.values()];
+    const milestones = new Set(observedDeliveries
+        .map((delivery) => delivery.milestone)
+        .filter((milestone) => milestone !== null));
+    for (const milestone of milestones) {
+        const delivery = latestDeliveryForMilestone(observedDeliveries, milestone);
         const carrier = project.state.milestoneGates?.[milestone]?.exit ?? null;
         if (carrier === null)
             continue;
         const scope = evidenceScope(project, delivery);
-        const evaluation = await evaluateGateCarrier(carrier, {
+        const evaluation = await evaluateDeliveryExitCarrier(carrier, {
             kind: 'code',
             scope: deliveryEffectiveScope(deliveries, delivery),
             match: 'covers',
             overrideDisabled: project.exitGateDisabled,
-        }, {
-            git: runners.git,
-            scope,
-            publishedHeads: delivery.members.map((member) => member.observed_head),
-        });
+        }, { git: runners.git, scope, delivery });
         exitCarriers.push({
             milestone,
             delivery: delivery.delivery_id,
@@ -282,7 +276,10 @@ export async function planDeliveryRefresh(project, runners) {
     return { deliveries: results, exitCarriers, writes, changed: false };
 }
 function evidenceScope(project, delivery) {
-    return deliveryEvidenceScope(project, project.state.deliveries ?? [], delivery);
+    const evidenceCarrier = delivery.milestone === null
+        ? null
+        : (project.state.milestoneGates?.[delivery.milestone]?.exit ?? null);
+    return deliveryEvidenceScope({ ...project, evidenceCarrier }, project.state.deliveries ?? [], delivery);
 }
 // ---------------------------------------------------------------------------
 // Applying writes to state.md frontmatter

package/dist/commands/project/journal-check/index.d.ts

@@ -1,4 +1,5 @@
 import { type CommandContext, type GlobalOptions } from '../../../app/command-context.js';
+import { type GitRunner } from '../../project/sync/git.js';
 import { type ActiveProjectResolution } from '../../../config/oat-config.js';
 import { Command } from 'commander';
 import { type JournalCheckReason, type JournalCheckResult } from './types.js';
@@ -16,6 +17,7 @@ export interface JournalCheckDependencies {
     readFile: (path: string, encoding: 'utf8') => Promise<string>;
     dirExists: (path: string) => Promise<boolean>;
     fileExists: (path: string) => Promise<boolean>;
+    git: GitRunner;
 }
 /**
  * Read the three inputs the evaluator needs. A missing journal or plan is a

package/dist/commands/project/journal-check/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/journal-check/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,oBAAoB,CAAC;AAS5B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAGL,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACxB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,YAAY,EACV,oBAAoB,EACpB,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB;IACvC,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,oBAAoB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAC7E,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9D,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAChD;AAWD;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,IAAI,CAAC,wBAAwB,EAAE,UAAU,GAAG,YAAY,CAAC,GACtE,OAAO,CAAC,iBAAiB,CAAC,CAa5B;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,GAAG,YAAY,GAClC,MAAM,EAAE,CAuBV;AASD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAItE;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,kBAAkB,GACzB,MAAM,CAKR;AAwGD,wBAAgB,2BAA2B,CACzC,SAAS,GAAE,OAAO,CAAC,wBAAwB,CAAM,GAChD,OAAO,CAiCT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/journal-check/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAE9E,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,oBAAoB,CAAC;AAS5B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAGL,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACxB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,YAAY,EACV,oBAAoB,EACpB,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB;IACvC,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,oBAAoB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAC7E,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9D,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,GAAG,EAAE,SAAS,CAAC;CAChB;AAYD;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,IAAI,CAAC,wBAAwB,EAAE,UAAU,GAAG,YAAY,CAAC,GACtE,OAAO,CAAC,iBAAiB,CAAC,CAa5B;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,GAAG,YAAY,GAClC,MAAM,EAAE,CAuBV;AA0ED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAItE;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,kBAAkB,GACzB,MAAM,CAKR;AA0JD,wBAAgB,2BAA2B,CACzC,SAAS,GAAE,OAAO,CAAC,wBAAwB,CAAM,GAChD,OAAO,CAiCT"}

package/dist/commands/project/journal-check/index.js

@@ -1,6 +1,8 @@
 import { readFile as defaultReadFile } from 'node:fs/promises';
 import { isAbsolute, join, resolve } from 'node:path';
 import { buildCommandContext, } from '../../../app/command-context.js';
+import { journalRewrites } from '../../project/delivery/evidence.js';
+import { defaultGitRunner } from '../../project/sync/git.js';
 import { readGlobalOptions } from '../../shared/shared.utils.js';
 import { resolveActiveProject, } from '../../../config/oat-config.js';
 import { CliError } from '../../../errors/cli-error.js';
@@ -18,6 +20,7 @@ const DEFAULT_DEPENDENCIES = {
     readFile: (path, encoding) => defaultReadFile(path, encoding),
     dirExists,
     fileExists,
+    git: defaultGitRunner,
 };
 /**
  * Read the three inputs the evaluator needs. A missing journal or plan is a
@@ -69,6 +72,41 @@ function readWorkflowMode(stateContent) {
     const mode = metadata.state === 'ok' ? metadata.record.oat_workflow_mode : undefined;
     return typeof mode === 'string' && mode.length > 0 ? mode : 'spec-driven';
 }
+async function readCommittedJournal(projectDir, git) {
+    const head = await git.run(['rev-parse', '--verify', '--quiet', 'HEAD^{commit}'], { cwd: projectDir, allowFailure: true });
+    if (head.code === 1) {
+        const symbolic = await git.run(['symbolic-ref', '-q', 'HEAD'], {
+            cwd: projectDir,
+            allowFailure: true,
+        });
+        if (symbolic.code !== 0 || symbolic.stdout === '') {
+            throw new CliError(`Unable to inspect the committed journal: HEAD does not resolve and its branch could not be identified${symbolic.stderr ? `: ${symbolic.stderr}` : ''}`, 2);
+        }
+        const branch = await git.run(['show-ref', '--verify', '--quiet', symbolic.stdout], { cwd: projectDir, allowFailure: true });
+        if (branch.code === 1) {
+            return null;
+        }
+        throw new CliError(`Unable to inspect the committed journal: HEAD does not resolve${branch.stderr ? `: ${branch.stderr}` : ''}`, 2);
+    }
+    if (head.code !== 0) {
+        throw new CliError(`Unable to inspect the committed journal: ${head.stderr || `git exited ${head.code}`}`, 2);
+    }
+    const entry = await git.run(['ls-tree', '--full-name', '-z', 'HEAD', '--', 'implementation.md'], { cwd: projectDir, allowFailure: true });
+    if (entry.code !== 0) {
+        throw new CliError(`Unable to inspect the committed journal path: ${entry.stderr || `git exited ${entry.code}`}`, 2);
+    }
+    if (entry.stdout === '') {
+        return null;
+    }
+    const blob = await git.run(['show', 'HEAD:./implementation.md'], {
+        cwd: projectDir,
+        allowFailure: true,
+    });
+    if (blob.code !== 0) {
+        throw new CliError(`Unable to read the committed journal: ${blob.stderr || `git exited ${blob.code}`}`, 2);
+    }
+    return blob.stdout;
+}
 export function formatJournalReason(reason) {
     const location = reason.line === null ? reason.path : `${reason.path}:${reason.line}`;
     return `${reason.code} ${location} (${reason.owner}): ${reason.message}`;
@@ -118,7 +156,46 @@ async function runJournalCheck(options, context, dependencies) {
                 ? 'phase-unit'
                 : 'task')
             : null;
-        const result = evaluateJournal({ boundary, scope, ...files });
+        let result = evaluateJournal({ boundary, scope, ...files });
+        if (workflowMode === 'goal' &&
+            (boundary === 'implement-preflight' || boundary === 'review')) {
+            const committed = await readCommittedJournal(projectDir, dependencies.git);
+            if (committed !== null) {
+                const reasons = journalRewrites(committed, files.journalContent).flatMap((rewrite) => {
+                    if (rewrite.kind === 'recorded-line-rewritten') {
+                        return [
+                            {
+                                code: 'journal-line-rewritten',
+                                path: 'implementation.md',
+                                line: null,
+                                owner: 'oat-project-implement',
+                                message: `Committed journal line "${rewrite.line}" was removed or rewritten; the journal is append-only — restore the committed line and append the correction.`,
+                            },
+                        ];
+                    }
+                    if (rewrite.kind === 'frontmatter-unparseable' &&
+                        rewrite.side !== 'after') {
+                        return [
+                            {
+                                code: 'journal-frontmatter-malformed',
+                                path: 'implementation.md',
+                                line: null,
+                                owner: 'oat-project-reconcile',
+                                message: 'Committed implementation.md frontmatter could not be parsed; repair the frontmatter and commit it before re-running.',
+                            },
+                        ];
+                    }
+                    return [];
+                });
+                if (reasons.length > 0) {
+                    result = {
+                        ...result,
+                        status: 'refused',
+                        reasons: [...result.reasons, ...reasons],
+                    };
+                }
+            }
+        }
         if (context.json) {
             context.logger.json({ ...result, projectPath: projectDir });
         }

package/dist/commands/project/journal-check/types.d.ts

@@ -11,7 +11,7 @@
 export declare const JOURNAL_CHECK_BOUNDARIES: readonly ['implement-preflight', 'review', 'completion'];
 export type JournalCheckBoundary = (typeof JOURNAL_CHECK_BOUNDARIES)[number];
 export type JournalArtifactPath = 'implementation.md' | 'plan.md' | 'state.md';
-export type JournalReasonCode = 'journal-frontmatter-malformed' | 'journal-frontmatter-missing' | 'journal-missing' | 'state-frontmatter-malformed' | 'journal-status-not-terminal' | 'journal-pointer-not-cleared' | 'state-status-disagrees' | 'state-pointer-not-cleared' | 'task-block-missing' | 'task-duplicate-block' | 'task-unplanned' | 'task-status-missing' | 'task-status-ambiguous' | 'task-status-invalid' | 'task-not-completed' | 'task-commit-missing' | 'task-misplaced' | 'plan-task-duplicate' | 'plan-task-misplaced' | 'execution-record-open' | 'phase-status-disagrees' | 'phase-status-ambiguous' | 'phase-duplicate-section' | 'phase-head-missing' | 'phase-not-accepted' | 'overview-total-mismatch' | 'references-not-last' | 'receipt-misplaced' | 'deferral-misplaced' | 'dispatch-payload' | 'run-line-malformed' | 'run-line-misplaced' | 'run-line-duplicate' | 'run-line-unresolved' | 'template-residue' | 'override-malformed' | 'override-misplaced' | 'override-unused';
+export type JournalReasonCode = 'journal-frontmatter-malformed' | 'journal-frontmatter-missing' | 'journal-missing' | 'journal-line-rewritten' | 'state-frontmatter-malformed' | 'journal-status-not-terminal' | 'journal-pointer-not-cleared' | 'state-status-disagrees' | 'state-pointer-not-cleared' | 'task-block-missing' | 'task-duplicate-block' | 'task-unplanned' | 'task-status-missing' | 'task-status-ambiguous' | 'task-status-invalid' | 'task-not-completed' | 'task-commit-missing' | 'task-misplaced' | 'plan-task-duplicate' | 'plan-task-misplaced' | 'execution-record-open' | 'phase-status-disagrees' | 'phase-status-ambiguous' | 'phase-duplicate-section' | 'phase-head-missing' | 'phase-not-accepted' | 'overview-total-mismatch' | 'references-not-last' | 'receipt-misplaced' | 'deferral-misplaced' | 'dispatch-payload' | 'run-line-malformed' | 'run-line-misplaced' | 'run-line-duplicate' | 'run-line-unresolved' | 'template-residue' | 'override-malformed' | 'override-misplaced' | 'override-unused';
 export interface JournalCheckReason {
     code: JournalReasonCode;
     path: JournalArtifactPath;

package/dist/commands/project/journal-check/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/journal-check/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,eAAO,MAAM,wBAAwB,YACnC,qBAAqB,EACrB,QAAQ,EACR,YAAY,CACJ,CAAC;AAEX,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,wBAAwB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7E,MAAM,MAAM,mBAAmB,GAAG,mBAAmB,GAAG,SAAS,GAAG,UAAU,CAAC;AAE/E,MAAM,MAAM,iBAAiB,GAEzB,+BAA+B,GAC/B,6BAA6B,GAC7B,iBAAiB,GACjB,6BAA6B,GAC7B,6BAA6B,GAC7B,6BAA6B,GAC7B,wBAAwB,GACxB,2BAA2B,GAE3B,oBAAoB,GACpB,sBAAsB,GACtB,gBAAgB,GAChB,qBAAqB,GACrB,uBAAuB,GACvB,qBAAqB,GACrB,oBAAoB,GACpB,qBAAqB,GACrB,gBAAgB,GAChB,qBAAqB,GACrB,qBAAqB,GACrB,uBAAuB,GAEvB,wBAAwB,GACxB,wBAAwB,GACxB,yBAAyB,GACzB,oBAAoB,GACpB,oBAAoB,GACpB,yBAAyB,GAEzB,qBAAqB,GACrB,mBAAmB,GACnB,oBAAoB,GACpB,kBAAkB,GAClB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,qBAAqB,GACrB,kBAAkB,GAElB,oBAAoB,GACpB,oBAAoB,GACpB,iBAAiB,CAAC;AAEtB,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,iBAAiB,CAAC;IACxB,IAAI,EAAE,mBAAmB,CAAC;IAC1B,0EAA0E;IAC1E,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,0CAA0C;IAC1C,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,YACjC,4BAA4B,EAC5B,eAAe,EACf,uBAAuB,CACf,CAAC;AAEX,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,sBAAsB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1E,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,mBAAmB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,0EAA0E;IAC1E,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,qEAAqE;IACrE,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,oBAAoB,CAAC;IAC/B;;;OAGG;IACH,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,IAAI,GAAG,SAAS,CAAC;IACzB,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,kBAAkB,EAAE,CAAC;IAC9B,qEAAqE;IACrE,QAAQ,EAAE,kBAAkB,EAAE,CAAC;IAC/B,SAAS,EAAE,eAAe,EAAE,CAAC;CAC9B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/journal-check/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,eAAO,MAAM,wBAAwB,YACnC,qBAAqB,EACrB,QAAQ,EACR,YAAY,CACJ,CAAC;AAEX,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,wBAAwB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7E,MAAM,MAAM,mBAAmB,GAAG,mBAAmB,GAAG,SAAS,GAAG,UAAU,CAAC;AAE/E,MAAM,MAAM,iBAAiB,GAEzB,+BAA+B,GAC/B,6BAA6B,GAC7B,iBAAiB,GACjB,wBAAwB,GACxB,6BAA6B,GAC7B,6BAA6B,GAC7B,6BAA6B,GAC7B,wBAAwB,GACxB,2BAA2B,GAE3B,oBAAoB,GACpB,sBAAsB,GACtB,gBAAgB,GAChB,qBAAqB,GACrB,uBAAuB,GACvB,qBAAqB,GACrB,oBAAoB,GACpB,qBAAqB,GACrB,gBAAgB,GAChB,qBAAqB,GACrB,qBAAqB,GACrB,uBAAuB,GAEvB,wBAAwB,GACxB,wBAAwB,GACxB,yBAAyB,GACzB,oBAAoB,GACpB,oBAAoB,GACpB,yBAAyB,GAEzB,qBAAqB,GACrB,mBAAmB,GACnB,oBAAoB,GACpB,kBAAkB,GAClB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,qBAAqB,GACrB,kBAAkB,GAElB,oBAAoB,GACpB,oBAAoB,GACpB,iBAAiB,CAAC;AAEtB,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,iBAAiB,CAAC;IACxB,IAAI,EAAE,mBAAmB,CAAC;IAC1B,0EAA0E;IAC1E,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,0CAA0C;IAC1C,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,YACjC,4BAA4B,EAC5B,eAAe,EACf,uBAAuB,CACf,CAAC;AAEX,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,sBAAsB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1E,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,mBAAmB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,0EAA0E;IAC1E,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,qEAAqE;IACrE,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,oBAAoB,CAAC;IAC/B;;;OAGG;IACH,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,IAAI,GAAG,SAAS,CAAC;IACzB,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,kBAAkB,EAAE,CAAC;IAC9B,qEAAqE;IACrE,QAAQ,EAAE,kBAAkB,EAAE,CAAC;IAC/B,SAAS,EAAE,eAAe,EAAE,CAAC;CAC9B"}

package/dist/commands/project/new/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/new/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AAGxC,OAAO,EAEL,KAAK,YAAY,EAClB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAE5C,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,YAAY,CAAC;AAmBpB,UAAU,sBAAsB;IAC9B,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,eAAe,EAAE,CAAC,OAAO,EAAE;QACzB,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,EAAE,YAAY,CAAC;QACnB,KAAK,EAAE,OAAO,CAAC;QACf,SAAS,EAAE,OAAO,CAAC;QACnB,gBAAgB,EAAE,OAAO,CAAC;QAC1B,MAAM,EAAE,OAAO,CAAC;QAChB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,KAAK,CAAC,EAAE,YAAY,CAAC;KACtB,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;CACtC;AAmGD,wBAAgB,uBAAuB,CACrC,SAAS,GAAE,OAAO,CAAC,sBAAsB,CAAM,GAC9C,OAAO,CAgDT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/new/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AAGxC,OAAO,EAEL,KAAK,YAAY,EAClB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAE5C,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,YAAY,CAAC;AAqBpB,UAAU,sBAAsB;IAC9B,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,eAAe,EAAE,CAAC,OAAO,EAAE;QACzB,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,EAAE,YAAY,CAAC;QACnB,KAAK,EAAE,OAAO,CAAC;QACf,SAAS,EAAE,OAAO,CAAC;QACnB,gBAAgB,EAAE,OAAO,CAAC;QAC1B,MAAM,EAAE,OAAO,CAAC;QAChB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,KAAK,CAAC,EAAE,YAAY,CAAC;KACtB,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;CACtC;AAmGD,wBAAgB,uBAAuB,CACrC,SAAS,GAAE,OAAO,CAAC,sBAAsB,CAAM,GAC9C,OAAO,CAgDT"}

package/dist/commands/project/new/index.js

@@ -7,6 +7,7 @@ import { Command, Option } from 'commander';
 import { scaffoldProject as defaultScaffoldProject, } from './scaffold.js';
 const COMMIT_STATUS_MESSAGES = {
     skipped_disabled: 'Scaffold commit: skipped (--no-commit)',
+    skipped_local_scope: 'Scaffold commit: skipped (local-scope projects are gitignored and never committed)',
     skipped_no_worktree: 'Scaffold commit: skipped (not a git work tree)',
     skipped_nothing: 'Scaffold commit: skipped (nothing to commit)',
 };

package/dist/commands/project/new/scaffold.d.ts

@@ -32,7 +32,7 @@ export interface ScaffoldProjectOptions {
  * reasons (and `failed`) lets the CLI surface accurate, distinct messaging
  * instead of collapsing every non-commit into a single benign "skipped" line.
  */
-export type CommitScaffoldStatus = 'committed' | 'skipped_disabled' | 'skipped_no_worktree' | 'skipped_nothing' | 'failed';
+export type CommitScaffoldStatus = 'committed' | 'skipped_disabled' | 'skipped_local_scope' | 'skipped_no_worktree' | 'skipped_nothing' | 'failed';
 export interface ScaffoldProjectResult {
     mode: WorkflowMode;
     scope: ProjectScope;

package/dist/commands/project/new/scaffold.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/new/scaffold.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/new/scaffold.ts"],"names":[],"mappings":"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"}

package/dist/commands/project/new/scaffold.js

@@ -441,7 +441,7 @@ export async function scaffoldProject(options, overrides = {}) {
     let parentHeadBeforeRecordCommit;
     let committed = false;
     let commitSha;
-    let commitStatus = 'skipped_disabled';
+    let commitStatus = scope === 'local' ? 'skipped_local_scope' : 'skipped_disabled';
     let commitError;
     let createdFiles = [];
     let skippedFiles = [];

package/dist/commands/providers/codex/materialize.d.ts

@@ -1,5 +1,9 @@
 import type { CodexMaterializeResult, ProvidersCodexMaterializeDependencies } from '../../providers/providers.types.js';
+import { type CodexConfigMergeResult } from '../../../providers/codex/codec/config-merge.js';
 import { Command } from 'commander';
-export declare function formatCodexMaterializeResult(result: CodexMaterializeResult): string;
+export interface CodexMaterializeCommandResult extends CodexMaterializeResult {
+    config: Pick<CodexConfigMergeResult, 'addedKeys' | 'userValueNotices'>;
+}
+export declare function formatCodexMaterializeResult(result: CodexMaterializeCommandResult): string;
 export declare function createCodexMaterializeCommand(overrides?: Partial<ProvidersCodexMaterializeDependencies>): Command;
 //# sourceMappingURL=materialize.d.ts.map

package/dist/commands/providers/codex/materialize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"materialize.d.ts","sourceRoot":"","sources":["../../../../src/commands/providers/codex/materialize.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,sBAAsB,EACtB,qCAAqC,EACtC,MAAM,qCAAqC,CAAC;AAa7C,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAyD5C,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,sBAAsB,GAC7B,MAAM,CAaR;AAsID,wBAAgB,6BAA6B,CAC3C,SAAS,GAAE,OAAO,CAAC,qCAAqC,CAAM,GAC7D,OAAO,CAoCT"}
+{"version":3,"file":"materialize.d.ts","sourceRoot":"","sources":["../../../../src/commands/providers/codex/materialize.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,sBAAsB,EACtB,qCAAqC,EACtC,MAAM,qCAAqC,CAAC;AAK7C,OAAO,EACL,KAAK,sBAAsB,EAI5B,MAAM,qCAAqC,CAAC;AAK7C,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAU5C,MAAM,WAAW,6BAA8B,SAAQ,sBAAsB;IAC3E,MAAM,EAAE,IAAI,CAAC,sBAAsB,EAAE,WAAW,GAAG,kBAAkB,CAAC,CAAC;CACxE;AAiDD,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,6BAA6B,GACpC,MAAM,CAcR;AA0ID,wBAAgB,6BAA6B,CAC3C,SAAS,GAAE,OAAO,CAAC,qCAAqC,CAAM,GAC7D,OAAO,CAoCT"}

package/dist/commands/providers/codex/materialize.js

@@ -6,7 +6,7 @@ import { readGlobalOptions } from '../../shared/shared.utils.js';
 import { CliError } from '../../../errors/index.js';
 import { ensureDir, fileExists } from '../../../fs/io.js';
 import { resolveProjectRoot, resolveScopeRoot } from '../../../fs/paths.js';
-import { mergeCodexConfigForRole, readCodexMaxDepth, } from '../../../providers/codex/codec/config-merge.js';
+import { describeCodexConfigMerge, mergeCodexConfigForRole, readCodexMaxDepth, } from '../../../providers/codex/codec/config-merge.js';
 import { materializeCodexRole } from '../../../providers/codex/codec/materialize.js';
 import { withOatManagedCodexRoleOwner } from '../../../providers/codex/codec/shared.js';
 import { Command, Option } from 'commander';
@@ -49,6 +49,7 @@ export function formatCodexMaterializeResult(result) {
         `Role: ${result.roleName}`,
         `Role file: ${result.rolePath}`,
         `Config file: ${result.configPath}`,
+        ...describeCodexConfigMerge(result.config).map((line) => `Config: ${line}`),
         'TOML preview:',
         result.tomlPreview.trimEnd(),
     ].join('\n');
@@ -105,6 +106,10 @@ async function buildCodexMaterializePlan(agentName, options, context, dependenci
             configPath,
             configFile: role.configFile,
             tomlPreview: role.content,
+            config: {
+                addedKeys: mergedConfig.addedKeys,
+                userValueNotices: mergedConfig.userValueNotices,
+            },
         },
     };
 }

package/dist/commands/shared/exact-path-commit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exact-path-commit.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/exact-path-commit.ts"],"names":[],"mappings":"AAuBA,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AACD,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,WAAW,GAAG,kBAAkB,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAC;IAC7E,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;kFAE8E;IAC9E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,sBAAsB,GAAG,uBAAuB,GAAG,OAAO,CAAC;IACvE,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AACD,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC;AAuSD;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,oBAAoB,EAC3B,SAAS,GAAE,OAAO,CAAC,2BAA2B,CAAM,GACnD,OAAO,CAAC,qBAAqB,CAAC,CA8iBhC"}
+{"version":3,"file":"exact-path-commit.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/exact-path-commit.ts"],"names":[],"mappings":"AAuBA,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AACD,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,WAAW,GAAG,kBAAkB,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAC;IAC7E,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;kFAE8E;IAC9E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,sBAAsB,GAAG,uBAAuB,GAAG,OAAO,CAAC;IACvE,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AACD,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC;AAuSD;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,oBAAoB,EAC3B,SAAS,GAAE,OAAO,CAAC,2BAA2B,CAAM,GACnD,OAAO,CAAC,qBAAqB,CAAC,CA0jBhC"}

package/dist/commands/shared/exact-path-commit.js

@@ -403,7 +403,17 @@ export async function commitExactPaths(input, overrides = {}) {
                 const isolated = join(temporary, 'index');
                 if (!commit) {
                     await git(root, head ? ['read-tree', head] : ['read-tree', '--empty'], isolated);
-                    await git(root, ['add', '-A', '--', ...paths], isolated);
+                    // Git refuses a tracked file whose parent directory an ignore rule
+                    // matches. Only paths the base already tracks may bypass ignore
+                    // rules; an untracked ignored path is still refused.
+                    const tracked = new Set((await git(root, ['ls-files', '-z', '--', ...paths], isolated))
+                        .split('\0')
+                        .filter(Boolean));
+                    const untracked = paths.filter((path) => !tracked.has(path));
+                    if (untracked.length)
+                        await git(root, ['add', '-A', '--', ...untracked], isolated);
+                    if (tracked.size)
+                        await git(root, ['add', '-A', '-f', '--', ...tracked], isolated);
                     if (!(await git(root, ['diff', '--cached', '--name-only'], isolated)))
                         return (operationResult = {
                             outcome: 'nothing',

package/dist/commands/shared/scope-option.d.ts

@@ -16,6 +16,8 @@ import type { Command } from 'commander';
  *   commands. Use `'project'` for commands that only support project scope
  *   (e.g. `providers set`) so bare invocations succeed without requiring an
  *   explicit `--scope project` flag.
+ * @param description - Help text for commands whose scope default needs
+ *   more explanation than "Limit execution scope".
  */
-export declare function withScopeOption(cmd: Command, defaultScope?: 'project' | 'user' | 'all'): Command;
+export declare function withScopeOption(cmd: Command, defaultScope?: 'project' | 'user' | 'all', description?: string): Command;
 //# sourceMappingURL=scope-option.d.ts.map

package/dist/commands/shared/scope-option.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scope-option.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/scope-option.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGzC;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,OAAO,EACZ,YAAY,GAAE,SAAS,GAAG,MAAM,GAAG,KAAa,GAC/C,OAAO,CAMT"}
+{"version":3,"file":"scope-option.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/scope-option.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGzC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,OAAO,EACZ,YAAY,GAAE,SAAS,GAAG,MAAM,GAAG,KAAa,EAChD,WAAW,SAA0B,GACpC,OAAO,CAMT"}

package/dist/commands/shared/scope-option.js

@@ -16,9 +16,11 @@ import { Option } from 'commander';
  *   commands. Use `'project'` for commands that only support project scope
  *   (e.g. `providers set`) so bare invocations succeed without requiring an
  *   explicit `--scope project` flag.
+ * @param description - Help text for commands whose scope default needs
+ *   more explanation than "Limit execution scope".
  */
-export function withScopeOption(cmd, defaultScope = 'all') {
-    return cmd.addOption(new Option('--scope <scope>', 'Limit execution scope')
+export function withScopeOption(cmd, defaultScope = 'all', description = 'Limit execution scope') {
+    return cmd.addOption(new Option('--scope <scope>', description)
         .choices(['project', 'user', 'all'])
         .default(defaultScope));
 }