@jskit-ai/assistant-runtime 0.1.15 → 0.1.17

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/assistant-runtime",
-  version: "0.1.15",
+  version: "0.1.17",
   kind: "runtime",
   description: "Shared assistant runtime with per-surface assistant registration.",
   dependsOn: [
@@ -10,9 +10,7 @@ export default Object.freeze({
     "@jskit-ai/http-runtime",
     "@jskit-ai/shell-web",
     "@jskit-ai/users-core",
-    "@jskit-ai/users-web",
-    "@jskit-ai/workspaces-core",
-    "@jskit-ai/workspaces-web"
+    "@jskit-ai/users-web"
   ],
   capabilities: {
     provides: ["assistant.runtime"],
@@ -22,9 +20,7 @@ export default Object.freeze({
       "auth.policy",
       "runtime.http-client",
       "users.core",
-      "users.web",
-      "workspaces.core",
-      "workspaces.web"
+      "users.web"
     ]
   },
   runtime: {
@@ -78,15 +74,13 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/assistant-core": "0.1.20",
-        "@jskit-ai/database-runtime": "0.1.44",
-        "@jskit-ai/http-runtime": "0.1.43",
-        "@jskit-ai/kernel": "0.1.44",
-        "@jskit-ai/shell-web": "0.1.43",
-        "@jskit-ai/users-core": "0.1.54",
-        "@jskit-ai/users-web": "0.1.59",
-        "@jskit-ai/workspaces-core": "0.1.20",
-        "@jskit-ai/workspaces-web": "0.1.20",
+        "@jskit-ai/assistant-core": "0.1.22",
+        "@jskit-ai/database-runtime": "0.1.46",
+        "@jskit-ai/http-runtime": "0.1.45",
+        "@jskit-ai/kernel": "0.1.46",
+        "@jskit-ai/shell-web": "0.1.45",
+        "@jskit-ai/users-core": "0.1.56",
+        "@jskit-ai/users-web": "0.1.61",
         "@tanstack/vue-query": "^5.90.5",
         "vuetify": "^4.0.0"
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/assistant-runtime",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "type": "module",
   "exports": {
     "./client": "./src/client/index.js",
@@ -8,15 +8,13 @@
     "./server/actionIds": "./src/server/actionIds.js"
   },
   "dependencies": {
-    "@jskit-ai/assistant-core": "0.1.20",
-    "@jskit-ai/database-runtime": "0.1.44",
-    "@jskit-ai/http-runtime": "0.1.43",
-    "@jskit-ai/kernel": "0.1.44",
-    "@jskit-ai/shell-web": "0.1.43",
-    "@jskit-ai/users-core": "0.1.54",
-    "@jskit-ai/users-web": "0.1.59",
-    "@jskit-ai/workspaces-core": "0.1.20",
-    "@jskit-ai/workspaces-web": "0.1.20",
+    "@jskit-ai/assistant-core": "0.1.22",
+    "@jskit-ai/database-runtime": "0.1.46",
+    "@jskit-ai/http-runtime": "0.1.45",
+    "@jskit-ai/kernel": "0.1.46",
+    "@jskit-ai/shell-web": "0.1.45",
+    "@jskit-ai/users-core": "0.1.56",
+    "@jskit-ai/users-web": "0.1.61",
     "@tanstack/vue-query": "^5.90.5",
     "vuetify": "^4.0.0"
   }

package/src/client/components/AssistantSettingsClientElement.vue

@@ -30,8 +30,9 @@ import { validateOperationSection } from "@jskit-ai/http-runtime/shared/validato
 import { assistantHttpClient, createAssistantApi, AssistantSettingsFormCard } from "@jskit-ai/assistant-core/client";
 import { assistantConfigResource, assistantSettingsQueryKey, buildAssistantApiPath } from "@jskit-ai/assistant-core/shared";
 import { useShellWebErrorRuntime } from "@jskit-ai/shell-web/client/error";
-import { useWorkspaceRouteContext } from "@jskit-ai/workspaces-web/client/composables/useWorkspaceRouteContext";
+import { useSurfaceRouteContext } from "@jskit-ai/users-web/client/composables/useSurfaceRouteContext";
 import { resolveAssistantSurfaceConfig } from "../../shared/assistantSurfaces.js";
+import { useWorkspaceWebScopeSupport } from "../support/workspaceScopeSupport.js";
 
 const props = defineProps({
   targetSurfaceId: {
@@ -51,14 +52,17 @@ const fieldErrors = reactive({
 const errorRuntime = useShellWebErrorRuntime();
 const queryClient = useQueryClient();
 const appConfig = getClientAppConfig();
-const { placementContext, currentSurfaceId, workspaceSlugFromRoute } = useWorkspaceRouteContext();
+const routeContext = useSurfaceRouteContext();
+const workspaceScopeSupport = useWorkspaceWebScopeSupport();
+const { placementContext, currentSurfaceId } = routeContext;
 
 const assistantSurface = computed(() => resolveAssistantSurfaceConfig(appConfig, props.targetSurfaceId));
 const placementSnapshot = computed(() => normalizeObject(placementContext.value));
+const routeScope = computed(() => workspaceScopeSupport.readRouteScope(routeContext));
 const scope = computed(() => {
   const settingsRequiresWorkspace = assistantSurface.value?.settingsSurfaceRequiresWorkspace === true;
   const workspaceSlug = settingsRequiresWorkspace
-    ? normalizeText(workspaceSlugFromRoute.value).toLowerCase()
+    ? normalizeText(routeScope.value.workspaceSlug).toLowerCase()
     : "";
 
   return {
@@ -154,6 +158,10 @@ const loadError = computed(() => {
   }
 
   if (assistantSurface.value?.settingsSurfaceRequiresWorkspace) {
+    if (workspaceScopeSupport.available !== true) {
+      return "Workspace support is not available for this assistant surface.";
+    }
+
     return "Select a workspace to configure assistant settings.";
   }
 

package/src/client/composables/useAssistantRuntime.js

@@ -21,8 +21,9 @@ import {
 } from "@jskit-ai/assistant-core/client";
 import { useShellWebErrorRuntime } from "@jskit-ai/shell-web/client/error";
 import { usePagedCollection } from "@jskit-ai/users-web/client/composables/usePagedCollection";
-import { useWorkspaceRouteContext } from "@jskit-ai/workspaces-web/client/composables/useWorkspaceRouteContext";
+import { useSurfaceRouteContext } from "@jskit-ai/users-web/client/composables/useSurfaceRouteContext";
 import { resolveAssistantSurfaceConfig } from "../../shared/assistantSurfaces.js";
+import { useWorkspaceWebScopeSupport } from "../support/workspaceScopeSupport.js";
 
 const DEFAULT_STREAM_TIMEOUT_MS = 120_000;
 const DEFAULT_HISTORY_PAGE_SIZE = 20;
@@ -234,7 +235,9 @@ function useAssistantRuntime({ api = null, surfaceId = "" } = {}) {
   const runtimePolicy = resolveRuntimePolicy();
   const queryClient = useQueryClient();
   const errorRuntime = useShellWebErrorRuntime();
-  const { placementContext, currentSurfaceId, workspaceSlugFromRoute } = useWorkspaceRouteContext();
+  const routeContext = useSurfaceRouteContext();
+  const workspaceScopeSupport = useWorkspaceWebScopeSupport();
+  const { placementContext, currentSurfaceId } = routeContext;
   const appConfig = getClientAppConfig();
 
   const messages = ref([]);
@@ -250,9 +253,10 @@ function useAssistantRuntime({ api = null, surfaceId = "" } = {}) {
   const assistantSurface = computed(() =>
     resolveAssistantSurfaceConfig(appConfig, surfaceId)
   );
+  const routeScope = computed(() => workspaceScopeSupport.readRouteScope(routeContext));
   const runtimeScope = computed(() => {
     const workspaceSlug = assistantSurface.value?.runtimeSurfaceRequiresWorkspace
-      ? normalizeText(workspaceSlugFromRoute.value).toLowerCase()
+      ? normalizeText(routeScope.value.workspaceSlug).toLowerCase()
       : "";
 
     return {

package/src/client/support/workspaceScopeSupport.js

@@ -0,0 +1,38 @@
+import { inject } from "vue";
+
+const WORKSPACES_WEB_SCOPE_SUPPORT_INJECTION_KEY = "jskit.workspaces.web.scope-support";
+
+const EMPTY_ROUTE_SCOPE = Object.freeze({
+  workspaceSlug: ""
+});
+
+const EMPTY_WORKSPACE_WEB_SCOPE_SUPPORT = Object.freeze({
+  available: false,
+  readRouteScope() {
+    return EMPTY_ROUTE_SCOPE;
+  }
+});
+
+function isWorkspaceWebScopeSupport(value) {
+  return Boolean(value && typeof value.readRouteScope === "function");
+}
+
+function useWorkspaceWebScopeSupport({ required = false } = {}) {
+  const support = inject(WORKSPACES_WEB_SCOPE_SUPPORT_INJECTION_KEY, null);
+  if (isWorkspaceWebScopeSupport(support)) {
+    return support;
+  }
+
+  if (required) {
+    throw new Error("Workspace web scope support is not available in Vue injection context.");
+  }
+
+  return EMPTY_WORKSPACE_WEB_SCOPE_SUPPORT;
+}
+
+export {
+  EMPTY_WORKSPACE_WEB_SCOPE_SUPPORT,
+  WORKSPACES_WEB_SCOPE_SUPPORT_INJECTION_KEY,
+  isWorkspaceWebScopeSupport,
+  useWorkspaceWebScopeSupport
+};

package/src/server/AssistantProvider.js

@@ -12,6 +12,7 @@ import { createChatService } from "./services/chatService.js";
 import { createTranscriptService } from "./services/transcriptService.js";
 import { resolveAssistantAiConfig } from "./support/assistantServerConfig.js";
 import { createSurfaceAwareToolCatalog } from "./support/createSurfaceAwareToolCatalog.js";
+import { resolveWorkspaceServerScopeSupport } from "./support/workspaceScopeSupport.js";
 
 function resolveGlobalAssistantConfig(scope) {
   const appConfig = resolveAppConfig(scope);
@@ -108,7 +109,8 @@ class AssistantProvider {
         createAssistantConfigService({
           assistantConfigRepository: scope.make("assistant.config.repository"),
           consoleService: scope.has("consoleService") ? scope.make("consoleService") : null,
-          resolveAppConfig: resolveCurrentAppConfig
+          resolveAppConfig: resolveCurrentAppConfig,
+          workspaceScopeSupport: resolveWorkspaceServerScopeSupport(scope)
         })
     );
 
@@ -129,7 +131,8 @@ class AssistantProvider {
           transcriptService: scope.make("assistant.transcript.service"),
           serviceToolCatalog: scope.make("assistant.service.tool-catalog"),
           assistantConfigService: scope.make("assistant.config.service"),
-          resolveAppConfig: resolveCurrentAppConfig
+          resolveAppConfig: resolveCurrentAppConfig,
+          workspaceScopeSupport: resolveWorkspaceServerScopeSupport(scope)
         })
     );
 

package/src/server/registerRoutes.js

@@ -2,8 +2,6 @@ import { AppError } from "@jskit-ai/kernel/server/runtime";
 import { resolveAppConfig } from "@jskit-ai/kernel/server/support";
 import { normalizeSurfaceId } from "@jskit-ai/kernel/shared/surface/registry";
 import { withStandardErrorResponses } from "@jskit-ai/http-runtime/shared/validators/errorResponses";
-import { buildWorkspaceInputFromRouteParams } from "@jskit-ai/workspaces-core/server/support/workspaceRouteInput";
-import { workspaceSlugParamsValidator } from "@jskit-ai/workspaces-core/server/validators/routeParamsValidator";
 import {
   assistantConfigResource,
   assistantResource,
@@ -18,17 +16,22 @@ import {
 import { resolveAssistantSurfaceConfig } from "../shared/assistantSurfaces.js";
 import { actionIds } from "./actionIds.js";
 import { assistantSurfaceRouteParamsValidator } from "./inputValidators.js";
+import { resolveWorkspaceServerScopeSupport } from "./support/workspaceScopeSupport.js";
 
-function buildRouteParamsValidator(requiresWorkspace) {
+function buildRouteParamsValidator(requiresWorkspace, workspaceScopeSupport = null) {
   if (requiresWorkspace === true) {
-    return [workspaceSlugParamsValidator, assistantSurfaceRouteParamsValidator];
+    if (!workspaceScopeSupport) {
+      throw new Error("Assistant workspace routes require workspace server scope support.");
+    }
+
+    return [workspaceScopeSupport.paramsValidator, assistantSurfaceRouteParamsValidator];
   }
 
   return assistantSurfaceRouteParamsValidator;
 }
 
-function buildConversationMessagesRouteParamsValidator(requiresWorkspace) {
-  const validators = buildRouteParamsValidator(requiresWorkspace);
+function buildConversationMessagesRouteParamsValidator(requiresWorkspace, workspaceScopeSupport = null) {
+  const validators = buildRouteParamsValidator(requiresWorkspace, workspaceScopeSupport);
   if (Array.isArray(validators)) {
     return validators.concat(assistantResource.operations.conversationMessagesList.paramsValidator);
   }
@@ -36,12 +39,16 @@ function buildConversationMessagesRouteParamsValidator(requiresWorkspace) {
   return [validators, assistantResource.operations.conversationMessagesList.paramsValidator];
 }
 
-function readWorkspaceInput(request, requiresWorkspace) {
+function readWorkspaceInput(request, requiresWorkspace, workspaceScopeSupport = null) {
   if (requiresWorkspace !== true) {
     return {};
   }
 
-  return buildWorkspaceInputFromRouteParams(request?.input?.params);
+  if (!workspaceScopeSupport) {
+    throw new Error("Assistant workspace routes require workspace server scope support.");
+  }
+
+  return workspaceScopeSupport.buildInputFromRouteParams(request?.input?.params);
 }
 
 function requireAssistantSurface(appConfig = {}, targetSurfaceId = "") {
@@ -102,7 +109,15 @@ function sendPreStreamErrorResponse(reply, error) {
   });
 }
 
-function resolveRouteRequestState(request, { resolveCurrentAppConfig = () => ({}), kind = "runtime", requiresWorkspace = false } = {}) {
+function resolveRouteRequestState(
+  request,
+  {
+    resolveCurrentAppConfig = () => ({}),
+    kind = "runtime",
+    requiresWorkspace = false,
+    workspaceScopeSupport = null
+  } = {}
+) {
   const appConfig = resolveCurrentAppConfig();
   const targetSurfaceId = normalizeSurfaceId(request?.input?.params?.surfaceId);
   const assistantSurface = requireAssistantSurface(appConfig, targetSurfaceId);
@@ -126,18 +141,22 @@ function resolveRouteRequestState(request, { resolveCurrentAppConfig = () => ({}
     hostSurfaceId,
     actionInput: Object.freeze({
       targetSurfaceId: assistantSurface.targetSurfaceId,
-      ...readWorkspaceInput(request, requiresWorkspace)
+      ...readWorkspaceInput(request, requiresWorkspace, workspaceScopeSupport)
     })
   });
 }
 
-function registerSettingsRoutes(router, resolveCurrentAppConfig, { requiresWorkspace = false } = {}) {
+function registerSettingsRoutes(
+  router,
+  resolveCurrentAppConfig,
+  { requiresWorkspace = false, workspaceScopeSupport = null } = {}
+) {
   const routeBase = resolveAssistantApiBasePath({
     requiresWorkspace
   });
   const visibility = requiresWorkspace ? "workspace" : "public";
   const routePath = `${routeBase}/:surfaceId/settings`;
-  const paramsValidator = buildRouteParamsValidator(requiresWorkspace);
+  const paramsValidator = buildRouteParamsValidator(requiresWorkspace, workspaceScopeSupport);
 
   router.register(
     "GET",
@@ -158,7 +177,8 @@ function registerSettingsRoutes(router, resolveCurrentAppConfig, { requiresWorks
       const routeState = resolveRouteRequestState(request, {
         resolveCurrentAppConfig,
         kind: "settings",
-        requiresWorkspace
+        requiresWorkspace,
+        workspaceScopeSupport
       });
 
       const response = await request.executeAction({
@@ -198,7 +218,8 @@ function registerSettingsRoutes(router, resolveCurrentAppConfig, { requiresWorks
       const routeState = resolveRouteRequestState(request, {
         resolveCurrentAppConfig,
         kind: "settings",
-        requiresWorkspace
+        requiresWorkspace,
+        workspaceScopeSupport
       });
 
       const response = await request.executeAction({
@@ -217,13 +238,17 @@ function registerSettingsRoutes(router, resolveCurrentAppConfig, { requiresWorks
   );
 }
 
-function registerRuntimeRoutes(router, resolveCurrentAppConfig, { requiresWorkspace = false } = {}) {
+function registerRuntimeRoutes(
+  router,
+  resolveCurrentAppConfig,
+  { requiresWorkspace = false, workspaceScopeSupport = null } = {}
+) {
   const routeBase = resolveAssistantApiBasePath({
     requiresWorkspace
   });
   const visibility = requiresWorkspace ? "workspace" : "public";
   const surfaceRouteBase = `${routeBase}/:surfaceId`;
-  const paramsValidator = buildRouteParamsValidator(requiresWorkspace);
+  const paramsValidator = buildRouteParamsValidator(requiresWorkspace, workspaceScopeSupport);
 
   router.register(
     "POST",
@@ -242,7 +267,8 @@ function registerRuntimeRoutes(router, resolveCurrentAppConfig, { requiresWorksp
       const routeState = resolveRouteRequestState(request, {
         resolveCurrentAppConfig,
         kind: "runtime",
-        requiresWorkspace
+        requiresWorkspace,
+        workspaceScopeSupport
       });
       const abortController = new AbortController();
       const requestBody = request?.input?.body && typeof request.input.body === "object" ? request.input.body : {};
@@ -367,7 +393,8 @@ function registerRuntimeRoutes(router, resolveCurrentAppConfig, { requiresWorksp
       const routeState = resolveRouteRequestState(request, {
         resolveCurrentAppConfig,
         kind: "runtime",
-        requiresWorkspace
+        requiresWorkspace,
+        workspaceScopeSupport
       });
 
       const response = await request.executeAction({
@@ -391,7 +418,7 @@ function registerRuntimeRoutes(router, resolveCurrentAppConfig, { requiresWorksp
     {
       auth: "required",
       visibility,
-      paramsValidator: buildConversationMessagesRouteParamsValidator(requiresWorkspace),
+      paramsValidator: buildConversationMessagesRouteParamsValidator(requiresWorkspace, workspaceScopeSupport),
       meta: {
         tags: ["assistant"],
         summary: "List assistant conversation messages."
@@ -405,7 +432,8 @@ function registerRuntimeRoutes(router, resolveCurrentAppConfig, { requiresWorksp
       const routeState = resolveRouteRequestState(request, {
         resolveCurrentAppConfig,
         kind: "runtime",
-        requiresWorkspace
+        requiresWorkspace,
+        workspaceScopeSupport
       });
 
       const response = await request.executeAction({
@@ -432,19 +460,25 @@ function registerRoutes(app) {
 
   const router = app.make("jskit.http.router");
   const resolveCurrentAppConfig = () => resolveAppConfig(app);
+  const workspaceScopeSupport = resolveWorkspaceServerScopeSupport(app);
 
   registerSettingsRoutes(router, resolveCurrentAppConfig, {
     requiresWorkspace: false
   });
-  registerSettingsRoutes(router, resolveCurrentAppConfig, {
-    requiresWorkspace: true
-  });
   registerRuntimeRoutes(router, resolveCurrentAppConfig, {
     requiresWorkspace: false
   });
-  registerRuntimeRoutes(router, resolveCurrentAppConfig, {
-    requiresWorkspace: true
-  });
+
+  if (workspaceScopeSupport) {
+    registerSettingsRoutes(router, resolveCurrentAppConfig, {
+      requiresWorkspace: true,
+      workspaceScopeSupport
+    });
+    registerRuntimeRoutes(router, resolveCurrentAppConfig, {
+      requiresWorkspace: true,
+      workspaceScopeSupport
+    });
+  }
 }
 
 export { registerRoutes };

package/src/server/services/assistantConfigService.js

@@ -1,9 +1,14 @@
 import { AppError, requireAuth } from "@jskit-ai/kernel/server/runtime";
 import { normalizeObject, normalizeRecordId } from "@jskit-ai/kernel/shared/support/normalize";
-import { resolveWorkspace } from "@jskit-ai/workspaces-core/server/support/resolveWorkspace";
 import { resolveAssistantSurfaceConfig } from "../../shared/assistantSurfaces.js";
 
-function createService({ assistantConfigRepository, consoleService = null, appConfig = {}, resolveAppConfig = null } = {}) {
+function createService({
+  assistantConfigRepository,
+  consoleService = null,
+  appConfig = {},
+  resolveAppConfig = null,
+  workspaceScopeSupport = null
+} = {}) {
   if (!assistantConfigRepository || typeof assistantConfigRepository.findByScope !== "function") {
     throw new Error("assistantConfigService requires assistantConfigRepository.findByScope().");
   }
@@ -63,7 +68,11 @@ function createService({ assistantConfigRepository, consoleService = null, appCo
       return null;
     }
 
-    const resolvedWorkspace = workspace || resolveWorkspace(context, input);
+    if (!workspaceScopeSupport || typeof workspaceScopeSupport.resolveWorkspace !== "function") {
+      throw new Error("assistant.config.service requires workspace server scope support for workspace-scoped settings.");
+    }
+
+    const resolvedWorkspace = workspace || workspaceScopeSupport.resolveWorkspace(context, input);
     const workspaceId = normalizeRecordId(resolvedWorkspace?.id, { fallback: null });
     if (!workspaceId) {
       throw new AppError(409, "Workspace selection required.");

package/src/server/services/chatService.js

@@ -1,6 +1,5 @@
 import { AppError } from "@jskit-ai/kernel/server/runtime";
 import { normalizeObject, normalizeRecordId, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
-import { resolveWorkspace } from "@jskit-ai/workspaces-core/server/support/resolveWorkspace";
 import { resolveWorkspaceSlug } from "@jskit-ai/assistant-core/server";
 import {
   ASSISTANT_STREAM_EVENT_TYPES
@@ -553,7 +552,8 @@ function createChatService({
   serviceToolCatalog,
   assistantConfigService,
   appConfig = {},
-  resolveAppConfig = null
+  resolveAppConfig = null,
+  workspaceScopeSupport = null
 } = {}) {
   if (!aiClientFactory || typeof aiClientFactory.resolveClient !== "function" || !transcriptService || !serviceToolCatalog || !assistantConfigService) {
     throw new Error(
@@ -564,6 +564,18 @@ function createChatService({
   const resolveCurrentAppConfig =
     typeof resolveAppConfig === "function" ? resolveAppConfig : () => appConfig;
 
+  function resolveRuntimeWorkspace(assistantSurface, context = {}, input = {}) {
+    if (assistantSurface?.runtimeSurfaceRequiresWorkspace !== true) {
+      return null;
+    }
+
+    if (!workspaceScopeSupport || typeof workspaceScopeSupport.resolveWorkspace !== "function") {
+      throw new Error("assistant.chat.service requires workspace server scope support for workspace-scoped assistant surfaces.");
+    }
+
+    return workspaceScopeSupport.resolveWorkspace(context, input);
+  }
+
   async function streamChat(payload = {}, options = {}) {
     const assistantSurface = requireAssistantSurface(resolveCurrentAppConfig(), payload?.targetSurfaceId);
     const aiClient = aiClientFactory.resolveClient(assistantSurface.targetSurfaceId);
@@ -573,9 +585,7 @@ function createChatService({
 
     const context = normalizeObject(options.context);
     const assistantContext = buildAssistantActionContext(context, assistantSurface);
-    const workspace = assistantSurface.runtimeSurfaceRequiresWorkspace
-      ? resolveWorkspace(assistantContext, payload)
-      : null;
+    const workspace = resolveRuntimeWorkspace(assistantSurface, assistantContext, payload);
     const source = normalizeStreamInput(payload);
     const streamWriter = options.streamWriter;
     if (!hasStreamWriter(streamWriter)) {
@@ -1010,9 +1020,7 @@ function createChatService({
     const assistantSurface = requireAssistantSurface(resolveCurrentAppConfig(), options?.input?.targetSurfaceId);
     const context = normalizeObject(options.context);
     const assistantContext = buildAssistantActionContext(context, assistantSurface);
-    const workspace = assistantSurface.runtimeSurfaceRequiresWorkspace
-      ? resolveWorkspace(assistantContext, options.input || {})
-      : null;
+    const workspace = resolveRuntimeWorkspace(assistantSurface, assistantContext, options.input || {});
     return transcriptService.listConversationsForUser(assistantSurface, workspace, assistantContext.actor, query, {
       context: assistantContext
     });
@@ -1022,9 +1030,7 @@ function createChatService({
     const assistantSurface = requireAssistantSurface(resolveCurrentAppConfig(), options?.input?.targetSurfaceId);
     const context = normalizeObject(options.context);
     const assistantContext = buildAssistantActionContext(context, assistantSurface);
-    const workspace = assistantSurface.runtimeSurfaceRequiresWorkspace
-      ? resolveWorkspace(assistantContext, options.input || {})
-      : null;
+    const workspace = resolveRuntimeWorkspace(assistantSurface, assistantContext, options.input || {});
     return transcriptService.getConversationMessagesForUser(
       assistantSurface,
       workspace,

package/src/server/support/workspaceScopeSupport.js

@@ -0,0 +1,35 @@
+const WORKSPACES_SERVER_SCOPE_SUPPORT_TOKEN = "workspaces.server.scope-support";
+
+function isWorkspaceServerScopeSupport(value) {
+  return Boolean(
+    value &&
+      value.available === true &&
+      value.paramsValidator &&
+      typeof value.paramsValidator.normalize === "function" &&
+      typeof value.buildInputFromRouteParams === "function" &&
+      typeof value.resolveWorkspace === "function"
+  );
+}
+
+function resolveWorkspaceServerScopeSupport(scope = null, { required = false, caller = "assistant-runtime" } = {}) {
+  const support =
+    scope && typeof scope.has === "function" && typeof scope.make === "function" && scope.has(WORKSPACES_SERVER_SCOPE_SUPPORT_TOKEN)
+      ? scope.make(WORKSPACES_SERVER_SCOPE_SUPPORT_TOKEN)
+      : null;
+
+  if (isWorkspaceServerScopeSupport(support)) {
+    return support;
+  }
+
+  if (required) {
+    throw new Error(`${caller} requires ${WORKSPACES_SERVER_SCOPE_SUPPORT_TOKEN} for workspace-scoped assistant surfaces.`);
+  }
+
+  return null;
+}
+
+export {
+  WORKSPACES_SERVER_SCOPE_SUPPORT_TOKEN,
+  isWorkspaceServerScopeSupport,
+  resolveWorkspaceServerScopeSupport
+};

package/test/lazyAppConfig.test.js

@@ -23,6 +23,26 @@ function createAssistantAppConfig() {
   };
 }
 
+function createWorkspaceServerScopeSupport() {
+  return Object.freeze({
+    available: true,
+    paramsValidator: Object.freeze({
+      normalize(value = {}) {
+        return {
+          workspaceSlug: String(value?.workspaceSlug || "").trim().toLowerCase()
+        };
+      }
+    }),
+    buildInputFromRouteParams(params = {}) {
+      const workspaceSlug = String(params?.workspaceSlug || "").trim().toLowerCase();
+      return workspaceSlug ? { workspaceSlug } : {};
+    },
+    resolveWorkspace(context = {}, input = {}) {
+      return input.workspace || context.workspace || null;
+    }
+  });
+}
+
 test("registerRoutes resolves appConfig lazily when handlers run", async () => {
   const routes = [];
   let currentAppConfig = null;
@@ -41,10 +61,16 @@ test("registerRoutes resolves appConfig lazily when handlers run", async () => {
       if (token === "appConfig") {
         return currentAppConfig;
       }
+      if (token === "workspaces.server.scope-support") {
+        return createWorkspaceServerScopeSupport();
+      }
       throw new Error(`Unexpected token: ${token}`);
     },
     has(token) {
-      return token === "appConfig" ? Boolean(currentAppConfig) : token === "jskit.http.router";
+      return (
+        (token === "appConfig" ? Boolean(currentAppConfig) : token === "jskit.http.router") ||
+        token === "workspaces.server.scope-support"
+      );
     }
   };
 
@@ -126,10 +152,16 @@ test("registerRoutes returns clear AppError payload for pre-stream assistant fai
       if (token === "appConfig") {
         return currentAppConfig;
       }
+      if (token === "workspaces.server.scope-support") {
+        return createWorkspaceServerScopeSupport();
+      }
       throw new Error(`Unexpected token: ${token}`);
     },
     has(token) {
-      return token === "appConfig" ? Boolean(currentAppConfig) : token === "jskit.http.router";
+      return (
+        (token === "appConfig" ? Boolean(currentAppConfig) : token === "jskit.http.router") ||
+        token === "workspaces.server.scope-support"
+      );
     }
   };
 
@@ -216,7 +248,8 @@ test("chat service resolves appConfig lazily when conversations are listed", asy
     },
     serviceToolCatalog: {},
     assistantConfigService: {},
-    resolveAppConfig: () => currentAppConfig
+    resolveAppConfig: () => currentAppConfig,
+    workspaceScopeSupport: createWorkspaceServerScopeSupport()
   });
 
   currentAppConfig = createAssistantAppConfig();
@@ -246,3 +279,76 @@ test("chat service resolves appConfig lazily when conversations are listed", asy
   assert.equal(response.assistantSurface.targetSurfaceId, "admin");
   assert.equal(response.workspace.slug, "dogandgroom");
 });
+
+test("chat service rejects workspace-scoped assistant surfaces when workspace support is unavailable", async () => {
+  const chatService = createChatService({
+    aiClientFactory: {
+      resolveClient() {
+        throw new Error("resolveClient should not be called when listing conversations.");
+      }
+    },
+    transcriptService: {
+      async listConversationsForUser() {
+        throw new Error("listConversationsForUser should not be called without workspace support.");
+      }
+    },
+    serviceToolCatalog: {},
+    assistantConfigService: {},
+    resolveAppConfig: () => createAssistantAppConfig()
+  });
+
+  await assert.rejects(
+    () =>
+      chatService.listConversations(
+        {
+          limit: 20
+        },
+        {
+          input: {
+            targetSurfaceId: "admin",
+            workspaceSlug: "dogandgroom"
+          },
+          context: {
+            actor: {
+              authenticated: true,
+              userId: 42
+            }
+          }
+        }
+      ),
+    /workspace server scope support/
+  );
+});
+
+test("registerRoutes omits workspace assistant routes when workspace scope support is unavailable", () => {
+  const routes = [];
+  const app = {
+    make(token) {
+      if (token === "jskit.http.router") {
+        return {
+          register(method, path, options, handler) {
+            routes.push({ method, path, options, handler });
+          }
+        };
+      }
+      if (token === "appConfig") {
+        return createAssistantAppConfig();
+      }
+      throw new Error(`Unexpected token: ${token}`);
+    },
+    has(token) {
+      return token === "jskit.http.router" || token === "appConfig";
+    }
+  };
+
+  registerRoutes(app);
+
+  assert.equal(
+    routes.some((entry) => entry.path.startsWith("/api/w/:workspaceSlug/assistant/")),
+    false
+  );
+  assert.equal(
+    routes.some((entry) => entry.path.startsWith("/api/assistant/")),
+    true
+  );
+});

package/test/packageDescriptor.test.js

@@ -15,6 +15,10 @@ function findFileMutation(id) {
 test("assistant-runtime descriptor registers runtime providers and initializes assistant config roots", () => {
   assert.equal(descriptor.kind, "runtime");
   assert.equal(descriptor.packageId, "@jskit-ai/assistant-runtime");
+  assert.equal(descriptor.dependsOn.includes("@jskit-ai/workspaces-core"), false);
+  assert.equal(descriptor.dependsOn.includes("@jskit-ai/workspaces-web"), false);
+  assert.equal(descriptor.capabilities?.requires?.includes("workspaces.core"), false);
+  assert.equal(descriptor.capabilities?.requires?.includes("workspaces.web"), false);
   assert.equal(descriptor.runtime?.server?.providers?.[0]?.entrypoint, "src/server/AssistantProvider.js");
   assert.equal(descriptor.runtime?.client?.providers?.[0]?.entrypoint, "src/client/providers/AssistantClientProvider.js");