@jskit-ai/assistant-core 0.1.7 → 0.1.9

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/assistant-core",
-  version: "0.1.7",
+  version: "0.1.9",
   kind: "runtime",
   description: "Reusable assistant client/server/shared primitives without surface-specific routes or settings ownership.",
   dependsOn: [
@@ -45,9 +45,9 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/http-runtime": "0.1.30",
-        "@jskit-ai/kernel": "0.1.31",
-        "@jskit-ai/users-core": "0.1.41",
+        "@jskit-ai/http-runtime": "0.1.32",
+        "@jskit-ai/kernel": "0.1.33",
+        "@jskit-ai/users-core": "0.1.43",
         "@tanstack/vue-query": "^5.90.5",
         "dompurify": "^3.3.3",
         "marked": "^17.0.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/assistant-core",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -11,9 +11,10 @@
     "./shared": "./src/shared/index.js"
   },
   "dependencies": {
-    "@jskit-ai/http-runtime": "0.1.30",
-    "@jskit-ai/kernel": "0.1.31",
-    "@jskit-ai/users-core": "0.1.41",
+    "@jskit-ai/database-runtime": "0.1.33",
+    "@jskit-ai/http-runtime": "0.1.32",
+    "@jskit-ai/kernel": "0.1.33",
+    "@jskit-ai/users-core": "0.1.43",
     "@tanstack/vue-query": "^5.90.5",
     "dompurify": "^3.3.3",
     "marked": "^17.0.4",

package/src/client/components/AssistantClientElement.vue

@@ -248,6 +248,7 @@ import { computed, nextTick, onActivated, onBeforeUnmount, onMounted, ref, shall
 import { createComponentInteractionEmitter } from "@jskit-ai/kernel/client";
 import {
   normalizeObject,
+  normalizeRecordId,
   normalizeText,
   normalizeOneOf
 } from "@jskit-ai/kernel/shared/support/normalize";
@@ -615,8 +616,8 @@ function resolveConversationActorLabel(conversation) {
     return email;
   }
 
-  const userId = Number(conversation?.createdByUserId);
-  if (Number.isInteger(userId) && userId > 0) {
+  const userId = normalizeRecordId(conversation?.createdByUserId, { fallback: null });
+  if (userId) {
     return `User #${userId}`;
   }
 
@@ -624,7 +625,7 @@ function resolveConversationActorLabel(conversation) {
 }
 
 function conversationSubtitle(conversation) {
-  const id = Number(conversation?.id) || 0;
+  const id = normalizeRecordId(conversation?.id, { fallback: "?" });
   const status = normalizeConversationStatus(conversation?.status);
   const startedAt = formatConversationStartedAt(conversation?.startedAt);
   const messageCount = Number(conversation?.messageCount || 0);

package/src/server/repositories/repositoryPersistenceUtils.js

@@ -1,3 +1,4 @@
+import { resolveInsertedRecordId } from "@jskit-ai/database-runtime/shared";
 import { parseJsonObject } from "../../shared/support/jsonObject.js";
 
 function stringifyJsonObject(value) {
@@ -22,27 +23,7 @@ function toIso(value) {
 }
 
 function resolveInsertedId(insertResult) {
-  if (Array.isArray(insertResult) && insertResult.length > 0) {
-    const first = insertResult[0];
-    if (first && typeof first === "object" && !Array.isArray(first)) {
-      const objectId = Number(first.id);
-      if (Number.isInteger(objectId) && objectId > 0) {
-        return objectId;
-      }
-    }
-
-    const scalarId = Number(first);
-    if (Number.isInteger(scalarId) && scalarId > 0) {
-      return scalarId;
-    }
-  }
-
-  const directId = Number(insertResult);
-  if (Number.isInteger(directId) && directId > 0) {
-    return directId;
-  }
-
-  return 0;
+  return resolveInsertedRecordId(insertResult, { fallback: "" }) || "";
 }
 
 export { parseJsonObject, stringifyJsonObject, toIso, resolveInsertedId };

package/src/shared/assistantResource.js

@@ -1,9 +1,12 @@
 import { Type } from "typebox";
 import {
   normalizeObjectInput,
-  createCursorListValidator
+  createCursorListValidator,
+  recordIdSchema,
+  recordIdInputSchema,
+  nullableRecordIdSchema
 } from "@jskit-ai/kernel/shared/validators";
-import { normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
+import { normalizeRecordId, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
 import { normalizeConversationStatus } from "./support/conversationStatus.js";
 import { toPositiveInteger } from "./support/positiveInteger.js";
 
@@ -24,8 +27,8 @@ function normalizeChatStreamBody(payload = {}) {
     input: normalizeText(source.input)
   };
 
-  const conversationId = toPositiveInteger(source.conversationId, 0);
-  if (conversationId > 0) {
+  const conversationId = normalizeRecordId(source.conversationId, { fallback: null });
+  if (conversationId) {
     normalized.conversationId = conversationId;
   }
 
@@ -70,7 +73,7 @@ function normalizeConversationsListQuery(payload = {}) {
   const normalized = {};
 
   if (Object.hasOwn(source, "cursor")) {
-    normalized.cursor = toPositiveInteger(source.cursor, 0);
+    normalized.cursor = normalizeRecordId(source.cursor, { fallback: "" });
   }
   if (Object.hasOwn(source, "limit")) {
     normalized.limit = toPositiveInteger(source.limit, 0);
@@ -94,7 +97,7 @@ function normalizeConversationMessagesQuery(payload = {}) {
 function normalizeConversationMessagesParams(payload = {}) {
   const source = normalizeObjectInput(payload);
   return {
-    conversationId: toPositiveInteger(source.conversationId, 0)
+    conversationId: normalizeRecordId(source.conversationId, { fallback: "" })
   };
 }
 
@@ -115,10 +118,10 @@ function normalizeConversationRecord(payload = {}) {
   const source = normalizeObjectInput(payload);
 
   return {
-    id: toPositiveInteger(source.id, 0),
-    workspaceId: toPositiveInteger(source.workspaceId, 0) || null,
+    id: normalizeRecordId(source.id, { fallback: "" }),
+    workspaceId: normalizeRecordId(source.workspaceId, { fallback: null }),
     title: normalizeText(source.title),
-    createdByUserId: toPositiveInteger(source.createdByUserId, 0) || null,
+    createdByUserId: normalizeRecordId(source.createdByUserId, { fallback: null }),
     status: normalizeText(source.status),
     provider: normalizeText(source.provider),
     model: normalizeText(source.model),
@@ -136,14 +139,14 @@ function normalizeConversationMessageRecord(payload = {}) {
   const source = normalizeObjectInput(payload);
 
   return {
-    id: toPositiveInteger(source.id, 0),
-    conversationId: toPositiveInteger(source.conversationId, 0),
-    workspaceId: toPositiveInteger(source.workspaceId, 0) || null,
+    id: normalizeRecordId(source.id, { fallback: "" }),
+    conversationId: normalizeRecordId(source.conversationId, { fallback: "" }),
+    workspaceId: normalizeRecordId(source.workspaceId, { fallback: null }),
     seq: toPositiveInteger(source.seq, 0),
     role: normalizeText(source.role),
     kind: normalizeText(source.kind),
     clientMessageSid: normalizeText(source.clientMessageSid),
-    actorUserId: toPositiveInteger(source.actorUserId, 0) || null,
+    actorUserId: normalizeRecordId(source.actorUserId, { fallback: null }),
     contentText: source.contentText == null ? null : String(source.contentText),
     metadata: normalizeObjectInput(source.metadata),
     createdAt: normalizeText(source.createdAt)
@@ -161,7 +164,7 @@ const historyMessageSchema = Type.Object(
 const chatStreamBodySchema = Type.Object(
   {
     messageId: Type.String({ minLength: 1, maxLength: 128 }),
-    conversationId: Type.Optional(Type.Integer({ minimum: 1 })),
+    conversationId: Type.Optional(recordIdInputSchema),
     input: Type.String({ minLength: 1, maxLength: MAX_INPUT_CHARS }),
     history: Type.Optional(Type.Array(historyMessageSchema, { maxItems: MAX_HISTORY_MESSAGES })),
     clientContext: Type.Optional(
@@ -181,10 +184,10 @@ const chatStreamBodySchema = Type.Object(
 
 const conversationRecordSchema = Type.Object(
   {
-    id: Type.Integer({ minimum: 1 }),
-    workspaceId: Type.Union([Type.Integer({ minimum: 1 }), Type.Null()]),
+    id: recordIdSchema,
+    workspaceId: nullableRecordIdSchema,
     title: Type.String(),
-    createdByUserId: Type.Union([Type.Integer({ minimum: 1 }), Type.Null()]),
+    createdByUserId: nullableRecordIdSchema,
     status: Type.String(),
     provider: Type.String(),
     model: Type.String(),
@@ -206,14 +209,14 @@ const conversationRecordValidator = Object.freeze({
 
 const messageRecordSchema = Type.Object(
   {
-    id: Type.Integer({ minimum: 1 }),
-    conversationId: Type.Integer({ minimum: 1 }),
-    workspaceId: Type.Union([Type.Integer({ minimum: 1 }), Type.Null()]),
+    id: recordIdSchema,
+    conversationId: recordIdSchema,
+    workspaceId: nullableRecordIdSchema,
     seq: Type.Integer({ minimum: 1 }),
     role: Type.String({ minLength: 1 }),
     kind: Type.String({ minLength: 1 }),
     clientMessageSid: Type.String(),
-    actorUserId: Type.Union([Type.Integer({ minimum: 1 }), Type.Null()]),
+    actorUserId: nullableRecordIdSchema,
     contentText: Type.Union([Type.String(), Type.Null()]),
     metadata: Type.Record(Type.String(), Type.Unknown()),
     createdAt: Type.String({ minLength: 1 })
@@ -243,7 +246,7 @@ const assistantResource = Object.freeze({
       queryValidator: Object.freeze({
         schema: Type.Object(
           {
-            cursor: createOptionalPositiveIntegerQuerySchema(),
+            cursor: Type.Optional(recordIdInputSchema),
             limit: createOptionalPositiveIntegerQuerySchema(MAX_PAGE_SIZE),
             status: Type.Optional(Type.String({ minLength: 1, maxLength: 32 }))
           },
@@ -258,10 +261,7 @@ const assistantResource = Object.freeze({
       paramsValidator: Object.freeze({
         schema: Type.Object(
           {
-            conversationId: Type.Union([
-              Type.Integer({ minimum: 1 }),
-              Type.String({ pattern: "^[1-9][0-9]*$" })
-            ])
+            conversationId: recordIdInputSchema
           },
           { additionalProperties: false }
         ),

package/src/shared/assistantSettingsResource.js

@@ -1,7 +1,9 @@
 import { Type } from "typebox";
-import { normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
-import { normalizeObjectInput } from "@jskit-ai/kernel/shared/validators";
-import { toPositiveInteger } from "./support/positiveInteger.js";
+import { normalizeText, normalizeRecordId } from "@jskit-ai/kernel/shared/support/normalize";
+import {
+  normalizeObjectInput,
+  nullableRecordIdSchema
+} from "@jskit-ai/kernel/shared/validators";
 
 const MAX_SYSTEM_PROMPT_CHARS = 12_000;
 
@@ -9,7 +11,7 @@ const assistantConfigRecordSchema = Type.Object(
   {
     targetSurfaceId: Type.String({ minLength: 1, maxLength: 64 }),
     scopeKey: Type.String({ minLength: 1, maxLength: 160 }),
-    workspaceId: Type.Union([Type.Integer({ minimum: 1 }), Type.Null()]),
+    workspaceId: nullableRecordIdSchema,
     settings: Type.Object(
       {
         systemPrompt: Type.String({ maxLength: MAX_SYSTEM_PROMPT_CHARS })
@@ -53,7 +55,7 @@ function normalizeConfigRecord(payload = {}) {
   return {
     targetSurfaceId: normalizeText(source.targetSurfaceId).toLowerCase(),
     scopeKey: normalizeText(source.scopeKey),
-    workspaceId: toPositiveInteger(source.workspaceId, 0) || null,
+    workspaceId: normalizeRecordId(source.workspaceId, { fallback: null }),
     settings: {
       systemPrompt: String(settings.systemPrompt || "")
     }

package/src/shared/queryKeys.js

@@ -1,3 +1,5 @@
+import { normalizeRecordId } from "@jskit-ai/kernel/shared/support/normalize";
+
 const ASSISTANT_QUERY_KEY_PREFIX = Object.freeze(["assistant"]);
 
 function normalizeSurfaceId(value) {
@@ -17,10 +19,10 @@ function normalizePositiveInteger(value, fallback) {
   return parsed;
 }
 
-function normalizeScopeKey({ targetSurfaceId = "", workspaceSlug = "", workspaceId = 0 } = {}) {
-  const normalizedWorkspaceId = normalizePositiveInteger(workspaceId, 0);
+function normalizeScopeKey({ targetSurfaceId = "", workspaceSlug = "", workspaceId = null } = {}) {
+  const normalizedWorkspaceId = normalizeRecordId(workspaceId, { fallback: null });
   const normalizedSurfaceId = normalizeSurfaceId(targetSurfaceId);
-  if (normalizedWorkspaceId > 0) {
+  if (normalizedWorkspaceId) {
     return `${normalizedSurfaceId}:workspace:${normalizedWorkspaceId}`;
   }
 
@@ -38,7 +40,7 @@ function normalizeStatus(value) {
 }
 
 function normalizeConversationId(value) {
-  return String(normalizePositiveInteger(value, 0) || "none");
+  return normalizeRecordId(value, { fallback: "none" });
 }
 
 function assistantRootQueryKey() {

package/test/assistantResource.test.js

@@ -14,10 +14,10 @@ test("assistant output schemas accept normalized paginated payloads", () => {
 
   const messagesPayload = {
     conversation: {
-      id: 1,
-      workspaceId: 10,
+      id: "1",
+      workspaceId: "10",
       title: "Conversation",
-      createdByUserId: 7,
+      createdByUserId: "7",
       status: "active",
       provider: "openai",
       model: "gpt-4.1",
@@ -40,10 +40,10 @@ test("assistant output schemas accept normalized paginated payloads", () => {
   assert.equal(Check(conversationMessagesSchema, messagesPayload), true);
 });
 
-test("assistant conversation message params accept numeric path strings and normalize to integer", () => {
+test("assistant conversation message params accept numeric path strings and normalize to record-id strings", () => {
   const paramsValidator = assistantResource.operations.conversationMessagesList.paramsValidator;
   assert.equal(Check(paramsValidator.schema, { conversationId: "2" }), true);
   assert.deepEqual(paramsValidator.normalize({ conversationId: "2" }), {
-    conversationId: 2
+    conversationId: "2"
   });
 });

package/test/queryKeys.test.js

@@ -28,7 +28,10 @@ test("assistant query keys normalize scope and paging", () => {
   ]);
 
   assert.deepEqual(
-    assistantConversationsListQueryKey({ targetSurfaceId: "admin", workspaceId: 9 }, { limit: 10, status: "ACTIVE" }),
+    assistantConversationsListQueryKey(
+      { targetSurfaceId: "admin", workspaceId: "9" },
+      { limit: 10, status: "ACTIVE" }
+    ),
     ["assistant", "admin:workspace:9", "conversations", "list", 10, "active"]
   );