@dsh-enhanced/assistant-delivery 0.1.3 → 0.1.5

package/lib/service.js

@@ -37,8 +37,6 @@ const configSchema = Schema.object({
     policyRef: Schema.string().min(1).default('owner-dm'),
     agentProvider: Schema.string().min(1).default('deepseek-official'),
     agentModel: Schema.string().min(1).default('deepseek-v4-flash'),
-    toolCapableProviders: Schema.array(Schema.string().pattern(/^[A-Za-z0-9][A-Za-z0-9._-]{0,255}$/u)).default(['deepseek-official']),
-    unknownRouteToolCalls: Schema.union(['allow', 'deny']).default('allow'),
     agentMaxOutputTokens: Schema.number().step(1).min(1).default(8_192),
     modelPickerTtlMs: Schema.number().step(1).min(60_000).max(86_400_000).default(900_000),
     permissionPickerTtlMs: Schema.number().step(1).min(60_000).max(86_400_000).default(900_000),
@@ -51,6 +49,8 @@ function pickerIncludesRoute(picker, route) {
     const model = picker.models.find(candidate => candidate.provider === route.provider && candidate.id === route.model);
     return model !== undefined && (route.reasoningEffort === undefined || model.effortIds.includes(route.reasoningEffort));
 }
+const MODEL_SELECTION_WAIT_POLL_MS = 500;
+const MODEL_SELECTION_WAIT_TIMEOUT_MS = 120_000;
 function isModelSelectionPayload(value) {
     if (value === null || typeof value !== 'object')
         return false;
@@ -58,6 +58,7 @@ function isModelSelectionPayload(value) {
     const principal = payload.principal;
     return typeof payload.callbackEventId === 'string'
         && typeof payload.callbackChatId === 'string'
+        && typeof payload.cardMessageId === 'string'
         && typeof payload.bindingId === 'string'
         && principal !== undefined
         && typeof principal.channel === 'string'
@@ -173,6 +174,7 @@ export class AssistantDeliveryService extends Service {
     conversationTransitions = new Map();
     agentApprovalBindings = new WeakMap();
     toolApprovalControllers = new Set();
+    modelSelectionWaiters = new Map();
     modelSelectionFlight;
     modelSelectionRetryTimer;
     runtime;
@@ -227,11 +229,10 @@ export class AssistantDeliveryService extends Service {
                 workspace: config.defaultWorkspace, agentPreset: config.defaultAgentPreset, policyRef: config.policyRef,
                 getAgentPresets: () => runtimeCtx.get('agentPresets'),
                 provider: config.agentProvider, model: config.agentModel, maxOutputTokens: config.agentMaxOutputTokens,
-                toolCapableProviders: new Set(config.toolCapableProviders),
-                unknownRouteToolCalls: config.unknownRouteToolCalls ?? 'allow',
                 modelPickerTtlMs: config.modelPickerTtlMs,
                 permissionPickerTtlMs: config.permissionPickerTtlMs,
                 getModelSelection: conversation => this.deliveryStore.getModelSelection(conversation),
+                clearStaleModelReasoningEffort: (conversation, expected) => this.deliveryStore.clearStaleModelReasoningEffort({ conversation, expected }),
                 imageMaterializer,
                 isInboundAuthorized: (binding, envelope) => this.isInboundAuthorized(binding, envelope),
                 isPermissionController: (binding, envelope) => this.isPermissionController(binding, envelope),
@@ -277,6 +278,7 @@ export class AssistantDeliveryService extends Service {
             this.start();
         ctx.effect(() => async () => {
             this.active = false;
+            this.cancelModelSelectionWaiters();
             for (const controller of this.toolApprovalControllers) {
                 controller.abort(new Error('assistant-delivery is stopping'));
             }
@@ -439,13 +441,18 @@ export class AssistantDeliveryService extends Service {
             || JSON.stringify(binding.principal) !== JSON.stringify(current.principal)) {
             throw new AssistantDeliveryError('missing-binding', 'model callback principal or chat does not own the active binding');
         }
-        const picker = this.deliveryStore.getModelPicker(input.operationId, input.bindingId);
+        const record = this.deliveryStore.getModelPickerRecord(input.operationId, input.bindingId);
         const expected = {
             revision: input.expectedRevision,
             provider: input.modelProvider,
             model: input.model,
             ...(input.reasoningEffort === undefined ? {} : { reasoningEffort: input.reasoningEffort }),
         };
+        if (record === undefined || !['accepted', 'delivered', 'read'].includes(record.status)
+            || record.providerMessageId !== input.cardMessageId) {
+            throw new AssistantDeliveryError('missing-binding', 'model picker confirmation is unavailable or invalid');
+        }
+        const picker = record.intent.modelPicker;
         if (picker === undefined || !pickerIncludesRoute(picker, expected)) {
             throw new AssistantDeliveryError('missing-binding', 'model picker confirmation is unavailable or invalid');
         }
@@ -457,6 +464,7 @@ export class AssistantDeliveryService extends Service {
         const payload = {
             callbackEventId: input.callbackEventId,
             callbackChatId: input.callbackChatId,
+            cardMessageId: input.cardMessageId,
             bindingId: input.bindingId,
             principal: current.principal,
             provider: input.provider,
@@ -477,6 +485,112 @@ export class AssistantDeliveryService extends Service {
         void this.drainModelSelectionSettlements();
         return { status: 'pending' };
     }
+    async awaitModelSelection(input, signal) {
+        this.assertActive();
+        const expected = {
+            revision: input.expectedRevision,
+            provider: input.modelProvider,
+            model: input.model,
+            ...(input.reasoningEffort === undefined ? {} : { reasoningEffort: input.reasoningEffort }),
+        };
+        const payload = {
+            callbackEventId: input.callbackEventId,
+            callbackChatId: input.callbackChatId,
+            cardMessageId: input.cardMessageId,
+            bindingId: input.bindingId,
+            principal: input.principal,
+            provider: input.provider,
+            modelProvider: input.modelProvider,
+            model: input.model,
+            reasoningEffort: input.reasoningEffort ?? null,
+            expectedRevision: input.expectedRevision,
+        };
+        const read = () => this.deliveryStore.getModelSelectionSettlement({
+            operationId: input.operationId, bindingId: input.bindingId, expected, payload,
+        });
+        const current = read();
+        if (current?.result !== undefined)
+            return current.result;
+        if (current === undefined) {
+            throw new AssistantDeliveryError('missing-binding', 'model selection settlement does not exist');
+        }
+        if (signal.aborted)
+            return undefined;
+        return await new Promise((resolve, reject) => {
+            let settled = false;
+            const finish = (result) => {
+                if (settled)
+                    return;
+                settled = true;
+                if (waiter.pollTimer !== undefined)
+                    clearTimeout(waiter.pollTimer);
+                if (waiter.deadlineTimer !== undefined)
+                    clearTimeout(waiter.deadlineTimer);
+                signal.removeEventListener('abort', waiter.abort);
+                const waiters = this.modelSelectionWaiters.get(input.operationId);
+                waiters?.delete(waiter);
+                if (waiters?.size === 0)
+                    this.modelSelectionWaiters.delete(input.operationId);
+                resolve(result);
+            };
+            const waiter = { abort: () => finish(undefined), resolve: finish };
+            const fail = (error) => {
+                if (settled)
+                    return;
+                settled = true;
+                if (waiter.pollTimer !== undefined)
+                    clearTimeout(waiter.pollTimer);
+                if (waiter.deadlineTimer !== undefined)
+                    clearTimeout(waiter.deadlineTimer);
+                signal.removeEventListener('abort', waiter.abort);
+                const currentWaiters = this.modelSelectionWaiters.get(input.operationId);
+                currentWaiters?.delete(waiter);
+                if (currentWaiters?.size === 0)
+                    this.modelSelectionWaiters.delete(input.operationId);
+                reject(error);
+            };
+            const poll = () => {
+                if (settled)
+                    return;
+                if (signal.aborted || !this.active) {
+                    finish(undefined);
+                    return;
+                }
+                try {
+                    const latest = read();
+                    if (latest?.result !== undefined) {
+                        finish(latest.result);
+                        return;
+                    }
+                    waiter.pollTimer = setTimeout(poll, MODEL_SELECTION_WAIT_POLL_MS);
+                    waiter.pollTimer.unref?.();
+                }
+                catch (error) {
+                    fail(error);
+                }
+            };
+            const waiters = this.modelSelectionWaiters.get(input.operationId) ?? new Set();
+            waiters.add(waiter);
+            this.modelSelectionWaiters.set(input.operationId, waiters);
+            signal.addEventListener('abort', waiter.abort, { once: true });
+            waiter.deadlineTimer = setTimeout(() => finish(undefined), MODEL_SELECTION_WAIT_TIMEOUT_MS);
+            waiter.deadlineTimer.unref?.();
+            try {
+                const raced = read();
+                if (raced?.result !== undefined)
+                    finish(raced.result);
+                else if (signal.aborted || !this.active)
+                    finish(undefined);
+                else {
+                    waiter.pollTimer = setTimeout(poll, MODEL_SELECTION_WAIT_POLL_MS);
+                    waiter.pollTimer.unref?.();
+                }
+            }
+            catch (error) {
+                fail(error);
+            }
+        });
+    }
     advanceModelPickerForCallback(input) {
         this.assertActive();
         const binding = this.deliveryStore.getBinding(input.bindingId);
@@ -486,7 +600,12 @@ export class AssistantDeliveryService extends Service {
             || JSON.stringify(binding.principal) !== JSON.stringify(current.principal)) {
             throw new AssistantDeliveryError('missing-binding', 'model callback principal or chat does not own the active binding');
         }
-        const picker = this.deliveryStore.getModelPicker(input.operationId, input.bindingId);
+        const record = this.deliveryStore.getModelPickerRecord(input.operationId, input.bindingId);
+        if (record === undefined || !['accepted', 'delivered', 'read'].includes(record.status)
+            || record.providerMessageId !== input.cardMessageId) {
+            throw new AssistantDeliveryError('missing-binding', 'model picker catalog or route is unavailable');
+        }
+        const picker = record.intent.modelPicker;
         if (picker === undefined || Date.now() >= picker.expiresAt
             || !pickerIncludesRoute(picker, input.expected) || !pickerIncludesRoute(picker, input.next)) {
             throw new AssistantDeliveryError('missing-binding', 'model picker catalog or route is unavailable');
@@ -507,7 +626,11 @@ export class AssistantDeliveryService extends Service {
             || JSON.stringify(binding.principal) !== JSON.stringify(current.principal)) {
             throw new AssistantDeliveryError('missing-binding', 'model callback principal or chat does not own the active binding');
         }
-        const picker = this.deliveryStore.getModelPicker(input.operationId, input.bindingId);
+        const record = this.deliveryStore.getModelPickerRecord(input.operationId, input.bindingId);
+        if (record === undefined || !['accepted', 'delivered', 'read'].includes(record.status)
+            || record.providerMessageId !== input.cardMessageId)
+            return undefined;
+        const picker = record.intent.modelPicker;
         return picker === undefined || Date.now() >= picker.expiresAt ? undefined : picker;
     }
     async settlePermissionSelection(input) {
@@ -1470,8 +1593,22 @@ export class AssistantDeliveryService extends Service {
             clearTimeout(this.modelSelectionRetryTimer);
         this.timer = undefined;
         this.modelSelectionRetryTimer = undefined;
+        this.cancelModelSelectionWaiters();
         await Promise.all([this.inbound.stop(), this.outbound.stop(), this.modelSelectionFlight]);
     }
+    resolveModelSelectionWaiters(operationId, result) {
+        const waiters = this.modelSelectionWaiters.get(operationId);
+        if (waiters === undefined)
+            return;
+        for (const waiter of waiters)
+            waiter.resolve(result);
+    }
+    cancelModelSelectionWaiters() {
+        for (const waiters of this.modelSelectionWaiters.values()) {
+            for (const waiter of waiters)
+                waiter.resolve(undefined);
+        }
+    }
     drainApprovalDispatches() {
         const cursor = this.deliveryStore.getApprovalDispatchCursor();
         const dispatches = this.policy.listPendingApprovalDispatches(100, cursor.after);
@@ -1553,13 +1690,17 @@ export class AssistantDeliveryService extends Service {
                 return;
             }
             await Promise.allSettled(claims.map(async (claim) => {
-                const finishWithoutReply = (result) => this.deliveryStore.completeModelSelectionSettlement({
-                    operationId: claim.operationId,
-                    payloadHash: claim.payloadHash,
-                    result,
-                    ownerId: this.ownerId,
-                    fencingToken: claim.fencingToken,
-                });
+                const finishWithoutReply = (result) => {
+                    const completed = this.deliveryStore.completeModelSelectionSettlement({
+                        operationId: claim.operationId,
+                        payloadHash: claim.payloadHash,
+                        result,
+                        ownerId: this.ownerId,
+                        fencingToken: claim.fencingToken,
+                    });
+                    this.resolveModelSelectionWaiters(claim.operationId, completed);
+                    return completed;
+                };
                 const payload = claim.payload;
                 if (!isModelSelectionPayload(payload) || payload.bindingId !== claim.bindingId) {
                     finishWithoutReply({ status: 'rejected', reason: 'authorization-revoked' });
@@ -1589,7 +1730,7 @@ export class AssistantDeliveryService extends Service {
                         format: 'plain',
                     });
                     const superseded = { status: 'rejected', reason: 'selection-superseded' };
-                    return this.deliveryStore.completeModelSelectionSettlement({
+                    const completed = this.deliveryStore.completeModelSelectionSettlement({
                         operationId: claim.operationId,
                         payloadHash: claim.payloadHash,
                         result,
@@ -1602,6 +1743,8 @@ export class AssistantDeliveryService extends Service {
                         ownerId: this.ownerId,
                         fencingToken: claim.fencingToken,
                     });
+                    this.resolveModelSelectionWaiters(claim.operationId, completed);
+                    return completed;
                 };
                 const initialBinding = this.deliveryStore.getBinding(claim.bindingId);
                 if (!ownsBinding(initialBinding) || !authorized(initialBinding)) {