@quolu/lattice 0.16.0 → 0.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quolu/lattice",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "Lattice — phase-aware TODO graph compiler and conflict-aware orchestration runtime",
   "type": "module",
   "license": "MIT",
@@ -62,6 +62,7 @@
     "precheck": "node --check src/bridge-launch-agent.mjs",
     "check": "node --check bin/lattice.mjs && node --check bin/lattice-mcp.mjs && node --check bin/lattice-dashboard.mjs && node --check bin/lattice-bridge.mjs && node --check bin/lattice-scripted-adapter.mjs && node --check src/cli-stdio.mjs && node --check src/bridge-address.mjs && node --check src/bridge-registrar.mjs && node --check src/todo-independence-guidance.mjs && node --check src/todo-independence.mjs && node --check src/todo-independence-contracts.mjs && node --check src/seam-proposal-contracts.mjs && node --check src/seam-proposal-queries.mjs && node --check src/seam-proposal.mjs && node --check src/todo-gantt-layout.mjs && node --check src/todo-gantt-scope.mjs && node --check src/bridge-config.mjs && node --check src/bridge-server.mjs && node --check src/bridge-daemon.mjs && node --check src/bridge-cli.mjs && node --check src/project-cli.mjs && node --check src/sensor-cli.mjs && node --check src/sensor-runtime.mjs && node --check src/sensor-adapter.mjs && node --check src/factory-diagnostics.mjs && node --check src/runtime-errors.mjs && node --check src/runtime-contracts.mjs && node --check src/runtime-event-store.mjs && node --check src/runtime-adapter-registry.mjs && node --check src/runtime-scripted-adapter-controller.mjs && node --check src/hash-chain.mjs && node --check src/dag-chain.mjs && node --check src/todo-contracts.mjs && node --check src/todo-chain.mjs && node --check src/todo-store.mjs && node --check src/todo-migration.mjs && node --check src/todo-revision.mjs && node --check src/todo-status.mjs && node --check src/todo-cli.mjs && node --check src/todo-dashboard-registry.mjs && node --check src/todo-gantt-presentation.mjs && node --check src/todo-gantt-live.mjs && node --check src/bounded-seam.mjs && node --check src/todo-narrative-anchor.mjs && node --check src/todo-markdown-renderer.mjs && node --check src/todo-gantt-svg.mjs && node --check src/todo-gantt-html.mjs && node --check src/runtime-projection.mjs && node --check src/runtime-decision-verifier.mjs && node --check src/runtime-front-end.mjs && node --check src/runtime-cli.mjs && node --check src/rc3-dogfood-scaffold.mjs && node --check src/runtime-engine.mjs && node --check src/runtime-scripted-executor.mjs && node --check src/runtime-diff-observer.mjs && node --check src/runtime-worktree-executor.mjs && node --check src/runtime-hold-recompile.mjs && node --check src/rc3-scripted-campaign.mjs && node --check src/rc3-actual-dogfood.mjs && node --check src/rc4-stage1-dogfood.mjs && node --check research/fixtures/dispatch-record/src/dispatch-record.mjs && node --check test/research-dispatch-record.test.mjs",
     "check:project-identity": "node --check src/project-identity.mjs",
-    "ci": "npm run test && npm run test:sensor && npm run check && npm run check:project-identity"
+    "ci": "npm run test && npm run test:sensor && npm run check && npm run check:project-identity && npm run verify:todo-store",
+    "verify:todo-store": "node bin/lattice.mjs todo verify --json"
   }
 }

package/src/bridge-daemon.mjs

@@ -17,6 +17,9 @@ const STOP_REQUEST_SCHEMA = 'lattice.bridge_stop_request.v1';
 const STOP_RECEIPT_SCHEMA = 'lattice.bridge_stop_receipt.v1';
 const ACTIVE_MARKER_SCHEMA = 'lattice.bridge_daemon_active.v1';
 const CONTROL_MAX_BYTES = 65_536;
+/** control fileの差し替え競合だけを吸収する再読の上限と間隔（`readStrictJson`が唯一の使用者）。 */
+const CONTROL_READ_RETRY_LIMIT = 5;
+const CONTROL_READ_RETRY_DELAY_MS = 20;
 
 export function bridgeDaemonDescriptorPath(env = process.env) {
   return path.join(bridgeConfigPaths(env).root, 'bridge-daemon.json');
@@ -66,7 +69,16 @@ function isIsoTimestamp(value) {
   try { return new Date(value).toISOString() === value; } catch { return false; }
 }
 
-async function readStrictJson(ref, code, label) {
+/** 読み取り中の差し替え・消失につけるmarker。内容の異常と同じ顔をさせない。 */
+const CONTROL_READ_RACE = Symbol('bridge_control_read_race');
+
+function controlReadRace(message) {
+  const error = new Error(message);
+  error[CONTROL_READ_RACE] = true;
+  return error;
+}
+
+async function readStrictJsonOnce(ref, label) {
   let before;
   let handle;
   try {
@@ -77,12 +89,12 @@ async function readStrictJson(ref, code, label) {
     const opened = await handle.stat();
     if (!opened.isFile() || opened.dev !== before.dev || opened.ino !== before.ino
       || opened.size !== before.size || opened.size > CONTROL_MAX_BYTES) {
-      throw new Error(`${label} changed during validation`);
+      throw controlReadRace(`${label} changed during validation`);
     }
     const text = await handle.readFile('utf8');
     const after = await lstat(ref);
     if (after.dev !== opened.dev || after.ino !== opened.ino || after.size !== opened.size) {
-      throw new Error(`${label} changed during read`);
+      throw controlReadRace(`${label} changed during read`);
     }
     const errors = [];
     const tree = parseTree(text, errors, { allowTrailingComma: false, disallowComments: true });
@@ -91,11 +103,37 @@ async function readStrictJson(ref, code, label) {
     }
     return JSON.parse(text);
   } catch (error) {
-    if (error?.code === 'ENOENT' && before === undefined) return null;
-    throw new BridgeConfigError(code, `${label} invalid`, undefined, error);
+    // 最初のlstatで無い＝未起動。読み始めた後に消えたのは停止との競合で、再読でnullへ落ち着く。
+    if (error?.code === 'ENOENT') {
+      if (before === undefined) return null;
+      throw controlReadRace(`${label} removed during read`);
+    }
+    throw error;
   } finally { await handle?.close(); }
 }
 
+/**
+ * 公開はatomic renameなので、読み手はinodeの差し替えに必ず出会う。差し替えを跨いだ読みは
+ * 内容の異常ではなく再読で解ける競合であり、壊れたcontrol fileと同じerrorにしてはならない。
+ *
+ * 再試行するのは`CONTROL_READ_RACE`が付いた3条件だけである——検証中のinode／size変化、
+ * 読み取り中のinode／size変化、最初のlstat後の消失。最大`CONTROL_READ_RETRY_LIMIT`回、
+ * 間隔`CONTROL_READ_RETRY_DELAY_MS`で再読し、超えたら他と同じtyped errorで落とす。
+ * JSON不正・schema不正・mode不正は競合ではないので一度も再試行せず即fail closedにする。
+ */
+async function readStrictJson(ref, code, label) {
+  for (let attempt = 0; ; attempt += 1) {
+    try {
+      return await readStrictJsonOnce(ref, label);
+    } catch (error) {
+      if (error?.[CONTROL_READ_RACE] !== true || attempt >= CONTROL_READ_RETRY_LIMIT) {
+        throw new BridgeConfigError(code, `${label} invalid`, undefined, error);
+      }
+      await new Promise((resolve) => setTimeout(resolve, CONTROL_READ_RETRY_DELAY_MS));
+    }
+  }
+}
+
 async function readStrictControl(ref, schema, keys) {
   const value = await readStrictJson(ref, 'BRIDGE_STOP_CONTROL_INVALID', 'bridge stop control');
   if (value === null) return null;

package/src/seam-proposal-contracts.mjs

@@ -15,7 +15,10 @@ import {
   isGitSha,
   severabilityOfConflictKind,
 } from './todo-independence-contracts.mjs';
-import { SEAM_PROPOSAL_GUIDANCE_CODES } from './todo-independence-guidance.mjs';
+import {
+  SEAM_PROPOSAL_GUIDANCE_CODES,
+  seamProposalGuidanceCode,
+} from './todo-independence-guidance.mjs';
 
 export const SEAM_PROPOSAL_SCHEMA = 'lattice.seam_proposal.v1';
 export const SEAM_PROPOSAL_PROJECTION_SCHEMA = 'lattice.seam_proposal_projection.v1';
@@ -309,19 +312,21 @@ export function validateSeamProposal(value) {
   }
 }
 
-const PROJECTION_GUIDANCE_BY_COVERAGE = Object.freeze({
-  missing: 'seam_proposal_unrecorded',
-  stale: 'seam_proposal_stale',
-  superseded: 'seam_proposal_superseded',
-  verified: 'seam_proposal_verified',
-});
-
-function projectionGuidance(value, coverage) {
-  return exactRecord(value, ['code', 'message', 'next_action'])
-    && SEAM_PROPOSAL_GUIDANCE_CODES.includes(value.code)
-    && value.code === PROJECTION_GUIDANCE_BY_COVERAGE[coverage]
-    && boundedText(value.message)
-    && isTodoIdentifier(value.next_action);
+/**
+ * 案内は、鮮度と載っているunknownから一意に決まる。生成側の文言をそのまま載せる規約なので
+ * shapeだけを見ると、投影が状況と噛み合わない案内を載せても通ってしまう。codeは規則正本へ
+ * 引き直して照合する（ADR 0130 Decision 1・2）。
+ */
+function projectionGuidance(value, coverage, components) {
+  if (!exactRecord(value, ['code', 'message', 'next_action'])
+    || !SEAM_PROPOSAL_GUIDANCE_CODES.includes(value.code)
+    || !boundedText(value.message)
+    || !isTodoIdentifier(value.next_action)) return false;
+  const unknownKinds = Array.isArray(components)
+    ? components.flatMap((component) => (Array.isArray(component?.unknowns)
+      ? component.unknowns.map((unknown) => unknown?.kind) : []))
+    : [];
+  return value.code === seamProposalGuidanceCode({ coverage, unknownKinds });
 }
 
 function projectionComponent(value) {
@@ -383,7 +388,7 @@ export function validateSeamProposalProjection(value) {
       || !isTodoIdentifier(value.plan_key)
       || !TODO_INDEPENDENCE_COVERAGE.includes(value.coverage)
       || !isGitSha(value.current_base_sha)
-      || !projectionGuidance(value.guidance, value.coverage)
+      || !projectionGuidance(value.guidance, value.coverage, value.components)
       || !isTodoDigest(value.result_digest)) return false;
 
     if (value.coverage === 'missing') {

package/src/todo-cli.mjs

@@ -1013,7 +1013,10 @@ async function seamProposal({ repoRoot, requestedPlanKey }) {
     topology_digest: artifact?.source_binding.topology_digest ?? null,
     independence_result_digest: artifact?.source_binding.independence_result_digest ?? null,
     compiled_at: artifact?.compiled_at ?? null,
-    guidance: selectSeamProposalGuidance({ coverage }),
+    guidance: selectSeamProposalGuidance({
+      coverage,
+      unknownKinds: components.flatMap(({ unknowns }) => unknowns.map(({ kind }) => kind)),
+    }),
     component_count: artifact === null ? null : components.length,
     conflict_resource_count: artifact === null ? null : components
       .reduce((count, component) => count + component.conflicts.length, 0),

package/src/todo-independence-guidance.mjs

@@ -24,9 +24,39 @@ export const SEAM_PROPOSAL_GUIDANCE_CODES = Object.freeze([
   'seam_proposal_unrecorded',
   'seam_proposal_superseded',
   'seam_proposal_stale',
+  'seam_proposal_binding_overlap',
+  'seam_proposal_binding_outside_resource',
+  'seam_proposal_binding_symbol_unresolved',
+  'seam_proposal_binding_resource_unresolved',
+  'seam_proposal_binding_ambiguous',
+  'seam_proposal_binding_missing',
   'seam_proposal_verified',
 ]);
 
+/**
+ * 束縛失敗のunknown種別から案内codeを引く表。並びは優先順で、先頭ほど次の一歩が具体的である。
+ *
+ * 宣言が壊れている状況を、宣言が無い状況より上に置く。壊れている方は直す対象が
+ * 一意に決まるのに対し、無い方は何をどう宣言するかから決めることになるからである。
+ */
+const SEAM_PROPOSAL_BINDING_GUIDANCE = Object.freeze([
+  Object.freeze(['concern_anchor_overlap', 'seam_proposal_binding_overlap']),
+  Object.freeze(['concern_anchor_outside_resource', 'seam_proposal_binding_outside_resource']),
+  Object.freeze(['concern_anchor_unresolved', 'seam_proposal_binding_symbol_unresolved']),
+  Object.freeze(['concern_anchor_resource_unresolved', 'seam_proposal_binding_resource_unresolved']),
+  Object.freeze(['semantic_owner_binding_ambiguous', 'seam_proposal_binding_ambiguous']),
+  Object.freeze(['semantic_owner_binding_missing', 'seam_proposal_binding_missing']),
+]);
+
+/**
+ * 束縛の案内へ共通で添える、記録が更新される条件。
+ *
+ * concern_anchorsはwitness setにあり、seam提案はindependence記録のwitness_set_digestと
+ * 一致する宣言しか読まない。宣言を直しただけでは提案は変わらないので、そこまで述べないと
+ * 「直したのに同じunknownが出る」で止まる。
+ */
+const BINDING_RECOMPILE_HINT = '宣言はwitness setにあり、independence compileとseam-proposal compileを通し直すまで提案へ写らない。';
+
 const CATALOG = Object.freeze({
   independence_no_ready_frontier: Object.freeze({
     message: '着手候補が無いため、並列可否を述べる対象が無い。',
@@ -76,6 +106,30 @@ const CATALOG = Object.freeze({
     message: 'seam提案の生成後にHEADが進み、記録時点の構造証拠は現在のcodeを指していない。',
     next_action: 'compile_seam_proposal',
   }),
+  seam_proposal_binding_overlap: Object.freeze({
+    message: `同じ資源について、複数のToDoが同じsymbolを自分の担当として宣言している。どちら側へ切るか決まらないため、切断候補を束縛できない。${BINDING_RECOMPILE_HINT}`,
+    next_action: 'split_overlapping_concern_anchors_then_recompile',
+  }),
+  seam_proposal_binding_outside_resource: Object.freeze({
+    message: `concern_anchorsが挙げたsymbolが、withinで指した資源の外にある。その資源の分割を説明しないので束縛へ使えない。${BINDING_RECOMPILE_HINT}`,
+    next_action: 'correct_concern_anchors_then_recompile',
+  }),
+  seam_proposal_binding_symbol_unresolved: Object.freeze({
+    message: `concern_anchorsが挙げたsymbolを、sensorが同名同pathで解決できなかった。近い別symbolへは寄せないため、束縛は成立していない。${BINDING_RECOMPILE_HINT}`,
+    next_action: 'correct_concern_anchors_then_recompile',
+  }),
+  seam_proposal_binding_resource_unresolved: Object.freeze({
+    message: `concern_anchorsのwithinが指す資源をsensorで解決できなかった。宣言がどの資源についてのものか確定しない。${BINDING_RECOMPILE_HINT}`,
+    next_action: 'correct_concern_anchors_then_recompile',
+  }),
+  seam_proposal_binding_ambiguous: Object.freeze({
+    message: `宣言したsymbolが切断候補の複数側へ当たるため、どのToDoがどちらを所有するか一意に決まらない。${BINDING_RECOMPILE_HINT}`,
+    next_action: 'narrow_concern_anchors_then_recompile',
+  }),
+  seam_proposal_binding_missing: Object.freeze({
+    message: `係争資源の中でどのToDoが何を触るかが宣言されていないため、切断候補を所有者へ束縛できない。依存線でも呼び出し辺でも所有は決まらない。${BINDING_RECOMPILE_HINT}`,
+    next_action: 'declare_concern_anchors_then_recompile',
+  }),
   seam_proposal_verified: Object.freeze({
     message: 'seam提案の記録は現在のplan、並列可否記録、HEADと一致している。',
     next_action: 'none',
@@ -135,21 +189,37 @@ export function selectIndependenceGuidance({
   return todoIndependenceGuidance('independence_verified');
 }
 
-export function selectSeamProposalGuidance({ coverage }) {
-  const code = coverage === 'missing' ? 'seam_proposal_unrecorded'
-    : coverage === 'superseded' ? 'seam_proposal_superseded'
-      : coverage === 'stale' ? 'seam_proposal_stale'
-        : coverage === 'verified' ? 'seam_proposal_verified' : null;
-  if (code === null) throw new TypeError(`unknown seam proposal coverage: ${coverage}`);
-  return todoIndependenceGuidance(code);
+/**
+ * seam提案の状況から案内codeを引く。投影の生成側と契約の検査側が同じ規則を読むための正本。
+ *
+ * 鮮度（coverage）を束縛失敗より先に見る。記録が古い・別topologyについてのものである時、
+ * そこに載っているunknownは現在のcodeについての事実ではないため、先に再compileが要る。
+ * 記録が現在と一致している時だけ、束縛失敗が「今直せる状況」になる。
+ */
+export function seamProposalGuidanceCode({ coverage, unknownKinds = [] }) {
+  if (coverage === 'missing') return 'seam_proposal_unrecorded';
+  if (coverage === 'superseded') return 'seam_proposal_superseded';
+  if (coverage === 'stale') return 'seam_proposal_stale';
+  if (coverage !== 'verified') throw new TypeError(`unknown seam proposal coverage: ${coverage}`);
+  const kinds = new Set(unknownKinds);
+  const binding = SEAM_PROPOSAL_BINDING_GUIDANCE.find(([kind]) => kinds.has(kind));
+  return binding === undefined ? 'seam_proposal_verified' : binding[1];
+}
+
+export function selectSeamProposalGuidance({ coverage, unknownKinds = [] }) {
+  return todoIndependenceGuidance(seamProposalGuidanceCode({ coverage, unknownKinds }));
 }
 
 /**
  * 宣言からcompileを経て読むまでの順序。helpとMCP instructionsが同じ手順を語るための正本。
  * 面ごとに手順を書き直すと、片方だけが古くなる。
+ *
+ * 宣言できる欄を挙げる面はここだけなので、witness契約へ欄を足したらここへも足す。
+ * 足さないと、能力はあるのに機械が黙る面が残る（ADR 0130）。
  */
 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が要る）',
   '3. 読む: lattice todo independence --plan <key> --json（sensorを引かず、記録とHEAD照合だけで返る）',
   '4. 追従する: plan改訂後は lattice todo independence witness migrate --plan <key> で宣言を写してから再compileする',