@jskit-ai/assistant-runtime 0.1.168 → 0.1.170

package/fixtures/conversation/vite.config.mjs

@@ -1,3 +1,4 @@
+import { createMemoryTurnRequests } from "../../test/support/memoryTurnRequests.js";
 import { createChatService } from "../../src/server/services/chatService.js";
 import { defineConfig } from "vite";
 import vue from "@vitejs/plugin-vue";
@@ -12,6 +13,7 @@ export default defineConfig({
       const streams = [];
       const requests = [];
       const transcript = [];
+      const turnRequests = createMemoryTurnRequests();
       let realService = false;
       server.middlewares.use(async (req, res, next) => {
         const url = new URL(req.url, "http://fixture");
@@ -58,6 +60,7 @@ export default defineConfig({
             });
             stream.advance = parameters => release(parameters);
             const service = createChatService({
+              turnRequests,
               aiClientFactory: { async resolveClient(_surface, { integrationId }) {
                 return { enabled: true, provider: "fixture", defaultModel: integrationId, supportsAttachments: true,
                   async *createChatCompletionStream({ messages }) {

package/migrations/assistant_turn_requests.cjs

@@ -0,0 +1,20 @@
+exports.up = async function up(knex) {
+  if (await knex.schema.hasTable("assistant_turn_requests")) return;
+  await knex.schema.createTable("assistant_turn_requests", table => {
+    table.bigIncrements("id").primary();
+    table.bigInteger("actor_user_id").unsigned().notNullable().references("id").inTable("users").onDelete("CASCADE");
+    table.string("scope_key", 128).notNullable();
+    table.string("message_sid", 128).notNullable();
+    table.string("claim_token", 36).notNullable();
+    table.text("request_json", "longtext").notNullable();
+    table.text("response_json", "longtext").nullable();
+    table.string("status", 32).notNullable().defaultTo("running");
+    table.timestamp("created_at").notNullable().defaultTo(knex.fn.now());
+    table.timestamp("updated_at").notNullable().defaultTo(knex.fn.now());
+    table.unique(["actor_user_id", "scope_key", "message_sid"], "uq_assistant_turn_request");
+  });
+};
+
+exports.down = async function down(knex) {
+  await knex.schema.dropTableIfExists("assistant_turn_requests");
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/assistant-runtime",
-  "version": "0.1.168",
+  "version": "0.1.170",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -11,15 +11,15 @@
     "./server/actionIds": "./src/server/actionIds.js"
   },
   "dependencies": {
-    "@jskit-ai/assistant-core": "0.1.175",
-    "@jskit-ai/database-runtime": "0.1.197",
+    "@jskit-ai/assistant-core": "0.1.177",
+    "@jskit-ai/database-runtime": "0.1.199",
     "json-rest-schema": "^1.0.17"
   },
   "peerDependencies": {
-    "@jskit-ai/http-runtime": "0.1.195",
-    "@jskit-ai/http-web": "0.1.42",
-    "@jskit-ai/kernel": "0.1.197",
-    "@jskit-ai/shell-web": "0.1.201",
+    "@jskit-ai/http-runtime": "0.1.197",
+    "@jskit-ai/http-web": "0.1.44",
+    "@jskit-ai/kernel": "0.1.199",
+    "@jskit-ai/shell-web": "0.1.203",
     "@tanstack/vue-query": "^5.90.5",
     "vue": "^3.5.13",
     "vuetify": "^4.0.0"
@@ -71,6 +71,9 @@
             },
             {
               "tableName": "assistant_messages"
+            },
+            {
+              "tableName": "assistant_turn_requests"
             }
           ]
         }

package/src/client/components/AssistantSurfaceClientElement.vue

@@ -43,6 +43,7 @@ onMounted(() => {
 const selectedConversation = computed(() => state.conversationHistory.find((entry) => String(entry.id) === state.activeConversationId));
 const turns = computed(() => mapAssistantConversationTurns(state.messages, state.pendingToolEvents, props));
 const adapter = computed(() => ({
+  delivery: runtime.delivery,
   attachments: props.attachments,
   suggestions: props.suggestions,
   goal: props.goal,
@@ -61,6 +62,7 @@ const adapter = computed(() => ({
     turns: turns.value,
     scrollKey: `${state.scopeKey}:${state.activeConversationId || "new"}`,
     loading: state.isRestoringConversation,
+    working: state.isStreaming && !runtime.delivery.state.sending,
     assistantLabel: props.assistantLabel,
     welcomeMessage: state.messages.length || state.isRestoringConversation ? "" : props.welcomeMessage
   },
@@ -79,14 +81,22 @@ const adapter = computed(() => ({
   },
   actions: {
     setDraft(value) { state.input = value; },
-    submit: ({ attachments }) => runtime.actions.sendMessage({
-      attachments,
-      onAccepted: () => props.attachments?.clearAttachments({ accepted: true, attachmentIds: attachments.map(file => file.attachmentId) })
-    }),
+    submit: ({ attachments }) => submitMessage({ attachments }),
+    resend: (messageId) => submitMessage({ retryMessageId: messageId }),
     stop: runtime.actions.cancelStream
   }
 }));
 
+function submitMessage({ attachments = [], retryMessageId = "" }) {
+  const attachmentOwner = props.attachments;
+  const acceptedFiles = retryMessageId ? runtime.delivery.find(retryMessageId)?.payload.displayAttachments || [] : attachments;
+  return runtime.actions.sendMessage({
+    attachments,
+    retryMessageId,
+    onAccepted: () => attachmentOwner?.clearAttachments({ accepted: true, attachmentIds: acceptedFiles.map(file => file.attachmentId) })
+  });
+}
+
 function conversationSubtitle(entry) {
   const details = [runtime.meta.normalizeConversationStatus(entry.status), runtime.meta.formatConversationStartedAt(entry.startedAt), `${Number(entry.messageCount || 0)} messages`];
   if (state.isAdminSurface) {

package/src/client/composables/useAssistantRuntime.js

@@ -2,6 +2,7 @@ import { computed, onScopeDispose, ref, shallowRef, toValue, watch } from "vue";
 import { useQueryClient } from "@tanstack/vue-query";
 import { getClientAppConfig } from "@jskit-ai/kernel/client";
 import { normalizeObject, normalizeRecordId, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
+import { createAssistantMessageDelivery } from "@jskit-ai/assistant-core/client/conversation-delivery";
 import { buildAssistantApiPath } from "@jskit-ai/assistant-core/shared";
 import {
   ASSISTANT_STREAM_EVENT_TYPES,
@@ -153,6 +154,7 @@ function useAssistantRuntime({ api = null, surfaceId = "", integrationId = "" }
   const conversationId = ref(null);
   const abortController = shallowRef(null);
   const isCanceling = ref(false);
+  const delivery = createAssistantMessageDelivery();
   let restoreVersion = 0;
 
   const placementSnapshot = computed(() => normalizeObject(placementContext.value));
@@ -378,6 +380,7 @@ function useAssistantRuntime({ api = null, surfaceId = "", integrationId = "" }
       const restored = mapTranscriptEntriesToAssistantState(transcript.entries);
       conversationId.value = normalizedConversationId;
       writeStoredActiveConversationId(scope, normalizedConversationId);
+      delivery.reset();
       messages.value = restored.messages;
       pendingToolEvents.value = restored.pendingToolEvents;
     } catch (loadError) {
@@ -398,6 +401,7 @@ function useAssistantRuntime({ api = null, surfaceId = "", integrationId = "" }
 
   function clearView() {
     restoreVersion += 1;
+    delivery.reset();
     abortController.value?.abort();
     abortController.value = null;
     messages.value = [];
@@ -425,35 +429,47 @@ function useAssistantRuntime({ api = null, surfaceId = "", integrationId = "" }
     abortController.value.abort();
   }
 
-  async function sendMessage({ attachments = [], onAccepted } = {}) {
-    const normalizedInput = normalizeText(input.value).slice(0, MAX_INPUT_CHARS) || (attachments.length ? "Please review the attached files." : "");
-    if (!normalizedInput || isStreaming.value || isRestoringConversation.value || !hasRuntimeScope.value) {
-      return;
+  async function sendMessage({ attachments = [], onAccepted, retryMessageId = "" } = {}) {
+    if (isStreaming.value || isRestoringConversation.value || !hasRuntimeScope.value) return false;
+    const retry = retryMessageId ? delivery.find(retryMessageId) : null;
+    if (retryMessageId && retry?.status !== "failed") return false;
+    const message = normalizeText(input.value).slice(0, MAX_INPUT_CHARS) || (attachments.length ? "Please review the attached files." : "");
+    const parsedConversationId = normalizeRecordId(conversationId.value, { fallback: null });
+    const payload = retry?.payload || {
+      message,
+      displayAttachments: attachments,
+      request: {
+        input: message,
+        ...(parsedConversationId ? { conversationId: parsedConversationId } : {}),
+        ...(attachments.length ? { attachmentIds: attachments.map(file => file.attachmentId) } : {}),
+        ...(toValue(integrationId) ? { integrationId: toValue(integrationId) } : {}),
+        history: buildHistory(messages.value)
+      }
+    };
+    if (!payload.message) return false;
+    if (!retry) input.value = "";
+    try {
+      return await delivery.send(payload, {
+        messageId: retryMessageId || buildId("message"),
+        deliver(submission) {
+          const admission = Promise.withResolvers();
+          runStream(submission, { onAccepted, admission }).then(
+            () => admission.reject(new Error("Assistant did not confirm this message.")),
+            admission.reject
+          );
+          return admission.promise;
+        }
+      });
+    } catch {
+      // The shared delivery state owns failures before the server accepts a turn.
+      return false;
     }
+  }
 
-    const messageId = buildId("message");
+  async function runStream({ messageId, message: normalizedInput, displayAttachments: attachments, request }, { onAccepted, admission }) {
     const assistantMessageId = buildId("assistant");
-    const history = buildHistory(messages.value);
-    const parsedConversationId = normalizeRecordId(conversationId.value, { fallback: null });
-
-    appendMessage({
-      id: buildId("user"),
-      role: "user",
-      kind: "chat",
-      text: normalizedInput,
-      attachments,
-      status: "done"
-    });
-
-    appendMessage({
-      id: assistantMessageId,
-      role: "assistant",
-      kind: "chat",
-      text: "",
-      status: "streaming"
-    });
-
-    input.value = "";
+    let accepted = false;
+    let admissionError = "";
     setRuntimeError("");
     isStreaming.value = true;
 
@@ -469,14 +485,7 @@ function useAssistantRuntime({ api = null, surfaceId = "", integrationId = "" }
 
     try {
       await runtimeApi.streamChat(
-        {
-          messageId,
-          ...(parsedConversationId ? { conversationId: parsedConversationId } : {}),
-          input: normalizedInput,
-          ...(attachments.length ? { attachmentIds: attachments.map(file => file.attachmentId) } : {}),
-          ...(toValue(integrationId) ? { integrationId: toValue(integrationId) } : {}),
-          history
-        },
+        { ...request, messageId },
         {
           signal: streamAbortController.signal,
           onEvent(event) {
@@ -484,7 +493,14 @@ function useAssistantRuntime({ api = null, surfaceId = "", integrationId = "" }
             const eventType = normalizeAssistantStreamEventType(event?.type, "");
 
             if (eventType === ASSISTANT_STREAM_EVENT_TYPES.META && Object.hasOwn(event || {}, "conversationId")) {
-              onAccepted?.();
+              if (!accepted) {
+                accepted = true;
+                appendMessage({ id: messageId, role: "user", kind: "chat", text: normalizedInput, attachments, status: "done" });
+                appendMessage({ id: assistantMessageId, role: "assistant", kind: "chat", text: "", status: "streaming" });
+                delivery.reconcile([{ user: { messageId } }]);
+                onAccepted?.();
+                admission.resolve(true);
+              }
               conversationId.value = normalizeRecordId(event?.conversationId, { fallback: null });
               writeStoredActiveConversationId(runtimeScope.value, conversationId.value);
               return;
@@ -550,6 +566,10 @@ function useAssistantRuntime({ api = null, surfaceId = "", integrationId = "" }
             }
 
             if (eventType === ASSISTANT_STREAM_EVENT_TYPES.ERROR) {
+              if (!accepted) {
+                admissionError = normalizeText(event?.message) || "Assistant request failed.";
+                return;
+              }
               setRuntimeError(
                 normalizeText(event?.message) || "Assistant request failed.",
                 "assistant.runtime:stream-event-error"
@@ -568,6 +588,7 @@ function useAssistantRuntime({ api = null, surfaceId = "", integrationId = "" }
       );
 
       if (!ownsStream()) return;
+      if (!accepted) throw new Error(admissionError || "Assistant did not confirm this message.");
       if (streamAbortController.signal.aborted) streamDoneStatus = "aborted";
       const assistantMessage = findMessage(assistantMessageId);
       const assistantMessageText = normalizeText(assistantMessage?.text);
@@ -589,6 +610,7 @@ function useAssistantRuntime({ api = null, surfaceId = "", integrationId = "" }
       }
     } catch (streamError) {
       if (!ownsStream()) return;
+      if (!accepted) throw streamError;
       if (String(streamError?.name || "") === "AbortError") {
         updateMessage(assistantMessageId, {
           status: "canceled"
@@ -611,8 +633,10 @@ function useAssistantRuntime({ api = null, surfaceId = "", integrationId = "" }
         abortController.value = null;
         isStreaming.value = false;
         isCanceling.value = false;
-        await invalidateConversationScope();
-        await refreshConversationHistory();
+        if (accepted) {
+          await invalidateConversationScope();
+          await refreshConversationHistory();
+        }
       }
     }
   }
@@ -631,6 +655,7 @@ function useAssistantRuntime({ api = null, surfaceId = "", integrationId = "" }
       normalizeConversationStatus,
       formatConversationStartedAt
     },
+    delivery,
     state: {
       messages,
       input,

package/src/server/AssistantProvider.js

@@ -7,6 +7,7 @@ import { registerRoutes } from "./registerRoutes.js";
 import { createRepository as createAssistantConfigRepository } from "./repositories/assistantConfigRepository.js";
 import { createRepository as createConversationsRepository } from "./repositories/conversationsRepository.js";
 import { createRepository as createMessagesRepository } from "./repositories/messagesRepository.js";
+import { createRepository as createTurnRequestsRepository } from "./repositories/turnRequestsRepository.js";
 import { createService as createAssistantConfigService } from "./services/assistantConfigService.js";
 import { createChatService } from "./services/chatService.js";
 import { createTranscriptService } from "./services/transcriptService.js";
@@ -68,6 +69,7 @@ function createAssistantRuntime({
   const assistantConfigRepository = createAssistantConfigRepository(database.knex);
   const conversationsRepository = createConversationsRepository(database.knex);
   const messagesRepository = createMessagesRepository(database.knex);
+  const turnRequests = createTurnRequestsRepository(database.knex);
   const workspaceScopeSupport = workspaces?.scope || null;
   const aiClientFactory = createAssistantAiClientFactory({ appConfig: config, env, aiConnections });
   const toolCatalog = createSurfaceAwareToolCatalog(actionCatalogue, { appConfig: config });
@@ -79,6 +81,7 @@ function createAssistantRuntime({
   });
   const transcriptService = createTranscriptService({ conversationsRepository, messagesRepository });
   const chatService = createChatService({
+    turnRequests,
     attachments,
     aiClientFactory,
     transcriptService,
@@ -92,7 +95,8 @@ function createAssistantRuntime({
     repositories: Object.freeze({
       config: assistantConfigRepository,
       conversations: conversationsRepository,
-      messages: messagesRepository
+      messages: messagesRepository,
+      turnRequests
     }),
     services: Object.freeze({ chat: chatService, config: configService, transcript: transcriptService }),
     aiClientFactory,

package/src/server/repositories/turnRequestsRepository.js

@@ -0,0 +1,35 @@
+import { randomUUID } from "node:crypto";
+import { assistantRuntimeConfig } from "../../shared/assistantRuntimeConfig.js";
+
+function createRepository(knex) {
+  const table = assistantRuntimeConfig.turnRequestsTable;
+
+  function key(scope, messageId) {
+    return { actor_user_id: scope.actorUserId, scope_key: JSON.stringify([scope.surfaceId, scope.workspaceId]), message_sid: messageId };
+  }
+
+  async function find(scope, messageId) {
+    const row = await knex(table).where(key(scope, messageId)).first();
+    return row ? { id: row.id, token: row.claim_token, request: JSON.parse(row.request_json),
+      response: row.response_json ? JSON.parse(row.response_json) : null, status: row.status } : null;
+  }
+
+  async function claim(scope, request) {
+    const token = randomUUID();
+    await knex(table).insert({ ...key(scope, request.messageId), claim_token: token, request_json: JSON.stringify(request) })
+      .onConflict(["actor_user_id", "scope_key", "message_sid"]).ignore();
+    const record = await find(scope, request.messageId);
+    if (!record) throw new Error("Assistant request could not be recorded.");
+    return { ...record, acquired: record.token === token };
+  }
+
+  async function update(claim, response, status = "running") {
+    const changed = await knex(table).where({ id: claim.id, claim_token: claim.token, status: "running" })
+      .update({ response_json: JSON.stringify(response), status, updated_at: new Date() });
+    if (!changed) throw new Error("Assistant request ownership was lost.");
+  }
+
+  return Object.freeze({ find, claim, update });
+}
+
+export { createRepository };