@fitlab-ai/agent-infra 0.9.13 → 0.9.15

package/lib/task/ledger-intents.ts

@@ -8,6 +8,7 @@ import {
   parseImplementationInputs,
   renderImplementationInputs
 } from './implementation-inputs.ts';
+import { parseArtifactName } from './artifact-name.ts';
 import { LEDGER_COLUMNS, LEDGER_HEADINGS, LEDGER_SECTION_MISSING_CODE, LEDGER_SECTION_MISSING_MESSAGE, nextHdId, parseLedgerDocument, validateLedgerRows } from './ledger.ts';
 import type { LedgerRow, ReviewStage } from './ledger.ts';
 import { resolveTaskRef } from './resolve-ref.ts';
@@ -44,16 +45,6 @@ type LedgerIntentResult = {
 const PREFIX: Record<ReviewStage, string> = { analysis: 'AN', plan: 'PL', code: 'CD' };
 const RESPONSE = new Set<ExecutorResponse>(['accepted', 'adjusted', 'refuted', 'cannot-judge']);
 const DISPOSITION = new Set<ReviewDisposition>(['confirmed', 'closed', 'open', 'needs-human-decision']);
-const REVIEW_ARTIFACT: Record<ReviewStage, RegExp> = {
-  analysis: /^review-analysis(?:-r(?:[2-9]|[1-9]\d+))?\.md$/,
-  plan: /^review-plan(?:-r(?:[2-9]|[1-9]\d+))?\.md$/,
-  code: /^review-code(?:-r(?:[2-9]|[1-9]\d+))?\.md$/
-};
-const ARTIFACT: Record<ReviewStage, RegExp> = {
-  analysis: /^analysis(?:-r(?:[2-9]|[1-9]\d+))?\.md$/,
-  plan: /^plan(?:-r(?:[2-9]|[1-9]\d+))?\.md$/,
-  code: /^code(?:-r(?:[2-9]|[1-9]\d+))?\.md$/
-};
 
 function failed(intent: LedgerIntent, code: string, message: string, taskId: string | null = null, entityId: string | null = null): LedgerIntentResult {
   return { status: 'failed', changed: false, intent: intent.kind, taskId, entityId, before: null, after: null, operations: [], error: { code, message } };
@@ -87,11 +78,6 @@ function nextFindingId(rows: readonly LedgerRow[], stage: ReviewStage): string {
   return `${prefix}-${max + 1}`;
 }
 
-function reviewArtifactRound(reviewArtifact: string): number {
-  const match = /-r([1-9]\d*)\.md$/.exec(reviewArtifact);
-  return match ? Number(match[1]) : 1;
-}
-
 function rowMutation(row: LedgerRow): TaskMutation {
   return {
     kind: 'table-row', action: 'upsert', sectionAliases: LEDGER_HEADINGS,
@@ -100,10 +86,6 @@ function rowMutation(row: LedgerRow): TaskMutation {
   };
 }
 
-function ledgerSectionMutation(content: string): TaskMutation[] {
-  return [];
-}
-
 function implementationInputMutation(content: string, rows: Parameters<typeof renderImplementationInputs>[0]): TaskMutation {
   const english = /^##\s+Activity Log\s*$/m.test(content);
   return {
@@ -147,7 +129,7 @@ function applyLedgerIntent(intent: LedgerIntent, options: TaskWriteOptions = {})
     const finding = rows.find((row) => row.id === intent.findingId);
     if (!finding || finding.severity === 'decision') return failed(intent, 'LEDGER_NOT_FOUND', `finding '${intent.findingId}' was not found`, resolved.taskId, intent.findingId);
     const sourceFromEvidence = finding.evidence.split('#')[0];
-    if (sourceFromEvidence !== intent.sourceArtifact || !REVIEW_ARTIFACT[finding.stage as ReviewStage]?.test(intent.sourceArtifact)) {
+    if (sourceFromEvidence !== intent.sourceArtifact || parseArtifactName(intent.sourceArtifact)?.family !== `review-${finding.stage}`) {
       return failed(intent, 'LEDGER_IDENTITY_CONFLICT', 'rework intent source artifact does not match finding evidence', resolved.taskId, intent.intentId);
     }
     try {
@@ -173,7 +155,8 @@ function applyLedgerIntent(intent: LedgerIntent, options: TaskWriteOptions = {})
   let before: LedgerRow | null = null;
   let after: LedgerRow;
   if (intent.kind === 'finding-upsert') {
-    if (!REVIEW_ARTIFACT[intent.stage]?.test(intent.reviewArtifact) || !Number.isInteger(intent.ordinal) || intent.ordinal < 1 || !['blocker', 'major', 'minor'].includes(intent.severity)) {
+    const identity = parseArtifactName(intent.reviewArtifact);
+    if (identity?.family !== `review-${intent.stage}` || !Number.isInteger(intent.ordinal) || intent.ordinal < 1 || !['blocker', 'major', 'minor'].includes(intent.severity)) {
       return failed(intent, 'LEDGER_PAYLOAD_INVALID', 'finding identity, stage, ordinal, or severity is invalid', resolved.taskId);
     }
     const evidence = normalizedEvidence(intent.evidence);
@@ -191,12 +174,12 @@ function applyLedgerIntent(intent: LedgerIntent, options: TaskWriteOptions = {})
     } else {
       const id = nextFindingId(rows, intent.stage);
       after = {
-        id, stage: intent.stage, round: String(reviewArtifactRound(intent.reviewArtifact)),
+        id, stage: intent.stage, round: String(identity.round),
         severity: intent.severity, status: 'open', evidence, sourceLine: -1
       };
     }
   } else if (intent.kind === 'decision-upsert') {
-    if (!/^HD-[1-9]\d*$/.test(intent.id) || !ARTIFACT[intent.stage]?.test(intent.artifact)) {
+    if (!/^HD-[1-9]\d*$/.test(intent.id) || !['analysis', 'plan', 'code'].includes(intent.stage) || parseArtifactName(intent.artifact)?.family !== intent.stage) {
       return failed(intent, 'LEDGER_PAYLOAD_INVALID', 'decision id, stage, or artifact is invalid', resolved.taskId, intent.id);
     }
     const evidence = `${intent.artifact}#${intent.id}`;
@@ -266,7 +249,7 @@ function applyLedgerIntent(intent: LedgerIntent, options: TaskWriteOptions = {})
 
   const result = writeTask({
     taskRef: intent.taskRef, expectedState: stateOverride ? resolved.state : 'active',
-    mutations: [...ledgerSectionMutation(content), rowMutation(after), ...(implementationMutation ? [implementationMutation] : [])],
+    mutations: [rowMutation(after), ...(implementationMutation ? [implementationMutation] : [])],
     dryRun: 'dryRun' in intent ? intent.dryRun : false
   }, { ...options, taskLocation: { repoRoot: resolved.repoRoot, taskId: resolved.taskId, taskMdPath: resolved.taskMdPath, state: resolved.state } });
   return mapWrite(intent, after.id, before, after, result);

package/lib/task/ledger.ts

@@ -51,9 +51,7 @@ function isReviewStage(stage: string): stage is ReviewStage {
   return stage === 'analysis' || stage === 'plan' || stage === 'code';
 }
 
-// Parse all rows of the disagreement ledger table. Skips the heading, the
-// header row (`| id | ... |`) and the `|---|` separator; ignores non-`|` lines.
-// Rows with fewer than 6 columns are skipped (mirrors the JS gate parser).
+// Parse ledger rows using the shared strict table structure contract.
 function parseLedgerDocument(content: string): LedgerDocument {
   const table = parseTable(content, { sectionAliases: LEDGER_HEADINGS, columns: LEDGER_COLUMNS });
   if (!table) return { present: false, rows: [] };

package/lib/task/lifecycle.ts

@@ -3,7 +3,8 @@ import fs from 'node:fs';
 import path from 'node:path';
 
 import { appendActivityEntry, locateActivityLog } from './activity-log.ts';
-import { artifactFamilyCatalog, inspectArtifactDirectory, parseArtifactName } from './artifact-lifecycle.ts';
+import { artifactFamilyCatalog, inspectArtifactDirectory } from './artifact-lifecycle.ts';
+import { parseArtifactName } from './artifact-name.ts';
 import { parseTypedTaskFrontmatter } from './frontmatter.ts';
 import { locateHotTaskDirs, resolveTaskRef, TASK_ID_RE } from './resolve-ref.ts';
 import {
@@ -337,6 +338,21 @@ function parseJournal(content: string): LifecycleJournal {
   return value as LifecycleJournal;
 }
 
+/** Recovery reads the same journal contract as the lifecycle writer. */
+export function readLifecycleJournalEvidence(repoRoot: string, taskId: string): Readonly<{
+  exists: boolean; completedSteps: readonly string[]; failure: string | null;
+}> {
+  const journalPath = locateHotTaskDirs(repoRoot, taskId)
+    .map((entry) => path.join(entry.taskDir, '.task-lifecycle.json'))
+    .find((candidate) => fs.existsSync(candidate));
+  if (!journalPath) return { exists: false, completedSteps: [], failure: null };
+  try {
+    const journal = parseJournal(fs.readFileSync(journalPath, 'utf8'));
+    if (journal.taskId !== taskId) throw new Error('journal task identity mismatch');
+    return { exists: true, completedSteps: journal.completedSteps, failure: journal.failure?.code ?? null };
+  } catch { return { exists: true, completedSteps: [], failure: 'SANDBOX_CONTROL_LIFECYCLE_JOURNAL_INVALID' }; }
+}
+
 type DirectoryEntry = Readonly<{ relativePath: string; kind: 'file' | 'directory'; size: number; digest: string }>;
 
 function directoryManifest(root: string): DirectoryEntry[] {