@jskit-ai/assistant 0.1.75 → 0.1.76

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/assistant",
-  version: "0.1.75",
+  version: "0.1.76",
   kind: "generator",
   description: "Install assistant runtime/config for one surface and scaffold assistant pages at explicit target files.",
   options: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/assistant",
-  "version": "0.1.75",
+  "version": "0.1.76",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -9,6 +9,6 @@
     "./server/buildTemplateContext": "./src/server/buildTemplateContext.js"
   },
   "dependencies": {
-    "@jskit-ai/kernel": "0.1.66"
+    "@jskit-ai/kernel": "0.1.67"
   }
 }

package/src/server/buildTemplateContext.js

@@ -12,7 +12,10 @@ async function buildTemplateContext({ appRoot, options } = {}) {
   const settingsSurface = resolveSurfaceDefinition(appConfig, options?.["settings-surface"], "settings-surface");
   const configScope = normalizeConfigScope(options?.["config-scope"]);
 
-  assertAssistantSurfaceIsAvailable(appConfig, runtimeSurface.id);
+  assertAssistantSurfaceIsAvailable(appConfig, runtimeSurface.id, {
+    settingsSurfaceId: settingsSurface.id,
+    configScope
+  });
 
   if (configScope === "workspace" && runtimeSurface.requiresWorkspace !== true) {
     throw new Error(

package/src/server/support.js

@@ -49,11 +49,25 @@ function resolveSurfaceDefinition(appConfig = {}, surfaceId = "", optionName = "
   });
 }
 
-function assertAssistantSurfaceIsAvailable(appConfig = {}, surfaceId = "") {
+function assertAssistantSurfaceIsAvailable(appConfig = {}, surfaceId = "", expected = {}) {
   const assistantSurfaces =
     appConfig && typeof appConfig.assistantSurfaces === "object" && !Array.isArray(appConfig.assistantSurfaces)
       ? appConfig.assistantSurfaces
       : {};
+  const existingSurface = assistantSurfaces[surfaceId];
+  if (!existingSurface) {
+    return;
+  }
+
+  const expectedSettingsSurfaceId = normalizeSurfaceId(expected?.settingsSurfaceId);
+  const expectedConfigScope = normalizeConfigScope(expected?.configScope);
+  const existingSettingsSurfaceId = normalizeSurfaceId(existingSurface?.settingsSurfaceId);
+  const existingConfigScope = normalizeConfigScope(existingSurface?.configScope);
+
+  if (existingSettingsSurfaceId === expectedSettingsSurfaceId && existingConfigScope === expectedConfigScope) {
+    return;
+  }
+
   if (assistantSurfaces[surfaceId]) {
     throw new Error(`assistant generator surface "${surfaceId}" already has an assistant configured in config/public.js.`);
   }

package/test/buildTemplateContext.test.js

@@ -84,7 +84,7 @@ test("buildTemplateContext rejects workspace config scope for a non-workspace as
   });
 });
 
-test("buildTemplateContext rejects duplicate assistant surfaces already configured in public config", async () => {
+test("buildTemplateContext accepts an already-configured matching assistant surface", async () => {
   await withTempApp(async (appRoot) => {
     await writeFile(
       path.join(appRoot, "config", "public.js"),
@@ -104,13 +104,48 @@ test("buildTemplateContext rejects duplicate assistant surfaces already configur
       "utf8"
     );
 
+    const context = await buildTemplateContext({
+      appRoot,
+      options: {
+        surface: "app",
+        "settings-surface": "console",
+        "config-scope": "global"
+      }
+    });
+
+    assert.equal(context.__ASSISTANT_SETTINGS_SURFACE_ID__, "console");
+    assert.equal(context.__ASSISTANT_CONFIG_SCOPE__, "global");
+  });
+});
+
+test("buildTemplateContext rejects conflicting assistant surfaces already configured in public config", async () => {
+  await withTempApp(async (appRoot) => {
+    await writeFile(
+      path.join(appRoot, "config", "public.js"),
+      `export const config = {
+  surfaceDefinitions: {
+    app: { id: "app", enabled: true, requiresWorkspace: false, accessPolicyId: "authenticated" },
+    admin: { id: "admin", enabled: true, requiresWorkspace: true, accessPolicyId: "workspace_member" },
+    console: { id: "console", enabled: true, requiresWorkspace: false, accessPolicyId: "console_owner" }
+  },
+  assistantSurfaces: {
+    app: {
+      settingsSurfaceId: "console",
+      configScope: "global"
+    }
+  }
+};
+`,
+      "utf8"
+    );
+
     await assert.rejects(
       () =>
         buildTemplateContext({
           appRoot,
           options: {
             surface: "app",
-            "settings-surface": "console",
+            "settings-surface": "admin",
             "config-scope": "global"
           }
         }),