eve 0.83.2 → 0.84.0

package/dist/src/execution/agent-sessions/requests.js

@@ -1 +1 @@
-async function forwardAgentSessionRequest(e){let{from:t,request:n}=e;if(n.kind===`subagent-authorization-event`){await e.owner.send({from:t,kind:`request`,replyTo:e.replyTo,request:{event:n,kind:`authorization-request`}});return}await e.owner.send({from:t,inputSource:n.inputSource,remote:e.remote,kind:`request`,replyTo:n.childContinuationToken,childSessionInbox:n.childSessionInbox?.sessionId===n.childSessionId?n.childSessionInbox:void 0,request:{kind:`input-batch`,requests:n.event.requests},requestCoordinates:{sequence:n.event.sequence,stepIndex:n.event.stepIndex,turnId:n.event.turnId}})}export{forwardAgentSessionRequest};
+async function forwardAgentSessionRequest(e){let{from:t,remote:n,request:r}=e,i=r.route===void 0?void 0:{...r.route,...r.route.childSessionInbox?.sessionId!==r.childSessionId&&{childSessionInbox:void 0},...n!==void 0&&{remote:n}};await e.owner.send({from:t,kind:`request`,replyTo:e.replyTo,request:{event:i===void 0?r:{...r,route:i},kind:`relay`}})}export{forwardAgentSessionRequest};

package/dist/src/execution/agent-sessions/session.js

@@ -1 +1 @@
-import{toErrorMessage}from"#shared/errors.js";import{createHook}from"#compiled/@workflow/core/index.js";import{normalizeRequestedOutputSchema}from"#subagents/invocation.js";import{forwardAgentSessionRequest}from"#execution/agent-sessions/requests.js";import{cancelAgentSessionTurnStep,endAgentSessionsStep,openAgentSessionStep,sendAgentSessionMessageStep}from"#execution/agent-sessions/steps.js";import{disposeHook}from"#execution/hook-ownership.js";import{serializeOutputSchema}from"#tools/schema-emission.js";function createAgentSessions(e,t){let n=[],r=0;return{open:(i,a={})=>{if(typeof i!=`string`||i.trim()===``)throw TypeError(`ctx.agent() requires a non-empty agent name.`);let o=`${e.from.runId}:${String(r)}`;return r+=1,new RunAgentSession({key:o,name:i,options:a,run:e,sessions:n,usage:t})},close:async()=>{n.length!==0&&await endAgentSessionsStep({sessions:n})}}}var RunAgentSession=class{#e;#t;#n;#r;#i;#a;#o;#s=[];constructor(e){this.#e=e.key,this.#t=e.name,this.#n=e.options,this.#r=e.run,this.#i=e.sessions,this.#a=e.usage}async send(e,t={}){if(typeof e!=`string`||e.trim()===``)throw TypeError(`ctx.agent("${this.#t}").send() requires a non-empty message.`);let n=normalizeRequestedOutputSchema(serializeOutputSchema(t.outputSchema)),r=this.#c(n!==void 0);try{await this.#d({auth:this.#r.auth,message:e,outputSchema:n,replyTo:r.hook.token})}catch(e){throw this.#s.splice(this.#s.indexOf(r),1),await releaseHook(r.hook),e}return t.signal!==void 0&&this.#p(r,t.signal),{result:()=>r.ended.then(unwrapTurnEnd)}}#c(e){let t=createHook(),settle=()=>{},n={ended:new Promise(e=>{settle=e}),hook:t,settle};return this.#s.push(n),this.#l(t,e).then(e=>this.#u(n,e)),n}async#l(e,t){try{for await(let n of e){if(n.kind!==`runtime-action-result`){await forwardAgentSessionRequest({from:this.#r.from,owner:this.#r.owner,replyTo:e.token,request:n,remote:this.#o===void 0?void 0:await this.#o.then(({address:e})=>e.kind===`remote`?{forwardPrincipal:e.forwardPrincipal,name:e.name,resolverId:e.resolverId,url:e.url,sessionId:e.sessionId}:void 0)});continue}let r=n.results.find(e=>e.kind===`subagent-result`);if(r!==void 0)return r.origin===`child`&&this.#a.record(r.outcome.usageDelta),{kind:`ended`,result:toAgentMessageResult(r,t)}}return{error:Error(`Agent "${this.#t}" stopped reporting before its turn ended.`),kind:`failed`}}catch(e){return{error:e,kind:`failed`}}}async#u(e,t){let n=this.#s.indexOf(e);if(!(n<0))for(let e of this.#s.splice(0,n+1))e.settle(t),await releaseHook(e.hook)}async#d(e){if(this.#o===void 0){this.#o=this.#f(e),await this.#o;return}let t=await this.#o;await sendAgentSessionMessageStep({...e,...t})}async#f(e){let{agentContext:t,from:n}=this.#r;try{let r=await openAgentSessionStep({...e,context:t,key:this.#e,model:this.#n.model,name:this.#t}),i={address:r,context:t,key:this.#e};return this.#i.push(i),await this.#r.owner.send({from:n,kind:`agent-started`,session:r}),i}catch(e){throw this.#o=void 0,e}}#p(e,t){let cancel=()=>{this.#s.includes(e)&&this.#o!==void 0&&this.#o.then(e=>cancelAgentSessionTurnStep(e)).catch(()=>{})};if(t.aborted){cancel();return}t.addEventListener(`abort`,cancel,{once:!0})}};async function releaseHook(e){try{await disposeHook(e)}catch{}}function unwrapTurnEnd(e){if(e.kind===`failed`)throw e.error;return e.result}const NO_REPLY={data:void 0,message:void 0};function failedTurn(e){return{...NO_REPLY,error:{message:toErrorMessage(e)},status:`failed`}}function toAgentMessageResult(e,t){if(e.origin!==`child`)return failedTurn(e.output);let{outcome:n}=e;switch(n.result.kind){case`failed`:return failedTurn(n.result.error);case`cancelled`:return{...NO_REPLY,status:`waiting`};case`succeeded`:{let{output:e}=n.result,r=n.kind===`terminal`?`completed`:`waiting`;return t?{data:e,message:void 0,status:r}:{data:void 0,message:typeof e==`string`?e:void 0,status:r}}}}export{createAgentSessions};
+import{toErrorMessage}from"#shared/errors.js";import{parseJsonValue}from"#shared/json.js";import{normalizeAgentMessage}from"#execution/agent-sessions/message.js";import{createHook}from"#compiled/@workflow/core/index.js";import{normalizeRequestedOutputSchema}from"#subagents/invocation.js";import{forwardAgentSessionRequest}from"#execution/agent-sessions/requests.js";import{cancelAgentSessionTurnStep,endAgentSessionsStep,openAgentSessionStep,sendAgentSessionMessageStep,stopLateAgentSessionStep}from"#execution/agent-sessions/steps.js";import{disposeHook}from"#execution/hook-ownership.js";import{serializeOutputSchema}from"#tools/schema-emission.js";function createAgentSessions(e,t){let n=[],r=0;return{open:(i,a={})=>{if(typeof i!=`string`||i.trim()===``)throw TypeError(`ctx.agent() requires a non-empty agent name.`);let o=`${e.from.runId}:${String(r)}`;return r+=1,new RunAgentSession({key:o,name:i,options:a,run:e,sessions:n,usage:t})},close:async()=>{n.length!==0&&await endAgentSessionsStep({sessions:n})}}}var RunAgentSession=class{#e;#t;#n;#r;#i;#a;#o;#s;#c=[];#l=Promise.resolve();constructor(e){this.#e=e.key,this.#t=e.name,this.#n=e.options,this.#r=e.run,this.#i=e.sessions,this.#a=e.usage}async send(e,t={}){e=normalizeAgentMessage(e);let n=normalizeRequestedOutputSchema(serializeOutputSchema(t.outputSchema)),r=this.#u(n!==void 0),i={context:this.#r.agentContext,from:this.#r.from},a={auth:this.#r.auth,message:e,outputSchema:n,replyTo:r.hook.token},o=this.#l.then(()=>this.#p(a,i));this.#l=o.catch(()=>void 0);try{await o}catch(e){throw this.#c.splice(this.#c.indexOf(r),1),await releaseHook(r.hook),e}return t.signal!==void 0&&this.#h(r,t.signal),{result:()=>r.ended.then(unwrapTurnEnd)}}#u(e){let t=createHook(),settle=()=>{},n={ended:new Promise(e=>{settle=e}),hook:t,settle};return this.#c.push(n),this.#d(t,e).then(e=>this.#f(n,e)),n}async#d(e,t){try{for await(let n of e){if(n.kind!==`runtime-action-result`){await forwardAgentSessionRequest({from:this.#r.from,owner:this.#r.owner,replyTo:e.token,request:n,remote:this.#o===void 0?void 0:await this.#o.then(({address:e})=>e.kind===`remote`?{forwardPrincipal:e.forwardPrincipal,name:e.name,resolverId:e.resolverId,url:e.url,sessionId:e.sessionId,...e.earlierProtocol!==void 0&&{earlierProtocol:e.earlierProtocol},...e.dynamicBinding!==void 0&&{dynamicBinding:parseJsonValue(JSON.parse(JSON.stringify(e.dynamicBinding)))}}:void 0)});continue}let r=n.results.find(e=>e.kind===`subagent-result`);if(r!==void 0)return r.origin===`child`&&this.#a.record(r.outcome.usageDelta),{kind:`ended`,result:toAgentMessageResult(r,t)}}return{error:Error(`Agent "${this.#t}" stopped reporting before its turn ended.`),kind:`failed`}}catch(e){return{error:e,kind:`failed`}}}async#f(e,t){let n=this.#c.indexOf(e);if(!(n<0))for(let e of this.#c.splice(0,n+1))e.settle(t),await releaseHook(e.hook)}async#p(e,t){let{from:n}=t,r;if(this.#o===void 0){let n=this.#m(e,t);this.#o=n.then(({opened:e})=>e),this.#o.catch(()=>void 0),{receipt:r}=await n}else{let t=await this.#o;if(r=await sendAgentSessionMessageStep({...e,...t}),r.sessionId!==t.address.sessionId){let e={...t,address:{...t.address,sessionId:r.sessionId}};this.#i.push(e),this.#o=Promise.resolve(e),await this.#r.owner.send({context:t.context,from:this.#s,kind:`agent-started`,session:e.address})}}r.deliveryId!==void 0&&await this.#r.owner.send({deliveryId:r.deliveryId,from:n,kind:`agent-sent`,sessionId:r.sessionId})}async#m(e,{context:t,from:n}){this.#s=n;let r;try{let{address:i,deliveryId:a}=await openAgentSessionStep({...e,context:t,key:this.#e,model:this.#n.model,name:this.#t});return r={address:i,context:t,key:this.#e},this.#i.push(r),await this.#r.owner.send({context:t,from:n,kind:`agent-started`,session:i}),{opened:r,receipt:{deliveryId:a,sessionId:i.sessionId}}}catch(e){throw this.#o=void 0,this.#s=void 0,r!==void 0&&await stopLateAgentSessionStep(r).catch(()=>void 0),e}}#h(e,t){let cancel=()=>{this.#c.includes(e)&&this.#o!==void 0&&this.#o.then(e=>cancelAgentSessionTurnStep(e)).catch(()=>{})};if(t.aborted){cancel();return}t.addEventListener(`abort`,cancel,{once:!0})}};async function releaseHook(e){try{await disposeHook(e)}catch{}}function unwrapTurnEnd(e){if(e.kind===`failed`)throw e.error;return e.result}const NO_REPLY={data:void 0,reply:void 0};function failedTurn(e,t=!1){return{...NO_REPLY,sessionEnded:t,error:{message:toErrorMessage(e)},status:`failed`}}function toAgentMessageResult(e,t){if(e.origin!==`child`)return failedTurn(e.output);let{outcome:n}=e;switch(n.result.kind){case`failed`:return failedTurn(n.result.error,n.kind===`terminal`);case`cancelled`:return{...NO_REPLY,sessionEnded:n.kind===`terminal`,status:`cancelled`};case`succeeded`:{let{output:e}=n.result,r={status:`completed`,sessionEnded:n.kind===`terminal`};return t?{data:e,reply:void 0,...r}:{data:void 0,reply:typeof e==`string`?e:void 0,...r}}}}export{createAgentSessions};

package/dist/src/execution/agent-sessions/steps.d.ts

@@ -1,6 +1,8 @@
+import type { MessageContent } from "#shared/message-content.js";
 import type { SessionAuth } from "#context/session-context.js";
 import type { AgentSessionContext } from "#execution/agent-sessions/context.js";
 import type { JsonObject } from "#shared/json.js";
+import type { DynamicRemoteBinding } from "#reactions/remote.js";
 import type { AgentSessionModelSelection } from "#tools/workflow-definition.js";
 /** Where a session a run opened lives, for its later sends, cancels, and end. */
 export type AgentSessionAddress = {
@@ -16,10 +18,17 @@ export type AgentSessionAddress = {
     readonly forwardPrincipal?: boolean;
     readonly name: string;
     readonly nodeId: string;
-    /** Keys the authored credential functions, as on `agent.started`. */
+    /** Keys the authored credential functions, as on `child.opened`. */
     readonly resolverId?: string;
+    /**
+     * A dynamic remote agent's binding, which its credentials are built from again: the child
+     * keeps the session it was opened with, whatever the parent's session becomes. Private.
+     */
+    readonly dynamicBinding?: DynamicRemoteBinding;
     readonly sessionId: string;
     readonly url: string;
+    /** The child's remote agent protocol, when it speaks an earlier one than this deployment. */
+    readonly earlierProtocol?: number;
 };
 /** A session a run opened, with the context of the call that opened it: its lineage. */
 export interface OpenedAgentSession {
@@ -28,6 +37,14 @@ export interface OpenedAgentSession {
     /** Names the session within its run, as when it opened. */
     readonly key: string;
 }
+/**
+ * A message a session accepted. An earlier-protocol remote agent names no delivery, so
+ * nothing records it.
+ */
+export interface AgentSessionReceipt {
+    readonly sessionId: string;
+    readonly deliveryId?: string;
+}
 /**
  * One message to a session, as the call that sends it: the session runs the
  * message with that call's auth. Its turn's result and questions arrive on
@@ -35,7 +52,7 @@ export interface OpenedAgentSession {
  */
 export interface AgentSessionMessage {
     readonly auth: SessionAuth;
-    readonly message: string;
+    readonly message: MessageContent<string | URL>;
     readonly outputSchema?: JsonObject;
     readonly replyTo: string;
 }
@@ -49,15 +66,20 @@ export declare function openAgentSessionStep(input: AgentSessionMessage & {
     readonly key: string;
     readonly model?: AgentSessionModelSelection;
     readonly name: string;
-}): Promise<AgentSessionAddress>;
+}): Promise<{
+    readonly address: AgentSessionAddress;
+    readonly deliveryId?: string;
+}>;
 /**
  * Sends a later message; it joins the session's running turn or starts the
  * next. It keeps the session's lineage and carries its own auth.
  */
-export declare function sendAgentSessionMessageStep(input: AgentSessionMessage & OpenedAgentSession): Promise<void>;
+export declare function sendAgentSessionMessageStep(input: AgentSessionMessage & OpenedAgentSession): Promise<AgentSessionReceipt>;
 /** Cancels a session's running turn; the turn still reports, as cancelled. */
 export declare function cancelAgentSessionTurnStep(input: OpenedAgentSession): Promise<void>;
 /** Ends a run's sessions when the run finishes, cancelling any turn still running. */
 export declare function endAgentSessionsStep(input: {
     readonly sessions: readonly OpenedAgentSession[];
 }): Promise<void>;
+/** Best-effort cleanup for a late address whose cancelled run cannot own it. */
+export declare function stopLateAgentSessionStep(opened: OpenedAgentSession): Promise<void>;

package/dist/src/execution/agent-sessions/steps.js

@@ -1 +1 @@
-import{createLogger,logError}from"#internal/logging.js";import{SessionStrandedError}from"#channel/session-stranded-error.js";import{sessionInboxHookToken}from"#execution/session-inbox/address.js";import{ContextContainer,contextStorage}from"#context/container.js";import{createEveCallbackRoutePath}from"#protocol/routes.js";import{toErrorMessage}from"#shared/errors.js";import{InvalidRuntimeModelSelectionError,resolveRuntimeModelSelection}from"#runtime/agent/resolve-model.js";import{agentDelegation}from"#tracing/eve/delegation.js";import{createWorkflowRuntime,dispatchWorkflowSessionCommand,resolveContinuation,waitForCommandHookOwner,waitForSessionInbox}from"#execution/workflow-runtime.js";import{resolveDurableCompiledArtifactsSource}from"#runtime/durable-compiled-artifacts-source.js";import{FatalError,getStepMetadata,getWorkflowMetadata}from"#compiled/@workflow/core/index.js";import{createWorkflowCallbackUrl,resolveWorkflowCallbackBaseUrl}from"#execution/workflow-callback-url.js";import{resolveAgentAction,resolveAgentStartTarget}from"#execution/agent-sessions/target.js";import{getCompiledRuntimeAgentBundle}from"#runtime/sessions/compiled-agent-cache.js";import{cancelRemoteAgentTurn,continueRemoteAgentSession,resetRemoteAgentSession,resolveRemoteAgentForAction,startRemoteAgentSession}from"#execution/agent-sessions/remote.js";import{buildSubagentRunInput}from"#subagents/tool.js";import{resolveConversationId}from"#shared/conversation-identity.js";import{stubToolPath}from"#tool-stubs/target.js";const log=createLogger(`execution.agent-sessions`),RUN_FINISHED_REASON=`The workflow run that opened this session finished.`;async function openAgentSessionStep(e){"use step";let{context:t}=e,n=await loadAgentSessionBundle(t),r=resolveAgentAction({bundle:n,callId:t.parent.callId,dynamicSelections:t.dynamicSelections,input:{message:e.message,outputSchema:e.outputSchema,target:e.name}}),i=resolveAgentStartTarget({action:r,bundle:n,dynamicSelections:t.dynamicSelections,isRootSession:t.parent.rootSessionId===t.parent.sessionId});if(e.model!==void 0&&i.kind===`remote`)throw new FatalError(`ctx.agent("${e.name}", { model }) cannot override a remote agent's model. Configure the model on the receiving agent.`);let a=e.model===void 0?void 0:await normalizeRuntimeOverrides(e.name,e.model),o={auth:e.auth,bundle:n,context:t,key:e.key,replyTo:e.replyTo,runtimeOverrides:a};return await agentDelegation.resume({context:t,agentName:r.name},()=>i.kind===`remote`?startRemoteSession({...o,target:i}):startLocalSession({...o,target:i}))}async function normalizeRuntimeOverrides(e,t){try{return{model:(await resolveRuntimeModelSelection({durability:`durable`,selection:t,state:new ContextContainer})).reference}}catch(t){throw t instanceof InvalidRuntimeModelSelectionError?new FatalError(`ctx.agent("${e}", { model }) could not resolve the model selection: ${toErrorMessage(t)}`):t}}async function sendAgentSessionMessageStep(e){"use step";let{address:t,context:n}=e;if(t.kind===`remote`){let r=await resolveSessionRemote(n,t);await continueRemoteAgentSession({auth:e.auth.current,callback:{callId:n.parent.callId,subagentName:t.name,token:e.replyTo,url:createWorkflowCallbackUrl(t.callbackBaseUrl,createEveCallbackRoutePath(e.replyTo))},message:e.message,outputSchema:e.outputSchema,remote:r,sessionId:t.sessionId});return}if((await commandLocalSession({...e,address:t},{auth:e.auth.current,schedule:n.schedule,caller:{callId:n.parent.callId,replyTo:{kind:`hook`,token:e.replyTo},subagentName:t.name},kind:`send`,payload:{message:e.message,outputSchema:e.outputSchema}}).catch(e=>{throw SessionStrandedError.is(e)?Error(`Agent "${t.name}" can no longer receive messages: ${e.message}`,{cause:e}):e})).status!==`accepted`)throw Error(`Agent "${t.name}" can no longer receive messages; its session ended.`)}async function cancelAgentSessionTurnStep(e){"use step";let{address:t}=e;try{if(t.kind===`remote`){let n=await resolveSessionRemote(e.context,t);await cancelRemoteAgentTurn({remote:n,sessionId:t.sessionId});return}await commandLocalSession({...e,address:t},{kind:`cancel`})}catch(e){logError(log,`failed to cancel an agent session turn`,e,{name:t.name,sessionId:t.sessionId})}}async function endAgentSessionsStep(e){"use step";await Promise.all(e.sessions.map(endAgentSession))}async function endAgentSession(e){let{address:t,context:n}=e;try{if(t.kind===`remote`){let e=await resolveSessionRemote(n,t);await resetRemoteAgentSession({reason:RUN_FINISHED_REASON,remote:e,sessionId:t.sessionId});return}await commandLocalSession({...e,address:t},{kind:`reset`,reason:RUN_FINISHED_REASON})}catch(e){logError(log,`failed to end an agent session`,e,{name:t.name,sessionId:t.sessionId})}}async function commandLocalSession(e,t){let{continuationToken:n,sessionId:r}=e.address,i=await dispatchWorkflowSessionCommand({command:t,sessionId:r});if(i.status===`accepted`||i.status===`reset`)return i;let a=await waitForSessionInbox(r)?r:(await resolveContinuation(n))?.sessionId;return a===void 0?i:await dispatchWorkflowSessionCommand({command:t,sessionId:a})}async function startLocalSession(e){let{auth:t,bundle:n,context:r,target:i}=e,{action:a}=i,{childContinuationToken:o,runInput:s}=buildSubagentRunInput({action:a,auth:t.current,capabilities:r.capabilities,schedule:r.schedule,channelMetadata:r.channelMetadata,continuationKey:e.key,graph:n.graph,inheritedConversation:r.conversation,initiatorAuth:t.initiator,parent:createParentContext(r,e.replyTo),sandboxSessionId:r.sandbox.sessionId,selfAgent:i.source.type===`runtime`,session:{continuationToken:e.replyTo,sandboxState:r.sandbox.state,sessionId:r.parent.sessionId},source:i.source}),c=createWorkflowRuntime({agentSessionRuntimeOverrides:e.runtimeOverrides,compiledArtifactsSource:n.compiledArtifactsSource,dynamicSubagentAgentConfig:i.dynamicSubagentAgentConfig,nodeId:a.nodeId}),l=r.toolStubs;l!==void 0&&(l={...l,agentPath:stubToolPath(l,a.name)});let u=(await contextStorage.run(new ContextContainer({localDevRequest:r.localDevRequest}),()=>c.createSession({...s,toolStubs:l}))).sessionId;return getStepMetadata().attempt>1&&({runId:u}=await waitForCommandHookOwner(sessionInboxHookToken(o))),{continuationToken:o,kind:`local`,name:a.name,nodeId:a.nodeId,sessionId:u}}async function startRemoteSession(e){let{auth:t,bundle:n,context:r,target:i}=e,{action:a}=i,o=resolveRemoteAgentForAction({dynamicRemoteAgent:i.dynamicRemoteAgent,nodeId:a.nodeId,registry:n.subagentRegistry.subagentsByNodeId,remoteAgentName:a.remoteAgentName}),s=resolveWorkflowCallbackBaseUrl(getWorkflowMetadata().url),c=await startRemoteAgentSession({action:a,auth:t.current,callbackBaseUrl:s,capabilities:r.capabilities,initiatorAuth:t.initiator,operationId:`agent-session:${e.key}`,originAudience:r.trace.originAudience,parent:createParentContext(r,e.replyTo),remote:o,session:{continuationToken:e.replyTo}});return{callbackBaseUrl:s,kind:`remote`,forwardPrincipal:o.forwardPrincipal,name:a.remoteAgentName,nodeId:a.nodeId,resolverId:i.dynamicRemoteAgent?.credentialsStepId??a.nodeId,sessionId:c.sessionId,url:o.url}}function createParentContext(e,t){return{continuationToken:t,conversationId:e.trace.conversationId??resolveConversationId(e.parent.rootSessionId),lineage:e.parent,originAudience:e.trace.originAudience,traceContext:e.trace.parentTraceContext,traceRoot:e.traceRoot}}async function resolveSessionRemote(e,t){let n=await loadAgentSessionBundle(e),r=e.dynamicSelections[t.nodeId];return{...resolveRemoteAgentForAction({dynamicRemoteAgent:r?.kind===`remote`?r.remoteAgent:void 0,nodeId:t.nodeId,registry:n.subagentRegistry.subagentsByNodeId,remoteAgentName:t.name}),url:t.url}}async function loadAgentSessionBundle(e){return await getCompiledRuntimeAgentBundle({compiledArtifactsSource:resolveDurableCompiledArtifactsSource(e.bundle.source),nodeId:e.bundle.nodeId})}export{cancelAgentSessionTurnStep,endAgentSessionsStep,openAgentSessionStep,sendAgentSessionMessageStep};
+import{createLogger,logError}from"#internal/logging.js";import{SessionStrandedError}from"#channel/session-stranded-error.js";import{sessionCommandHookToken,sessionInboxHookToken}from"#execution/session-inbox/address.js";import{ContextContainer,contextStorage}from"#context/container.js";import{createEveCallbackRoutePath}from"#protocol/routes.js";import{toErrorMessage}from"#shared/errors.js";import{resumeHook}from"#internal/workflow/runtime.js";import{agentDelegation}from"#tracing/eve/delegation.js";import{createWorkflowRuntime,dispatchWorkflowSessionCommand,resolveContinuation,waitForCommandHookOwner,waitForSessionInbox}from"#execution/workflow-runtime.js";import{resolveDurableCompiledArtifactsSource}from"#runtime/durable-compiled-artifacts-source.js";import{FatalError,getStepMetadata,getWorkflowMetadata}from"#compiled/@workflow/core/index.js";import{createWorkflowCallbackUrl,resolveWorkflowCallbackBaseUrl}from"#execution/workflow-callback-url.js";import{remoteAgentCredentials}from"#execution/agent-sessions/remote-credentials.js";import{resolveAgentAction,resolveAgentStartTarget}from"#execution/agent-sessions/target.js";import{getCompiledRuntimeAgentBundle}from"#runtime/sessions/compiled-agent-cache.js";import{InvalidRuntimeModelSelectionError,resolveRuntimeModelSelection}from"#runtime/agent/resolve-model.js";import{cancelRemoteAgentTurn,continueRemoteAgentSession,resetRemoteAgentSession,resolveRemoteAgentForAction,startRemoteAgentSession}from"#execution/agent-sessions/remote.js";import{buildSubagentRunInput}from"#subagents/tool.js";import{resolveConversationId}from"#shared/conversation-identity.js";import{stubToolPath}from"#tool-stubs/target.js";const log=createLogger(`execution.agent-sessions`),RUN_FINISHED_REASON=`The workflow run that opened this session finished.`;async function openAgentSessionStep(e){"use step";let{context:t}=e,n=await loadAgentSessionBundle(t),r=resolveAgentAction({bundle:n,callId:t.parent.callId,dynamicSelections:t.dynamicSelections,input:{message:e.message,outputSchema:e.outputSchema,target:e.name}}),i=resolveAgentStartTarget({action:r,bundle:n,dynamicSelections:t.dynamicSelections,isRootSession:t.parent.rootSessionId===t.parent.sessionId});if(e.model!==void 0&&i.kind===`remote`)throw new FatalError(`ctx.agent("${e.name}", { model }) cannot override a remote agent's model. Configure the model on the receiving agent.`);let a=e.model===void 0?void 0:await normalizeRuntimeOverrides(e.name,e.model),o={auth:e.auth,bundle:n,context:t,key:e.key,replyTo:e.replyTo,runtimeOverrides:a};return await agentDelegation.resume({context:t,agentName:r.name},()=>i.kind===`remote`?startRemoteSession({...o,target:i}):startLocalSession({...o,target:i}))}async function normalizeRuntimeOverrides(e,t){try{return{model:(await resolveRuntimeModelSelection({durability:`durable`,selection:t,state:new ContextContainer})).reference}}catch(t){throw t instanceof InvalidRuntimeModelSelectionError?new FatalError(`ctx.agent("${e}", { model }) could not resolve the model selection: ${toErrorMessage(t)}`):t}}async function sendAgentSessionMessageStep(e){"use step";let{address:t,context:n}=e;if(t.kind===`remote`){let r=await resolveSessionRemote(n,t);return await continueRemoteAgentSession({auth:e.auth.current,callback:{callId:n.parent.callId,subagentName:t.name,token:e.replyTo,url:createWorkflowCallbackUrl(t.callbackBaseUrl,createEveCallbackRoutePath(e.replyTo))},earlierProtocol:t.earlierProtocol,idempotencyKey:agentDeliveryId(`send`,t.sessionId),message:e.message,outputSchema:e.outputSchema,remote:r,sessionId:t.sessionId})}let r=agentDeliveryId(`send`,t.sessionId),i=await commandLocalSession({...e,address:t},{auth:e.auth.current,schedule:n.schedule,caller:{callId:n.parent.callId,replyTo:{kind:`hook`,token:e.replyTo},subagentName:t.name},kind:`send`,delivery:{channelKind:`subagent`,channelName:`subagent`,deliveryId:r},payload:{message:e.message,outputSchema:e.outputSchema}}).catch(e=>{throw SessionStrandedError.is(e)?Error(`Agent "${t.name}" can no longer receive messages: ${e.message}`,{cause:e}):e});if(i.status!==`accepted`)throw Error(`Agent "${t.name}" can no longer receive messages; its session ended.`);return{deliveryId:r,sessionId:i.sessionId}}async function cancelAgentSessionTurnStep(e){"use step";let{address:t}=e;try{if(t.kind===`remote`){let n=await resolveSessionRemote(e.context,t);await cancelRemoteAgentTurn({remote:n,sessionId:t.sessionId});return}await commandLocalSession({...e,address:t},{kind:`cancel`,deliveryId:agentDeliveryId(`cancel`,t.sessionId)})}catch(e){logError(log,`failed to cancel an agent session turn`,e,{name:t.name,sessionId:t.sessionId})}}async function endAgentSessionsStep(e){"use step";await Promise.all(e.sessions.map(endAgentSession))}async function stopLateAgentSessionStep(e){"use step";if(e.address.kind===`remote`){await endAgentSession(e);return}let{sessionId:t}=e.address;try{await resumeHook(sessionInboxHookToken(sessionCommandHookToken(t)),{kind:`reset`,reason:RUN_FINISHED_REASON,deliveryId:agentDeliveryId(`reset`,t)})}catch(e){logError(log,`could not stop late child; cleanup is best effort`,e,{sessionId:t})}}async function endAgentSession(e){let{address:t,context:n}=e;try{if(t.kind===`remote`){let e=await resolveSessionRemote(n,t);await resetRemoteAgentSession({reason:RUN_FINISHED_REASON,remote:e,sessionId:t.sessionId});return}await commandLocalSession({...e,address:t},{kind:`reset`,reason:RUN_FINISHED_REASON,deliveryId:agentDeliveryId(`reset`,t.sessionId)})}catch(e){logError(log,`failed to end an agent session`,e,{name:t.name,sessionId:t.sessionId})}}async function commandLocalSession(e,t){let{continuationToken:n,sessionId:r}=e.address,i=await dispatchWorkflowSessionCommand({command:t,sessionId:r});if(i.status===`accepted`||i.status===`reset`)return i;let a=await waitForSessionInbox(r)?r:(await resolveContinuation(n))?.sessionId;return a===void 0?i:await dispatchWorkflowSessionCommand({command:t,sessionId:a})}async function startLocalSession(e){let{auth:t,bundle:n,context:r,target:i}=e,{action:a}=i,{childContinuationToken:o,runInput:s}=buildSubagentRunInput({action:a,auth:t.current,capabilities:r.capabilities,schedule:r.schedule,channelMetadata:r.channelMetadata,continuationKey:e.key,graph:n.graph,inheritedConversation:r.conversation,initiatorAuth:t.initiator,parent:createParentContext(r,e.replyTo),sandboxSessionId:r.sandbox.sessionId,selfAgent:i.source.type===`runtime`,session:{continuationToken:e.replyTo,sandboxState:r.sandbox.state,sessionId:r.parent.sessionId},source:i.source}),c=createWorkflowRuntime({agentSessionRuntimeOverrides:e.runtimeOverrides,compiledArtifactsSource:n.compiledArtifactsSource,dynamicSubagentAgentConfig:i.dynamicSubagentAgentConfig,nodeId:a.nodeId}),l=r.toolStubs;l!==void 0&&(l={...l,agentPath:stubToolPath(l,a.name)});let u=`agent-session:${e.key}:initial`,d=(await contextStorage.run(new ContextContainer({localDevRequest:r.localDevRequest}),()=>c.createSession({...s,delivery:{channelKind:`subagent`,channelName:`subagent`,deliveryId:u},toolStubs:l}))).sessionId;return getStepMetadata().attempt>1&&({runId:d}=await waitForCommandHookOwner(sessionInboxHookToken(o))),{address:{continuationToken:o,kind:`local`,name:a.name,nodeId:a.nodeId,sessionId:d},deliveryId:u}}async function startRemoteSession(e){let{auth:t,bundle:n,context:r,target:i}=e,{action:a}=i,o=bindingFor(r,a.nodeId),s=resolveRemoteAgentForAction({credentials:i.dynamicRemoteAgent===void 0?void 0:await credentialsOf(n,a.nodeId,o,{name:a.remoteAgentName,url:i.dynamicRemoteAgent.url}),dynamicRemoteAgent:i.dynamicRemoteAgent,nodeId:a.nodeId,registry:n.subagentRegistry.subagentsByNodeId,remoteAgentName:a.remoteAgentName}),c=resolveWorkflowCallbackBaseUrl(getWorkflowMetadata().url),l=await startRemoteAgentSession({action:a,auth:t.current,callbackBaseUrl:c,capabilities:r.capabilities,initiatorAuth:t.initiator,operationId:`agent-session:${e.key}`,originAudience:r.trace.originAudience,parent:createParentContext(r,e.replyTo),remote:s,session:{continuationToken:e.replyTo}}),u={callbackBaseUrl:c,kind:`remote`,forwardPrincipal:s.forwardPrincipal,name:a.remoteAgentName,nodeId:a.nodeId,resolverId:a.nodeId,sessionId:l.sessionId,url:s.url};return o!==void 0&&(u.dynamicBinding=o),l.earlierProtocol!==void 0&&(u.earlierProtocol=l.earlierProtocol),l.deliveryId===void 0?{address:u}:{address:u,deliveryId:l.deliveryId}}function createParentContext(e,t){return{continuationToken:t,conversationId:e.trace.conversationId??resolveConversationId(e.parent.rootSessionId),lineage:e.parent,originAudience:e.trace.originAudience,traceContext:e.trace.parentTraceContext,traceRoot:e.traceRoot}}async function resolveSessionRemote(e,t){let n=await loadAgentSessionBundle(e),r=e.dynamicSelections[t.nodeId];return{...resolveRemoteAgentForAction({credentials:await credentialsOf(n,t.nodeId,t.dynamicBinding,t),dynamicRemoteAgent:r?.kind===`remote`?r.remoteAgent:void 0,nodeId:t.nodeId,registry:n.subagentRegistry.subagentsByNodeId,remoteAgentName:t.name}),url:t.url}}function bindingFor(e,t){let n=e.dynamicSelections[t];return n?.kind===`remote`&&n.remoteAgent.credentials===!0?n.binding:void 0}async function credentialsOf(e,t,n,r){if(n!==void 0)return await remoteAgentCredentials({binding:n,destination:r,nodeId:t,resolvers:e.subagentRegistry.dynamicResolvers})}async function loadAgentSessionBundle(e){return await getCompiledRuntimeAgentBundle({compiledArtifactsSource:resolveDurableCompiledArtifactsSource(e.bundle.source),nodeId:e.bundle.nodeId})}function agentDeliveryId(e,t){return`agent-session:${getWorkflowMetadata().workflowRunId}:${getStepMetadata().stepId}:${t}:${e}`}export{cancelAgentSessionTurnStep,endAgentSessionsStep,openAgentSessionStep,sendAgentSessionMessageStep,stopLateAgentSessionStep};

package/dist/src/execution/agent-sessions/target.d.ts

@@ -1,3 +1,4 @@
+import type { MessageContent } from "#shared/message-content.js";
 import type { DurableDynamicSubagentSelection } from "#context/keys.js";
 import type { CompiledBundle } from "#runtime/sessions/runtime-context-keys.js";
 import type { DynamicSubagentAgentConfig } from "#runtime/subagents/dynamic-agent-config.js";
@@ -8,7 +9,7 @@ import type { SubagentInputSource } from "#subagents/tool.js";
 export type DynamicSubagentSelections = Readonly<Record<string, DurableDynamicSubagentSelection>>;
 /** One message to an agent, addressed by its invocation name. */
 export interface AgentActionInput {
-    readonly message: string;
+    readonly message: MessageContent<string | URL>;
     readonly outputSchema?: JsonObject;
     readonly target: string;
 }

package/dist/src/execution/agent-sessions/target.js

@@ -1 +1 @@
-import{createLogger}from"#internal/logging.js";import{AGENT_TOOL_DESCRIPTION,AGENT_TOOL_NAME}from"#tools/framework/agent-contract.js";import{FatalError}from"#compiled/@workflow/core/index.js";import{ROOT_RUNTIME_AGENT_NODE_ID}from"#runtime/graph.js";const log=createLogger(`execution.agent-target`);function resolveAgentAction(e){let t=findAgentDefinition(e.bundle,e.dynamicSelections,e.input.target);if(t===void 0)throw new FatalError(`Agent target "${e.input.target}" is not available to this agent.`);let n={message:e.input.message};e.input.outputSchema!==void 0&&(n.outputSchema=e.input.outputSchema);let r={callId:e.callId,description:t.description??``,input:n,name:t.name,nodeId:t.nodeId};return t.kind===`remote`?{...r,kind:`remote-agent-call`,remoteAgentName:t.name}:{...r,kind:`subagent-call`,subagentName:t.name}}function findAgentDefinition(e,t,n){let r=e.subagentRegistry.subagentsByName.get(n);if(r!==void 0)return r.definition;let i=Object.values(t).find(e=>e!==null&&e.prepared.name===n);if(i!=null)return i.prepared;if(n===AGENT_TOOL_NAME&&e.nodeId===void 0)return{description:AGENT_TOOL_DESCRIPTION,kind:`subagent`,name:AGENT_TOOL_NAME,nodeId:ROOT_RUNTIME_AGENT_NODE_ID}}function resolveAgentStartTarget(e){let{action:t}=e,n=e.bundle.subagentRegistry.subagentsByNodeId,r=e.bundle.subagentRegistry.dynamicNodeIds?.has(t.nodeId)===!0,i=r?e.dynamicSelections[t.nodeId]??void 0:void 0;if(r&&(i===void 0||t.kind===`subagent-call`&&i.kind!==`subagent`||t.kind===`remote-agent-call`&&i.kind!==`remote`))throw log.warn(`dynamic subagent call blocked after availability changed`,{callId:t.callId,nodeId:t.nodeId,subagentName:t.name}),new FatalError(`Subagent "${t.name}" is not available in the current session context.`);if(isRecursiveAgentAction(t,n)&&!e.isRootSession)throw log.warn(`recursive agent call blocked outside the root session`,{callId:t.callId,nodeId:t.nodeId,subagentName:t.subagentName}),new FatalError(`The built-in "agent" tool is only available to the root session.`);if(t.kind===`remote-agent-call`)return{action:t,dynamicRemoteAgent:i?.kind===`remote`?i.remoteAgent:void 0,kind:`remote`};let a=i?.kind===`subagent`?i.agentConfig:void 0,o=n.get(t.nodeId),s=a?.description??(o?.definition.kind===`subagent`?o.definition.description:void 0);return{action:t,dynamicSubagentAgentConfig:a,kind:`local`,source:s===void 0?{type:`runtime`}:{description:s,type:`local`}}}function isRecursiveAgentAction(e,t){return e.kind===`subagent-call`&&e.subagentName===AGENT_TOOL_NAME&&!t.has(e.nodeId)}export{resolveAgentAction,resolveAgentStartTarget};
+import{createLogger}from"#internal/logging.js";import{AGENT_TOOL_DESCRIPTION,AGENT_TOOL_NAME}from"#tools/framework/agent-contract.js";import{normalizeAgentMessage}from"#execution/agent-sessions/message.js";import{FatalError}from"#compiled/@workflow/core/index.js";import{ROOT_RUNTIME_AGENT_NODE_ID}from"#runtime/graph.js";const log=createLogger(`execution.agent-target`);function resolveAgentAction(e){let t=findAgentDefinition(e.bundle,e.dynamicSelections,e.input.target);if(t===void 0)throw new FatalError(`Agent target "${e.input.target}" is not available to this agent.`);let n={message:normalizeAgentMessage(e.input.message),...e.input.outputSchema!==void 0&&{outputSchema:e.input.outputSchema}},r={callId:e.callId,description:t.description??``,input:n,name:t.name,nodeId:t.nodeId};return t.kind===`remote`?{...r,kind:`remote-agent-call`,remoteAgentName:t.name}:{...r,kind:`subagent-call`,subagentName:t.name}}function findAgentDefinition(e,t,n){let r=e.subagentRegistry.subagentsByName.get(n);if(r!==void 0)return r.definition;let i=Object.values(t).find(e=>e!==null&&e.prepared.name===n);if(i!=null)return i.prepared;if(n===AGENT_TOOL_NAME&&e.nodeId===void 0)return{description:AGENT_TOOL_DESCRIPTION,kind:`subagent`,name:AGENT_TOOL_NAME,nodeId:ROOT_RUNTIME_AGENT_NODE_ID}}function resolveAgentStartTarget(e){let{action:t}=e,n=e.bundle.subagentRegistry.subagentsByNodeId,r=e.bundle.subagentRegistry.dynamicNodeIds.has(t.nodeId),i=r?e.dynamicSelections[t.nodeId]??void 0:void 0;if(r&&(i===void 0||t.kind===`subagent-call`&&i.kind!==`subagent`||t.kind===`remote-agent-call`&&i.kind!==`remote`))throw log.warn(`dynamic subagent call blocked after availability changed`,{callId:t.callId,nodeId:t.nodeId,subagentName:t.name}),new FatalError(`Subagent "${t.name}" is not available in the current session context.`);if(isRecursiveAgentAction(t,n)&&!e.isRootSession)throw log.warn(`recursive agent call blocked outside the root session`,{callId:t.callId,nodeId:t.nodeId,subagentName:t.subagentName}),new FatalError(`The built-in "agent" tool is only available to the root session.`);if(t.kind===`remote-agent-call`)return{action:t,dynamicRemoteAgent:i?.kind===`remote`?i.remoteAgent:void 0,kind:`remote`};let a=i?.kind===`subagent`?i.agentConfig:void 0,o=n.get(t.nodeId),s=a?.description??(o?.definition.kind===`subagent`?o.definition.description:void 0);return{action:t,dynamicSubagentAgentConfig:a,kind:`local`,source:s===void 0?{type:`runtime`}:{description:s,type:`local`}}}function isRecursiveAgentAction(e,t){return e.kind===`subagent-call`&&e.subagentName===AGENT_TOOL_NAME&&!t.has(e.nodeId)}export{resolveAgentAction,resolveAgentStartTarget};

package/dist/src/execution/agent-sessions/usage.d.ts

@@ -1,4 +1,3 @@
-import type { SessionStateMap } from "#harness/types.js";
 import type { TokenUsage } from "#shared/token-usage.js";
 /** What a run's `ctx.agent` sessions have spent, turn by turn. */
 export interface RunUsageTally {
@@ -9,10 +8,3 @@ export interface RunUsageTally {
 }
 /** `onRecord` runs after each recorded turn, so the run can send a total no reply will carry. */
 export declare function createRunUsageTally(onRecord?: () => void): RunUsageTally;
-/**
- * Adds a run's delegated spend to the session's totals: its running `total`,
- * less the part of it `counted` earlier.
- */
-export declare function countRunUsage<T extends {
-    readonly state?: SessionStateMap;
-}>(session: T, total: TokenUsage, counted?: TokenUsage): T;

package/dist/src/execution/agent-sessions/usage.js

@@ -1 +1 @@
-import{accumulateSessionUsage,getTurnUsageState,setTurnUsageState,toUsage}from"#harness/turn-tag-state.js";function createRunUsageTally(e){let t;return{record(n){t=accumulateSessionUsage({previous:t,usage:n}),e?.()},total(){return t===void 0?void 0:toUsage(t.session)}}}function countRunUsage(e,t,n){return setTurnUsageState(e,accumulateSessionUsage({previous:getTurnUsageState(e.state),usage:usageSince(t,n)}))}function usageSince(e,t){return t===void 0?e:{cacheReadTokens:e.cacheReadTokens-t.cacheReadTokens,cacheWriteTokens:e.cacheWriteTokens-t.cacheWriteTokens,costUsd:e.costUsd===void 0?void 0:e.costUsd-(t.costUsd??0),inputTokens:e.inputTokens-t.inputTokens,outputTokens:e.outputTokens-t.outputTokens}}export{countRunUsage,createRunUsageTally};
+import{addTokenUsage}from"#shared/token-usage-math.js";function createRunUsageTally(e){let t;return{record(n){t=t===void 0?n:addTokenUsage(t,n),e?.()},total:()=>t}}export{createRunUsageTally};

package/dist/src/execution/cancelled-model-call-batch.d.ts

@@ -1,15 +1,17 @@
 import { type ContextContainer } from "#context/container.js";
 import type { DurableStepResult } from "#execution/session/turn-step-types.js";
-import type { HarnessSession, StepInput, StepResult } from "#harness/types.js";
+import type { HarnessSession, HarnessStepInput, StepResult } from "#harness/types.js";
 export interface CompletedModelCallCheckpoint {
     readonly result: StepResult;
     readonly serializedContext: Record<string, unknown>;
 }
+/** The session with the message of a step that stopped before the model read it kept in history. */
+export declare function preserveStoppedTurnMessage(ctx: ContextContainer, session: HarnessSession, preserved: HarnessStepInput | undefined): Promise<HarnessSession>;
 /** Builds the successful step result that commits a cancelled batch's completed model calls. */
 export declare function createCancelledModelCallBatchResult(input: {
     readonly beforeBatchContext: Record<string, unknown>;
     readonly checkpoint: CompletedModelCallCheckpoint | undefined;
     readonly ctx: ContextContainer;
     readonly initialSession: HarnessSession;
-    readonly stepInput: StepInput | undefined;
+    readonly stepInput: HarnessStepInput | undefined;
 }): Promise<DurableStepResult>;

package/dist/src/execution/cancelled-model-call-batch.js

@@ -1 +1 @@
-import{createLogger}from"#internal/logging.js";import{contextStorage}from"#context/container.js";import{appliedSession,saveSessionProjection}from"#harness/session-machine/current.js";import{AuthKey,OfferedCatalogToolsKey,SandboxKey,TurnDeliveryIdsKey}from"#context/keys.js";import{createDurableSessionValues}from"#execution/durable-session-store.js";import{preserveSerializedSessionDynamicModelSelection}from"#context/serialized-dynamic-model-selection.js";import{withContextScope}from"#context/run-step.js";import{serializeContext}from"#context/serialize.js";import{preserveCancelledTurnMessage}from"#execution/cancelled-turn-message.js";import{takeDeferredMessage}from"#harness/hitl/index.js";import{preserveSerializedInstrumentationState}from"#instrumentation/state.js";import{preserveSerializedAgentTraceState}from"#tracing/eve/agent-trace-context-store.js";const log=createLogger(`execution.cancelled-turn`);async function cancelledWithoutCheckpoint(e,t,n){let r=appliedSession(e),i=r??t,a=n;if(r!==void 0){let e=takeDeferredMessage(r);i=e.session,e.message!==void 0&&(a={...n,message:e.message})}if(e.get(SandboxKey)===void 0&&hasFileParts(a?.message))try{return(await withContextScope(e,i,async e=>({result:void 0,session:await preserveCancelledTurnMessage(e,a)}))).session}catch(t){log.warn(`staging a cancelled turn's attachments failed`,{error:t}),e.clearVirtualContext()}return await contextStorage.run(e,()=>preserveCancelledTurnMessage(i,a))}function hasFileParts(e){return Array.isArray(e)&&e.some(e=>e.type===`file`)}async function createCancelledModelCallBatchResult(e){let t=serializeContext(e.ctx),n=e.checkpoint?.result.session??await cancelledWithoutCheckpoint(e.ctx,e.initialSession,e.stepInput),r={...e.checkpoint?.serializedContext??e.beforeBatchContext,[AuthKey.name]:t[AuthKey.name],[OfferedCatalogToolsKey.name]:t[OfferedCatalogToolsKey.name],[TurnDeliveryIdsKey.name]:t[TurnDeliveryIdsKey.name]};return{action:`cancelled`,serializedContext:preserveSerializedInstrumentationState(preserveSerializedAgentTraceState(preserveSerializedSessionDynamicModelSelection(r,t),t),t),...createDurableSessionValues(saveSessionProjection(n,e.ctx))}}export{createCancelledModelCallBatchResult};
+import{createLogger}from"#internal/logging.js";import{contextStorage}from"#context/container.js";import{AuthKey,OfferedCatalogToolsKey,SandboxKey,TurnDeliveryIdsKey}from"#context/keys.js";import{ReactionsStateKey}from"#reactions/state.js";import{appliedSession,saveSessionProjection}from"#harness/session-machine/current.js";import{withContextScope}from"#context/run-step.js";import{serializeContext}from"#context/serialize.js";import{preserveCancelledTurnMessage}from"#execution/cancelled-turn-message.js";import{createDurableSessionValues}from"#execution/durable-session-store.js";import{takeDeferredMessage}from"#harness/hitl/index.js";import{preserveSerializedInstrumentationState}from"#instrumentation/state.js";import{preserveSerializedAgentTraceState}from"#tracing/eve/agent-trace-context-store.js";const log=createLogger(`execution.cancelled-turn`);async function cancelledWithoutCheckpoint(e,t,n){let r=appliedSession(e),i=r??t,a=n;if(r!==void 0){let e=takeDeferredMessage(r);i=e.session,e.message!==void 0&&(a={...n,message:e.message})}return await preserveStoppedTurnMessage(e,i,a)}async function preserveStoppedTurnMessage(e,t,n){if(e.get(SandboxKey)===void 0&&hasFileParts(n?.message))try{return(await withContextScope(e,t,async e=>({result:void 0,session:await preserveCancelledTurnMessage(e,n)}))).session}catch(t){log.warn(`staging a cancelled turn's attachments failed`,{error:t}),e.clearVirtualContext()}return await contextStorage.run(e,()=>preserveCancelledTurnMessage(t,n))}function hasFileParts(e){return Array.isArray(e)&&e.some(e=>e.type===`file`)}async function createCancelledModelCallBatchResult(e){let t=serializeContext(e.ctx),n=e.checkpoint?.result.session??await cancelledWithoutCheckpoint(e.ctx,e.initialSession,e.stepInput),r={...e.checkpoint?.serializedContext??e.beforeBatchContext,[AuthKey.name]:t[AuthKey.name],[OfferedCatalogToolsKey.name]:t[OfferedCatalogToolsKey.name],[TurnDeliveryIdsKey.name]:t[TurnDeliveryIdsKey.name],[ReactionsStateKey.name]:t[ReactionsStateKey.name]};return{action:`cancelled`,serializedContext:preserveSerializedInstrumentationState(preserveSerializedAgentTraceState(r,t),t),...createDurableSessionValues(saveSessionProjection(n,e.ctx))}}export{createCancelledModelCallBatchResult,preserveStoppedTurnMessage};

package/dist/src/execution/cancelled-turn-message.d.ts

@@ -1,2 +1,2 @@
-import type { HarnessSession, StepInput } from "#harness/types.js";
-export declare function preserveCancelledTurnMessage(session: HarnessSession, input: StepInput | undefined): Promise<HarnessSession>;
+import type { HarnessSession, HarnessStepInput } from "#harness/types.js";
+export declare function preserveCancelledTurnMessage(session: HarnessSession, input: HarnessStepInput | undefined): Promise<HarnessSession>;

package/dist/src/execution/cancelled-turn-message.js

@@ -1 +1 @@
-import{createFrameworkUserMessage,createUserMessage,frameworkMessageKindForStepInput,normalizeUserContent}from"#harness/messages.js";import{stageAttachmentsToSandbox}from"#harness/attachment-staging.js";async function preserveCancelledTurnMessage(e,t){let n=normalizeUserContent(t?.message);if(n===void 0)return e;let r=await stageAttachmentsToSandbox(n),i=frameworkMessageKindForStepInput(t);return{...e,history:[...e.history,i===void 0?createUserMessage(`user`,r):createFrameworkUserMessage(i,r)]}}export{preserveCancelledTurnMessage};
+import{stageAttachmentsToSandbox}from"#harness/attachment-staging.js";import{createFrameworkUserMessage,createUserMessage,frameworkMessageKindForStepInput,normalizeMessage,userContentOf}from"#harness/messages.js";async function preserveCancelledTurnMessage(e,t){let n=normalizeMessage(t?.message);if(n===void 0)return e;let r=await stageAttachmentsToSandbox(userContentOf(n)),i=frameworkMessageKindForStepInput(t);return{...e,history:[...e.history,i===void 0?createUserMessage(`user`,r):createFrameworkUserMessage(i,r)]}}export{preserveCancelledTurnMessage};

package/dist/src/execution/catalog/connection-auth.js

@@ -1 +1 @@
-import{createLogger}from"#internal/logging.js";import{toErrorMessage}from"#shared/errors.js";import{CALL_TOOL_NAME}from"#protocol/catalog-tools.js";import{isConnectionAuthorizationFailedError,isConnectionAuthorizationRequiredError}from"#connections/errors.js";import{getAuthorizationResults}from"#harness/authorization.js";import{passesToolFilter}from"#runtime/connections/mcp-client.js";import{resolveConnectionAuthorization}from"#runtime/connections/resolve-authorization.js";import{createAuthorizationExecution}from"#runtime/connections/scoped-authorization.js";import{supportsInteractiveAuthorization}from"#shared/connection-types.js";const log=createLogger(`framework.catalog-connections`);async function completeConnectionSignIn(e,t){assertPendingSignInInstance(t);let n=await interactiveAuthorization(t),r=createAuthorizationExecution();n!==void 0&&await r.complete(n);let i=e.getClient(t.connectionName);return n!==void 0&&r.isJustAuthorized(n)&&await i.close(),{auth:r,client:i,scoped:n}}async function listConnectionTools(e,{auth:t,client:n,scoped:r}){let i=e.connectionName;try{return{tools:await listToolMetadata(e,n)}}catch(e){return isConnectionAuthorizationRequiredError(e)?r===void 0?{failure:`"${i}" requires authorization and cannot start interactive sign-in.`}:t.isJustAuthorized(r)?{failure:`Authorization failed for "${i}": the service rejected the token immediately after authorization.`}:{authorization:r,error:e}:(log.warn(`failed to load connection tools`,{connection:i,error:e}),{failure:listingFailureMessage(i,e)})}}const LISTING_TIMEOUT_MS=1e4;var ListingTimeoutError=class extends Error{};async function listToolMetadata(e,t){let{connectionName:n}=e,r,i=new Promise((e,t)=>{r=setTimeout(()=>{t(new ListingTimeoutError(`"${n}" did not list its tools within ${LISTING_TIMEOUT_MS/1e3}s. Try again later.`))},LISTING_TIMEOUT_MS)});try{return(await listConnectionMetadata(n,t,i)).filter(t=>passesToolFilter(t.name,e.tools))}finally{clearTimeout(r)}}async function listConnectionMetadata(e,t,n){let r=Promise.race([t.getToolMetadata(),n]),i=t.eventActions;if(i===void 0)return r;let[a,o]=await Promise.allSettled([r,listEventActions(e,i,n)]);for(let e of[a,o])if(e.status===`rejected`&&isConnectionAuthorizationRequiredError(e.reason))throw e.reason;let s=o.status===`fulfilled`?o.value:[];if(a.status===`rejected`){if(s.length>0)return s;throw a.reason}let c=a.value;if(c.some(e=>i.ownsName(e.name)))throw Error(`Remote tool names conflict with eve's event action namespace.`);return[...c,...s]}async function listEventActions(e,t,n){try{return await Promise.race([t.metadata(),n])}catch(n){if(isConnectionAuthorizationRequiredError(n))throw n;return log.warn(`failed to discover connection events`,{connection:e,error:n}),t.recoveryMetadata()}}function listingFailureMessage(e,t){return t instanceof ListingTimeoutError?t.message:isConnectionAuthorizationFailedError(t)?`Authorization failed for "${e}": ${t.message}`:`Failed to load tools for "${e}": ${toErrorMessage(t)}`}async function interactiveAuthorization(e){let t=await resolveConnectionAuthorization(e);if(t!==void 0&&supportsInteractiveAuthorization(t))return{scope:e.connectionName,instanceId:e.instanceId,connection:{url:e.url??``},authorization:t}}function assertPendingSignInInstance(e){for(let t of getAuthorizationResults())if(t.name===e.connectionName&&t.instanceId!==void 0&&t.instanceId!==e.instanceId)throw Error(`Authorization for "${t.name}" cannot complete because its resolved connection changed while sign-in was pending. Sign in again with ${CALL_TOOL_NAME}({ name: "${t.name}" }).`)}export{completeConnectionSignIn,listConnectionTools,listToolMetadata,listingFailureMessage};
+import{createLogger}from"#internal/logging.js";import{toErrorMessage}from"#shared/errors.js";import{CALL_TOOL_NAME}from"#protocol/catalog-tools.js";import{isConnectionAuthorizationFailedError,isConnectionAuthorizationRequiredError}from"#connections/errors.js";import{getAuthorizationResults}from"#harness/authorization.js";import{passesToolFilter}from"#runtime/connections/mcp-client.js";import{resolveConnectionAuthorization}from"#runtime/connections/resolve-authorization.js";import{createAuthorizationExecution}from"#runtime/connections/scoped-authorization.js";import{supportsInteractiveAuthorization}from"#shared/connection-types.js";const log=createLogger(`framework.catalog-connections`);async function completeConnectionSignIn(e,t){assertPendingSignInInstance(t);let n=await interactiveAuthorization(t),r=createAuthorizationExecution();n!==void 0&&await r.complete(n);let i=e.getClient(t.connectionName);return n!==void 0&&r.isJustAuthorized(n)&&await i.close(),{auth:r,client:i,scoped:n}}async function listConnectionTools(e,{auth:t,client:n,scoped:r}){let i=e.connectionName;try{return{tools:await listToolMetadata(e,n)}}catch(e){return isConnectionAuthorizationRequiredError(e)?r===void 0?{failure:`"${i}" requires authorization and cannot start interactive sign-in.`}:t.isJustAuthorized(r)?{failure:`Authorization failed for "${i}": the service rejected the token immediately after authorization.`}:{authorization:r,error:e}:(log.warn(`failed to load connection tools`,{connection:i,error:e}),{failure:listingFailureMessage(i,e)})}}const LISTING_TIMEOUT_MS=1e4;var ListingTimeoutError=class extends Error{};async function listToolMetadata(e,t){let{connectionName:n}=e,r,i=new Promise((e,t)=>{r=setTimeout(()=>{t(new ListingTimeoutError(`"${n}" did not list its tools within ${LISTING_TIMEOUT_MS/1e3}s. Try again later.`))},LISTING_TIMEOUT_MS)});try{return(await listConnectionMetadata(n,t,i)).filter(t=>passesToolFilter(t.operationId===void 0?[t.name]:[t.name,t.operationId],e.tools))}finally{clearTimeout(r)}}async function listConnectionMetadata(e,t,n){let r=Promise.race([t.getToolMetadata(),n]),i=t.eventActions;if(i===void 0)return r;let[a,o]=await Promise.allSettled([r,listEventActions(e,i,n)]);for(let e of[a,o])if(e.status===`rejected`&&isConnectionAuthorizationRequiredError(e.reason))throw e.reason;let s=o.status===`fulfilled`?o.value:[];if(a.status===`rejected`){if(s.length>0)return s;throw a.reason}let c=a.value;if(c.some(e=>i.ownsName(e.name)))throw Error(`Remote tool names conflict with eve's event action namespace.`);return[...c,...s]}async function listEventActions(e,t,n){try{return await Promise.race([t.metadata(),n])}catch(n){if(isConnectionAuthorizationRequiredError(n))throw n;return log.warn(`failed to discover connection events`,{connection:e,error:n}),t.recoveryMetadata()}}function listingFailureMessage(e,t){return t instanceof ListingTimeoutError?t.message:isConnectionAuthorizationFailedError(t)?`Authorization failed for "${e}": ${t.message}`:`Failed to load tools for "${e}": ${toErrorMessage(t)}`}async function interactiveAuthorization(e){let t=await resolveConnectionAuthorization(e);if(t!==void 0&&supportsInteractiveAuthorization(t))return{scope:e.connectionName,instanceId:e.instanceId,connection:{url:e.url??``},authorization:t}}function assertPendingSignInInstance(e){for(let t of getAuthorizationResults())if(t.name===e.connectionName&&t.instanceId!==void 0&&t.instanceId!==e.instanceId)throw Error(`Authorization for "${t.name}" cannot complete because its resolved connection changed while sign-in was pending. Sign in again with ${CALL_TOOL_NAME}({ name: "${t.name}" }).`)}export{completeConnectionSignIn,listConnectionTools,listToolMetadata,listingFailureMessage};

package/dist/src/execution/catalog/connection-entry.js

@@ -1 +1 @@
-import{completeConnectionSignIn,listConnectionTools,listToolMetadata,listingFailureMessage}from"./connection-auth.js";import{closestNames}from"./rank.js";import{connectionToolSignature}from"./signatures.js";import{isObject}from"#shared/guards.js";import{loadContext}from"#context/container.js";import{displayProperName,displayTitle}from"#shared/display-name.js";import{SEARCH_TOOL_NAME}from"#protocol/catalog-tools.js";import{defineJsonSchema,refineJsonSchema}from"#tools/schema.js";import{connectionToolName}from"#connections/ownership.js";import{ContextKey}from"#context/key.js";import{resolveApprovalPolicy}from"#approval/definition.js";import{isApprovalRecheck,markApprovalRecheck}from"#harness/approval-recheck.js";import{isConnectionAuthorizationRequiredError}from"#connections/errors.js";import{connectionToolModelOutput,toConnectionToolResult}from"#runtime/connections/tool-result.js";const CONNECTION_CHANGED_MESSAGE=`The connection for this tool call changed or is unavailable. Request a new tool call and approval.`,ConnectionApprovalPinsKey=new ContextKey(`eve.connectionApprovalPins`);function instanceKey(e){return e.instanceId??``}function connectionEntry(e,t,n){let r=`${displayProperName(t.connectionName)}: ${displayTitle(n)}`;return{approval:connectionApproval(e,t,n),deferred:!0,description:``,execute:(r,i)=>callConnectionTool(e,t,n,r,i),inputSchema:refineJsonSchema({},r=>checkInput(e,t,n,r)),label:{start:()=>r},name:connectionToolName(t.connectionName,n),toModelOutput:connectionToolModelOutput}}function connectionSignInEntry(e,t){let n=displayProperName(t.connectionName),r=`Sign in to use the ${n} tools`;return{deferred:!0,description:t.description===``?`${r}.`:`${r}: ${t.description}`,execute:()=>connect(e,t),inputSchema:defineJsonSchema({type:`object`,properties:{},additionalProperties:!1}),label:{start:()=>`Sign in to ${n}`},name:t.connectionName}}async function connect(e,t){let n=await completeConnectionSignIn(e,t),r=await listConnectionTools(t,n);if(`failure`in r)throw Error(r.failure);if(`authorization`in r)return await n.auth.handleError(r.error,r.authorization);let i=displayProperName(t.connectionName),a=`${SEARCH_TOOL_NAME}({ query: "${t.connectionName}__" })`;return n.scoped!==void 0&&n.auth.isJustAuthorized(n.scoped)?`Signed in to ${i}. Find the ${i} tools with ${a}.`:`The ${i} tools are available. Find them with ${a}.`}async function callConnectionTool(e,t,n,r,i){releaseApprovalPin(i.toolCallId,t);let a=await completeConnectionSignIn(e,t),{auth:o,client:s,scoped:c}=a,l=await listConnectionTools(t,a);if(`failure`in l)throw Error(l.failure);if(`authorization`in l)return await o.handleError(l.error,l.authorization);let u=s.eventActions?.ownsName(n)===!0,d=await checkCall(t,l.tools,n,r,!u);if(`issues`in d)throw Error(issuesMessage(d.issues));let{input:f,tool:p}=d,m;try{if(u)return await s.eventActions.execute(p.name,f,{abortSignal:i.abortSignal,callId:i.toolCallId});m=await executeWithDeadline(t.connectionName,s,p.name,f,i)}catch(e){if(isConnectionAuthorizationRequiredError(e))return await o.handleError(e,c);throw e}let h=toConnectionToolResult(t.protocol,p,m);if(!h.ok)throw Error(h.error);return h.value}const CALL_TIMEOUT_MS=3e5;async function executeWithDeadline(e,t,n,r,i){let a=i.abortSignal,o=new AbortController,s=setTimeout(()=>o.abort(),CALL_TIMEOUT_MS);try{return await t.executeTool(n,r,{abortSignal:a===void 0?o.signal:AbortSignal.any([a,o.signal]),callId:i.toolCallId})}catch(t){throw!o.signal.aborted||a?.aborted===!0?t:Error(`"${e}" did not answer ${n} within ${CALL_TIMEOUT_MS/6e4} minutes. It may still have run, so check before you retry.`,{cause:t})}finally{clearTimeout(s)}}async function checkInput(e,t,n,r){let i=e.getClient(t.connectionName),a;try{a=await listToolMetadata(t,i)}catch(e){return isConnectionAuthorizationRequiredError(e)?{value:r}:{issues:[{message:listingFailureMessage(t.connectionName,e)}]}}let o=await checkCall(t,a,n,r,i.eventActions?.ownsName(n)!==!0);return`issues`in o?{issues:o.issues}:{value:o.input}}async function checkCall(e,t,n,r,i=!0){let a=t.find(e=>e.name===n);if(a===void 0)return{issues:[{message:unknownToolMessage(e,n,t)}]};let o=i?e.toolCall?.providedArguments??{}:{},s=Object.fromEntries(Object.entries(isObject(r)?r:{}).filter(([e])=>!Object.hasOwn(o,e))),c=await defineJsonSchema(a.inputSchema)[`~standard`].validate(s);return c.issues===void 0?{input:c.value,tool:a}:{issues:[...c.issues,{message:`Signature: ${connectionToolSignature(e,a)}`}]}}function issuesMessage(e){return e.map(({message:e,path:t=[]})=>{let n=t.map(e=>String(typeof e==`object`?e.key:e)).join(`.`);return n.length>0?`${n}: ${e}`:e}).join(` `)}function unknownToolMessage(e,t,n){let{connectionName:r}=e,i=closestNames(t,n).map(e=>connectionToolName(r,e));return`Connection "${r}" has no tool named "${t}".${i.length>0?` Closest tools: ${i.join(`, `)}.`:` Find its tools with ${SEARCH_TOOL_NAME}({ query: "${r}__" }).`}`}function connectionApproval(e,t,n){let{approval:r}=t;if(r===void 0)return;let i=resolveApprovalPolicy(r),request=async r=>requestApproval(t,i,withToolAnnotations(r,await toolAnnotations(e,t,n))),a=typeof r==`function`?void 0:r.response;return a===void 0?request:{request,response:e=>authorizeApprovalResponse(t,a,e)}}async function requestApproval(e,t,n){isApprovalRecheck(n)&&!matchesApprovalPin(n.callId,e)&&markApprovalPinChanged(n.callId);let r=await t(n);return!isApprovalRecheck(n)&&parksForApproval(r)&&pinApprovedInstance(n.callId,e),r}async function toolAnnotations(e,t,n){try{return(await listToolMetadata(t,e.getClient(t.connectionName))).find(e=>e.name===n)?.annotations}catch{return}}function withToolAnnotations(e,t){if(t===void 0)return e;let n={...e,toolAnnotations:t};return isApprovalRecheck(e)?markApprovalRecheck(n):n}function parksForApproval(e){return e===!0||e===`user-approval`||typeof e==`object`&&e.type===`user-approval`}async function authorizeApprovalResponse(e,t,n){return matchesApprovalPin(n.request.callId,e)?await t(n):{reason:CONNECTION_CHANGED_MESSAGE,status:`rejected`}}function pinApprovedInstance(e,t){let n=loadContext();n.get(ConnectionApprovalPinsKey)?.[e]===void 0&&n.set(ConnectionApprovalPinsKey,(n={})=>Object.fromEntries([...Object.entries(n).slice(-49),[e,instanceKey(t)]]))}function matchesApprovalPin(e,t){let n=loadContext().get(ConnectionApprovalPinsKey)?.[e];return n!==void 0&&n===instanceKey(t)}function markApprovalPinChanged(e){loadContext().set(ConnectionApprovalPinsKey,(t={})=>({...t,[e]:`\0changed`}))}function releaseApprovalPin(e,t){let n=loadContext(),r=n.get(ConnectionApprovalPinsKey);if(r?.[e]===void 0)return;let{[e]:i,...a}=r;if(n.set(ConnectionApprovalPinsKey,a),i!==instanceKey(t))throw Error(CONNECTION_CHANGED_MESSAGE)}export{connectionEntry,connectionSignInEntry};
+import{completeConnectionSignIn,listConnectionTools,listToolMetadata,listingFailureMessage}from"./connection-auth.js";import{closestNames}from"./rank.js";import{connectionToolSignature}from"./signatures.js";import{approvalDecision}from"#approval/status.js";import{isObject}from"#shared/guards.js";import{loadContext}from"#context/container.js";import{displayProperName,displayTitle}from"#protocol/session-projection/display-name.js";import{defineJsonSchema,refineJsonSchema}from"#tools/schema.js";import{connectionToolName}from"#connections/ownership.js";import{ContextKey}from"#context/key.js";import{inheritApprovalContext,isApprovalRecheck}from"#approval/evaluation.js";import{SEARCH_TOOL_NAME}from"#protocol/catalog-tools.js";import{isConnectionAuthorizationRequiredError}from"#connections/errors.js";import{resolveApprovalPolicy}from"#approval/definition.js";import{connectionToolModelOutput,toConnectionToolResult}from"#runtime/connections/tool-result.js";const CONNECTION_CHANGED_MESSAGE=`The connection for this tool call changed or is unavailable. Request a new tool call and approval.`,ConnectionApprovalPinsKey=new ContextKey(`eve.connectionApprovalPins`);function instanceKey(e){return e.instanceId??``}function connectionEntry(e,t,n){let r=`${displayProperName(t.connectionName)}: ${displayTitle(n)}`;return{approval:connectionApproval(e,t,n),deferred:!0,description:``,execute:(r,i)=>callConnectionTool(e,t,n,r,i),inputSchema:refineJsonSchema({},r=>checkInput(e,t,n,r)),label:{start:()=>r},name:connectionToolName(t.connectionName,n),toModelOutput:connectionToolModelOutput}}function connectionSignInEntry(e,t){let n=displayProperName(t.connectionName),r=`Sign in to use the ${n} tools`;return{deferred:!0,description:t.description===``?`${r}.`:`${r}: ${t.description}`,execute:()=>connect(e,t),inputSchema:defineJsonSchema({type:`object`,properties:{},additionalProperties:!1}),label:{start:()=>`Sign in to ${n}`},name:t.connectionName}}async function connect(e,t){let n=await completeConnectionSignIn(e,t),r=await listConnectionTools(t,n);if(`failure`in r)throw Error(r.failure);if(`authorization`in r)return await n.auth.handleError(r.error,r.authorization);let i=displayProperName(t.connectionName),a=`${SEARCH_TOOL_NAME}({ query: "${t.connectionName}__" })`;return n.scoped!==void 0&&n.auth.isJustAuthorized(n.scoped)?`Signed in to ${i}. Find the ${i} tools with ${a}.`:`The ${i} tools are available. Find them with ${a}.`}async function callConnectionTool(e,t,n,r,i){releaseApprovalPin(i.toolCallId,t);let a=await completeConnectionSignIn(e,t),{auth:o,client:s,scoped:c}=a,l=await listConnectionTools(t,a);if(`failure`in l)throw Error(l.failure);if(`authorization`in l)return await o.handleError(l.error,l.authorization);let u=s.eventActions?.ownsName(n)===!0,d=await checkCall(t,l.tools,n,r,!u);if(`issues`in d)throw Error(issuesMessage(d.issues));let{input:f,tool:p}=d,m;try{if(u)return await s.eventActions.execute(p.name,f,{abortSignal:i.abortSignal,callId:i.toolCallId});m=await executeWithDeadline(t.connectionName,s,p.name,f,i)}catch(e){if(isConnectionAuthorizationRequiredError(e))return await o.handleError(e,c);throw e}let h=toConnectionToolResult(t.protocol,p,m);if(!h.ok)throw Error(h.error);return h.value}const CALL_TIMEOUT_MS=3e5;async function executeWithDeadline(e,t,n,r,i){let a=i.abortSignal,o=new AbortController,s=setTimeout(()=>o.abort(),CALL_TIMEOUT_MS);try{return await t.executeTool(n,r,{abortSignal:a===void 0?o.signal:AbortSignal.any([a,o.signal]),callId:i.toolCallId})}catch(t){throw!o.signal.aborted||a?.aborted===!0?t:Error(`"${e}" did not answer ${n} within ${CALL_TIMEOUT_MS/6e4} minutes. It may still have run, so check before you retry.`,{cause:t})}finally{clearTimeout(s)}}async function checkInput(e,t,n,r){let i=e.getClient(t.connectionName),a;try{a=await listToolMetadata(t,i)}catch(e){return isConnectionAuthorizationRequiredError(e)?{value:r}:{issues:[{message:listingFailureMessage(t.connectionName,e)}]}}let o=await checkCall(t,a,n,r,i.eventActions?.ownsName(n)!==!0);return`issues`in o?{issues:o.issues}:{value:o.input}}async function checkCall(e,t,n,r,i=!0){let a=t.find(e=>e.name===n);if(a===void 0)return{issues:[{message:unknownToolMessage(e,n,t)}]};let o=i?e.toolCall?.providedArguments??{}:{},s=Object.fromEntries(Object.entries(isObject(r)?r:{}).filter(([e])=>!Object.hasOwn(o,e))),c=await defineJsonSchema(a.inputSchema)[`~standard`].validate(s);return c.issues===void 0?{input:c.value,tool:a}:{issues:[...c.issues,{message:`Signature: ${connectionToolSignature(e,a)}`}]}}function issuesMessage(e){return e.map(({message:e,path:t=[]})=>{let n=t.map(e=>String(typeof e==`object`?e.key:e)).join(`.`);return n.length>0?`${n}: ${e}`:e}).join(` `)}function unknownToolMessage(e,t,n){let{connectionName:r}=e,i=closestNames(t,n).map(e=>connectionToolName(r,e));return`Connection "${r}" has no tool named "${t}".${i.length>0?` Closest tools: ${i.join(`, `)}.`:` Find its tools with ${SEARCH_TOOL_NAME}({ query: "${r}__" }).`}`}function connectionApproval(e,t,n){let{approval:r}=t;if(r===void 0)return;let i=resolveApprovalPolicy(r),request=async r=>requestApproval(t,i,withToolAnnotations(r,await toolAnnotations(e,t,n)));if(typeof r==`function`)return request;let a=r.response;return{request,prompt:r.prompt,response:a===void 0?void 0:e=>authorizeApprovalResponse(t,a,e)}}async function requestApproval(e,t,n){isApprovalRecheck(n)&&!matchesApprovalPin(n.callId,e)&&markApprovalPinChanged(n.callId);let r=await t(n);return!isApprovalRecheck(n)&&approvalDecision(r).awaitsPerson===!0&&pinApprovedInstance(n.callId,e),r}async function toolAnnotations(e,t,n){try{return(await listToolMetadata(t,e.getClient(t.connectionName))).find(e=>e.name===n)?.annotations}catch{return}}function withToolAnnotations(e,t){return t===void 0?e:inheritApprovalContext(e,{...e,toolAnnotations:t})}async function authorizeApprovalResponse(e,t,n){return matchesApprovalPin(n.request.callId,e)?await t(n):{reason:CONNECTION_CHANGED_MESSAGE,status:`rejected`}}function pinApprovedInstance(e,t){let n=loadContext();n.get(ConnectionApprovalPinsKey)?.[e]===void 0&&n.set(ConnectionApprovalPinsKey,(n={})=>Object.fromEntries([...Object.entries(n).slice(-49),[e,instanceKey(t)]]))}function matchesApprovalPin(e,t){let n=loadContext().get(ConnectionApprovalPinsKey)?.[e];return n!==void 0&&n===instanceKey(t)}function markApprovalPinChanged(e){loadContext().set(ConnectionApprovalPinsKey,(t={})=>({...t,[e]:`\0changed`}))}function releaseApprovalPin(e,t){let n=loadContext(),r=n.get(ConnectionApprovalPinsKey);if(r?.[e]===void 0)return;let{[e]:i,...a}=r;if(n.set(ConnectionApprovalPinsKey,a),i!==instanceKey(t))throw Error(CONNECTION_CHANGED_MESSAGE)}export{connectionEntry,connectionSignInEntry};

package/dist/src/execution/catalog/rank.js

@@ -1 +1 @@
-import{isObject}from"#shared/guards.js";import{connectionToolName}from"#connections/ownership.js";function rankCandidates(e,t){let n=tokenize(e),r=scoringTerms(n);return t.map(e=>({candidate:e,...rankCandidate(n,r,e)})).filter(e=>e.score>0).sort((e,t)=>e.tier-t.tier||t.score-e.score||compareCodeUnits(e.candidate.connection?.name??``,t.candidate.connection?.name??``)||compareCodeUnits(e.candidate.name,t.candidate.name)).map(e=>e.candidate)}function isEmptyQuery(e){return tokenize(e).length===0}function closestNames(e,t){return isEmptyQuery(e)?[]:rankCandidates(e,t).slice(0,5).map(e=>e.name)}const Tier={exact:0,exactWithoutNamespace:1,connection:2,namePrefix:3,keyword:4};function rankCandidate(e,t,n){let r=n.connection===void 0?n.name:connectionToolName(n.connection.name,n.name),i=tokenize(r),a=r.lastIndexOf(`__`),o=tokenize(a<0?r:r.slice(a+2)),s=sameWords(i,e)?Tier.exact:sameWords(o,e)?Tier.exactWithoutNamespace:n.connection!==void 0&&startsWithWholeWords(tokenize(n.connection.name),e)?Tier.connection:startsWithWords(i,e)||startsWithWords(o,e)?Tier.namePrefix:Tier.keyword;return{score:scoreFields(t,candidateFields(n)),tier:s}}const FILLER_WORDS=new Set([`a`,`an`,`and`,`for`,`in`,`is`,`me`,`my`,`of`,`or`,`please`,`the`,`to`,`with`]);function scoringTerms(e){let t=e.filter(e=>e.length>1&&!FILLER_WORDS.has(e));return t.length>0?t:e}function sameWords(e,t){return e.length===t.length&&startsWithWholeWords(e,t)}function startsWithWholeWords(e,t){return t.length<=e.length&&t.every((t,n)=>e[n]===t)}function startsWithWords(e,t){return t.length<=e.length&&t.every((n,r)=>r===t.length-1?e[r].startsWith(n):e[r]===n)}function candidateFields(e){let t=isObject(e.inputSchema?.properties)?Object.entries(e.inputSchema.properties):[],n=t.flatMap(([,e])=>isObject(e)&&typeof e.description==`string`?[e.description]:[]);return[[tokenize(e.name),6],[tokenize(e.connection?.name??``),4],[t.flatMap(([e])=>tokenize(e)),3],[proseWords(e.description),2],[n.flatMap(proseWords),1],[proseWords(e.connection?.description??``),1]]}function scoreFields(e,t){let n=0;for(let r of e)for(let[e,i]of t)e.some(e=>matchesWord(e,r))&&(n+=i);return n}function matchesWord(e,t){return e.startsWith(t)||e.length>=3&&t.startsWith(e)}function tokenize(e){return e.replaceAll(/([A-Z]+)([A-Z][a-z])/gu,`$1 $2`).replaceAll(/([a-z0-9])([A-Z])/gu,`$1 $2`).toLowerCase().split(/[^a-z0-9]+/u).filter(e=>e!==``)}function proseWords(e){return tokenize(e).filter(e=>e.length>1)}function compareCodeUnits(e,t){return e<t?-1:+(e>t)}export{closestNames,compareCodeUnits,isEmptyQuery,rankCandidates};
+import{isObject}from"#shared/guards.js";import{followRefs}from"#tools/schema.js";import{connectionToolName}from"#connections/ownership.js";function rankCandidates(e,t){let n=tokenize(e),r=scoringTerms(n);return t.map(e=>({candidate:e,...rankCandidate(n,r,e)})).filter(e=>e.score>0).sort((e,t)=>e.tier-t.tier||t.score-e.score||compareCodeUnits(e.candidate.connection?.name??``,t.candidate.connection?.name??``)||compareCodeUnits(e.candidate.name,t.candidate.name)).map(e=>e.candidate)}function isEmptyQuery(e){return tokenize(e).length===0}function closestNames(e,t){return isEmptyQuery(e)?[]:rankCandidates(e,t).slice(0,5).map(e=>e.name)}const Tier={exact:0,exactWithoutNamespace:1,connection:2,namePrefix:3,keyword:4};function rankCandidate(e,t,n){let r=n.connection===void 0?n.name:connectionToolName(n.connection.name,n.name),i=tokenize(r),a=r.lastIndexOf(`__`),o=tokenize(a<0?r:r.slice(a+2)),s=sameWords(i,e)?Tier.exact:sameWords(o,e)?Tier.exactWithoutNamespace:n.connection!==void 0&&startsWithWholeWords(tokenize(n.connection.name),e)?Tier.connection:startsWithWords(i,e)||startsWithWords(o,e)?Tier.namePrefix:Tier.keyword;return{score:scoreFields(t,candidateFields(n)),tier:s}}const FILLER_WORDS=new Set([`a`,`an`,`and`,`for`,`in`,`is`,`me`,`my`,`of`,`or`,`please`,`the`,`to`,`with`]);function scoringTerms(e){let t=e.filter(e=>e.length>1&&!FILLER_WORDS.has(e));return t.length>0?t:e}function sameWords(e,t){return e.length===t.length&&startsWithWholeWords(e,t)}function startsWithWholeWords(e,t){return t.length<=e.length&&t.every((t,n)=>e[n]===t)}function startsWithWords(e,t){return t.length<=e.length&&t.every((n,r)=>r===t.length-1?e[r].startsWith(n):e[r]===n)}function candidateFields(e){let t=isObject(e.inputSchema?.properties)?Object.entries(e.inputSchema.properties):[],n=e.inputSchema??{},r=t.flatMap(([,e])=>{for(let t of followRefs(n,e))if(typeof t.description==`string`)return[t.description];return[]});return[[tokenize(e.name),6],[tokenize(e.connection?.name??``),4],[t.flatMap(([e])=>tokenize(e)),3],[proseWords(e.description),2],[r.flatMap(proseWords),1],[proseWords(e.connection?.description??``),1]]}function scoreFields(e,t){let n=0;for(let r of e)for(let[e,i]of t)e.some(e=>matchesWord(e,r))&&(n+=i);return n}function matchesWord(e,t){return e.startsWith(t)||e.length>=3&&t.startsWith(e)}function tokenize(e){return e.replaceAll(/([A-Z]+)([A-Z][a-z])/gu,`$1 $2`).replaceAll(/([a-z0-9])([A-Z])/gu,`$1 $2`).toLowerCase().split(/[^a-z0-9]+/u).filter(e=>e!==``)}function proseWords(e){return tokenize(e).filter(e=>e.length>1)}function compareCodeUnits(e,t){return e<t?-1:+(e>t)}export{closestNames,compareCodeUnits,isEmptyQuery,rankCandidates};

package/dist/src/execution/catalog/search.js

@@ -1 +1 @@
-import{completeConnectionSignIn,listConnectionTools,listingFailureMessage}from"./connection-auth.js";import{closestNames,isEmptyQuery,rankCandidates}from"./rank.js";import{connectionToolSignature,entrySignature}from"./signatures.js";import{connectionSignInEntry}from"./connection-entry.js";import{CALL_TOOL_NAME,SEARCH_TOOL_NAME,SKILL_TOOL_NAME}from"#protocol/catalog-tools.js";import{serializeInputSchema,toInputSchema}from"#tools/schema.js";import{connectionToolName}from"#connections/ownership.js";function searchDescription({connections:e,skills:t,tools:n}){return[`Search your own catalog for tools, agents, skills, and connected services that aren't in your tool list. Use it when nothing in your tool list fits the request; it doesn't search the web.`,n?`A result with \`tool\` has the exact name, description, and TypeScript signature: call it with ${CALL_TOOL_NAME}({ name, input }).`:void 0,t?`A result with \`skill\` has the name and description: load it with ${SKILL_TOOL_NAME}({ name }).`:void 0,"`searched` counts the entries the query covered, and `remaining` counts the matches past `limit`: when `remaining` is 0, nothing else the query covered matched. Connections under `unavailable` weren't searched.",`When you already know a name or connection, from the catalog listing, an earlier result, or an error, search it directly: the exact name, or "<connection>__", which is faster and returns only that connection's tools.`,e?`A connection that needs sign-in appears as a tool named after the connection: calling it with ${CALL_TOOL_NAME}({ name }) asks the user to sign in. \`searched\` counts its tools only after sign-in.`:void 0].filter(e=>e!==void 0).join(` `)}const SEARCH_INPUT_SCHEMA=toInputSchema({type:`object`,properties:{query:{type:`string`,minLength:1,description:`Words describing the capability, such as 'list open issues'; an exact name; or a namespace prefix such as 'linear__', which searches only that connection's tools.`},limit:{type:`integer`,minimum:1,maximum:50,description:`Maximum results, best matches first. Defaults to 10.`}},required:[`query`],additionalProperties:!1}),SEARCH_LABEL={start:e=>`Search tools${labelQuery(e)}`,complete:(e,t)=>{let{results:n,unavailable:r=[]}=t,i=`Searched tools${labelQuery(e)}, found ${n.length===0?`nothing`:String(n.length)}`;if(n.length>0||r.length===0)return i;let a=r.length===1?`connection`:`connections`;return`${i}; ${String(r.length)} ${a} unavailable`}};function labelQuery(e){let t=e.query?.trim();return t?` for “${t}”`:``}function createSearchTool(e){return{description:searchDescription(e.reach),execute:t=>search(e,t),frameworkTool:!0,inputSchema:SEARCH_INPUT_SCHEMA,label:SEARCH_LABEL,name:SEARCH_TOOL_NAME}}async function search(e,t){let n=t.query??``;if(isEmptyQuery(n))throw Error(`${SEARCH_TOOL_NAME} needs at least one word in query, such as a capability ("list open issues") or a name or connection prefix ("linear__").`);let r=parseNamespace(n),inScope=e=>r===void 0||inNamespace(e,r),i=[...e.deferred.map(t=>entryCandidate(t,e.describe)),...e.skills.map(skillCandidate)].filter(e=>inScope(e.fullName)),a=[],{registry:o}=e;if(o!==void 0){let e=o.getConnections().filter(({connectionName:e})=>r===void 0||mayOwnNamespace(e,r)),t=await Promise.all(e.map(e=>searchConnection(o,e)));for(let e of t)`unavailable`in e?a.push(e.unavailable):i.push(...e.candidates.filter(e=>inScope(e.fullName)))}if(r!==void 0&&i.length===0&&a.length===0)throw Error(unknownNamespaceMessage(r,o?.getConnections()??[]));let s=clampInteger(t.limit,1,50,10),c=rankCandidates(n,i),l=c.slice(0,s).map(e=>e.result()),u={results:l,remaining:c.length-l.length,searched:i.length};return a.length>0?{...u,unavailable:a}:u}function parseNamespace(e){let t=(e.trim().split(/\s+/u)[0]??``).replace(/^[^A-Za-z0-9_-]+/u,``),n=t.slice(0,Math.max(0,t.lastIndexOf(`__`))).replace(/_+$/u,``);return n===``?void 0:n}function inNamespace(e,t){return e===t||e.startsWith(`${t}__`)}function mayOwnNamespace(e,t){return inNamespace(e,t)||t.startsWith(`${e}__`)}function unknownNamespaceMessage(e,t){if(t.some(({connectionName:t})=>t===e))return`Connection "${e}" has no tools.`;let n=closestNames(e,t.map(({connectionName:e,description:t})=>({description:t,name:e})));return`No entries are named "${e}__…". ${n.length>0?`Closest connections: ${n.join(`, `)}.`:`Find names in the catalog listing or your tool list, or call ${SEARCH_TOOL_NAME} with plain words.`}`}async function searchConnection(e,t){let n=t.connectionName,r;try{r=await listConnectionTools(t,await completeConnectionSignIn(e,t))}catch(e){return{unavailable:{connection:n,error:listingFailureMessage(n,e)}}}return`failure`in r?{unavailable:{connection:n,error:r.failure}}:`authorization`in r?{candidates:[signInCandidate(e,t)]}:{candidates:r.tools.map(e=>toolCandidate(t,e))}}function entryCandidate(e,t){let n=serializeInputSchema(e.inputSchema),r=t(e);return{description:r,inputSchema:n,name:e.name,result:()=>({description:r,signature:entrySignature(e,n),tool:e.name}),fullName:e.name}}function skillCandidate({description:e,name:t,path:n}){return{description:e,fullName:t,name:t,result:()=>({description:e,path:n,skill:t})}}function toolCandidate(e,t){let n=connectionToolName(e.connectionName,t.name);return{connection:{description:e.description,name:e.connectionName},description:t.description,inputSchema:t.inputSchema,name:t.name,result:()=>({description:t.description,signature:connectionToolSignature(e,t),tool:n}),fullName:n}}function signInCandidate(e,t){let n=connectionSignInEntry(e,t);return{description:t.description,name:t.connectionName,result:()=>({description:n.description,signature:entrySignature(n),tool:n.name}),fullName:n.name}}function clampInteger(e,t,n,r){return typeof e!=`number`||!Number.isFinite(e)?r:Math.min(n,Math.max(t,Math.trunc(e)))}export{createSearchTool};
+import{completeConnectionSignIn,listConnectionTools,listingFailureMessage}from"./connection-auth.js";import{closestNames,isEmptyQuery,rankCandidates}from"./rank.js";import{connectionToolSignature,entrySignature}from"./signatures.js";import{connectionSignInEntry}from"./connection-entry.js";import{serializeInputSchema,toInputSchema}from"#tools/schema.js";import{connectionToolName}from"#connections/ownership.js";import{CALL_TOOL_NAME,SEARCH_TOOL_NAME,SKILL_TOOL_NAME}from"#protocol/catalog-tools.js";function searchDescription({connections:e,skills:t,tools:n}){return[`Search your own catalog for tools, agents, skills, and connected services that aren't in your tool list. Use it when nothing in your tool list fits the request; it doesn't search the web.`,n?`A result with \`tool\` has the exact name, description, and TypeScript signature: call it with ${CALL_TOOL_NAME}({ name, input }).`:void 0,t?`A result with \`skill\` has the name and description: load it with ${SKILL_TOOL_NAME}({ name }).`:void 0,"`searched` counts the entries the query covered, and `remaining` counts the matches past `limit`: when `remaining` is 0, nothing else the query covered matched. Connections under `unavailable` weren't searched.",`When you already know a name or connection, from the catalog listing, an earlier result, or an error, search it directly: the exact name, or "<connection>__", which is faster and returns only that connection's tools.`,e?`A connection that needs sign-in appears as a tool named after the connection: calling it with ${CALL_TOOL_NAME}({ name }) asks the user to sign in. \`searched\` counts its tools only after sign-in.`:void 0].filter(e=>e!==void 0).join(` `)}const SEARCH_INPUT_SCHEMA=toInputSchema({type:`object`,properties:{query:{type:`string`,minLength:1,description:`Words describing the capability, such as 'list open issues'; an exact name; or a namespace prefix such as 'linear__', which searches only that connection's tools.`},limit:{type:`integer`,minimum:1,maximum:50,description:`Maximum results, best matches first. Defaults to 10.`}},required:[`query`],additionalProperties:!1}),SEARCH_LABEL={start:e=>`Search tools${labelQuery(e)}`,complete:(e,t)=>{let{results:n,unavailable:r=[]}=t,i=`Searched tools${labelQuery(e)}, found ${n.length===0?`nothing`:String(n.length)}`;if(n.length>0||r.length===0)return i;let a=r.length===1?`connection`:`connections`;return`${i}; ${String(r.length)} ${a} unavailable`}};function labelQuery(e){let t=e.query?.trim();return t?` for “${t}”`:``}function createSearchTool(e){return{description:searchDescription(e.reach),execute:t=>search(e,t),frameworkTool:!0,inputSchema:SEARCH_INPUT_SCHEMA,label:SEARCH_LABEL,name:SEARCH_TOOL_NAME}}async function search(e,t){let n=t.query??``;if(isEmptyQuery(n))throw Error(`${SEARCH_TOOL_NAME} needs at least one word in query, such as a capability ("list open issues") or a name or connection prefix ("linear__").`);let r=parseNamespace(n),inScope=e=>r===void 0||inNamespace(e,r),i=[...e.deferred.map(t=>entryCandidate(t,e.describe)),...e.skills.map(skillCandidate)].filter(e=>inScope(e.fullName)),a=[],{registry:o}=e;if(o!==void 0){let e=o.getConnections().filter(({connectionName:e})=>r===void 0||mayOwnNamespace(e,r)),t=await Promise.all(e.map(e=>searchConnection(o,e)));for(let e of t)`unavailable`in e?a.push(e.unavailable):i.push(...e.candidates.filter(e=>inScope(e.fullName)))}if(r!==void 0&&i.length===0&&a.length===0)throw Error(unknownNamespaceMessage(r,o?.getConnections()??[]));let s=clampInteger(t.limit,1,50,10),c=rankCandidates(n,i),l=c.slice(0,s).map(e=>e.result()),u={results:l,remaining:c.length-l.length,searched:i.length};return a.length>0?{...u,unavailable:a}:u}function parseNamespace(e){let t=(e.trim().split(/\s+/u)[0]??``).replace(/^[^A-Za-z0-9_-]+/u,``),n=t.slice(0,Math.max(0,t.lastIndexOf(`__`))).replace(/_+$/u,``);return n===``?void 0:n}function inNamespace(e,t){return e===t||e.startsWith(`${t}__`)}function mayOwnNamespace(e,t){return inNamespace(e,t)||t.startsWith(`${e}__`)}function unknownNamespaceMessage(e,t){if(t.some(({connectionName:t})=>t===e))return`Connection "${e}" has no tools.`;let n=closestNames(e,t.map(({connectionName:e,description:t})=>({description:t,name:e})));return`No entries are named "${e}__…". ${n.length>0?`Closest connections: ${n.join(`, `)}.`:`Find names in the catalog listing or your tool list, or call ${SEARCH_TOOL_NAME} with plain words.`}`}async function searchConnection(e,t){let n=t.connectionName,r;try{r=await listConnectionTools(t,await completeConnectionSignIn(e,t))}catch(e){return{unavailable:{connection:n,error:listingFailureMessage(n,e)}}}return`failure`in r?{unavailable:{connection:n,error:r.failure}}:`authorization`in r?{candidates:[signInCandidate(e,t)]}:{candidates:r.tools.map(e=>toolCandidate(t,e))}}function entryCandidate(e,t){let n=serializeInputSchema(e.inputSchema),r=t(e);return{description:r,inputSchema:n,name:e.name,result:()=>({description:r,signature:entrySignature(e,n),tool:e.name}),fullName:e.name}}function skillCandidate({description:e,name:t,path:n}){return{description:e,fullName:t,name:t,result:()=>({description:e,path:n,skill:t})}}function toolCandidate(e,t){let n=connectionToolName(e.connectionName,t.name);return{connection:{description:e.description,name:e.connectionName},description:t.description,inputSchema:t.inputSchema,name:t.name,result:()=>({description:t.description,signature:connectionToolSignature(e,t),tool:n}),fullName:n}}function signInCandidate(e,t){let n=connectionSignInEntry(e,t);return{description:t.description,name:t.connectionName,result:()=>({description:n.description,signature:entrySignature(n),tool:n.name}),fullName:n.name}}function clampInteger(e,t,n,r){return typeof e!=`number`||!Number.isFinite(e)?r:Math.min(n,Math.max(t,Math.trunc(e)))}export{createSearchTool};

package/dist/src/execution/catalog/skills.js

@@ -1 +1 @@
-import{closestNames}from"./rank.js";import{DynamicSkillManifestKey}from"#context/keys.js";import{skillTarget}from"#shared/action-request-name.js";import{SEARCH_TOOL_NAME,SKILL_ENTRY_NAME}from"#protocol/catalog-tools.js";import{toInputSchema}from"#tools/schema.js";import{stripSkillFrontmatter}from"#shared/skill-package.js";import{BundleKey}from"#runtime/sessions/runtime-context-keys.js";import{skillFilePath}from"#execution/skills/instructions.js";function sessionSkills(e){let t=new Map;for(let n of e?.get(BundleKey)?.resolvedAgent.skills??[])t.set(n.name,{deferred:n.deferred===!0,description:n.description,markdown:n.markdown,name:n.name,path:skillFilePath(n.name)});for(let n of Object.values(e?.get(DynamicSkillManifestKey)??{}).flat())t.set(n.name,{deferred:n.deferred===!0,description:n.description,markdown:stripSkillFrontmatter(n.markdown),name:n.name,path:n.revision===void 0?void 0:skillFilePath(n.name)});return t}const SKILL_LOAD_LABEL={start:e=>`Load skill${skillName(e)}`,complete:e=>`Loaded skill${skillName(e)}`};function skillName(e){let t=skillTarget(e);return t===void 0?``:` ${t}`}function createSkillLoader(e){return{description:`Loads a skill's instructions.`,execute:t=>{let n=e.get(t.name);if(n===void 0)throw Error(`No skill named "${t.name}".`);return n.markdown},frameworkTool:!0,inputSchema:SKILL_INPUT_SCHEMA,label:SKILL_LOAD_LABEL,name:SKILL_ENTRY_NAME}}function unknownSkillMessage(e,t,n,r){let i=closestNames(e,[...t.values()]),a=i.length>0?` Closest skills: ${i.join(`, `)}.`:r?` Find skills with ${SEARCH_TOOL_NAME}.`:``,o=n.find(t=>t.toLowerCase()===e.toLowerCase());return`No skill named "${e}".${a}${o===void 0?``:` "${o}" is a connection, not a skill. Find its tools with ${SEARCH_TOOL_NAME}({ query: "${o}__" }).`}`}const SKILL_INPUT_SCHEMA=toInputSchema({type:`object`,properties:{name:{type:`string`}},required:[`name`],additionalProperties:!1});export{createSkillLoader,sessionSkills,unknownSkillMessage};
+import{closestNames}from"./rank.js";import{toInputSchema}from"#tools/schema.js";import{stripSkillFrontmatter}from"#shared/skill-package.js";import{BundleKey}from"#runtime/sessions/runtime-context-keys.js";import{SEARCH_TOOL_NAME,SKILL_ENTRY_NAME}from"#protocol/catalog-tools.js";import{skillFilePath}from"#execution/skills/instructions.js";import{skillTarget}from"#shared/action-request-name.js";import{dynamicSkillManifest}from"#reactions/kinds/skill.js";function sessionSkills(e){let t=new Map;for(let n of e?.get(BundleKey)?.resolvedAgent.skills??[])t.set(n.name,{deferred:n.deferred===!0,description:n.description,markdown:n.content,name:n.name,path:skillFilePath(n.name)});for(let n of Object.values(dynamicSkillManifest(e)).flat())t.set(n.name,{deferred:n.deferred===!0,description:n.description,markdown:stripSkillFrontmatter(n.markdown),name:n.name,path:n.revision===void 0?void 0:skillFilePath(n.name)});return t}const SKILL_LOAD_LABEL={start:e=>`Load skill${skillName(e)}`,complete:e=>`Loaded skill${skillName(e)}`};function skillName(e){let t=skillTarget(e);return t===void 0?``:` ${t}`}function createSkillLoader(e){return{description:`Loads a skill's instructions.`,execute:t=>{let n=e.get(t.name);if(n===void 0)throw Error(`No skill named "${t.name}".`);return n.markdown},frameworkTool:!0,inputSchema:SKILL_INPUT_SCHEMA,label:SKILL_LOAD_LABEL,name:SKILL_ENTRY_NAME}}function unknownSkillMessage(e,t,n,r){let i=closestNames(e,[...t.values()]),a=i.length>0?` Closest skills: ${i.join(`, `)}.`:r?` Find skills with ${SEARCH_TOOL_NAME}.`:``,o=n.find(t=>t.toLowerCase()===e.toLowerCase());return`No skill named "${e}".${a}${o===void 0?``:` "${o}" is a connection, not a skill. Find its tools with ${SEARCH_TOOL_NAME}({ query: "${o}__" }).`}`}const SKILL_INPUT_SCHEMA=toInputSchema({type:`object`,properties:{name:{type:`string`}},required:[`name`],additionalProperties:!1});export{createSkillLoader,sessionSkills,unknownSkillMessage};

package/dist/src/execution/catalog/step-catalog.js

@@ -1 +1 @@
-import{closestNames}from"./rank.js";import{entrySignature}from"./signatures.js";import{connectionEntry,connectionSignInEntry}from"./connection-entry.js";import{createSearchTool}from"./search.js";import{createSkillLoader,sessionSkills,unknownSkillMessage}from"./skills.js";import{isObject}from"#shared/guards.js";import{OfferedCatalogToolsKey}from"#context/keys.js";import{CALL_TOOL_NAME,SEARCH_TOOL_NAME,SKILL_ENTRY_NAME,SKILL_TOOL_NAME}from"#protocol/catalog-tools.js";import{refineJsonSchema}from"#tools/schema.js";import{connectionToolName}from"#connections/ownership.js";import{eveNamespaceReservation}from"#protocol/runtime-tools.js";import{buildDynamicTools}from"#context/build-dynamic-tools.js";import{ConnectionRegistryKey}from"#context/providers/connection-key.js";import{BundleKey}from"#runtime/sessions/runtime-context-keys.js";import{startsTasks}from"#execution/tasks/tool-entry-point.js";import{buildDynamicSubagentTools}from"#context/dynamic-subagent-lifecycle.js";import{withTaskTools}from"#execution/tasks/model-step.js";import{runEntryCall}from"#harness/execute-call.js";import{checkToolCallInput}from"#harness/tool-call-io.js";const CALL_TOOL_DESCRIPTION=`Call a tool that isn't in your tool list by its exact name from ${SEARCH_TOOL_NAME}, with \`input\` matching its signature.`,SEARCHABLE_SKILL_DESCRIPTION=`Load a skill's instructions when the request clearly matches a listed skill or one ${SEARCH_TOOL_NAME} found, or the user asks for it, then follow them.`;function catalogToolsFor(e){let{offered:t}=e,n=[...e.skills.values()],r=t?.connections===!0||e.connections.length>0,i=t?.searchableSkills===!0||n.some(e=>e.deferred),a=t?.tools===!0||r||e.deferred.size>0;return{connections:r,search:a||i,searchableSkills:i,skills:t?.skills===!0||n.length>0,tools:a}}function buildStepCatalog(e){let visible=t=>isVisible(t,e.session),t=((e.ctx?.get(BundleKey))?.subagentRegistry.dynamicResolvers.length??0)>0||[...e.agentTools.values()].some(e=>visible(e)&&startsTasks(e)),n=stepEntries(e,visible),r=t?withTaskTools(n):n,i=new Map,a=new Map;for(let[e,t]of r)(t.deferred===!0?a:i).set(e,t);let o=e.ctx?.get(ConnectionRegistryKey),s=o?.getConnections()??[],c=sessionSkills(e.ctx),l=catalogToolsFor({connections:s,deferred:a,offered:e.ctx?.get(OfferedCatalogToolsKey),skills:c}),{search:u,...d}=l,f=createSkillLoader(c),p=new Map(i),toolEntry=e=>r.get(e)??p.get(e)??(o===void 0?void 0:connectionEntryNamed(e,o,s)),describe=t=>describeEntry(t,e.endsTurn),m={advertised:p,connections:s,deferred:a,describe,entries:r,get:e=>e===SKILL_ENTRY_NAME?f:toolEntry(e),offered:d,offersTasks:t,resolve:e=>{if(e.toolName===CALL_TOOL_NAME&&l.tools){let t=targetName(e.input),n=t===void 0?void 0:toolEntry(t);return t===void 0||n===void 0||!callableByName(n)?void 0:{call:asEntryCall(e,t),definition:n}}if(e.toolName===SKILL_TOOL_NAME&&l.skills){let t=targetName(e.input);return t===void 0||!c.has(t)?void 0:{call:{...e,input:{name:t},toolName:SKILL_ENTRY_NAME},definition:f}}let t=p.get(e.toolName);return t===void 0?void 0:{call:e,definition:t}},skills:c};if(l.search){let e=createSearchTool({deferred:[...a.values()],describe,reach:{connections:l.connections,skills:l.searchableSkills,tools:l.tools},registry:o,skills:[...c.values()].filter(e=>e.deferred)});p.set(e.name,e)}return l.tools&&p.set(CALL_TOOL_NAME,createCallTool(m,toolEntry,l)),l.skills&&p.set(SKILL_TOOL_NAME,createSkillTool(m,toolEntry,l)),m}function recordOfferedCatalogTools(e,{offered:t}){Object.values(t).includes(!0)&&e?.set(OfferedCatalogToolsKey,t)}function targetName(e){return isObject(e)&&typeof e.name==`string`?e.name:void 0}function asEntryCall(e,t){let n=e.input.input;return{...e,input:n??{},toolName:t}}function describeEntry(e,t){return t&&e.endsTurn===!0?`${e.description}\n\nCalling this tool ends your turn once it succeeds: do not write a reply or call other tools in the same step. If it fails, you will see the error and can continue.`.trimStart():e.description}function stepEntries(e,t){let n=new Map([...e.agentTools].filter(([,e])=>t(e)));if(e.ctx===void 0)return n;for(let r of buildDynamicSubagentTools(e.ctx).filter(t))n.set(r.name,r);let r=new Set;for(let i of buildDynamicTools(e.ctx).filter(t))r.has(i.name)||(r.add(i.name),n.set(i.name,i));return n}function isVisible(e,t){return e.rootOnly!==!0&&e.availableInSubagents!==!1&&e.behavior?.availability.includes(`root-session`)!==!0||t.rootSessionId===void 0}function connectionEntryNamed(e,t,n){for(let r of n){if(e===r.connectionName)return connectionSignInEntry(t,r);let n=connectionToolName(r.connectionName,``);if(e.length>n.length&&e.startsWith(n))return connectionEntry(t,r,e.slice(n.length))}}function createCallTool(e,t,n){return{description:n.connections?`${CALL_TOOL_DESCRIPTION} Prefer connected services over web search or general knowledge when a request relates to them.`:CALL_TOOL_DESCRIPTION,execute:(t,n)=>runResolved(e,{input:t,toolName:CALL_TOOL_NAME},n),frameworkTool:!0,inputSchema:refineJsonSchema({type:`object`,properties:{name:{type:`string`,description:`The tool's exact name, as ${SEARCH_TOOL_NAME} returns it.`},input:{type:`object`,description:`Arguments matching the tool's signature. Defaults to {}.`}},required:[`name`],additionalProperties:!1},n=>resolveToolInput(e,t,n)),name:CALL_TOOL_NAME}}function createSkillTool(e,t,n){return{description:n.searchableSkills?SEARCHABLE_SKILL_DESCRIPTION:`Load a skill's instructions when the request clearly matches one of your listed skills or the user asks for it, then follow them.`,execute:(t,n)=>runResolved(e,{input:t,toolName:SKILL_TOOL_NAME},n),frameworkTool:!0,inputSchema:refineJsonSchema({type:`object`,properties:{name:{type:`string`,description:n.searchableSkills?`The skill's name, from your listed skills or ${SEARCH_TOOL_NAME}.`:`The skill's name, from your listed skills.`}},required:[`name`],additionalProperties:!1},async r=>resolveSkillInput(e,t,r.name,n)),name:SKILL_TOOL_NAME}}function runResolved(e,t,n){let r=e.resolve(t);if(r===void 0)throw Error(`A ${t.toolName} call ran without a resolved entry.`);return runEntryCall(r,n)}function callableByName(e){return e.deferred===!0||eveNamespaceReservation(e.name)===void 0&&(e.execute!==void 0||e.workflowId!==void 0)}async function resolveToolInput(e,t,{input:n,name:r}){let i=t(r);if(i===void 0)return failure(`name`,unknownEntryMessage(r,e));if(!callableByName(i))return failure(`name`,`"${r}" is in your tool list; call it directly.`);let a=await checkToolCallInput(i,n,``);if(a.kind===`threw`)throw a.error;return a.kind===`invalid`?{issues:(isConnectionTool(r,e.connections)?a.issues:[...a.issues,{message:`Signature: ${entrySignature(i)}`}]).map(({message:e,path:t=[]})=>({message:e,path:[`input`,...t]}))}:{value:{input:a.value,name:r}}}function resolveSkillInput(e,t,n,r){if(e.skills.has(n))return{value:{name:n}};let i=e.connections.map(e=>e.connectionName),a=i.includes(n)?void 0:t(n);return a===void 0?failure(`name`,unknownSkillMessage(n,e.skills,i,r.searchableSkills)):failure(`name`,a.deferred===!0?`"${n}" is a tool, not a skill; call it with ${CALL_TOOL_NAME}({ name: "${n}" }).`:`"${n}" is a tool in your tool list, not a skill; call it directly.`)}function isConnectionTool(e,t){return t.some(({connectionName:t})=>e.startsWith(connectionToolName(t,``)))}function failure(e,t){return{issues:[{message:t,path:[e]}]}}function unknownEntryMessage(e,t){if(t.skills.has(e))return`"${e}" is a skill; load it with ${SKILL_TOOL_NAME}({ name: "${e}" }).`;let n=[...t.deferred.values()].map(({description:e,name:t})=>({description:e,name:t})),r=closestNames(e,n);return`No tool named "${e}".${r.length>0?` Closest tools: ${r.join(`, `)}.`:` Find tools with ${SEARCH_TOOL_NAME}.`}`}export{buildStepCatalog,recordOfferedCatalogTools};
+import{closestNames}from"./rank.js";import{entrySignature}from"./signatures.js";import{connectionEntry,connectionSignInEntry}from"./connection-entry.js";import{createSearchTool}from"./search.js";import{createSkillLoader,sessionSkills,unknownSkillMessage}from"./skills.js";import{isObject}from"#shared/guards.js";import{OfferedCatalogToolsKey}from"#context/keys.js";import{refineJsonSchema}from"#tools/schema.js";import{connectionToolName}from"#connections/ownership.js";import{eveNamespaceReservation}from"#protocol/runtime-tools.js";import{BundleKey}from"#runtime/sessions/runtime-context-keys.js";import{ConnectionRegistryKey}from"#context/providers/connection-key.js";import{CALL_TOOL_NAME,SEARCH_TOOL_NAME,SKILL_ENTRY_NAME,SKILL_TOOL_NAME}from"#protocol/catalog-tools.js";import{buildDynamicSubagentTools}from"#reactions/kinds/subagent.js";import{startsTasks}from"#execution/tasks/tool-entry-point.js";import{dynamicConnectionVersions}from"#reactions/kinds/connection.js";import{dynamicTools}from"#reactions/kinds/tool.js";import{withTaskTools}from"#execution/tasks/model-step.js";import{runEntryCall}from"#harness/execute-call.js";import{checkToolCallInput}from"#harness/tool-call-io.js";const CALL_TOOL_DESCRIPTION=`Call a tool that isn't in your tool list by its exact name from ${SEARCH_TOOL_NAME}, with \`input\` matching its signature.`,SEARCHABLE_SKILL_DESCRIPTION=`Load a skill's instructions when the request clearly matches a listed skill or one ${SEARCH_TOOL_NAME} found, or the user asks for it, then follow them.`;function catalogToolsFor(e){let{offered:t}=e,n=[...e.skills.values()],r=t?.connections===!0||e.connections.length>0,i=t?.searchableSkills===!0||n.some(e=>e.deferred),a=t?.tools===!0||r||e.deferred.size>0;return{connections:r,search:a||i,searchableSkills:i,skills:t?.skills===!0||n.length>0,tools:a}}function buildStepCatalog(e){let visible=t=>isVisible(t,e.session),t=((e.ctx?.get(BundleKey))?.subagentRegistry.dynamicResolvers.length??0)>0||[...e.agentTools.values()].some(e=>visible(e)&&startsTasks(e)),n=stepEntries(e,visible),r=t?withTaskTools(n):n,i=new Map,a=new Map;for(let[e,t]of r)(t.deferred===!0?a:i).set(e,t);let o=e.ctx?.get(ConnectionRegistryKey),s=o?.getConnections()??[],c=dynamicConnectionVersions(e.ctx),l=sessionSkills(e.ctx),u=catalogToolsFor({connections:s,deferred:a,offered:e.ctx?.get(OfferedCatalogToolsKey),skills:l}),{search:d,...f}=u,p=createSkillLoader(l),m=new Map(i),toolEntry=e=>r.get(e)??m.get(e)??(o===void 0?void 0:connectionEntryNamed(e,o,s,c)),describe=t=>describeEntry(t,e.endsTurn),h={advertised:m,connections:s,deferred:a,describe,entries:r,get:e=>e===SKILL_ENTRY_NAME?p:toolEntry(e),offered:f,offersTasks:t,resolve:e=>{if(e.toolName===CALL_TOOL_NAME&&u.tools){let t=targetName(e.input),n=t===void 0?void 0:toolEntry(t);return t===void 0||n===void 0||!callableByName(n)?void 0:{call:asEntryCall(e,t),definition:n}}if(e.toolName===SKILL_TOOL_NAME&&u.skills){let t=targetName(e.input);return t===void 0||!l.has(t)?void 0:{call:{...e,input:{name:t},toolName:SKILL_ENTRY_NAME},definition:p}}let t=m.get(e.toolName);return t===void 0?void 0:{call:e,definition:t}},skills:l};if(u.search){let e=createSearchTool({deferred:[...a.values()],describe,reach:{connections:u.connections,skills:u.searchableSkills,tools:u.tools},registry:o,skills:[...l.values()].filter(e=>e.deferred)});m.set(e.name,e)}return u.tools&&m.set(CALL_TOOL_NAME,createCallTool(h,toolEntry,u)),u.skills&&m.set(SKILL_TOOL_NAME,createSkillTool(h,toolEntry,u)),h}function recordOfferedCatalogTools(e,{offered:t}){Object.values(t).includes(!0)&&e?.set(OfferedCatalogToolsKey,t)}function targetName(e){return isObject(e)&&typeof e.name==`string`?e.name:void 0}function asEntryCall(e,t){let n=e.input.input;return{...e,input:n??{},toolName:t}}function describeEntry(e,t){return t&&e.endsTurn===!0?`${e.description}\n\nCalling this tool ends your turn once it succeeds: do not write a reply or call other tools in the same step. If it fails, you will see the error and can continue.`.trimStart():e.description}function stepEntries(e,t){let n=new Map([...e.agentTools].filter(([,e])=>t(e)));if(e.ctx===void 0)return n;for(let r of buildDynamicSubagentTools(e.ctx).filter(t))n.set(r.name,r);for(let r of dynamicTools(e.ctx).filter(t))n.set(r.name,r);return n}function isVisible(e,t){return e.rootOnly!==!0&&e.availableInSubagents!==!1&&e.behavior?.availability.includes(`root-session`)!==!0||t.rootSessionId===void 0}function connectionEntryNamed(e,t,n,r){for(let i of n){let n=r.get(i.connectionName),versioned=e=>n===void 0?e:{...e,version:n};if(e===i.connectionName)return versioned(connectionSignInEntry(t,i));let a=connectionToolName(i.connectionName,``);if(e.length>a.length&&e.startsWith(a))return versioned(connectionEntry(t,i,e.slice(a.length)))}}function createCallTool(e,t,n){return{description:n.connections?`${CALL_TOOL_DESCRIPTION} Prefer connected services over web search or general knowledge when a request relates to them.`:CALL_TOOL_DESCRIPTION,execute:(t,n)=>runResolved(e,{input:t,toolName:CALL_TOOL_NAME},n),frameworkTool:!0,inputSchema:refineJsonSchema({type:`object`,properties:{name:{type:`string`,description:`The tool's exact name, as ${SEARCH_TOOL_NAME} returns it.`},input:{type:`object`,description:`Arguments matching the tool's signature. Defaults to {}.`}},required:[`name`],additionalProperties:!1},n=>resolveToolInput(e,t,n)),name:CALL_TOOL_NAME}}function createSkillTool(e,t,n){return{description:n.searchableSkills?SEARCHABLE_SKILL_DESCRIPTION:`Load a skill's instructions when the request clearly matches one of your listed skills or the user asks for it, then follow them.`,execute:(t,n)=>runResolved(e,{input:t,toolName:SKILL_TOOL_NAME},n),frameworkTool:!0,inputSchema:refineJsonSchema({type:`object`,properties:{name:{type:`string`,description:n.searchableSkills?`The skill's name, from your listed skills or ${SEARCH_TOOL_NAME}.`:`The skill's name, from your listed skills.`}},required:[`name`],additionalProperties:!1},async r=>resolveSkillInput(e,t,r.name,n)),name:SKILL_TOOL_NAME}}function runResolved(e,t,n){let r=e.resolve(t);if(r===void 0)throw Error(`A ${t.toolName} call ran without a resolved entry.`);return runEntryCall(r,n)}function callableByName(e){return e.deferred===!0||eveNamespaceReservation(e.name)===void 0&&(e.execute!==void 0||e.workflowId!==void 0)}async function resolveToolInput(e,t,{input:n,name:r}){let i=t(r);if(i===void 0)return failure(`name`,unknownEntryMessage(r,e));if(!callableByName(i))return failure(`name`,`"${r}" is in your tool list; call it directly.`);let a=await checkToolCallInput(i,n,``);if(a.kind===`threw`)throw a.error;return a.kind===`invalid`?{issues:(isConnectionTool(r,e.connections)?a.issues:[...a.issues,{message:`Signature: ${entrySignature(i)}`}]).map(({message:e,path:t=[]})=>({message:e,path:[`input`,...t]}))}:{value:{input:a.value,name:r}}}function resolveSkillInput(e,t,n,r){if(e.skills.has(n))return{value:{name:n}};let i=e.connections.map(e=>e.connectionName),a=i.includes(n)?void 0:t(n);return a===void 0?failure(`name`,unknownSkillMessage(n,e.skills,i,r.searchableSkills)):failure(`name`,a.deferred===!0?`"${n}" is a tool, not a skill; call it with ${CALL_TOOL_NAME}({ name: "${n}" }).`:`"${n}" is a tool in your tool list, not a skill; call it directly.`)}function isConnectionTool(e,t){return t.some(({connectionName:t})=>e.startsWith(connectionToolName(t,``)))}function failure(e,t){return{issues:[{message:t,path:[e]}]}}function unknownEntryMessage(e,t){if(t.skills.has(e))return`"${e}" is a skill; load it with ${SKILL_TOOL_NAME}({ name: "${e}" }).`;let n=[...t.deferred.values()].map(({description:e,name:t})=>({description:e,name:t})),r=closestNames(e,n);return`No tool named "${e}".${r.length>0?` Closest tools: ${r.join(`, `)}.`:` Find tools with ${SEARCH_TOOL_NAME}.`}`}export{buildStepCatalog,recordOfferedCatalogTools};

package/dist/src/execution/child-binding.d.ts

@@ -0,0 +1,19 @@
+import type { JsonValue } from "#shared/json.js";
+/** What the parent's proxy route needs to reach one remote child's stream. */
+export interface RemoteChildBinding {
+    readonly callId: string;
+    readonly childSessionId: string;
+    readonly name: string;
+    /** The proxy route the parent's `child.opened` names. */
+    readonly streamPath: string;
+    readonly url: string;
+    readonly resolverId?: string;
+    /** A dynamic remote agent's binding, which the child's credentials are built from again. */
+    readonly dynamicBinding?: JsonValue;
+    /** The child's remote agent protocol, when it speaks an earlier one: the proxy can't follow it. */
+    readonly earlierProtocol?: number;
+}
+/** Records a remote child's binding on the parent session's stream, before its `child.opened`. */
+export declare function recordRemoteChildBinding(parentSessionId: string, binding: RemoteChildBinding): Promise<void>;
+/** Reads a remote child's binding from its parent session, or `undefined` when none was recorded. */
+export declare function readRemoteChildBinding(parentSessionId: string, childSessionId: string): Promise<RemoteChildBinding | undefined>;

package/dist/src/execution/child-binding.js

@@ -0,0 +1 @@
+import{isObject}from"#shared/guards.js";import{getRun}from"#internal/workflow/runtime.js";function namespaceOf(e){return`eve.child.${e}`}async function recordRemoteChildBinding(e,t){let n=getRun(e).getWritable({namespace:namespaceOf(t.childSessionId)}).getWriter();try{await n.write(t)}finally{n.releaseLock()}}async function readRemoteChildBinding(e,t){let n=getRun(e).getReadable({namespace:namespaceOf(t)});try{if(await n.getTailIndex()<0)return;let e=n.getReader(),r=await e.read();return e.releaseLock(),r.done?void 0:parseBinding(r.value,t)}finally{await n.cancel().catch(()=>{})}}function parseBinding(e,t){if(!isObject(e))return;let{callId:n,dynamicBinding:r,earlierProtocol:i,name:a,resolverId:o,streamPath:s,url:c}=e;if(typeof n!=`string`||typeof a!=`string`||typeof s!=`string`||typeof c!=`string`)return;let l={callId:n,childSessionId:t,name:a,streamPath:s,url:c};return typeof o==`string`&&(l.resolverId=o),r!==void 0&&(l.dynamicBinding=r),typeof i==`number`&&(l.earlierProtocol=i),l}export{readRemoteChildBinding,recordRemoteChildBinding};

package/dist/src/execution/close-session-stream-step.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Closes a session's durable stream when its run ends without the terminal publication closing
+ * it: a session a turn ended, or a run that lost its continuation claim. Readers then reach the
+ * stream's end, and the route tells them with `stream.ended`. Never throws: a stream already
+ * closed stays closed.
+ */
+export declare function closeSessionStreamStep(input: {
+    readonly sessionWritable: WritableStream<Uint8Array>;
+}): Promise<void>;

package/dist/src/execution/close-session-stream-step.js

@@ -0,0 +1 @@
+async function closeSessionStreamStep(e){"use step";try{let t=e.sessionWritable.getWriter();try{await t.close()}finally{t.releaseLock()}}catch{}}export{closeSessionStreamStep};

package/dist/src/execution/coordination-dispatch-shared.d.ts

@@ -5,7 +5,8 @@ import { type LocalDevRequestProvenance } from "#context/keys.js";
 import { ContextContainer } from "#context/container.js";
 import { type CompiledBundle } from "#runtime/sessions/runtime-context-keys.js";
 import type { HarnessSessionBase } from "#harness/types.js";
-import type { TaskStartedStreamEvent } from "#protocol/message.js";
+import type { TaskCallStart } from "#harness/session-machine/transitions.js";
+import type { FactOf } from "#protocol/session-events/facts.js";
 import type { RuntimeActionResult, RuntimeWorkflowTaskRequest } from "#shared/action-types.js";
 import type { SessionParent, SessionTraceRoot } from "#channel/types.js";
 import { type DurableSessionState, readDurableSession } from "#execution/durable-session-store.js";
@@ -24,8 +25,17 @@ export interface CoordinationDispatchResult {
     readonly results: readonly RuntimeActionResult[];
     readonly serializedContext: Record<string, unknown>;
     readonly sessionState: DurableSessionState;
-    /** The tasks the dispatch started or sent to, for the step that publishes `task.started`. */
-    readonly started: readonly TaskStartedStreamEvent["data"][];
+    /** What the dispatch leaves for the step that publishes it; the dispatch itself publishes nothing. */
+    readonly pending: PendingDispatchFacts;
+}
+/** The calls a dispatch started or refused, recorded on the session but not yet published. */
+export interface PendingDispatchFacts {
+    /** Calls the turn waits on, each running from now in a run of its own. */
+    readonly executing: readonly FactOf<"call.started">[];
+    /** Tasks the dispatch started or sent a call to. */
+    readonly started: readonly TaskCallStart[];
+    /** Calls a dispatch admission refused before any run started. */
+    readonly refused: readonly FactOf<"call.settled">[];
 }
 /** Everything preflight produces before either step's dispatch loop runs. */
 export interface PreparedCoordinationDispatch<PlanEntry = RuntimeWorkflowTaskRequest> {

package/dist/src/execution/coordination-dispatch-shared.js

@@ -1 +1 @@
-import{ConversationContextKey}from"#shared/conversation-context.js";import"#channel/adapter.js";import"#context/container.js";import{AuthKey,CapabilitiesKey,ChannelInstrumentationKey,InitiatorAuthKey,LocalDevRequestKey,ParentSessionKey,TraceRootKey}from"#context/keys.js";import{BundleKey,ChannelKey}from"#runtime/sessions/runtime-context-keys.js";import{activeTurnId,runtimeWait,storedProjection,turnPosition}from"#harness/session-machine/view.js";import"#subagents/tool.js";import{readDurableSession}from"#execution/durable-session-store.js";import{deserializeContext}from"#context/serialize.js";import{readDynamicSubagentSelections}from"#context/dynamic-subagent-lifecycle.js";import{buildAdapterContext}from"#channel/adapter-context.js";import{assertUniqueCoordinationCallIds}from"#harness/coordination.js";import{resolveTraceRootSessionId}from"#shared/trace-root.js";import{hydrateDurableSession}from"#execution/session.js";import{resolveEffectiveAgentRuntime}from"#execution/effective-agent-config.js";import{resolveWorkflowAgentMetadata}from"#execution/agent-sessions/metadata.js";async function prepareCoordinationDispatch(e){let t=readDurableSession(e.sessionState),n=runtimeWait(t.state);if(n===void 0)return;let r=n.tasks;if(r.length===0)return;let i=n.event.turnId||activeTurnId(turnPosition(storedProjection(t.state))),a=await deserializeContext(e.serializedContext);return{...await prepareActionDispatch({batch:{event:{...n.event,turnId:i},requests:r},ctx:a,durableSession:t,plan:()=>r,serializedContext:e.serializedContext}),sessionState:e.sessionState}}async function prepareActionDispatch(e){let{batch:t,durableSession:n}=e;assertUniqueCoordinationCallIds(t.requests);let r=e.ctx,i=r.require(BundleKey),a=resolveEffectiveAgentRuntime(i,r),o=hydrateDurableSession({compactionOverrides:{thresholdPercent:a.thresholdPercent},durable:n,turnAgent:a.turnAgent}),s=r.require(ChannelKey),c=e.plan({bundle:i,ctx:r,requests:t.requests,session:o}),l=resolveActiveSandboxSessionId(s.state,o.sessionId),u=o.sandboxState??resolveOwnerSandboxState(s.state);return{adapter:s,adapterCtx:buildAdapterContext(s,r),auth:r.get(AuthKey)??null,batch:t,bundle:i,capabilities:r.get(CapabilitiesKey),channelMetadata:r.get(ChannelInstrumentationKey),dynamicSubagentSelections:readDynamicSubagentSelections(r),inheritedConversation:r.get(ConversationContextKey),initiatorAuth:r.get(InitiatorAuthKey)??null,localDevRequest:r.get(LocalDevRequestKey),parentSession:r.get(ParentSessionKey),plan:c,sandboxSessionId:l,sandboxState:u,serializedContext:e.serializedContext,session:o,traceRoot:childTraceRoot(r,o.sessionId),workflowAgents:resolveWorkflowAgentMetadata(r)}}function childTraceRoot(e,t){if(e.get(TraceRootKey)!==void 0)return{kind:`inherited`,sessionId:resolveTraceRootSessionId(e,t)}}function resolveOwnerSandboxState(e){if(typeof e==`object`&&e)return e.parentSandboxState}function resolveActiveSandboxSessionId(e,t){if(typeof e!=`object`||!e)return t;let n=e.sandboxSessionId;return typeof n==`string`&&n.length>0?n:t}export{prepareActionDispatch,prepareCoordinationDispatch};
+import{ConversationContextKey}from"#shared/conversation-context.js";import"#channel/adapter.js";import"#context/container.js";import{AuthKey,CapabilitiesKey,ChannelInstrumentationKey,InitiatorAuthKey,LocalDevRequestKey,ParentSessionKey,TraceRootKey}from"#context/keys.js";import{BundleKey,ChannelKey}from"#runtime/sessions/runtime-context-keys.js";import{activeTurnId,runtimeWait,storedProjection,turnPosition}from"#harness/session-machine/view.js";import{enterSessionProjection}from"#harness/session-machine/current.js";import{readDynamicSubagentSelections}from"#reactions/kinds/subagent.js";import"#subagents/tool.js";import{deserializeContext}from"#context/serialize.js";import{readDurableSession}from"#execution/durable-session-store.js";import{buildAdapterContext}from"#channel/adapter-context.js";import{assertUniqueCoordinationCallIds}from"#harness/coordination.js";import{resolveTraceRootSessionId}from"#shared/trace-root.js";import{hydrateDurableSession}from"#execution/session.js";import{resolveEffectiveAgentRuntime}from"#execution/effective-agent-config.js";import{resolveWorkflowAgentMetadata}from"#execution/agent-sessions/metadata.js";async function prepareCoordinationDispatch(e){let t=readDurableSession(e.sessionState),n=runtimeWait(t.state);if(n===void 0)return;let r=n.tasks;if(r.length===0)return;let i=n.event.turnId||activeTurnId(turnPosition(storedProjection(t.state))),a=await deserializeContext(e.serializedContext);return{...await prepareActionDispatch({batch:{event:{...n.event,turnId:i},requests:r},ctx:a,durableSession:t,plan:()=>r,serializedContext:e.serializedContext}),sessionState:e.sessionState}}async function prepareActionDispatch(e){let{batch:t,durableSession:n}=e;assertUniqueCoordinationCallIds(t.requests);let r=e.ctx;enterSessionProjection(r,n.state);let i=r.require(BundleKey),a=resolveEffectiveAgentRuntime(i,r),o=hydrateDurableSession({compactionOverrides:{thresholdPercent:a.thresholdPercent},durable:n,turnAgent:a.turnAgent}),s=r.require(ChannelKey),c=e.plan({bundle:i,ctx:r,requests:t.requests,session:o}),l=resolveActiveSandboxSessionId(s.state,o.sessionId),u=o.sandboxState??resolveOwnerSandboxState(s.state);return{adapter:s,adapterCtx:buildAdapterContext(s,r),auth:r.get(AuthKey)??null,batch:t,bundle:i,capabilities:r.get(CapabilitiesKey),channelMetadata:r.get(ChannelInstrumentationKey),dynamicSubagentSelections:readDynamicSubagentSelections(r),inheritedConversation:r.get(ConversationContextKey),initiatorAuth:r.get(InitiatorAuthKey)??null,localDevRequest:r.get(LocalDevRequestKey),parentSession:r.get(ParentSessionKey),plan:c,sandboxSessionId:l,sandboxState:u,serializedContext:e.serializedContext,session:o,traceRoot:childTraceRoot(r,o.sessionId),workflowAgents:resolveWorkflowAgentMetadata(r)}}function childTraceRoot(e,t){if(e.get(TraceRootKey)!==void 0)return{kind:`inherited`,sessionId:resolveTraceRootSessionId(e,t)}}function resolveOwnerSandboxState(e){if(typeof e==`object`&&e)return e.parentSandboxState}function resolveActiveSandboxSessionId(e,t){if(typeof e!=`object`||!e)return t;let n=e.sandboxSessionId;return typeof n==`string`&&n.length>0?n:t}export{prepareActionDispatch,prepareCoordinationDispatch};

package/dist/src/execution/coordination-dispatch-step.d.ts

@@ -1,23 +1,19 @@
-/** Starts workflow-tool runs for pending coordination, then reports the tasks it started. */
-import { type CoordinationDispatchInput, type CoordinationDispatchResult } from "#execution/coordination-dispatch-shared.js";
+/** Starts workflow-tool runs for pending coordination, then publishes the calls it started. */
+import { type CoordinationDispatchInput, type CoordinationDispatchResult, type PendingDispatchFacts } from "#execution/coordination-dispatch-shared.js";
 import { type SessionStepState } from "#execution/publish-session-events.js";
 import { type SessionStateTransition, type WithSessionStateDelta } from "#execution/session/state-delta.js";
-import type { TaskStartedStreamEvent } from "#protocol/message.js";
-type CoordinationDispatchStepInput = CoordinationDispatchInput & {
-    readonly action: "park";
-};
 /**
  * Starts the runs of the pending calls and records them on the session. A
  * retry starts its runs again, since a Workflow start has no idempotency key,
  * so this step publishes nothing and commits as soon as the runs are
- * recorded. See {@link publishTaskStartedStep}.
+ * recorded. See {@link publishDispatchedCallsStep}.
  */
-export declare function dispatchCoordinationStep(input: CoordinationDispatchStepInput): Promise<WithSessionStateDelta<CoordinationDispatchResult>>;
+export declare function dispatchCoordinationStep(input: CoordinationDispatchInput): Promise<WithSessionStateDelta<CoordinationDispatchResult>>;
 /**
- * Publishes `task.started` for the tasks {@link dispatchCoordinationStep}
- * started, before their receipts reach the turn. A retry only publishes again.
+ * Publishes, as one commit, what {@link dispatchCoordinationStep} recorded: the calls the turn
+ * waits on started, the tasks it started or reached, and the calls it refused. Run ownership is
+ * checkpointed first, so retrying the publication cannot start those runs again.
  */
-export declare function publishTaskStartedStep(input: SessionStepState & {
-    readonly started: readonly TaskStartedStreamEvent["data"][];
+export declare function publishDispatchedCallsStep(input: SessionStepState & {
+    readonly pending: PendingDispatchFacts;
 }): Promise<SessionStateTransition>;
-export {};

package/dist/src/execution/coordination-dispatch-step.js

@@ -1 +1 @@
-import{createDurableSessionState}from"#execution/durable-session-store.js";import{prepareCoordinationDispatch}from"#execution/coordination-dispatch-shared.js";import{commitSessionStep}from"#execution/publish-session-events.js";import{withSessionStateDelta}from"#execution/session/state-delta.js";import{startWorkflowTask,startWorkflowToolCallRun}from"#execution/tools/workflow/start.js";import{runEntryToStart,sendToTask,startTaskRun,startsEveryRun}from"#execution/tasks/start.js";import{readTaskTable}from"#execution/tasks/table.js";import{captureAgentSessionContext}from"#execution/agent-sessions/context.js";import{startTask}from"#harness/session-machine/transitions.js";async function dispatchCoordinationStep(e){"use step";return await withSessionStateDelta(e,dispatchCoordination)}async function publishTaskStartedStep(e){"use step";return await withSessionStateDelta(e,({started:e,...t})=>commitSessionStep(t,t=>e.map(e=>startTask(t,e)),{origin:`own`}))}async function dispatchCoordination(e){let t=await prepareCoordinationDispatch({serializedContext:e.serializedContext,sessionState:e.sessionState});if(t===void 0)return{results:[],serializedContext:e.serializedContext,sessionState:e.sessionState,started:[]};let{batch:n,session:r}=t,i=r,a=[],o=[],s=withPrestartedRuns(t.plan.map(i=>({agentContext:captureAgentSessionContext(t,i.callId),auth:{current:t.auth,initiator:t.initiatorAuth},batchEvent:n.event,owner:e.workflowToolRunOwner,parentSession:t.parentSession,session:r,task:i})),readTaskTable(r.state));for(let e of s){let t=await dispatchWorkflowCall({...e,session:i});i=t.session,t.result!==void 0&&a.push(t.result),t.started!==void 0&&o.push(t.started)}return{results:a,serializedContext:e.serializedContext,sessionState:i===r?t.sessionState:createDurableSessionState({session:i}),started:o}}function withPrestartedRuns(e,t){let n=e.map(e=>e.task),r=n.map(e=>runEntryToStart(t,e));return r.filter(e=>e!==void 0).length>1&&startsEveryRun(t,n)?e.map((e,t)=>{let n=r[t];if(n===void 0)return e;let i=startWorkflowToolCallRun(e,n);return i.catch(()=>{}),{...e,prestarted:{entry:n,run:i}}}):e}async function dispatchWorkflowCall(e){let{entry:t}=e.task;switch(t.entryPoint){case`execute`:return await startWorkflowTask(e);case`task`:case`serve`:return await startTaskRun({...e,entry:t});case`receive`:return await sendToTask({...e,taskId:t.taskId})}}export{dispatchCoordinationStep,publishTaskStartedStep};
+import{copyView,foldLine}from"#protocol/session-projection/fold.js";import{storedProjection}from"#harness/session-machine/view.js";import{createDurableSessionState}from"#execution/durable-session-store.js";import{prepareCoordinationDispatch}from"#execution/coordination-dispatch-shared.js";import{commitSessionStep}from"#execution/publish-session-events.js";import"#execution/session/state-delta.js";import{withSessionStateDelta}from"#execution/session/step-state-delta.js";import{startWorkflowTask,startWorkflowToolCallRun}from"#execution/tools/workflow/start.js";import{runEntryToStart,sendToTask,startTaskRun,startsEveryRun}from"#execution/tasks/start.js";import{readTaskTable}from"#execution/tasks/table.js";import{captureAgentSessionContext}from"#execution/agent-sessions/context.js";import{sessionView}from"#harness/session-machine/commit.js";import{startTask}from"#harness/session-machine/transitions.js";import{callSettledFrom,callStarted}from"#harness/call-facts.js";async function dispatchCoordinationStep(e){"use step";return await withSessionStateDelta(e,dispatchCoordination)}async function publishDispatchedCallsStep(e){"use step";return await withSessionStateDelta(e,({pending:e,...t})=>commitSessionStep(t,t=>{let n=new Set(Object.keys(t.projection.view.tasks));return[{events:[...e.executing,...e.started.flatMap(e=>startTask(t,e,n).events),...e.refused],turn:t.turn}]},{origin:`own`}))}async function dispatchCoordination(e){let t=await prepareCoordinationDispatch({serializedContext:e.serializedContext,sessionState:e.sessionState});if(t===void 0)return{results:[],serializedContext:e.serializedContext,sessionState:e.sessionState,pending:{executing:[],refused:[],started:[]}};let{batch:n,session:r}=t,i=r,a=[],o=[],s=[],c=[],l=copyView(storedProjection(r.state).view),u=withPrestartedRuns(t.plan.map(i=>({agentContext:captureAgentSessionContext(t,i.callId),auth:{current:t.auth,initiator:t.initiatorAuth},batchEvent:n.event,owner:e.workflowToolRunOwner,parentSession:t.parentSession,session:r,task:i})),readTaskTable(r.state),l);for(let e of u){let{task:t}=e,n=await dispatchWorkflowCall({...e,session:i},l);if(i=n.session,n.result===void 0?t.entry.entryPoint===`execute`&&c.push(callStarted(t.callId,{clearedBy:t.clearedBy})):a.push(n.result),n.started!==void 0){o.push(n.started);let e=sessionView({...storedProjection(i.state),view:l},i.state);foldLine(l,{at:new Date().toISOString(),facts:startTask(e,n.started).events},l.position)}n.refusal!==void 0&&n.result!==void 0&&s.push(callSettledFrom(n.result,{rejected:!0,cause:{policy:n.refusal}}))}return{results:a,serializedContext:e.serializedContext,sessionState:i===r?t.sessionState:createDurableSessionState({session:i}),pending:{executing:c,refused:s,started:o}}}function withPrestartedRuns(e,t,n){let r=e.map(e=>e.task),i=r.map(e=>runEntryToStart(t,n,e));return i.filter(e=>e!==void 0).length>1&&startsEveryRun(t,n,r)?e.map((e,t)=>{let n=i[t];if(n===void 0)return e;let r=startWorkflowToolCallRun(e,n);return r.catch(()=>{}),{...e,prestarted:{entry:n,run:r}}}):e}async function dispatchWorkflowCall(e,t){let{entry:n}=e.task;switch(n.entryPoint){case`execute`:return await startWorkflowTask(e);case`task`:case`serve`:return await startTaskRun({...e,entry:n},t);case`receive`:return await sendToTask({...e,taskId:n.taskId},t)}}export{dispatchCoordinationStep,publishDispatchedCallsStep};

package/dist/src/execution/deliver-payloads.js

@@ -1 +1 @@
-import{coalesceTurnInputs}from"#harness/messages.js";const COALESCED_DELIVER_FIELDS=[`context`,`history`,`inputResponses`,`message`,`outputSchema`];function coalesceDeliverPayloads(e){if(e.length===0)return{};if(e.length===1)return e[0]??{};let t={},n={};for(let r of e){for(let[e,n]of Object.entries(r))n!==void 0&&(t[e]=n);n=coalesceTurnInputs(n,r)}for(let e of COALESCED_DELIVER_FIELDS)delete t[e];return Object.assign(t,n)}export{coalesceDeliverPayloads};
+import{coalesceTurnInputs}from"#harness/messages.js";const COALESCED_DELIVER_FIELDS=[`context`,`history`,`answers`,`message`,`outputSchema`];function coalesceDeliverPayloads(e){if(e.length===0)return{};if(e.length===1)return e[0]??{};let t={},n={};for(let r of e){for(let[e,n]of Object.entries(r))n!==void 0&&(t[e]=n);n=coalesceTurnInputs(n,r)}for(let e of COALESCED_DELIVER_FIELDS)delete t[e];return Object.assign(t,n)}export{coalesceDeliverPayloads};