@dosu/cli 0.67.2 → 0.68.0

package/bin/dosu.js

@@ -1128,7 +1128,7 @@ function isNpxInvocation(channel = INSTALL_CHANNEL, env = process.env) {
 function getVersionString() {
   return `v${VERSION}`;
 }
-var VERSION = "0.67.2", INSTALL_CHANNEL = "npm";
+var VERSION = "0.68.0", INSTALL_CHANNEL = "npm";
 
 // src/debug/logger.ts
 import {
@@ -14333,7 +14333,7 @@ var init_conflicts = __esm(() => {
 });
 
 // src/telemetry/debug-id.ts
-var BUNDLE_DEBUG_ID_PLACEHOLDER = "fa693edb-14f4-abcb-6475-6e2164756e21";
+var BUNDLE_DEBUG_ID_PLACEHOLDER = "2a77eea3-ffbe-b0f0-6475-6e2164756e21";
 
 // src/telemetry/telemetry.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
@@ -62521,10 +62521,13 @@ function hasShape(expected, actual) {
   }
   return expected === actual;
 }
+function isUserChoiceKey(key) {
+  return USER_CHOICE_KEYS.has(key);
+}
 function withoutUserChoices(entry) {
   if (typeof entry !== "object" || entry === null || Array.isArray(entry))
     return entry;
-  return Object.fromEntries(Object.entries(entry).filter(([key]) => !USER_CHOICE_KEYS.has(key)));
+  return Object.fromEntries(Object.entries(entry).filter(([key]) => !isUserChoiceKey(key)));
 }
 function entryHasShape(expected, actual) {
   return hasShape(withoutUserChoices(expected), withoutUserChoices(actual));
@@ -62723,7 +62726,7 @@ var init_cline_cli = __esm(() => {
 import { existsSync as existsSync22, readFileSync as readFileSync22 } from "node:fs";
 import { dirname as dirname11, join as join29 } from "node:path";
 function codexHome3() {
-  return process.env.CODEX_HOME ?? expandHome("~/.codex");
+  return process.env.CODEX_HOME || expandHome("~/.codex");
 }
 function getConfigPath2(global2) {
   if (global2)
@@ -62745,66 +62748,130 @@ function tomlValue(value) {
   return Array.isArray(value) ? `[${value.map(tomlString).join(", ")}]` : tomlString(value);
 }
 function dosuEntry(url, apiKey, npx, path) {
-  return npxRemoteEntry(url, apiKey, npx, path);
+  return { ...npxRemoteEntry(url, apiKey, npx, path), omit_tools_from: ["deferred"] };
+}
+function isUserKey(key) {
+  return isUserChoiceKey(key) || key === "tools" || key.startsWith("tools.");
 }
-function renderDosuEntry(entry) {
-  const tables = [["mcp_servers.dosu", {}]];
+function isUserTable(name) {
+  return name === `${DOSU_TABLE}.tools` || name.startsWith(`${DOSU_TABLE}.tools.`);
+}
+function renderDosuEntry(entry, kept) {
+  const tables = [[DOSU_TABLE, []]];
   for (const [key, value] of Object.entries(entry)) {
-    if (typeof value === "string" || Array.isArray(value))
-      tables[0][1][key] = value;
-    else
-      tables.push([`mcp_servers.dosu.${key}`, value]);
+    if (typeof value === "string" || Array.isArray(value)) {
+      tables[0][1].push(`${key} = ${tomlValue(value)}`);
+    } else {
+      const lines = Object.entries(value).map(([k, v]) => `${k} = ${tomlValue(v)}`);
+      tables.push([`${DOSU_TABLE}.${key}`, lines]);
+    }
   }
-  return tables.map(([name, keys]) => {
-    const lines = Object.entries(keys).map(([key, value]) => `${key} = ${tomlValue(value)}`);
-    return `
+  tables[0][1].push(...kept.root);
+  return tables.map(([name, lines]) => `
 [${name}]
 ${lines.join(`
 `)}
-`;
-  }).join("");
-}
-function isToolApproval(name) {
-  return name.startsWith("mcp_servers.dosu.tools.");
+`).join("") + kept.tables.map((table) => `
+${table}
+`).join("");
+}
+function openBrackets(text) {
+  let depth = 0;
+  let quote = null;
+  for (let i = 0;i < text.length; i++) {
+    const c = text[i];
+    if (quote) {
+      if (c === "\\" && quote === '"')
+        i++;
+      else if (c === quote)
+        quote = null;
+    } else if (c === '"' || c === "'")
+      quote = c;
+    else if (c === "#")
+      break;
+    else if (c === "[" || c === "{")
+      depth++;
+    else if (c === "]" || c === "}")
+      depth--;
+  }
+  return depth;
 }
-function readDosuEntry(content) {
-  let entry;
+function dosuTables(content) {
+  const tables = [];
   let table;
+  let open;
+  let depth = 0;
   for (const line of content.split(`
 `)) {
     const name = sectionName(line);
     if (name !== null) {
-      table = undefined;
-      if (!isDosuSection(name) || isToolApproval(name))
-        continue;
-      entry ??= {};
-      if (name === "mcp_servers.dosu") {
-        table = entry;
-      } else {
-        table = {};
-        entry[name.slice("mcp_servers.dosu.".length)] = table;
-      }
+      open = undefined;
+      table = isDosuSection(name) ? { name, header: line.trim(), statements: [] } : undefined;
+      if (table)
+        tables.push(table);
+      continue;
+    }
+    if (open && depth > 0) {
+      open.value += `
+${line}`;
+      open.text += `
+${line}`;
+      depth += openBrackets(line);
       continue;
     }
+    open = undefined;
     const text = line.trim();
     if (!table || !text || text.startsWith("#"))
       continue;
     const eq = text.indexOf("=");
     const key = eq === -1 ? text : text.slice(0, eq).trim();
-    const raw = eq === -1 ? "" : text.slice(eq + 1).trim();
-    try {
-      table[key] = JSON.parse(raw);
-    } catch {
-      table[key] = raw;
+    const value = eq === -1 ? "" : text.slice(eq + 1).trim();
+    open = { key, value, text: line };
+    table.statements.push(open);
+    depth = openBrackets(value);
+  }
+  return tables;
+}
+function readDosuEntry(content) {
+  let entry;
+  for (const { name, statements } of dosuTables(content)) {
+    entry ??= {};
+    if (isUserTable(name))
+      continue;
+    const isRoot = name === DOSU_TABLE;
+    const table = isRoot ? entry : {};
+    if (!isRoot)
+      entry[name.slice(DOSU_TABLE.length + 1)] = table;
+    for (const { key, value } of statements) {
+      if (isRoot && isUserKey(key))
+        continue;
+      try {
+        table[key] = JSON.parse(value);
+      } catch {
+        table[key] = value;
+      }
     }
   }
   return entry;
 }
+function userSettings(content) {
+  const kept = { root: [], tables: [] };
+  for (const { name, header, statements } of dosuTables(content)) {
+    if (name === DOSU_TABLE) {
+      kept.root.push(...statements.filter(({ key }) => isUserKey(key)).map(({ text }) => text));
+    } else if (isUserTable(name)) {
+      kept.tables.push([header, ...statements.map(({ text }) => text)].join(`
+`));
+    }
+  }
+  return kept;
+}
 function installDosuToTOML(path, cfg) {
-  const content = removeDosuFromTOML(readTOML(path));
+  const existing = readTOML(path);
+  const content = removeDosuFromTOML(existing);
   const npx = findNpx();
   const entry = dosuEntry(mcpEndpoint(cfg), cfg.active_account?.target?.api_key, npx, npxPathEnv(npx));
-  writeTOML(path, content + renderDosuEntry(entry));
+  writeTOML(path, content + renderDosuEntry(entry, userSettings(existing)));
 }
 function sectionName(line) {
   const header = line.trim();
@@ -62812,7 +62879,7 @@ function sectionName(line) {
   return match ? match[1].trim() : null;
 }
 function isDosuSection(name) {
-  return name === "mcp_servers.dosu" || name.startsWith("mcp_servers.dosu.");
+  return name === DOSU_TABLE || name.startsWith(`${DOSU_TABLE}.`);
 }
 function removeDosuFromTOML(content) {
   const result = [];
@@ -62870,7 +62937,7 @@ function pruneLegacyRemoteEntry(path) {
     return;
   writeTOML(path, removeDosuFromTOML(content));
 }
-var REMOTE_HTTP_KEY, CodexProvider = () => ({
+var DOSU_TABLE = "mcp_servers.dosu", REMOTE_HTTP_KEY, CodexProvider = () => ({
   name: () => "Codex (CLI + Desktop)",
   id: () => "codex",
   supportsLocal: () => true,
@@ -69217,4 +69284,4 @@ main().catch((err) => {
   process.exit(1);
 });
 
-//# debugId=fa693edb-14f4-abcb-6475-6e2164756e21
+//# debugId=2a77eea3-ffbe-b0f0-6475-6e2164756e21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dosu/cli",
-  "version": "0.67.2",
+  "version": "0.68.0",
   "type": "module",
   "description": "Dosu CLI - Set up Dosu MCP for AI tools and work with Dosu Libraries, docs, and reviews",
   "license": "MIT",