@fitlab-ai/agent-infra 0.9.10 → 0.9.12

package/lib/task/create.ts

@@ -2,8 +2,11 @@ import { createHash, randomUUID } from 'node:crypto';
 import fs from 'node:fs';
 import path from 'node:path';
 
+import { isValidAgentInfraVersion, VERSION } from '../version.ts';
 import { loadShortIdByTaskId, mutateShortIdRegistry } from './short-id.ts';
 import { TaskExecutionLockError, withTaskExecutionLock } from './task-execution-lock.ts';
+import { readDeliveryDefaults, validateBaseRef, validateRemote } from './delivery-target.ts';
+import { buildUnboundFact, encodePrDeliveryFact } from './pr-delivery-fact.ts';
 
 const AGENTS = ['claude', 'codex', 'antigravity', 'opencode', 'cursor'] as const;
 const TYPES = ['feature', 'bugfix', 'refactor', 'docs', 'chore'] as const;
@@ -29,6 +32,8 @@ type TaskCreateCandidateV1 = Readonly<{
   priority: TaskPriority;
   effort: TaskEffort;
   description: string;
+  deliveryRemote?: string;
+  deliveryBaseRef?: string;
   taskInput: Readonly<Record<typeof TASK_INPUT_KEYS[number], readonly string[]>>;
 }>;
 
@@ -48,12 +53,14 @@ function payloadError(message: string): never {
   throw new Error(`TASK_CREATE_PAYLOAD_INVALID: ${message}`);
 }
 
-function exactKeys(value: Record<string, unknown>, expected: readonly string[], label: string): void {
+function exactKeys(value: Record<string, unknown>, expected: readonly string[], label: string, optional: readonly string[] = []): void {
   const actual = Object.keys(value).sort();
   const wanted = [...expected].sort();
-  if (actual.length !== wanted.length || actual.some((key, index) => key !== wanted[index])) {
+  const allowed = new Set([...expected, ...optional]);
+  if (actual.some((key) => !allowed.has(key))) {
     payloadError(`${label} has unknown or missing fields`);
   }
+  if (expected.some((key) => !actual.includes(key))) payloadError(`${label} has unknown or missing fields`);
 }
 
 function cleanString(value: unknown, label: string, maxBytes: number, oneLine = false): string {
@@ -77,7 +84,7 @@ function validateTaskCreateCandidate(value: unknown): TaskCreateCandidateV1 {
   exactKeys(candidate, [
     'version', 'idempotencyKey', 'agent', 'title', 'type', 'branchSlug',
     'priority', 'effort', 'description', 'taskInput'
-  ], 'candidate');
+  ], 'candidate', ['deliveryRemote', 'deliveryBaseRef']);
   if (candidate.version !== 1) payloadError('version must be 1');
   const idempotencyKey = cleanString(candidate.idempotencyKey, 'idempotencyKey', 64, true);
   if (!/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(idempotencyKey)) {
@@ -90,6 +97,14 @@ function validateTaskCreateCandidate(value: unknown): TaskCreateCandidateV1 {
     payloadError('branchSlug must be lowercase ASCII kebab-case with length 3-64');
   }
   const description = cleanString(candidate.description, 'description', 8 * 1024);
+  const deliveryRemote = candidate.deliveryRemote === undefined
+    ? undefined
+    : cleanString(candidate.deliveryRemote, 'deliveryRemote', 200, true);
+  const deliveryBaseRef = candidate.deliveryBaseRef === undefined
+    ? undefined
+    : cleanString(candidate.deliveryBaseRef, 'deliveryBaseRef', 200, true);
+  if (deliveryRemote !== undefined && !validateRemote(deliveryRemote)) payloadError('deliveryRemote is invalid');
+  if (deliveryBaseRef !== undefined && !validateBaseRef(deliveryBaseRef)) payloadError('deliveryBaseRef is invalid');
   if (!candidate.taskInput || typeof candidate.taskInput !== 'object' || Array.isArray(candidate.taskInput)) {
     payloadError('taskInput must be an object');
   }
@@ -110,6 +125,8 @@ function validateTaskCreateCandidate(value: unknown): TaskCreateCandidateV1 {
     priority: enumValue(candidate.priority, PRIORITIES, 'priority'),
     effort: enumValue(candidate.effort, EFFORTS, 'effort'),
     description,
+    ...(deliveryRemote === undefined ? {} : { deliveryRemote }),
+    ...(deliveryBaseRef === undefined ? {} : { deliveryBaseRef }),
     taskInput
   };
 }
@@ -126,6 +143,8 @@ function canonicalTaskCreateCandidate(candidate: TaskCreateCandidateV1): string
     priority: valid.priority,
     effort: valid.effort,
     description: valid.description,
+    deliveryRemote: valid.deliveryRemote ?? null,
+    deliveryBaseRef: valid.deliveryBaseRef ?? null,
     taskInput: Object.fromEntries(TASK_INPUT_KEYS.map((key) => [key, valid.taskInput[key]]))
   });
 }
@@ -169,6 +188,7 @@ function renderTask(params: Readonly<{
   candidate: TaskCreateCandidateV1;
   taskId: string;
   project: string;
+  delivery: { remote: string; baseRef: string };
   timestamp: string;
   agentInfraVersion: string;
   keyDigest: string;
@@ -193,7 +213,11 @@ function renderTask(params: Readonly<{
     'target_date:',
     'current_step: requirement-analysis',
     `assigned_to: ${candidate.agent}`,
-    'pr_status: pending',
+    `pr_delivery_fact: ${JSON.stringify(encodePrDeliveryFact(buildUnboundFact()))}`,
+    `delivery_remote: ${candidate.deliveryRemote ?? params.delivery.remote}`,
+    `delivery_base_ref: ${candidate.deliveryBaseRef ?? params.delivery.baseRef}`,
+    'checkpoint_commit:',
+    'delivery_remote_head:',
     `task_create_key_digest: ${params.keyDigest}`,
     `task_create_candidate_digest: ${params.candidateDigest}`,
     '---'
@@ -218,12 +242,14 @@ function renderTask(params: Readonly<{
   return `${content.trimEnd()}\n`;
 }
 
-function readProject(repoRoot: string): string {
-  const config = JSON.parse(fs.readFileSync(path.join(repoRoot, '.agents', '.airc.json'), 'utf8')) as { project?: unknown };
+function readProject(repoRoot: string): { project: string; delivery: { remote: string; baseRef: string } } {
+  const config = JSON.parse(fs.readFileSync(path.join(repoRoot, '.agents', '.airc.json'), 'utf8')) as { project?: unknown; delivery?: { remote?: unknown; baseRef?: unknown } };
   if (typeof config.project !== 'string' || !/^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(config.project)) {
     throw new Error('TASK_CREATE_CONFIG_INVALID: project is missing or invalid');
   }
-  return config.project;
+  const delivery = readDeliveryDefaults(repoRoot);
+  if (!delivery.ok) throw new Error(`TASK_CREATE_CONFIG_INVALID: ${delivery.message}`);
+  return { project: config.project, delivery: delivery.value };
 }
 
 function assertRealDirectory(directory: string, code: string): void {
@@ -294,13 +320,17 @@ function recoverPublishedTask(activeRoot: string, repoRoot: string, keyDigest: s
 
 function createLocalTask(value: unknown, options: LocalTaskCreateOptions): LocalTaskCreateResult {
   const candidate = validateTaskCreateCandidate(value);
+  const agentInfraVersion = options.agentInfraVersion ?? VERSION;
+  if (!isValidAgentInfraVersion(agentInfraVersion)) {
+    throw new Error('TASK_CREATE_VERSION_INVALID: agentInfraVersion must be a valid v-prefixed semver');
+  }
   const repoRoot = fs.realpathSync.native(options.repoRoot);
   const workspaceRoot = path.join(repoRoot, '.agents', 'workspace');
   const activeRoot = path.join(workspaceRoot, 'active');
   ensureRealDirectory(path.join(repoRoot, '.agents'), 'TASK_CREATE_WORKSPACE_INVALID');
   ensureRealDirectory(workspaceRoot, 'TASK_CREATE_WORKSPACE_INVALID');
   ensureRealDirectory(activeRoot, 'TASK_CREATE_WORKSPACE_INVALID');
-  const project = readProject(repoRoot);
+  const projectConfig = readProject(repoRoot);
   const canonical = canonicalTaskCreateCandidate(candidate);
   const candidateDigest = sha256(canonical);
   const keyDigest = sha256(candidate.idempotencyKey);
@@ -341,8 +371,8 @@ function createLocalTask(value: unknown, options: LocalTaskCreateOptions): Local
     const templateStat = fs.lstatSync(templatePath);
     if (!templateStat.isFile() || templateStat.isSymbolicLink()) throw new Error('TASK_CREATE_TEMPLATE_INVALID');
     const rendered = renderTask({
-      template: fs.readFileSync(templatePath, 'utf8'), candidate, taskId, project, timestamp,
-      agentInfraVersion: options.agentInfraVersion ?? 'unknown', keyDigest, candidateDigest
+      template: fs.readFileSync(templatePath, 'utf8'), candidate, taskId, project: projectConfig.project, delivery: projectConfig.delivery, timestamp,
+      agentInfraVersion, keyDigest, candidateDigest
     });
     const temporary = path.join(workspaceRoot, `.task-create.tmp.${process.pid}.${randomUUID()}`);
     fs.mkdirSync(temporary, { mode: 0o700 });

package/lib/task/current-contract.ts

@@ -0,0 +1,49 @@
+import { isValidAgentInfraVersion } from '../version.ts';
+import { parseTypedTaskFrontmatter } from './frontmatter.ts';
+import { LEDGER_SECTION_MISSING_CODE, LEDGER_SECTION_MISSING_MESSAGE, parseLedgerDocument, validateLedgerRows } from './ledger.ts';
+import type { LedgerDocument } from './ledger.ts';
+
+type CurrentTaskContractErrorCode = 'TASK_DOCUMENT_INVALID' | 'TASK_CURRENT_CONTRACT_INVALID';
+type CurrentTaskContractResult =
+  | {
+      ok: true;
+      metadata: ReturnType<typeof parseTypedTaskFrontmatter>;
+      ledger: LedgerDocument;
+    }
+  | {
+      ok: false;
+      code: CurrentTaskContractErrorCode;
+      message: string;
+    };
+
+function validateCurrentTaskContract(content: string): CurrentTaskContractResult {
+  let metadata: ReturnType<typeof parseTypedTaskFrontmatter>;
+  try {
+    metadata = parseTypedTaskFrontmatter(content);
+  } catch (error) {
+    return { ok: false, code: 'TASK_DOCUMENT_INVALID', message: error instanceof Error ? error.message : String(error) };
+  }
+  if (!isValidAgentInfraVersion(metadata.agent_infra_version)) {
+    return {
+      ok: false,
+      code: 'TASK_CURRENT_CONTRACT_INVALID',
+      message: `agent_infra_version must be a valid v-prefixed semver (received ${String(metadata.agent_infra_version ?? 'missing')})`
+    };
+  }
+
+  let ledger: LedgerDocument;
+  try {
+    ledger = parseLedgerDocument(content);
+  } catch (error) {
+    return { ok: false, code: 'TASK_DOCUMENT_INVALID', message: error instanceof Error ? error.message : String(error) };
+  }
+  if (!ledger.present) {
+    return { ok: false, code: 'TASK_CURRENT_CONTRACT_INVALID', message: `${LEDGER_SECTION_MISSING_CODE}: ${LEDGER_SECTION_MISSING_MESSAGE}` };
+  }
+  const invalid = validateLedgerRows(ledger.rows);
+  if (invalid) return { ok: false, code: 'TASK_CURRENT_CONTRACT_INVALID', message: `${invalid.code}: ${invalid.message}` };
+  return { ok: true, metadata, ledger };
+}
+
+export { validateCurrentTaskContract };
+export type { CurrentTaskContractErrorCode, CurrentTaskContractResult };

package/lib/task/decision-details.ts

@@ -0,0 +1,280 @@
+type SourceLine = {
+  start: number;
+  end: number;
+  text: string;
+};
+
+type VisibleHeading = SourceLine & {
+  level: number;
+  text: string;
+};
+
+type VisibleAnchor = SourceLine & {
+  id: string;
+};
+
+type VisibleMarkdown = {
+  lines: SourceLine[];
+  headings: VisibleHeading[];
+  anchors: VisibleAnchor[];
+};
+
+type DecisionDetailBlock = {
+  id: string;
+  heading: string;
+  canonical: boolean;
+  start: number;
+  end: number;
+  content: string;
+};
+
+type DecisionDetailResolution =
+  | { status: 'found'; block: DecisionDetailBlock }
+  | { status: 'missing'; reason: string }
+  | { status: 'ambiguous'; reason: string; candidates: DecisionDetailBlock[] };
+
+type DecisionDetailDuplicate = {
+  id: string;
+  blocks: DecisionDetailBlock[];
+};
+
+type DecisionDetailInspection =
+  | { ok: true; blocks: DecisionDetailBlock[] }
+  | {
+      ok: false;
+      code: 'DECISION_DETAIL_DUPLICATE';
+      message: string;
+      blocks: DecisionDetailBlock[];
+      duplicates: DecisionDetailDuplicate[];
+    };
+
+const DECISION_ID = /^(AN|PL|CD|HD)-[1-9]\d*(?=$|[\s:：])/i;
+const HEADING = /^ {0,3}(#{1,6})[ \t]+(.+?)\s*$/;
+const FENCE_OPEN = /^ {0,3}(`{3,}|~{3,})(.*)$/;
+const FENCE_CLOSE = /^ {0,3}(`{3,}|~{3,})\s*$/;
+const ANCHOR = /^\s*<a\s+id=(['"])([^'"]+)\1\s*><\/a>\s*$/;
+const FIELD = /^\s*[-*]\s+\*\*([^*]+)\*\*\s*[:：]\s*/;
+const OPTION_HEADING = /^(?:方案|Option)\s+[A-Z](?:\b|\s*[:：])/i;
+
+function sourceLines(content: string): SourceLine[] {
+  const lines: SourceLine[] = [];
+  let start = 0;
+  while (start < content.length) {
+    const newline = content.indexOf('\n', start);
+    const end = newline === -1 ? content.length : newline;
+    lines.push({ start, end, text: content.slice(start, end).replace(/\r$/, '') });
+    start = newline === -1 ? content.length : newline + 1;
+  }
+  return lines;
+}
+
+function scanVisibleMarkdown(content: string): VisibleMarkdown {
+  const lines = sourceLines(content);
+  const visible: SourceLine[] = [];
+  const headings: VisibleHeading[] = [];
+  const anchors: VisibleAnchor[] = [];
+  let fence: { character: '`' | '~'; length: number } | null = null;
+
+  for (const line of lines) {
+    if (fence) {
+      const close = line.text.match(FENCE_CLOSE);
+      if (close && close[1]![0] === fence.character && close[1]!.length >= fence.length) fence = null;
+      continue;
+    }
+    const open = line.text.match(FENCE_OPEN);
+    const marker = open?.[1];
+    const info = open?.[2] ?? '';
+    if (marker && !(marker[0] === '`' && info.includes('`'))) {
+      fence = { character: marker[0] as '`' | '~', length: marker.length };
+      continue;
+    }
+    visible.push(line);
+    const heading = line.text.match(HEADING);
+    if (heading) headings.push({ ...line, level: heading[1]!.length, text: heading[2]!.trim() });
+    const anchor = line.text.match(ANCHOR);
+    if (anchor) anchors.push({ ...line, id: anchor[2]! });
+  }
+  return { lines: visible, headings, anchors };
+}
+
+function parseDecisionDetailBlocks(content: string): DecisionDetailBlock[] {
+  const scanned = scanVisibleMarkdown(content);
+  const details = scanned.headings.filter((heading) => heading.level === 3 && DECISION_ID.test(heading.text));
+  return details.map((heading) => {
+    const next = scanned.headings.find((candidate) => (
+      candidate.start > heading.start && candidate.level <= 3
+    ));
+    const end = next?.start ?? content.length;
+    return {
+      id: heading.text.match(DECISION_ID)![0]!,
+      heading: heading.text,
+      canonical: /\[needs-human-decision\]/i.test(heading.text),
+      start: heading.start,
+      end,
+      content: content.slice(heading.start, end).trim()
+    };
+  });
+}
+
+function parseDecisionEvidence(evidence: string): { ok: true; artifact: string; anchor: string } | { ok: false } {
+  const separator = evidence.indexOf('#');
+  if (separator <= 0 || evidence.indexOf('#', separator + 1) !== -1) return { ok: false };
+  const artifact = evidence.slice(0, separator);
+  const anchor = evidence.slice(separator + 1);
+  if (!/^[A-Za-z0-9][A-Za-z0-9._-]*\.md$/.test(artifact)) return { ok: false };
+  if (!anchor || /[\s\u0000-\u001f#]/.test(anchor)) return { ok: false };
+  return { ok: true, artifact, anchor };
+}
+
+function sameId(left: string, right: string): boolean {
+  return left.toUpperCase() === right.toUpperCase();
+}
+
+function resolveDecisionDetail(content: string, rowId: string, anchor: string): DecisionDetailResolution {
+  const scanned = scanVisibleMarkdown(content);
+  const blocks = parseDecisionDetailBlocks(content);
+  const explicit = scanned.anchors.filter((candidate) => candidate.id === anchor);
+  if (explicit.length > 1) {
+    return { status: 'ambiguous', reason: `evidence anchor '${anchor}' occurs more than once`, candidates: [] };
+  }
+  if (explicit.length === 1) {
+    const marker = explicit[0]!;
+    const followingLine = scanned.lines.find((line) => line.start > marker.end && line.text.trim());
+    const followingHeading = followingLine
+      ? scanned.headings.find((heading) => heading.start === followingLine.start)
+      : undefined;
+    const candidate = followingHeading?.level === 3
+      ? blocks.find((block) => block.start === followingHeading.start)
+      : undefined;
+    if (!candidate || !sameId(candidate.id, rowId) || !candidate.canonical) {
+      return { status: 'missing', reason: `evidence anchor '${anchor}' does not identify a canonical ${rowId} detail` };
+    }
+    return { status: 'found', block: candidate };
+  }
+  if (!sameId(anchor, rowId)) {
+    return { status: 'missing', reason: `evidence anchor '${anchor}' is not the ledger id '${rowId}'` };
+  }
+  const matches = blocks.filter((block) => sameId(block.id, rowId) && block.canonical);
+  if (matches.length === 0) return { status: 'missing', reason: `no canonical ${rowId} detail was found` };
+  if (matches.length > 1) {
+    return { status: 'ambiguous', reason: `more than one canonical ${rowId} detail was found`, candidates: matches };
+  }
+  return { status: 'found', block: matches[0]! };
+}
+
+function inspectDecisionDetailDuplicates(content: string): DecisionDetailInspection {
+  const blocks = parseDecisionDetailBlocks(content);
+  const grouped = new Map<string, DecisionDetailBlock[]>();
+  for (const block of blocks) {
+    const key = block.id.toUpperCase();
+    const group = grouped.get(key) ?? [];
+    group.push(block);
+    grouped.set(key, group);
+  }
+  const duplicates: DecisionDetailDuplicate[] = [];
+  for (const group of grouped.values()) {
+    if (group.length < 2) continue;
+    duplicates.push({ id: group[0]!.id, blocks: group });
+  }
+  if (duplicates.length === 0) return { ok: true, blocks };
+  const summary = duplicates.map((duplicate) => {
+    const types = duplicate.blocks.map((block) => block.canonical ? 'canonical' : 'informal').join(', ');
+    return `${duplicate.id} (${duplicate.blocks.length} blocks: ${types})`;
+  }).join(', ');
+  return {
+    ok: false,
+    code: 'DECISION_DETAIL_DUPLICATE',
+    message: `Duplicate decision detail ids: ${summary}`,
+    blocks,
+    duplicates
+  };
+}
+
+type FieldKey = 'decision' | 'why' | 'impact' | 'risk' | 'analogy' | 'recommend' | 'reason' | 'implementation';
+
+const FIELD_KEYS: Record<string, FieldKey> = {
+  '为什么现在要决定': 'why', 'why decide now': 'why', 'why a decision is needed now': 'why',
+  '要决定什么': 'decision', 'what to decide': 'decision', 'what needs a decision': 'decision',
+  '会影响什么': 'impact', 'what it affects': 'impact', 'what this affects': 'impact',
+  '如果选错或暂不处理': 'risk', 'if wrong or postponed': 'risk',
+  'what could go wrong': 'risk',
+  '打个比方': 'analogy', '例子': 'analogy', 'example': 'analogy',
+  '建议选哪个': 'recommend', 'recommended option': 'recommend', 'recommended choice': 'recommend',
+  '为什么这样建议': 'reason', 'why this recommendation': 'reason', 'why this choice': 'reason',
+  '是否需要实现': 'implementation', 'implementation required': 'implementation'
+};
+
+const TERMINAL_FIELD_KEYS = new Set<FieldKey>(['recommend', 'reason', 'implementation']);
+
+function normalizeDecisionDetailForDisplay(block: DecisionDetailBlock): string {
+  const body = block.content;
+  const scanned = scanVisibleMarkdown(body);
+  const heading = scanned.headings.find((candidate) => candidate.level === 3);
+  if (!heading) return body.trim();
+  const options = scanned.headings.filter((candidate) => candidate.level === 4 && OPTION_HEADING.test(candidate.text));
+  const optionRanges = options.map((option, index) => ({
+    start: option.start,
+    end: options[index + 1]?.start
+      ?? scanned.headings.find((candidate) => candidate.start > option.start && candidate.level <= 3)?.start
+      ?? scanned.lines.find((line) => (
+        line.start > option.start
+        && FIELD.test(line.text)
+        && TERMINAL_FIELD_KEYS.has(FIELD_KEYS[line.text.match(FIELD)![1]!.trim().toLowerCase()] as FieldKey)
+      ))?.start
+      ?? body.length
+  }));
+  const topLines = scanned.lines.filter((line) => (
+    line.start > heading.end && !optionRanges.some((range) => line.start >= range.start && line.start < range.end)
+  ));
+  const fields: { key: FieldKey | null; line: SourceLine }[] = [];
+  for (const line of topLines) {
+    const match = line.text.match(FIELD);
+    if (!match) continue;
+    const key = FIELD_KEYS[match[1]!.trim().toLowerCase()];
+    fields.push({ key: key ?? null, line });
+  }
+  if (fields.some((field) => field.key === null)) return body.trim();
+  const byKey = new Map<FieldKey, string>();
+  const selectedRanges: { start: number; end: number }[] = [];
+  for (let index = 0; index < fields.length; index += 1) {
+    const field = fields[index]!;
+    if (!field.key) continue;
+    const nextOption = optionRanges.find((range) => range.start > field.line.start)?.start ?? body.length;
+    const end = Math.min(fields[index + 1]?.line.start ?? body.length, nextOption);
+    const value = body.slice(field.line.start, end).trim();
+    byKey.set(field.key, value);
+    selectedRanges.push({ start: field.line.start, end });
+  }
+  selectedRanges.push(...optionRanges);
+  const required: FieldKey[] = ['decision', 'why', 'impact', 'recommend', 'reason'];
+  if (required.some((key) => !byKey.has(key)) || options.length < 2) return body.trim();
+  const sortedRanges = selectedRanges.sort((left, right) => left.start - right.start);
+  let cursor = heading.end;
+  for (const range of sortedRanges) {
+    if (/\S/.test(body.slice(cursor, range.start))) return body.trim();
+    cursor = Math.max(cursor, range.end);
+  }
+  if (/\S/.test(body.slice(cursor))) return body.trim();
+  const ordered: string[] = [
+    byKey.get('decision')!, byKey.get('why')!, byKey.get('impact')!
+  ];
+  for (const optional of ['risk', 'analogy'] as const) if (byKey.has(optional)) ordered.push(byKey.get(optional)!);
+  ordered.push(...optionRanges.map((range) => body.slice(range.start, range.end).trim()));
+  ordered.push(byKey.get('recommend')!, byKey.get('reason')!);
+  if (byKey.has('implementation')) ordered.push(byKey.get('implementation')!);
+  return [body.slice(heading.start, heading.end).trim(), ...ordered].join('\n\n').trim();
+}
+
+export {
+  inspectDecisionDetailDuplicates,
+  normalizeDecisionDetailForDisplay,
+  parseDecisionDetailBlocks,
+  parseDecisionEvidence,
+  resolveDecisionDetail
+};
+export type {
+  DecisionDetailBlock,
+  DecisionDetailDuplicate,
+  DecisionDetailInspection,
+  DecisionDetailResolution
+};

package/lib/task/decision-intents.ts

@@ -10,7 +10,7 @@ import {
   renderImplementationInputs,
   selectDeclaredImplementationInput
 } from './implementation-inputs.ts';
-import { LEDGER_COLUMNS, LEDGER_HEADINGS, parseLedger } from './ledger.ts';
+import { LEDGER_COLUMNS, LEDGER_HEADINGS, LEDGER_SECTION_MISSING_CODE, LEDGER_SECTION_MISSING_MESSAGE, parseLedgerDocument } from './ledger.ts';
 import type { LedgerRow } from './ledger.ts';
 import { resolveTaskContext } from './resolve-ref.ts';
 import { extractSection, extractSubSection, findSectionHeading } from './sections.ts';
@@ -90,7 +90,12 @@ function applyHumanDecision(request: HumanDecisionRequest, options: TaskWriteOpt
   if (resolved.state !== 'active' && !stateOverride) return failed('TASK_STATE_MISMATCH', `task ${resolved.taskId} is ${resolved.state}, expected active`, resolved.taskId);
   let content: string;
   let rows: LedgerRow[];
-  try { content = fs.readFileSync(resolved.taskMdPath, 'utf8'); rows = parseLedger(content); }
+  try {
+    content = fs.readFileSync(resolved.taskMdPath, 'utf8');
+    const ledger = parseLedgerDocument(content);
+    if (!ledger.present) return failed(LEDGER_SECTION_MISSING_CODE, LEDGER_SECTION_MISSING_MESSAGE, resolved.taskId);
+    rows = ledger.rows as LedgerRow[];
+  }
   catch (error) { return failed('DECISION_DOCUMENT_INVALID', error instanceof Error ? error.message : String(error), resolved.taskId); }
 
   const direct = rows.filter((row) => row.id.toUpperCase() === request.selector.toUpperCase());

package/lib/task/delivery-target.ts

@@ -0,0 +1,130 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { execFileSync } from 'node:child_process';
+
+export type DeliveryTarget = Readonly<{
+  remote: string;
+  baseRef: string;
+}>;
+
+export type DeliveryTargetBindingInput = Readonly<{
+  defaults?: Partial<DeliveryTarget>;
+  existing?: Partial<DeliveryTarget>;
+  explicit?: Partial<DeliveryTarget>;
+}>;
+
+export type DeliveryTargetResult =
+  | { ok: true; value: DeliveryTarget }
+  | { ok: false; code: string; message: string };
+
+export type DiffBaseResult =
+  | { ok: true; diffBase: string }
+  | { ok: false; code: string; message: string };
+
+const REMOTE_RE = /^(?!-)(?!.*\.\.)(?!.*[~^:?*\\\s])[A-Za-z0-9._/-]+$/;
+const REF_RE = /^(?!-)(?!.*\.\.)(?!.*(?:^|\/)\.)(?!.*[~^:?*\\\s])[A-Za-z0-9._-]+(?:\/[A-Za-z0-9._-]+)*$/;
+
+function validateRemote(value: unknown): value is string {
+  return typeof value === 'string' && value.length > 0 && REMOTE_RE.test(value);
+}
+
+function validateBaseRef(value: unknown): value is string {
+  return typeof value === 'string' && value.length > 0 && !value.startsWith('refs/') && REF_RE.test(value);
+}
+
+function invalid(field: string, value: unknown): DeliveryTargetResult {
+  return { ok: false, code: 'DELIVERY_TARGET_INVALID', message: `${field} is invalid: ${String(value ?? '')}` };
+}
+
+function bindDeliveryTarget(input: DeliveryTargetBindingInput): DeliveryTargetResult {
+  const remote = input.existing?.remote ?? input.explicit?.remote ?? input.defaults?.remote;
+  const baseRef = input.existing?.baseRef ?? input.explicit?.baseRef ?? input.defaults?.baseRef;
+  if (input.existing?.remote !== undefined && input.explicit?.remote !== undefined && input.existing.remote !== input.explicit.remote) {
+    return { ok: false, code: 'DELIVERY_TARGET_CONFLICT', message: 'Explicit delivery remote does not match the task binding' };
+  }
+  if (input.existing?.baseRef !== undefined && input.explicit?.baseRef !== undefined && input.existing.baseRef !== input.explicit.baseRef) {
+    return { ok: false, code: 'DELIVERY_TARGET_CONFLICT', message: 'Explicit delivery base ref does not match the task binding' };
+  }
+  if (!validateRemote(remote)) return invalid('delivery remote', remote);
+  if (!validateBaseRef(baseRef)) return invalid('delivery base ref', baseRef);
+  return { ok: true, value: { remote, baseRef } };
+}
+
+function readDeliveryDefaults(repoRoot: string): DeliveryTargetResult {
+  try {
+    const configPath = path.join(repoRoot, '.agents', '.airc.json');
+    const config = JSON.parse(fs.readFileSync(configPath, 'utf8')) as Record<string, unknown>;
+    if (!config.delivery || typeof config.delivery !== 'object' || Array.isArray(config.delivery)) {
+      return { ok: false, code: 'DELIVERY_CONFIG_INVALID', message: 'delivery config must declare remote and baseRef' };
+    }
+    const delivery = config.delivery as Record<string, unknown>;
+    if (typeof delivery.remote !== 'string' || typeof delivery.baseRef !== 'string') {
+      return { ok: false, code: 'DELIVERY_CONFIG_INVALID', message: 'delivery config must declare remote and baseRef' };
+    }
+    return bindDeliveryTarget({
+      defaults: {
+        remote: delivery.remote,
+        baseRef: delivery.baseRef
+      }
+    });
+  } catch (error) {
+    return { ok: false, code: 'DELIVERY_CONFIG_INVALID', message: error instanceof Error ? error.message : String(error) };
+  }
+}
+
+function resolveDeliveryTarget(
+  repoRoot: string,
+  existing: Partial<DeliveryTarget> = {},
+  explicit: Partial<DeliveryTarget> = {}
+): DeliveryTargetResult {
+  const defaults = readDeliveryDefaults(repoRoot);
+  if (!defaults.ok) return defaults;
+  return bindDeliveryTarget({ defaults: defaults.value, existing, explicit });
+}
+
+function gitText(repoRoot: string, args: readonly string[]): string {
+  return execFileSync('git', [...args], {
+    cwd: repoRoot,
+    encoding: 'utf8',
+    stdio: ['ignore', 'pipe', 'pipe']
+  }).trim();
+}
+
+function resolveTargetHead(repoRoot: string, target: DeliveryTarget): DeliveryTargetResult & { head?: string } {
+  try {
+    const output = gitText(repoRoot, ['ls-remote', '--refs', target.remote, `refs/heads/${target.baseRef}`]);
+    const head = output.split(/\s+/)[0] ?? '';
+    if (!/^[a-f0-9]{40}$/i.test(head)) {
+      return { ok: false, code: 'DELIVERY_TARGET_UNAVAILABLE', message: `Delivery target ${target.remote}/${target.baseRef} is unavailable` };
+    }
+    try { gitText(repoRoot, ['cat-file', '-e', `${head}^{commit}`]); }
+    catch {
+      return { ok: false, code: 'DELIVERY_TARGET_OBJECT_MISSING', message: `Delivery target commit ${head} is not available locally` };
+    }
+    return { ok: true, value: target, head };
+  } catch (error) {
+    return { ok: false, code: 'DELIVERY_TARGET_UNAVAILABLE', message: error instanceof Error ? error.message : String(error) };
+  }
+}
+
+function resolveDiffBase(repoRoot: string, reviewedHead: string, targetHead: string): DiffBaseResult {
+  try {
+    const diffBase = gitText(repoRoot, ['merge-base', reviewedHead, targetHead]);
+    if (!/^[a-f0-9]{40}$/i.test(diffBase)) {
+      return { ok: false, code: 'DELIVERY_DIFF_BASE_UNAVAILABLE', message: 'Git returned an invalid diff base' };
+    }
+    return { ok: true, diffBase };
+  } catch (error) {
+    return { ok: false, code: 'DELIVERY_DIFF_BASE_UNAVAILABLE', message: error instanceof Error ? error.message : String(error) };
+  }
+}
+
+export {
+  bindDeliveryTarget,
+  readDeliveryDefaults,
+  resolveDeliveryTarget,
+  resolveTargetHead,
+  resolveDiffBase,
+  validateBaseRef,
+  validateRemote
+};