@fitlab-ai/agent-infra 0.9.7 → 0.9.8

package/dist/lib/task/delegation-receipts.js

@@ -10,6 +10,10 @@ function managedDelegationRole(nativeAgent) {
 function fail(code, message) {
     return { ok: false, code, message };
 }
+// 空白串折叠为 null，保持"缺失即 null"的单一表示（Start/Stop 两处共用，避免任一入口把 "   " 当成已观察到的值入账）
+function foldBlankToNull(value) {
+    return value?.trim() ? value : null;
+}
 function prepareDelegation(input, options = {}) {
     const monotonic = (options.monotonicNow ?? (() => Number(process.hrtime.bigint() / 1000000n)))();
     return Object.freeze({
@@ -82,30 +86,43 @@ function activateDelegation(receipt, event, options = {}) {
     if (!event.parentId || (receipt.parentId !== null && event.parentId !== receipt.parentId) || !event.childId || event.childId === event.parentId) {
         return fail('DELEGATION_IDENTITY_INVALID', 'native parent/child identity does not match the prepared delegation');
     }
-    if (event.spawnMode !== 'fresh')
+    // spawnMode 的必需性按 client 判断：claude-code 宿主结构上不提供该字段，跳过；其余 client 维持硬校验
+    if (receipt.client !== 'claude-code' && event.spawnMode !== 'fresh') {
         return fail('DELEGATION_FORK_FORBIDDEN', `spawn mode '${event.spawnMode}' is not fresh`);
-    const actualModel = event.actualModel;
-    if (!actualModel || actualModel.trim() !== actualModel) {
-        return fail('DELEGATION_MODEL_IDENTITY_MISSING', 'native start event must provide a non-empty actual model identity');
     }
-    if (actualModel !== receipt.requestedModel && (!event.modelFallbackReason || event.modelFallbackReason.trim() === '')) {
-        return fail('DELEGATION_MODEL_FALLBACK_UNRECORDED', 'actual model differs from requested model without a fallback reason');
+    // model/effort 维度：claude-code 如实记录、不做门禁；其余 client 维持现状硬校验（HDR-2）
+    const actualModel = foldBlankToNull(event.actualModel);
+    const actualReasoningEffort = foldBlankToNull(event.actualReasoningEffort);
+    if (receipt.client !== 'claude-code') {
+        if (!actualModel || actualModel.trim() !== actualModel) {
+            return fail('DELEGATION_MODEL_IDENTITY_MISSING', 'native start event must provide a non-empty actual model identity');
+        }
+    }
+    if (actualModel !== null && actualModel !== receipt.requestedModel) {
+        if (receipt.client !== 'claude-code' && (!event.modelFallbackReason || event.modelFallbackReason.trim() === '')) {
+            return fail('DELEGATION_MODEL_FALLBACK_UNRECORDED', 'actual model differs from requested model without a fallback reason');
+        }
     }
-    const actualReasoningEffort = event.actualReasoningEffort;
-    if (!actualReasoningEffort || actualReasoningEffort.trim() !== actualReasoningEffort) {
-        return fail('DELEGATION_REASONING_EFFORT_MISSING', 'native start event must provide a non-empty actual reasoning effort');
+    if (receipt.client !== 'claude-code') {
+        if (!actualReasoningEffort || actualReasoningEffort.trim() !== actualReasoningEffort) {
+            return fail('DELEGATION_REASONING_EFFORT_MISSING', 'native start event must provide a non-empty actual reasoning effort');
+        }
     }
     if (receipt.client === 'codex'
         && event.hostEvidence?.kind !== 'codex-lifecycle-v2')
         return fail('DELEGATION_HOST_EVIDENCE_REQUIRED', 'Codex activation requires trusted lifecycle-v2 host evidence');
-    if (actualReasoningEffort !== receipt.requestedReasoningEffort
-        && (!event.reasoningEffortFallbackReason || event.reasoningEffortFallbackReason.trim() === '')) {
-        return fail('DELEGATION_REASONING_EFFORT_FALLBACK_UNRECORDED', 'actual reasoning effort differs from requested effort without a fallback reason');
+    if (actualReasoningEffort !== null && actualReasoningEffort !== receipt.requestedReasoningEffort) {
+        if (receipt.client !== 'claude-code' && (!event.reasoningEffortFallbackReason || event.reasoningEffortFallbackReason.trim() === '')) {
+            return fail('DELEGATION_REASONING_EFFORT_FALLBACK_UNRECORDED', 'actual reasoning effort differs from requested effort without a fallback reason');
+        }
     }
-    if (actualModel === receipt.requestedModel && event.modelFallbackReason) {
+    // "无关 fallback 理由"检查对所有 client 保持不变——防止编造理由的红线，不属于 HDR-2 放宽范围
+    // actualModel/actualReasoningEffort 为 null（未观察到）时同样没有"实际不同"这回事，理由一样是无关的
+    if ((actualModel === null || actualModel === receipt.requestedModel) && event.modelFallbackReason) {
         return fail('DELEGATION_MODEL_FALLBACK_INVALID', 'model fallback reason is only valid when actual model differs');
     }
-    if (actualReasoningEffort === receipt.requestedReasoningEffort && event.reasoningEffortFallbackReason) {
+    if ((actualReasoningEffort === null || actualReasoningEffort === receipt.requestedReasoningEffort)
+        && event.reasoningEffortFallbackReason) {
         return fail('DELEGATION_REASONING_EFFORT_FALLBACK_INVALID', 'reasoning-effort fallback reason is only valid when actual effort differs');
     }
     if (event.hostEvidence
@@ -145,7 +162,7 @@ function activateDelegation(receipt, event, options = {}) {
             status: 'activated',
             parentId: event.parentId,
             childId: event.childId,
-            spawnMode: event.spawnMode,
+            spawnMode: event.spawnMode ?? null,
             actualModel,
             actualReasoningEffort,
             modelFallbackReason: event.modelFallbackReason ?? null,
@@ -213,6 +230,10 @@ function sealDelegation(receipt, event, options = {}) {
             status: 'sealed',
             afterFingerprint: event.afterFingerprint,
             changedPaths: Object.freeze([...event.changedPaths]),
+            actualModel: receipt.actualModel ?? foldBlankToNull(event.actualModel),
+            actualReasoningEffort: receipt.actualReasoningEffort ?? foldBlankToNull(event.actualReasoningEffort),
+            modelFallbackReason: receipt.modelFallbackReason ?? event.modelFallbackReason ?? null,
+            reasoningEffortFallbackReason: receipt.reasoningEffortFallbackReason ?? event.reasoningEffortFallbackReason ?? null,
             hostEvidence: event.hostEvidence && receipt.hostEvidence ? Object.freeze({
                 ...receipt.hostEvidence,
                 ...event.hostEvidence
@@ -231,5 +252,5 @@ function consumeDelegation(receipt, options = {}) {
             consumedAt: (options.now ?? (() => new Date().toISOString()))()
         }) };
 }
-export { activateDelegation, abortPreparedDelegation, completeDelegationStage, consumeDelegation, dispatchDelegation, managedDelegationRole, prepareDelegation, sealDelegation };
+export { activateDelegation, abortPreparedDelegation, completeDelegationStage, consumeDelegation, dispatchDelegation, foldBlankToNull, managedDelegationRole, prepareDelegation, sealDelegation };
 //# sourceMappingURL=delegation-receipts.js.map

package/dist/lib/task/events.js

@@ -12,6 +12,7 @@ import { validateLifecycleExecution } from './lifecycle-execution.js';
 import { commitOrchestrationStageCompletion } from './orchestration.js';
 import { TaskExecutionLockError, withTaskExecutionLock } from './task-execution-lock.js';
 import { captureTaskWriteMetadata, writeTask } from './write.js';
+import { allowsManualOverride } from './guard-override.js';
 const eventCatalog = [
     'analyze.started', 'analyze.awaiting-input', 'analyze.completed',
     'review-analysis.started', 'review-analysis.completed',
@@ -22,7 +23,7 @@ const eventCatalog = [
     'manual-validation.started', 'manual-validation.completed',
     'validation-run.started', 'validation-run.completed'
 ];
-const BASE_FIELDS = new Set(['taskRef', 'event', 'agent', 'dryRun']);
+const BASE_FIELDS = new Set(['taskRef', 'event', 'agent', 'dryRun', 'overrideTicket', 'overrideTarget', 'overrideScope']);
 const SCHEMAS = {
     'analyze.started': { optional: ['round'] },
     'analyze.awaiting-input': { required: ['question'] },
@@ -331,7 +332,8 @@ function applyTaskEventUnlocked(request, options = {}) {
     const resolved = resolveTaskRef(request.taskRef, { repoRoot: options.repoRoot });
     if (!resolved.ok)
         return failed(request, { code: resolved.code, message: resolved.message }, { taskId: resolved.taskId });
-    if (resolved.state !== 'active')
+    const stateOverride = allowsManualOverride(options.manualOverride, 'task-event', 'TASK_STATE_MISMATCH');
+    if (resolved.state !== 'active' && !stateOverride)
         return failed(request, { code: 'TASK_STATE_MISMATCH', message: `task ${resolved.taskId} is ${resolved.state}, expected active` }, { taskId: resolved.taskId, taskMdPath: resolved.taskMdPath });
     let content;
     try {
@@ -403,7 +405,7 @@ function applyTaskEventUnlocked(request, options = {}) {
         return successNoOp(normalized, resolved.taskId, resolved.taskMdPath, currentStep, eventIdentity, done.done, frontmatter, artifactContext);
     if (eventIdentity.phase === 'completed' && completedRows.length > 0 && openRows.length === 0)
         return failed(normalized, { code: 'EVENT_LOG_CONFLICT', message: 'event identity is already completed with a different payload' }, { taskId: resolved.taskId, taskMdPath: resolved.taskMdPath, fromStep: currentStep, toStep: currentStep, action: eventIdentity.action, phase: eventIdentity.phase });
-    if (eventIdentity.phase === 'completed' && !row?.started)
+    if (eventIdentity.phase === 'completed' && !row?.started && !allowsManualOverride(options.manualOverride, 'task-event', 'EVENT_START_MISSING'))
         return failed(normalized, { code: 'EVENT_START_MISSING', message: 'completion requires one open matching started event' }, { taskId: resolved.taskId, taskMdPath: resolved.taskMdPath, fromStep: currentStep, toStep: currentStep, action: eventIdentity.action, phase: eventIdentity.phase });
     if (eventIdentity.phase === 'completed') {
         const validated = validateCompletedArtifact(resolved.taskDir, FAMILY[eventIdentity.family].artifact, normalized.artifact, normalized.round);
@@ -416,7 +418,7 @@ function applyTaskEventUnlocked(request, options = {}) {
         return successNoOp(normalized, resolved.taskId, resolved.taskMdPath, currentStep, eventIdentity, existing.time, frontmatter, artifactContext);
     }
     const allowed = FAMILY[eventIdentity.family][eventIdentity.phase === 'started' ? 'started' : 'completed'];
-    if (!allowed.includes(currentStep))
+    if (!allowed.includes(currentStep) && !allowsManualOverride(options.manualOverride, 'task-event', 'EVENT_TRANSITION_INVALID'))
         return failed(normalized, { code: 'EVENT_TRANSITION_INVALID', message: `${normalized.event} is not allowed from '${currentStep}'` }, { taskId: resolved.taskId, taskMdPath: resolved.taskMdPath, fromStep: currentStep, toStep: currentStep, action: eventIdentity.action, phase: eventIdentity.phase });
     const findingCountError = validateReviewFindingCounts(normalized, content, eventIdentity.family, completedArtifact?.path ?? null);
     if (findingCountError)
@@ -528,7 +530,7 @@ function applyTaskEventUnlocked(request, options = {}) {
         });
     }
     mutations.push({ kind: 'section', aliases: ['活动日志', 'Activity Log'], heading: section.heading, body });
-    const result = writeTask({ taskRef: normalized.taskRef, expectedState: 'active', dryRun: normalized.dryRun, mutations }, { ...options, metadataProvider: () => metadata });
+    const result = writeTask({ taskRef: normalized.taskRef, expectedState: stateOverride ? resolved.state : 'active', dryRun: normalized.dryRun, mutations }, { ...options, metadataProvider: () => metadata });
     if (result.status === 'failed')
         return failed(normalized, result.error, { taskId: result.taskId, taskMdPath: result.taskMdPath, fromStep: currentStep, toStep: step, action: eventIdentity.action, phase: eventIdentity.phase, timestamp: result.timestamp, agentInfraVersion: result.agentInfraVersion, operations: result.operations, artifactContext });
     if (!normalized.dryRun && orchestrationCompletion) {
@@ -568,6 +570,8 @@ function applyTaskEvent(request, options = {}) {
     if (invalid)
         return failed(request, invalid);
     const parts = eventParts(request.event);
+    if (options.lockAlreadyHeld)
+        return applyTaskEventUnlocked(request, options);
     if (request.dryRun || parts.phase !== 'completed' || parts.family === 'manual-validation') {
         return applyTaskEventUnlocked(request, options);
     }

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

@@ -0,0 +1,31 @@
+const guardProducerCatalog = [
+    { producerId: 'task.resolve', guardId: 'G-01', code: 'TASK_NOT_FOUND' },
+    { producerId: 'task.resolve', guardId: 'G-01', code: 'TASK_IDENTITY_CONFLICT' },
+    { producerId: 'task.write', guardId: 'G-02', code: 'TASK_STATE_MISMATCH' },
+    { producerId: 'task-event', guardId: 'G-04', code: 'TASK_STATE_MISMATCH' },
+    { producerId: 'task-event', guardId: 'G-04', code: 'EVENT_TRANSITION_INVALID' },
+    { producerId: 'task-event', guardId: 'G-04', code: 'EVENT_START_MISSING' },
+    { producerId: 'task-verify', guardId: 'G-05', code: 'VERIFY_TASK_STATE_MISMATCH' },
+    { producerId: 'task-verify', guardId: 'G-05', code: 'VERIFY_ARTIFACT_INVALID' },
+    { producerId: 'verification-engine', guardId: 'G-06', code: 'CHECK_FAILED' },
+    { producerId: 'verification-engine', guardId: 'G-06', code: 'CHECK_BLOCKED' },
+    { producerId: 'activity-intent', guardId: 'G-07', code: 'TASK_STATE_MISMATCH' },
+    { producerId: 'ledger-intent', guardId: 'G-07', code: 'TASK_STATE_MISMATCH' },
+    { producerId: 'decision-intent', guardId: 'G-07', code: 'TASK_STATE_MISMATCH' },
+    { producerId: 'workflow-warning', guardId: 'G-07', code: 'TASK_STATE_MISMATCH' },
+    { producerId: 'review-finalization', guardId: 'G-07', code: 'TASK_STATE_MISMATCH' },
+    { producerId: 'ledger-intent', guardId: 'G-08', code: 'LEDGER_TRANSITION_INVALID' },
+    { producerId: 'lifecycle-execution', guardId: 'G-09', code: 'ORCHESTRATION_STANDALONE_BUSY' },
+    { producerId: 'lifecycle-execution', guardId: 'G-09', code: 'ORCHESTRATION_PROVENANCE_MISMATCH' },
+    { producerId: 'lifecycle-execution', guardId: 'G-09', code: 'ORCHESTRATION_STATE_INVALID' },
+    { producerId: 'platform.issue', guardId: 'G-10', code: 'PLATFORM_BIND_FAILED' },
+    { producerId: 'platform.pull-request', guardId: 'G-10', code: 'PLATFORM_BIND_FAILED' }
+];
+function guardFailureId(producerId, code) {
+    return `${producerId}:${code}`;
+}
+function allowsManualOverride(capability, producerId, code) {
+    return capability?.failureId === guardFailureId(producerId, code);
+}
+export { allowsManualOverride, guardFailureId, guardProducerCatalog };
+//# sourceMappingURL=guard-override.js.map