@bastani/atomic 0.5.4 → 0.5.5-0

package/dist/services/system/detect.d.ts

@@ -0,0 +1,75 @@
+/**
+ * Utilities for command and platform detection
+ */
+export declare const WSL_INSTALL_URL = "https://learn.microsoft.com/en-us/windows/wsl/install";
+/**
+ * Check if a command is installed and available in PATH
+ */
+export declare function isCommandInstalled(cmd: string): boolean;
+/**
+ * Get the resolved absolute path to a command executable.
+ *
+ * On Windows, this properly resolves .cmd, .bat, .exe and other executable
+ * extensions through Bun.which(), which handles the PATHEXT environment
+ * variable. This is essential for spawning commands correctly on Windows
+ * where 'opencode' might actually be 'opencode.cmd'.
+ *
+ * @param cmd - The command name to resolve (e.g., 'opencode', 'claude')
+ * @returns The absolute path to the command, or null if not found
+ */
+export declare function getCommandPath(cmd: string): string | null;
+/**
+ * Get the version string of a command
+ * Returns null if command is not installed or version check fails
+ */
+export declare function getCommandVersion(cmd: string): string | null;
+/**
+ * Check if running on Windows
+ */
+export declare function isWindows(): boolean;
+/**
+ * Check if running on macOS
+ */
+export declare function isMacOS(): boolean;
+/**
+ * Check if running on Linux
+ */
+export declare function isLinux(): boolean;
+/**
+ * Get the appropriate script extension for the current platform
+ * Returns ".ps1" on Windows, ".sh" on Unix-like systems
+ */
+export declare function getScriptExtension(): string;
+/**
+ * Get the opposite script extension (for filtering)
+ * Returns ".sh" on Windows, ".ps1" on Unix-like systems
+ */
+export declare function getOppositeScriptExtension(): string;
+/**
+ * Check if WSL is installed on Windows
+ * Returns false on non-Windows platforms
+ */
+export declare function isWslInstalled(): boolean;
+/**
+ * Check if colors are enabled (respects NO_COLOR standard)
+ * See: https://no-color.org/
+ */
+export declare function supportsColor(): boolean;
+/**
+ * Check if the terminal supports true color (24-bit).
+ *
+ * Checks COLORTERM, TERM, and TERM_PROGRAM environment variables.
+ * macOS Terminal.app (Apple_Terminal) does NOT support truecolor and
+ * will degrade hex colors to washed-out 256-color approximations.
+ */
+export declare function supportsTrueColor(): boolean;
+/**
+ * Check if the terminal supports 256 colors
+ *
+ * Note: This returns true when supportsTrueColor() returns true.
+ * Since supportsTrueColor() defaults to true for modern terminals,
+ * this function will also return true in most cases. This is intentional -
+ * most modern terminals support at least 256 colors.
+ */
+export declare function supports256Color(): boolean;
+//# sourceMappingURL=detect.d.ts.map

package/dist/services/system/detect.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"detect.d.ts","sourceRoot":"","sources":["../../../src/services/system/detect.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,eAAO,MAAM,eAAe,0DAC6B,CAAC;AAE1D;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEzD;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAc5D;AAED;;GAEG;AACH,wBAAgB,SAAS,IAAI,OAAO,CAEnC;AAED;;GAEG;AACH,wBAAgB,OAAO,IAAI,OAAO,CAEjC;AAED;;GAEG;AACH,wBAAgB,OAAO,IAAI,OAAO,CAEjC;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,IAAI,MAAM,CAEnD;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,OAAO,CAIxC;AAED;;;GAGG;AACH,wBAAgB,aAAa,IAAI,OAAO,CAMvC;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAgC3C;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAG1C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/atomic",
-  "version": "0.5.4",
+  "version": "0.5.5-0",
   "description": "Configuration management CLI and SDK for coding agents",
   "type": "module",
   "license": "MIT",
@@ -28,33 +28,11 @@
   "exports": {
     ".": {
       "bun": "./src/sdk/index.ts",
-      "types": "./dist/sdk/index.d.ts",
-      "import": "./dist/sdk/index.js",
-      "default": "./dist/sdk/index.js"
+      "types": "./dist/sdk/index.d.ts"
     },
-    "./workflows": {
-      "bun": "./src/sdk/workflows/index.ts",
-      "types": "./dist/sdk/workflows/index.d.ts",
-      "import": "./dist/sdk/workflows/index.js",
-      "default": "./dist/sdk/workflows/index.js"
-    },
-    "./workflows/builtin/ralph/claude": {
-      "bun": "./src/sdk/workflows/builtin/ralph/claude/index.ts",
-      "types": "./dist/sdk/workflows/builtin/ralph/claude/index.d.ts",
-      "import": "./dist/sdk/workflows/builtin/ralph/claude/index.js",
-      "default": "./dist/sdk/workflows/builtin/ralph/claude/index.js"
-    },
-    "./workflows/builtin/ralph/copilot": {
-      "bun": "./src/sdk/workflows/builtin/ralph/copilot/index.ts",
-      "types": "./dist/sdk/workflows/builtin/ralph/copilot/index.d.ts",
-      "import": "./dist/sdk/workflows/builtin/ralph/copilot/index.js",
-      "default": "./dist/sdk/workflows/builtin/ralph/copilot/index.js"
-    },
-    "./workflows/builtin/ralph/opencode": {
-      "bun": "./src/sdk/workflows/builtin/ralph/opencode/index.ts",
-      "types": "./dist/sdk/workflows/builtin/ralph/opencode/index.d.ts",
-      "import": "./dist/sdk/workflows/builtin/ralph/opencode/index.js",
-      "default": "./dist/sdk/workflows/builtin/ralph/opencode/index.js"
+    "./*": {
+      "bun": "./src/sdk/*",
+      "types": "./dist/sdk/*"
     }
   },
   "files": [
@@ -69,7 +47,7 @@
   ],
   "scripts": {
     "dev": "bun run src/cli.ts",
-    "build": "bun run build.ts",
+    "build": "rm -rf dist && bunx tsc --project tsconfig.build.json",
     "prepack": "bun run build",
     "test": "bun test ./src ./tests",
     "test:coverage": "bun test --coverage ./src ./tests",
@@ -78,25 +56,26 @@
     "lint:fix": "oxlint --config=oxlint.json --fix src",
     "prepare": "lefthook install || true"
   },
+  "trustedDependencies": ["lefthook"],
   "devDependencies": {
-    "@types/bun": "^1.3.11",
+    "@types/bun": "^1.3.12",
     "@types/react": "^19.2.14",
-    "lefthook": "^2.1.4",
+    "lefthook": "^2.1.5",
     "oxlint": "^1.59.0",
     "typescript": "^6.0.2",
     "typescript-language-server": "^5.1.3"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.2.92",
+    "@anthropic-ai/claude-agent-sdk": "^0.2.104",
     "@clack/prompts": "^1.2.0",
     "@commander-js/extra-typings": "^14.0.0",
-    "@github/copilot-sdk": "^0.2.1",
-    "@opencode-ai/sdk": "^1.3.17",
+    "@github/copilot-sdk": "^0.2.2",
+    "@opencode-ai/sdk": "^1.4.3",
     "@opentui/core": "^0.1.97",
     "@opentui/react": "^0.1.97",
     "commander": "^14.0.3",
     "ignore": "^7.0.5",
-    "react": "19",
+    "react": "^19.2.5",
     "yaml": "^2.8.3",
     "zod": "^4.3.6"
   }

package/src/cli.ts

@@ -16,9 +16,9 @@
  */
 
 import { Command } from "@commander-js/extra-typings";
-import { VERSION } from "@/version.ts";
-import { COLORS } from "@/theme/colors.ts";
-import { AGENT_CONFIG, type AgentKey, SCM_CONFIG, type SourceControlType } from "@/services/config/index.ts";
+import { VERSION } from "./version.ts";
+import { COLORS } from "./theme/colors.ts";
+import { AGENT_CONFIG, type AgentKey, SCM_CONFIG, type SourceControlType } from "./services/config/index.ts";
 
 /**
  * Create and configure the main CLI program
@@ -61,7 +61,7 @@ export function createProgram() {
         )
         .action(async (localOpts) => {
             const globalOpts = program.opts();
-            const { initCommand } = await import("@/commands/cli/init.ts");
+            const { initCommand } = await import("./commands/cli/init.ts");
 
             await initCommand({
                 showBanner: globalOpts.banner !== false,
@@ -117,9 +117,9 @@ Examples:
             // Collect extra args/options to forward to the native CLI
             const passthroughArgs = cmd.args;
 
-            const { chatCommand } = await import("@/commands/cli/chat.ts");
+            const { chatCommand } = await import("./commands/cli/chat.ts");
             const exitCode = await chatCommand({
-                agentType: agentType as "claude" | "opencode" | "copilot",
+                agentType: agentType as AgentKey,
                 passthroughArgs,
             });
 
@@ -157,7 +157,7 @@ Examples:
                                                     Run a structured-input workflow`,
         )
         .action(async (localOpts, cmd) => {
-            const { workflowCommand } = await import("@/commands/cli/workflow.ts");
+            const { workflowCommand } = await import("./commands/cli/workflow.ts");
             const exitCode = await workflowCommand({
                 name: localOpts.name,
                 agent: localOpts.agent,
@@ -179,8 +179,9 @@ Examples:
         .argument("<key>", "Configuration key (e.g., telemetry)")
         .argument("<value>", "Value to set (e.g., true, false)")
         .action(async (key: string, value: string) => {
-            const { configCommand } = await import("@/commands/cli/config.ts");
-            await configCommand("set", key, value);
+            const { configCommand } = await import("./commands/cli/config.ts");
+            const exitCode = await configCommand("set", key, value);
+            process.exit(exitCode);
         });
 
     return program;
@@ -206,7 +207,7 @@ async function main(): Promise<void> {
             argv.includes("-h");
 
         if (!isInfoCommand) {
-            const { autoSyncIfStale } = await import("@/services/system/auto-sync.ts");
+            const { autoSyncIfStale } = await import("./services/system/auto-sync.ts");
             await autoSyncIfStale();
         }
 

package/src/commands/cli/chat/index.ts

@@ -13,28 +13,28 @@
  *   atomic chat -a <agent> [native-args...]
  */
 
-import { join } from "path";
-import { homedir } from "os";
-import { mkdir, writeFile, rm } from "fs/promises";
-import { AGENT_CONFIG, type AgentKey } from "@/services/config/index.ts";
-import { COLORS } from "@/theme/colors.ts";
-import { isCommandInstalled } from "@/services/system/detect.ts";
+import { join } from "node:path";
+import { homedir } from "node:os";
+import { mkdir, writeFile, rm } from "node:fs/promises";
+import { AGENT_CONFIG, type AgentKey } from "../../../services/config/index.ts";
+import { COLORS } from "../../../theme/colors.ts";
+import { isCommandInstalled } from "../../../services/system/detect.ts";
 import {
   ensureAtomicGlobalAgentConfigs,
-} from "@/services/config/atomic-global-config.ts";
-import { getConfigRoot } from "@/services/config/config-path.ts";
+} from "../../../services/config/atomic-global-config.ts";
+import { getConfigRoot } from "../../../services/config/config-path.ts";
 import {
   isInsideTmux,
   isTmuxInstalled,
   resetMuxBinaryCache,
-} from "@/sdk/workflows/index.ts";
+} from "../../../sdk/workflows/index.ts";
 import {
   createSession,
   killSession,
   spawnMuxAttach,
   SOCKET_NAME,
-} from "@/sdk/workflows/index.ts";
-import { ensureTmuxInstalled } from "@/lib/spawn.ts";
+} from "../../../sdk/workflows/index.ts";
+import { ensureTmuxInstalled } from "../../../lib/spawn.ts";
 
 // ============================================================================
 // Types

package/src/commands/cli/chat.ts

@@ -5,4 +5,4 @@
  * The implementation lives under `commands/cli/chat/`.
  */
 
-export * from "@/commands/cli/chat/index.ts";
+export * from "./chat/index.ts";

package/src/commands/cli/config.ts

@@ -8,7 +8,7 @@
  */
 
 import { log } from "@clack/prompts";
-import { setTelemetryEnabled } from "@/services/config/settings.ts";
+import { setTelemetryEnabled } from "../../services/config/settings.ts";
 
 /**
  * Execute the config command
@@ -17,39 +17,40 @@ export async function configCommand(
   subcommand: string | undefined,
   key: string | undefined,
   value: string | undefined
-): Promise<void> {
+): Promise<number> {
   if (!subcommand) {
     log.error("Missing subcommand. Usage: atomic config set <key> <value>");
-    process.exit(1);
+    return 1;
   }
 
   if (subcommand !== "set") {
     log.error(`Unknown subcommand: ${subcommand}. Only 'set' is supported.`);
-    process.exit(1);
+    return 1;
   }
 
   if (!key) {
     log.error("Missing key. Usage: atomic config set <key> <value>");
-    process.exit(1);
+    return 1;
   }
 
   if (key !== "telemetry") {
     log.error(`Unknown config key: ${key}. Only 'telemetry' is supported.`);
-    process.exit(1);
+    return 1;
   }
 
   if (!value) {
     log.error("Missing value. Usage: atomic config set telemetry <true|false>");
-    process.exit(1);
+    return 1;
   }
 
   if (value !== "true" && value !== "false") {
     log.error(`Invalid value: ${value}. Must be 'true' or 'false'.`);
-    process.exit(1);
+    return 1;
   }
 
   const enabled = value === "true";
-  setTelemetryEnabled(enabled);
+  await setTelemetryEnabled(enabled);
 
   log.success(`Telemetry has been ${enabled ? "enabled" : "disabled"}.`);
+  return 0;
 }

package/src/commands/cli/init/index.ts

@@ -16,7 +16,7 @@ import {
   note,
   log,
 } from "@clack/prompts";
-import { join, resolve } from "path";
+import { join, resolve } from "node:path";
 
 import {
   AGENT_CONFIG,
@@ -28,16 +28,16 @@ import {
   type SourceControlType,
   getScmKeys,
   isValidScm,
-} from "@/services/config/index.ts";
-import { pathExists } from "@/services/system/copy.ts";
-import { getConfigRoot } from "@/services/config/config-path.ts";
-import { isWindows, isWslInstalled, WSL_INSTALL_URL } from "@/services/system/detect.ts";
-import { saveAtomicConfig } from "@/services/config/atomic-config.ts";
-import { upsertTrustedWorkspacePath } from "@/services/config/settings.ts";
+} from "../../../services/config/index.ts";
+import { pathExists } from "../../../services/system/copy.ts";
+import { getConfigRoot } from "../../../services/config/config-path.ts";
+import { isWindows, isWslInstalled, WSL_INSTALL_URL } from "../../../services/system/detect.ts";
+import { saveAtomicConfig } from "../../../services/config/atomic-config.ts";
+import { upsertTrustedWorkspacePath } from "../../../services/config/settings.ts";
 import {
   ensureAtomicGlobalAgentConfigs,
   getTemplateAgentFolder,
-} from "@/services/config/atomic-global-config.ts";
+} from "../../../services/config/atomic-global-config.ts";
 import {
   installLocalScmSkills,
   reconcileScmVariants,
@@ -47,8 +47,8 @@ import {
   applyManagedOnboardingFiles,
   hasProjectOnboardingFiles,
 } from "./onboarding.ts";
-import { displayBlockBanner } from "@/theme/logo.ts";
-import { createPainter } from "@/theme/colors.ts";
+import { displayBlockBanner } from "../../../theme/logo.ts";
+import { createPainter } from "../../../theme/colors.ts";
 
 /**
  * Thrown when the user cancels an interactive prompt during init.
@@ -268,7 +268,7 @@ export async function initCommand(options: InitOptions = {}): Promise<void> {
     await saveAtomicConfig(targetDir, {
       scm: scmType,
     });
-    upsertTrustedWorkspacePath(resolve(targetDir), agentKey);
+    await upsertTrustedWorkspacePath(resolve(targetDir), agentKey);
 
     s.stop(paint("success", "✓", { bold: true }) + " Skills configured");
 

package/src/commands/cli/init/onboarding.ts

@@ -1,7 +1,7 @@
-import { dirname, join } from "path";
-import { AGENT_CONFIG, type AgentKey } from "@/services/config/index.ts";
-import { copyFile, pathExists, ensureDir } from "@/services/system/copy.ts";
-import { mergeJsonFile } from "@/lib/merge.ts";
+import { dirname, join } from "node:path";
+import { AGENT_CONFIG, type AgentKey } from "../../../services/config/index.ts";
+import { copyFile, pathExists, ensureDir } from "../../../services/system/copy.ts";
+import { mergeJsonFile } from "../../../lib/merge.ts";
 
 export async function applyManagedOnboardingFiles(
   agentKey: AgentKey,

package/src/commands/cli/init/scm.ts

@@ -1,12 +1,12 @@
-import { join } from "path";
-import { readdir } from "fs/promises";
-import { copyFile, pathExists, ensureDir } from "@/services/system/copy.ts";
-import { getOppositeScriptExtension } from "@/services/system/detect.ts";
+import { join } from "node:path";
+import { readdir } from "node:fs/promises";
+import { copyFile, pathExists, ensureDir } from "../../../services/system/copy.ts";
+import { getOppositeScriptExtension } from "../../../services/system/detect.ts";
 import {
   SCM_SKILLS_BY_TYPE,
   type AgentKey,
   type SourceControlType,
-} from "@/services/config/index.ts";
+} from "../../../services/config/index.ts";
 
 export const SCM_PREFIX_BY_TYPE: Record<SourceControlType, "gh-" | "sl-"> = {
   github: "gh-",

package/src/commands/cli/init.ts

@@ -5,4 +5,4 @@
  * historical `commands/cli/init.ts` path remains stable.
  */
 
-export * from "@/commands/cli/init/index.ts";
+export * from "./init/index.ts";

package/src/commands/cli/workflow-command.test.ts

@@ -29,17 +29,18 @@ import {
   afterEach,
   mock,
 } from "bun:test";
-import { mkdtemp, mkdir, rm, writeFile } from "fs/promises";
-import { join } from "path";
-import { tmpdir } from "os";
-import * as realWorkflows from "@/sdk/workflows/index.ts";
-import * as realDetect from "@/services/system/detect.ts";
+import { mkdtemp, mkdir, rm, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import * as realWorkflows from "../../sdk/workflows/index.ts";
+import * as realDetect from "../../services/system/detect.ts";
 import * as realSpawn from "../../lib/spawn.ts";
+import { AGENT_CONFIG } from "../../services/config/index.ts";
 import type {
   WorkflowDefinition,
   WorkflowRunOptions,
   DiscoveredWorkflow,
-} from "@/sdk/workflows/index.ts";
+} from "../../sdk/workflows/index.ts";
 
 // Capture original function references BEFORE `mock.module` replaces the
 // module exports. `import * as realWorkflows` gives a LIVE namespace — after
@@ -77,9 +78,16 @@ const loadWorkflowsMetadataMock = mock<
 const isTmuxInstalledMock =
   mock<typeof realWorkflows.isTmuxInstalled>(() => true);
 
-// Default: real presence check. Tests override for the agent-missing branch.
+// Default: delegate to the real check, but pretend agent CLIs are installed.
+// CI runners won't have copilot/opencode/claude on PATH; without this
+// override every test that passes through runPrereqChecks would bail early.
+// Non-agent commands still hit the real check so mock.module doesn't break
+// detect.test.ts (Bun shares one process across test files).
+const AGENT_CMDS = new Set(Object.values(AGENT_CONFIG).map((c) => c.cmd));
+const defaultIsCommandInstalled = (cmd: string) =>
+  AGENT_CMDS.has(cmd) || realIsCommandInstalled(cmd);
 const isCommandInstalledMock = mock<typeof realDetect.isCommandInstalled>(
-  (cmd) => realIsCommandInstalled(cmd),
+  defaultIsCommandInstalled,
 );
 
 // Default: no-op so the best-effort installer branch in runPrereqChecks
@@ -91,14 +99,14 @@ const ensureBunInstalledMock = mock<typeof realSpawn.ensureBunInstalled>(
   async () => {},
 );
 
-mock.module("@/sdk/workflows/index.ts", () => ({
+mock.module("../../sdk/workflows/index.ts", () => ({
   ...realWorkflows,
   executeWorkflow: executeWorkflowMock,
   discoverWorkflows: discoverWorkflowsMock,
   loadWorkflowsMetadata: loadWorkflowsMetadataMock,
   isTmuxInstalled: isTmuxInstalledMock,
 }));
-mock.module("@/services/system/detect.ts", () => ({
+mock.module("../../services/system/detect.ts", () => ({
   ...realDetect,
   isCommandInstalled: isCommandInstalledMock,
 }));
@@ -201,7 +209,7 @@ beforeEach(async () => {
   isTmuxInstalledMock.mockClear();
   isTmuxInstalledMock.mockImplementation(() => true);
   isCommandInstalledMock.mockClear();
-  isCommandInstalledMock.mockImplementation((cmd) => realIsCommandInstalled(cmd));
+  isCommandInstalledMock.mockImplementation(defaultIsCommandInstalled);
   ensureTmuxInstalledMock.mockClear();
   ensureTmuxInstalledMock.mockImplementation(async () => {});
   ensureBunInstalledMock.mockClear();

package/src/commands/cli/workflow.test.ts

@@ -5,8 +5,8 @@ import {
   resolveInputs,
   renderWorkflowList,
 } from "./workflow.ts";
-import type { WorkflowInput } from "@/sdk/workflows/index.ts";
-import type { DiscoveredWorkflow } from "@/sdk/workflows/index.ts";
+import type { WorkflowInput } from "../../sdk/workflows/index.ts";
+import type { DiscoveredWorkflow } from "../../sdk/workflows/index.ts";
 
 // ─── Colour handling ────────────────────────────────────────────────────────
 // The renderer emits ANSI sequences when the host terminal claims truecolor

package/src/commands/cli/workflow.ts

@@ -9,9 +9,9 @@
  *   atomic workflow --list                         list discoverable workflows
  */
 
-import { AGENT_CONFIG, type AgentKey } from "@/services/config/index.ts";
-import { COLORS, createPainter, type PaletteKey } from "@/theme/colors.ts";
-import { isCommandInstalled } from "@/services/system/detect.ts";
+import { AGENT_CONFIG, type AgentKey } from "../../services/config/index.ts";
+import { COLORS, createPainter, type PaletteKey } from "../../theme/colors.ts";
+import { isCommandInstalled } from "../../services/system/detect.ts";
 import { ensureTmuxInstalled, ensureBunInstalled } from "../../lib/spawn.ts";
 import {
   isTmuxInstalled,
@@ -21,14 +21,14 @@ import {
   executeWorkflow,
   WorkflowLoader,
   resetMuxBinaryCache,
-} from "@/sdk/workflows/index.ts";
+} from "../../sdk/workflows/index.ts";
 import type {
   AgentType,
   DiscoveredWorkflow,
   WorkflowInput,
   WorkflowWithMetadata,
-} from "@/sdk/workflows/index.ts";
-import { WorkflowPickerPanel } from "@/sdk/components/workflow-picker-panel.tsx";
+} from "../../sdk/workflows/index.ts";
+import { WorkflowPickerPanel } from "../../sdk/components/workflow-picker-panel.tsx";
 
 // ─── Flag parser ────────────────────────────────────────────────────────────
 

package/src/lib/merge.ts

@@ -2,29 +2,12 @@
  * Utilities for merging JSON configuration files
  */
 
-import { readFile, writeFile } from "fs/promises";
-import { resolve } from "path";
+import { resolve } from "node:path";
 
-interface McpConfig {
-  mcpServers?: Record<string, unknown>;
-  servers?: Record<string, unknown>;
-  lspServers?: Record<string, unknown>;
-  [key: string]: unknown;
-}
+type McpConfig = Record<string, unknown>;
 
-function mergeNamedObjectMap(
-  destination: Record<string, unknown> | undefined,
-  source: Record<string, unknown> | undefined,
-): Record<string, unknown> | undefined {
-  if (!destination && !source) {
-    return undefined;
-  }
-
-  return {
-    ...destination,
-    ...source,
-  };
-}
+/** Keys that hold named-object maps (server registries). */
+const SERVER_MAP_KEYS = ["mcpServers", "servers", "lspServers"] as const;
 
 /**
  * Merge source JSON file into destination JSON file
@@ -43,23 +26,26 @@ export async function mergeJsonFile(
     return;
   }
 
-  const [srcContent, destContent] = await Promise.all([
-    readFile(srcPath, "utf-8"),
-    readFile(destPath, "utf-8"),
+  const [srcConfig, destConfig] = await Promise.all([
+    Bun.file(srcPath).json() as Promise<McpConfig>,
+    Bun.file(destPath).json() as Promise<McpConfig>,
   ]);
 
-  const srcConfig: McpConfig = JSON.parse(srcContent);
-  const destConfig: McpConfig = JSON.parse(destContent);
-
   // Merge top-level config - preserve destination's other keys
   const mergedConfig: McpConfig = {
     ...destConfig,
     ...srcConfig,
   };
 
-  mergedConfig.mcpServers = mergeNamedObjectMap(destConfig.mcpServers, srcConfig.mcpServers);
-  mergedConfig.servers = mergeNamedObjectMap(destConfig.servers, srcConfig.servers);
-  mergedConfig.lspServers = mergeNamedObjectMap(destConfig.lspServers, srcConfig.lspServers);
+  // Server maps are merged individually so the destination's existing
+  // entries are preserved while source entries are added or updated.
+  for (const key of SERVER_MAP_KEYS) {
+    const dst = destConfig[key] as Record<string, unknown> | undefined;
+    const src = srcConfig[key] as Record<string, unknown> | undefined;
+    if (dst || src) {
+      mergedConfig[key] = { ...dst, ...src };
+    }
+  }
 
-  await writeFile(destPath, JSON.stringify(mergedConfig, null, 2) + "\n");
+  await Bun.write(destPath, JSON.stringify(mergedConfig, null, 2) + "\n");
 }

package/src/lib/path-root-guard.ts

@@ -1,5 +1,5 @@
-import { realpath } from "fs/promises";
-import { isAbsolute, relative, resolve } from "path";
+import { realpath } from "node:fs/promises";
+import { isAbsolute, relative, resolve } from "node:path";
 
 function isSubPath(rootPath: string, targetPath: string): boolean {
   const rel = relative(rootPath, targetPath);