@scheduler-systems/gal-run 0.0.598 → 0.0.602

package/dist/index.cjs

@@ -3955,7 +3955,7 @@ var cliVersion, defaultApiUrl, BUILD_CONSTANTS, constants_default;
 var init_constants = __esm({
   "module_6"() {
     "use strict";
-    cliVersion = true ? "0.0.598" : "0.0.0-dev";
+    cliVersion = true ? "0.0.602" : "0.0.0-dev";
     defaultApiUrl = true ? "https://api.gal.run" : "http://localhost:3000";
     BUILD_CONSTANTS = Object.freeze([cliVersion, defaultApiUrl]);
     constants_default = BUILD_CONSTANTS;
@@ -11868,7 +11868,7 @@ function detectEnvironment() {
     return "dev";
   }
   try {
-    const version2 = true ? "0.0.598" : void 0;
+    const version2 = true ? "0.0.602" : void 0;
     if (version2 && version2.includes("-local")) {
       return "dev";
     }
@@ -14549,7 +14549,7 @@ function getId() {
 }
 function getCliVersion() {
   try {
-    return true ? "0.0.598" : "0.0.0-dev";
+    return true ? "0.0.602" : "0.0.0-dev";
   } catch {
     return "0.0.0-dev";
   }
@@ -51012,6 +51012,98 @@ var init_CoreServiceProvider = __esm({
   }
 });
 
+function buildGalHeaders(orgName, authToken) {
+  const headers = {};
+  if (authToken) {
+    headers.Authorization = `Bearer ${authToken}`;
+  }
+  if (orgName) {
+    headers["X-Gal-Organization"] = orgName;
+  }
+  return Object.keys(headers).length > 0 ? headers : void 0;
+}
+function buildHostedGalServer(orgName, authToken) {
+  const headers = buildGalHeaders(orgName, authToken);
+  return {
+    type: "http",
+    transport: "http",
+    url: GAL_MCP_URL,
+    ...headers ? { headers } : {}
+  };
+}
+function buildBrowserGalServer(projectPath2, profile, profileDir) {
+  return {
+    command: "gal",
+    args: [
+      "browser",
+      "browser-server",
+      "--project-path",
+      projectPath2,
+      ...profileDir ? ["--profile-dir", profileDir] : [],
+      ...profile ? ["--profile", profile] : []
+    ],
+    env: { ...GAL_BROWSER_MCP_ENV }
+  };
+}
+function escapeTomlString(value) {
+  return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+}
+function parseTomlSectionHeader(line) {
+  const trimmed = line.trim();
+  if (!trimmed.startsWith("[") || trimmed.startsWith("[[") || !trimmed.endsWith("]")) {
+    return null;
+  }
+  return trimmed.slice(1, -1).trim();
+}
+function isManagedCodexMcpSection(sectionName) {
+  return MANAGED_CODEX_MCP_SECTIONS.some(
+    (managedSection) => sectionName === managedSection || sectionName.startsWith(`${managedSection}.`)
+  );
+}
+function stripManagedCodexMcpSections(content) {
+  const lines = content.split(/\r?\n/);
+  const keptLines = [];
+  let skippingManagedSection = false;
+  for (const line of lines) {
+    const sectionName = parseTomlSectionHeader(line);
+    if (sectionName) {
+      skippingManagedSection = isManagedCodexMcpSection(sectionName);
+      if (skippingManagedSection) {
+        continue;
+      }
+    }
+    if (!skippingManagedSection) {
+      keptLines.push(line);
+    }
+  }
+  return keptLines.join("\n").trimEnd();
+}
+function renderCodexManagedMcpConfig(projectPath2, _orgName, _authToken) {
+  const lines = [
+    "# GAL-managed MCP servers",
+    "[mcp_servers.gal]",
+    'command = "npx"',
+    'args = ["-y", "gal-run-mcp@latest"]',
+    "startup_timeout_sec = 45.0"
+  ];
+  for (const [serverName, profile] of [
+    ["browser-gal", void 0],
+    ["browser-slack", "slack"]
+  ]) {
+    lines.push(
+      "",
+      `[mcp_servers.${serverName}]`,
+      'command = "gal"',
+      `args = ["browser", "browser-server", "--project-path", "${escapeTomlString(projectPath2)}"${profile ? `, "--profile", "${profile}"` : ""}]`,
+      "",
+      `[mcp_servers.${serverName}.env]`,
+      'NO_COLOR = "1"',
+      'GAL_SKIP_ORG_AUTO_UPGRADE = "1"'
+    );
+  }
+  return `${lines.join("\n").trimEnd()}
+`;
+}
 function resolveEnvVars(value) {
   let resolved = value.replace(/^~(?=\/|$)/, (0, import_os15.homedir)());
   resolved = resolved.replace(/\$HOME\b/g, (0, import_os15.homedir)());
@@ -51058,7 +51150,7 @@ function readMcpJsonFile(mcpPath) {
     return { mcpServers: {} };
   }
 }
-function mergeMcpConfigs(existing, orgServers, orgName) {
+function mergeMcpConfigs(existing, orgServers, orgName, authToken) {
   const merged = { ...existing };
   const existingServers = existing.mcpServers && typeof existing.mcpServers === "object" ? { ...existing.mcpServers } : {};
   const orgServerNames = new Set(Object.keys(orgServers));
@@ -51074,12 +51166,7 @@ function mergeMcpConfigs(existing, orgServers, orgName) {
     mergedServers[name] = config2;
     orgServersApplied++;
   }
-  mergedServers["gal"] = {
-    type: "http",
-    transport: "http",
-    url: "https://api.gal.run/mcp",
-    ...orgName ? { headers: { "X-Gal-Organization": orgName } } : {}
-  };
+  mergedServers["gal"] = buildHostedGalServer(orgName, authToken);
   for (const [name, config2] of Object.entries(mergedServers)) {
     mergedServers[name] = resolveEnvVarsDeep(config2);
   }
@@ -51100,14 +51187,15 @@ function parseOrgMcpServers(mcpContent) {
   }
   return {};
 }
-function syncMcpConfig(directory, mcpContent, orgName) {
+function syncMcpConfig(directory, mcpContent, orgName, authToken) {
   const mcpPath = (0, import_path16.join)(directory, ".mcp.json");
   const existing = readMcpJsonFile(mcpPath);
   const orgServers = parseOrgMcpServers(mcpContent);
   const { merged, orgServersApplied, preservedUserServers } = mergeMcpConfigs(
     existing,
     orgServers,
-    orgName
+    orgName,
+    authToken
   );
   (0, import_fs18.writeFileSync)(mcpPath, JSON.stringify(merged, null, 2) + "\n", "utf-8");
   return {
@@ -51117,6 +51205,21 @@ function syncMcpConfig(directory, mcpContent, orgName) {
     galServerIncluded: true
   };
 }
+function syncCodexMcpConfig(directory, projectPath2, orgName, authToken) {
+  const codexDir = (0, import_path16.join)(directory, ".codex");
+  const codexConfigPath = (0, import_path16.join)(codexDir, "config.toml");
+  if (!(0, import_fs18.existsSync)(codexDir)) {
+    (0, import_fs18.mkdirSync)(codexDir, { recursive: true });
+  }
+  const existingContent = (0, import_fs18.existsSync)(codexConfigPath) ? (0, import_fs18.readFileSync)(codexConfigPath, "utf-8") : "";
+  const preservedContent = stripManagedCodexMcpSections(existingContent);
+  const managedContent = renderCodexManagedMcpConfig(projectPath2, orgName, authToken);
+  const nextContent = preservedContent ? `${preservedContent}
+
+${managedContent}` : managedContent;
+  (0, import_fs18.writeFileSync)(codexConfigPath, nextContent, "utf-8");
+  return codexConfigPath;
+}
 function injectPlaywrightStorageState(directory, storageStatePath) {
   const mcpPath = (0, import_path16.join)(directory, ".mcp.json");
   const config2 = readMcpJsonFile(mcpPath);
@@ -51146,50 +51249,39 @@ function isPlaywrightMcpEntry(entry) {
 function injectBrowserGalServer(directory, projectPath2, profileDir) {
   const mcpPath = (0, import_path16.join)(directory, ".mcp.json");
   const config2 = readMcpJsonFile(mcpPath);
-  const sharedProfileArgs = profileDir ? ["--profile-dir", profileDir] : [];
   const existingServers = { ...config2.mcpServers ?? {} };
   delete existingServers["browser-work"];
   delete existingServers["browser-work-slack"];
-  if (!existingServers["browser-slack"]) {
-    existingServers["browser-slack"] = {
-      command: "gal",
-      args: [
-        "browser",
-        "browser-server",
-        "--project-path",
-        projectPath2,
-        ...sharedProfileArgs,
-        "--profile",
-        "slack"
-      ]
-    };
-  }
   const servers = {
     ...existingServers,
+    "browser-slack": buildBrowserGalServer(projectPath2, "slack", profileDir),
     "browser-gal": {
       // gal browser-server is a hidden subcommand under `gal browser`,
       // so no separate gal-browser-server binary needs to be distributed.
-      command: "gal",
-      args: [
-        "browser",
-        "browser-server",
-        "--project-path",
-        projectPath2,
-        ...sharedProfileArgs
-      ]
+      ...buildBrowserGalServer(projectPath2, void 0, profileDir)
     }
   };
   const updated = { ...config2, mcpServers: servers };
   (0, import_fs18.writeFileSync)(mcpPath, JSON.stringify(updated, null, 2) + "\n", "utf-8");
   return mcpPath;
 }
-var import_fs18, import_path16, import_os15;
+var import_fs18, import_path16, import_os15, GAL_MCP_URL, GAL_BROWSER_MCP_ENV, MANAGED_CODEX_MCP_SECTIONS;
 var init_mcp_config_writer = __esm({
   "module_340"() {
     "use strict";
     import_fs18 = require("fs");
     import_path16 = require("path");
     import_os15 = require("os");
+    GAL_MCP_URL = "https://api.gal.run/mcp";
+    GAL_BROWSER_MCP_ENV = {
+      NO_COLOR: "1",
+      GAL_SKIP_ORG_AUTO_UPGRADE: "1"
+    };
+    MANAGED_CODEX_MCP_SECTIONS = [
+      "mcp_servers.gal",
+      "mcp_servers.browser-gal",
+      "mcp_servers.browser-slack"
+    ];
   }
 });
 
@@ -58500,12 +58592,20 @@ function writeClaudeConfig(directory, configData, syncedFiles, syncedItems, orgN
     }
   }
 }
-function writeCodexConfig(directory, configData, syncedFiles, syncedItems) {
+function writeCodexConfig(directory, configData, syncedFiles, syncedItems, orgName, authToken) {
   const codexDir = (0, import_path27.join)(directory, ".codex");
-  const codexDirExists = (0, import_fs29.existsSync)(codexDir);
-  if (!codexDirExists) {
-    return;
+  if (!(0, import_fs29.existsSync)(codexDir)) {
+    (0, import_fs29.mkdirSync)(codexDir, { recursive: true });
   }
+  const codexConfigPath = syncCodexMcpConfig(directory, directory, orgName, authToken);
+  const codexConfigRelativePath = codexConfigPath.replace(`${directory}/`, "");
+  syncedFiles.push(codexConfigRelativePath);
+  syncedItems.push({
+    path: codexConfigRelativePath,
+    type: "mcp",
+    name: "config.toml",
+    platform: "codex"
+  });
   if (configData.skills && configData.skills.length > 0) {
     const skillsDir = (0, import_path27.join)(codexDir, "skills");
     if (!(0, import_fs29.existsSync)(skillsDir)) {
@@ -58771,6 +58871,8 @@ async function maybeShowSyncCopilotHint(configRepo, orgName, platformFilter) {
 async function pullApprovedConfig(configRepo, authRepo, orgName, directory, platformFilter, apiUrl, options) {
   const outputMode = options?.outputMode ?? "full";
   const isFullOutput = outputMode === "full";
+  const cliConfig = ConfigManager.load();
+  const authToken = cliConfig.authToken;
   if (isFullOutput) {
     console.log(source_default.green("\n\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550"));
     console.log(source_default.green("  GAL Config Sync - Convenience Package"));
@@ -58910,7 +59012,7 @@ async function pullApprovedConfig(configRepo, authRepo, orgName, directory, plat
         );
         writeApprovedClaudeConfig(directory, configData);
       } else if (platform5 === "codex") {
-        writeCodexConfig(directory, configData, platformFiles, platformItems);
+        writeCodexConfig(directory, configData, platformFiles, platformItems, orgName, authToken);
       } else if (platform5 === "copilot") {
         const copilotItems = [];
         writeCopilotConfig(directory, {
@@ -59096,7 +59198,7 @@ async function pullApprovedConfig(configRepo, authRepo, orgName, directory, plat
     const mcpContent = mcpSource?.mcp?.content;
     const mcpSpinner = isFullOutput ? ora("  mcp: Syncing MCP server configs...").start() : null;
     try {
-      const mcpResult = syncMcpConfig(directory, mcpContent || void 0, orgName);
+      const mcpResult = syncMcpConfig(directory, mcpContent || void 0, orgName, authToken);
       allSyncedFiles.push(".mcp.json");
       allSyncedItems.push({
         path: ".mcp.json",
@@ -59183,7 +59285,7 @@ async function pullApprovedConfig(configRepo, authRepo, orgName, directory, plat
     const codexFiles = [];
     const codexItems = [];
     try {
-      writeCodexConfig(directory, claudeConfigData, codexFiles, codexItems);
+      writeCodexConfig(directory, claudeConfigData, codexFiles, codexItems, orgName, authToken);
       const codexHash = calculateConfigHash(JSON.stringify(claudeConfigData));
       platformStates.set("codex", {
         lastSyncHash: codexHash,
@@ -59228,9 +59330,9 @@ async function pullApprovedConfig(configRepo, authRepo, orgName, directory, plat
   }
   let dispatchRules;
   try {
-    const cliConfig = ConfigManager.load();
-    const effectiveApiUrl = apiUrl || cliConfig.apiUrl || defaultApiUrl4;
-    const token = cliConfig.authToken;
+    const cliConfig2 = ConfigManager.load();
+    const effectiveApiUrl = apiUrl || cliConfig2.apiUrl || defaultApiUrl4;
+    const token = cliConfig2.authToken;
     if (token) {
       const resp = await fetch(`${effectiveApiUrl}/organizations/${encodeURIComponent(orgName)}/dispatch-rules`, {
         headers: { "Authorization": `Bearer ${token}`, "Content-Type": "application/json" }
@@ -81799,7 +81901,8 @@ var init_command_registry = __esm({
 });
 
 function printBranding() {
-  if (process.argv.includes("--json") || process.argv.includes("-j") || process.argv.includes("--auto") || process.argv.includes("--no-color") || process.env.CI === "true" || process.env.NO_COLOR !== void 0) {
+  const hiddenMcpEntrypoint = process.argv.includes("browser-server");
+  if (hiddenMcpEntrypoint || process.stdin.isTTY !== true || process.stdout.isTTY !== true || process.argv.includes("--json") || process.argv.includes("-j") || process.argv.includes("--auto") || process.argv.includes("--no-color") || process.env.CI === "true" || process.env.NO_COLOR !== void 0) {
     return;
   }
   console.log(
@@ -82424,7 +82527,7 @@ var init_index = __esm({
   }
 });
 
-var cliVersion10 = true ? "0.0.598" : "0.0.0-dev";
+var cliVersion10 = true ? "0.0.602" : "0.0.0-dev";
 var args = process.argv.slice(2);
 var requestedGlobalHelp = args.length === 1 && (args[0] === "--help" || args[0] === "-h");
 var requestedVersion = args.length === 1 && (args[0] === "--version" || args[0] === "-V");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scheduler-systems/gal-run",
-  "version": "0.0.598",
+  "version": "0.0.602",
   "description": "GAL CLI - Command-line tool for managing AI agent configurations across your organization",
   "license": "Elastic-2.0",
   "private": false,