opencode-rules-md 0.6.5 → 0.7.0

package/dist/cli.mjs

@@ -2,67 +2,104 @@
 
 // src/cli/main.ts
 import { parseArgs } from "node:util";
+import { pathToFileURL } from "node:url";
+import { realpathSync } from "node:fs";
 
 // src/cli/config.ts
 import * as os from "node:os";
 import * as path from "node:path";
+var SERVER_CONFIG_FILENAME = "opencode.json";
+var TUI_CONFIG_FILENAME = "tui.json";
 function stripJsoncComments(content) {
   let result = "";
   let i = 0;
-  while (i < content.length) {
+  let inString = false;
+  let escaped = false;
+  const len = content.length;
+  while (i < len) {
     const char = content[i];
+    if (inString) {
+      result += char;
+      if (escaped) {
+        escaped = false;
+      } else if (char === "\\") {
+        escaped = true;
+      } else if (char === '"') {
+        inString = false;
+      }
+      i++;
+      continue;
+    }
     if (char === '"') {
+      inString = true;
       result += char;
       i++;
-      while (i < content.length) {
-        const c = content[i];
-        if (c === "\\" && i + 1 < content.length) {
-          result += c + content[i + 1];
-          i += 2;
-          continue;
-        }
-        if (c === '"') {
-          result += c;
-          i++;
-          break;
-        }
-        result += c;
-        i++;
-      }
       continue;
     }
     if (char === "/" && content[i + 1] === "/") {
-      while (i < content.length && content[i] !== `
-`) {
+      i += 2;
+      while (i < len && content[i] !== `
+`)
         i++;
-      }
       continue;
     }
     if (char === "/" && content[i + 1] === "*") {
       i += 2;
-      while (i + 1 < content.length && !(content[i] === "*" && content[i + 1] === "/")) {
+      while (i < len && !(content[i] === "*" && content[i + 1] === "/"))
         i++;
-      }
-      if (i + 1 < content.length) {
+      if (i < len)
         i += 2;
+      continue;
+    }
+    result += char;
+    i++;
+  }
+  let out = "";
+  let inStr = false;
+  let esc = false;
+  let j = 0;
+  const outLen = result.length;
+  while (j < outLen) {
+    const ch = result[j];
+    if (inStr) {
+      out += ch;
+      if (esc) {
+        esc = false;
+      } else if (ch === "\\") {
+        esc = true;
+      } else if (ch === '"') {
+        inStr = false;
       }
+      j++;
       continue;
     }
-    if (char === "," && (content[i + 1] === "}" || content[i + 1] === "]")) {
-      i++;
+    if (ch === '"') {
+      inStr = true;
+      out += ch;
+      j++;
       continue;
     }
-    result += char;
-    i++;
+    if (ch === ",") {
+      let k = j + 1;
+      while (k < outLen && /\s/.test(result[k]))
+        k++;
+      if (k < outLen && /[}\]]/.test(result[k])) {
+        j = k;
+        continue;
+      }
+    }
+    out += ch;
+    j++;
   }
-  return result;
+  return out;
 }
 function resolveGlobalConfigPath(fs, opts = {}) {
   const dir = resolveConfigDir();
   if (opts.ensureDir && !fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
-  return path.join(dir, "opencode.json");
+  const filename = opts.filename ?? SERVER_CONFIG_FILENAME;
+  return path.join(dir, filename);
 }
 function resolveConfigDir() {
   if (process.env.OPENCODE_CONFIG_DIR) {
@@ -81,8 +118,8 @@ function resolveConfigDir() {
   }
   throw new Error("Cannot resolve config dir: none of OPENCODE_CONFIG_DIR, XDG_CONFIG_HOME, HOME, or APPDATA is set");
 }
-function loadGlobalConfig(fs) {
-  const configPath = resolveGlobalConfigPath(fs);
+function loadGlobalConfig(fs, opts = {}) {
+  const configPath = resolveGlobalConfigPath(fs, opts.filename ? { filename: opts.filename } : {});
   if (!fs.existsSync(configPath)) {
     return { path: configPath, existed: false, config: {} };
   }
@@ -129,15 +166,14 @@ function addPlugin(config, specifier) {
   config["plugin"] = removed;
 }
 function rotateBackups(fs, configPath, _pluginName) {
+  if (!fs.existsSync(configPath)) {
+    return null;
+  }
   const dir = path.dirname(configPath);
   const base = path.basename(configPath);
   const timestamp = Date.now();
   const newBak = path.join(dir, `${base}.bak.${timestamp}`);
-  if (fs.existsSync(configPath)) {
-    fs.copyFileSync(configPath, newBak);
-  } else {
-    fs.writeFileSync(newBak, "", "utf-8");
-  }
+  fs.copyFileSync(configPath, newBak);
   const entries = fs.readdirSync(dir);
   const bakFiles = entries.filter((e) => e.startsWith(base + ".bak.")).sort();
   while (bakFiles.length > 3) {
@@ -149,7 +185,7 @@ function rotateBackups(fs, configPath, _pluginName) {
 function writeAtomically(fs, configPath, content) {
   const dir = path.dirname(configPath);
   const base = path.basename(configPath);
-  const tmpPath = path.join(dir, `.${base}.tmp.${Date.now()}`);
+  const tmpPath = path.join(dir, `.${base}.tmp.${Date.now()}-${process.pid}`);
   fs.writeFileSync(tmpPath, content, "utf-8");
   fs.renameSync(tmpPath, configPath);
 }
@@ -198,71 +234,104 @@ var realFs = {
 
 // src/cli/install.ts
 function runInstall(opts, fs2 = realFs) {
-  const loadResult = loadGlobalConfig(fs2);
+  const specifier = buildSpecifier(opts.version);
+  const server = updateConfig(specifier, opts.dryRun ?? false, fs2);
+  const tui = updateConfig(specifier, opts.dryRun ?? false, fs2, {
+    filename: TUI_CONFIG_FILENAME
+  });
+  const aggregate = server.status === "wrote" || tui.status === "wrote" ? "wrote" : server.status === "planned" || tui.status === "planned" ? "planned" : "noop";
+  printSummary(aggregate, specifier, server, tui);
+  return { status: aggregate, specifier, server, tui };
+}
+function updateConfig(specifier, dryRun, fs2, opts = {}) {
+  const loadResult = loadGlobalConfig(fs2, opts.filename ? { filename: opts.filename } : {});
   if (loadResult.parseError) {
-    return {
-      status: "error",
-      path: loadResult.path,
-      specifier: buildSpecifier(opts.version),
-      parseError: loadResult.parseError
-    };
+    const filename = opts.filename ?? "opencode.json";
+    const err = new Error(`opencode-rules-md: ${filename} is malformed — aborting to avoid data loss.
+` + `  path:  ${loadResult.path}
+` + `  error: ${loadResult.parseError.message}`);
+    err.configPath = loadResult.path;
+    throw err;
   }
   const configPath = loadResult.path;
   const config = loadResult.config;
   config["plugin"] = normalizePlugin(config);
-  const specifier = buildSpecifier(opts.version);
   const existing = config["plugin"] ?? [];
   if (existing.includes(specifier)) {
     return { status: "noop", path: configPath, specifier };
   }
   removePlugin(config, "opencode-rules-md");
   addPlugin(config, specifier);
-  if (opts.dryRun) {
+  if (dryRun) {
     const planned = JSON.stringify(config, null, 2);
-    console.log(`Planned config:
-` + planned);
+    console.log(`Planned ${configPath}:
+${planned}`);
     return { status: "planned", path: configPath, specifier };
   }
   const backup = rotateBackups(fs2, configPath, "opencode-rules-md");
   const serialized = JSON.stringify(config, null, 2);
   writeAtomically(fs2, configPath, serialized);
-  console.log(`Installed ${specifier} to ${configPath}`);
-  if (backup) {
-    console.log(`Backup written to ${backup}`);
-  }
-  return { status: "wrote", path: configPath, specifier, backup };
+  const result = { status: "wrote", path: configPath, specifier };
+  if (backup)
+    result.backup = backup;
+  return result;
 }
 function buildSpecifier(version) {
   return version ? `opencode-rules-md@${version}` : "opencode-rules-md";
 }
+function printSummary(status, specifier, server, tui) {
+  if (status === "noop") {
+    console.log(`Already installed (${specifier})`);
+    console.log(`  server config: ${server.path}`);
+    console.log(`  tui config:    ${tui.path}`);
+    return;
+  }
+  if (status === "planned") {
+    console.log("Dry run complete — no files written.");
+    return;
+  }
+  console.log(`Installed ${specifier}`);
+  console.log(`  server config: ${server.path}`);
+  if (server.backup)
+    console.log(`    backup:      ${server.backup}`);
+  console.log(`  tui config:    ${tui.path}`);
+  if (tui.backup)
+    console.log(`    backup:      ${tui.backup}`);
+}
 
 // src/cli/status.ts
 import * as fs2 from "node:fs";
 import * as path2 from "node:path";
-function runStatus(fs3 = realFs) {
-  const loadResult = loadGlobalConfig(fs3);
-  const configPath = loadResult.path;
-  if (loadResult.parseError) {
-    return {
-      installed: false,
-      path: configPath,
-      version: getVersion(),
-      parseError: loadResult.parseError
-    };
-  }
-  const config = loadResult.config;
-  const pluginList = Array.isArray(config["plugin"]) ? config["plugin"] : [];
-  const specifier = pluginList.find((p) => p.startsWith("opencode-rules-md"));
+function runStatus(cliFs = realFs) {
+  const serverLoad = loadGlobalConfig(cliFs);
+  const tuiLoad = loadGlobalConfig(cliFs, { filename: TUI_CONFIG_FILENAME });
+  const serverSpecifier = findSpecifier(serverLoad);
+  const tuiSpecifier = findSpecifier(tuiLoad);
+  const installed = serverSpecifier !== undefined && tuiSpecifier !== undefined;
   const result = {
-    installed: specifier !== undefined,
-    path: configPath,
+    installed,
+    serverPath: serverLoad.path,
+    tuiPath: tuiLoad.path,
+    serverExisted: serverLoad.existed,
+    tuiExisted: tuiLoad.existed,
     version: getVersion()
   };
-  if (specifier) {
-    result.specifier = specifier;
-  }
+  if (serverSpecifier)
+    result.serverSpecifier = serverSpecifier;
+  if (tuiSpecifier)
+    result.tuiSpecifier = tuiSpecifier;
+  const parseError = serverLoad.parseError ?? tuiLoad.parseError;
+  if (parseError)
+    result.parseError = parseError;
   return result;
 }
+function findSpecifier(load) {
+  if (load.parseError)
+    return;
+  const config = load.config;
+  const pluginList = Array.isArray(config["plugin"]) ? config["plugin"] : [];
+  return pluginList.find((p) => p.startsWith("opencode-rules-md"));
+}
 function getVersion() {
   try {
     const pkgPath = path2.resolve(process.cwd(), "package.json");
@@ -280,7 +349,7 @@ var HELP_TEXT = `opencode-rules-md CLI
 Usage: opencode-rules-md <command> [options]
 
 Commands:
-  install   Add opencode-rules-md to the global opencode config
+  install   Add opencode-rules-md to the global opencode + tui configs
   status    Report whether opencode-rules-md is installed
 
 Options:
@@ -290,8 +359,7 @@ Options:
   --yes          Skip confirmation prompts (future use)
   -h, --help     Show this help text
 `.trim();
-var USAGE_ERROR_TEXT = `Error: unknown command. Run 'opencode-rules-md --help' for usage.
-`.trim();
+var USAGE_ERROR_TEXT = `Error: unknown command. Run 'opencode-rules-md --help' for usage.`.trim();
 function parseCliArgs(argv) {
   const { positionals, values } = parseArgs({
     args: argv,
@@ -339,16 +407,14 @@ async function runMain(argv, fs3 = realFs) {
           installOpts.version = options.version;
         if (options.dryRun)
           installOpts.dryRun = true;
-        const installResult = runInstall(installOpts, fs3);
-        if (installResult.status === "error") {
-          return 1;
-        }
+        runInstall(installOpts, fs3);
         return 0;
       }
       case "status": {
         const statusResult = runStatus(fs3);
         if (statusResult.installed) {
-          console.log(`opencode-rules-md is installed (${statusResult.specifier})`);
+          const spec = statusResult.serverSpecifier ?? statusResult.tuiSpecifier;
+          console.log(`opencode-rules-md is installed (${spec})`);
         } else {
           console.log("opencode-rules-md is not installed");
         }
@@ -361,13 +427,27 @@ async function runMain(argv, fs3 = realFs) {
       }
     }
   } catch (err) {
-    console.error(`Error: ${err instanceof Error ? err.message : String(err)}`);
+    const message = err instanceof Error ? err.message : String(err);
+    console.error(`Error: ${message}`);
     return 1;
   }
 }
-if (import.meta.url === `file://${process.argv[1]}`) {
-  const exitCode = await runMain(process.argv.slice(2));
-  process.exit(exitCode);
+function isInvokedAsMain() {
+  if (!process.argv[1])
+    return false;
+  try {
+    const realArgv = pathToFileURL(realpathSync(process.argv[1])).href;
+    return import.meta.url === realArgv;
+  } catch {
+    try {
+      return import.meta.url === pathToFileURL(process.argv[1]).href;
+    } catch {
+      return false;
+    }
+  }
+}
+if (isInvokedAsMain()) {
+  runMain(process.argv.slice(2)).then((code) => process.exit(code));
 }
 export {
   runMain

package/dist/src/cli/config.d.ts

@@ -6,6 +6,12 @@
  * an in-memory implementation without touching real disk.
  */
 import type { CliFs } from './real-fs.js';
+/** npm package name for this plugin. */
+export declare const PLUGIN_NAME = "opencode-rules-md";
+/** Filename for the OpenCode server config. */
+export declare const SERVER_CONFIG_FILENAME = "opencode.json";
+/** Filename for the OpenCode TUI config. */
+export declare const TUI_CONFIG_FILENAME = "tui.json";
 export interface LoadResult {
     path: string;
     existed: boolean;
@@ -15,6 +21,9 @@ export interface LoadResult {
 /**
  * Strip JSONC comments and trailing commas while preserving
  * comment-like sequences inside string literals.
+ *
+ * Pass 1: strip `//` and `/* * /` comments (string-aware).
+ * Pass 2: strip trailing commas before `}` or `]`, skipping whitespace.
  */
 export declare function stripJsoncComments(content: string): string;
 /**
@@ -26,13 +35,16 @@ export declare function stripJsoncComments(content: string): string;
  */
 export declare function resolveGlobalConfigPath(fs: CliFs, opts?: {
     ensureDir?: boolean;
+    filename?: string;
 }): string;
 /**
- * Load and parse the global opencode config.
+ * Load and parse a global OpenCode config file.
  * Treats a missing file as an empty config object (not an error).
  * Surfaces parse errors so callers can exit non-zero without corrupting data.
  */
-export declare function loadGlobalConfig(fs: CliFs): LoadResult;
+export declare function loadGlobalConfig(fs: CliFs, opts?: {
+    filename?: string;
+}): LoadResult;
 /**
  * Return the plugin array with opencode-rules-md* entries deduplicated by
  * name prefix, keeping the last occurrence of each unique prefix.
@@ -51,9 +63,9 @@ export declare function addPlugin(config: Record<string, unknown>, specifier: st
 /**
  * Write a timestamped backup of the given config path and rotate so at most
  * 3 backups are retained (oldest deleted first).
- * Returns the path of the newly created backup.
+ * Returns the path of the newly created backup, or null if no backup was created.
  */
-export declare function rotateBackups(fs: CliFs, configPath: string, _pluginName: string): string;
+export declare function rotateBackups(fs: CliFs, configPath: string, _pluginName: string): string | null;
 /**
  * Write content to a temporary sibling file then rename it into place.
  * The final path is never in a partially-written state.

package/dist/src/cli/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/cli/config.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAM1C,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,UAAU,CAAC,EAAE,KAAK,CAAC;CACpB;AAMD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAgE1D;AAMD;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,EAAE,EAAE,KAAK,EACT,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAA;CAAO,GACjC,MAAM,CAMR;AA+BD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,KAAK,GAAG,UAAU,CAoBtD;AAMD;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,MAAM,EAAE,CAcV;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,MAAM,EAAE,MAAM,GACb,IAAI,CAMN;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACvB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,SAAS,EAAE,MAAM,GAChB,IAAI,CAUN;AAMD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAyBxF;AAMD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAOpF"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/cli/config.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAM1C,wCAAwC;AACxC,eAAO,MAAM,WAAW,sBAAsB,CAAC;AAE/C,+CAA+C;AAC/C,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AAEtD,4CAA4C;AAC5C,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAM9C,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,UAAU,CAAC,EAAE,KAAK,CAAC;CACpB;AAMD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAgG1D;AAMD;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,EAAE,EAAE,KAAK,EACT,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GACpD,MAAM,CAOR;AA+BD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,UAAU,CAuBxF;AAMD;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,MAAM,EAAE,CAcV;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,MAAM,EAAE,MAAM,GACb,IAAI,CAMN;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACvB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,SAAS,EAAE,MAAM,GAChB,IAAI,CAUN;AAMD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAyB/F;AAMD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAOpF"}

package/dist/src/cli/config.js

@@ -8,68 +8,115 @@
 import * as os from 'node:os';
 import * as path from 'node:path';
 // ---------------------------------------------------------------------------
-// JSONC comment stripper
+// Public constants
+// ---------------------------------------------------------------------------
+/** npm package name for this plugin. */
+export const PLUGIN_NAME = 'opencode-rules-md';
+/** Filename for the OpenCode server config. */
+export const SERVER_CONFIG_FILENAME = 'opencode.json';
+/** Filename for the OpenCode TUI config. */
+export const TUI_CONFIG_FILENAME = 'tui.json';
+// ---------------------------------------------------------------------------
+// JSONC comment stripper — two-pass
 // ---------------------------------------------------------------------------
 /**
  * Strip JSONC comments and trailing commas while preserving
  * comment-like sequences inside string literals.
+ *
+ * Pass 1: strip `//` and `/* * /` comments (string-aware).
+ * Pass 2: strip trailing commas before `}` or `]`, skipping whitespace.
  */
 export function stripJsoncComments(content) {
+    // Pass 1 — strip comments while preserving string contents
     let result = '';
     let i = 0;
-    while (i < content.length) {
+    let inString = false;
+    let escaped = false;
+    const len = content.length;
+    while (i < len) {
         const char = content[i];
-        // Start of string (double-quoted only — JSON only supports double quotes)?
+        if (inString) {
+            result += char;
+            if (escaped) {
+                escaped = false;
+            }
+            else if (char === '\\') {
+                escaped = true;
+            }
+            else if (char === '"') {
+                inString = false;
+            }
+            i++;
+            continue;
+        }
         if (char === '"') {
+            inString = true;
             result += char;
             i++;
-            while (i < content.length) {
-                const c = content[i];
-                if (c === '\\' && i + 1 < content.length) {
-                    // Escape sequence — copy both chars verbatim
-                    result += c + content[i + 1];
-                    i += 2;
-                    continue;
-                }
-                if (c === '"') {
-                    result += c;
-                    i++;
-                    break;
-                }
-                result += c;
-                i++;
-            }
             continue;
         }
-        // Line comment?
+        // Line comment: // until newline
         if (char === '/' && content[i + 1] === '/') {
-            while (i < content.length && content[i] !== '\n') {
+            i += 2;
+            while (i < len && content[i] !== '\n')
                 i++;
-            }
             continue;
         }
-        // Block comment?
+        // Block comment: /* until */
         if (char === '/' && content[i + 1] === '*') {
             i += 2;
-            while (i + 1 < content.length && !(content[i] === '*' && content[i + 1] === '/')) {
+            while (i < len && !(content[i] === '*' && content[i + 1] === '/'))
                 i++;
+            if (i < len)
+                i += 2; // skip past */
+            continue;
+        }
+        result += char;
+        i++;
+    }
+    // Pass 2 — strip trailing commas (with whitespace skip) before } or ]
+    let out = '';
+    let inStr = false;
+    let esc = false;
+    let j = 0;
+    const outLen = result.length;
+    while (j < outLen) {
+        const ch = result[j];
+        if (inStr) {
+            out += ch;
+            if (esc) {
+                esc = false;
             }
-            // Only skip past */ if we actually found it
-            if (i + 1 < content.length) {
-                i += 2; // skip */
+            else if (ch === '\\') {
+                esc = true;
             }
+            else if (ch === '"') {
+                inStr = false;
+            }
+            j++;
             continue;
         }
-        // Trailing comma before } or ]
-        if (char === ',' &&
-            (content[i + 1] === '}' || content[i + 1] === ']')) {
-            i++;
+        if (ch === '"') {
+            inStr = true;
+            out += ch;
+            j++;
             continue;
         }
-        result += char;
-        i++;
+        if (ch === ',') {
+            // Skip whitespace before checking for } or ]
+            let k = j + 1;
+            while (k < outLen && /\s/.test(result[k]))
+                k++;
+            if (k < outLen && /[}\]]/.test(result[k])) {
+                // Drop the comma; jump to the bracket
+                j = k;
+                continue;
+            }
+        }
+        out += ch;
+        j++;
     }
-    return result;
+    return out;
 }
 // ---------------------------------------------------------------------------
 // Config path resolution
@@ -86,7 +133,8 @@ export function resolveGlobalConfigPath(fs, opts = {}) {
     if (opts.ensureDir && !fs.existsSync(dir)) {
         fs.mkdirSync(dir, { recursive: true });
     }
-    return path.join(dir, 'opencode.json');
+    const filename = opts.filename ?? SERVER_CONFIG_FILENAME;
+    return path.join(dir, filename);
 }
 function resolveConfigDir() {
     if (process.env.OPENCODE_CONFIG_DIR) {
@@ -110,12 +158,12 @@ function resolveConfigDir() {
 // JSONC-safe config load
 // ---------------------------------------------------------------------------
 /**
- * Load and parse the global opencode config.
+ * Load and parse a global OpenCode config file.
  * Treats a missing file as an empty config object (not an error).
  * Surfaces parse errors so callers can exit non-zero without corrupting data.
  */
-export function loadGlobalConfig(fs) {
-    const configPath = resolveGlobalConfigPath(fs);
+export function loadGlobalConfig(fs, opts = {}) {
+    const configPath = resolveGlobalConfigPath(fs, opts.filename ? { filename: opts.filename } : {});
     if (!fs.existsSync(configPath)) {
         return { path: configPath, existed: false, config: {} };
     }
@@ -186,19 +234,17 @@ export function addPlugin(config, specifier) {
 /**
  * Write a timestamped backup of the given config path and rotate so at most
  * 3 backups are retained (oldest deleted first).
- * Returns the path of the newly created backup.
+ * Returns the path of the newly created backup, or null if no backup was created.
  */
 export function rotateBackups(fs, configPath, _pluginName) {
+    if (!fs.existsSync(configPath)) {
+        return null;
+    }
     const dir = path.dirname(configPath);
     const base = path.basename(configPath);
     const timestamp = Date.now();
     const newBak = path.join(dir, `${base}.bak.${timestamp}`);
-    if (fs.existsSync(configPath)) {
-        fs.copyFileSync(configPath, newBak);
-    }
-    else {
-        fs.writeFileSync(newBak, '', 'utf-8');
-    }
+    fs.copyFileSync(configPath, newBak);
     // Collect existing backups sorted by timestamp (lexical sort on numeric suffix)
     const entries = fs.readdirSync(dir);
     const bakFiles = entries
@@ -221,7 +267,7 @@ export function rotateBackups(fs, configPath, _pluginName) {
 export function writeAtomically(fs, configPath, content) {
     const dir = path.dirname(configPath);
     const base = path.basename(configPath);
-    const tmpPath = path.join(dir, `.${base}.tmp.${Date.now()}`);
+    const tmpPath = path.join(dir, `.${base}.tmp.${Date.now()}-${process.pid}`);
     fs.writeFileSync(tmpPath, content, 'utf-8');
     fs.renameSync(tmpPath, configPath);
 }