@pleri/olam-cli 0.1.45 → 0.1.47

package/dist/image-digests.json

@@ -1,8 +1,8 @@
 {
   "auth": "sha256:4e2ea22c5ef026ecf7b10892fbe381384b32e83636962d86d9ab1fc572972f8e",
-  "devbox": "sha256:9363a1979d7df0ed2b2c964c183ba3e739383c146416f27b1ceb976f64648fd9",
+  "devbox": "sha256:4148e0bc06774b3970a12f2257d8ebb381bb51b898f61351c1a6d19ee4b948c9",
   "host-cp": "sha256:29d2e544db7fabae259a0311a76ff367ee5e2ca5f48e9640ebefaf3c5997bda3",
   "$schema_version": 1,
-  "$published_version": "0.1.45",
+  "$published_version": "0.1.47",
   "$registry": "ghcr.io/pleri"
 }

package/dist/index.js

@@ -7508,9 +7508,10 @@ import * as fs12 from "node:fs";
 import * as os8 from "node:os";
 import * as path13 from "node:path";
 import { globSync } from "node:fs";
-function copyClaudeConfig(workspacePath, homeDir) {
+function copyClaudeConfig(workspacePath, homeDir, configCtx) {
   const sourceClaudeDir = path13.join(homeDir ?? os8.homedir(), ".claude");
   const destClaudeDir = path13.join(workspacePath, ".claude-host-config");
+  void configCtx;
   if (!fs12.existsSync(sourceClaudeDir))
     return;
   fs12.mkdirSync(destClaudeDir, { recursive: true });
@@ -7550,6 +7551,113 @@ function copyClaudeConfig(workspacePath, homeDir) {
   if (fs12.existsSync(scriptsDir)) {
     copyDirRecursive(scriptsDir, path13.join(destClaudeDir, "scripts"));
   }
+  applyProjectClaudeOverlay(workspacePath, destClaudeDir);
+  writeStrippedMcpServersSnapshot(homeDir ?? os8.homedir(), workspacePath, destClaudeDir);
+}
+function applyProjectClaudeOverlay(workspacePath, destClaudeDir) {
+  const projectClaudeDir = path13.join(workspacePath, ".claude");
+  if (!fs12.existsSync(projectClaudeDir))
+    return;
+  const projectSettingsPath = path13.join(projectClaudeDir, "settings.json");
+  const destSettingsPath = path13.join(destClaudeDir, "settings.json");
+  if (fs12.existsSync(projectSettingsPath)) {
+    try {
+      const projectSettings = JSON.parse(fs12.readFileSync(projectSettingsPath, "utf-8"));
+      delete projectSettings["hooks"];
+      const existing = fs12.existsSync(destSettingsPath) ? JSON.parse(fs12.readFileSync(destSettingsPath, "utf-8")) : {};
+      const merged = { ...existing, ...projectSettings, hooks: existing["hooks"] };
+      fs12.writeFileSync(destSettingsPath, JSON.stringify(merged, null, 2));
+    } catch {
+    }
+  }
+  const projectClaudeMd = path13.join(projectClaudeDir, "CLAUDE.md");
+  if (fs12.existsSync(projectClaudeMd)) {
+    fs12.copyFileSync(projectClaudeMd, path13.join(destClaudeDir, "CLAUDE.md"));
+  }
+  const projectAgentsMd = path13.join(projectClaudeDir, "AGENTS.md");
+  if (fs12.existsSync(projectAgentsMd)) {
+    fs12.copyFileSync(projectAgentsMd, path13.join(destClaudeDir, "AGENTS.md"));
+  }
+  for (const subdir of ["rules", "agents", "plugins", "skills", "scripts"]) {
+    const projectSubdir = path13.join(projectClaudeDir, subdir);
+    if (fs12.existsSync(projectSubdir)) {
+      const skip = subdir === "plugins" ? SKIP_FILES : /* @__PURE__ */ new Set();
+      copyDirRecursive(projectSubdir, path13.join(destClaudeDir, subdir), 0, skip);
+    }
+  }
+}
+function stripMcpServers(mcpServers) {
+  const out = {};
+  for (const [svc, entry] of Object.entries(mcpServers)) {
+    if (!entry || typeof entry !== "object")
+      continue;
+    const stripped = {};
+    for (const [key, value] of Object.entries(entry)) {
+      if (!MCP_SERVER_ALLOWLIST.has(key))
+        continue;
+      if (key === "args") {
+        if (Array.isArray(value)) {
+          stripped.args = value.filter((v) => typeof v === "string");
+        }
+      } else if (key === "command" && typeof value === "string") {
+        stripped.command = value;
+      } else if (key === "type" && typeof value === "string") {
+        stripped.type = value;
+      } else if (key === "url" && typeof value === "string") {
+        stripped.url = value;
+      }
+    }
+    out[svc] = stripped;
+  }
+  return out;
+}
+function writeStrippedMcpServersSnapshot(homeDir, workspacePath, destClaudeDir) {
+  const hostMcpServers = readMcpServersFromFile(path13.join(homeDir, ".claude.json"));
+  const projectMcpServers = readMcpServersFromFile(path13.join(workspacePath, ".mcp.json"));
+  if (Object.keys(hostMcpServers).length === 0 && Object.keys(projectMcpServers).length === 0) {
+    return;
+  }
+  const stripped = {
+    ...stripMcpServers(hostMcpServers),
+    ...stripMcpServers(projectMcpServers)
+  };
+  const output = { mcpServers: stripped };
+  fs12.writeFileSync(path13.join(destClaudeDir, ".claude.json"), JSON.stringify(output, null, 2), { mode: 384 });
+}
+function writeWorldEntitlementsJson(workspacePath, configCtx) {
+  const olamDir = path13.join(workspacePath, ".olam");
+  fs12.mkdirSync(olamDir, { recursive: true });
+  const resolvedRepos = configCtx.repos.map((repo) => {
+    const repoEntitlement = repo;
+    return {
+      name: repo.name,
+      entitled_mcps: repoEntitlement.entitled_mcps !== void 0 ? repoEntitlement.entitled_mcps : configCtx.worlds_default.entitled_mcps,
+      agent_teams_enabled: repoEntitlement.agent_teams_enabled !== void 0 ? repoEntitlement.agent_teams_enabled : configCtx.worlds_default.agent_teams_enabled
+    };
+  });
+  const resolved = {
+    multi_tenant: configCtx.multi_tenant,
+    worlds_default: configCtx.worlds_default,
+    repos: resolvedRepos
+  };
+  const filePath = path13.join(olamDir, "world-entitlements.json");
+  fs12.writeFileSync(filePath, JSON.stringify(resolved, null, 2), { mode: 420 });
+}
+function readMcpServersFromFile(filePath) {
+  if (!fs12.existsSync(filePath))
+    return {};
+  try {
+    const raw = fs12.readFileSync(filePath, "utf-8");
+    if (!raw.trim())
+      return {};
+    const parsed = JSON.parse(raw);
+    const mcpServers = parsed["mcpServers"];
+    if (!mcpServers || typeof mcpServers !== "object")
+      return {};
+    return mcpServers;
+  } catch {
+    return {};
+  }
 }
 function copyDirRecursive(src, dest, depth = 0, skipFiles = /* @__PURE__ */ new Set()) {
   if (depth > 10)
@@ -7710,11 +7818,17 @@ function buildRepoEnvBundle(repoName, serviceEnv, crossRepoEnv, envOverrides) {
   const merged = { ...serviceEnv, ...injectables };
   return { merged, injectables };
 }
-function setupWorldEnv(repos, workspacePath, serviceEnv, crossRepoEnv = {}) {
+function setupWorldEnv(repos, workspacePath, serviceEnv, crossRepoEnv = {}, configCtx) {
   try {
-    copyClaudeConfig(workspacePath);
+    copyClaudeConfig(workspacePath, void 0, configCtx);
   } catch {
   }
+  if (configCtx) {
+    try {
+      writeWorldEntitlementsJson(workspacePath, configCtx);
+    } catch {
+    }
+  }
   for (const repo of repos) {
     const worktreePath = path13.join(workspacePath, repo.name);
     const sourcePath = repo.path;
@@ -7798,11 +7912,17 @@ function applyEnvOverrides(repoPath, overrides) {
     }
   }
 }
-var SKIP_FILES, DENY_PATTERNS, SKIP_DIRS, PROTECTED_ENV_KEYS, PROTECTED_ENV_KEY_SET, ENV_KEY_PATTERN, ENV_VALUE_FORBIDDEN;
+var MCP_SERVER_ALLOWLIST, SKIP_FILES, DENY_PATTERNS, SKIP_DIRS, PROTECTED_ENV_KEYS, PROTECTED_ENV_KEY_SET, ENV_KEY_PATTERN, ENV_VALUE_FORBIDDEN;
 var init_env_setup = __esm({
   "../core/dist/world/env-setup.js"() {
     "use strict";
     init_hooks_config();
+    MCP_SERVER_ALLOWLIST = /* @__PURE__ */ new Set([
+      "command",
+      "args",
+      "type",
+      "url"
+    ]);
     SKIP_FILES = /* @__PURE__ */ new Set([
       ".credentials.json",
       "credentials.json",
@@ -7820,7 +7940,9 @@ var init_env_setup = __esm({
       "sessions",
       "projects",
       "cache",
-      "backups"
+      "backups",
+      "teams",
+      "tasks"
     ]);
     PROTECTED_ENV_KEYS = [
       // Discrete host vars
@@ -9653,7 +9775,12 @@ var init_manager = __esm({
           }
         }
         try {
-          setupWorldEnv(enrichedRepos, workspacePath, serviceEnv, crossRepoEnv);
+          const configCtx = {
+            multi_tenant: this.config.multi_tenant,
+            worlds_default: this.config.worlds_default,
+            repos: enrichedRepos
+          };
+          setupWorldEnv(enrichedRepos, workspacePath, serviceEnv, crossRepoEnv, configCtx);
         } catch (err) {
           const msg = err instanceof Error ? err.message : String(err);
           console.warn(`[WorldManager] env setup failed: ${msg}`);

package/dist/mcp-server.js

@@ -25062,9 +25062,10 @@ function generateHooksConfig(hookServerUrl = DEFAULT_HOOK_SERVER_URL) {
 }
 
 // ../core/dist/world/env-setup.js
-function copyClaudeConfig(workspacePath, homeDir) {
+function copyClaudeConfig(workspacePath, homeDir, configCtx) {
   const sourceClaudeDir = path9.join(homeDir ?? os6.homedir(), ".claude");
   const destClaudeDir = path9.join(workspacePath, ".claude-host-config");
+  void configCtx;
   if (!fs6.existsSync(sourceClaudeDir))
     return;
   fs6.mkdirSync(destClaudeDir, { recursive: true });
@@ -25104,6 +25105,119 @@ function copyClaudeConfig(workspacePath, homeDir) {
   if (fs6.existsSync(scriptsDir)) {
     copyDirRecursive(scriptsDir, path9.join(destClaudeDir, "scripts"));
   }
+  applyProjectClaudeOverlay(workspacePath, destClaudeDir);
+  writeStrippedMcpServersSnapshot(homeDir ?? os6.homedir(), workspacePath, destClaudeDir);
+}
+function applyProjectClaudeOverlay(workspacePath, destClaudeDir) {
+  const projectClaudeDir = path9.join(workspacePath, ".claude");
+  if (!fs6.existsSync(projectClaudeDir))
+    return;
+  const projectSettingsPath = path9.join(projectClaudeDir, "settings.json");
+  const destSettingsPath = path9.join(destClaudeDir, "settings.json");
+  if (fs6.existsSync(projectSettingsPath)) {
+    try {
+      const projectSettings = JSON.parse(fs6.readFileSync(projectSettingsPath, "utf-8"));
+      delete projectSettings["hooks"];
+      const existing = fs6.existsSync(destSettingsPath) ? JSON.parse(fs6.readFileSync(destSettingsPath, "utf-8")) : {};
+      const merged = { ...existing, ...projectSettings, hooks: existing["hooks"] };
+      fs6.writeFileSync(destSettingsPath, JSON.stringify(merged, null, 2));
+    } catch {
+    }
+  }
+  const projectClaudeMd = path9.join(projectClaudeDir, "CLAUDE.md");
+  if (fs6.existsSync(projectClaudeMd)) {
+    fs6.copyFileSync(projectClaudeMd, path9.join(destClaudeDir, "CLAUDE.md"));
+  }
+  const projectAgentsMd = path9.join(projectClaudeDir, "AGENTS.md");
+  if (fs6.existsSync(projectAgentsMd)) {
+    fs6.copyFileSync(projectAgentsMd, path9.join(destClaudeDir, "AGENTS.md"));
+  }
+  for (const subdir of ["rules", "agents", "plugins", "skills", "scripts"]) {
+    const projectSubdir = path9.join(projectClaudeDir, subdir);
+    if (fs6.existsSync(projectSubdir)) {
+      const skip = subdir === "plugins" ? SKIP_FILES : /* @__PURE__ */ new Set();
+      copyDirRecursive(projectSubdir, path9.join(destClaudeDir, subdir), 0, skip);
+    }
+  }
+}
+var MCP_SERVER_ALLOWLIST = /* @__PURE__ */ new Set([
+  "command",
+  "args",
+  "type",
+  "url"
+]);
+function stripMcpServers(mcpServers) {
+  const out = {};
+  for (const [svc, entry] of Object.entries(mcpServers)) {
+    if (!entry || typeof entry !== "object")
+      continue;
+    const stripped = {};
+    for (const [key, value] of Object.entries(entry)) {
+      if (!MCP_SERVER_ALLOWLIST.has(key))
+        continue;
+      if (key === "args") {
+        if (Array.isArray(value)) {
+          stripped.args = value.filter((v) => typeof v === "string");
+        }
+      } else if (key === "command" && typeof value === "string") {
+        stripped.command = value;
+      } else if (key === "type" && typeof value === "string") {
+        stripped.type = value;
+      } else if (key === "url" && typeof value === "string") {
+        stripped.url = value;
+      }
+    }
+    out[svc] = stripped;
+  }
+  return out;
+}
+function writeStrippedMcpServersSnapshot(homeDir, workspacePath, destClaudeDir) {
+  const hostMcpServers = readMcpServersFromFile(path9.join(homeDir, ".claude.json"));
+  const projectMcpServers = readMcpServersFromFile(path9.join(workspacePath, ".mcp.json"));
+  if (Object.keys(hostMcpServers).length === 0 && Object.keys(projectMcpServers).length === 0) {
+    return;
+  }
+  const stripped = {
+    ...stripMcpServers(hostMcpServers),
+    ...stripMcpServers(projectMcpServers)
+  };
+  const output = { mcpServers: stripped };
+  fs6.writeFileSync(path9.join(destClaudeDir, ".claude.json"), JSON.stringify(output, null, 2), { mode: 384 });
+}
+function writeWorldEntitlementsJson(workspacePath, configCtx) {
+  const olamDir = path9.join(workspacePath, ".olam");
+  fs6.mkdirSync(olamDir, { recursive: true });
+  const resolvedRepos = configCtx.repos.map((repo) => {
+    const repoEntitlement = repo;
+    return {
+      name: repo.name,
+      entitled_mcps: repoEntitlement.entitled_mcps !== void 0 ? repoEntitlement.entitled_mcps : configCtx.worlds_default.entitled_mcps,
+      agent_teams_enabled: repoEntitlement.agent_teams_enabled !== void 0 ? repoEntitlement.agent_teams_enabled : configCtx.worlds_default.agent_teams_enabled
+    };
+  });
+  const resolved = {
+    multi_tenant: configCtx.multi_tenant,
+    worlds_default: configCtx.worlds_default,
+    repos: resolvedRepos
+  };
+  const filePath = path9.join(olamDir, "world-entitlements.json");
+  fs6.writeFileSync(filePath, JSON.stringify(resolved, null, 2), { mode: 420 });
+}
+function readMcpServersFromFile(filePath) {
+  if (!fs6.existsSync(filePath))
+    return {};
+  try {
+    const raw = fs6.readFileSync(filePath, "utf-8");
+    if (!raw.trim())
+      return {};
+    const parsed = JSON.parse(raw);
+    const mcpServers = parsed["mcpServers"];
+    if (!mcpServers || typeof mcpServers !== "object")
+      return {};
+    return mcpServers;
+  } catch {
+    return {};
+  }
 }
 var SKIP_FILES = /* @__PURE__ */ new Set([
   ".credentials.json",
@@ -25122,7 +25236,9 @@ var SKIP_DIRS = /* @__PURE__ */ new Set([
   "sessions",
   "projects",
   "cache",
-  "backups"
+  "backups",
+  "teams",
+  "tasks"
 ]);
 function copyDirRecursive(src, dest, depth = 0, skipFiles = /* @__PURE__ */ new Set()) {
   if (depth > 10)
@@ -25314,11 +25430,17 @@ function buildRepoEnvBundle(repoName, serviceEnv, crossRepoEnv, envOverrides) {
   const merged = { ...serviceEnv, ...injectables };
   return { merged, injectables };
 }
-function setupWorldEnv(repos, workspacePath, serviceEnv, crossRepoEnv = {}) {
+function setupWorldEnv(repos, workspacePath, serviceEnv, crossRepoEnv = {}, configCtx) {
   try {
-    copyClaudeConfig(workspacePath);
+    copyClaudeConfig(workspacePath, void 0, configCtx);
   } catch {
   }
+  if (configCtx) {
+    try {
+      writeWorldEntitlementsJson(workspacePath, configCtx);
+    } catch {
+    }
+  }
   for (const repo of repos) {
     const worktreePath = path9.join(workspacePath, repo.name);
     const sourcePath = repo.path;
@@ -30387,7 +30509,12 @@ var WorldManager = class {
       }
     }
     try {
-      setupWorldEnv(enrichedRepos, workspacePath, serviceEnv, crossRepoEnv);
+      const configCtx = {
+        multi_tenant: this.config.multi_tenant,
+        worlds_default: this.config.worlds_default,
+        repos: enrichedRepos
+      };
+      setupWorldEnv(enrichedRepos, workspacePath, serviceEnv, crossRepoEnv, configCtx);
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       console.warn(`[WorldManager] env setup failed: ${msg}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pleri/olam-cli",
-  "version": "0.1.45",
+  "version": "0.1.47",
   "type": "module",
   "bin": {
     "olam": "./bin/olam.cjs"