@useorgx/wizard 0.1.58 → 0.1.59

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]="38a8c165-aa33-5892-9af0-25fee0a694c7")}catch(e){}}();
 import * as clack from "@clack/prompts";
 import { spawnSync as spawnSync5 } from "child_process";
 import { readFileSync as readFileSync10 } from "fs";
@@ -2441,12 +2441,15 @@ function stringifyTomlDocument(document) {
   return rendered.endsWith("\n") ? rendered : `${rendered}
 `;
 }
-function upsertCodexEntry(servers, key, url) {
+function upsertCodexEntry(servers, key, url, oauthResource) {
   const current = readObject(servers[key]);
   const next = {
     ...current,
     url
   };
+  if (oauthResource) {
+    next.oauth_resource = oauthResource;
+  }
   delete next.command;
   delete next.args;
   delete next.startup_timeout_sec;
@@ -2466,7 +2469,12 @@ 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
+  );
   if (localMcpUrl) {
     upsertCodexEntry(servers, ORGX_LOCAL_MCP_KEY, localMcpUrl);
   }
@@ -2474,27 +2482,60 @@ 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_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 urlIndex = -1;
+  let oauthResourceIndex = -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;
+      continue;
+    }
+    if (!inOrgxSection) continue;
+    if (/^\s*url\s*=/.test(line)) urlIndex = index;
+    if (/^\s*oauth_resource\s*=/.test(line)) oauthResourceIndex = index;
+  }
+  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;
+  }
+  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;
     }
-    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;
+  } 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}"${urlMatch[5] ? lineEnding : ""}`
+    );
     changed = true;
-    return `${match[1]}${match[2]}${ORGX_CODEX_MCP_URL}${match[2]}${match[4]}${match[5] ?? ""}`;
-  });
-  return changed ? nextLines.join("") : input;
+  }
+  return changed ? lines.join("") : input;
 }
 function removeCodexConfigToml(input) {
   const current = parseTomlDocument(input);
@@ -2515,7 +2556,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;
   const localConfigured = typeof local.url === "string";
   return {
     configured: hostedConfigured && localConfigured,
@@ -4252,7 +4293,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 +4302,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 for the commander profile and OAuth."] : []
   ];
   return {
     target: "codex",
@@ -6249,7 +6290,7 @@ function initializeWizardSentry() {
   Sentry.init({
     dsn,
     environment: process.env.ORGX_SENTRY_ENVIRONMENT || "production",
-    release: "useorgx-wizard@0.1.58",
+    release: "useorgx-wizard@0.1.59",
     tracesSampleRate: sampleRate(process.env.ORGX_SENTRY_TRACES_SAMPLE_RATE),
     enableLogs: true,
     sendDefaultPii: false,
@@ -18280,7 +18321,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.59" : void 0;
   program.version(pkgVersion ?? "unknown", "-V, --version");
   program.hook("preAction", (_thisCommand, actionCommand) => {
     if (Boolean(actionCommand.optsWithGlobals().json)) return;
@@ -19324,4 +19365,4 @@ main().catch(async (error) => {
   process.exitCode = 1;
 });
 //# sourceMappingURL=cli.js.map
-//# debugId=66b240e6-4f09-5817-86f1-bac0012af8cb
+//# debugId=38a8c165-aa33-5892-9af0-25fee0a694c7