eve 0.83.2 → 0.84.0

package/dist/src/public/channels/chat-sdk/chatSdkChannel.js

@@ -1,3 +1 @@
-import{actionLabel,visibleActions}from"#shared/action-label.js";import{createLogger,extractErrorId,formatErrorHint}from"#internal/logging.js";import{parseInputResponses}from"#shared/input.js";import{defaultDeliverResult}from"#channel/adapter.js";import{ContextContainer,contextStorage}from"#context/container.js";import{GET,POST,defineChannel}from"#public/definitions/channel.js";import{ContextKey}from"#context/key.js";import{DEFAULT_UPLOAD_POLICY}from"#public/channels/upload-policy.js";import{EveAttachmentError}from"#internal/attachments/errors.js";import{assertWithinLimit}from"#internal/attachments/limited-read.js";import{isNotImplemented}from"#public/channels/chat-sdk/notImplemented.js";import{promptQueueEvents}from"#channel/prompt-queue.js";import{INACTIVE_REQUEST_NOTICE,respondOrRetireInactivePrompt}from"#channel/inactive-prompt.js";import{Chat,Message,ThreadImpl}from"#compiled/chat/index.js";import{defaultAuthorizationEvents}from"#public/channels/chat-sdk/authorization.js";import{parseChatSdkFileRef}from"#public/channels/chat-sdk/attachment-refs.js";import{decodeInputAction,renderInputRequests,renderRetiredInputRequest}from"#public/channels/chat-sdk/input-actions.js";import{chatSdkInstrumentation}from"#public/channels/chat-sdk/audience.js";const log=createLogger(`chat-sdk.channel`),streamTextByState=new WeakMap,ActiveWebhookKey=new ContextKey(`chat-sdk.active-webhook`);function chatSdkChannel(e){let t=new Chat(e),n=e.inputActionPrefix??`eve_input:`,r=e.streaming??!0,i=e.streamingEditIntervalMs??1e3,a={...defaultEvents(n),...e.events};return t.onAction(async r=>{let i=decodeInputAction(r.actionId,n,r.value);if(!i)return;let{thread:a}=r;if(!a)throw Error(`chatSdkChannel input actions require a thread on the Chat SDK action event.`);let o=e.resolveInputAuth?await e.resolveInputAuth(r):null,s=await respondOrRetireInactivePrompt(()=>bridgeRespond(t,[i],{auth:o,thread:a.toJSON()}),{retirePrompt:e=>retireInputCard(a,r.messageId,e)},log);if(s.outcome===`failed`)throw s.error;s.outcome!==`delivered`&&await Promise.all([s.retirement,a.postEphemeral(r.user,{markdown:INACTIVE_REQUEST_NOTICE},{fallbackToDM:!0}).catch(e=>log.error(`inactive prompt notice failed`,{error:e}))])}),{bot:t,channel:defineChannel({kindHint:`chat-sdk`,turnPolicy:e.turnPolicy,fetchFile:e=>fetchAttachment(t,e),state:initialState(),...chatSdkInstrumentation,context(e){return{bot:t,state:e,streaming:r,streamingEditIntervalMs:i,thread:threadFromState(t,e)}},routes:adapterNames(e.adapters).flatMap(n=>{let r=routeForAdapter(n,e),handler=async(r,i)=>{let a=t.webhooks[n],o=new ContextContainer;return o.setVirtualContext(ActiveWebhookKey,{from:i.from}),contextStorage.run(o,()=>a(r,{...e.webhook,waitUntil(e){i.waitUntil(e)}}))};return[GET(r,handler),POST(r,handler)]}),async receive(e,{from:n}){let r=serializeReceiveTarget(t,e.target);return n(r.id).send(e.message,{auth:e.auth,state:{thread:r}})},deliver(e,t){recordPrincipalUser(t.state,t.session.auth.current,e),recordLatestMessage(t.state,e);let n=resolveInputAnswer(t.state,e);return n===void 0?defaultDeliverResult(e):{context:e.context,inputResponses:parseInputResponses([n])}},events:a}),send(e,n){return bridgeSend(t,e,n)},respond(e,n){return bridgeRespond(t,e,n)}}}function defaultEvents(e){async function showPrompt(t,n){if(!t.thread)return!1;let r=await t.thread.post(renderInputRequests([n],e));r.id&&(t.state.pendingInputCards={...t.state.pendingInputCards,[r.id]:{requests:[n],resolved:{}}})}async function clearAnsweredCards(t,n){let r=n.thread;if(r)for(let[i,a]of Object.entries(n.state.pendingInputCards??{})){let o=t.resolutions.filter(e=>a.requests.some(t=>t.requestId===e.requestId));if(o.length===0)continue;let s={...a.resolved,...Object.fromEntries(o.map(e=>[e.requestId,e]))},{[i]:c,...l}=n.state.pendingInputCards??{};if(n.state.pendingInputCards=a.requests.every(e=>s[e.requestId]!==void 0)?l:{...l,[i]:{requests:a.requests,resolved:s}},n.state.editSupported!==!1)try{await r.adapter.editMessage(r.id,i,renderInputRequests(a.requests,e,s))}catch(e){if(!isNotImplemented(e)){log.warn(`answered input card edit failed`,{error:e,messageId:i});continue}n.state.editSupported=!1}}}let t=promptQueueEvents(showPrompt);return{...defaultAuthorizationEvents(),async"turn.started"(e,t,n){t.state.pendingToolCallMessage=null,clearStream(t.state),await safeStartTyping(t.thread,`Working...`)},async"actions.requested"(e,t,n){let r=t.state.pendingToolCallMessage;if(t.state.pendingToolCallMessage=null,r){await safeStartTyping(t.thread,truncate(r));return}let i=visibleActions(e.actions).map(t=>actionLabel(t,e.presentation));i.length!==0&&await safeStartTyping(t.thread,truncate(`${i.join(`, `)}...`))},async"message.appended"(e,t,n){if(!t.thread||!canStream(t))return;let r=((t.state.streamStepIndex===e.stepIndex?streamTextByState.get(t.state):void 0)??``)+e.messageDelta;if(!r)return;streamTextByState.set(t.state,r);let i=t.state.anchorMessageId;if(!i||t.state.streamStepIndex!==e.stepIndex){let n=await t.thread.post({markdown:r});t.state.anchorMessageId=n.id,t.state.streamStepIndex=e.stepIndex,t.state.lastEditAtMs=Date.now();return}let a=t.state.lastEditAtMs??0;if(!(Date.now()-a<t.streamingEditIntervalMs))try{await editMessage(t.thread,i,r),t.state.lastEditAtMs=Date.now()}catch(e){if(!isNotImplemented(e))throw e;t.state.editSupported=!1,clearStream(t.state)}},...t,async"input.resolved"(e,n,r){await clearAnsweredCards(e,n),await t[`input.resolved`](e,n)},async"message.completed"(e,t,n){if(e.finishReason===`tool-calls`){t.state.pendingToolCallMessage=e.message?firstNonEmptyLine(e.message)??null:null,e.message?await finalizeStreamedMessage(t,e.message,!1):clearStream(t.state);return}if(t.state.pendingToolCallMessage=null,!e.message){clearStream(t.state);return}await finalizeStreamedMessage(t,e.message,!0)},async"turn.failed"(e,t,n){e.terminal||await postFailure(t.thread,`I hit an error while handling your request`,`Please try again, rephrase, or reach out if it keeps failing.`,e)},async"session.failed"(e,t){await postFailure(t.thread,`This session could not recover from an error`,`Start a new conversation to continue.`,e)}}}async function safeStartTyping(e,t){if(e)try{await e.startTyping(t)}catch(e){if(!isNotImplemented(e))throw e}}async function editMessage(e,t,n){await e.adapter.editMessage(e.id,t,{markdown:n})}async function retireInputCard(e,t,n){try{await e.adapter.editMessage(e.id,t,renderRetiredInputRequest(n))}catch(e){if(!isNotImplemented(e))throw e}}async function finalizeStreamedMessage(e,t,n){let r=e.thread;if(!r){clearStream(e.state);return}let i=e.state.anchorMessageId;if(canStream(e)&&i)try{await editMessage(r,i,t)}catch(i){if(!isNotImplemented(i))throw i;e.state.editSupported=!1,n&&await r.post({markdown:t})}else n&&await r.post({markdown:t});clearStream(e.state)}function canStream(e){return e.streaming&&e.state.editSupported!==!1}function clearStream(e){e.anchorMessageId=null,e.lastEditAtMs=null,e.streamStepIndex=null,streamTextByState.delete(e)}function firstNonEmptyLine(e){for(let t of e.split(/\r?\n/u)){let e=t.trim();if(e.length>0)return e}}function truncate(e,t=80){return e.length<=t?e:`${e.slice(0,t-1)}\u2026`}async function postFailure(e,t,n,r){if(!e)return;let i=formatErrorHint(r),a=extractErrorId(r.details);await e.post([`${t}${i}.`,n,...a?[`Error id: ${a}`]:[]].join(`
-
-`))}async function bridgeSend(e,t,n){let r=activeFrom(`send`),{adapterName:i,auth:a,inputAnswer:o,thread:s,...c}=n,l=serializeThread(e,s,i),u={thread:l};return o!==void 0&&(u.inputAnswer=o),r(l.id).send(t,{...c,auth:a??null,state:u})}async function bridgeRespond(e,t,n){let r=activeFrom(`respond`),{adapterName:i,auth:a,thread:o,...s}=n;return r(serializeThread(e,o,i).id).respond(parseInputResponses(t),{...s,auth:a??null})}function recordPrincipalUser(e,t,n){if(t===null)return;let r=(n.state?.thread)?.currentMessage?.author;if(r===void 0||r.isBot===!0||r.isMe)return;let i=e.usersByPrincipal?.[t.principalId];i!==r.userId&&i!==null&&(e.usersByPrincipal={...e.usersByPrincipal,[t.principalId]:i===void 0?r.userId:null})}function recordLatestMessage(e,t){let n=t.state?.thread?.currentMessage;n===void 0||n.author.isMe||(e.latestMessageId=n.id)}function resolveInputAnswer(e,t){let n=t.state?.inputAnswer;if(n===void 0)return;let r=e.pendingInputCards?.[n.messageId],i=r?.requests.find(e=>r.resolved[e.requestId]===void 0&&e.options?.some(e=>e.id===n.optionId)===!0);return i===void 0?void 0:{optionId:n.optionId,requestId:i.requestId}}function activeFrom(e){let t=contextStorage.getStore()?.get(ActiveWebhookKey);if(!t)throw Error(`chatSdkChannel().${e} can only run during a Chat SDK webhook handler for this bridge.`);return t.from}function initialState(){return{pendingAuthMessageIds:{},thread:null}}async function fetchAttachment(e,t){let n=parseChatSdkFileRef(new URL(t));if(n===null)return null;await e.initialize();let r=e.getAdapter(n.adapter).rehydrateAttachment?.(n.attachment);if(r?.fetchData===void 0)throw new EveAttachmentError({adapterKind:`chat-sdk`,kind:`resolver-threw`,message:`the ${n.adapter} adapter can't download it after the webhook returns.`});let i;try{i=await r.fetchData()}catch(e){throw e instanceof EveAttachmentError?e:new EveAttachmentError({adapterKind:`chat-sdk`,cause:e,kind:`resolver-threw`,message:`the ${n.adapter} download failed.`})}let a=Buffer.isBuffer(i)?i:Buffer.from(i);return assertWithinLimit(a,DEFAULT_UPLOAD_POLICY.maxBytes,`chat-sdk`),{bytes:a,mediaType:n.attachment.mimeType}}function threadFromState(e,t){if(!t.thread)return null;try{let n=t.thread;return new ThreadImpl({adapter:e.getAdapter(n.adapterName),channelId:n.channelId,channelVisibility:n.channelVisibility,currentMessage:n.currentMessage?Message.fromJSON(n.currentMessage):void 0,id:n.id,isDM:n.isDM,stateAdapter:e.getState()})}catch(e){return log.warn(`failed to rebuild Chat SDK thread from channel state`,{error:e}),null}}function serializeReceiveTarget(e,t){if(t.thread)return t.thread;if(!t.threadId)throw Error(`chatSdkChannel().receive requires target.thread or target.threadId.`);return serializeThread(e,t.threadId,t.adapterName)}function serializeThread(e,t,n){if(typeof t==`string`){let r=n??inferAdapterName(t),i=e.getAdapter(r);return{_type:`chat:Thread`,adapterName:r,channelId:i.channelIdFromThreadId(t),channelVisibility:i.getChannelVisibility?.(t),id:t,isDM:!1}}return isSerializedThread(t)?t:t.toJSON()}function isSerializedThread(e){return`_type`in e&&e._type===`chat:Thread`}function inferAdapterName(e){let t=e.indexOf(`:`);if(t<=0)throw Error(`chatSdkChannel string thread references require options.adapterName.`);return e.slice(0,t)}function adapterNames(e){return Object.keys(e)}function routeForAdapter(e,t){return t.routes?.[e]||`${(t.route??`/eve/v1`).replace(/\/$/u,``)}/${e}`}export{chatSdkChannel};
+import{contentPhase}from"#protocol/session-events/catalog.js";import{callLabel}from"#protocol/session-projection/selectors.js";import{createLogger}from"#internal/logging.js";import{parseAnswers}from"#shared/input.js";import{settleSignIn,showSignIn}from"#channel/sign-in.js";import{requestSettlementOf}from"#channel/interaction-prompts.js";import{sessionTables}from"#protocol/session-projection/session-view.js";import{ContextContainer,contextStorage}from"#context/container.js";import{promptQueue}from"#channel/prompt-queue.js";import{failureNotice}from"#public/channels/reply.js";import{GET,POST,defineChannel}from"#public/definitions/channel.js";import{ContextKey}from"#context/key.js";import{DEFAULT_UPLOAD_POLICY}from"#public/channels/upload-policy.js";import{EveAttachmentError}from"#internal/attachments/errors.js";import{assertWithinLimit}from"#internal/attachments/limited-read.js";import{isNotImplemented}from"#public/channels/chat-sdk/notImplemented.js";import{INACTIVE_REQUEST_NOTICE,respondOrRetireInactivePrompt}from"#channel/inactive-prompt.js";import{Chat,Message,ThreadImpl}from"#compiled/chat/index.js";import{chatSdkSignIns}from"#public/channels/chat-sdk/authorization.js";import{parseChatSdkFileRef}from"#public/channels/chat-sdk/attachment-refs.js";import{decodeInputAction,renderInteractions,renderRetiredInputRequest}from"#public/channels/chat-sdk/input-actions.js";import{reportUndeliveredReply,withUndeliveredReplyNote}from"#public/channels/undelivered-reply.js";import{chatSdkInstrumentation}from"#public/channels/chat-sdk/audience.js";const log=createLogger(`chat-sdk.channel`),SURFACE_NAME=`this chat`,ActiveWebhookKey=new ContextKey(`chat-sdk.active-webhook`);function chatSdkChannel(e){let t=new Chat(e),n=e.inputActionPrefix??`eve_input:`,r=e.streaming??!0,i=e.streamingEditIntervalMs??1e3,a={...defaultEvents(n),...e.events};return t.onAction(async r=>{let i=decodeInputAction(r.actionId,n,r.value);if(!i)return;let{thread:a}=r;if(!a)throw Error(`chatSdkChannel input actions require a thread on the Chat SDK action event.`);let o=e.resolveInputAuth?await e.resolveInputAuth(r):null,s=await respondOrRetireInactivePrompt(()=>bridgeRespond(t,[i],{auth:o,thread:a.toJSON()}),{retirePrompt:e=>retireInputCard(a,r.messageId,e)},log);if(s.outcome===`failed`)throw s.error;s.outcome!==`delivered`&&await Promise.all([s.retirement,a.postEphemeral(r.user,{markdown:INACTIVE_REQUEST_NOTICE},{fallbackToDM:!0}).catch(e=>log.error(`inactive prompt notice failed`,{error:e}))])}),{bot:t,channel:defineChannel({turnPolicy:e.turnPolicy,fetchFile:e=>fetchAttachment(t,e),state:initialState(),...chatSdkInstrumentation,context(e){return{bot:t,state:e,streaming:r,streamingEditIntervalMs:i,thread:threadFromState(t,e)}},routes:adapterNames(e.adapters).flatMap(n=>{let r=routeForAdapter(n,e),handler=async(r,i)=>{let a=t.webhooks[n],o=new ContextContainer;return o.setVirtualContext(ActiveWebhookKey,{from:i.from}),contextStorage.run(o,()=>a(r,{...e.webhook,waitUntil(e){i.waitUntil(e)}}))};return[GET(r,handler),POST(r,handler)]}),async receive(e,{from:n}){let r=serializeReceiveTarget(t,e.target);return n(r.id).send(e.message,{auth:e.auth,state:{thread:r}})},deliver(e,t){recordPrincipalUser(t.state,t.session.auth.current,e),recordLatestMessage(t.state,e);let n=resolveInputAnswer(t.state,e);return n===void 0?withUndeliveredReplyNote(t.state,e,SURFACE_NAME):{answers:parseAnswers([n]),context:e.context}},events:a}),send(e,n){return bridgeSend(t,e,n)},respond(e,n){return bridgeRespond(t,e,n)}}}function defaultEvents(e){async function showPrompt(t,n){if(!t.thread)return!1;let r=await t.thread.post(renderInteractions([n],e));r.id&&(t.state.pendingInputCards={...t.state.pendingInputCards,[r.id]:{requests:[n],resolved:{}}})}async function clearAnsweredCards(t,n){let r=n.thread;if(r)for(let[i,a]of Object.entries(n.state.pendingInputCards??{})){let o=t.resolutions.filter(e=>a.requests.some(t=>t.interactionId===e.interactionId));if(o.length===0)continue;let s={...a.resolved,...Object.fromEntries(o.map(e=>[e.interactionId,e]))},{[i]:c,...l}=n.state.pendingInputCards??{};if(n.state.pendingInputCards=a.requests.every(e=>s[e.interactionId]!==void 0)?l:{...l,[i]:{requests:a.requests,resolved:s}},n.state.editSupported!==!1)try{await r.adapter.editMessage(r.id,i,renderInteractions(a.requests,e,s))}catch(e){if(!isNotImplemented(e)){log.warn(`answered input card edit failed`,{error:e,messageId:i});continue}n.state.editSupported=!1}}}return{async"turn.started"(e,{channel:t}){t.state.pendingToolCallMessage=null,clearStream(t.state),await safeStartTyping(t.thread,`Working...`)},async"call.requested"({data:e},{channel:t}){let n=t.state.pendingToolCallMessage;if(t.state.pendingToolCallMessage=null,n){await safeStartTyping(t.thread,truncate(n));return}if(e.capability.kind===`control`)return;let r=callLabel(e);await safeStartTyping(t.thread,truncate(`${r}...`))},async"content.delta"({data:e},{channel:t}){if(!t.thread||!canStream(t))return;let n=t.state.streamPartId===e.partId;if(e.kind===void 0?!n:e.kind!==`text`)return;let r=((n?t.state.streamText:null)??``)+e.delta;if(!r)return;t.state.streamText=r;let i=t.state.anchorMessageId;if(!i||!n){let n=await t.thread.post({markdown:r});t.state.shownText=r,t.state.anchorMessageId=n.id,t.state.streamPartId=e.partId,t.state.lastEditAtMs=Date.now();return}let a=t.state.lastEditAtMs??0;if(!(Date.now()-a<t.streamingEditIntervalMs))try{await editMessage(t.thread,i,r),t.state.shownText=r,t.state.lastEditAtMs=Date.now()}catch(e){if(!isNotImplemented(e))throw e;t.state.editSupported=!1}},async"interaction.opened"(e,t){let{data:n}=e,{channel:r}=t,i=chatSdkSignIns(r);i!==void 0&&await showSignIn(sessionTables(t.view),n.interactionId,i)},async"interaction.settled"(e,t){let{data:n}=e,{channel:r}=t,i=chatSdkSignIns(r);i!==void 0&&await settleSignIn(sessionTables(t.view),n,i);let a=requestSettlementOf(sessionTables(t.view),n);a!==void 0&&await clearAnsweredCards({resolutions:[a]},r)},committed:promptQueue(showPrompt),async"content.completed"({data:e},{channel:t,session:n}){if(e.kind!==`text`)return;let r=typeof e.value==`string`?e.value:``;if(contentPhase(e.phase)===`narration`){if(t.state.pendingToolCallMessage=r?firstNonEmptyLine(r)??null:null,r)try{await finalizeStreamedMessage(t,r,!1)}catch(e){if(!isNotImplemented(e))throw e}else clearStream(t.state);return}if(t.state.pendingToolCallMessage=null,!r){clearStream(t.state);return}try{await finalizeStreamedMessage(t,r,!0)}catch(e){await reportUndeliveredReply({log,name:SURFACE_NAME,post:async e=>t.thread?.post(e),state:t.state},n.turn.id,e)}},async"turn.settled"({data:e},{channel:t}){let n=failureNotice(e,`turn`);n!==void 0&&await t.thread?.post(n)},async"session.ended"({data:e},{channel:t}){let n=failureNotice(e,{restart:`message`});n!==void 0&&await t.thread?.post(n)}}}async function safeStartTyping(e,t){if(e)try{await e.startTyping(t)}catch(e){if(!isNotImplemented(e))throw e}}async function editMessage(e,t,n){await e.adapter.editMessage(e.id,t,{markdown:n})}async function retireInputCard(e,t,n){try{await e.adapter.editMessage(e.id,t,renderRetiredInputRequest(n))}catch(e){if(!isNotImplemented(e))throw e}}async function finalizeStreamedMessage(e,t,n){let{anchorMessageId:r,shownText:i}=e.state;clearStream(e.state);let a=e.thread;if(a){if(!r){n&&await a.post({markdown:t});return}if(i!==t)try{await editMessage(a,r,t)}catch(t){throw isNotImplemented(t)&&(e.state.editSupported=!1),t}}}function canStream(e){return e.streaming&&e.state.editSupported!==!1}function clearStream(e){e.anchorMessageId=null,e.lastEditAtMs=null,e.streamPartId=null,e.streamText=null,e.shownText=null}function firstNonEmptyLine(e){for(let t of e.split(/\r?\n/u)){let e=t.trim();if(e.length>0)return e}}function truncate(e,t=80){return e.length<=t?e:`${e.slice(0,t-1)}\u2026`}async function bridgeSend(e,t,n){let r=activeFrom(`send`),{adapterName:i,auth:a,inputAnswer:o,thread:s,...c}=n,l=serializeThread(e,s,i),u={thread:l};return o!==void 0&&(u.inputAnswer=o),r(l.id).send(t,{...c,auth:a??null,state:u})}async function bridgeRespond(e,t,n){let r=activeFrom(`respond`),{adapterName:i,auth:a,thread:o,...s}=n;return r(serializeThread(e,o,i).id).respond(parseAnswers(t),{...s,auth:a??null})}function recordPrincipalUser(e,t,n){if(t===null)return;let r=(n.state?.thread)?.currentMessage?.author;if(r===void 0||r.isBot===!0||r.isMe)return;let i=e.usersByPrincipal?.[t.principalId];i!==r.userId&&i!==null&&(e.usersByPrincipal={...e.usersByPrincipal,[t.principalId]:i===void 0?r.userId:null})}function recordLatestMessage(e,t){let n=t.state?.thread?.currentMessage;n===void 0||n.author.isMe||(e.latestMessageId=n.id)}function resolveInputAnswer(e,t){let n=t.state?.inputAnswer;if(n===void 0)return;let r=e.pendingInputCards?.[n.messageId],i=r?.requests.find(e=>r.resolved[e.interactionId]===void 0&&e.request.kind!==`sign-in`&&e.request.options?.some(e=>e.id===n.optionId)===!0);return i===void 0?void 0:{optionId:n.optionId,interactionId:i.interactionId}}function activeFrom(e){let t=contextStorage.getStore()?.get(ActiveWebhookKey);if(!t)throw Error(`chatSdkChannel().${e} can only run during a Chat SDK webhook handler for this bridge.`);return t.from}function initialState(){return{pendingAuthMessageIds:{},thread:null}}async function fetchAttachment(e,t){let n=parseChatSdkFileRef(new URL(t));if(n===null)return null;await e.initialize();let r=e.getAdapter(n.adapter).rehydrateAttachment?.(n.attachment);if(r?.fetchData===void 0)throw new EveAttachmentError({adapterKind:`chat-sdk`,kind:`resolver-threw`,message:`the ${n.adapter} adapter can't download it after the webhook returns.`});let i;try{i=await r.fetchData()}catch(e){throw e instanceof EveAttachmentError?e:new EveAttachmentError({adapterKind:`chat-sdk`,cause:e,kind:`resolver-threw`,message:`the ${n.adapter} download failed.`})}let a=Buffer.isBuffer(i)?i:Buffer.from(i);return assertWithinLimit(a,DEFAULT_UPLOAD_POLICY.maxBytes,`chat-sdk`),{bytes:a,mediaType:n.attachment.mimeType}}function threadFromState(e,t){if(!t.thread)return null;try{let n=t.thread;return new ThreadImpl({adapter:e.getAdapter(n.adapterName),channelId:n.channelId,channelVisibility:n.channelVisibility,currentMessage:n.currentMessage?Message.fromJSON(n.currentMessage):void 0,id:n.id,isDM:n.isDM,stateAdapter:e.getState()})}catch(e){return log.warn(`failed to rebuild Chat SDK thread from channel state`,{error:e}),null}}function serializeReceiveTarget(e,t){if(t.thread)return t.thread;if(!t.threadId)throw Error(`chatSdkChannel().receive requires target.thread or target.threadId.`);return serializeThread(e,t.threadId,t.adapterName)}function serializeThread(e,t,n){if(typeof t==`string`){let r=n??inferAdapterName(t),i=e.getAdapter(r);return{_type:`chat:Thread`,adapterName:r,channelId:i.channelIdFromThreadId(t),channelVisibility:i.getChannelVisibility?.(t),id:t,isDM:!1}}return isSerializedThread(t)?t:t.toJSON()}function isSerializedThread(e){return`_type`in e&&e._type===`chat:Thread`}function inferAdapterName(e){let t=e.indexOf(`:`);if(t<=0)throw Error(`chatSdkChannel string thread references require options.adapterName.`);return e.slice(0,t)}function adapterNames(e){return Object.keys(e)}function routeForAdapter(e,t){return t.routes?.[e]||`${(t.route??`/eve/v1`).replace(/\/$/u,``)}/${e}`}export{chatSdkChannel};

package/dist/src/public/channels/chat-sdk/index.d.ts

@@ -1,3 +1,3 @@
 export { chatSdkChannel, type ChatSdkChannel, type ChatSdkChannelBridge, type ChatSdkChannelConfig, type ChatSdkChannelContext, type ChatSdkChannelEvents, type ChatSdkChannelState, type ChatSdkEventContext, type ChatSdkInputAnswer, type ChatSdkInstrumentationMetadata, type ChatSdkReceiveTarget, type ChatSdkRespondOptions, type ChatSdkSendOptions, } from "#public/channels/chat-sdk/chatSdkChannel.js";
-export { messageToUserContent } from "#public/channels/chat-sdk/messageToUserContent.js";
+export { messageContentOf } from "#public/channels/chat-sdk/message-content.js";
 export { isNotImplemented } from "#public/channels/chat-sdk/notImplemented.js";

package/dist/src/public/channels/chat-sdk/index.js

@@ -1 +1 @@
-import{isNotImplemented}from"#public/channels/chat-sdk/notImplemented.js";import{chatSdkChannel}from"#public/channels/chat-sdk/chatSdkChannel.js";import{messageToUserContent}from"#public/channels/chat-sdk/messageToUserContent.js";export{chatSdkChannel,isNotImplemented,messageToUserContent};
+import{isNotImplemented}from"#public/channels/chat-sdk/notImplemented.js";import{chatSdkChannel}from"#public/channels/chat-sdk/chatSdkChannel.js";import{messageContentOf}from"#public/channels/chat-sdk/message-content.js";export{chatSdkChannel,isNotImplemented,messageContentOf};

package/dist/src/public/channels/chat-sdk/input-actions.d.ts

@@ -1,11 +1,11 @@
-import type { InputResolution } from "#protocol/message.js";
-import type { InputRequest } from "#shared/input.js";
+import { type RequestSettlement } from "#channel/interaction-prompts.js";
+import type { Interaction } from "#channel/interaction-prompts.js";
 /**
  * Renders pending input requests as a Chat SDK card with one button per option,
  * plus fallback text for adapters without cards (such as Photon iMessage). A
  * request in `resolved` shows its outcome in place of its buttons.
  */
-export declare function renderInputRequests(requests: readonly InputRequest[], inputActionPrefix: string, resolved?: Readonly<Record<string, InputResolution>>): {
+export declare function renderInteractions(requests: readonly Interaction[], inputActionPrefix: string, resolved?: Readonly<Record<string, RequestSettlement>>): {
     card: import("#compiled/chat/index.js").CardElement;
     fallbackText: string;
 };
@@ -16,6 +16,6 @@ export declare function renderRetiredInputRequest(label: string): {
 };
 /** Decodes a default eve HITL button action back into an input response. */
 export declare function decodeInputAction(actionId: string, prefix: string, value: string | undefined): {
+    interactionId: string;
     optionId: string;
-    requestId: string;
 } | null;

package/dist/src/public/channels/chat-sdk/input-actions.js

@@ -1,4 +1,4 @@
-import{Actions,Button,Card,CardText}from"#compiled/chat/index.js";import{resolvedPromptLabel}from"#channel/resolved-prompt.js";const FREEFORM_HINT=`Reply with your answer.`;function renderInputRequests(e,t,n={}){let outcome=e=>{let t=n[e.requestId];return t===void 0?void 0:resolvedPromptLabel(t,e.options)};return{card:Card({children:e.flatMap(e=>{let n=outcome(e);return n===void 0?renderInputRequest(e,t):[CardText(e.prompt),CardText(n)]})}),fallbackText:e.map(e=>{let t=outcome(e);return t===void 0?renderInputRequestText(e):`${e.prompt}\n\n${t}`}).join(`
+import{optionStyle}from"#channel/interaction-prompts.js";import{Actions,Button,Card,CardText}from"#compiled/chat/index.js";import{resolvedPromptLabel}from"#channel/resolved-prompt.js";const FREEFORM_HINT=`Reply with your answer.`;function renderInteractions(e,t,n={}){let outcome=e=>{let t=n[e.interactionId];return t===void 0?void 0:resolvedPromptLabel(t,e.request.options)};return{card:Card({children:e.flatMap(e=>{let n=outcome(e);return n===void 0?renderInteraction(e,t):[CardText(e.request.prompt),CardText(n)]})}),fallbackText:e.map(e=>{let t=outcome(e);return t===void 0?renderInteractionText(e):`${e.request.prompt}\n\n${t}`}).join(`
 
-`)}}function renderRetiredInputRequest(e){return{card:Card({children:[CardText(e)]}),fallbackText:e}}function renderInputRequestText(e){let t=e.options??[];return t.length===0?`${e.prompt}\n\n${FREEFORM_HINT}`:[e.prompt,``,...t.map((e,t)=>{let n=e.description?` - ${e.description}`:``;return`${t+1}. ${e.label}${n}`}),``,e.allowFreeform===!0?`Reply with a number, or with your own answer.`:`Reply with a number to choose.`].join(`
-`)}function renderInputRequest(e,t){let n=[CardText(e.prompt)];return e.options&&e.options.length>0?(n.push(Actions(e.options.map(n=>Button({id:encodeInputAction(t,e.requestId,n.id),label:n.label,style:n.style,value:n.id})))),e.allowFreeform===!0&&n.push(CardText(`Or reply with your own answer.`)),n):(n.push(CardText(FREEFORM_HINT)),n)}function encodeInputAction(e,t,n){return`${e}${encodeURIComponent(t)}:${encodeURIComponent(n)}`}function decodeInputAction(e,t,n){if(!e.startsWith(t))return null;let r=e.slice(t.length),i=r.indexOf(`:`);if(i<=0)return null;try{let e=decodeURIComponent(r.slice(0,i));return{optionId:n??decodeURIComponent(r.slice(i+1)),requestId:e}}catch{return null}}export{decodeInputAction,renderInputRequests,renderRetiredInputRequest};
+`)}}function renderRetiredInputRequest(e){return{card:Card({children:[CardText(e)]}),fallbackText:e}}function renderInteractionText(e){let t=e.request.options??[];return t.length===0?`${e.request.prompt}\n\n${FREEFORM_HINT}`:[e.request.prompt,``,...t.map((e,t)=>{let n=e.description?` - ${e.description}`:``;return`${t+1}. ${e.label}${n}`}),``,e.request.allowFreeform===!0?`Reply with a number, or with your own answer.`:`Reply with a number to choose.`].join(`
+`)}function renderInteraction(e,t){let n=[CardText(e.request.prompt)];return e.request.options&&e.request.options.length>0?(n.push(Actions(e.request.options.map(n=>Button({id:encodeInputAction(t,e.interactionId,n.id),label:n.label,style:optionStyle(n),value:n.id})))),e.request.allowFreeform===!0&&n.push(CardText(`Or reply with your own answer.`)),n):(n.push(CardText(FREEFORM_HINT)),n)}function encodeInputAction(e,t,n){return`${e}${encodeURIComponent(t)}:${encodeURIComponent(n)}`}function decodeInputAction(e,t,n){if(!e.startsWith(t))return null;let r=e.slice(t.length),i=r.indexOf(`:`);if(i<=0)return null;try{return{interactionId:decodeURIComponent(r.slice(0,i)),optionId:n??decodeURIComponent(r.slice(i+1))}}catch{return null}}export{decodeInputAction,renderInteractions,renderRetiredInputRequest};

package/dist/src/public/channels/chat-sdk/{messageToUserContent.d.ts → message-content.d.ts}

@@ -1,11 +1,11 @@
-import type { UserContent } from "ai";
+import type { MessageContent } from "#shared/message-content.js";
 import type { Message } from "#compiled/chat/index.js";
 /**
  * Converts a Chat SDK `Message` into the input shape `chatSdkChannel().send`
  * accepts.
  *
  * Returns `message.text` when the message has no attachments. Otherwise
- * returns an AI SDK `UserContent` array: the text (when non-empty) followed by
+ * returns message parts: the text (when non-empty) followed by
  * one part per attachment.
  *
  * An attachment the adapter can download (`fetchData`) becomes a file part the
@@ -17,4 +17,4 @@ import type { Message } from "#compiled/chat/index.js";
  * that URL. An attachment with neither also becomes a note, so a file the
  * platform gave no way to download is never dropped silently.
  */
-export declare function messageToUserContent(message: Message): string | UserContent;
+export declare function messageContentOf(message: Message): MessageContent;

package/dist/src/public/channels/chat-sdk/message-content.js

@@ -0,0 +1 @@
+import{DEFAULT_UPLOAD_POLICY}from"#public/channels/upload-policy.js";import{encodeChatSdkFileRef}from"#public/channels/chat-sdk/attachment-refs.js";function messageContentOf(e){let t=e.attachments??[];if(t.length===0)return e.text;let n=[];e.text&&n.push({text:e.text,type:`text`});let r=e.threadId.split(`:`)[0];for(let e of t)n.push(attachmentToPart(r,e));return n}function attachmentToPart(e,t){let n=t.mimeType??`application/octet-stream`;return t.fetchData===void 0?t.url?{data:new URL(t.url),filename:t.name,mediaType:n,type:`file`}:{text:`Attachment ${t.name??`file`} was not retrieved: the platform did not provide a download for it.`,type:`text`}:t.size!==void 0&&t.size>DEFAULT_UPLOAD_POLICY.maxBytes?{text:`Attachment ${t.name??`file`} was not retrieved: it is over the upload limit.`,type:`text`}:{data:encodeChatSdkFileRef({adapter:e,attachment:t}),filename:t.name,mediaType:n,type:`file`}}export{messageContentOf};

package/dist/src/public/channels/discord/api.d.ts

@@ -1,9 +1,11 @@
+import type { DiscordChannelCredentials } from "#public/channels/discord/credentials.js";
+export type { DiscordChannelCredentials } from "#public/channels/discord/credentials.js";
 /**
  * Minimal Discord REST API wrapper. The channel talks directly to Discord's
  * JSON HTTP API rather than exposing a third-party SDK through eve.
  */
 import { type JsonObject } from "#shared/json.js";
-import { resolveDiscordPublicKey, type DiscordPublicKey } from "#public/channels/discord/verify.js";
+import { resolveDiscordPublicKey } from "#public/channels/discord/verify.js";
 /** Discord application id, materialized directly or from an async secret provider. */
 export type DiscordApplicationId = string | (() => string | Promise<string>);
 /** Discord bot token, materialized directly or from an async secret provider. */
@@ -14,18 +16,10 @@ export type DiscordFetch = typeof fetch;
  * Credentials used by the native Discord channel. Each field falls back to the
  * matching `DISCORD_*` env var when omitted.
  */
-export interface DiscordCredentials {
-    /** Required to edit or follow up on interaction responses. Falls back to `DISCORD_APPLICATION_ID`. */
-    readonly applicationId?: DiscordApplicationId;
-    /** Required for channel messages and typing indicators. Falls back to `DISCORD_BOT_TOKEN`. */
-    readonly botToken?: DiscordBotToken;
-    /** Required for inbound Ed25519 interaction verification. Falls back to `DISCORD_PUBLIC_KEY`. */
-    readonly publicKey?: DiscordPublicKey;
-}
 /** Shared Discord API options. */
 export interface DiscordApiOptions {
     readonly apiBaseUrl?: string;
-    readonly credentials?: DiscordCredentials;
+    readonly credentials?: DiscordChannelCredentials;
     readonly fetch?: DiscordFetch;
 }
 /** Raw Discord API call result. `body` is parsed JSON, or text/null when not JSON. */
@@ -48,7 +42,10 @@ export declare const DISCORD_NO_MENTIONS: JsonObject;
 /** Discord's documented message-content cap. */
 export declare const DISCORD_MESSAGE_CONTENT_MAX_LENGTH = 2000;
 /** Builds the channel-local continuation token (`<channelId>:<conversationId>`). */
-export declare function discordContinuationToken(channelId: string, conversationId: string | undefined): string;
+export declare function discordContinuationToken({ channelId, conversationId, }: {
+    readonly channelId: string;
+    readonly conversationId?: string | undefined;
+}): string;
 /** Resolves a Discord application id, falling back to `DISCORD_APPLICATION_ID`. */
 export declare function resolveDiscordApplicationId(applicationId?: DiscordApplicationId): Promise<string>;
 /** Resolves a Discord bot token, falling back to `DISCORD_BOT_TOKEN`. */

package/dist/src/public/channels/discord/api.js

@@ -1,2 +1,2 @@
-import{isObject}from"#shared/guards.js";import{parseJsonObject}from"#shared/json.js";import{resolveDiscordPublicKey}from"#public/channels/discord/verify.js";const DISCORD_NO_MENTIONS={parse:[]},DISCORD_MESSAGE_CONTENT_MAX_LENGTH=2e3;function discordContinuationToken(e,t){return`${e}:${t??``}`}async function resolveDiscordApplicationId(e){let t=e??process.env.DISCORD_APPLICATION_ID;if(!t)throw Error(`DISCORD_APPLICATION_ID is required.`);return typeof t==`function`?await t():t}async function resolveDiscordBotToken(e){let t=e??process.env.DISCORD_BOT_TOKEN;if(!t)throw Error(`DISCORD_BOT_TOKEN is required.`);return typeof t==`function`?await t():t}async function callDiscordApi(e){let t=e.fetch??fetch,n=new Headers;if(n.set(`content-type`,`application/json; charset=utf-8`),e.botToken!==void 0){let t=await resolveDiscordBotToken(e.botToken);n.set(`authorization`,`Bot ${t}`)}let r={headers:n,method:e.method??`POST`};e.body!==void 0&&(r.body=JSON.stringify(parseJsonObject(e.body)));let i=await t(`${e.apiBaseUrl??`https://discord.com/api/v10`}${e.path}`,r);return{body:await parseResponseBody(i),ok:i.ok,status:i.status}}async function sendDiscordChannelMessage(e){let t=await callDiscordApi({apiBaseUrl:e.apiBaseUrl,body:normalizeMessageBody(e.body),botToken:e.credentials?.botToken,fetch:e.fetch,path:`/channels/${encodeURIComponent(e.channelId)}/messages`});if(!t.ok)throw Error(`Discord create message failed with HTTP ${t.status}.`);return toPostedMessage(t.body)}async function triggerDiscordTypingIndicator(e){let t=await callDiscordApi({apiBaseUrl:e.apiBaseUrl,botToken:e.credentials?.botToken,fetch:e.fetch,path:`/channels/${encodeURIComponent(e.channelId)}/typing`});if(!t.ok)throw Error(`Discord typing indicator failed with HTTP ${t.status}.`)}async function editDiscordOriginalResponse(e){let t=await resolveDiscordApplicationId(e.credentials?.applicationId),n=await callDiscordApi({apiBaseUrl:e.apiBaseUrl,body:normalizeMessageBody(e.body),fetch:e.fetch,method:`PATCH`,path:`/webhooks/${encodeURIComponent(t)}/${encodeURIComponent(e.interactionToken)}/messages/@original`});if(!n.ok)throw Error(`Discord edit original response failed with HTTP ${n.status}.`);return toPostedMessage(n.body)}async function createDiscordFollowupMessage(e){let t=await resolveDiscordApplicationId(e.credentials?.applicationId),n=await callDiscordApi({apiBaseUrl:e.apiBaseUrl,body:normalizeMessageBody(e.body),fetch:e.fetch,path:`/webhooks/${encodeURIComponent(t)}/${encodeURIComponent(e.interactionToken)}`});if(!n.ok)throw Error(`Discord followup message failed with HTTP ${n.status}.`);return toPostedMessage(n.body)}function splitDiscordMessageContent(e){if(e.length<=2e3)return[e];let t=[],n=e;for(;n.length>DISCORD_MESSAGE_CONTENT_MAX_LENGTH;){let e=n.lastIndexOf(`
+import{isObject}from"#shared/guards.js";import{parseJsonObject}from"#shared/json.js";import{resolveDiscordPublicKey}from"#public/channels/discord/verify.js";const DISCORD_NO_MENTIONS={parse:[]},DISCORD_MESSAGE_CONTENT_MAX_LENGTH=2e3;function discordContinuationToken({channelId:e,conversationId:t}){return`${e}:${t??``}`}async function resolveDiscordApplicationId(e){let t=e??process.env.DISCORD_APPLICATION_ID;if(!t)throw Error(`DISCORD_APPLICATION_ID is required.`);return typeof t==`function`?await t():t}async function resolveDiscordBotToken(e){let t=e??process.env.DISCORD_BOT_TOKEN;if(!t)throw Error(`DISCORD_BOT_TOKEN is required.`);return typeof t==`function`?await t():t}async function callDiscordApi(e){let t=e.fetch??fetch,n=new Headers;if(n.set(`content-type`,`application/json; charset=utf-8`),e.botToken!==void 0){let t=await resolveDiscordBotToken(e.botToken);n.set(`authorization`,`Bot ${t}`)}let r={headers:n,method:e.method??`POST`};e.body!==void 0&&(r.body=JSON.stringify(parseJsonObject(e.body)));let i=await t(`${e.apiBaseUrl??`https://discord.com/api/v10`}${e.path}`,r);return{body:await parseResponseBody(i),ok:i.ok,status:i.status}}async function sendDiscordChannelMessage(e){let t=await callDiscordApi({apiBaseUrl:e.apiBaseUrl,body:normalizeMessageBody(e.body),botToken:e.credentials?.botToken,fetch:e.fetch,path:`/channels/${encodeURIComponent(e.channelId)}/messages`});if(!t.ok)throw Error(`Discord create message failed with HTTP ${t.status}.`);return toPostedMessage(t.body)}async function triggerDiscordTypingIndicator(e){let t=await callDiscordApi({apiBaseUrl:e.apiBaseUrl,botToken:e.credentials?.botToken,fetch:e.fetch,path:`/channels/${encodeURIComponent(e.channelId)}/typing`});if(!t.ok)throw Error(`Discord typing indicator failed with HTTP ${t.status}.`)}async function editDiscordOriginalResponse(e){let t=await resolveDiscordApplicationId(e.credentials?.applicationId),n=await callDiscordApi({apiBaseUrl:e.apiBaseUrl,body:normalizeMessageBody(e.body),fetch:e.fetch,method:`PATCH`,path:`/webhooks/${encodeURIComponent(t)}/${encodeURIComponent(e.interactionToken)}/messages/@original`});if(!n.ok)throw Error(`Discord edit original response failed with HTTP ${n.status}.`);return toPostedMessage(n.body)}async function createDiscordFollowupMessage(e){let t=await resolveDiscordApplicationId(e.credentials?.applicationId),n=await callDiscordApi({apiBaseUrl:e.apiBaseUrl,body:normalizeMessageBody(e.body),fetch:e.fetch,path:`/webhooks/${encodeURIComponent(t)}/${encodeURIComponent(e.interactionToken)}`});if(!n.ok)throw Error(`Discord followup message failed with HTTP ${n.status}.`);return toPostedMessage(n.body)}function splitDiscordMessageContent(e){if(e.length<=2e3)return[e];let t=[],n=e;for(;n.length>DISCORD_MESSAGE_CONTENT_MAX_LENGTH;){let e=n.lastIndexOf(`
 `,DISCORD_MESSAGE_CONTENT_MAX_LENGTH);e<=0&&(e=n.lastIndexOf(` `,DISCORD_MESSAGE_CONTENT_MAX_LENGTH)),e<=0&&(e=DISCORD_MESSAGE_CONTENT_MAX_LENGTH),t.push(n.slice(0,e).trimEnd()),n=n.slice(e).trimStart()}return t.push(n),t}function normalizeMessageBody(e){let t={...e};return t.allowed_mentions===void 0&&(t.allowed_mentions=DISCORD_NO_MENTIONS),parseJsonObject(t)}function toPostedMessage(e){let t=parseMaybeObject(e);return{channelId:typeof t.channel_id==`string`?t.channel_id:void 0,id:typeof t.id==`string`?t.id:``,raw:e}}function parseMaybeObject(e){return isObject(e)?e:{}}async function parseResponseBody(e){let t=await e.text();if(!t)return null;try{return JSON.parse(t)}catch{return t}}export{DISCORD_MESSAGE_CONTENT_MAX_LENGTH,DISCORD_NO_MENTIONS,callDiscordApi,createDiscordFollowupMessage,discordContinuationToken,editDiscordOriginalResponse,resolveDiscordApplicationId,resolveDiscordBotToken,resolveDiscordPublicKey,sendDiscordChannelMessage,splitDiscordMessageContent,triggerDiscordTypingIndicator};

package/dist/src/public/channels/discord/attachments.d.ts

@@ -1,4 +1,4 @@
-import type { UserContent } from "ai";
+import type { MessageContent } from "#shared/message-content.js";
 import type { FetchFileResult } from "#channel/adapter.js";
 import type { DiscordFetch } from "#public/channels/discord/api.js";
 import type { DiscordAttachment } from "#public/channels/discord/inbound.js";
@@ -7,7 +7,7 @@ import type { DiscordAttachment } from "#public/channels/discord/inbound.js";
  * attachment, which the channel's `fetchFile` downloads. Files over the default
  * upload limit become a short note instead.
  */
-export declare function discordCommandContent(text: string, attachments: readonly DiscordAttachment[]): string | UserContent;
+export declare function discordCommandContent(text: string, attachments: readonly DiscordAttachment[]): MessageContent;
 /**
  * Creates the channel's `fetchFile` for Discord CDN URLs. Any other URL
  * resolves to `null`, so it's never fetched here.

package/dist/src/public/channels/discord/authorization.d.ts

@@ -7,11 +7,9 @@
  * the person who must sign in.
  */
 import type { Session } from "#channel/session.js";
+import type { SignIn } from "#channel/sign-in.js";
 import type { SessionAuthContext } from "#channel/types.js";
-import type { AuthorizationCompletedStreamEvent, AuthorizationRequiredStreamEvent } from "#protocol/message.js";
 import type { DiscordMessageBody } from "#public/channels/discord/api.js";
-type AuthorizationRequired = AuthorizationRequiredStreamEvent["data"];
-type AuthorizationCompleted = AuthorizationCompletedStreamEvent["data"];
 /** Custom id prefix of the shared sign-in message's button. */
 export declare const DISCORD_AUTHORIZATION_CUSTOM_ID_PREFIX = "eve_auth:";
 /** The sign-in attempt a shared message's button names, as an opaque digest. */
@@ -19,11 +17,9 @@ export interface DiscordAuthorizationReveal {
     readonly attempt: string;
 }
 /** The full sign-in, link and code included, for the person signing in alone. */
-export declare function renderDiscordAuthorizationPrompt(event: AuthorizationRequired): DiscordMessageBody;
+export declare function renderDiscordAuthorizationPrompt(event: SignIn): DiscordMessageBody;
 /** The shared sign-in message: who must sign in, and a button that shows them the challenge. */
-export declare function renderDiscordAuthorizationStatus(event: AuthorizationRequired): DiscordMessageBody;
-/** What a sign-in's message says once it settles. */
-export declare function renderDiscordAuthorizationCompleted(event: AuthorizationCompleted): string;
+export declare function renderDiscordAuthorizationStatus(event: SignIn): DiscordMessageBody;
 /** Reads the sign-in attempt a button names, or `null` for any other component. */
 export declare function readDiscordAuthorizationReveal(customId: string): DiscordAuthorizationReveal | null;
 /**
@@ -37,9 +33,3 @@ export declare function answerDiscordAuthorizationReveal(input: {
     readonly resolveSession: () => Promise<Session | undefined>;
     readonly reveal: DiscordAuthorizationReveal;
 }): Promise<DiscordMessageBody>;
-/** The key a channel's state tracks one sign-in attempt's message under. */
-export declare function discordAuthorizationMessageKey(event: {
-    readonly attemptId?: string;
-    readonly name: string;
-}): string;
-export {};

package/dist/src/public/channels/discord/authorization.js

@@ -1,3 +1,3 @@
-import{createHash}from"node:crypto";import{createLogger}from"#internal/logging.js";import{displayProperName}from"#shared/display-name.js";import{attemptKey,findPendingAuthorization}from"#channel/pending-authorization.js";import{DISCORD_COMPONENT_TYPE}from"#public/channels/discord/hitl.js";const log=createLogger(`discord.authorization`),DISCORD_AUTHORIZATION_CUSTOM_ID_PREFIX=`eve_auth:`,NOT_YOURS=`Only the person who needs to sign in can open this sign-in.`;function displayNameOf(e){return e.authorization?.displayName??displayProperName(e.name)}function renderDiscordAuthorizationPrompt(e){let t=displayNameOf(e),n=e.authorization?.url,r=e.authorization?.userCode,i=[`Sign in to ${t} to continue.`,e.authorization?.instructions,r?`If ${t} asks for a confirmation code, enter ${r}.`:void 0].filter(Boolean).join(`
+import{createHash}from"node:crypto";import{createLogger}from"#internal/logging.js";import{findPendingAuthorization}from"#channel/pending-authorization.js";import{DISCORD_COMPONENT_TYPE}from"#public/channels/discord/hitl.js";const log=createLogger(`discord.authorization`),DISCORD_AUTHORIZATION_CUSTOM_ID_PREFIX=`eve_auth:`,NOT_YOURS=`Only the person who needs to sign in can open this sign-in.`;function renderDiscordAuthorizationPrompt(e){let{displayName:t,url:n,userCode:r}=e,i=[`Sign in to ${t} to continue.`,e.instructions,r?`If ${t} asks for a confirmation code, enter ${r}.`:void 0].filter(Boolean).join(`
 
-`);return n?{components:[{components:[{label:`Sign in to ${t}`,style:5,type:DISCORD_COMPONENT_TYPE.BUTTON,url:n}],type:DISCORD_COMPONENT_TYPE.ACTION_ROW}],content:i}:{content:i}}function renderDiscordAuthorizationStatus(e){let t=discordUserIdOf(e.principalId),n=t?`<@${t}> needs`:`Someone needs`;return{components:[{components:[{custom_id:authorizationCustomId(e),label:`Sign in`,style:1,type:DISCORD_COMPONENT_TYPE.BUTTON}],type:DISCORD_COMPONENT_TYPE.ACTION_ROW}],content:`${n} to sign in to ${displayNameOf(e)} to continue. Only they can open the sign-in.`}}function renderDiscordAuthorizationCompleted(e){let t=displayNameOf(e);if(e.outcome===`authorized`)return`${t} connected.`;let n=e.reason===void 0?``:` (${e.reason})`;return`${t} sign-in ${e.outcome}${n}.`}function readDiscordAuthorizationReveal(e){if(!e.startsWith(`eve_auth:`))return null;let t=e.slice(9);return t?{attempt:t}:null}async function answerDiscordAuthorizationReveal(e){if(e.auth===null)return{content:NOT_YOURS};let t;try{let n=await e.resolveSession();t=n&&await findPendingAuthorization(n,t=>attemptDigest(t)===e.reveal.attempt)}catch(e){log.error(`Discord sign-in lookup failed`,{error:e})}return t===void 0?{content:`This sign-in is no longer active.`}:e.auth.principalId===t.principalId?renderDiscordAuthorizationPrompt(t):{content:NOT_YOURS}}function authorizationCustomId(e){return`${DISCORD_AUTHORIZATION_CUSTOM_ID_PREFIX}${attemptDigest(e)}`}function attemptDigest(e){return createHash(`sha256`).update(attemptKey(e)).digest(`base64url`).slice(0,32)}function discordAuthorizationMessageKey(e){return attemptDigest(e)}function discordUserIdOf(e){return/^discord:(\d+)$/u.exec(e??``)?.[1]}export{DISCORD_AUTHORIZATION_CUSTOM_ID_PREFIX,answerDiscordAuthorizationReveal,discordAuthorizationMessageKey,readDiscordAuthorizationReveal,renderDiscordAuthorizationCompleted,renderDiscordAuthorizationPrompt,renderDiscordAuthorizationStatus};
+`);return n?{components:[{components:[{label:`Sign in to ${t}`,style:5,type:DISCORD_COMPONENT_TYPE.BUTTON,url:n}],type:DISCORD_COMPONENT_TYPE.ACTION_ROW}],content:i}:{content:i}}function renderDiscordAuthorizationStatus(e){let t=discordUserIdOf(e.principalId),n=t?`<@${t}> needs`:`Someone needs`;return{components:[{components:[{custom_id:authorizationCustomId(e),label:`Sign in`,style:1,type:DISCORD_COMPONENT_TYPE.BUTTON}],type:DISCORD_COMPONENT_TYPE.ACTION_ROW}],content:`${n} to sign in to ${e.displayName} to continue. Only they can open the sign-in.`}}function readDiscordAuthorizationReveal(e){if(!e.startsWith(`eve_auth:`))return null;let t=e.slice(9);return t?{attempt:t}:null}async function answerDiscordAuthorizationReveal(e){if(e.auth===null)return{content:NOT_YOURS};let t;try{let n=await e.resolveSession();t=n&&await findPendingAuthorization(n,t=>attemptDigest(t)===e.reveal.attempt)}catch(e){log.error(`Discord sign-in lookup failed`,{error:e})}return t===void 0?{content:`This sign-in is no longer active.`}:e.auth.principalId===t.principalId?renderDiscordAuthorizationPrompt(t):{content:NOT_YOURS}}function authorizationCustomId(e){return`${DISCORD_AUTHORIZATION_CUSTOM_ID_PREFIX}${attemptDigest(e)}`}function attemptDigest(e){return createHash(`sha256`).update(JSON.stringify([e.name,e.interactionId])).digest(`base64url`).slice(0,32)}function discordUserIdOf(e){return/^discord:(\d+)$/u.exec(e??``)?.[1]}export{DISCORD_AUTHORIZATION_CUSTOM_ID_PREFIX,answerDiscordAuthorizationReveal,readDiscordAuthorizationReveal,renderDiscordAuthorizationPrompt,renderDiscordAuthorizationStatus};

package/dist/src/public/channels/discord/credentials.d.ts

@@ -0,0 +1,11 @@
+import type { DiscordApplicationId } from "#public/channels/discord/api.js";
+import type { DiscordBotToken } from "#public/channels/discord/api.js";
+import type { DiscordPublicKey } from "#public/channels/discord/verify.js";
+import type { DiscordWebhookVerifier } from "#public/channels/discord/verify.js";
+/** Credentials for the Discord channel and its API. */
+export interface DiscordChannelCredentials {
+    readonly applicationId?: DiscordApplicationId;
+    readonly botToken?: DiscordBotToken;
+    readonly publicKey?: DiscordPublicKey;
+    readonly webhookVerifier?: DiscordWebhookVerifier;
+}

package/dist/src/public/channels/discord/credentials.js

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

package/dist/src/public/channels/discord/defaults.d.ts

@@ -1,7 +1,7 @@
 import type { SessionAuthContext } from "#channel/types.js";
 import type { DiscordCommandInteraction, DiscordInteractionBase } from "#public/channels/discord/inbound.js";
 import type { DiscordGatewayMessage, DiscordMessageResult } from "#public/channels/discord/messages.js";
-import type { DiscordChannelEvents, DiscordCommandResult, DiscordContext, DiscordHandle, DiscordHitlPrompt } from "#public/channels/discord/discordChannel.js";
+import type { DiscordChannelEvents, DiscordChannelState, DiscordCommandResult, DiscordContext, DiscordHandle, DiscordHitlPrompt } from "#public/channels/discord/discordChannel.js";
 /**
  * Builds the default {@link SessionAuthContext} for the user behind a Discord
  * interaction (a command, button press, select, or modal submission):
@@ -28,5 +28,11 @@ export declare function defaultOnCommand(_ctx: DiscordContext, interaction: Disc
 export declare function editDiscordResolvedPrompt(discord: Pick<DiscordHandle, "channelId" | "request">, prompt: Pick<DiscordHitlPrompt, "content" | "messageId">, label: string): Promise<void>;
 /** Default Gateway message hook: dispatch messages addressed to the bot with Discord user auth. */
 export declare function defaultOnMessage(_ctx: DiscordContext, message: DiscordGatewayMessage): DiscordMessageResult;
+/**
+ * Whether only the person signing in reads the conversation: a one-to-one DM (channel type 1),
+ * from an interaction or a Gateway message. A group DM has no guild either, but every member
+ * reads it. A session eve started itself records no channel type, so it isn't taken as private.
+ */
+export declare function signsInPrivately(state: DiscordChannelState): boolean;
 /** Built-in Discord event handlers for typing, replies, HITL, and terminal errors. */
 export declare const defaultEvents: DiscordChannelEvents;

package/dist/src/public/channels/discord/defaults.js

@@ -1,3 +1 @@
-import{createLogger,extractErrorId,formatErrorHint}from"#internal/logging.js";import{resolvedPromptLabel}from"#channel/resolved-prompt.js";import{renderInputRequestComponents}from"#public/channels/discord/hitl.js";import{DISCORD_MESSAGE_CONTENT_MAX_LENGTH,DISCORD_NO_MENTIONS,splitDiscordMessageContent}from"#public/channels/discord/api.js";import{discordAuthorizationMessageKey,renderDiscordAuthorizationCompleted,renderDiscordAuthorizationPrompt,renderDiscordAuthorizationStatus}from"#public/channels/discord/authorization.js";const log=createLogger(`discord.defaults`);function defaultDiscordAuth(e){let t={channel_id:e.channelId,interaction_id:e.id};return e.member?.nick!==void 0&&(t.member_nick=e.member.nick),discordUserAuth(e.user,e.guildId,t)}function defaultDiscordMessageAuth(e){return discordUserAuth(e.author,e.guildId,{channel_id:e.channelId,message_id:e.id})}function discordUserAuth(e,t,n){let r={...n,user_id:e.id,username:e.username};return t!==void 0&&(r.guild_id=t),{attributes:r,authenticator:`discord-interaction`,issuer:t?`discord:${t}`:`discord`,principalId:t?`discord:${t}:${e.id}`:`discord:${e.id}`,principalType:e.isBot?`service`:`user`}}function defaultOnCommand(e,t){return{auth:defaultDiscordAuth(t)}}async function editDiscordResolvedPrompt(e,t,n){let r=`${t.content}\n\n${n}`.slice(0,DISCORD_MESSAGE_CONTENT_MAX_LENGTH);await editDiscordMessage(e,t.messageId,r)}async function editDiscordMessage(e,t,n){let r=await e.request(`/channels/${encodeURIComponent(e.channelId)}/messages/${encodeURIComponent(t)}`,{allowed_mentions:DISCORD_NO_MENTIONS,components:[],content:n},{botAuth:!0,method:`PATCH`});if(!r.ok)throw Error(`Discord message edit failed with HTTP ${r.status}.`)}function defaultOnMessage(e,t){return t.addressed?{auth:defaultDiscordMessageAuth(t)}:null}const defaultEvents={async"turn.started"(e,t,n){await t.discord.startTyping()},async"authorization.required"(e,t,n){let r=t.state.directMessage===!0?renderDiscordAuthorizationPrompt(e):renderDiscordAuthorizationStatus(e);try{let n=await t.discord.post(r);n.id&&(t.state.pendingAuthMessageIds={...t.state.pendingAuthMessageIds,[discordAuthorizationMessageKey(e)]:n.id})}catch(t){log.error(`Discord sign-in delivery failed`,{error:t,name:e.name})}},async"authorization.completed"(e,t,n){e.outcome===`authorized`&&await t.discord.startTyping();let r=discordAuthorizationMessageKey(e),i=t.state.pendingAuthMessageIds?.[r];if(i===void 0)return;let{[r]:a,...o}=t.state.pendingAuthMessageIds??{};t.state.pendingAuthMessageIds=o;try{await editDiscordMessage(t.discord,i,renderDiscordAuthorizationCompleted(e))}catch(t){log.warn(`Discord sign-in edit failed`,{error:t,name:e.name})}},async"actions.requested"(e,t,n){await t.discord.startTyping()},async"input.requested"(e,t,n){for(let n of e.requests){let e=splitDiscordMessageContent(n.prompt)[0]??n.prompt,r=renderInputRequestComponents(n),i=await t.discord.post({components:r,content:e});r.length!==0&&i.id&&(t.state.hitlPrompts={...t.state.hitlPrompts,[n.requestId]:{content:e,messageId:i.id,options:(n.options??[]).map(({id:e,label:t})=>({id:e,label:t}))}})}},async"input.resolved"(e,t,n){for(let n of e.resolutions){let e=t.state.hitlPrompts?.[n.requestId];if(e===void 0)continue;let{[n.requestId]:r,...i}=t.state.hitlPrompts??{};t.state.hitlPrompts=i;let a=resolvedPromptLabel(n,e.options);try{await editDiscordResolvedPrompt(t.discord,e,a)}catch(e){log.warn(`Discord answered prompt edit failed`,{error:e,requestId:n.requestId})}}},async"message.completed"(e,t,n){e.finishReason!==`tool-calls`&&e.message&&await t.discord.post(e.message)},async"session.failed"(e,t){let n=formatErrorHint(e),r=extractErrorId(e.details);await t.discord.post([`This session could not recover from an error${n}.`,``,`Send a new message or command to continue.`,...r?[``,`Error id: ${r}`]:[]].join(`
-`))},async"turn.failed"(e,t,n){if(e.terminal)return;let r=formatErrorHint(e),i=extractErrorId(e.details);await t.discord.post([`I hit an error while handling your request${r}.`,``,`Please try again, rephrase, or reach out if it keeps failing.`,...i?[``,`Error id: ${i}`]:[]].join(`
-`))}};export{defaultDiscordAuth,defaultDiscordMessageAuth,defaultEvents,defaultOnCommand,defaultOnMessage,editDiscordResolvedPrompt};
+import{createLogger}from"#internal/logging.js";import{postedIn}from"#channel/sign-in.js";import{resolvedPromptLabel}from"#channel/resolved-prompt.js";import{renderInteractionComponents}from"#public/channels/discord/hitl.js";import{surfaceEvents}from"#channel/surface.js";import{DISCORD_MESSAGE_CONTENT_MAX_LENGTH,DISCORD_NO_MENTIONS,splitDiscordMessageContent}from"#public/channels/discord/api.js";import{renderDiscordAuthorizationPrompt,renderDiscordAuthorizationStatus}from"#public/channels/discord/authorization.js";const log=createLogger(`discord.defaults`);function defaultDiscordAuth(e){let t={channel_id:e.channelId,interaction_id:e.id};return e.member?.nick!==void 0&&(t.member_nick=e.member.nick),discordUserAuth(e.user,e.guildId,t)}function defaultDiscordMessageAuth(e){return discordUserAuth(e.author,e.guildId,{channel_id:e.channelId,message_id:e.id})}function discordUserAuth(e,t,n){let r={...n,user_id:e.id,username:e.username};return t!==void 0&&(r.guild_id=t),{attributes:r,authenticator:`discord-interaction`,issuer:t?`discord:${t}`:`discord`,principalId:t?`discord:${t}:${e.id}`:`discord:${e.id}`,principalType:e.isBot?`service`:`user`}}function defaultOnCommand(e,t){return{auth:defaultDiscordAuth(t)}}async function editDiscordResolvedPrompt(e,t,n){let r=`${t.content}\n\n${n}`.slice(0,DISCORD_MESSAGE_CONTENT_MAX_LENGTH);await editDiscordMessage(e,t.messageId,r)}async function editDiscordMessage(e,t,n){let r=await e.request(`/channels/${encodeURIComponent(e.channelId)}/messages/${encodeURIComponent(t)}`,{allowed_mentions:DISCORD_NO_MENTIONS,components:[],content:n},{botAuth:!0,method:`PATCH`});if(!r.ok)throw Error(`Discord message edit failed with HTTP ${r.status}.`)}function defaultOnMessage(e,t){return t.addressed?{auth:defaultDiscordMessageAuth(t)}:null}function signsInPrivately(e){return e.channelType===1}function discordSignIns(e){let{discord:t}=e;return{private:signsInPrivately(e.state),postChallenge:async e=>(await t.post(renderDiscordAuthorizationPrompt(e))).id||void 0,post:async e=>(await t.post({content:e})).id||void 0,postStatus:async e=>(await t.post(renderDiscordAuthorizationStatus(e))).id||void 0,async edit(e,n){try{await editDiscordMessage(t,e,n)}catch(e){log.warn(`Discord sign-in status edit failed`,{error:e})}},typing:()=>t.startTyping(),posted:postedIn(e.state,`pendingSignIns`)}}const defaultEvents=surfaceEvents({typing:e=>e.discord.startTyping(),post:(e,t)=>e.discord.post(t),restart:`command`,requests:{show:postDiscordRequest,settle:editDiscordSettledRequest},signIns:discordSignIns});async function postDiscordRequest(e,t){let n=splitDiscordMessageContent(t.request.prompt)[0]??t.request.prompt,r=renderInteractionComponents(t),i=await e.discord.post({components:r,content:n});r.length!==0&&i.id&&(e.state.hitlPrompts={...e.state.hitlPrompts,[t.interactionId]:{content:n,messageId:i.id,options:(t.request.options??[]).map(({id:e,label:t})=>({id:e,label:t}))}})}async function editDiscordSettledRequest(e,t){let{[t.interactionId]:n,...r}=e.state.hitlPrompts??{};if(n===void 0)return;e.state.hitlPrompts=r;let i=resolvedPromptLabel(t,n.options);try{await editDiscordResolvedPrompt(e.discord,n,i)}catch(e){log.warn(`Discord answered prompt edit failed`,{error:e,requestId:t.interactionId})}}export{defaultDiscordAuth,defaultDiscordMessageAuth,defaultEvents,defaultOnCommand,defaultOnMessage,editDiscordResolvedPrompt,signsInPrivately};

package/dist/src/public/channels/discord/discordChannel.d.ts

@@ -1,33 +1,29 @@
+import type { DiscordChannelCredentials } from "#public/channels/discord/credentials.js";
+export type { DiscordChannelCredentials } from "#public/channels/discord/credentials.js";
+import type { ChannelEventContext, ChannelEventOf } from "#public/definitions/channel.js";
+import type { SessionEvent } from "#protocol/session-event.js";
 import type { DiscordInstrumentationMetadata } from "#public/channels/discord/index.js";
 import type { SessionHistoryMessage } from "#shared/session-history.js";
 import type { SessionAuthContext, TurnPolicy } from "#channel/types.js";
-import type { SessionContext } from "#public/definitions/callback-context.js";
 import type { ChannelContinuationOps } from "#public/definitions/channel.js";
-import type { UnstampedMessageStreamEvent } from "#protocol/message.js";
-import { type DiscordApiOptions, type DiscordApiResponse, type DiscordCredentials, type DiscordMessageBody, type DiscordPostedMessage } from "#public/channels/discord/api.js";
+import { type DiscordApiOptions, type DiscordApiResponse, type DiscordMessageBody, type DiscordPostedMessage } from "#public/channels/discord/api.js";
 import { type DiscordCommandInteraction, type DiscordComponentInteraction, type DiscordModalSubmitInteraction } from "#public/channels/discord/inbound.js";
 import { type DiscordGatewayConfig } from "#public/channels/discord/messages.js";
-import { type DiscordWebhookVerifier } from "#public/channels/discord/verify.js";
 import { type JsonObject } from "#shared/json.js";
 import { type Channel } from "#public/definitions/channel.js";
-import type { InputOption } from "#shared/input.js";
+import type { InteractionOption } from "#protocol/session-events/families/interaction.js";
 import type { ChannelAudience } from "#shared/channel-audience.js";
-type EventData<T extends UnstampedMessageStreamEvent["type"]> = Extract<UnstampedMessageStreamEvent, {
-    type: T;
-}> extends {
-    data: infer D;
-} ? D : undefined;
 /** Pre-dispatch Discord context passed to inbound command hooks. */
 export interface DiscordContext {
     readonly discord: DiscordHandle;
 }
-/** Context passed to `discordChannel({ onInputResponse })` before eve answers the pending request. */
-export interface DiscordInputResponseContext extends DiscordContext {
+/** Context passed to `discordChannel({ onAnswers })` before eve answers the pending request. */
+export interface DiscordAnswerContext extends DiscordContext {
     /** Auth derived from the Discord user who pressed or submitted, as `defaultDiscordAuth` builds it. */
     readonly defaultAuth: SessionAuthContext;
 }
 /** Channel-owned Discord context returned by `context()`. */
-type DiscordChannelContext = DiscordContext & {
+export type DiscordChannelContext = DiscordContext & {
     state: DiscordChannelState;
 };
 /** Event-handler Discord context, including continuation routing. */
@@ -42,6 +38,8 @@ export interface DiscordChannelState {
     conversationId: string | null;
     /** Discord guild id, when the interaction was invoked in a guild. */
     guildId: string | null;
+    /** The Discord channel type the interaction came from, such as 1 for a DM. */
+    channelType?: number;
     /** Discord application id from the inbound interaction. */
     applicationId: string | null;
     /** Latest interaction token available to the channel. */
@@ -52,22 +50,16 @@ export interface DiscordChannelState {
     hasMessageAnchor: boolean;
     /** Posted prompts with components, keyed by requestId, until eve resolves them. */
     hitlPrompts?: Record<string, DiscordHitlPrompt>;
-    /** Each pending sign-in's message, keyed by sign-in attempt, until the sign-in settles. */
-    pendingAuthMessageIds?: Record<string, string>;
-    /** Whether the conversation is a 1:1 DM with the bot, where nobody else can see a sign-in. */
-    directMessage?: boolean;
+    /** The sign-ins the default flow posted for, by connection name. */
+    pendingSignIns?: Record<string, string>;
 }
 /** What a posted prompt needs so its message can be edited once eve resolves it. */
 export interface DiscordHitlPrompt {
     readonly content: string;
     readonly messageId: string;
-    readonly options: readonly Pick<InputOption, "id" | "label">[];
+    readonly options: readonly Pick<InteractionOption, "id" | "label">[];
 }
 /** Discord channel credentials. */
-export interface DiscordChannelCredentials extends DiscordCredentials {
-    /** Custom inbound webhook verifier. When supplied, eve skips the `DISCORD_PUBLIC_KEY` fallback and delegates verification to it. */
-    readonly webhookVerifier?: DiscordWebhookVerifier;
-}
 /** Target accepted by `receive(discord, { target })` for proactive sessions. */
 export interface DiscordReceiveTarget {
     readonly channelId: string;
@@ -91,33 +83,30 @@ export type DiscordCommandResult = {
     readonly title?: string;
 } | null;
 /** Sync or async {@link DiscordCommandResult}. */
-export type DiscordCommandResultOrPromise = DiscordCommandResult | Promise<DiscordCommandResult>;
-/** Result of {@link DiscordChannelConfig.onInputResponse}: `{ auth }` to accept the answer, or `null` to drop it. */
-export type DiscordInputResponseResult = {
+/** Result of {@link DiscordChannelConfig.onAnswers}: `{ auth }` to accept the answer, or `null` to drop it. */
+export type DiscordAnswerResult = {
     readonly auth: SessionAuthContext | null;
 } | null;
 /** A Discord interaction that answers a pending request: a button press, a select, or a modal submission. */
-export type DiscordInputResponseInteraction = DiscordComponentInteraction | DiscordModalSubmitInteraction;
-type DiscordEventHandler<T extends UnstampedMessageStreamEvent["type"]> = (data: EventData<T>, channel: DiscordEventContext, ctx: SessionContext) => void | Promise<void>;
-type DiscordSessionFailedHandler = (data: EventData<"session.failed">, channel: DiscordEventContext) => void | Promise<void>;
-/** Per-event handlers for `discordChannel({ events })`. Supplied handlers override built-in defaults per key; unspecified events keep their defaults. `session.failed` receives only `(data, channel)` and exposes the ID as `data.sessionId`; every other handler also gets the session `ctx`. */
+export type DiscordAnswerInteraction = DiscordComponentInteraction | DiscordModalSubmitInteraction;
+type DiscordEventHandler<T extends SessionEvent["type"]> = (event: ChannelEventOf<T>, ctx: ChannelEventContext<DiscordEventContext>) => void | Promise<void>;
+/**
+ * Per-event handlers for `discordChannel({ events })`. Supplied handlers override built-in
+ * defaults per key; unspecified events keep their defaults. Each handler receives the event and
+ * a `ctx` whose `channel` is the Discord context.
+ */
 export interface DiscordChannelEvents {
     readonly "turn.started"?: DiscordEventHandler<"turn.started">;
-    readonly "actions.requested"?: DiscordEventHandler<"actions.requested">;
-    readonly "action.partial"?: DiscordEventHandler<"action.partial">;
-    readonly "action.result"?: DiscordEventHandler<"action.result">;
-    readonly "message.completed"?: DiscordEventHandler<"message.completed">;
-    readonly "message.appended"?: DiscordEventHandler<"message.appended">;
-    readonly "input.requested"?: DiscordEventHandler<"input.requested">;
-    readonly "input.resolved"?: DiscordEventHandler<"input.resolved">;
-    readonly "turn.failed"?: DiscordEventHandler<"turn.failed">;
-    readonly "turn.completed"?: DiscordEventHandler<"turn.completed">;
-    readonly "turn.cancelled"?: DiscordEventHandler<"turn.cancelled">;
-    readonly "session.failed"?: DiscordSessionFailedHandler;
-    readonly "session.completed"?: DiscordEventHandler<"session.completed">;
-    readonly "session.waiting"?: DiscordEventHandler<"session.waiting">;
-    readonly "authorization.required"?: DiscordEventHandler<"authorization.required">;
-    readonly "authorization.completed"?: DiscordEventHandler<"authorization.completed">;
+    readonly "call.requested"?: DiscordEventHandler<"call.requested">;
+    readonly "call.progress"?: DiscordEventHandler<"call.progress">;
+    readonly "call.settled"?: DiscordEventHandler<"call.settled">;
+    readonly "content.completed"?: DiscordEventHandler<"content.completed">;
+    readonly "content.delta"?: DiscordEventHandler<"content.delta">;
+    readonly "interaction.opened"?: DiscordEventHandler<"interaction.opened">;
+    readonly "interaction.settled"?: DiscordEventHandler<"interaction.settled">;
+    readonly "turn.settled"?: DiscordEventHandler<"turn.settled">;
+    readonly "session.ended"?: DiscordEventHandler<"session.ended">;
+    readonly "delivery.settled"?: DiscordEventHandler<"delivery.settled">;
 }
 /** Configuration for {@link discordChannel}. */
 export interface DiscordChannelConfig {
@@ -128,16 +117,16 @@ export interface DiscordChannelConfig {
     /** Policy for accepted messages that arrive while a turn is active. */
     readonly turnPolicy?: TurnPolicy;
     /** Inbound command hook. Defaults to user-scoped Discord auth and dispatch. Return `{ auth }` to dispatch, or `null` to acknowledge without running the agent. */
-    onCommand?(ctx: DiscordContext, interaction: DiscordCommandInteraction): DiscordCommandResultOrPromise;
+    onCommand?(ctx: DiscordContext, interaction: DiscordCommandInteraction): DiscordCommandResult | Promise<DiscordCommandResult>;
     /**
      * Authorizes a button press, select, or modal submission before it answers a
      * pending request. Return `{ auth }` to accept the answer, or `null` to drop
      * it and keep the request pending. Thrown errors are logged and drop the
      * answer. Defaults to the interacting user's Discord auth. With a custom
-     * `onCommand` and no `onInputResponse`, every answer is dropped: set it to
+     * `onCommand` and no `onAnswers`, every answer is dropped: set it to
      * give a person's answers the same principal, and gating, as their commands.
      */
-    onInputResponse?(ctx: DiscordInputResponseContext, interaction: DiscordInputResponseInteraction): DiscordInputResponseResult | Promise<DiscordInputResponseResult>;
+    onAnswers?(ctx: DiscordAnswerContext, interaction: DiscordAnswerInteraction): DiscordAnswerResult | Promise<DiscordAnswerResult>;
     /**
      * Accepts ordinary messages (DMs, mentions, and thread follow-ups) that a
      * relay forwards from the Discord Gateway, such as `experimental_runDiscordGatewayRelay`
@@ -186,4 +175,3 @@ export interface DiscordChannel extends Channel<DiscordChannelState, DiscordRece
  * and, with `gateway`, ordinary messages forwarded from the Discord Gateway.
  */
 export declare function discordChannel(config?: DiscordChannelConfig): DiscordChannel;
-export {};

package/dist/src/public/channels/discord/discordChannel.js

@@ -1 +1 @@
-import{discordAudience,discordInstrumentationMetadata}from"./audience.js";import{createLogger,logError}from"#internal/logging.js";import{readNonEmptyString}from"#shared/guards.js";import{parseJsonObject}from"#shared/json.js";import{POST,defineChannel}from"#public/definitions/channel.js";import{INACTIVE_REQUEST_NOTICE,respondOrRetireInactivePrompt}from"#channel/inactive-prompt.js";import"#public/channels/discord/verify.js";import{buildFreeformModalResponse,deriveComponentInputResponses,deriveModalInputResponses,isDiscordFreeformComponent}from"#public/channels/discord/hitl.js";import{callDiscordApi,createDiscordFollowupMessage,discordContinuationToken,editDiscordOriginalResponse,resolveDiscordBotToken,sendDiscordChannelMessage,splitDiscordMessageContent,triggerDiscordTypingIndicator}from"#public/channels/discord/api.js";import{answerDiscordAuthorizationReveal,readDiscordAuthorizationReveal}from"#public/channels/discord/authorization.js";import{defaultDiscordAuth,defaultEvents,defaultOnCommand,editDiscordResolvedPrompt}from"#public/channels/discord/defaults.js";import{DISCORD_EPHEMERAL_MESSAGE_FLAG,DISCORD_INTERACTION_RESPONSE_TYPE,DISCORD_INTERACTION_TYPE,commandInteractionMessage,formatDiscordContextBlock,parseDiscordInteraction}from"#public/channels/discord/inbound.js";import{discordDeferredJson,discordJson,discordJsonBody,readMessageContent}from"#public/channels/discord/responses.js";import{createDiscordGatewayRoute}from"#public/channels/discord/messages.js";import{verifyDiscordInbound}from"#public/channels/discord/verifyInbound.js";import{createDiscordFetchFile,discordCommandContent}from"#public/channels/discord/attachments.js";const log=createLogger(`discord.channel`);function discordChannel(e={}){let t=e.onCommand??defaultOnCommand,n=e.onInputResponse??(e.onCommand===void 0?acceptAsPresser:dropUnmappedInputResponse),r={...defaultEvents,...e.events};return defineChannel({kindHint:`discord`,turnPolicy:e.turnPolicy,state:initialDiscordState(),metadata:discordInstrumentationMetadata,audience:({state:e})=>e.audience??`unknown`,fetchFile:createDiscordFetchFile(e.api?.fetch),context(t,n){return rebuildDiscordContext(t,n,e)},routes:[POST(e.route??`/eve/v1/discord`,async(r,{from:i,resolveSession:a,waitUntil:o})=>{let s=await verifyDiscordInbound(r,e.credentials);if(s===null)return new Response(`unauthorized`,{status:401});let c;try{c=parseJsonObject(JSON.parse(s))}catch(e){return log.warn(`inbound Discord body is not valid JSON`,{error:e}),discordJson({content:`invalid request`,ephemeral:!0})}if(c.type===DISCORD_INTERACTION_TYPE.PING)return discordJson({type:DISCORD_INTERACTION_RESPONSE_TYPE.PONG});let l=parseDiscordInteraction(c);return l===null?discordJson({content:`Unsupported Discord interaction.`,ephemeral:!0}):handleInteraction({config:e,interaction:l,onCommand:t,onInputResponse:n,from:i,resolveSession:a,waitUntil:o})}),...e.gateway===void 0?[]:[createDiscordGatewayRoute({buildContext:t=>({discord:buildDiscordHandle({config:e,state:t})}),config:e,gateway:e.gateway})]],async receive(t,{from:n}){let r=t.target,i=readNonEmptyString(r.channelId);if(!i)throw Error(`discordChannel().receive requires target.channelId.`);let a=readNonEmptyString(r.conversationId),o=r.initialMessage;if(o!==void 0&&a!==void 0)throw Error("discordChannel().receive: `conversationId` and `initialMessage` are mutually exclusive.");let s=a??``,c=a!==void 0;if(o!==void 0){let t=await buildDiscordHandle({config:e,state:{...initialDiscordState(),channelId:i}}).sendChannelMessage(o);s=t.id,c=t.id.length>0}return n(discordContinuationToken(i,s)).send(t.message,{auth:t.auth,state:{applicationId:null,channelId:i,conversationId:s||null,guildId:null,hasMessageAnchor:c,initialResponseSent:!0,interactionToken:null}})},events:r})}function rebuildDiscordContext(e,t,n){return{discord:buildDiscordHandle({config:n,session:t,state:e}),state:e}}function buildDiscordHandle(e){let t=e.config.api,n=e.state,r=mergeCredentials(e.config.credentials,n);function anchor(t){t.id&&(n.hasMessageAnchor||=(n.conversationId=t.id,!0),n.channelId&&e.session?.continuation?.alias(discordContinuationToken(n.channelId,t.id)))}async function sendViaChannel(e){let i=n.channelId??``;if(!i)throw Error(`discordChannel: missing channel id for outbound message.`);let a=normalizePostInput(e),o=await sendDiscordChannelMessage({apiBaseUrl:t?.apiBaseUrl,body:a,credentials:r,fetch:t?.fetch,channelId:i});return anchor(o),o}async function editOriginal(e){let i=n.interactionToken??``;if(!i)throw Error(`discordChannel: missing interaction token for original response edit.`);let a=normalizePostInput(e),o=await editDiscordOriginalResponse({apiBaseUrl:t?.apiBaseUrl,body:a,credentials:r,fetch:t?.fetch,interactionToken:i});return n.initialResponseSent=!0,anchor(o),o}async function followup(e){let i=n.interactionToken??``;if(!i)throw Error(`discordChannel: missing interaction token for followup message.`);let a=normalizePostInput(e),o=await createDiscordFollowupMessage({apiBaseUrl:t?.apiBaseUrl,body:a,credentials:r,fetch:t?.fetch,interactionToken:i});return anchor(o),o}async function startTyping(){let e=n.channelId??``;if(e)try{await triggerDiscordTypingIndicator({apiBaseUrl:t?.apiBaseUrl,credentials:r,fetch:t?.fetch,channelId:e})}catch(t){logError(log,`Discord typing indicator failed — swallowed`,t,{channelId:e})}}return{applicationId:n.applicationId??void 0,channelId:n.channelId??``,conversationId:n.conversationId??``,guildId:n.guildId??void 0,interactionToken:n.interactionToken??void 0,request(e,n,i){return callDiscordApi({apiBaseUrl:t?.apiBaseUrl,body:n,botToken:i?.botAuth===!0?r.botToken:void 0,fetch:t?.fetch,method:i?.method,path:e})},async post(e){let t=expandPostBodies(normalizePostInput(e)),r;for(let e of t){let t=await postOne({body:e,editOriginal,followup,sendViaChannel,state:n});r===void 0&&(r=t)}return r??{id:``,raw:null}},editOriginalResponse:editOriginal,followup,sendChannelMessage:sendViaChannel,startTyping}}async function postOne(e){if(e.state.interactionToken&&e.state.applicationId)try{return e.state.initialResponseSent?await e.followup(e.body):await e.editOriginal(e.body)}catch(e){log.warn(`Discord interaction-token delivery failed, falling back to channel message`,{error:e})}return e.sendViaChannel(e.body)}async function handleInteraction(e){if(e.interaction.type===DISCORD_INTERACTION_TYPE.MESSAGE_COMPONENT){let t=readDiscordAuthorizationReveal(e.interaction.customId);if(t!==null)return revealAuthorization({...e,interaction:e.interaction,reveal:t})}return e.interaction.type===DISCORD_INTERACTION_TYPE.APPLICATION_COMMAND?handleCommandInteraction({config:e.config,interaction:e.interaction,onCommand:e.onCommand,from:e.from,waitUntil:e.waitUntil}):e.interaction.type===DISCORD_INTERACTION_TYPE.MESSAGE_COMPONENT?handleComponentInteraction({config:e.config,interaction:e.interaction,onInputResponse:e.onInputResponse,from:e.from,waitUntil:e.waitUntil}):handleModalSubmitInteraction({config:e.config,interaction:e.interaction,onInputResponse:e.onInputResponse,from:e.from,waitUntil:e.waitUntil})}async function handleCommandInteraction(e){let t=stateFromInteraction(e.interaction,{conversationId:e.interaction.id,hasMessageAnchor:!1,initialResponseSent:!1}),n={discord:buildDiscordHandle({config:e.config,state:t})},r;try{r=await e.onCommand(n,e.interaction)}catch(e){return log.error(`command handler failed`,{error:e}),discordJson({content:`The Discord command handler failed.`,ephemeral:!0})}return r==null?discordJson({content:`Command ignored.`,ephemeral:!0}):(e.waitUntil(dispatchCommand({interaction:e.interaction,result:r,from:e.from,state:t})),discordDeferredJson(r.ephemeral===!0))}function revealAuthorization(e){return e.waitUntil(answerRevealedAuthorization(e)),discordDeferredJson(!0)}async function answerRevealedAuthorization(e){let{interaction:t}=e,n=stateFromInteraction(t,{conversationId:t.messageId,hasMessageAnchor:!0,initialResponseSent:!1}),r=buildDiscordHandle({config:e.config,state:n}),i=null;try{i=(await e.onInputResponse({defaultAuth:defaultDiscordAuth(t),discord:r},t))?.auth??null}catch(e){log.error(`Discord sign-in press authorization failed`,{error:e})}let a=await answerDiscordAuthorizationReveal({auth:i,resolveSession:()=>e.resolveSession(discordContinuationToken(t.channelId,t.messageId)),reveal:e.reveal});try{await r.editOriginalResponse(a)}catch(e){log.error(`Discord sign-in reply failed`,{error:e})}}function handleComponentInteraction(e){if(isDiscordFreeformComponent(e.interaction.customId)){let t=readMessageContent(e.interaction.raw);return discordJsonBody(buildFreeformModalResponse({customId:e.interaction.customId,prompt:t}))}let t=deriveComponentInputResponses(e.interaction);return t.length>0&&e.waitUntil(dispatchInputResponses({config:e.config,onInputResponse:e.onInputResponse,conversationId:e.interaction.messageId,inputResponses:t,interaction:e.interaction,from:e.from})),discordJsonBody({type:DISCORD_INTERACTION_RESPONSE_TYPE.DEFERRED_UPDATE_MESSAGE})}function handleModalSubmitInteraction(e){let t=deriveModalInputResponses(e.interaction);return t.length>0&&e.waitUntil(dispatchInputResponses({config:e.config,onInputResponse:e.onInputResponse,conversationId:e.interaction.messageId??e.interaction.id,inputResponses:t,interaction:e.interaction,from:e.from})),discordJson({content:`Answer received.`,ephemeral:!0})}async function dispatchCommand(e){let t=discordCommandContent(commandInteractionMessage(e.interaction),e.interaction.attachments),n=formatDiscordContextBlock({applicationId:e.interaction.applicationId,channelId:e.interaction.channelId,commandName:e.interaction.commandName,guildId:e.interaction.guildId,interactionId:e.interaction.id,userId:e.interaction.user.id,username:e.interaction.user.username}),r=e.result.context??[];try{await e.from(discordContinuationToken(e.interaction.channelId,e.interaction.id)).send(t,{auth:e.result.auth,context:[n,...r],history:e.result.history,state:e.state,title:e.result.title})}catch(e){log.error(`command delivery failed`,{error:e})}}async function dispatchInputResponses(e){let t=stateFromInteraction(e.interaction,{conversationId:e.conversationId,hasMessageAnchor:e.conversationId!==e.interaction.id,initialResponseSent:!0}),n=buildDiscordHandle({config:e.config,state:t}),r;try{r=await e.onInputResponse({defaultAuth:defaultDiscordAuth(e.interaction),discord:n},e.interaction)}catch(e){log.error(`input response handler failed`,{error:e});return}if(r===null)return;let{auth:i}=r,a=e.from(discordContinuationToken(e.interaction.channelId,e.conversationId)),o=await respondOrRetireInactivePrompt(()=>a.respond(e.inputResponses,{auth:i}),{retirePrompt:async t=>{let r=e.interaction.messageId,i=readMessageContent(e.interaction.raw);r!==void 0&&i!==void 0&&await editDiscordResolvedPrompt(n,{content:i,messageId:r},t)}},log);o.outcome===`inactive`&&await Promise.all([o.retirement,sendInactiveNotice(n)])}async function sendInactiveNotice(e){try{await e.followup({content:INACTIVE_REQUEST_NOTICE,flags:DISCORD_EPHEMERAL_MESSAGE_FLAG})}catch(e){log.error(`inactive prompt notice failed`,{error:e})}}function acceptAsPresser(e){return{auth:e.defaultAuth}}function dropUnmappedInputResponse(){return log.warn(`dropped a Discord input response: onCommand is customized but onInputResponse is not; set onInputResponse to accept button presses and modal submissions`),null}function stateFromInteraction(e,t){return{audience:discordAudience(e.channelType),directMessage:e.channelType===1,applicationId:e.applicationId,channelId:e.channelId,conversationId:t.conversationId,guildId:e.guildId??null,hasMessageAnchor:t.hasMessageAnchor,initialResponseSent:t.initialResponseSent,interactionToken:e.token}}function initialDiscordState(){return{applicationId:null,channelId:null,conversationId:null,guildId:null,hasMessageAnchor:!1,initialResponseSent:!1,interactionToken:null}}function mergeCredentials(e,t){return{applicationId:t.applicationId??e?.applicationId,botToken:e?.botToken??(()=>resolveDiscordBotToken()),publicKey:e?.publicKey,webhookVerifier:e?.webhookVerifier}}function normalizePostInput(e){return typeof e==`string`?{content:e}:e}function expandPostBodies(e){return typeof e.content==`string`?splitDiscordMessageContent(e.content).map((t,n)=>n===0?{...e,content:t}:{allowed_mentions:e.allowed_mentions,content:t}):[e]}export{discordChannel};
+import{discordAudience,discordInstrumentationMetadata}from"./audience.js";import{createLogger,logError}from"#internal/logging.js";import{readNonEmptyString}from"#shared/guards.js";import{parseJsonObject}from"#shared/json.js";import{POST,defineChannel}from"#public/definitions/channel.js";import{INACTIVE_REQUEST_NOTICE,respondOrRetireInactivePrompt}from"#channel/inactive-prompt.js";import{buildFreeformModalResponse,deriveComponentAnswers,deriveModalAnswers,isDiscordFreeformComponent}from"#public/channels/discord/hitl.js";import{callDiscordApi,createDiscordFollowupMessage,discordContinuationToken,editDiscordOriginalResponse,resolveDiscordBotToken,sendDiscordChannelMessage,splitDiscordMessageContent,triggerDiscordTypingIndicator}from"#public/channels/discord/api.js";import{answerDiscordAuthorizationReveal,readDiscordAuthorizationReveal}from"#public/channels/discord/authorization.js";import{defaultDiscordAuth,defaultEvents,defaultOnCommand,editDiscordResolvedPrompt}from"#public/channels/discord/defaults.js";import{DISCORD_EPHEMERAL_MESSAGE_FLAG,DISCORD_INTERACTION_RESPONSE_TYPE,DISCORD_INTERACTION_TYPE,commandInteractionMessage,formatDiscordContextBlock,parseDiscordInteraction}from"#public/channels/discord/inbound.js";import{discordDeferredJson,discordJson,discordJsonBody,readMessageContent}from"#public/channels/discord/responses.js";import{createDiscordGatewayRoute}from"#public/channels/discord/messages.js";import{verifyDiscordInbound}from"#public/channels/discord/verifyInbound.js";import{createDiscordFetchFile,discordCommandContent}from"#public/channels/discord/attachments.js";const log=createLogger(`discord.channel`);function discordChannel(e={}){let t=e.onCommand??defaultOnCommand,n=e.onAnswers??(e.onCommand===void 0?acceptAsPresser:dropUnmappedAnswer),r={...defaultEvents,...e.events};return defineChannel({turnPolicy:e.turnPolicy,state:initialDiscordState(),metadata:discordInstrumentationMetadata,audience:({state:e})=>e.audience??`unknown`,fetchFile:createDiscordFetchFile(e.api?.fetch),context(t,n){return rebuildDiscordContext(t,n,e)},routes:[POST(e.route??`/eve/v1/discord`,async(r,{from:i,resolveSession:a,waitUntil:o})=>{let s=await verifyDiscordInbound(r,e.credentials);if(s===null)return new Response(`unauthorized`,{status:401});let c;try{c=parseJsonObject(JSON.parse(s))}catch(e){return log.warn(`inbound Discord body is not valid JSON`,{error:e}),discordJson({content:`invalid request`,ephemeral:!0})}if(c.type===DISCORD_INTERACTION_TYPE.PING)return discordJson({type:DISCORD_INTERACTION_RESPONSE_TYPE.PONG});let l=parseDiscordInteraction(c);return l===null?discordJson({content:`Unsupported Discord interaction.`,ephemeral:!0}):handleInteraction({config:e,interaction:l,onCommand:t,onAnswers:n,from:i,resolveSession:a,waitUntil:o})}),...e.gateway===void 0?[]:[createDiscordGatewayRoute({buildContext:t=>({discord:buildDiscordHandle({config:e,state:t})}),config:e,gateway:e.gateway})]],async receive(t,{from:n}){let r=t.target,i=readNonEmptyString(r.channelId);if(!i)throw Error(`discordChannel().receive requires target.channelId.`);let a=readNonEmptyString(r.conversationId),o=r.initialMessage;if(o!==void 0&&a!==void 0)throw Error("discordChannel().receive: `conversationId` and `initialMessage` are mutually exclusive.");let s=a??``,c=a!==void 0;if(o!==void 0){let t=await buildDiscordHandle({config:e,state:{...initialDiscordState(),channelId:i}}).sendChannelMessage(o);s=t.id,c=t.id.length>0}return n(discordContinuationToken({channelId:i,conversationId:s})).send(t.message,{auth:t.auth,state:{applicationId:null,channelId:i,conversationId:s||null,guildId:null,hasMessageAnchor:c,initialResponseSent:!0,interactionToken:null}})},events:r})}function rebuildDiscordContext(e,t,n){return{discord:buildDiscordHandle({config:n,session:t,state:e}),state:e}}function buildDiscordHandle(e){let t=e.config.api,n=e.state,r=mergeCredentials(e.config.credentials,n);function anchor(t){t.id&&(n.hasMessageAnchor||=(n.conversationId=t.id,!0),n.channelId&&e.session?.continuation?.alias(discordContinuationToken({channelId:n.channelId,conversationId:t.id})))}async function sendViaChannel(e){let i=n.channelId??``;if(!i)throw Error(`discordChannel: missing channel id for outbound message.`);let a=normalizePostInput(e),o=await sendDiscordChannelMessage({apiBaseUrl:t?.apiBaseUrl,body:a,credentials:r,fetch:t?.fetch,channelId:i});return anchor(o),o}async function editOriginal(e){let i=n.interactionToken??``;if(!i)throw Error(`discordChannel: missing interaction token for original response edit.`);let a=normalizePostInput(e),o=await editDiscordOriginalResponse({apiBaseUrl:t?.apiBaseUrl,body:a,credentials:r,fetch:t?.fetch,interactionToken:i});return n.initialResponseSent=!0,anchor(o),o}async function followup(e){let i=n.interactionToken??``;if(!i)throw Error(`discordChannel: missing interaction token for followup message.`);let a=normalizePostInput(e),o=await createDiscordFollowupMessage({apiBaseUrl:t?.apiBaseUrl,body:a,credentials:r,fetch:t?.fetch,interactionToken:i});return anchor(o),o}async function startTyping(){let e=n.channelId??``;if(e)try{await triggerDiscordTypingIndicator({apiBaseUrl:t?.apiBaseUrl,credentials:r,fetch:t?.fetch,channelId:e})}catch(t){logError(log,`Discord typing indicator failed — swallowed`,t,{channelId:e})}}return{applicationId:n.applicationId??void 0,channelId:n.channelId??``,conversationId:n.conversationId??``,guildId:n.guildId??void 0,interactionToken:n.interactionToken??void 0,request(e,n,i){return callDiscordApi({apiBaseUrl:t?.apiBaseUrl,body:n,botToken:i?.botAuth===!0?r.botToken:void 0,fetch:t?.fetch,method:i?.method,path:e})},async post(e){let t=expandPostBodies(normalizePostInput(e)),r;for(let e of t){let t=await postOne({body:e,editOriginal,followup,sendViaChannel,state:n});r===void 0&&(r=t)}return r??{id:``,raw:null}},editOriginalResponse:editOriginal,followup,sendChannelMessage:sendViaChannel,startTyping}}async function postOne(e){if(e.state.interactionToken&&e.state.applicationId)try{return e.state.initialResponseSent?await e.followup(e.body):await e.editOriginal(e.body)}catch(e){log.warn(`Discord interaction-token delivery failed, falling back to channel message`,{error:e})}return e.sendViaChannel(e.body)}async function handleInteraction(e){if(e.interaction.type===DISCORD_INTERACTION_TYPE.MESSAGE_COMPONENT){let t=readDiscordAuthorizationReveal(e.interaction.customId);if(t!==null)return revealAuthorization({...e,interaction:e.interaction,reveal:t})}return e.interaction.type===DISCORD_INTERACTION_TYPE.APPLICATION_COMMAND?handleCommandInteraction({config:e.config,interaction:e.interaction,onCommand:e.onCommand,from:e.from,waitUntil:e.waitUntil}):e.interaction.type===DISCORD_INTERACTION_TYPE.MESSAGE_COMPONENT?handleComponentInteraction({config:e.config,interaction:e.interaction,onAnswers:e.onAnswers,from:e.from,waitUntil:e.waitUntil}):handleModalSubmitInteraction({config:e.config,interaction:e.interaction,onAnswers:e.onAnswers,from:e.from,waitUntil:e.waitUntil})}async function handleCommandInteraction(e){let t=stateFromInteraction(e.interaction,{conversationId:e.interaction.id,hasMessageAnchor:!1,initialResponseSent:!1}),n={discord:buildDiscordHandle({config:e.config,state:t})},r;try{r=await e.onCommand(n,e.interaction)}catch(e){return log.error(`command handler failed`,{error:e}),discordJson({content:`The Discord command handler failed.`,ephemeral:!0})}return r==null?discordJson({content:`Command ignored.`,ephemeral:!0}):(e.waitUntil(dispatchCommand({interaction:e.interaction,result:r,from:e.from,state:t})),discordDeferredJson(r.ephemeral===!0))}function revealAuthorization(e){return e.waitUntil(answerRevealedAuthorization(e)),discordDeferredJson(!0)}async function answerRevealedAuthorization(e){let{interaction:t}=e,n=stateFromInteraction(t,{conversationId:t.messageId,hasMessageAnchor:!0,initialResponseSent:!1}),r=buildDiscordHandle({config:e.config,state:n}),i=null;try{i=(await e.onAnswers({defaultAuth:defaultDiscordAuth(t),discord:r},t))?.auth??null}catch(e){log.error(`Discord sign-in press authorization failed`,{error:e})}let a=await answerDiscordAuthorizationReveal({auth:i,resolveSession:()=>e.resolveSession(discordContinuationToken({channelId:t.channelId,conversationId:t.messageId})),reveal:e.reveal});try{await r.editOriginalResponse(a)}catch(e){log.error(`Discord sign-in reply failed`,{error:e})}}function handleComponentInteraction(e){if(isDiscordFreeformComponent(e.interaction.customId)){let t=readMessageContent(e.interaction.raw);return discordJsonBody(buildFreeformModalResponse({customId:e.interaction.customId,prompt:t}))}let t=deriveComponentAnswers(e.interaction);return t.length>0&&e.waitUntil(dispatchAnswers({config:e.config,onAnswers:e.onAnswers,conversationId:e.interaction.messageId,answers:t,interaction:e.interaction,from:e.from})),discordJsonBody({type:DISCORD_INTERACTION_RESPONSE_TYPE.DEFERRED_UPDATE_MESSAGE})}function handleModalSubmitInteraction(e){let t=deriveModalAnswers(e.interaction);return t.length>0&&e.waitUntil(dispatchAnswers({config:e.config,onAnswers:e.onAnswers,conversationId:e.interaction.messageId??e.interaction.id,answers:t,interaction:e.interaction,from:e.from})),discordJson({content:`Answer received.`,ephemeral:!0})}async function dispatchCommand(e){let t=discordCommandContent(commandInteractionMessage(e.interaction),e.interaction.attachments),n=formatDiscordContextBlock({applicationId:e.interaction.applicationId,channelId:e.interaction.channelId,commandName:e.interaction.commandName,guildId:e.interaction.guildId,interactionId:e.interaction.id,userId:e.interaction.user.id,username:e.interaction.user.username}),r=e.result.context??[];try{await e.from(discordContinuationToken({channelId:e.interaction.channelId,conversationId:e.interaction.id})).send(t,{auth:e.result.auth,context:[n,...r],history:e.result.history,state:e.state,title:e.result.title})}catch(e){log.error(`command delivery failed`,{error:e})}}async function dispatchAnswers(e){let t=stateFromInteraction(e.interaction,{conversationId:e.conversationId,hasMessageAnchor:e.conversationId!==e.interaction.id,initialResponseSent:!0}),n=buildDiscordHandle({config:e.config,state:t}),r;try{r=await e.onAnswers({defaultAuth:defaultDiscordAuth(e.interaction),discord:n},e.interaction)}catch(e){log.error(`input response handler failed`,{error:e});return}if(r===null)return;let{auth:i}=r,a=e.from(discordContinuationToken({channelId:e.interaction.channelId,conversationId:e.conversationId})),o=await respondOrRetireInactivePrompt(()=>a.respond(e.answers,{auth:i}),{retirePrompt:async t=>{let r=e.interaction.messageId,i=readMessageContent(e.interaction.raw);r!==void 0&&i!==void 0&&await editDiscordResolvedPrompt(n,{content:i,messageId:r},t)}},log);o.outcome===`inactive`&&await Promise.all([o.retirement,sendInactiveNotice(n)])}async function sendInactiveNotice(e){try{await e.followup({content:INACTIVE_REQUEST_NOTICE,flags:DISCORD_EPHEMERAL_MESSAGE_FLAG})}catch(e){log.error(`inactive prompt notice failed`,{error:e})}}function acceptAsPresser(e){return{auth:e.defaultAuth}}function dropUnmappedAnswer(){return log.warn(`dropped a Discord input response: onCommand is customized but onAnswers is not; set onAnswers to accept button presses and modal submissions`),null}function stateFromInteraction(e,t){return{audience:discordAudience(e.channelType),applicationId:e.applicationId,...e.channelType!==void 0&&{channelType:e.channelType},channelId:e.channelId,conversationId:t.conversationId,guildId:e.guildId??null,hasMessageAnchor:t.hasMessageAnchor,initialResponseSent:t.initialResponseSent,interactionToken:e.token}}function initialDiscordState(){return{applicationId:null,channelId:null,conversationId:null,guildId:null,hasMessageAnchor:!1,initialResponseSent:!1,interactionToken:null}}function mergeCredentials(e,t){return{applicationId:t.applicationId??e?.applicationId,botToken:e?.botToken??(()=>resolveDiscordBotToken()),publicKey:e?.publicKey,webhookVerifier:e?.webhookVerifier}}function normalizePostInput(e){return typeof e==`string`?{content:e}:e}function expandPostBodies(e){return typeof e.content==`string`?splitDiscordMessageContent(e.content).map((t,n)=>n===0?{...e,content:t}:{allowed_mentions:e.allowed_mentions,content:t}):[e]}export{discordChannel};

package/dist/src/public/channels/discord/hitl.d.ts

@@ -5,7 +5,8 @@
  * encodes only the request id and, for buttons, the selected option id.
  */
 import { type DiscordComponentInteraction, type DiscordModalSubmitInteraction } from "#public/channels/discord/inbound.js";
-import { type InputRequest, type ValidatedInputResponse } from "#shared/input.js";
+import { type ValidatedAnswer } from "#shared/input.js";
+import type { Interaction } from "#channel/interaction-prompts.js";
 /** Maps Discord component kinds (ACTION_ROW, BUTTON, STRING_SELECT, TEXT_INPUT) to their wire `type` integers used in component payloads. */
 export declare const DISCORD_COMPONENT_TYPE: {
     readonly ACTION_ROW: 1;
@@ -25,7 +26,7 @@ export declare const DISCORD_HITL_FREEFORM_TEXT_INPUT_ID = "eve_freeform_text";
  * else a freeform-answer button when freeform is accepted. Empty array when no
  * control applies.
  */
-export declare function renderInputRequestComponents(request: InputRequest): readonly Readonly<Record<string, unknown>>[];
+export declare function renderInteractionComponents(request: Interaction): readonly Readonly<Record<string, unknown>>[];
 /** Builds a Discord modal response for one freeform HITL request. */
 export declare function buildFreeformModalResponse(input: {
     readonly customId: string;
@@ -38,10 +39,10 @@ export declare function isDiscordFreeformComponent(customId: string): boolean;
  * if the custom id is not an eve HITL id; otherwise one response from the
  * encoded option id (buttons) or the first selected value (selects).
  */
-export declare function deriveComponentInputResponses(interaction: DiscordComponentInteraction): readonly ValidatedInputResponse[];
+export declare function deriveComponentAnswers(interaction: DiscordComponentInteraction): readonly ValidatedAnswer[];
 /**
  * Decodes an eve freeform modal submission into a single text input response.
  * Empty array unless the custom id matches the freeform prefix and the freeform
  * text field is present.
  */
-export declare function deriveModalInputResponses(interaction: DiscordModalSubmitInteraction): readonly ValidatedInputResponse[];
+export declare function deriveModalAnswers(interaction: DiscordModalSubmitInteraction): readonly ValidatedAnswer[];