@open-agent-toolkit/cli 0.3.16 → 0.3.18

package/dist/commands/shared/agents-md.js

@@ -1,6 +1,7 @@
 import { constants } from 'node:fs';
 import { lstat, open, readFile, readlink, realpath, writeFile, } from 'node:fs/promises';
 import { dirname, isAbsolute, join, relative, resolve, sep } from 'node:path';
+import { acquireAgentsMdAppendLock } from './agents-md-lock.js';
 const defaultFileSystem = {
     lstat,
     open,
@@ -496,7 +497,7 @@ function classifySections(plan, desired, content, removeSectionKeys, appendRefus
     };
 }
 /** Inspect current bytes and identity without opening a write handle. */
-async function inspectSections(plan, sections, removeSectionKeys, fileSystem) {
+async function inspectSections(plan, sections, removeSectionKeys, fileSystem, validateContent = true) {
     const desired = sections.map(({ key, body }) => ({
         key,
         block: buildSection(key, body),
@@ -505,7 +506,7 @@ async function inspectSections(plan, sections, removeSectionKeys, fileSystem) {
         ? ''
         : await fileSystem.readFile(plan.targetPath, 'utf8');
     const classification = classifySections(plan, desired, content, removeSectionKeys);
-    await assertPlanUnchanged(plan, fileSystem, plan.kind === 'missing' ? undefined : content);
+    await assertPlanUnchanged(plan, fileSystem, plan.kind === 'missing' || !validateContent ? undefined : content);
     return { content, desired, classification };
 }
 async function upsertSectionsInternal(repoRoot, sections, removeSectionKeys, fileSystem, allowReplan) {
@@ -518,7 +519,7 @@ async function upsertSectionsInternal(repoRoot, sections, removeSectionKeys, fil
         return Object.fromEntries(sections.map(({ key }) => [key, blocked]));
     }
     try {
-        const { desired, content, classification } = await inspectSections(plan, sections, removeSectionKeys, fileSystem);
+        let { desired, content, classification } = await inspectSections(plan, sections, removeSectionKeys, fileSystem, false);
         if (plan.kind === 'missing') {
             const creation = await createMissingFile(plan, `${desired.map(({ block }) => block).join('\n\n')}\n`, fileSystem);
             if (creation === 'created')
@@ -528,12 +529,29 @@ async function upsertSectionsInternal(repoRoot, sections, removeSectionKeys, fil
             }
             throw new Error(IDENTITY_CHANGED);
         }
+        if (classification.absentBlocks.length === 0) {
+            // Non-appending outcomes retain their original content-stability check
+            // without creating a lock; only append candidates use the locked re-read.
+            await assertPlanUnchanged(plan, fileSystem, content);
+            return classification.results;
+        }
         if (classification.absentBlocks.length > 0) {
-            const appended = await appendAbsentSections(plan, classification.absentBlocks, fileSystem);
-            if (appended.kind === 'blocked')
-                throw new Error(appended.reason);
-            if (appended.kind === 'refused') {
-                return classifySections(plan, desired, content, removeSectionKeys, appended.cause).results;
+            const release = await acquireAgentsMdAppendLock(plan.repoRoot, plan.targetPath);
+            try {
+                // Revalidate the original identity and classify fresh bytes under the lock.
+                ({ desired, content, classification } = await inspectSections(plan, sections, removeSectionKeys, fileSystem));
+                if (classification.absentBlocks.length > 0) {
+                    const appended = await appendAbsentSections(plan, classification.absentBlocks, fileSystem);
+                    if (appended.kind === 'blocked')
+                        throw new Error(appended.reason);
+                    if (appended.kind === 'refused') {
+                        return classifySections(plan, desired, content, removeSectionKeys, appended.cause).results;
+                    }
+                }
+                return classification.results;
+            }
+            finally {
+                await release();
             }
         }
         return classification.results;

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

@@ -0,0 +1,32 @@
+export interface ExactPathCommitInput {
+    repoRoot: string;
+    paths: readonly string[];
+    message: string;
+    identity: string;
+}
+export interface ExactPathCommitResult {
+    outcome: 'committed' | 'already-matching' | 'nothing' | 'blocked' | 'failed';
+    committed: boolean;
+    attempts: number;
+    commit?: string;
+    /** A fully verified resumed receipt whose owned real-index entries remain
+     * published, or whose later generation is published at current HEAD. Failed
+     * outcome stays failed; only the marker owner may retire that reservation. */
+    settledCommit?: string;
+    receipt?: string;
+    error?: string;
+    lockClass?: 'transient-index-lock' | 'persistent-index-lock' | 'other';
+    resumable?: boolean;
+}
+export interface ExactPathCommitDependencies {
+    attempts: number;
+    retryDelaysMs: readonly number[];
+    sleep: (ms: number) => Promise<void>;
+}
+/** Use an isolated index for enabled hooks; publish only owned entries under Git's lock.
+ * The real lock is held during hooks, so ordinary competing Git writers cannot lose
+ * their changes. A byte comparison also detects writers bypassing that protocol.
+ * Never restore a snapshot over current user data, and never remove a foreign lock.
+ */
+export declare function commitExactPaths(input: ExactPathCommitInput, overrides?: Partial<ExactPathCommitDependencies>): Promise<ExactPathCommitResult>;
+//# sourceMappingURL=exact-path-commit.d.ts.map

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

@@ -0,0 +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"}