@useorgx/wizard 0.1.58 → 0.1.60

package/dist/cli.js

@@ -2,7 +2,7 @@
 
 // src/cli.ts
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="66b240e6-4f09-5817-86f1-bac0012af8cb")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="7bd631ed-f07c-5a2e-95a9-249e72dc087a")}catch(e){}}();
 import * as clack from "@clack/prompts";
 import { spawnSync as spawnSync5 } from "child_process";
 import { readFileSync as readFileSync10 } from "fs";
@@ -32,7 +32,9 @@ import { join } from "path";
 var ORGX_HOSTED_MCP_KEY = "orgx";
 var ORGX_LOCAL_MCP_KEY = "orgx-openclaw";
 var ORGX_HOSTED_MCP_URL = "https://mcp.useorgx.com/mcp";
-var ORGX_CODEX_MCP_URL = `${ORGX_HOSTED_MCP_URL}?profile=commander`;
+var ORGX_CODEX_MCP_URL = ORGX_HOSTED_MCP_URL;
+var ORGX_CODEX_TOOL_PROFILE_HEADER = "x-orgx-tool-profile";
+var ORGX_CODEX_TOOL_PROFILE = "commander";
 var ORGX_HOSTED_MCP_HEALTH_URL = "https://mcp.useorgx.com/health";
 var ORGX_HOSTED_OAUTH_BASE_URL = "https://mcp.useorgx.com";
 var ORGX_HOSTED_OAUTH_AUTHORIZE_URL = `${ORGX_HOSTED_OAUTH_BASE_URL}/authorize`;
@@ -2179,6 +2181,7 @@ import { dirname as dirname4, join as join4 } from "path";
 
 // src/surfaces/mcp-config.ts
 import * as TOML from "@iarna/toml";
+var ORGX_LEGACY_CODEX_MCP_URL = `${ORGX_HOSTED_MCP_URL}?profile=commander`;
 function cloneConfigCollection(config, key) {
   return { ...readObject(config[key]) };
 }
@@ -2441,12 +2444,20 @@ function stringifyTomlDocument(document) {
   return rendered.endsWith("\n") ? rendered : `${rendered}
 `;
 }
-function upsertCodexEntry(servers, key, url) {
+function upsertCodexEntry(servers, key, url, oauthResource, toolProfile) {
   const current = readObject(servers[key]);
   const next = {
     ...current,
     url
   };
+  if (oauthResource) {
+    next.oauth_resource = oauthResource;
+  }
+  if (toolProfile) {
+    const httpHeaders = readObject(next.http_headers);
+    httpHeaders[ORGX_CODEX_TOOL_PROFILE_HEADER] = toolProfile;
+    next.http_headers = httpHeaders;
+  }
   delete next.command;
   delete next.args;
   delete next.startup_timeout_sec;
@@ -2466,7 +2477,13 @@ function removeLegacyCodexEntries(servers) {
 function patchCodexConfigToml(input, localMcpUrl) {
   const current = parseTomlDocument(input);
   const servers = readObject(current.mcp_servers);
-  upsertCodexEntry(servers, ORGX_HOSTED_MCP_KEY, ORGX_CODEX_MCP_URL);
+  upsertCodexEntry(
+    servers,
+    ORGX_HOSTED_MCP_KEY,
+    ORGX_CODEX_MCP_URL,
+    ORGX_HOSTED_MCP_URL,
+    ORGX_CODEX_TOOL_PROFILE
+  );
   if (localMcpUrl) {
     upsertCodexEntry(servers, ORGX_LOCAL_MCP_KEY, localMcpUrl);
   }
@@ -2474,27 +2491,115 @@ function patchCodexConfigToml(input, localMcpUrl) {
   current.mcp_servers = servers;
   return stringifyTomlDocument(current);
 }
-function migrateCodexHostedMcpProfile(input) {
+function migrateCodexHostedMcpConnection(input) {
   if (!input) return input;
   const current = parseTomlDocument(input);
   const servers = readObject(current.mcp_servers);
   const hosted = readObject(servers[ORGX_HOSTED_MCP_KEY]);
-  if (hosted.url !== ORGX_HOSTED_MCP_URL) return input;
+  if (hosted.url !== ORGX_HOSTED_MCP_URL && hosted.url !== ORGX_LEGACY_CODEX_MCP_URL) {
+    return input;
+  }
   const lines = input.match(/.*(?:\r\n|\n|$)/g)?.filter((line) => line.length > 0) ?? [];
-  let inOrgxSection = false;
-  let changed = false;
-  const nextLines = lines.map((line) => {
+  let activeSection = "other";
+  let orgxSectionEnd = lines.length;
+  let headersSectionStart = -1;
+  let headersSectionEnd = lines.length;
+  let urlIndex = -1;
+  let oauthResourceIndex = -1;
+  let inlineHeadersIndex = -1;
+  let profileHeaderIndex = -1;
+  for (const [index, line] of lines.entries()) {
     if (/^\s*\[/.test(line)) {
-      inOrgxSection = /^\s*\[mcp_servers\.(?:orgx|"orgx")\]\s*(?:#.*)?(?:\r?\n)?$/.test(line);
-      return line;
+      if (activeSection === "orgx" && orgxSectionEnd === lines.length) {
+        orgxSectionEnd = index;
+      }
+      if (activeSection === "headers" && headersSectionEnd === lines.length) {
+        headersSectionEnd = index;
+      }
+      if (/^\s*\[mcp_servers\.(?:orgx|"orgx")\]\s*(?:#.*)?(?:\r?\n)?$/.test(line)) {
+        activeSection = "orgx";
+      } else if (/^\s*\[mcp_servers\.(?:orgx|"orgx")\.http_headers\]\s*(?:#.*)?(?:\r?\n)?$/.test(line)) {
+        activeSection = "headers";
+        headersSectionStart = index;
+      } else {
+        activeSection = "other";
+      }
+      continue;
+    }
+    if (activeSection === "orgx") {
+      if (/^\s*url\s*=/.test(line)) urlIndex = index;
+      if (/^\s*oauth_resource\s*=/.test(line)) oauthResourceIndex = index;
+      if (/^\s*http_headers\s*=/.test(line)) inlineHeadersIndex = index;
+    } else if (activeSection === "headers" && /^\s*(?:"x-orgx-tool-profile"|x-orgx-tool-profile)\s*=/.test(line)) {
+      profileHeaderIndex = index;
     }
-    if (!inOrgxSection || changed) return line;
-    const match = line.match(/^(\s*url\s*=\s*)(["'])(https:\/\/mcp\.useorgx\.com\/mcp)\2([ \t]*(?:#.*)?)(\r?\n)?$/);
-    if (!match) return line;
+  }
+  if (urlIndex < 0) return input;
+  const urlMatch = lines[urlIndex]?.match(
+    /^(\s*url\s*=\s*)(["'])(https:\/\/mcp\.useorgx\.com\/mcp(?:\?profile=commander)?)\2([ \t]*(?:#.*)?)(\r?\n)?$/
+  );
+  if (!urlMatch) return input;
+  let changed = false;
+  if (urlMatch[3] !== ORGX_CODEX_MCP_URL) {
+    lines[urlIndex] = `${urlMatch[1]}${urlMatch[2]}${ORGX_CODEX_MCP_URL}${urlMatch[2]}${urlMatch[4]}${urlMatch[5] ?? ""}`;
     changed = true;
-    return `${match[1]}${match[2]}${ORGX_CODEX_MCP_URL}${match[2]}${match[4]}${match[5] ?? ""}`;
-  });
-  return changed ? nextLines.join("") : input;
+  }
+  const httpHeaders = readObject(hosted.http_headers);
+  const configuredProfile = httpHeaders[ORGX_CODEX_TOOL_PROFILE_HEADER];
+  if (inlineHeadersIndex >= 0 && configuredProfile !== ORGX_CODEX_TOOL_PROFILE) {
+    return input;
+  }
+  if (oauthResourceIndex >= 0) {
+    const oauthResourceMatch = lines[oauthResourceIndex]?.match(
+      /^(\s*oauth_resource\s*=\s*)(["'])([^"']*)\2([ \t]*(?:#.*)?)(\r?\n)?$/
+    );
+    if (!oauthResourceMatch) return input;
+    if (oauthResourceMatch[3] !== ORGX_HOSTED_MCP_URL) {
+      lines[oauthResourceIndex] = `${oauthResourceMatch[1]}${oauthResourceMatch[2]}${ORGX_HOSTED_MCP_URL}${oauthResourceMatch[2]}${oauthResourceMatch[4]}${oauthResourceMatch[5] ?? ""}`;
+      changed = true;
+    }
+  } else {
+    const lineEnding = urlMatch[5] ?? (input.includes("\r\n") ? "\r\n" : "\n");
+    if (!urlMatch[5]) {
+      lines[urlIndex] = `${lines[urlIndex]}${lineEnding}`;
+    }
+    const indent = urlMatch[1]?.match(/^\s*/)?.[0] ?? "";
+    lines.splice(
+      urlIndex + 1,
+      0,
+      `${indent}oauth_resource = "${ORGX_HOSTED_MCP_URL}"${lineEnding}`
+    );
+    changed = true;
+  }
+  const oauthInsertionShift = oauthResourceIndex < 0 ? 1 : 0;
+  if (configuredProfile !== ORGX_CODEX_TOOL_PROFILE) {
+    if (profileHeaderIndex >= 0) {
+      const currentIndex = profileHeaderIndex + oauthInsertionShift;
+      const profileHeaderMatch = lines[currentIndex]?.match(
+        /^(\s*(?:"x-orgx-tool-profile"|x-orgx-tool-profile)\s*=\s*)(["'])([^"']*)\2([ \t]*(?:#.*)?)(\r?\n)?$/
+      );
+      if (!profileHeaderMatch) return input;
+      lines[currentIndex] = `${profileHeaderMatch[1]}${profileHeaderMatch[2]}${ORGX_CODEX_TOOL_PROFILE}${profileHeaderMatch[2]}${profileHeaderMatch[4]}${profileHeaderMatch[5] ?? ""}`;
+    } else if (headersSectionStart >= 0) {
+      lines.splice(
+        headersSectionEnd + oauthInsertionShift,
+        0,
+        `${ORGX_CODEX_TOOL_PROFILE_HEADER} = "${ORGX_CODEX_TOOL_PROFILE}"${urlMatch[5] ?? "\n"}`
+      );
+    } else if (readObject(hosted.http_headers)[ORGX_CODEX_TOOL_PROFILE_HEADER] === void 0) {
+      const lineEnding = urlMatch[5] ?? (input.includes("\r\n") ? "\r\n" : "\n");
+      const insertionIndex = orgxSectionEnd + oauthInsertionShift;
+      lines.splice(
+        insertionIndex,
+        0,
+        `[mcp_servers.orgx.http_headers]${lineEnding}`,
+        `${ORGX_CODEX_TOOL_PROFILE_HEADER} = "${ORGX_CODEX_TOOL_PROFILE}"${lineEnding}`,
+        lineEnding
+      );
+    }
+    changed = true;
+  }
+  return changed ? lines.join("") : input;
 }
 function removeCodexConfigToml(input) {
   const current = parseTomlDocument(input);
@@ -2503,7 +2608,7 @@ function removeCodexConfigToml(input) {
   if (isRecord(servers[ORGX_LOCAL_MCP_KEY])) {
     delete servers[ORGX_LOCAL_MCP_KEY];
   }
-  if (hosted.url === ORGX_HOSTED_MCP_URL || hosted.url === ORGX_CODEX_MCP_URL) {
+  if (hosted.url === ORGX_HOSTED_MCP_URL || hosted.url === ORGX_LEGACY_CODEX_MCP_URL) {
     delete servers[ORGX_HOSTED_MCP_KEY];
   }
   removeLegacyCodexEntries(servers);
@@ -2515,7 +2620,7 @@ function inspectCodexConfigToml(input) {
   const servers = readObject(current.mcp_servers);
   const hosted = readObject(servers[ORGX_HOSTED_MCP_KEY]);
   const local = readObject(servers[ORGX_LOCAL_MCP_KEY]);
-  const hostedConfigured = hosted.url === ORGX_CODEX_MCP_URL;
+  const hostedConfigured = hosted.url === ORGX_CODEX_MCP_URL && hosted.oauth_resource === ORGX_HOSTED_MCP_URL && readObject(hosted.http_headers)[ORGX_CODEX_TOOL_PROFILE_HEADER] === ORGX_CODEX_TOOL_PROFILE;
   const localConfigured = typeof local.url === "string";
   return {
     configured: hostedConfigured && localConfigured,
@@ -4252,7 +4357,7 @@ async function installCodexPlugin(paths, fetchImpl, runner) {
   const syncResult = await syncManagedRepoTree(CODEX_PLUGIN_SYNC_SPEC, paths.codexPluginDir, fetchImpl);
   const marketplaceChanged = upsertCodexMarketplaceEntry(paths.codexMarketplacePath);
   const previousConfig = readTextIfExists(paths.codexConfigPath);
-  const nextConfig = migrateCodexHostedMcpProfile(previousConfig);
+  const nextConfig = migrateCodexHostedMcpConnection(previousConfig);
   const configChanged = nextConfig !== previousConfig;
   if (configChanged && nextConfig !== null) {
     writeTextFile(paths.codexConfigPath, nextConfig);
@@ -4261,7 +4366,7 @@ async function installCodexPlugin(paths, fetchImpl, runner) {
   const changes = [
     ...syncResult.changed ? [`Synced ${syncResult.fileCount} Codex plugin files.`] : [],
     ...marketplaceChanged ? ["Updated the Codex marketplace entry."] : [],
-    ...configChanged ? ["Updated the existing OrgX MCP connection to the commander profile."] : []
+    ...configChanged ? ["Updated the existing OrgX MCP connection to the canonical OAuth resource and commander profile."] : []
   ];
   return {
     target: "codex",
@@ -6249,7 +6354,7 @@ function initializeWizardSentry() {
   Sentry.init({
     dsn,
     environment: process.env.ORGX_SENTRY_ENVIRONMENT || "production",
-    release: "useorgx-wizard@0.1.58",
+    release: "useorgx-wizard@0.1.60",
     tracesSampleRate: sampleRate(process.env.ORGX_SENTRY_TRACES_SAMPLE_RATE),
     enableLogs: true,
     sendDefaultPii: false,
@@ -18280,7 +18385,7 @@ async function main() {
   initializeWizardSentry();
   const program = new Command();
   program.name("orgx-wizard").description("Add OrgX MCP configs, skills/rules, and companion plugins to your local AI tools.").showHelpAfterError();
-  const pkgVersion = true ? "0.1.58" : void 0;
+  const pkgVersion = true ? "0.1.60" : void 0;
   program.version(pkgVersion ?? "unknown", "-V, --version");
   program.hook("preAction", (_thisCommand, actionCommand) => {
     if (Boolean(actionCommand.optsWithGlobals().json)) return;
@@ -19324,4 +19429,4 @@ main().catch(async (error) => {
   process.exitCode = 1;
 });
 //# sourceMappingURL=cli.js.map
-//# debugId=66b240e6-4f09-5817-86f1-bac0012af8cb
+//# debugId=7bd631ed-f07c-5a2e-95a9-249e72dc087a