@xmarts/genius-setup 1.8.0 → 1.9.0

package/bin/genius-setup.js

@@ -123,16 +123,17 @@ function runSetup(token) {
     if (secret) { try { fs.chmodSync(p, 0o600); } catch (_) {} }
   }
 
-  // 1) ~/.genius/config.json + hook
+  // 1) ~/.genius/config.json + hook. MERGE into any existing config so state we
+  //    track across runs (e.g. managed_mcp_keys for MCP de-provisioning) survives.
   ensureDir(HOOKS_DIR);
-  const cfg = {
-    base_url: BASE,
-    token: token,
-    capture_endpoint: BASE + '/xma/genius/v1/capture/transcript',
-    inject_endpoint: BASE + '/xma/genius/v1/inject',
-  };
+  const cfgPath0 = path.join(GENIUS_DIR, 'config.json');
+  const cfg = readJson(cfgPath0);
+  cfg.base_url = BASE;
+  cfg.token = token;
+  cfg.capture_endpoint = BASE + '/xma/genius/v1/capture/transcript';
+  cfg.inject_endpoint = BASE + '/xma/genius/v1/inject';
   if (CLIENT) cfg.target_client = CLIENT;
-  writeJson(path.join(GENIUS_DIR, 'config.json'), cfg, true);  // secret: 0600
+  writeJson(cfgPath0, cfg, true);  // secret: 0600
 
   // Copy the hooks shipped alongside this script (capture + per-turn inject).
   function copyHook(fname) {
@@ -211,6 +212,97 @@ function runSetup(token) {
     log('WARN: could not write CLAUDE.md protocol (' + e.message + ')');
   }
 
+  // 5) Fan out the consultant's OTHER MCP servers (asana, clickup, google, ...).
+  //    Their non-secret shape (manifest) + per-device secret VALUES come from the
+  //    Bearer-authed /xma/genius/v1/mcp/secrets endpoint. We write Claude Code
+  //    always and Claude Desktop only if it is installed. Fail-open: a fetch
+  //    error never breaks onboarding. Re-runs (self-update / epoch bump) converge.
+  function desktopConfigPath() {
+    try {
+      if (process.platform === 'darwin')
+        return path.join(HOME, 'Library', 'Application Support', 'Claude', 'claude_desktop_config.json');
+      if (process.platform === 'win32')
+        return path.join(process.env.APPDATA || path.join(HOME, 'AppData', 'Roaming'), 'Claude', 'claude_desktop_config.json');
+      return path.join(HOME, '.config', 'Claude', 'claude_desktop_config.json');
+    } catch (_) { return ''; }
+  }
+  function mcpEntry(srv, secrets, host) {
+    // One mcpServers entry, or null if a required secret is missing (never write a
+    // half-broken server) or it is not portable to this host.
+    const env = {};
+    let ok = true;
+    (srv.env_keys || []).forEach((k) => { if (secrets[k]) env[k] = secrets[k]; else ok = false; });
+    if (!ok) return null;
+    const isHttp = srv.transport === 'http' || srv.transport === 'sse';
+    if (host === 'desktop') {
+      if (srv.host_targets !== 'both' || srv.desktop_strategy === 'skip') return null;
+      if (isHttp) return { command: 'npx', args: ['-y', 'mcp-remote', srv.url] }; // stdio-only Desktop
+      const e = { command: srv.command, args: srv.args || [] };
+      if (Object.keys(env).length) e.env = env;
+      return e;
+    }
+    if (isHttp) return { type: srv.transport, url: srv.url };
+    const e = { type: 'stdio', command: srv.command, args: srv.args || [] };
+    if (Object.keys(env).length) e.env = env;
+    return e;
+  }
+  function writeHostMcps(cfgPath, manifest, secrets, host, prevKeys) {
+    let obj = readJson(cfgPath);
+    if (!obj || typeof obj !== 'object') obj = {};
+    backup(cfgPath);
+    obj.mcpServers = obj.mcpServers || {};
+    // De-provision: drop servers WE previously managed that are no longer granted.
+    (prevKeys || []).forEach((k) => {
+      if (obj.mcpServers[k] && !manifest.find((s) => s.key === k)) delete obj.mcpServers[k];
+    });
+    const nowKeys = [];
+    manifest.forEach((srv) => {
+      const entry = mcpEntry(srv, secrets, host);
+      if (entry) { obj.mcpServers[srv.key] = entry; nowKeys.push(srv.key); }
+      else if (obj.mcpServers[srv.key] && (prevKeys || []).includes(srv.key)) {
+        delete obj.mcpServers[srv.key]; // lost its secret / portability -> remove
+      }
+    });
+    writeJson(cfgPath, obj, true); // may carry env secrets -> 0600
+    return nowKeys;
+  }
+  function provisionMcps(token) {
+    let url;
+    try { url = new URL(BASE + '/xma/genius/v1/mcp/secrets'); } catch (_) { return; }
+    const mod = url.protocol === 'http:' ? require('http') : require('https');
+    const payload = JSON.stringify({ jsonrpc: '2.0', method: 'call', id: 1, params: {} });
+    const req = mod.request({
+      hostname: url.hostname, port: url.port || (url.protocol === 'http:' ? 80 : 443),
+      path: url.pathname, method: 'POST',
+      headers: {
+        'Content-Type': 'application/json', 'Content-Length': Buffer.byteLength(payload),
+        'Authorization': 'Bearer ' + token, 'User-Agent': 'XmartsGenius-Setup/1.6.0',
+      },
+      timeout: 15000,
+    }, (res) => {
+      let data = ''; res.on('data', (c) => { data += c; });
+      res.on('end', () => {
+        try {
+          const parsed = JSON.parse(data); const r = parsed.result || parsed;
+          if (!r || r.status !== 'ok' || !Array.isArray(r.manifest)) return;
+          const secrets = r.secrets || {};
+          const cfgPath = path.join(GENIUS_DIR, 'config.json');
+          const prev = (readJson(cfgPath).managed_mcp_keys) || [];
+          const managed = writeHostMcps(path.join(HOME, '.claude.json'), r.manifest, secrets, 'code', prev);
+          const dp = desktopConfigPath();
+          if (dp && (fs.existsSync(dp) || fs.existsSync(path.dirname(dp)))) {
+            try { writeHostMcps(dp, r.manifest, secrets, 'desktop', prev); } catch (_) {}
+          }
+          try { const c = readJson(cfgPath); c.managed_mcp_keys = managed; writeJson(cfgPath, c, true); } catch (_) {}
+          if (managed.length) log('  - MCP fan-out   : ' + managed.join(', '));
+        } catch (_) {}
+      });
+    });
+    req.on('error', () => {}); req.on('timeout', () => { try { req.destroy(); } catch (_) {} });
+    req.write(payload); req.end();
+  }
+  provisionMcps(token);
+
   log('');
   log('  Xmarts Genius is set up.');
   log('  - MCP server     : beesmart_genius -> ' + BASE + '/mcp/consultant');

package/hooks/genius_inject.py

@@ -25,6 +25,7 @@ TIMEOUT = 3.5
 SELF_UPDATE_TTL = 86400  # at most once/day
 SELF_UPDATE_STAMP = os.path.join(HOME, ".genius", ".last_selfupdate")
 FORCE_STAMP = os.path.join(HOME, ".genius", ".last_forced_epoch")
+MCP_EPOCH_STAMP = os.path.join(HOME, ".genius", ".last_mcp_epoch")
 
 SESSION_PRIMER = (
     "[Xmarts Genius — Brain connected]\n"
@@ -77,9 +78,10 @@ def _inject(cfg, prompt):
         result = data.get("result", data) or {}
         return ((result.get("context", "") or ""),
                 result.get("hook_force_epoch"),
-                result.get("hook_pin_version"))
+                result.get("hook_pin_version"),
+                result.get("mcp_manifest_epoch"))
     except Exception:
-        return "", None, None
+        return "", None, None, None
 
 
 # M6 (Phase-0 integrity gate): NEVER resolve `@latest`. An unsigned `npx @latest`
@@ -101,7 +103,7 @@ def _pkg_spec(pin_version):
     return "@xmarts/genius-setup@%s" % PINNED_FALLBACK
 
 
-def _maybe_self_update(cfg, force_epoch=None, pin_version=None):
+def _maybe_self_update(cfg, force_epoch=None, pin_version=None, mcp_epoch=None):
     """Keep the consultant on the SERVER-PINNED Genius package with ZERO action: at most
     once/day, silently re-run the installer in the background. New hooks, MCP
     tools, settings and the CLAUDE.md protocol then flow automatically — the
@@ -129,6 +131,18 @@ def _maybe_self_update(cfg, force_epoch=None, pin_version=None):
                 forced = fe > last
             except Exception:
                 forced = False
+        # MCP fan-out reconvergence: a newer manifest epoch forces an immediate
+        # re-run (re-provisions ~/.claude.json + Desktop), bypassing the daily TTL.
+        if not forced and mcp_epoch:
+            try:
+                me = int(mcp_epoch)
+                lastm = 0
+                if os.path.exists(MCP_EPOCH_STAMP):
+                    with open(MCP_EPOCH_STAMP) as fh:
+                        lastm = int((fh.read() or "0").strip() or 0)
+                forced = me > lastm
+            except Exception:
+                pass
         if not forced and os.path.exists(SELF_UPDATE_STAMP) and (
                 time.time() - os.path.getmtime(SELF_UPDATE_STAMP)) < SELF_UPDATE_TTL:
             return
@@ -140,6 +154,9 @@ def _maybe_self_update(cfg, force_epoch=None, pin_version=None):
             if force_epoch:
                 with open(FORCE_STAMP, "w") as fh:
                     fh.write(str(int(force_epoch)))
+            if mcp_epoch:
+                with open(MCP_EPOCH_STAMP, "w") as fh:
+                    fh.write(str(int(mcp_epoch)))
         except Exception:
             return
         env = dict(os.environ)
@@ -174,11 +191,12 @@ def main():
         _maybe_self_update(cfg)   # TTL-only on priming
         _emit("SessionStart", SESSION_PRIMER)
     else:
-        context, force_epoch, pin_version = _inject(cfg, event.get("prompt") or "")
+        context, force_epoch, pin_version, mcp_epoch = _inject(cfg, event.get("prompt") or "")
         # The inject call already round-tripped the server, so honour any
         # admin-pushed force-update epoch here (bypasses the daily TTL) and install
-        # the exact server-pinned version (never @latest).
-        _maybe_self_update(cfg, force_epoch, pin_version)
+        # the exact server-pinned version (never @latest). A newer MCP manifest
+        # epoch likewise forces an immediate re-provision of the fan-out servers.
+        _maybe_self_update(cfg, force_epoch, pin_version, mcp_epoch)
         _emit("UserPromptSubmit", context)
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xmarts/genius-setup",
-  "version": "1.8.0",
-  "description": "One-command, self-updating onboarding for Xmarts Genius (Brain MCP + per-turn injection + automatic session/time capture + plan/committee→Brain enforcement + CLAUDE.md protocol). Secret-free onboarding via single-use setup-token exchange (no Bearer in the GET-able bootstrap). Installs once; self-updates daily so new tools/skills/features arrive with zero action.",
+  "version": "1.9.0",
+  "description": "One-command, self-updating onboarding for Xmarts Genius (Brain MCP + per-turn injection + automatic session/time capture + plan/committee→Brain enforcement + CLAUDE.md protocol + MCP fan-out: provisions the consultant's granted MCP servers into Claude Code & Claude Desktop). Secret-free onboarding via single-use setup-token exchange. Installs once; self-updates daily so new tools/skills/features arrive with zero action.",
   "bin": {
     "genius-setup": "bin/genius-setup.js"
   },