@quolu/lattice 0.21.0 → 0.21.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quolu/lattice",
-  "version": "0.21.0",
+  "version": "0.21.2",
   "description": "Lattice — phase-aware TODO graph compiler and conflict-aware orchestration runtime",
   "type": "module",
   "license": "MIT",

package/src/isolation-runner.mjs

@@ -130,11 +130,35 @@ async function buildPatch(worktreePath, changedPaths) {
   return Buffer.concat(parts);
 }
 
+/**
+ * mountのために作った親dirが1エントリで報告されたら、除外せず展開して子を同じ規律で見る。
+ *
+ * 親ごと除外すると、その中に現れた別の変更まで隠れる。runnerが張ったmountだけを外す規律を、
+ * ディレクトリ単位の報告でも保つ。
+ */
+async function expandMountAncestors(worktreePath, paths, mountedEntries) {
+  const isAncestor = (entry) => mountedEntries
+    .some((mount) => mount.startsWith(`${entry}/`));
+  const expanded = [];
+  const pending = [...paths];
+  while (pending.length > 0) {
+    const current = pending.pop();
+    const normalized = current.replace(/\/$/u, '');
+    if (!current.endsWith('/') || !isAncestor(normalized)) { expanded.push(current); continue; }
+    const children = await readdir(path.join(worktreePath, normalized), { withFileTypes: true });
+    for (const child of children) {
+      pending.push(`${normalized}/${child.name}${child.isDirectory() ? '/' : ''}`);
+    }
+  }
+  return [...new Set(expanded)].sort();
+}
+
 async function captureSnapshot(worktreePath, baseSha, allowedPaths, mountedEntries = []) {
   const mounted = new Set(mountedEntries);
-  const changedPaths = statusPaths((await run('git', [
+  const reported = statusPaths((await run('git', [
     'status', '--porcelain=v1', '-z', '--untracked-files=all', '--ignored=matching',
-  ], { cwd: worktreePath })).stdout)
+  ], { cwd: worktreePath })).stdout);
+  const changedPaths = (await expandMountAncestors(worktreePath, reported, [...mounted]))
     // runnerが張ったmountだけを外す。それ以外は無視しない——gitignore対象であっても、
     // allowed pathの外に現れたものは変更である。
     .filter((changedPath) => {

package/src/todo-cli.mjs

@@ -4,6 +4,7 @@ import {
   lstat, mkdir, open, readFile, realpath, rename, rm, writeFile,
 } from 'node:fs/promises';
 import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { parseTree } from 'jsonc-parser';
 
 import {
@@ -988,7 +989,9 @@ async function seamProposalApply({ repoRoot, planKey, pathNames = {}, land = fal
     pathNames,
     sourceProposal: artifact,
     witnessSet,
-    latticeBin: path.join(repoRoot, 'bin', 'lattice.mjs'),
+    // 配布物内の自分自身を指す。repoRoot配下を指すと、Lattice自身のrepositoryでしか動かない
+    // ——消費側のprojectに`bin/lattice.mjs`は存在しない。
+    latticeBin: fileURLToPath(new URL('../bin/lattice.mjs', import.meta.url)),
     sharedPathFor: (sourcePath) => sourcePath.replace(/(\.[^./]+)$/u, '.seam-shared$1'),
     executors: witnessSet.capacity.executors,
     compileIndependence: {