@fitlab-ai/agent-infra 0.9.10 → 0.9.12

package/dist/lib/task/decision-details.js

@@ -0,0 +1,218 @@
+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) {
+    const lines = [];
+    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) {
+    const lines = sourceLines(content);
+    const visible = [];
+    const headings = [];
+    const anchors = [];
+    let fence = 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], 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) {
+    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) {
+    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, right) {
+    return left.toUpperCase() === right.toUpperCase();
+}
+function resolveDecisionDetail(content, rowId, anchor) {
+    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) {
+    const blocks = parseDecisionDetailBlocks(content);
+    const grouped = new Map();
+    for (const block of blocks) {
+        const key = block.id.toUpperCase();
+        const group = grouped.get(key) ?? [];
+        group.push(block);
+        grouped.set(key, group);
+    }
+    const duplicates = [];
+    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
+    };
+}
+const FIELD_KEYS = {
+    '为什么现在要决定': '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(['recommend', 'reason', 'implementation']);
+function normalizeDecisionDetailForDisplay(block) {
+    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()])))?.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 = [];
+    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();
+    const selectedRanges = [];
+    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 = ['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 = [
+        byKey.get('decision'), byKey.get('why'), byKey.get('impact')
+    ];
+    for (const optional of ['risk', 'analogy'])
+        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 };
+//# sourceMappingURL=decision-details.js.map

package/dist/lib/task/decision-intents.js

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import { appendActivityEntry, locateActivityLog } from './activity-log.js';
 import { isDecisionItem, listDecisionItems, selectDecisionItem } from './decision-items.js';
 import { createImplementationInput, finalizeImplementationInput, IMPLEMENTATION_INPUT_ALIASES, parseImplementationInputs, renderImplementationInputs, selectDeclaredImplementationInput } from './implementation-inputs.js';
-import { LEDGER_COLUMNS, LEDGER_HEADINGS, parseLedger } from './ledger.js';
+import { LEDGER_COLUMNS, LEDGER_HEADINGS, LEDGER_SECTION_MISSING_CODE, LEDGER_SECTION_MISSING_MESSAGE, parseLedgerDocument } from './ledger.js';
 import { resolveTaskContext } from './resolve-ref.js';
 import { extractSection, extractSubSection, findSectionHeading } from './sections.js';
 import { captureTaskWriteMetadata, writeTask } from './write.js';
@@ -64,7 +64,10 @@ function applyHumanDecision(request, options = {}) {
     let rows;
     try {
         content = fs.readFileSync(resolved.taskMdPath, 'utf8');
-        rows = parseLedger(content);
+        const ledger = parseLedgerDocument(content);
+        if (!ledger.present)
+            return failed(LEDGER_SECTION_MISSING_CODE, LEDGER_SECTION_MISSING_MESSAGE, resolved.taskId);
+        rows = ledger.rows;
     }
     catch (error) {
         return failed('DECISION_DOCUMENT_INVALID', error instanceof Error ? error.message : String(error), resolved.taskId);

package/dist/lib/task/delivery-target.js

@@ -0,0 +1,97 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { execFileSync } from 'node:child_process';
+const REMOTE_RE = /^(?!-)(?!.*\.\.)(?!.*[~^:?*\\\s])[A-Za-z0-9._/-]+$/;
+const REF_RE = /^(?!-)(?!.*\.\.)(?!.*(?:^|\/)\.)(?!.*[~^:?*\\\s])[A-Za-z0-9._-]+(?:\/[A-Za-z0-9._-]+)*$/;
+function validateRemote(value) {
+    return typeof value === 'string' && value.length > 0 && REMOTE_RE.test(value);
+}
+function validateBaseRef(value) {
+    return typeof value === 'string' && value.length > 0 && !value.startsWith('refs/') && REF_RE.test(value);
+}
+function invalid(field, value) {
+    return { ok: false, code: 'DELIVERY_TARGET_INVALID', message: `${field} is invalid: ${String(value ?? '')}` };
+}
+function bindDeliveryTarget(input) {
+    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) {
+    try {
+        const configPath = path.join(repoRoot, '.agents', '.airc.json');
+        const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+        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;
+        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, existing = {}, explicit = {}) {
+    const defaults = readDeliveryDefaults(repoRoot);
+    if (!defaults.ok)
+        return defaults;
+    return bindDeliveryTarget({ defaults: defaults.value, existing, explicit });
+}
+function gitText(repoRoot, args) {
+    return execFileSync('git', [...args], {
+        cwd: repoRoot,
+        encoding: 'utf8',
+        stdio: ['ignore', 'pipe', 'pipe']
+    }).trim();
+}
+function resolveTargetHead(repoRoot, target) {
+    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, reviewedHead, targetHead) {
+    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 };
+//# sourceMappingURL=delivery-target.js.map

package/dist/lib/task/delivery.js

@@ -0,0 +1,153 @@
+import fs from 'node:fs';
+import { spawnSync } from 'node:child_process';
+import path from 'node:path';
+import { parseTaskFrontmatter } from './frontmatter.js';
+import { resolveTaskRef } from './resolve-ref.js';
+import { resolveDeliveryTarget, resolveDiffBase, resolveTargetHead, validateBaseRef, validateRemote } from './delivery-target.js';
+import { extractReviewBaseline, extractReviewDiffBase, extractReviewTargetHead, extractReviewedHead, findAuthoritativeReviewCodeArtifact } from './review-fingerprint.js';
+import { captureTaskWriteMetadata, writeTask } from './write.js';
+import { withRepositoryMutationLock, withTaskExecutionLock } from './task-execution-lock.js';
+function classifyDeliveryState(localHead, remoteHead, lastDelivered) {
+    if (remoteHead === null)
+        return { state: 'absent', shouldPush: true };
+    if (remoteHead === localHead)
+        return { state: 'same', shouldPush: false };
+    if (lastDelivered && remoteHead === lastDelivered)
+        return { state: 'known-old', shouldPush: true };
+    return { state: 'unknown-drift', shouldPush: false };
+}
+function git(cwd, args) {
+    const result = spawnSync('git', [...args], { cwd, encoding: 'utf8' });
+    return { status: result.status, stdout: result.stdout ?? '', stderr: result.stderr ?? '' };
+}
+function gitValue(cwd, args) {
+    const result = git(cwd, args);
+    return result.status === 0 ? result.stdout.trim() : null;
+}
+function validateBranch(cwd, branch) {
+    return git(cwd, ['check-ref-format', `refs/heads/${branch}`]).status === 0;
+}
+function validateReviewTargetCompatibility(repoRoot, taskDir, target, reviewedHead) {
+    const artifact = findAuthoritativeReviewCodeArtifact(taskDir);
+    if (!artifact.ok || !artifact.path)
+        return { ok: false, code: 'DELIVERY_REVIEW_REQUIRED', message: 'A current review-code artifact is required before delivery' };
+    let content;
+    try {
+        content = fs.readFileSync(artifact.path, 'utf8');
+    }
+    catch (error) {
+        return { ok: false, code: 'DELIVERY_REVIEW_REQUIRED', message: error instanceof Error ? error.message : String(error) };
+    }
+    const savedReviewedHead = extractReviewedHead(content) || extractReviewBaseline(content);
+    const savedTargetHead = extractReviewTargetHead(content);
+    const savedDiffBase = extractReviewDiffBase(content);
+    if (!savedReviewedHead || !savedTargetHead || !savedDiffBase) {
+        return { ok: false, code: 'DELIVERY_REVIEW_TARGET_INVALID', message: 'review-code must save reviewed head, target head, and diff base before delivery' };
+    }
+    if (savedReviewedHead !== reviewedHead) {
+        return { ok: false, code: 'DELIVERY_REVIEW_REQUIRED', message: 'review-code reviewed head does not match last_reviewed_commit' };
+    }
+    const saved = resolveDiffBase(repoRoot, reviewedHead, savedTargetHead);
+    if (!saved.ok || saved.diffBase !== savedDiffBase) {
+        return { ok: false, code: 'DELIVERY_REVIEW_TARGET_INVALID', message: saved.ok ? 'saved review diff base does not match saved target head' : saved.message };
+    }
+    const currentTarget = resolveTargetHead(repoRoot, target);
+    if (!currentTarget.ok)
+        return { ok: false, code: currentTarget.code, message: currentTarget.message };
+    const current = resolveDiffBase(repoRoot, reviewedHead, currentTarget.head);
+    if (!current.ok)
+        return { ok: false, code: current.code, message: current.message };
+    if (current.diffBase !== savedDiffBase) {
+        return { ok: false, code: 'DELIVERY_REVIEW_TARGET_CHANGED', message: 'current delivery target changed the reviewed diff base; re-run review-code' };
+    }
+    return { ok: true };
+}
+function failure(taskId, code, message, retryable = false, status = retryable ? 'blocked' : 'failed') {
+    return { status, changed: false, taskId, remoteHead: null, localHead: null, state: null, error: { code, message, retryable } };
+}
+function deliverUnlocked(taskId, taskDir, repoRoot, options) {
+    let frontmatter;
+    try {
+        frontmatter = parseTaskFrontmatter(fs.readFileSync(path.join(taskDir, 'task.md'), 'utf8'));
+    }
+    catch (error) {
+        return failure(taskId, 'TASK_CONTEXT_UNREADABLE', error instanceof Error ? error.message : String(error));
+    }
+    if (frontmatter.status !== 'active')
+        return failure(taskId, 'TASK_STATE_INVALID', 'task branch delivery requires an active task');
+    const branch = frontmatter.branch ?? '';
+    if (!branch)
+        return failure(taskId, 'DELIVERY_BRANCH_MISSING', 'task branch is missing');
+    if (!validateBranch(repoRoot, branch))
+        return failure(taskId, 'DELIVERY_BRANCH_INVALID', 'task branch is invalid');
+    if (!frontmatter.delivery_remote || !frontmatter.delivery_base_ref) {
+        return failure(taskId, 'DELIVERY_TARGET_MISSING', 'task delivery target is not bound; recreate or repair task metadata before delivery');
+    }
+    const target = resolveDeliveryTarget(repoRoot, {
+        remote: frontmatter.delivery_remote,
+        baseRef: frontmatter.delivery_base_ref
+    }, {
+        ...(options.remote === undefined ? {} : { remote: options.remote }),
+        ...(options.baseRef === undefined ? {} : { baseRef: options.baseRef })
+    });
+    if (!target.ok)
+        return failure(taskId, target.code, target.message);
+    if (!validateRemote(target.value.remote) || !validateBaseRef(target.value.baseRef))
+        return failure(taskId, 'DELIVERY_TARGET_INVALID', 'task delivery target is invalid');
+    const localHead = gitValue(repoRoot, ['rev-parse', 'HEAD']);
+    if (!localHead)
+        return failure(taskId, 'DELIVERY_LOCAL_HEAD_UNAVAILABLE', 'Unable to resolve local HEAD');
+    const status = git(repoRoot, ['status', '--porcelain=v1']);
+    if (status.status !== 0)
+        return failure(taskId, 'DELIVERY_GIT_INSPECT_FAILED', status.stderr.trim() || 'Unable to inspect Git state');
+    if (status.stdout.trim())
+        return failure(taskId, 'DELIVERY_WORKTREE_DIRTY', 'Working tree must be clean before branch delivery');
+    const reviewed = frontmatter.last_reviewed_commit ?? '';
+    if (reviewed !== localHead)
+        return failure(taskId, 'DELIVERY_REVIEW_REQUIRED', 'Local HEAD must equal last_reviewed_commit before delivery');
+    const reviewTarget = validateReviewTargetCompatibility(repoRoot, taskDir, target.value, reviewed);
+    if (!reviewTarget.ok)
+        return failure(taskId, reviewTarget.code, reviewTarget.message, reviewTarget.code.includes('UNAVAILABLE'), reviewTarget.code.includes('UNAVAILABLE') ? 'blocked' : 'failed');
+    const ref = `refs/heads/${branch}`;
+    const remoteOutput = git(repoRoot, ['ls-remote', '--refs', target.value.remote, ref]);
+    if (remoteOutput.status !== 0)
+        return failure(taskId, 'DELIVERY_REMOTE_UNAVAILABLE', remoteOutput.stderr.trim() || 'Unable to inspect the delivery remote', true);
+    const remoteHead = remoteOutput.stdout.trim().split(/\s+/)[0] || null;
+    const classification = classifyDeliveryState(localHead, remoteHead, frontmatter.delivery_remote_head ?? null);
+    if (classification.state === 'unknown-drift')
+        return failure(taskId, 'DELIVERY_REMOTE_DRIFT', `Remote branch ${branch} has an unexpected head; refusing to overwrite it`);
+    if (options.dryRun)
+        return { status: 'planned', changed: classification.shouldPush, taskId, remoteHead, localHead, state: classification.state, error: null };
+    if (classification.shouldPush) {
+        const args = classification.state === 'known-old'
+            ? ['push', `--force-with-lease=${ref}:${frontmatter.delivery_remote_head}`, target.value.remote, `HEAD:${ref}`]
+            : ['push', `--force-with-lease=${ref}:`, target.value.remote, `HEAD:${ref}`];
+        const pushed = git(repoRoot, args);
+        if (pushed.status !== 0)
+            return failure(taskId, 'DELIVERY_PUSH_FAILED', pushed.stderr.trim() || 'Task branch delivery was rejected', true, 'blocked');
+    }
+    const verified = gitValue(repoRoot, ['ls-remote', '--refs', target.value.remote, ref])?.split(/\s+/)[0] ?? null;
+    if (verified !== localHead)
+        return failure(taskId, 'DELIVERY_REMOTE_VERIFY_FAILED', `Expected remote head ${localHead}, received ${verified ?? 'unavailable'}`, true, 'blocked');
+    const written = writeTask({
+        taskRef: taskId,
+        expectedState: 'active',
+        mutations: [{ kind: 'frontmatter', set: { delivery_remote: target.value.remote, delivery_base_ref: target.value.baseRef, delivery_remote_head: localHead, assigned_to: options.agent } }]
+    }, { repoRoot, metadataProvider: captureTaskWriteMetadata });
+    if (written.status === 'failed')
+        return failure(taskId, 'DELIVERY_TASK_SYNC_FAILED', written.error.message, true, 'blocked');
+    return { status: classification.shouldPush ? 'applied' : 'no-op', changed: classification.shouldPush || written.changed, taskId, remoteHead: localHead, localHead, state: classification.state, error: null };
+}
+function deliverTaskBranch(taskRef, options) {
+    const resolved = resolveTaskRef(taskRef, { repoRoot: options.repoRoot });
+    if (!resolved.ok)
+        return failure(resolved.taskId, resolved.code, resolved.message);
+    try {
+        return withRepositoryMutationLock(resolved.repoRoot, () => withTaskExecutionLock(resolved.repoRoot, resolved.taskId, 'task-delivery', () => deliverUnlocked(resolved.taskId, resolved.taskDir, resolved.repoRoot, options)));
+    }
+    catch (error) {
+        return failure(resolved.taskId, 'DELIVERY_LOCK_FAILED', error instanceof Error ? error.message : String(error), true, 'blocked');
+    }
+}
+export { classifyDeliveryState, deliverTaskBranch };
+//# sourceMappingURL=delivery.js.map

package/dist/lib/task/events.js

@@ -1,11 +1,11 @@
 import fs from 'node:fs';
-import { appendActivityEntry, locateActivityLog, pairEntries } from './activity-log.js';
+import { appendActivityEntry, locateActivityLog, pairEntries, startedBackedRows } from './activity-log.js';
 import { buildArtifactLinkSection, artifactName, inspectArtifactDirectory, parseReviewedInputReference, parseCodePlanInputReference, parseArtifactName, resolveArtifactContext, validateCompletedArtifact } from './artifact-lifecycle.js';
 import { ArtifactReceiptError, sha256File, upsertArtifactReceipt } from './artifact-receipts.js';
 import { parseTypedTaskFrontmatter } from './frontmatter.js';
 import { consumeImplementationInput, IMPLEMENTATION_INPUT_ALIASES, parseImplementationInputs, renderImplementationInputs } from './implementation-inputs.js';
-import { parseLedger, summarizeLedgerStage, validateLedgerRows } from './ledger.js';
-import { parseReviewSummary } from './review-artifacts.js';
+import { LEDGER_SECTION_MISSING_CODE, LEDGER_SECTION_MISSING_MESSAGE, parseLedgerDocument, summarizeLedgerStage, validateLedgerRows } from './ledger.js';
+import { parseReviewSummary, resolveCanonicalVerdict } from './review-artifacts.js';
 import { resolveTaskRef } from './resolve-ref.js';
 import { findSectionHeading } from './sections.js';
 import { validateLifecycleExecution } from './lifecycle-execution.js';
@@ -101,7 +101,10 @@ function validateReviewFindingCounts(request, content, family, artifactPath) {
     const stage = REVIEW_LEDGER_STAGES[family];
     if (!stage || !artifactPath)
         return null;
-    const rows = parseLedger(content);
+    const ledger = parseLedgerDocument(content);
+    if (!ledger.present)
+        return { code: 'EVENT_FINDING_COUNT_MISMATCH', message: `${LEDGER_SECTION_MISSING_CODE}: ${LEDGER_SECTION_MISSING_MESSAGE}` };
+    const rows = ledger.rows;
     const invalid = validateLedgerRows(rows);
     if (invalid)
         return { code: 'TASK_DOCUMENT_INVALID', message: `${invalid.code}: ${invalid.message}` };
@@ -125,6 +128,9 @@ function validateReviewFindingCounts(request, content, family, artifactPath) {
             message: parsed.ok ? 'review summary finding counts are not finalized' : parsed.message
         };
     }
+    const canonical = resolveCanonicalVerdict(parsed.summary);
+    if (!canonical.ok)
+        return { code: 'EVENT_VERDICT_INVALID', message: `${canonical.code}: ${canonical.message}` };
     const report = parsed.summary.counts;
     const reportVerdict = parsed.summary.verdict === 'Approved'
         ? 'approved'
@@ -352,7 +358,7 @@ function applyTaskEventUnlocked(request, options = {}) {
     const section = locateActivityLog(content);
     if (!section)
         return failed(request, { code: 'EVENT_LOG_MISSING', message: 'task has no unique Activity Log section' }, { taskId: resolved.taskId, taskMdPath: resolved.taskMdPath });
-    const rows = pairEntries(section.entries);
+    const rows = startedBackedRows(pairEntries(section.entries));
     let normalized = request;
     let artifactContext = null;
     const initialParts = eventParts(request.event);

package/dist/lib/task/human-override.js

@@ -19,6 +19,7 @@ import { applyWorkflowWarningIntent } from './workflow-warning-intents.js';
 import { verifyTaskEvent } from './verification.js';
 import { verifyInProcess } from './verification-engine.js';
 import { canonicalTimestamp, writeTask } from './write.js';
+import { readPrDeliveryFact } from './pr-delivery-fact.js';
 const LIFECYCLE_PRODUCER = 'lifecycle.apply';
 const HUMAN_OVERRIDE_SECTION_ALIASES = ['人工豁免账本', 'Human Override Ledger'];
 const HUMAN_OVERRIDE_COLUMNS = [
@@ -405,7 +406,8 @@ function resourceForSnapshot(policy, options, frontmatter) {
         return number === null ? null : { kind: 'issue', number };
     }
     if (policy.producerId === 'platform.pull-request') {
-        const number = options.probePullRequestNumber ?? toPositiveInteger(frontmatter?.pr_number);
+        const fact = frontmatter ? readPrDeliveryFact(frontmatter) : null;
+        const number = options.probePullRequestNumber ?? (fact?.status === 'valid' && fact.fact.state === 'bound' ? fact.fact.identity.number : null);
         return number === null ? null : { kind: 'pull-request', number };
     }
     return null;
@@ -468,7 +470,8 @@ function probePlatformFailure(taskRef, policy, resolved, options) {
         return error('OVERRIDE_DOCUMENT_INVALID', cause instanceof Error ? cause.message : String(cause));
     }
     const issueNumber = options.probeIssueNumber ?? toPositiveInteger(frontmatter.issue_number);
-    const pullRequestNumber = options.probePullRequestNumber ?? toPositiveInteger(frontmatter.pr_number);
+    const fact = readPrDeliveryFact(frontmatter);
+    const pullRequestNumber = options.probePullRequestNumber ?? (fact.status === 'valid' && fact.fact.state === 'bound' ? fact.fact.identity.number : null);
     const operation = policy.producerId === 'platform.issue'
         ? issueNumber === null
             ? null

package/dist/lib/task/index.js

@@ -1,34 +1,33 @@
 const USAGE = `Usage: ai task <command> [options]
 
 Commands:
-  cat [--task <ref>] <artifact | N>      Print a task artifact (by name or number)
-  decisions, d [--task <ref>] [-i item]  List review decisions, or show one item's detail
-  files [--task <ref>]                   List artifacts in a task dir (numbered)
-  grep <pattern> [--current|--task <ref>] Literal search across task artifacts (global by default)
-  issue-body [--task <ref>] [--template] Print a deterministic Issue body from task.md
-  log [--task <ref>]                     Render a task's activity log as a timeline
+  cat [--task <ref> | -t <ref>] <artifact | N> Print a task artifact (by name or number)
+  decisions, d [--task <ref> | -t <ref>] [--item <selector> | -i <selector>] List review decisions, or show one item's detail
+  files [--task <ref> | -t <ref>]        List artifacts in a task dir (numbered)
+  grep [--current | --task <ref> | -t <ref>] <pattern> Literal search in the current or selected task
+  issue-body [--task <ref> | -t <ref>] [--template <path>] Print a deterministic Issue body from task.md
+  log [--task <ref> | -t <ref>]          Render a task's activity log as a timeline
   ls [--all | --blocked | --completed]   List tasks (default: active)
-  show [--task <ref>]                    Print a task.md
-  status [--task <ref>]                  Aggregated status view (metadata / artifacts / git / platform)
+  show [--task <ref> | -t <ref>]         Print a task.md
+  status [--task <ref> | -t <ref>]       Aggregated status view (metadata / artifacts / git / platform)
 
 Examples:
-  ai task cat 11 analysis
   ai task cat analysis
-  ai task cat 11 3
-  ai task decisions 11
+  ai task cat --task 11 analysis
+  ai task decisions --task 11
   ai task decisions --item 1
-  ai task d 11 PL-3 --format markdown
-  ai task files 11
+  ai task d --task 11 --item PL-3 --format markdown
+  ai task files --task 11
   ai task grep resolveArtifact
   ai task grep resolveArtifact --current
-  ai task grep resolveArtifact 11
-  ai task issue-body 11
-  ai task issue-body 11 --template .github/ISSUE_TEMPLATE/05_other.yml
-  ai task log 11
+  ai task grep resolveArtifact --task 11
+  ai task issue-body --task 11
+  ai task issue-body --task 11 --template .github/ISSUE_TEMPLATE/05_other.yml
+  ai task log --task 11
   ai task ls
-  ai task show 11
-  ai task show TASK-20260612-162737
-  ai task status 11
+  ai task show --task 11
+  ai task show --task TASK-20260612-162737
+  ai task status --task 11
 
 Run 'ai task <command> --help' for details.`;
 export async function runTask(args) {