@bastani/atomic 0.5.4-0 → 0.5.5-0

package/src/services/config/atomic-config.ts

@@ -7,12 +7,11 @@
  * 2) global `~/.atomic/settings.json` (default fallback)
  */
 
-import { readFile, writeFile } from "fs/promises";
-import { join, dirname } from "path";
-import { homedir } from "os";
-import { type SourceControlType } from "@/services/config/index.ts";
-import { SETTINGS_SCHEMA_URL } from "@/services/config/settings-schema.ts";
-import { ensureDir } from "@/services/system/copy.ts";
+import { join, dirname } from "node:path";
+import { homedir } from "node:os";
+import { type SourceControlType } from "./index.ts";
+import { SETTINGS_SCHEMA_URL } from "./settings-schema.ts";
+import { ensureDir } from "../system/copy.ts";
 
 const SETTINGS_DIR = ".atomic";
 const SETTINGS_FILENAME = "settings.json";
@@ -42,7 +41,7 @@ function getLocalSettingsPath(projectDir: string): string {
 
 async function readJsonFile(path: string): Promise<JsonRecord | null> {
   try {
-    return JSON.parse(await readFile(path, "utf-8")) as JsonRecord;
+    return await Bun.file(path).json() as JsonRecord;
   } catch {
     return null;
   }
@@ -112,7 +111,7 @@ export async function saveAtomicConfig(
   };
 
   await ensureDir(dirname(localPath));
-  await writeFile(localPath, JSON.stringify(nextSettings, null, 2) + "\n", "utf-8");
+  await Bun.write(localPath, JSON.stringify(nextSettings, null, 2) + "\n");
 }
 
 /**

package/src/services/config/atomic-global-config.ts

@@ -1,10 +1,10 @@
-import { copyFile, lstat, readdir, rm, rmdir } from "fs/promises";
-import { join, resolve } from "path";
-import { homedir } from "os";
+import { copyFile, lstat, readdir, rm, rmdir } from "node:fs/promises";
+import { join, resolve } from "node:path";
+import { homedir } from "node:os";
 
-import { AGENT_CONFIG, type AgentKey } from "@/services/config/index.ts";
-import { mergeJsonFile } from "@/lib/merge.ts";
-import { copyDir, ensureDir, pathExists } from "@/services/system/copy.ts";
+import { AGENT_CONFIG, getAgentKeys, type AgentKey } from "./index.ts";
+import { mergeJsonFile } from "../../lib/merge.ts";
+import { copyDir, ensureDir, pathExists } from "../system/copy.ts";
 
 
 const ATOMIC_HOME_DIR = join(homedir(), ".atomic");
@@ -196,7 +196,7 @@ export async function removeAtomicManagedGlobalAgentConfigs(
   configRoot: string,
   baseDir: string = ATOMIC_HOME_DIR,
 ): Promise<void> {
-  const agentKeys = Object.keys(AGENT_CONFIG) as AgentKey[];
+  const agentKeys = getAgentKeys();
 
   for (const agentKey of agentKeys) {
     const sourceFolder = join(configRoot, getTemplateAgentFolder(agentKey));
@@ -256,7 +256,7 @@ export async function syncAtomicGlobalAgentConfigs(
 ): Promise<void> {
   await ensureDir(baseDir);
 
-  const agentKeys = Object.keys(AGENT_CONFIG) as AgentKey[];
+  const agentKeys = getAgentKeys();
   for (const agentKey of agentKeys) {
     const sourceFolder = join(configRoot, getTemplateAgentFolder(agentKey));
     if (!(await pathExists(sourceFolder))) continue;
@@ -300,7 +300,7 @@ export async function hasAtomicGlobalAgentConfigs(
   configRoot: string,
   baseDir: string = ATOMIC_HOME_DIR,
 ): Promise<boolean> {
-  const agentKeys = Object.keys(AGENT_CONFIG) as AgentKey[];
+  const agentKeys = getAgentKeys();
 
   for (const agentKey of agentKeys) {
     const sourceFolder = join(configRoot, getTemplateAgentFolder(agentKey));

package/src/services/config/config-path.ts

@@ -6,7 +6,7 @@
  * 2. npm/bun installed: Installed via `bun add -g @bastani/atomic`
  */
 
-import { join } from "path";
+import { join } from "node:path";
 
 /**
  * Get the root directory where config folders (.claude, .opencode, .github) are stored.

package/src/services/config/definitions.ts

@@ -119,13 +119,12 @@ export function getAgentKeys(): AgentKey[] {
  * Source Control Management (SCM) configuration definitions
  */
 
-/** Supported source control types */
-export type SourceControlType = "github" | "sapling";
-// Future: | 'azure-devops'
-
 /** SCM keys for iteration */
 const SCM_KEYS = ["github", "sapling"] as const;
 
+/** Supported source control types — derived from SCM_KEYS tuple. */
+export type SourceControlType = (typeof SCM_KEYS)[number];
+
 export interface ScmConfig {
   /** Internal identifier */
   name: string;

package/src/services/config/index.ts

@@ -4,4 +4,4 @@
  * Centralized access to the CLI's agent and SCM configuration.
  */
 
-export * from "@/services/config/definitions.ts";
+export * from "./definitions.ts";

package/src/services/config/settings.ts

@@ -9,12 +9,12 @@
  * The --model CLI flag takes precedence over both (handled at call site).
  */
 
-import { readFileSync, writeFileSync, existsSync } from "node:fs";
 import { join, dirname, resolve } from "node:path";
 import { homedir } from "node:os";
-import { SETTINGS_SCHEMA_URL } from "@/services/config/settings-schema.ts";
-import { ensureDirSync } from "@/services/system/copy.ts";
-import type { AgentKey } from "@/services/config/definitions.ts";
+import { SETTINGS_SCHEMA_URL } from "./settings-schema.ts";
+import { ensureDir } from "../system/copy.ts";
+import { errorMessage } from "../../sdk/errors.ts";
+import type { AgentKey, SourceControlType } from "./definitions.ts";
 
 export interface TrustedPathEntry {
   workspacePath: string;
@@ -23,10 +23,16 @@ export interface TrustedPathEntry {
 
 interface AtomicSettings {
   $schema?: string;
-  scm?: "github" | "sapling";
+  scm?: SourceControlType;
   version?: number;
   lastUpdated?: string;
   trustedPaths?: TrustedPathEntry[];
+  telemetryEnabled?: boolean;
+}
+
+/** Runtime guard for parsed JSON to ensure it's a plain object. */
+function isPlainObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
 /** Global settings path: ~/.atomic/settings.json */
@@ -35,31 +41,21 @@ function globalSettingsPath(): string {
   return join(home, ".atomic", "settings.json");
 }
 
-function loadSettingsFileSync(path: string): AtomicSettings {
-  try {
-    if (existsSync(path)) {
-      return JSON.parse(readFileSync(path, "utf-8")) as AtomicSettings;
-    }
-  } catch {
-    // Silently fail
-  }
-  return {};
-}
-
 async function loadSettingsFile(path: string): Promise<AtomicSettings> {
   try {
-    return await Bun.file(path).json() as AtomicSettings;
+    const parsed: unknown = await Bun.file(path).json();
+    if (isPlainObject(parsed)) return parsed as AtomicSettings;
   } catch {
-    // Silently fail (file doesn't exist or invalid JSON)
+    // File missing or invalid JSON — fall through to default
   }
   return {};
 }
 
-function writeGlobalSettingsSync(settings: AtomicSettings): void {
+async function writeGlobalSettings(settings: AtomicSettings): Promise<void> {
+  settings.$schema = SETTINGS_SCHEMA_URL;
   const path = globalSettingsPath();
-  const dir = dirname(path);
-  if (!existsSync(dir)) ensureDirSync(dir);
-  writeFileSync(path, JSON.stringify(settings, null, 2), "utf-8");
+  await ensureDir(dirname(path));
+  await Bun.write(path, JSON.stringify(settings, null, 2));
 }
 
 function normalizeTrustedPathEntry(entry: TrustedPathEntry): TrustedPathEntry {
@@ -102,33 +98,31 @@ export async function isTrustedWorkspacePath(
   );
 }
 
-export function upsertTrustedWorkspacePath(
+export async function upsertTrustedWorkspacePath(
   workspacePath: string,
   provider: AgentKey,
-): void {
+): Promise<void> {
   try {
-    const settings = loadSettingsFileSync(globalSettingsPath());
-    settings.$schema = SETTINGS_SCHEMA_URL;
+    const settings = await loadSettingsFile(globalSettingsPath());
     settings.trustedPaths = normalizeTrustedPaths([
       ...(settings.trustedPaths ?? []),
       { workspacePath, provider },
     ]);
-    writeGlobalSettingsSync(settings);
-  } catch {
-    // Silently fail
+    await writeGlobalSettings(settings);
+  } catch (e) {
+    console.warn(`[settings] failed to upsert trusted path: ${errorMessage(e)}`);
   }
 }
 
 /**
  * Set telemetry enabled/disabled in global settings.
  */
-export function setTelemetryEnabled(enabled: boolean): void {
+export async function setTelemetryEnabled(enabled: boolean): Promise<void> {
   try {
-    const settings = loadSettingsFileSync(globalSettingsPath());
-    settings.$schema = SETTINGS_SCHEMA_URL;
-    (settings as Record<string, unknown>).telemetryEnabled = enabled;
-    writeGlobalSettingsSync(settings);
-  } catch {
-    // Silently fail
+    const settings = await loadSettingsFile(globalSettingsPath());
+    settings.telemetryEnabled = enabled;
+    await writeGlobalSettings(settings);
+  } catch (e) {
+    console.warn(`[settings] failed to set telemetry: ${errorMessage(e)}`);
   }
 }

package/src/services/system/agents.ts

@@ -17,14 +17,14 @@
  * source is left untouched).
  */
 
-import { join, dirname } from "path";
-import { homedir } from "os";
+import { join, dirname } from "node:path";
+import { homedir } from "node:os";
 import {
   copyDir,
   copyFile,
   ensureDir,
   pathExists,
-} from "@/services/system/copy.ts";
+} from "./copy.ts";
 
 /**
  * Locate the package root by walking up from this module. Both in installed

package/src/services/system/auto-sync.ts

@@ -31,20 +31,20 @@
  * launch.
  */
 
-import { join } from "path";
-import { homedir } from "os";
-import { VERSION } from "@/version.ts";
-import { COLORS } from "@/theme/colors.ts";
+import { join } from "node:path";
+import { homedir } from "node:os";
+import { VERSION } from "../../version.ts";
+import { COLORS } from "../../theme/colors.ts";
 import {
   ensureNpmInstalled,
   ensureTmuxInstalled,
   upgradePlaywrightCli,
   upgradeLiteparse,
-} from "@/lib/spawn.ts";
-import { installGlobalAgents } from "@/services/system/agents.ts";
-import { installGlobalSkills } from "@/services/system/skills.ts";
-import { runSteps, printSummary } from "@/services/system/install-ui.ts";
-import { displayBlockBanner } from "@/theme/logo.ts";
+} from "../../lib/spawn.ts";
+import { installGlobalAgents } from "./agents.ts";
+import { installGlobalSkills } from "./skills.ts";
+import { runSteps, printSummary } from "./install-ui.ts";
+import { displayBlockBanner } from "../../theme/logo.ts";
 
 /** Path to the version marker. Honors ATOMIC_SETTINGS_HOME for tests. */
 function syncMarkerPath(): string {

package/src/services/system/copy.ts

@@ -2,9 +2,15 @@
  * Utilities for copying directories and files with exclusions
  */
 
-import { readdir, mkdir, stat, readFile } from "fs/promises";
-import { mkdirSync } from "fs";
-import { join, extname, relative, resolve } from "path";
+import { readdir, mkdir, stat, readFile } from "node:fs/promises";
+import { mkdirSync } from "node:fs";
+import { join, extname, relative, resolve } from "node:path";
+import { getOppositeScriptExtension } from "./detect.ts";
+import {
+  assertPathWithinRoot,
+  assertRealPathWithinRoot,
+  isPathWithinRoot,
+} from "../../lib/path-root-guard.ts";
 
 /**
  * Safely create a directory (and parents) without throwing on EEXIST.
@@ -46,12 +52,6 @@ export function ensureDirSync(path: string): void {
     throw error;
   }
 }
-import { getOppositeScriptExtension } from "@/services/system/detect.ts";
-import {
-  assertPathWithinRoot,
-  assertRealPathWithinRoot,
-  isPathWithinRoot,
-} from "@/lib/path-root-guard.ts";
 
 /**
  * Normalize a path for cross-platform comparison.

package/src/services/system/file-lock.ts

@@ -8,8 +8,8 @@
  */
 
 import { existsSync, writeFileSync, readFileSync, unlinkSync, readdirSync } from "node:fs";
-import { join, dirname } from "path";
-import { ensureDirSync } from "@/services/system/copy.ts";
+import { join, dirname } from "node:path";
+import { ensureDirSync } from "./copy.ts";
 
 // ============================================================================
 // TYPES

package/src/services/system/install-ui.ts

@@ -23,11 +23,11 @@
  * library, just what auto-sync needs to stop being visually noisy.
  */
 
-import { COLORS } from "@/theme/colors.ts";
+import { COLORS } from "../../theme/colors.ts";
 import {
   supportsTrueColor,
   supports256Color,
-} from "@/services/system/detect.ts";
+} from "./detect.ts";
 
 const BAR_WIDTH = 30;
 const BAR_FILLED = "■";

package/src/services/system/skills.ts

@@ -6,7 +6,7 @@
  * locally per-project based on the user's selected SCM + active agent.
  */
 
-import { ALL_SCM_SKILLS } from "@/services/config/index.ts";
+import { ALL_SCM_SKILLS } from "../config/index.ts";
 
 const SKILLS_REPO = "https://github.com/flora131/atomic.git";
 const SKILLS_AGENTS = ["claude-code", "opencode", "github-copilot"] as const;

package/src/theme/colors.ts

@@ -1,4 +1,4 @@
-import { supportsColor, supportsTrueColor } from "@/services/system/detect.ts";
+import { supportsColor, supportsTrueColor } from "../services/system/detect.ts";
 
 /**
  * ANSI color and formatting codes for CLI output

package/src/theme/logo.ts

@@ -8,7 +8,7 @@ import {
   supportsTrueColor,
   supports256Color,
   supportsColor,
-} from "@/services/system/detect.ts";
+} from "../services/system/detect.ts";
 
 export const ATOMIC_BLOCK_LOGO = [
   "█▀▀█ ▀▀█▀▀ █▀▀█ █▀▄▀█ ▀█▀ █▀▀",

package/tsconfig.json

@@ -3,13 +3,12 @@
     // Environment setup & latest features
     "lib": ["ESNext", "DOM"],
     "target": "ESNext",
-    "module": "ESNext",
+    "module": "Preserve",
+    "moduleDetection": "force",
     "jsx": "react-jsx",
+    "allowJs": true,
 
     // Bundler mode
-    "paths": {
-      "@/*": ["./src/*"]
-    },
     "jsxImportSource": "@opentui/react",
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,

package/dist/chunk-1gb5qxz9.js

@@ -1 +0,0 @@
-// @bun