eve 0.83.3 → 0.84.1

package/dist/src/harness/session-machine/transitions.js

@@ -1 +1 @@
-import{activeTurnId,answeredCallIds,nextStepIndex,runningTasks,turnPosition}from"./view.js";import{inputWithdrawn,signInWithdrawn}from"./events.js";import{openInputs,openSignIns,turnCoordinates}from"#protocol/session-projection.js";import{createActionResultEvent,createAuthorizationCompletedEvent,createAuthorizationRequiredEvent,createContextClearedEvent,createHistoryImportedEvent,createInputRequestedEvent,createInputResolvedEvent,createMessageReceivedEvent,createResultCompletedEvent,createSessionCompletedEvent,createSessionFailedEvent,createSessionStartedEvent,createSessionWaitingEvent,createStepFailedEvent,createStepStartedEvent,createTaskSettledEvent,createTaskStartedEvent,createTurnCancelledEvent,createTurnCompletedEvent,createTurnFailedEvent,createTurnStartedEvent,createTurnWaitingEvent}from"#protocol/message.js";import{toProxyInputRequestEntries}from"#harness/hitl/relays.js";import{authorizationEventFields}from"#harness/authorization-event-fields.js";import{signInAttemptKey}from"#harness/hitl/sign-ins.js";const unchanged=(e,t)=>({events:t,turn:e.turn});function at(e){let t=turnPosition(e);return{sequence:t.sequence,stepIndex:t.stepIndex,turnId:activeTurnId(t)}}function receive(e,t){let n=turnPosition(e.projection),r=activeTurnId(n),i=[];return n.sessionStarted||i.push(createSessionStartedEvent({predecessor:t.predecessor,runtime:t.runtime,trace:t.trace})),n.turnId===``&&i.push(createTurnStartedEvent({sequence:n.sequence,trace:t.trace,turnId:r})),t.imported!==void 0&&t.imported.length>0&&i.push(createHistoryImportedEvent({messages:t.imported,sequence:n.sequence,turnId:r})),t.message!==void 0&&i.push(createMessageReceivedEvent({message:t.message,sequence:n.sequence,turnId:r})),unchanged(e,i)}function startStep(e,t){let{sequence:n,turnId:r}=at(e.projection);return unchanged(e,[createStepStartedEvent({modelId:t.modelId,sequence:n,stepIndex:nextStepIndex(e.projection),turnId:r})])}function hold(e,t){let{sequence:n,turnId:r}=turnPosition(e.projection);return r===``?unchanged(e,[]):unchanged(e,[createTurnWaitingEvent({on:t.on,sequence:n,turnId:r,usage:e.usage})])}function finishTurn(e,t={}){let{sequence:n,stepIndex:r,turnId:i}=at(e.projection),a=[];return t.result!==void 0&&a.push(createResultCompletedEvent({result:t.result,sequence:n,stepIndex:r,turnId:i})),e.projection.activeTurnId!==void 0&&a.push(createTurnCompletedEvent({sequence:n,turnId:i})),a.push(createSessionWaitingEvent(e.usage)),unchanged(e,a)}function fail(e,t){let{sequence:n,stepIndex:r,turnId:i}=at(e.projection),a=e.turn.suspended.filter(e=>(e.approved?.length??0)>0);return{commit:a.flatMap(cancelledTranscript),events:failedEvents(e,t,{sequence:n,stepIndex:r,turnId:i}),turn:{...e.turn,suspended:e.turn.suspended.filter(e=>!a.includes(e))}}}function failedEvents(e,t,n){let{sequence:r,stepIndex:i,turnId:a}=n,{code:o,details:s,message:c}=t,l=t.terminal!==void 0;return[createStepFailedEvent({code:o,details:s,message:c,sequence:r,stepIndex:i,turnId:a}),createTurnFailedEvent({code:o,details:s,message:c,sequence:r,terminal:l,turnId:a}),t.terminal===void 0?createSessionWaitingEvent(e.usage):createSessionFailedEvent({code:o,details:s,message:c,sessionId:t.terminal.sessionId,usage:e.usage})]}function idle(e){return unchanged(e,[createSessionWaitingEvent(e.usage)])}function sessionCompleted(e){return createSessionCompletedEvent(e)}function sessionFailed(e){return createSessionFailedEvent(e)}function settle(e,t){let n=[],r=[...e.turn.suspended];for(let{part:e,result:i}of t.results){let t=r.findIndex(t=>stepCallIds(t).has(e.toolCallId)),a=r[t];a!==void 0&&(r[t]=withoutApproved({...a,messages:withResult(a.messages,e)},new Set([e.toolCallId])),i!==void 0&&n.push(createActionResultEvent({result:i,...a.event})))}for(let t of r)t.tasks.length!==0&&t.requests.length!==0&&(runningTasks(t).length>0||t.requests.some(t=>t.requestId in e.projection.inputs)||n.push(createInputRequestedEvent({requests:t.requests,...t.event})));let i=r.filter(isComplete);return{commit:i.flatMap(e=>e.messages),events:n,turn:{...e.turn,suspended:r.filter(e=>!i.includes(e))}}}const RETRIED_CALL_RESULT={code:`MODEL_CALL_ATTEMPT_RETRIED`,message:`The model call attempt was retried before this tool could run.`};function discardAttempt(e,t){let n=at(e.projection);return unchanged(e,t.calls.map(({callId:e,toolName:t})=>createActionResultEvent({...n,result:{callId:e,isError:!0,kind:`tool-result`,output:{...RETRIED_CALL_RESULT},toolName:t}})))}function suspendStep(e,t){return{events:[],turn:suspend(e.turn,{...t,requests:[]})}}function withoutApproved(e,t){if(e.approved===void 0)return e;let n=e.approved.filter(e=>!t.has(e.action.callId));if(n.length===e.approved.length)return e;let{approved:r,...i}=e;return n.length===0?i:{...i,approved:n}}function runnableCalls(e,t){let n=new Set(e.signIns.map(signInAttemptKey));return(t.approved??[]).filter(e=>(e.signIns??[]).every(e=>!n.has(signInAttemptKey(e))))}function approvedCalls(e){return e.turn.suspended.flatMap(t=>runnableCalls(e,t))}function suspend(e,t){return{...e,suspended:[...e.suspended,t]}}function stepCallIds(e){let t=new Set;for(let n of e.messages)if(n.role===`assistant`&&typeof n.content!=`string`)for(let e of n.content)e.type===`tool-call`&&e.providerExecuted!==!0&&t.add(e.toolCallId);return t}function isComplete(e){if(e.requests.length>0)return!1;let t=answeredCallIds(e.messages);return[...stepCallIds(e)].every(e=>t.has(e))}function withResult(e,t){let n=[...e],r=findCall(n,t.toolCallId);if(r===void 0)return n.push({content:[t],role:`tool`}),n;let i={...t,toolName:r.call.toolName},a=n[r.index+1];return a?.role===`tool`?n[r.index+1]={...a,content:[...a.content,i]}:n.splice(r.index+1,0,{content:[i],role:`tool`}),n}function withoutResults(e,t){return e.flatMap(e=>{if(e.role!==`tool`)return[e];let n=e.content.filter(e=>e.type!==`tool-result`||!t.has(e.toolCallId));return n.length===0?[]:[{...e,content:n}]})}function findCall(e,t){for(let[n,r]of e.entries()){if(r.role!==`assistant`||typeof r.content==`string`)continue;let e=r.content.find(e=>e.type===`tool-call`&&e.toolCallId===t);if(e!==void 0)return{call:e,index:n}}}function startTask(e,t){return unchanged(e,[createTaskStartedEvent(t)])}function settleTask(e,t){let{outcome:n,task:r}=t;return unchanged(e,t.calls.map(e=>{let t={callId:e.callId,kind:r.kind,name:r.name,taskId:r.id,turnId:e.turnId};switch(n.status){case`completed`:return createTaskSettledEvent({...t,output:n.output,status:`completed`});case`failed`:return createTaskSettledEvent({...t,error:{message:n.error},status:`failed`});case`cancelled`:return createTaskSettledEvent(n.reason===void 0?{...t,status:`cancelled`}:{...t,cancel:{reason:n.reason},status:`cancelled`})}}))}function finishRun(e,t){let n=new Set(t.requestIds);return unchanged(e,openInputs(e.projection).filter(e=>n.has(e.request.requestId)||t.taskId!==void 0&&e.taskId===t.taskId).map(inputWithdrawn))}function relay(e,t){let{payload:n}=t,r=[...finishRun(e,{requestIds:t.replacedRequestIds}).events];if(n.kind===`subagent-input-request`){let{event:e}=n;r.push(createInputRequestedEvent({callId:n.callId,requests:e.requests,sequence:e.sequence,stepIndex:e.stepIndex,taskId:e.taskId,turnId:e.turnId}))}else{let{event:t}=n;if(r.push(t),t.type!==`authorization.required`)return unchanged(e,r)}if(r.push(...hold(e,{on:`input`}).events),n.kind!==`subagent-input-request`)return unchanged(e,r);let i=toProxyInputRequestEntries(n).map(([e,n])=>[e,{...n,...t.workflowAsk!==void 0&&{workflowAsk:t.workflowAsk},...t.runId!==void 0&&{runId:t.runId}}]);return{...unchanged(e,r),relays:{upsert:{entries:i,forChildContinuationToken:n.childContinuationToken,inputSource:n.inputSource}}}}function receiveRelayedAnswer(e){return createMessageReceivedEvent(e)}function routeAnswer(e,t){let n=t.children.filter(e=>e.resolutions.length>0).map(e=>createInputResolvedEvent({resolutions:e.resolutions,...e.event}));t.holds===!0&&n.push(...hold(e,{on:`input`}).events);let r=t.children.flatMap(e=>e.resolutions.map(e=>e.requestId));return{...unchanged(e,n),...r.length>0&&{relays:{retire:r}}}}function runSignIn(e,t,n){let r={...authorizationEventFields(t),sequence:e.sequence,stepIndex:e.stepIndex,taskId:e.taskId,turnId:e.turnId};return n===void 0?createAuthorizationRequiredEvent({...r,description:`Sign in to ${t.name} to continue.`,webhookUrl:t.hookUrl}):createAuthorizationCompletedEvent({...r,outcome:n})}function matchSignIns(e,t){let n=new Set(t.attemptIds);return{...unchanged(e,[]),signIns:e.signIns.filter(e=>!n.has(signInAttemptKey(e)))}}function callSignIns(e){return e.suspended.flatMap(e=>(e.approved??[]).flatMap(e=>e.signIns??[]))}function awaitSignIns(e,t){let n=stepCallIds(e),r=t.stopped.filter(({action:e})=>n.has(e.callId));if(r.length===0)return e;let i=r.map(({action:n,connections:r})=>{let i=e.approved?.find(e=>e.action.callId===n.callId);return{action:n,requestId:i?.requestId??n.callId,signIns:[...i?.signIns??[],...t.challenges.filter(e=>r.includes(e.name))]}}),a=new Set(i.map(e=>e.action.callId));return{...e,messages:withoutResults(e.messages,a),approved:[...(e.approved??[]).filter(e=>!a.has(e.action.callId)),...i]}}function completeSignIn(e,t){let n=at(e.projection),r=new Set(callSignIns(e.turn).map(signInAttemptKey));return unchanged(e,t.completions.filter(e=>!r.has(signInAttemptKey(e))).map(t=>{let r=t.attemptId===void 0?void 0:e.projection.authorizations[t.attemptId];return createAuthorizationCompletedEvent({...authorizationEventFields(t),outcome:`authorized`,sequence:r?.sequence??n.sequence,stepIndex:r?.stepIndex??n.stepIndex,turnId:r?.turnId??n.turnId})}))}function ownOpenRequestIds(e){return new Set(openInputs(e.projection).filter(t=>t.callId===void 0&&t.taskId===void 0&&!e.relayedRequestIds.has(t.request.requestId)).map(e=>e.request.requestId))}const CANCELLED_CALL_RESULT=`The turn was cancelled before this call finished.`;function cancel(e){let{projection:t}=e,n=t.activeTurnId,r=e.turn.suspended.filter(e=>n!==void 0&&e.event.turnId===n||e.tasks.some(t=>!answeredCallIds(e.messages).has(t.callId))||(e.approved?.length??0)>0),i=new Set(r.flatMap(e=>e.requests.map(e=>e.requestId))),a=[...openInputs(t).filter(t=>t.turnId===n||i.has(t.request.requestId)||e.relayedRequestIds.has(t.request.requestId)||t.request.kind===`session-limit`).map(inputWithdrawn),...openSignIns(t).filter(e=>e.turnId===n).map(e=>signInWithdrawn(e,`Cancelled.`))];if(n!==void 0){let{sequence:e}=turnCoordinates(t);a.push(createTurnCancelledEvent({sequence:e,turnId:n}))}return a.push(createSessionWaitingEvent(e.usage)),{commit:r.flatMap(cancelledTranscript),events:a,signIns:[],turn:{...e.turn,suspended:e.turn.suspended.filter(e=>!r.includes(e))}}}function cancelledTranscript(e){let t=answeredCallIds(e.messages),n=[...e.messages];for(let r of e.messages)if(r.role===`assistant`&&typeof r.content!=`string`)for(let e of r.content)e.type===`tool-call`&&e.providerExecuted!==!0&&(t.has(e.toolCallId)||(n=withResult(n,{output:{type:`text`,value:CANCELLED_CALL_RESULT},toolCallId:e.toolCallId,toolName:e.toolName,type:`tool-result`})));return n}function clear(e,t){let{projection:n}=e,{sequence:r,turnId:i}=turnCoordinates(n);return{clearsHistory:!0,events:[...openInputs(n).filter(t=>!e.relayedRequestIds.has(t.request.requestId)).map(inputWithdrawn),...openSignIns(n).map(e=>signInWithdrawn(e,`The context was cleared.`)),createContextClearedEvent({sequence:r,sessionId:t.sessionId,turnId:i}),createSessionWaitingEvent(e.usage)],turn:{grants:e.turn.grants,suspended:[]}}}export{CANCELLED_CALL_RESULT,approvedCalls,awaitSignIns,callSignIns,cancel,clear,completeSignIn,discardAttempt,fail,finishRun,finishTurn,hold,idle,matchSignIns,ownOpenRequestIds,receive,receiveRelayedAnswer,relay,routeAnswer,runSignIn,runnableCalls,sessionCompleted,sessionFailed,settle,settleTask,startStep,startTask,stepCallIds,suspend,suspendStep,withResult,withoutApproved};
+import{activeTurnId,answeredCallIds,turnPosition}from"./view.js";import{isComplete,stepCallIds,suspend,withResult,withoutResults}from"./suspended-steps.js";import{activeTurn,interactionOwner}from"#protocol/session-projection/selectors.js";import{isOpen}from"#protocol/session-projection/tree.js";import{callSettledFrom}from"#harness/call-facts.js";import{contextStarted,controlAdmitted,defined,delegatedUsageFact,deliveryApplied,errorInfoOf,fact,runSettledFacts,sessionEndedFacts,turnSettled}from"#harness/facts.js";import{activeTurnIdOf,nextChangeId,openRunOf}from"#protocol/session-projection.js";import{closeUnder}from"#harness/session-machine/cascade.js";import{interruptedCallResult}from"#harness/interrupted-attempt.js";import{interactionSettled,responseAdmitted,responseSettled,responseSubmitted,signInInteractionId}from"#harness/interaction-facts.js";import{signInAttemptKey}from"#harness/hitl/sign-ins.js";const unchanged=(e,t)=>({events:t,turn:e.turn});function followedTurn(e){let t=e.view.selection;return t===null?null:t?.turnId??e.view.session.latestTurnId??null}function waitingDeliveries(e,t){return t.filter(({deliveryId:t})=>e.view?.deliveries[t]?.status===`admitted`)}function consumed(e,t){return fact(`delivery.consumed`,{deliveryId:e.deliveryId,history:(e.history?.length??0)>0?e.history:void 0,parts:e.parts,turnId:t})}function receive(e,t){let{projection:n}=e,r=turnPosition(n),i=activeTurnId(r),a=waitingDeliveries(n,t.deliveries??[]),o=a[0],s=o===void 0?t.cause??{policy:`system`}:{deliveryId:o.deliveryId},{parent:c,predecessor:l,runtime:u,trace:d}=t,f=[];return r.sessionStarted||f.push(fact(`session.started`,{parent:c,predecessor:l,runtime:u,trace:d})),r.turnId===``&&f.push(fact(`turn.started`,{cause:s,follows:followedTurn(n),trace:d,turnId:i})),f.push(...a.map(e=>consumed(e,i))),unchanged(e,f)}function join(e,t){let{projection:n}=e,r=waitingDeliveries(n,t.deliveries),i=activeTurnIdOf(n);return unchanged(e,i===void 0?r.map(({deliveryId:e})=>deliveryApplied(e)):r.map(e=>consumed(e,i)))}function fail(e,t){let n=e.turn.suspended.filter(e=>(e.approved?.length??0)>0),r=errorInfoOf(t),i=activeTurnIdOf(e.projection),a=i===void 0?void 0:openRunOf(e.projection,i),o=[...a===void 0?[]:runSettledFacts({runId:a,outcome:`failed`,error:r}),...t.terminal===void 0?turnSettled(e.projection,{error:r,outcome:`failed`}):sessionEndedFacts(e.projection,{cause:i===void 0?void 0:{turnId:i},error:r,outcome:`failed`})];return{...commitSteps(e.turn,n,cancelledTranscript),events:o}}function settle(e,t){let n=[],r=[...e.turn.suspended];for(let{part:i,result:a,usage:o}of t.results){let t=r.findIndex(e=>stepCallIds(e).has(i.toolCallId)),s=r[t];if(s===void 0)continue;r[t]=withoutApproved({...s,messages:withResult(s.messages,i)},new Set([i.toolCallId]));let c=a===void 0?void 0:e.projection.view.calls[a.callId];a!==void 0&&c!==void 0&&c.taskId===void 0&&c.status!==`settled`&&(n.push(callSettledFrom(a)),o!==void 0&&n.push(delegatedUsageFact(a.callId,o)))}let i=r.filter(isComplete);return{...commitSteps({...e.turn,suspended:r},i),events:n}}function discardAttempt(e,t){let n=e.projection.view,r={family:`run`,id:t.runId},i=t.ending===`steered`?closeUnder(n,r,`steered`):[];if(!isOpen(n,r))return unchanged(e,i);let a=t.ending===`retried`?{outcome:`abandoned`,runId:t.runId,usage:t.usage}:{finishReason:`other`,outcome:`completed`,runId:t.runId,usage:t.usage};return unchanged(e,[...i,...runSettledFacts(a)])}function suspendStep(e,t){return{events:[],turn:suspend(e.turn,{...t,requests:[]})}}function withoutApproved(e,t){if(e.approved===void 0)return e;let n=e.approved.filter(e=>!t.has(e.call.callId));if(n.length===e.approved.length)return e;let{approved:r,...i}=e;return n.length===0?i:{...i,approved:n}}function runnableCalls(e,t){let n=new Set(e.signIns.map(signInAttemptKey));return(t.approved??[]).filter(e=>(e.signIns??[]).every(e=>!n.has(signInAttemptKey(e))))}function startTask(e,t,n){let r=[];return(n?.has(t.taskId)??e.projection.view.tasks[t.taskId]!==void 0)||(n?.add(t.taskId),r.push({type:`task.started`,data:{taskId:t.taskId,kind:t.kind,name:t.name,startedBy:{callId:t.callId}}})),r.push({type:`call.started`,data:defined({callId:t.callId,taskId:t.taskId,clearedBy:t.clearedBy})}),unchanged(e,r)}function settleTask(e,t){let{outcome:n}=t,r=n.status===`completed`?n.output:void 0,i=t.calls[0]?.callId,a=t.calls.map(({callId:e},t)=>fact(`call.settled`,{callId:e,error:n.status===`failed`?{code:`TASK_FAILED`,message:n.error}:void 0,outcome:n.status===`cancelled`?`interrupted`:n.status,output:t===0?r:void 0,outputOf:t>0&&r!==void 0&&i!==void 0?{callId:i}:void 0,reason:n.status===`cancelled`?n.reason??`task-cancelled`:void 0}));return unchanged(e,a)}function endTask(e,t){let n=e.projection.view.tasks[t.taskId];if(n===void 0||n.status===`ended`)return unchanged(e,[]);let{outcome:r}=t;return unchanged(e,[fact(`task.ended`,{error:r.status===`failed`?{code:`TASK_FAILED`,message:r.error}:void 0,outcome:r.status,reason:r.status===`cancelled`?r.reason??`task-ended`:void 0,taskId:t.taskId})])}function finishRun(e,t){let n=new Set(t.requestIds),r=e.projection.view,i=Object.values(r.interactions).filter(e=>e.status===`open`&&(n.has(e.interactionId)||t.taskId!==void 0&&interactionOwner(r,e).taskId===t.taskId));return unchanged(e,i.map(e=>withdrawInteraction(e.interactionId,`asker-ended`)))}function withdrawInteraction(e,t,n=`withdrawn`){return interactionSettled(e,n,{reason:t})}function relay(e,t){let{payload:n}=t,r=e.projection.view,i=n.route===void 0?void 0:{...n.route,...t.workflowAsk!==void 0&&{workflowAsk:t.workflowAsk},...t.runId!==void 0&&{runId:t.runId}},a=[],o={};for(let e of n.events){let t=e.data.interactionId,s=r.interactions[t];if(e.type===`interaction.opened`||s?.origin!==void 0&&`callId`in s.subject&&s.subject.callId===n.callId)switch(e.type){case`interaction.opened`:if(s!==void 0)break;a.push({data:{...e.data,origin:e.data.origin??{interactionId:t,sessionId:n.childSessionId},subject:{callId:n.callId}},type:`interaction.opened`}),i!==void 0&&e.data.request.kind!==`sign-in`&&(o[t]=i);break;case`interaction.settled`:if(s?.status!==`open`)break;a.push(...mirrorSettled(r,e.data));break;case`response.admitted`:{let t=s===void 0?void 0:forwardedAnswer(r,e.data);t!==void 0&&r.responses[t]?.status===`submitted`&&a.push(responseAdmitted(t));break}case`response.settled`:{let t=s===void 0?void 0:forwardedAnswer(r,e.data);t!==void 0&&e.data.outcome!==`applied`&&a.push(responseSettled(t,e.data.outcome,e.data.reason));break}}}return Object.keys(o).length>0?{...unchanged(e,a),relays:o}:unchanged(e,a)}function mirrorSettled(e,t){let n=Object.values(e.responses).filter(e=>e.interactionId===t.interactionId&&e.status!==`settled`).sort((e,t)=>e.introducedAt-t.introducedAt),r=t.outcome===`accepted`||t.outcome===`declined`||t.outcome===`invalid`?n.at(-1):void 0,i=r===void 0?[]:[responseSettled(r.responseId,`applied`,t.reason)],a=r===void 0?t.cause:{responseId:r.responseId};return i.push(fact(`interaction.settled`,{...t,cause:a})),i}function forwardedAnswer(e,t){let n=Object.values(e.responses).filter(e=>e.interactionId===t.interactionId&&e.status!==`settled`).sort((e,t)=>e.introducedAt-t.introducedAt);return(n.find(e=>t.deliveryId!==void 0&&e.deliveryId===t.deliveryId)??n.at(-1))?.responseId}function routeAnswer(e,t){let n=e.projection.view,r=[],i=new Set;for(let e of t.deliveries){if(n.deliveries[e.deliveryId]!==void 0||i.has(e.deliveryId))continue;i.add(e.deliveryId);let{deliveryId:t,principal:a,source:o}=e;r.push(fact(`delivery.admitted`,{deliveryId:t,principal:a,source:o})),e.consumed!==void 0&&r.push(consumed({deliveryId:t,parts:e.consumed.parts},e.consumed.turnId))}let known=e=>i.has(e)||n.deliveries[e]!==void 0,a=new Map;for(let e of t.forwarded)n.responses[e.responseId]===void 0&&n.interactions[e.interactionId]?.status===`open`&&known(e.deliveryId)&&(a.set(e.responseId,e),r.push(responseSubmitted(e)));for(let{answer:e,outcome:i}of t.decided){let t=n.interactions[e.interactionId];if(t?.status!==`open`)continue;let o=[...Object.values(n.responses).filter(e=>e.interactionId===t.interactionId&&e.status!==`settled`).map(e=>e.responseId),...[...a.values()].filter(e=>e.interactionId===t.interactionId).map(e=>e.responseId)].at(-1);o!==void 0&&r.push(responseSettled(o,`applied`)),r.push(interactionSettled(t.interactionId,i,{cause:o===void 0?void 0:{responseId:o},response:e}))}for(let e of t.deliveries)e.consumed===void 0&&e.continues!==!0&&i.has(e.deliveryId)&&r.push(deliveryApplied(e.deliveryId));return unchanged(e,r)}function matchSignIns(e,t){let n=new Set(t.attemptIds);return{...unchanged(e,[]),signIns:e.signIns.filter(e=>!n.has(signInAttemptKey(e)))}}function callSignIns(e){return e.suspended.flatMap(e=>(e.approved??[]).flatMap(e=>e.signIns??[]))}function awaitSignIns(e,t){let n=stepCallIds(e),r=t.stopped.filter(({call:e})=>n.has(e.callId));if(r.length===0)return e;let i=r.map(({approval:n,call:r,connections:i})=>{let a=e.approved?.find(e=>e.call.callId===r.callId),o=n?.interactionId??a?.interactionId,s=n?.responder??a?.responder;return{call:r,...o!==void 0&&{interactionId:o},...s!==void 0&&{responder:s},signIns:[...a?.signIns??[],...t.challenges.filter(e=>i.includes(e.name))]}}),a=new Set(i.map(e=>e.call.callId));return{...e,messages:withoutResults(e.messages,a),approved:[...(e.approved??[]).filter(e=>!a.has(e.call.callId)),...i]}}function signInCallbackFacts(e,t,n){let r=signInInteractionId(t);if(e.interactions[r]?.status!==`open`)return[];let i=`callback_${r}`,a=`response_${i}`,o=interactionSettled(r,n.outcome,{cause:{responseId:a},...n.reason!==void 0&&{reason:n.reason}});return[{data:{deliveryId:i,source:{callback:`authorization`}},type:`delivery.admitted`},responseSubmitted({deliveryId:i,interactionId:r,responseId:a}),responseSettled(a,`applied`),n.retryable===!1?{...o,data:{...o.data,response:{retryable:!1}}}:o,deliveryApplied(i)]}function callSignInsSettled(e,t,n){let r=e.projection.view,i=n===void 0?{outcome:`accepted`}:{...n,outcome:`failed`};return(t.signIns??[]).flatMap(e=>signInCallbackFacts(r,e,i))}function completeSignIn(e,t){let n=e.projection.view,r=new Set(callSignIns(e.turn).map(signInAttemptKey));return unchanged(e,t.completions.filter(e=>!r.has(signInAttemptKey(e))).flatMap(e=>signInCallbackFacts(n,e,{outcome:`accepted`})))}function controlDeliveryFor(e,t){return t??{deliveryId:`control_${String(e.projection.view.position)}`}}function controlled(e,t,n){if(e===void 0)return n(void 0);let r=n({deliveryId:e.deliveryId});return{...r,events:[controlAdmitted(e,t),...r.events,deliveryApplied(e.deliveryId)]}}const CANCELLED_CALL_RESULT=`The turn was cancelled before this call finished.`;function cancel(e,t={}){let{projection:n}=e,r=activeTurnIdOf(n),i=e.turn.suspended.filter(e=>r!==void 0&&e.event.turnId===r||e.tasks.some(t=>!answeredCallIds(e.messages).has(t.callId))||(e.approved?.length??0)>0),a=new Set(i.flatMap(e=>e.requests.map(e=>e.interactionId))),o=n.view,s=Object.values(o.interactions).filter(t=>t.status===`open`&&(e.relayedRequestIds.has(t.interactionId)||a.has(t.interactionId)||t.request.kind===`budget`)).map(e=>withdrawInteraction(e.interactionId,`Cancelled.`,`interrupted`));s.push(...turnSettled(n,{cause:t.cause,outcome:`cancelled`},activeTurn(o)?.turnId??r),...unreadSettled(e));let{queued:c,...l}=e.turn;return{...commitSteps(l,i,cancelledTranscript),events:s,signIns:[]}}function unreadSettled(e){let t=e.projection.view;return(e.turn.queued?.deliveries??[]).filter(({deliveryId:e})=>t.deliveries[e]?.status===`admitted`).map(({deliveryId:e})=>fact(`delivery.settled`,{deliveryId:e,outcome:`ignored`}))}function cancelledTranscript(e){return stoppedTranscript(e,()=>CANCELLED_CALL_RESULT)}function stopInterruptedSteps(e,t){let n=e.turn.suspended.filter(e=>e.requests.some(e=>t.settledInteractions.has(e.interactionId))||[...stepCallIds(e)].some(e=>t.calls.get(e)?.started===!0));return{...commitSteps(e.turn,n,e=>stoppedTranscript(e,e=>interruptedCallResult(t.calls.get(e)))),events:[]}}function commitSteps(e,t,n=e=>e.messages){let r=new Set(t);return{commit:t.flatMap(n),turn:{...e,suspended:e.suspended.filter(e=>!r.has(e))}}}function stoppedTranscript(e,t){let n=answeredCallIds(e.messages),r=[...e.messages];for(let i of e.messages)if(i.role===`assistant`&&typeof i.content!=`string`)for(let e of i.content)e.type===`tool-call`&&e.providerExecuted!==!0&&(n.has(e.toolCallId)||(r=withResult(r,{output:{type:`text`,value:t(e.toolCallId)},toolCallId:e.toolCallId,toolName:e.toolName,type:`tool-result`})));return r}function clear(e,t={}){let{projection:n}=e,r=nextChangeId(n);return{clearsHistory:!0,signIns:[],events:[...clearedInteractions(e),...turnSettled(n,{cause:t.cause,outcome:`cancelled`}),...unreadSettled(e),contextStarted({cause:t.cause,changeId:r,kind:`clear`}),fact(`context.settled`,{changeId:r,kind:`clear`,outcome:`completed`,selects:null})],turn:{remembered:e.turn.remembered,suspended:[]}}}function clearedInteractions(e){let t=e.projection.view;return Object.values(t.interactions).filter(t=>t.status===`open`&&!e.relayedRequestIds.has(t.interactionId)).map(e=>withdrawInteraction(e.interactionId,`The context was cleared.`,`interrupted`))}export{CANCELLED_CALL_RESULT,awaitSignIns,callSignIns,callSignInsSettled,cancel,clear,completeSignIn,controlDeliveryFor,controlled,discardAttempt,endTask,fail,finishRun,join,matchSignIns,receive,relay,routeAnswer,runnableCalls,settle,settleTask,startTask,stopInterruptedSteps,suspendStep,withoutApproved};

package/dist/src/harness/session-machine/view.d.ts

@@ -1,12 +1,12 @@
-import type { TokenUsage } from "#shared/token-usage.js";
 import type { ModelMessage } from "ai";
 import type { AuthorizationChallenge } from "#harness/authorization.js";
+import type { PendingResponder } from "#harness/hitl/index.js";
 import { type TaskToolCall } from "#execution/tasks/calls.js";
-import type { SessionStateMap, StepInput } from "#harness/types.js";
+import type { SessionStateMap, HarnessStepInput } from "#harness/types.js";
 import type { RuntimeWorkflowTaskRequest } from "#shared/action-types.js";
 import { type SessionProjection } from "#protocol/session-projection.js";
 import { type StepCoordinates, type SuspendedStep, type TurnState } from "./state.js";
-export type { StepCoordinates, SuspendedStep, TurnState } from "./state.js";
+export type { ApprovalAsk, ApprovedCall, StepCoordinates, SuspendedStep, TurnState, } from "./state.js";
 export declare const SESSION_PROJECTION_STATE_KEY = "eve.harness.sessionProjection";
 /** What a transition sees. */
 export interface SessionView {
@@ -14,10 +14,10 @@ export interface SessionView {
     readonly projection: SessionProjection;
     /** Requests this session relays for a child session or a workflow run, by `requestId`. */
     readonly relayedRequestIds: ReadonlySet<string>;
+    /** Who gave each answer a response policy still weighs, by response id. */
+    readonly responders: Readonly<Record<string, PendingResponder>>;
     /** The sign-in attempts the session waits on, with what completing them needs. */
     readonly signIns: readonly AuthorizationChallenge[];
-    /** The session's token usage so far, which its waiting and terminal events report. */
-    readonly usage: TokenUsage;
 }
 /** Reads the authoritative lifecycle facts saved alongside execution state. */
 export declare function storedProjection(state: SessionStateMap | undefined): SessionProjection;
@@ -30,15 +30,15 @@ export interface TurnPosition {
     readonly turnId: string;
     /** The open turn streamed assistant output, so steering can no longer restart it. */
     readonly assistantOutputStarted?: boolean;
+    /** The open turn's latest open model run, which content and calls belong to. */
+    readonly runId?: string;
 }
 export declare function turnPosition(projection: SessionProjection): TurnPosition;
 /** The open turn's id, or the id the next turn takes. */
 export declare function activeTurnId(position: Pick<TurnPosition, "sequence" | "turnId">): string;
 export declare function isBetweenTurns(projection: SessionProjection): boolean;
-/** The index the open turn's next `step.started` takes. */
-export declare function nextStepIndex(projection: SessionProjection): number;
 /** Input the session holds until it can run. */
-export declare function queuedInput(state: SessionStateMap | undefined): StepInput | undefined;
+export declare function queuedInput(state: SessionStateMap | undefined): HarnessStepInput | undefined;
 export declare function suspendedSteps(state: SessionStateMap | undefined): readonly SuspendedStep[];
 /** The ids of calls that already have a result in `messages`. */
 export declare function answeredCallIds(messages: readonly ModelMessage[]): ReadonlySet<string>;
@@ -53,3 +53,7 @@ export interface RuntimeWait {
 }
 /** The calls suspended steps wait on the runtime for, or `undefined` when none do. */
 export declare function runtimeWait(state: SessionStateMap | undefined): RuntimeWait | undefined;
+/** The suspended step whose approval `interactionId` names. */
+export declare function stepForRequest(view: SessionView, interactionId: string): SuspendedStep | undefined;
+/** Requests this session asked itself and still awaits; relayed requests answer elsewhere. */
+export declare function ownOpenRequestIds(view: Omit<SessionView, "turn">): ReadonlySet<string>;

package/dist/src/harness/session-machine/view.js

@@ -1 +1 @@
-import{readTurnState}from"./state.js";import{initialSessionProjection,turnCoordinates}from"#protocol/session-projection.js";import{pendingTaskToolCalls}from"#execution/tasks/calls.js";const SESSION_PROJECTION_STATE_KEY=`eve.harness.sessionProjection`;function storedProjection(e){return e?.[`eve.harness.sessionProjection`]??initialSessionProjection()}function turnPosition(e){let{sequence:t,stepIndex:n}=turnCoordinates(e),r=e.activeTurnId===void 0?void 0:e.turns[e.activeTurnId],i={sessionStarted:e.started===!0,sequence:t,stepIndex:n,turnId:r?.turnId??``};return r?.outputStarted===!0&&(i.assistantOutputStarted=!0),i}function activeTurnId(e){return e.turnId===``?`turn_${e.sequence}`:e.turnId}function isBetweenTurns(e){return e.activeTurnId===void 0}function nextStepIndex(e){let t=e.activeTurnId===void 0?void 0:e.turns[e.activeTurnId];return t?.stepIndex===void 0?0:t.stepIndex+1}function queuedInput(e){return readTurnState(e).queued}function suspendedSteps(e){return readTurnState(e).suspended}function answeredCallIds(e){let t=new Set;for(let n of e)if((n.role===`tool`||n.role===`assistant`)&&typeof n.content!=`string`)for(let e of n.content)e.type===`tool-result`&&t.add(e.toolCallId);return t}function runningTasks(e){let t=answeredCallIds(e.messages);return e.tasks.filter(e=>!t.has(e.callId))}function runtimeWait(e){let t=suspendedSteps(e).flatMap(e=>{let t=runningTasks(e),n=pendingTaskToolCalls(e.messages);return t.length===0&&n.length===0?[]:[{step:e,tasks:t,taskToolCalls:n}]}),n=t[0];if(n===void 0)return;let r=t.flatMap(e=>e.tasks),i=t.flatMap(e=>e.taskToolCalls);return{callIds:[...r.map(e=>e.callId),...i.map(e=>e.callId)],event:n.step.event,taskToolCalls:i,tasks:r}}export{SESSION_PROJECTION_STATE_KEY,activeTurnId,answeredCallIds,isBetweenTurns,nextStepIndex,queuedInput,runningTasks,runtimeWait,storedProjection,suspendedSteps,turnPosition};
+import{readTurnState}from"./state.js";import{openRequests}from"#protocol/session-projection/reader.js";import{interactionOwner}from"#protocol/session-projection/selectors.js";import{activeTurnIdOf,initialSessionProjection,openRunOf,turnCoordinates}from"#protocol/session-projection.js";import{pendingTaskToolCalls}from"#execution/tasks/calls.js";const SESSION_PROJECTION_STATE_KEY=`eve.harness.sessionProjection`;function storedProjection(e){let t=e?.[SESSION_PROJECTION_STATE_KEY];if(t===void 0)return initialSessionProjection();let n=initialSessionProjection(),r={counters:t.counters??n.counters,view:t.view??n.view,usageWindow:t.usageWindow};return t.outputStarted===void 0?r:{...r,outputStarted:t.outputStarted}}function turnPosition(e){let{sequence:t,stepIndex:n}=turnCoordinates(e),r=activeTurnIdOf(e),i={sessionStarted:e.view.session.status!==`new`,sequence:t,stepIndex:n,turnId:r??``};if(r===void 0)return i;e.outputStarted===r&&(i.assistantOutputStarted=!0);let a=openRunOf(e,r);return a!==void 0&&(i.runId=a),i}function activeTurnId(e){return e.turnId===``?`turn_${e.sequence}`:e.turnId}function isBetweenTurns(e){return activeTurnIdOf(e)===void 0}function queuedInput(e){return readTurnState(e).queued}function suspendedSteps(e){return readTurnState(e).suspended}function answeredCallIds(e){let t=new Set;for(let n of e)if((n.role===`tool`||n.role===`assistant`)&&typeof n.content!=`string`)for(let e of n.content)e.type===`tool-result`&&t.add(e.toolCallId);return t}function runningTasks(e){let t=answeredCallIds(e.messages);return e.tasks.filter(e=>!t.has(e.callId))}function runtimeWait(e){let t=suspendedSteps(e).flatMap(e=>{let t=runningTasks(e),n=pendingTaskToolCalls(e.messages);return t.length===0&&n.length===0?[]:[{step:e,tasks:t,taskToolCalls:n}]}),n=t[0];if(n===void 0)return;let r=t.flatMap(e=>e.tasks),i=t.flatMap(e=>e.taskToolCalls);return{callIds:[...r.map(e=>e.callId),...i.map(e=>e.callId)],event:n.step.event,taskToolCalls:i,tasks:r}}function stepForRequest(e,t){return e.turn.suspended.find(e=>e.requests.some(e=>e.interactionId===t))}function ownOpenRequestIds(e){return new Set(openRequests(e.projection.view).filter(t=>t.origin===void 0&&interactionOwner(e.projection.view,t).taskId===void 0&&!e.relayedRequestIds.has(t.interactionId)).map(e=>e.interactionId))}export{SESSION_PROJECTION_STATE_KEY,activeTurnId,answeredCallIds,isBetweenTurns,ownOpenRequestIds,queuedInput,runningTasks,runtimeWait,stepForRequest,storedProjection,suspendedSteps,turnPosition};

package/dist/src/harness/session-machine/waiting.d.ts

@@ -0,0 +1,16 @@
+import type { SessionEvent } from "#protocol/session-event.js";
+import type { SessionView } from "#protocol/session-projection/tables.js";
+/**
+ * What a step announces as it ends, from the tables before and after it: that the open turn
+ * waits on interactions — `turn.paused` with the interactions, and `awaiting-input` for the
+ * deliveries the turn answers for now. It announces when the step leaves the turn waiting on
+ * someone it didn't wait on before, or a delivery arrived or moved during the step and can go
+ * no further: one answer of a batch still waiting for the rest, or a message queued behind a
+ * budget question. A step that only finds the turn as it was announces nothing.
+ *
+ * A step is the session's unit of progress: inside one, a line can look as if nothing is left
+ * to do while the step goes on, so only its end can say. Every step's publisher asks here, so
+ * nothing the session runs announces a pause itself, and the announcement materializes
+ * `waiting(view, turnId)` for readers that follow the stream from a cursor without folding.
+ */
+export declare function announceWaiting(before: SessionView, after: SessionView): SessionEvent[];

package/dist/src/harness/session-machine/waiting.js

@@ -0,0 +1 @@
+import{activeTurn,openWork,waiting}from"#protocol/session-projection/selectors.js";function announceWaiting(e,t){let n=activeTurn(t)?.turnId;if(n===void 0)return[];let r=waiting(t,n);if(r?.on!==`interaction`)return[];let i=waiting(e,n),a=new Set(i?.on===`interaction`?i.interactions.map(e=>e.interactionId):[]),o=openWork(t,{turnId:n}).deliveries.map(e=>e.deliveryId);return!Object.values(t.deliveries).some(t=>t.status!==`settled`&&e.deliveries[t.deliveryId]?.status!==t.status)&&r.interactions.every(e=>a.has(e.interactionId))?[]:[{data:{awaiting:r.interactions.map(({interactionId:e})=>({interactionId:e})),turnId:n},type:`turn.paused`},...o.map(e=>({data:{deliveryId:e,outcome:`awaiting-input`,turnId:n},type:`delivery.settled`}))]}export{announceWaiting};

package/dist/src/harness/session-usage.d.ts

@@ -0,0 +1,22 @@
+import type { SessionStateMap } from "#harness/types.js";
+import type { SessionView } from "#protocol/session-projection/tables.js";
+import type { TokenUsage } from "#shared/token-usage.js";
+export declare const NO_USAGE: TokenUsage;
+/** Lifetime spend comes only from committed usage facts, including delegated spend. */
+export declare function sessionUsage(session: {
+    readonly state?: SessionStateMap;
+}): TokenUsage;
+/** Own model runs include summaries; delegated spend belongs to the calls that delegated. */
+export declare function turnUsage(view: SessionView, turnId: string): TokenUsage;
+/** A persistent child reports each committed unit of spend to its parent exactly once. */
+export declare function takeSessionUsageDelta<T extends {
+    readonly state?: SessionStateMap;
+}>(session: T): {
+    readonly delta: TokenUsage;
+    readonly session: T;
+};
+/** Spend outside a turn must not be claimed again by a later turn's report. */
+export declare function markUsageReported<T extends {
+    readonly state?: SessionStateMap;
+}>(session: T, usage: TokenUsage): T;
+export declare function withModelUsage(view: SessionView, usage: TokenUsage): SessionView;

package/dist/src/harness/session-usage.js

@@ -0,0 +1 @@
+import{storedProjection}from"#harness/session-machine/view.js";import{addTokenUsage,usageSince}from"#shared/token-usage-math.js";const REPORTED_SESSION_USAGE_STATE_KEY=`eve.harness.reportedSessionUsage`,NO_USAGE={cacheReadTokens:0,cacheWriteTokens:0,inputTokens:0,outputTokens:0};function sessionUsage(e){return storedProjection(e.state).view.usage.total}function turnUsage(e,t){let n=NO_USAGE;for(let r of Object.values(e.runs)){if(r.usage===void 0)continue;let{owner:i}=r;(`turnId`in i?i.turnId:e.changes[i.changeId]?.turnId)===t&&(n=addTokenUsage(n,r.usage))}return n}function takeSessionUsageDelta(e){let t=sessionUsage(e);return{delta:usageSince(t,reportedUsage(e.state)),session:withReported(e,t)}}function markUsageReported(e,t){return withReported(e,addTokenUsage(reportedUsage(e.state),t))}function withModelUsage(e,t){return{...e,usage:{byKind:{model:t},total:t}}}function reportedUsage(e){return e?.[REPORTED_SESSION_USAGE_STATE_KEY]??NO_USAGE}function withReported(e,t){return{...e,state:{...e.state,[REPORTED_SESSION_USAGE_STATE_KEY]:t}}}export{NO_USAGE,markUsageReported,sessionUsage,takeSessionUsageDelta,turnUsage,withModelUsage};

package/dist/src/harness/step/after-model.d.ts

@@ -1,7 +1,4 @@
-import type { ModelMessage } from "ai";
 import type { StepResult } from "#harness/types.js";
 import type { ModelResponse } from "#harness/model-call/run.js";
-import type { Step } from "#harness/step/context.js";
+import { type Step } from "#harness/step/context.js";
 export declare function handleStepResult(step: Step, input: ModelResponse): Promise<StepResult>;
-/** The SDK's approval parts: eve answers approvals itself, so history never holds them. */
-export declare function withoutApprovalParts(messages: readonly ModelMessage[]): ModelMessage[];

package/dist/src/harness/step/after-model.js

@@ -1 +1 @@
-import{createLogger}from"#internal/logging.js";import{REPLY_TOOL_NAME}from"#protocol/reply-tool.js";import{resolveAssistantStepText,validateHarnessModelMessages}from"#harness/messages.js";import{renderFinalOutputWhileWorkingError}from"#execution/tasks/render.js";import{extractToolApprovalInputRequests,hasRunnableQueue,parkOnApprovals,stopForToolSignIn}from"#harness/hitl/index.js";import{stageToolResultMedia}from"#harness/attachment-staging.js";import{isWorkflowTool,workingTaskIds}from"#execution/tasks/model-step.js";import{collectWorkflowCalls}from"#harness/coordination.js";import{fail,finishTurn,hold,suspendStep,withResult}from"#harness/session-machine/transitions.js";import{createToolResultMessagePartFromToolError,isToolResultError}from"#harness/action-result-helpers.js";import{setRequestEnvelopeTokens}from"#harness/request-envelope.js";import{getInvalidToolCallInputError,isInvalidToolCall}from"#harness/tool-call-input-errors.js";import{resolveInlineAuthorizationInterrupt}from"#harness/inline-tool-authorization.js";import{FINAL_OUTPUT_BESIDE_PENDING_CALLS}from"#harness/final-output.js";import{appendMissingToolResultMessages,extractToolResultCallIds}from"#harness/model-call/response.js";import{clearTurnClientContextState}from"#harness/turn-client-context.js";import{normalizeProviderToolHistory}from"#harness/provider-tool-history.js";const log=createLogger(`harness.tool-loop`);function getInvalidToolCallInputErrors(e){let t=[];for(let n of e.toolCalls){if(n.toolName===REPLY_TOOL_NAME)continue;let e=getInvalidToolCallInputError({toolCall:n});e!==void 0&&t.push(e)}return t}async function handleStepResult(e,t){let{promptMessages:n,result:r}=t,i=resolveAssistantStepText(r.response.messages,r.text),a=getInvalidToolCallInputErrors({toolCalls:r.toolCalls}),o=new Set([...r.invalidInputToolCallIds??[],...r.toolCalls.filter(isInvalidToolCall).map(e=>e.toolCallId),...a.map(e=>e.toolCallId)]),s=appendMissingToolResultMessages({append:a.map(e=>createToolResultMessagePartFromToolError(e)),responseMessages:r.response.messages}),c=new Set;for(let e of[...r.content??[],...r.toolResults??[]])(e.type===`tool-result`||e.type===`tool-error`)&&e.providerExecuted===!0&&c.add(e.toolCallId);let l=normalizeProviderToolHistory({messages:s,providerExecutedOutcomeIds:c}),u=await stageToolResultMedia(withoutApprovalParts(l.messages));e.session=setRequestEnvelopeTokens({...e.session,compaction:createNextCompactionConfig(e.session.compaction,t.durableModelPromptMessageCount,r)},r.usage?.inputTokens!==void 0&&t.durableModelPromptMessageCount!==void 0?t.requestEnvelopeTokens:void 0);let d=extractToolApprovalInputRequests({content:r.content??[],excludedCallIds:o,tools:t.catalog}),f=new Set([...d.map(e=>e.action.callId),...extractToolResultCallIds(u)]),p=(r.toolCalls??[]).filter(e=>!o.has(e.toolCallId)).filter(e=>!f.has(e.toolCallId)).filter(e=>isWorkflowTool(t.catalog.get(e.toolName))),m=resolveInlineAuthorizationInterrupt({toolResults:r.toolResults});if(p.length>0||d.length>0||m){let{sequence:i,stepIndex:a,turnId:o}=e.position(),s=collectWorkflowCalls({session:e.session,toolCalls:p,tools:t.catalog,turnId:o});e.session={...s.session,history:validateHarnessModelMessages(n)};let c={event:{sequence:i,stepIndex:a,turnId:o},messages:answerCallsThatWontRun(u,r),tasks:s.workflowRequests};if(d.length>0){let n=await parkOnApprovals(e,{...c,requests:d,tools:t.catalog,waitsOn:m?`sign-in`:p.length>0?`runtime`:void 0});return m?stopForToolSignIn(e,m):n}return await e.apply(suspendStep(e.view(),c)),m?stopForToolSignIn(e,m):(s.workflowRequests.some(e=>e.entry.entryPoint===`execute`)&&await e.apply(hold(e.view(),{on:`tasks`})),{next:null,session:e.session})}e.session={...e.session,history:validateHarnessModelMessages([...n,...u])};let h=e.session.outputSchema!==void 0&&extractFinalOutput(r)!==void 0,g=workingTaskIds(e.session),_=h&&g.length>0,v=u;_&&(v=rejectFinalOutput(u,r,g),e.session={...e.session,history:validateHarnessModelMessages([...n,...v])});let y=await stepEndsTurn(r,u,t.endsTurnTools);return(!h||_)&&(v.at(-1)?.role===`tool`&&!y||l.outcomeEndsResponse||hasRunnableQueue(e.view()))?{next:e.runStep,session:e.session}:g.length>0?(await e.apply(hold(e.view(),{on:`tasks`})),{held:{kind:`tasks`,taskIds:g},next:null,session:e.session}):settleTurn(e,{history:n,result:r,stepOutput:y?null:i})}function answerCallsThatWontRun(e,t){let n=extractToolResultCallIds(e);return(t.toolCalls??[]).filter(e=>e.toolName===REPLY_TOOL_NAME).map(e=>({output:{type:`error-text`,value:FINAL_OUTPUT_BESIDE_PENDING_CALLS},toolCallId:e.toolCallId,toolName:e.toolName,type:`tool-result`})).filter(e=>!n.has(e.toolCallId)).reduce((e,t)=>withResult(e,t),[...e])}function withoutApprovalParts(e){return e.flatMap(e=>{if(e.role!==`assistant`&&e.role!==`tool`||!Array.isArray(e.content))return[e];let t=e.content.filter(e=>e.type!==`tool-approval-request`&&e.type!==`tool-approval-response`);return t.length===0?[]:[{...e,content:t}]})}async function stepEndsTurn(e,t,n){let r=e.toolCalls??[];if(r.length===0)return!1;let i=new Map;for(let e of t)if(e.role===`tool`)for(let t of e.content)t.type===`tool-result`&&i.set(t.toolCallId,t.output);if(!r.every(e=>{let t=i.get(e.toolCallId);return n.has(e.toolName)&&t!==void 0&&!isToolResultError(t)}))return!1;let a=new Map((e.toolResults??[]).map(e=>[e.toolCallId,e.output]));for(let e of r){let t=n.get(e.toolName);if(typeof t==`function`&&!await callEndsTurn(t,a.get(e.toolCallId),e))return!1}return!0}async function callEndsTurn(e,t,n){try{return await e(t)===!0}catch(e){return log.warn(`endsTurn threw; continuing the turn`,{callId:n.toolCallId,error:e,toolName:n.toolName}),!1}}function rejectFinalOutput(e,t,n){let r=(t.toolCalls??[]).find(e=>e.toolName===REPLY_TOOL_NAME);if(r===void 0)return[...e];let i={output:{type:`error-text`,value:renderFinalOutputWhileWorkingError(n)},toolCallId:r.toolCallId,toolName:REPLY_TOOL_NAME,type:`tool-result`};return[...e,{content:[i],role:`tool`}]}const OUTPUT_SCHEMA_NOT_FULFILLED={code:`OUTPUT_SCHEMA_NOT_FULFILLED`,message:`The agent could not produce a result matching the requested schema.`};function extractFinalOutput(e){return(e.toolCalls??[]).find(e=>e.toolName===REPLY_TOOL_NAME&&!isInvalidToolCall(e))?.input}async function settleTurn(e,t){let{history:n,result:r,stepOutput:i}=t,a=e.session.outputSchema;if(e.session=clearTurnClientContextState(e.session),a===void 0)return await e.apply(finishTurn(e.view()),e.session.history),{next:null,session:e.session,settledTurn:{output:i??``}};let o=extractFinalOutput(r);return o===void 0?(e.session={...e.session,outputSchema:void 0},await e.apply(fail(e.view(),OUTPUT_SCHEMA_NOT_FULFILLED)),{next:null,session:e.session,settledTurn:{isError:!0,output:OUTPUT_SCHEMA_NOT_FULFILLED.message}}):(e.session={...e.session,history:[...n,{content:JSON.stringify(o),role:`assistant`}],outputSchema:void 0},await e.apply(finishTurn(e.view(),{result:o}),e.session.history),{next:null,session:e.session,settledTurn:{output:o}})}function createNextCompactionConfig(e,t,n){let r={recentWindowSize:e.recentWindowSize,threshold:e.threshold,thresholdPercent:e.thresholdPercent};return n.usage?.inputTokens!==void 0&&t!==void 0&&(r.lastKnownInputTokens=n.usage.inputTokens,r.lastKnownPromptMessageCount=t),r}export{handleStepResult,withoutApprovalParts};
+import{createLogger}from"#internal/logging.js";import{REPLY_TOOL_NAME}from"#protocol/reply-tool.js";import{renderFinalOutputWhileWorkingError}from"#execution/tasks/render.js";import{askStepApprovals,stopForToolSignIn}from"#harness/hitl/index.js";import{stageToolResultMedia}from"#harness/attachment-staging.js";import{resolveAssistantStepText,validateHarnessModelMessages}from"#harness/messages.js";import{isWorkflowTool,workingTaskIds}from"#execution/tasks/model-step.js";import{collectWorkflowCalls}from"#harness/coordination.js";import{fail,suspendStep}from"#harness/session-machine/transitions.js";import{turnSettled}from"#harness/facts.js";import{createToolResultMessagePartFromToolError,isToolResultError}from"#harness/action-result-helpers.js";import{getInvalidToolCallInputError,isInvalidToolCall}from"#harness/tool-call-input-errors.js";import{withPromptMeasurement}from"#harness/compaction/engine.js";import{withResult}from"#harness/session-machine/suspended-steps.js";import{hasQueuedTurnInput,park}from"#harness/step/park.js";import{resolveInlineAuthorizationInterrupt}from"#harness/inline-tool-authorization.js";import{FINAL_OUTPUT_BESIDE_PENDING_CALLS}from"#harness/final-output.js";import{failTurnForReaction}from"#harness/step/context.js";import{appendMissingToolResultMessages,extractToolResultCallIds}from"#harness/model-call/response.js";import{clearTurnClientContextState}from"#harness/turn-client-context.js";import{normalizeProviderToolHistory}from"#harness/provider-tool-history.js";const log=createLogger(`harness.tool-loop`);function getInvalidToolCallInputErrors(e){let t=[];for(let n of e.toolCalls){if(n.toolName===REPLY_TOOL_NAME)continue;let e=getInvalidToolCallInputError({toolCall:n});e!==void 0&&t.push(e)}return t}async function handleStepResult(e,t){let{promptMessages:n,result:r}=t,i=resolveAssistantStepText(r.response.messages,r.text),a=getInvalidToolCallInputErrors({toolCalls:r.toolCalls}),o=new Set([...r.invalidInputToolCallIds??[],...r.toolCalls.filter(isInvalidToolCall).map(e=>e.toolCallId),...a.map(e=>e.toolCallId)]),s=appendMissingToolResultMessages({append:a.map(e=>createToolResultMessagePartFromToolError(e)),responseMessages:r.response.messages}),c=new Set;for(let e of[...r.content??[],...r.toolResults??[]])(e.type===`tool-result`||e.type===`tool-error`)&&e.providerExecuted===!0&&c.add(e.toolCallId);let l=normalizeProviderToolHistory({messages:s,providerExecutedOutcomeIds:c}),u=await stageToolResultMedia(l.messages);e.session={...e.session,compaction:withPromptMeasurement(e.session.compaction,{inputTokens:r.usage?.inputTokens,promptMessageCount:t.durableModelPromptMessageCount,requestEnvelopeTokens:t.requestEnvelopeTokens})};let d=r.approvalRequests??[],f=new Set([...d.map(e=>e.call.callId),...extractToolResultCallIds(u)]),p=(r.toolCalls??[]).filter(e=>!o.has(e.toolCallId)).filter(e=>!f.has(e.toolCallId)).filter(e=>isWorkflowTool(t.catalog.get(e.toolName))),m=resolveInlineAuthorizationInterrupt({signIns:r.signIns??[]});if(p.length>0||d.length>0||m){let{sequence:i,stepIndex:a,turnId:o}=e.position(),s=collectWorkflowCalls({session:e.session,toolCalls:p,tools:t.catalog,turnId:o});e.session={...s.session,history:validateHarnessModelMessages(n)};let c={event:{sequence:i,stepIndex:a,turnId:o},messages:answerCallsThatWontRun(u,r),tasks:s.workflowRequests.map(e=>({...e,clearedBy:r.policyApprovals?.[e.callId]}))};return d.length>0?await askStepApprovals(e,{...c,requests:d,tools:t.catalog}):await e.apply(suspendStep(e.view(),c)),m?stopForToolSignIn(e,m):park(e)}e.session={...e.session,history:validateHarnessModelMessages([...n,...u])};let h=e.session.outputSchema!==void 0&&extractFinalOutput(r)!==void 0,g=workingTaskIds(e.session),_=h&&g.length>0,v=u;_&&(v=rejectFinalOutput(u,r,g),e.session={...e.session,history:validateHarnessModelMessages([...n,...v])});let y=await stepEndsTurn(r,u,t.endsTurnTools);return(!h||_)&&(v.at(-1)?.role===`tool`&&!y||l.outcomeEndsResponse||hasQueuedTurnInput(e.view()))?{next:e.runStep,session:e.session}:g.length>0?{held:{kind:`tasks`,taskIds:g},next:null,session:e.session}:settleTurn(e,{history:n,result:r,stepOutput:y?null:i})}function answerCallsThatWontRun(e,t){let n=extractToolResultCallIds(e);return(t.toolCalls??[]).filter(e=>e.toolName===REPLY_TOOL_NAME).map(e=>({output:{type:`error-text`,value:FINAL_OUTPUT_BESIDE_PENDING_CALLS},toolCallId:e.toolCallId,toolName:e.toolName,type:`tool-result`})).filter(e=>!n.has(e.toolCallId)).reduce((e,t)=>withResult(e,t),[...e])}async function stepEndsTurn(e,t,n){let r=e.toolCalls??[];if(r.length===0)return!1;let i=new Map;for(let e of t)if(e.role===`tool`)for(let t of e.content)t.type===`tool-result`&&i.set(t.toolCallId,t.output);if(!r.every(e=>{let t=i.get(e.toolCallId);return n.has(e.toolName)&&t!==void 0&&!isToolResultError(t)}))return!1;let a=new Map((e.toolResults??[]).map(e=>[e.toolCallId,e.output]));for(let e of r){let t=n.get(e.toolName);if(typeof t==`function`&&!await callEndsTurn(t,a.get(e.toolCallId),e))return!1}return!0}async function callEndsTurn(e,t,n){try{return await e(t)===!0}catch(e){return log.warn(`endsTurn threw; continuing the turn`,{callId:n.toolCallId,error:e,toolName:n.toolName}),!1}}function rejectFinalOutput(e,t,n){let r=(t.toolCalls??[]).find(e=>e.toolName===REPLY_TOOL_NAME);if(r===void 0)return[...e];let i={output:{type:`error-text`,value:renderFinalOutputWhileWorkingError(n)},toolCallId:r.toolCallId,toolName:REPLY_TOOL_NAME,type:`tool-result`};return[...e,{content:[i],role:`tool`}]}const OUTPUT_SCHEMA_NOT_FULFILLED={code:`OUTPUT_SCHEMA_NOT_FULFILLED`,message:`The agent could not produce a result matching the requested schema.`};function extractFinalOutput(e){return(e.toolCalls??[]).find(e=>e.toolName===REPLY_TOOL_NAME&&!isInvalidToolCall(e))?.input}async function settleTurn(e,t){let{history:n,result:r,stepOutput:i}=t,a=await failTurnForReaction(e);if(a!==void 0)return a;let o=e.session.outputSchema;if(e.session=clearTurnClientContextState(e.session),o===void 0)return await e.apply(turnSettled(e.view().projection,{outcome:`completed`}),e.session.history),{next:null,session:e.session,settledTurn:{output:i??``}};let s=extractFinalOutput(r);return s===void 0?(e.session={...e.session,outputSchema:void 0},await e.apply(fail(e.view(),OUTPUT_SCHEMA_NOT_FULFILLED)),{next:null,session:e.session,settledTurn:{isError:!0,output:OUTPUT_SCHEMA_NOT_FULFILLED.message}}):(e.session={...e.session,history:[...n,{content:JSON.stringify(s),role:`assistant`}],outputSchema:void 0},await e.apply(turnSettled(e.view().projection,{outcome:`completed`}),e.session.history),{next:null,session:e.session,settledTurn:{output:s}})}export{handleStepResult};

package/dist/src/harness/step/context.d.ts

@@ -1,14 +1,13 @@
 import type { ModelMessage } from "ai";
+import type { SessionEvent } from "#protocol/session-event.js";
 import type { AlsContext } from "#context/container.js";
 import { type HarnessModelMessage } from "#harness/messages.js";
 import { type Publish, type Transition } from "#harness/session-machine/commit.js";
 import { type StepProjection } from "#harness/session-machine/current.js";
+import { type Prompt } from "#harness/step/prompt.js";
 import { type SessionView, type TurnPosition } from "#harness/session-machine/view.js";
-import type { HarnessEmitFn, HarnessSession, StepFn, StepInput, StepResult, ToolLoopHarnessConfig } from "#harness/types.js";
+import type { HarnessEmitFn, HarnessSession, StepFn, HarnessStepInput, StepResult, ToolLoopHarnessConfig } from "#harness/types.js";
 import type { InstrumentationStepScope } from "#instrumentation/runtime.js";
-import type { SessionHistoryMessage } from "#shared/session-history.js";
-import type { createHistoryViewPreparer } from "#shared/history-view.js";
-type HistoryViewPreparer = ReturnType<typeof createHistoryViewPreparer>;
 /**
  * One harness step: the session it changes, and the machine it changes the session through.
  * Every lifecycle change goes through `apply`, which publishes the transition's events and saves
@@ -27,11 +26,15 @@ export interface Step {
     readonly instrumentation: InstrumentationStepScope<HarnessSession> | undefined;
     /** A child's caller or a schedule hears only the turn's real end. */
     readonly hasDelegatedCaller: boolean;
+    /**
+     * The session's reader sees only its final reply: a child's caller or a schedule. A held turn's
+     * text there narrates; a person reads it as a reply.
+     */
+    readonly finalReplyOnly: boolean;
     view(): SessionView;
     position(): TurnPosition;
-    apply(transition: Transition, messages?: readonly ModelMessage[]): Promise<void>;
-    /** History as the model and hooks see it, under `state`, the session's by default. */
-    projectHistory(messages: readonly ModelMessage[], state?: HarnessSession["state"]): readonly ModelMessage[];
+    /** Publishes a transition, or facts that change nothing private, as one commit. */
+    apply(change: Transition | readonly SessionEvent[], messages?: readonly ModelMessage[]): Promise<void>;
 }
 export declare function createStep(input: {
     readonly config: ToolLoopHarnessConfig;
@@ -39,29 +42,26 @@ export declare function createStep(input: {
     readonly emit: HarnessEmitFn | undefined;
     readonly instrumentation: InstrumentationStepScope<HarnessSession> | undefined;
     readonly live: StepProjection;
-    readonly prepareHistory: HistoryViewPreparer;
     readonly publish: Publish;
     readonly runStep: StepFn;
     readonly session: HarnessSession;
 }): Step;
-/**
- * Opens the turn, or joins the open one, with the preamble its hooks prepare: memory recall and
- * dynamic instructions join history ahead of the turn's input. Returns the step's result when the
- * preamble failed the session.
- */
+/** Opens the turn, or joins the open one. Returns the step's result when opening failed the session. */
 export declare function openTurn(step: Step, opened: {
-    /** Prior conversation the delivery added, published before the message. */
-    readonly imported?: readonly SessionHistoryMessage[];
     readonly input: readonly HarnessModelMessage[];
-    readonly message?: StepInput["message"];
+    readonly message?: HarnessStepInput["message"];
+    /** The deliveries the turn consumes. */
+    readonly deliveries?: HarnessStepInput["deliveries"];
 }): Promise<StepResult | undefined>;
 /**
- * A lifecycle event failed to publish: a dynamic model selection failure ends the session, and a
- * dynamic connection resolver failure parks it. Anything else throws.
+ * Before a model call: the session's dynamic values are evaluated with the conversation the call
+ * reads, and user-role instructions from new occurrences join history, ahead of the turn's input
+ * on its first call. A value that fails fails the turn; returns the step's result then.
  */
+export declare function prepareModelCall(step: Step, preview: Prompt): Promise<StepResult | undefined>;
+/** A hook failed during the turn: the turn fails. Returns the step's result then. */
+export declare function failTurnForReaction(step: Step): Promise<StepResult | undefined>;
+/** A lifecycle event failed to publish: a dynamic model selection failure ends the session. */
 export declare function failBoundaryEvent(step: Step, error: unknown): Promise<StepResult>;
-/** A dynamic connection resolver threw: the session parks so the next message can retry. */
-export declare function failConnectionResolution(step: Step, error: unknown): Promise<StepResult>;
 /** No model can serve the turn: the session fails. */
 export declare function failModelSelection(step: Step, error: unknown): Promise<StepResult>;
-export {};

package/dist/src/harness/step/context.js

@@ -1 +1 @@
-import{createErrorId,createLogger}from"#internal/logging.js";import{recordAppliedSession}from"#harness/session-machine/current.js";import{ParentSessionKey,SessionCallbackKey,SessionPredecessorKey}from"#context/keys.js";import{toErrorMessage}from"#shared/errors.js";import{validateHarnessModelMessages}from"#harness/messages.js";import{drainMemoryCommit,prepareMemoryPreamble}from"#context/memory-lifecycle.js";import{activeTurnId,turnPosition}from"#harness/session-machine/view.js";import{fail,receive}from"#harness/session-machine/transitions.js";import{isDynamicConnectionResolutionError}from"#context/dynamic-connection-lifecycle.js";import{applyTransition,sessionView}from"#harness/session-machine/commit.js";import{isDynamicModelSelectionError}from"#context/dynamic-model-lifecycle.js";import{isTurnCancellation,throwIfTurnAborted}from"#harness/turn-cancellation.js";import{drainDynamicInstructionUserMessages,prepareDynamicInstructionPreamble}from"#context/dynamic-instruction-lifecycle.js";const log=createLogger(`harness.step`);function createStep(e){let{ctx:t,live:n}=e,r={session:e.session,frameworkToolNames:new Set,config:e.config,ctx:t,runStep:e.runStep,publish:e.publish,emit:e.emit,instrumentation:e.instrumentation,hasDelegatedCaller:t?.get(ParentSessionKey)!==void 0||t?.get(SessionCallbackKey)!==void 0,view:()=>sessionView(n.read(),r.session.state),position:()=>turnPosition(n.read()),async apply(n,i){r.session=await applyTransition(r.session,n,e.publish,i),t!==void 0&&recordAppliedSession(t,r.session)},projectHistory:(t,n=r.session.state)=>e.prepareHistory(t,n).messages};return r}async function openTurn(e,t){let{config:n,ctx:r}=e;r!==void 0&&(prepareDynamicInstructionPreamble(r,e.projectHistory(e.session.history)),prepareMemoryPreamble(r,{history:e.session.history,input:[...t.input],projector:n.historyProjector,state:e.session.state}));let i;try{let i=e.position(),a=await e.instrumentation?.preparePreamble({sequence:i.sequence,sessionStarted:i.sessionStarted,traceContext:e.instrumentation?.traceContext,turnId:activeTurnId(i)});await e.apply(receive(e.view(),{imported:t.imported,message:t.message,predecessor:r?.get(SessionPredecessorKey),runtime:n.runtimeIdentity,trace:a}),e.projectHistory([...e.session.history,...t.input]))}catch(e){i={error:e}}let a=r===void 0?[]:drainDynamicInstructionUserMessages(r),o=r===void 0?void 0:drainMemoryCommit(r);if(e.session={...e.session,history:validateHarnessModelMessages([...e.session.history,...o?.recalledMessages??[],...a]),state:o?.state??e.session.state},i!==void 0)return failBoundaryEvent(e,i.error);e.instrumentation?.setTurnId(e.position().turnId)}async function failBoundaryEvent(e,t){if(throwIfTurnAborted(e.config.abortSignal),isTurnCancellation(t))throw t;if(isDynamicModelSelectionError(t))return failModelSelection(e,t);if(isDynamicConnectionResolutionError(t))return failConnectionResolution(e,t);throw t}async function failConnectionResolution(e,t){if(e.emit===void 0)throw t;e.instrumentation?.recordError(t);let n=createErrorId(),r=toErrorMessage(t);return log.error(`dynamic connection resolver failed — parking session`,{error:t,errorId:n,sessionId:e.session.sessionId,turnId:activeTurnId(e.position())}),await e.apply(fail(e.view(),{code:`EVENT_HANDLER_FAILED`,details:{errorId:n},message:r})),e.session={...e.session,outputSchema:void 0},{next:null,session:e.session,settledTurn:{isError:!0,output:r}}}async function failModelSelection(e,t){if(throwIfTurnAborted(e.config.abortSignal),e.instrumentation?.recordError(t),e.emit===void 0)throw t;let n=createErrorId(),r=toErrorMessage(t),{session:i}=e;return log.error(`model selection failed terminally`,{error:t,errorId:n,sessionId:i.sessionId,turnId:activeTurnId(e.position())}),await e.apply(fail(e.view(),{code:`MODEL_SELECTION_FAILED`,details:{errorId:n},message:r,terminal:{sessionId:i.sessionId}})),{next:e.hasDelegatedCaller?{done:!0,isError:!0,output:r}:{done:!0,output:``},session:e.session}}export{createStep,failBoundaryEvent,failConnectionResolution,failModelSelection,openTurn};
+import{createErrorId,createLogger}from"#internal/logging.js";import{ParentSessionKey,ScheduleIdKey,SessionCallbackKey,SessionPredecessorKey}from"#context/keys.js";import{toErrorMessage}from"#shared/errors.js";import{activeTurnId,turnPosition}from"#harness/session-machine/view.js";import{recordAppliedSession}from"#harness/session-machine/current.js";import{validateHarnessModelMessages}from"#harness/messages.js";import{applyTransition,dropClosedRecords,sessionView}from"#harness/session-machine/commit.js";import{fail,receive}from"#harness/session-machine/transitions.js";import{evaluateValues,isReactionFailedError}from"#reactions/runner.js";import{isTurnCancellation,throwIfTurnAborted}from"#harness/turn-cancellation.js";import{withClientContext}from"#harness/step/prompt.js";import{isDynamicModelSelectionError}from"#reactions/kinds/model.js";import{takeUserInstructionMessages}from"#reactions/kinds/instructions.js";import{takeTurnFailure}from"#reactions/intents.js";const log=createLogger(`harness.step`);function createStep(e){let{ctx:t,live:n}=e,r=t?.get(ParentSessionKey)!==void 0||t?.get(SessionCallbackKey)!==void 0,i={session:e.session,frameworkToolNames:new Set,config:e.config,ctx:t,runStep:e.runStep,publish:e.publish,emit:e.emit,instrumentation:e.instrumentation,hasDelegatedCaller:r,finalReplyOnly:r||t?.get(ScheduleIdKey)!==void 0,view:()=>sessionView(n.read(),i.session.state),position:()=>turnPosition(n.read()),async apply(r,a){let o=`events`in r?r:{events:r,turn:i.view().turn};i.session=dropClosedRecords(await applyTransition(i.session,o,e.publish,a),n.read()),t!==void 0&&recordAppliedSession(t,i.session)}};return i}async function openTurn(e,t){let{config:n,ctx:r}=e,i;try{let i=e.position(),a=await e.instrumentation?.preparePreamble({sequence:i.sequence,sessionStarted:i.sessionStarted,traceContext:e.instrumentation?.traceContext,turnId:activeTurnId(i)});await e.apply(receive(e.view(),{deliveries:t.deliveries,predecessor:r?.get(SessionPredecessorKey),runtime:n.runtimeIdentity,trace:a}),[...e.session.history,...t.input])}catch(e){i={error:e}}if(i!==void 0)return failBoundaryEvent(e,i.error);e.instrumentation?.setTurnId(e.position().turnId)}async function prepareModelCall(e,t){let n=e.ctx;if(n===void 0)return;throwIfTurnAborted(e.config.abortSignal);try{await evaluateValues(n,{abortSignal:e.config.abortSignal,conversation:validateHarnessModelMessages(withClientContext(t))})}catch(t){if(!isReactionFailedError(t))throw t;return failTurn(e,t,`REACTION_FAILED`)}let r=takeUserInstructionMessages(n);r.length>0&&(e.session={...e.session,history:validateHarnessModelMessages([...e.session.history,...r])})}async function failTurnForReaction(e){let t=takeTurnFailure(e.ctx);if(t!==void 0)return failTurn(e,Error(t),`HOOK_FAILED`)}async function failTurn(e,t,n){throwIfTurnAborted(e.config.abortSignal),e.instrumentation?.recordError(t);let r=toErrorMessage(t),i=createErrorId();return log.error(`turn failed`,{code:n,error:t,errorId:i,sessionId:e.session.sessionId,turnId:activeTurnId(e.position())}),await e.apply(fail(e.view(),{code:n,details:{errorId:i},message:r})),{next:null,session:e.session,settledTurn:{isError:!0,output:r}}}async function failBoundaryEvent(e,t){if(throwIfTurnAborted(e.config.abortSignal),isTurnCancellation(t))throw t;if(isDynamicModelSelectionError(t))return failModelSelection(e,t);throw t}async function failModelSelection(e,t){if(throwIfTurnAborted(e.config.abortSignal),e.instrumentation?.recordError(t),e.emit===void 0)throw t;let n=createErrorId(),r=toErrorMessage(t),{session:i}=e;return log.error(`model selection failed terminally`,{error:t,errorId:n,sessionId:i.sessionId,turnId:activeTurnId(e.position())}),await e.apply(fail(e.view(),{code:`MODEL_SELECTION_FAILED`,details:{errorId:n},message:r,terminal:!0})),{next:e.hasDelegatedCaller?{done:!0,isError:!0,output:r}:{done:!0,output:``},session:e.session}}export{createStep,failBoundaryEvent,failModelSelection,failTurnForReaction,openTurn,prepareModelCall};

package/dist/src/harness/step/intake.d.ts

@@ -1,15 +1,14 @@
 import { type HarnessModelMessage, type UserModelMessage } from "#harness/messages.js";
 import { getTurnClientContextState } from "#harness/turn-client-context.js";
-import type { StepInput } from "#harness/types.js";
-import type { SessionHistoryMessage } from "#shared/session-history.js";
+import type { HarnessStepInput } from "#harness/types.js";
 import type { Step } from "./context.js";
 /**
  * Settles the calls the runtime ran for parked steps. Returns `undefined` while some are still
  * running: input queued behind them waits until they have. Otherwise returns the step's input
  * without the results it settled, and whether the step waited on any.
  */
-export declare function settleRuntimeWork(step: Step, input: StepInput | undefined): Promise<{
-    readonly input: StepInput | undefined;
+export declare function settleRuntimeWork(step: Step, input: HarnessStepInput | undefined): Promise<{
+    readonly input: HarnessStepInput | undefined;
     readonly waited: boolean;
 } | undefined>;
 /** The turn's input as the model reads it. */
@@ -19,18 +18,18 @@ export interface TurnInput {
     readonly clientContext: readonly string[] | undefined;
     readonly storedClientContext: ReturnType<typeof getTurnClientContextState>;
     readonly ephemeral: readonly UserModelMessage[];
-    /** Prior conversation the delivery added, as published in `history.imported`. */
-    readonly imported: readonly SessionHistoryMessage[];
-    /** The added history, the context entries, and the message, in history order. */
+    /** Imported history, the context entries, and the message, in history order. */
     readonly messages: readonly HarnessModelMessage[];
     /** The input carries a user's message, which follows tool results across a boundary. */
     readonly hasUserMessage: boolean;
+    /** The message with its attachments staged, so input queued again isn't staged twice. */
+    readonly message: HarnessStepInput["message"];
 }
 /**
  * Prepares the turn's input: client and context entries, and the message with its attachments
  * staged to the sandbox. A message a plain-text answer consumed never reaches the model.
  */
-export declare function prepareTurnInput(step: Step, input: StepInput | undefined, options: {
+export declare function prepareTurnInput(step: Step, input: HarnessStepInput | undefined, options: {
     readonly consumedMessage: boolean;
 }): Promise<TurnInput>;
 /** The turn's input as it follows tool results: a user message needs a boundary before it. */

package/dist/src/harness/step/intake.js

@@ -1 +1 @@
-import{readClientContext}from"#internal/client-context.js";import{TOOL_RESULT_BOUNDARY,createFrameworkUserMessage,createImportedHistoryMessages,createUserMessage,frameworkMessageKindForStepInput,normalizeUserContent}from"#harness/messages.js";import{activeTurnId,runtimeWait}from"#harness/session-machine/view.js";import{stageAttachmentsToSandbox,stageToolResultMedia}from"#harness/attachment-staging.js";import{forgetFinishedRuns,runtimeResultCalls}from"#harness/coordination.js";import{finishRun,settle}from"#harness/session-machine/transitions.js";import{resolveRuntimeActionResultsForCallIds}from"#runtime/actions/results.js";import{getTurnClientContextState}from"#harness/turn-client-context.js";async function settleRuntimeWork(e,t){let n=runtimeWait(e.session.state);if(n===void 0)return{input:t,waited:!1};let r=resolveRuntimeActionResultsForCallIds({pendingCallIds:n.callIds,results:t?.runtimeActionResults??[]});if(r===void 0)return;let i=forgetFinishedRuns(e.session,r,n.event.turnId);e.session=i.session,await e.apply(finishRun(e.view(),{requestIds:i.requestIds}));let a=await runtimeResultCalls(r,e.config.tools),o=(await stageToolResultMedia([{role:`tool`,content:a.map(({part:e})=>e)}])).flatMap(e=>e.role===`tool`?e.content.filter(e=>e.type===`tool-result`):[]);if(await e.apply(settle(e.view(),{results:a.map((e,t)=>({...e,part:o[t]}))})),t===void 0)return{input:t,waited:!0};let{runtimeActionResults:s,...c}=t;return{input:c,waited:!0}}async function prepareTurnInput(e,t,n){let r=activeTurnId(e.position()),i=getTurnClientContextState(e.session.state,r),a=readClientContext(t),o=(a??i?.messages)?.map(e=>createFrameworkUserMessage(`context.instruction`,e))??[],s=t?.history??[],c=[...createImportedHistoryMessages(s),...(t?.context??[]).map(e=>createFrameworkUserMessage(`context.instruction`,e))],l=frameworkMessageKindForStepInput(t),u=normalizeUserContent(t?.message),d=u!==void 0&&!n.consumedMessage?await stageAttachmentsToSandbox(u):void 0;return d!==void 0&&c.push(l===void 0?createUserMessage(`user`,d):createFrameworkUserMessage(l,d)),{clientContext:a,ephemeral:o,hasUserMessage:d!==void 0&&l===void 0,imported:s,messages:c,storedClientContext:i,turnId:r}}function followingToolResults(e){return[...e.hasUserMessage?[{content:TOOL_RESULT_BOUNDARY,role:`assistant`}]:[],...e.messages]}export{followingToolResults,prepareTurnInput,settleRuntimeWork};
+import{readClientContext}from"#internal/client-context.js";import{activeTurnId,runtimeWait}from"#harness/session-machine/view.js";import{stageAttachmentsToSandbox,stageToolResultMedia}from"#harness/attachment-staging.js";import{TOOL_RESULT_BOUNDARY,anchorToTurn,createFrameworkUserMessage,createImportedHistoryMessages,createUserMessage,frameworkMessageKindForStepInput,normalizeMessage,userContentOf}from"#harness/messages.js";import{forgetFinishedRuns,runtimeResultCalls}from"#harness/coordination.js";import{finishRun,settle}from"#harness/session-machine/transitions.js";import{delegatedUsageFact}from"#harness/facts.js";import{resolveRuntimeActionResultsForCallIds}from"#runtime/actions/results.js";import{getTurnClientContextState}from"#harness/turn-client-context.js";async function settleRuntimeWork(e,t){let n=runtimeWait(e.session.state);if(n===void 0){if(await recordLateSpend(e,t?.delegatedUsage,new Set),t?.delegatedUsage===void 0)return{input:t,waited:!1};let{delegatedUsage:n,...r}=t;return{input:r,waited:!1}}let r=resolveRuntimeActionResultsForCallIds({pendingCallIds:n.callIds,results:t?.runtimeActionResults??[]});if(r===void 0)return;let i=forgetFinishedRuns(e.session,r,n.event.turnId);e.session=i.session,await e.apply(finishRun(e.view(),{requestIds:i.requestIds}));let a=await runtimeResultCalls(r,e.config.tools),o=(await stageToolResultMedia([{role:`tool`,content:a.map(({part:e})=>e)}])).flatMap(e=>e.role===`tool`?e.content.filter(e=>e.type===`tool-result`):[]),s=t?.delegatedUsage??{};if(await recordLateSpend(e,s,new Set(a.map(({part:e})=>e.toolCallId))),await e.apply(settle(e.view(),{results:a.map((e,t)=>({...e,part:o[t],usage:s[e.part.toolCallId]}))})),t===void 0)return{input:t,waited:!0};let{delegatedUsage:c,runtimeActionResults:l,...u}=t;return{input:u,waited:!0}}async function recordLateSpend(e,t,n){let r=Object.entries(t??{}).filter(([e])=>!n.has(e));r.length>0&&await e.publish(r.map(([,e])=>delegatedUsageFact(void 0,e)))}async function prepareTurnInput(e,t,n){let r=activeTurnId(e.position()),i=getTurnClientContextState(e.session.state,r),a=readClientContext(t),o=(a??i?.messages)?.map(e=>createFrameworkUserMessage(`context.instruction`,e))??[],s=[...createImportedHistoryMessages(t?.history??[]),...(t?.context??[]).map(e=>anchorToTurn(createFrameworkUserMessage(`context.instruction`,e),r))],c=frameworkMessageKindForStepInput(t),l=normalizeMessage(t?.message),u=l!==void 0&&!n.consumedMessage?await stageAttachmentsToSandbox(userContentOf(l)):void 0;return u!==void 0&&s.push(anchorToTurn(c===void 0?createUserMessage(`user`,u):createFrameworkUserMessage(c,u),r)),{clientContext:a,ephemeral:o,hasUserMessage:u!==void 0&&c===void 0,message:u,messages:s,storedClientContext:i,turnId:r}}function followingToolResults(e){return[...e.hasUserMessage?[{content:TOOL_RESULT_BOUNDARY,role:`assistant`}]:[],...e.messages]}export{followingToolResults,prepareTurnInput,settleRuntimeWork};

package/dist/src/harness/step/park.d.ts

@@ -0,0 +1,19 @@
+import { type SessionView } from "#harness/session-machine/view.js";
+import type { StepResult } from "#harness/types.js";
+import type { Step } from "./context.js";
+/**
+ * Whether the session resumes the turn on a person itself: a request it asked, or its own sign-in.
+ * A child's relayed sign-in resumes the turn on its call instead, though readers see a person.
+ */
+export declare function resumesOnPerson(view: SessionView): boolean;
+/** Whether an open request takes its answer before any message: the message waits behind it. */
+export declare function holdsMessages(view: SessionView): boolean;
+/** Whether the turn holds input it hasn't taken. */
+export declare function hasQueuedTurnInput(view: SessionView): boolean;
+/** Whether anything open stops the turn from calling the model. */
+export declare function blocked(view: SessionView, state: Step["session"]["state"]): boolean;
+/**
+ * Nothing the step holds can run. Input the turn holds runs next step, past whatever it steers;
+ * otherwise the turn stops, waiting on the person it asked or on the runtime's calls.
+ */
+export declare function park(step: Step): StepResult;

package/dist/src/harness/step/park.js

@@ -0,0 +1 @@
+import{readClientContext}from"#internal/client-context.js";import{ownOpenRequestIds,runtimeWait}from"#harness/session-machine/view.js";const ANSWER_FIRST_KINDS=new Set([`budget`]);function resumesOnPerson(e){return ownOpenRequestIds(e).size>0||e.signIns.length>0}function holdsMessages(e){let t=e.projection.view;return[...ownOpenRequestIds(e)].some(e=>ANSWER_FIRST_KINDS.has(t.interactions[e]?.request.kind??``))}function hasQueuedTurnInput(e){let t=e.turn.queued;return t!==void 0&&(t.message!==void 0||(t.context?.length??0)>0||t.outputSchema!==void 0||readClientContext(t)!==void 0||(t.runtimeActionResults?.length??0)>0)}function blocked(e,t){return resumesOnPerson(e)||runtimeWait(t)!==void 0}function park(e){let t=e.view();return hasQueuedTurnInput(t)&&!holdsMessages(t)?{next:e.runStep,session:e.session}:resumesOnPerson(t)?{held:{kind:`request`},next:null,session:e.session}:{next:null,session:e.session}}export{blocked,hasQueuedTurnInput,holdsMessages,park,resumesOnPerson};

package/dist/src/harness/step/prompt.d.ts

@@ -15,9 +15,8 @@ export interface Prompt {
 }
 export declare function buildPrompt(step: Step, turn: TurnInput): Promise<Prompt>;
 /**
- * The prompt a step starts on while approved calls wait to run: history and the turn's input,
- * without the task results and the client context's position a prompt settles, which wait for
- * the prompt the model reads once the calls have run.
+ * The prompt the session's dynamic values are evaluated with: history and the turn's input,
+ * without the task results and the client context's position a prompt settles.
  */
 export declare function previewPrompt(step: Step, turn: TurnInput): Prompt;
 /**
@@ -27,8 +26,8 @@ export declare function previewPrompt(step: Step, turn: TurnInput): Prompt;
 export declare function placeTurnInput(step: Step, messages: readonly HarnessModelMessage[], turn: TurnInput): HarnessModelMessage[];
 /** `messages`, the prompt's by default, with the client's context at its position. */
 export declare function withClientContext(prompt: Prompt, messages?: readonly HarnessModelMessage[]): HarnessModelMessage[];
-/** The prompt as the model reads it: with the client's context, projected for its history view. */
-export declare function projectPrompt(step: Step, prompt: Prompt): HarnessModelMessage[];
+/** The prompt as the model reads it: with the client's context. */
+export declare function projectPrompt(prompt: Prompt): HarnessModelMessage[];
 /**
  * Compaction rewrote the durable messages: the client's context keeps its distance from the end,
  * so it stays after the turn's input.

package/dist/src/harness/step/prompt.js

@@ -1 +1 @@
-import{followingToolResults}from"./intake.js";import{createFrameworkUserMessage,followsToolResults,normalizeModelMessages,validateHarnessModelMessages}from"#harness/messages.js";import{appendTaskContext}from"#execution/tasks/model-step.js";import{hasUnansweredToolCall}from"#harness/model-call/response.js";import{getTurnClientContextState,setTurnClientContextState}from"#harness/turn-client-context.js";import{repairToolHistory}from"#harness/tool-history-repair.js";async function buildPrompt(e,t){let n=repairToolHistory({messages:e.session.history,insertionIndex:t.storedClientContext?.insertionIndex}),r=validateHarnessModelMessages(n.messages);if(e.session={...e.session,history:[...r]},t.storedClientContext!==void 0&&n.insertionIndex!==void 0){let r={...t.storedClientContext,insertionIndex:n.insertionIndex};t={...t,storedClientContext:r},e.session=setTurnClientContextState(e.session,r)}if(!hasUnansweredToolCall(r)){let t=await appendTaskContext({messages:r,projectHistory:e.projectHistory,session:e.session,tools:e.config.tools});e.session=t.session,r.push(...t.messages)}let i=placeTurnInput(e,r,t);return{clientContext:getTurnClientContextState(e.session.state,t.turnId),messages:i}}function previewPrompt(e,t){let n=validateHarnessModelMessages([...e.session.history]);return{clientContext:turnClientContext(n,t),messages:withTurnInput(n,t)}}function placeTurnInput(e,t,n){let r=turnClientContext(t,n);return r!==void 0&&(e.session=setTurnClientContextState(e.session,r)),withTurnInput(t,n)}function turnClientContext(e,t){return t.clientContext===void 0?t.storedClientContext:{insertionIndex:t.storedClientContext?.insertionIndex??e.length,messages:t.clientContext,turnId:t.turnId}}function withTurnInput(e,t){return[...e,...followsToolResults(e)?followingToolResults(t):t.messages]}function withClientContext(e,t=e.messages){let{clientContext:n}=e;if(n===void 0||n.messages.length===0)return[...t];let r=Math.min(Math.max(0,n.insertionIndex),t.length);return[...t.slice(0,r),...n.messages.map(e=>createFrameworkUserMessage(`context.instruction`,e)),...t.slice(r)]}function projectPrompt(e,t){return validateHarnessModelMessages(normalizeModelMessages(e.projectHistory(withClientContext(t))))}function compactPrompt(e,t,n){let{clientContext:r}=t;if(r!==void 0){let i=Math.max(0,t.messages.length-r.insertionIndex);t.clientContext={...r,insertionIndex:Math.max(0,n.length-i)},e.session=setTurnClientContextState(e.session,t.clientContext)}t.messages=n}export{buildPrompt,compactPrompt,placeTurnInput,previewPrompt,projectPrompt,withClientContext};
+import{followingToolResults}from"./intake.js";import{anchorToTurn,createFrameworkUserMessage,followsToolResults,normalizeModelMessages,validateHarnessModelMessages}from"#harness/messages.js";import{appendTaskContext}from"#execution/tasks/model-step.js";import{hasUnansweredToolCall}from"#harness/model-call/response.js";import{getTurnClientContextState,setTurnClientContextState}from"#harness/turn-client-context.js";import{repairToolHistory}from"#harness/tool-history-repair.js";async function buildPrompt(e,t){let n=repairToolHistory({messages:e.session.history,insertionIndex:t.storedClientContext?.insertionIndex}),r=validateHarnessModelMessages(n.messages);if(e.session={...e.session,history:[...r]},t.storedClientContext!==void 0&&n.insertionIndex!==void 0){let r={...t.storedClientContext,insertionIndex:n.insertionIndex};t={...t,storedClientContext:r},e.session=setTurnClientContextState(e.session,r)}if(!hasUnansweredToolCall(r)){let n=await appendTaskContext({messages:r,session:e.session,tools:e.config.tools});e.session=n.session,r.push(...n.messages.map(e=>e.role===`user`?anchorToTurn(e,t.turnId):e))}let i=placeTurnInput(e,r,t);return{clientContext:getTurnClientContextState(e.session.state,t.turnId),messages:i}}function previewPrompt(e,t){let n=validateHarnessModelMessages([...e.session.history]);return{clientContext:turnClientContext(n,t),messages:withTurnInput(n,t)}}function placeTurnInput(e,t,n){let r=turnClientContext(t,n);return r!==void 0&&(e.session=setTurnClientContextState(e.session,r)),withTurnInput(t,n)}function turnClientContext(e,t){return t.clientContext===void 0?t.storedClientContext:{insertionIndex:t.storedClientContext?.insertionIndex??e.length,messages:t.clientContext,turnId:t.turnId}}function withTurnInput(e,t){return[...e,...followsToolResults(e)?followingToolResults(t):t.messages]}function withClientContext(e,t=e.messages){let{clientContext:n}=e;if(n===void 0||n.messages.length===0)return[...t];let r=Math.min(Math.max(0,n.insertionIndex),t.length);return[...t.slice(0,r),...n.messages.map(e=>createFrameworkUserMessage(`context.instruction`,e)),...t.slice(r)]}function projectPrompt(e){return validateHarnessModelMessages(normalizeModelMessages(withClientContext(e)))}function compactPrompt(e,t,n){let{clientContext:r}=t;if(r!==void 0){let i=Math.max(0,t.messages.length-r.insertionIndex);t.clientContext={...r,insertionIndex:Math.max(0,n.length-i)},e.session=setTurnClientContextState(e.session,t.clientContext)}t.messages=n}export{buildPrompt,compactPrompt,placeTurnInput,previewPrompt,projectPrompt,withClientContext};

package/dist/src/harness/step-hooks.d.ts

@@ -1,13 +1,23 @@
-import type { GenerateTextOnStepStartCallback, ModelMessage, PrepareStepFunction, ProviderMetadata, StepResult, ToolSet } from "ai";
+import type { GenerateTextOnStepStartCallback, LanguageModelUsage, ModelMessage, PrepareStepFunction, ProviderMetadata, StepResult, ToolSet, ToolResultPart } from "ai";
+import type { Usage } from "#protocol/session-events/envelope.js";
+import type { ToolSignIn } from "#harness/call-executor.js";
 import type { TurnPosition } from "#harness/session-machine/view.js";
 import type { ModelProfile } from "#harness/model-profile.js";
-import { type HarnessEmitFn, type HarnessSession, type HarnessToolLookup } from "#harness/types.js";
+import { type HarnessEmitFn, type HarnessSession } from "#harness/types.js";
+import type { ApprovalAsk } from "#harness/session-machine/view.js";
 /**
  * The subset of `StepResult` that the harness reads after a step completes, captured by the
  * `onStepEnd` callback.
  */
 export type HarnessStepResult = Pick<StepResult<ToolSet>, "content" | "finishReason" | "providerMetadata" | "response" | "text" | "toolCalls" | "toolResults" | "usage"> & {
+    /** The AI SDK's ID for the model call, which the telemetry of the calls it made shares. */
+    readonly callId?: string;
     readonly invalidInputToolCallIds?: ReadonlySet<string>;
+    /** The calls eve ran that wait on a person's approval. */
+    readonly approvalRequests?: readonly ApprovalAsk[];
+    readonly policyApprovals?: Readonly<Record<string, import("#protocol/session-events/families/call.js").ClearedBy>>;
+    /** The calls eve ran that stopped for a sign-in. */
+    readonly signIns?: readonly ToolSignIn[];
 };
 /**
  * Input for {@link buildStepHooks}.
@@ -35,8 +45,8 @@ interface StepHooks {
     /**
      * `ToolLoopAgent` `onStepEnd` callback.
      *
-     * Emits `actions.requested`, `action.result`, and `step.completed` events
-     * from the captured step result.
+     * Publishes call and content facts from the captured response, then settles its model run
+     * with the usage it reported.
      */
     readonly onStepEnd: (step: StepResult<ToolSet>) => Promise<void>;
     /**
@@ -74,26 +84,16 @@ interface StepHooks {
  */
 export declare function buildStepHooks(input: StepHooksInput): StepHooks;
 /**
- * Emits `actions.requested`, `action.result`, and `step.completed` events
- * from a captured step result.
- *
- * Tool calls and results that match `excludedActionToolNames`, belong to
- * tool-approval requests, or are marked `invalid` by the AI SDK (e.g. the
- * model emitted unparsable JSON) are filtered out of the emitted events.
- * The AI SDK feeds the invalid-call error back to the model on the next
- * step via `step.response.messages` so it can retry with well-formed
- * arguments — the runtime event stream only sees successfully parsed
- * tool calls.
- *
- * `handledInlineToolResultCallIds` contains results emitted by
- * `emitStreamContent` or sent to authorization. Skip them here.
+ * Ends a step's run: the calls that didn't run settle with why, then one commit holds the run's
+ * structured result, if it has one, its settlement, and its usage. The stream published the calls,
+ * and eve published the results of the calls it ran as they settled.
  */
-export declare function emitStepActions(emitFn: HarnessEmitFn, state: TurnPosition, step: HarnessStepResult, options: {
-    readonly emittedActionCallIds?: ReadonlySet<string>;
-    readonly excludedActionCallIds?: ReadonlySet<string>;
-    readonly excludedActionToolNames: ReadonlySet<string>;
-    readonly handledInlineToolResultCallIds?: ReadonlySet<string>;
-    readonly tools: HarnessToolLookup;
-}): Promise<void>;
+export declare function emitStepActions(emitFn: HarnessEmitFn, state: TurnPosition, step: HarnessStepResult, notRun: readonly ToolResultPart[]): Promise<void>;
+/** A run's usage as `usage.recorded` carries it, or `undefined` when the SDK reported none. */
+export declare function runUsageOf(input: {
+    readonly costUsd: number | undefined;
+    readonly usage: LanguageModelUsage | undefined;
+}): Usage | undefined;
+export declare function extractGatewayCostUsd(providerMetadata: ProviderMetadata | undefined): number | undefined;
 export declare function readGatewayGenerationId(providerMetadata: ProviderMetadata | undefined): string | undefined;
 export {};

package/dist/src/harness/step-hooks.js

@@ -1 +1 @@
-import{contextStorage}from"#context/container.js";import{AuthKey}from"#context/keys.js";import{createActionResultEvent,createActionsRequestedEvent,createStepCompletedEvent}from"#protocol/message.js";import{isAuthorizationSignal,isPendingAuthorizationToolOutput}from"#harness/authorization.js";import{createRuntimeToolResultFromMessagePart,createRuntimeToolResultFromStepResult,createRuntimeToolResultFromToolError,toActionResult}from"#harness/action-result-helpers.js";import{requireSessionModelReference}from"#harness/types.js";import{resolveCallProviderOptions}from"#harness/provider-safety.js";import{isInvalidToolCall}from"#harness/tool-call-input-errors.js";import{collectActionPresentation,createPresentedRuntimeActionRequestFromToolCall}from"#harness/action-presentation.js";import{normalizeAssistantStepFinishReason}from"#harness/finish-reason.js";import{extractToolApprovalInputRequests}from"#harness/input-extraction.js";import{readToolInterrupt}from"#harness/tool-interrupts.js";import{applyConversationCacheControl,mergeGatewayAutoCaching}from"#harness/prompt-cache.js";function buildStepHooks(e){let t=e.session,n;return{onStepEnd:async e=>{n(e)},onStepStart:async({messages:t})=>{await e.startStep?.(t)},prepareStep:async({messages:n})=>{let{profile:r}=e,i={messages:r.anthropicCache?applyConversationCacheControl(n,r.anthropicCache):n},a=requireSessionModelReference(t),o=resolveCallProviderOptions({auth:e.auth??contextStorage.getStore()?.get(AuthKey)??null,profile:r,providerOptions:a.providerOptions,session:t});return r.gateway?i.providerOptions=mergeGatewayAutoCaching(o):o!==void 0&&(i.providerOptions=o),i},stepResult:new Promise(e=>{n=e})}}async function emitStepActions(e,t,n,r){let i=new Set(n.toolCalls.filter(isProviderExecutedToolCall).map(e=>e.toolCallId)),a=new Set([...r.excludedActionCallIds??[],...i,...extractToolApprovalInputRequests({content:n.content??[],excludedCallIds:r.excludedActionCallIds,tools:r.tools}).map(e=>e.action.callId),...n.toolCalls.filter(isInvalidToolCall).map(e=>e.toolCallId)]),isExcluded=(e,t)=>a.has(e)||r.excludedActionToolNames.has(t),o=n.toolCalls.filter(e=>!isExcluded(e.toolCallId,e.toolName)&&!r.emittedActionCallIds?.has(e.toolCallId)).map(e=>createPresentedRuntimeActionRequestFromToolCall({toolCall:e,tools:r.tools}));o.length>0&&await e(createActionsRequestedEvent({actions:o.map(({action:e})=>e),presentation:collectActionPresentation(o),sequence:t.sequence,stepIndex:t.stepIndex,turnId:t.turnId}));let s=r.handledInlineToolResultCallIds,c=new Map(n.toolResults.map(e=>[e.toolCallId,e.output])),l=new Map(n.toolCalls.map(e=>[e.toolCallId,e.input]));for(let r of reconcileToolResults(n)){if(isExcluded(r.callId,r.toolName)||s?.has(r.callId))continue;let n=c.get(r.callId);shouldSkipAuthorizationActionResult(r.callId,n)||await e(createActionResultEvent({result:toActionResult(r,l.get(r.callId)),sequence:t.sequence,stepIndex:t.stepIndex,turnId:t.turnId}))}await e(createStepCompletedEvent({finishReason:normalizeAssistantStepFinishReason(n.finishReason),providerMetadata:extractStepProviderMetadata(n.providerMetadata),sequence:t.sequence,stepIndex:t.stepIndex,turnId:t.turnId,usage:extractStepUsage({costUsd:extractGatewayCostUsd(n.providerMetadata),usage:n.usage})}))}function isProviderExecutedToolCall(e){return e.providerExecuted===!0}function reconcileToolResults(e){let t=new Map;for(let n of e.toolResults)n.providerExecuted!==!0&&t.set(n.toolCallId,createRuntimeToolResultFromStepResult(n));for(let n of e.content??[])n.type===`tool-error`&&n.providerExecuted!==!0&&(t.has(n.toolCallId)||t.set(n.toolCallId,createRuntimeToolResultFromToolError(n)));let n=new Map(e.toolCalls.map(e=>[e.toolCallId,e.toolName]));for(let r of extractToolResultParts(e.response.messages))r.providerExecuted!==!0&&(t.has(r.toolCallId)||t.set(r.toolCallId,createRuntimeToolResultFromMessagePart(r,n.get(r.toolCallId)??r.toolName)));return[...t.values()]}function shouldSkipAuthorizationActionResult(e,t){if(t!==void 0&&isPendingAuthorizationToolOutput(t))return!0;let n=contextStorage.getStore();if(n===void 0)return!1;let r=readToolInterrupt(n,e);return r!==void 0&&isAuthorizationSignal(r)}function extractToolResultParts(e){let t=[];for(let n of e)if(n.role===`tool`&&Array.isArray(n.content))for(let e of n.content)e.type===`tool-result`&&t.push(e);return t}function extractStepUsage(e){let t={};e.costUsd!==void 0&&(t.costUsd=e.costUsd);let n=e.usage;return n===void 0?Object.keys(t).length>0?t:void 0:(n.inputTokens!==void 0&&(t.inputTokens=n.inputTokens),n.outputTokens!==void 0&&(t.outputTokens=n.outputTokens),n.inputTokenDetails?.cacheReadTokens!==void 0&&(t.cacheReadTokens=n.inputTokenDetails.cacheReadTokens),n.inputTokenDetails?.cacheWriteTokens!==void 0&&(t.cacheWriteTokens=n.inputTokenDetails.cacheWriteTokens),Object.keys(t).length>0?t:void 0)}function extractStepProviderMetadata(e){let t=readGatewayGenerationId(e);return t===void 0?void 0:{gateway:{generationId:t}}}function extractGatewayCostUsd(e){let t=readGatewayMetadata(e)?.cost;if(typeof t==`number`&&Number.isFinite(t))return t;if(typeof t==`string`){let e=Number(t);return Number.isFinite(e)?e:void 0}}function readGatewayGenerationId(e){let t=readGatewayMetadata(e)?.generationId;return typeof t==`string`&&t.length>0?t:void 0}function readGatewayMetadata(e){let t=e?.gateway;return t&&typeof t==`object`&&!Array.isArray(t)?t:void 0}export{buildStepHooks,emitStepActions,readGatewayGenerationId};
+import{contextStorage}from"#context/container.js";import{AuthKey}from"#context/keys.js";import{REPLY_TOOL_NAME}from"#protocol/reply-tool.js";import{callSettledFrom,toJsonValue}from"#harness/call-facts.js";import{usageOf}from"#harness/facts.js";import{createRuntimeToolResultFromMessagePart}from"#harness/action-result-helpers.js";import{isInvalidToolCall}from"#harness/tool-call-input-errors.js";import{requireSessionModelReference}from"#harness/types.js";import{resolveCallProviderOptions}from"#harness/provider-safety.js";import{normalizeAssistantStepFinishReason}from"#harness/finish-reason.js";import{applyConversationCacheControl,mergeGatewayAutoCaching}from"#harness/prompt-cache.js";function buildStepHooks(e){let t=e.session,n;return{onStepEnd:async e=>{n(e)},onStepStart:async({messages:t})=>{await e.startStep?.(t)},prepareStep:async({messages:n})=>{let{profile:r}=e,i={messages:r.anthropicCache?applyConversationCacheControl(n,r.anthropicCache):n},a=requireSessionModelReference(t),o=resolveCallProviderOptions({auth:e.auth??contextStorage.getStore()?.get(AuthKey)??null,profile:r,providerOptions:a.providerOptions,session:t});return r.gateway?i.providerOptions=mergeGatewayAutoCaching(o):o!==void 0&&(i.providerOptions=o),i},stepResult:new Promise(e=>{n=e})}}async function emitStepActions(e,t,n,r){let{runId:i}=t;for(let t of r)await e(callSettledFrom(createRuntimeToolResultFromMessagePart(t,t.toolName)));if(i===void 0)return;let a=[],o=finalOutputOf(n);o!==void 0&&a.push({data:{kind:`result`,partId:`${i}.result`,phase:`reply`,runId:i,value:o},type:`content.completed`});let s={finishReason:normalizeAssistantStepFinishReason(n.finishReason),outcome:`completed`,runId:i},c=readGatewayGenerationId(n.providerMetadata);c!==void 0&&(s.generationId=c),a.push({data:s,type:`model.settled`});let l=runUsageOf({costUsd:extractGatewayCostUsd(n.providerMetadata),usage:n.usage});l!==void 0&&a.push({data:{kind:`model`,owner:{runId:i},usage:l},type:`usage.recorded`}),await e(a)}function finalOutputOf(e){let t=(e.toolCalls??[]).find(e=>e.toolName===REPLY_TOOL_NAME&&!isInvalidToolCall(e));return t===void 0?void 0:toJsonValue(t.input)}function runUsageOf(e){let{usage:t}=e;if(t!==void 0||e.costUsd!==void 0)return usageOf({cacheReadTokens:t?.inputTokenDetails?.cacheReadTokens,cacheWriteTokens:t?.inputTokenDetails?.cacheWriteTokens,costUsd:e.costUsd,inputTokens:t?.inputTokens,outputTokens:t?.outputTokens})}function extractGatewayCostUsd(e){let t=readGatewayMetadata(e)?.cost;if(typeof t==`number`&&Number.isFinite(t))return t;if(typeof t==`string`){let e=Number(t);return Number.isFinite(e)?e:void 0}}function readGatewayGenerationId(e){let t=readGatewayMetadata(e)?.generationId;return typeof t==`string`&&t.length>0?t:void 0}function readGatewayMetadata(e){let t=e?.gateway;return t&&typeof t==`object`&&!Array.isArray(t)?t:void 0}export{buildStepHooks,emitStepActions,extractGatewayCostUsd,readGatewayGenerationId,runUsageOf};

package/dist/src/harness/stream-actions.d.ts

@@ -1,23 +1,17 @@
-import { type RuntimeActionRequestProjection } from "#harness/action-presentation.js";
+import type { RuntimeActionRequestProjection } from "#harness/action-presentation.js";
 import type { HarnessEmitFn } from "#harness/types.js";
 interface ActionEventCoordinates {
-    readonly sequence: number;
-    readonly stepIndex: number;
+    readonly runId?: string;
     readonly turnId: string;
 }
-interface EmittedProviderAction {
-    readonly request: RuntimeActionRequestProjection;
-    readonly toolName: string;
-}
 interface ProviderStreamActionBatch {
     cancel(): Promise<void>;
     flush(): Promise<void>;
-    observe(action: RuntimeActionRequestProjection, toolName: string): void;
+    observe(action: RuntimeActionRequestProjection): void;
 }
 /** Batches provider-managed calls that arrive in one streamed model response. */
 export declare function createProviderStreamActionBatch(input: {
     readonly emitFn: HarnessEmitFn;
-    readonly onActionsEmitted?: (actions: readonly EmittedProviderAction[]) => void;
     readonly state: ActionEventCoordinates;
 }): ProviderStreamActionBatch;
 export {};