@dsh-enhanced/assistant-delivery 0.1.63 → 0.1.64

package/lib/service.js

@@ -67,6 +67,7 @@ const goalOutcomeFeedbackFooter = [
 ].join('\n');
 const goalWakeCompletionNotice = '目标已通过独立验收并完成。';
 const interruptedTurnNotice = '这次请求在执行过程中被中断，当前已停止等待；已有操作的结果尚未确认，因此没有自动重跑。你可以继续发送消息；涉及写入的任务需要先核对现有结果。';
+const timedOutTurnNotice = '这次请求等待超时；已有操作的结果尚未确认，因此不会自动重跑。';
 function isGoalOutcomeFeedbackAuthority(value) {
     return typeof value === 'object' && value !== null
         && typeof value.issueOwnerGoalOutcomeFeedbackTarget === 'function'
@@ -282,6 +283,7 @@ const configSchema = Schema.object({
         })]),
     schedulerEnabled: Schema.boolean().default(true),
     tickIntervalMs: Schema.number().step(1).min(100).default(1_000),
+    agentTaskTimeoutMs: Schema.number().step(1).min(1_000).max(86_400_000).default(1_800_000),
     leaseMs: Schema.number().step(1).min(1_000).default(30_000),
     maxAttempts: Schema.number().step(1).min(1).max(100).default(5),
     maxConcurrency: Schema.number().step(1).min(1).max(100).default(4),
@@ -737,6 +739,24 @@ export class AssistantDeliveryService extends Service {
                     return;
                 this.deliveryStore.recordReceipt(receipt);
             },
+            progressJournal: {
+                begin: async (intent, fingerprint, sequence, showDetails) => this.progressAuthorized(intent)
+                    ? this.deliveryStore.beginProgress(intent, fingerprint, sequence, showDetails) : undefined,
+                get: async (intent, fingerprint) => this.progressAuthorized(intent)
+                    ? this.deliveryStore.getProgress(intent, fingerprint) : undefined,
+                created: async (intent, fingerprint, handle) => this.progressAuthorized(intent)
+                    ? this.deliveryStore.attachProgressHandle(intent, fingerprint, handle) : undefined,
+                advance: async (intent, fingerprint) => this.progressAuthorized(intent)
+                    ? this.deliveryStore.advanceProgress(intent, fingerprint) : undefined,
+                stageTerminal: async (intent, fingerprint) => this.progressAuthorized(intent)
+                    ? this.deliveryStore.stageProgressTerminal(intent, fingerprint) : undefined,
+                delivered: async (intent, fingerprint) => {
+                    if (this.progressAuthorized(intent))
+                        this.deliveryStore.confirmProgressTerminal(intent, fingerprint);
+                },
+                recover: async (channel, account, fingerprint, limit) => this.active
+                    ? this.deliveryStore.recoverProgress(channel, account, fingerprint, limit, (binding, inbox) => this.isInboundAuthorized(binding, inbox.envelope)) : [],
+            },
         });
         const imageMaterializer = new InboundImageMaterializer({
             store: this.deliveryStore,
@@ -782,6 +802,7 @@ export class AssistantDeliveryService extends Service {
                 readOwnerApprovalStatus: agent => this.readOwnerApprovalStatus(agent),
                 provider: config.agentProvider, model: config.agentModel, maxOutputTokens: config.agentMaxOutputTokens,
                 maxAutoContinuationTurns: config.agentMaxAutoContinuationTurns,
+                taskTimeoutMs: config.agentTaskTimeoutMs,
                 goalContinuationTimeoutMs: config.agentGoalContinuationTimeoutMs,
                 maxTextBytes: config.maxTextBytes,
                 prepareForegroundTaskAcceptance: (binding, envelope) => this.prepareForegroundTaskAcceptance(binding, envelope),
@@ -2650,6 +2671,14 @@ export class AssistantDeliveryService extends Service {
         void this.drainDeliveryPresentations();
         return stored;
     }
+    progressAuthorized(intent) {
+        if (!this.active)
+            return false;
+        const inbox = this.deliveryStore.getInboxByProviderEvent(intent.target.conversation.channel, intent.target.conversation.account, intent.eventId);
+        const binding = this.deliveryStore.getBinding(intent.bindingId);
+        return inbox !== undefined && binding !== undefined && inbox.bindingId === binding.id
+            && this.isInboundAuthorized(binding, inbox.envelope);
+    }
     isInboundAuthorized(binding, envelope) {
         if (!this.active)
             return false;
@@ -4124,7 +4153,9 @@ export class AssistantDeliveryService extends Service {
                 const inboxId = key.slice('inbound:'.length, -':interrupted'.length);
                 const inbox = this.deliveryStore.getInbox(inboxId);
                 const binding = this.deliveryStore.getBinding(record.intent.bindingId);
-                if (record.intent.text !== interruptedTurnNotice || inbox === undefined || binding === undefined
+                const expectedNotice = inbox?.failureCode === 'agent-task-timeout'
+                    ? timedOutTurnNotice : interruptedTurnNotice;
+                if (record.intent.text !== expectedNotice || inbox === undefined || binding === undefined
                     || !this.deliveryStore.canSendInterruptedInboxNotice(record)
                     || !this.isInboundAuthorized(binding, inbox.envelope)) {
                     throw new Error('interrupted Inbox authority changed');
@@ -5274,7 +5305,8 @@ export class AssistantDeliveryService extends Service {
             this.interruptedInboxNoticeAfterSequence = inbox.admissionCursor.sequence;
             try {
                 const current = this.deliveryStore.getInbox(inbox.id);
-                if (current?.status !== 'dead_letter' || current.failureCode !== 'dispatch-ambiguous'
+                if (current?.status !== 'dead_letter'
+                    || (current.failureCode !== 'dispatch-ambiguous' && current.failureCode !== 'agent-task-timeout')
                     || current.bindingId === undefined
                     || this.deliveryStore.getDeadLetterResolution({ kind: 'inbox', id: current.id,
                         attemptCount: current.attemptCount }) !== undefined
@@ -5290,7 +5322,8 @@ export class AssistantDeliveryService extends Service {
                     || this.registry.get(binding.conversation.channel, binding.conversation.account) === undefined)
                     continue;
                 this.replyCommand(binding, { idempotencyKey: `inbound:${current.id}:interrupted`,
-                    interruptedInboxId: current.id, replyToEventId: current.eventId, text: interruptedTurnNotice });
+                    interruptedInboxId: current.id, replyToEventId: current.eventId,
+                    text: current.failureCode === 'agent-task-timeout' ? timedOutTurnNotice : interruptedTurnNotice });
             }
             catch (error) {
                 if (!this.active)