@descix/cli 3.0.0 → 3.0.2

package/lib/workspace-config.js

@@ -1,6 +1,6 @@
 import * as fs from 'fs/promises';
 import * as path from 'path';
-import { ENV_ORIGINS, resolveWorkspaceApps } from '@descix/app-sdk/dev';
+import { ENV_ORIGINS, resolveWorkspaceApps, resolveWorkspaceAppsFrom, assertSiteStatic } from '@descix/app-sdk/dev';
 import { resolveOrigin } from './origin.js';
 // The one canonical KB-sync surface, from its owner. The example in requireContext() is a remedy
 // a stuck developer will copy verbatim, so it must resolve to the live verb rather than a literal
@@ -860,9 +860,9 @@ export class WorkspaceConfig {
    * Update the app's site config on env.app (v3 single-app).
    *
    * Parallel to setMicroservicePort(), but operates on the entry's site.{} slot. This is the
-   * canonical write path for site.static — the relative path the dev gateway's
-   * staticSitePlugin serves at /p/{appId}/ (see createViteProxyConfig: site.static is
-   * resolved against the app's localPath; "." means the localPath itself) — and for
+   * canonical write path for site.static — the path, relative to the workspace root (the repo
+   * root; "." means the root itself), that the dev gateway's staticSitePlugin serves at
+   * /p/{appId}/; anything that is not a plain relative path is refused (assertSiteStatic) — and for
    * site.port / site.protocol, the dev-server upstream the gateway proxies /p/{appId} to.
    * Backs the `descix app set-site` command, closing the site.static workspace gap without
    * hand-editing workspace.json (the org rule forbids hand edits — CEO-D-2026-06-02-SSGPOD-SITE-PREPROD).
@@ -898,6 +898,12 @@ export class WorkspaceConfig {
     const settingPort = 'port' in fields && fields.port !== null && fields.port !== undefined;
     const settingProtocol = 'protocol' in fields && fields.protocol !== null && fields.protocol !== undefined;
 
+    // site.static path rule — ONE owner (@descix/app-sdk/dev siteStatic.js), applied before
+    // anything is computed so a refusal writes NOTHING.
+    if (settingStatic) {
+      assertSiteStatic(fields.static, { subject: '--static', remedy: `Nothing was written for ${appId}.` });
+    }
+
     if (settingProtocol && fields.protocol !== 'http' && fields.protocol !== 'https') {
       throw new Error(
         `site.protocol must be "http" or "https" (got ${JSON.stringify(fields.protocol)}). ` +
@@ -950,6 +956,97 @@ export class WorkspaceConfig {
     return this.save();
   }
 
+  /**
+   * THE ONE WRITER of a gateway workspace's repo list: env.gateway.shell and env.gateway.appRepos[]
+   * (DeSciXCore#9). Backs `descix config gateway set-shell | add-repo | remove-repo`, so a gateway
+   * workspace.json is never hand-edited.
+   *
+   * Paths are relative to THIS workspace's root (sibling checkouts: "../<repo>") and are stored in
+   * normalized form; two spellings of one directory are one repo.
+   *
+   * Refused loud, and a refusal writes NOTHING:
+   *  - this workspace holds env.app — a single-app workspace is not a gateway;
+   *  - add-repo of a repo already listed (or already the shell);
+   *  - remove-repo of a repo that is not listed;
+   *  - any resulting listed repo that the gateway could not read: the candidate config is resolved
+   *    by @descix/app-sdk/dev resolveWorkspaceAppsFrom — the SAME function the gateway reads it with
+   *    — so an absolute path, a repo without its own .descix/workspace.json, one with no env.app, a
+   *    bad site.static, or one appId listed twice is refused by the reader's own rule.
+   *
+   * @param {'set-shell'|'add-repo'|'remove-repo'} op
+   * @param {string|null} repo - repo root relative to the workspace root; null with set-shell removes the shell
+   * @returns {Promise<string>} Path to saved config (from save())
+   */
+  async setGatewayRepo(op, repo) {
+    const OPS = ['set-shell', 'add-repo', 'remove-repo'];
+    if (!OPS.includes(op)) throw new Error(`Unknown gateway op "${op}" (expected one of: ${OPS.join(', ')}).`);
+    const root = this.workspaceRoot;
+    if (!root) throw new Error('Workspace root not set. Load the config with WorkspaceConfig.load() first.');
+    const configPath = path.join(root, '.descix', 'workspace.json');
+
+    if (this.env?.app?.appId) {
+      throw new Error(
+        `${configPath} is a single-app workspace (env.app "${this.env.app.appId}"), not a gateway workspace.\n` +
+        'env.gateway.shell and env.gateway.appRepos belong to a gateway workspace, which holds no env.app of\n' +
+        'its own and lists sibling app repos. Run this verb from the gateway workspace\'s root. Nothing was written.'
+      );
+    }
+
+    const removingShell = op === 'set-shell' && (repo === null || repo === undefined);
+    if (!removingShell && (typeof repo !== 'string' || repo.trim() === '')) {
+      throw new Error(`descix config gateway ${op} needs a repo path (relative to ${root}). Nothing was written.`);
+    }
+    // Normalized relative form: "../repo-a/", "./../repo-a" and "../repo-a" are one repo. An absolute
+    // path is passed through untouched so the reader's own rule refuses it below.
+    const normalize = (rel) => (path.isAbsolute(rel) ? rel : (path.normalize(rel).replace(/[\\/]+$/, '') || '.'));
+    const dirOf = (rel) => path.resolve(root, rel);
+    const rel = removingShell ? null : normalize(repo.trim());
+
+    const gateway = { ...(this.env?.gateway || {}) };
+    const appRepos = [...(gateway.appRepos || [])];
+
+    if (op === 'set-shell') {
+      if (rel === null) delete gateway.shell;
+      else gateway.shell = rel;
+    } else if (op === 'add-repo') {
+      if (!path.isAbsolute(rel)) {
+        const listed = appRepos.find((r) => dirOf(r) === dirOf(rel));
+        if (listed) {
+          throw new Error(`"${repo}" is already listed in env.gateway.appRepos (as "${listed}") in ${configPath}. Nothing was written.`);
+        }
+        if (gateway.shell && dirOf(gateway.shell) === dirOf(rel)) {
+          throw new Error(
+            `"${repo}" is this workspace's env.gateway.shell in ${configPath}; the shell is served at / and is not ` +
+            'also listed in appRepos. Nothing was written.'
+          );
+        }
+      }
+      appRepos.push(rel);
+    } else {
+      const at = path.isAbsolute(rel) ? -1 : appRepos.findIndex((r) => dirOf(r) === dirOf(rel));
+      if (at < 0) {
+        throw new Error(
+          `"${repo}" is not listed in env.gateway.appRepos in ${configPath}.\n` +
+          `  Listed: ${appRepos.length ? appRepos.join(', ') : '(none)'}\nNothing was written.`
+        );
+      }
+      appRepos.splice(at, 1);
+    }
+
+    if (appRepos.length) gateway.appRepos = appRepos;
+    else delete gateway.appRepos;
+
+    const candidateEnv = { ...(this.env || {}) };
+    if (Object.keys(gateway).length) candidateEnv.gateway = gateway;
+    else delete candidateEnv.gateway;
+
+    // Validate the WHOLE resulting repo set with the reader's own function before anything is saved.
+    resolveWorkspaceAppsFrom(root, { env: candidateEnv });
+
+    this.env = candidateEnv;
+    return this.save();
+  }
+
   /**
    * Persistently set the target environment in workspace.json.
    *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@descix/cli",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "DeSciX CLI and MCP Server - Unified command-line interface for DeSciX platform",
   "repository": {
     "type": "git",
@@ -17,6 +17,7 @@
     "test": "node --experimental-test-module-mocks --test \"tests/*.test.js\"",
     "pack": "npm pack",
     "check:doc-paths": "node scripts/check-doc-paths.js",
+    "generate:cli-verbs": "node scripts/generate-cli-verbs.mjs",
     "briefer": "node scripts/briefer/run.mjs"
   },
   "keywords": [
@@ -30,7 +31,7 @@
   "author": "DeSciX",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@descix/app-sdk": "^0.3.0",
+    "@descix/app-sdk": "^0.3.3",
     "@descix/sdk": "^3.0.0",
     "@modelcontextprotocol/sdk": "^1.25.1",
     "axios": "^1.7.9",