@jskit-ai/assistant-runtime 0.1.143 → 0.1.145

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/assistant-runtime",
-  "version": "0.1.143",
+  "version": "0.1.145",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -11,15 +11,15 @@
     "./server/actionIds": "./src/server/actionIds.js"
   },
   "dependencies": {
-    "@jskit-ai/assistant-core": "0.1.148",
-    "@jskit-ai/database-runtime": "0.1.172",
+    "@jskit-ai/assistant-core": "0.1.150",
+    "@jskit-ai/database-runtime": "0.1.174",
     "json-rest-schema": "^1.0.17"
   },
   "peerDependencies": {
-    "@jskit-ai/http-runtime": "0.1.170",
-    "@jskit-ai/http-web": "0.1.17",
-    "@jskit-ai/kernel": "0.1.172",
-    "@jskit-ai/shell-web": "0.1.176",
+    "@jskit-ai/http-runtime": "0.1.172",
+    "@jskit-ai/http-web": "0.1.19",
+    "@jskit-ai/kernel": "0.1.174",
+    "@jskit-ai/shell-web": "0.1.178",
     "@tanstack/vue-query": "^5.90.5",
     "vue": "^3.5.13",
     "vuetify": "^4.0.0"

package/src/client/composables/useAssistantRuntime.js

@@ -5,14 +5,12 @@ import { normalizeObject, normalizeRecordId, normalizeText } from "@jskit-ai/ker
 import { buildAssistantApiPath } from "@jskit-ai/assistant-core/shared";
 import {
   ASSISTANT_STREAM_EVENT_TYPES,
-  MAX_HISTORY_MESSAGES,
   MAX_INPUT_CHARS,
   assistantConversationMessagesQueryKey,
   assistantConversationsListQueryKey,
   assistantScopeQueryKey,
   normalizeAssistantStreamEventType,
   normalizeConversationStatus as normalizeAssistantConversationStatus,
-  parseJsonObject,
   toPositiveInteger
 } from "@jskit-ai/assistant-core/shared";
 import {
@@ -23,14 +21,23 @@ import { useShellWebErrorRuntime } from "@jskit-ai/shell-web/client/error";
 import { usePagedCollection } from "@jskit-ai/http-web/client/composables/usePagedCollection";
 import { useSurfaceRouteContext } from "@jskit-ai/shell-web/client/navigation/useSurfaceRouteContext";
 import { resolveAssistantSurfaceConfig } from "../../shared/assistantSurfaces.js";
+import {
+  buildHistory,
+  buildId,
+  interruptPendingToolEvents,
+  mapTranscriptEntriesToAssistantState,
+  normalizeToolName
+} from "../support/assistantRuntimeState.js";
 import { insertTextAtSelection } from "../support/composerInputSupport.js";
+import {
+  loadConversationTranscript,
+  resolveConversationRestorePolicy
+} from "../support/conversationRestoreSupport.js";
 import { useWorkspaceWebScopeSupport } from "../support/workspaceScopeSupport.js";
 
 const DEFAULT_STREAM_TIMEOUT_MS = 120_000;
 const DEFAULT_HISTORY_PAGE_SIZE = 20;
-const DEFAULT_MESSAGES_PAGE_SIZE = 200;
 const DEFAULT_HISTORY_STALE_TIME_MS = 60_000;
-const RESTORE_MESSAGES_PAGE = 1;
 
 function toNonNegativeInteger(value, fallback = 0) {
   const parsed = Number(value);
@@ -78,18 +85,6 @@ function writeStoredActiveConversationId(scope = {}, conversationId) {
   }
 }
 
-function buildId(prefix = "id") {
-  if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
-    return `${prefix}_${crypto.randomUUID()}`;
-  }
-
-  return `${prefix}_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
-}
-
-function normalizeToolName(value) {
-  return normalizeText(value) || "tool";
-}
-
 function normalizeConversationStatus(value) {
   return normalizeAssistantConversationStatus(value, {
     fallback: "unknown"
@@ -110,111 +105,19 @@ function formatConversationStartedAt(value) {
   return date.toLocaleString();
 }
 
-function parseToolResultPayload(value) {
-  return parseJsonObject(value);
-}
-
-function buildHistory(messages) {
-  const normalizedHistory = (Array.isArray(messages) ? messages : [])
-    .filter((message) => {
-      if (!message || typeof message !== "object") {
-        return false;
-      }
-      if (message.kind !== "chat") {
-        return false;
-      }
-      if (message.role !== "user" && message.role !== "assistant") {
-        return false;
-      }
-      if (normalizeText(message.status).toLowerCase() !== "done") {
-        return false;
-      }
-      return Boolean(normalizeText(message.text));
-    })
-    .map((message) => ({
-      role: message.role,
-      content: String(message.text || "").slice(0, MAX_INPUT_CHARS)
-    }));
-
-  return normalizedHistory.slice(-MAX_HISTORY_MESSAGES);
-}
-
-function mapTranscriptEntriesToAssistantState(entries) {
-  const sourceEntries = Array.isArray(entries) ? entries : [];
-  const messages = [];
-  const toolEventsById = new Map();
-
-  function ensureToolEvent(toolCallId, toolName) {
-    const key = normalizeText(toolCallId) || buildId("tool_call");
-    if (toolEventsById.has(key)) {
-      return toolEventsById.get(key);
-    }
-
-    const next = {
-      id: key,
-      name: normalizeToolName(toolName),
-      arguments: "",
-      status: "pending",
-      result: null,
-      error: null
-    };
-    toolEventsById.set(key, next);
-    return next;
-  }
-
-  for (const entry of sourceEntries) {
-    const role = normalizeText(entry?.role).toLowerCase();
-    const kind = normalizeText(entry?.kind).toLowerCase();
-    const metadata = normalizeObject(entry?.metadata);
-    const transcriptId = normalizeRecordId(entry?.id, { fallback: null });
-    const messageId = transcriptId ? `transcript_${transcriptId}` : buildId("transcript");
-
-    if (kind === "chat" && (role === "user" || role === "assistant")) {
-      messages.push({
-        id: messageId,
-        role,
-        kind: "chat",
-        text: entry?.contentText == null ? "" : String(entry.contentText),
-        status: "done"
-      });
-      continue;
-    }
-
-    if (kind === "tool_call") {
-      const toolCallId = normalizeText(metadata.toolCallId) || `tool_call_${messageId}`;
-      const toolName = normalizeToolName(metadata.tool);
-      const toolEvent = ensureToolEvent(toolCallId, toolName);
-      toolEvent.arguments = String(entry?.contentText || "");
-      toolEvent.status = "pending";
-      continue;
-    }
-
-    if (kind === "tool_result") {
-      const parsedResult = parseToolResultPayload(entry?.contentText);
-      const toolCallId = normalizeText(metadata.toolCallId || parsedResult.toolCallId) || `tool_result_${messageId}`;
-      const toolName = normalizeToolName(metadata.tool || parsedResult.tool);
-      const toolEvent = ensureToolEvent(toolCallId, toolName);
-      const failed = parsedResult.ok === false || metadata.ok === false;
-      toolEvent.status = failed ? "failed" : "done";
-      toolEvent.result = failed ? null : parsedResult.result;
-      toolEvent.error = failed ? parsedResult.error || metadata.error || null : null;
-    }
-  }
-
-  return {
-    messages,
-    pendingToolEvents: [...toolEventsById.values()]
-  };
-}
-
 function resolveRuntimePolicy() {
   const appConfig = getClientAppConfig();
   const assistantConfig = normalizeObject(appConfig?.assistant);
+  const conversationRestorePolicy = resolveConversationRestorePolicy({
+    pageSize: assistantConfig.restoreMessagesPageSize,
+    maxEntries: assistantConfig.restoreMessagesMaxEntries
+  });
 
   return Object.freeze({
     timeoutMs: toPositiveInteger(assistantConfig.timeoutMs, DEFAULT_STREAM_TIMEOUT_MS),
     historyPageSize: toPositiveInteger(assistantConfig.historyPageSize, DEFAULT_HISTORY_PAGE_SIZE),
-    restoreMessagesPageSize: toPositiveInteger(assistantConfig.restoreMessagesPageSize, DEFAULT_MESSAGES_PAGE_SIZE),
+    restoreMessagesPageSize: conversationRestorePolicy.pageSize,
+    restoreMessagesMaxEntries: conversationRestorePolicy.maxEntries,
     historyStaleTimeMs: toNonNegativeInteger(assistantConfig.historyStaleTimeMs, DEFAULT_HISTORY_STALE_TIME_MS)
   });
 }
@@ -474,19 +377,23 @@ function useAssistantRuntime({ api = null, surfaceId = "" } = {}) {
     setRuntimeError("");
 
     try {
-      const response = await queryClient.fetchQuery({
-        queryKey: assistantConversationMessagesQueryKey(runtimeScope.value, parsedConversationId, {
-          page: RESTORE_MESSAGES_PAGE,
-          pageSize: runtimePolicy.restoreMessagesPageSize
-        }),
-        queryFn: () =>
-          runtimeApi.getConversationMessages(parsedConversationId, {
-            page: RESTORE_MESSAGES_PAGE,
-            pageSize: runtimePolicy.restoreMessagesPageSize
-          })
+      const transcript = await loadConversationTranscript({
+        pageSize: runtimePolicy.restoreMessagesPageSize,
+        maxEntries: runtimePolicy.restoreMessagesMaxEntries,
+        fetchPage: (page, pageSize) => queryClient.fetchQuery({
+          queryKey: assistantConversationMessagesQueryKey(runtimeScope.value, parsedConversationId, {
+            page,
+            pageSize
+          }),
+          queryFn: () => runtimeApi.getConversationMessages(parsedConversationId, {
+            page,
+            pageSize
+          }),
+          staleTime: runtimePolicy.historyStaleTimeMs
+        })
       });
 
-      const restored = mapTranscriptEntriesToAssistantState(response?.entries);
+      const restored = mapTranscriptEntriesToAssistantState(transcript.entries);
       messages.value = restored.messages;
       pendingToolEvents.value = restored.pendingToolEvents;
       input.value = "";
@@ -724,6 +631,7 @@ function useAssistantRuntime({ api = null, surfaceId = "" } = {}) {
       }
     } finally {
       clearTimeout(streamTimeout);
+      pendingToolEvents.value = interruptPendingToolEvents(pendingToolEvents.value);
       abortController.value = null;
       isStreaming.value = false;
       await invalidateConversationScope();

package/src/client/support/assistantRuntimeState.js

@@ -0,0 +1,140 @@
+import { normalizeObject, normalizeRecordId, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
+import {
+  MAX_HISTORY_MESSAGES,
+  MAX_INPUT_CHARS,
+  parseJsonObject
+} from "@jskit-ai/assistant-core/shared";
+import { isAssistantProgressOnlyText } from "../../shared/assistantResponseText.js";
+
+function buildId(prefix = "id") {
+  if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
+    return `${prefix}_${crypto.randomUUID()}`;
+  }
+
+  return `${prefix}_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
+}
+
+function normalizeToolName(value) {
+  return normalizeText(value) || "tool";
+}
+
+function buildHistory(messages) {
+  const normalizedHistory = (Array.isArray(messages) ? messages : [])
+    .filter((message) => {
+      if (!message || typeof message !== "object") {
+        return false;
+      }
+      if (message.kind !== "chat") {
+        return false;
+      }
+      if (message.role !== "user" && message.role !== "assistant") {
+        return false;
+      }
+      if (normalizeText(message.status).toLowerCase() !== "done") {
+        return false;
+      }
+      const text = normalizeText(message.text);
+      if (!text) {
+        return false;
+      }
+      return message.role !== "assistant" || !isAssistantProgressOnlyText(text);
+    })
+    .map((message) => ({
+      role: message.role,
+      content: String(message.text || "").slice(0, MAX_INPUT_CHARS)
+    }));
+
+  return normalizedHistory.slice(-MAX_HISTORY_MESSAGES);
+}
+
+function interruptPendingToolEvents(toolEvents) {
+  return (Array.isArray(toolEvents) ? toolEvents : []).map((toolEvent) => {
+    if (normalizeText(toolEvent?.status).toLowerCase() !== "pending") {
+      return toolEvent;
+    }
+
+    return {
+      ...toolEvent,
+      status: "interrupted"
+    };
+  });
+}
+
+function mapTranscriptEntriesToAssistantState(entries) {
+  const sourceEntries = Array.isArray(entries) ? entries : [];
+  const messages = [];
+  const toolEventsById = new Map();
+
+  function ensureToolEvent(toolCallId, toolName) {
+    const key = normalizeText(toolCallId) || buildId("tool_call");
+    if (toolEventsById.has(key)) {
+      return toolEventsById.get(key);
+    }
+
+    const next = {
+      id: key,
+      name: normalizeToolName(toolName),
+      arguments: "",
+      status: "pending",
+      result: null,
+      error: null
+    };
+    toolEventsById.set(key, next);
+    return next;
+  }
+
+  for (const entry of sourceEntries) {
+    const role = normalizeText(entry?.role).toLowerCase();
+    const kind = normalizeText(entry?.kind).toLowerCase();
+    const metadata = normalizeObject(entry?.metadata);
+    const transcriptId = normalizeRecordId(entry?.id, { fallback: null });
+    const messageId = transcriptId ? `transcript_${transcriptId}` : buildId("transcript");
+
+    if (kind === "chat" && (role === "user" || role === "assistant")) {
+      const text = entry?.contentText == null ? "" : String(entry.contentText);
+      if (role === "assistant" && isAssistantProgressOnlyText(text)) {
+        continue;
+      }
+
+      messages.push({
+        id: messageId,
+        role,
+        kind: "chat",
+        text,
+        status: "done"
+      });
+      continue;
+    }
+
+    if (kind === "tool_call") {
+      const toolCallId = normalizeText(metadata.toolCallId) || `tool_call_${messageId}`;
+      const toolEvent = ensureToolEvent(toolCallId, metadata.tool);
+      toolEvent.arguments = String(entry?.contentText || "");
+      toolEvent.status = "pending";
+      continue;
+    }
+
+    if (kind === "tool_result") {
+      const parsedResult = parseJsonObject(entry?.contentText);
+      const toolCallId = normalizeText(metadata.toolCallId || parsedResult.toolCallId) || `tool_result_${messageId}`;
+      const toolEvent = ensureToolEvent(toolCallId, metadata.tool || parsedResult.tool);
+      const failed = parsedResult.ok === false || metadata.ok === false;
+      toolEvent.status = failed ? "failed" : "done";
+      toolEvent.result = failed ? null : parsedResult.result;
+      toolEvent.error = failed ? parsedResult.error || metadata.error || null : null;
+    }
+  }
+
+  return {
+    messages,
+    pendingToolEvents: interruptPendingToolEvents([...toolEventsById.values()])
+  };
+}
+
+export {
+  buildHistory,
+  buildId,
+  interruptPendingToolEvents,
+  mapTranscriptEntriesToAssistantState,
+  normalizeToolName
+};

package/src/client/support/conversationRestoreSupport.js

@@ -0,0 +1,75 @@
+import { MAX_MESSAGE_PAGE_SIZE } from "@jskit-ai/assistant-core/shared";
+
+const DEFAULT_RESTORE_MESSAGES_PAGE_SIZE = 200;
+const DEFAULT_RESTORE_MESSAGES_MAX_ENTRIES = 2000;
+const MAX_RESTORE_MESSAGES_MAX_ENTRIES = 5000;
+
+function normalizeBoundedPositiveInteger(value, fallback, maximum) {
+  const parsed = Number(value);
+  if (!Number.isInteger(parsed) || parsed < 1) {
+    return fallback;
+  }
+
+  return Math.min(parsed, maximum);
+}
+
+function normalizeTotalPages(value) {
+  const parsed = Number(value);
+  return Number.isInteger(parsed) && parsed > 0 ? parsed : 1;
+}
+
+function resolveConversationRestorePolicy({ pageSize, maxEntries } = {}) {
+  return Object.freeze({
+    pageSize: normalizeBoundedPositiveInteger(
+      pageSize,
+      DEFAULT_RESTORE_MESSAGES_PAGE_SIZE,
+      MAX_MESSAGE_PAGE_SIZE
+    ),
+    maxEntries: normalizeBoundedPositiveInteger(
+      maxEntries,
+      DEFAULT_RESTORE_MESSAGES_MAX_ENTRIES,
+      MAX_RESTORE_MESSAGES_MAX_ENTRIES
+    )
+  });
+}
+
+async function loadConversationTranscript({
+  fetchPage,
+  pageSize = DEFAULT_RESTORE_MESSAGES_PAGE_SIZE,
+  maxEntries = DEFAULT_RESTORE_MESSAGES_MAX_ENTRIES
+} = {}) {
+  if (typeof fetchPage !== "function") {
+    throw new TypeError("loadConversationTranscript requires fetchPage().");
+  }
+
+  const restorePolicy = resolveConversationRestorePolicy({ pageSize, maxEntries });
+  const normalizedPageSize = restorePolicy.pageSize;
+  const normalizedMaxEntries = restorePolicy.maxEntries;
+  const firstResponse = await fetchPage(1, normalizedPageSize);
+  const totalPages = normalizeTotalPages(firstResponse?.totalPages);
+  const restoredPageCount = Math.max(1, Math.ceil(normalizedMaxEntries / normalizedPageSize));
+  const firstRestoredPage = Math.max(1, totalPages - restoredPageCount + 1);
+  const entries = firstRestoredPage === 1 && Array.isArray(firstResponse?.entries)
+    ? [...firstResponse.entries]
+    : [];
+
+  for (let page = Math.max(2, firstRestoredPage); page <= totalPages; page += 1) {
+    const response = await fetchPage(page, normalizedPageSize);
+    if (Array.isArray(response?.entries)) {
+      entries.push(...response.entries);
+    }
+  }
+
+  return Object.freeze({
+    entries: Object.freeze(entries.slice(-normalizedMaxEntries)),
+    firstRestoredPage,
+    pageSize: normalizedPageSize,
+    totalPages,
+    truncated: firstRestoredPage > 1
+  });
+}
+
+export {
+  loadConversationTranscript,
+  resolveConversationRestorePolicy
+};