@omnidev-ai/cli 0.7.0 → 0.9.0

package/dist/index.js

@@ -32,27 +32,30 @@ import { existsSync as existsSync4 } from "node:fs";
 
 // ../adapters/src/claude-code/index.ts
 import { existsSync, mkdirSync } from "node:fs";
-import { writeFile } from "node:fs/promises";
+import { readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
+import {
+  transformHooksConfig
+} from "@omnidev-ai/core";
 var claudeCodeAdapter = {
   id: "claude-code",
   displayName: "Claude Code",
-  async init(ctx) {
-    const claudeMdPath = join(ctx.projectRoot, "CLAUDE.md");
-    const filesCreated = [];
-    if (!existsSync(claudeMdPath)) {
-      await writeFile(claudeMdPath, generateClaudeTemplate(), "utf-8");
-      filesCreated.push("CLAUDE.md");
-    }
+  async init(_ctx) {
     return {
-      filesCreated,
-      message: filesCreated.length > 0 ? `Created ${filesCreated.join(", ")}` : "CLAUDE.md already exists"
+      filesCreated: [],
+      message: "Claude Code adapter initialized"
     };
   },
   async sync(bundle, ctx) {
     const filesWritten = [];
     const filesDeleted = [];
-    const skillsDir = join(ctx.projectRoot, ".claude", "skills");
+    const claudeMdPath = join(ctx.projectRoot, "CLAUDE.md");
+    const claudeMdContent = await generateClaudeMdContent(ctx.projectRoot);
+    await writeFile(claudeMdPath, claudeMdContent, "utf-8");
+    filesWritten.push("CLAUDE.md");
+    const claudeDir = join(ctx.projectRoot, ".claude");
+    mkdirSync(claudeDir, { recursive: true });
+    const skillsDir = join(claudeDir, "skills");
     mkdirSync(skillsDir, { recursive: true });
     for (const skill of bundle.skills) {
       const skillDir = join(skillsDir, skill.name);
@@ -67,57 +70,93 @@ ${skill.instructions}`;
       await writeFile(skillPath, content, "utf-8");
       filesWritten.push(`.claude/skills/${skill.name}/SKILL.md`);
     }
+    if (bundle.hooks) {
+      const settingsPath = join(claudeDir, "settings.json");
+      const hooksWritten = await writeHooksToSettings(settingsPath, bundle.hooks);
+      if (hooksWritten) {
+        filesWritten.push(".claude/settings.json");
+      }
+    }
     return {
       filesWritten,
       filesDeleted
     };
   }
 };
-function generateClaudeTemplate() {
-  return `# Project Instructions
-
-<!-- Add your project-specific instructions here -->
+async function generateClaudeMdContent(projectRoot) {
+  const omniMdPath = join(projectRoot, "OMNI.md");
+  let omniMdContent = "";
+  if (existsSync(omniMdPath)) {
+    omniMdContent = await readFile(omniMdPath, "utf-8");
+  }
+  let content = omniMdContent;
+  content += `
 
 ## OmniDev
 
 @import .omni/instructions.md
 `;
+  return content;
+}
+async function writeHooksToSettings(settingsPath, hooks) {
+  const claudeHooks = transformHooksConfig(hooks, "toClaude");
+  let existingSettings = {};
+  if (existsSync(settingsPath)) {
+    try {
+      const content = await readFile(settingsPath, "utf-8");
+      existingSettings = JSON.parse(content);
+    } catch {
+      existingSettings = {};
+    }
+  }
+  const newSettings = {
+    ...existingSettings,
+    hooks: claudeHooks
+  };
+  await writeFile(settingsPath, `${JSON.stringify(newSettings, null, 2)}
+`, "utf-8");
+  return true;
 }
 // ../adapters/src/codex/index.ts
 import { existsSync as existsSync2 } from "node:fs";
-import { writeFile as writeFile2 } from "node:fs/promises";
+import { readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises";
 import { join as join2 } from "node:path";
 var codexAdapter = {
   id: "codex",
   displayName: "Codex",
-  async init(ctx) {
-    const agentsMdPath = join2(ctx.projectRoot, "AGENTS.md");
-    const filesCreated = [];
-    if (!existsSync2(agentsMdPath)) {
-      await writeFile2(agentsMdPath, generateAgentsTemplate(), "utf-8");
-      filesCreated.push("AGENTS.md");
-    }
+  async init(_ctx) {
     return {
-      filesCreated,
-      message: filesCreated.length > 0 ? `Created ${filesCreated.join(", ")}` : "AGENTS.md already exists"
+      filesCreated: [],
+      message: "Codex adapter initialized"
     };
   },
-  async sync(_bundle, _ctx) {
+  async sync(_bundle, ctx) {
+    const filesWritten = [];
+    const filesDeleted = [];
+    const agentsMdPath = join2(ctx.projectRoot, "AGENTS.md");
+    const agentsMdContent = await generateAgentsMdContent(ctx.projectRoot);
+    await writeFile2(agentsMdPath, agentsMdContent, "utf-8");
+    filesWritten.push("AGENTS.md");
     return {
-      filesWritten: [],
-      filesDeleted: []
+      filesWritten,
+      filesDeleted
     };
   }
 };
-function generateAgentsTemplate() {
-  return `# Project Instructions
-
-<!-- Add your project-specific instructions here -->
+async function generateAgentsMdContent(projectRoot) {
+  const omniMdPath = join2(projectRoot, "OMNI.md");
+  let omniMdContent = "";
+  if (existsSync2(omniMdPath)) {
+    omniMdContent = await readFile2(omniMdPath, "utf-8");
+  }
+  let content = omniMdContent;
+  content += `
 
 ## OmniDev
 
 @import .omni/instructions.md
 `;
+  return content;
 }
 // ../adapters/src/cursor/index.ts
 import { mkdirSync as mkdirSync2 } from "node:fs";
@@ -152,7 +191,7 @@ var cursorAdapter = {
 };
 // ../adapters/src/opencode/index.ts
 import { existsSync as existsSync3, mkdirSync as mkdirSync3 } from "node:fs";
-import { writeFile as writeFile4 } from "node:fs/promises";
+import { readFile as readFile3, writeFile as writeFile4 } from "node:fs/promises";
 import { join as join4 } from "node:path";
 var opencodeAdapter = {
   id: "opencode",
@@ -160,33 +199,40 @@ var opencodeAdapter = {
   async init(ctx) {
     const opencodeDir = join4(ctx.projectRoot, ".opencode");
     mkdirSync3(opencodeDir, { recursive: true });
-    const instructionsPath = join4(opencodeDir, "instructions.md");
-    const filesCreated = [];
-    if (!existsSync3(instructionsPath)) {
-      await writeFile4(instructionsPath, generateOpencodeTemplate(), "utf-8");
-      filesCreated.push(".opencode/instructions.md");
-    }
     return {
-      filesCreated,
-      message: filesCreated.length > 0 ? `Created ${filesCreated.join(", ")}` : ".opencode/instructions.md already exists"
+      filesCreated: [".opencode/"],
+      message: "OpenCode adapter initialized"
     };
   },
-  async sync(_bundle, _ctx) {
+  async sync(_bundle, ctx) {
+    const filesWritten = [];
+    const filesDeleted = [];
+    const opencodeDir = join4(ctx.projectRoot, ".opencode");
+    mkdirSync3(opencodeDir, { recursive: true });
+    const instructionsPath = join4(opencodeDir, "instructions.md");
+    const instructionsContent = await generateOpencodeInstructionsContent(ctx.projectRoot);
+    await writeFile4(instructionsPath, instructionsContent, "utf-8");
+    filesWritten.push(".opencode/instructions.md");
     return {
-      filesWritten: [],
-      filesDeleted: []
+      filesWritten,
+      filesDeleted
     };
   }
 };
-function generateOpencodeTemplate() {
-  return `# OpenCode Instructions
-
-<!-- Add your project-specific instructions here -->
+async function generateOpencodeInstructionsContent(projectRoot) {
+  const omniMdPath = join4(projectRoot, "OMNI.md");
+  let omniMdContent = "";
+  if (existsSync3(omniMdPath)) {
+    omniMdContent = await readFile3(omniMdPath, "utf-8");
+  }
+  let content = omniMdContent;
+  content += `
 
 ## OmniDev
 
 @import ../.omni/instructions.md
 `;
+  return content;
 }
 // ../adapters/src/registry.ts
 import { readEnabledProviders } from "@omnidev-ai/core";
@@ -208,24 +254,12 @@ async function getEnabledAdapters() {
 import {
   getActiveProfile,
   loadBaseConfig,
-  syncAgentConfiguration,
-  writeConfig
+  patchAddCapabilitySource,
+  patchAddMcp,
+  patchAddToProfile,
+  syncAgentConfiguration
 } from "@omnidev-ai/core";
 import { buildCommand, buildRouteMap } from "@stricli/core";
-function addToActiveProfile(config, activeProfile, capabilityName) {
-  if (!config.profiles) {
-    config.profiles = {};
-  }
-  if (!config.profiles[activeProfile]) {
-    config.profiles[activeProfile] = { capabilities: [] };
-  }
-  if (!config.profiles[activeProfile].capabilities) {
-    config.profiles[activeProfile].capabilities = [];
-  }
-  if (!config.profiles[activeProfile].capabilities.includes(capabilityName)) {
-    config.profiles[activeProfile].capabilities.push(capabilityName);
-  }
-}
 async function runAddCap(flags, name) {
   try {
     if (!existsSync4("omni.toml")) {
@@ -241,25 +275,18 @@ async function runAddCap(flags, name) {
     }
     const config = await loadBaseConfig();
     const activeProfile = await getActiveProfile() ?? config.active_profile ?? "default";
-    if (!config.capabilities) {
-      config.capabilities = {};
-    }
-    if (!config.capabilities.sources) {
-      config.capabilities.sources = {};
-    }
-    if (config.capabilities.sources[name]) {
+    if (config.capabilities?.sources?.[name]) {
       console.error(`✗ Capability source "${name}" already exists`);
       console.log("  Use a different name or remove the existing source first");
       process.exit(1);
     }
     const source = `github:${flags.github}`;
     if (flags.path) {
-      config.capabilities.sources[name] = { source, path: flags.path };
+      await patchAddCapabilitySource(name, { source, path: flags.path });
     } else {
-      config.capabilities.sources[name] = source;
+      await patchAddCapabilitySource(name, source);
     }
-    addToActiveProfile(config, activeProfile, name);
-    await writeConfig(config);
+    await patchAddToProfile(activeProfile, name);
     console.log(`✓ Added capability source: ${name}`);
     console.log(`  Source: ${source}`);
     if (flags.path) {
@@ -284,10 +311,7 @@ async function runAddMcp(flags, name) {
     }
     const config = await loadBaseConfig();
     const activeProfile = await getActiveProfile() ?? config.active_profile ?? "default";
-    if (!config.mcps) {
-      config.mcps = {};
-    }
-    if (config.mcps[name]) {
+    if (config.mcps?.[name]) {
       console.error(`✗ MCP "${name}" already exists`);
       console.log("  Use a different name or remove the existing MCP first");
       process.exit(1);
@@ -341,9 +365,8 @@ async function runAddMcp(flags, name) {
         }
       }
     }
-    config.mcps[name] = mcpConfig;
-    addToActiveProfile(config, activeProfile, name);
-    await writeConfig(config);
+    await patchAddMcp(name, mcpConfig);
+    await patchAddToProfile(activeProfile, name);
     console.log(`✓ Added MCP: ${name}`);
     console.log(`  Transport: ${transport}`);
     if (mcpConfig.url) {
@@ -663,7 +686,7 @@ var capabilityRoutes = buildRouteMap2({
 // src/commands/doctor.ts
 import { existsSync as existsSync5 } from "node:fs";
 import { execFile } from "node:child_process";
-import { readFile } from "node:fs/promises";
+import { readFile as readFile4 } from "node:fs/promises";
 import { promisify } from "node:util";
 import { buildCommand as buildCommand3 } from "@stricli/core";
 var doctorCommand = buildCommand3({
@@ -803,7 +826,7 @@ async function checkRootGitignore() {
       fix: "Run: omnidev init"
     };
   }
-  const content = await readFile(gitignorePath, "utf-8");
+  const content = await readFile4(gitignorePath, "utf-8");
   const lines = content.split(`
 `).map((line) => line.trim());
   const hasOmniDir = lines.includes(".omni/");
@@ -844,20 +867,32 @@ async function checkCapabilitiesDir() {
 }
 
 // src/commands/init.ts
+import { exec } from "node:child_process";
 import { existsSync as existsSync6, mkdirSync as mkdirSync4 } from "node:fs";
-import { readFile as readFile2, writeFile as writeFile5 } from "node:fs/promises";
+import { readFile as readFile5, writeFile as writeFile5 } from "node:fs/promises";
+import { promisify as promisify2 } from "node:util";
 import {
-  generateInstructionsTemplate,
+  generateOmniMdTemplate,
   loadConfig,
   setActiveProfile,
   syncAgentConfiguration as syncAgentConfiguration3,
-  writeConfig as writeConfig2,
+  writeConfig,
   writeEnabledProviders
 } from "@omnidev-ai/core";
 import { buildCommand as buildCommand4 } from "@stricli/core";
 
 // src/prompts/provider.ts
-import { checkbox } from "@inquirer/prompts";
+import { checkbox, confirm } from "@inquirer/prompts";
+var PROVIDER_GITIGNORE_FILES = {
+  claude: ["CLAUDE.md", ".claude/"],
+  "claude-code": ["CLAUDE.md", ".claude/"],
+  cursor: [".cursor/"],
+  codex: ["AGENTS.md", ".codex/"],
+  opencode: [".opencode/"]
+};
+function getProviderGitignoreFiles(providers) {
+  return providers.flatMap((p) => PROVIDER_GITIGNORE_FILES[p] ?? []);
+}
 async function promptForProviders() {
   const answers = await checkbox({
     message: "Select your AI provider(s):",
@@ -871,8 +906,16 @@ async function promptForProviders() {
   });
   return answers;
 }
+async function promptForGitignoreProviderFiles(selectedProviders) {
+  const filesToIgnore = getProviderGitignoreFiles(selectedProviders);
+  return confirm({
+    message: `Add provider files to .gitignore? (${filesToIgnore.join(", ")})`,
+    default: false
+  });
+}
 
 // src/commands/init.ts
+var execAsync = promisify2(exec);
 async function runInit(_flags, providerArg) {
   console.log("Initializing OmniDev...");
   mkdirSync4(".omni", { recursive: true });
@@ -880,15 +923,31 @@ async function runInit(_flags, providerArg) {
   mkdirSync4(".omni/state", { recursive: true });
   await updateRootGitignore();
   let providerIds;
+  const isInteractive = !providerArg;
   if (providerArg) {
     providerIds = parseProviderArg(providerArg);
   } else {
     providerIds = await promptForProviders();
   }
+  if (isInteractive) {
+    const shouldIgnoreProviderFiles = await promptForGitignoreProviderFiles(providerIds);
+    if (shouldIgnoreProviderFiles) {
+      const filesToIgnore = getProviderGitignoreFiles(providerIds);
+      await addProviderFilesToGitignore(filesToIgnore);
+      const trackedFiles = await getTrackedProviderFiles(filesToIgnore);
+      if (trackedFiles.length > 0) {
+        console.log("");
+        console.log("⚠️  Some provider files are already tracked in git.");
+        console.log("   Run the following to stop tracking them:");
+        console.log("");
+        console.log(`   git rm --cached ${trackedFiles.join(" ")}`);
+        console.log("");
+      }
+    }
+  }
   await writeEnabledProviders(providerIds);
   if (!existsSync6("omni.toml")) {
-    await writeConfig2({
-      project: "my-project",
+    await writeConfig({
       profiles: {
         default: {
           capabilities: []
@@ -903,8 +962,8 @@ async function runInit(_flags, providerArg) {
     });
     await setActiveProfile("default");
   }
-  if (!existsSync6(".omni/instructions.md")) {
-    await writeFile5(".omni/instructions.md", generateInstructionsTemplate(), "utf-8");
+  if (!existsSync6("OMNI.md")) {
+    await writeFile5("OMNI.md", generateOmniMdTemplate(), "utf-8");
   }
   const config = await loadConfig();
   const ctx = {
@@ -913,14 +972,9 @@ async function runInit(_flags, providerArg) {
   };
   const allAdapters = getAllAdapters();
   const selectedAdapters = allAdapters.filter((a) => providerIds.includes(a.id));
-  const filesCreated = [];
-  const filesExisting = [];
   for (const adapter of selectedAdapters) {
     if (adapter.init) {
-      const result = await adapter.init(ctx);
-      if (result.filesCreated) {
-        filesCreated.push(...result.filesCreated);
-      }
+      await adapter.init(ctx);
     }
   }
   const enabledAdapters = await getEnabledAdapters();
@@ -928,22 +982,10 @@ async function runInit(_flags, providerArg) {
   console.log("");
   console.log(`✓ OmniDev initialized for ${selectedAdapters.map((a) => a.displayName).join(" and ")}!`);
   console.log("");
-  if (filesCreated.length > 0) {
-    console.log("\uD83D\uDCDD Don't forget to add your project description to:");
-    console.log("   • .omni/instructions.md");
-  }
-  if (filesExisting.length > 0) {
-    console.log("\uD83D\uDCDD Add this line to your existing file(s):");
-    for (const file of filesExisting) {
-      console.log(`   • ${file}: @import .omni/instructions.md`);
-    }
-  }
-  console.log("");
-  console.log("\uD83D\uDCA1 Recommendation:");
-  console.log("   Add provider-specific files to .gitignore:");
-  console.log("   CLAUDE.md, .claude/, AGENTS.md, .cursor/, .mcp.json");
+  console.log("\uD83D\uDCDD Add your project description and instructions to OMNI.md");
+  console.log("   This will be transformed into provider-specific files (CLAUDE.md, AGENTS.md, etc.)");
   console.log("");
-  console.log("   Run 'omnidev capability list' to see available capabilities.");
+  console.log("\uD83D\uDCA1 Run 'omnidev capability list' to see available capabilities.");
 }
 var initCommand = buildCommand4({
   parameters: {
@@ -985,11 +1027,17 @@ function parseProviderArg(arg) {
   return result;
 }
 async function updateRootGitignore() {
-  const gitignorePath = ".gitignore";
   const entriesToAdd = [".omni/", "omni.local.toml"];
+  await addToGitignore(entriesToAdd, "OmniDev");
+}
+async function addProviderFilesToGitignore(entries) {
+  await addToGitignore(entries, "OmniDev Provider Files");
+}
+async function addToGitignore(entriesToAdd, sectionHeader) {
+  const gitignorePath = ".gitignore";
   let content = "";
   if (existsSync6(gitignorePath)) {
-    content = await readFile2(gitignorePath, "utf-8");
+    content = await readFile5(gitignorePath, "utf-8");
   }
   const lines = content.split(`
 `);
@@ -1000,12 +1048,24 @@ async function updateRootGitignore() {
   const needsNewline = content.length > 0 && !content.endsWith(`
 `);
   const section = `${needsNewline ? `
-` : ""}# OmniDev
+` : ""}# ${sectionHeader}
 ${missingEntries.join(`
 `)}
 `;
   await writeFile5(gitignorePath, content + section, "utf-8");
 }
+async function getTrackedProviderFiles(files) {
+  const tracked = [];
+  for (const file of files) {
+    try {
+      const { stdout } = await execAsync(`git ls-files "${file}"`);
+      if (stdout.trim()) {
+        tracked.push(file);
+      }
+    } catch {}
+  }
+  return tracked;
+}
 
 // src/commands/profile.ts
 import { existsSync as existsSync7 } from "node:fs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnidev-ai/cli",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -28,11 +28,11 @@
   },
   "dependencies": {
     "@inquirer/prompts": "^8.1.0",
-    "@omnidev-ai/core": "0.7.0",
+    "@omnidev-ai/core": "0.9.0",
     "@stricli/core": "^1.2.5"
   },
   "devDependencies": {
-    "@omnidev-ai/adapters": "0.0.1",
+    "@omnidev-ai/adapters": "0.0.11",
     "bunup": "^0.16.20"
   }
 }