@topolo/cli 0.9.8 → 0.9.9

package/dist/index.js

@@ -9,7 +9,7 @@ import { platform as platform2 } from "os";
 import { createInterface } from "readline/promises";
 import { stdin as input } from "process";
 
-// node_modules/@topolo/sdk/dist/index.js
+// ../../../../../TopoloWork2/.worktrees/cli-postinstall-message/packages/topolo-cli/node_modules/@topolo/sdk/dist/index.js
 function applyAuthHeaders(headers, credential) {
   if (credential.kind === "api_key") {
     headers.set("X-Api-Key", credential.apiKey);
@@ -2948,7 +2948,7 @@ function createTopolo(options) {
   };
 }
 
-// node_modules/@topolo/sdk/dist/node/credential-store.js
+// ../../../../../TopoloWork2/.worktrees/cli-postinstall-message/packages/topolo-cli/node_modules/@topolo/sdk/dist/node/credential-store.js
 import { mkdir, readFile, writeFile, chmod, rm, stat } from "fs/promises";
 import { existsSync } from "fs";
 import { homedir, platform } from "os";
@@ -5107,8 +5107,20 @@ async function readCodexRegistrations(homeDir) {
   if (!existsSync2(path)) return [];
   const registrations = /* @__PURE__ */ new Map();
   let section;
+  let pending;
   for (const rawLine of (await readFile3(path, "utf8")).split(/\r?\n/)) {
-    const line = rawLine.trim();
+    const line = stripTomlComment(rawLine).trim();
+    if (pending) {
+      if (line.startsWith("[")) {
+        throw new Error(`Cannot read unsupported MCP value in Codex configuration at ${path}.`);
+      }
+      pending.value = `${pending.value} ${line}`;
+      if (isTomlValueComplete(pending.value)) {
+        applyCodexAssignment(path, section, pending, registrations);
+        pending = void 0;
+      }
+      continue;
+    }
     const heading = line.match(/^\[mcp_servers\.([A-Za-z0-9_-]+)(\.env)?\]$/);
     if (heading) {
       section = { name: heading[1], env: Boolean(heading[2]) };
@@ -5124,20 +5136,120 @@ async function readCodexRegistrations(homeDir) {
     if (!section || !isPublicRegistrationName(section.name) || !line || line.startsWith("#")) continue;
     const assignment = line.match(/^([A-Za-z0-9_]+)\s*=\s*(.+)$/);
     if (!assignment) continue;
-    const registration = registrations.get(section.name);
-    try {
-      const value = JSON.parse(assignment[2]);
-      if (section.env && typeof value === "string") registration.env[assignment[1]] = value;
-      if (!section.env && assignment[1] === "command" && typeof value === "string") registration.command = value;
-      if (!section.env && assignment[1] === "args" && Array.isArray(value) && value.every((item) => typeof item === "string")) {
-        registration.args = value;
-      }
-    } catch {
-      throw new Error(`Cannot read unsupported MCP value in Codex configuration at ${path}.`);
+    if (!section.env && assignment[1] !== "command" && assignment[1] !== "args") continue;
+    pending = { key: assignment[1], value: assignment[2] };
+    if (isTomlValueComplete(pending.value)) {
+      applyCodexAssignment(path, section, pending, registrations);
+      pending = void 0;
     }
   }
+  if (pending) throw new Error(`Cannot read unsupported MCP value in Codex configuration at ${path}.`);
   return [...registrations.values()].filter((registration) => registration.command);
 }
+function applyCodexAssignment(path, section, assignment, registrations) {
+  const registration = registrations.get(section.name);
+  let value;
+  try {
+    value = parseTomlValue(assignment.value);
+  } catch {
+    throw new Error(`Cannot read unsupported MCP value in Codex configuration at ${path}.`);
+  }
+  if (section.env && typeof value === "string") registration.env[assignment.key] = value;
+  if (!section.env && assignment.key === "command" && typeof value === "string") registration.command = value;
+  if (!section.env && assignment.key === "args" && Array.isArray(value) && value.every((item) => typeof item === "string")) {
+    registration.args = value;
+  }
+}
+function stripTomlComment(line) {
+  let quote;
+  let escaped = false;
+  for (let index = 0; index < line.length; index += 1) {
+    const character = line[index];
+    if (quote === '"') {
+      if (escaped) escaped = false;
+      else if (character === "\\") escaped = true;
+      else if (character === '"') quote = void 0;
+      continue;
+    }
+    if (quote === "'") {
+      if (character === "'" && line[index + 1] === "'") index += 1;
+      else if (character === "'") quote = void 0;
+      continue;
+    }
+    if (character === '"' || character === "'") quote = character;
+    else if (character === "#") return line.slice(0, index);
+  }
+  return line;
+}
+function isTomlValueComplete(value) {
+  let quote;
+  let escaped = false;
+  let arrayDepth = 0;
+  for (let index = 0; index < value.length; index += 1) {
+    const character = value[index];
+    if (quote === '"') {
+      if (escaped) escaped = false;
+      else if (character === "\\") escaped = true;
+      else if (character === '"') quote = void 0;
+      continue;
+    }
+    if (quote === "'") {
+      if (character === "'" && value[index + 1] === "'") index += 1;
+      else if (character === "'") quote = void 0;
+      continue;
+    }
+    if (character === '"' || character === "'") quote = character;
+    else if (character === "[") arrayDepth += 1;
+    else if (character === "]") arrayDepth -= 1;
+  }
+  return !quote && arrayDepth === 0;
+}
+function parseTomlValue(rawValue) {
+  const value = rawValue.trim();
+  try {
+    return JSON.parse(value);
+  } catch {
+  }
+  if (value.startsWith("'") && value.endsWith("'")) return value.slice(1, -1).replace(/''/g, "'");
+  if (value.startsWith("[") && value.endsWith("]")) {
+    const body = value.slice(1, -1).trim();
+    if (!body) return [];
+    return splitTomlArray(body).map((item) => parseTomlValue(item));
+  }
+  throw new Error("Unsupported TOML value");
+}
+function splitTomlArray(value) {
+  const items = [];
+  let start = 0;
+  let quote;
+  let escaped = false;
+  let arrayDepth = 0;
+  for (let index = 0; index < value.length; index += 1) {
+    const character = value[index];
+    if (quote === '"') {
+      if (escaped) escaped = false;
+      else if (character === "\\") escaped = true;
+      else if (character === '"') quote = void 0;
+      continue;
+    }
+    if (quote === "'") {
+      if (character === "'" && value[index + 1] === "'") index += 1;
+      else if (character === "'") quote = void 0;
+      continue;
+    }
+    if (character === '"' || character === "'") quote = character;
+    else if (character === "[") arrayDepth += 1;
+    else if (character === "]") arrayDepth -= 1;
+    else if (character === "," && arrayDepth === 0) {
+      const item = value.slice(start, index).trim();
+      if (item) items.push(item);
+      start = index + 1;
+    }
+  }
+  const last = value.slice(start).trim();
+  if (last) items.push(last);
+  return items;
+}
 function normalizeRegistration(name, value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return [];
   const candidate = value;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@topolo/cli",
-  "version": "0.9.8",
-  "topoloPublishedVersion": "0.9.8",
+  "version": "0.9.9",
+  "topoloPublishedVersion": "0.9.9",
   "description": "Public command-line interface for Topolo customer organizations, developers, and agents.",
   "license": "UNLICENSED",
   "author": "Topolo",