@quolu/lattice 0.63.7 → 0.63.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quolu/lattice",
-  "version": "0.63.7",
+  "version": "0.63.9",
   "description": "Schedulability compiler for multi-agent development: observe real code boundaries, refactor the conflicting seam, recompile the plan for parallel execution",
   "author": {
     "name": "Quo / クオ at kitepon.dev",

package/src/todo-cli.mjs

@@ -437,24 +437,32 @@ function looksLikeEvidenceDescriptor(value) {
   return value !== null && typeof value === 'object' && !Array.isArray(value);
 }
 
-function writeEvidenceBlob(repoRoot, bytes) {
-  const oid = gitSync(['hash-object', '-w', '--stdin'], {
+function writeEvidenceBlob(repoRoot, bytes, blobPath) {
+  // worktree pathから作る証拠は`git add`と同じclean filterを通す。生のCRLF bytesを
+  // そのままhashすると、commit先はLFへ正規化される一方、descriptorはdangling blobを
+  // 指すため、commit後もhard検証を通せない。
+  const oid = gitSync(['hash-object', '-w', `--path=${blobPath}`, '--stdin'], {
     cwd: repoRoot, input: bytes, encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'],
   }).trim();
+  const storedBytes = gitSync(['cat-file', 'blob', oid], {
+    cwd: repoRoot, stdio: ['ignore', 'pipe', 'ignore'],
+  });
   return {
     git_blob_oid: oid,
-    content_digest: createHash('sha256').update(bytes).digest('hex'),
+    content_digest: createHash('sha256').update(storedBytes).digest('hex'),
   };
 }
 
 async function resolveDoneEvidence({ repoRoot, evidenceRef, evidenceMessage, planKey, taskId }) {
   if (typeof evidenceMessage === 'string') {
     const bytes = Buffer.from(evidenceMessage, 'utf8');
+    const sourceDigest = createHash('sha256').update(bytes).digest('hex');
+    const evidencePath = `.lattice/todo/evidence/${planKey}/${taskId}/${sourceDigest}.md`;
     const descriptor = {
       evidence_id: evidenceIdFor(planKey, taskId),
       repo_id: 'self',
-      path: `.lattice/todo/evidence/${planKey}/${taskId}.md`,
-      ...writeEvidenceBlob(repoRoot, bytes),
+      path: evidencePath,
+      ...writeEvidenceBlob(repoRoot, bytes, evidencePath),
       media_type: 'text/markdown',
       anchor_digest: null,
     };
@@ -486,7 +494,7 @@ async function resolveDoneEvidence({ repoRoot, evidenceRef, evidenceMessage, pla
     evidence_id: evidenceIdFor(planKey, taskId),
     repo_id: 'self',
     path: located.inputRef,
-    ...writeEvidenceBlob(repoRoot, bytes),
+    ...writeEvidenceBlob(repoRoot, bytes, located.inputRef),
     media_type: mediaTypeFor(located.inputRef),
     anchor_digest: null,
   };
@@ -626,6 +634,14 @@ async function mutate({
       repoRoot, evidenceRef, evidenceMessage, planKey, taskId,
     });
   const testResult = testResultRef === null ? null : await readTestResultInput(repoRoot, testResultRef);
+  const materializedEvidence = typeof evidenceMessage === 'string'
+    ? {
+      ref: evidence.path,
+      bytes: gitSync(['cat-file', 'blob', evidence.git_blob_oid], {
+        cwd: repoRoot, stdio: ['ignore', 'pipe', 'ignore'],
+      }),
+    }
+    : null;
   let eventPayload = payload;
   if (kind === 'done' && payload === 'authored') {
     eventPayload = { evidence, ...(testResult === null ? {} : { test_result: testResult }) };
@@ -641,6 +657,7 @@ async function mutate({
     writer: createTodoStoreWriter({ caller: 'g5-authoring' }),
     planKey,
     event: { kind, task_id: taskId, actor, payload: eventPayload },
+    materializedEvidence,
   });
   const task = snapshot.tasks.find(({ task_id: current }) => current === event.task_id);
   const authoredTask = plan.tasks.find(({ task_id: current }) => current === event.task_id);

package/src/todo-migration.mjs

@@ -128,7 +128,7 @@ function validateEdges(value, schema) {
       const basic = exactRecord(edge, ['from', 'to']);
       const refsValid = nodeRef(edge?.from) && nodeRef(edge?.to);
       const crossPlan = refsValid && isCrossPlanEdge(edge);
-      const withReason = [TODO_EXTRACTION_SCHEMA_V3, TODO_EXTRACTION_SCHEMA_V4].includes(schema) && crossPlan
+      const withReason = [TODO_EXTRACTION_SCHEMA_V3, TODO_EXTRACTION_SCHEMA_V4].includes(schema)
         && exactRecord(edge, ['from', 'to', 'reason'])
         && boundedText(edge.reason);
       return (basic || withReason) && refsValid

package/src/todo-store.mjs

@@ -2050,6 +2050,19 @@ export async function appendTodoEvent(options = {}) {
         eventDigest: event.event_digest,
       }),
     });
+    if (options.materializedEvidence !== null && options.materializedEvidence !== undefined) {
+      const asset = options.materializedEvidence;
+      const descriptor = event.kind === 'done' ? event.payload.evidence : null;
+      if (!exactRecord(asset, ['ref', 'bytes']) || !Buffer.isBuffer(asset.bytes)
+        || descriptor === null || asset.ref !== descriptor.path
+        || !asset.ref.startsWith(`${STORE_ROOT_REF}/evidence/`)
+        || sha256Bytes(asset.bytes) !== descriptor.content_digest) {
+        throw new TypeError('materialized evidence input invalid');
+      }
+      // prospective replayが成立した後、journalより先に実体を同じstore lock内へ置く。
+      // content-addressed pathなので再試行と同文面の並行要求も同じbytesへ収束する。
+      await atomicWrite(path.resolve(repoRoot, asset.ref), asset.bytes);
+    }
     const eventBytes = canonicalLine(event);
     const activeRef = member.descriptor.journal_ref;
     const activeAbsolute = path.resolve(repoRoot, activeRef);