@jskit-ai/assistant-core 0.1.31 → 0.1.33

package/package.descriptor.mjs

@@ -1,11 +1,13 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/assistant-core",
-  version: "0.1.31",
+  version: "0.1.33",
   kind: "runtime",
   description: "Reusable assistant client/server/shared primitives without surface-specific routes or settings ownership.",
   dependsOn: [
     "@jskit-ai/http-runtime",
+    "@jskit-ai/resource-core",
+    "@jskit-ai/resource-crud-core",
     "@jskit-ai/users-core"
   ],
   capabilities: {
@@ -45,14 +47,16 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/http-runtime": "0.1.54",
-        "@jskit-ai/kernel": "0.1.55",
-        "@jskit-ai/users-core": "0.1.65",
+        "@jskit-ai/http-runtime": "0.1.56",
+        "@jskit-ai/kernel": "0.1.57",
+        "@jskit-ai/resource-core": "0.1.2",
+        "@jskit-ai/resource-crud-core": "0.1.2",
+        "@jskit-ai/users-core": "0.1.67",
         "@tanstack/vue-query": "^5.90.5",
         "dompurify": "^3.3.3",
+        "json-rest-schema": "1.x.x",
         "marked": "^17.0.4",
         "openai": "^6.22.0",
-        "typebox": "^1.0.81",
         "vuetify": "^4.0.0"
       },
       dev: {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/assistant-core",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -11,15 +11,20 @@
     "./shared": "./src/shared/index.js"
   },
   "dependencies": {
-    "@jskit-ai/database-runtime": "0.1.55",
-    "@jskit-ai/http-runtime": "0.1.54",
-    "@jskit-ai/kernel": "0.1.55",
-    "@jskit-ai/users-core": "0.1.65",
+    "@jskit-ai/database-runtime": "0.1.57",
+    "@jskit-ai/http-runtime": "0.1.56",
+    "@jskit-ai/kernel": "0.1.57",
+    "@jskit-ai/resource-crud-core": "0.1.2",
+    "@jskit-ai/resource-core": "0.1.2",
+    "@jskit-ai/users-core": "0.1.67",
     "@tanstack/vue-query": "^5.90.5",
     "dompurify": "^3.3.3",
+    "json-rest-schema": "1.x.x",
     "marked": "^17.0.4",
     "openai": "^6.22.0",
-    "typebox": "^1.0.81",
     "vuetify": "^4.0.0"
+  },
+  "peerDependencies": {
+    "vue": "^3.5.13"
   }
 }

package/src/server/lib/serviceToolCatalog.js

@@ -3,6 +3,7 @@ import { resolveActionContributors } from "@jskit-ai/kernel/server/actions";
 import { normalizeActionDefinition } from "@jskit-ai/kernel/shared/actions";
 import { normalizeSurfaceId } from "@jskit-ai/kernel/shared/surface/registry";
 import { normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
+import { resolveStructuredSchemaTransportSchema } from "@jskit-ai/kernel/shared/validators";
 import { resolveWorkspaceSlug } from "./resolveWorkspaceSlug.js";
 
 const AUTOMATION_CHANNEL = "automation";
@@ -275,8 +276,14 @@ function resolveActionBackedToolEntries(scope) {
         continue;
       }
 
-      const inputSchema = normalizedAction.inputValidator?.schema || null;
-      const outputSchema = normalizedAction.outputValidator?.schema || null;
+      const inputSchema = resolveStructuredSchemaTransportSchema(normalizedAction.input, {
+        context: `Action definition "${actionId}" input`,
+        defaultMode: "patch"
+      }) || null;
+      const outputSchema = resolveStructuredSchemaTransportSchema(normalizedAction.output, {
+        context: `Action definition "${actionId}" output`,
+        defaultMode: "replace"
+      }) || null;
       if (!inputSchema || !outputSchema) {
         continue;
       }

package/src/shared/assistantResource.js

@@ -1,303 +1,301 @@
-import { Type } from "typebox";
+import { createSchema } from "json-rest-schema";
+import { createCursorListValidator, RECORD_ID_PATTERN } from "@jskit-ai/kernel/shared/validators";
 import {
-  normalizeObjectInput,
-  createCursorListValidator,
-  recordIdSchema,
-  recordIdInputSchema,
-  nullableRecordIdSchema
-} from "@jskit-ai/kernel/shared/validators";
-import { normalizeRecordId, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
-import { normalizeConversationStatus } from "./support/conversationStatus.js";
-import { toPositiveInteger } from "./support/positiveInteger.js";
+  createSchemaDefinition,
+  defineResource
+} from "@jskit-ai/resource-core/shared/resource";
 
 const MAX_INPUT_CHARS = 8000;
 const MAX_HISTORY_MESSAGES = 20;
 const MAX_PAGE_SIZE = 200;
 const MAX_MESSAGE_PAGE_SIZE = 500;
 
-function normalizePaginationValue(value, fallback, max) {
-  const parsed = toPositiveInteger(value, fallback);
-  return Math.max(1, Math.min(max, parsed));
-}
-
-function normalizeChatStreamBody(payload = {}) {
-  const source = normalizeObjectInput(payload);
-  const normalized = {
-    messageId: normalizeText(source.messageId),
-    input: normalizeText(source.input)
-  };
-
-  const conversationId = normalizeRecordId(source.conversationId, { fallback: null });
-  if (conversationId) {
-    normalized.conversationId = conversationId;
+const historyMessageSchema = createSchema({
+  role: {
+    type: "string",
+    required: true,
+    enum: ["user", "assistant"]
+  },
+  content: {
+    type: "string",
+    required: true,
+    minLength: 1,
+    maxLength: MAX_INPUT_CHARS
   }
+});
 
-  const history = Array.isArray(source.history) ? source.history : [];
-  normalized.history = history
-    .slice(0, MAX_HISTORY_MESSAGES)
-    .map((entry) => {
-      const item = normalizeObjectInput(entry);
-      const role = normalizeText(item.role).toLowerCase();
-      if (role !== "user" && role !== "assistant") {
-        return null;
-      }
-
-      const content = normalizeText(item.content);
-      if (!content) {
-        return null;
-      }
-
-      return {
-        role,
-        content: content.slice(0, MAX_INPUT_CHARS)
-      };
-    })
-    .filter(Boolean);
-
-  const clientContext = normalizeObjectInput(source.clientContext);
-  if (Object.keys(clientContext).length > 0) {
-    normalized.clientContext = {
-      locale: normalizeText(clientContext.locale),
-      timezone: normalizeText(clientContext.timezone)
-    };
+const clientContextSchema = createSchema({
+  locale: {
+    type: "string",
+    required: false,
+    maxLength: 64
+  },
+  timezone: {
+    type: "string",
+    required: false,
+    maxLength: 64
   }
+});
 
-  return normalized;
-}
-
-function normalizeConversationsListQuery(payload = {}) {
-  const source = normalizeObjectInput(payload);
-  const status = normalizeConversationStatus(source.status, {
-    fallback: ""
-  });
-  const normalized = {};
-
-  if (Object.hasOwn(source, "cursor")) {
-    normalized.cursor = normalizeRecordId(source.cursor, { fallback: "" });
-  }
-  if (Object.hasOwn(source, "limit")) {
-    normalized.limit = toPositiveInteger(source.limit, 0);
-  }
-  if (status) {
-    normalized.status = status;
+const chatStreamBodySchema = createSchema({
+  messageId: {
+    type: "string",
+    required: true,
+    minLength: 1,
+    maxLength: 128
+  },
+  conversationId: {
+    type: "string",
+    required: false,
+    minLength: 1,
+    pattern: RECORD_ID_PATTERN
+  },
+  input: {
+    type: "string",
+    required: true,
+    minLength: 1,
+    maxLength: MAX_INPUT_CHARS
+  },
+  history: {
+    type: "array",
+    required: false,
+    maxItems: MAX_HISTORY_MESSAGES,
+    items: historyMessageSchema
+  },
+  clientContext: {
+    type: "object",
+    required: false,
+    schema: clientContextSchema
   }
+});
 
-  return normalized;
-}
-
-function normalizeConversationMessagesQuery(payload = {}) {
-  const source = normalizeObjectInput(payload);
-
-  return {
-    page: normalizePaginationValue(source.page, 1, MAX_MESSAGE_PAGE_SIZE),
-    pageSize: normalizePaginationValue(source.pageSize, 200, MAX_MESSAGE_PAGE_SIZE)
-  };
-}
-
-function normalizeConversationMessagesParams(payload = {}) {
-  const source = normalizeObjectInput(payload);
-  return {
-    conversationId: normalizeRecordId(source.conversationId, { fallback: "" })
-  };
-}
-
-function createOptionalPositiveIntegerQuerySchema(max = null) {
-  const numericSchema = max == null
-    ? Type.Integer({ minimum: 1 })
-    : Type.Integer({ minimum: 1, maximum: max });
-
-  return Type.Optional(
-    Type.Union([
-      numericSchema,
-      Type.String({ pattern: "^[1-9][0-9]*$" })
-    ])
-  );
-}
-
-function normalizeConversationRecord(payload = {}) {
-  const source = normalizeObjectInput(payload);
-
-  return {
-    id: normalizeRecordId(source.id, { fallback: "" }),
-    workspaceId: normalizeRecordId(source.workspaceId, { fallback: null }),
-    title: normalizeText(source.title),
-    createdByUserId: normalizeRecordId(source.createdByUserId, { fallback: null }),
-    status: normalizeText(source.status),
-    provider: normalizeText(source.provider),
-    model: normalizeText(source.model),
-    surfaceId: normalizeText(source.surfaceId || source.surfaceSid).toLowerCase(),
-    startedAt: normalizeText(source.startedAt),
-    endedAt: normalizeText(source.endedAt) || null,
-    messageCount: Math.max(0, Number(source.messageCount || 0)),
-    metadata: normalizeObjectInput(source.metadata),
-    createdAt: normalizeText(source.createdAt),
-    updatedAt: normalizeText(source.updatedAt)
-  };
-}
-
-function normalizeConversationMessageRecord(payload = {}) {
-  const source = normalizeObjectInput(payload);
-
-  return {
-    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: normalizeRecordId(source.actorUserId, { fallback: null }),
-    contentText: source.contentText == null ? null : String(source.contentText),
-    metadata: normalizeObjectInput(source.metadata),
-    createdAt: normalizeText(source.createdAt)
-  };
-}
-
-const historyMessageSchema = Type.Object(
-  {
-    role: Type.Union([Type.Literal("user"), Type.Literal("assistant")]),
-    content: Type.String({ minLength: 1, maxLength: MAX_INPUT_CHARS })
+const conversationsListQuerySchema = createSchema({
+  cursor: {
+    type: "id",
+    required: false
   },
-  { additionalProperties: false }
-);
+  limit: {
+    type: "number",
+    required: false,
+    min: 1,
+    max: MAX_PAGE_SIZE
+  },
+  status: {
+    type: "string",
+    required: false,
+    minLength: 1,
+    maxLength: 32
+  }
+});
 
-const chatStreamBodySchema = Type.Object(
-  {
-    messageId: Type.String({ minLength: 1, maxLength: 128 }),
-    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(
-      Type.Object(
-        {
-          locale: Type.Optional(Type.String({ maxLength: 64 })),
-          timezone: Type.Optional(Type.String({ maxLength: 64 }))
-        },
-        { additionalProperties: false }
-      )
-    )
-  },
-  {
-    additionalProperties: false
+const conversationRecordSchema = createSchema({
+  id: {
+    type: "string",
+    required: true,
+    minLength: 1,
+    pattern: RECORD_ID_PATTERN
+  },
+  workspaceId: {
+    type: "string",
+    required: true,
+    nullable: true,
+    minLength: 1,
+    pattern: RECORD_ID_PATTERN
+  },
+  title: {
+    type: "string",
+    required: true
+  },
+  createdByUserId: {
+    type: "string",
+    required: true,
+    nullable: true,
+    minLength: 1,
+    pattern: RECORD_ID_PATTERN
+  },
+  status: {
+    type: "string",
+    required: true
+  },
+  provider: {
+    type: "string",
+    required: true
+  },
+  model: {
+    type: "string",
+    required: true
+  },
+  surfaceId: {
+    type: "string",
+    required: true
+  },
+  startedAt: {
+    type: "string",
+    required: true,
+    minLength: 1
+  },
+  endedAt: {
+    type: "string",
+    required: true,
+    nullable: true,
+    minLength: 1
+  },
+  messageCount: {
+    type: "integer",
+    required: true,
+    min: 0
+  },
+  metadata: {
+    type: "object",
+    required: true,
+    additionalProperties: true
+  },
+  createdAt: {
+    type: "string",
+    required: true,
+    minLength: 1
+  },
+  updatedAt: {
+    type: "string",
+    required: true,
+    minLength: 1
   }
-);
+});
 
-const conversationRecordSchema = Type.Object(
-  {
-    id: recordIdSchema,
-    workspaceId: nullableRecordIdSchema,
-    title: Type.String(),
-    createdByUserId: nullableRecordIdSchema,
-    status: Type.String(),
-    provider: Type.String(),
-    model: Type.String(),
-    surfaceId: Type.String(),
-    startedAt: Type.String({ minLength: 1 }),
-    endedAt: Type.Union([Type.String({ minLength: 1 }), Type.Null()]),
-    messageCount: Type.Integer({ minimum: 0 }),
-    metadata: Type.Record(Type.String(), Type.Unknown()),
-    createdAt: Type.String({ minLength: 1 }),
-    updatedAt: Type.String({ minLength: 1 })
-  },
-  { additionalProperties: false }
-);
+const messageRecordSchema = createSchema({
+  id: {
+    type: "string",
+    required: true,
+    minLength: 1,
+    pattern: RECORD_ID_PATTERN
+  },
+  conversationId: {
+    type: "string",
+    required: true,
+    minLength: 1,
+    pattern: RECORD_ID_PATTERN
+  },
+  workspaceId: {
+    type: "string",
+    required: true,
+    nullable: true,
+    minLength: 1,
+    pattern: RECORD_ID_PATTERN
+  },
+  seq: {
+    type: "integer",
+    required: true,
+    min: 1
+  },
+  role: {
+    type: "string",
+    required: true,
+    minLength: 1
+  },
+  kind: {
+    type: "string",
+    required: true,
+    minLength: 1
+  },
+  clientMessageSid: {
+    type: "string",
+    required: true
+  },
+  actorUserId: {
+    type: "string",
+    required: true,
+    nullable: true,
+    minLength: 1,
+    pattern: RECORD_ID_PATTERN
+  },
+  contentText: {
+    type: "string",
+    required: true,
+    nullable: true
+  },
+  createdAt: {
+    type: "string",
+    required: true,
+    minLength: 1
+  },
+  metadata: {
+    type: "object",
+    required: true,
+    additionalProperties: true
+  }
+});
 
-const conversationRecordValidator = Object.freeze({
-  schema: conversationRecordSchema,
-  normalize: normalizeConversationRecord
+const conversationMessagesParamsSchema = createSchema({
+  conversationId: {
+    type: "id",
+    required: true
+  }
 });
 
-const messageRecordSchema = Type.Object(
-  {
-    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: nullableRecordIdSchema,
-    contentText: Type.Union([Type.String(), Type.Null()]),
-    metadata: Type.Record(Type.String(), Type.Unknown()),
-    createdAt: Type.String({ minLength: 1 })
-  },
-  { additionalProperties: false }
-);
+const conversationMessagesQuerySchema = createSchema({
+  page: {
+    type: "number",
+    required: false,
+    min: 1
+  },
+  pageSize: {
+    type: "number",
+    required: false,
+    min: 1,
+    max: MAX_MESSAGE_PAGE_SIZE
+  }
+});
 
-const paginationProperties = Object.freeze({
-  page: Type.Integer({ minimum: 1 }),
-  pageSize: Type.Integer({ minimum: 1 }),
-  total: Type.Integer({ minimum: 0 }),
-  totalPages: Type.Integer({ minimum: 1 })
+const conversationMessagesListOutputSchema = createSchema({
+  page: {
+    type: "integer",
+    required: true,
+    min: 1
+  },
+  pageSize: {
+    type: "integer",
+    required: true,
+    min: 1
+  },
+  total: {
+    type: "integer",
+    required: true,
+    min: 0
+  },
+  totalPages: {
+    type: "integer",
+    required: true,
+    min: 1
+  },
+  conversation: {
+    type: "object",
+    required: true,
+    schema: conversationRecordSchema
+  },
+  entries: {
+    type: "array",
+    required: true,
+    items: messageRecordSchema
+  }
 });
 
-const assistantResource = Object.freeze({
+const assistantResource = defineResource({
   namespace: "assistant",
   operations: {
     chatStream: {
       method: "POST",
-      bodyValidator: Object.freeze({
-        schema: chatStreamBodySchema,
-        normalize: normalizeChatStreamBody
-      })
+      body: chatStreamBodySchema
     },
     conversationsList: {
       method: "GET",
-      queryValidator: Object.freeze({
-        schema: Type.Object(
-          {
-            cursor: Type.Optional(recordIdInputSchema),
-            limit: createOptionalPositiveIntegerQuerySchema(MAX_PAGE_SIZE),
-            status: Type.Optional(Type.String({ minLength: 1, maxLength: 32 }))
-          },
-          { additionalProperties: false }
-        ),
-        normalize: normalizeConversationsListQuery
-      }),
-      outputValidator: createCursorListValidator(conversationRecordValidator)
+      query: conversationsListQuerySchema,
+      output: createCursorListValidator(createSchemaDefinition(conversationRecordSchema, "replace"))
     },
     conversationMessagesList: {
       method: "GET",
-      paramsValidator: Object.freeze({
-        schema: Type.Object(
-          {
-            conversationId: recordIdInputSchema
-          },
-          { additionalProperties: false }
-        ),
-        normalize: normalizeConversationMessagesParams
-      }),
-      queryValidator: Object.freeze({
-        schema: Type.Object(
-          {
-            page: createOptionalPositiveIntegerQuerySchema(),
-            pageSize: createOptionalPositiveIntegerQuerySchema(MAX_MESSAGE_PAGE_SIZE)
-          },
-          { additionalProperties: false }
-        ),
-        normalize: normalizeConversationMessagesQuery
-      }),
-      outputValidator: Object.freeze({
-        schema: Type.Object(
-          {
-            ...paginationProperties,
-            conversation: conversationRecordSchema,
-            entries: Type.Array(messageRecordSchema)
-          },
-          { additionalProperties: false }
-        ),
-        normalize(payload = {}) {
-          const source = normalizeObjectInput(payload);
-          return {
-            conversation: normalizeConversationRecord(source.conversation),
-            entries: (Array.isArray(source.entries) ? source.entries : []).map(normalizeConversationMessageRecord),
-            page: normalizePaginationValue(source.page, 1, MAX_MESSAGE_PAGE_SIZE),
-            pageSize: normalizePaginationValue(source.pageSize, 200, MAX_MESSAGE_PAGE_SIZE),
-            total: Math.max(0, Number(source.total || 0)),
-            totalPages: Math.max(1, Number(source.totalPages || 1))
-          };
-        }
-      })
+      params: conversationMessagesParamsSchema,
+      query: conversationMessagesQuerySchema,
+      output: conversationMessagesListOutputSchema
     }
   }
 });