@ekkos/cli 0.2.17 → 0.2.18

package/dist/commands/setup.js

@@ -10,6 +10,7 @@ const fs_1 = require("fs");
 const chalk_1 = __importDefault(require("chalk"));
 const inquirer_1 = __importDefault(require("inquirer"));
 const ora_1 = __importDefault(require("ora"));
+const hooks_js_1 = require("./hooks.js");
 const EKKOS_API_URL = 'https://mcp.ekkos.dev';
 const CONFIG_DIR = (0, path_1.join)((0, os_1.homedir)(), '.ekkos');
 const CONFIG_FILE = (0, path_1.join)(CONFIG_DIR, 'config.json');
@@ -207,24 +208,74 @@ async function setupIDE(ide, apiKey, config) {
 async function setupClaudeCode(apiKey) {
     const claudeDir = (0, path_1.join)((0, os_1.homedir)(), '.claude');
     const hooksDir = (0, path_1.join)(claudeDir, 'hooks');
-    if (!(0, fs_1.existsSync)(hooksDir)) {
-        (0, fs_1.mkdirSync)(hooksDir, { recursive: true });
+    const stateDir = (0, path_1.join)(claudeDir, 'state');
+    // Create directories
+    (0, fs_1.mkdirSync)(claudeDir, { recursive: true });
+    (0, fs_1.mkdirSync)(hooksDir, { recursive: true });
+    (0, fs_1.mkdirSync)(stateDir, { recursive: true });
+    // Check for existing custom hooks (don't have EKKOS_MANAGED=1 marker)
+    const isWindows = (0, os_1.platform)() === 'win32';
+    const hookExt = isWindows ? '.ps1' : '.sh';
+    const hookFiles = ['user-prompt-submit', 'stop', 'session-start', 'assistant-response'];
+    let hasCustomHooks = false;
+    for (const hookName of hookFiles) {
+        const hookPath = (0, path_1.join)(hooksDir, `${hookName}${hookExt}`);
+        if ((0, fs_1.existsSync)(hookPath)) {
+            const content = (0, fs_1.readFileSync)(hookPath, 'utf-8');
+            if (!content.includes('EKKOS_MANAGED=1')) {
+                hasCustomHooks = true;
+                break;
+            }
+        }
+    }
+    if (hasCustomHooks) {
+        // User has custom hooks - don't overwrite, use minimal approach
+        console.log(chalk_1.default.yellow('  Detected custom hooks - preserving your hooks'));
+        console.log(chalk_1.default.gray('  Run `ekkos hooks install --global` to upgrade to managed hooks'));
+        console.log(chalk_1.default.gray('  (This will overwrite existing hooks with full-featured versions)'));
+        // Still save API key for existing hooks to use
     }
+    else {
+        // No custom hooks OR all managed - safe to install full templates
+        try {
+            await (0, hooks_js_1.hooksInstall)({ global: true, verbose: false });
+        }
+        catch (err) {
+            // Fallback: if manifest-driven install fails, generate basic hooks
+            console.log(chalk_1.default.yellow('  Note: Could not install hooks from templates'));
+            console.log(chalk_1.default.gray('  Generating basic hooks instead...'));
+            await generateBasicHooks(hooksDir, apiKey);
+        }
+    }
+    // Save API key to config for hooks to use
+    const ekkosConfigDir = (0, path_1.join)((0, os_1.homedir)(), '.ekkos');
+    (0, fs_1.mkdirSync)(ekkosConfigDir, { recursive: true });
+    const configPath = (0, path_1.join)(ekkosConfigDir, 'config.json');
+    let existingConfig = {};
+    if ((0, fs_1.existsSync)(configPath)) {
+        try {
+            existingConfig = JSON.parse((0, fs_1.readFileSync)(configPath, 'utf-8'));
+        }
+        catch { }
+    }
+    // Update config with API key (hookApiKey for hooks, apiKey for compatibility)
+    existingConfig.hookApiKey = apiKey;
+    existingConfig.apiKey = apiKey;
+    existingConfig.updatedAt = new Date().toISOString();
+    (0, fs_1.writeFileSync)(configPath, JSON.stringify(existingConfig, null, 2));
+}
+/**
+ * Generate basic inline hooks as fallback when templates aren't available
+ */
+async function generateBasicHooks(hooksDir, apiKey) {
     const isWindows = (0, os_1.platform)() === 'win32';
     if (isWindows) {
-        // Windows: PowerShell hooks
         const promptSubmitHook = generatePromptSubmitHookPS(apiKey);
-        const promptSubmitPath = (0, path_1.join)(hooksDir, 'user-prompt-submit.ps1');
-        (0, fs_1.writeFileSync)(promptSubmitPath, promptSubmitHook);
+        (0, fs_1.writeFileSync)((0, path_1.join)(hooksDir, 'user-prompt-submit.ps1'), promptSubmitHook);
         const stopHook = generateStopHookPS(apiKey);
-        const stopPath = (0, path_1.join)(hooksDir, 'stop.ps1');
-        (0, fs_1.writeFileSync)(stopPath, stopHook);
-        // Create wrapper batch files for Windows
-        (0, fs_1.writeFileSync)((0, path_1.join)(hooksDir, 'user-prompt-submit.cmd'), `@echo off\npowershell -ExecutionPolicy Bypass -File "%~dp0user-prompt-submit.ps1"`);
-        (0, fs_1.writeFileSync)((0, path_1.join)(hooksDir, 'stop.cmd'), `@echo off\npowershell -ExecutionPolicy Bypass -File "%~dp0stop.ps1"`);
+        (0, fs_1.writeFileSync)((0, path_1.join)(hooksDir, 'stop.ps1'), stopHook);
     }
     else {
-        // Unix: Bash hooks
         const promptSubmitHook = generatePromptSubmitHook(apiKey);
         const promptSubmitPath = (0, path_1.join)(hooksDir, 'user-prompt-submit.sh');
         (0, fs_1.writeFileSync)(promptSubmitPath, promptSubmitHook);
@@ -234,11 +285,6 @@ async function setupClaudeCode(apiKey) {
         (0, fs_1.writeFileSync)(stopPath, stopHook);
         (0, fs_1.chmodSync)(stopPath, '755');
     }
-    // Create state directory
-    const stateDir = (0, path_1.join)(claudeDir, 'state');
-    if (!(0, fs_1.existsSync)(stateDir)) {
-        (0, fs_1.mkdirSync)(stateDir, { recursive: true });
-    }
 }
 async function setupCursor(apiKey) {
     // Cursor uses .cursorrules for system prompt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ekkos/cli",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "description": "Setup ekkOS memory for AI coding assistants (Claude Code, Cursor, Windsurf)",
   "main": "dist/index.js",
   "bin": {

package/templates/hooks/user-prompt-submit.sh

@@ -159,6 +159,12 @@ if [ -z "$RAW_SESSION_ID" ] || [ "$RAW_SESSION_ID" = "unknown" ] || [ "$RAW_SESS
     if [ -f "$STATE_FILE" ] && [ -f "$JSON_PARSE_HELPER" ]; then
         RAW_SESSION_ID=$(node "$JSON_PARSE_HELPER" "$STATE_FILE" '.session_id' 2>/dev/null || echo "unknown")
     fi
+
+    # VSCode extension fallback: Extract session ID from transcript path
+    # Path format: ~/.claude/projects/<project>/<session-uuid>.jsonl
+    if [ "$RAW_SESSION_ID" = "unknown" ] && [ -n "$TRANSCRIPT_PATH" ] && [ -f "$TRANSCRIPT_PATH" ]; then
+        RAW_SESSION_ID=$(basename "$TRANSCRIPT_PATH" .jsonl)
+    fi
 fi
 
 # ═══════════════════════════════════════════════════════════════════════════