@musashishao/agent-kit 1.11.0 → 1.11.2

package/.agent/scripts/ak_cli.py

@@ -30,7 +30,29 @@ from datetime import datetime
 # Constants
 # ============================================================================
 
-VERSION = "1.0.0"
+def get_version() -> str:
+    """Get version from package.json to stay in sync with npm."""
+    try:
+        # Try to find package.json in parent directories
+        script_dir = Path(__file__).parent
+        for i in range(5):  # Go up max 5 levels
+            pkg_path = script_dir / "package.json"
+            if pkg_path.exists():
+                with open(pkg_path, "r") as f:
+                    return json.load(f).get("version", "1.0.0")
+            script_dir = script_dir.parent
+        
+        # Try from .agent's parent (typical structure)
+        agent_parent = Path(__file__).parent.parent.parent
+        pkg_path = agent_parent / "package.json"
+        if pkg_path.exists():
+            with open(pkg_path, "r") as f:
+                return json.load(f).get("version", "1.0.0")
+    except Exception:
+        pass
+    return "1.0.0"
+
+VERSION = get_version()
 BANNER = """
     ___                    __     __ __ _ __ 
    /   | ____ ____  ____  / /_   / //_/(_) /_

package/.agent/scripts/setup_notebooklm_mcp.py

@@ -43,7 +43,7 @@ def get_platform_info() -> Dict[str, Path]:
             "vscode_config": home / ".vscode/mcp.json",
             "agent_kit_config": cwd / ".agent/mcp/config/mcp-config.json",
             "antigravity_config": home / ".gemini/antigravity/mcp_config.json",
-            "codex_config": home / ".codex/mcp_config.json",
+            "codex_config": home / ".codex/config.toml",  # Codex uses TOML format
             "python_exe": "python",
             "pip_exe": "pip",
         }
@@ -56,7 +56,7 @@ def get_platform_info() -> Dict[str, Path]:
             "vscode_config": home / ".vscode/mcp.json",
             "agent_kit_config": cwd / ".agent/mcp/config/mcp-config.json",
             "antigravity_config": Path(os.environ.get("LOCALAPPDATA", home)) / "Google/Antigravity/mcp_config.json",
-            "codex_config": Path(os.environ.get("LOCALAPPDATA", home)) / "Codex/mcp_config.json",
+            "codex_config": Path(os.environ.get("LOCALAPPDATA", home)) / "Codex/config.toml",  # Codex uses TOML
             "python_exe": "python.exe",
             "pip_exe": "pip.exe",
         }
@@ -231,6 +231,65 @@ def update_json_config(file_path: Path, server_name: str, config_data: Dict) ->
         return False
 
 
+def update_toml_config(file_path: Path, server_name: str, python_path: str, wrapper_path: str, profile: str) -> bool:
+    """Update a TOML config file with server config (for Codex CLI)."""
+    try:
+        file_path.parent.mkdir(parents=True, exist_ok=True)
+        
+        # Read existing content
+        lines = []
+        if file_path.exists():
+            with open(file_path, 'r', encoding='utf-8') as f:
+                lines = f.readlines()
+        
+        # Check if server already exists
+        server_header = f'[mcp_servers.{server_name}]'
+        server_exists = any(server_header in line for line in lines)
+        
+        if server_exists:
+            # Remove existing server config
+            new_lines = []
+            skip_section = False
+            for line in lines:
+                if server_header in line:
+                    skip_section = True
+                    continue
+                elif skip_section and line.strip().startswith('['):
+                    skip_section = False
+                
+                if not skip_section:
+                    new_lines.append(line)
+            lines = new_lines
+        
+        # Build TOML config for server
+        # Escape backslashes for Windows paths
+        py_path_escaped = python_path.replace('\\', '\\\\')
+        wrapper_escaped = wrapper_path.replace('\\', '\\\\')
+        
+        toml_config = f'''
+[mcp_servers.{server_name}]
+command = "{py_path_escaped}"
+args = ["-u", "-W", "ignore", "{wrapper_escaped}"]
+env = {{ "PYTHONUNBUFFERED" = "1", "PYTHONWARNINGS" = "ignore", "NOTEBOOKLM_PROFILE" = "{profile}" }}
+startup_timeout_sec = 60
+'''
+        
+        # Append new config
+        content = ''.join(lines)
+        if not content.endswith('\n'):
+            content += '\n'
+        content += toml_config
+        
+        with open(file_path, 'w', encoding='utf-8') as f:
+            f.write(content)
+        
+        return True
+        
+    except Exception as e:
+        print(f"  ⚠️ Không thể cập nhật {file_path.name}: {e}")
+        return False
+
+
 def run_auth_check(python_path: str) -> bool:
     """Check if NotebookLM auth is configured."""
     try:
@@ -310,15 +369,15 @@ def main():
     # 8. Update client configs
     print("\n🔗 Đang cấu hình các app AI...")
     
-    configs_to_update = [
+    # JSON-based configs
+    json_configs = [
         (platform_info["claude_config"], "notebooklm-mcp", "Claude"),
         (platform_info["cursor_config"], "notebooklm-mcp", "Cursor"),
         (platform_info["vscode_config"], "notebooklm-mcp", "VS Code"),
         (platform_info.get("antigravity_config"), "notebooklm", "Antigravity"),
-        (platform_info.get("codex_config"), "notebooklm", "Codex"),
     ]
     
-    for config_path, server_name, app_name in configs_to_update:
+    for config_path, server_name, app_name in json_configs:
         if not config_path:
             continue
         if update_json_config(config_path, server_name, server_config):
@@ -326,6 +385,14 @@ def main():
         else:
             print(f"  ⚠️ {app_name} (bỏ qua)")
     
+    # TOML-based configs (Codex CLI)
+    codex_config = platform_info.get("codex_config")
+    if codex_config:
+        if update_toml_config(codex_config, "notebooklm", python_path, wrapper_path, profile):
+            print(f"  ✅ Codex CLI")
+        else:
+            print(f"  ⚠️ Codex CLI (bỏ qua)")
+    
     # 9. Update Agent Kit config
     ak_config = platform_info["agent_kit_config"]
     if ak_config.exists():

package/bin/agent-kit

@@ -1,38 +1,139 @@
 #!/usr/bin/env node
 
-const { spawn } = require('child_process');
+/**
+ * Agent Kit CLI Entry Point
+ * 
+ * Smart router that directs commands to the appropriate handler:
+ * - Basic commands (init, status, agents, skills, workflows, etc.) → cli.js
+ * - AI/Advanced commands (ai, memory, sync, autofix, etc.) → ak_cli.py
+ */
+
+const { spawn, spawnSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 
-// Path to the Python CLI script
-const scriptPath = path.join(__dirname, '..', '.agent', 'scripts', 'ak_cli.py');
+// Get version from package.json
+const packageJson = require('../package.json');
+const VERSION = packageJson.version;
+
+// Commands handled by cli.js (Node.js)
+const CLI_JS_COMMANDS = [
+  'init',
+  'update',
+  'status',
+  'agents',
+  'skills',
+  'workflows',
+  'doctor',
+  'codex',
+  'setup-codex',
+  'mcp',
+  'set-lang',
+  'ai',  // ai is a meta-command handled by cli.js which calls Python for subcommands
+  '--help', '-h',
+  '--version', '-v'
+];
 
-// Check if Python 3 is available
-const pythonCommand = process.platform === 'win32' ? 'python' : 'python3';
+// Commands handled by ak_cli.py (Python) - these are direct subcommands
+const PYTHON_CLI_COMMANDS = [
+  'sync',
+  'memory',
+  'autofix',
+  'dashboard',
+  'setup-notebooklm',
+  'setup-intel-verifier',
+  'setup-memory-mcp',
+  'setup-notion-mcp',
+  'memory-sync',
+  'notebooklm-status',
+  'setup',
+  'install'
+];
 
-// Forward all arguments
+// Parse arguments
 const args = process.argv.slice(2);
+const command = args[0];
+
+// Special case: no command or help/version
+if (!command || command === '--help' || command === '-h') {
+  runCliJs(args);
+} else if (command === '--version' || command === '-v') {
+  console.log(`@musashishao/agent-kit v${VERSION}`);
+  process.exit(0);
+} else if (CLI_JS_COMMANDS.includes(command)) {
+  runCliJs(args);
+} else if (PYTHON_CLI_COMMANDS.includes(command)) {
+  runPythonCli(args);
+} else {
+  // Unknown command - try cli.js first (it will show error)
+  runCliJs(args);
+}
+
+/**
+ * Run cli.js for basic commands
+ */
+function runCliJs(args) {
+  const cliPath = path.join(__dirname, 'cli.js');
+  
+  if (!fs.existsSync(cliPath)) {
+    console.error('❌ Error: cli.js not found. Package may be corrupted.');
+    process.exit(1);
+  }
+  
+  // Execute cli.js with all arguments
+  require(cliPath);
+}
 
-// Spawn the Python process
-const child = spawn(pythonCommand, [scriptPath, ...args], {
-  stdio: 'inherit'
-});
-
-child.on('error', (err) => {
-  if (err.code === 'ENOENT') {
-    console.error('❌ Error: Python 3 not found. Please install Python 3.10+ to use Agent Kit.');
-    console.error('Download: https://www.python.org/downloads/');
-  } else {
-    console.error('❌ Failed to start Agent Kit CLI:', err.message);
+/**
+ * Run ak_cli.py for AI/advanced commands
+ */
+function runPythonCli(args) {
+  // Try to find the Python script
+  const scriptPaths = [
+    // When running from installed package
+    path.join(__dirname, '..', '.agent', 'scripts', 'ak_cli.py'),
+    // When running from project with .agent folder
+    path.join(process.cwd(), '.agent', 'scripts', 'ak_cli.py')
+  ];
+  
+  let scriptPath = null;
+  for (const p of scriptPaths) {
+    if (fs.existsSync(p)) {
+      scriptPath = p;
+      break;
+    }
   }
-  process.exit(1);
-});
-
-child.on('exit', (code) => {
-  if (code === 1) {
-      // Suggest dependency check if generic failure
-      // We can't easily detect ImportErrors from exit code alone without reading stderr, 
-      // but stdio inherit is better for UI.
+  
+  if (!scriptPath) {
+    console.error('❌ Error: AI CLI script not found.');
+    console.error('   Make sure Agent Kit is properly installed.');
+    console.error('   Run: npx @musashishao/agent-kit init');
+    process.exit(1);
   }
-  process.exit(code);
-});
+  
+  // Check if Python 3 is available
+  const pythonCommand = process.platform === 'win32' ? 'python' : 'python3';
+  
+  // Pass project root to Python CLI
+  const pythonArgs = [scriptPath, '--project-root', process.cwd(), ...args];
+  
+  // Spawn the Python process
+  const child = spawn(pythonCommand, pythonArgs, {
+    stdio: 'inherit',
+    cwd: process.cwd()
+  });
+  
+  child.on('error', (err) => {
+    if (err.code === 'ENOENT') {
+      console.error('❌ Error: Python 3 not found. Please install Python 3.10+ to use Agent Kit AI features.');
+      console.error('   Download: https://www.python.org/downloads/');
+    } else {
+      console.error('❌ Failed to start Agent Kit CLI:', err.message);
+    }
+    process.exit(1);
+  });
+  
+  child.on('exit', (code) => {
+    process.exit(code || 0);
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@musashishao/agent-kit",
-  "version": "1.11.0",
+  "version": "1.11.2",
   "description": "AI Agent templates - Skills, Agents, Workflows, and AI-Ready Data Infrastructure Gateway",
   "main": "index.js",
   "bin": {
@@ -14,9 +14,6 @@
     ".agent/agents",
     ".agent/dashboard",
     ".agent/mcp",
-    ".agent/mcp-gateway/dist",
-    ".agent/mcp-gateway/package.json",
-    ".agent/mcp-gateway/src",
     ".agent/rules",
     ".agent/scripts",
     ".agent/skills",