@omnidev-ai/core 0.1.1 → 0.3.0

package/src/config/loader.ts

@@ -26,6 +26,11 @@ function mergeConfigs(base: OmniConfig, override: OmniConfig): OmniConfig {
 		};
 	}
 
+	// Deep merge mcps (only if at least one config has it)
+	if (base.mcps || override.mcps) {
+		merged.mcps = { ...base.mcps, ...override.mcps };
+	}
+
 	return merged;
 }
 
@@ -70,65 +75,130 @@ export async function writeConfig(config: OmniConfig): Promise<void> {
 function generateConfigToml(config: OmniConfig): string {
 	const lines: string[] = [];
 
+	lines.push("# =============================================================================");
 	lines.push("# OmniDev Configuration");
-	lines.push("# Main configuration for your OmniDev project");
+	lines.push("# =============================================================================");
+	lines.push("# This file defines your project's capabilities, profiles, and settings.");
+	lines.push("#");
+	lines.push("# Files:");
+	lines.push("#   • omni.toml - Main config (commit to share with team)");
+	lines.push("#   • omni.local.toml - Local overrides (add to .gitignore)");
+	lines.push("#   • omni.lock.toml - Version lock file (commit for reproducibility)");
+	lines.push("#");
+	lines.push("# Quick start:");
+	lines.push("#   1. Add capability sources to [capabilities.sources]");
+	lines.push("#   2. Reference them in your profiles");
+	lines.push("#   3. Run: omnidev sync");
+	lines.push("#   4. Switch profiles: omnidev profile use <name>");
 	lines.push("");
 
 	// Project name
 	if (config.project) {
 		lines.push(`project = "${config.project}"`);
+		lines.push("");
 	}
 
 	// Note: active_profile is stored in .omni/state/active-profile, not in config.toml
 	// We still read it from config.toml for backwards compatibility, but don't write it here
 
-	// Sandbox mode
-	if (config.sandbox_enabled !== undefined) {
-		lines.push(`sandbox_enabled = ${config.sandbox_enabled}`);
-	}
-
-	lines.push("");
-
 	// Providers
 	if (config.providers?.enabled && config.providers.enabled.length > 0) {
+		lines.push("# AI providers to enable (claude, codex, or both)");
 		lines.push("[providers]");
 		lines.push(`enabled = [${config.providers.enabled.map((p) => `"${p}"`).join(", ")}]`);
 		lines.push("");
 	}
 
 	// Environment variables
+	lines.push("# =============================================================================");
+	lines.push("# Environment Variables");
+	lines.push("# =============================================================================");
+	lines.push("# Global environment variables available to all capabilities.");
+	// biome-ignore lint/suspicious/noTemplateCurlyInString: Example of env var syntax
+	lines.push("# Use ${VAR_NAME} syntax to reference shell environment variables.");
+	lines.push("#");
 	if (config.env && Object.keys(config.env).length > 0) {
 		lines.push("[env]");
 		for (const [key, value] of Object.entries(config.env)) {
 			lines.push(`${key} = "${value}"`);
 		}
-		lines.push("");
+	} else {
+		lines.push("# [env]");
+		// biome-ignore lint/suspicious/noTemplateCurlyInString: Example of env var syntax
+		lines.push('# DATABASE_URL = "${DATABASE_URL}"');
+		// biome-ignore lint/suspicious/noTemplateCurlyInString: Example of env var syntax
+		lines.push('# API_KEY = "${MY_API_KEY}"');
 	}
+	lines.push("");
 
 	// Capability sources (commented examples)
 	lines.push("# =============================================================================");
 	lines.push("# Capability Sources");
 	lines.push("# =============================================================================");
-	lines.push("# Fetch capabilities from Git repositories. On sync, these are cloned/updated");
-	lines.push("# and wrapped into capabilities automatically.");
+	lines.push("# Fetch capabilities from Git repositories. On sync, these are");
+	lines.push("# cloned/updated and made available to your profiles.");
 	lines.push("#");
 	lines.push("# [capabilities.sources]");
-	lines.push("# # Simple GitHub reference (auto-wrapped if no capability.toml)");
-	lines.push('# obsidian = "github:kepano/obsidian-skills"');
+	lines.push("# # GitHub shorthand (uses latest commit)");
+	lines.push('# tasks = "github:example-org/tasks-capability"');
+	lines.push("#");
+	lines.push("# # Version pinning (recommended for production)");
+	lines.push('# ralph = { source = "github:example-org/ralph", ref = "v1.2.0" }');
+	lines.push("#");
+	lines.push("# # Other Git sources");
+	lines.push('# private = "git@github.com:company/private-cap.git"');
+	lines.push('# gitlab = "https://gitlab.com/user/capability.git"');
+	lines.push("");
+
+	// MCP servers (commented examples)
+	lines.push("# =============================================================================");
+	lines.push("# MCP Servers");
+	lines.push("# =============================================================================");
+	lines.push("# Define MCP servers that automatically become capabilities.");
+	lines.push(
+		'# Reference in profiles using the MCP name directly, e.g. capabilities = ["filesystem"]',
+	);
 	lines.push("#");
-	lines.push("# # Full configuration with version pinning");
-	lines.push('# my-cap = { source = "github:user/repo", ref = "v1.0.0" }');
+	lines.push("# [mcps.filesystem]");
+	lines.push('# command = "npx"');
+	lines.push('# args = ["-y", "@modelcontextprotocol/server-filesystem", "/path/to/dir"]');
+	lines.push('# transport = "stdio"  # stdio (default), sse, or http');
 	lines.push("#");
-	lines.push("# # Force wrap mode (generate capability.toml from discovered content)");
-	lines.push('# external = { source = "github:user/skills-repo", type = "wrap" }');
+	lines.push("# [mcps.database]");
+	lines.push('# command = "node"');
+	lines.push('# args = ["./servers/database.js"]');
+	lines.push('# cwd = "./mcp-servers"');
+	lines.push("# [mcps.database.env]");
+	// biome-ignore lint/suspicious/noTemplateCurlyInString: Example of env var syntax
+	lines.push('# DB_URL = "${DATABASE_URL}"');
+	lines.push("");
+
+	// Always enabled capabilities
+	lines.push("# =============================================================================");
+	lines.push("# Always Enabled Capabilities");
+	lines.push("# =============================================================================");
+	lines.push("# Capabilities that load in ALL profiles, regardless of profile config.");
+	lines.push("# Useful for essential tools needed everywhere.");
+	lines.push("#");
+	lines.push('# always_enabled_capabilities = ["git-tools", "linting"]');
 	lines.push("");
 
 	// Profiles
+	lines.push("# =============================================================================");
+	lines.push("# Profiles");
+	lines.push("# =============================================================================");
+	lines.push("# Define different capability sets for different workflows.");
+	lines.push("# Switch profiles with: omnidev profile use <name>");
+	lines.push("");
 	if (config.profiles && Object.keys(config.profiles).length > 0) {
 		for (const [name, profile] of Object.entries(config.profiles)) {
 			lines.push(`[profiles.${name}]`);
 			const capabilities = profile.capabilities ?? [];
-			lines.push(`capabilities = [${capabilities.map((id) => `"${id}"`).join(", ")}]`);
+			if (capabilities.length > 0) {
+				lines.push(`capabilities = [${capabilities.map((id) => `"${id}"`).join(", ")}]`);
+			} else {
+				lines.push("capabilities = []");
+			}
 			lines.push("");
 		}
 	}

package/src/config/parser.test.ts

@@ -183,31 +183,6 @@ default = "https://api.example.com"
 		});
 	});
 
-	test("parses capability with MCP config", () => {
-		const toml = `
-[capability]
-id = "custom"
-name = "Custom Capability"
-version = "1.0.0"
-description = "Custom MCP"
-
-[mcp]
-command = "node"
-args = ["server.js"]
-transport = "stdio"
-
-[mcp.env]
-PORT = "3000"
-		`;
-
-		const config = parseCapabilityConfig(toml);
-
-		expect(config.mcp?.command).toBe("node");
-		expect(config.mcp?.args).toEqual(["server.js"]);
-		expect(config.mcp?.transport).toBe("stdio");
-		expect(config.mcp?.env?.PORT).toBe("3000");
-	});
-
 	test("throws error when capability.id is missing", () => {
 		const toml = `
 [capability]

package/src/config/profiles.test.ts

@@ -1,27 +1,12 @@
-import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
-import { tmpdir } from "../test-utils/index.js";
+import { describe, expect, test } from "bun:test";
+import { mkdirSync, writeFileSync } from "node:fs";
+import { setupTestDir } from "@omnidev-ai/core/test-utils";
 import { readActiveProfileState } from "../state/active-profile.js";
 import type { OmniConfig } from "../types/index.js";
 import { getActiveProfile, resolveEnabledCapabilities, setActiveProfile } from "./profiles.js";
 
 describe("getActiveProfile", () => {
-	let TEST_DIR: string;
-	let originalCwd: string;
-
-	beforeEach(() => {
-		originalCwd = process.cwd();
-		TEST_DIR = tmpdir("profiles-test-");
-		process.chdir(TEST_DIR);
-		mkdirSync(".omni", { recursive: true });
-	});
-
-	afterEach(() => {
-		process.chdir(originalCwd);
-		if (existsSync(TEST_DIR)) {
-			rmSync(TEST_DIR, { recursive: true, force: true });
-		}
-	});
+	setupTestDir("profiles-test-", { chdir: true, createOmniDir: true });
 
 	test("returns null when no state file or config exists", async () => {
 		const profile = await getActiveProfile();
@@ -57,26 +42,7 @@ describe("getActiveProfile", () => {
 });
 
 describe("setActiveProfile", () => {
-	const TEST_DIR = ".omni-test-profiles-set";
-	let originalCwd: string;
-
-	beforeEach(() => {
-		if (!existsSync(TEST_DIR)) {
-			mkdirSync(TEST_DIR, { recursive: true });
-		}
-		originalCwd = process.cwd();
-		process.chdir(TEST_DIR);
-		if (!existsSync(".omni")) {
-			mkdirSync(".omni", { recursive: true });
-		}
-	});
-
-	afterEach(() => {
-		process.chdir(originalCwd);
-		if (existsSync(TEST_DIR)) {
-			rmSync(TEST_DIR, { recursive: true, force: true });
-		}
-	});
+	setupTestDir("profiles-set-test-", { chdir: true, createOmniDir: true });
 
 	test("sets active_profile in state file", async () => {
 		await setActiveProfile("staging");

package/src/config/provider.test.ts

@@ -1,22 +1,8 @@
-import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { existsSync, rmSync } from "node:fs";
-import { tmpdir } from "../test-utils/index.js";
+import { describe, expect, test } from "bun:test";
+import { setupTestDir } from "@omnidev-ai/core/test-utils";
 import { parseProviderFlag } from "./provider.js";
 
-let TEST_DIR: string;
-const originalCwd = process.cwd();
-
-beforeEach(() => {
-	TEST_DIR = tmpdir("provider-test-");
-	process.chdir(TEST_DIR);
-});
-
-afterEach(() => {
-	process.chdir(originalCwd);
-	if (existsSync(TEST_DIR)) {
-		rmSync(TEST_DIR, { recursive: true });
-	}
-});
+const testDir = setupTestDir("provider-test-", { chdir: true });
 
 describe("parseProviderFlag", () => {
 	test("parses 'claude' flag", () => {
@@ -44,7 +30,7 @@ describe("parseProviderFlag", () => {
 
 describe("writeProviderConfig", () => {
 	test("writes single provider config", async () => {
-		const testPath = `${TEST_DIR}/provider.toml`;
+		const testPath = `${testDir.path}/provider.toml`;
 
 		// Manually write for testing
 		const lines: string[] = [];
@@ -62,7 +48,7 @@ describe("writeProviderConfig", () => {
 	});
 
 	test("writes multiple providers config", async () => {
-		const testPath = `${TEST_DIR}/provider.toml`;
+		const testPath = `${testDir.path}/provider.toml`;
 
 		const lines: string[] = [];
 		lines.push("# OmniDev Provider Configuration");

package/src/index.ts

@@ -2,7 +2,7 @@
  * @omnidev-ai/core - Core functionality for OmniDev
  *
  * This package contains shared types, utilities, and core logic
- * used across the CLI and MCP server packages.
+ * used across the CLI and capability tooling packages.
  */
 
 // Re-export @stricli/core for capabilities to use
@@ -20,8 +20,6 @@ export * from "./capability";
 
 // Export config functionality
 export * from "./config";
-// Export gitignore management
-export * from "./gitignore/manager";
 // Export MCP JSON management
 export * from "./mcp-json";
 // Export state management