@jskit-ai/assistant 0.1.37 → 0.1.39

package/package.descriptor.mjs

@@ -1,15 +1,15 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/assistant",
-  version: "0.1.37",
+  version: "0.1.39",
   kind: "generator",
-  description: "Generate an app-local assistant runtime and settings integration from explicit surface choices.",
+  description: "Generate an assistant page and per-surface assistant config using the shared assistant runtime.",
   options: {
-    "runtime-surface": {
+    surface: {
       required: true,
       inputType: "text",
-      defaultValue: "",
-      promptLabel: "Runtime surface",
+      defaultFromConfig: "surfaceDefaultId",
+      promptLabel: "Assistant surface",
       promptHint: "Enabled surface id where the assistant page will run."
     },
     "settings-surface": {
@@ -17,7 +17,14 @@ export default Object.freeze({
       inputType: "text",
       defaultValue: "",
       promptLabel: "Settings surface",
-      promptHint: "Enabled surface id whose settings outlet will host the assistant settings form."
+      promptHint: "Enabled surface id whose settings pages will include the assistant settings section."
+    },
+    "settings-route-path": {
+      required: false,
+      inputType: "text",
+      defaultValue: "assistant",
+      promptLabel: "Settings route path",
+      promptHint: "Route segment to use for the assistant settings section page."
     },
     "config-scope": {
       required: true,
@@ -47,6 +54,13 @@ export default Object.freeze({
       promptLabel: "Menu label",
       promptHint: "Menu label for the assistant page entry."
     },
+    "ai-config-prefix": {
+      required: false,
+      inputType: "text",
+      defaultValue: "",
+      promptLabel: "AI config prefix",
+      promptHint: "Optional env/config prefix override. Defaults to <SURFACE>_ASSISTANT."
+    },
     "ai-provider": {
       required: true,
       defaultValue: "openai",
@@ -58,7 +72,7 @@ export default Object.freeze({
       allowEmpty: true,
       defaultValue: "",
       promptLabel: "AI API key",
-      promptHint: "Leave empty to keep assistant disabled until you add a key."
+      promptHint: "Leave empty to keep the assistant disabled until you add a key."
     },
     "ai-base-url": {
       required: true,
@@ -74,7 +88,7 @@ export default Object.freeze({
       promptHint: "Abort AI requests after this many milliseconds."
     }
   },
-  dependsOn: [],
+  dependsOn: ["@jskit-ai/assistant-runtime"],
   capabilities: {
     provides: ["assistant-generator"],
     requires: []
@@ -88,78 +102,6 @@ export default Object.freeze({
     }
   },
   metadata: {
-    generatorPrimarySubcommand: "install",
-    generatorSubcommands: {
-      install: {
-        description: "Generate and install an app-local assistant runtime from explicit surface choices.",
-        examples: [
-          {
-            label: "App runtime, console settings, global config",
-            lines: [
-              "npx jskit generate @jskit-ai/assistant install \\",
-              "  --runtime-surface app \\",
-              "  --settings-surface console \\",
-              "  --config-scope global \\",
-              "  --placement shell-layout:primary-menu \\",
-              "  --menu-label Assistant \\",
-              "  --ai-provider openai \\",
-              "  --ai-api-key \"$OPENAI_API_KEY\" \\",
-              "  --ai-base-url \"\" \\",
-              "  --ai-timeout-ms 120000 \\",
-              "  --run-npm-install"
-            ]
-          },
-          {
-            label: "App runtime, app settings, global config",
-            lines: [
-              "npx jskit generate @jskit-ai/assistant install \\",
-              "  --runtime-surface app \\",
-              "  --settings-surface app \\",
-              "  --config-scope global \\",
-              "  --placement shell-layout:primary-menu \\",
-              "  --menu-label Assistant \\",
-              "  --ai-provider openai \\",
-              "  --ai-api-key \"$OPENAI_API_KEY\" \\",
-              "  --ai-base-url \"\" \\",
-              "  --ai-timeout-ms 120000 \\",
-              "  --run-npm-install"
-            ]
-          },
-          {
-            label: "Workspace runtime, console settings, global config",
-            lines: [
-              "npx jskit generate @jskit-ai/assistant install \\",
-              "  --runtime-surface admin \\",
-              "  --settings-surface console \\",
-              "  --config-scope global \\",
-              "  --placement shell-layout:primary-menu \\",
-              "  --menu-label Assistant \\",
-              "  --ai-provider openai \\",
-              "  --ai-api-key \"$OPENAI_API_KEY\" \\",
-              "  --ai-base-url \"\" \\",
-              "  --ai-timeout-ms 120000 \\",
-              "  --run-npm-install"
-            ]
-          },
-          {
-            label: "Workspace runtime, workspace settings, workspace config",
-            lines: [
-              "npx jskit generate @jskit-ai/assistant install \\",
-              "  --runtime-surface admin \\",
-              "  --settings-surface admin \\",
-              "  --config-scope workspace \\",
-              "  --placement shell-layout:primary-menu \\",
-              "  --menu-label Assistant \\",
-              "  --ai-provider openai \\",
-              "  --ai-api-key \"$OPENAI_API_KEY\" \\",
-              "  --ai-base-url \"\" \\",
-              "  --ai-timeout-ms 120000 \\",
-              "  --run-npm-install"
-            ]
-          }
-        ]
-      }
-    },
     apiSummary: {
       surfaces: [
         {
@@ -175,18 +117,7 @@ export default Object.freeze({
   },
   mutations: {
     dependencies: {
-      runtime: {
-        "@local/assistant": "file:packages/assistant",
-        "@jskit-ai/assistant-core": "0.1.4",
-        "@jskit-ai/database-runtime": "0.1.28",
-        "@jskit-ai/http-runtime": "0.1.27",
-        "@jskit-ai/kernel": "0.1.28",
-        "@jskit-ai/shell-web": "0.1.27",
-        "@jskit-ai/users-core": "0.1.38",
-        "@jskit-ai/users-web": "0.1.43",
-        "@tanstack/vue-query": "^5.90.5",
-        "vuetify": "^4.0.0"
-      },
+      runtime: {},
       dev: {}
     },
     packageJson: {
@@ -195,236 +126,106 @@ export default Object.freeze({
     procfile: {},
     files: [
       {
-        op: "install-migration",
-        from: "templates/migrations/assistant_config_initial.cjs",
-        toDir: "migrations",
-        extension: ".cjs",
-        reason: "Install assistant configuration schema migration.",
-        category: "assistant",
-        id: "assistant-config-initial-schema",
-        templateContext: {
-          entrypoint: "src/server/buildTemplateContext.js",
-          export: "buildTemplateContext"
-        }
-      },
-      {
-        op: "install-migration",
-        from: "templates/migrations/assistant_transcripts_initial.cjs",
-        toDir: "migrations",
-        extension: ".cjs",
-        reason: "Install assistant transcript schema migration.",
-        category: "assistant",
-        id: "assistant-transcripts-initial-schema",
-        templateContext: {
-          entrypoint: "src/server/buildTemplateContext.js",
-          export: "buildTemplateContext"
-        }
-      },
-      {
-        from: "templates/src/local-package/package.json",
-        to: "packages/assistant/package.json",
-        reason: "Install app-local assistant package manifest.",
-        category: "assistant",
-        id: "assistant-local-package-json"
-      },
-      {
-        from: "templates/src/local-package/package.descriptor.mjs",
-        to: "packages/assistant/package.descriptor.mjs",
-        reason: "Install app-local assistant package descriptor.",
-        category: "assistant",
-        id: "assistant-local-package-descriptor"
-      },
-      {
-        from: "templates/src/local-package/shared/assistantRuntimeConfig.js",
-        to: "packages/assistant/src/shared/assistantRuntimeConfig.js",
-        reason: "Install generated assistant runtime configuration.",
-        category: "assistant",
-        id: "assistant-local-runtime-config",
-        templateContext: {
-          entrypoint: "src/server/buildTemplateContext.js",
-          export: "buildTemplateContext"
-        }
-      },
-      {
-        from: "templates/src/local-package/shared/index.js",
-        to: "packages/assistant/src/shared/index.js",
-        reason: "Install generated assistant shared exports.",
-        category: "assistant",
-        id: "assistant-local-shared-index"
-      },
-      {
-        from: "templates/src/local-package/client/index.js",
-        to: "packages/assistant/src/client/index.js",
-        reason: "Install generated assistant client exports.",
-        category: "assistant",
-        id: "assistant-local-client-index"
-      },
-      {
-        from: "templates/src/local-package/client/components/AssistantSurfaceClientElement.vue",
-        to: "packages/assistant/src/client/components/AssistantSurfaceClientElement.vue",
-        reason: "Install generated assistant surface page component.",
-        category: "assistant",
-        id: "assistant-local-surface-client-element",
-        templateContext: {
-          entrypoint: "src/server/buildTemplateContext.js",
-          export: "buildTemplateContext"
-        }
-      },
-      {
-        from: "templates/src/local-package/client/components/AssistantSettingsClientElement.vue",
-        to: "packages/assistant/src/client/components/AssistantSettingsClientElement.vue",
-        reason: "Install generated assistant settings form component.",
-        category: "assistant",
-        id: "assistant-local-settings-client-element",
-        templateContext: {
-          entrypoint: "src/server/buildTemplateContext.js",
-          export: "buildTemplateContext"
-        }
-      },
-      {
-        from: "templates/src/local-package/client/composables/useAssistantRuntime.js",
-        to: "packages/assistant/src/client/composables/useAssistantRuntime.js",
-        reason: "Install generated assistant runtime composable.",
-        category: "assistant",
-        id: "assistant-local-runtime-composable",
-        templateContext: {
-          entrypoint: "src/server/buildTemplateContext.js",
-          export: "buildTemplateContext"
-        }
-      },
-      {
-        from: "templates/src/local-package/client/providers/AssistantClientProvider.js",
-        to: "packages/assistant/src/client/providers/AssistantClientProvider.js",
-        reason: "Install generated assistant client provider.",
-        category: "assistant",
-        id: "assistant-local-client-provider"
-      },
-      {
-        from: "templates/src/local-package/server/AssistantProvider.js",
-        to: "packages/assistant/src/server/AssistantProvider.js",
-        reason: "Install generated assistant server provider.",
-        category: "assistant",
-        id: "assistant-local-server-provider",
-        templateContext: {
-          entrypoint: "src/server/buildTemplateContext.js",
-          export: "buildTemplateContext"
-        }
-      },
-      {
-        from: "templates/src/local-package/server/actionIds.js",
-        to: "packages/assistant/src/server/actionIds.js",
-        reason: "Install generated assistant action identifiers.",
-        category: "assistant",
-        id: "assistant-local-action-ids"
-      },
-      {
-        from: "templates/src/local-package/server/actions.js",
-        to: "packages/assistant/src/server/actions.js",
-        reason: "Install generated assistant action definitions.",
-        category: "assistant",
-        id: "assistant-local-actions",
-        templateContext: {
-          entrypoint: "src/server/buildTemplateContext.js",
-          export: "buildTemplateContext"
-        }
-      },
-      {
-        from: "templates/src/local-package/server/registerRoutes.js",
-        to: "packages/assistant/src/server/registerRoutes.js",
-        reason: "Install generated assistant route registration.",
-        category: "assistant",
-        id: "assistant-local-register-routes",
-        templateContext: {
-          entrypoint: "src/server/buildTemplateContext.js",
-          export: "buildTemplateContext"
-        }
-      },
-      {
-        from: "templates/src/local-package/server/repositories/assistantConfigRepository.js",
-        to: "packages/assistant/src/server/repositories/assistantConfigRepository.js",
-        reason: "Install generated assistant config repository.",
+        from: "templates/src/pages/assistant/index.vue",
+        toSurface: "${option:surface|lower}",
+        toSurfacePath: "assistant/index.vue",
+        reason: "Install generated assistant runtime page.",
         category: "assistant",
-        id: "assistant-local-config-repository",
+        id: "assistant-page-runtime",
         templateContext: {
           entrypoint: "src/server/buildTemplateContext.js",
           export: "buildTemplateContext"
         }
       },
       {
-        from: "templates/src/local-package/server/repositories/conversationsRepository.js",
-        to: "packages/assistant/src/server/repositories/conversationsRepository.js",
-        reason: "Install generated assistant conversations repository.",
+        from: "templates/src/pages/settings/assistant/index.vue",
+        toSurface: "${option:settings-surface|lower}",
+        toSurfacePath: "settings/${option:settings-route-path|path}/index.vue",
+        reason: "Install generated assistant settings section page.",
         category: "assistant",
-        id: "assistant-local-conversations-repository",
+        id: "assistant-page-settings-standard",
+        when: {
+          option: "settings-surface",
+          notEquals: "admin"
+        },
         templateContext: {
           entrypoint: "src/server/buildTemplateContext.js",
           export: "buildTemplateContext"
         }
       },
       {
-        from: "templates/src/local-package/server/repositories/messagesRepository.js",
-        to: "packages/assistant/src/server/repositories/messagesRepository.js",
-        reason: "Install generated assistant messages repository.",
+        from: "templates/src/pages/settings/assistant/index.vue",
+        toSurface: "${option:settings-surface|lower}",
+        toSurfacePath: "workspace/settings/${option:settings-route-path|path}/index.vue",
+        reason: "Install generated assistant settings section page.",
         category: "assistant",
-        id: "assistant-local-messages-repository",
+        id: "assistant-page-settings-admin",
+        when: {
+          option: "settings-surface",
+          equals: "admin"
+        },
         templateContext: {
           entrypoint: "src/server/buildTemplateContext.js",
           export: "buildTemplateContext"
         }
-      },
+      }
+    ],
+    text: [
       {
-        from: "templates/src/local-package/server/services/assistantConfigService.js",
-        to: "packages/assistant/src/server/services/assistantConfigService.js",
-        reason: "Install generated assistant config service.",
+        op: "append-text",
+        file: "src/placement.js",
+        position: "bottom",
+        skipIfContains: "assistant.generated.menu:${option:surface|lower}",
+        value:
+          "\n// assistant.generated.menu:${option:surface|lower}\naddPlacement({\n  id: \"assistant.generated.menu.${option:surface|kebab}\",\n  host: \"__ASSISTANT_MENU_PLACEMENT_HOST__\",\n  position: \"__ASSISTANT_MENU_PLACEMENT_POSITION__\",\n  surfaces: [\"${option:surface|lower}\"],\n  order: 310,\n  componentToken: \"__ASSISTANT_MENU_COMPONENT_TOKEN__\",\n  props: {\n    label: \"__ASSISTANT_MENU_LABEL__\",\n    surface: \"${option:surface|lower}\",\n    workspaceSuffix: \"__ASSISTANT_MENU_WORKSPACE_SUFFIX__\",\n    nonWorkspaceSuffix: \"__ASSISTANT_MENU_NON_WORKSPACE_SUFFIX__\"\n  },\n  when: ({ auth }) => Boolean(auth?.authenticated)\n});\n",
+        reason: "Append generated assistant runtime menu placement into app-owned placement registry.",
         category: "assistant",
-        id: "assistant-local-config-service",
+        id: "assistant-placement-menu",
         templateContext: {
           entrypoint: "src/server/buildTemplateContext.js",
           export: "buildTemplateContext"
         }
       },
       {
-        from: "templates/src/local-package/server/services/chatService.js",
-        to: "packages/assistant/src/server/services/chatService.js",
-        reason: "Install generated assistant chat service.",
+        op: "append-text",
+        file: "src/placement.js",
+        position: "bottom",
+        skipIfContains: "assistant.generated.settings.menu:${option:surface|lower}",
+        value:
+          "\n// assistant.generated.settings.menu:${option:surface|lower}\naddPlacement({\n  id: \"assistant.generated.settings.menu.${option:surface|kebab}\",\n  host: \"__ASSISTANT_SETTINGS_HOST__\",\n  position: \"primary-menu\",\n  surfaces: [\"${option:settings-surface|lower}\"],\n  order: 250,\n  componentToken: \"users.web.shell.surface-aware-menu-link-item\",\n  props: {\n    label: \"__ASSISTANT_SETTINGS_MENU_LABEL__\",\n    surface: \"${option:settings-surface|lower}\",\n    workspaceSuffix: \"__ASSISTANT_SETTINGS_MENU_WORKSPACE_SUFFIX__\",\n    nonWorkspaceSuffix: \"__ASSISTANT_SETTINGS_MENU_NON_WORKSPACE_SUFFIX__\"\n  },\n  when: ({ auth }) => Boolean(auth?.authenticated)\n});\n",
+        reason: "Append generated assistant settings section menu placement into app-owned settings placements.",
         category: "assistant",
-        id: "assistant-local-chat-service",
+        id: "assistant-settings-menu-placement",
         templateContext: {
           entrypoint: "src/server/buildTemplateContext.js",
           export: "buildTemplateContext"
         }
       },
       {
-        from: "templates/src/local-package/server/services/transcriptService.js",
-        to: "packages/assistant/src/server/services/transcriptService.js",
-        reason: "Install generated assistant transcript service.",
+        op: "append-text",
+        file: "config/public.js",
+        position: "bottom",
+        skipIfContains: "config.assistantSurfaces.${option:surface|lower} = {",
+        value:
+          "\nconfig.assistantSurfaces.${option:surface|lower} = {\n  settingsSurfaceId: \"__ASSISTANT_SETTINGS_SURFACE_ID__\",\n  configScope: \"__ASSISTANT_CONFIG_SCOPE__\"\n};\n",
+        reason: "Register the generated assistant surface in public app config.",
         category: "assistant",
-        id: "assistant-local-transcript-service",
+        id: "assistant-public-surface-config",
         templateContext: {
           entrypoint: "src/server/buildTemplateContext.js",
           export: "buildTemplateContext"
         }
       },
-      {
-        from: "templates/src/pages/assistant/index.vue",
-        toSurface: "${option:runtime-surface|lower}",
-        toSurfacePath: "assistant/index.vue",
-        reason: "Install generated assistant runtime page.",
-        category: "assistant",
-        id: "assistant-page-runtime"
-      }
-    ],
-    text: [
       {
         op: "append-text",
-        file: "src/placement.js",
+        file: "config/server.js",
         position: "bottom",
-        skipIfContains: "id: \"assistant.generated.menu\"",
+        skipIfContains: "config.assistantServer.${option:surface|lower} = {",
         value:
-          "\naddPlacement({\n  id: \"assistant.generated.menu\",\n  host: \"__ASSISTANT_MENU_PLACEMENT_HOST__\",\n  position: \"__ASSISTANT_MENU_PLACEMENT_POSITION__\",\n  surfaces: [\"${option:runtime-surface|lower}\"],\n  order: 310,\n  componentToken: \"__ASSISTANT_MENU_COMPONENT_TOKEN__\",\n  props: {\n    label: \"__ASSISTANT_MENU_LABEL__\",\n    surface: \"${option:runtime-surface|lower}\",\n    workspaceSuffix: \"__ASSISTANT_MENU_WORKSPACE_SUFFIX__\",\n    nonWorkspaceSuffix: \"__ASSISTANT_MENU_NON_WORKSPACE_SUFFIX__\"\n  },\n  when: ({ auth }) => Boolean(auth?.authenticated)\n});\n",
-        reason: "Append generated assistant runtime menu placement into app-owned placement registry.",
+          "\nconfig.assistantServer.${option:surface|lower} = {\n  aiConfigPrefix: \"__ASSISTANT_AI_CONFIG_PREFIX__\"\n};\n",
+        reason: "Register generated assistant server config for the selected surface.",
         category: "assistant",
-        id: "assistant-placement-menu",
+        id: "assistant-server-surface-config",
         templateContext: {
           entrypoint: "src/server/buildTemplateContext.js",
           export: "buildTemplateContext"
@@ -432,54 +233,18 @@ export default Object.freeze({
       },
       {
         op: "append-text",
-        file: "src/placement.js",
+        file: ".env",
         position: "bottom",
-        skipIfContains: "id: \"assistant.generated.settings.form\"",
+        skipIfContains: "__ASSISTANT_AI_CONFIG_PREFIX___AI_PROVIDER=",
         value:
-          "\naddPlacement({\n  id: \"assistant.generated.settings.form\",\n  host: \"__ASSISTANT_SETTINGS_HOST__\",\n  position: \"forms\",\n  surfaces: [\"${option:settings-surface|lower}\"],\n  order: 250,\n  componentToken: \"assistant.web.settings.element\",\n  when: ({ auth }) => Boolean(auth?.authenticated)\n});\n",
-        reason: "Append generated assistant settings form placement into app-owned settings placements.",
-        category: "assistant",
-        id: "assistant-settings-form-placement",
+          "\n__ASSISTANT_AI_CONFIG_PREFIX___AI_PROVIDER=${option:ai-provider}\n__ASSISTANT_AI_CONFIG_PREFIX___AI_API_KEY=${option:ai-api-key}\n__ASSISTANT_AI_CONFIG_PREFIX___AI_BASE_URL=${option:ai-base-url}\n__ASSISTANT_AI_CONFIG_PREFIX___AI_TIMEOUT_MS=${option:ai-timeout-ms}\n",
+        reason: "Append assistant AI env defaults for the generated surface prefix.",
+        category: "runtime-config",
+        id: "assistant-ai-prefixed-env",
         templateContext: {
           entrypoint: "src/server/buildTemplateContext.js",
           export: "buildTemplateContext"
         }
-      },
-      {
-        file: ".env",
-        op: "upsert-env",
-        key: "AI_PROVIDER",
-        value: "${option:ai-provider}",
-        reason: "Configure assistant AI provider id.",
-        category: "runtime-config",
-        id: "assistant-ai-provider"
-      },
-      {
-        file: ".env",
-        op: "upsert-env",
-        key: "AI_API_KEY",
-        value: "${option:ai-api-key}",
-        reason: "Configure assistant AI API key.",
-        category: "runtime-config",
-        id: "assistant-ai-api-key"
-      },
-      {
-        file: ".env",
-        op: "upsert-env",
-        key: "AI_BASE_URL",
-        value: "${option:ai-base-url}",
-        reason: "Configure assistant AI base URL override.",
-        category: "runtime-config",
-        id: "assistant-ai-base-url"
-      },
-      {
-        file: ".env",
-        op: "upsert-env",
-        key: "AI_TIMEOUT_MS",
-        value: "${option:ai-timeout-ms}",
-        reason: "Configure assistant AI timeout in milliseconds.",
-        category: "runtime-config",
-        id: "assistant-ai-timeout-ms"
       }
     ]
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/assistant",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -9,6 +9,6 @@
     "./server/buildTemplateContext": "./src/server/buildTemplateContext.js"
   },
   "dependencies": {
-    "@jskit-ai/kernel": "0.1.28"
+    "@jskit-ai/kernel": "0.1.30"
   }
 }

package/src/server/buildTemplateContext.js

@@ -50,8 +50,32 @@ function resolveSurfaceDefinition(appConfig = {}, surfaceId = "", optionName = "
   });
 }
 
-function resolveTableSuffix(surfaceId = "") {
-  return toSnakeCase(surfaceId) || "assistant";
+function assertAssistantSurfaceIsAvailable(appConfig = {}, surfaceId = "") {
+  const assistantSurfaces =
+    appConfig && typeof appConfig.assistantSurfaces === "object" && !Array.isArray(appConfig.assistantSurfaces)
+      ? appConfig.assistantSurfaces
+      : {};
+  if (assistantSurfaces[surfaceId]) {
+    throw new Error(`assistant generator surface "${surfaceId}" already has an assistant configured in config/public.js.`);
+  }
+}
+
+function resolveAiConfigPrefix(surfaceId = "", explicitPrefix = "") {
+  const normalizedExplicitPrefix = normalizeText(explicitPrefix);
+  if (normalizedExplicitPrefix) {
+    return normalizedExplicitPrefix;
+  }
+
+  const surfacePrefix = toSnakeCase(surfaceId).toUpperCase();
+  return surfacePrefix ? `${surfacePrefix}_ASSISTANT` : "ASSISTANT";
+}
+
+function normalizeSettingsRoutePath(value = "") {
+  return normalizeText(value).toLowerCase().replace(/^\/+|\/+$/g, "") || "assistant";
+}
+
+function resolveSettingsRouteBase(surfaceId = "") {
+  return normalizeSurfaceId(surfaceId) === "admin" ? "/workspace/settings" : "/settings";
 }
 
 async function resolveMenuPlacementTarget(appRoot = "", options = {}) {
@@ -64,13 +88,16 @@ async function resolveMenuPlacementTarget(appRoot = "", options = {}) {
 
 async function buildTemplateContext({ appRoot, options } = {}) {
   const appConfig = await loadAppConfig(appRoot);
-  const runtimeSurface = resolveSurfaceDefinition(appConfig, options?.["runtime-surface"], "runtime-surface");
+  const runtimeSurface = resolveSurfaceDefinition(appConfig, options?.surface, "surface");
   const settingsSurface = resolveSurfaceDefinition(appConfig, options?.["settings-surface"], "settings-surface");
   const configScope = normalizeConfigScope(options?.["config-scope"]);
+  const settingsRoutePath = normalizeSettingsRoutePath(options?.["settings-route-path"]);
+
+  assertAssistantSurfaceIsAvailable(appConfig, runtimeSurface.id);
 
   if (configScope === "workspace" && runtimeSurface.requiresWorkspace !== true) {
     throw new Error(
-      `assistant generator config-scope "workspace" requires runtime surface "${runtimeSurface.id}" with requiresWorkspace=true.`
+      `assistant generator config-scope "workspace" requires surface "${runtimeSurface.id}" with requiresWorkspace=true.`
     );
   }
   if (configScope === "workspace" && settingsSurface.requiresWorkspace !== true) {
@@ -80,27 +107,25 @@ async function buildTemplateContext({ appRoot, options } = {}) {
   }
 
   const placementTarget = await resolveMenuPlacementTarget(appRoot, options);
-  const tableSuffix = resolveTableSuffix(runtimeSurface.id);
   const menuComponentToken = normalizeText(options?.["placement-component-token"]) || DEFAULT_MENU_COMPONENT_TOKEN;
+  const settingsRouteBase = resolveSettingsRouteBase(settingsSurface.id);
+  const settingsMenuSuffix = `${settingsRouteBase}/${settingsRoutePath}`;
 
   return Object.freeze({
-    "__ASSISTANT_RUNTIME_SURFACE_ID__": runtimeSurface.id,
+    "__ASSISTANT_SURFACE_ID__": runtimeSurface.id,
     "__ASSISTANT_SETTINGS_SURFACE_ID__": settingsSurface.id,
-    "__ASSISTANT_RUNTIME_SURFACE_REQUIRES_WORKSPACE__": runtimeSurface.requiresWorkspace ? "true" : "false",
-    "__ASSISTANT_SETTINGS_SURFACE_REQUIRES_WORKSPACE__": settingsSurface.requiresWorkspace ? "true" : "false",
-    "__ASSISTANT_SETTINGS_SURFACE_REQUIRES_CONSOLE_OWNER__":
-      settingsSurface.accessPolicyId === "console_owner" ? "true" : "false",
     "__ASSISTANT_CONFIG_SCOPE__": configScope,
     "__ASSISTANT_SETTINGS_HOST__": `${settingsSurface.id}-settings`,
-    "__ASSISTANT_CONFIG_TABLE__": "assistant_config",
-    "__ASSISTANT_CONVERSATIONS_TABLE__": `assistant_${tableSuffix}_conversations`,
-    "__ASSISTANT_MESSAGES_TABLE__": `assistant_${tableSuffix}_messages`,
+    "__ASSISTANT_AI_CONFIG_PREFIX__": resolveAiConfigPrefix(runtimeSurface.id, options?.["ai-config-prefix"]),
     "__ASSISTANT_MENU_PLACEMENT_HOST__": placementTarget.host,
     "__ASSISTANT_MENU_PLACEMENT_POSITION__": placementTarget.position,
     "__ASSISTANT_MENU_COMPONENT_TOKEN__": menuComponentToken,
     "__ASSISTANT_MENU_LABEL__": normalizeText(options?.["menu-label"]) || "Assistant",
     "__ASSISTANT_MENU_WORKSPACE_SUFFIX__": "/assistant",
-    "__ASSISTANT_MENU_NON_WORKSPACE_SUFFIX__": "/assistant"
+    "__ASSISTANT_MENU_NON_WORKSPACE_SUFFIX__": "/assistant",
+    "__ASSISTANT_SETTINGS_MENU_LABEL__": normalizeText(options?.["menu-label"]) || "Assistant",
+    "__ASSISTANT_SETTINGS_MENU_WORKSPACE_SUFFIX__": settingsMenuSuffix,
+    "__ASSISTANT_SETTINGS_MENU_NON_WORKSPACE_SUFFIX__": settingsMenuSuffix
   });
 }
 

package/templates/src/pages/assistant/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <AssistantSurfaceClientElement />
+  <AssistantSurfaceClientElement surface-id="__ASSISTANT_SURFACE_ID__" />
 </template>
 
 <script setup>
-import { AssistantSurfaceClientElement } from "@local/assistant/client";
+import { AssistantSurfaceClientElement } from "@jskit-ai/assistant-runtime/client";
 </script>

package/templates/src/pages/settings/assistant/index.vue

@@ -0,0 +1,7 @@
+<template>
+  <AssistantSettingsClientElement target-surface-id="__ASSISTANT_SURFACE_ID__" />
+</template>
+
+<script setup>
+import { AssistantSettingsClientElement } from "@jskit-ai/assistant-runtime/client";
+</script>