@jskit-ai/assistant-core 0.1.5 → 0.1.7

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/assistant-core",
-  version: "0.1.5",
+  version: "0.1.7",
   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.28",
-        "@jskit-ai/kernel": "0.1.29",
-        "@jskit-ai/users-core": "0.1.39",
+        "@jskit-ai/http-runtime": "0.1.30",
+        "@jskit-ai/kernel": "0.1.31",
+        "@jskit-ai/users-core": "0.1.41",
         "@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.5",
+  "version": "0.1.7",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -11,9 +11,9 @@
     "./shared": "./src/shared/index.js"
   },
   "dependencies": {
-    "@jskit-ai/http-runtime": "0.1.28",
-    "@jskit-ai/kernel": "0.1.29",
-    "@jskit-ai/users-core": "0.1.39",
+    "@jskit-ai/http-runtime": "0.1.30",
+    "@jskit-ai/kernel": "0.1.31",
+    "@jskit-ai/users-core": "0.1.41",
     "@tanstack/vue-query": "^5.90.5",
     "dompurify": "^3.3.3",
     "marked": "^17.0.4",

package/src/client/lib/assistantApi.js

@@ -130,6 +130,30 @@ function createAssistantApi({ request, requestStream, resolveBasePath, resolveSu
         appendQueryString(`${basePath}/conversations/${encodedConversationId}/messages`, params.toString()),
         requestHeaders ? { headers: requestHeaders } : {}
       );
+    },
+
+    getSettings() {
+      const basePath = resolveRequiredBasePath(resolveBasePath);
+      const requestHeaders = resolveAssistantRequestHeaders(resolveSurfaceId);
+
+      return request(
+        `${basePath}/settings`,
+        requestHeaders ? { headers: requestHeaders } : {}
+      );
+    },
+
+    updateSettings(payload = {}) {
+      const basePath = resolveRequiredBasePath(resolveBasePath);
+      const requestHeaders = resolveAssistantRequestHeaders(resolveSurfaceId);
+
+      return request(
+        `${basePath}/settings`,
+        {
+          method: "PATCH",
+          ...(requestHeaders ? { headers: requestHeaders } : {}),
+          body: payload
+        }
+      );
     }
   });
 }

package/src/server/lib/serviceToolCatalog.js

@@ -1,6 +1,7 @@
 import { requireAuth } from "@jskit-ai/kernel/server/runtime";
 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 { resolveWorkspaceSlug } from "./resolveWorkspaceSlug.js";
 
@@ -209,6 +210,34 @@ function hasAutomationChannel(action = {}) {
   return channels.some((channel) => normalizeText(channel).toLowerCase() === AUTOMATION_CHANNEL);
 }
 
+function normalizeSurfaceList(value) {
+  const source = Array.isArray(value) ? value : [value];
+  const resolved = [];
+
+  for (const entry of source) {
+    const normalized = normalizeSurfaceId(entry);
+    if (normalized) {
+      resolved.push(normalized);
+    }
+  }
+
+  return Object.freeze(resolved);
+}
+
+function canUseToolOnSurface(entry = {}, context = {}) {
+  const toolSurfaces = Array.isArray(entry.surfaces) ? entry.surfaces : [];
+  if (toolSurfaces.length < 1) {
+    return true;
+  }
+
+  const contextSurfaceId = normalizeSurfaceId(context?.surface);
+  if (!contextSurfaceId) {
+    return true;
+  }
+
+  return toolSurfaces.includes(contextSurfaceId);
+}
+
 function resolveActionBackedToolEntries(scope) {
   if (!scope || typeof scope.has !== "function" || typeof scope.make !== "function") {
     return new Map();
@@ -261,7 +290,8 @@ function resolveActionBackedToolEntries(scope) {
         description: assistantExtension.description || `Run ${actionId}.`,
         inputSchema,
         outputSchema,
-        permission: normalizePermissionSpec(normalizedAction.permission)
+        permission: normalizePermissionSpec(normalizedAction.permission),
+        surfaces: normalizeSurfaceList(normalizedAction.surfaces)
       });
       const existing = entriesByActionId.get(actionKey);
       if (!existing || actionVersion >= Number(existing.actionVersion || 0)) {
@@ -309,7 +339,8 @@ function resolveActionToolEntries(
           parameters: actionEntry.inputSchema,
           outputSchema: actionEntry.outputSchema
         }),
-        permission: actionEntry.permission
+        permission: actionEntry.permission,
+        surfaces: actionEntry.surfaces
       })
     );
   }
@@ -346,6 +377,9 @@ function createServiceToolCatalog(
     const tools = [];
     const byName = new Map();
     for (const entry of resolveOrCreateMethodEntries()) {
+      if (!canUseToolOnSurface(entry, context)) {
+        continue;
+      }
       if (!canInvokeMethod(entry.permission, context)) {
         continue;
       }

package/src/shared/assistantPaths.js

@@ -3,30 +3,38 @@ import { normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
 import { resolveApiBasePath } from "@jskit-ai/users-core/shared/support/usersApiPaths";
 
 const ASSISTANT_API_RELATIVE_PATH = "/assistant";
-const ASSISTANT_SETTINGS_API_RELATIVE_PATH = "/assistant/settings";
+const ASSISTANT_SETTINGS_API_RELATIVE_PATH = "/assistant/:surfaceId/settings";
 const ASSISTANT_WORKSPACE_API_BASE_PATH_TEMPLATE = "/api/w/:workspaceSlug/assistant";
 const ASSISTANT_PUBLIC_API_BASE_PATH = "/api/assistant";
-const ASSISTANT_WORKSPACE_SETTINGS_API_PATH_TEMPLATE = "/api/w/:workspaceSlug/assistant/settings";
-const ASSISTANT_PUBLIC_SETTINGS_API_PATH = "/api/assistant/settings";
+const ASSISTANT_WORKSPACE_SETTINGS_API_PATH_TEMPLATE = "/api/w/:workspaceSlug/assistant/:surfaceId/settings";
+const ASSISTANT_PUBLIC_SETTINGS_API_PATH = "/api/assistant/:surfaceId/settings";
 
-function materializeAssistantPath(basePath = "", workspaceSlug = "", suffix = "/") {
+function materializeAssistantPath(basePath = "", { workspaceSlug = "", surfaceId = "", suffix = "/" } = {}) {
   const normalizedBasePath = String(basePath || "").trim();
   if (!normalizedBasePath) {
     return "";
   }
 
-  const normalizedSuffix = normalizePathname(suffix);
+  let materializedBasePath = normalizedBasePath;
   if (normalizedBasePath.includes(":workspaceSlug")) {
     const normalizedWorkspaceSlug = normalizeText(workspaceSlug).toLowerCase();
     if (!normalizedWorkspaceSlug) {
       return "";
     }
 
-    const materializedBasePath = normalizedBasePath.replace(":workspaceSlug", encodeURIComponent(normalizedWorkspaceSlug));
-    return normalizedSuffix === "/" ? materializedBasePath : `${materializedBasePath}${normalizedSuffix}`;
+    materializedBasePath = normalizedBasePath.replace(":workspaceSlug", encodeURIComponent(normalizedWorkspaceSlug));
+  }
+  if (materializedBasePath.includes(":surfaceId")) {
+    const normalizedSurfaceId = normalizeText(surfaceId).toLowerCase();
+    if (!normalizedSurfaceId) {
+      return "";
+    }
+
+    materializedBasePath = materializedBasePath.replace(":surfaceId", encodeURIComponent(normalizedSurfaceId));
   }
 
-  return normalizedSuffix === "/" ? normalizedBasePath : `${normalizedBasePath}${normalizedSuffix}`;
+  const normalizedSuffix = normalizePathname(suffix);
+  return normalizedSuffix === "/" ? materializedBasePath : `${materializedBasePath}${normalizedSuffix}`;
 }
 
 function resolveAssistantApiBasePath({ requiresWorkspace = false } = {}) {
@@ -48,18 +56,23 @@ function buildAssistantApiPath({ requiresWorkspace = false, workspaceSlug = "",
     resolveAssistantApiBasePath({
       requiresWorkspace
     }),
-    workspaceSlug,
-    suffix
+    {
+      workspaceSlug,
+      suffix
+    }
   );
 }
 
-function buildAssistantSettingsApiPath({ requiresWorkspace = false, workspaceSlug = "", suffix = "/" } = {}) {
+function buildAssistantSettingsApiPath({ requiresWorkspace = false, workspaceSlug = "", surfaceId = "", suffix = "/" } = {}) {
   return materializeAssistantPath(
     resolveAssistantSettingsApiPath({
       requiresWorkspace
     }),
-    workspaceSlug,
-    suffix
+    {
+      workspaceSlug,
+      surfaceId,
+      suffix
+    }
   );
 }
 

package/test/assistantPaths.test.js

@@ -11,8 +11,8 @@ test("assistant path helpers derive workspace and non-workspace API bases from s
   assert.equal(resolveAssistantApiBasePath({ requiresWorkspace: false }), "/api/assistant");
   assert.equal(resolveAssistantApiBasePath({ requiresWorkspace: true }), "/api/w/:workspaceSlug/assistant");
 
-  assert.equal(resolveAssistantSettingsApiPath({ requiresWorkspace: false }), "/api/assistant/settings");
-  assert.equal(resolveAssistantSettingsApiPath({ requiresWorkspace: true }), "/api/w/:workspaceSlug/assistant/settings");
+  assert.equal(resolveAssistantSettingsApiPath({ requiresWorkspace: false }), "/api/assistant/:surfaceId/settings");
+  assert.equal(resolveAssistantSettingsApiPath({ requiresWorkspace: true }), "/api/w/:workspaceSlug/assistant/:surfaceId/settings");
 });
 
 test("assistant path builders materialize workspace-aware and public API paths", () => {
@@ -36,16 +36,17 @@ test("assistant path builders materialize workspace-aware and public API paths",
   assert.equal(
     buildAssistantSettingsApiPath({
       requiresWorkspace: false,
-      suffix: "/"
+      surfaceId: "admin"
     }),
-    "/api/assistant/settings"
+    "/api/assistant/admin/settings"
   );
 
   assert.equal(
     buildAssistantSettingsApiPath({
       requiresWorkspace: true,
-      workspaceSlug: "acme"
+      workspaceSlug: "acme",
+      surfaceId: "admin"
     }),
-    "/api/w/acme/assistant/settings"
+    "/api/w/acme/assistant/admin/settings"
   );
 });

package/test/serviceToolCatalog.test.js

@@ -1233,3 +1233,82 @@ test("service tool catalog executes action-backed tools with object payloads", a
     }
   });
 });
+
+test("service tool catalog hides automation actions from other surfaces", () => {
+  const app = createApp();
+  const actionRuntimeProvider = new ActionRuntimeServiceProvider();
+  actionRuntimeProvider.register(app);
+
+  app.actions([
+    {
+      id: "demo.admin.list",
+      domain: "demo",
+      version: 1,
+      kind: "query",
+      channels: ["automation"],
+      surfaces: ["admin"],
+      permission: {
+        require: "authenticated"
+      },
+      inputValidator: {
+        schema: Type.Object({}, { additionalProperties: false })
+      },
+      outputValidator: {
+        schema: Type.Array(Type.Object({}, { additionalProperties: true }))
+      },
+      idempotency: "none",
+      audit: {
+        actionName: "demo.admin.list"
+      },
+      observability: {},
+      async execute() {
+        return [];
+      }
+    },
+    {
+      id: "demo.console.list",
+      domain: "demo",
+      version: 1,
+      kind: "query",
+      channels: ["automation"],
+      surfaces: ["console"],
+      permission: {
+        require: "authenticated"
+      },
+      inputValidator: {
+        schema: Type.Object({}, { additionalProperties: false })
+      },
+      outputValidator: {
+        schema: Type.Array(Type.Object({}, { additionalProperties: true }))
+      },
+      idempotency: "none",
+      audit: {
+        actionName: "demo.console.list"
+      },
+      observability: {},
+      async execute() {
+        return [];
+      }
+    }
+  ]);
+
+  const catalog = createServiceToolCatalog(app, {
+    skipActionPrefixes: []
+  });
+
+  const adminToolSet = catalog.resolveToolSet({
+    actor: { id: 1 },
+    permissions: [],
+    channel: "internal",
+    surface: "admin"
+  });
+  const consoleToolSet = catalog.resolveToolSet({
+    actor: { id: 1 },
+    permissions: [],
+    channel: "internal",
+    surface: "console"
+  });
+
+  assert.deepEqual(adminToolSet.tools.map((entry) => entry.actionId), ["demo.admin.list"]);
+  assert.deepEqual(consoleToolSet.tools.map((entry) => entry.actionId), ["demo.console.list"]);
+});