@bastani/atomic 0.5.18 → 0.5.19

package/src/sdk/runtime/tmux.ts

@@ -30,28 +30,6 @@ export type TmuxResult =
 // Core tmux primitives
 // ---------------------------------------------------------------------------
 
-// ---------------------------------------------------------------------------
-// Default status-bar values — must match tmux.conf.
-// Centralised here so restore logic in session-graph-panel stays in sync.
-// ---------------------------------------------------------------------------
-
-export const TMUX_DEFAULT_STATUS_LEFT = " ";
-export const TMUX_DEFAULT_STATUS_LEFT_LENGTH = "10";
-export const TMUX_DEFAULT_STATUS_RIGHT = " #{session_name} | %H:%M ";
-export const TMUX_DEFAULT_STATUS_RIGHT_LENGTH = "60";
-
-// Attached-mode status bar — agent list via tmux window list + shortcut hints.
-// The window-status formats hide window 0 (orchestrator) and style agent names.
-// tmux natively highlights the current window, so no React state sync is needed
-// for agent cycling via Ctrl+\.
-export const TMUX_ATTACHED_STATUS_RIGHT =
-  "#[fg=#cdd6f4]ctrl+g #[fg=#6c7086]graph #[fg=#585b70]\u00b7 #[fg=#cdd6f4]ctrl+\\ #[fg=#6c7086]next ";
-export const TMUX_ATTACHED_STATUS_RIGHT_LENGTH = "40";
-export const TMUX_ATTACHED_WINDOW_FMT =
-  "#{?#{==:#{window_index},0},, #W }";
-export const TMUX_ATTACHED_WINDOW_STYLE = "fg=#6c7086";
-export const TMUX_ATTACHED_WINDOW_CURRENT_STYLE = "fg=#cdd6f4,bold";
-
 // ---------------------------------------------------------------------------
 // Core tmux primitives
 // ---------------------------------------------------------------------------

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

@@ -9,7 +9,7 @@
 
 import { join, dirname } from "node:path";
 import { homedir } from "node:os";
-import { type SourceControlType, type AgentKey, type ProviderOverrides } from "./index.ts";
+import { type AgentKey, type ProviderOverrides } from "./index.ts";
 import { SETTINGS_SCHEMA_URL } from "./settings-schema.ts";
 import { ensureDir } from "../system/copy.ts";
 
@@ -22,8 +22,6 @@ const SETTINGS_FILENAME = "settings.json";
 export interface AtomicConfig {
   /** Version of config schema */
   version?: number;
-  /** Selected source control type */
-  scm?: SourceControlType;
   /** Timestamp of last init */
   lastUpdated?: string;
   /** Per-provider overrides for chatFlags and envVars */
@@ -89,11 +87,9 @@ function pickAtomicConfig(record: JsonRecord | null): AtomicConfig | null {
 
   const config: AtomicConfig = {};
   const version = record.version;
-  const scm = record.scm;
   const lastUpdated = record.lastUpdated;
 
   if (typeof version === "number") config.version = version;
-  if (typeof scm === "string") config.scm = scm as SourceControlType;
   if (typeof lastUpdated === "string") config.lastUpdated = lastUpdated;
 
   const providers = pickProviders(record.providers);
@@ -137,7 +133,6 @@ function mergeConfigs(...configs: Array<AtomicConfig | null>): AtomicConfig | nu
   for (const config of configs) {
     if (!config) continue;
     if (config.version !== undefined) merged.version = config.version;
-    if (config.scm !== undefined) merged.scm = config.scm;
     if (config.lastUpdated !== undefined) merged.lastUpdated = config.lastUpdated;
 
     if (config.providers) {
@@ -192,14 +187,6 @@ export async function saveAtomicConfig(
   await Bun.write(localPath, JSON.stringify(nextSettings, null, 2) + "\n");
 }
 
-/**
- * Get selected SCM using local override + global fallback.
- */
-export async function getSelectedScm(projectDir: string): Promise<SourceControlType | null> {
-  const config = await readAtomicConfig(projectDir);
-  return config?.scm ?? null;
-}
-
 /**
  * Resolve provider overrides from global + local settings (local wins).
  *

package/src/services/config/definitions.ts

@@ -2,9 +2,6 @@
  * 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;
@@ -88,13 +85,7 @@ export const AGENT_CONFIG: Record<AgentKey, AgentConfig> = {
     install_url:
       "https://github.com/github/copilot-cli?tab=readme-ov-file#installation",
     exclude: ["workflows", "dependabot.yml"],
-    onboarding_files: [
-      {
-        source: ".mcp.json",
-        destination: ".mcp.json",
-        merge: true,
-      },
-    ],
+    onboarding_files: [],
   },
 };
 
@@ -122,95 +113,3 @@ export function getAgentConfig(key: AgentKey): AgentConfig {
 export function getAgentKeys(): AgentKey[] {
   return [...AGENT_KEYS];
 }
-
-/**
- * Source Control Management (SCM) configuration definitions
- */
-
-/** 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 {
-  /** Display name for prompts */
-  displayName: string;
-  /** Primary CLI tool (git or sl) */
-  cliTool: string;
-  /** Code review system (github, phabricator) */
-  reviewSystem: string;
-  /** Directory marker used to detect this SCM in a repo (e.g. `.git`, `.sl`) */
-  detectDir: string;
-}
-
-export const SCM_CONFIG: Record<SourceControlType, ScmConfig> = {
-  github: {
-    displayName: "GitHub / Git",
-    cliTool: "git",
-    reviewSystem: "github",
-    detectDir: ".git",
-  },
-  sapling: {
-    displayName: "Sapling + Phabricator",
-    cliTool: "sl",
-    reviewSystem: "phabricator",
-    detectDir: ".sl",
-  },
-};
-
-/**
- * SCM-variant skill names, grouped by source control type.
- *
- * These are the skills that `installGlobalSkills` removes from the global
- * scope after the initial install, and that `installLocalScmSkills`
- * re-installs per-project based on the user's selected SCM. Passed to
- * `npx skills add --skill <name>` as explicit names (the skills CLI does
- * not support glob patterns like `gh-*`).
- */
-export const SCM_SKILLS_BY_TYPE: Record<SourceControlType, readonly string[]> =
-  {
-    github: ["gh-commit", "gh-create-pr"],
-    sapling: ["sl-commit", "sl-submit-diff"],
-  };
-
-/** Flat list of every SCM-variant skill across all source control types. */
-export const ALL_SCM_SKILLS: readonly string[] = [
-  ...SCM_SKILLS_BY_TYPE.github,
-  ...SCM_SKILLS_BY_TYPE.sapling,
-];
-
-/**
- * Get all SCM keys for iteration
- */
-export function getScmKeys(): SourceControlType[] {
-  return [...SCM_KEYS];
-}
-
-/**
- * Check if a string is a valid SCM type
- */
-export function isValidScm(key: string): key is SourceControlType {
-  return key in SCM_CONFIG;
-}
-
-/**
- * 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 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/index.ts

@@ -1,7 +1,7 @@
 /**
  * Configuration Module Exports
  *
- * Centralized access to the CLI's agent and SCM configuration.
+ * Centralized access to the CLI's agent configuration.
  */
 
 export * from "./definitions.ts";

package/src/services/config/settings.ts

@@ -9,24 +9,17 @@
  * The --model CLI flag takes precedence over both (handled at call site).
  */
 
-import { join, dirname, resolve } from "node:path";
+import { join, dirname } from "node:path";
 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, ProviderOverrides, SourceControlType } from "./definitions.ts";
-
-export interface TrustedPathEntry {
-  workspacePath: string;
-  provider: AgentKey;
-}
+import type { AgentKey, ProviderOverrides } from "./definitions.ts";
 
 interface AtomicSettings {
   $schema?: string;
-  scm?: SourceControlType;
   version?: number;
   lastUpdated?: string;
-  trustedPaths?: TrustedPathEntry[];
   telemetryEnabled?: boolean;
   providers?: Partial<Record<AgentKey, ProviderOverrides>>;
 }
@@ -59,62 +52,6 @@ async function writeGlobalSettings(settings: AtomicSettings): Promise<void> {
   await Bun.write(path, JSON.stringify(settings, null, 2));
 }
 
-function normalizeTrustedPathEntry(entry: TrustedPathEntry): TrustedPathEntry {
-  return {
-    workspacePath: resolve(entry.workspacePath),
-    provider: entry.provider,
-  };
-}
-
-function normalizeTrustedPaths(entries: TrustedPathEntry[] | undefined): TrustedPathEntry[] {
-  const deduped = new Map<string, TrustedPathEntry>();
-
-  for (const entry of entries ?? []) {
-    if (
-      typeof entry.workspacePath !== "string" ||
-      typeof entry.provider !== "string"
-    ) {
-      continue;
-    }
-
-    const normalizedEntry = normalizeTrustedPathEntry(entry);
-    deduped.set(
-      `${normalizedEntry.provider}:${normalizedEntry.workspacePath}`,
-      normalizedEntry,
-    );
-  }
-
-  return Array.from(deduped.values());
-}
-
-export async function isTrustedWorkspacePath(
-  workspacePath: string,
-  provider: AgentKey,
-): Promise<boolean> {
-  const settings = await loadSettingsFile(globalSettingsPath());
-  const normalizedWorkspacePath = resolve(workspacePath);
-
-  return normalizeTrustedPaths(settings.trustedPaths).some((entry) =>
-    entry.provider === provider && entry.workspacePath === normalizedWorkspacePath
-  );
-}
-
-export async function upsertTrustedWorkspacePath(
-  workspacePath: string,
-  provider: AgentKey,
-): Promise<void> {
-  try {
-    const settings = await loadSettingsFile(globalSettingsPath());
-    settings.trustedPaths = normalizeTrustedPaths([
-      ...(settings.trustedPaths ?? []),
-      { workspacePath, provider },
-    ]);
-    await writeGlobalSettings(settings);
-  } catch (e) {
-    console.warn(`[settings] failed to upsert trusted path: ${errorMessage(e)}`);
-  }
-}
-
 /**
  * Set telemetry enabled/disabled in global settings.
  */

package/src/services/system/skills.ts

@@ -4,20 +4,10 @@
  * Copies bundled agent skills from the installed package into the
  * provider-native global skill roots, mirroring the merge-copy approach
  * used by {@link installGlobalAgents} for agent configs.
- *
- * Previously this ran `npx skills add <repo>` at runtime, which cloned
- * the entire git repo on every version bump.  Now the skills ship inside
- * the npm package (`.agents/skills/`) and are copied locally — no network
- * required, no `npx`/`bunx` dependency.
- *
- * SCM-variant skills (gh-commit, gh-create-pr, sl-commit, sl-submit-diff)
- * are excluded from the global install; `atomic init` installs them
- * per-project based on the user's selected SCM + active agent.
  */
 
 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";
 
@@ -47,12 +37,8 @@ const SKILL_DEST_DIRS = [
   ".claude/skills",
 ] as const;
 
-/** The set of SCM skill names to exclude from global installation. */
-const SCM_SKILL_SET = new Set<string>(ALL_SCM_SKILLS);
-
 /**
- * Copy bundled skills to the global skill directories, excluding
- * SCM-variant skills that are installed per-project by `atomic init`.
+ * Copy bundled skills to the global skill directories.
  */
 export async function installGlobalSkills(): Promise<void> {
   const src = join(packageRoot(), ".agents", "skills");
@@ -62,14 +48,11 @@ export async function installGlobalSkills(): Promise<void> {
   }
 
   const home = homeRoot();
-
-  // 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, ignoreFilter }),
+      copyDir(src, join(home, rel), { ignoreFilter }),
     ),
   );
 }

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

@@ -1,175 +0,0 @@
-import { join } from "node:path";
-import { readdir } from "node:fs/promises";
-import { copyDir, pathExists, ensureDir } from "../../../services/system/copy.ts";
-import { createCommonIgnoreFilter } from "../../../lib/common-ignore.ts";
-import {
-  SCM_SKILLS_BY_TYPE,
-  type AgentKey,
-  type SourceControlType,
-} from "../../../services/config/index.ts";
-
-export const SCM_PREFIX_BY_TYPE: Record<SourceControlType, "gh-" | "sl-"> = {
-  github: "gh-",
-  sapling: "sl-",
-};
-
-export function getScmPrefix(scmType: SourceControlType): "gh-" | "sl-" {
-  return SCM_PREFIX_BY_TYPE[scmType];
-}
-
-export function isManagedScmEntry(name: string): boolean {
-  return name.startsWith("gh-") || name.startsWith("sl-");
-}
-
-export interface ReconcileScmVariantsOptions {
-  scmType: SourceControlType;
-  agentFolder: string;
-  skillsSubfolder: string;
-  targetDir: string;
-  configRoot: string;
-}
-
-export async function reconcileScmVariants(options: ReconcileScmVariantsOptions): Promise<void> {
-  const { agentFolder, skillsSubfolder, targetDir, configRoot } = options;
-  const srcDir = join(configRoot, agentFolder, skillsSubfolder);
-  const destDir = join(targetDir, agentFolder, skillsSubfolder);
-
-  if (!(await pathExists(srcDir)) || !(await pathExists(destDir))) {
-    return;
-  }
-
-  const sourceEntries = await readdir(srcDir, { withFileTypes: true });
-  const managedEntries = sourceEntries.filter((entry) => isManagedScmEntry(entry.name));
-
-  if (process.env.DEBUG === "1" && managedEntries.length > 0) {
-    console.log(
-      `[DEBUG] Preserving existing managed SCM variants in ${destDir}: ${managedEntries
-        .map((entry) => entry.name)
-        .join(", ")}`
-    );
-  }
-}
-
-export interface SyncProjectScmSkillsOptions {
-  scmType: SourceControlType;
-  sourceSkillsDir: string;
-  targetSkillsDir: string;
-}
-
-export async function syncProjectScmSkills(options: SyncProjectScmSkillsOptions): Promise<number> {
-  const { scmType, sourceSkillsDir, targetSkillsDir } = options;
-  const selectedPrefix = getScmPrefix(scmType);
-
-  if (!(await pathExists(sourceSkillsDir))) {
-    return 0;
-  }
-
-  await ensureDir(targetSkillsDir);
-
-  const entries = await readdir(sourceSkillsDir, { withFileTypes: true });
-  let copiedCount = 0;
-
-  for (const entry of entries) {
-    if (!entry.isDirectory()) continue;
-    if (!entry.name.startsWith(selectedPrefix)) continue;
-
-    const srcPath = join(sourceSkillsDir, entry.name);
-    const destPath = join(targetSkillsDir, entry.name);
-    await copyDir(srcPath, destPath, { ignoreFilter: createCommonIgnoreFilter() });
-    copiedCount += 1;
-  }
-
-  return copiedCount;
-}
-
-/** Skills-CLI agent identifiers (match `bunx skills -a <value>`). */
-const SKILLS_AGENT_BY_KEY: Record<AgentKey, string> = {
-  claude: "claude-code",
-  opencode: "opencode",
-  copilot: "github-copilot",
-};
-
-const SKILLS_REPO = "https://github.com/flora131/atomic.git";
-
-export interface InstallLocalScmSkillsOptions {
-  scmType: SourceControlType;
-  agentKey: AgentKey;
-  /** The directory to run `bunx skills add` in (the project root). */
-  cwd: string;
-}
-
-export interface InstallLocalScmSkillsResult {
-  success: boolean;
-  /** The explicit skill names that were requested (e.g. `["gh-commit", "gh-create-pr"]`). */
-  skills: readonly string[];
-  /** Non-empty when `success` is false. */
-  details: string;
-}
-
-/**
- * Install the SCM skill variants (e.g. `gh-commit`, `gh-create-pr` for
- * GitHub) locally into the current project via `bunx skills add`. The `-g`
- * flag is intentionally omitted so the skills are installed per-project
- * (in the given `cwd`).
- *
- * Each skill is passed explicitly with `--skill <name>` — the skills CLI
- * does not support glob patterns like `gh-*`, which would either fail or
- * fall back to installing the entire skill set.
- *
- * This is best-effort: callers should treat a failed result as a warning,
- * not as a fatal error.
- */
-export async function installLocalScmSkills(
-  options: InstallLocalScmSkillsOptions,
-): Promise<InstallLocalScmSkillsResult> {
-  const { scmType, agentKey, cwd } = options;
-
-  const skills = SCM_SKILLS_BY_TYPE[scmType];
-
-  const bunxPath = Bun.which("bunx");
-  if (!bunxPath) {
-    return { success: false, skills, details: "bunx not found on PATH" };
-  }
-
-  const agentFlag = SKILLS_AGENT_BY_KEY[agentKey];
-  const skillFlags = skills.flatMap((skill) => ["--skill", skill]);
-
-  try {
-    const proc = Bun.spawn({
-      cmd: [
-        bunxPath,
-        "skills",
-        "add",
-        SKILLS_REPO,
-        ...skillFlags,
-        "-a",
-        agentFlag,
-        "-y",
-      ],
-      cwd,
-      stdout: "pipe",
-      stderr: "pipe",
-      env: process.env,
-    });
-    const [stderr, stdout, exitCode] = await Promise.all([
-      new Response(proc.stderr).text(),
-      new Response(proc.stdout).text(),
-      proc.exited,
-    ]);
-    if (exitCode === 0) {
-      return { success: true, skills, details: "" };
-    }
-    const details = stderr.trim().length > 0 ? stderr.trim() : stdout.trim();
-    return {
-      success: false,
-      skills,
-      details: details || `exit code ${exitCode}`,
-    };
-  } catch (error) {
-    return {
-      success: false,
-      skills,
-      details: error instanceof Error ? error.message : String(error),
-    };
-  }
-}