@sema-agent/core 7.61.0 → 7.62.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +312 -0
- package/dist/agents/cascade.d.ts +11 -3
- package/dist/agents/cascade.js +1 -1
- package/dist/agents/peer-held-queue.d.ts +27 -4
- package/dist/agents/peer-held-queue.js +81 -36
- package/dist/agents/peer-session-drain.js +13 -3
- package/dist/agents/subagent.d.ts +6 -1
- package/dist/agents/subagent.js +66 -12
- package/dist/agents/suspend-guard.d.ts +38 -16
- package/dist/agents/suspend-guard.js +9 -4
- package/dist/agents/verify.js +4 -3
- package/dist/core/checkpoint-features.d.ts +722 -0
- package/dist/core/checkpoint-features.js +98 -0
- package/dist/core/checkpoint-requirements.d.ts +9 -2
- package/dist/core/checkpoint-requirements.js +9 -4
- package/dist/core/checkpoint-row-verdict.d.ts +99 -0
- package/dist/core/checkpoint-row-verdict.js +225 -0
- package/dist/core/checkpoint-store.d.ts +55 -745
- package/dist/core/checkpoint-store.js +39 -141
- package/dist/core/engine-notice.d.ts +19 -3
- package/dist/core/engine-notice.js +9 -2
- package/dist/core/gate-fold.js +2 -2
- package/dist/core/governance-codes.d.ts +3 -1
- package/dist/core/governance-codes.js +3 -0
- package/dist/core/hooks.d.ts +13 -0
- package/dist/core/human-input-projection.d.ts +1 -0
- package/dist/core/human-input-projection.js +3 -0
- package/dist/core/image-admission.d.ts +1 -1
- package/dist/core/locked-config.d.ts +2 -2
- package/dist/core/mcp-host-seat.js +6 -1
- package/dist/core/memory-engine/consolidation-driver.d.ts +1 -1
- package/dist/core/memory-vector.d.ts +1 -1
- package/dist/core/memory.d.ts +10 -10
- package/dist/core/mode-policy.js +1 -1
- package/dist/core/mods/classic-events.d.ts +9 -1
- package/dist/core/mods/dollar.d.ts +32 -1
- package/dist/core/mods/dollar.js +13 -1
- package/dist/core/mods/kernel/events.d.ts +11 -3
- package/dist/core/mods/kernel/events.js +13 -10
- package/dist/core/mods/lifecycle-stations.d.ts +36 -4
- package/dist/core/mods/lifecycle-stations.js +44 -9
- package/dist/core/mods/session-append.d.ts +4 -1
- package/dist/core/mods/session-append.js +7 -0
- package/dist/core/mods/session-receive.js +12 -15
- package/dist/core/mods/stations.d.ts +51 -6
- package/dist/core/mods/stations.js +124 -0
- package/dist/core/own-property-receipt.d.ts +7 -0
- package/dist/core/own-property-receipt.js +3 -0
- package/dist/core/read-root-candidate.js +1 -1
- package/dist/core/resume-startup-cause.d.ts +5 -4
- package/dist/core/runner/compact-session.js +5 -2
- package/dist/core/runner/contracts.d.ts +18 -8
- package/dist/core/runner/delegation-owner.d.ts +43 -0
- package/dist/core/runner/delegation-owner.js +59 -0
- package/dist/core/runner/lineage-reroot-view.d.ts +56 -0
- package/dist/core/runner/lineage-reroot-view.js +108 -0
- package/dist/core/runner/permission-rule-lanes.d.ts +2 -1
- package/dist/core/runner/permission-rule-lanes.js +2 -2
- package/dist/core/runner/person-path-rows.d.ts +15 -0
- package/dist/core/runner/person-path-rows.js +26 -3
- package/dist/core/runner/prepare-acquire-reconcile.d.ts +4 -1
- package/dist/core/runner/prepare-acquire-reconcile.js +7 -2
- package/dist/core/runner/prepare-caps-and-workflow.d.ts +1 -0
- package/dist/core/runner/prepare-caps-and-workflow.js +1 -1
- package/dist/core/runner/prepare-config-doors.d.ts +6 -6
- package/dist/core/runner/prepare-config-doors.js +3 -4
- package/dist/core/runner/prepare-hands-readface.d.ts +1 -1
- package/dist/core/runner/prepare-hands-readface.js +28 -7
- package/dist/core/runner/prepare-inherited-gate.d.ts +2 -0
- package/dist/core/runner/prepare-inherited-gate.js +7 -3
- package/dist/core/runner/prepare-task.js +10 -7
- package/dist/core/runner/resume-admission.d.ts +3 -3
- package/dist/core/runner/resume-admission.js +6 -3
- package/dist/core/runner/resume-apply.d.ts +4 -0
- package/dist/core/runner/resume-apply.js +11 -4
- package/dist/core/runner/resume-checkpoint-screen.d.ts +9 -0
- package/dist/core/runner/resume-checkpoint-screen.js +4 -84
- package/dist/core/runner/run-git-lane.d.ts +2 -0
- package/dist/core/runner/run-git-lane.js +4 -1
- package/dist/core/runner/run-harness-handlers.d.ts +2 -0
- package/dist/core/runner/run-harness-handlers.js +3 -2
- package/dist/core/runner/run-leg.js +24 -7
- package/dist/core/runner/run-settle-and-teardown.js +3 -2
- package/dist/core/runner/run-stop-and-final-verify.js +2 -1
- package/dist/core/runner/run-turn-boundary.js +7 -4
- package/dist/core/runner/runtask.js +6 -6
- package/dist/core/runner/steering-preview.d.ts +9 -0
- package/dist/core/runner/steering-preview.js +5 -0
- package/dist/core/runner/stream-steer-verb.js +8 -0
- package/dist/core/runner/tool-face-overlay.js +2 -0
- package/dist/core/runner/turn-attachments.d.ts +5 -0
- package/dist/core/runner/turn-attachments.js +1 -1
- package/dist/core/runner-deps.d.ts +2 -2
- package/dist/core/secret-env.d.ts +8 -5
- package/dist/core/secret-env.js +37 -18
- package/dist/core/session-store.d.ts +1 -1
- package/dist/core/session-store.js +5 -1
- package/dist/core/session.d.ts +14 -4
- package/dist/core/store-contracts/checkpoint-store-contract.d.ts +6 -0
- package/dist/core/store-contracts/checkpoint-store-contract.js +68 -0
- package/dist/core/store-contracts/session-store-contract.js +22 -8
- package/dist/core/task-event.d.ts +7 -1
- package/dist/core/task-notification.js +2 -1
- package/dist/core/task-registry-agent.d.ts +27 -7
- package/dist/core/task-registry-agent.js +12 -5
- package/dist/core/task-registry-shared.d.ts +7 -0
- package/dist/core/task-registry-workflow.js +4 -3
- package/dist/core/task-registry.d.ts +13 -2
- package/dist/core/task-registry.js +11 -4
- package/dist/core/task-result.d.ts +5 -5
- package/dist/core/task-spec.d.ts +1 -1
- package/dist/core/terminal-cause.d.ts +6 -6
- package/dist/core/tool-face.d.ts +6 -2
- package/dist/core/tool-face.js +1 -1
- package/dist/core/tool-policy.d.ts +2 -1
- package/dist/core/tool-roster.d.ts +4 -4
- package/dist/core/tool-spec.d.ts +4 -0
- package/dist/core/types.d.ts +1 -1
- package/dist/core/types.js +1 -1
- package/dist/engine/execution-env/node-execution-env.d.ts +3 -0
- package/dist/engine/execution-env/node-execution-env.js +12 -5
- package/dist/engine/harness/types.d.ts +11 -0
- package/dist/engine/session/parent-chain-guard.d.ts +3 -3
- package/dist/engine/session/parent-chain-guard.js +1 -1
- package/dist/engine/session/path-to-root.d.ts +18 -3
- package/dist/engine/session/path-to-root.js +15 -1
- package/dist/engine/session/repo-utils.d.ts +12 -1
- package/dist/engine/session/repo-utils.js +41 -0
- package/dist/engine/session/session.js +1 -1
- package/dist/engine/session/storage-base.d.ts +20 -0
- package/dist/engine/session/storage-base.js +28 -9
- package/dist/index.d.ts +9 -8
- package/dist/index.js +4 -4
- package/dist/internal/harness.d.ts +4 -3
- package/dist/internal/harness.js +3 -2
- package/dist/orchestration/run-workflow-tool.d.ts +3 -0
- package/dist/orchestration/run-workflow-tool.js +27 -11
- package/dist/orchestration/workflow-governance.d.ts +1 -1
- package/dist/orchestration/workflow.d.ts +3 -0
- package/dist/orchestration/workflow.js +2 -7
- package/dist/stores/file/checkpoint-store.d.ts +2 -0
- package/dist/stores/file/checkpoint-store.js +7 -6
- package/dist/stores/file/fs-atomic.d.ts +0 -22
- package/dist/stores/file/fs-atomic.js +0 -17
- package/dist/stores/file/index.d.ts +2 -9
- package/dist/stores/file/index.js +2 -4
- package/dist/stores/file/session-store.d.ts +13 -7
- package/dist/stores/file/session-store.js +40 -17
- package/dist/tools/fs/bash-program-position.d.ts +3 -2
- package/dist/tools/fs/bash-program-position.js +7 -7
- package/dist/tools/fs/removal-targets.js +2 -2
- package/dist/tools/fs/shell-read-argv.d.ts +4 -2
- package/dist/tools/fs/shell-read-argv.js +14 -3
- package/dist/tools/fs/shell-read-bindings.d.ts +18 -2
- package/dist/tools/fs/shell-read-bindings.js +148 -68
- package/dist/tools/fs/shell-read-check.js +20 -4
- package/dist/tools/fs/shell-read-establish.js +22 -8
- package/dist/tools/fs/shell-read-functions.js +2 -2
- package/dist/tools/fs/shell-read-object-path.d.ts +59 -0
- package/dist/tools/fs/shell-read-object-path.js +119 -0
- package/dist/tools/fs/shell-read-plan.d.ts +8 -0
- package/dist/tools/fs/shell-read-plan.js +47 -30
- package/dist/tools/fs/shell-read-start.d.ts +66 -13
- package/dist/tools/fs/shell-read-start.js +89 -17
- package/dist/tools/fs/shell-read-workdir.d.ts +29 -8
- package/dist/tools/fs/shell-read-workdir.js +31 -8
- package/package.json +2 -2
- package/test/export-surface.snapshot.json +21 -33
- package/wire-changes/core-stores-sql@7.62.0.json +30 -0
- package/wire-changes/core@7.62.0.json +2181 -0
- package/wire-changes/mods-kernel@7.62.0.json +42 -0
- package/wire-changes/primitives@7.62.0.json +30 -0
- package/dist/core/consolidate-scope.d.ts +0 -93
- package/dist/core/consolidate-scope.js +0 -98
- package/dist/core/runner/memory-consolidation.d.ts +0 -109
- package/dist/core/runner/memory-consolidation.js +0 -251
|
@@ -19,7 +19,7 @@ import { isValidReminderMark, mintReminderMark } from "../reminder-mint.js";
|
|
|
19
19
|
import { clampPermissionMode } from "../ask-origin.js";
|
|
20
20
|
import { modePolicyOf, modeRequestAfterResume, refusePermissionModeDoors } from "../mode-policy.js";
|
|
21
21
|
import { resolveOutputStyleFrame } from "../output-style.js";
|
|
22
|
-
import { recordedModeSeed } from "../checkpoint-
|
|
22
|
+
import { recordedModeSeed } from "../checkpoint-row-verdict.js";
|
|
23
23
|
import { emitTrace } from "../trace.js";
|
|
24
24
|
import { personPathRowsOfTask, ruleRowsDroppedNotice, ruleStoreUnreadableNotice } from "./person-path-rows.js";
|
|
25
25
|
import { STALL_FIRST_BYTE_MS, STALL_FIRST_TOKEN_MS, STALL_IDLE_MS, withBrainCallGuardrail } from "../../brain/timeout.js";
|
|
@@ -35,6 +35,7 @@ import { compileOutputSchema } from "./strict-output-schema.js";
|
|
|
35
35
|
import { MEMORY_ENGINE_TOOL_NAMES } from "../memory-engine/tools.js";
|
|
36
36
|
import { foldAdmissionFreeze } from "../memory-admission.js";
|
|
37
37
|
import { chainAnchorRecords, chainPolicyOnLeg, chainTopAnchors, deploymentCanRerootChild } from "./child-tree.js";
|
|
38
|
+
import { ownRowDelegationOwner } from "./delegation-owner.js";
|
|
38
39
|
import { prepareMemory } from "./prepare-memory.js";
|
|
39
40
|
import { prepareMemoryEngineSession } from "./prepare-memory-engine-session.js";
|
|
40
41
|
import { prepareDeferClassify } from "./prepare-defer-classify.js";
|
|
@@ -102,7 +103,7 @@ import { handsWriteHalfMounts } from "../../tools/fs/index.js";
|
|
|
102
103
|
import { askSeatEffective } from "../wiring-manifest.js";
|
|
103
104
|
import { durableParkGapFor } from "../park-selfcheck.js";
|
|
104
105
|
import { createToolCallEntry, createToolCallStation } from "../mods/tool-call.js";
|
|
105
|
-
import { createRowSeat, createSessionAppendEntry } from "../mods/session-append.js";
|
|
106
|
+
import { createRowSeat, createSessionAppendEntry, promptCountOf } from "../mods/session-append.js";
|
|
106
107
|
import { createReceiveSeat } from "../mods/session-receive.js";
|
|
107
108
|
import { createCompactStation, createSessionCompactEntry } from "../mods/session-compact.js";
|
|
108
109
|
import { createSessionSendEntry, createSessionSendStation } from "../mods/session-send.js";
|
|
@@ -357,8 +358,9 @@ export async function prepareTask(request, deps, sessions, resume, internals, ru
|
|
|
357
358
|
for (const cap of MODEL_CAPABILITIES)
|
|
358
359
|
capabilityOf(model, cap);
|
|
359
360
|
const fileHistoryRequest = resolveFileHistoryRequest(spec, deps);
|
|
360
|
-
const { acquired, session, conflictRef, wakeRecovered, branch } = await prepareAcquireReconcile({ sessions, spec, resume, wakeEffects, report: (e, id) => deps.onError?.(e, { phase: "config", sessionId: id }), ...(legWrites !== undefined ? { legWrites } : {}), ...(internals?.sessionPlacement !== undefined ? { placement: internals.sessionPlacement } : {}), ...(() => { const g = durableParkGapFor(deps, spec); return g !== undefined ? { durableParkGap: g } : {}; })() });
|
|
361
|
+
const { acquired, session, conflictRef, wakeRecovered, branch } = await prepareAcquireReconcile({ sessions, spec, resume, wakeEffects, report: (e, id) => deps.onError?.(e, { phase: "config", sessionId: id }), replayLossNotice: { onNotice: deps.onNotice, runId }, ...(legWrites !== undefined ? { legWrites } : {}), ...(internals?.sessionPlacement !== undefined ? { placement: internals.sessionPlacement } : {}), ...(() => { const g = durableParkGapFor(deps, spec); return g !== undefined ? { durableParkGap: g } : {}; })() });
|
|
361
362
|
const sessionId = acquired.sessionId;
|
|
363
|
+
const delegationOwner = internals?.delegationOwner ?? ownRowDelegationOwner(sessions, sessionId, async () => (await session.getMetadata()).incarnation);
|
|
362
364
|
await holdSessionLock?.(sessionId);
|
|
363
365
|
const onceLedger = await loadAnnounceOnceLedger(session, resume?.seed.announcedListings, deps.onError);
|
|
364
366
|
internals = restoreRowTaskId(internals, resume?.seed.rowTaskId);
|
|
@@ -490,7 +492,7 @@ export async function prepareTask(request, deps, sessions, resume, internals, ru
|
|
|
490
492
|
const mcpPool = installedPreflight.mcp?.length ? { pool: internals?.mcpPool ?? new McpConnectionPool(), owned: internals?.mcpPool === undefined } : undefined;
|
|
491
493
|
const mcpHostSeats = internals?.mcpHostSeats;
|
|
492
494
|
const mountedMcpNow = mcpPool !== undefined ? () => mountedMcpOf({ declared: installedPreflight.mcp, roster: roster.tools, aggregateNames: new Set(mcp.tools.filter((t) => t.mcpRemoteName === undefined).map((t) => t.name)), pool: mcpPool.pool, ...(mcpHostSeats !== undefined ? { hostSeats: mcpHostSeats } : {}) }) : undefined;
|
|
493
|
-
const { liveInheritedGate, seedInheritedGate, inheritedAncestorRules, inheritedShellGate, inheritedParentConstraints, permissionMode, commitModeSeats, endModeCeiling, inheritedAdmittedOrgScopes, priorOwnOrgVerdict, orgGovernedProvenance, effectiveShellGate, ownSessionRulesRef, ancestorSessionRulesRef, ancestorRulesNow, memoryAdmittedOrgScopesRef, ownOrgVerdictRef, runClampSource, faceCheckpointSection, writeFaceCheckpointSection, skillGrantCheckpointSection, frozenOnAsk, hookEnvSource, frozenOnQuestion, parentSpecSeat, provenanceForChildrenRef, delegationSettlementRef, inheritedGateForChildren, carrierReadFace, carrierWriteFace, fullShellReachable, gateStopRef, stopForDenialLimit, enrichSpecToolCtx } = prepareInheritedGate({ spec, deps, askSeat: doors.askSeat, hostFloor: doors.hostFloor, crossBoundaryTree, internals, resume, sessions, sessionId, runId, hostTaskId, taskRootFinal, ownTarget, executionEnv, ownedEnv, lockedPreflight: installedPreflight, pathRuleAnchors: { chainTop, onLeg: onLeg.chained }, checkpointSeat, checkpointScope, toolFaceSnapshot, mountsCallerTool, ...(mountedMcpNow !== undefined ? { mountedMcp: mountedMcpNow } : {}), promptLean, resolvedInteractionPosture, permissionModeSeat, handsEnabled, reportUsage, harnessRef, skillGrants, requestAllowedTools: allowedToolTables.request, forwardEvent, subagentRetain, taskArtifacts, worktreeIsolation, requestReview, requestStopAfterTurn, enterPlanMode, reminderMark, reminderDisclosureCounts, fileHistoryEnabled, historyScope, historyRoot, historyFs, abortRun: () => { abortController.abort(); void harness.abort(); }, runtimeCaps: () => runtimeCaps, modBus: legMods.standing, ownModChain, autoModeDecider: () => autoModeDeciderRef.current, autoModeDenialTracking: () => autoModeDenialTrackingRef.current, autoModeArming: () => autoModeArmingRef.current, agentForkDenial: () => agentForkDenial, agentStations: () => agentStationsRef.current, sendStation: () => sendStationRef.current, observersActive: () => observersActive, resolvedReadFace: () => resolvedReadFace, resolvedWriteFace: () => resolvedWriteFace, readDenyAdditionsNormalized: () => readDenyAdditionsNormalized, handsLessResolvedFace: () => handsLessResolvedFace, handsLessResolvedWriteFace: () => handsLessResolvedWriteFace, centerAdoption: () => centerAdoptionRef.current, memoryEngineSession: () => memoryEngineSession });
|
|
495
|
+
const { liveInheritedGate, seedInheritedGate, inheritedAncestorRules, inheritedShellGate, inheritedParentConstraints, permissionMode, commitModeSeats, endModeCeiling, inheritedAdmittedOrgScopes, priorOwnOrgVerdict, orgGovernedProvenance, effectiveShellGate, ownSessionRulesRef, ancestorSessionRulesRef, ancestorRulesNow, memoryAdmittedOrgScopesRef, ownOrgVerdictRef, runClampSource, faceCheckpointSection, writeFaceCheckpointSection, skillGrantCheckpointSection, frozenOnAsk, hookEnvSource, frozenOnQuestion, parentSpecSeat, provenanceForChildrenRef, delegationSettlementRef, inheritedGateForChildren, carrierReadFace, carrierWriteFace, fullShellReachable, gateStopRef, stopForDenialLimit, enrichSpecToolCtx } = prepareInheritedGate({ spec, deps, delegationOwner, askSeat: doors.askSeat, hostFloor: doors.hostFloor, crossBoundaryTree, internals, resume, sessions, sessionId, runId, hostTaskId, taskRootFinal, ownTarget, executionEnv, ownedEnv, lockedPreflight: installedPreflight, pathRuleAnchors: { chainTop, onLeg: onLeg.chained }, checkpointSeat, checkpointScope, toolFaceSnapshot, mountsCallerTool, ...(mountedMcpNow !== undefined ? { mountedMcp: mountedMcpNow } : {}), promptLean, resolvedInteractionPosture, permissionModeSeat, handsEnabled, reportUsage, harnessRef, skillGrants, requestAllowedTools: allowedToolTables.request, forwardEvent, subagentRetain, taskArtifacts, worktreeIsolation, requestReview, requestStopAfterTurn, enterPlanMode, reminderMark, reminderDisclosureCounts, fileHistoryEnabled, historyScope, historyRoot, historyFs, abortRun: () => { abortController.abort(); void harness.abort(); }, runtimeCaps: () => runtimeCaps, modBus: legMods.standing, ownModChain, autoModeDecider: () => autoModeDeciderRef.current, autoModeDenialTracking: () => autoModeDenialTrackingRef.current, autoModeArming: () => autoModeArmingRef.current, agentForkDenial: () => agentForkDenial, agentStations: () => agentStationsRef.current, sendStation: () => sendStationRef.current, observersActive: () => observersActive, resolvedReadFace: () => resolvedReadFace, resolvedWriteFace: () => resolvedWriteFace, readDenyAdditionsNormalized: () => readDenyAdditionsNormalized, handsLessResolvedFace: () => handsLessResolvedFace, handsLessResolvedWriteFace: () => handsLessResolvedWriteFace, centerAdoption: () => centerAdoptionRef.current, memoryEngineSession: () => memoryEngineSession });
|
|
494
496
|
bindPermissionModeSeat(permissionMode);
|
|
495
497
|
const personRowNotices = { onUnread: ruleStoreUnreadableNotice(deps.onNotice, { sessionId, runId }), onRowsDropped: ruleRowsDroppedNotice(deps.onNotice, { sessionId, runId }) };
|
|
496
498
|
const readerOf = (signals) => personPathRowsOfTask({ deps, notices: personRowNotices, principal: spec.principal, ids: { sessionId, runId, taskId: hostTaskId }, root: taskRootFinal, rootCanonical: taskRootCanonical, leads: headLeads, chainTop, occurrences: toolOccurrences, signals });
|
|
@@ -509,7 +511,7 @@ export async function prepareTask(request, deps, sessions, resume, internals, ru
|
|
|
509
511
|
const { seat: worktreeSeat, writeLocation, checkout } = writeLocationOf({ spelled: taskRootFinal, canonical: taskRootCanonical });
|
|
510
512
|
const legWriteGuard = { exemptRoots: legExemptRoots, rows: toolPolicyWriteGuardRows([installedToolPolicy, ...(inheritedParentConstraints ?? []).map((c) => c.policy)]), checkout };
|
|
511
513
|
const sideCallBookRef = {};
|
|
512
|
-
const { roster, blockedRef, runtimeCaps, runtimeCapsFaulted, complianceDenies, complianceDegraded, agentForkDenial, observersActive, autoModeArmReason, autoModeDeciderRef, autoModeDenialTrackingRef, autoModeArmingRef, armAutoMode, selfOrchestrationActive, workflowToolsActive, workflowSizeGuideline } = await prepareCapsAndWorkflow({ spec, deps, askSeat: doors.askSeat, internals, crossBoundaryTree, session, sessionId, runId, hostTaskId, taskScope, taskRootFinal, ownTarget, model, thinking, lockedPreflight, checkpointSeat, toolEffects, toolFaceSnapshot, promptLean, resolvedInteractionPosture, harnessRef, parentSpecSeat, runClampSource, forwardEvent, inheritedGateForChildren, enrichSpecToolCtx, maybeOffload, taskArtifacts, requestReview, ...(spec.planFile !== undefined ? { planFileSource: { path: spec.planFile, shown: planFileShown(spec.planFile), read: (signal) => advertisedWritableDirs?.readPlanFile(signal) ?? Promise.resolve({ ok: false, reason: "this run admitted no plan file" }) } } : {}), enterPlanMode, permissionMode, readDenyEntries: () => personRows.tablesReady().then(() => ({ entries: readDenyMatcher?.entries ?? [], ruleRows: pathTables?.ruleRows() ?? effectivePathDenyRules })), peerLaneActive, peerSendMessageBuiltIn, runnerSelf, memoryEngineSession: () => memoryEngineSession, centerAdoption: () => centerAdoptionRef.current, agentStations: () => agentStationsRef.current, delegated: delegation.isDelegatedChild, sideCallBookRef });
|
|
514
|
+
const { roster, blockedRef, runtimeCaps, runtimeCapsFaulted, complianceDenies, complianceDegraded, agentForkDenial, observersActive, autoModeArmReason, autoModeDeciderRef, autoModeDenialTrackingRef, autoModeArmingRef, armAutoMode, selfOrchestrationActive, workflowToolsActive, workflowSizeGuideline } = await prepareCapsAndWorkflow({ spec, deps, delegationOwner, askSeat: doors.askSeat, internals, crossBoundaryTree, session, sessionId, runId, hostTaskId, taskScope, taskRootFinal, ownTarget, model, thinking, lockedPreflight, checkpointSeat, toolEffects, toolFaceSnapshot, promptLean, resolvedInteractionPosture, harnessRef, parentSpecSeat, runClampSource, forwardEvent, inheritedGateForChildren, enrichSpecToolCtx, maybeOffload, taskArtifacts, requestReview, ...(spec.planFile !== undefined ? { planFileSource: { path: spec.planFile, shown: planFileShown(spec.planFile), read: (signal) => advertisedWritableDirs?.readPlanFile(signal) ?? Promise.resolve({ ok: false, reason: "this run admitted no plan file" }) } } : {}), enterPlanMode, permissionMode, readDenyEntries: () => personRows.tablesReady().then(() => ({ entries: readDenyMatcher?.entries ?? [], ruleRows: pathTables?.ruleRows() ?? effectivePathDenyRules })), peerLaneActive, peerSendMessageBuiltIn, runnerSelf, memoryEngineSession: () => memoryEngineSession, centerAdoption: () => centerAdoptionRef.current, agentStations: () => agentStationsRef.current, delegated: delegation.isDelegatedChild, sideCallBookRef });
|
|
513
515
|
const tools = roster.tools;
|
|
514
516
|
const crossBoundary = await prepareCrossBoundaryLane({ token: crossBoundaryTree, posture: doors.crossBoundaryPosture, externalContentTargetActive, env: executionEnv, session, resumeLeg: resume !== undefined, sessionId, runId, hostTaskId, deps });
|
|
515
517
|
const sessionProject = await resolveSessionProject(projectMarkerFsOf(executionEnv), taskRootCanonical, spec.projectId);
|
|
@@ -762,6 +764,7 @@ export async function prepareTask(request, deps, sessions, resume, internals, ru
|
|
|
762
764
|
const rowSeat = createRowSeat();
|
|
763
765
|
const receiveSeat = createReceiveSeat();
|
|
764
766
|
const compactStation = createCompactStation();
|
|
767
|
+
const sessionMeasure = {};
|
|
765
768
|
const imageUnprocessed = imageUnprocessedSeat(deps.onNotice, deps.imageProcessor, { sessionId, runId });
|
|
766
769
|
const harness = new AgentHarness({
|
|
767
770
|
admitRows: rowSeat.admitRows,
|
|
@@ -870,14 +873,14 @@ export async function prepareTask(request, deps, sessions, resume, internals, ru
|
|
|
870
873
|
const preparedHolder = {};
|
|
871
874
|
const { cacheBreakDetector, cacheFingerprint, promptOverheadTokens, compactionRestore, normalizeAttachmentPath, isDedupStubResult, recentlyReadFiles, onCompactionApplied, detectExternalChanges, syntheticReadVerdict, consolidationWriteJudge, listBackgroundTasks, taskReadHandleOf, centerCompactionCandidate, effectiveReadFaceObserved, effectiveWriteFaceObserved, effectiveReadDenyObserved } = prepareTurnWiring({ deps, systemPromptSeat, harnessTools, fpRef, model, promptIdentityDigest: promptManifest.identity.artifact, systemBlocks, thinking, spec, sessionId, turnSnapshotRef, promptManifest, charsPerToken, handsEnabled, executionEnv, attachmentRootCanonical, readRoots, modelFileReader: modelFileReaderSeat.current, reminderMark, reminderDisclosureCounts, resolvedReadFace, handsCwdRef, readFileStateForCheckpoint, denyNarrowingPolicy, skillGrants: skillGrantLane, callerPolicy: installedToolPolicy, inheritedPolicies: (inheritedParentConstraints ?? []).flatMap((c) => (c.policy !== undefined ? [c.policy] : [])), persistedRuleLane: permissionRuleLane, ruleLaneFacts, personRowsBeyondRun, orgRuleLane: permissionRuleOrgLane, stampCallTarget, abortController, hostTaskId, taskScope, buildAssembleInputs, identityFor, adoptsCandidates, centerAdoptionRef, harnessRef, carrierReadFace, carrierWriteFace, readDenyAdditionsNormalized, preparedHolder });
|
|
872
875
|
await onceLedger.settle(session, announcedListingsRef);
|
|
873
|
-
const buildPrepared = () => ({ harness, session, sessionId, taskId: hostTaskId, runId, crossBoundary, ...(doors.hostFloor !== undefined ? { hostFloor: doors.hostFloor } : {}), registryAccess: { owner: hostTaskId, scope: taskScope }, reminderMark, reminderDisclosureCounts, fullShellReachable, approvalPosture: { get mode() { return permissionMode.current; }, askEffective: askSeatEffective(wiringManifest) }, ...(outputStyleFrame !== undefined ? { outputStyleFrame } : {}), permissionMode, editedFilesSnapshot, taskRootPath: taskRootFinal, model, thinking, compModel: effectiveCompModel, mcp, ...(mcpRedial !== undefined ? { mcpRedial } : {}), ...(a2a.tools.length > 0 ? { a2a } : {}), blockedRef, outputRef, abortController, conflictRef, blockedToolCalls, toolOccurrences, batchHaltRef, nestedStats, ...(rewindNotes.length > 0 ? { rewindNotes } : {}), ...(fileHistoryBoundary !== undefined ? { fileHistoryBoundary } : {}), ...(effectiveReadFaceObserved !== undefined ? { effectiveReadFace: effectiveReadFaceObserved, effectiveWriteFace: effectiveWriteFaceObserved } : {}), ...(effectiveReadDenyObserved !== undefined ? { effectiveReadDenyPatterns: effectiveReadDenyObserved } : {}), effectiveMemoryScopes: memoryEffectiveScopes, ...(placementValueOrAbsent(placementRootResolved) !== undefined ? { placementRoot: placementRootResolved } : {}), cwdRef: handsCwdRef, ...(attachmentRootCanonical !== undefined ? { handsRoot: attachmentRootCanonical } : {}), ...(stampCallTarget !== undefined ? { stampCallTarget } : {}), toolProgressRef, ...(advertisedWritableDirs !== undefined ? { advertisedWritableDirs } : {}), exemptRoots: legExemptRoots, ...(worktreeSessionRef !== undefined ? { worktreeSessionRef } : {}), workspaceFrame: createWorkspaceFrameSeat({ root: taskRootCanonical, ...(handsCwdRef !== undefined ? { cwdRef: handsCwdRef } : {}), ...(worktreeSessionRef !== undefined ? { worktreeSessionRef } : {}), ...(sessionProject.project !== undefined ? { project: sessionProject.project } : {}), remote: workspaceRemote }), ...(workspaceStateSettle !== undefined ? { workspaceStateSettle } : {}), ...(sealReadStateSeat !== undefined ? { sealReadStateSeat } : {}), denyNarrowingPolicy, skillGrants: skillGrantLane, skillSpecs, ...(permissionRuleLane !== undefined ? { persistedRuleLane: permissionRuleLane } : {}), ...(basePolicyForResumeEdit !== undefined ? { basePolicyForResumeEdit } : {}), consolidationWriteJudge, ...(permissionRuleOrgLane !== undefined ? { permissionRuleOrg: permissionRuleOrgLane } : {}), releaseSignal, endModeCeiling, settleContentAskBindings, cacheBreakDetector, cacheFingerprint, wiringManifest, promptManifest, promptIdentity, activeTools, ...(deferred.size > 0 ? { deferredToolNames: deferred } : {}), toolMaterializeStatic, deferDirectCall, ...(staticFaceForRef.current !== undefined ? { staticFaceFor: staticFaceForRef.current } : {}), ownedEnv, pausedRef, undeliveredContinuationRef, suspendProgressRef, remoteEnvFailures, reviewRequestRef, suspendLoopRef, suspendForResource, ...(suspendForPlatformLimit !== undefined ? { suspendForPlatformLimit } : {}), ...(envLifetimeSuspendAt !== undefined ? { envLifetimeSuspendAt } : {}), ...(usageGovernance !== undefined ? { usageGovernance } : {}), callIssuedAtRef, workCutRef, loopTerminalRef, brainCallGuardrailRef, gateStopRef, stopForDenialLimit, suspendForReview, ...(readFileStateForCheckpoint !== undefined ? { readFileState: readFileStateForCheckpoint } : {}), resourceLedger: priorLedger, liveSpendRef, humanReviewRef, now, tools, toolRoster, toolRosterDeltas: rosterSeat, structuredProjector, toolEffects, wakeRecovered, promptOverheadTokens, lastBrainContext, lastSentRequest: () => lastBrainContextRef.current, ...(advisor.instruction !== undefined ? { advisorInstruction: advisor.instruction } : {}), ...(compactionRestore !== undefined ? { compactionRestore } : {}), recentlyReadFiles, normalizeAttachmentPath, isDedupStubResult, ...(onCompactionApplied ? { onCompactionApplied } : {}), compactionReuseRef, trimPressureRef, microCompact, ...(memoryEngineSession ? { memoryEngineSession } : {}), ...(subagentRetain ? { subagentRetain } : {}), ...(lspDiagnostics && nudgeLspOnEdit && withheldDiagnosticsOf ? { lspDiagnostics: { registry: lspDiagnostics, nudge: nudgeLspOnEdit, runIdent: lspRunIdent, withheldOf: withheldDiagnosticsOf } } : {}), stopRequestedRef, announcedSnapshotRecovered: onceLedger.recovered, ...(dateChange ? { dateChange } : {}), ...(instructionSources ? { instructionSources } : {}), ...(projectInstructionContent !== undefined ? { projectInstructionContent } : {}), ...(workflowSizeGuideline ? { workflowSizeGuideline } : {}), ...(detectExternalChanges ? { detectExternalChanges } : {}), ...(toolsDeltaRef ? { toolsDeltaRef } : {}), ...(mcpUnavailable ? { mcpUnavailable } : {}), ...(agentListing ? { agentListing } : {}), ...(skillsListing ? { skillsListing } : {}), announcedListingsRef, frameReceipts, frameSettlement, ...(userAttachmentsSeat !== undefined ? { userAttachments: userAttachmentsSeat } : {}), attachmentDelivery: createAttachmentDelivery(), imageUnprocessed, ...(modelFileReaderSeat.current !== undefined ? { modelFileReader: modelFileReaderSeat.current } : {}), syntheticReadVerdict, ...(peerLaneRefs.boundaryRound !== undefined ? { peerBoundaryRound: peerLaneRefs.boundaryRound } : {}), gitStatusRef, postureFrameRef, listBackgroundTasks, taskReadHandleOf, hookIdentity, modBus: legMods.bus, admitRows: rowSeat.admitRows, receiveSeat, turnOpenRedelivery: {}, compactStation, sideCallBookRef, ...(sessionBoxBound !== undefined ? { sessionBox: sessionBoxBound } : {}), ...(turnSnapshotRef.current !== undefined ? { turnSnapshot: turnSnapshotRef.current } : {}), ...(centerCompactionCandidate !== undefined ? { centerCompactionCandidate } : {}), ...(shellReadCheck !== undefined ? { shellReadCheck } : {}), ...(shellReadLandings !== undefined ? { shellReadLandings } : {}), ...(toolDisclosureSeat !== undefined ? { toolDisclosure: toolDisclosureSeat } : {}), ...(approvedCallScreen !== undefined ? { approvedCallScreen } : {}), ...(toolCallStationRef.current !== undefined ? { toolCallStation: toolCallStationRef.current } : {}) });
|
|
876
|
+
const buildPrepared = () => ({ harness, session, sessionId, taskId: hostTaskId, runId, crossBoundary, ...(doors.hostFloor !== undefined ? { hostFloor: doors.hostFloor } : {}), registryAccess: { owner: hostTaskId, scope: taskScope }, reminderMark, reminderDisclosureCounts, fullShellReachable, approvalPosture: { get mode() { return permissionMode.current; }, askEffective: askSeatEffective(wiringManifest) }, ...(outputStyleFrame !== undefined ? { outputStyleFrame } : {}), permissionMode, editedFilesSnapshot, taskRootPath: taskRootFinal, model, thinking, compModel: effectiveCompModel, mcp, ...(mcpRedial !== undefined ? { mcpRedial } : {}), ...(a2a.tools.length > 0 ? { a2a } : {}), blockedRef, outputRef, abortController, conflictRef, blockedToolCalls, toolOccurrences, batchHaltRef, nestedStats, ...(rewindNotes.length > 0 ? { rewindNotes } : {}), ...(fileHistoryBoundary !== undefined ? { fileHistoryBoundary } : {}), ...(effectiveReadFaceObserved !== undefined ? { effectiveReadFace: effectiveReadFaceObserved, effectiveWriteFace: effectiveWriteFaceObserved } : {}), ...(effectiveReadDenyObserved !== undefined ? { effectiveReadDenyPatterns: effectiveReadDenyObserved } : {}), effectiveMemoryScopes: memoryEffectiveScopes, ...(placementValueOrAbsent(placementRootResolved) !== undefined ? { placementRoot: placementRootResolved } : {}), cwdRef: handsCwdRef, ...(attachmentRootCanonical !== undefined ? { handsRoot: attachmentRootCanonical } : {}), ...(stampCallTarget !== undefined ? { stampCallTarget } : {}), toolProgressRef, ...(advertisedWritableDirs !== undefined ? { advertisedWritableDirs } : {}), exemptRoots: legExemptRoots, ...(worktreeSessionRef !== undefined ? { worktreeSessionRef } : {}), workspaceFrame: createWorkspaceFrameSeat({ root: taskRootCanonical, ...(handsCwdRef !== undefined ? { cwdRef: handsCwdRef } : {}), ...(worktreeSessionRef !== undefined ? { worktreeSessionRef } : {}), ...(sessionProject.project !== undefined ? { project: sessionProject.project } : {}), remote: workspaceRemote }), ...(workspaceStateSettle !== undefined ? { workspaceStateSettle } : {}), ...(sealReadStateSeat !== undefined ? { sealReadStateSeat } : {}), denyNarrowingPolicy, skillGrants: skillGrantLane, skillSpecs, ...(permissionRuleLane !== undefined ? { persistedRuleLane: permissionRuleLane } : {}), ...(basePolicyForResumeEdit !== undefined ? { basePolicyForResumeEdit } : {}), consolidationWriteJudge, ...(permissionRuleOrgLane !== undefined ? { permissionRuleOrg: permissionRuleOrgLane } : {}), releaseSignal, endModeCeiling, settleContentAskBindings, cacheBreakDetector, cacheFingerprint, wiringManifest, promptManifest, promptIdentity, activeTools, ...(deferred.size > 0 ? { deferredToolNames: deferred } : {}), toolMaterializeStatic, deferDirectCall, ...(staticFaceForRef.current !== undefined ? { staticFaceFor: staticFaceForRef.current } : {}), ownedEnv, pausedRef, undeliveredContinuationRef, suspendProgressRef, remoteEnvFailures, reviewRequestRef, suspendLoopRef, suspendForResource, ...(suspendForPlatformLimit !== undefined ? { suspendForPlatformLimit } : {}), ...(envLifetimeSuspendAt !== undefined ? { envLifetimeSuspendAt } : {}), ...(usageGovernance !== undefined ? { usageGovernance } : {}), callIssuedAtRef, workCutRef, loopTerminalRef, brainCallGuardrailRef, gateStopRef, stopForDenialLimit, suspendForReview, ...(readFileStateForCheckpoint !== undefined ? { readFileState: readFileStateForCheckpoint } : {}), resourceLedger: priorLedger, liveSpendRef, humanReviewRef, now, tools, toolRoster, toolRosterDeltas: rosterSeat, structuredProjector, toolEffects, wakeRecovered, promptOverheadTokens, lastBrainContext, lastSentRequest: () => lastBrainContextRef.current, ...(advisor.instruction !== undefined ? { advisorInstruction: advisor.instruction } : {}), ...(compactionRestore !== undefined ? { compactionRestore } : {}), recentlyReadFiles, normalizeAttachmentPath, isDedupStubResult, ...(onCompactionApplied ? { onCompactionApplied } : {}), compactionReuseRef, trimPressureRef, microCompact, ...(memoryEngineSession ? { memoryEngineSession } : {}), ...(subagentRetain ? { subagentRetain } : {}), ...(lspDiagnostics && nudgeLspOnEdit && withheldDiagnosticsOf ? { lspDiagnostics: { registry: lspDiagnostics, nudge: nudgeLspOnEdit, runIdent: lspRunIdent, withheldOf: withheldDiagnosticsOf } } : {}), stopRequestedRef, announcedSnapshotRecovered: onceLedger.recovered, ...(dateChange ? { dateChange } : {}), ...(instructionSources ? { instructionSources } : {}), ...(projectInstructionContent !== undefined ? { projectInstructionContent } : {}), ...(workflowSizeGuideline ? { workflowSizeGuideline } : {}), ...(detectExternalChanges ? { detectExternalChanges } : {}), ...(toolsDeltaRef ? { toolsDeltaRef } : {}), ...(mcpUnavailable ? { mcpUnavailable } : {}), ...(agentListing ? { agentListing } : {}), ...(skillsListing ? { skillsListing } : {}), announcedListingsRef, frameReceipts, frameSettlement, ...(userAttachmentsSeat !== undefined ? { userAttachments: userAttachmentsSeat } : {}), attachmentDelivery: createAttachmentDelivery(), imageUnprocessed, ...(modelFileReaderSeat.current !== undefined ? { modelFileReader: modelFileReaderSeat.current } : {}), syntheticReadVerdict, ...(peerLaneRefs.boundaryRound !== undefined ? { peerBoundaryRound: peerLaneRefs.boundaryRound } : {}), gitStatusRef, postureFrameRef, listBackgroundTasks, taskReadHandleOf, hookIdentity, modBus: legMods.bus, admitRows: rowSeat.admitRows, receiveSeat, turnOpenRedelivery: {}, compactStation, sessionMeasure, sideCallBookRef, ...(sessionBoxBound !== undefined ? { sessionBox: sessionBoxBound } : {}), ...(turnSnapshotRef.current !== undefined ? { turnSnapshot: turnSnapshotRef.current } : {}), ...(centerCompactionCandidate !== undefined ? { centerCompactionCandidate } : {}), ...(shellReadCheck !== undefined ? { shellReadCheck } : {}), ...(shellReadLandings !== undefined ? { shellReadLandings } : {}), ...(toolDisclosureSeat !== undefined ? { toolDisclosure: toolDisclosureSeat } : {}), ...(approvedCallScreen !== undefined ? { approvedCallScreen } : {}), ...(toolCallStationRef.current !== undefined ? { toolCallStation: toolCallStationRef.current } : {}) });
|
|
874
877
|
refuseLateRosterChanges(callerRoster.roster);
|
|
875
878
|
rollback.commit();
|
|
876
879
|
commitModeSeats(abortController.signal);
|
|
877
880
|
const prepared = buildPrepared();
|
|
878
881
|
preparedHolder.current = prepared;
|
|
879
882
|
const toolCallEntry = createToolCallEntry({ bus: legMods.bus, harness, faceOf: (name) => toolCallFaceOf(rosterSeat.current, name), specOf: (name) => spec.tools?.find((s) => s.name === name) });
|
|
880
|
-
legMods.bindFacade(legFacadeSeats({ deps, spec, sessionId, model, executionEnv, readFloor: runFloor, taskRoot: taskRootFinal, cwdRef: handsCwdRef, lastBrainContext: prepared.lastBrainContext, activeTools, agentListing, book: (answeredBy, reply) => {
|
|
883
|
+
legMods.bindFacade(legFacadeSeats({ deps, spec, sessionId, model, executionEnv, readFloor: runFloor, taskRoot: taskRootFinal, cwdRef: handsCwdRef, lastBrainContext: prepared.lastBrainContext, agentSessions: { registry: defaultTaskRegistry, access: { ...prepared.registryAccess, sessionId } }, turns: async () => promptCountOf(await session.getBranch()), measure: sessionMeasure, activeTools, agentListing, book: (answeredBy, reply) => {
|
|
881
884
|
const book = prepared.sideCallBookRef.book;
|
|
882
885
|
if (book === undefined)
|
|
883
886
|
throw new Error("a mod's $.model.complete was answered before the run body bound the leg's usage account, which it does before any tool call");
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The resume ladder's ADMISSION rung (E1) and the wake's shaping (E2), verbatim from
|
|
3
3
|
* `Runner.resumeStream`: the outcome container's domain, the one-read snapshots of the caller's config and
|
|
4
|
-
* the trusted internals bag, the store resolution, the row read and its terminal-status confirm, the
|
|
5
|
-
* same-process parent-constraint re-supply, then the wake pre-ladder (gate purity, pendingAction purity,
|
|
4
|
+
* the trusted internals bag, the store resolution, the row read and its terminal-status confirm, the row's own verdict,
|
|
5
|
+
* the same-process parent-constraint re-supply, then the wake pre-ladder (gate purity, pendingAction purity,
|
|
6
6
|
* the message's persist-time validation) and the one read of the outcome discriminant and the signal slot.
|
|
7
7
|
*
|
|
8
8
|
* Async (two store reads); every refusal throws a typed `CheckpointError` pre-CAS. It ends by handing what it
|
|
@@ -40,7 +40,7 @@ export interface ResumeAdmissionInput<R> {
|
|
|
40
40
|
}
|
|
41
41
|
/** What admission established — the constants every later rung reads. */
|
|
42
42
|
export interface ResumeAdmissionResult {
|
|
43
|
-
/** The caller's config, snapshotted once (own enumerable fields)
|
|
43
|
+
/** The caller's config, snapshotted once (own enumerable fields); its MCP / A2A lists are the doors' judged copies of THIS resume's (the row records none). */
|
|
44
44
|
config: ResumeTaskConfig;
|
|
45
45
|
/** The trusted internals snapshot, with the parked parent chain re-supplied when this Runner spawned the leg. */
|
|
46
46
|
internals: RunInternals | undefined;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { CheckpointError, judgeParkedSteerRepeat, readPendingSteerQueue,
|
|
1
|
+
import { CheckpointError, judgeParkedSteerRepeat, readPendingSteerQueue, resolveCheckpointStore, validatePendingSteer } from "../checkpoint-store.js";
|
|
2
|
+
import { checkpointRowRefusal } from "../checkpoint-row-verdict.js";
|
|
2
3
|
import { assertResumeConfigRecord, checkpointStoreSeat, refuseResumeDoors } from "./prepare-config-doors.js";
|
|
3
4
|
import { compositionLegRecord } from "./checkpoint-scope.js";
|
|
4
5
|
import { asResumeConfigRefusal } from "../mode-policy.js";
|
|
@@ -49,6 +50,9 @@ export async function resumeAdmission(input) {
|
|
|
49
50
|
}
|
|
50
51
|
throw new CheckpointError("checkpoint.already_resolved", `checkpoint is ${describeSuppliedValue(live?.status ?? cp.status)} — the token is consumed, so this resume was neither validated nor executed (idempotent); a different outcome cannot redeem it`);
|
|
51
52
|
}
|
|
53
|
+
const rowRefusal = checkpointRowRefusal(cp);
|
|
54
|
+
if (rowRefusal !== undefined)
|
|
55
|
+
throw rowRefusal;
|
|
52
56
|
if ((internals?.inheritedGate?.parentConstraints?.length ?? 0) === 0) {
|
|
53
57
|
const parked = parentConstraintRegistry.get(token);
|
|
54
58
|
if (parked !== undefined) {
|
|
@@ -62,8 +66,7 @@ export async function resumeAdmission(input) {
|
|
|
62
66
|
const outcomeGate = outcome.gate;
|
|
63
67
|
const resumeSignal = config.signal;
|
|
64
68
|
let suppliedMessage;
|
|
65
|
-
|
|
66
|
-
config = refuseResumeDoors(config, cp.state, runner.deps, sessions, internals?.holder);
|
|
69
|
+
config = refuseResumeDoors(config, runner.deps, sessions, internals?.holder);
|
|
67
70
|
const parkedSteers = readPendingSteerQueue(cp.state);
|
|
68
71
|
if (outcomeGate === "wake") {
|
|
69
72
|
suppliedMessage = outcome.message;
|
|
@@ -41,6 +41,10 @@ export interface ResumeApplyInput<R> {
|
|
|
41
41
|
export interface ResumeApplyResult {
|
|
42
42
|
/** The screen's `additionalContext` for the wake message, when a screen ran and supplied one. */
|
|
43
43
|
wakeHookContext: string | undefined;
|
|
44
|
+
/** The wake message the leg delivers: the validated one, or as the screen handed it on (`prompt.submit` rewrote its text). */
|
|
45
|
+
wakeMessage: Omit<PendingSteerEntry, "seq"> | undefined;
|
|
46
|
+
/** Who rewrote the wake message's text, in the order they did; absent when nobody did. */
|
|
47
|
+
wakeRewrittenBy?: readonly string[];
|
|
44
48
|
/** The resumed leg's bus, when the wake-message screen made this rung admit it (the leg adopts it). */
|
|
45
49
|
legMods?: LegMods;
|
|
46
50
|
/** The approval lane's twin WITH its minted settlement record (undefined on every other lane). */
|
|
@@ -2,7 +2,7 @@ import { snapshotActorAssertion } from "../../internal/llm.js";
|
|
|
2
2
|
import { CheckpointError, remainingBudgetMicroUsd } from "../checkpoint-store.js";
|
|
3
3
|
import { chainPolicyOnLeg, chainTopAnchors } from "./child-tree.js";
|
|
4
4
|
import { mintHookInvocationIdentity } from "../hooks.js";
|
|
5
|
-
import { admitLegMods, classicEventBase, failedHandlerClause, screenUserPrompt } from "../mods/stations.js";
|
|
5
|
+
import { admitLegMods, classicEventBase, failedHandlerClause, promptScreenHasHandlers, screenUserPrompt } from "../mods/stations.js";
|
|
6
6
|
import { legTaskIdOf } from "../leg-identity.js";
|
|
7
7
|
import { restoreRowTaskId } from "./checkpoint-scope.js";
|
|
8
8
|
import { checkToolPolicyProjection, policyCannotAnswer, refuseOutOfContractDecision } from "../tool-policy.js";
|
|
@@ -24,12 +24,14 @@ export async function resumeApply(input) {
|
|
|
24
24
|
const { cp, config, internals, outcomeGate, wakeMessage, resumeSignal, recheckGovernanceWindow, plainReviewOutcome, plainParkOutcome, runner, effectiveDelegationFacts } = input;
|
|
25
25
|
let plainPolicyOutcome = input.plainPolicyOutcome;
|
|
26
26
|
let wakeHookContext;
|
|
27
|
+
let wakeDelivered = wakeMessage;
|
|
28
|
+
let wakeRewrittenBy;
|
|
27
29
|
let legMods;
|
|
28
30
|
if (outcomeGate === "wake" && wakeMessage !== undefined) {
|
|
29
31
|
if (resumeSignal?.aborted !== true) {
|
|
30
32
|
legMods = await admitLegMods({ spec: config, deps: runner.deps, sessionId: cp.sessionId, skills: skillsThatLoad(readSkillsSeat(config.skills)), reopenedSkills: frozenSkillScopesOf(cp.state) });
|
|
31
33
|
}
|
|
32
|
-
if (legMods !== undefined && legMods.bus
|
|
34
|
+
if (legMods !== undefined && promptScreenHasHandlers(legMods.bus)) {
|
|
33
35
|
const screenedMessage = wakeMessage;
|
|
34
36
|
const identity = mintHookInvocationIdentity({
|
|
35
37
|
sessionId: cp.sessionId,
|
|
@@ -61,6 +63,10 @@ export async function resumeApply(input) {
|
|
|
61
63
|
if (screen?.additionalContext !== undefined && screen.additionalContext !== "") {
|
|
62
64
|
wakeHookContext = screen.additionalContext;
|
|
63
65
|
}
|
|
66
|
+
if (screen?.kind === "answered" && screen.rewrittenBy !== undefined) {
|
|
67
|
+
wakeDelivered = { ...screenedMessage, text: screen.text };
|
|
68
|
+
wakeRewrittenBy = screen.rewrittenBy;
|
|
69
|
+
}
|
|
64
70
|
if (recheckGovernanceWindow !== undefined)
|
|
65
71
|
await recheckGovernanceWindow();
|
|
66
72
|
}
|
|
@@ -176,9 +182,10 @@ export async function resumeApply(input) {
|
|
|
176
182
|
if (outcomeForReview?.gate === "plan_review") {
|
|
177
183
|
outcomeForReview = { ...outcomeForReview, gateOutcome: mintDecideRecord(cp, outcomeForReview.hostDecision, { allowed: outcomeForReview.decision !== "reject", note: outcomeForReview.reason }) };
|
|
178
184
|
}
|
|
179
|
-
const
|
|
185
|
+
const parkOutcome = plainParkOutcome?.gate === "wake" && wakeDelivered !== wakeMessage && wakeDelivered !== undefined ? { gate: "wake", message: wakeDelivered } : plainParkOutcome;
|
|
186
|
+
const outcomeForStore = plainPolicyOutcome ?? outcomeForReview ?? parkOutcome;
|
|
180
187
|
if (outcomeForStore === undefined) {
|
|
181
188
|
throw new CheckpointError("checkpoint.invalid_outcome", `resume outcome (gate "${describeSuppliedValue(outcomeGate)}") matched the checkpoint gate but no lane captured it — refusing pre-CAS rather than passing the caller's live object to the store and the resumed run`);
|
|
182
189
|
}
|
|
183
|
-
return await input.next({ wakeHookContext, ...(legMods !== undefined ? { legMods } : {}), plainPolicyOutcome, outcomeForStore });
|
|
190
|
+
return await input.next({ wakeHookContext, wakeMessage: wakeDelivered, ...(wakeRewrittenBy !== undefined ? { wakeRewrittenBy } : {}), ...(legMods !== undefined ? { legMods } : {}), plainPolicyOutcome, outcomeForStore });
|
|
184
191
|
}
|
|
@@ -1,3 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The resume ladder's CHECKPOINT SCREEN (E5) and its abort / workspace-handle / inherited-
|
|
3
|
+
* constraint rungs (E6), verbatim from `Runner.resumeStream`: the rungs a deployment fact or a resume input decides — the
|
|
4
|
+
* org-governance wiring check, the already-aborted signal, the remote-handle factory requirement, the requestedCwd conflict,
|
|
5
|
+
* the row's recorded ceiling and own lists (each when the leg runs under it), a renamed delegation mount, the parent-constraint
|
|
6
|
+
* count / content / installation checks, and the array-level snapshot of the validated chain. The rungs the row and the engine
|
|
7
|
+
* decide alone are the row's verdict, judged at admission (`judgeCheckpointRow`).
|
|
8
|
+
* Synchronous; every refusal throws pre-CAS.
|
|
9
|
+
*/
|
|
1
10
|
import { type Checkpoint } from "../checkpoint-store.js";
|
|
2
11
|
import type { RunInternals, RunnerDepsSeat } from "./contracts.js";
|
|
3
12
|
export interface ResumeCheckpointScreenInput {
|
|
@@ -1,85 +1,15 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { validatePath } from "../effective-path-target.js";
|
|
3
|
-
import { isAskOrigin } from "../ask-origin.js";
|
|
4
|
-
import { CHECKPOINT_FEATURES, CheckpointError, checkpointVersionOf, MAX_SUPPORTED_CHECKPOINT_VERSION, realApprovalOrgFact } from "../checkpoint-store.js";
|
|
5
|
-
import { judgeCheckpointRequirements } from "../checkpoint-requirements.js";
|
|
1
|
+
import { CheckpointError, realApprovalOrgFact } from "../checkpoint-store.js";
|
|
6
2
|
import { constraintChainDigest, constraintChainEntryOfSuppliedLayer } from "../tool-policy.js";
|
|
7
|
-
import { readFrozenSkillGrants } from "../skill-grant.js";
|
|
8
|
-
import { readFrozenSkillScopes } from "../mods/spec-seats.js";
|
|
9
3
|
import { chainInstallationGaps, chainInstallationRefusal } from "./child-tree.js";
|
|
10
4
|
import { chainEntryFault } from "../mods/stations.js";
|
|
11
5
|
import { refusePersistedToolNames, refuseRenamedDelegationMounts } from "./sub-agent-deny-lists.js";
|
|
12
6
|
import { asResumeConfigRefusal } from "../mode-policy.js";
|
|
13
|
-
import { screenRecordedRunOrigin } from "../run-origin.js";
|
|
14
7
|
export function resumeCheckpointScreen(input) {
|
|
15
8
|
const { cp, resumeSignal, internals, tools, runner } = input;
|
|
16
|
-
const { realApproval: realApprovalRow, face: faceRow, f012: f012Row } = CHECKPOINT_FEATURES;
|
|
17
|
-
if (checkpointVersionOf(cp) > MAX_SUPPORTED_CHECKPOINT_VERSION) {
|
|
18
|
-
throw new CheckpointError("checkpoint.unsupported_version", `checkpoint requires reader capabilities this worker lacks (row format v${checkpointVersionOf(cp)}; this worker reads up to v${MAX_SUPPORTED_CHECKPOINT_VERSION}) — resume it on a worker at or above the version that parked it`, { reason: "version_newer" });
|
|
19
|
-
}
|
|
20
|
-
const requirements = judgeCheckpointRequirements(cp);
|
|
21
|
-
if (requirements.kind === "lacking")
|
|
22
|
-
throw new CheckpointError("checkpoint.unsupported_version", `checkpoint requires reader capabilities this worker lacks (${requirements.words.join(", ")}) — resume it on a worker at or above the version that parked it`, { reason: "version_newer", requires: requirements.words });
|
|
23
|
-
if (requirements.kind === "damaged")
|
|
24
|
-
throw new CheckpointError("checkpoint.invalid_outcome", `this checkpoint's reader-requirement list does not match the row (${requirements.why}) — refusing to resume a damaged row (corruption guard), the checkpoint stays pending; no worker can resume it: start the task again`, { reason: "requirements_damaged" });
|
|
25
9
|
const preCasGateBit = cp.gate.kind === "irreversible_ask" ? cp.gate.realApproval : undefined;
|
|
26
|
-
const preCasBitWellFormed = preCasGateBit !== undefined && typeof preCasGateBit === "object" && isAskOrigin(preCasGateBit.origin);
|
|
27
|
-
const faceSaysGoverned = (cp.state.readFace?.realApproval) === true;
|
|
28
|
-
const preCasBitViolation = checkpointVersionOf(cp) === realApprovalRow.version
|
|
29
|
-
? !preCasBitWellFormed
|
|
30
|
-
: checkpointVersionOf(cp) < realApprovalRow.version
|
|
31
|
-
? preCasGateBit !== undefined
|
|
32
|
-
: faceSaysGoverned
|
|
33
|
-
? !preCasBitWellFormed
|
|
34
|
-
: preCasGateBit !== undefined && !preCasBitWellFormed;
|
|
35
|
-
if (preCasBitViolation) {
|
|
36
|
-
throw new CheckpointError("checkpoint.invalid_outcome", checkpointVersionOf(cp) >= realApprovalRow.version
|
|
37
|
-
? `a v${checkpointVersionOf(cp)} checkpoint's realApproval gate bit must be well-formed (origin a member of the closed ask-origin set)${checkpointVersionOf(cp) === realApprovalRow.version ? " and present on an irreversible_ask gate" : ""} — this row's is not; refusing to resume a damaged real-approval row (corruption / downgrade guard), the checkpoint stays pending`
|
|
38
|
-
: `a v${checkpointVersionOf(cp)} checkpoint carries a realApproval gate bit no release of that version ever minted — refusing to honor a fabricated origin (corruption / forgery guard), the checkpoint stays pending`, { reason: checkpointVersionOf(cp) >= realApprovalRow.version ? "real_approval_damaged" : "real_approval_forged" });
|
|
39
|
-
}
|
|
40
|
-
{
|
|
41
|
-
const faceSectionRaw = cp.state.readFace;
|
|
42
|
-
const faceCandidate = faceSectionRaw !== undefined && typeof faceSectionRaw === "object" && faceSectionRaw !== null
|
|
43
|
-
? faceSectionRaw
|
|
44
|
-
: undefined;
|
|
45
|
-
const faceWellFormed = faceCandidate !== undefined &&
|
|
46
|
-
(faceCandidate.face === "open" || faceCandidate.face === "roots") &&
|
|
47
|
-
(faceCandidate.realApproval === undefined || faceCandidate.realApproval === true) &&
|
|
48
|
-
(faceCandidate.denyEntries === undefined ||
|
|
49
|
-
(Array.isArray(faceCandidate.denyEntries) &&
|
|
50
|
-
faceCandidate.denyEntries.every((e) => persistedReadDenyEntryProblem(e) === null)));
|
|
51
|
-
const v = checkpointVersionOf(cp);
|
|
52
|
-
if (v === faceRow.version ? !faceWellFormed : v < faceRow.version ? faceSectionRaw !== undefined : faceSectionRaw !== undefined && !faceWellFormed) {
|
|
53
|
-
throw new CheckpointError("checkpoint.invalid_outcome", checkpointVersionOf(cp) >= faceRow.version
|
|
54
|
-
? `a v${checkpointVersionOf(cp)} checkpoint must carry a well-formed read-face section (state.readFace) — this row's is missing or malformed; refusing to resume a damaged read-face row (corruption / downgrade guard), the checkpoint stays pending`
|
|
55
|
-
: `a v${checkpointVersionOf(cp)} checkpoint carries a read-face section no release of that version ever minted — refusing to honor a fabricated read-face state (corruption / forgery guard), the checkpoint stays pending`, { reason: checkpointVersionOf(cp) >= faceRow.version ? "read_face_damaged" : "read_face_forged" });
|
|
56
|
-
}
|
|
57
|
-
const writeFaceSectionRaw = cp.state.writeFace;
|
|
58
|
-
if (writeFaceSectionRaw !== undefined) {
|
|
59
|
-
const c = typeof writeFaceSectionRaw === "object" && writeFaceSectionRaw !== null ? writeFaceSectionRaw : undefined;
|
|
60
|
-
if (c === undefined || !(c.face === "open" || c.face === "roots")) {
|
|
61
|
-
throw new CheckpointError("checkpoint.invalid_outcome", `this checkpoint carries a write-face section (state.writeFace) that is not well-formed — refusing to resume a damaged write-face row (corruption guard), the checkpoint stays pending`, { reason: "write_face_damaged" });
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
if (readFrozenSkillGrants(cp.state.skillGrants) === undefined)
|
|
65
|
-
throw new CheckpointError("checkpoint.invalid_outcome", "this checkpoint carries a skill-grant section (state.skillGrants) that does not read as grant rows under this engine — a damaged section, or a row an earlier release wrote whose entry this release reads as nothing (an entry with a surrounding space, say) — refusing to resume without the grant rows and refusals it carries; the checkpoint stays pending: finish it on a worker of the release that parked it, or expire it", { reason: "skill_grants_damaged" });
|
|
66
|
-
if (readFrozenSkillScopes(cp.state.skillScopes) === undefined)
|
|
67
|
-
throw new CheckpointError("checkpoint.invalid_outcome", "this checkpoint carries a skill-scope section (state.skillScopes) that does not read as a list of SkillSpec names — a damaged section — refusing to resume without the active skills' hooks it records; the checkpoint stays pending: finish it on a worker of the release that parked it, or expire it", { reason: "skill_scopes_damaged" });
|
|
68
|
-
for (const field of ["handsRoot", "handsHome", "handsCwd"]) {
|
|
69
|
-
const coordinate = cp.state[field];
|
|
70
|
-
if (coordinate !== undefined && validatePath(coordinate, { intent: "validate-coordinate" }) === undefined)
|
|
71
|
-
throw new CheckpointError("checkpoint.invalid_outcome", `this checkpoint's state.${field} is not an absolute path — refusing to resume a row whose hands' coordinates are damaged (corruption guard), the checkpoint stays pending`, { reason: "hands_coordinates_damaged" });
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
10
|
if (realApprovalOrgFact(preCasGateBit) !== undefined && runner.deps.permissionRuleStore?.partitions.org !== true) {
|
|
75
11
|
throw new CheckpointError("checkpoint.unsupported_version", `this checkpoint's approval was minted under organization governance (org ${String(realApprovalOrgFact(preCasGateBit))}, routed as ${String(preCasGateBit?.origin)}) and this worker has no org adjudication wiring (its permission-rule store carries no org partition) — a governed approval may only be redeemed where governance can be enforced; the checkpoint stays pending, resume it on an org-wired worker`, { reason: "governed_unwired" });
|
|
76
12
|
}
|
|
77
|
-
const retiredWalltimeTotal = cp.resourceLedger?.totalWalltimeSec;
|
|
78
|
-
if (retiredWalltimeTotal !== undefined) {
|
|
79
|
-
throw new CheckpointError("checkpoint.walltime_axis_retired", "this checkpoint's ledger carries a cross-slice WALL-CLOCK allocation (resourceLedger.totalWalltimeSec), an axis this engine version retired — " +
|
|
80
|
-
"resuming here would run the leg with that ceiling unenforced. Rejected pre-CAS (the checkpoint stays pending): finish it on a worker of the " +
|
|
81
|
-
"previous release, or start a fresh task bounded by resourceSuspend.totalTokens / totalBudgetUsd.");
|
|
82
|
-
}
|
|
83
13
|
if (resumeSignal?.aborted === true && cp.status === "pending") {
|
|
84
14
|
throw new CheckpointError("checkpoint.resume_aborted", "the resume was handed an ALREADY-ABORTED signal — refusing to consume the approval on a leg that cannot run it (the checkpoint stays pending and is resumable with a live signal)");
|
|
85
15
|
}
|
|
@@ -91,8 +21,7 @@ export function resumeCheckpointScreen(input) {
|
|
|
91
21
|
"the restored workspace's own mount path is authoritative for the task root. Drop requestedCwd on resume legs " +
|
|
92
22
|
"(the checkpoint stays pending and is resumable without it).");
|
|
93
23
|
}
|
|
94
|
-
asResumeConfigRefusal("inheritedGate", () => refusePersistedToolNames((internals?.toolCeiling ?? undefined) === undefined ? cp.state.toolCeiling : undefined,
|
|
95
|
-
asResumeConfigRefusal("inheritedGate", () => void screenRecordedRunOrigin(cp.state.runOrigin));
|
|
24
|
+
asResumeConfigRefusal("inheritedGate", () => refusePersistedToolNames((internals?.toolCeiling ?? undefined) === undefined ? cp.state.toolCeiling : undefined, undefined, (internals?.ownToolLists ?? undefined) === undefined ? cp.state.ownToolLists : undefined));
|
|
96
25
|
asResumeConfigRefusal("taskConfig", () => refuseRenamedDelegationMounts(tools));
|
|
97
26
|
if (cp.state.inheritedGate?.requiresParentConstraint === true) {
|
|
98
27
|
const supplied = internals?.inheritedGate?.parentConstraints?.length ?? 0;
|
|
@@ -108,18 +37,9 @@ export function resumeCheckpointScreen(input) {
|
|
|
108
37
|
"re-supply would run the resumed leg under a different ancestor chain than it suspended with; " +
|
|
109
38
|
"rejected pre-CAS (the checkpoint stays pending) — re-resume with the full original chain");
|
|
110
39
|
}
|
|
111
|
-
if (checkpointVersionOf(cp) >= f012Row.version &&
|
|
112
|
-
(cp.state.inheritedGate.constraintChain === undefined || cp.state.inheritedGate.constraintDigest === undefined)) {
|
|
113
|
-
throw new CheckpointError("checkpoint.invalid_outcome", `a v${checkpointVersionOf(cp)} checkpoint that requires parent constraints must carry BOTH the frozen constraintChain and its constraintDigest (they are minted in one write with the version stamp) — this row carries neither or only one; refusing to fall back to the count-only contract on a damaged row (corruption / downgrade guard), the checkpoint stays pending`, { reason: "constraint_chain_missing" });
|
|
114
|
-
}
|
|
115
40
|
const expectedDigest = cp.state.inheritedGate.constraintDigest;
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
if (persistedChain === undefined || constraintChainDigest(persistedChain) !== expectedDigest) {
|
|
119
|
-
throw new CheckpointError("resume.parent_constraint_mismatch", "the checkpoint's OWN recorded constraint chain does not match its recorded digest " +
|
|
120
|
-
"(corrupt / inconsistently-minted row) — the frozen deny data the resume would execute is not the data the " +
|
|
121
|
-
"digest authenticates; rejected pre-CAS (the checkpoint stays pending)");
|
|
122
|
-
}
|
|
41
|
+
const persistedChain = cp.state.inheritedGate.constraintChain;
|
|
42
|
+
if (expectedDigest !== undefined && persistedChain !== undefined) {
|
|
123
43
|
const suppliedDigest = constraintChainDigest((internals?.inheritedGate?.parentConstraints ?? []).map((pc, i) => constraintChainEntryOfSuppliedLayer(pc, persistedChain[i])));
|
|
124
44
|
if (suppliedDigest !== expectedDigest) {
|
|
125
45
|
throw new CheckpointError("resume.parent_constraint_mismatch", "the re-supplied parent-constraint chain's projection content does not match what the checkpoint recorded " +
|
|
@@ -45,6 +45,8 @@ export interface RunGitLaneInput {
|
|
|
45
45
|
onTurnEnd: (event: Extract<AgentHarnessEvent, {
|
|
46
46
|
type: "turn_end";
|
|
47
47
|
}>) => void;
|
|
48
|
+
/** borrowed-readonly — the harness-handlers lane's turn_start closure (awaited by the loop only when it raises). */
|
|
49
|
+
onTurnStart: () => Promise<void> | undefined;
|
|
48
50
|
/** borrowed-readonly — the turn-boundary lane's handler, registered on `turn_boundary` AFTER the owed-frame retry
|
|
49
51
|
* so a pending announcement is re-asserted into the session ahead of the boundary's own context work. */
|
|
50
52
|
onTurnBoundary: (event: {
|
|
@@ -3,7 +3,7 @@ import { wrapGitFrame } from "./git-leg-delivery.js";
|
|
|
3
3
|
import { appendAdmittedRow } from "../row-admission.js";
|
|
4
4
|
import { thrownText } from "../thrown-value.js";
|
|
5
5
|
export function runGitLane(input) {
|
|
6
|
-
const { prepared, queue, rs, ident, onMessageUpdate, onMessageEnd, onToolStart, onToolEnd, onTurnEnd, onTurnBoundary, runner } = input;
|
|
6
|
+
const { prepared, queue, rs, ident, onMessageUpdate, onMessageEnd, onToolStart, onToolEnd, onTurnEnd, onTurnStart, onTurnBoundary, runner } = input;
|
|
7
7
|
prepared.gitStatusRef.reassert = async () => {
|
|
8
8
|
const ref = prepared.gitStatusRef;
|
|
9
9
|
const frame = ref.frame;
|
|
@@ -81,6 +81,8 @@ export function runGitLane(input) {
|
|
|
81
81
|
const unsubBoundary = prepared.harness.on("turn_boundary", onTurnBoundary);
|
|
82
82
|
const unsub = prepared.harness.subscribe((event) => {
|
|
83
83
|
switch (event.type) {
|
|
84
|
+
case "turn_start":
|
|
85
|
+
return onTurnStart();
|
|
84
86
|
case "message_update":
|
|
85
87
|
onMessageUpdate(event);
|
|
86
88
|
break;
|
|
@@ -99,6 +101,7 @@ export function runGitLane(input) {
|
|
|
99
101
|
default:
|
|
100
102
|
break;
|
|
101
103
|
}
|
|
104
|
+
return undefined;
|
|
102
105
|
});
|
|
103
106
|
return { flushGitMirror, unsubGitRetry, unsubBoundary, unsub };
|
|
104
107
|
}
|
|
@@ -36,6 +36,8 @@ export interface RunHarnessHandlersResult {
|
|
|
36
36
|
onTurnEnd: (event: Extract<AgentHarnessEvent, {
|
|
37
37
|
type: "turn_end";
|
|
38
38
|
}>) => void;
|
|
39
|
+
/** A model turn began: `turn.start` (the loop awaits it before the turn's first request); `undefined` when unheard. */
|
|
40
|
+
onTurnStart: () => Promise<void> | undefined;
|
|
39
41
|
/** The leg's workspace-frame observation (`Prepared.workspaceFrame.observe`); the run body
|
|
40
42
|
* calls it after a resume's approved-call resolution, which bypasses onToolEnd. */
|
|
41
43
|
announceWorkspaceMove: () => void;
|
|
@@ -13,7 +13,7 @@ import { hasVerifiableStructureSignal } from "./grounding-signal.js";
|
|
|
13
13
|
import { announceToolCall, batchResponseDigest, emitSettled } from "./tool-end-body.js";
|
|
14
14
|
import { neverExecuted, stampRowNotExecuted } from "./tool-not-executed.js";
|
|
15
15
|
import { extensionCallOf, noteExtensionCallDenied, requesterOf } from "../mods/extension-call.js";
|
|
16
|
-
import { noteCompletedTurn } from "../mods/lifecycle-stations.js";
|
|
16
|
+
import { noteCompletedTurn, raiseStartedTurn } from "../mods/lifecycle-stations.js";
|
|
17
17
|
import { createResponseModelSeat } from "./response-model-seat.js";
|
|
18
18
|
import { createToolCallIdFoldSeat } from "./tool-call-id-fold-seat.js";
|
|
19
19
|
import { createFinishReasonSeat } from "./finish-reason-seat.js";
|
|
@@ -296,6 +296,7 @@ export function createHarnessHandlers(input) {
|
|
|
296
296
|
}
|
|
297
297
|
}
|
|
298
298
|
};
|
|
299
|
+
const onTurnStart = () => raiseStartedTurn(prepared.modBus, prepared.hookIdentity, stats.turns + 1, prepared.abortController.signal);
|
|
299
300
|
const onTurnEnd = (event) => {
|
|
300
301
|
stats.turns += 1;
|
|
301
302
|
noteCompletedTurn(prepared.modBus, rs.turn, event.message.role === "assistant" ? event.message : undefined, stats.turns, prepared.abortController.signal.aborted, rs.turn.turnUsageMissing ? undefined : rs.turn.turnUsage);
|
|
@@ -363,5 +364,5 @@ export function createHarnessHandlers(input) {
|
|
|
363
364
|
}
|
|
364
365
|
}
|
|
365
366
|
};
|
|
366
|
-
return { onMessageUpdate, onMessageEnd, onToolStart, onToolEnd, onTurnEnd, announceWorkspaceMove };
|
|
367
|
+
return { onMessageUpdate, onMessageEnd, onToolStart, onToolEnd, onTurnEnd, onTurnStart, announceWorkspaceMove };
|
|
367
368
|
}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { snapshotActorAssertion } from "../../internal/llm.js";
|
|
2
|
-
import {
|
|
2
|
+
import { steeringPreview } from "./steering-preview.js";
|
|
3
3
|
import { isEngineQuestionFace } from "../ask-question.js";
|
|
4
4
|
import { CheckpointError, planReviewRequesterOf, readPendingSteerQueue, realApprovalOrgFact, remainingBudgetMicroUsd } from "../checkpoint-store.js";
|
|
5
5
|
import { normalizePersistedRuleHit } from "../rule-lane-reads.js";
|
|
6
6
|
import { decidersNote, SETTLEMENT_NOBODY_JUDGED } from "../gate-outcome.js";
|
|
7
7
|
import { formatHookFeedback } from "../hooks.js";
|
|
8
8
|
import { classicEventBase, failedHandlerClause, legEventsOf, legNoticeTaskId, openSubagent, screenUserPrompt, seatHears } from "../mods/stations.js";
|
|
9
|
+
import { raiseSessionEnd, raiseSessionStart } from "../mods/lifecycle-stations.js";
|
|
9
10
|
import { offeredAgentListing } from "../mods/agent-stations.js";
|
|
10
11
|
import { appendAdmittedRow } from "../row-admission.js";
|
|
11
12
|
import { buildAppliedHumanInputEvent, buildHumanInputEvent, projectHumanInput } from "../human-input-projection.js";
|
|
@@ -65,6 +66,9 @@ export async function runLeg(input) {
|
|
|
65
66
|
let strandedHumanAnswers = [];
|
|
66
67
|
const legRunOrigin = prepared.wiringManifest.leg?.runOrigin;
|
|
67
68
|
try {
|
|
69
|
+
const starting = raiseSessionStart(prepared.modBus, prepared.hookIdentity, { cwd: prepared.cwdRef?.current ?? prepared.taskRootPath, sessionId: prepared.sessionId }, prepared.abortController.signal);
|
|
70
|
+
if (starting !== undefined)
|
|
71
|
+
await starting;
|
|
68
72
|
if (prepared.abortController.signal.aborted) {
|
|
69
73
|
const e = new Error("run aborted");
|
|
70
74
|
e.name = "AbortError";
|
|
@@ -188,6 +192,7 @@ export async function runLeg(input) {
|
|
|
188
192
|
continuation += "\n\n" + formatHookFeedback(resume.wakeMessageHookContext, prepared.reminderMark);
|
|
189
193
|
engineSegments.push({ start: hookStart, end: continuation.length });
|
|
190
194
|
}
|
|
195
|
+
let delivered = { text: steer.text, rewrittenBy: source === "wake" ? resume.wakeMessageRewrittenBy : undefined };
|
|
191
196
|
if (source === "steer") {
|
|
192
197
|
const screen = await screenUserPrompt(prepared.modBus, {
|
|
193
198
|
...classicEventBase(prepared.hookIdentity, prepared.permissionMode.observed),
|
|
@@ -235,6 +240,8 @@ export async function runLeg(input) {
|
|
|
235
240
|
});
|
|
236
241
|
continue;
|
|
237
242
|
}
|
|
243
|
+
if (screen.kind === "answered" && screen.rewrittenBy !== undefined)
|
|
244
|
+
delivered = { text: screen.text, rewrittenBy: screen.rewrittenBy };
|
|
238
245
|
if ("context" in outcome && outcome.context !== undefined) {
|
|
239
246
|
const hookStart = continuation.length;
|
|
240
247
|
continuation += "\n\n" + formatHookFeedback(outcome.context, prepared.reminderMark);
|
|
@@ -243,14 +250,14 @@ export async function runLeg(input) {
|
|
|
243
250
|
}
|
|
244
251
|
}
|
|
245
252
|
const start = continuation.length;
|
|
246
|
-
const projected = projectHumanInput({ text:
|
|
253
|
+
const projected = projectHumanInput({ text: delivered.text, actor: steer.actor, source });
|
|
247
254
|
continuation +=
|
|
248
255
|
"\n\n" +
|
|
249
256
|
(steer.trusted ? formatHookFeedback(projected, prepared.reminderMark) : delimitUntrusted("supervisor steering message", projected));
|
|
250
257
|
if (steer.trusted)
|
|
251
258
|
engineSegments.push({ start, end: continuation.length });
|
|
252
259
|
appliedEvents.push(() => ({
|
|
253
|
-
...buildAppliedHumanInputEvent({ carrier: source, source, sessionSeq: nextHumanInputSeq(prepared.harness), inputId: steer.inputId, actor: steer.actor, principal: spec.principal, runOrigin: steer.runOrigin }),
|
|
260
|
+
...buildAppliedHumanInputEvent({ carrier: source, source, sessionSeq: nextHumanInputSeq(prepared.harness), inputId: steer.inputId, actor: steer.actor, principal: spec.principal, runOrigin: steer.runOrigin, rewrittenBy: delivered.rewrittenBy }),
|
|
254
261
|
...ident(),
|
|
255
262
|
}));
|
|
256
263
|
}
|
|
@@ -283,13 +290,13 @@ export async function runLeg(input) {
|
|
|
283
290
|
});
|
|
284
291
|
}
|
|
285
292
|
if (outputStyleWrapped !== undefined) {
|
|
286
|
-
const preview =
|
|
293
|
+
const preview = steeringPreview(prepared.outputStyleFrame);
|
|
287
294
|
prepared.frameReceipts.pending.push({ source: "output_style", text: continuation, commit: () => void (queue.push({ type: "steering_injected", source: "output_style", preview, ...ident() }), (rs.attach.attachmentsInjected += 1)) });
|
|
288
295
|
}
|
|
289
296
|
if (postureText !== undefined)
|
|
290
297
|
prepared.frameReceipts.pending.push({ source: "posture", text: continuation, commit: () => undefined });
|
|
291
298
|
if (unavailableResume !== undefined)
|
|
292
|
-
prepared.frameReceipts.pending.push({ source: "mcp_unavailable", text: continuation, commit: () => void (settleMcpUnavailable(prepared, unavailableResume.entries), queue.push({ type: "steering_injected", source: "mcp_unavailable", preview:
|
|
299
|
+
prepared.frameReceipts.pending.push({ source: "mcp_unavailable", text: continuation, commit: () => void (settleMcpUnavailable(prepared, unavailableResume.entries), queue.push({ type: "steering_injected", source: "mcp_unavailable", preview: steeringPreview(unavailableResume.body), ...ident() }), (rs.attach.attachmentsInjected += 1)) });
|
|
293
300
|
if (prepared.turnOpenRedelivery.current !== undefined)
|
|
294
301
|
await prepared.turnOpenRedelivery.current;
|
|
295
302
|
final = await withBrainSinks(() => prepared.harness.prompt(continuation, {
|
|
@@ -312,7 +319,8 @@ export async function runLeg(input) {
|
|
|
312
319
|
}
|
|
313
320
|
else {
|
|
314
321
|
const objectiveActor = entryActor;
|
|
315
|
-
|
|
322
|
+
let projectedObjective = projectHumanInput({ text: spec.objective, actor: objectiveActor, source: "objective" });
|
|
323
|
+
let objectiveRewrittenBy;
|
|
316
324
|
let effectiveObjective = projectedObjective;
|
|
317
325
|
let promptBlocked = false;
|
|
318
326
|
const author = objectiveAuthorOf(objectiveAuthor, (e) => runner.deps.onError?.(e, { phase: "config", sessionId: prepared.sessionId, classification: "input-author-unreadable" }));
|
|
@@ -325,6 +333,11 @@ export async function runLeg(input) {
|
|
|
325
333
|
...(objectiveActor !== undefined ? { actor: snapshotActorAssertion(objectiveActor) } : {}),
|
|
326
334
|
...(prepared.userAttachments !== undefined ? { userAttachments: userAttachmentDeclarations(prepared.userAttachments) } : {}),
|
|
327
335
|
}, prepared.abortController.signal);
|
|
336
|
+
if (screen?.kind === "answered" && screen.rewrittenBy !== undefined) {
|
|
337
|
+
projectedObjective = projectHumanInput({ text: screen.text, actor: objectiveActor, source: "objective" });
|
|
338
|
+
objectiveRewrittenBy = screen.rewrittenBy;
|
|
339
|
+
effectiveObjective = projectedObjective;
|
|
340
|
+
}
|
|
328
341
|
if (screen?.kind === "aborted") {
|
|
329
342
|
holdPrompt(prepared.blockedRef, prepared.reminderMark, "cancelled", `the task was cancelled while the deployment's userPromptSubmit hook was still screening this prompt; ` +
|
|
330
343
|
`the prompt was NOT submitted (fail-closed)`);
|
|
@@ -490,7 +503,7 @@ export async function runLeg(input) {
|
|
|
490
503
|
text: effectiveObjective,
|
|
491
504
|
commit: () => {
|
|
492
505
|
f.commit();
|
|
493
|
-
queue.push({ type: "steering_injected", source: f.source, preview:
|
|
506
|
+
queue.push({ type: "steering_injected", source: f.source, preview: steeringPreview(f.body), ...ident() });
|
|
494
507
|
rs.attach.attachmentsInjected += 1;
|
|
495
508
|
f.disclose();
|
|
496
509
|
},
|
|
@@ -514,6 +527,7 @@ export async function runLeg(input) {
|
|
|
514
527
|
...(spec.principal !== undefined ? { principal: spec.principal } : {}),
|
|
515
528
|
...(attachmentFrames.length > 0 ? { attachments: humanInputAttachmentsOf(attachmentFrames) } : {}),
|
|
516
529
|
...(legRunOrigin !== undefined ? { runOrigin: legRunOrigin } : {}),
|
|
530
|
+
...(objectiveRewrittenBy !== undefined ? { rewrittenBy: objectiveRewrittenBy } : {}),
|
|
517
531
|
}),
|
|
518
532
|
...ident(),
|
|
519
533
|
});
|
|
@@ -542,6 +556,9 @@ export async function runLeg(input) {
|
|
|
542
556
|
await settleTeardownLeg(() => prepared.mcp.dispose(), "mcp.dispose (tool_unavailable leg)", (e) => runner.deps.onError?.(e, { phase: "config", sessionId: prepared.sessionId }));
|
|
543
557
|
await settleTeardownLeg(() => prepared.a2a?.dispose(), "a2a.dispose (tool_unavailable leg)", (e) => runner.deps.onError?.(e, { phase: "config", sessionId: prepared.sessionId }));
|
|
544
558
|
await settleTeardownLeg(() => (prepared.ownedEnv && hasDestroy(prepared.ownedEnv) ? prepared.ownedEnv.destroy() : undefined), "ownedEnv.destroy (tool_unavailable leg)", (e) => runner.deps.onError?.(e, { phase: "config", sessionId: prepared.sessionId }));
|
|
559
|
+
const ending = raiseSessionEnd(prepared.modBus, prepared.hookIdentity, { reason: "failed", sessionId: prepared.sessionId });
|
|
560
|
+
if (ending !== undefined)
|
|
561
|
+
await ending;
|
|
545
562
|
throw err;
|
|
546
563
|
}
|
|
547
564
|
threw = err;
|
|
@@ -194,8 +194,9 @@ export async function runSettleAndTeardown(input) {
|
|
|
194
194
|
taskIdRef.delegationTerminalOwed = undefined;
|
|
195
195
|
if (rs.turn.completed !== undefined)
|
|
196
196
|
await raiseCompletedTurn(prepared.modBus, rs.turn, prepared.hookIdentity, undefined);
|
|
197
|
-
|
|
198
|
-
|
|
197
|
+
const ending = raiseSessionEnd(prepared.modBus, prepared.hookIdentity, { reason: terminalFace.status, sessionId: prepared.sessionId });
|
|
198
|
+
if (ending !== undefined)
|
|
199
|
+
await ending;
|
|
199
200
|
if (rs.degrade.degraded)
|
|
200
201
|
result.degraded = rs.degrade.degraded;
|
|
201
202
|
if (prepared.outputRef.set)
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { openSystemReminder } from "../reminder-mint.js";
|
|
2
2
|
import { formatHookFeedback } from "../hooks.js";
|
|
3
3
|
import { classicEventBase, dispatchClassic, legEventsOf, stringMembersAnswer, stringMembersOf } from "../mods/stations.js";
|
|
4
|
+
import { steeringPreview } from "./steering-preview.js";
|
|
4
5
|
import { asThrownError } from "../thrown-value.js";
|
|
5
6
|
const STOP_HOOK_BLOCK_CAP = 8;
|
|
6
7
|
export function runStopAndFinalVerify(input) {
|
|
@@ -22,7 +23,7 @@ export function runStopAndFinalVerify(input) {
|
|
|
22
23
|
return worst;
|
|
23
24
|
};
|
|
24
25
|
const emitFinalVerifyEcho = (body) => {
|
|
25
|
-
queue.push({ type: "steering_injected", source: "final_verification", preview: body
|
|
26
|
+
queue.push({ type: "steering_injected", source: "final_verification", preview: steeringPreview(body), ...ident() });
|
|
26
27
|
};
|
|
27
28
|
const owed = spec.oneShot === true ? deliveryObligations : undefined;
|
|
28
29
|
if (stopArmed || finalVerificationOn || owed !== undefined) {
|