@cloverleaf/reference-impl 0.8.1 → 0.8.2

package/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

package/dist/cli.mjs

@@ -44,7 +44,7 @@
  */
 import { readFileSync, mkdirSync, copyFileSync, appendFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
-import { execSync } from 'node:child_process';
+import { execSync, execFileSync } from 'node:child_process';
 import { loadTask, saveTask } from './task.mjs';
 import { advanceStatus } from './task.mjs';
 import { emitGateDecision } from './events.mjs';
@@ -66,7 +66,7 @@ import { buildBaselinePath } from './visual-diff.mjs';
 import { computeReadyTasks, detectCycle } from './dag-walker.mjs';
 import { readWalkState, writeWalkState, walkStatePath } from './walk-state.mjs';
 import { loadWalkerConfig } from './walker-config.mjs';
-import { classifyFiles } from './scope-check.mjs';
+import { classifyFiles, normalizePath } from './scope-check.mjs';
 import { computeRfcTasksView } from './rfc-tasks.mjs';
 import { loadSecretPatternsConfig, scanSecrets } from './secret-scan.mjs';
 import { classifyTaskSecurity } from './security-classify.mjs';
@@ -652,8 +652,29 @@ try {
             catch {
                 // No diff is fine (empty branch)
             }
-            // 4. Classify and output
-            const result = classifyFiles(taskDoc, modifiedFiles, siblingScopes);
+            // 4. Compute sharedFiles via git check-attr (merge=union honors user's multi-writer intent)
+            let sharedFiles = new Set();
+            if (modifiedFiles.length > 0) {
+                try {
+                    const out = execFileSync('git', ['-C', repoRoot, 'check-attr', '-z', 'merge', '--', ...modifiedFiles], { encoding: 'utf-8' });
+                    // -z output: NUL-separated triplets: path\0attr\0value\0
+                    const parts = out.split('\0');
+                    for (let i = 0; i + 2 < parts.length; i += 3) {
+                        const path = parts[i];
+                        const attr = parts[i + 1];
+                        const value = parts[i + 2];
+                        if (attr === 'merge' && value === 'union') {
+                            sharedFiles.add(normalizePath(path));
+                        }
+                    }
+                }
+                catch (err) {
+                    process.stderr.write(`cloverleaf-cli check-scope: git check-attr failed (${err instanceof Error ? err.message : String(err)}); proceeding with no shared-file annotations.\n`);
+                    sharedFiles = new Set();
+                }
+            }
+            // 5. Classify and output
+            const result = classifyFiles(taskDoc, modifiedFiles, siblingScopes, sharedFiles);
             process.stdout.write(JSON.stringify(result) + '\n');
             process.exit(0);
         }

package/dist/scope-check.mjs

@@ -37,7 +37,7 @@
  *  - Strip trailing `/` (preserving a non-empty result)
  *  - Return the resulting string (may be empty for degenerate inputs; caller filters)
  */
-function normalizePath(p) {
+export function normalizePath(p) {
     let s = p.trim().replace(/\\/g, '/');
     // Strip leading `./` repeatedly
     while (s.startsWith('./')) {
@@ -71,7 +71,7 @@ function normalizePaths(paths) {
  * @param siblingScopes - Other tasks in the same Plan with their declared files.
  * @returns             - { contested, own, extension } with arrays sorted by file path.
  */
-export function classifyFiles(taskDoc, modifiedFiles, siblingScopes) {
+export function classifyFiles(taskDoc, modifiedFiles, siblingScopes, sharedFiles) {
     // 1. Normalize own files from taskDoc.scope.files_touched
     const scope = taskDoc['scope'];
     const rawOwn = Array.isArray(scope?.['files_touched'])
@@ -117,6 +117,11 @@ export function classifyFiles(taskDoc, modifiedFiles, siblingScopes) {
         if (ownSet.has(f)) {
             own.push(f);
         }
+        else if (sharedFiles?.has(f)) {
+            // merge=union (or other shared-intent annotation): never contested.
+            // Falls into extension so post-merge auto-extend picks it up.
+            extension.push(f);
+        }
         else if (siblingMap.has(f)) {
             const owners = siblingMap.get(f);
             contested.push({ file: f, owner: owners[0] }); // lex-smallest wins

package/lib/cli.ts

@@ -45,7 +45,7 @@
 
 import { readFileSync, mkdirSync, copyFileSync, appendFileSync, existsSync } from 'node:fs';
 import { dirname, join } from 'node:path';
-import { execSync } from 'node:child_process';
+import { execSync, execFileSync } from 'node:child_process';
 import { loadTask, saveTask } from './task.js';
 import { advanceStatus } from './task.js';
 import { emitGateDecision } from './events.js';
@@ -68,7 +68,7 @@ import { buildBaselinePath } from './visual-diff.js';
 import { computeReadyTasks, detectCycle } from './dag-walker.js';
 import { readWalkState, writeWalkState, walkStatePath } from './walk-state.js';
 import { loadWalkerConfig } from './walker-config.js';
-import { classifyFiles } from './scope-check.js';
+import { classifyFiles, normalizePath } from './scope-check.js';
 import type { SiblingScope } from './scope-check.js';
 import { computeRfcTasksView, type RfcTasksView } from './rfc-tasks.js';
 import { loadSecretPatternsConfig, scanSecrets } from './secret-scan.js';
@@ -663,8 +663,35 @@ try {
         // No diff is fine (empty branch)
       }
 
-      // 4. Classify and output
-      const result = classifyFiles(taskDoc, modifiedFiles, siblingScopes);
+      // 4. Compute sharedFiles via git check-attr (merge=union honors user's multi-writer intent)
+      let sharedFiles = new Set<string>();
+      if (modifiedFiles.length > 0) {
+        try {
+          const out = execFileSync(
+            'git',
+            ['-C', repoRoot, 'check-attr', '-z', 'merge', '--', ...modifiedFiles],
+            { encoding: 'utf-8' },
+          );
+          // -z output: NUL-separated triplets: path\0attr\0value\0
+          const parts = out.split('\0');
+          for (let i = 0; i + 2 < parts.length; i += 3) {
+            const path = parts[i];
+            const attr = parts[i + 1];
+            const value = parts[i + 2];
+            if (attr === 'merge' && value === 'union') {
+              sharedFiles.add(normalizePath(path));
+            }
+          }
+        } catch (err) {
+          process.stderr.write(
+            `cloverleaf-cli check-scope: git check-attr failed (${err instanceof Error ? err.message : String(err)}); proceeding with no shared-file annotations.\n`,
+          );
+          sharedFiles = new Set();
+        }
+      }
+
+      // 5. Classify and output
+      const result = classifyFiles(taskDoc, modifiedFiles, siblingScopes, sharedFiles);
       process.stdout.write(JSON.stringify(result) + '\n');
       process.exit(0);
     }

package/lib/scope-check.ts

@@ -56,7 +56,7 @@ export interface SiblingScope {
  *  - Strip trailing `/` (preserving a non-empty result)
  *  - Return the resulting string (may be empty for degenerate inputs; caller filters)
  */
-function normalizePath(p: string): string {
+export function normalizePath(p: string): string {
   let s = p.trim().replace(/\\/g, '/');
   // Strip leading `./` repeatedly
   while (s.startsWith('./')) {
@@ -93,7 +93,8 @@ function normalizePaths(paths: string[]): string[] {
 export function classifyFiles(
   taskDoc: TaskDoc,
   modifiedFiles: string[],
-  siblingScopes: SiblingScope[]
+  siblingScopes: SiblingScope[],
+  sharedFiles?: Set<string>
 ): ClassifyResult {
   // 1. Normalize own files from taskDoc.scope.files_touched
   const scope = taskDoc['scope'] as Record<string, unknown> | undefined;
@@ -138,6 +139,10 @@ export function classifyFiles(
   for (const f of filteredModified) {
     if (ownSet.has(f)) {
       own.push(f);
+    } else if (sharedFiles?.has(f)) {
+      // merge=union (or other shared-intent annotation): never contested.
+      // Falls into extension so post-merge auto-extend picks it up.
+      extension.push(f);
     } else if (siblingMap.has(f)) {
       const owners = siblingMap.get(f)!;
       contested.push({ file: f, owner: owners[0] }); // lex-smallest wins

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloverleaf/reference-impl",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Reference implementation of the Cloverleaf methodology as Claude Code skills. Implements the Tight Loop (Implementer + Reviewer).",
   "type": "module",
   "license": "MIT",