@quolu/lattice 0.67.3 → 0.67.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quolu/lattice",
-  "version": "0.67.3",
+  "version": "0.67.5",
   "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/cli-help.mjs

@@ -110,6 +110,7 @@ Write commands:
   reopen --plan <key> --task <id> --reason <text> [--override-reason <text>]
   evidence promote --plan <key> --task <id> --evidence <file>
       # done状態と完了時刻を維持し、最新doneへ追記eventで証拠を再束縛する
+  start --plan <key> --task <id> --rebind --reason <text>  # 改訂でcarryされたin-progressへ現版のstart束縛を積み直す（ADR 0191）
   dependency connect --from-plan <key> --from-task <id> --to-plan <key> --to-task <id> --reason <text>
   dependency disconnect --from-plan <key> --from-task <id> --to-plan <key> --to-task <id> --reason <text>
       # 開発中に発見した依存を明示接続する（同一plan内・plan跨ぎとも）。依存の自動推定は行わない

package/src/todo-cli.mjs

@@ -901,6 +901,47 @@ async function startTask({
     structureContext });
 }
 
+// plan改訂でcarryされたin-progress ToDoの再束縛入口（ADR 0191）。task状態・開始時刻は
+// 変えず、現plan_version・現actorのstart束縛だけをjournalへ積む。runtime intakeは
+// literal startだけを束縛に使いcarryを推定しないため、改訂を跨いだ進行中工程の
+// 再開はこの入口だけが正規経路になる。advisory・independence gateは初回startで
+// 済んでいるため再適用しない。
+async function rebindStart({ repoRoot, env, planKey, taskId, reason }) {
+  const store = await readTodoStore({ repoRoot });
+  const member = store.members.find(({ descriptor }) => descriptor.plan_key === planKey);
+  if (member === undefined) throw new TodoStoreError('STORE_INCONSISTENT', 'plan_not_active');
+  const task = member.tasks.find(({ task_id: candidate }) => candidate === taskId);
+  if (task === undefined) {
+    throw new TodoStoreError('TASK_NOT_FOUND', 'task_not_found', undefined, {
+      requested_task_id: taskId,
+    });
+  }
+  if (task.status !== 'in-progress') {
+    throw new TodoStoreError('TASK_START_BINDING_UNSUPPORTED', 'rebind_requires_in_progress', undefined, {
+      task_id: taskId, status: task.status,
+    });
+  }
+  let noteContext;
+  try {
+    ({ context: noteContext } = await readTodoNoteContext({ repoRoot, store, planKey, taskId }));
+  } catch (error) {
+    if (!['NOTE_LOG_CORRUPT', 'NOTE_PROJECTION_INVALID'].includes(error?.code)) throw error;
+    noteContext = {
+      schema: 'lattice.todo_note_context.unreadable.v1',
+      project_id: member.plan.project_id,
+      plan_key: planKey,
+      task_id: taskId,
+      code: error.code,
+      reason: error.detail?.reason ?? 'note_context_unreadable',
+      next_action: `lattice todo note list --plan ${planKey} --json`,
+    };
+  }
+  return mutate({
+    repoRoot, env, planKey, taskId, kind: 'start',
+    payload: { start_mode: 'rebind', reason }, evidenceRef: null, noteContext,
+  });
+}
+
 async function retractStart({ repoRoot, env, planKey, taskId, reason }) {
   const actor = mutationActor(env);
   const store = await readTodoStore({ repoRoot });
@@ -1052,7 +1093,8 @@ async function dependencyConnect({
 async function dependencyDisconnect({
   repoRoot, env, fromPlanKey, fromTaskId, toPlanKey, toTaskId, reason,
 }) {
-  const store = await readTodoStore({ repoRoot });
+  // 修理扉: 越境依存の固定digestが陳腐化した store でも disconnect だけは通す（todo-store.mjs 参照）
+  const store = await readTodoStore({ repoRoot, tolerateStaleBindings: true });
   const live = projectTodoCrossPlanDependencies(store.members).filter((dependency) => (
     dependency.from.plan_key === fromPlanKey && dependency.from.task_id === fromTaskId
     && dependency.to.plan_key === toPlanKey && dependency.to.task_id === toTaskId
@@ -1068,6 +1110,7 @@ async function dependencyDisconnect({
     .some((event) => event.event_digest === target.event_digest));
   const { event } = await appendTodoEvent({
     repoRoot, writer: createTodoStoreWriter({ caller: 'g5-authoring' }), planKey: owner.plan.plan_key,
+    tolerateStaleBindings: true,
     event: {
       kind: 'cross_plan_dependency_removed', actor: mutationActor(env),
       payload: { target_event_digest: target.event_digest, reason },
@@ -3968,11 +4011,18 @@ export async function runTodoCli({ argv, cwd, stdout, stderr, env = process.env
     action = (repoRoot) => phaseBaseline({ repoRoot, env, reason: argv[3], exceptPlanKeys });
   } else if (argv[0] === 'start') {
     const flags = matchFlagCommand(argv, ['start'], {
-      known: ['plan', 'task', 'parallel-frontier', 'override-reason', 'serial-confirmed'],
+      known: ['plan', 'task', 'parallel-frontier', 'override-reason', 'serial-confirmed', 'rebind', 'reason'],
       required: ['plan', 'task'],
-      booleans: ['parallel-frontier', 'serial-confirmed'],
+      booleans: ['parallel-frontier', 'serial-confirmed', 'rebind'],
     });
-    if (flags !== null && isTodoIdentifier(flags.plan) && isTodoIdentifier(flags.task)
+    if (flags !== null && flags.rebind === true) {
+      if (isTodoIdentifier(flags.plan) && isTodoIdentifier(flags.task)
+        && typeof flags.reason === 'string' && flags.reason.length > 0) {
+        action = (repoRoot) => rebindStart({
+          repoRoot, env, planKey: flags.plan, taskId: flags.task, reason: flags.reason,
+        });
+      }
+    } else if (flags !== null && isTodoIdentifier(flags.plan) && isTodoIdentifier(flags.task)
       && (flags['override-reason'] === undefined || (typeof flags['override-reason'] === 'string'
         && flags['override-reason'].length > 0))) {
       action = (repoRoot) => startTask({

package/src/todo-contracts.mjs

@@ -532,6 +532,12 @@ function validPayload(event) {
       && isTodoDigest(payload.target_event_digest)
       && nullableText(payload.reason) && payload.reason !== null;
   }
+  // rebind: plan改訂でcarryされたin-progress ToDoへ、現plan_versionの明示的start束縛を積み直す
+  // （runtime intakeはliteral startだけを束縛に使い、carryを推定しない。ADR 0191）
+  if (event.kind === 'start' && payload?.start_mode === 'rebind') {
+    return exactRecord(payload, ['start_mode', 'reason'])
+      && nullableText(payload.reason) && payload.reason !== null;
+  }
   if (event.kind === 'start') return exactRecord(payload, ['override_reason']) && nullableText(payload.override_reason);
   if (event.kind === 'start_retracted') return exactRecord(payload, ['reason', 'target_start_digest'])
     && nullableText(payload.reason) && payload.reason !== null

package/src/todo-store.mjs

@@ -678,6 +678,17 @@ function replay(plan, events, { now = new Date(), verifyEvidence, verifyImportSo
     if (state === undefined) fail('STORE_INCONSISTENT', 'event_task_missing');
     const dependenciesDone = localPredecessors(plan, event.task_id).every((id) => states.get(id)?.status === 'done');
     if (event.kind === 'start') {
+      if (event.payload.start_mode === 'rebind') {
+        // 改訂でcarryされたin-progressの再束縛。状態・開始時刻は動かさず、start束縛だけを
+        // 現actor・現plan_versionのeventへ更新する（ADR 0191）
+        if (state.status !== 'in-progress') {
+          fail('STORE_INCONSISTENT', 'invalid_rebind_start_transition');
+        }
+        authoredStartBindings.set(event.task_id, {
+          actor: structuredClone(event.actor), event_digest: event.event_digest,
+        });
+        continue;
+      }
       if (event.payload.start_mode === 'historical_import') {
         if (!importedGenesis || state.status !== 'pending') {
           fail('STORE_INCONSISTENT', 'invalid_historical_import_start_transition');
@@ -879,7 +890,13 @@ function snapshotFor(plan, events, tasks) {
   return snapshot;
 }
 
-function validateMergedGraph(members, crossPlanDependencies = []) {
+function validateMergedGraph(members, crossPlanDependencies = [], options = {}) {
+  // tolerateStaleBindings は dependency disconnect 専用の修理扉。plan revise が越境依存の
+  // 固定digestを陳腐化させると、通常loadは binding_stale で fail closed するが、その修理
+  // コマンド自身も load を要するため、扉が無いと修理経路が存在しない（実被弾 2026-08-29:
+  // evidence-2 改訂で store 全体が読めなくなり、disconnect も同エラーで詰んだ）。
+  // 許容するのは digest 不一致だけで、dangling / missing は修理扉でも fail する。
+  const tolerateStale = options.tolerateStaleBindings === true;
   const tasks = new Map();
   for (const member of members) for (const task of member.plan.tasks) {
     tasks.set(`${member.plan.project_id}\0${member.plan.plan_key}\0${task.task_id}`, member.plan.topology_digest);
@@ -900,7 +917,7 @@ function validateMergedGraph(members, crossPlanDependencies = []) {
     if (topology === undefined) fail('STORE_INCONSISTENT', 'dangling_dependency');
     if ((ref.project_id !== ownerPlan.project_id || ref.plan_key !== ownerPlan.plan_key)
       && ref.expected_topology_digest === undefined) fail('STORE_INCONSISTENT', 'cross_plan_binding_missing');
-    if (ref.expected_topology_digest !== undefined && topology !== ref.expected_topology_digest) {
+    if (!tolerateStale && ref.expected_topology_digest !== undefined && topology !== ref.expected_topology_digest) {
       fail('STORE_INCONSISTENT', 'binding_stale');
     }
     return key;
@@ -911,7 +928,7 @@ function validateMergedGraph(members, crossPlanDependencies = []) {
     if (topology === undefined) fail('STORE_INCONSISTENT', 'dangling_phase_dependency');
     if ((ref.project_id !== ownerPlan.project_id || ref.plan_key !== ownerPlan.plan_key)
       && ref.expected_topology_digest === undefined) fail('STORE_INCONSISTENT', 'cross_plan_binding_missing');
-    if (ref.expected_topology_digest !== undefined && topology !== ref.expected_topology_digest) {
+    if (!tolerateStale && ref.expected_topology_digest !== undefined && topology !== ref.expected_topology_digest) {
       fail('STORE_INCONSISTENT', 'binding_stale');
     }
     return key;
@@ -1119,6 +1136,7 @@ function validateMergedTransition(store, member, event) {
   const phaseAcceptReady = mergedPhaseAcceptReady(store, targetKey);
   const dependenciesDone = taskDependenciesDone && phaseAcceptReady;
   if (event.kind === 'start' && event.payload.start_mode !== 'historical_import'
+    && event.payload.start_mode !== 'rebind'
     && (!phaseAcceptReady || (!taskDependenciesDone && event.payload.override_reason === null))) {
     fail('STORE_INCONSISTENT', 'invalid_start_transition');
   }
@@ -1629,7 +1647,9 @@ export async function readTodoStore(options = {}) {
       snapshot: snapshotStale ? expectedSnapshot : snapshot,
       tasks, phases, coordination, snapshot_stale: snapshotStale });
   }
-  validateMergedGraph(loaded, projectTodoCrossPlanDependencies(loaded));
+  validateMergedGraph(loaded, projectTodoCrossPlanDependencies(loaded), {
+    tolerateStaleBindings: options.tolerateStaleBindings === true,
+  });
   return {
     schema: 'lattice.todo_store_read.v1', project_id: manifest.project_id, manifest,
     members: loaded, snapshot_stale: loaded.some((member) => member.snapshot_stale),
@@ -2036,6 +2056,10 @@ export async function appendTodoEvent(options = {}) {
     const store = await readTodoStore({
       repoRoot, forWrite: true, now: options.now, evidenceRepair,
       evidenceRepairCapability: EVIDENCE_REPAIR_CAPABILITY,
+      // 修理扉は除去event（tombstone）の書込みだけに開く。それ以外の書込みは従来どおり
+      // binding_stale で fail closed する（validateMergedGraph の注記を参照）
+      tolerateStaleBindings: options.tolerateStaleBindings === true
+        && options.event.kind === 'cross_plan_dependency_removed',
     });
     const member = store.members.find(({ descriptor }) => descriptor.plan_key === options.planKey);
     if (!member) fail('STORE_INCONSISTENT', 'plan_not_active');