@quolu/lattice 0.50.1 → 0.52.0

package/src/seam-proposal-queries.mjs

@@ -5,7 +5,7 @@ import { SENSOR_QUERY_OPERATIONS } from './runtime-contracts.mjs';
 import { collectSensorEvidence, portableSensorOutcome } from './sensor-adapter.mjs';
 import { todoSelfDigest } from './todo-contracts.mjs';
 
-const CONFLICT_KINDS = new Set(['symbol', 'path', 'state', 'effect']);
+const CONFLICT_KINDS = new Set(['symbol', 'path', 'state', 'effect', 'line']);
 const QUERYABLE_KINDS = new Set(['symbol', 'path']);
 const SYMBOL_OPERATIONS = Object.freeze(['query', 'callers', 'callees', 'impact']);
 const SENSOR_OPERATIONS = new Set(SENSOR_QUERY_OPERATIONS);

package/src/todo-cli.mjs

@@ -46,10 +46,12 @@ import {
   createTodoStoreWriter,
   TodoStoreError,
   isPhaselessTodoPlanSchema,
+  projectTodoCrossPlanDependencies,
   TERMINAL_AUDIT_PHASE_ID,
   readTodoIndependenceArtifact,
   readTodoSeamProposalArtifact,
   readTodoStore,
+  resolveTodoStartRetractionBinding,
   readTodoWitnessSet,
   todoWitnessRef,
   writeTodoWitnessSet,
@@ -60,6 +62,7 @@ import {
   verifyEffectivePhaseTodoRevisionSources,
   verifyTodoRevisionSources,
 } from './todo-store.mjs';
+import { withStartRetractionGuard } from './runtime-pull-intake.mjs';
 import {
   appendTodoExtraction,
   compileTodoExtraction,
@@ -94,6 +97,7 @@ import {
   selectIndependenceGuidance,
   selectWitnessScaffoldGuidance,
   selectSeamProposalGuidance,
+  scopeExpansionRecommendations,
 } from './todo-independence-guidance.mjs';
 import {
   buildSeamProposalQuerySet,
@@ -116,6 +120,10 @@ import {
   parseTodoSourceRef, todoLegacyReconciliationDigest, validatePhaseTodoRevision,
   validateTodoRevision, validateTodoRevisionSet,
 } from './todo-revision.mjs';
+import {
+  compileTodoSplit,
+  prepareTodoSplitWitnessMigration,
+} from './todo-split.mjs';
 import {
   appendTodoNote,
   readTodoNoteContext,
@@ -124,6 +132,7 @@ import {
   readTodoPlanNotesForStatus,
 } from './todo-note-store.mjs';
 import { readTodoParallelCandidatesForStatus } from './todo-parallel-candidates.mjs';
+import { commitTodoStoreMutation } from './todo-store-git-transaction.mjs';
 
 const CLI_ERROR_SCHEMA = 'lattice.cli_error.v2';
 const DEFAULT_GANTT_SCOPE = 'live';
@@ -177,7 +186,7 @@ function typedFailure(stderr, error) {
 const TODO_COMMAND_NAMES = Object.freeze([
   'status', 'show', 'note', 'bindings', 'independence', 'seam-profile', 'seam-proposal',
   'verify', 'snapshot', 'gantt', 'dashboard', 'phase', 'migrate', 'start', 'block',
-  'unblock', 'done', 'reopen', 'evidence', 'revise', 'revise-phase', 'revise-set',
+  'unblock', 'done', 'reopen', 'evidence', 'split', 'revise', 'revise-phase', 'revise-set',
 ]);
 
 function typedArgumentFailure(stderr, code, message, detail) {
@@ -186,6 +195,30 @@ function typedArgumentFailure(stderr, code, message, detail) {
   return 2;
 }
 
+function supportsAtomicStoreCommit(argv) {
+  const command = argv[0];
+  if (command === 'note') return argv[1] !== 'list';
+  if (command === 'independence') {
+    return argv[1] === 'mode'
+      || (argv[1] === 'witness' && ['migrate', 'scaffold'].includes(argv[2]));
+  }
+  if (command === 'snapshot') return argv[1] === '--rebuild';
+  if (command === 'migrate') return !argv.includes('--dry-run') && !argv.includes('--schema');
+  if (['revise', 'split', 'revise-set', 'revise-phase', 'start', 'retract', 'block',
+    'unblock', 'done', 'reopen'].includes(command)) return true;
+  if (command === 'evidence') return argv[1] === 'promote';
+  if (command === 'phase') return argv[1] !== 'status';
+  return false;
+}
+
+function atomicStoreCommitUnsupported(stderr, argv) {
+  return typedArgumentFailure(stderr, 'STORE_COMMIT_UNSUPPORTED',
+    'todo_command_does_not_mutate_only_the_store', {
+      command: argv.slice(0, 3),
+      next_action: 'remove_--commit-store_or_use_a_supported_todo_write_command',
+    });
+}
+
 function resolveRepoRoot(cwd) {
   try {
     return execFileSync('git', ['rev-parse', '--show-toplevel'], {
@@ -249,9 +282,13 @@ function taskRef(plan, taskId) {
 }
 
 function mergedTopology(store) {
+  const crossPlanDependencies = projectTodoCrossPlanDependencies(store.members);
   return {
     nodes: store.members.flatMap(({ plan }) => plan.tasks.map(({ task_id: taskId }) => taskRef(plan, taskId))),
-    hard_edges: store.members.flatMap(({ plan }) => plan.hard_dependencies),
+    hard_edges: [
+      ...store.members.flatMap(({ plan }) => plan.hard_dependencies),
+      ...crossPlanDependencies.map(({ from, to }) => ({ from, to })),
+    ],
     joins: store.members.flatMap(({ plan }) => plan.joins),
   };
 }
@@ -609,6 +646,7 @@ async function startAdvisory({ repoRoot, store, projection, planKey, taskId }) {
       coverage: 'missing',
       drift_intersecting: null,
       conflicts_with_active: [],
+      scope_expansion_recommendations: [],
       uncovered_active_task_ids: projection.active_set
         .filter((task) => task.plan_key === planKey).map(({ task_id: id }) => id),
       self_unknowns: [{ kind: 'witness_missing', ref: 'no_independence_record' }],
@@ -652,6 +690,9 @@ async function startAdvisory({ repoRoot, store, projection, planKey, taskId }) {
     drift_intersecting: projected.drift === null
       ? null : projected.drift.intersecting_task_ids.includes(taskId),
     conflicts_with_active: conflictsWithActive,
+    scope_expansion_recommendations: scopeExpansionRecommendations(
+      Array.isArray(artifact.scope_expanded) ? artifact.scope_expanded : [],
+    ).filter(({ task_id: expandedTaskId }) => expandedTaskId === taskId),
     uncovered_active_task_ids: projected.uncovered_active_task_ids,
     self_unknowns: selfUnknowns,
     guidance: selectIndependenceGuidance({
@@ -786,6 +827,23 @@ async function startTask({
     payload: { override_reason: overrideReason }, evidenceRef: null, advisory, noteContext });
 }
 
+async function retractStart({ repoRoot, env, planKey, taskId, reason }) {
+  const actor = mutationActor(env);
+  const store = await readTodoStore({ repoRoot });
+  const binding = resolveTodoStartRetractionBinding(store, { planKey, taskId, actor });
+  return withStartRetractionGuard({
+    repoRoot,
+    planKey,
+    taskId: binding.task_id,
+    activationEventDigest: binding.activation_event_digest,
+    action: () => mutate({
+      repoRoot, env, planKey, taskId: binding.task_id, kind: 'start_retracted',
+      payload: { reason, target_start_digest: binding.activation_event_digest },
+      evidenceRef: null,
+    }),
+  });
+}
+
 function validatePhaseDecisionInput(value, outcome) {
   const keys = outcome === 'accept'
     ? ['schema', 'review_event_digest', 'decision_evidence', 'evidence_slots', 'input_digest']
@@ -864,6 +922,57 @@ async function independenceMode({ repoRoot, env, planKey, mode, reason }) {
   return result;
 }
 
+/** 開発中に発見したplan跨ぎ依存を、consumer planのplan-scoped chainへ接続する。 */
+async function dependencyConnect({
+  repoRoot, env, fromPlanKey, fromTaskId, toPlanKey, toTaskId, reason,
+}) {
+  const store = await readTodoStore({ repoRoot });
+  const dependencyMember = (planKey) => {
+    const member = store.members.find(({ plan }) => plan.plan_key === planKey);
+    if (member === undefined) {
+      throw new TodoStoreError('DEPENDENCY_INVALID', 'dependency_plan_not_found', undefined, {
+        plan_key: planKey,
+      });
+    }
+    return member;
+  };
+  const source = dependencyMember(fromPlanKey);
+  const target = dependencyMember(toPlanKey);
+  if (!source.plan.tasks.some(({ task_id: taskId }) => taskId === fromTaskId)) {
+    throw new TodoStoreError('DEPENDENCY_INVALID', 'dependency_task_not_found', undefined, {
+      plan_key: fromPlanKey, task_id: fromTaskId,
+    });
+  }
+  if (!target.plan.tasks.some(({ task_id: taskId }) => taskId === toTaskId)) {
+    throw new TodoStoreError('DEPENDENCY_INVALID', 'dependency_task_not_found', undefined, {
+      plan_key: toPlanKey, task_id: toTaskId,
+    });
+  }
+  const from = {
+    project_id: store.project_id, plan_key: fromPlanKey, task_id: fromTaskId,
+    expected_topology_digest: source.plan.topology_digest,
+  };
+  const to = {
+    project_id: store.project_id, plan_key: toPlanKey, task_id: toTaskId,
+    expected_topology_digest: target.plan.topology_digest,
+  };
+  const { event } = await appendTodoEvent({
+    repoRoot, writer: createTodoStoreWriter({ caller: 'g5-authoring' }), planKey: toPlanKey,
+    event: {
+      kind: 'cross_plan_dependency', actor: mutationActor(env), payload: { from, to, reason },
+    },
+  });
+  const result = {
+    schema: 'lattice.todo_dependency_connect_result.v1', project_id: store.project_id,
+    from: event.payload.from, to: event.payload.to, reason: event.payload.reason,
+    connected_by: event.actor, connected_at: event.recorded_at,
+    event_digest: event.event_digest, plan_scoped_head_digest: event.event_digest,
+    result_digest: '',
+  };
+  result.result_digest = todoSelfDigest(result, 'result_digest');
+  return result;
+}
+
 async function phaseStatus({ repoRoot, planKey }) {
   const store = await readTodoStore({ repoRoot });
   const [member] = selectMembers(store, planKey);
@@ -1322,6 +1431,69 @@ async function revisePhase({ repoRoot, env, planKey, inputRef }) {
     revision, actor: mutationActor(env), recordedAt: new Date().toISOString() });
 }
 
+async function splitTodo({ repoRoot, env, planKey, inputRef }) {
+  const proposal = await readMigrationInput(repoRoot, inputRef, { requireValid: false });
+  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 witnessSet = await readTodoWitnessSet({ repoRoot, planKey });
+  if (witnessSet === null) {
+    throw new TodoStoreError('WITNESS_MIGRATION_UNAVAILABLE', 'witness_set_absent', undefined, {
+      witness_ref: todoWitnessRef(planKey),
+      next_action: `lattice todo independence witness scaffold --plan ${planKey} --input <draft>`,
+    });
+  }
+  const compiled = await compileTodoSplit({ repoRoot, member, proposal });
+  const actor = mutationActor(env);
+  const recordedAt = new Date().toISOString();
+  // splitのmigrationは既存taskへのidentity写像だけである。宣言を純粋に移行・検査し、
+  // 同じcanonical bytesをwitness先へ書けることまでapply前に確定する。これにより、
+  // witness失敗をrevision適用後に返してplan/sourceだけ進んだ状態を作らない。
+  const preparedWitness = prepareTodoSplitWitnessMigration({
+    witnessSet, revision: compiled.revision,
+  });
+  const { ref: witnessRef } = await writeTodoWitnessSet({
+    repoRoot, witnessSet: preparedWitness.witnessSet,
+  });
+  const witnessMigration = {
+    schema: 'lattice.todo_witness_migrate_result.v1',
+    project_id: store.project_id,
+    plan_key: planKey,
+    plan_version: compiled.revision.desired_plan.plan_version,
+    witness_ref: witnessRef,
+    migrated_count: preparedWitness.migrated_count,
+    removed_count: preparedWitness.removed_count,
+    unchanged_count: preparedWitness.unchanged_count,
+    witness_set_digest: preparedWitness.witnessSet.witness_set_digest,
+    result_digest: '',
+  };
+  witnessMigration.result_digest = todoSelfDigest(witnessMigration, 'result_digest');
+  const receipt = compiled.revision.schema === 'lattice.phase_todo_revision.v3'
+    ? await applyPhaseTodoRevision({
+      repoRoot, writer: createTodoStoreWriter({ caller: 'g5-authoring' }),
+      revision: compiled.revision, actor, recordedAt,
+    })
+    : await applyTodoRevision({
+      repoRoot, writer: createTodoStoreWriter({ caller: 'g5-authoring' }),
+      revision: compiled.revision, actor, recordedAt,
+    });
+  const result = {
+    schema: 'lattice.todo_split_result.v1',
+    project_id: store.project_id,
+    plan_key: planKey,
+    predecessor_task_id: proposal.task_id,
+    residual_task_id: proposal.task_id,
+    extracted_task_ids: compiled.extracted_task_ids,
+    plan_version: compiled.revision.desired_plan.plan_version,
+    revision_digest: compiled.revision.revision_digest,
+    revision_receipt_digest: receipt.receipt_digest ?? receipt.result_digest,
+    witness_migration_result_digest: witnessMigration.result_digest,
+    result_digest: '',
+  };
+  result.result_digest = todoSelfDigest(result, 'result_digest');
+  return result;
+}
+
 async function status({ repoRoot }) {
   const store = await readTodoStore({ repoRoot });
   return projectTodoStatus(store, {
@@ -1530,17 +1702,23 @@ async function independenceCompile({ repoRoot, planKey, inputRef }) {
   const member = store.members.find(({ descriptor }) => descriptor.plan_key === planKey);
   if (!member) throw new TodoStoreError('STORE_INCONSISTENT', 'plan_not_active', undefined, { plan_key: planKey });
 
+  // 前回artifactを渡して膨張の履歴を継ぐ。**例外を握り潰さない。**
+  // `readTodoIndependenceArtifact` は「欠落だけnull・旧版はlegacy marker・壊れた記録は
+  // INDEPENDENCE_ARTIFACT_INVALIDでtyped fail」を既に区別している。ここでcatchすると
+  // **corrupt/permission/I-Oまで「初回」へ化けて履歴が黙って切れる**（suzune の監査で実測・room [1148]）。
+  const previousArtifact = await readTodoIndependenceArtifact({ repoRoot, store, planKey });
   const artifact = compileTodoIndependence({
     witnessSet,
     plan: member.plan,
     baseSha,
     compiledAt: new Date().toISOString(),
     sensorEvidence: await collectWitnessSensorEvidence({ cwd: repoRoot, witnessSet }),
+    previousArtifact,
   });
   const { ref } = await writeTodoIndependenceArtifact({ repoRoot, artifact });
 
   const result = {
-    schema: 'lattice.todo_independence_compile_result.v1',
+    schema: 'lattice.todo_independence_compile_result.v2',
     project_id: artifact.project_id,
     plan_key: artifact.plan_key,
     plan_version: artifact.plan_version,
@@ -1550,6 +1728,7 @@ async function independenceCompile({ repoRoot, planKey, inputRef }) {
     task_count: artifact.task_ids.length,
     conflict_count: artifact.conflicts.length,
     unknown_count: artifact.unknowns.length,
+    scope_expansion_recommendations: scopeExpansionRecommendations(artifact.scope_expanded),
     result_digest: '',
   };
   result.result_digest = todoSelfDigest(result, 'result_digest');
@@ -2218,7 +2397,35 @@ async function independenceForGantt({ repoRoot, store }) {
   const projections = [];
   for (const member of store.members) {
     const planKey = member.plan.plan_key;
-    const artifact = await readTodoIndependenceArtifact({ repoRoot, store, planKey });
+    let artifact = null;
+    let unreadableReason = null;
+    try {
+      artifact = await readTodoIndependenceArtifact({ repoRoot, store, planKey });
+    } catch (error) {
+      if (!(error instanceof TodoStoreError)) throw error;
+      unreadableReason = `${error.code}:${error.detail?.reason ?? error.message}`;
+    }
+    if (unreadableReason !== null) {
+      if (currentBaseSha === null) currentBaseSha = currentHeadSha(repoRoot);
+      const projected = projectIndependenceFrontier({
+        artifact: null,
+        readyTaskIds: frontier.filter((task) => task.plan_key === planKey)
+          .map(({ task_id: taskId }) => taskId),
+        activeTaskIds: status.active_set.filter((task) => task.plan_key === planKey)
+          .map(({ task_id: taskId }) => taskId),
+        plan: member.plan,
+        currentBaseSha,
+        changedPaths: null,
+      });
+      projections.push({
+        project_id: member.plan.project_id,
+        plan_key: planKey,
+        coverage: 'unreadable',
+        unreadable_reason: unreadableReason,
+        frontier: projected.frontier,
+      });
+      continue;
+    }
     if (artifact === null) continue;
     // 記録があるplanが1つでもあれば鮮度の判定にHEADが要る。
     if (currentBaseSha === null) currentBaseSha = currentHeadSha(repoRoot);
@@ -2238,6 +2445,7 @@ async function independenceForGantt({ repoRoot, store }) {
       project_id: member.plan.project_id,
       plan_key: planKey,
       coverage: projected.coverage,
+      unreadable_reason: null,
       frontier: projected.frontier,
     });
   }
@@ -2253,12 +2461,29 @@ async function seamProposalsForGantt({ repoRoot, store }) {
   const projections = [];
   for (const member of store.members) {
     const planKey = member.plan.plan_key;
-    const artifact = await readTodoSeamProposalArtifact({ repoRoot, store, planKey });
+    let artifact = null;
+    try {
+      artifact = await readTodoSeamProposalArtifact({ repoRoot, store, planKey });
+    } catch (error) {
+      if (!(error instanceof TodoStoreError)) throw error;
+      projections.push({
+        project_id: member.plan.project_id,
+        plan_key: planKey,
+        coverage: 'superseded',
+        unreadable_reason: `${error.code}:${error.detail?.reason ?? error.message}`,
+        guidance: selectSeamProposalGuidance({ coverage: 'superseded' }),
+        component_count: null,
+        conflict_resource_count: null,
+        components: [],
+      });
+      continue;
+    }
     if (artifact === null) {
       projections.push({
         project_id: member.plan.project_id,
         plan_key: planKey,
         coverage: 'missing',
+        unreadable_reason: null,
         guidance: selectSeamProposalGuidance({ coverage: 'missing' }),
         component_count: null,
         conflict_resource_count: null,
@@ -2268,7 +2493,14 @@ async function seamProposalsForGantt({ repoRoot, store }) {
     }
 
     if (currentBaseSha === null) currentBaseSha = currentHeadSha(repoRoot);
-    const independenceArtifact = await readTodoIndependenceArtifact({ repoRoot, store, planKey });
+    let independenceArtifact = null;
+    let unreadableReason = null;
+    try {
+      independenceArtifact = await readTodoIndependenceArtifact({ repoRoot, store, planKey });
+    } catch (error) {
+      if (!(error instanceof TodoStoreError)) throw error;
+      unreadableReason = `${error.code}:${error.detail?.reason ?? error.message}`;
+    }
     const binding = artifact.source_binding;
     const independenceMatches = independenceArtifact !== null
       && validateTodoIndependence(independenceArtifact)
@@ -2287,6 +2519,7 @@ async function seamProposalsForGantt({ repoRoot, store }) {
       project_id: member.plan.project_id,
       plan_key: planKey,
       coverage,
+      unreadable_reason: unreadableReason,
       guidance: selectSeamProposalGuidance({ coverage }),
       component_count: components.length,
       conflict_resource_count: components
@@ -2538,6 +2771,13 @@ export async function runTodoCli({ argv, cwd, stdout, stderr, env = process.env
     throw new TypeError('runTodoCli optionsが不正');
   }
 
+  const atomicCommit = argv.at(-1) === '--commit-store';
+  if (atomicCommit) argv = argv.slice(0, -1);
+  if (atomicCommit && ((argv[1] === '--schema' && argv[2] === '--json')
+    || (argv[0] === 'dashboard' && argv[1] === 'remove'))) {
+    return atomicStoreCommitUnsupported(stderr, argv);
+  }
+
   if (argv[0] === 'migrate' && argv[1] === '--input'
     && typeof argv[2] === 'string' && path.isAbsolute(argv[2])) {
     return typedArgumentFailure(stderr, 'INPUT_OUTSIDE_REPOSITORY', 'absolute_input_path_rejected', {
@@ -2645,6 +2885,16 @@ export async function runTodoCli({ argv, cwd, stdout, stderr, env = process.env
     action = (repoRoot) => independenceMode({
       repoRoot, env, planKey: argv[3], mode: argv[5], reason: argv[7],
     });
+  } else if (argv.length === 12 && argv[0] === 'dependency' && argv[1] === 'connect'
+    && argv[2] === '--from-plan' && isTodoIdentifier(argv[3])
+    && argv[4] === '--from-task' && isTodoIdentifier(argv[5])
+    && argv[6] === '--to-plan' && isTodoIdentifier(argv[7])
+    && argv[8] === '--to-task' && isTodoIdentifier(argv[9])
+    && argv[10] === '--reason' && argv[11].length > 0) {
+    action = (repoRoot) => dependencyConnect({
+      repoRoot, env, fromPlanKey: argv[3], fromTaskId: argv[5],
+      toPlanKey: argv[7], toTaskId: argv[9], reason: argv[11],
+    });
   } else if (argv.length === 6 && argv[0] === 'independence' && argv[1] === 'compile'
     && argv[2] === '--plan' && isTodoIdentifier(argv[3]) && argv[4] === '--input') {
     action = (repoRoot) => independenceCompile({
@@ -2731,6 +2981,10 @@ export async function runTodoCli({ argv, cwd, stdout, stderr, env = process.env
     && argv[1] === '--plan' && isTodoIdentifier(argv[2])
     && argv[3] === '--input' && isTodoRef(argv[4])) {
     action = (repoRoot) => revise({ repoRoot, env, planKey: argv[2], inputRef: argv[4] });
+  } else if (argv.length === 5 && argv[0] === 'split'
+    && argv[1] === '--plan' && isTodoIdentifier(argv[2])
+    && argv[3] === '--input' && isTodoRef(argv[4])) {
+    action = (repoRoot) => splitTodo({ repoRoot, env, planKey: argv[2], inputRef: argv[4] });
   } else if (argv.length === 3 && argv[0] === 'revise-set'
     && argv[1] === '--input' && isTodoRef(argv[2])) {
     action = (repoRoot) => reviseSet({ repoRoot, env, inputRef: argv[2] });
@@ -2784,6 +3038,13 @@ export async function runTodoCli({ argv, cwd, stdout, stderr, env = process.env
     action = (repoRoot) => startTask({ repoRoot, env, planKey: argv[2], taskId: argv[4],
       overrideReason, parallelFrontier: argv.length === 6,
       serialConfirmed: argv.length === 8 });
+  } else if (argv.length === 7 && argv[0] === 'retract'
+    && argv[1] === '--plan' && isTodoIdentifier(argv[2])
+    && argv[3] === '--task' && isTodoIdentifier(argv[4])
+    && argv[5] === '--reason' && argv[6].length > 0) {
+    action = (repoRoot) => retractStart({
+      repoRoot, env, planKey: argv[2], taskId: argv[4], reason: argv[6],
+    });
   } else if (argv.length === 7 && argv[0] === 'block'
     && argv[1] === '--plan' && isTodoIdentifier(argv[2])
     && argv[3] === '--task' && isTodoIdentifier(argv[4])
@@ -2831,6 +3092,9 @@ export async function runTodoCli({ argv, cwd, stdout, stderr, env = process.env
       command, next_action: argumentHelp,
     });
   }
+  if (atomicCommit && !supportsAtomicStoreCommit(argv)) {
+    return atomicStoreCommitUnsupported(stderr, argv);
+  }
 
   try {
     const repoRoot = resolveRepoRoot(cwd);
@@ -2840,7 +3104,9 @@ export async function runTodoCli({ argv, cwd, stdout, stderr, env = process.env
     if (!ganttCommand && !dashboardAdopt && !migrationDryRun) {
       await ensureActiveProjectDashboard({ repoRoot, env });
     }
-    const result = await action(repoRoot);
+    const result = atomicCommit
+      ? await commitTodoStoreMutation({ repoRoot, argv, action, env })
+      : await action(repoRoot);
     if (result !== null) stdout.write(`${JSON.stringify(result)}\n`);
     return 0;
   } catch (error) {

package/src/todo-contracts.mjs

@@ -2,7 +2,7 @@ import { createHash } from 'node:crypto';
 import { isCanonicalUtcTimestamp } from './timestamp-contract.mjs';
 
 export const TODO_EVENT_KINDS = Object.freeze([
-  'plan_genesis', 'start', 'block', 'unblock', 'done', 'reopen',
+  'plan_genesis', 'start', 'start_retracted', 'block', 'unblock', 'done', 'reopen',
   'phase_review', 'phase_accept', 'phase_reject', 'phase_reopen',
   // ADR 0148: 監査していない歴史を「監査なしで閉じた」として明示的に閉じるための専用kind。
   // phase_review/accept/reject/reopenと同じv3 tail event shape(phase_id持ち)に収め、
@@ -13,10 +13,15 @@ export const TODO_EVENT_KINDS = Object.freeze([
   // 「誰が選んだか」の帰属を持つ——witnessが全planの暗黙義務だった時に帰属が無く、正確な
   // 案内が素通りされたことへの是正である(オーナー裁定C①)。
   'coordination_mode',
+  // 開発中に発見したplan跨ぎの依存を、active plan topologyの追記改変ではなく
+  // version-boundなplan-scoped eventとして接続する。推定はせず、AIが発見した時だけ積む。
+  'cross_plan_dependency',
 ]);
 
 /** planへ帰属し、taskにもPhaseにも属さないevent kind。 */
-export const TODO_PLAN_SCOPED_EVENT_KINDS = Object.freeze(['coordination_mode']);
+export const TODO_PLAN_SCOPED_EVENT_KINDS = Object.freeze([
+  'coordination_mode', 'cross_plan_dependency',
+]);
 
 /** 調整方式。witness=独立性を宣言し検証して並列する／conversation=会話で調整する。 */
 export const TODO_COORDINATION_MODES = Object.freeze(['witness', 'conversation']);
@@ -506,7 +511,19 @@ function validPayload(event) {
       && TODO_COORDINATION_MODES.includes(payload.mode)
       && nullableText(payload.reason) && payload.reason !== null;
   }
+  if (event.kind === 'cross_plan_dependency') {
+    const dependencyRef = (value) => exactRecord(value, [
+      'project_id', 'plan_key', 'task_id', 'expected_topology_digest',
+    ]) && isTodoIdentifier(value.project_id) && isTodoIdentifier(value.plan_key)
+      && isTodoIdentifier(value.task_id) && isTodoDigest(value.expected_topology_digest);
+    return exactRecord(payload, ['from', 'to', 'reason'])
+      && dependencyRef(payload.from) && dependencyRef(payload.to)
+      && 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
+    && isTodoDigest(payload.target_start_digest);
   if (event.kind === 'block') return exactRecord(payload, ['reason']) && nullableText(payload.reason) && payload.reason !== null;
   if (event.kind === 'unblock') return exactRecord(payload, []);
   if (event.kind === 'done' && payload?.done_mode === 'authored') {

package/src/todo-gantt-html-independence.mjs

@@ -139,7 +139,8 @@ export function renderRightPane(
 ) {
   const lookup = presentationLookup(presentation);
   const sectionByKey = new Map(sections.map((section) => [refKey(section.ref), section]));
-  const nodeByKey = new Map(layout.nodes.map((node) => [refKey(node.ref), node]));
+  const semanticNodes = [...layout.nodes, ...(layout.hierarchy_nodes ?? [])];
+  const nodeByKey = new Map(semanticNodes.map((node) => [refKey(node.ref), node]));
   const folds = foldIndex(layout);
   const incoming = new Map(sections.map((section) => [refKey(section.ref), []]));
   const outgoing = new Map(sections.map((section) => [refKey(section.ref), []]));
@@ -163,7 +164,7 @@ export function renderRightPane(
   const counts = { pending: 0, 'in-progress': 0, blocked: 0, done: 0 };
   for (const section of sections) counts[section.state.status] += 1;
   const active = sections.filter((section) => section.state.status === 'in-progress');
-  const ready = layout.nodes.filter((node) => node.visibility.next_ready);
+  const ready = semanticNodes.filter((node) => node.visibility.next_ready);
   const independenceSummary = summarizeIndependence(layout);
   const readyHeadline = ready.length > 1
     ? `<p class="readiness-note"><strong>同時dispatch推奨:</strong> ${ready.length}工程。${escapeHtmlText(dispatchBasis(independenceSummary))}</p>`

package/src/todo-gantt-html-shared.mjs

@@ -90,8 +90,7 @@ export function presentationLookup(presentation) {
 }
 
 export function taskReference(section, lookup) {
-  const number = lookup.taskNumbers.get(refKey(section.ref));
-  return number === undefined ? `ID ${section.task.task_id}` : `工程 ${number.display_number}`;
+  return `工程 ${section.task.task_id}`;
 }
 
 export function renderRelationList(relations, sectionByKey, lookup, emptyText, folds = new Set()) {

package/src/todo-gantt-html-style.mjs

@@ -116,3 +116,16 @@ button.fold-chip[aria-expanded="true"]{border-color:var(--text-primary)}
 .lane-dimmed{opacity:.35}
 @media(max-width:900px){body{display:block;height:auto}.shell{display:block}.pane-divider{display:none}.gantt-pane,.narrative-pane{height:70vh}.gantt-pane{border-bottom:1px solid var(--border)}}
 `;
+
+// 階層を持つplanだけが読み込む。親無しplanのHTML/CSS bytesを変えないため、基底CSSへは混ぜない。
+export const NESTED_CSS = `
+.nested-task-panel{filter:drop-shadow(0 4px 12px rgba(11,11,11,.18))}
+.nested-task-surface{fill:var(--surface-1);stroke:var(--text-secondary);stroke-width:1.5}
+.nested-task-label{fill:var(--text-primary);font-size:12px;font-weight:650}
+.nested-task-link{fill:none;stroke:var(--text-secondary);stroke-width:1.5;stroke-dasharray:4 3}
+.nested-task-diagram{outline:1px solid var(--border);background:var(--surface-1)}
+.nested-task-toggle{cursor:pointer}
+.nested-task-toggle rect{fill:var(--surface-1);stroke:var(--text-secondary);stroke-width:1.5}
+.nested-task-toggle text{fill:var(--text-primary);font-size:14px;font-weight:650}
+.nested-task-toggle:focus rect{stroke:var(--text-primary);stroke-width:2.5}
+`;

package/src/todo-gantt-html.mjs

@@ -5,7 +5,7 @@ import { serializeJsonForScript } from './todo-markdown-renderer.mjs';
 import { renderTodoGanttSvg, TODO_GANTT_STATUS_PRESENTATION } from './todo-gantt-svg.mjs';
 import { renderDiagramLegend, renderRightPane } from './todo-gantt-html-independence.mjs';
 import { escapeHtmlAttribute, escapeHtmlText, refKey } from './todo-gantt-html-shared.mjs';
-import { CSS } from './todo-gantt-html-style.mjs';
+import { CSS, NESTED_CSS } from './todo-gantt-html-style.mjs';
 
 export const TODO_GANTT_RENDERER_VERSION = 'lattice.todo_gantt_renderer.v19';
 export const TODO_GANTT_PROSE_MAX_BYTES = 8 * 1024 * 1024;
@@ -188,6 +188,18 @@ const CONTROLLER = `
 })();
 `;
 
+const NESTED_CONTROLLER = `
+(()=>{
+  const root=document.querySelector('[data-gantt-root]');if(!root)return;
+  const toggles=[...root.querySelectorAll('[data-nested-toggle-for]')];
+  const panels=[...root.querySelectorAll('[data-nested-panel-for]')];
+  const panelFor=(key)=>panels.find(panel=>panel.dataset.nestedPanelFor===key);
+  const toggle=(control)=>{const key=control.dataset.nestedToggleFor;const panel=panelFor(key);if(!panel)return;const open=panel.hasAttribute('hidden');panel.toggleAttribute('hidden',!open);const link=[...root.querySelectorAll('[data-nested-link-for]')].find(candidate=>candidate.dataset.nestedLinkFor===key);link?.toggleAttribute('hidden',!open);control.setAttribute('aria-expanded',String(open));const mark=control.querySelector('text');if(mark)mark.textContent=open?'−':'＋';};
+  root.addEventListener('click',event=>{const control=event.target.closest('[data-nested-toggle-for]');if(!control||!root.contains(control))return;event.preventDefault();event.stopPropagation();toggle(control);});
+  root.addEventListener('keydown',event=>{const control=event.target.closest('[data-nested-toggle-for]');if(!control||!root.contains(control)||(event.key!=='Enter'&&event.key!==' '))return;event.preventDefault();event.stopPropagation();toggle(control);});
+})();
+`;
+
 export function renderTodoGanttHtml({
   readModel, layout, narratives = [], anchorOutcomes = [], presentation = null, metadata = {},
   expandedLayout = null, noteContexts = null, noteWarnings = [],
@@ -208,6 +220,7 @@ export function renderTodoGanttHtml({
   }
   const normalized = normalizeSections(readModel, narratives, anchorOutcomes, noteContexts);
   const displayName = projectDisplayName(readModel, metadata);
+  const hasHierarchy = layout?.hierarchy?.schema === 'lattice.todo_gantt_hierarchy.v1';
   const svg = renderTodoGanttSvg(layout, { presentation });
   // The expanded diagram travels with the page so the badge can bring the
   // history back without a round trip. A file:// artifact has nowhere to ask.
@@ -224,7 +237,7 @@ export function renderTodoGanttHtml({
     metadata,
     presentation,
   });
-  const html = `<!doctype html><html lang="ja"><head><meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'unsafe-inline'; style-src 'unsafe-inline'"><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Lattice — ${escapeHtmlText(displayName)} 依存工程図</title><style>${CSS}</style></head><body data-gantt-root data-view-state="overview"><main class="shell"><section class="gantt-pane" aria-label="${escapeHtmlAttribute(displayName)} 依存工程図"><div class="diagram-toolbar" role="group" aria-label="図のズーム"><strong class="project-heading">${escapeHtmlText(displayName)} 依存工程図</strong>${renderAuditPendingChip(readModel)}<button type="button" data-zoom-action="out" aria-label="縮小">−</button><button type="button" data-zoom-action="reset">等倍</button><button type="button" data-zoom-action="in" aria-label="拡大">＋</button><button type="button" data-zoom-action="fit">全体表示</button><output class="zoom-readout" data-zoom-output aria-live="polite">100%</output><span class="diagram-note">縦=依存段階（時間ではない）</span></div>${renderDiagramLegend(presentation, layout, expandedSvg !== '')}<div class="diagram-scroll" data-diagram-scroll tabindex="0" aria-label="縦方向を主にスクロール可能な依存工程図">${diagrams}</div></section><div class="pane-divider" data-pane-divider aria-hidden="true"></div><aside class="narrative-pane" aria-label="選択工程の詳細と全工程一覧">${rightPane}</aside></main><script type="application/json" id="todo-gantt-data">${staticData}</script><script>${CONTROLLER}</script></body></html>`;
+  const html = `<!doctype html><html lang="ja"><head><meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'unsafe-inline'; style-src 'unsafe-inline'"><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Lattice — ${escapeHtmlText(displayName)} 依存工程図</title><style>${CSS}${hasHierarchy ? NESTED_CSS : ''}</style></head><body data-gantt-root data-view-state="overview"><main class="shell"><section class="gantt-pane" aria-label="${escapeHtmlAttribute(displayName)} 依存工程図"><div class="diagram-toolbar" role="group" aria-label="図のズーム"><strong class="project-heading">${escapeHtmlText(displayName)} 依存工程図</strong>${renderAuditPendingChip(readModel)}<button type="button" data-zoom-action="out" aria-label="縮小">−</button><button type="button" data-zoom-action="reset">等倍</button><button type="button" data-zoom-action="in" aria-label="拡大">＋</button><button type="button" data-zoom-action="fit">全体表示</button><output class="zoom-readout" data-zoom-output aria-live="polite">100%</output><span class="diagram-note">縦=依存段階（時間ではない）</span></div>${renderDiagramLegend(presentation, layout, expandedSvg !== '')}<div class="diagram-scroll" data-diagram-scroll tabindex="0" aria-label="縦方向を主にスクロール可能な依存工程図">${diagrams}</div></section><div class="pane-divider" data-pane-divider aria-hidden="true"></div><aside class="narrative-pane" aria-label="選択工程の詳細と全工程一覧">${rightPane}</aside></main><script type="application/json" id="todo-gantt-data">${staticData}</script><script>${CONTROLLER}${hasHierarchy ? NESTED_CONTROLLER : ''}</script></body></html>`;
   const htmlBytes = Buffer.byteLength(html, 'utf8');
   if (htmlBytes > TODO_GANTT_HTML_MAX_BYTES) {
     throw new TodoGanttRenderError('TODO_SCALE_EXCEEDED', 'todo gantt HTML limit exceeded', {