eve 0.90.0 → 0.91.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +34 -23
- package/dist/src/channel/auth/http-basic.js +1 -1
- package/dist/src/channel/channel-operations.d.ts +1 -1
- package/dist/src/channel/types.d.ts +2 -0
- package/dist/src/cli/dev/tui/prompt-commands.d.ts +1 -1
- package/dist/src/client/session.d.ts +1 -1
- package/dist/src/compiled/.vendor-stamp.json +1 -1
- package/dist/src/execution/dynamic-workflow/tool.js +1 -1
- package/dist/src/execution/proxied-deliver-step.js +1 -1
- package/dist/src/execution/sandbox/bash.js +2 -2
- package/dist/src/execution/session/active-turn.js +1 -1
- package/dist/src/execution/session/admission.d.ts +6 -0
- package/dist/src/execution/session/admission.js +1 -1
- package/dist/src/execution/session/delivery-facts.js +1 -1
- package/dist/src/execution/session/next-input.d.ts +2 -2
- package/dist/src/execution/session/next-input.js +1 -1
- package/dist/src/execution/session/program.js +1 -1
- package/dist/src/execution/session-inbox/inbox.d.ts +2 -2
- package/dist/src/execution/session-inbox/inbox.js +1 -1
- package/dist/src/execution/session-inbox/protocol.js +1 -1
- package/dist/src/execution/tools/agent-router-workflow.js +1 -1
- package/dist/src/harness/compaction/engine.js +2 -2
- package/dist/src/harness/current-messages.js +1 -1
- package/dist/src/harness/emission.d.ts +3 -0
- package/dist/src/harness/emission.js +1 -1
- package/dist/src/harness/facts.d.ts +5 -2
- package/dist/src/harness/facts.js +1 -1
- package/dist/src/harness/model-call/call.d.ts +7 -1
- package/dist/src/harness/model-call/call.js +3 -1
- package/dist/src/harness/provider-tool-history.d.ts +8 -0
- package/dist/src/harness/provider-tool-history.js +1 -1
- package/dist/src/harness/session-machine/transitions.d.ts +3 -2
- package/dist/src/harness/step/after-model.js +1 -1
- package/dist/src/harness/step/context.js +1 -1
- package/dist/src/harness/step/intake.js +1 -1
- package/dist/src/harness/step/prompt.js +1 -1
- package/dist/src/harness/tool-history-repair.d.ts +2 -0
- package/dist/src/harness/tool-history-repair.js +1 -1
- package/dist/src/harness/tool-loop.js +1 -1
- package/dist/src/internal/application/stamped-package-version.js +1 -1
- package/dist/src/protocol/session-events/families/delivery.d.ts +5 -3
- package/dist/src/protocol/session-events/families/delivery.js +1 -1
- package/dist/src/protocol/session-projection/fold.js +1 -1
- package/dist/src/public/channels/discord/hitl.js +1 -1
- package/dist/src/public/channels/slack/hitl.d.ts +2 -1
- package/dist/src/public/channels/slack/hitl.js +3 -3
- package/dist/src/public/channels/slack/interaction-cards.js +1 -1
- package/dist/src/public/channels/slack/request-card-render.js +1 -1
- package/dist/src/public/channels/teams/hitl.js +1 -1
- package/dist/src/public/channels/teams/verify.js +1 -1
- package/dist/src/public/definitions/hook.d.ts +90 -7
- package/dist/src/public/definitions/hook.js +1 -1
- package/dist/src/public/hooks/index.d.ts +3 -2
- package/dist/src/reactions/continuation.d.ts +19 -0
- package/dist/src/reactions/continuation.js +1 -0
- package/dist/src/reactions/intents.d.ts +10 -4
- package/dist/src/reactions/intents.js +1 -1
- package/dist/src/reactions/kinds/hook.js +1 -1
- package/dist/src/reactions/runner.js +1 -1
- package/dist/src/reactions/state.d.ts +15 -2
- package/dist/src/reactions/state.js +1 -1
- package/dist/src/runtime/resolve-connection.js +1 -1
- package/dist/src/runtime/subagents/workflow.js +1 -1
- package/dist/src/setup/primitives/open-url.js +1 -1
- package/dist/src/setup/scaffold/create/project.js +1 -1
- package/dist/src/shared/value-delta.d.ts +5 -4
- package/dist/src/shared/value-delta.js +1 -1
- package/dist/src/tools/provided/ask-question-workflow.js +1 -1
- package/dist/src/tools/provided/sleep-workflow.js +1 -1
- package/dist/src/tools/provided/web-fetch.js +1 -1
- package/docs/agent-config.md +199 -222
- package/docs/channels/chat-sdk.mdx +60 -64
- package/docs/channels/custom.mdx +264 -281
- package/docs/channels/discord.mdx +176 -123
- package/docs/channels/eve.mdx +136 -206
- package/docs/channels/github.mdx +24 -22
- package/docs/channels/linear.mdx +30 -30
- package/docs/channels/linq.mdx +25 -13
- package/docs/channels/mcp.mdx +154 -116
- package/docs/channels/overview.mdx +31 -32
- package/docs/channels/photon.mdx +32 -56
- package/docs/channels/slack.mdx +538 -375
- package/docs/channels/teams.mdx +40 -26
- package/docs/channels/telegram.mdx +13 -13
- package/docs/channels/twilio.mdx +11 -11
- package/docs/code-extension.mdx +40 -42
- package/docs/concepts/built-in-tools.md +89 -57
- package/docs/concepts/context-control.md +20 -20
- package/docs/concepts/default-harness.md +20 -36
- package/docs/concepts/execution-model-and-durability.mdx +96 -160
- package/docs/concepts/project-structure.mdx +21 -14
- package/docs/concepts/security-model.md +27 -27
- package/docs/concepts/sessions-runs-and-streaming.md +184 -198
- package/docs/concepts/state.md +7 -15
- package/docs/connections/mcp.mdx +109 -93
- package/docs/connections/openapi.mdx +57 -59
- package/docs/connections/overview.mdx +175 -170
- package/docs/evals/assertions.mdx +36 -29
- package/docs/evals/cases.mdx +38 -42
- package/docs/evals/judge.mdx +21 -29
- package/docs/evals/overview.mdx +42 -38
- package/docs/evals/reporters.mdx +54 -27
- package/docs/evals/running.mdx +15 -8
- package/docs/evals/targets.mdx +16 -19
- package/docs/evals/tool-stubs.mdx +111 -97
- package/docs/experimental/dynamic-schedules.mdx +118 -63
- package/docs/extensions.md +58 -65
- package/docs/getting-started.mdx +4 -6
- package/docs/guides/auth-and-route-protection.md +87 -70
- package/docs/guides/client/continuations.mdx +23 -26
- package/docs/guides/client/messages.mdx +47 -66
- package/docs/guides/client/output-schema.mdx +8 -8
- package/docs/guides/client/overview.mdx +45 -43
- package/docs/guides/client/streaming.mdx +62 -71
- package/docs/guides/decide.md +24 -79
- package/docs/guides/deployment/meta.json +1 -1
- package/docs/guides/deployment/overview.md +27 -18
- package/docs/guides/deployment/self-hosted-operations.md +99 -0
- package/docs/guides/deployment/self-hosting.md +63 -80
- package/docs/guides/deployment/vercel.mdx +31 -27
- package/docs/guides/deployment/workflow-worlds.md +100 -0
- package/docs/guides/dev-tui.md +48 -41
- package/docs/guides/dynamic-capabilities.md +49 -50
- package/docs/guides/frontend/nextjs.mdx +2 -2
- package/docs/guides/frontend/nuxt.mdx +11 -11
- package/docs/guides/frontend/overview.mdx +1 -1
- package/docs/guides/frontend/sveltekit.mdx +11 -11
- package/docs/guides/frontend/tanstack.mdx +16 -16
- package/docs/guides/frontend/use-eve-agent-svelte.mdx +21 -21
- package/docs/guides/frontend/use-eve-agent-vue.mdx +22 -22
- package/docs/guides/frontend/use-eve-agent.mdx +25 -25
- package/docs/guides/hooks.md +152 -106
- package/docs/guides/instrumentation/agent-runs.mdx +26 -30
- package/docs/guides/instrumentation/instrumentation.mdx +49 -76
- package/docs/guides/instrumentation/meta.json +1 -1
- package/docs/guides/instrumentation/otel.mdx +113 -179
- package/docs/guides/remote-agents.md +125 -187
- package/docs/guides/self-modification.md +18 -18
- package/docs/guides/session-context.md +16 -16
- package/docs/install-integrations.mdx +26 -24
- package/docs/instructions.mdx +37 -42
- package/docs/memory/custom-provider.md +35 -41
- package/docs/memory/file.md +93 -76
- package/docs/memory/overview.mdx +145 -156
- package/docs/patterns/durable-cross-channel-notifications.md +15 -19
- package/docs/patterns/dynamic-scheduling.md +19 -23
- package/docs/patterns/multi-tenant-approvals.md +17 -22
- package/docs/patterns/multi-tenant-auth.md +43 -42
- package/docs/patterns/multi-tenant-memory.md +39 -36
- package/docs/patterns/voice-notes.md +3 -3
- package/docs/protocols/acp.md +13 -13
- package/docs/protocols/ucp.mdx +7 -7
- package/docs/reference/agent-files.md +6 -6
- package/docs/reference/cli.md +99 -98
- package/docs/reference/telemetry.md +1 -1
- package/docs/reference/typescript-api.md +52 -53
- package/docs/responsible-use.md +2 -2
- package/docs/sandbox/custom-providers.mdx +60 -56
- package/docs/sandbox/default.mdx +23 -24
- package/docs/sandbox/docker.mdx +16 -10
- package/docs/sandbox/index.mdx +93 -61
- package/docs/sandbox/just-bash.mdx +17 -11
- package/docs/sandbox/troubleshooting.mdx +29 -23
- package/docs/sandbox/vercel.mdx +45 -52
- package/docs/schedules.mdx +65 -54
- package/docs/skills.mdx +74 -49
- package/docs/subagents/index.mdx +97 -136
- package/docs/tools/human-in-the-loop.md +160 -90
- package/docs/tools/meta.json +1 -1
- package/docs/tools/overview.mdx +229 -237
- package/docs/tools/tasks.md +118 -117
- package/docs/tools/workflows.mdx +447 -543
- package/docs/tutorial/connect-a-warehouse.mdx +11 -13
- package/docs/tutorial/first-agent.mdx +14 -16
- package/docs/tutorial/guard-the-spend.mdx +6 -8
- package/docs/tutorial/how-it-runs.mdx +8 -8
- package/docs/tutorial/query-sample-data.mdx +8 -8
- package/docs/tutorial/remember-definitions.mdx +4 -4
- package/docs/tutorial/run-analysis.mdx +20 -22
- package/docs/tutorial/ship-it.mdx +19 -19
- package/docs/tutorial/team-playbooks.mdx +9 -9
- package/docs/use-cases.mdx +13 -11
- package/package.json +1 -1
- package/docs/guides/instrumentation/migration.md +0 -96
- package/docs/tools/tasks-upgrade.md +0 -218
|
@@ -71,10 +71,13 @@ export declare function delegatedUsageFact(callId: string | undefined, usage: Us
|
|
|
71
71
|
export declare function contextStarted(data: FactOf<"context.started">["data"]): SessionEvent;
|
|
72
72
|
/** A control's admission: the delivery it arrived as, its kind, and who sent it. */
|
|
73
73
|
export declare function controlAdmitted(delivery: ControlDelivery, control: string): SessionEvent;
|
|
74
|
+
/** A control's admission and settlement, recorded together. */
|
|
74
75
|
export interface ControlSettlement {
|
|
75
76
|
readonly control: ControlDelivery;
|
|
76
|
-
|
|
77
|
-
readonly
|
|
77
|
+
/** The control's kind as it arrived; an owner may receive one it doesn't know. */
|
|
78
|
+
readonly source: string;
|
|
79
|
+
readonly outcome: "ignored" | "applied" | "failed";
|
|
80
|
+
readonly reason?: string;
|
|
78
81
|
}
|
|
79
82
|
/** A control that finishes without a step of its own, admitted and settled together. */
|
|
80
83
|
export declare function controlSettled(settlement: ControlSettlement): SessionEvent[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{activeTurn}from"#protocol/session-projection/selectors.js";function defined(e){return Object.fromEntries(Object.entries(e).filter(([,e])=>e!==void 0))}function fact(e,t){return{data:defined(t),type:e}}function usageOf(e){return defined({cacheReadTokens:e.cacheReadTokens??0,cacheWriteTokens:e.cacheWriteTokens??0,costUsd:e.costUsd,inputTokens:e.inputTokens??0,outputTokens:e.outputTokens??0})}function errorInfoOf(e){let{errorId:t,hint:n}=e.details??{};return defined({code:e.code,hint:typeof n==`string`&&n.trim().length>0?n.trim():void 0,id:typeof t==`string`?t:void 0,message:e.message})}function sessionEndedFacts(e,t){let n=[];e!==void 0&&e.view.session.status===`new`&&n.push(fact(`session.started`,{}));for(let e of t.settles??[])n.push(...controlSettled(e));let{control:r}=t;r!==void 0&&n.push(controlAdmitted(r,`reset`),deliveryApplied(r.deliveryId));let i=r===void 0?t.cause:{deliveryId:r.deliveryId};return n.push(fact(`session.ended`,{cause:i,error:t.error,outcome:t.outcome})),n}function turnSettled(e,t,n=activeTurn(e.view)?.turnId){if(n===void 0)return[];let r=e.view.turns[n]?.reply;return[fact(`turn.settled`,{...t,reply:r!==void 0&&r.length>0?r:void 0,turnId:n})]}function runRequested(e,t){return fact(`model.requested`,{owner:e,runId:t})}function runStarted(e){let{attempt:t,modelId:n,runId:r}=e;return fact(`model.started`,{attempt:t,modelId:n,runId:r})}function runSettledFacts(e){let{usage:t,...n}=e,r=[fact(`model.settled`,n)];return t!==void 0&&r.push(fact(`usage.recorded`,{kind:`model`,owner:{runId:e.runId},usage:t})),r}function delegatedUsageFact(e,t){let n=usageOf(t);return e===void 0?fact(`usage.recorded`,{kind:`delegated-late`,usage:n}):fact(`usage.recorded`,{kind:`model`,owner:{callId:e},usage:n})}function contextStarted(e){return fact(`context.started`,e)}function controlAdmitted(e,t){return fact(`delivery.admitted`,{deliveryId:e.deliveryId,principal:e.principal,source:{control:t}})}function controlSettled(e){let{control:t,outcome:n,source:
|
|
1
|
+
import{activeTurn}from"#protocol/session-projection/selectors.js";function defined(e){return Object.fromEntries(Object.entries(e).filter(([,e])=>e!==void 0))}function fact(e,t){return{data:defined(t),type:e}}function usageOf(e){return defined({cacheReadTokens:e.cacheReadTokens??0,cacheWriteTokens:e.cacheWriteTokens??0,costUsd:e.costUsd,inputTokens:e.inputTokens??0,outputTokens:e.outputTokens??0})}function errorInfoOf(e){let{errorId:t,hint:n}=e.details??{};return defined({code:e.code,hint:typeof n==`string`&&n.trim().length>0?n.trim():void 0,id:typeof t==`string`?t:void 0,message:e.message})}function sessionEndedFacts(e,t){let n=[];e!==void 0&&e.view.session.status===`new`&&n.push(fact(`session.started`,{}));for(let e of t.settles??[])n.push(...controlSettled(e));let{control:r}=t;r!==void 0&&n.push(controlAdmitted(r,`reset`),deliveryApplied(r.deliveryId));let i=r===void 0?t.cause:{deliveryId:r.deliveryId};return n.push(fact(`session.ended`,{cause:i,error:t.error,outcome:t.outcome})),n}function turnSettled(e,t,n=activeTurn(e.view)?.turnId){if(n===void 0)return[];let r=e.view.turns[n]?.reply;return[fact(`turn.settled`,{...t,reply:r!==void 0&&r.length>0?r:void 0,turnId:n})]}function runRequested(e,t){return fact(`model.requested`,{owner:e,runId:t})}function runStarted(e){let{attempt:t,modelId:n,runId:r}=e;return fact(`model.started`,{attempt:t,modelId:n,runId:r})}function runSettledFacts(e){let{usage:t,...n}=e,r=[fact(`model.settled`,n)];return t!==void 0&&r.push(fact(`usage.recorded`,{kind:`model`,owner:{runId:e.runId},usage:t})),r}function delegatedUsageFact(e,t){let n=usageOf(t);return e===void 0?fact(`usage.recorded`,{kind:`delegated-late`,usage:n}):fact(`usage.recorded`,{kind:`model`,owner:{callId:e},usage:n})}function contextStarted(e){return fact(`context.started`,e)}function controlAdmitted(e,t){return fact(`delivery.admitted`,{deliveryId:e.deliveryId,principal:e.principal,source:{control:t}})}function controlSettled(e){let{control:t,outcome:n,reason:r,source:i}=e;return[controlAdmitted(t,i),fact(`delivery.settled`,{deliveryId:t.deliveryId,outcome:n,...r!==void 0&&{reason:r}})]}function deliveryApplied(e){return fact(`delivery.settled`,{deliveryId:e,outcome:`applied`})}export{contextStarted,controlAdmitted,controlSettled,defined,delegatedUsageFact,deliveryApplied,errorInfoOf,fact,runRequested,runSettledFacts,runStarted,sessionEndedFacts,turnSettled,usageOf};
|
|
@@ -83,7 +83,13 @@ export declare class ModelCaller {
|
|
|
83
83
|
/** The step's result counted its usage, so an interrupted call's usage no longer applies. */
|
|
84
84
|
clearInterruptedUsage(): void;
|
|
85
85
|
private buildRequest;
|
|
86
|
-
|
|
86
|
+
/**
|
|
87
|
+
* The call's instructions and messages, with the attempt's notes. A trailing user note keeps the
|
|
88
|
+
* provider's cached prefix valid, and the step commits its prompt messages, so the note exists
|
|
89
|
+
* only on this call's request. It would end the request on a user message, which a provider
|
|
90
|
+
* tool's pending result must not follow, so then it joins the system note.
|
|
91
|
+
*/
|
|
92
|
+
private framing;
|
|
87
93
|
private prepare;
|
|
88
94
|
/** Compacts the prompt when it's over the threshold, then rebuilds what depends on it. */
|
|
89
95
|
private compact;
|
|
@@ -1 +1,3 @@
|
|
|
1
|
-
import{modelCallErrorInfo,reportCompactionFailure,reportModelCallFailure}from"./failure.js";import{buildGatewayAttributionHeaders,withGatewayTraceContext}from"./model.js";import{isEmptyModelResponse,recoverModelCall,rethrowNoOutputAsEmptyResponse}from"./recovery.js";import{modelInstructions,requestMessages,withTrailingUserNote}from"./request.js";import{answerSkippedToolCalls,extractToolResultCallIds,withCallResults}from"./response.js";import{ALLOW_RETRY,STOP_RETRY,runModelCallWithRetries}from"./retry.js";import{withUniqueCallIds}from"./unique-call-ids.js";import{prepareModelTools}from"./tools.js";import{extractGatewayCostUsd,extractTokenUsageDelta}from"./usage.js";import{ToolLoopAgent,isStepCount}from"ai";import{createLogger,logError}from"#internal/logging.js";import{AuthKey,HistoryStateKey}from"#context/keys.js";import{REPLY_TOOL_NAME}from"#protocol/reply-tool.js";import{activeTurnId}from"#harness/session-machine/view.js";import{hydrateSandboxAttachments,moveToolResultFilesToUserMessages}from"#harness/attachment-staging.js";import{workingTaskIds}from"#execution/tasks/model-step.js";import{historyCallNames,toEntryStep,toEntryStream}from"#harness/execute-call.js";import{discardAttempt}from"#harness/session-machine/transitions.js";import{summarizeKnownError}from"#harness/semantic-errors/index.js";import{nextChangeId,nextRunId}from"#protocol/session-projection.js";import{fact,usageOf}from"#harness/facts.js";import{throwIfTurnAborted}from"#harness/turn-cancellation.js";import{compactedTurnInput,maybeCompact}from"#harness/compaction/step.js";import{CompactionOverLimitError}from"#harness/compaction/over-limit-error.js";import{estimateTokens}from"#harness/token-estimate.js";import{withoutPromptMeasurement}from"#harness/compaction/engine.js";import{requireSessionModelReference}from"#harness/types.js";import{ContentFilteredModelResponseError,EmptyModelResponseError,ModelStreamStalledError}from"#harness/model-call/errors.js";import{resolveModelProfile}from"#harness/model-profile.js";import{interruptStreamOnFailure}from"#harness/interruptible-stream.js";import{NO_INLINE_CALLS,executeInlineCalls}from"#harness/call-executor.js";import{emitStreamContent}from"#harness/emission.js";import{estimateRequestEnvelope}from"#harness/request-envelope.js";import{compactPrompt,projectPrompt,withClientContext}from"#harness/step/prompt.js";import{buildStepHooks,emitStepActions,readGatewayGenerationId}from"#harness/step-hooks.js";const environment=process.env.NODE_ENV??`unknown`,log=createLogger(`harness.tool-loop`),MODEL_OUTPUT_TIMEOUT_MS=6e5;var ModelCaller=class{profile;attributionHeaders;projectedMessages;turnMessages;request;modelMessages=[];requestEnvelopeTokens=0;interruptedUsage;compactionFailure;attemptIndex=0;started;acceptedOutput=!1;step;prompt;input;constructor(e,t,n){this.step=e,this.prompt=t,this.input=n,this.profile=resolveModelProfile(n.model,requireSessionModelReference(e.session).promptCache),this.attributionHeaders=buildGatewayAttributionHeaders(this.profile,e.config.runtimeIdentity),this.projectedMessages=n.projectedMessages,this.turnMessages=n.turnMessages,this.request=this.buildRequest()}async call(){let e={},t={policies:[()=>this.compactionFailure===void 0?ALLOW_RETRY:STOP_RETRY],onRetry:e=>this.prepareRetry(e),sessionId:this.step.session.sessionId,turnId:this.step.position().turnId};for(;;)try{return await runModelCallWithRetries(()=>this.attempt(e),t,this.input.generation.signal)}catch(n){if(this.compactionFailure!==void 0)throw this.compactionFailure.error;throwIfTurnAborted(this.step.config.abortSignal),this.input.generation.check();let r=recoverModelCall(n,e,t);if(r===void 0)throw n;await this.prepareRetry(n),e=r}}async prepareRetry(e){let{step:t}=this,n=t.position().runId,r=this.started;if(this.started=void 0,n!==void 0){if(this.acceptedOutput){await t.apply(discardAttempt(t.view(),{ending:`retried`,runId:n})),this.acceptedOutput=!1,await this.input.newRun();return}r!==void 0&&await t.apply([fact(`model.retried`,{attempt:r,error:modelCallErrorInfo(e),runId:n})])}}async failIfCompactionFailed(){if(this.compactionFailure===void 0)return;let{error:e}=this.compactionFailure;return e instanceof CompactionOverLimitError?reportCompactionFailure(this.step,e):reportModelCallFailure(this.step,e)}async steered(){let{step:e}=this;throwIfTurnAborted(e.config.abortSignal),this.input.generation.end(),e.ctx?.set(HistoryStateKey,this.request.historyState);let t=e.position().runId;return t!==void 0&&await e.apply(discardAttempt(e.view(),{ending:`steered`,runId:t,usage:this.interruptedUsage===void 0?void 0:usageOf(this.interruptedUsage)})),{next:e.runStep,session:{...e.session,history:[...this.request.history]},steered:!0}}clearInterruptedUsage(){this.interruptedUsage=void 0}buildRequest(){return requestMessages(this.step,{catalog:this.input.catalog,messages:this.prompt.messages,pendingApprovalsNote:this.input.pendingApprovalsNote,projectedMessages:this.projectedMessages,turnMessages:this.turnMessages})}instructions(e){return modelInstructions({anthropicCache:this.profile.anthropicCache,extraSystemNote:e,session:this.step.session,systemMessages:this.request.systemMessages})}async prepare(e){let t=await prepareModelTools(this.step,{catalog:this.input.catalog,disabledProviderTools:e.disabledProviderTools,profile:this.profile});return this.request=this.buildRequest(),this.requestEnvelopeTokens=await estimateRequestEnvelope({history:this.projectedMessages,instructions:this.instructions(e.extraSystemNote),messages:withTrailingUserNote(this.request.nonSystemMessages,e.trailingUserNote),tools:t}),t}async compact(e,t){let{step:n,prompt:r}=this,{config:i}=n,a;try{let{projection:e}=n.view();if(a=await maybeCompact({abortSignal:i.abortSignal,auth:n.ctx?.get(AuthKey)??null,change:{changeId:nextChangeId(e),summaryRunId:nextRunId(e),turnId:n.position().turnId},ctx:n.ctx,emissionState:n.position(),messages:[...r.messages],model:this.input.model,promptMessages:withClientContext(r),publish:n.publish,view:()=>n.view().projection.view,requestEnvelopeTokens:this.requestEnvelopeTokens,resolveModel:i.resolveModel,runtimeIdentity:i.runtimeIdentity,session:n.session,prepareTelemetry:e=>n.instrumentation?.prepareAttempt({runId:e,attempt:0,turnId:activeTurnId(n.position())}).telemetry,traceContextHeaders:n.instrumentation?.gatewayTraceContextHeaders}),n.session=a.session,a.failure!==void 0)throw a.failure.error}catch(e){throw this.compactionFailure={error:e},e}if(!a.compacted)return t;compactPrompt(n,r,a.messages);let o=compactedTurnInput(r.messages);return this.turnMessages=o===void 0?this.input.turnMessages:[...this.input.turnMessages,o],n.session={...n.session,compaction:withoutPromptMeasurement(n.session.compaction)},this.projectedMessages=projectPrompt(r),await this.prepare(e)}async attempt(e){let{step:t}=this,{generation:n,model:r}=this.input,i=await this.compact(e,await this.prepare(e)),a=this.attemptIndex++;await this.input.startRun(a),this.started=a,this.requestEnvelopeTokens=Math.max(0,this.requestEnvelopeTokens-(estimateTokens(this.request.history)-estimateTokens(this.prompt.messages))),n.begin(),this.modelMessages=await hydrateSandboxAttachments(this.request.nonSystemMessages),this.profile.filesOutsideToolResults&&(this.modelMessages=moveToolResultFilesToUserMessages(this.modelMessages));let o=this.instructions(e.extraSystemNote),s=t.instrumentation?.resolveRuntimeContext({attempt:a,emissionState:t.position(),environment,modelInput:{instructions:o,messages:this.modelMessages},session:t.session})??{};e.retryReason&&(s[`eve.retry.reason`]=e.retryReason);let c=withTrailingUserNote(this.modelMessages,e.trailingUserNote),l=t.position(),u=t.instrumentation?.prepareAttempt({isFrameworkTool:e=>t.frameworkToolNames.has(e),runId:l.runId,attempt:a,runtimeContext:s,stepIndex:l.stepIndex,turnId:activeTurnId(l)}),d=buildStepHooks({auth:t.ctx?.get(AuthKey)??null,profile:this.profile,session:t.session}),f={headers:this.attributionHeaders,instructions:o,model:withUniqueCallIds(withGatewayTraceContext(r,this.profile,this.step.instrumentation?.gatewayTraceContextHeaders),[...Object.keys(t.view().projection.view.calls),...historyCallNames(c).keys()]),onLanguageModelCallEnd:e=>{n.interrupted||(this.interruptedUsage=extractTokenUsageDelta({costUsd:extractGatewayCostUsd(e.providerMetadata),usage:e.usage}))},onError(e){n.interrupted||summarizeKnownError(e.error)?.tags.includes(`config`)!==!0&&logError(log,`tool-loop stream error`,e.error)},onStepEnd:d.onStepEnd,onStepStart:d.onStepStart,prepareStep:d.prepareStep,reasoning:t.session.agent.modelReference?.reasoning??t.session.agent.reasoning,runtimeContext:s,stopWhen:isStepCount(1),telemetry:u?.telemetry,timeout:{chunkMs:MODEL_OUTPUT_TIMEOUT_MS,firstChunkMs:MODEL_OUTPUT_TIMEOUT_MS},tools:i},p=new ToolLoopAgent(f);try{return await this.stream(p,c,d.stepResult,u?.telemetry)}catch(e){if(n.check(),isAbortError(e)&&!n.signal.aborted)throw new ModelStreamStalledError({cause:e});return rethrowNoOutputAsEmptyResponse(e)}}async stream(e,t,n,r){let{step:i}=this,{catalog:a,generation:o}=this.input,s=new Set([REPLY_TOOL_NAME]),c=await e.stream({abortSignal:o.signal,messages:t}),{invalidInputToolCallIds:l,trailingInlineToolResultParts:u}=await emitStreamContent(async(e,t)=>{this.acceptedOutput=!0,await i.publish(e,t)},i.position(),toEntryStream(interruptStreamOnFailure(c.fullStream,o.signal),a.resolve),{excludedActionToolNames:s,held:i.finalReplyOnly&&workingTaskIds(i.session).length>0,finalReplyOnly:i.finalReplyOnly,tools:a,interruptSignal:o.signal});throwIfTurnAborted(i.config.abortSignal),o.check();let[d,f]=toEntryStep(...await Promise.all([n,c.responseMessages]),a.resolve);assertUsableResponse(d,f,{allowEmptyStop:!i.hasDelegatedCaller,hasInlineResults:u.length>0});let p=await this.runInlineCalls(d,t,{excludedCallIds:l,telemetry:r}),m=answerSkippedToolCalls(d,a,l);return await emitStepActions(i.publish,i.position(),d,m),withCallResults({answers:[...u,...m],calls:p,invalidInputToolCallIds:l,responseMessages:f,stepResult:d})}async runInlineCalls(e,t,n){let{finishReason:r}=e;if(r!==`stop`&&r!==`tool-calls`)return NO_INLINE_CALLS;let{step:i}=this,a=await executeInlineCalls({abortSignal:this.input.generation.signal,approvalMemory:this.input.approvalMemory,beforeExecute:()=>this.input.generation.protectToolExecution(),excludedCallIds:n.excludedCallIds??new Set,messages:t,modelCallId:e.callId,publish:i.publish,telemetry:n.telemetry,toolCalls:e.toolCalls??[],tools:this.input.catalog});return throwIfTurnAborted(i.config.abortSignal),a}};function assertUsableResponse(e,t,n){if(e.finishReason===`content-filter`)throw new ContentFilteredModelResponseError(readGatewayGenerationId(e.providerMetadata));if(!(n.allowEmptyStop&&e.finishReason===`stop`)&&isEmptyModelResponse(e)&&extractToolResultCallIds(t).size===0&&!n.hasInlineResults)throw new EmptyModelResponseError}function isAbortError(e){return e instanceof Error&&(e.name===`AbortError`||e.name===`TimeoutError`)}export{ModelCaller};
|
|
1
|
+
import{modelCallErrorInfo,reportCompactionFailure,reportModelCallFailure}from"./failure.js";import{buildGatewayAttributionHeaders,withGatewayTraceContext}from"./model.js";import{isEmptyModelResponse,recoverModelCall,rethrowNoOutputAsEmptyResponse}from"./recovery.js";import{modelInstructions,requestMessages,withTrailingUserNote}from"./request.js";import{answerSkippedToolCalls,extractToolResultCallIds,withCallResults}from"./response.js";import{ALLOW_RETRY,STOP_RETRY,runModelCallWithRetries}from"./retry.js";import{withUniqueCallIds}from"./unique-call-ids.js";import{prepareModelTools}from"./tools.js";import{extractGatewayCostUsd,extractTokenUsageDelta}from"./usage.js";import{ToolLoopAgent,isStepCount}from"ai";import{createLogger,logError}from"#internal/logging.js";import{AuthKey,HistoryStateKey}from"#context/keys.js";import{REPLY_TOOL_NAME}from"#protocol/reply-tool.js";import{activeTurnId}from"#harness/session-machine/view.js";import{hydrateSandboxAttachments,moveToolResultFilesToUserMessages}from"#harness/attachment-staging.js";import{workingTaskIds}from"#execution/tasks/model-step.js";import{historyCallNames,toEntryStep,toEntryStream}from"#harness/execute-call.js";import{discardAttempt}from"#harness/session-machine/transitions.js";import{summarizeKnownError}from"#harness/semantic-errors/index.js";import{nextChangeId,nextRunId}from"#protocol/session-projection.js";import{fact,usageOf}from"#harness/facts.js";import{throwIfTurnAborted}from"#harness/turn-cancellation.js";import{compactedTurnInput,maybeCompact}from"#harness/compaction/step.js";import{CompactionOverLimitError}from"#harness/compaction/over-limit-error.js";import{awaitsProviderToolResult}from"#harness/provider-tool-history.js";import{estimateTokens}from"#harness/token-estimate.js";import{withoutPromptMeasurement}from"#harness/compaction/engine.js";import{requireSessionModelReference}from"#harness/types.js";import{ContentFilteredModelResponseError,EmptyModelResponseError,ModelStreamStalledError}from"#harness/model-call/errors.js";import{resolveModelProfile}from"#harness/model-profile.js";import{interruptStreamOnFailure}from"#harness/interruptible-stream.js";import{NO_INLINE_CALLS,executeInlineCalls}from"#harness/call-executor.js";import{emitStreamContent}from"#harness/emission.js";import{estimateRequestEnvelope}from"#harness/request-envelope.js";import{compactPrompt,projectPrompt,withClientContext}from"#harness/step/prompt.js";import{buildStepHooks,emitStepActions,readGatewayGenerationId}from"#harness/step-hooks.js";const environment=process.env.NODE_ENV??`unknown`,log=createLogger(`harness.tool-loop`),MODEL_OUTPUT_TIMEOUT_MS=6e5;var ModelCaller=class{profile;attributionHeaders;projectedMessages;turnMessages;request;modelMessages=[];requestEnvelopeTokens=0;interruptedUsage;compactionFailure;attemptIndex=0;started;acceptedOutput=!1;step;prompt;input;constructor(e,t,n){this.step=e,this.prompt=t,this.input=n,this.profile=resolveModelProfile(n.model,requireSessionModelReference(e.session).promptCache),this.attributionHeaders=buildGatewayAttributionHeaders(this.profile,e.config.runtimeIdentity),this.projectedMessages=n.projectedMessages,this.turnMessages=n.turnMessages,this.request=this.buildRequest()}async call(){let e={},t={policies:[()=>this.compactionFailure===void 0?ALLOW_RETRY:STOP_RETRY],onRetry:e=>this.prepareRetry(e),sessionId:this.step.session.sessionId,turnId:this.step.position().turnId};for(;;)try{return await runModelCallWithRetries(()=>this.attempt(e),t,this.input.generation.signal)}catch(n){if(this.compactionFailure!==void 0)throw this.compactionFailure.error;throwIfTurnAborted(this.step.config.abortSignal),this.input.generation.check();let r=recoverModelCall(n,e,t);if(r===void 0)throw n;await this.prepareRetry(n),e=r}}async prepareRetry(e){let{step:t}=this,n=t.position().runId,r=this.started;if(this.started=void 0,n!==void 0){if(this.acceptedOutput){await t.apply(discardAttempt(t.view(),{ending:`retried`,runId:n})),this.acceptedOutput=!1,await this.input.newRun();return}r!==void 0&&await t.apply([fact(`model.retried`,{attempt:r,error:modelCallErrorInfo(e),runId:n})])}}async failIfCompactionFailed(){if(this.compactionFailure===void 0)return;let{error:e}=this.compactionFailure;return e instanceof CompactionOverLimitError?reportCompactionFailure(this.step,e):reportModelCallFailure(this.step,e)}async steered(){let{step:e}=this;throwIfTurnAborted(e.config.abortSignal),this.input.generation.end(),e.ctx?.set(HistoryStateKey,this.request.historyState);let t=e.position().runId;return t!==void 0&&await e.apply(discardAttempt(e.view(),{ending:`steered`,runId:t,usage:this.interruptedUsage===void 0?void 0:usageOf(this.interruptedUsage)})),{next:e.runStep,session:{...e.session,history:[...this.request.history]},steered:!0}}clearInterruptedUsage(){this.interruptedUsage=void 0}buildRequest(){return requestMessages(this.step,{catalog:this.input.catalog,messages:this.prompt.messages,pendingApprovalsNote:this.input.pendingApprovalsNote,projectedMessages:this.projectedMessages,turnMessages:this.turnMessages})}framing(e,t){let n=e.trailingUserNote,r=n!==void 0&&awaitsProviderToolResult(t),i=r?[e.extraSystemNote,n].filter(e=>e!==void 0).join(`
|
|
2
|
+
|
|
3
|
+
`):e.extraSystemNote;return{instructions:modelInstructions({anthropicCache:this.profile.anthropicCache,extraSystemNote:i,session:this.step.session,systemMessages:this.request.systemMessages}),messages:r?[...t]:withTrailingUserNote(t,n)}}async prepare(e){let t=await prepareModelTools(this.step,{catalog:this.input.catalog,disabledProviderTools:e.disabledProviderTools,profile:this.profile});return this.request=this.buildRequest(),this.requestEnvelopeTokens=await estimateRequestEnvelope({history:this.projectedMessages,...this.framing(e,this.request.nonSystemMessages),tools:t}),t}async compact(e,t){let{step:n,prompt:r}=this,{config:i}=n,a;try{let{projection:e}=n.view();if(a=await maybeCompact({abortSignal:i.abortSignal,auth:n.ctx?.get(AuthKey)??null,change:{changeId:nextChangeId(e),summaryRunId:nextRunId(e),turnId:n.position().turnId},ctx:n.ctx,emissionState:n.position(),messages:[...r.messages],model:this.input.model,promptMessages:withClientContext(r),publish:n.publish,view:()=>n.view().projection.view,requestEnvelopeTokens:this.requestEnvelopeTokens,resolveModel:i.resolveModel,runtimeIdentity:i.runtimeIdentity,session:n.session,prepareTelemetry:e=>n.instrumentation?.prepareAttempt({runId:e,attempt:0,turnId:activeTurnId(n.position())}).telemetry,traceContextHeaders:n.instrumentation?.gatewayTraceContextHeaders}),n.session=a.session,a.failure!==void 0)throw a.failure.error}catch(e){throw this.compactionFailure={error:e},e}if(!a.compacted)return t;compactPrompt(n,r,a.messages);let o=compactedTurnInput(r.messages);return this.turnMessages=o===void 0?this.input.turnMessages:[...this.input.turnMessages,o],n.session={...n.session,compaction:withoutPromptMeasurement(n.session.compaction)},this.projectedMessages=projectPrompt(r),await this.prepare(e)}async attempt(e){let{step:t}=this,{generation:n,model:r}=this.input,i=await this.compact(e,await this.prepare(e)),a=this.attemptIndex++;await this.input.startRun(a),this.started=a,this.requestEnvelopeTokens=Math.max(0,this.requestEnvelopeTokens-(estimateTokens(this.request.history)-estimateTokens(this.prompt.messages))),n.begin(),this.modelMessages=await hydrateSandboxAttachments(this.request.nonSystemMessages),this.profile.filesOutsideToolResults&&(this.modelMessages=moveToolResultFilesToUserMessages(this.modelMessages));let{instructions:o,messages:s}=this.framing(e,this.modelMessages),c=t.instrumentation?.resolveRuntimeContext({attempt:a,emissionState:t.position(),environment,modelInput:{instructions:o,messages:this.modelMessages},session:t.session})??{};e.retryReason&&(c[`eve.retry.reason`]=e.retryReason);let l=t.position(),u=t.instrumentation?.prepareAttempt({isFrameworkTool:e=>t.frameworkToolNames.has(e),runId:l.runId,attempt:a,runtimeContext:c,stepIndex:l.stepIndex,turnId:activeTurnId(l)}),d=buildStepHooks({auth:t.ctx?.get(AuthKey)??null,profile:this.profile,session:t.session}),f={headers:this.attributionHeaders,instructions:o,model:withUniqueCallIds(withGatewayTraceContext(r,this.profile,this.step.instrumentation?.gatewayTraceContextHeaders),[...Object.keys(t.view().projection.view.calls),...historyCallNames(s).keys()]),onLanguageModelCallEnd:e=>{n.interrupted||(this.interruptedUsage=extractTokenUsageDelta({costUsd:extractGatewayCostUsd(e.providerMetadata),usage:e.usage}))},onError(e){n.interrupted||summarizeKnownError(e.error)?.tags.includes(`config`)!==!0&&logError(log,`tool-loop stream error`,e.error)},onStepEnd:d.onStepEnd,onStepStart:d.onStepStart,prepareStep:d.prepareStep,reasoning:t.session.agent.modelReference?.reasoning??t.session.agent.reasoning,runtimeContext:c,stopWhen:isStepCount(1),telemetry:u?.telemetry,timeout:{chunkMs:MODEL_OUTPUT_TIMEOUT_MS,firstChunkMs:MODEL_OUTPUT_TIMEOUT_MS},tools:i},p=new ToolLoopAgent(f);try{return await this.stream(p,s,d.stepResult,u?.telemetry)}catch(e){if(n.check(),isAbortError(e)&&!n.signal.aborted)throw new ModelStreamStalledError({cause:e});return rethrowNoOutputAsEmptyResponse(e)}}async stream(e,t,n,r){let{step:i}=this,{catalog:a,generation:o}=this.input,s=new Set([REPLY_TOOL_NAME]),c=await e.stream({abortSignal:o.signal,messages:t}),{invalidInputToolCallIds:l,trailingInlineToolResultParts:u}=await emitStreamContent(async(e,t)=>{this.acceptedOutput=!0,await i.publish(e,t)},i.position(),toEntryStream(interruptStreamOnFailure(c.fullStream,o.signal),a.resolve),{excludedActionToolNames:s,held:i.finalReplyOnly&&workingTaskIds(i.session).length>0,finalReplyOnly:i.finalReplyOnly,sessionCall:e=>i.view().projection.view.calls[e],tools:a,interruptSignal:o.signal});throwIfTurnAborted(i.config.abortSignal),o.check();let[d,f]=toEntryStep(...await Promise.all([n,c.responseMessages]),a.resolve);assertUsableResponse(d,f,{allowEmptyStop:!i.hasDelegatedCaller,hasInlineResults:u.length>0});let p=await this.runInlineCalls(d,t,{excludedCallIds:l,telemetry:r}),m=answerSkippedToolCalls(d,a,l);return await emitStepActions(i.publish,i.position(),d,m),withCallResults({answers:[...u,...m],calls:p,invalidInputToolCallIds:l,responseMessages:f,stepResult:d})}async runInlineCalls(e,t,n){let{finishReason:r}=e;if(r!==`stop`&&r!==`tool-calls`)return NO_INLINE_CALLS;let{step:i}=this,a=await executeInlineCalls({abortSignal:this.input.generation.signal,approvalMemory:this.input.approvalMemory,beforeExecute:()=>this.input.generation.protectToolExecution(),excludedCallIds:n.excludedCallIds??new Set,messages:t,modelCallId:e.callId,publish:i.publish,telemetry:n.telemetry,toolCalls:e.toolCalls??[],tools:this.input.catalog});return throwIfTurnAborted(i.config.abortSignal),a}};function assertUsableResponse(e,t,n){if(e.finishReason===`content-filter`)throw new ContentFilteredModelResponseError(readGatewayGenerationId(e.providerMetadata));if(!(n.allowEmptyStop&&e.finishReason===`stop`)&&isEmptyModelResponse(e)&&extractToolResultCallIds(t).size===0&&!n.hasInlineResults)throw new EmptyModelResponseError}function isAbortError(e){return e instanceof Error&&(e.name===`AbortError`||e.name===`TimeoutError`)}export{ModelCaller};
|
|
@@ -21,3 +21,11 @@ export declare function normalizeProviderToolHistory(input: {
|
|
|
21
21
|
readonly messages: ModelMessage[];
|
|
22
22
|
readonly outcomeEndsResponse: boolean;
|
|
23
23
|
};
|
|
24
|
+
/**
|
|
25
|
+
* Whether `messages` end on local tool results while a provider tool called beside them still
|
|
26
|
+
* runs. Anthropic defers that call until the local results arrive, and its result opens the next
|
|
27
|
+
* response, so a request must end on those results: anything after them ends the turn early.
|
|
28
|
+
*/
|
|
29
|
+
export declare function awaitsProviderToolResult(messages: readonly ModelMessage[]): boolean;
|
|
30
|
+
/** The provider calls whose results `messages` end waiting on, as {@link awaitsProviderToolResult}. */
|
|
31
|
+
export declare function awaitedProviderToolCallIds(messages: readonly ModelMessage[]): ReadonlySet<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
function normalizeProviderToolHistory(e){let t=findProviderToolCallsToNormalize(e);if(e.providerExecutedOutcomeIds.size===0)return{messages:[...e.messages],outcomeEndsResponse:!1};let n=[],r=-1,i=-1,a=0;for(let o of e.messages){if(o.role!==`assistant`||!Array.isArray(o.content)){n.push(o),o.role===`assistant`&&typeof o.content==`string`&&o.content.trim().length>0&&(i=a),a+=1;continue}let s=[],c=[],l=!1,u=[],d=o.content.some(e=>e.type===`tool-result`&&t.has(e.toolCallId)),flushAssistant=()=>{s.length!==0&&(n.push({...o,content:s}),s=[])},flushTool=()=>{c.length!==0&&(n.push({role:`tool`,content:c}),c=[])};for(let n of o.content)n.type===`tool-result`&&t.has(n.toolCallId)?(flushAssistant(),c.push(n)):d&&n.type===`tool-call`&&n.providerExecuted!==!0&&!t.has(n.toolCallId)?u.push(n):(flushTool(),l&&n.type!==`tool-result`&&flushAssistant(),l=n.type===`tool-result`,s.push(n.type===`tool-call`&&t.has(n.toolCallId)?{...n,providerExecuted:!1}:n)),n.type===`tool-result`&&e.providerExecutedOutcomeIds.has(n.toolCallId)?r=a:n.type===`text`&&n.text.trim().length>0&&(i=a),a+=1;flushTool(),s.push(...u),flushAssistant()}return{messages:n,outcomeEndsResponse:r>=0&&r>i}}function findProviderToolCallsToNormalize(e){let t=new Set;for(let n of e.messages){if(n.role!==`assistant`||!Array.isArray(n.content))continue;let r=n.content.some(t=>t.type===`tool-call`&&t.providerExecuted!==!0&&!e.providerExecutedOutcomeIds.has(t.toolCallId));for(let i of n.content)i.type===`tool-call`&&e.providerExecutedOutcomeIds.has(i.toolCallId)&&(i.providerExecuted!==!0||r)&&t.add(i.toolCallId)}return t}export{normalizeProviderToolHistory};
|
|
1
|
+
function normalizeProviderToolHistory(e){let t=findProviderToolCallsToNormalize(e);if(e.providerExecutedOutcomeIds.size===0)return{messages:[...e.messages],outcomeEndsResponse:!1};let n=[],r=-1,i=-1,a=0;for(let o of e.messages){if(o.role!==`assistant`||!Array.isArray(o.content)){n.push(o),o.role===`assistant`&&typeof o.content==`string`&&o.content.trim().length>0&&(i=a),a+=1;continue}let s=[],c=[],l=!1,u=[],d=o.content.some(e=>e.type===`tool-result`&&t.has(e.toolCallId)),flushAssistant=()=>{s.length!==0&&(n.push({...o,content:s}),s=[])},flushTool=()=>{c.length!==0&&(n.push({role:`tool`,content:c}),c=[])};for(let n of o.content)n.type===`tool-result`&&t.has(n.toolCallId)?(flushAssistant(),c.push(n)):d&&n.type===`tool-call`&&n.providerExecuted!==!0&&!t.has(n.toolCallId)?u.push(n):(flushTool(),l&&n.type!==`tool-result`&&flushAssistant(),l=n.type===`tool-result`,s.push(n.type===`tool-call`&&t.has(n.toolCallId)?{...n,providerExecuted:!1}:n)),n.type===`tool-result`&&e.providerExecutedOutcomeIds.has(n.toolCallId)?r=a:n.type===`text`&&n.text.trim().length>0&&(i=a),a+=1;flushTool(),s.push(...u),flushAssistant()}return{messages:n,outcomeEndsResponse:r>=0&&r>i}}function awaitsProviderToolResult(e){return awaitedProviderToolCallIds(e).size>0}function awaitedProviderToolCallIds(e){let t=e.length;for(;t>0&&e[t-1].role===`tool`;)--t;let n=e[t-1];if(t===e.length||n?.role!==`assistant`||!Array.isArray(n.content))return new Set;let r=new Set;for(let i of[...n.content,...e.slice(t).flatMap(toolContent)])i.type===`tool-result`&&r.add(i.toolCallId);return new Set(n.content.flatMap(e=>e.type===`tool-call`&&e.providerExecuted===!0&&!r.has(e.toolCallId)?[e.toolCallId]:[]))}function toolContent(e){return e.role===`tool`?e.content:[]}function findProviderToolCallsToNormalize(e){let t=new Set;for(let n of e.messages){if(n.role!==`assistant`||!Array.isArray(n.content))continue;let r=n.content.some(t=>t.type===`tool-call`&&t.providerExecuted!==!0&&!e.providerExecutedOutcomeIds.has(t.toolCallId));for(let i of n.content)i.type===`tool-call`&&e.providerExecutedOutcomeIds.has(i.toolCallId)&&(i.providerExecuted!==!0||r)&&t.add(i.toolCallId)}return t}export{awaitedProviderToolCallIds,awaitsProviderToolResult,normalizeProviderToolHistory};
|
|
@@ -258,8 +258,9 @@ export declare function stopInterruptedSteps(view: SessionView, input: {
|
|
|
258
258
|
}): Transition;
|
|
259
259
|
/**
|
|
260
260
|
* `session.clear()`: everything the cleared history asked for is withdrawn, its approvals and
|
|
261
|
-
* the session-limit prompt and every sign-in, and the calls awaiting them stop.
|
|
262
|
-
*
|
|
261
|
+
* the session-limit prompt and every sign-in, and the calls awaiting them stop. A clear cancels
|
|
262
|
+
* the running turn and the session's working tasks first, and a task run withdraws what it
|
|
263
|
+
* relayed as it stops, so relayed requests are left to it.
|
|
263
264
|
*/
|
|
264
265
|
export declare function clear(view: SessionView, input?: {
|
|
265
266
|
readonly cause?: Cause;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{createLogger}from"#internal/logging.js";import{REPLY_TOOL_NAME}from"#protocol/reply-tool.js";import{renderFinalOutputWhileWorkingError}from"#execution/tasks/render.js";import{askStepApprovals,stopForToolSignIn}from"#harness/hitl/index.js";import{stageToolResultMedia}from"#harness/attachment-staging.js";import{resolveAssistantStepText,validateHarnessModelMessages}from"#harness/messages.js";import{isWorkflowTool,workingTaskIds}from"#execution/tasks/model-step.js";import{collectWorkflowCalls}from"#harness/coordination.js";import{fail,suspendStep}from"#harness/session-machine/transitions.js";import{turnSettled}from"#harness/facts.js";import{createToolResultMessagePartFromToolError,isToolResultError}from"#harness/action-result-helpers.js";import{getInvalidToolCallInputError,isInvalidToolCall}from"#harness/tool-call-input-errors.js";import{withPromptMeasurement}from"#harness/compaction/engine.js";import{withResult}from"#harness/session-machine/suspended-steps.js";import{hasQueuedTurnInput,park}from"#harness/step/park.js";import{resolveInlineAuthorizationInterrupt}from"#harness/inline-tool-authorization.js";import{FINAL_OUTPUT_BESIDE_PENDING_CALLS}from"#harness/final-output.js";import{failTurnForReaction}from"#harness/step/context.js";import{appendMissingToolResultMessages,extractToolResultCallIds}from"#harness/model-call/response.js";import{clearTurnClientContextState}from"#harness/turn-client-context.js";
|
|
1
|
+
import{createLogger}from"#internal/logging.js";import{REPLY_TOOL_NAME}from"#protocol/reply-tool.js";import{renderFinalOutputWhileWorkingError}from"#execution/tasks/render.js";import{askStepApprovals,stopForToolSignIn}from"#harness/hitl/index.js";import{stageToolResultMedia}from"#harness/attachment-staging.js";import{resolveAssistantStepText,validateHarnessModelMessages}from"#harness/messages.js";import{isWorkflowTool,workingTaskIds}from"#execution/tasks/model-step.js";import{collectWorkflowCalls}from"#harness/coordination.js";import{fail,suspendStep}from"#harness/session-machine/transitions.js";import{turnSettled}from"#harness/facts.js";import{createToolResultMessagePartFromToolError,isToolResultError}from"#harness/action-result-helpers.js";import{getInvalidToolCallInputError,isInvalidToolCall}from"#harness/tool-call-input-errors.js";import{normalizeProviderToolHistory}from"#harness/provider-tool-history.js";import{withPromptMeasurement}from"#harness/compaction/engine.js";import{withResult}from"#harness/session-machine/suspended-steps.js";import{hasQueuedTurnInput,park}from"#harness/step/park.js";import{resolveInlineAuthorizationInterrupt}from"#harness/inline-tool-authorization.js";import{FINAL_OUTPUT_BESIDE_PENDING_CALLS}from"#harness/final-output.js";import{failTurnForReaction}from"#harness/step/context.js";import{appendMissingToolResultMessages,extractToolResultCallIds}from"#harness/model-call/response.js";import{clearTurnClientContextState}from"#harness/turn-client-context.js";const log=createLogger(`harness.tool-loop`);function getInvalidToolCallInputErrors(e){let t=[];for(let n of e.toolCalls){if(n.toolName===REPLY_TOOL_NAME)continue;let e=getInvalidToolCallInputError({toolCall:n});e!==void 0&&t.push(e)}return t}async function handleStepResult(e,t){let{promptMessages:n,result:r}=t,i=resolveAssistantStepText(r.response.messages,r.text),a=getInvalidToolCallInputErrors({toolCalls:r.toolCalls}),o=new Set([...r.invalidInputToolCallIds??[],...r.toolCalls.filter(isInvalidToolCall).map(e=>e.toolCallId),...a.map(e=>e.toolCallId)]),s=appendMissingToolResultMessages({append:a.map(e=>createToolResultMessagePartFromToolError(e)),responseMessages:r.response.messages}),c=new Set;for(let e of[...r.content??[],...r.toolResults??[]])(e.type===`tool-result`||e.type===`tool-error`)&&e.providerExecuted===!0&&c.add(e.toolCallId);let l=normalizeProviderToolHistory({messages:s,providerExecutedOutcomeIds:c}),u=await stageToolResultMedia(l.messages);e.session={...e.session,compaction:withPromptMeasurement(e.session.compaction,{inputTokens:r.usage?.inputTokens,promptMessageCount:t.durableModelPromptMessageCount,requestEnvelopeTokens:t.requestEnvelopeTokens})};let d=r.approvalRequests??[],f=new Set([...d.map(e=>e.call.callId),...extractToolResultCallIds(u)]),p=(r.toolCalls??[]).filter(e=>!o.has(e.toolCallId)).filter(e=>!f.has(e.toolCallId)).filter(e=>isWorkflowTool(t.catalog.get(e.toolName))),m=resolveInlineAuthorizationInterrupt({signIns:r.signIns??[]});if(p.length>0||d.length>0||m){let{sequence:i,stepIndex:a,turnId:o}=e.position(),s=collectWorkflowCalls({session:e.session,toolCalls:p,tools:t.catalog,turnId:o});e.session={...s.session,history:validateHarnessModelMessages(n)};let c={event:{sequence:i,stepIndex:a,turnId:o},messages:answerCallsThatWontRun(u,r),tasks:s.workflowRequests.map(e=>({...e,clearedBy:r.policyApprovals?.[e.callId]}))};return d.length>0?await askStepApprovals(e,{...c,requests:d,tools:t.catalog}):await e.apply(suspendStep(e.view(),c)),m?stopForToolSignIn(e,m):park(e)}e.session={...e.session,history:validateHarnessModelMessages([...n,...u])};let h=e.session.outputSchema!==void 0&&extractFinalOutput(r)!==void 0,g=workingTaskIds(e.session),_=h&&g.length>0,v=u;_&&(v=rejectFinalOutput(u,r,g),e.session={...e.session,history:validateHarnessModelMessages([...n,...v])});let y=await stepEndsTurn(r,u,t.endsTurnTools);return(!h||_)&&(v.at(-1)?.role===`tool`&&!y||l.outcomeEndsResponse||hasQueuedTurnInput(e.view()))?{next:e.runStep,session:e.session}:g.length>0?{held:{kind:`tasks`,taskIds:g},next:null,session:e.session}:settleTurn(e,{history:n,result:r,stepOutput:y?null:i})}function answerCallsThatWontRun(e,t){let n=extractToolResultCallIds(e);return(t.toolCalls??[]).filter(e=>e.toolName===REPLY_TOOL_NAME).map(e=>({output:{type:`error-text`,value:FINAL_OUTPUT_BESIDE_PENDING_CALLS},toolCallId:e.toolCallId,toolName:e.toolName,type:`tool-result`})).filter(e=>!n.has(e.toolCallId)).reduce((e,t)=>withResult(e,t),[...e])}async function stepEndsTurn(e,t,n){let r=e.toolCalls??[];if(r.length===0)return!1;let i=new Map;for(let e of t)if(e.role===`tool`)for(let t of e.content)t.type===`tool-result`&&i.set(t.toolCallId,t.output);if(!r.every(e=>{let t=i.get(e.toolCallId);return n.has(e.toolName)&&t!==void 0&&!isToolResultError(t)}))return!1;let a=new Map((e.toolResults??[]).map(e=>[e.toolCallId,e.output]));for(let e of r){let t=n.get(e.toolName);if(typeof t==`function`&&!await callEndsTurn(t,a.get(e.toolCallId),e))return!1}return!0}async function callEndsTurn(e,t,n){try{return await e(t)===!0}catch(e){return log.warn(`endsTurn threw; continuing the turn`,{callId:n.toolCallId,error:e,toolName:n.toolName}),!1}}function rejectFinalOutput(e,t,n){let r=(t.toolCalls??[]).find(e=>e.toolName===REPLY_TOOL_NAME);if(r===void 0)return[...e];let i={output:{type:`error-text`,value:renderFinalOutputWhileWorkingError(n)},toolCallId:r.toolCallId,toolName:REPLY_TOOL_NAME,type:`tool-result`};return[...e,{content:[i],role:`tool`}]}const OUTPUT_SCHEMA_NOT_FULFILLED={code:`OUTPUT_SCHEMA_NOT_FULFILLED`,message:`The agent could not produce a result matching the requested schema.`};function extractFinalOutput(e){return(e.toolCalls??[]).find(e=>e.toolName===REPLY_TOOL_NAME&&!isInvalidToolCall(e))?.input}async function settleTurn(e,t){let{history:n,result:r,stepOutput:i}=t,a=await failTurnForReaction(e);if(a!==void 0)return a;let o=e.session.outputSchema;if(e.session=clearTurnClientContextState(e.session),o===void 0)return await e.apply(turnSettled(e.view().projection,{outcome:`completed`}),e.session.history),{next:null,session:e.session,settledTurn:{output:i??``}};let s=extractFinalOutput(r);return s===void 0?(e.session={...e.session,outputSchema:void 0},await e.apply(fail(e.view(),OUTPUT_SCHEMA_NOT_FULFILLED)),{next:null,session:e.session,settledTurn:{isError:!0,output:OUTPUT_SCHEMA_NOT_FULFILLED.message}}):(e.session={...e.session,history:[...n,{content:JSON.stringify(s),role:`assistant`}],outputSchema:void 0},await e.apply(turnSettled(e.view().projection,{outcome:`completed`}),e.session.history),{next:null,session:e.session,settledTurn:{output:s}})}export{handleStepResult};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{createErrorId,createLogger}from"#internal/logging.js";import{ParentSessionKey,ScheduleIdKey,SessionCallbackKey,SessionPredecessorKey}from"#context/keys.js";import{toErrorMessage}from"#shared/errors.js";import{activeTurnId,turnPosition}from"#harness/session-machine/view.js";import{recordAppliedSession}from"#harness/session-machine/current.js";import{validateHarnessModelMessages}from"#harness/messages.js";import{applyTransition,dropClosedRecords,sessionView}from"#harness/session-machine/commit.js";import{fail,receive}from"#harness/session-machine/transitions.js";import{evaluateValues,isReactionFailedError}from"#reactions/runner.js";import{isTurnCancellation,throwIfTurnAborted}from"#harness/turn-cancellation.js";import{withClientContext}from"#harness/step/prompt.js";import{isDynamicModelSelectionError}from"#reactions/kinds/model.js";import{takeUserInstructionMessages}from"#reactions/kinds/instructions.js";import{takeTurnFailure}from"#reactions/intents.js";const log=createLogger(`harness.step`);function createStep(e){let{ctx:t,live:n}=e,r=t?.get(ParentSessionKey)!==void 0||t?.get(SessionCallbackKey)!==void 0,i={session:e.session,frameworkToolNames:new Set,config:e.config,ctx:t,runStep:e.runStep,publish:e.publish,emit:e.emit,instrumentation:e.instrumentation,hasDelegatedCaller:r,finalReplyOnly:r||t?.get(ScheduleIdKey)!==void 0,view:()=>sessionView(n.read(),i.session.state),position:()=>turnPosition(n.read()),async apply(r,a){let o=`events`in r?r:{events:r,turn:i.view().turn};i.session=dropClosedRecords(await applyTransition(i.session,o,e.publish,a),n.read()),t!==void 0&&recordAppliedSession(t,i.session)}};return i}async function openTurn(e,t){let{config:n,ctx:r}=e,i;try{let i=e.position(),a=await e.instrumentation?.preparePreamble({sequence:i.sequence,sessionStarted:i.sessionStarted,traceContext:e.instrumentation?.traceContext,turnId:activeTurnId(i)});await e.apply(receive(e.view(),{deliveries:t.deliveries,predecessor:r?.get(SessionPredecessorKey),runtime:n.runtimeIdentity,trace:a}),[...e.session.history,...t.input])}catch(e){i={error:e}}if(i!==void 0)return failBoundaryEvent(e,i.error);e.instrumentation?.setTurnId(e.position().turnId)}async function prepareModelCall(e,t){let n=e.ctx;if(n===void 0)return;throwIfTurnAborted(e.config.abortSignal);try{await evaluateValues(n,{abortSignal:e.config.abortSignal,conversation:validateHarnessModelMessages(withClientContext(t))})}catch(t){if(!isReactionFailedError(t))throw t;return failTurn(e,t,`REACTION_FAILED`)}let r=takeUserInstructionMessages(n);r.length>0&&(e.session={...e.session,history:validateHarnessModelMessages([...e.session.history,...r])})}async function failTurnForReaction(e){let t=takeTurnFailure(e.ctx);if(t!==void 0)return failTurn(e,Error(t),`HOOK_FAILED`)}async function failTurn(e,t,n){throwIfTurnAborted(e.config.abortSignal),e.instrumentation?.recordError(t);let r=toErrorMessage(t),i=createErrorId();return log.error(`turn failed`,{code:n,error:t,errorId:i,sessionId:e.session.sessionId,turnId:activeTurnId(e.position())}),await e.apply(fail(e.view(),{code:n,details:{errorId:i},message:r})),{next:null,session:e.session,settledTurn:{isError:!0,output:r}}}async function failBoundaryEvent(e,t){if(throwIfTurnAborted(e.config.abortSignal),
|
|
1
|
+
import{createErrorId,createLogger}from"#internal/logging.js";import{ParentSessionKey,ScheduleIdKey,SessionCallbackKey,SessionPredecessorKey}from"#context/keys.js";import{toErrorMessage}from"#shared/errors.js";import{activeTurnId,turnPosition}from"#harness/session-machine/view.js";import{recordAppliedSession}from"#harness/session-machine/current.js";import{validateHarnessModelMessages}from"#harness/messages.js";import{applyTransition,dropClosedRecords,sessionView}from"#harness/session-machine/commit.js";import{fail,receive}from"#harness/session-machine/transitions.js";import{evaluateValues,isReactionFailedError}from"#reactions/runner.js";import{isTurnCancellation,throwIfTurnAborted}from"#harness/turn-cancellation.js";import{withClientContext}from"#harness/step/prompt.js";import{isDynamicModelSelectionError}from"#reactions/kinds/model.js";import{takeUserInstructionMessages}from"#reactions/kinds/instructions.js";import{takeTurnFailure}from"#reactions/intents.js";const log=createLogger(`harness.step`);function createStep(e){let{ctx:t,live:n}=e,r=t?.get(ParentSessionKey)!==void 0||t?.get(SessionCallbackKey)!==void 0,i={session:e.session,frameworkToolNames:new Set,config:e.config,ctx:t,runStep:e.runStep,publish:e.publish,emit:e.emit,instrumentation:e.instrumentation,hasDelegatedCaller:r,finalReplyOnly:r||t?.get(ScheduleIdKey)!==void 0,view:()=>sessionView(n.read(),i.session.state),position:()=>turnPosition(n.read()),async apply(r,a){let o=`events`in r?r:{events:r,turn:i.view().turn};i.session=dropClosedRecords(await applyTransition(i.session,o,e.publish,a),n.read()),t!==void 0&&recordAppliedSession(t,i.session)}};return i}async function openTurn(e,t){let{config:n,ctx:r}=e,i;try{let i=e.position(),a=await e.instrumentation?.preparePreamble({sequence:i.sequence,sessionStarted:i.sessionStarted,traceContext:e.instrumentation?.traceContext,turnId:activeTurnId(i)});await e.apply(receive(e.view(),{deliveries:t.deliveries,predecessor:r?.get(SessionPredecessorKey),runtime:n.runtimeIdentity,trace:a}),[...e.session.history,...t.input])}catch(e){i={error:e}}if(i!==void 0)return failBoundaryEvent(e,i.error);e.instrumentation?.setTurnId(e.position().turnId)}async function prepareModelCall(e,t){let n=e.ctx;if(n===void 0)return;throwIfTurnAborted(e.config.abortSignal);try{await evaluateValues(n,{abortSignal:e.config.abortSignal,conversation:validateHarnessModelMessages(withClientContext(t))})}catch(t){if(!isReactionFailedError(t))throw t;return failTurn(e,t,`REACTION_FAILED`)}let r=takeUserInstructionMessages(n);r.length>0&&(e.session={...e.session,history:validateHarnessModelMessages([...e.session.history,...r])})}async function failTurnForReaction(e){let t=takeTurnFailure(e.ctx);if(t!==void 0)return failTurn(e,Error(t),`HOOK_FAILED`)}async function failTurn(e,t,n){throwIfTurnAborted(e.config.abortSignal),e.instrumentation?.recordError(t);let r=toErrorMessage(t),i=createErrorId();return log.error(`turn failed`,{code:n,error:t,errorId:i,sessionId:e.session.sessionId,turnId:activeTurnId(e.position())}),await e.apply(fail(e.view(),{code:n,details:{errorId:i},message:r})),{next:null,session:e.session,settledTurn:{isError:!0,output:r}}}async function failBoundaryEvent(e,t){if(throwIfTurnAborted(e.config.abortSignal),isDynamicModelSelectionError(t))return failModelSelection(e,t);throw t}async function failModelSelection(e,t){if(throwIfTurnAborted(e.config.abortSignal),isTurnCancellation(t)||(e.instrumentation?.recordError(t),e.emit===void 0))throw t;let n=createErrorId(),r=toErrorMessage(t),{session:i}=e;return log.error(`model selection failed terminally`,{error:t,errorId:n,sessionId:i.sessionId,turnId:activeTurnId(e.position())}),await e.apply(fail(e.view(),{code:`MODEL_SELECTION_FAILED`,details:{errorId:n},message:r,terminal:!0})),{next:e.hasDelegatedCaller?{done:!0,isError:!0,output:r}:{done:!0,output:``},session:e.session}}export{createStep,failBoundaryEvent,failModelSelection,failTurnForReaction,openTurn,prepareModelCall};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{readClientContext}from"#internal/client-context.js";import{activeTurnId,runtimeWait}from"#harness/session-machine/view.js";import{stageAttachmentsToSandbox,stageToolResultMedia}from"#harness/attachment-staging.js";import{TOOL_RESULT_BOUNDARY,anchorToTurn,createFrameworkUserMessage,createImportedHistoryMessages,createUserMessage,frameworkMessageKindForStepInput,normalizeMessage,userContentOf}from"#harness/messages.js";import{forgetFinishedRuns,runtimeResultCalls}from"#harness/coordination.js";import{finishRun,settle}from"#harness/session-machine/transitions.js";import{delegatedUsageFact}from"#harness/facts.js";import{resolveRuntimeActionResultsForCallIds}from"#runtime/actions/results.js";import{getTurnClientContextState}from"#harness/turn-client-context.js";async function settleRuntimeWork(e,t){let n=runtimeWait(e.session.state);if(n===void 0){if(await recordLateSpend(e,t?.delegatedUsage,new Set),t?.delegatedUsage===void 0)return{input:t,waited:!1};let{delegatedUsage:n,...r}=t;return{input:r,waited:!1}}let r=resolveRuntimeActionResultsForCallIds({pendingCallIds:n.callIds,results:t?.runtimeActionResults??[]});if(r===void 0)return;let i=forgetFinishedRuns(e.session,r,n.event.turnId);e.session=i.session,await e.apply(finishRun(e.view(),{requestIds:i.requestIds}));let a=await runtimeResultCalls(r,e.config.tools),o=(await stageToolResultMedia([{role:`tool`,content:a.map(({part:e})=>e)}])).flatMap(e=>e.role===`tool`?e.content.filter(e=>e.type===`tool-result`):[]),s=t?.delegatedUsage??{};if(await recordLateSpend(e,s,new Set(a.map(({part:e})=>e.toolCallId))),await e.apply(settle(e.view(),{results:a.map((e,t)=>({...e,part:o[t],usage:s[e.part.toolCallId]}))})),t===void 0)return{input:t,waited:!0};let{delegatedUsage:c,runtimeActionResults:l,...u}=t;return{input:u,waited:!0}}async function recordLateSpend(e,t,n){let r=Object.entries(t??{}).filter(([e])=>!n.has(e));r.length>0&&await e.publish(r.map(([,e])=>delegatedUsageFact(void 0,e)))}async function prepareTurnInput(e,t,n){let r=activeTurnId(e.position()),i=getTurnClientContextState(e.session.state,r),a=readClientContext(t),o=(a??i?.messages)?.map(e=>createFrameworkUserMessage(`context.instruction`,e))??[],s=[...createImportedHistoryMessages(t?.history??[]),...(t?.context??[]).map(e=>anchorToTurn(createFrameworkUserMessage(`context.instruction`,e),r))],c=frameworkMessageKindForStepInput(t),l=normalizeMessage(t?.message),u=l!==void 0&&!n.consumedMessage?await stageAttachmentsToSandbox(userContentOf(l)):void 0;return u!==void 0&&s.push(anchorToTurn(c===void 0?createUserMessage(`user`,u):createFrameworkUserMessage(c,u),r)),{clientContext:a,ephemeral:o,hasUserMessage:u!==void 0&&c===void 0,message:u,messages:s,storedClientContext:i,turnId:r}}function followingToolResults(e){return[...e.hasUserMessage?[{content:TOOL_RESULT_BOUNDARY,role:`assistant`}]:[],...e.messages]}export{followingToolResults,prepareTurnInput,settleRuntimeWork};
|
|
1
|
+
import{readClientContext}from"#internal/client-context.js";import{activeTurnId,runtimeWait}from"#harness/session-machine/view.js";import{stageAttachmentsToSandbox,stageToolResultMedia}from"#harness/attachment-staging.js";import{TOOL_RESULT_BOUNDARY,anchorToTurn,createFrameworkUserMessage,createImportedHistoryMessages,createUserMessage,frameworkMessageKindForStepInput,normalizeMessage,userContentOf}from"#harness/messages.js";import{forgetFinishedRuns,runtimeResultCalls}from"#harness/coordination.js";import{finishRun,settle}from"#harness/session-machine/transitions.js";import{delegatedUsageFact}from"#harness/facts.js";import{resolveRuntimeActionResultsForCallIds}from"#runtime/actions/results.js";import{getTurnClientContextState}from"#harness/turn-client-context.js";async function settleRuntimeWork(e,t){let n=runtimeWait(e.session.state);if(n===void 0){if(await recordLateSpend(e,t?.delegatedUsage,new Set),t?.delegatedUsage===void 0)return{input:t,waited:!1};let{delegatedUsage:n,...r}=t;return{input:r,waited:!1}}let r=resolveRuntimeActionResultsForCallIds({pendingCallIds:n.callIds,results:t?.runtimeActionResults??[]});if(r===void 0)return;let i=forgetFinishedRuns(e.session,r,n.event.turnId);e.session=i.session,await e.apply(finishRun(e.view(),{requestIds:i.requestIds}));let a=await runtimeResultCalls(r,e.config.tools),o=(await stageToolResultMedia([{role:`tool`,content:a.map(({part:e})=>e)}])).flatMap(e=>e.role===`tool`?e.content.filter(e=>e.type===`tool-result`):[]),s=t?.delegatedUsage??{};if(await recordLateSpend(e,s,new Set(a.map(({part:e})=>e.toolCallId))),await e.apply(settle(e.view(),{results:a.map((e,t)=>({...e,part:o[t],usage:s[e.part.toolCallId]}))})),t===void 0)return{input:t,waited:!0};let{delegatedUsage:c,runtimeActionResults:l,...u}=t;return{input:u,waited:!0}}async function recordLateSpend(e,t,n){let r=Object.entries(t??{}).filter(([e])=>!n.has(e));r.length>0&&await e.publish(r.map(([,e])=>delegatedUsageFact(void 0,e)))}async function prepareTurnInput(e,t,n){let r=activeTurnId(e.position()),i=getTurnClientContextState(e.session.state,r),a=readClientContext(t),o=(a??i?.messages)?.map(e=>createFrameworkUserMessage(`context.instruction`,e))??[],s=[...createImportedHistoryMessages(t?.history??[]),...(t?.context??[]).map(e=>anchorToTurn(createFrameworkUserMessage(`context.instruction`,e),r))],c=frameworkMessageKindForStepInput(t),l=normalizeMessage(t?.message),u=l!==void 0&&!n.consumedMessage?await stageAttachmentsToSandbox(userContentOf(l)):void 0;return u!==void 0&&(isContinuation(e,t)&&s.push(anchorToTurn(createFrameworkUserMessage(`context.instruction`,CONTINUATION_NOTE),r)),s.push(anchorToTurn(c===void 0?createUserMessage(`user`,u):createFrameworkUserMessage(c,u),r))),{clientContext:a,ephemeral:o,hasUserMessage:u!==void 0&&c===void 0,message:u,messages:s,storedClientContext:i,turnId:r}}const CONTINUATION_NOTE=`The next message was sent automatically after the last turn, not by a person.`;function isContinuation(e,t){let n=t?.deliveries??[],r=e.view().projection.view.deliveries;return n.length>0&&n.every(({deliveryId:e})=>{let t=r[e]?.source;return t!==void 0&&`hook`in t&&t.hook!==void 0})}function followingToolResults(e){return[...e.hasUserMessage?[{content:TOOL_RESULT_BOUNDARY,role:`assistant`}]:[],...e.messages]}export{followingToolResults,prepareTurnInput,settleRuntimeWork};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{followingToolResults}from"./intake.js";import{anchorToTurn,createFrameworkUserMessage,followsToolResults,normalizeModelMessages,validateHarnessModelMessages}from"#harness/messages.js";import{appendTaskContext}from"#execution/tasks/model-step.js";import{hasUnansweredToolCall}from"#harness/model-call/response.js";import{getTurnClientContextState,setTurnClientContextState}from"#harness/turn-client-context.js";import{repairToolHistory}from"#harness/tool-history-repair.js";async function buildPrompt(e,t){let n=repairToolHistory({messages:e.session.history,insertionIndex:t.storedClientContext?.insertionIndex}),r=validateHarnessModelMessages(n.messages);if(e.session={...e.session,history:[...r]},t.storedClientContext!==void 0&&n.insertionIndex!==void 0){let r={...t.storedClientContext,insertionIndex:n.insertionIndex};t={...t,storedClientContext:r},e.session=setTurnClientContextState(e.session,r)}if(!hasUnansweredToolCall(r)){let n=await appendTaskContext({messages:r,session:e.session,tools:e.config.tools});e.session=n.session,r.push(...n.messages.map(e=>e.role===`user`?anchorToTurn(e,t.turnId):e))}let i=placeTurnInput(e,r,t);return{clientContext:getTurnClientContextState(e.session.state,t.turnId),messages:i}}function previewPrompt(e,t){let n=validateHarnessModelMessages([...e.session.history]);return{clientContext:turnClientContext(n,t),messages:withTurnInput(n,t)}}function placeTurnInput(e,t,n){let r=turnClientContext(t,n);return r!==void 0&&(e.session=setTurnClientContextState(e.session,r)),withTurnInput(t,n)}function turnClientContext(e,t){return t.clientContext===void 0?t.storedClientContext:{insertionIndex:t.storedClientContext?.insertionIndex??e.length,messages:t.clientContext,turnId:t.turnId}}function withTurnInput(e,t){return[...e,...followsToolResults(e)?followingToolResults(t):t.messages]}function withClientContext(e,t=e.messages){let{clientContext:n}=e;if(n===void 0||n.messages.length===0)return[...t];let r=Math.min(Math.max(0,n.insertionIndex),t.length);return[...t.slice(0,r),...n.messages.map(e=>createFrameworkUserMessage(`context.instruction`,e)),...t.slice(r)]}function projectPrompt(e){return validateHarnessModelMessages(normalizeModelMessages(withClientContext(e)))}function compactPrompt(e,t,n){let{clientContext:r}=t;if(r!==void 0){let i=Math.max(0,t.messages.length-r.insertionIndex);t.clientContext={...r,insertionIndex:Math.max(0,n.length-i)},e.session=setTurnClientContextState(e.session,t.clientContext)}t.messages=n}export{buildPrompt,compactPrompt,placeTurnInput,previewPrompt,projectPrompt,withClientContext};
|
|
1
|
+
import{followingToolResults}from"./intake.js";import{anchorToTurn,createFrameworkUserMessage,followsToolResults,normalizeModelMessages,validateHarnessModelMessages}from"#harness/messages.js";import{appendTaskContext}from"#execution/tasks/model-step.js";import{hasUnansweredToolCall}from"#harness/model-call/response.js";import{getTurnClientContextState,setTurnClientContextState}from"#harness/turn-client-context.js";import{repairToolHistory}from"#harness/tool-history-repair.js";async function buildPrompt(e,t){let n=repairToolHistory({endsRequest:t.messages.length===0,messages:e.session.history,insertionIndex:t.storedClientContext?.insertionIndex}),r=validateHarnessModelMessages(n.messages);if(e.session={...e.session,history:[...r]},t.storedClientContext!==void 0&&n.insertionIndex!==void 0){let r={...t.storedClientContext,insertionIndex:n.insertionIndex};t={...t,storedClientContext:r},e.session=setTurnClientContextState(e.session,r)}if(!hasUnansweredToolCall(r)){let n=await appendTaskContext({messages:r,session:e.session,tools:e.config.tools});e.session=n.session,r.push(...n.messages.map(e=>e.role===`user`?anchorToTurn(e,t.turnId):e))}let i=placeTurnInput(e,r,t);return{clientContext:getTurnClientContextState(e.session.state,t.turnId),messages:i}}function previewPrompt(e,t){let n=validateHarnessModelMessages([...e.session.history]);return{clientContext:turnClientContext(n,t),messages:withTurnInput(n,t)}}function placeTurnInput(e,t,n){let r=turnClientContext(t,n);return r!==void 0&&(e.session=setTurnClientContextState(e.session,r)),withTurnInput(t,n)}function turnClientContext(e,t){return t.clientContext===void 0?t.storedClientContext:{insertionIndex:t.storedClientContext?.insertionIndex??e.length,messages:t.clientContext,turnId:t.turnId}}function withTurnInput(e,t){return[...e,...followsToolResults(e)?followingToolResults(t):t.messages]}function withClientContext(e,t=e.messages){let{clientContext:n}=e;if(n===void 0||n.messages.length===0)return[...t];let r=Math.min(Math.max(0,n.insertionIndex),t.length);return[...t.slice(0,r),...n.messages.map(e=>createFrameworkUserMessage(`context.instruction`,e)),...t.slice(r)]}function projectPrompt(e){return validateHarnessModelMessages(normalizeModelMessages(withClientContext(e)))}function compactPrompt(e,t,n){let{clientContext:r}=t;if(r!==void 0){let i=Math.max(0,t.messages.length-r.insertionIndex);t.clientContext={...r,insertionIndex:Math.max(0,n.length-i)},e.session=setTurnClientContextState(e.session,t.clientContext)}t.messages=n}export{buildPrompt,compactPrompt,placeTurnInput,previewPrompt,projectPrompt,withClientContext};
|
|
@@ -3,6 +3,8 @@ import type { ModelMessage } from "ai";
|
|
|
3
3
|
export declare function repairToolHistory(input: {
|
|
4
4
|
readonly messages: readonly ModelMessage[];
|
|
5
5
|
readonly insertionIndex?: number;
|
|
6
|
+
/** Nothing follows `messages` in the request, so a provider result they await can still come. */
|
|
7
|
+
readonly endsRequest?: boolean;
|
|
6
8
|
}): {
|
|
7
9
|
messages: ModelMessage[];
|
|
8
10
|
insertionIndex: number | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{withResult}from"#harness/session-machine/suspended-steps.js";import{extractToolResultCallIds}from"#harness/model-call/response.js";function repairToolHistory(e){let t=
|
|
1
|
+
import{awaitedProviderToolCallIds}from"#harness/provider-tool-history.js";import{withResult}from"#harness/session-machine/suspended-steps.js";import{extractToolResultCallIds}from"#harness/model-call/response.js";function repairToolHistory(e){let t=closeProviderCalls(e.messages,e.endsRequest===!0),n=[...t],r=e.insertionIndex,i=new Set(extractToolResultCallIds(n)),a=new Set;for(let e of n)if(e.role===`assistant`&&Array.isArray(e.content))for(let t of e.content)t.type===`tool-approval-request`&&i.add(t.toolCallId),t.type===`tool-call`&&((a.has(t.toolCallId)||t.providerExecuted===!0)&&i.add(t.toolCallId),a.add(t.toolCallId));for(let e of t)if(e.role===`assistant`&&Array.isArray(e.content))for(let t of e.content){if(t.type!==`tool-call`||i.has(t.toolCallId))continue;let a=n.indexOf(e),o=withResult(n,{type:`tool-result`,toolCallId:t.toolCallId,toolName:t.toolName,output:{type:`error-text`,value:`The previous attempt ended without a recorded result; execution outcome is unknown; verify external state before repeating side effects.`}});r!==void 0&&o.length>n.length&&a<r&&r++,n=o}return{messages:n,insertionIndex:r}}function closeProviderCalls(e,t){let n=extractToolResultCallIds(e),r=t?awaitedProviderToolCallIds(e):new Set,i=new Set(e.flatMap(e=>e.role===`assistant`&&Array.isArray(e.content)?e.content.flatMap(e=>e.type===`tool-approval-request`?[e.toolCallId]:[]):[]));return e.map(e=>{if(e.role!==`assistant`||!Array.isArray(e.content))return e;let t=e.content,a=t.some(e=>e.type===`tool-call`&&e.providerExecuted!==!0),dangling=e=>e.type===`tool-call`&&e.providerExecuted===!0&&!n.has(e.toolCallId)&&!r.has(e.toolCallId)&&!i.has(e.toolCallId)&&!n.has(anthropicCaller(e.providerOptions)??``);return!a||!t.some(dangling)?e:{...e,content:t.map(e=>e.type===`tool-call`&&dangling(e)?{...e,providerExecuted:!1}:e)}})}function anthropicCaller(e){let t=e?.anthropic?.caller;return typeof t?.toolId==`string`?t.toolId:void 0}export{repairToolHistory};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{contextStorage}from"#context/container.js";import{StaticModelReferenceKey}from"#context/keys.js";import{resolveInstalledPackageInfo}from"#internal/application/package.js";import{turnPosition}from"#harness/session-machine/view.js";import{saveProjection,stepProjection}from"#harness/session-machine/current.js";import{admitHumanInput,applyHumanDecisions,compactInput,openDeferredApprovals,queueInput,settleHumanInput,turnInputOnly,withoutTurnInput}from"#harness/hitl/index.js";import{clear,controlDeliveryFor,controlled,join}from"#harness/session-machine/transitions.js";import{activeTurnIdOf}from"#protocol/session-projection.js";import{eventsOf}from"#harness/publication.js";import{compactHistory,replaceSessionHistory}from"#harness/compaction/step.js";import{blocked,hasQueuedTurnInput,park}from"#harness/step/park.js";import{createStep,failTurnForReaction,openTurn}from"#harness/step/context.js";import{GenerationSteering}from"#harness/generation-steering.js";import{runModelStep}from"#harness/model-call/run.js";import{prepareTurnInput,settleRuntimeWork}from"#harness/step/intake.js";const environment=process.env.NODE_ENV??`unknown`,eveVersion=resolveInstalledPackageInfo().version;function createToolLoopHarness(e){e.instrumentation?.installAiSdkWarningLogger();async function runStep(t,n){let executeStep=async r=>{let i=r?.session??t,a=stepProjection(contextStorage.getStore(),i.state),o=new GenerationSteering({abortSignal:e.abortSignal,steeringSignal:e.steeringSignal,outputStarted:turnPosition(a.read()).assistantOutputStarted});try{let e=await executeStepBody(i,o,a,n,r);return{...e,session:saveProjection(e.session,a.read())}}finally{o.dispose()}};return e.instrumentation?.runStep({environment,eveVersion,hasInput:hasStepInput(n),session:t},executeStep)??executeStep()}async function executeStepBody(t,n,r,i,a){let o=contextStorage.getStore();o!==void 0&&!o.has(StaticModelReferenceKey)&&o.setVirtualContext(StaticModelReferenceKey,t.agent.dynamicModel===!0?null:t.agent.modelReference??null);let s=a?.createHandleEvent({isFrameworkTool:e=>c.frameworkToolNames.has(e),handleEvent:e.handleEvent})??e.handleEvent,c=createStep({config:e,ctx:o,emit:s,instrumentation:a,live:r,publish:async(e,t)=>{let i=eventsOf(e);for(let e of i)n.beforeEvent(e);s!==void 0&&await s(e,t),(s===void 0||o===void 0)&&r.record(i)},runStep,session:t});if(e.clearOnly===!0)return clearContext(c);if(e.compactOnly===!0)return compactHistory(c);let l=await runtimeResults(c,i);if(`ended`in l)return l.ended;let u=await answers(c,l);if(`ended`in u)return u.ended;let d=await turnInput(c,i,u);if(`ended`in d)return d.ended;let f=await failTurnForReaction(c);if(f!==void 0)return f;let p=await applyHumanDecisions(c,u.decided);if(p!==void 0)return p;if(blocked(c.view(),c.session.state))return park(c);if(hasQueuedTurnInput(c.view())){let e=u.input&&{...u.input,message:d.message};return await c.apply(queueInput(c.view(),turnInputOnly(e))),{next:c.runStep,session:c.session}}return runModelStep(c,{generation:n,turn:d})}return runStep}async function runtimeResults(e,t){let n=await settleRuntimeWork(e,t);return n===void 0?{ended:{next:null,session:e.session}}:(await e.apply(openDeferredApprovals(e.view())),n)}async function answers(e,t){let n=await admitHumanInput(e,t.input,{takeQueued:!t.waited});if(n.kind===`stop`)return{ended:n.result};let r=await settleHumanInput(e,n),{input:i,message:a}=n;return(r.approved.length>0||r.settledApprovals)&&(await e.apply(queueInput(e.view(),turnInputOnly(i))),i=withoutTurnInput(i),a=void 0),r.approved.length===0&&blocked(e.view(),e.session.state)?(await e.apply(queueInput(e.view(),compactInput(i))),{ended:await park(e)}):{decided:r,input:i,intake:n,message:a}}async function turnInput(e,t,{input:n,intake:r,message:i}){let a=await prepareTurnInput(e,n,{consumedMessage:r.consumedMessage}),o=deliveriesOf(t,n);if(r.opensTurn){let t=await openTurn(e,{deliveries:o,input:[...a.ephemeral,...a.messages],message:i});if(t!==void 0)return{ended:t}}else o!==void 0&&await e.apply(join(e.view(),{deliveries:o}));return!r.opensTurn&&activeTurnIdOf(e.view().projection)===void 0?{ended:{next:null,session:e.session}}:a}async function clearContext(e){let t=controlDeliveryFor(e.view(),e.config.controlDelivery);
|
|
1
|
+
import{contextStorage}from"#context/container.js";import{StaticModelReferenceKey}from"#context/keys.js";import{resolveInstalledPackageInfo}from"#internal/application/package.js";import{turnPosition}from"#harness/session-machine/view.js";import{saveProjection,stepProjection}from"#harness/session-machine/current.js";import{admitHumanInput,applyHumanDecisions,compactInput,openDeferredApprovals,queueInput,settleHumanInput,turnInputOnly,withoutTurnInput}from"#harness/hitl/index.js";import{readTaskTable,takeTaskResults,writeTaskTable}from"#execution/tasks/table.js";import{clear,controlDeliveryFor,controlled,join}from"#harness/session-machine/transitions.js";import{activeTurnIdOf}from"#protocol/session-projection.js";import{eventsOf}from"#harness/publication.js";import{compactHistory,replaceSessionHistory}from"#harness/compaction/step.js";import{awaitsProviderToolResult}from"#harness/provider-tool-history.js";import{blocked,hasQueuedTurnInput,park}from"#harness/step/park.js";import{createStep,failTurnForReaction,openTurn}from"#harness/step/context.js";import{GenerationSteering}from"#harness/generation-steering.js";import{runModelStep}from"#harness/model-call/run.js";import{prepareTurnInput,settleRuntimeWork}from"#harness/step/intake.js";const environment=process.env.NODE_ENV??`unknown`,eveVersion=resolveInstalledPackageInfo().version;function createToolLoopHarness(e){e.instrumentation?.installAiSdkWarningLogger();async function runStep(t,n){let executeStep=async r=>{let i=r?.session??t,a=stepProjection(contextStorage.getStore(),i.state),o=new GenerationSteering({abortSignal:e.abortSignal,steeringSignal:e.steeringSignal,outputStarted:turnPosition(a.read()).assistantOutputStarted});try{let e=await executeStepBody(i,o,a,n,r);return{...e,session:saveProjection(e.session,a.read())}}finally{o.dispose()}};return e.instrumentation?.runStep({environment,eveVersion,hasInput:hasStepInput(n),session:t},executeStep)??executeStep()}async function executeStepBody(t,n,r,i,a){let o=contextStorage.getStore();o!==void 0&&!o.has(StaticModelReferenceKey)&&o.setVirtualContext(StaticModelReferenceKey,t.agent.dynamicModel===!0?null:t.agent.modelReference??null);let s=a?.createHandleEvent({isFrameworkTool:e=>c.frameworkToolNames.has(e),handleEvent:e.handleEvent})??e.handleEvent,c=createStep({config:e,ctx:o,emit:s,instrumentation:a,live:r,publish:async(e,t)=>{let i=eventsOf(e);for(let e of i)n.beforeEvent(e);s!==void 0&&await s(e,t),(s===void 0||o===void 0)&&r.record(i)},runStep,session:t});if(e.clearOnly===!0)return clearContext(c);if(e.compactOnly===!0)return compactHistory(c);let l=await runtimeResults(c,i);if(`ended`in l)return l.ended;let u=await answers(c,l);if(`ended`in u)return u.ended;let d=await turnInput(c,i,u);if(`ended`in d)return d.ended;let f=await failTurnForReaction(c);if(f!==void 0)return f;let p=await applyHumanDecisions(c,u.decided);if(p!==void 0)return p;if(blocked(c.view(),c.session.state))return park(c);if(hasQueuedTurnInput(c.view())&&!awaitsProviderToolResult(c.session.history)){let e=u.input&&{...u.input,message:d.message};return await c.apply(queueInput(c.view(),turnInputOnly(e))),{next:c.runStep,session:c.session}}return runModelStep(c,{generation:n,turn:d})}return runStep}async function runtimeResults(e,t){let n=await settleRuntimeWork(e,t);return n===void 0?{ended:{next:null,session:e.session}}:(await e.apply(openDeferredApprovals(e.view())),n)}async function answers(e,t){let n=await admitHumanInput(e,t.input,{takeQueued:!t.waited});if(n.kind===`stop`)return{ended:n.result};let r=await settleHumanInput(e,n),{input:i,message:a}=n;return(r.approved.length>0||r.settledApprovals||awaitsProviderToolResult(e.session.history)&&activeTurnIdOf(e.view().projection)!==void 0)&&(await e.apply(queueInput(e.view(),turnInputOnly(i))),i=withoutTurnInput(i),a=void 0),r.approved.length===0&&blocked(e.view(),e.session.state)?(await e.apply(queueInput(e.view(),compactInput(i))),{ended:await park(e)}):{decided:r,input:i,intake:n,message:a}}async function turnInput(e,t,{input:n,intake:r,message:i}){let a=await prepareTurnInput(e,n,{consumedMessage:r.consumedMessage}),o=deliveriesOf(t,n);if(r.opensTurn){let t=await openTurn(e,{deliveries:o,input:[...a.ephemeral,...a.messages],message:i});if(t!==void 0)return{ended:t}}else o!==void 0&&await e.apply(join(e.view(),{deliveries:o}));return!r.opensTurn&&activeTurnIdOf(e.view().projection)===void 0?{ended:{next:null,session:e.session}}:a}async function clearContext(e){let t=controlDeliveryFor(e.view(),e.config.controlDelivery);await e.apply(controlled(t,`clear`,t=>clear(e.view(),{cause:t})));let n=takeTaskResults(readTaskTable(e.session.state)).table;return{next:null,session:replaceSessionHistory(writeTaskTable(e.session,n),[])}}function deliveriesOf(...e){let t=new Map;for(let n of e.flatMap(e=>e?.deliveries??[]))t.has(n.deliveryId)||t.set(n.deliveryId,n);return t.size===0?void 0:[...t.values()]}function hasStepInput(e){return e===void 0?!1:e.message!==void 0||(e.answers?.length??0)>0}export{createToolLoopHarness};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
const STAMPED_PACKAGE_VERSION=`0.
|
|
1
|
+
const STAMPED_PACKAGE_VERSION=`0.91.0`;function readStampedPackageVersion(){return STAMPED_PACKAGE_VERSION.startsWith(`__`)?void 0:STAMPED_PACKAGE_VERSION}export{readStampedPackageVersion};
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { z } from "#compiled/zod/index.js";
|
|
2
2
|
import type { Envelope, Principal, UserPart } from "../envelope.js";
|
|
3
3
|
/**
|
|
4
|
-
* Where a delivery came from: a channel (with the schedule that sent it), a control, or a
|
|
5
|
-
* sign-in callback.
|
|
6
|
-
* delivery on its own
|
|
4
|
+
* Where a delivery came from: a channel (with the schedule or hook that sent it), a control, or a
|
|
5
|
+
* sign-in callback. A hook's `ctx.continue()` names the hook's slug and the session's channel.
|
|
6
|
+
* The set is open. A parent session records which of its calls sent a child's delivery on its own
|
|
7
|
+
* `child.sent`.
|
|
7
8
|
*/
|
|
8
9
|
export type DeliverySource = {
|
|
9
10
|
readonly channel: string;
|
|
10
11
|
readonly scheduleId?: string;
|
|
12
|
+
readonly hook?: string;
|
|
11
13
|
} | {
|
|
12
14
|
readonly control: string;
|
|
13
15
|
} | {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{conforming,envelopeOf,id,known,principal,userPart}from"../common.js";import{z}from"#compiled/zod/index.js";const deliverySource=conforming()(z.union([z.object({channel:z.string(),scheduleId:z.string().optional()}),z.object({control:z.string()}),z.object({callback:z.string()})])),importedMessage=conforming()(z.object({id:z.string().optional(),role:z.enum([`user`,`assistant`]),text:z.string()})),deliverySchemas={"delivery.admitted":envelopeOf(`delivery.admitted`,conforming()(z.object({deliveryId:id,principal:principal.optional(),source:deliverySource.optional()}))),"delivery.consumed":envelopeOf(`delivery.consumed`,conforming()(z.object({deliveryId:id,history:z.array(importedMessage).optional(),parts:z.array(userPart),turnId:id}))),"delivery.settled":envelopeOf(`delivery.settled`,conforming()(z.object({deliveryId:id,outcome:known(),reason:z.string().optional(),turnId:id.optional()})))};export{deliverySchemas};
|
|
1
|
+
import{conforming,envelopeOf,id,known,principal,userPart}from"../common.js";import{z}from"#compiled/zod/index.js";const deliverySource=conforming()(z.union([z.object({channel:z.string(),scheduleId:z.string().optional(),hook:z.string().optional()}),z.object({control:z.string()}),z.object({callback:z.string()})])),importedMessage=conforming()(z.object({id:z.string().optional(),role:z.enum([`user`,`assistant`]),text:z.string()})),deliverySchemas={"delivery.admitted":envelopeOf(`delivery.admitted`,conforming()(z.object({deliveryId:id,principal:principal.optional(),source:deliverySource.optional()}))),"delivery.consumed":envelopeOf(`delivery.consumed`,conforming()(z.object({deliveryId:id,history:z.array(importedMessage).optional(),parts:z.array(userPart),turnId:id}))),"delivery.settled":envelopeOf(`delivery.settled`,conforming()(z.object({deliveryId:id,outcome:known(),reason:z.string().optional(),turnId:id.optional()})))};export{deliverySchemas};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{FACT_CATALOG,isFactType,isProgressType}from"#protocol/session-events/catalog.js";import{isOpen,parentOf,refOf,tableOf,turnOf}from"#protocol/session-projection/tree.js";import{isObject}from"#protocol/session-events/json.js";const ZERO={cacheReadTokens:0,cacheWriteTokens:0,inputTokens:0,outputTokens:0};function dictionary(e){return Object.assign(Object.create(null),e)}function emptySessionView(){return{calls:dictionary(),changes:dictionary(),children:dictionary(),deliveries:dictionary(),interactions:dictionary(),parts:dictionary(),position:0,responses:dictionary(),runs:dictionary(),session:{status:`new`,turnCount:0},tasks:dictionary(),turns:dictionary(),usage:{byKind:dictionary(),total:ZERO}}}function emptyPreviews(){return{calls:dictionary(),parts:dictionary()}}function foldLine(e,t,n,r={}){let i=e;if(n<i.position)return;r.retention===`operational`&&prune(i,r.keep),i.position=n+1;let a=r.previews;if(`progress`in t){a!==void 0&&foldProgress(i,a,t.progress);return}if(Array.isArray(t.facts))for(let e of t.facts)foldFact(i,a,e,{at:t.at,position:n})}function foldLines(e,t,n,r={}){let i=n;for(let n of t)foldLine(e,n,i,r),i+=1}function foldEvents(e,t,n={}){let r=0;for(;r<t.length;){let i=t[r].meta.position.line,a=r+1;for(;a<t.length&&t[a].meta.position.line===i;)a+=1;let o=t.slice(r,a);if(o.at(-1).meta.endOfLine===!1)return t.slice(r);let s=o[0];foldLine(e,o.length===1&&isProgressType(s.type)?{progress:s}:{at:s.meta.at,facts:o},i,n),r=a}return[]}function viewOfEvents(e){let t=emptySessionView(),n=emptyPreviews();return foldEvents(t,e,{previews:n}),{previews:n,view:t}}function copyView(e){return{...e,calls:dictionary(e.calls),changes:dictionary(e.changes),children:dictionary(e.children),deliveries:dictionary(e.deliveries),interactions:dictionary(e.interactions),parts:dictionary(e.parts),responses:dictionary(e.responses),runs:dictionary(e.runs),tasks:dictionary(e.tasks),turns:dictionary(e.turns)}}function foldReceivedEvent(e,t,n){let r=e,i=t.meta?.position?.line??r.position;if(i<r.position)return;let a=n;isFactType(t.type)?foldFact(r,a,t,{at:t.meta?.at??``,position:i}):a!==void 0&&isProgressType(t.type)&&foldProgress(r,a,t),t.meta?.endOfLine!==!1&&(r.position=i+1)}function foldFact(e,t,n,r){if(typeof n!=`object`||!n)return;let i=n;if(isFactType(i.type)&&i.data!==null&&typeof i.data==`object`&&e.session.status!==`ended`&&(i.type!==`model.requested`&&i.type!==`call.requested`&&i.type!==`child.opened`||isObject(i.data.owner))){if(foldLifecycle(e,i,{introducedAt:r.position,startedAt:r.at},r)){foldSpecifics(e,t,i,r);return}switch(i.type){case`session.started`:{if(e.session.status!==`new`)return;let{parent:t,runtime:n}=i.data;e.session={...e.session,parent:t,runtime:n,startedAt:r.at,status:`open`};return}case`session.ended`:{let{cause:t,error:n,outcome:a}=i.data;if(typeof a!=`string`)return;e.session={...e.session,cause:t,closedAt:r.position,endedAt:r.at,error:n,outcome:a,status:`ended`};return}case`child.sent`:{let{callId:t,childDeliveryId:n,sessionId:r}=i.data,a=e.children[r];if(a===void 0||a.deliveries?.some(e=>e.deliveryId===n))return;e.children[r]={...a,deliveries:[...a.deliveries??[],{callId:t,deliveryId:n}]};return}case`usage.recorded`:{let{kind:t,owner:n,usage:r}=i.data;if(typeof r!=`object`||!r||(e.usage=addToTotals(e.usage,t,r),!isObject(n)))return;if(`runId`in n){let t=e.runs[n.runId];t!==void 0&&(e.runs[t.runId]={...t,usage:addUsage(t.usage,r)})}else if(`callId`in n){let t=e.calls[n.callId];t!==void 0&&(e.calls[t.callId]={...t,usage:addUsage(t.usage,r)})}return}}}}const LIFECYCLE={"call.requested":{status:`requested`,table:`calls`},"call.settled":{status:`settled`,table:`calls`},"call.started":{from:`requested`,status:`running`,table:`calls`},"child.opened":{table:`children`},"content.completed":{table:`parts`},"context.settled":{status:`settled`,table:`changes`},"context.started":{status:`running`,table:`changes`},"delivery.admitted":{status:`admitted`,table:`deliveries`},"delivery.consumed":{from:`admitted`,omit:[`history`],status:`consumed`,table:`deliveries`},"delivery.settled":{status:`settled`,table:`deliveries`},"interaction.opened":{status:`open`,table:`interactions`},"interaction.settled":{status:`settled`,table:`interactions`},"model.requested":{status:`requested`,table:`runs`},"model.settled":{status:`settled`,table:`runs`},"model.started":{status:`running`,table:`runs`},"response.admitted":{from:`submitted`,status:`admitted`,table:`responses`},"response.settled":{status:`settled`,table:`responses`},"response.submitted":{status:`submitted`,table:`responses`},"task.ended":{status:`ended`,table:`tasks`},"task.started":{status:`running`,table:`tasks`},"turn.settled":{rename:{cause:`endedBy`},status:`settled`,table:`turns`},"turn.started":{omit:[`trace`],status:`running`,table:`turns`}},FOLD_FIELDS=new Set([`introducedAt`,`startedAt`,`closedAt`,`endedAt`,`consumedAt`,`step`,`runs`,`status`]);function foldLifecycle(e,t,n,r){let i=LIFECYCLE[t.type];if(i===void 0)return!1;let{idField:a,role:o}=FACT_CATALOG[t.type],s=Object.fromEntries(Object.entries(t.data).flatMap(([e,t])=>i.omit?.includes(e)===!0||FOLD_FIELDS.has(e)?[]:[[i.rename?.[e]??e,t]])),c=s[a];if(typeof c!=`string`)return!1;let l=e[i.table],u=l[c],d=i.status===void 0?{}:{status:i.status},closed=e=>e.status===`settled`||e.status===`ended`;switch(o){case`introduces`:case`complete`:return u===void 0&&(l[c]={...n,...s,...d},!0);case`updates`:return u===void 0||(i.from===void 0?closed(u):u.status!==i.from)?!1:(l[c]={...u,...s,...d},!0);case`terminal`:return u===void 0||closed(u)||typeof s.outcome!=`string`?!1:(l[c]={...u,...s,closedAt:r.position,endedAt:r.at,...d},!0);default:return!1}}function foldSpecifics(e,t,n,r){switch(n.type){case`delivery.consumed`:{let t=e.deliveries[n.data.deliveryId];e.deliveries[t.deliveryId]={...t,consumedAt:r.position};return}case`turn.started`:e.session={...e.session,latestTurnId:n.data.turnId,turnCount:e.session.turnCount+1},delete e.selection;return;case`model.requested`:{let{owner:t,runId:r}=n.data,i=`turnId`in t?e.turns[t.turnId]:void 0;if(i===void 0)return;let a=i.runs??0;e.turns[i.turnId]={...i,runs:a+1},e.runs[r]={...e.runs[r],step:a};return}case`model.settled`:t!==void 0&&dropRunPreviews(e,t,n.data.runId);return;case`call.requested`:case`call.settled`:t!==void 0&&delete t.calls[n.data.callId];return;case`content.completed`:{let{partId:r,phase:i,runId:a}=n.data;t!==void 0&&delete t.parts[r];let o=e.runs[a]?.owner,s=o!==void 0&&`turnId`in o?e.turns[o.turnId]:void 0;if(i===`reply`&&s!==void 0&&s.status!==`settled`){let t=(s.reply??[]).filter(t=>e.parts[t]?.runId===a);e.turns[s.turnId]={...s,reply:[...t,r]}}return}case`context.settled`:{let{outcome:t,selects:r}=n.data;t===`completed`&&`selects`in n.data&&r!==void 0&&(e.selection=r);return}}}function foldProgress(e,t,n){if(typeof n!=`object`||!n)return;let r=n;if(isProgressType(r.type)&&r.data!==null&&typeof r.data==`object`&&e.session.status!==`ended`)switch(r.type){case`content.delta`:{let{delta:n,kind:i,partId:a}=r.data;if(e.parts[a]!==void 0||typeof n!=`string`)return;let o=t.parts[a];o===void 0?i!==void 0&&(t.parts[a]={kind:i,partId:a,runId:r.scope?.runId,text:n}):t.parts[a]={...o,text:o.text+n};return}case`call.input`:{let{callId:n,delta:i,kind:a,name:o}=r.data;if(e.calls[n]!==void 0||typeof i!=`string`)return;let s=t.calls[n];if(s!==void 0)t.calls[n]={...s,input:s.input+i};else if(o!==void 0){let e={callId:n,input:i,name:o,runId:r.scope?.runId};t.calls[n]=a===void 0?e:{...e,kind:a}}return}case`call.progress`:{let{callId:n,output:i,label:a}=r.data,o=e.calls[n];if(o===void 0||o.status===`settled`)return;let s=t.calls[n];t.calls[n]={callId:n,input:s?.input??``,name:o.capability.name,output:i,runId:`runId`in o.owner?o.owner.runId:void 0,...a!==void 0&&{label:a}};return}}}function dropRunPreviews(e,t,n){for(let[e,r]of Object.entries(t.parts))r.runId===n&&delete t.parts[e];for(let[r,i]of Object.entries(t.calls))i.runId===n&&e.calls[r]===void 0&&delete t.calls[r]}function prune(e,t){let n=new Set,pinPath=t=>{let r=t===void 0?[]:[t];for(;r.length>0;){let t=r.pop(),i=`${tableOf(t.family)}:${t.id}`;if(n.has(i))continue;n.add(i);let a=parentOf(e,t);a!==void 0&&r.push(a);let o=t.family===`call`?refOf(e.calls[t.id]?.owner):void 0;o!==void 0&&r.push(o)}};for(let t of[`call`,`run`,`change`,`interaction`,`delivery`])for(let n of Object.keys(e[tableOf(t)]))isOpen(e,{family:t,id:n})&&pinPath({family:t,id:n});for(let t of Object.values(e.responses))t.status!==`settled`&&(pinPath({family:`response`,id:t.responseId}),pinPath({family:`delivery`,id:t.deliveryId}));let r=liveTurns(e),i=e.session.latestTurnId;for(let t of(i===void 0?void 0:e.turns[i]?.reply)??[])n.add(`parts:${t}`);let retained=(i,a)=>{if(n.has(`${tableOf(i)}:${a}`)||t?.(tableOf(i),a)===!0)return!0;let o=i===`part`?void 0:turnOf(e,{family:i,id:a});return o!==void 0&&r.has(o)},dropWhere=(e,t,n)=>{for(let[r,i]of Object.entries(t))n(i)&&!retained(e,r)&&delete t[r]};dropWhere(`delivery`,e.deliveries,e=>e.status===`settled`),dropWhere(`turn`,e.turns,e=>e.status===`settled`),dropWhere(`run`,e.runs,e=>e.status===`settled`),dropWhere(`part`,e.parts,()=>!0),dropWhere(`call`,e.calls,e=>e.status===`settled`),dropWhere(`task`,e.tasks,e=>e.status===`ended`),dropWhere(`interaction`,e.interactions,e=>e.status===`settled`),dropWhere(`response`,e.responses,e=>e.status===`settled`),dropWhere(`change`,e.changes,e=>e.status===`settled`);for(let[t,n]of Object.entries(e.children))(`callId`in n.owner?e.calls[n.owner.callId]:e.tasks[n.owner.taskId])===void 0?delete e.children[t]:n.deliveries!==void 0&&(e.children[t]={...n,deliveries:void 0});for(let t of Object.values(e.calls))t.status===`settled`&&!n.has(`calls:${t.callId}`)&&withholdLarge(e,t)}function liveTurns(e){let t=new Set;e.session.latestTurnId!==void 0&&t.add(e.session.latestTurnId);for(let n of Object.values(e.calls)){if(n.status===`settled`)continue;let r=turnOf(e,{family:`call`,id:n.callId});r!==void 0&&t.add(r)}return t}const MAX_KEPT_VALUE_LENGTH=16384;function withholdLarge(e,t){let size=e=>e===void 0?0:JSON.stringify(e)?.length??0,n=size(t.input),r=size(t.output);if(n<=MAX_KEPT_VALUE_LENGTH&&r<=MAX_KEPT_VALUE_LENGTH)return;let{input:i,output:a,...o}=t;e.calls[t.callId]={...o,...n<=MAX_KEPT_VALUE_LENGTH?{input:i}:{inputRef:{size:n,mediaType:`application/json`}},...r<=MAX_KEPT_VALUE_LENGTH?a===void 0?{}:{output:a}:{outputRef:{size:r,mediaType:`application/json`}}}}function addUsage(e,t){if(e===void 0)return t;let n={cacheReadTokens:e.cacheReadTokens+t.cacheReadTokens,cacheWriteTokens:e.cacheWriteTokens+t.cacheWriteTokens,inputTokens:e.inputTokens+t.inputTokens,outputTokens:e.outputTokens+t.outputTokens};return(e.costUsd!==void 0||t.costUsd!==void 0)&&(n.costUsd=(e.costUsd??0)+(t.costUsd??0)),n}function addToTotals(e,t,n){return{byKind:dictionary({...e.byKind,[t]:addUsage(e.byKind[t],n)}),total:addUsage(e.total,n)}}export{copyView,emptyPreviews,emptySessionView,foldEvents,foldLine,foldLines,foldReceivedEvent,viewOfEvents};
|
|
1
|
+
import{FACT_CATALOG,isFactType,isProgressType}from"#protocol/session-events/catalog.js";import{isOpen,parentOf,refOf,tableOf,turnOf}from"#protocol/session-projection/tree.js";import{isObject}from"#protocol/session-events/json.js";const ZERO={cacheReadTokens:0,cacheWriteTokens:0,inputTokens:0,outputTokens:0};function dictionary(e){return Object.assign(Object.create(null),e)}function emptySessionView(){return{calls:dictionary(),changes:dictionary(),children:dictionary(),deliveries:dictionary(),interactions:dictionary(),parts:dictionary(),position:0,responses:dictionary(),runs:dictionary(),session:{status:`new`,turnCount:0},tasks:dictionary(),turns:dictionary(),usage:{byKind:dictionary(),total:ZERO}}}function emptyPreviews(){return{calls:dictionary(),parts:dictionary()}}function foldLine(e,t,n,r={}){let i=e;if(n<i.position)return;r.retention===`operational`&&prune(i,r.keep),i.position=n+1;let a=r.previews;if(`progress`in t){a!==void 0&&foldProgress(i,a,t.progress);return}if(Array.isArray(t.facts))for(let e of t.facts)foldFact(i,a,e,{at:t.at,position:n})}function foldLines(e,t,n,r={}){let i=n;for(let n of t)foldLine(e,n,i,r),i+=1}function foldEvents(e,t,n={}){let r=0;for(;r<t.length;){let i=t[r].meta.position.line,a=r+1;for(;a<t.length&&t[a].meta.position.line===i;)a+=1;let o=t.slice(r,a);if(o.at(-1).meta.endOfLine===!1)return t.slice(r);let s=o[0];foldLine(e,o.length===1&&isProgressType(s.type)?{progress:s}:{at:s.meta.at,facts:o},i,n),r=a}return[]}function viewOfEvents(e){let t=emptySessionView(),n=emptyPreviews();return foldEvents(t,e,{previews:n}),{previews:n,view:t}}function copyView(e){return{...e,calls:dictionary(e.calls),changes:dictionary(e.changes),children:dictionary(e.children),deliveries:dictionary(e.deliveries),interactions:dictionary(e.interactions),parts:dictionary(e.parts),responses:dictionary(e.responses),runs:dictionary(e.runs),tasks:dictionary(e.tasks),turns:dictionary(e.turns)}}function foldReceivedEvent(e,t,n){let r=e,i=t.meta?.position?.line??r.position;if(i<r.position)return;let a=n;isFactType(t.type)?foldFact(r,a,t,{at:t.meta?.at??``,position:i}):a!==void 0&&isProgressType(t.type)&&foldProgress(r,a,t),t.meta?.endOfLine!==!1&&(r.position=i+1)}function foldFact(e,t,n,r){if(typeof n!=`object`||!n)return;let i=n;if(isFactType(i.type)&&i.data!==null&&typeof i.data==`object`&&e.session.status!==`ended`&&(i.type!==`model.requested`&&i.type!==`call.requested`&&i.type!==`child.opened`||isObject(i.data.owner))){if(foldLifecycle(e,i,{introducedAt:r.position,startedAt:r.at},r)){foldSpecifics(e,t,i,r);return}switch(i.type){case`session.started`:{if(e.session.status!==`new`)return;let{parent:t,runtime:n}=i.data;e.session={...e.session,parent:t,runtime:n,startedAt:r.at,status:`open`};return}case`session.ended`:{let{cause:t,error:n,outcome:a}=i.data;if(typeof a!=`string`)return;e.session={...e.session,cause:t,closedAt:r.position,endedAt:r.at,error:n,outcome:a,status:`ended`};return}case`child.sent`:{let{callId:t,childDeliveryId:n,sessionId:r}=i.data,a=e.children[r];if(a===void 0||a.deliveries?.some(e=>e.deliveryId===n))return;e.children[r]={...a,deliveries:[...a.deliveries??[],{callId:t,deliveryId:n}]};return}case`usage.recorded`:{let{kind:t,owner:n,usage:r}=i.data;if(typeof r!=`object`||!r||(e.usage=addToTotals(e.usage,t,r),!isObject(n)))return;if(`runId`in n){let t=e.runs[n.runId];t!==void 0&&(e.runs[t.runId]={...t,usage:addUsage(t.usage,r)})}else if(`callId`in n){let t=e.calls[n.callId];t!==void 0&&(e.calls[t.callId]={...t,usage:addUsage(t.usage,r)})}return}}}}const LIFECYCLE={"call.requested":{status:`requested`,table:`calls`},"call.settled":{status:`settled`,table:`calls`},"call.started":{from:`requested`,status:`running`,table:`calls`},"child.opened":{table:`children`},"content.completed":{table:`parts`},"context.settled":{status:`settled`,table:`changes`},"context.started":{status:`running`,table:`changes`},"delivery.admitted":{status:`admitted`,table:`deliveries`},"delivery.consumed":{from:`admitted`,omit:[`history`],status:`consumed`,table:`deliveries`},"delivery.settled":{status:`settled`,table:`deliveries`},"interaction.opened":{status:`open`,table:`interactions`},"interaction.settled":{status:`settled`,table:`interactions`},"model.requested":{status:`requested`,table:`runs`},"model.settled":{status:`settled`,table:`runs`},"model.started":{status:`running`,table:`runs`},"response.admitted":{from:`submitted`,status:`admitted`,table:`responses`},"response.settled":{status:`settled`,table:`responses`},"response.submitted":{status:`submitted`,table:`responses`},"task.ended":{status:`ended`,table:`tasks`},"task.started":{status:`running`,table:`tasks`},"turn.settled":{rename:{cause:`endedBy`},status:`settled`,table:`turns`},"turn.started":{omit:[`trace`],status:`running`,table:`turns`}},FOLD_FIELDS=new Set([`introducedAt`,`startedAt`,`closedAt`,`endedAt`,`consumedAt`,`step`,`runs`,`status`]);function foldLifecycle(e,t,n,r){let i=LIFECYCLE[t.type];if(i===void 0)return!1;let{idField:a,role:o}=FACT_CATALOG[t.type],s=Object.fromEntries(Object.entries(t.data).flatMap(([e,t])=>i.omit?.includes(e)===!0||FOLD_FIELDS.has(e)?[]:[[i.rename?.[e]??e,t]])),c=s[a];if(typeof c!=`string`)return!1;let l=e[i.table],u=l[c],d=i.status===void 0?{}:{status:i.status},closed=e=>e.status===`settled`||e.status===`ended`;switch(o){case`introduces`:case`complete`:return u===void 0&&(l[c]={...n,...s,...d},!0);case`updates`:return u===void 0||(i.from===void 0?closed(u):u.status!==i.from)?!1:(l[c]={...u,...s,...d},!0);case`terminal`:return u===void 0||closed(u)||typeof s.outcome!=`string`?!1:(l[c]={...u,...s,closedAt:r.position,endedAt:r.at,...d},!0);default:return!1}}function foldSpecifics(e,t,n,r){switch(n.type){case`delivery.consumed`:{let t=e.deliveries[n.data.deliveryId];e.deliveries[t.deliveryId]={...t,consumedAt:r.position};return}case`turn.started`:e.session={...e.session,latestTurnId:n.data.turnId,turnCount:e.session.turnCount+1},delete e.selection;return;case`model.requested`:{let{owner:t,runId:r}=n.data,i=`turnId`in t?e.turns[t.turnId]:void 0;if(i===void 0)return;let a=i.runs??0;e.turns[i.turnId]={...i,runs:a+1},e.runs[r]={...e.runs[r],step:a};return}case`model.settled`:t!==void 0&&dropRunPreviews(e,t,n.data.runId);return;case`call.requested`:case`call.settled`:t!==void 0&&delete t.calls[n.data.callId];return;case`content.completed`:{let{partId:r,phase:i,runId:a}=n.data;t!==void 0&&delete t.parts[r];let o=e.runs[a]?.owner,s=o!==void 0&&`turnId`in o?e.turns[o.turnId]:void 0;if(i===`reply`&&s!==void 0&&s.status!==`settled`){let t=(s.reply??[]).filter(t=>e.parts[t]?.runId===a);e.turns[s.turnId]={...s,reply:[...t,r]}}return}case`context.settled`:{let{outcome:t,selects:r}=n.data;t===`completed`&&`selects`in n.data&&r!==void 0&&(e.selection=r);return}}}function foldProgress(e,t,n){if(typeof n!=`object`||!n)return;let r=n;if(isProgressType(r.type)&&r.data!==null&&typeof r.data==`object`&&e.session.status!==`ended`)switch(r.type){case`content.delta`:{let{delta:n,kind:i,partId:a}=r.data;if(e.parts[a]!==void 0||typeof n!=`string`)return;let o=t.parts[a];o===void 0?i!==void 0&&(t.parts[a]={kind:i,partId:a,runId:r.scope?.runId,text:n}):t.parts[a]={...o,text:o.text+n};return}case`call.input`:{let{callId:n,delta:i,kind:a,name:o}=r.data;if(e.calls[n]!==void 0||typeof i!=`string`)return;let s=t.calls[n];if(s!==void 0)t.calls[n]={...s,input:s.input+i};else if(o!==void 0){let e={callId:n,input:i,name:o,runId:r.scope?.runId};t.calls[n]=a===void 0?e:{...e,kind:a}}return}case`call.progress`:{let{callId:n,output:i,label:a}=r.data,o=e.calls[n];if(o===void 0||o.status===`settled`)return;let s=t.calls[n];t.calls[n]={callId:n,input:s?.input??``,name:o.capability.name,output:i,runId:`runId`in o.owner?o.owner.runId:void 0,...a!==void 0&&{label:a}};return}}}function dropRunPreviews(e,t,n){for(let[e,r]of Object.entries(t.parts))r.runId===n&&delete t.parts[e];for(let[r,i]of Object.entries(t.calls))i.runId===n&&e.calls[r]===void 0&&delete t.calls[r]}function prune(e,t){let n=new Set,pinPath=t=>{let r=t===void 0?[]:[t];for(;r.length>0;){let t=r.pop(),i=`${tableOf(t.family)}:${t.id}`;if(n.has(i))continue;n.add(i);let a=parentOf(e,t);a!==void 0&&r.push(a);let o=t.family===`call`?refOf(e.calls[t.id]?.owner):void 0;o!==void 0&&r.push(o)}};for(let t of[`call`,`run`,`change`,`interaction`,`delivery`])for(let n of Object.keys(e[tableOf(t)]))isOpen(e,{family:t,id:n})&&pinPath({family:t,id:n});for(let t of Object.values(e.responses))t.status!==`settled`&&(pinPath({family:`response`,id:t.responseId}),pinPath({family:`delivery`,id:t.deliveryId}));let r=liveTurns(e),i=e.session.latestTurnId;for(let t of(i===void 0?void 0:e.turns[i]?.reply)??[])n.add(`parts:${t}`);let retained=(i,a)=>{if(n.has(`${tableOf(i)}:${a}`)||t?.(tableOf(i),a)===!0)return!0;let o=i===`part`?void 0:i===`delivery`?e.deliveries[a]?.turnId:turnOf(e,{family:i,id:a});return o!==void 0&&r.has(o)},dropWhere=(e,t,n)=>{for(let[r,i]of Object.entries(t))n(i)&&!retained(e,r)&&delete t[r]};dropWhere(`delivery`,e.deliveries,e=>e.status===`settled`),dropWhere(`turn`,e.turns,e=>e.status===`settled`),dropWhere(`run`,e.runs,e=>e.status===`settled`),dropWhere(`part`,e.parts,()=>!0),dropWhere(`call`,e.calls,e=>e.status===`settled`),dropWhere(`task`,e.tasks,e=>e.status===`ended`),dropWhere(`interaction`,e.interactions,e=>e.status===`settled`),dropWhere(`response`,e.responses,e=>e.status===`settled`),dropWhere(`change`,e.changes,e=>e.status===`settled`);for(let[t,n]of Object.entries(e.children))(`callId`in n.owner?e.calls[n.owner.callId]:e.tasks[n.owner.taskId])===void 0?delete e.children[t]:n.deliveries!==void 0&&(e.children[t]={...n,deliveries:void 0});for(let t of Object.values(e.calls))t.status===`settled`&&!n.has(`calls:${t.callId}`)&&withholdLarge(e,t)}function liveTurns(e){let t=new Set;e.session.latestTurnId!==void 0&&t.add(e.session.latestTurnId);for(let n of Object.values(e.calls)){if(n.status===`settled`)continue;let r=turnOf(e,{family:`call`,id:n.callId});r!==void 0&&t.add(r)}return t}const MAX_KEPT_VALUE_LENGTH=16384;function withholdLarge(e,t){let size=e=>e===void 0?0:JSON.stringify(e)?.length??0,n=size(t.input),r=size(t.output);if(n<=MAX_KEPT_VALUE_LENGTH&&r<=MAX_KEPT_VALUE_LENGTH)return;let{input:i,output:a,...o}=t;e.calls[t.callId]={...o,...n<=MAX_KEPT_VALUE_LENGTH?{input:i}:{inputRef:{size:n,mediaType:`application/json`}},...r<=MAX_KEPT_VALUE_LENGTH?a===void 0?{}:{output:a}:{outputRef:{size:r,mediaType:`application/json`}}}}function addUsage(e,t){if(e===void 0)return t;let n={cacheReadTokens:e.cacheReadTokens+t.cacheReadTokens,cacheWriteTokens:e.cacheWriteTokens+t.cacheWriteTokens,inputTokens:e.inputTokens+t.inputTokens,outputTokens:e.outputTokens+t.outputTokens};return(e.costUsd!==void 0||t.costUsd!==void 0)&&(n.costUsd=(e.costUsd??0)+(t.costUsd??0)),n}function addToTotals(e,t,n){return{byKind:dictionary({...e.byKind,[t]:addUsage(e.byKind[t],n)}),total:addUsage(e.total,n)}}export{copyView,emptyPreviews,emptySessionView,foldEvents,foldLine,foldLines,foldReceivedEvent,viewOfEvents};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{parseAnswer}from"#shared/input.js";import{DISCORD_INTERACTION_RESPONSE_TYPE}from"#public/channels/discord/inbound.js";import{chunk,truncate}from"#public/channels/text.js";const DISCORD_COMPONENT_TYPE={ACTION_ROW:1,BUTTON:2,STRING_SELECT:3,TEXT_INPUT:4},DISCORD_HITL_CUSTOM_ID_PREFIX=`eve_input:`,DISCORD_HITL_FREEFORM_CUSTOM_ID_PREFIX=`eve_input_freeform:`,DISCORD_HITL_FREEFORM_TEXT_INPUT_ID=`eve_freeform_text`;function renderInteractionComponents(e){let t=e.request.options,n=e.request.allowFreeform===!0||!t||t.length===0;return t&&t.length>0&&e.request.display===`select`?[{components:[{custom_id:encodeHitlCustomId(DISCORD_HITL_CUSTOM_ID_PREFIX,{requestId:e.interactionId}),options:t.slice(0,25).map(e=>{let t={label:truncate(e.label,100),value:
|
|
1
|
+
import{parseAnswer}from"#shared/input.js";import{DISCORD_INTERACTION_RESPONSE_TYPE}from"#public/channels/discord/inbound.js";import{chunk,truncate}from"#public/channels/text.js";const DISCORD_COMPONENT_TYPE={ACTION_ROW:1,BUTTON:2,STRING_SELECT:3,TEXT_INPUT:4},DISCORD_HITL_CUSTOM_ID_PREFIX=`eve_input:`,DISCORD_HITL_FREEFORM_CUSTOM_ID_PREFIX=`eve_input_freeform:`,DISCORD_HITL_FREEFORM_TEXT_INPUT_ID=`eve_freeform_text`;function renderInteractionComponents(e){let t=e.request.options,n=e.request.allowFreeform===!0||!t||t.length===0;return t&&t.length>0&&e.request.display===`select`?[{components:[{custom_id:encodeHitlCustomId(DISCORD_HITL_CUSTOM_ID_PREFIX,{requestId:e.interactionId}),options:t.slice(0,25).map(e=>{let t={label:truncate(e.label,100),value:selectOptionValue(e.id)};return e.description!==void 0&&(t.description=truncate(e.description,100)),t}),placeholder:`Choose an option`,type:DISCORD_COMPONENT_TYPE.STRING_SELECT}],type:DISCORD_COMPONENT_TYPE.ACTION_ROW}]:t&&t.length>0?chunk(t.slice(0,25),5).map(t=>({components:t.map(t=>({custom_id:encodeHitlCustomId(DISCORD_HITL_CUSTOM_ID_PREFIX,{optionId:t.id,requestId:e.interactionId}),label:truncate(t.label,80),style:toDiscordButtonStyle(t.style),type:DISCORD_COMPONENT_TYPE.BUTTON})),type:DISCORD_COMPONENT_TYPE.ACTION_ROW})):n?[{components:[{custom_id:encodeHitlCustomId(DISCORD_HITL_FREEFORM_CUSTOM_ID_PREFIX,{requestId:e.interactionId}),label:`Type your answer`,style:1,type:DISCORD_COMPONENT_TYPE.BUTTON}],type:DISCORD_COMPONENT_TYPE.ACTION_ROW}]:[]}function buildFreeformModalResponse(e){let t=decodeHitlCustomId(e.customId,DISCORD_HITL_FREEFORM_CUSTOM_ID_PREFIX);if(!t)throw Error(`discordChannel: freeform custom_id is malformed.`);return{data:{components:[{components:[{custom_id:DISCORD_HITL_FREEFORM_TEXT_INPUT_ID,label:`Answer`,max_length:4e3,min_length:1,placeholder:`Type your answer here...`,required:!0,style:2,type:DISCORD_COMPONENT_TYPE.TEXT_INPUT}],type:DISCORD_COMPONENT_TYPE.ACTION_ROW}],custom_id:encodeHitlCustomId(DISCORD_HITL_FREEFORM_CUSTOM_ID_PREFIX,{requestId:t.requestId}),title:truncate(e.prompt??`Your answer`,45)},type:DISCORD_INTERACTION_RESPONSE_TYPE.MODAL}}function isDiscordFreeformComponent(e){return decodeHitlCustomId(e,DISCORD_HITL_FREEFORM_CUSTOM_ID_PREFIX)!==null}function deriveComponentAnswers(e){let t=decodeHitlCustomId(e.customId,DISCORD_HITL_CUSTOM_ID_PREFIX);if(!t)return[];if(t.optionId!==void 0)return[parseAnswer({interactionId:t.requestId,optionId:t.optionId})];let n=e.values[0];return n===void 0?[]:[parseAnswer({interactionId:t.requestId,optionId:n})]}function deriveModalAnswers(e){let t=decodeHitlCustomId(e.customId,DISCORD_HITL_FREEFORM_CUSTOM_ID_PREFIX),n=e.textInputs[DISCORD_HITL_FREEFORM_TEXT_INPUT_ID];return!t||n===void 0?[]:[parseAnswer({interactionId:t.requestId,text:n})]}function encodeHitlCustomId(e,t){let n=t.optionId===void 0?[t.requestId]:[t.requestId,t.optionId],r=`${e}${JSON.stringify(n)}`;if(r.length>100)throw Error(`discordChannel: HITL custom_id exceeded Discord's 100-character limit.`);return r}function decodeHitlCustomId(e,t){if(!e.startsWith(t))return null;let n;try{n=JSON.parse(e.slice(t.length))}catch{return null}if(!Array.isArray(n)||n.length<1||n.length>2)return null;let[r,i]=n;return typeof r!=`string`||r.length===0?null:i===void 0?{requestId:r}:typeof i==`string`?{optionId:i,requestId:r}:null}function selectOptionValue(e){if(e.length>100)throw Error(`discordChannel: select option ids must be at most 100 characters, Discord's option value limit.`);return e}function toDiscordButtonStyle(e){return e===`primary`?1:e===`danger`?4:2}export{DISCORD_COMPONENT_TYPE,DISCORD_HITL_CUSTOM_ID_PREFIX,DISCORD_HITL_FREEFORM_CUSTOM_ID_PREFIX,DISCORD_HITL_FREEFORM_TEXT_INPUT_ID,buildFreeformModalResponse,deriveComponentAnswers,deriveModalAnswers,isDiscordFreeformComponent,renderInteractionComponents};
|
|
@@ -143,7 +143,8 @@ export type HitlFreeformModalMetadata = SlackSessionTarget & {
|
|
|
143
143
|
/**
|
|
144
144
|
* Builds the `views.open` payload for the freeform-answer modal. The
|
|
145
145
|
* triggering `prompt` is preserved as a header section so the user can
|
|
146
|
-
* re-read what they're answering inside the modal.
|
|
146
|
+
* re-read what they're answering inside the modal. `prompt` is the posted
|
|
147
|
+
* card's mrkdwn, which was escaped when the card was rendered.
|
|
147
148
|
*
|
|
148
149
|
* Title is auto-truncated to the Slack modal-title limit.
|
|
149
150
|
*/
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import{parseAnswer}from"#shared/input.js";import{truncate}from"#public/channels/text.js";import{SLACK_SECTION_TEXT_MAX_LENGTH,truncateCardBodyText,truncateModalTitle,truncatePlainText,truncateSectionText}from"#public/channels/slack/limits.js";const ANSWER_ACTION_PREFIX=`eve_input:`,HITL_FREEFORM_ACTION_PREFIX=`eve_input_freeform:`,HITL_FREEFORM_MODAL_CALLBACK_ID=`eve_input_freeform_submit`,HITL_FREEFORM_MODAL_BLOCK_ID=`eve_freeform_block`,HITL_FREEFORM_MODAL_ACTION_ID=`eve_freeform_text`,HITL_ROUTE_PREFIX=`${ANSWER_ACTION_PREFIX}route:`,HITL_CODE_CHANNEL_ROUTE_PREFIX=`${ANSWER_ACTION_PREFIX}code:`,BUTTON_ACTION_ID_RE=/^(?:(?<kind>tool-approval):)?(?<requestId>.+):button:\d+$/u,TOOL_INPUT_SUFFIX="\n```",answerFromSlackAction=e=>decodeHitlResponse(e);function decodeHitlResponse(e){let t=decodeHitlActionId(e.actionId);if(t===null)return null;let n=e.selectedOptionValue??e.value;if(n===void 0||e.value!==void 0&&!t.button)return null;let r={response:parseAnswer({interactionId:t.requestId,optionId:n})};return t.kind!==void 0&&(r.kind=t.kind),t.route!==void 0&&(r.route=t.route),r}function splitEncodedRequest(e){return e.startsWith(`tool-approval:`)?{kind:`tool-approval`,requestId:e.slice(14)}:{requestId:e}}function isHitlAction(e){return e.startsWith(ANSWER_ACTION_PREFIX)}function decodeHitlActionId(e){if(!e.startsWith(`eve_input:`))return null;let t=e.slice(10),n;if(t.startsWith(`route:`)){t=t.slice(6);let e=t.indexOf(`:`),r=t.indexOf(`:`,e+1);if(e<=0||r<=e+1)return null;n={channelId:t.slice(0,e),threadTs:t.slice(e+1,r)},t=t.slice(r+1)}else if(t.startsWith(`code:`)){t=t.slice(5);let e=t.indexOf(`:`);if(e<=0)return null;n={channelId:t.slice(0,e),codeChannel:!0},t=t.slice(e+1)}let r=BUTTON_ACTION_ID_RE.exec(t),i=splitEncodedRequest(r?.groups?.requestId??t);if(!i.requestId)return null;let a=r?.groups?.kind===`tool-approval`?`tool-approval`:i.kind,o={button:r!==null,requestId:i.requestId};return a!==void 0&&(o.kind=a),n!==void 0&&(o.route=n),o}function encodeHitlActionId(e,t){let n=`${e.request.kind===`approval`?`tool-approval:`:``}${e.interactionId}`;return t===void 0?`${ANSWER_ACTION_PREFIX}${n}`:t.codeChannel===!0?`${HITL_CODE_CHANNEL_ROUTE_PREFIX}${t.channelId}:${n}`:`${HITL_ROUTE_PREFIX}${t.channelId}:${t.threadTs}:${n}`}function renderInteractionBlocks(e,t){let n={text:{text:truncateSectionText(e.request.prompt),type:`mrkdwn`},type:`section`},r=renderInteractionDetailBlocks(e),i=encodeHitlActionId(e,t),a=e.request.options,o=e.request.allowFreeform===!0||!a||a.length===0;if(a&&a.length>0&&e.request.display===`select`){let e=a.length<=6?{type:`radio_buttons`,action_id:i,options:a.map(buildOption)}:{type:`static_select`,action_id:i,options:a.map(buildOption),placeholder:{type:`plain_text`,text:`Choose an option`}};return[n,...r,{type:`actions`,elements:[e]}]}if(a&&a.length>0){let t=renderInteractionCardBlock(e,i),n=renderToolInputContainerBlock(e);return n===void 0?[t]:[t,n]}if(o){let t=i.replace(ANSWER_ACTION_PREFIX,HITL_FREEFORM_ACTION_PREFIX);return[n,...r,{type:`actions`,elements:[{type:`button`,action_id:t,text:{type:`plain_text`,text:`Type your answer`},style:`primary`,value:e.interactionId}]}]}return[n]}function renderInteractionPostParts(e,t){let n=renderInteractionBlocks(e,t),[r,...i]=n;return!isApprovalRequest(e)||r===void 0||!isBlockType(r,`card`)||i.length===0?{controls:{blocks:n,text:formatInteractionFallbackText(e)}}:{controls:{blocks:[r],text:e.request.prompt},details:{blocks:i,text:formatInteractionFallbackText(e)}}}function formatInteractionFallbackText(e){let t=formatToolInputDetails(e);return
|
|
2
|
-
${truncate(
|
|
1
|
+
import{parseAnswer}from"#shared/input.js";import{truncate}from"#public/channels/text.js";import{SLACK_SECTION_TEXT_MAX_LENGTH,truncateCardBodyText,truncateModalTitle,truncatePlainText,truncateSectionText}from"#public/channels/slack/limits.js";import{escapeSlackText,unescapeSlackText}from"#compiled/@chat-adapter/slack/format.js";const ANSWER_ACTION_PREFIX=`eve_input:`,HITL_FREEFORM_ACTION_PREFIX=`eve_input_freeform:`,HITL_FREEFORM_MODAL_CALLBACK_ID=`eve_input_freeform_submit`,HITL_FREEFORM_MODAL_BLOCK_ID=`eve_freeform_block`,HITL_FREEFORM_MODAL_ACTION_ID=`eve_freeform_text`,HITL_ROUTE_PREFIX=`${ANSWER_ACTION_PREFIX}route:`,HITL_CODE_CHANNEL_ROUTE_PREFIX=`${ANSWER_ACTION_PREFIX}code:`,BUTTON_ACTION_ID_RE=/^(?:(?<kind>tool-approval):)?(?<requestId>.+):button:\d+$/u,TOOL_INPUT_SUFFIX="\n```",answerFromSlackAction=e=>decodeHitlResponse(e);function decodeHitlResponse(e){let t=decodeHitlActionId(e.actionId);if(t===null)return null;let n=e.selectedOptionValue??e.value;if(n===void 0||e.value!==void 0&&!t.button)return null;let r={response:parseAnswer({interactionId:t.requestId,optionId:n})};return t.kind!==void 0&&(r.kind=t.kind),t.route!==void 0&&(r.route=t.route),r}function splitEncodedRequest(e){return e.startsWith(`tool-approval:`)?{kind:`tool-approval`,requestId:e.slice(14)}:{requestId:e}}function isHitlAction(e){return e.startsWith(ANSWER_ACTION_PREFIX)}function decodeHitlActionId(e){if(!e.startsWith(`eve_input:`))return null;let t=e.slice(10),n;if(t.startsWith(`route:`)){t=t.slice(6);let e=t.indexOf(`:`),r=t.indexOf(`:`,e+1);if(e<=0||r<=e+1)return null;n={channelId:t.slice(0,e),threadTs:t.slice(e+1,r)},t=t.slice(r+1)}else if(t.startsWith(`code:`)){t=t.slice(5);let e=t.indexOf(`:`);if(e<=0)return null;n={channelId:t.slice(0,e),codeChannel:!0},t=t.slice(e+1)}let r=BUTTON_ACTION_ID_RE.exec(t),i=splitEncodedRequest(r?.groups?.requestId??t);if(!i.requestId)return null;let a=r?.groups?.kind===`tool-approval`?`tool-approval`:i.kind,o={button:r!==null,requestId:i.requestId};return a!==void 0&&(o.kind=a),n!==void 0&&(o.route=n),o}function encodeHitlActionId(e,t){let n=`${e.request.kind===`approval`?`tool-approval:`:``}${e.interactionId}`;return t===void 0?`${ANSWER_ACTION_PREFIX}${n}`:t.codeChannel===!0?`${HITL_CODE_CHANNEL_ROUTE_PREFIX}${t.channelId}:${n}`:`${HITL_ROUTE_PREFIX}${t.channelId}:${t.threadTs}:${n}`}function renderInteractionBlocks(e,t){let n={text:{text:truncateSectionText(escapeSlackText(e.request.prompt)),type:`mrkdwn`},type:`section`},r=renderInteractionDetailBlocks(e),i=encodeHitlActionId(e,t),a=e.request.options,o=e.request.allowFreeform===!0||!a||a.length===0;if(a&&a.length>0&&e.request.display===`select`){let e=a.length<=6?{type:`radio_buttons`,action_id:i,options:a.map(buildOption)}:{type:`static_select`,action_id:i,options:a.map(buildOption),placeholder:{type:`plain_text`,text:`Choose an option`}};return[n,...r,{type:`actions`,elements:[e]}]}if(a&&a.length>0){let t=renderInteractionCardBlock(e,i),n=renderToolInputContainerBlock(e);return n===void 0?[t]:[t,n]}if(o){let t=i.replace(ANSWER_ACTION_PREFIX,HITL_FREEFORM_ACTION_PREFIX);return[n,...r,{type:`actions`,elements:[{type:`button`,action_id:t,text:{type:`plain_text`,text:`Type your answer`},style:`primary`,value:e.interactionId}]}]}return[n]}function renderInteractionPostParts(e,t){let n=renderInteractionBlocks(e,t),[r,...i]=n;return!isApprovalRequest(e)||r===void 0||!isBlockType(r,`card`)||i.length===0?{controls:{blocks:n,text:formatInteractionFallbackText(e)}}:{controls:{blocks:[r],text:escapeSlackText(e.request.prompt)},details:{blocks:i,text:formatInteractionFallbackText(e)}}}function formatInteractionFallbackText(e){let t=escapeSlackText(e.request.prompt),n=formatToolInputDetails(e);return n===void 0?t:`${t}\n${n}`}function buildFreeformModalView(e){let t=e.prompt?truncateModalTitle(unescapeSlackText(e.prompt)):`Your answer`,n=e.prompt?[{type:`section`,text:{type:`mrkdwn`,text:truncateSectionText(e.prompt)}}]:[];return{type:`modal`,callback_id:HITL_FREEFORM_MODAL_CALLBACK_ID,private_metadata:JSON.stringify(e.metadata),title:{type:`plain_text`,text:t},submit:{type:`plain_text`,text:`Submit`},close:{type:`plain_text`,text:`Cancel`},blocks:[...n,{type:`input`,block_id:HITL_FREEFORM_MODAL_BLOCK_ID,element:{type:`plain_text_input`,action_id:HITL_FREEFORM_MODAL_ACTION_ID,multiline:!0,placeholder:{type:`plain_text`,text:`Type your answer here...`}},label:{type:`plain_text`,text:`Answer`}}]}}function isFreeformAction(e){return e.startsWith(HITL_FREEFORM_ACTION_PREFIX)}function decodeFreeformHitlActionId(e){return isFreeformAction(e)?decodeHitlActionId(`${ANSWER_ACTION_PREFIX}${e.slice(19)}`):null}function buildCardButton(e,t,n){let r={type:`button`,text:{type:`plain_text`,text:truncatePlainText(e.label),emoji:!1},action_id:`${t}:button:${n}`,value:e.id};return(e.style===`primary`||e.style===`danger`)&&(r.style=e.style),r}function buildOption(e){let t={text:{text:truncatePlainText(e.label),type:`plain_text`},value:e.id},n=truncatePlainText(e.description);return n&&n.length>0&&(t.description={text:n,type:`plain_text`}),t}function renderInteractionCardBlock(e,t){let n={type:`card`,body:{type:`mrkdwn`,text:truncateCardBodyText(`*${escapeSlackText(e.request.prompt)}*`),verbatim:!1},actions:cardButtonOptions(e).map((e,n)=>buildCardButton(e,t,n))};return isApprovalRequest(e)&&(n.subtext={type:`mrkdwn`,text:`I've paused until someone approves or denies.`}),n}function cardButtonOptions(e){let t=e.request.options??[];if(!isApprovalRequest(e))return t.map(toCardButtonOption);let n=t.find(e=>e.id===`approve`),r=t.find(e=>e.id===`deny`);return!n||!r?t.map(toCardButtonOption):[{id:r.id,label:`Deny`},{id:n.id,label:`Approve`,style:`primary`}]}function toCardButtonOption(e){let t={id:e.id,label:e.label};return e.style===`primary`||e.style===`danger`?{...t,style:e.style}:t}function buildAnsweredBlocks(e){let t=[];for(let n of e.promptBlocks)n!=null&&t.push(n);let n=truncate(escapeSlackText(e.answerLabel),SLACK_SECTION_TEXT_MAX_LENGTH-20-1);return t.push({type:`section`,text:{type:`mrkdwn`,text:`:white_check_mark: *${n}*`}}),e.userId&&e.userId.length>0&&t.push({type:`context`,elements:[{type:`mrkdwn`,text:`Answered by <@${e.userId}>`}]}),t}function renderInteractionDetailBlocks(e){let t=formatToolInputDetails(e);return t===void 0?[]:[{type:`section`,text:{type:`mrkdwn`,text:t}}]}function renderToolInputContainerBlock(e){let t=formatToolInputContainerText(e);if(t!==void 0)return{type:`container`,title:{type:`plain_text`,text:`Tool input`},is_collapsible:!0,default_collapsed:!0,child_blocks:[{type:`section`,text:{type:`mrkdwn`,text:t}}]}}function formatToolInputContainerText(e){if(!isApprovalRequest(e))return;let t=JSON.stringify(e.call?.input??{},null,2);if(t===`{}`)return;let n=escapeSlackText(t),r=SLACK_SECTION_TEXT_MAX_LENGTH-4-4;return`\`\`\`
|
|
2
|
+
${truncate(n,r)}${TOOL_INPUT_SUFFIX}`}function formatToolInputDetails(e){if(!isApprovalRequest(e))return;let t=JSON.stringify(e.call?.input??{},null,2);if(t===`{}`)return;let n=escapeSlackText(t),r=SLACK_SECTION_TEXT_MAX_LENGTH-17-4;return`*Tool input*
|
|
3
3
|
\`\`\`
|
|
4
|
-
${truncate(
|
|
4
|
+
${truncate(n,r)}${TOOL_INPUT_SUFFIX}`}function isBlockType(e,t){return typeof e==`object`&&!!e&&e.type===t}function isApprovalRequest(e){return e.request.kind===`approval`}export{ANSWER_ACTION_PREFIX,HITL_FREEFORM_ACTION_PREFIX,HITL_FREEFORM_MODAL_ACTION_ID,HITL_FREEFORM_MODAL_BLOCK_ID,HITL_FREEFORM_MODAL_CALLBACK_ID,answerFromSlackAction,buildAnsweredBlocks,buildFreeformModalView,decodeFreeformHitlActionId,decodeHitlActionId,decodeHitlResponse,formatInteractionFallbackText,isFreeformAction,isHitlAction,renderInteractionBlocks,renderInteractionPostParts};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{truncate}from"#public/channels/text.js";import{callSlackApi}from"#public/channels/slack/api.js";import{SLACK_CARD_SUBTEXT_MAX_LENGTH,truncateCardSubtext}from"#public/channels/slack/limits.js";import{buildAnsweredBlocks,isHitlAction}from"#public/channels/slack/hitl.js";function buildSettledHitlMessageBlocks(e){let t=e.messageBlocks.findIndex(t=>blockContainsActionId(t,e.actionId));if(t===-1)return buildAnsweredBlocks({promptBlocks:findPromptBlocks(e.messageBlocks),answerLabel:e.card.label,userId:e.card.userId});let n=e.messageBlocks[t],r=answeredBlocksFromActionBlock({answerLabel:e.card.label,block:n,userId:e.card.userId})??buildAnsweredBlocks({promptBlocks:promptBlocksFromActionBlock(n),answerLabel:e.card.label,userId:e.card.userId});return[...e.messageBlocks.slice(0,t),...r,...e.messageBlocks.slice(t+1)]}function findPromptBlocks(e){let t=[];for(let n of e){if(!isObjectRecord(n))continue;let e=n.type;if(e===`actions`)break;(e===`section`||e===`context`||e===`divider`||e===`image`)&&t.push(n)}return t}function blockContainsActionId(e,t){return isObjectRecord(e)?actionsContainActionId(e.elements,t)||actionsContainActionId(e.actions,t):!1}function actionsContainActionId(e,t){return Array.isArray(e)?e.some(e=>isObjectRecord(e)&&e.action_id===t):!1}function answeredBlocksFromActionBlock(e){if(!isObjectRecord(e.block)||e.block.type!==`card`)return;let{actions:t,subtext:n,...r}=e.block,i={...r,subtext:{type:`mrkdwn`,text:formatAnsweredCardSubtext(e),verbatim:!1}};return hasCardContent(i)?[i]:void 0}function formatAnsweredCardSubtext(e){let t=e.userId===void 0?``:` by <@${e.userId}>`,n=SLACK_CARD_SUBTEXT_MAX_LENGTH-20-1-t.length,r=truncate(e.answerLabel,n);return truncateCardSubtext(`:white_check_mark: *${r}*${t}`)}function promptBlocksFromActionBlock(e){if(!isObjectRecord(e)||e.type!==`card`)return[];let{actions:t,...n}=e;return hasCardContent(n)?[n]:[]}function hasCardContent(e){return e.body!==void 0||e.title!==void 0||e.hero_image!==void 0}function isObjectRecord(e){return typeof e==`object`&&!!e}async function settleHitlCard(e,t,n){let r=e.actions.find(e=>isHitlAction(e.actionId));r?.messageTs&&await updateSettledCard({blocks:buildSettledHitlMessageBlocks({actionId:r.actionId,card:n,messageBlocks:e.messageBlocks}),card:n,channelId:e.channelId,deps:t,installationTeamId:e.installationTeamId,messageTs:r.messageTs})}async function settleFreeformCard(e){await updateSettledCard({...e,blocks:buildAnsweredBlocks({promptBlocks:[],answerLabel:e.card.label,userId:e.card.userId})})}async function updateSettledCard(e){await callSlackApi({api:e.deps.api,botToken:e.deps.config.credentials?.botToken,context:{teamId:e.installationTeamId},operation:`chat.update`,body:{channel:e.channelId,ts:e.messageTs,blocks:e.blocks,text:e.card.text}})}export{answeredBlocksFromActionBlock,settleFreeformCard,settleHitlCard};
|
|
1
|
+
import{truncate}from"#public/channels/text.js";import{callSlackApi}from"#public/channels/slack/api.js";import{SLACK_CARD_SUBTEXT_MAX_LENGTH,truncateCardSubtext}from"#public/channels/slack/limits.js";import{escapeSlackText}from"#compiled/@chat-adapter/slack/format.js";import{buildAnsweredBlocks,isHitlAction}from"#public/channels/slack/hitl.js";function buildSettledHitlMessageBlocks(e){let t=e.messageBlocks.findIndex(t=>blockContainsActionId(t,e.actionId));if(t===-1)return buildAnsweredBlocks({promptBlocks:findPromptBlocks(e.messageBlocks),answerLabel:e.card.label,userId:e.card.userId});let n=e.messageBlocks[t],r=answeredBlocksFromActionBlock({answerLabel:e.card.label,block:n,userId:e.card.userId})??buildAnsweredBlocks({promptBlocks:promptBlocksFromActionBlock(n),answerLabel:e.card.label,userId:e.card.userId});return[...e.messageBlocks.slice(0,t),...r,...e.messageBlocks.slice(t+1)]}function findPromptBlocks(e){let t=[];for(let n of e){if(!isObjectRecord(n))continue;let e=n.type;if(e===`actions`)break;(e===`section`||e===`context`||e===`divider`||e===`image`)&&t.push(n)}return t}function blockContainsActionId(e,t){return isObjectRecord(e)?actionsContainActionId(e.elements,t)||actionsContainActionId(e.actions,t):!1}function actionsContainActionId(e,t){return Array.isArray(e)?e.some(e=>isObjectRecord(e)&&e.action_id===t):!1}function answeredBlocksFromActionBlock(e){if(!isObjectRecord(e.block)||e.block.type!==`card`)return;let{actions:t,subtext:n,...r}=e.block,i={...r,subtext:{type:`mrkdwn`,text:formatAnsweredCardSubtext(e),verbatim:!1}};return hasCardContent(i)?[i]:void 0}function formatAnsweredCardSubtext(e){let t=e.userId===void 0?``:` by <@${e.userId}>`,n=SLACK_CARD_SUBTEXT_MAX_LENGTH-20-1-t.length,r=truncate(escapeSlackText(e.answerLabel),n);return truncateCardSubtext(`:white_check_mark: *${r}*${t}`)}function promptBlocksFromActionBlock(e){if(!isObjectRecord(e)||e.type!==`card`)return[];let{actions:t,...n}=e;return hasCardContent(n)?[n]:[]}function hasCardContent(e){return e.body!==void 0||e.title!==void 0||e.hero_image!==void 0}function isObjectRecord(e){return typeof e==`object`&&!!e}async function settleHitlCard(e,t,n){let r=e.actions.find(e=>isHitlAction(e.actionId));r?.messageTs&&await updateSettledCard({blocks:buildSettledHitlMessageBlocks({actionId:r.actionId,card:n,messageBlocks:e.messageBlocks}),card:n,channelId:e.channelId,deps:t,installationTeamId:e.installationTeamId,messageTs:r.messageTs})}async function settleFreeformCard(e){await updateSettledCard({...e,blocks:buildAnsweredBlocks({promptBlocks:[],answerLabel:e.card.label,userId:e.card.userId})})}async function updateSettledCard(e){await callSlackApi({api:e.deps.api,botToken:e.deps.config.credentials?.botToken,context:{teamId:e.installationTeamId},operation:`chat.update`,body:{channel:e.channelId,ts:e.messageTs,blocks:e.blocks,text:e.card.text}})}export{answeredBlocksFromActionBlock,settleFreeformCard,settleHitlCard};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{createLogger,logError}from"#internal/logging.js";import{truncate}from"#public/channels/text.js";import{SLACK_MAX_BLOCKS_PER_MESSAGE,SLACK_SECTION_TEXT_MAX_LENGTH}from"#public/channels/slack/limits.js";import{refusedPayloadError}from"#public/channels/slack/reply-delivery.js";import{isFreeformAction,isHitlAction,renderInteractionPostParts}from"#public/channels/slack/hitl.js";import{answeredBlocksFromActionBlock}from"#public/channels/slack/interaction-cards.js";const log=createLogger(`slack.interaction-card`);function defaultInteractionCard(e,t){let{interaction:n}=e,r=renderInteractionPostParts(n,t);if(n.status===`open`&&n.answer===void 0)return r;let{label:i,text:a}=endingOf(n);return{controls:{blocks:[answeredBlocksFromActionBlock({answerLabel:i,block:r.controls.blocks[0],userId:e.answeredBy})?.[0]??answeredSection(n.request.prompt,i,e.answeredBy)],text:a}}}function endingOf(e){let{answer:t,outcome:n,request:r}=e;if(t!==void 0){let e=r.options?.find(e=>e.id===t.optionId)?.label??t.text??t.optionId??`Answered`;return{label:e,text:`Answered: ${e}`}}let i=n===`accepted`?`Accepted`:n===`declined`?`Declined`:`No longer needed`;return{label:i,text:i}}function answeredSection(e,t,n){let r=n===void 0?``:` by <@${n}>`,i=`:white_check_mark: *${truncate(t,500)}*${r}`;return{text:{text:`${truncate(e,SLACK_SECTION_TEXT_MAX_LENGTH-i.length-1)}\n${i}`,type:`mrkdwn`},type:`section`}}function renderRequestCard(e,t,n){let r=defaultInteractionCard(t,n),{interactionId:i}=t.interaction;try{let a=JSON.parse(JSON.stringify(e(t,e=>defaultInteractionCard(e,n)))),o=invalidCardReason(a,r);if(o===void 0)return{fallback:r,parts:a};log.warn(`interactionCard result rejected; using eve's default`,{interactionId:i,problem:o})}catch(e){logError(log,`interactionCard renderer failed; using eve's default`,e,{interactionId:i})}return{fallback:r,parts:r}}function invalidCardReason(e,t){for(let[t,n]of[[`controls`,e.controls],[`details`,e.details]])if(n!==void 0||t!==`details`){if(!isMessage(n))return`${t} is not a message with blocks and text`;if(n.blocks.length>SLACK_MAX_BLOCKS_PER_MESSAGE)return`${t} has more than ${SLACK_MAX_BLOCKS_PER_MESSAGE} blocks`}if(e.details!==void 0&&eveControls(e.details.blocks).length>0)return`details hold eve controls`;let n=eveControls(t.controls.blocks),r=eveControls(e.controls.blocks);if(n.length!==r.length||n.some((e,t)=>e!==r[t]))return n.length===0?`controls of an answered or settled request hold eve controls`:`controls don't hold exactly eve's controls`}function isMessage(e){if(typeof e!=`object`||!e)return!1;let{blocks:t,text:n}=e;return Array.isArray(t)&&typeof n==`string`}function compactDefault(e){let t=e.blocks.filter(e=>eveControls(e).length>0);return t.length===0?e:{...e,blocks:t}}function eveControls(e){let t=[],walk=e=>{if(Array.isArray(e)){for(let t of e)walk(t);return}if(typeof e!=`object`||!e)return;let n=e,r=n.action_id;if(typeof r==`string`&&(isHitlAction(r)||isFreeformAction(r))){let e=Array.isArray(n.options)?n.options.map(e=>e.value).sort():null;t.push(JSON.stringify([r,n.value??null,e]))}for(let t of Object.values(e))walk(t)};return walk(e),t.sort()}async function sendWithFallback(e,t,n){try{return await e(t)}catch(r){if(refusedPayloadError(r)===void 0||sameJson(t,n))throw r;return logError(log,`Slack rejected a rendered input request; sending eve's default`,r),n===void 0?void 0:await e(n)}}function sameJson(e,t){return JSON.stringify(e)===JSON.stringify(t)}export{compactDefault,defaultInteractionCard,endingOf,renderRequestCard,sameJson,sendWithFallback};
|
|
1
|
+
import{createLogger,logError}from"#internal/logging.js";import{truncate}from"#public/channels/text.js";import{SLACK_MAX_BLOCKS_PER_MESSAGE,SLACK_SECTION_TEXT_MAX_LENGTH}from"#public/channels/slack/limits.js";import{refusedPayloadError}from"#public/channels/slack/reply-delivery.js";import{escapeSlackText}from"#compiled/@chat-adapter/slack/format.js";import{isFreeformAction,isHitlAction,renderInteractionPostParts}from"#public/channels/slack/hitl.js";import{answeredBlocksFromActionBlock}from"#public/channels/slack/interaction-cards.js";const log=createLogger(`slack.interaction-card`);function defaultInteractionCard(e,t){let{interaction:n}=e,r=renderInteractionPostParts(n,t);if(n.status===`open`&&n.answer===void 0)return r;let{label:i,text:a}=endingOf(n);return{controls:{blocks:[answeredBlocksFromActionBlock({answerLabel:i,block:r.controls.blocks[0],userId:e.answeredBy})?.[0]??answeredSection(n.request.prompt,i,e.answeredBy)],text:a}}}function endingOf(e){let{answer:t,outcome:n,request:r}=e;if(t!==void 0){let e=r.options?.find(e=>e.id===t.optionId)?.label??t.text??t.optionId??`Answered`;return{label:e,text:`Answered: ${escapeSlackText(e)}`}}let i=n===`accepted`?`Accepted`:n===`declined`?`Declined`:`No longer needed`;return{label:i,text:i}}function answeredSection(e,t,n){let r=n===void 0?``:` by <@${n}>`,i=`:white_check_mark: *${truncate(escapeSlackText(t),500)}*${r}`;return{text:{text:`${truncate(escapeSlackText(e),SLACK_SECTION_TEXT_MAX_LENGTH-i.length-1)}\n${i}`,type:`mrkdwn`},type:`section`}}function renderRequestCard(e,t,n){let r=defaultInteractionCard(t,n),{interactionId:i}=t.interaction;try{let a=JSON.parse(JSON.stringify(e(t,e=>defaultInteractionCard(e,n)))),o=invalidCardReason(a,r);if(o===void 0)return{fallback:r,parts:a};log.warn(`interactionCard result rejected; using eve's default`,{interactionId:i,problem:o})}catch(e){logError(log,`interactionCard renderer failed; using eve's default`,e,{interactionId:i})}return{fallback:r,parts:r}}function invalidCardReason(e,t){for(let[t,n]of[[`controls`,e.controls],[`details`,e.details]])if(n!==void 0||t!==`details`){if(!isMessage(n))return`${t} is not a message with blocks and text`;if(n.blocks.length>SLACK_MAX_BLOCKS_PER_MESSAGE)return`${t} has more than ${SLACK_MAX_BLOCKS_PER_MESSAGE} blocks`}if(e.details!==void 0&&eveControls(e.details.blocks).length>0)return`details hold eve controls`;let n=eveControls(t.controls.blocks),r=eveControls(e.controls.blocks);if(n.length!==r.length||n.some((e,t)=>e!==r[t]))return n.length===0?`controls of an answered or settled request hold eve controls`:`controls don't hold exactly eve's controls`}function isMessage(e){if(typeof e!=`object`||!e)return!1;let{blocks:t,text:n}=e;return Array.isArray(t)&&typeof n==`string`}function compactDefault(e){let t=e.blocks.filter(e=>eveControls(e).length>0);return t.length===0?e:{...e,blocks:t}}function eveControls(e){let t=[],walk=e=>{if(Array.isArray(e)){for(let t of e)walk(t);return}if(typeof e!=`object`||!e)return;let n=e,r=n.action_id;if(typeof r==`string`&&(isHitlAction(r)||isFreeformAction(r))){let e=Array.isArray(n.options)?n.options.map(e=>e.value).sort():null;t.push(JSON.stringify([r,n.value??null,e]))}for(let t of Object.values(e))walk(t)};return walk(e),t.sort()}async function sendWithFallback(e,t,n){try{return await e(t)}catch(r){if(refusedPayloadError(r)===void 0||sameJson(t,n))throw r;return logError(log,`Slack rejected a rendered input request; sending eve's default`,r),n===void 0?void 0:await e(n)}}function sameJson(e,t){return JSON.stringify(e)===JSON.stringify(t)}export{compactDefault,defaultInteractionCard,endingOf,renderRequestCard,sameJson,sendWithFallback};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{isObject}from"#shared/guards.js";import{parseAnswer}from"#shared/input.js";import{parseJsonObject}from"#shared/json.js";import{truncate}from"#public/channels/text.js";import{TEAMS_ADAPTIVE_CARD_ACTION_LIMIT,TEAMS_ADAPTIVE_CARD_ACTION_TITLE_MAX_LENGTH,TEAMS_ADAPTIVE_CARD_CHOICE_TITLE_MAX_LENGTH,TEAMS_ADAPTIVE_CARD_TEXT_MAX_LENGTH}from"#public/channels/teams/limits.js";const TEAMS_ADAPTIVE_CARD_CONTENT_TYPE=`application/vnd.microsoft.card.adaptive`,TEAMS_HITL_DATA_KEY=`eve_input`,TEAMS_HITL_CHOICE_INPUT_ID=`eve_option`,TEAMS_HITL_FREEFORM_INPUT_ID=`eve_freeform_text`,TEAMS_HITL_REQUEST_KIND_KEY=`kind`,TEAMS_HITL_PROMPT_KEY=`prompt`;function renderInteractionMessage(e,t={}){let n=formatApprovalInput(e),r=n?truncate(n,TEAMS_ADAPTIVE_CARD_TEXT_MAX_LENGTH):null;return{attachments:[renderInteractionAttachment(e,t)],text:r?`${e.request.prompt}\n\nTool input:\n${r}`:e.request.prompt}}function renderInteractionAttachment(e,t={}){let n=formatApprovalInput(e),r={$schema:`http://adaptivecards.io/schemas/adaptive-card.json`,actions:renderActions(e,t.replyToActivityId),body:[
|
|
1
|
+
import{isObject}from"#shared/guards.js";import{parseAnswer}from"#shared/input.js";import{parseJsonObject}from"#shared/json.js";import{truncate}from"#public/channels/text.js";import{TEAMS_ADAPTIVE_CARD_ACTION_LIMIT,TEAMS_ADAPTIVE_CARD_ACTION_TITLE_MAX_LENGTH,TEAMS_ADAPTIVE_CARD_CHOICE_TITLE_MAX_LENGTH,TEAMS_ADAPTIVE_CARD_TEXT_MAX_LENGTH}from"#public/channels/teams/limits.js";const TEAMS_ADAPTIVE_CARD_CONTENT_TYPE=`application/vnd.microsoft.card.adaptive`,TEAMS_HITL_DATA_KEY=`eve_input`,TEAMS_HITL_CHOICE_INPUT_ID=`eve_option`,TEAMS_HITL_FREEFORM_INPUT_ID=`eve_freeform_text`,TEAMS_HITL_REQUEST_KIND_KEY=`kind`,TEAMS_HITL_PROMPT_KEY=`prompt`;function literalText(e,t={}){return{inlines:[{...t.color!==void 0&&{color:t.color},...t.fontType!==void 0&&{fontType:t.fontType},text:truncate(e,TEAMS_ADAPTIVE_CARD_TEXT_MAX_LENGTH),type:`TextRun`}],type:`RichTextBlock`}}function renderInteractionMessage(e,t={}){let n=formatApprovalInput(e),r=n?truncate(n,TEAMS_ADAPTIVE_CARD_TEXT_MAX_LENGTH):null;return{attachments:[renderInteractionAttachment(e,t)],text:r?`${e.request.prompt}\n\nTool input:\n${r}`:e.request.prompt,textFormat:`plain`}}function renderInteractionAttachment(e,t={}){let n=formatApprovalInput(e),r={$schema:`http://adaptivecards.io/schemas/adaptive-card.json`,actions:renderActions(e,t.replyToActivityId),body:[literalText(e.request.prompt),...n?[literalText(n,{fontType:`Monospace`})]:[],...renderInputs(e)],type:`AdaptiveCard`,version:t.adaptiveCardVersion??`1.5`};return{content:parseJsonObject(r),contentType:TEAMS_ADAPTIVE_CARD_CONTENT_TYPE}}function renderAnsweredInteractionMessage(e){let t=e.label?`Answered: ${e.label}`:`Answered`,n=renderSettledInputRequestMessage(e.prompt,{color:`good`,text:t});return e.includeText===!1?n:{...n,text:t,textFormat:`plain`}}function renderInactiveInputRequestMessage(e,t){return renderSettledInputRequestMessage(e,{text:t})}function renderSettledInputRequestMessage(e,t){let n=e===void 0?[]:[literalText(e)];return{attachments:[{content:parseJsonObject({$schema:`http://adaptivecards.io/schemas/adaptive-card.json`,body:[...n,literalText(t.text,{color:t.color})],type:`AdaptiveCard`,version:`1.5`}),contentType:TEAMS_ADAPTIVE_CARD_CONTENT_TYPE}]}}function isTeamsAnswerActivity(e){return deriveTeamsAnswers(e).length>0}function isTeamsToolApprovalResponseActivity(e){let t=readActivityValue(e);return(t&&readHitlPayload(t))?.[TEAMS_HITL_REQUEST_KIND_KEY]===`tool-approval`}function readTeamsToolApprovalPrompt(e){return isTeamsToolApprovalResponseActivity(e)?readTeamsInputPrompt(e):void 0}function readTeamsInputPrompt(e){let t=readActivityValue(e),n=(t&&readHitlPayload(t))?.[TEAMS_HITL_PROMPT_KEY];return typeof n==`string`&&n.length>0?n:void 0}function deriveTeamsAnswers(e){let t=readActivityValue(e);if(!t)return[];let n=readHitlPayload(t);if(!n)return[];let r=typeof n.requestId==`string`?n.requestId:``;if(!r)return[];let i=typeof n.optionId==`string`?n.optionId:typeof t.eve_option==`string`?t[TEAMS_HITL_CHOICE_INPUT_ID]:void 0,a=typeof t.eve_freeform_text==`string`?t[TEAMS_HITL_FREEFORM_INPUT_ID]:void 0;return i===void 0?a===void 0?[parseAnswer({interactionId:r})]:[parseAnswer({interactionId:r,text:a})]:[parseAnswer({interactionId:r,optionId:i})]}function readTeamsInputReplyToActivityId(e){let t=readActivityValue(e);if(!t)return null;let n=readHitlPayload(t);return n&&typeof n.replyToActivityId==`string`?n.replyToActivityId:null}function teamsInvokeResponse(e={}){return{statusCode:e.statusCode??200,type:`application/vnd.microsoft.activity.message`,value:e.message??`Answer received.`}}function renderInputs(e){return e.request.display===`select`&&e.request.options&&e.request.options.length>0?[{choices:e.request.options.map(e=>({title:truncate(e.label,TEAMS_ADAPTIVE_CARD_CHOICE_TITLE_MAX_LENGTH),value:e.id})),id:TEAMS_HITL_CHOICE_INPUT_ID,isMultiSelect:!1,style:`compact`,type:`Input.ChoiceSet`}]:e.request.allowFreeform===!0||!e.request.options||e.request.options.length===0?[{id:TEAMS_HITL_FREEFORM_INPUT_ID,isMultiline:!0,placeholder:`Type your answer`,type:`Input.Text`}]:[]}function renderActions(e,t){let payload=n=>{let r={requestId:e.interactionId,[TEAMS_HITL_PROMPT_KEY]:truncate(e.request.prompt,TEAMS_ADAPTIVE_CARD_TEXT_MAX_LENGTH)};return e.request.kind===`approval`&&(r[TEAMS_HITL_REQUEST_KIND_KEY]=`tool-approval`),t!==void 0&&(r.replyToActivityId=t),n!==void 0&&(r.optionId=n),r},n=e.request.options;return n&&n.length>0&&e.request.display!==`select`?n.slice(0,TEAMS_ADAPTIVE_CARD_ACTION_LIMIT).map(e=>({data:{[TEAMS_HITL_DATA_KEY]:payload(e.id)},title:truncate(e.label,TEAMS_ADAPTIVE_CARD_ACTION_TITLE_MAX_LENGTH),type:`Action.Submit`})):[{data:{[TEAMS_HITL_DATA_KEY]:payload()},title:`Submit`,type:`Action.Submit`}]}function readActivityValue(e){return e.type===`message`?readMessageValue(e):e.type===`invoke`?readInvokeValue(e):null}function readMessageValue(e){return e.value??null}function readInvokeValue(e){let t=e.value;if(!t)return null;let n=isObject(t.action)?t.action:null;return(n&&isObject(n.data)?n.data:null)??t}function readHitlPayload(e){let t=e[TEAMS_HITL_DATA_KEY];if(isObject(t))return t;let n=isObject(e.action)?e.action:null,r=(n&&isObject(n.data)?n.data:null)?.[TEAMS_HITL_DATA_KEY];return isObject(r)?r:null}function formatApprovalInput(e){if(e.request.kind!==`approval`)return null;let t=JSON.stringify(e.call?.input??{},null,2);return t===`{}`?null:t}export{TEAMS_ADAPTIVE_CARD_CONTENT_TYPE,TEAMS_HITL_CHOICE_INPUT_ID,TEAMS_HITL_DATA_KEY,TEAMS_HITL_FREEFORM_INPUT_ID,TEAMS_HITL_PROMPT_KEY,TEAMS_HITL_REQUEST_KIND_KEY,deriveTeamsAnswers,isTeamsAnswerActivity,isTeamsToolApprovalResponseActivity,readTeamsInputPrompt,readTeamsInputReplyToActivityId,readTeamsToolApprovalPrompt,renderAnsweredInteractionMessage,renderInactiveInputRequestMessage,renderInteractionAttachment,renderInteractionMessage,teamsInvokeResponse};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{createLogger}from"#internal/logging.js";import{isObject}from"#shared/guards.js";import{importJWK,jwtVerify}from"#compiled/jose/index.js";import{resolveTeamsAppId}from"#public/channels/teams/api.js";const log=createLogger(`teams.verify`)
|
|
1
|
+
import{createLogger}from"#internal/logging.js";import{isObject}from"#shared/guards.js";import{importJWK,jwtVerify}from"#compiled/jose/index.js";import{resolveTeamsAppId}from"#public/channels/teams/api.js";const log=createLogger(`teams.verify`),BOT_CONNECTOR_ALGORITHM=`RS256`;async function verifyTeamsRequest(e,t){let n=await e.text();if(t.webhookVerifier!==void 0){let r=await t.webhookVerifier(e,n);if(!r)throw Error(`teamsChannel: inbound webhook verifier rejected the request.`);return{body:typeof r==`string`?r:n}}let r=readBearerToken(e.headers.get(`authorization`)??``);if(!r)throw Error(`teamsChannel: inbound request missing bearer token.`);let i=await verifyTeamsJwt(r,t);if(typeof i.serviceurl!=`string`)throw Error(`teamsChannel: verified token is missing its service URL claim.`);return{body:n,serviceUrl:i.serviceurl}}async function verifyTeamsJwt(e,t){let n=await resolveTeamsAppId(t.appId),r=await loadJwks(t);return(await jwtVerify(e,async e=>importJWK(selectJwk(r,e),BOT_CONNECTOR_ALGORITHM),{algorithms:[BOT_CONNECTOR_ALGORITHM],audience:n,clockTolerance:t.maxSkewSeconds??300,issuer:`https://api.botframework.com`})).payload}function readBearerToken(e){let[t,n]=e.split(/\s+/,2);return t?.toLowerCase()!==`bearer`||!n?null:n}async function loadJwks(e){let t=e.fetch??fetch,n=await t(e.jwksUrl??await loadJwksUrl(e,t),{headers:{accept:`application/json`}});if(!n.ok)throw Error(`Teams JWKS route returned HTTP ${n.status}.`);let r=await n.json();if(!isObject(r)||!Array.isArray(r.keys))throw Error(`Teams JWKS response is malformed.`);return r.keys.filter(isObject)}async function loadJwksUrl(e,t){let n=await t(e.openIdMetadataUrl??`https://login.botframework.com/v1/.well-known/openidconfiguration`,{headers:{accept:`application/json`}});if(!n.ok)throw Error(`Teams OpenID metadata route returned HTTP ${n.status}.`);let r=await n.json();if(!isObject(r)||typeof r.jwks_uri!=`string`)throw Error(`Teams OpenID metadata response is missing jwks_uri.`);return r.jwks_uri}function selectJwk(e,t){let n=typeof t.kid==`string`?t.kid:void 0,r=typeof t.x5t==`string`?t.x5t:void 0,i=e.find(e=>n!==void 0&&e.kid===n||r!==void 0&&e.x5t===r)??(e.length===1?e[0]:void 0);if(i===void 0)throw log.debug(`Teams JWT key not found`,{kid:n,x5t:r}),Error(`teamsChannel: inbound JWT key was not found in JWKS.`);return i}export{verifyTeamsJwt,verifyTeamsRequest};
|