@bastani/atomic 0.5.14 → 0.5.15-0

package/src/services/config/definitions.ts

@@ -2,6 +2,9 @@
  * Agent configuration definitions for atomic CLI
  */
 
+import { stat } from "node:fs/promises";
+import { join } from "node:path";
+
 export interface AgentConfig {
   /** Display name for the agent */
   name: string;
@@ -36,12 +39,10 @@ export const AGENT_CONFIG: Record<AgentKey, AgentConfig> = {
       "--allow-dangerously-skip-permissions",
       "--dangerously-skip-permissions",
     ],
-    env_vars: {
-      CLAUDE_CODE_NO_FLICKER: "1",
-    },
+    env_vars: {},
     folder: ".claude",
     install_url: "https://code.claude.com/docs/en/setup",
-    exclude: [".DS_Store", "settings.json"],
+    exclude: [],
     onboarding_files: [
       {
         source: ".mcp.json",
@@ -62,14 +63,7 @@ export const AGENT_CONFIG: Record<AgentKey, AgentConfig> = {
     env_vars: { OPENCODE_EXPERIMENTAL_LSP_TOOL: "true" },
     folder: ".opencode",
     install_url: "https://opencode.ai",
-    exclude: [
-      "node_modules",
-      ".gitignore",
-      "bun.lock",
-      "package.json",
-      ".DS_Store",
-      "opencode.json",
-    ],
+    exclude: [".gitignore", "package.json"],
     onboarding_files: [
       {
         source: ".opencode/opencode.json",
@@ -81,30 +75,37 @@ export const AGENT_CONFIG: Record<AgentKey, AgentConfig> = {
   copilot: {
     name: "GitHub Copilot CLI",
     cmd: "copilot",
-    chat_flags: [
-      "--add-dir",
-      ".",
-      "--yolo",
-      "--experimental",
-      "--no-auto-update",
-    ],
+    chat_flags: ["--add-dir", ".", "--yolo", "--experimental"],
     env_vars: {
       COPILOT_ALLOW_ALL: "true",
     },
     folder: ".github",
     install_url:
       "https://github.com/github/copilot-cli?tab=readme-ov-file#installation",
-    exclude: ["workflows", "dependabot.yml", ".DS_Store"],
+    exclude: ["workflows", "dependabot.yml"],
     onboarding_files: [
       {
-        source: ".vscode/mcp.json",
-        destination: ".vscode/mcp.json",
+        source: ".mcp.json",
+        destination: ".mcp.json",
         merge: true,
       },
     ],
   },
 };
 
+/**
+ * Per-provider overrides that users can set in `.atomic/settings.json`
+ * (local) or `~/.atomic/settings.json` (global).
+ *
+ * - `chatFlags`: when set, replaces the agent's default `chat_flags` entirely.
+ * - `envVars`: environment variables merged on top of the agent's default
+ *   `env_vars` (user values win on conflict).
+ */
+export interface ProviderOverrides {
+  chatFlags?: string[];
+  envVars?: Record<string, string>;
+}
+
 export function isValidAgent(key: string): key is AgentKey {
   return key in AGENT_CONFIG;
 }
@@ -128,49 +129,31 @@ const SCM_KEYS = ["github", "sapling"] as const;
 export type SourceControlType = (typeof SCM_KEYS)[number];
 
 export interface ScmConfig {
-  /** Internal identifier */
-  name: string;
   /** Display name for prompts */
   displayName: string;
   /** Primary CLI tool (git or sl) */
   cliTool: string;
-  /** Code review tool (gh, jf submit, arc diff, etc.) */
-  reviewTool: string;
   /** Code review system (github, phabricator) */
   reviewSystem: string;
-  /** Directory marker for potential future auto-detection */
+  /** Directory marker used to detect this SCM in a repo (e.g. `.git`, `.sl`) */
   detectDir: string;
-  /** Code review command file name */
-  reviewCommandFile: string;
-  /** Required configuration files */
-  requiredConfigFiles?: string[];
 }
 
 export const SCM_CONFIG: Record<SourceControlType, ScmConfig> = {
   github: {
-    name: "github",
     displayName: "GitHub / Git",
     cliTool: "git",
-    reviewTool: "gh",
     reviewSystem: "github",
     detectDir: ".git",
-    reviewCommandFile: "create-gh-pr.md",
   },
   sapling: {
-    name: "sapling",
     displayName: "Sapling + Phabricator",
     cliTool: "sl",
-    reviewTool: "jf submit",
     reviewSystem: "phabricator",
     detectDir: ".sl",
-    reviewCommandFile: "submit-diff.md",
-    requiredConfigFiles: [".arcconfig", "~/.arcrc"],
   },
 };
 
-/** Commands that have SCM-specific variants */
-export const SCM_SPECIFIC_COMMANDS = ["commit"];
-
 /**
  * SCM-variant skill names, grouped by source control type.
  *
@@ -207,8 +190,22 @@ export function isValidScm(key: string): key is SourceControlType {
 }
 
 /**
- * Get the configuration for a specific SCM type
+ * Detect the SCM type by looking for marker directories in `projectRoot`.
+ *
+ * Checks each {@link ScmConfig.detectDir} (e.g. `.git`, `.sl`) and returns
+ * the first match. Returns `null` when no known marker is found.
  */
-export function getScmConfig(key: SourceControlType): ScmConfig {
-  return SCM_CONFIG[key];
+export async function detectScmType(
+  projectRoot: string,
+): Promise<SourceControlType | null> {
+  for (const key of getScmKeys()) {
+    const markerPath = join(projectRoot, SCM_CONFIG[key].detectDir);
+    try {
+      await stat(markerPath);
+      return key;
+    } catch {
+      // marker not found — try next
+    }
+  }
+  return null;
 }

package/src/services/config/settings.ts

@@ -14,7 +14,7 @@ import { homedir } from "node:os";
 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";
+import type { AgentKey, ProviderOverrides, SourceControlType } from "./definitions.ts";
 
 export interface TrustedPathEntry {
   workspacePath: string;
@@ -28,6 +28,7 @@ interface AtomicSettings {
   lastUpdated?: string;
   trustedPaths?: TrustedPathEntry[];
   telemetryEnabled?: boolean;
+  providers?: Partial<Record<AgentKey, ProviderOverrides>>;
 }
 
 /** Runtime guard for parsed JSON to ensure it's a plain object. */

package/src/services/system/agents.ts

@@ -25,6 +25,7 @@ import {
   ensureDir,
   pathExists,
 } from "./copy.ts";
+import { createCommonIgnoreFilter } from "../../lib/common-ignore.ts";
 
 /**
  * Locate the package root by walking up from this module. Both in installed
@@ -72,7 +73,7 @@ export async function installGlobalAgents(): Promise<void> {
       continue;
     }
 
-    await copyDir(src, dest);
+    await copyDir(src, dest, { ignoreFilter: createCommonIgnoreFilter() });
   }
 
   // Surface skipped sources via a non-fatal thrown error only if ALL sources

package/src/services/system/copy.ts

@@ -5,6 +5,7 @@
 import { readdir, mkdir, stat, readFile } from "node:fs/promises";
 import { mkdirSync } from "node:fs";
 import { join, extname, relative, resolve } from "node:path";
+import type { Ignore } from "ignore";
 import { getOppositeScriptExtension } from "./detect.ts";
 import {
   assertPathWithinRoot,
@@ -77,6 +78,8 @@ export function isPathSafe(basePath: string, targetPath: string): boolean {
 interface CopyOptions {
   /** Paths to exclude (relative to source root or base names) */
   exclude?: string[];
+  /** Gitignore-style filter for common junk patterns (via the `ignore` package) */
+  ignoreFilter?: Ignore;
   /** Whether to skip scripts for the opposite platform */
   skipOppositeScripts?: boolean;
 }
@@ -158,21 +161,29 @@ async function copySymlinkAsFileWithOverwriteOption(
  * Check if a path should be excluded based on exclusion rules.
  * Uses normalized paths (forward slashes) to ensure consistent matching
  * on both Windows and Unix systems.
+ *
+ * When an {@link Ignore} filter is provided, gitignore-style glob patterns
+ * are evaluated first so common junk files (.DS_Store, node_modules, etc.)
+ * are filtered automatically without polluting the explicit `exclude` list.
  */
 export function shouldExclude(
   relativePath: string,
   name: string,
-  exclude: string[]
+  exclude: string[],
+  ignoreFilter?: Ignore,
 ): boolean {
+  const normalizedPath = normalizePath(relativePath);
+
+  // Gitignore-style patterns take precedence
+  if (ignoreFilter?.ignores(normalizedPath)) {
+    return true;
+  }
+
   // Check if the name matches any exclusion
   if (exclude.includes(name)) {
     return true;
   }
 
-  // Normalize the relative path for cross-platform comparison
-  // This ensures Windows backslash paths match forward-slash exclusion patterns
-  const normalizedPath = normalizePath(relativePath);
-
   // Check if the relative path starts with any exclusion
   for (const ex of exclude) {
     const normalizedExclusion = normalizePath(ex);
@@ -205,7 +216,7 @@ async function copyDirInternal(
   overwriteExisting: boolean = true,
 ): Promise<void> {
   try {
-    const { exclude = [], skipOppositeScripts = true } = options;
+    const { exclude = [], ignoreFilter, skipOppositeScripts = true } = options;
     const root = rootSrc ?? src;
     const destinationRoot = rootDest ?? dest;
 
@@ -245,7 +256,7 @@ async function copyDirInternal(
       }
 
       // Check if this path should be excluded
-      if (shouldExclude(relativePath, entry.name, exclude)) {
+      if (shouldExclude(relativePath, entry.name, exclude, ignoreFilter)) {
         continue;
       }
 

package/src/services/system/skills.ts

@@ -18,6 +18,7 @@
 import { join } from "node:path";
 import { homedir } from "node:os";
 import { ALL_SCM_SKILLS } from "../config/index.ts";
+import { createCommonIgnoreFilter } from "../../lib/common-ignore.ts";
 import { copyDir, pathExists } from "./copy.ts";
 
 /**
@@ -64,10 +65,11 @@ export async function installGlobalSkills(): Promise<void> {
 
   // Build the exclusion list from SCM skill names
   const exclude = [...SCM_SKILL_SET];
+  const ignoreFilter = createCommonIgnoreFilter();
 
   await Promise.all(
     SKILL_DEST_DIRS.map((rel) =>
-      copyDir(src, join(home, rel), { exclude }),
+      copyDir(src, join(home, rel), { exclude, ignoreFilter }),
     ),
   );
 }