@quolu/lattice 0.61.2 → 0.62.0

package/src/todo-independence-contracts.mjs

@@ -203,15 +203,20 @@ export function synthesizeWitnessRunRequest(witnessSet, { baseSha, requestId })
 /**
  * 1 taskのconcern anchor宣言を検査する。
  *
- * `within`はそのtask自身が`owns`で主張している資源に限る。所有していない資源の内側に
- * 担当を主張させない。symbol名の実在・資源内包含・task間排他はsensorとcompile側が見る。
+ * `within`は`owns`または`writes`が指す資源に限る。触ると宣言した面の内側に担当を書ける。
+ * 所有も書き込みも無い資源の内側には主張させない。
  */
-function explainConcernAnchors(anchors, owns, at) {
+function explainConcernAnchors(anchors, owns, writes, at) {
   const reject = (reason, path) => ({ valid: false, reason, path });
   if (!Array.isArray(anchors) || anchors.length > TODO_CONCERN_ANCHOR_LIMIT) {
     return reject('bounded_collection_violation', at);
   }
   const ownedKeys = new Set(owns.map((own) => `${own.kind}\0${own.target}`));
+  if (Array.isArray(writes)) {
+    for (const write of writes) {
+      if (typeof write === 'string') ownedKeys.add(`path\0${write}`);
+    }
+  }
   for (const [index, entry] of anchors.entries()) {
     const entryAt = `${at}/${index}`;
     if (!exactRecord(entry, ['within', 'symbols'])) {
@@ -297,7 +302,9 @@ export function explainTodoWitnessSet(value) {
       if (!CONCERN_ANCHOR_SCHEMAS.includes(value.schema)) {
         return reject('concern_anchors_require_witness_set_v2', at);
       }
-      const anchors = explainConcernAnchors(witness.concern_anchors, witness.owns, at);
+      const anchors = explainConcernAnchors(
+        witness.concern_anchors, witness.owns, witness.writes, at,
+      );
       if (!anchors.valid) return reject(anchors.reason, anchors.path);
     }
     return { valid: true };

package/src/todo-independence-guidance.mjs

@@ -304,8 +304,8 @@ export function selectSeamProposalGuidance({ coverage, unknownKinds = [] }) {
  */
 export const TODO_INDEPENDENCE_WORKFLOW = Object.freeze([
   '1. 宣言する: .lattice/todo/witness/<plan_key>.json へ、ToDoごとのowns／reads／writes／affected_testsを書く',
-  '   係争資源しか所有していないToDoは、その資源の中で自分が触るsymbolをconcern_anchorsへ宣言できる（witness set v2）。並列可否の判定には写らず、切断候補の束縛だけに効く',
-  '2. 判定する: lattice todo independence compile --plan <key> --input <ref>（実sensorを引き、clean worktreeが要る）',
+  '   係争資源しか所有していないToDoは、ownsまたはwritesの内側で自分が触るsymbolをconcern_anchorsへ宣言できる（witness set v2）。並列可否の判定には写らず、切断候補の束縛だけに効く',
+  '2. 判定する: lattice todo independence compile --plan <key> --input <ref>（実sensorを引く。pretty-printやdigest未計算の下書きは機械が直す）',
   '3. 読む: lattice todo independence --plan <key> --json（sensorを引かず、記録とHEAD照合だけで返る）',
   '4. 追従する: plan改訂後は lattice todo independence witness migrate --plan <key> で宣言を写してから再compileする',
 ]);
@@ -319,8 +319,8 @@ export const TODO_INDEPENDENCE_WORKFLOW = Object.freeze([
  */
 const SCAFFOLD_CATALOG = Object.freeze({
   anchor_outside_owned: {
-    message: 'concern_anchorのwithinが、自分の所有pathを指していない。所有していない資源の内側に担当を主張できない。',
-    next_action: 'align_anchor_with_owns',
+    message: 'concern_anchorのwithinが、ownsにもwritesにも無い。触ると宣言した面の内側にだけ担当を書ける。',
+    next_action: 'align_anchor_with_owns_or_writes',
   },
   draft_invalid: {
     message: '下書きがlattice.todo_witness_draft契約を満たしていない。',

package/src/todo-store.mjs

@@ -1040,7 +1040,11 @@ function validateMergedTransition(store, member, event) {
   if (event.kind === 'reopen' && event.payload.override_reason === null) {
     const startedSuccessor = mergedSuccessorKeys(store, targetKey)
       .some((key) => states.get(key) !== 'pending');
-    if (startedSuccessor) fail('STORE_INCONSISTENT', 'reopen_has_started_successor');
+    if (startedSuccessor) {
+      fail('STORE_INCONSISTENT', 'reopen_has_started_successor', {
+        next_action: `lattice todo split --plan ${member.plan.plan_key} --input <file>`,
+      });
+    }
   }
   if (event.kind === 'phase_reopen' && event.payload.override_reason === null) {
     const startedSuccessor = member.plan.schema === 'lattice.todo_plan.v4'
@@ -1838,6 +1842,7 @@ function resolveCanonicalTaskId(plan, requestedTaskId) {
 }
 
 async function enforceTodoStructureLifecycleGate(repoRoot, member, eventInput) {
+  if (eventInput.kind === 'done') return;
   const binding = await readTodoStructureBinding({
     repoRoot, planKey: member.plan.plan_key, planVersion: member.plan.plan_version,
   });
@@ -1846,35 +1851,6 @@ async function enforceTodoStructureLifecycleGate(repoRoot, member, eventInput) {
   if (source === null || source.structure_set_digest !== binding.structure_set_digest) {
     fail('STRUCTURE_LIFECYCLE_GATE_FAILED', 'enabled_structure_source_unreadable');
   }
-  if (eventInput.kind === 'done') {
-    const task = source.tasks.find(({ task_id: id }) => id === eventInput.task_id);
-    if (task?.applicability !== 'graph') return;
-    const chain = await readTodoStructureRealizationChain({
-      repoRoot, structureSet: source, taskId: eventInput.task_id,
-    });
-    const latest = chain.at(-1);
-    if (latest === undefined) {
-      fail('STRUCTURE_REALIZATION_REQUIRED', 'fresh_realization_missing', {
-        plan_key: member.plan.plan_key, task_id: eventInput.task_id,
-        next_action: `lattice todo structure realize --plan ${member.plan.plan_key} --task ${eventInput.task_id} --realized <actual-structure.json>`,
-      });
-    }
-    let currentHead;
-    try {
-      currentHead = gitSync(['rev-parse', '--verify', 'HEAD^{commit}'], {
-        cwd: repoRoot, encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'],
-      }).trim();
-    } catch {
-      fail('STRUCTURE_GIT_HEAD_UNAVAILABLE', 'current_head_unavailable');
-    }
-    if (latest.head_sha !== currentHead) {
-      fail('STRUCTURE_REALIZATION_REQUIRED', 'realization_head_stale', {
-        plan_key: member.plan.plan_key, task_id: eventInput.task_id,
-        realization_head_sha: latest.head_sha, current_head_sha: currentHead,
-        next_action: `lattice todo structure realize --plan ${member.plan.plan_key} --task ${eventInput.task_id} --realized <actual-structure.json>`,
-      });
-    }
-  }
   if (!['phase_accept', 'phase_close_unaudited'].includes(eventInput.kind)
     || member.tasks.some(({ status }) => status !== 'done')) return;
   const finalization = await readTodoStructureFinalization({

package/src/witness-scaffold.mjs

@@ -65,6 +65,7 @@ export function validateWitnessDraft(value) {
     && task !== null && typeof task === 'object' && !Array.isArray(task)
     && draftOwnEntries(task, value.schema) !== null
     && (task.reads === undefined || (Array.isArray(task.reads) && task.reads.every(isTodoRef)))
+    && (task.writes === undefined || (Array.isArray(task.writes) && task.writes.every(isTodoRef)))
     && (task.unknowns === undefined || (Array.isArray(task.unknowns)
       && task.unknowns.every((entry) => entry !== null && typeof entry === 'object'
         && isTodoIdentifier(entry.kind) && typeof entry.ref === 'string' && entry.ref.length > 0)))
@@ -113,20 +114,26 @@ export function buildWitnessSet({ draft, observationByPath } = {}) {
     const entries = draftOwnEntries(task, draft.schema) ?? [];
     const owns = [...new Map(entries.map((entry) => [entry.target, entry])).values()]
       .sort((left, right) => compareText(left.target, right.target));
-    const ownedTargets = new Set(owns.map(({ target }) => target));
+    const writeTargets = sortedUnique([
+      ...owns.map(({ target }) => target),
+      ...(Array.isArray(task.writes) ? task.writes : []),
+    ]);
+    const declaredTargets = new Set(writeTargets);
     const affected = sortedUnique(owns.flatMap(({ target }) => (
       observationByPath?.[target]?.affectedTests ?? []
     )));
     for (const anchor of task.concern_anchors ?? []) {
-      // `within`は自分が所有している資源に限る。所有していない資源の内側に担当を主張させない。
-      if (!ownedTargets.has(anchor.within)) reasons.push(`anchor_outside_owned:${taskId}:${anchor.within}`);
+      // `within`はownsまたはwritesが指す資源に限る。
+      if (!declaredTargets.has(anchor.within)) {
+        reasons.push(`anchor_outside_owned:${taskId}:${anchor.within}`);
+      }
     }
     manualWitness[taskId] = {
       owns: owns.map(({ target, creates }) => (
         creates ? { kind: 'path', target, creates: true } : { kind: 'path', target }
       )),
       reads: sortedUnique(task.reads ?? []),
-      writes: owns.map(({ target }) => target),
+      writes: writeTargets,
       resources: [],
       state_effects: [],
       sensor_provenance: {