eve 0.83.2 → 0.84.0

package/dist/src/shared/session.d.ts

@@ -0,0 +1,22 @@
+import type { SessionStreamEvent } from "#protocol/session-event.js";
+import type { StreamReconnectPolicy } from "#client/types.js";
+/** Options common to session readers on the client and server. */
+export interface SessionStreamOptions {
+    /**
+     * Zero-based durable line position, matching `event.meta.position.line`,
+     * not an event count. One line may contain several events. Negative values
+     * count back from the tail (`-1` starts at the latest line). Defaults to `0`.
+     */
+    readonly startIndex?: number;
+    /** Follow new lines (default), or stop at the durable tail observed on open. */
+    readonly follow?: boolean;
+    /** Stops the read and releases its stream reader. */
+    readonly signal?: AbortSignal;
+    /** Client-only reconnection policy; server-side readers do not reconnect. */
+    readonly streamReconnectPolicy?: StreamReconnectPolicy;
+}
+/** A read-only session handle. Attaching it performs no I/O and grants no command authority. */
+export interface SessionReader {
+    readonly id: string;
+    stream(options?: SessionStreamOptions): AsyncIterable<SessionStreamEvent>;
+}

package/dist/src/shared/session.js

@@ -0,0 +1 @@
+export{};

package/dist/src/shared/skill-definition.d.ts

@@ -16,7 +16,7 @@ export interface SkillPackageDefinition {
     readonly deferred?: boolean;
     readonly description: string;
     readonly license?: string;
-    readonly markdown: string;
+    readonly content: string;
     readonly metadata?: Record<string, string>;
     readonly files?: Readonly<Record<string, SkillFileContent>>;
 }

package/dist/src/shared/skill-package.d.ts

@@ -10,11 +10,11 @@ export interface MaterializableSkillPackage {
     readonly description: string;
     readonly files: readonly NormalizedSkillPackageFile[];
     readonly license?: string;
-    readonly markdown: string;
+    readonly content: string;
     readonly metadata?: Readonly<Record<string, string>>;
     readonly name: string;
 }
-export declare function stripSkillFrontmatter(markdown: string): string;
+export declare function stripSkillFrontmatter(content: string): string;
 /** Content hash over every package file, including `SKILL.md`. */
 export declare function skillPackageRevision(skill: MaterializableSkillPackage): string;
 /**

package/dist/src/shared/skill-package.js

@@ -1 +1 @@
-import{createHash}from"node:crypto";import{mkdir,writeFile}from"node:fs/promises";import{dirname,join}from"node:path";import{resolveSandboxSkillRoot,resolveSandboxSkillWritePath}from"#shared/skill-paths.js";import{Buffer}from"node:buffer";function stripSkillFrontmatter(e){return e.replace(/^---\r?\n[\s\S]*?\r?\n---\r?\n?/,``)}function skillPackageRevision(e){let t=createHash(`sha256`);for(let n of e.files)t.update(`${n.relativePath}\0${n.content.byteLength}\0`).update(n.content);return t.digest(`hex`)}function normalizeSkillPackage(e){assertSafeSkillPackageName(e.name);let t=[{content:Buffer.from(e.markdown,`utf8`),relativePath:`SKILL.md`}];for(let[n,r]of Object.entries(e.files??{}))assertSafeSkillPackageFilePath(n),t.push({content:contentToBuffer(r),relativePath:n});return t.sort((e,t)=>comparePaths(e.relativePath,t.relativePath)),{deferred:e.deferred,description:e.description,files:t,license:e.license,markdown:e.markdown,metadata:e.metadata===void 0?void 0:{...e.metadata},name:e.name}}async function writeSkillPackageDirectory(e){for(let t of e.skill.files){let n=join(e.rootPath,`skills`,e.skill.name,t.relativePath);await mkdir(dirname(n),{recursive:!0}),await writeFile(n,t.content)}}async function writeSkillPackageToSandbox(e){let t=await Promise.all(e.skill.files.map(async t=>({content:t.content,path:await resolveSandboxSkillWritePath({name:e.skill.name,relativePath:t.relativePath,sandbox:e.sandbox})})));await e.sandbox.writeFiles({files:t})}async function removeSkillPackageFromSandbox(e){assertSafeSkillPackageName(e.name);let t=await resolveSandboxSkillRoot({sandbox:e.sandbox});await e.sandbox.removePath({force:!0,path:`${t}/${e.name}`,recursive:!0})}function assertSafeSkillPackageName(e){if(e.length===0||e.startsWith(`.`)||e.includes(`/`)||e.includes(`\\`)||e.includes(`..`)||!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(e)||/^[A-Za-z]:/.test(e))throw Error(`Expected skill name to be a non-empty shell-safe path segment starting with an alphanumeric character and containing only alphanumerics, ".", "_", or "-".`)}function assertSafeSkillPackageFilePath(e){if(e===`SKILL.md`)throw Error(`Skill package files must not include "SKILL.md"; eve generates it.`);if(e.length===0||e.startsWith(`/`)||e.includes(`\\`)||/^[A-Za-z]:/.test(e)||e.split(`/`).some(e=>e.length===0||e===`.`||e===`..`))throw Error(`Expected skill package file paths to be relative POSIX paths.`)}function contentToBuffer(e){return typeof e==`string`?Buffer.from(e,`utf8`):Buffer.from(e)}function comparePaths(e,t){return e<t?-1:+(e>t)}export{normalizeSkillPackage,removeSkillPackageFromSandbox,skillPackageRevision,stripSkillFrontmatter,writeSkillPackageDirectory,writeSkillPackageToSandbox};
+import{createHash}from"node:crypto";import{mkdir,writeFile}from"node:fs/promises";import{dirname,join}from"node:path";import{resolveSandboxSkillRoot,resolveSandboxSkillWritePath}from"#shared/skill-paths.js";import{Buffer}from"node:buffer";function stripSkillFrontmatter(e){return e.replace(/^---\r?\n[\s\S]*?\r?\n---\r?\n?/,``)}function skillPackageRevision(e){let t=createHash(`sha256`);for(let n of e.files)t.update(`${n.relativePath}\0${n.content.byteLength}\0`).update(n.content);return t.digest(`hex`)}function normalizeSkillPackage(e){assertSafeSkillPackageName(e.name);let t=[{content:Buffer.from(e.content,`utf8`),relativePath:`SKILL.md`}];for(let[n,r]of Object.entries(e.files??{}))assertSafeSkillPackageFilePath(n),t.push({content:contentToBuffer(r),relativePath:n});return t.sort((e,t)=>comparePaths(e.relativePath,t.relativePath)),{deferred:e.deferred,description:e.description,files:t,license:e.license,content:e.content,metadata:e.metadata===void 0?void 0:{...e.metadata},name:e.name}}async function writeSkillPackageDirectory(e){for(let t of e.skill.files){let n=join(e.rootPath,`skills`,e.skill.name,t.relativePath);await mkdir(dirname(n),{recursive:!0}),await writeFile(n,t.content)}}async function writeSkillPackageToSandbox(e){let t=await Promise.all(e.skill.files.map(async t=>({content:t.content,path:await resolveSandboxSkillWritePath({name:e.skill.name,relativePath:t.relativePath,sandbox:e.sandbox})})));await e.sandbox.writeFiles({files:t})}async function removeSkillPackageFromSandbox(e){assertSafeSkillPackageName(e.name);let t=await resolveSandboxSkillRoot({sandbox:e.sandbox});await e.sandbox.removePath({force:!0,path:`${t}/${e.name}`,recursive:!0})}function assertSafeSkillPackageName(e){if(e.length===0||e.startsWith(`.`)||e.includes(`/`)||e.includes(`\\`)||e.includes(`..`)||!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(e)||/^[A-Za-z]:/.test(e))throw Error(`Expected skill name to be a non-empty shell-safe path segment starting with an alphanumeric character and containing only alphanumerics, ".", "_", or "-".`)}function assertSafeSkillPackageFilePath(e){if(e===`SKILL.md`)throw Error(`Skill package files must not include "SKILL.md"; eve generates it.`);if(e.length===0||e.startsWith(`/`)||e.includes(`\\`)||/^[A-Za-z]:/.test(e)||e.split(`/`).some(e=>e.length===0||e===`.`||e===`..`))throw Error(`Expected skill package file paths to be relative POSIX paths.`)}function contentToBuffer(e){return typeof e==`string`?Buffer.from(e,`utf8`):Buffer.from(e)}function comparePaths(e,t){return e<t?-1:+(e>t)}export{normalizeSkillPackage,removeSkillPackageFromSandbox,skillPackageRevision,stripSkillFrontmatter,writeSkillPackageDirectory,writeSkillPackageToSandbox};

package/dist/src/shared/token-usage-math.d.ts

@@ -0,0 +1,5 @@
+import type { TokenUsage } from "#shared/token-usage.js";
+/** Adds two usages; the cost is absent only when neither reported one. */
+export declare function addTokenUsage(a: TokenUsage, b: TokenUsage): TokenUsage;
+/** The new spend in one cumulative report: `total`, less the part of it `counted` earlier. */
+export declare function usageSince(total: TokenUsage, counted: TokenUsage | undefined): TokenUsage;

package/dist/src/shared/token-usage-math.js

@@ -0,0 +1 @@
+function addTokenUsage(e,t){return{cacheReadTokens:e.cacheReadTokens+t.cacheReadTokens,cacheWriteTokens:e.cacheWriteTokens+t.cacheWriteTokens,costUsd:e.costUsd===void 0&&t.costUsd===void 0?void 0:(e.costUsd??0)+(t.costUsd??0),inputTokens:e.inputTokens+t.inputTokens,outputTokens:e.outputTokens+t.outputTokens}}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{addTokenUsage,usageSince};

package/dist/src/shared/token-usage.d.ts

@@ -9,5 +9,3 @@ export declare const tokenUsageWithCostSchema: z.ZodObject<{
     outputTokens: z.ZodNumber;
     costUsd: z.ZodOptional<z.ZodNumber>;
 }, z.core.$strip>;
-/** Adds two usages; the cost is absent only when neither reported one. */
-export declare function addTokenUsage(a: TokenUsage, b: TokenUsage): TokenUsage;

package/dist/src/shared/token-usage.js

@@ -1 +1 @@
-import{z}from"#compiled/zod/index.js";const tokenUsageWithCostSchema=z.object({cacheReadTokens:z.number().int().nonnegative(),cacheWriteTokens:z.number().int().nonnegative(),inputTokens:z.number().int().nonnegative(),outputTokens:z.number().int().nonnegative()}).extend({costUsd:z.number().finite().nonnegative().optional()});function addTokenUsage(e,t){return{cacheReadTokens:e.cacheReadTokens+t.cacheReadTokens,cacheWriteTokens:e.cacheWriteTokens+t.cacheWriteTokens,costUsd:e.costUsd===void 0&&t.costUsd===void 0?void 0:(e.costUsd??0)+(t.costUsd??0),inputTokens:e.inputTokens+t.inputTokens,outputTokens:e.outputTokens+t.outputTokens}}export{addTokenUsage,tokenUsageWithCostSchema};
+import{z}from"#compiled/zod/index.js";const tokenUsageWithCostSchema=z.object({cacheReadTokens:z.number().int().nonnegative(),cacheWriteTokens:z.number().int().nonnegative(),inputTokens:z.number().int().nonnegative(),outputTokens:z.number().int().nonnegative()}).extend({costUsd:z.number().finite().nonnegative().optional()});export{tokenUsageWithCostSchema};

package/dist/src/shared/validate-authorization.js

@@ -1 +1 @@
-import{extractVercelConnectMetadata}from"#shared/vercel-connect-metadata.js";import{readConnectionEventsBackend}from"#shared/connection-events.js";function validateAuthorizationSpec(e,t=`auth`){if(typeof e!=`object`||!e)return`The "${t}" field must be an object with a "getToken" method.`;let n=e;if(typeof n.getToken!=`function`)return`The "${t}.getToken" field must be a function returning Promise<{ token }>.`;let r=n.startAuthorization!==void 0,i=n.completeAuthorization!==void 0,a=n.credentialOwner!==void 0,o=n.principalType!==void 0;if(a&&o)return`The "${t}" field must not provide both "credentialOwner" and "principalType".`;let s=a?`credentialOwner`:`principalType`,c=a?n.credentialOwner:n.principalType;if(c!==void 0&&c!==`app`&&c!==`user`)return`The "${t}.${s}" field must be "app" or "user".`;if(r!==i)return`The "${t}" field must provide either both "startAuthorization" and "completeAuthorization" (interactive OAuth) or neither (getToken-only). Got only "${r?`startAuthorization`:`completeAuthorization`}".`;if(r&&typeof n.startAuthorization!=`function`)return`The "${t}.startAuthorization" field must be a function when provided.`;if(i&&typeof n.completeAuthorization!=`function`)return`The "${t}.completeAuthorization" field must be a function when provided.`;if(r&&a)return`The "${t}.credentialOwner" field is only supported by getToken-only authorization. Interactive authorization is restricted to "principalType": "user" in v1.`;if(r&&n.principalType!==`user`)return`Interactive authorization (startAuthorization + completeAuthorization) is restricted to "principalType": "user" in v1. App-level credentials must use a getToken-only definition.`;if(n.displayName!==void 0&&(typeof n.displayName!=`string`||n.displayName.length===0))return`The "${t}.displayName" field must be a non-empty string when provided.`}function normalizeAuthorizationSpec(e,t,n=`auth`){let r=validateAuthorizationSpec(e,n);if(r!==void 0)throw Error(`${t} ${r}`);let i=e,a=extractVercelConnectMetadata(i.vercelConnect),o=readConnectionEventsBackend(i.vercelConnect?.experimental_events),s=a;o!==void 0&&a!==void 0&&(s={...a,experimental_events:o});let c=i.displayName,l=typeof i.evict==`function`?i.evict:void 0;if(i.startAuthorization!==void 0&&i.completeAuthorization!==void 0){let e={completeAuthorization:i.completeAuthorization,getToken:i.getToken,principalType:`user`,startAuthorization:i.startAuthorization};return s!==void 0&&(e={...e,vercelConnect:s}),c!==void 0&&(e={...e,displayName:c}),l!==void 0&&(e={...e,evict:l}),e}let u={getToken:i.getToken,principalType:i.credentialOwner??i.principalType??`app`};return s!==void 0&&(u={...u,vercelConnect:s}),c!==void 0&&(u={...u,displayName:c}),l!==void 0&&(u={...u,evict:l}),u}export{normalizeAuthorizationSpec,validateAuthorizationSpec};
+import{extractVercelConnectMetadata}from"#shared/vercel-connect-metadata.js";import{readConnectionEventsBackend}from"#shared/connection-events.js";function validateAuthorizationSpec(e,t=`auth`){if(typeof e!=`object`||!e)return`The "${t}" field must be an object with a "getToken" method.`;let n=e;if(typeof n.getToken!=`function`)return`The "${t}.getToken" field must be a function returning Promise<{ token }>.`;let r=n.startAuthorization!==void 0,i=n.completeAuthorization!==void 0;if(`credentialOwner`in n)return`The "${t}.credentialOwner" field is no longer supported. Use "principalType": "app" or "user".`;if(n.principalType!==void 0&&n.principalType!==`app`&&n.principalType!==`user`)return`The "${t}.principalType" field must be "app" or "user".`;if(r!==i)return`The "${t}" field must provide either both "startAuthorization" and "completeAuthorization" (interactive OAuth) or neither (getToken-only). Got only "${r?`startAuthorization`:`completeAuthorization`}".`;if(r&&typeof n.startAuthorization!=`function`)return`The "${t}.startAuthorization" field must be a function when provided.`;if(i&&typeof n.completeAuthorization!=`function`)return`The "${t}.completeAuthorization" field must be a function when provided.`;if(r&&n.principalType!==`user`)return`Interactive authorization (startAuthorization + completeAuthorization) is restricted to "principalType": "user" in v1. App-level credentials must use a getToken-only definition.`;if(n.displayName!==void 0&&(typeof n.displayName!=`string`||n.displayName.length===0))return`The "${t}.displayName" field must be a non-empty string when provided.`}function normalizeAuthorizationSpec(e,t,n=`auth`){let r=validateAuthorizationSpec(e,n);if(r!==void 0)throw Error(`${t} ${r}`);let i=e,a=extractVercelConnectMetadata(i.vercelConnect),o=readConnectionEventsBackend(i.vercelConnect?.experimental_events),s=a;o!==void 0&&a!==void 0&&(s={...a,experimental_events:o});let c=i.displayName,l=typeof i.evict==`function`?i.evict:void 0;if(i.startAuthorization!==void 0&&i.completeAuthorization!==void 0){let e={completeAuthorization:i.completeAuthorization,getToken:i.getToken,principalType:`user`,startAuthorization:i.startAuthorization};return s!==void 0&&(e={...e,vercelConnect:s}),c!==void 0&&(e={...e,displayName:c}),l!==void 0&&(e={...e,evict:l}),e}let u={getToken:i.getToken,principalType:i.principalType??`app`};return s!==void 0&&(u={...u,vercelConnect:s}),c!==void 0&&(u={...u,displayName:c}),l!==void 0&&(u={...u,evict:l}),u}export{normalizeAuthorizationSpec,validateAuthorizationSpec};

package/dist/src/shared/wait-with-signal.d.ts

@@ -0,0 +1,2 @@
+/** Stops waiting without claiming to cancel work whose owner does not accept a signal. */
+export declare function waitWithSignal<T>(promise: Promise<T>, signal?: AbortSignal): Promise<T>;

package/dist/src/shared/wait-with-signal.js

@@ -0,0 +1 @@
+async function waitWithSignal(e,t){if(t===void 0)return await e;let n=Promise.withResolvers(),onAbort=()=>n.reject(t.reason);t.addEventListener(`abort`,onAbort,{once:!0}),t.aborted&&onAbort();try{return await Promise.race([n.promise,e])}finally{t.removeEventListener(`abort`,onAbort)}}export{waitWithSignal};

package/dist/src/subagents/adapter.d.ts

@@ -1,10 +1,8 @@
 import type { ChannelAdapter } from "#channel/adapter.js";
 /**
- * Framework adapter that bridges a child subagent session to its
- * parent.
+ * Framework adapter that bridges a child subagent session to its parent.
  *
- * It proxies child `input.requested` events upward so the parent channel can
- * render HITL prompts and route responses back down to the child, and the
- * `input.resolved` of requests only the child can close.
+ * It relays every interaction fact the child publishes, so the parent channel can render each
+ * request, route answers back down, and close its copy when the child settles it.
  */
 export declare const SUBAGENT_ADAPTER: ChannelAdapter;

package/dist/src/subagents/adapter.js

@@ -1 +1 @@
-import{createErrorId,createLogger}from"#internal/logging.js";import{ContinuationTokenKey,SessionIdKey,SessionInboxKey}from"#context/keys.js";import{resolvedForParent}from"#harness/hitl/relays.js";import{SUBAGENT_ADAPTER_KIND,isSubagentAdapterState}from"#subagents/adapter-state.js";const log=createLogger(`execution.subagent-adapter`),SUBAGENT_ADAPTER={kind:SUBAGENT_ADAPTER_KIND,async"approval.candidate"(e,t){await forwardSubagentAuthorizationEvent({data:e,type:`approval.candidate`},t)},async"approval.settled"(e,t){await forwardSubagentAuthorizationEvent({data:e,type:`approval.settled`},t)},async"authorization.required"(e,t){await forwardSubagentAuthorizationEvent({data:e,type:`authorization.required`},t)},async"authorization.completed"(e,t){await forwardSubagentAuthorizationEvent({data:e,type:`authorization.completed`},t)},async"input.resolved"(e,t){let n=resolvedForParent(e);n!==void 0&&await forwardSubagentAuthorizationEvent({data:n,type:`input.resolved`},t)},async"input.requested"(e,t){let n=t.state;isSubagentAdapterState(n)&&await forwardSubagentInputRequestStep({hookPayload:{callId:n.callId,childContinuationToken:t.ctx.require(ContinuationTokenKey),childSessionId:t.ctx.require(SessionIdKey),childSessionInbox:t.ctx.get(SessionInboxKey),inputSource:t.inputSource,event:{requests:e.requests,sequence:e.sequence,stepIndex:e.stepIndex,turnId:e.turnId},kind:`subagent-input-request`,subagentName:n.subagentName},parentContinuationToken:n.parentContinuationToken})}};async function forwardSubagentAuthorizationEvent(e,t){let n=t.state;isSubagentAdapterState(n)&&await forwardSubagentAuthorizationEventStep({hookPayload:{callId:n.callId,childSessionId:t.ctx.require(SessionIdKey),event:e,kind:`subagent-authorization-event`,subagentName:n.subagentName},parentContinuationToken:n.parentContinuationToken})}async function forwardSubagentAuthorizationEventStep(e){"use step";try{await resumeParentHook(e.parentContinuationToken,e.hookPayload)}catch(t){let n=createErrorId();throw log.warn(`failed to forward subagent authorization event to parent`,{callId:e.hookPayload.callId,childSessionId:e.hookPayload.childSessionId,errorId:n,eventType:e.hookPayload.event.type,parentContinuationToken:e.parentContinuationToken,subagentName:e.hookPayload.subagentName,error:t}),t}}async function forwardSubagentInputRequestStep(e){"use step";try{await resumeParentHook(e.parentContinuationToken,e.hookPayload)}catch(t){let n=createErrorId();throw log.warn(`failed to forward proxied HITL batch to parent`,{callId:e.hookPayload.callId,childContinuationToken:e.hookPayload.childContinuationToken,childSessionId:e.hookPayload.childSessionId,errorId:n,parentContinuationToken:e.parentContinuationToken,subagentName:e.hookPayload.subagentName,error:t}),t}}async function resumeParentHook(e,t){let{resumeHook:n}=await import(`#internal/workflow/runtime.js`);await n(e,t)}export{SUBAGENT_ADAPTER};
+import{createErrorId,createLogger}from"#internal/logging.js";import{ContinuationTokenKey,SessionIdKey,SessionInboxKey}from"#context/keys.js";import{relayedInteractionEvents}from"#harness/interaction-relay.js";import{SUBAGENT_ADAPTER_KIND,isSubagentAdapterState}from"#subagents/adapter-state.js";const log=createLogger(`execution.subagent-adapter`),SUBAGENT_ADAPTER={kind:SUBAGENT_ADAPTER_KIND,async"interaction.opened"(e,t){await relay(e,t)},async"interaction.settled"(e,t){await relay(e,t)},async"response.admitted"(e,t){await relay(e,t)},async"response.settled"(e,t){await relay(e,t)}};async function relay(e,t){let n=t.state;if(!isSubagentAdapterState(n)||t.view===void 0)return;let r=t.ctx.require(SessionIdKey),i=relayedInteractionEvents(t.view,e,r);i.length!==0&&await forwardToParentStep({hookPayload:{callId:n.callId,childSessionId:r,events:i,kind:`subagent-interaction`,subagentName:n.subagentName,...i.some(e=>e.type===`interaction.opened`&&e.data.request.kind!==`sign-in`)&&{route:{childContinuationToken:t.ctx.require(ContinuationTokenKey),...t.ctx.get(SessionInboxKey)!==void 0&&{childSessionInbox:t.ctx.get(SessionInboxKey)},...t.inputSource!==void 0&&{inputSource:t.inputSource}}}},parentContinuationToken:n.parentContinuationToken})}async function forwardToParentStep(e){"use step";try{let{resumeHook:t}=await import(`#internal/workflow/runtime.js`);await t(e.parentContinuationToken,e.hookPayload)}catch(t){throw log.warn(`failed to forward a child's interaction to its parent`,{callId:e.hookPayload.callId,childSessionId:e.hookPayload.childSessionId,errorId:createErrorId(),eventTypes:e.hookPayload.events.map(e=>e.type),parentContinuationToken:e.parentContinuationToken,subagentName:e.hookPayload.subagentName,error:t}),t}}export{SUBAGENT_ADAPTER};

package/dist/src/subagents/callback-route.js

@@ -1 +1 @@
-import{z}from"#compiled/zod/index.js";import{inputRequestSchema,inputResponseSchema}from"#shared/input.js";import{jsonValueSchema}from"#shared/json-schemas.js";import{renameLegacyTaskCallback}from"#execution/legacy-remote-agent/protocol.js";import{resumeRunnableHook}from"#execution/session-inbox/owner.js";import{agentTurnOutcomeWithCostSchema}from"#shared/agent-turn-outcome.js";const sessionInputCallbackSchema=z.object({callId:z.string().min(1),childContinuationToken:z.string().min(1),childSessionId:z.string().min(1),childSessionInbox:z.object({sessionId:z.string().min(1)}).strict().optional(),inputSource:z.string().min(1).optional(),remote:z.object({name:z.string().min(1),url:z.string().url(),forwardPrincipal:z.boolean().optional(),sessionId:z.string().min(1),resolverId:z.string().min(1).optional()}).strict().optional(),kind:z.literal(`subagent-input-request`),subagentName:z.string().min(1),event:z.object({requests:z.array(inputRequestSchema).min(1),sequence:z.number(),stepIndex:z.number(),taskId:z.string().optional(),turnId:z.string()})}),sessionAuthorizationCallbackSchema=z.object({callId:z.string().min(1),childSessionId:z.string().min(1),kind:z.literal(`subagent-authorization-event`),subagentName:z.string().min(1),event:z.discriminatedUnion(`type`,[z.object({type:z.literal(`approval.candidate`),data:z.object({candidateId:z.string(),outcome:z.enum([`pending`,`rejected`,`failed`,`timed-out`,`stale`]),requestId:z.string(),responderPrincipalId:z.string(),reason:z.string().optional(),sequence:z.number(),stepIndex:z.number(),turnId:z.string()}).passthrough()}),z.object({type:z.literal(`approval.settled`),data:z.object({outcome:z.enum([`approved`,`cancelled`]),requestId:z.string(),responderPrincipalId:z.string(),sequence:z.number(),stepIndex:z.number(),turnId:z.string()}).passthrough()}),z.object({type:z.literal(`input.resolved`),data:z.object({resolutions:z.array(z.object({kind:z.enum([`question`,`session-limit`,`tool-approval`]),outcome:z.enum([`answered`,`approved`,`cancelled`,`denied`,`ignored`,`invalid`]),requestId:z.string(),response:inputResponseSchema.optional()}).passthrough()),sequence:z.number(),stepIndex:z.number(),turnId:z.string()}).passthrough()}),z.object({type:z.literal(`authorization.required`),data:z.object({description:z.string(),name:z.string(),sequence:z.number(),stepIndex:z.number(),turnId:z.string(),webhookUrl:z.string().optional(),attemptId:z.string().optional(),taskId:z.string().optional(),principalId:z.string().optional()}).passthrough()}),z.object({type:z.literal(`authorization.completed`),data:z.object({name:z.string(),outcome:z.enum([`authorized`,`declined`,`failed`,`timed-out`]),sequence:z.number(),stepIndex:z.number(),turnId:z.string(),attemptId:z.string().optional(),taskId:z.string().optional(),principalId:z.string().optional()}).passthrough()})])}),sessionResultCallbackSchema=z.discriminatedUnion(`kind`,[z.object({callId:z.string().min(1),kind:z.literal(`turn.completed`),outcome:agentTurnOutcomeWithCostSchema,output:jsonValueSchema.optional(),subagentName:z.string().min(1)}),z.object({callId:z.string().min(1),error:jsonValueSchema,kind:z.literal(`turn.failed`),outcome:agentTurnOutcomeWithCostSchema,subagentName:z.string().min(1)})]);async function handleSessionCallbackRequest(e,t){let n=t.params.token;if(typeof n!=`string`||n.length===0)return Response.json({error:`Missing callback token.`,ok:!1},{status:400});let r;try{r=renameLegacyTaskCallback(await e.json())}catch{return Response.json({error:`Invalid JSON body.`,ok:!1},{status:400})}let i=callbackKind(r),a=i===`subagent-input-request`?sessionInputCallbackSchema.safeParse(r):i===`subagent-authorization-event`?sessionAuthorizationCallbackSchema.safeParse(r):void 0;if(a!==void 0&&!a.success)return Response.json({error:`Invalid session input callback.`,ok:!1},{status:400});let o=a===void 0?projectSessionCallbackResult(r):void 0;if(o instanceof Response)return o;try{await resumeRunnableHook(n,a?.success?a.data:{kind:`runtime-action-result`,results:[o]})}catch{return Response.json({error:`Session callback not pending.`,ok:!1},{status:404})}return Response.json({ok:!0},{status:202})}function callbackKind(e){if(typeof e==`object`&&e)return Reflect.get(e,`kind`)}function projectSessionCallbackResult(e){if(typeof e!=`object`||!e)return Response.json({error:`Expected a JSON object.`,ok:!1},{status:400});let t=callbackKind(e);if(t!==`turn.completed`&&t!==`turn.failed`)return Response.json({error:`Unsupported callback kind.`,ok:!1},{status:400});let n=sessionResultCallbackSchema.safeParse(e);if(!n.success)return Response.json({error:`Invalid session result callback.`,ok:!1},{status:400});let r=n.data;return r.kind===`turn.completed`?{callId:r.callId,kind:`subagent-result`,origin:`child`,outcome:r.outcome,output:r.output??``,subagentName:r.subagentName,usage:r.outcome.usageDelta}:{callId:r.callId,isError:!0,kind:`subagent-result`,origin:`child`,outcome:r.outcome,output:r.error,subagentName:r.subagentName}}export{handleSessionCallbackRequest};
+import{z}from"#compiled/zod/index.js";import{jsonValueSchema}from"#shared/json-schemas.js";import{REMOTE_CALLBACK_NOT_PENDING,REMOTE_CALLBACK_NOT_PENDING_MESSAGE,V26_INPUT_REMOTE_AGENT_PROTOCOL,readCallbackProtocol}from"#protocol/remote-agent-protocol.js";import{resumeRunnableHook}from"#execution/session-inbox/owner.js";import{PROTOCOL_TWO_INPUT_CALLBACK_KINDS,parseProtocolTwoInputCallback,readProtocolTwoInputCallback}from"#subagents/protocol-two-callback.js";import{interactionSchemas}from"#protocol/session-events/families/interaction.js";import{known}from"#protocol/session-events/common.js";import{agentTurnOutcomeWithCostSchema}from"#shared/agent-turn-outcome.js";const sessionInteractionCallbackSchema=z.object({callId:z.string().min(1),childSessionId:z.string().min(1),kind:z.literal(`subagent-interaction`),subagentName:z.string().min(1),route:z.object({childContinuationToken:z.string().min(1),childSessionInbox:z.object({sessionId:z.string().min(1)}).strict().optional(),inputSource:z.string().min(1).optional(),remote:z.object({name:z.string().min(1),url:z.string().url(),forwardPrincipal:z.boolean().optional(),sessionId:z.string().min(1),resolverId:z.string().min(1).optional()}).strict().optional()}).optional(),events:z.array(z.discriminatedUnion(`type`,[interactionSchemas[`interaction.opened`],interactionSchemas[`interaction.settled`],z.object({type:z.literal(`response.admitted`),data:z.object({deliveryId:z.string().optional(),interactionId:z.string()})}),z.object({type:z.literal(`response.settled`),data:z.object({deliveryId:z.string().optional(),interactionId:z.string(),outcome:known(),reason:z.string().optional()})})]))}),sessionResultCallbackSchema=z.discriminatedUnion(`kind`,[z.object({callId:z.string().min(1),kind:z.literal(`turn.completed`),outcome:agentTurnOutcomeWithCostSchema,output:jsonValueSchema.optional(),subagentName:z.string().min(1)}),z.object({callId:z.string().min(1),error:jsonValueSchema,kind:z.literal(`turn.failed`),outcome:agentTurnOutcomeWithCostSchema,subagentName:z.string().min(1)})]);async function handleSessionCallbackRequest(e,t){let n=t.params.token;if(typeof n!=`string`||n.length===0)return Response.json({error:`Missing callback token.`,ok:!1},{status:400});let r;try{r=await e.json()}catch{return Response.json({error:`Invalid JSON body.`,ok:!1},{status:400})}let i=readInteractionCallback(r,readCallbackProtocol(e.url));if(i===null)return Response.json({error:`Invalid session input callback.`,ok:!1},{status:400});if(isEmptyRelay(i))return Response.json({ok:!0},{status:202});let a=i===void 0?projectSessionCallbackResult(r):void 0;if(a instanceof Response)return a;try{await resumeRunnableHook(n,i??{kind:`runtime-action-result`,results:[a]})}catch{return Response.json({code:REMOTE_CALLBACK_NOT_PENDING,error:REMOTE_CALLBACK_NOT_PENDING_MESSAGE,ok:!1},{status:404})}return Response.json({ok:!0},{status:202})}function readInteractionCallback(e,t){let n=callbackKind(e);if(n===`subagent-interaction`){let t=sessionInteractionCallbackSchema.safeParse(e);return t.success?t.data:null}if(PROTOCOL_TWO_INPUT_CALLBACK_KINDS.has(n)){if(t===V26_INPUT_REMOTE_AGENT_PROTOCOL)return readProtocolTwoInputCallback(e)??null;if(t===void 0)return parseProtocolTwoInputCallback(e)??null}}function isEmptyRelay(e){if(e==null||Reflect.get(e,`kind`)!==`subagent-interaction`)return!1;let t=Reflect.get(e,`events`);return Array.isArray(t)&&t.length===0}function callbackKind(e){if(typeof e==`object`&&e)return Reflect.get(e,`kind`)}function projectSessionCallbackResult(e){if(typeof e!=`object`||!e)return Response.json({error:`Expected a JSON object.`,ok:!1},{status:400});let t=callbackKind(e);if(t!==`turn.completed`&&t!==`turn.failed`)return Response.json({error:`Unsupported callback kind.`,ok:!1},{status:400});let n=sessionResultCallbackSchema.safeParse(e);if(!n.success)return Response.json({error:`Invalid session result callback.`,ok:!1},{status:400});let r=n.data;return r.kind===`turn.completed`?{callId:r.callId,kind:`subagent-result`,origin:`child`,outcome:r.outcome,output:r.output??``,subagentName:r.subagentName,usage:r.outcome.usageDelta}:{callId:r.callId,isError:!0,kind:`subagent-result`,origin:`child`,outcome:r.outcome,output:r.error,subagentName:r.subagentName}}export{handleSessionCallbackRequest};

package/dist/src/subagents/event-proxy-step.d.ts

@@ -1,22 +1,19 @@
-import type { SubagentAuthorizationEventHookPayload, SubagentInputRequestHookPayload } from "#channel/types.js";
+import type { SubagentInteractionHookPayload } from "#channel/types.js";
 import { type PublishedSessionEvents, type RestoredSessionStep, type SessionStepState } from "#execution/publish-session-events.js";
 import { type SessionStateTransition } from "#execution/session/state-delta.js";
 import type { WorkflowAskRoute } from "#harness/hitl/relays.js";
-type SubagentEventHookPayload = SubagentAuthorizationEventHookPayload | SubagentInputRequestHookPayload;
-/** Proxies one child event through its parent channel across a durable step boundary. */
+/** Relays one child interaction fact through its parent channel across a durable step boundary. */
 export declare function runProxySubagentEventStep(input: SessionStepState & {
     readonly workflowAsk?: WorkflowAskRoute;
     readonly runId?: string;
-    readonly hookPayload: SubagentEventHookPayload;
+    readonly hookPayload: SubagentInteractionHookPayload;
 }): Promise<SessionStateTransition>;
 /**
- * Relays one child event through the parent session's channel. `runId` names
- * the workflow tool run that relayed an input request, so the session can
- * withdraw it when that run ends.
+ * Relays one child interaction fact through the parent session's channel. `runId` names the
+ * workflow tool run that relayed it, so the session can withdraw its requests when that run ends.
  */
 export declare function emitProxiedSubagentEvent(input: RestoredSessionStep & {
     readonly workflowAsk?: WorkflowAskRoute;
     readonly runId?: string;
-    readonly hookPayload: SubagentEventHookPayload;
+    readonly hookPayload: SubagentInteractionHookPayload;
 }): Promise<PublishedSessionEvents>;
-export {};

package/dist/src/subagents/event-proxy-step.js

@@ -1 +1 @@
-import{readHitlState}from"#harness/hitl/index.js";import{commitSessionStep,restoreSessionStep}from"#execution/publish-session-events.js";import{withSessionStateDelta}from"#execution/session/state-delta.js";import{relay}from"#harness/session-machine/transitions.js";async function runProxySubagentEventStep(e){"use step";return await withSessionStateDelta(e,async e=>emitProxiedSubagentEvent({...await restoreSessionStep(e),workflowAsk:e.workflowAsk,runId:e.runId,hookPayload:e.hookPayload}))}async function emitProxiedSubagentEvent(e){let{hookPayload:t,runId:n,workflowAsk:r}=e,i=new Set(t.kind===`subagent-input-request`?t.event.requests.map(e=>e.requestId):[]),a=t.kind===`subagent-input-request`?[...readHitlState(e.durableSession.state).relays].filter(([e,n])=>n.childContinuationToken===t.childContinuationToken&&n.inputSource===t.inputSource&&!i.has(e)).map(([e])=>e):[];return await commitSessionStep(e,e=>[relay(e,{payload:t,replacedRequestIds:a,runId:n,workflowAsk:r})],{origin:`relayed`,inputSource:t.kind===`subagent-input-request`?JSON.stringify([t.childContinuationToken,t.inputSource??null]):void 0})}export{emitProxiedSubagentEvent,runProxySubagentEventStep};
+import{commitSessionStep,restoreSessionStep}from"#execution/publish-session-events.js";import"#execution/session/state-delta.js";import{withSessionStateDelta}from"#execution/session/step-state-delta.js";import{relay}from"#harness/session-machine/transitions.js";async function runProxySubagentEventStep(e){"use step";return await withSessionStateDelta(e,async e=>emitProxiedSubagentEvent({...await restoreSessionStep(e),workflowAsk:e.workflowAsk,runId:e.runId,hookPayload:e.hookPayload}))}async function emitProxiedSubagentEvent(e){let{hookPayload:t,runId:n,workflowAsk:r}=e;return await commitSessionStep(e,e=>[relay(e,{payload:t,runId:n,workflowAsk:r})],{origin:`relayed`,inputSource:t.route===void 0?void 0:JSON.stringify([t.route.childContinuationToken,t.route.inputSource??null])})}export{emitProxiedSubagentEvent,runProxySubagentEventStep};

package/dist/src/subagents/hitl-proxy.d.ts

@@ -1,45 +1,33 @@
 import type { SessionInboxAddress } from "#execution/session-inbox/address.js";
 import type { DeliverPayload } from "#channel/types.js";
-import type { StepCoordinates as PendingInputBatchEvent } from "#harness/session-machine/view.js";
-import type { WorkflowAskRoute, ProxyInputRequest } from "#harness/hitl/relays.js";
+import type { Relay, WorkflowAskRoute } from "#harness/hitl/relays.js";
 import type { SessionStateMap } from "#harness/types.js";
-import type { InputResolution } from "#protocol/message.js";
-import type { InputResponse } from "#shared/input.js";
-/** One proxied-child bucket of a routed deliver payload. */
+import type { Answer } from "#shared/input.js";
+/** The answers of a routed deliver payload that go to one asker. */
 export interface RoutedChildDelivery {
     readonly workflowAsk?: WorkflowAskRoute;
-    readonly remote?: ProxyInputRequest["remote"];
+    readonly remote?: Relay["remote"];
     readonly inputSource?: string;
     readonly childContinuationToken: string;
     readonly childSessionInbox?: SessionInboxAddress;
     /** The person's message whose text answered this bucket's question. */
     readonly message?: DeliverPayload["message"];
     readonly payload: {
-        readonly inputResponses: readonly InputResponse[];
+        readonly answers: readonly Answer[];
     };
-    /** What forwarding this bucket resolves on the routing session. */
-    readonly resolved: ProxiedInputResolutions;
 }
 /**
- * The parent-visible requests one forwarded bucket resolves: those it answers,
- * plus the rest of a batch those answers complete. Each retires from the proxy
- * map, and the session announces them with one `input.resolved` at `event`,
- * the coordinates of the child batch's `input.requested`.
- */
-export interface ProxiedInputResolutions {
-    readonly event: PendingInputBatchEvent;
-    readonly resolutions: readonly InputResolution[];
-}
-/**
- * Outcome of splitting one deliver payload by the session's proxy map.
+ * Outcome of splitting one deliver payload by the session's relay routes.
  * `forSelf` is the parent-local remainder (or `undefined` when fully
- * routed); `forChildren` carries one entry per descendant token.
+ * routed); `forChildren` carries one entry per asker.
  */
 export interface RoutedDeliverPayload {
     readonly forChildren: readonly RoutedChildDelivery[];
     readonly forSelf: DeliverPayload | undefined;
+    /** Stop on a child's budget prompt: this session's turn ends too. */
     readonly parentAction: {
         readonly kind: "cancel-turn";
+        readonly answer: Answer;
     } | undefined;
 }
 /**
@@ -47,12 +35,12 @@ export interface RoutedDeliverPayload {
  *
  * With `resolveMessage`, a plain-text message is also resolved against the
  * first open request when a child asked it, whether a `ctx.ask()` question, a
- * tool approval, or a session-limit prompt: a matching option or permitted free
+ * tool approval, or a budget prompt: a matching option or permitted free
  * text answers that one request, and the message is consumed along with its
  * `context`. Otherwise the message stays with the parent.
  */
 export declare function routeDeliverPayload(input: {
-    readonly allowRoute?: (requestId: string, route: ProxyInputRequest) => boolean;
+    readonly allowRoute?: (interactionId: string) => boolean;
     readonly payload: DeliverPayload;
     readonly resolveMessage?: boolean;
     readonly state: SessionStateMap | undefined;

package/dist/src/subagents/hitl-proxy.js

@@ -1 +1 @@
-import{inputTextKey,readAnswerText}from"#internal/input-text.js";import{firstOpenInput}from"#harness/open-input-request.js";import{resolveTextToResponse}from"#channel/resolve-text.js";import{storedProjection}from"#harness/session-machine/view.js";import{readHitlState}from"#harness/hitl/index.js";import{resolvedByChild}from"#harness/hitl/relays.js";import{resolveInputOutcome}from"#harness/input-request-resolution.js";import{SESSION_LIMIT_STOP_OPTION_ID}from"#harness/hitl/budget-request.js";const CONSUMED_MESSAGE_KEYS=new Set([`context`,`message`,inputTextKey]);function routeDeliverPayload(e){let t=readHitlState(e.state).relays,routable=(t,n)=>n!==void 0&&e.allowRoute?.(t,n)!==!1,n=resolveMessageAgainstFirstRequest({enabled:e.resolveMessage===!0,entries:t,payload:e.payload,routable,state:e.state}),[r]=n.responses,i=[...e.payload.inputResponses??[],...n.responses],a=new Map,o=[],s,bucketFor=e=>{let t=JSON.stringify([e.childContinuationToken,e.childSessionInbox?.sessionId??``,e.remote?.sessionId??``,e.event.sequence,e.event.stepIndex,e.event.turnId,e.inputSource??null]),n=a.get(t);if(n!==void 0)return n;let r={childContinuationToken:e.childContinuationToken,remote:e.remote,event:e.event,parentRequestIds:[],responses:[],routes:[],...e.childSessionInbox!==void 0&&{childSessionInbox:e.childSessionInbox},...e.workflowAsk!==void 0&&{workflowAsk:e.workflowAsk}};return a.set(t,r),r},c=new Set;for(let e of i){let n=t.get(e.requestId);if(n===void 0||!routable(e.requestId,n)){o.push(e);continue}if(c.has(e.requestId))continue;c.add(e.requestId),n.kind===`session-limit`&&e.optionId===SESSION_LIMIT_STOP_OPTION_ID&&(s={kind:`cancel-turn`});let r=bucketFor(n);r.parentRequestIds.push(e.requestId),r.responses.push(e),r.routes.push(n)}let l=[...a.values()].map(({workflowAsk:n,remote:i,childContinuationToken:a,childSessionInbox:o,event:s,parentRequestIds:c,responses:l,routes:u})=>{let d=new Set(c),decided=e=>{let n=t.get(e)?.kind;return n===void 0||!resolvedByChild(n)},f=new Set([...d].filter(decided));for(let e of u)if(e.batch!==void 0&&batchResolves({batch:e.batch,childContinuationToken:a,entries:t,responseIds:d}))for(let t of e.batch.requestIds)decided(t)&&f.add(t);return{childContinuationToken:a,payload:{inputResponses:l},resolved:{event:s,resolutions:resolveRetiredRequests({entries:t,responses:l,retireRequestIds:f})},...o!==void 0&&{childSessionInbox:o},...r!==void 0&&l.includes(r)&&{message:e.payload.message},...n!==void 0&&{workflowAsk:n},...i!==void 0&&{remote:i},...u[0]?.inputSource!==void 0&&{inputSource:u[0].inputSource}}}),u={};for(let[t,r]of Object.entries(e.payload))t!==`inputResponses`&&r!==void 0&&(n.consumed&&CONSUMED_MESSAGE_KEYS.has(t)||(u[t]=r));return o.length>0&&(u.inputResponses=o),{forChildren:l,forSelf:Object.keys(u).length>0?u:void 0,parentAction:s}}function resolveRetiredRequests(e){let t=new Map(e.responses.map(e=>[e.requestId,e])),n=[];for(let r of e.retireRequestIds){let i=e.entries.get(r);i!==void 0&&n.push(toInputResolution(r,i,t.get(r)))}return n}function toInputResolution(e,t,n){let r=resolveInputOutcome(t.kind,n),i={kind:t.kind,outcome:r,requestId:e};return n===void 0?i:{...i,response:n}}function resolveMessageAgainstFirstRequest(e){let t={consumed:!1,responses:[]};if(!e.enabled||(e.payload.inputResponses?.length??0)>0)return t;let n=readAnswerText(e.payload);if(n===void 0)return t;let answered=t=>{let n=e.entries.get(t);return n!==void 0&&!e.routable(t,n)},r=firstOpenInput(storedProjection(e.state),answered)?.request.requestId??[...e.entries.keys()].find(e=>!answered(e)),i=r===void 0?void 0:e.entries.get(r)?.reply;if(r===void 0||i===void 0)return t;let a=resolveTextToResponse(n,{requestId:r,...i});return a===void 0?t:{consumed:!0,responses:[a]}}function batchResolves(e){return e.batch.approvalRequestIds.length===0||e.batch.approvalRequestIds.every(t=>{let n=e.entries.get(t);return n===void 0||!sameBatch(n,e)||e.responseIds.has(t)})}function sameBatch(e,t){return e.childContinuationToken===t.childContinuationToken&&e.batch?.requestIds.length===t.batch.requestIds.length&&e.batch.requestIds.every((e,n)=>e===t.batch.requestIds[n])}export{routeDeliverPayload};
+import{promptQueueHead}from"#protocol/session-projection/reader.js";import{inputTextKey,readAnswerText}from"#internal/input-text.js";import{DENY_OPTION_ID}from"#shared/input.js";import{storedProjection}from"#harness/session-machine/view.js";import{readHitlState}from"#harness/hitl/index.js";import{answerFromText}from"#channel/resolve-text.js";const CONSUMED_MESSAGE_KEYS=new Set([`context`,`message`,inputTextKey]);function routeDeliverPayload(e){let t=readHitlState(e.state).relays,n=storedProjection(e.state),taken=t=>e.allowRoute?.(t)===!1,routeOf=e=>taken(e)?void 0:t.get(e),r=resolveMessageAgainstFirstRequest({enabled:e.resolveMessage===!0,payload:e.payload,projection:n,routeOf,taken}),[i]=r.answers,a=[...e.payload.answers??[],...r.answers],o=new Map,s=[],c=new Set,l;for(let e of a){let t=routeOf(e.interactionId);if(t===void 0){s.push(e);continue}if(c.has(e.interactionId))continue;c.add(e.interactionId),n.view.interactions[e.interactionId]?.request.kind===`budget`&&e.optionId===DENY_OPTION_ID&&(l={answer:e,kind:`cancel-turn`});let r=JSON.stringify([t.childContinuationToken,t.childSessionInbox?.sessionId??``,t.remote?.sessionId??``,t.inputSource??null,t.workflowAsk?.control??null]),i=o.get(r)??{answers:[],relay:t};i.answers.push(e),o.set(r,i)}let u=[...o.values()].map(({answers:t,relay:n})=>({childContinuationToken:n.childContinuationToken,payload:{answers:t},...n.childSessionInbox!==void 0&&{childSessionInbox:n.childSessionInbox},...i!==void 0&&t.includes(i)&&{message:e.payload.message},...n.workflowAsk!==void 0&&{workflowAsk:n.workflowAsk},...n.remote!==void 0&&{remote:n.remote},...n.inputSource!==void 0&&{inputSource:n.inputSource}})),d={};for(let[t,n]of Object.entries(e.payload))t!==`answers`&&n!==void 0&&(r.consumed&&CONSUMED_MESSAGE_KEYS.has(t)||(d[t]=n));return s.length>0&&(d.answers=s),{forChildren:u,forSelf:Object.keys(d).length>0?d:void 0,parentAction:l}}function resolveMessageAgainstFirstRequest(e){let t={answers:[],consumed:!1};if(!e.enabled||(e.payload.answers?.length??0)>0)return t;let n=readAnswerText(e.payload);if(n===void 0)return t;let r=promptQueueHead(e.projection.view,e.taken);if(r===void 0||e.routeOf(r.interactionId)===void 0)return t;let i=answerFromText(n,r);return i===void 0?t:{answers:[i],consumed:!0}}export{routeDeliverPayload};

package/dist/src/subagents/invocation.d.ts

@@ -1,5 +1,6 @@
+import type { MessageContent } from "#shared/message-content.js";
 import type { StepInput } from "#harness/types.js";
-import type { SessionParent, SessionTraceContext, SessionTraceRoot } from "#channel/types.js";
+import type { SessionParent, SessionTraceSeed, SessionTraceRoot } from "#channel/types.js";
 import type { ChannelAudience } from "#shared/channel-audience.js";
 import { type JsonObject, type JsonValue } from "#shared/json.js";
 export interface SubagentParentContext {
@@ -8,15 +9,14 @@ export interface SubagentParentContext {
     /** The caller's trace root, which a local child inherits. */
     readonly traceRoot?: SessionTraceRoot;
     readonly continuationToken?: string;
-    readonly traceContext?: SessionTraceContext;
+    readonly traceContext?: SessionTraceSeed;
     readonly originAudience?: ChannelAudience;
 }
 /**
- * Narrowed form of {@link StepInput} whose `message` is always a plain string.
- * Delegated child runs receive a synthesized text-only prompt.
+ * Delegated input keeps file parts beside the synthesized child instructions.
  */
 interface FormattedSubagentInvocation extends StepInput {
-    readonly message: string;
+    readonly message: MessageContent<string | URL>;
 }
 /**
  * Reads the `outputSchema` a `ctx.agent()` call requested. An empty `{}`
@@ -26,19 +26,19 @@ interface FormattedSubagentInvocation extends StepInput {
  */
 export declare function normalizeRequestedOutputSchema(outputSchema: JsonValue | undefined): JsonObject | undefined;
 type RuntimeSubagentInputFormatRequest = {
-    readonly message: string;
+    readonly message: MessageContent<string | URL>;
     readonly name: string;
     readonly type: "runtime";
 };
 type LocalSubagentInputFormatRequest = {
     readonly description: string;
-    readonly message: string;
+    readonly message: MessageContent<string | URL>;
     readonly name: string;
     readonly type: "local";
 };
 type RemoteSubagentInputFormatRequest = {
     readonly description: string;
-    readonly message: string;
+    readonly message: MessageContent<string | URL>;
     readonly name: string;
     readonly type: "remote";
 };

package/dist/src/subagents/invocation.js

@@ -1,2 +1,2 @@
-import{isJsonObjectValue}from"#shared/json.js";function normalizeRequestedOutputSchema(e){return isJsonObjectValue(e)&&Object.keys(e).length>0?e:void 0}const formatSubagentInputByType={runtime(e){return formatSubagentPrompt({descriptionLines:[],message:e.message,name:e.name})},local(e){return formatSubagentPrompt({descriptionLines:formatDescriptionLines(e.description),message:e.message,name:e.name})},remote(e){return formatSubagentPrompt({descriptionLines:formatDescriptionLines(e.description),message:e.message,name:e.name})}};function formatSubagentInput(e){switch(e.type){case`runtime`:return formatSubagentInputByType.runtime(e);case`local`:return formatSubagentInputByType.local(e);case`remote`:return formatSubagentInputByType.remote(e);default:return e}}function formatSubagentPrompt(e){return{message:[`You are the subagent "${e.name}".`,...e.descriptionLines,``,`The caller delegated the following task to you. Complete it and return the result directly. The caller may send follow-up messages after you answer.`,``,`Caller message:`,e.message].join(`
-`)}}function formatDescriptionLines(e){return e.trim().length>0?[`Description: ${e}`]:[]}export{formatSubagentInput,normalizeRequestedOutputSchema};
+import{isJsonObjectValue}from"#shared/json.js";function normalizeRequestedOutputSchema(e){return isJsonObjectValue(e)&&Object.keys(e).length>0?e:void 0}const formatSubagentInputByType={runtime(e){return formatSubagentPrompt({descriptionLines:[],message:e.message,name:e.name})},local(e){return formatSubagentPrompt({descriptionLines:formatDescriptionLines(e.description),message:e.message,name:e.name})},remote(e){return formatSubagentPrompt({descriptionLines:formatDescriptionLines(e.description),message:e.message,name:e.name})}};function formatSubagentInput(e){switch(e.type){case`runtime`:return formatSubagentInputByType.runtime(e);case`local`:return formatSubagentInputByType.local(e);case`remote`:return formatSubagentInputByType.remote(e);default:return e}}function formatSubagentPrompt(e){let t=[`You are the subagent "${e.name}".`,...e.descriptionLines,``,`The caller delegated the following task to you. Complete it and return the result directly. The caller may send follow-up messages after you answer.`,``,`Caller message:`,...typeof e.message==`string`?[e.message]:[]].join(`
+`);return{message:typeof e.message==`string`?t:[{type:`text`,text:t},...e.message]}}function formatDescriptionLines(e){return e.trim().length>0?[`Description: ${e}`]:[]}export{formatSubagentInput,normalizeRequestedOutputSchema};

package/dist/src/subagents/parent-notification.d.ts

@@ -40,3 +40,8 @@ export declare function resolveInitialTurnCallerStep(input: {
  * previous one.
  */
 export declare function bindTurnCallerContext(caller: TurnCaller | undefined, serializedContext: Record<string, unknown>): Record<string, unknown>;
+/**
+ * How long a result waits on a caller whose callback reports nothing pending, in case the caller
+ * hasn't registered the reply it sent the token for yet.
+ */
+export declare const NOT_PENDING_RETRY_DELAYS_MS: readonly number[];

package/dist/src/subagents/parent-notification.js

@@ -1 +1 @@
-import{createLogger}from"#internal/logging.js";import{SessionCallbackKey}from"#context/keys.js";import{toErrorMessage}from"#shared/errors.js";import{parseJsonValue}from"#shared/json.js";import{ChannelKey}from"#runtime/sessions/runtime-context-keys.js";import{resumeHook}from"#internal/workflow/runtime.js";import{parseSessionCallback}from"#channel/session-callback.js";import{deserializeContext}from"#context/serialize.js";import{postSessionCallbackRequest}from"#execution/session-callback-request.js";import{HookNotFoundError}from"#compiled/@workflow/errors/index.js";import{SUBAGENT_ADAPTER_KIND,isSubagentAdapterState}from"#subagents/adapter-state.js";const log=createLogger(`execution.delegated-parent-notification`),SUBAGENT_EXECUTION_FAILED=`SUBAGENT_EXECUTION_FAILED`,ZERO_TOKEN_USAGE={cacheReadTokens:0,cacheWriteTokens:0,inputTokens:0,outputTokens:0};async function notifyTurnCallerStep(e){"use step";if(e.caller===void 0)return;let t=createSettledTurnResult({caller:e.caller,lifecycle:e.lifecycle,sessionId:e.sessionId,settled:e.settled});if(e.caller.replyTo.kind===`callback`){await postSettledTurnCallback({result:t,sessionId:e.sessionId,url:e.caller.replyTo.url});return}await resumeSettledTurnHook(e.caller.replyTo.token,t)}async function notifyCancelledTaskCallerStep(e){"use step";let t=e.usage??ZERO_TOKEN_USAGE,n={code:SUBAGENT_EXECUTION_FAILED,message:`The agent invocation was cancelled.`},r={callId:e.caller.callId,isError:!0,kind:`subagent-result`,origin:`child`,outcome:{kind:`parked`,result:{kind:`cancelled`},usageDelta:t},output:n,subagentName:e.caller.subagentName},i=e.usage===void 0?r:{...r,usage:e.usage};if(e.caller.replyTo.kind===`callback`){await postSettledTurnCallback({result:i,sessionId:e.sessionId,url:e.caller.replyTo.url});return}await resumeSettledTurnHook(e.caller.replyTo.token,i)}function createSettledTurnResult(e){let t=e.settled.usage??ZERO_TOKEN_USAGE;if(e.settled.isError===!0){let n={code:SUBAGENT_EXECUTION_FAILED,message:toErrorMessage(e.settled.output)};return{callId:e.caller.callId,isError:!0,kind:`subagent-result`,origin:`child`,outcome:{kind:e.lifecycle,result:{error:n,kind:`failed`},usageDelta:t},output:n,subagentName:e.caller.subagentName}}let n=parseJsonValue(e.settled.output),r={callId:e.caller.callId,kind:`subagent-result`,origin:`child`,outcome:{kind:e.lifecycle,result:{kind:`succeeded`,output:n},usageDelta:t},output:n,subagentName:e.caller.subagentName};return e.settled.usage===void 0?r:{...r,usage:e.settled.usage}}async function resolveInitialTurnCallerStep(e){"use step";let t=e.serializedContext[SessionCallbackKey.name];if(t!==void 0){let e=parseSessionCallback(t);if(!e.ok)throw Error(`Serialized session callback is invalid.`,{cause:e.cause});return{callId:e.callback.callId,replyTo:{kind:`callback`,token:e.callback.token,url:e.callback.url},subagentName:e.callback.subagentName}}let n=(await deserializeContext(e.serializedContext)).get(ChannelKey);if(n?.kind===SUBAGENT_ADAPTER_KIND&&isSubagentAdapterState(n.state))return{callId:n.state.callId,replyTo:{kind:`hook`,token:n.state.parentContinuationToken},subagentName:n.state.subagentName}}function bindTurnCallerContext(e,t){if(e===void 0)return t;if(e.replyTo.kind===`callback`){let n={callId:e.callId,subagentName:e.subagentName,token:e.replyTo.token,url:e.replyTo.url};return{...t,[SessionCallbackKey.name]:n}}let n=t[ChannelKey.name];if(typeof n!=`object`||!n||Reflect.get(n,`kind`)!==SUBAGENT_ADAPTER_KIND||!isSubagentAdapterState(Reflect.get(n,`state`)))throw Error(`Delegated local turn is missing its subagent adapter binding.`);let r={...Reflect.get(n,`state`),callId:e.callId,parentContinuationToken:e.replyTo.token,subagentName:e.subagentName};return{...t,[ChannelKey.name]:{...n,state:r}}}async function postSettledTurnCallback(e){let{sessionId:t}=e;if(e.result.isError===!0){await postCallbackPayload({payload:{callId:e.result.callId,error:e.result.output,kind:`turn.failed`,outcome:e.result.outcome,sessionId:t,subagentName:e.result.subagentName},url:e.url});return}await postCallbackPayload({payload:{callId:e.result.callId,kind:`turn.completed`,outcome:e.result.outcome,output:e.result.output,sessionId:t,subagentName:e.result.subagentName},url:e.url})}async function postCallbackPayload(e){let t=await postSessionCallbackRequest({body:e.payload,url:e.url});if(!t.ok)throw Error(`Turn callback failed with HTTP ${t.status}.`)}async function resumeSettledTurnHook(e,t){try{await resumeHook(e,{kind:`runtime-action-result`,results:[t]})}catch(n){if(!HookNotFoundError.is(n))throw n;log.warn(`turn caller hook no longer exists`,{callId:t.callId,callerToken:e})}}export{bindTurnCallerContext,notifyCancelledTaskCallerStep,notifyTurnCallerStep,resolveInitialTurnCallerStep};
+import{createLogger}from"#internal/logging.js";import{SessionCallbackKey}from"#context/keys.js";import{toErrorMessage}from"#shared/errors.js";import{parseJsonValue}from"#shared/json.js";import{ChannelKey}from"#runtime/sessions/runtime-context-keys.js";import{resumeHook}from"#internal/workflow/runtime.js";import{REMOTE_CALLBACK_NOT_PENDING,REMOTE_CALLBACK_NOT_PENDING_MESSAGE}from"#protocol/remote-agent-protocol.js";import{parseSessionCallback}from"#channel/session-callback.js";import{deserializeContext}from"#context/serialize.js";import{postSessionCallbackRequest}from"#execution/session-callback-request.js";import{HookNotFoundError}from"#compiled/@workflow/errors/index.js";import{SUBAGENT_ADAPTER_KIND,isSubagentAdapterState}from"#subagents/adapter-state.js";const log=createLogger(`execution.delegated-parent-notification`),SUBAGENT_EXECUTION_FAILED=`SUBAGENT_EXECUTION_FAILED`,ZERO_TOKEN_USAGE={cacheReadTokens:0,cacheWriteTokens:0,inputTokens:0,outputTokens:0};async function notifyTurnCallerStep(e){"use step";if(e.caller===void 0)return;let t=createSettledTurnResult({caller:e.caller,lifecycle:e.lifecycle,sessionId:e.sessionId,settled:e.settled});if(e.caller.replyTo.kind===`callback`){await postSettledTurnCallback({result:t,sessionId:e.sessionId,url:e.caller.replyTo.url});return}await resumeSettledTurnHook(e.caller.replyTo.token,t)}async function notifyCancelledTaskCallerStep(e){"use step";let t=e.usage??ZERO_TOKEN_USAGE,n={code:SUBAGENT_EXECUTION_FAILED,message:`The agent invocation was cancelled.`},r={callId:e.caller.callId,isError:!0,kind:`subagent-result`,origin:`child`,outcome:{kind:`parked`,result:{kind:`cancelled`},usageDelta:t},output:n,subagentName:e.caller.subagentName},i=e.usage===void 0?r:{...r,usage:e.usage};if(e.caller.replyTo.kind===`callback`){await postSettledTurnCallback({result:i,sessionId:e.sessionId,url:e.caller.replyTo.url});return}await resumeSettledTurnHook(e.caller.replyTo.token,i)}function createSettledTurnResult(e){let t=e.settled.usage??ZERO_TOKEN_USAGE;if(e.settled.isError===!0){let n={code:SUBAGENT_EXECUTION_FAILED,message:toErrorMessage(e.settled.output)};return{callId:e.caller.callId,isError:!0,kind:`subagent-result`,origin:`child`,outcome:{kind:e.lifecycle,result:{error:n,kind:`failed`},usageDelta:t},output:n,subagentName:e.caller.subagentName}}let n=parseJsonValue(e.settled.output),r={callId:e.caller.callId,kind:`subagent-result`,origin:`child`,outcome:{kind:e.lifecycle,result:{kind:`succeeded`,output:n},usageDelta:t},output:n,subagentName:e.caller.subagentName};return e.settled.usage===void 0?r:{...r,usage:e.settled.usage}}async function resolveInitialTurnCallerStep(e){"use step";let t=e.serializedContext[SessionCallbackKey.name];if(t!==void 0){let e=parseSessionCallback(t);if(!e.ok)throw Error(`Serialized session callback is invalid.`,{cause:e.cause});return{callId:e.callback.callId,replyTo:{kind:`callback`,token:e.callback.token,url:e.callback.url},subagentName:e.callback.subagentName}}let n=(await deserializeContext(e.serializedContext)).get(ChannelKey);if(n?.kind===SUBAGENT_ADAPTER_KIND&&isSubagentAdapterState(n.state))return{callId:n.state.callId,replyTo:{kind:`hook`,token:n.state.parentContinuationToken},subagentName:n.state.subagentName}}function bindTurnCallerContext(e,t){if(e===void 0)return t;if(e.replyTo.kind===`callback`){let n={callId:e.callId,subagentName:e.subagentName,token:e.replyTo.token,url:e.replyTo.url};return{...t,[SessionCallbackKey.name]:n}}let n=t[ChannelKey.name];if(typeof n!=`object`||!n||Reflect.get(n,`kind`)!==SUBAGENT_ADAPTER_KIND||!isSubagentAdapterState(Reflect.get(n,`state`)))throw Error(`Delegated local turn is missing its subagent adapter binding.`);let r={...Reflect.get(n,`state`),callId:e.callId,parentContinuationToken:e.replyTo.token,subagentName:e.subagentName};return{...t,[ChannelKey.name]:{...n,state:r}}}async function postSettledTurnCallback(e){let{sessionId:t}=e;if(e.result.isError===!0){await postCallbackPayload({payload:{callId:e.result.callId,error:e.result.output,kind:`turn.failed`,outcome:e.result.outcome,sessionId:t,subagentName:e.result.subagentName},url:e.url});return}await postCallbackPayload({payload:{callId:e.result.callId,kind:`turn.completed`,outcome:e.result.outcome,output:e.result.output,sessionId:t,subagentName:e.result.subagentName},url:e.url})}const NOT_PENDING_RETRY_DELAYS_MS=[250,500,1e3,2e3,4e3];async function postCallbackPayload(e){for(let t=0;;t+=1){let n=await postSessionCallbackRequest({body:e.payload,url:e.url});if(n.ok)return;if(!await isCallbackNotPending(n))throw Error(`Turn callback failed with HTTP ${n.status}.`);let r=NOT_PENDING_RETRY_DELAYS_MS[t];if(r===void 0){log.warn(`turn caller no longer waits for this result`,{kind:Reflect.get(e.payload,`kind`)});return}await new Promise(e=>setTimeout(e,r))}}async function isCallbackNotPending(e){if(e.status!==404)return!1;let t=await e.json().catch(()=>void 0);return typeof t!=`object`||!t?!1:Reflect.get(t,`code`)===REMOTE_CALLBACK_NOT_PENDING||Reflect.get(t,`error`)===REMOTE_CALLBACK_NOT_PENDING_MESSAGE}async function resumeSettledTurnHook(e,t){try{await resumeHook(e,{kind:`runtime-action-result`,results:[t]})}catch(n){if(!HookNotFoundError.is(n))throw n;log.warn(`turn caller hook no longer exists`,{callId:t.callId,callerToken:e})}}export{NOT_PENDING_RETRY_DELAYS_MS,bindTurnCallerContext,notifyCancelledTaskCallerStep,notifyTurnCallerStep,resolveInitialTurnCallerStep};

package/dist/src/subagents/protocol-two-callback.d.ts

@@ -0,0 +1,27 @@
+import type { SubagentInteractionHookPayload } from "#channel/types.js";
+import type { InteractionKind } from "#protocol/session-events/families/interaction.js";
+import type { Answer } from "#protocol/session-events/families/response.js";
+/** The callback kinds a protocol 2 child posts about its people's input. */
+export declare const PROTOCOL_TWO_INPUT_CALLBACK_KINDS: ReadonlySet<unknown>;
+/**
+ * The answers a session forwarded to a protocol 2 child that it settles itself, as the child takes
+ * them: every answer but an approval's, which the child settles and relays, and but the one
+ * `decidedHere` names, which this session already settles its own way, such as Stop on a budget
+ * prompt.
+ */
+export declare function protocolTwoAnswersSettledOnForward(input: {
+    readonly answers: readonly Answer[];
+    readonly decidedHere?: string;
+    readonly kindOf: (interactionId: string) => InteractionKind | undefined;
+}): Answer[];
+/**
+ * A protocol 2 input callback as that protocol's own parent reads it, for a parent run from before
+ * v27 (the callback route resumes its hook with it as is), or `undefined` when the body is not one.
+ */
+export declare function parseProtocolTwoInputCallback(body: unknown): object | undefined;
+/**
+ * Reads a protocol 2 child's input callback as the interaction facts it records, or `undefined`
+ * when the body is not one. A callback that records nothing this session mirrors, such as an
+ * approval's own settlement, reads as a payload without events.
+ */
+export declare function readProtocolTwoInputCallback(body: unknown): SubagentInteractionHookPayload | undefined;

package/dist/src/subagents/protocol-two-callback.js

@@ -0,0 +1 @@
+import{z}from"#compiled/zod/index.js";import{jsonObjectSchema}from"#shared/json-schemas.js";import{fact}from"#harness/facts.js";import{v26InteractionOutcome,v26InteractionRequest,v26SignInOutcome,v26SignInRequest}from"#protocol/v26-interactions.js";const PROTOCOL_TWO_INPUT_CALLBACK_KINDS=new Set([`subagent-input-request`,`subagent-authorization-event`]),position={sequence:z.number(),stepIndex:z.number(),turnId:z.string()},v26RequestSchema=z.object({action:z.object({callId:z.string().min(1),input:jsonObjectSchema,kind:z.literal(`tool-call`),toolName:z.string().min(1)}),allowFreeform:z.boolean().optional(),display:z.string().optional(),kind:z.enum([`question`,`session-limit`,`tool-approval`]),options:z.array(z.object({description:z.string().optional(),id:z.string(),label:z.string(),style:z.string().optional()})).optional(),prompt:z.string(),requestId:z.string().min(1)}),v26ResponseSchema=z.object({optionId:z.string().optional(),requestId:z.string(),text:z.string().optional()}),inputRequestCallbackSchema=z.object({callId:z.string().min(1),childContinuationToken:z.string().min(1),childSessionId:z.string().min(1),childSessionInbox:z.object({sessionId:z.string().min(1)}).strict().optional(),inputSource:z.string().min(1).optional(),remote:z.object({forwardPrincipal:z.boolean().optional(),name:z.string().min(1),resolverId:z.string().min(1).optional(),sessionId:z.string().min(1),url:z.string().url()}).strict().optional(),kind:z.literal(`subagent-input-request`),subagentName:z.string().min(1),event:z.object({...position,requests:z.array(v26RequestSchema).min(1),taskId:z.string().optional()})}),signInFields={...position,attemptId:z.string().min(1).optional(),name:z.string(),principalId:z.string().optional(),taskId:z.string().optional()},authorizationCallbackSchema=z.object({callId:z.string().min(1),childSessionId:z.string().min(1),kind:z.literal(`subagent-authorization-event`),subagentName:z.string().min(1),event:z.discriminatedUnion(`type`,[z.object({type:z.literal(`approval.candidate`),data:z.object({...position,candidateId:z.string(),outcome:z.enum([`pending`,`rejected`,`failed`,`timed-out`,`stale`]),reason:z.string().optional(),requestId:z.string().min(1),responderPrincipalId:z.string()}).passthrough()}),z.object({type:z.literal(`approval.settled`),data:z.object({...position,outcome:z.enum([`approved`,`cancelled`]),requestId:z.string().min(1),responderPrincipalId:z.string()}).passthrough()}),z.object({type:z.literal(`input.resolved`),data:z.object({...position,resolutions:z.array(z.object({kind:z.enum([`question`,`session-limit`,`tool-approval`]),outcome:z.enum([`answered`,`approved`,`cancelled`,`denied`,`ignored`,`invalid`]),requestId:z.string().min(1),response:v26ResponseSchema.optional()}).passthrough())}).passthrough()}),z.object({type:z.literal(`authorization.required`),data:z.object({...signInFields,description:z.string(),webhookUrl:z.string().optional()}).passthrough()}),z.object({type:z.literal(`authorization.completed`),data:z.object({...signInFields,outcome:z.enum([`authorized`,`declined`,`failed`,`timed-out`])}).passthrough()})])});function protocolTwoAnswersSettledOnForward(e){return e.answers.filter(({interactionId:t})=>t!==e.decidedHere&&e.kindOf(t)!==`approval`)}function parseProtocolTwoInputCallback(e){let t=inputRequestCallbackSchema.safeParse(e);if(t.success)return t.data;let n=authorizationCallbackSchema.safeParse(e);return n.success?n.data:void 0}function readProtocolTwoInputCallback(e){let t=inputRequestCallbackSchema.safeParse(e);if(t.success){let{data:e}=t;return{callId:e.callId,childSessionId:e.childSessionId,events:e.event.requests.map(t=>{let n={interactionId:t.requestId,sessionId:e.childSessionId};return fact(`interaction.opened`,{interactionId:t.requestId,origin:t.kind===`session-limit`?n:{...n,call:{callId:t.action.callId,input:t.action.input,name:t.action.toolName}},request:v26InteractionRequest(t),subject:{turnId:e.event.turnId}})}),kind:`subagent-interaction`,route:{childContinuationToken:e.childContinuationToken,...e.childSessionInbox!==void 0&&{childSessionInbox:e.childSessionInbox},...e.inputSource!==void 0&&{inputSource:e.inputSource}},subagentName:e.subagentName}}let n=authorizationCallbackSchema.safeParse(e);if(!n.success)return;let{data:r}=n;return{callId:r.callId,childSessionId:r.childSessionId,events:authorizationEvents(r.childSessionId,r.event),kind:`subagent-interaction`,subagentName:r.subagentName}}function authorizationEvents(e,t){switch(t.type){case`approval.candidate`:{let{outcome:e,reason:n,requestId:r}=t.data;return e===`pending`?[{data:{interactionId:r},type:`response.admitted`}]:[{data:{interactionId:r,outcome:CANDIDATE_OUTCOMES[e],...n!==void 0&&{reason:n}},type:`response.settled`}]}case`approval.settled`:return[];case`input.resolved`:return t.data.resolutions.map(e=>{let t={};return e.response?.optionId!==void 0&&(t.optionId=e.response.optionId),e.response?.text!==void 0&&(t.text=e.response.text),fact(`interaction.settled`,{interactionId:e.requestId,outcome:v26InteractionOutcome(e.outcome),...Object.keys(t).length>0&&{response:t}})});case`authorization.required`:{let n=t.data.principalId,r=signInId(e,t.data);return[fact(`interaction.opened`,{...n!==void 0&&{audience:{principalIds:[n]}},interactionId:r,origin:{interactionId:r,sessionId:e},request:v26SignInRequest(t.data),subject:{turnId:t.data.turnId}})]}case`authorization.completed`:return[fact(`interaction.settled`,{interactionId:signInId(e,t.data),outcome:v26SignInOutcome(t.data.outcome)})]}}const CANDIDATE_OUTCOMES={failed:`failed`,rejected:`refused`,stale:`withdrawn`,"timed-out":`expired`};function signInId(e,t){return t.attemptId??`signin_${e}_${encodeURIComponent(t.name)}_${t.principalId??``}`}export{PROTOCOL_TWO_INPUT_CALLBACK_KINDS,parseProtocolTwoInputCallback,protocolTwoAnswersSettledOnForward,readProtocolTwoInputCallback};

package/dist/src/svelte/index.d.ts

@@ -1,7 +1,4 @@
 export { useEveAgent, type PrepareSend, type UseEveAgentOptions, type UseEveAgentReturn, type UseEveAgentSnapshot, type UseEveAgentStatus, } from "#svelte/use-eve-agent.js";
-export { type EveAgentReducer, type EveAgentReducerEvent, type ClientInputRespondedEvent, type ClientMessageFailedEvent, type ClientMessageSubmittedEvent, } from "#client/reducer.js";
-export { conversationReducer } from "#client/conversation-reducer.js";
-export { openConversationInputs } from "#client/conversation-state.js";
-export { toolCallState, type ToolCallState, type ToolCallStatus } from "#client/tool-call-state.js";
-export type { AgentObservation, ConversationAgentSession, ConversationInput, ConversationState, ConversationTask, ConversationTaskCall, ConversationTurn, } from "#client/conversation-state.js";
-export { defaultMessageReducer, type EveAuthorizationChallenge, type EveAuthorizationOutcome, type EveAuthorizationPart, type EveMessageData, type EveDynamicToolPart, type EveMessageInputRequest, type EveMessage, type EveMessageMetadata, type EveMessagePart, type EveMessageToolMetadata, } from "#client/message-reducer.js";
+export { signInEnding, type AskedCall, type Interaction, } from "#protocol/session-projection/reader.js";
+export type { AgentObservation, AgentObservationReason, FollowAgents, FollowedChild, ConversationAgentSession, ConversationState, } from "#client/conversation-state.js";
+export type { EveInteractionPart, EveMessage, EveMessageMetadata, EveMessagePart, EveToolPart, } from "#client/message-types.js";

package/dist/src/svelte/index.js

@@ -1,40 +1,3 @@
-import { a as conversationProjection, i as openConversationInputs, n as conversationReducer, o as callStatus, r as defaultMessageReducer, t as useEveAgent } from "../chunks/use-eve-agent-ZY7NQ2VW.js";
+import { n as signInEnding, t as useEveAgent } from "../chunks/use-eve-agent-DWjyzplb.js";
 
-//#region src/client/tool-call-state.ts
-function toolCallState(conversation, callId, options = {}) {
-	const part = findToolPart(conversation, callId);
-	const projection = conversationProjection(conversation);
-	const call = projection.calls[callId];
-	const status = callStatus(projection, callId, options) ?? partStatus(part, options);
-	if (status === void 0) return void 0;
-	const taskCall = (call?.taskId === void 0 ? void 0 : conversation.tasks[call.taskId])?.calls[callId];
-	const output = taskCall?.output ?? part?.output;
-	const errorText = taskCall?.error?.message ?? part?.errorText ?? call?.error?.message ?? (part?.state === "output-denied" ? part.approval.reason : void 0);
-	const state = { status: respondedStatus(conversation, part, status) };
-	if (output !== void 0) state.output = output;
-	if (errorText !== void 0) state.errorText = errorText;
-	if (call?.error?.code !== void 0) state.errorCode = call.error.code;
-	return state;
-}
-function respondedStatus(conversation, part, status) {
-	if (status !== "awaiting-input" || part?.state !== "approval-requested") return status;
-	const input = conversation.inputs[part.approval.id];
-	if (input?.status !== "responded") return status;
-	return input.response?.optionId === "approve" ? "running" : "rejected";
-}
-function partStatus(part, options) {
-	if (part === void 0) return void 0;
-	switch (part.state) {
-		case "output-available": return part.partial === true ? "running" : "completed";
-		case "output-error": return "failed";
-		case "output-denied": return "rejected";
-		case "approval-requested": return "awaiting-input";
-		default: return options.streaming === false ? "interrupted" : "running";
-	}
-}
-function findToolPart(conversation, callId) {
-	for (let index = conversation.messages.length - 1; index >= 0; index -= 1) for (const part of conversation.messages[index].parts) if (part.type === "dynamic-tool" && part.toolCallId === callId) return part;
-}
-
-//#endregion
-export { conversationReducer, defaultMessageReducer, openConversationInputs, toolCallState, useEveAgent };
+export { signInEnding, useEveAgent };