ai-agent-config 2.2.2 → 2.4.1

package/.agent/skills/ai-agent-config/SKILL.md

@@ -0,0 +1,236 @@
+---
+name: ai-agent-config
+description: Manage AI coding skills across platforms (Claude Code, Antigravity, Cursor, Windsurf) using ai-agent-config CLI. Use when the user wants to sync skills to/from GitHub, install to multiple platforms, add custom skill sources, or configure skill management settings.
+---
+
+# AI Agent Config Management
+
+Complete guide for the `ai-agent-config` CLI tool - universal skill management across AI coding platforms.
+
+## Core Commands
+
+### GitHub Sync
+
+```bash
+# Initialize with repository
+ai-agent init --repo https://github.com/username/my-skills.git
+
+# Push local skills to GitHub
+ai-agent push --message "Added new skills"
+
+# Pull skills from GitHub
+ai-agent pull
+
+# Bi-directional sync
+ai-agent sync --message "Sync latest"
+```
+
+### Installation
+
+```bash
+# Install to all detected platforms
+ai-agent install
+
+# Force reinstall
+ai-agent install --force
+
+# Install specific skill
+ai-agent install --skill backend-patterns
+```
+
+### Source Management
+
+```bash
+# Add custom source
+ai-agent source add https://github.com/company/skills.git \
+  --name company-skills \
+  --branch main
+
+# List sources
+ai-agent source list
+
+# Enable/disable
+ai-agent source enable company-skills
+ai-agent source disable company-skills
+```
+
+### Configuration
+
+```bash
+# Get/set config values
+ai-agent config get repository.url
+ai-agent config set repository.autoSync true
+
+# Edit in $EDITOR
+ai-agent config edit
+
+# Validate config
+ai-agent config validate
+```
+
+### Platform Info
+
+```bash
+# Show detected platforms
+ai-agent platforms
+
+# List installed skills
+ai-agent list
+```
+
+## Common Workflows
+
+### First-Time Setup
+
+**User**: "Set up ai-agent-config with my GitHub"
+
+**Assistant**:
+```bash
+# Initialize with your repository
+ai-agent init --repo https://github.com/yourname/my-ai-skills.git
+
+# This will:
+# 1. Create ~/.ai-agent/config.json
+# 2. Clone your repo to ~/.ai-agent/sync-repo
+# 3. Enable auto-sync (pull before push)
+
+# Push current skills
+ai-agent push --message "Initial setup"
+```
+
+### Daily Workflow
+
+**User**: "Update all my skills"
+
+**Assistant**:
+```bash
+# Pull latest from GitHub (auto-installs)
+ai-agent pull
+```
+
+### Adding Custom Skills
+
+**User**: "Add skills from my company repo"
+
+**Assistant**:
+```bash
+# Add custom source
+ai-agent source add https://github.com/company/ai-skills.git \
+  --name company-skills \
+  --branch main
+
+# Update from new source (auto-installs)
+ai-agent update --source company-skills
+```
+
+### Team Sharing
+
+**User**: "Share my skills with team"
+
+**Assistant**:
+```bash
+# Push to GitHub
+ai-agent push --message "Added debugging skills"
+
+# Team members pull (auto-installs)
+ai-agent pull
+```
+
+## Architecture
+
+### File Locations
+- **Config**: `~/.ai-agent/config.json`
+- **Sync Repo**: `~/.ai-agent/sync-repo/` (local clone)
+- **Cache**: `~/.ai-agent-config-cache/` (external sources)
+
+### Platform Paths
+- Claude Code: `~/.claude/skills/`
+- Antigravity: `~/.gemini/antigravity/skills/`
+- Cursor: `~/.cursor/skills/`
+- Windsurf: `~/.windsurf/skills/`
+- Codex: `~/.codex/skills/`
+
+## Configuration
+
+Key config settings:
+
+```json
+{
+  "repository": {
+    "url": "https://github.com/username/skills.git",
+    "branch": "main",
+    "autoSync": true
+  },
+  "sources": {
+    "official": [...],
+    "custom": [...]
+  }
+}
+```
+
+## Examples
+
+### Setup for Team
+
+```bash
+# Create shared repository
+ai-agent init --repo https://github.com/team/shared-skills.git
+
+# Add company skills
+ai-agent source add https://github.com/company/official-skills.git \
+  --name company
+
+# Push setup
+ai-agent push --message "Team setup complete"
+```
+
+### Migration
+
+```bash
+# Initialize ai-agent-config
+ai-agent init --repo https://github.com/username/skills.git
+
+# Install to all platforms
+ai-agent install --force
+
+# Push existing skills
+ai-agent push --message "Migrated to ai-agent-config"
+```
+
+## Troubleshooting
+
+### Skills Not Installing
+
+```bash
+# Force reinstall
+ai-agent install --force
+
+# Check platforms detected
+ai-agent platforms
+```
+
+### GitHub Sync Conflicts
+
+Auto-sync handles most conflicts automatically. If issues persist:
+
+```bash
+cd ~/.ai-agent/sync-repo
+git status
+```
+
+### Config Issues
+
+```bash
+# Validate
+ai-agent config validate
+
+# Reset if corrupted
+ai-agent config reset
+```
+
+## Tips
+
+- **Auto-Sync**: Keep enabled to prevent conflicts
+- **Regular Pulls**: Pull frequently for latest skills
+- **Descriptive Messages**: Use `--message` for clear commit messages
+- **Force Reinstall**: Use `--force` when skills aren't updating

package/README.md

@@ -21,19 +21,19 @@
 # Install globally
 npm install -g ai-agent-config
 
-# Initialize (creates config at ~/.ai-agent/config.json)
-ai-agent init
+# Initialize (optional)
+ai-agent init --repo https://github.com/youruser/my-ai-skills.git
 
-# Install bundled skills to platforms
-ai-agent install
+# Pull and auto-install
+ai-agent pull
 ```
 
 ## 🎯 Bundled Skills (2)
 
 The package includes 2 core skills for managing the system:
 
-1. **config-manager** - Manage configuration and custom sources
-2. **skill-updater** - Update skills from GitHub repositories
+1.  **config-manager** - Manage configuration and custom sources
+2.  **skill-updater** - Update skills from GitHub repositories
 
 ## 📚 Add More Skills
 
@@ -80,9 +80,8 @@ ai-agent config reset --yes                 # Reset to defaults
 
 ### Installation & Updates
 ```bash
-ai-agent init                               # Initialize/migrate to v2.0
-ai-agent update [--source name]             # Update skills from sources
-ai-agent install [--platform name]          # Install to platforms
+ai-agent init                               # Initialize/migrate config
+ai-agent pull                               # Pull + auto-install from GitHub
 ai-agent list                               # List installed skills
 ai-agent platforms                          # Show detected platforms
 ai-agent uninstall                          # Remove skills

package/bin/cli.js

@@ -1,28 +1,25 @@
 #!/usr/bin/env node
 
-/**
- * AI Agent Config CLI v2.0
- * Universal Global Skills for AI Coding Assistants
- */
-
 const fs = require("fs");
 const path = require("path");
 const { execSync } = require("child_process");
-
-const platforms = require("../scripts/platforms");
-const installer = require("../scripts/installer");
-const externalSync = require("../scripts/external-sync");
 const configManager = require("../scripts/config-manager");
+const installer = require("../scripts/installer");
+const platforms = require("../scripts/platforms");
 const migration = require("../scripts/migration");
 
-// Read version from package.json
-const packageJson = require("../package.json");
-const VERSION = packageJson.version;
+const VERSION = "2.4.1";
+
+// Get package root (one level up from bin/)
+const PACKAGE_ROOT = path.join(__dirname, "..");
 
+// Commands with descriptions
 const COMMANDS = {
-  // v2.0 New Commands
-  init: "Initialize or migrate to v2.0 config",
+  // v2.3 New Commands
+  init: "Initialize or migrate config",
   migrate: "Migrate from v1.x to v2.0",
+  push: "Push skills to GitHub repository",
+  pull: "Pull skills from GitHub repository",
 
   // Source Management
   "source add": "Add a custom skill source",
@@ -44,7 +41,7 @@ const COMMANDS = {
   // Original Commands (updated)
   install: "Install skills to detected platforms",
   update: "Update skills from all sources",
-  sync: "Sync skills from GitHub repository",
+  sync: "Bi-directional sync (pull + push)",
   list: "List installed skills",
   platforms: "Show detected platforms",
   uninstall: "Remove installed skills",
@@ -91,24 +88,32 @@ Usage: ai-agent <command> [options]
 🔧 Installation & Sync:
   install [opts]              Install skills to platforms
   update [opts]               Update all skills from sources
-  list                        List installed skills
-  platforms                   Show detected platforms
-  uninstall [opts]            Remove installed skills
-
-Options:
-  --platform <name>           Target specific platform
-  --skill <name>              Target specific skill
-  --source <name>             Target specific source
-  --force                     Force overwrite
-  --branch <name>             Git branch (for source add)
-  --merge                     Merge on import (don't replace)
-
-Examples:
-  # Initialize v2.0 config
-  ai-agent init
-
-  # Add your company's skills
-  ai-agent source add https://github.com/mycompany/ai-skills \\
+  list                        List installed  ai-agent update [--source <name>]      # Update from specific source
+
+  # Installation
+  ai-agent install                    # Install to all detected platforms
+  ai-agent install --force            # Force reinstall
+  ai-agent install --skill <name>    # Install specific skill
+
+  # List skills
+  ai-agent list                       # List installed skills
+
+🌐 Examples:
+
+  # Initialize with GitHub repository (v2.3)
+  ai-agent init --repo https://github.com/yourname/my-ai-skills.git
+
+  # Push skills to GitHub
+  ai-agent push --message "Added new skills"
+
+  # Pull latest skills from GitHub  
+  ai-agent pull
+
+  # Bi-directional sync
+  ai-agent sync
+
+  # Add a source
+  ai-agent source add https://github.com/user/repo.git --name my-sourcekills \\
     --branch main \\
     --name company-skills
 
@@ -194,10 +199,23 @@ function listSkills() {
   console.log("");
 }
 
+/**
+ * Get argument value by flag name
+ */
+function getArgValue(args, flag) {
+  for (let i = 0; i < args.length; i++) {
+    if (args[i] === flag && args[i + 1]) {
+      return args[i + 1];
+    }
+  }
+  return null;
+}
+
 function init(args) {
-  console.log("\n🚀 Initializing AI Agent Config v2.0...\n");
+  console.log("\n🚀 Initializing AI Agent Config...\n");
 
   const force = args.includes("--force");
+  const repoUrl = getArgValue(args, "--repo");
 
   // Check if migration needed
   if (migration.needsMigration()) {
@@ -213,9 +231,37 @@ function init(args) {
       console.log("🔄 Resetting config...");
       configManager.resetConfig();
       console.log("✅ Config reset to defaults\n");
-    } else {
+    } else if (!repoUrl) {
       console.log("\n💡 Use --force to reset config to defaults");
+      console.log("💡 Use --repo <url> to initialize with a repository");
+    }
+  }
+
+  // Handle --repo flag
+  if (repoUrl) {
+    console.log(`\n📦 Setting up repository: ${repoUrl}`);
+
+    const config = configManager.loadConfig();
+    const localPath = path.join(process.env.HOME || process.env.USERPROFILE, ".ai-agent", "sync-repo");
+
+    // Clone if not exists
+    if (!fs.existsSync(localPath)) {
+      try {
+        console.log(`🔄 Cloning repository to ${localPath}...`);
+        execSync(`git clone "${repoUrl}" "${localPath}"`, { stdio: "inherit" });
+        console.log("✅ Repository cloned successfully!");
+      } catch (error) {
+        console.error(`❌ Failed to clone repository: ${error.message}\n`);
+        return;
+      }
+    } else {
+      console.log(`⚠️  Directory ${localPath} already exists, skipping clone`);
     }
+
+    // Update config
+    configManager.setConfigValue("repository.url", repoUrl);
+    configManager.setConfigValue("repository.local", localPath);
+    console.log("✅ Repository configured!\n");
   }
 
   const detected = platforms.detectAll();
@@ -225,9 +271,14 @@ function init(args) {
   }
 
   console.log("\n📚 Next steps:");
-  console.log("  1. ai-agent update          # Update skills from sources");
-  console.log("  2. ai-agent install         # Install to platforms");
-  console.log("  3. ai-agent source add ...  # Add custom sources");
+  if (repoUrl) {
+    console.log("  1. ai-agent push            # Push skills to repository");
+    console.log("  2. ai-agent pull            # Pull skills from repository");
+  } else {
+    console.log("  1. ai-agent update          # Update skills from sources");
+    console.log("  2. ai-agent install         # Install to platforms");
+    console.log("  3. ai-agent source add ...  # Add custom sources");
+  }
   console.log("");
 }
 
@@ -590,16 +641,13 @@ function install(args) {
   console.log("\n📥 Installing skills...\n");
 
   const options = {
-    platform: null,
     force: false,
     skill: null,
     sync: true,
   };
 
   for (let i = 0; i < args.length; i++) {
-    if (args[i] === "--platform" && args[i + 1]) {
-      options.platform = args[++i];
-    } else if (args[i] === "--force") {
+    if (args[i] === "--force") {
       options.force = true;
     } else if (args[i] === "--skill" && args[i + 1]) {
       options.skill = args[++i];
@@ -681,25 +729,118 @@ function update(args) {
   }
 }
 
-function sync(args) {
-  console.log("\n🔄 Syncing from GitHub repository...\n");
+/**
+ * Push skills to GitHub repository
+ */
+function push(args) {
+  console.log("\\n⬆️  Pushing to GitHub...\\n");
+
+  const config = configManager.loadConfig();
+
+  if (!config.repository.url) {
+    console.error("❌ No repository configured");
+    console.log("\\n   Run: ai-agent init --repo <url>\\n");
+    process.exit(1);
+  }
+
+  const SyncManager = require("../scripts/sync-manager");
+  const syncManager = new SyncManager(config);
+
+  const options = {
+    message: getArgValue(args, "--message") || "Update skills and workflows",
+  };
+
+  try {
+    const result = syncManager.push(options);
+
+    if (result.pushed) {
+      console.log("✅ Pushed successfully!");
+      console.log(`   Repository: ${config.repository.url}\\n`);
+    } else {
+      console.log(`⚠️  ${result.reason}`);
+
+      if (result.conflicts && result.conflicts.length > 0) {
+        console.log("\\n   Conflicting files:");
+        result.conflicts.forEach((f) => console.log(`     - ${f}`));
+        console.log("\\n   Resolve conflicts manually and try again.\\n");
+        process.exit(1);
+      }
+    }
+  } catch (error) {
+    console.error(`❌ Push failed: ${error.message}\\n`);
+    process.exit(1);
+  }
+}
+
+/**
+ * Pull skills from GitHub repository
+ */
+function pull(args) {
+  console.log("\n⬇️  Pulling from GitHub...\n");
+
+  const config = configManager.loadConfig();
+
+  if (!config.repository.url) {
+    console.error("❌ No repository configured");
+    console.log("\n   Run: ai-agent init <url>\n");
+    process.exit(1);
+  }
+
+  const SyncManager = require("../scripts/sync-manager");
+  const syncManager = new SyncManager(config);
+
+  try {
+    const result = syncManager.pull();
+
+    if (result.pulled) {
+      console.log("✅ Pulled successfully!\n");
+
+      // Auto-install after pull (unless --no-install flag)
+      const noInstall = args.includes("--no-install");
+
+      if (!noInstall) {
+        console.log("📥 Auto-installing skills...\n");
+        install(["--force"]); // Force install to ensure latest
+      }
+    } else {
+      console.log(`⚠️  ${result.reason || "Pull failed"}`);
+
+      if (result.conflicts && result.conflicts.length > 0) {
+        console.log("\n   Conflicts in:");
+        result.conflicts.forEach((f) => console.log(`     - ${f}`));
+        console.log("\n   Resolve manually and commit.\n");
+        process.exit(1);
+      }
+    }
+  } catch (error) {
+    console.error(`❌ Pull failed: ${error.message}\n`);
+    process.exit(1);
+  }
+}
+
+
+/**
+ * Old sync function (backward compatibility)
+ */
+function oldSync(args) {
+  console.log("\\n🔄 Syncing from GitHub repository...\\n");
   console.log(`   Repository: ${installer.REPO_URL}`);
-  console.log(`   Cache: ${installer.CACHE_DIR}\n`);
+  console.log(`   Cache: ${installer.CACHE_DIR}\\n`);
 
   try {
     const success = installer.syncRepo();
 
     if (success) {
-      console.log("\n✓ Sync complete!\n");
+      console.log("\\n✓ Sync complete!\\n");
 
       const skills = installer.getAvailableSkills();
       const workflows = installer.getAvailableWorkflows();
 
       console.log(`   Found ${skills.length} skill(s), ${workflows.length} workflow(s)`);
-      console.log("\n   Run 'ai-agent install' to install to your platforms.\n");
+      console.log("\\n   Run 'ai-agent install' to install to your platforms.\\n");
     }
   } catch (error) {
-    console.error(`\n❌ Sync failed: ${error.message}`);
+    console.error(`\\n❌ Sync failed: ${error.message}`);
     process.exit(1);
   }
 }
@@ -818,15 +959,19 @@ if (command === "source") {
     case "migrate":
       migrateCmd(args.slice(1));
       break;
+    case "push":
+      push(args.slice(1));
+      break;
+    case "pull":
+      pull(args.slice(1));
+      break;
     case "install":
       install(args.slice(1));
       break;
     case "update":
       update(args.slice(1));
       break;
-    case "sync":
-      sync(args.slice(1));
-      break;
+
     case "sync-external":
       // Backward compatibility - alias for update
       update(args.slice(1));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ai-agent-config",
-  "version": "2.2.2",
-  "description": "Universal Global Skills & Workflows for AI Coding Assistants (Claude Code, Antigravity, Cursor) - v2.0: User-configurable skill sources",
+  "version": "2.4.1",
+  "description": "Universal skill & workflow manager for AI coding assistants with bi-directional GitHub sync",
   "main": "index.js",
   "bin": {
     "ai-agent": "./bin/cli.js"
@@ -46,4 +46,4 @@
     "index.js",
     "README.md"
   ]
-}
+}

package/scripts/config-manager.js

@@ -1,6 +1,6 @@
 /**
  * Config Manager Module
- * Manages user configuration for ai-agent-config v2.0
+ * Manages user configuration for ai-agent-config v2.3
  */
 
 const fs = require("fs");
@@ -49,16 +49,21 @@ function loadOfficialSources() {
  */
 function createDefaultConfig() {
   const config = {
-    version: "2.0",
+    version: "2.3",
+    repository: {
+      url: null,
+      branch: "main",
+      local: path.join(os.homedir(), ".ai-agent", "sync-repo"),
+      lastSync: null,
+      autoSync: true,
+    },
+    sync: {
+      conflictResolution: "pull-first",
+    },
     sources: {
       official: loadOfficialSources().map((s) => ({ ...s, enabled: true })),
       custom: [],
     },
-    sync: {
-      enabled: false,
-      provider: null,
-      config: {},
-    },
     preferences: {
       autoUpdate: true,
       updateInterval: "weekly",
@@ -90,6 +95,35 @@ function initConfig(force = false) {
   return { created: true, path: CONFIG_FILE };
 }
 
+/**
+ * Migrate config from older versions to v2.3
+ */
+function migrateConfig(oldConfig) {
+  const newConfig = {
+    version: "2.3",
+    repository: {
+      url: null,
+      branch: "main",
+      local: path.join(os.homedir(), ".ai-agent", "sync-repo"),
+      lastSync: null,
+      autoSync: true,
+    },
+    sync: {
+      conflictResolution: "pull-first",
+    },
+    sources: oldConfig.sources || {
+      official: loadOfficialSources().map((s) => ({ ...s, enabled: true })),
+      custom: [],
+    },
+    preferences: oldConfig.preferences || {
+      autoUpdate: true,
+      updateInterval: "weekly",
+    },
+  };
+
+  return newConfig;
+}
+
 /**
  * Load user config
  */
@@ -101,7 +135,17 @@ function loadConfig() {
   }
 
   const data = fs.readFileSync(CONFIG_FILE, "utf-8");
-  return JSON.parse(data);
+  let config = JSON.parse(data);
+
+  // Auto-migrate from v2.0/v2.2 to v2.3
+  if (config.version !== "2.3") {
+    console.log(`🔄 Migrating config from v${config.version} to v2.3...`);
+    config = migrateConfig(config);
+    saveConfig(config);
+    console.log("✅ Config migrated successfully!");
+  }
+
+  return config;
 }
 
 /**
@@ -144,6 +188,23 @@ function validateConfig(config) {
     }
   }
 
+  // V2.3 validation
+  if (config.version === "2.3") {
+    if (!config.repository) {
+      errors.push("Missing repository field in v2.3 config");
+    } else {
+      if (config.repository.url && typeof config.repository.url !== "string") {
+        errors.push("repository.url must be a string");
+      }
+      if (config.repository.branch && typeof config.repository.branch !== "string") {
+        errors.push("repository.branch must be a string");
+      }
+      if (config.repository.autoSync !== undefined && typeof config.repository.autoSync !== "boolean") {
+        errors.push("repository.autoSync must be a boolean");
+      }
+    }
+  }
+
   return {
     valid: errors.length === 0,
     errors,
@@ -375,6 +436,7 @@ module.exports = {
   loadOfficialSources,
   createDefaultConfig,
   initConfig,
+  migrateConfig,
   loadConfig,
   saveConfig,
   validateConfig,

package/scripts/installer.js

@@ -81,12 +81,12 @@ function isRepoCached() {
 
 /**
  * Get list of available skills
- * Priority: Package bundled skills > External repo cache
+ * Merges package bundled skills + external repo cache
  */
 function getAvailableSkills() {
   const skills = new Set();
 
-  // Try package bundled skills first (.agent/skills/)
+  // Add package bundled skills first (.agent/skills/)
   if (fs.existsSync(PACKAGE_SKILLS_DIR)) {
     const packageSkills = fs.readdirSync(PACKAGE_SKILLS_DIR);
     packageSkills.forEach((name) => {
@@ -97,13 +97,10 @@ function getAvailableSkills() {
       }
     });
 
-    // If package has bundled skills, return only those (don't merge with cache)
-    if (skills.size > 0) {
-      return Array.from(skills);
-    }
+
   }
 
-  // Fallback: Get skills from external repo cache (only if no package skills)
+  // Merge with skills from external repo cache
   if (fs.existsSync(REPO_SKILLS_DIR)) {
     fs.readdirSync(REPO_SKILLS_DIR).forEach((name) => {
       const skillPath = path.join(REPO_SKILLS_DIR, name);
@@ -240,7 +237,7 @@ function installToPlatform(platform, options = {}) {
  * Install skills to all detected platforms
  */
 function install(options = {}) {
-  const { platform = null, force = false, skill = null, sync = true } = options;
+  const { force = false, skill = null, sync = true } = options;
 
   // Sync repo first if needed
   if (sync && !isRepoCached()) {
@@ -251,29 +248,17 @@ function install(options = {}) {
   }
 
   if (!isRepoCached()) {
-    console.log("\n⚠️  Skills repository not cached. Run 'ai-agent sync' first.");
-    return { skillsCount: 0, platformsCount: 0, details: [] };
+    console.log("\n⚠️  Skills repository not cached. Run 'ai-agent update' first.");
+    return { skillsCount: 0, platformsCount: 0, workflowsCount: 0, details: [] };
   }
 
-  let targetPlatforms;
-
-  if (platform) {
-    const platformObj = platforms.getByName(platform);
-    if (!platformObj) {
-      throw new Error(
-        `Unknown platform: ${platform}. Available: ${platforms.getAllNames().join(", ")}`
-      );
-    }
-    targetPlatforms = [platformObj];
-  } else {
-    targetPlatforms = platforms.detectAll().map((p) => platforms.getByName(p.name));
-  }
+  // Always install to all detected platforms
+  const targetPlatforms = platforms.detectAll().map((p) => platforms.getByName(p.name));
 
   if (targetPlatforms.length === 0) {
     console.log("\n⚠️  No AI coding platforms detected.");
     console.log("   Supported platforms:", platforms.getAllNames().join(", "));
-    console.log("\n   Force install with: ai-agent install --platform <name>");
-    return { skillsCount: 0, platformsCount: 0, details: [] };
+    return { skillsCount: 0, platformsCount: 0, workflowsCount: 0, details: [] };
   }
 
   const details = [];

package/scripts/sync-manager.js

@@ -0,0 +1,234 @@
+/**
+ * Sync Manager Module
+ * Handles pushing/pulling skills to/from GitHub repository
+ */
+
+const fs = require("fs");
+const path = require("path");
+const { execSync } = require("child_process");
+
+class SyncManager {
+    constructor(config) {
+        this.config = config;
+        this.repoPath = this.expandPath(config.repository.local);
+    }
+
+    /**
+     * Push local changes to GitHub
+     */
+    push(options = {}) {
+        if (!this.config.repository.url) {
+            return { pushed: false, reason: "No repository configured" };
+        }
+
+        // 1. Check if repo exists locally
+        if (!fs.existsSync(this.repoPath)) {
+            return { pushed: false, reason: `Repository not found at ${this.repoPath}` };
+        }
+
+        // 2. Check for local changes
+        if (!this.hasLocalChanges()) {
+            return { pushed: false, reason: "No changes to push" };
+        }
+
+        // 3. Auto-sync: pull before push (if enabled)
+        if (this.config.repository.autoSync) {
+            console.log("🔄 Auto-syncing from remote...");
+            const pullResult = this.pull();
+
+            if (!pullResult.pulled) {
+                return {
+                    pushed: false,
+                    reason: "Pull failed before push",
+                    conflicts: pullResult.conflicts,
+                };
+            }
+        }
+
+        // 4. Commit and push
+        try {
+            const message = options.message || "Update skills and workflows";
+            this.gitCommit(message);
+            this.gitPush();
+
+            // Update last sync time
+            this.updateLastSync();
+
+            return { pushed: true };
+        } catch (error) {
+            return { pushed: false, reason: error.message };
+        }
+    }
+
+    /**
+     * Pull from GitHub to local
+     */
+    pull() {
+        if (!this.config.repository.url) {
+            throw new Error("No repository configured");
+        }
+
+        if (!fs.existsSync(this.repoPath)) {
+            throw new Error(`Repository not found at ${this.repoPath}`);
+        }
+
+        try {
+            const output = execSync("git pull", {
+                cwd: this.repoPath,
+                encoding: "utf-8",
+            });
+
+            // Check for conflicts
+            if (output.includes("CONFLICT")) {
+                const conflicts = this.parseConflicts(output);
+                return { pulled: false, conflicts };
+            }
+
+            this.updateLastSync();
+            return { pulled: true };
+        } catch (error) {
+            // Check if error message contains conflict info
+            const errorMsg = error.message || error.stdout || error.stderr || "";
+            if (errorMsg.includes("CONFLICT")) {
+                const conflicts = this.parseConflicts(errorMsg);
+                return { pulled: false, conflicts };
+            }
+            return { pulled: false, reason: error.message };
+        }
+    }
+
+    /**
+     * Bi-directional sync (pull + push)
+     */
+    sync(options = {}) {
+        // Pull first
+        const pullResult = this.pull();
+        if (!pullResult.pulled) {
+            return {
+                synced: false,
+                reason: "Pull failed",
+                conflicts: pullResult.conflicts,
+            };
+        }
+
+        // Then push
+        const pushResult = this.push(options);
+        if (!pushResult.pushed) {
+            return {
+                synced: false,
+                reason: pushResult.reason,
+            };
+        }
+
+        return { synced: true };
+    }
+
+    /**
+     * Check if local has uncommitted changes
+     */
+    hasLocalChanges() {
+        try {
+            const status = execSync("git status --porcelain", {
+                cwd: this.repoPath,
+                encoding: "utf-8",
+            });
+            return status.trim().length > 0;
+        } catch (error) {
+            return false;
+        }
+    }
+
+    /**
+     * Check for remote changes (potential conflicts)
+     */
+    checkRemoteConflicts() {
+        try {
+            // Fetch remote
+            execSync("git fetch", { cwd: this.repoPath, stdio: "pipe" });
+
+            const branch = this.config.repository.branch || "main";
+
+            // Compare local vs remote
+            const diff = execSync(`git diff HEAD origin/${branch} --name-only`, {
+                cwd: this.repoPath,
+                encoding: "utf-8",
+            });
+
+            return diff.trim().split("\n").filter(Boolean);
+        } catch (error) {
+            return [];
+        }
+    }
+
+    /**
+     * Git commit
+     */
+    gitCommit(message) {
+        try {
+            // Add all .agent/ files except bundled package skills
+            execSync("git add .agent/workflows/", { cwd: this.repoPath, stdio: "pipe" });
+
+            // Add skills individually, excluding bundled ones
+            const fs = require("fs");
+            const path = require("path");
+            const skillsDir = path.join(this.repoPath, ".agent/skills");
+            const bundledSkills = ["ai-agent-config", "config-manager"];
+
+            if (fs.existsSync(skillsDir)) {
+                const skills = fs.readdirSync(skillsDir);
+                skills.forEach(skill => {
+                    if (!bundledSkills.includes(skill)) {
+                        execSync(`git add .agent/skills/${skill}`, {
+                            cwd: this.repoPath,
+                            stdio: "pipe"
+                        });
+                    }
+                });
+            }
+
+            execSync(`git commit -m "${message}"`, { cwd: this.repoPath, stdio: "pipe" });
+        } catch (error) {
+            // Ignore commit errors if nothing to commit
+            if (!error.message.includes("nothing to commit")) {
+                throw error;
+            }
+        }
+    }
+
+    /**
+     * Git push
+     */
+    gitPush() {
+        const branch = this.config.repository.branch || "main";
+        execSync(`git push origin ${branch}`, { cwd: this.repoPath, stdio: "inherit" });
+    }
+
+    /**
+     * Update last sync timestamp
+     */
+    updateLastSync() {
+        const configManager = require("./config-manager");
+        configManager.setConfigValue("repository.lastSync", new Date().toISOString());
+    }
+
+    /**
+     * Parse git conflicts
+     */
+    parseConflicts(output) {
+        const lines = output.split("\n");
+        return lines
+            .filter((line) => line.includes("CONFLICT"))
+            .map((line) => line.replace("CONFLICT (content): Merge conflict in ", "").trim())
+            .filter(Boolean);
+    }
+
+    /**
+     * Expand ~ to home directory
+     */
+    expandPath(p) {
+        if (!p) return null;
+        return p.replace(/^~/, process.env.HOME || process.env.USERPROFILE);
+    }
+}
+
+module.exports = SyncManager;

package/.agent/skills/skill-updater/SKILL.md

@@ -1,167 +0,0 @@
-# Skill Updater
-
-Automatically update skills from all configured sources (official and custom).
-
-## When to Use This Skill
-
-Use this skill when the user wants to:
-- Update all skills from configured sources
-- Update a specific source
-- Update a specific skill
-- Sync latest changes from external repositories
-- Keep skills up to date with latest best practices
-
-## Capabilities
-
-- **Multi-Source Updates**: Updates from both official and custom sources
-- **Selective Updates**: Update specific source or skill
-- **Force Updates**: Overwrite local changes
-- **Progress Reporting**: Shows what was updated, copied, or skipped
-
-## Command Reference
-
-```bash
-# Update all skills from all sources
-ai-agent update
-
-# Update from specific source
-ai-agent update --source vercel-labs
-
-# Update specific skill
-ai-agent update --skill react-best-practices
-
-# Force overwrite existing skills
-ai-agent update --force
-
-# Combine options
-ai-agent update --source company-skills --force
-```
-
-## How It Works (v2.0)
-
-1. **Reads User Config**: Loads `~/.ai-agent/config.json`
-2. **Gets Enabled Sources**: Filters for enabled sources (official + custom)
-3. **Clones/Updates Repos**: For each source, clones to `~/.ai-agent-external-cache/`
-4. **Copies Skills**: Copies skills to `.agent/skills/` in the package directory
-5. **Reports Results**: Shows what was updated
-
-## Examples
-
-### Regular Update
-
-**User**: "Update my skills"
-
-**Assistant**: I'll update all your skills from configured sources:
-
-```bash
-ai-agent update
-```
-
-This will:
-- Pull latest from Vercel Labs, Everything Claude Code, etc.
-- Update your custom sources too
-- Copy new/updated skills to your system
-- Show what changed
-
-### Update After Adding Custom Source
-
-**User**: "I just added a custom source, how do I get the skills?"
-
-**Assistant**: After adding a source, update it:
-
-```bash
-# Update just your new source
-ai-agent update --source your-source-name
-
-# Then install to platforms
-ai-agent install
-```
-
-### Force Update
-
-**User**: "Some skills aren't updating"
-
-**Assistant**: Use `--force` to overwrite existing skills:
-
-```bash
-ai-agent update --force
-```
-
-⚠️ Warning: This will overwrite any local modifications you made to skills.
-
-## What's New in v2.0
-
-- ✅ **Custom Sources**: Updates from your custom sources, not just official ones
-- ✅ **User Config**: Reads from `~/.ai-agent/config.json` instead of hard-coded list
-- ✅ **Selective Sync**: Update specific sources or skills
-- ✅ **Better Reporting**: Shows which sources succeeded/failed
-
-## Update vs Install
-
-- **`ai-agent update`**: Downloads latest skills from sources to cache
-- **`ai-agent install`**: Installs cached skills to AI platforms (Claude, Antigravity, etc.)
-
-Typical workflow:
-```bash
-ai-agent update    # Get latest skills
-ai-agent install   # Install to platforms
-```
-
-## Configuration
-
-Skills are defined in your config file:
-
-```json
-{
-  "sources": {
-    "official": [
-      {
-        "name": "vercel-labs",
-        "enabled": true,
-        "skills": [
-          { "path": "skills/react-best-practices", "name": "react-best-practices" }
-        ]
-      }
-    ],
-    "custom": [
-      {
-        "name": "my-skills",
-        "enabled": true,
-        "skills": [
-          { "path": "skills/my-skill", "name": "my-skill" }
-        ]
-      }
-    ]
-  }
-}
-```
-
-## Backward Compatibility
-
-The old command still works:
-```bash
-ai-agent sync-external
-```
-
-This is now an alias for `ai-agent update`.
-
-## Tips
-
-1. **Regular Updates**: Run `ai-agent update` weekly to get latest skills
-2. **Check Before Install**: After update, review changes before installing
-3. **Test Custom Sources**: When adding custom sources, test with `--source` flag first
-4. **Use Version Control**: If modifying skills, use git to track changes
-
-## Troubleshooting
-
-**Problem**: "Failed to load user config"
-**Solution**: Run `ai-agent init` to create config file
-
-**Problem**: Update fails for a source
-**Solution**: Check repo URL is correct: `ai-agent source info <name>`
-
-**Problem**: Skills not appearing
-**Solution**: Make sure source is enabled: `ai-agent source list`
-
-**Problem**: Git errors
-**Solution**: Check internet connection and git is installed