jobarbiter 0.3.1 → 0.3.3

package/dist/lib/observe.js

@@ -1,112 +1,42 @@
 /**
  * JobArbiter Observer — Hook installer for coding agent CLIs
  *
- * Detects installed coding agents, installs observation hooks that
- * extract proficiency signals from session transcripts.
+ * Installs observation hooks that extract proficiency signals from
+ * session transcripts. Uses detect-tools.ts for agent detection.
  */
 import { existsSync, readFileSync, writeFileSync, mkdirSync, chmodSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
-import { execSync } from "node:child_process";
-// ── Agent Detection ────────────────────────────────────────────────────
-const AGENT_DEFINITIONS = [
-    {
-        id: "claude-code",
-        name: "Claude Code",
-        configDir: join(homedir(), ".claude"),
-        hookFormat: "claude",
-        detectBin: "claude",
-    },
-    {
-        id: "cursor",
-        name: "Cursor",
-        configDir: join(homedir(), ".cursor"),
-        hookFormat: "cursor",
-        detectBin: null, // Cursor is an app, not a CLI
-        detectDir: join(homedir(), ".cursor"),
-    },
-    {
-        id: "opencode",
-        name: "OpenCode",
-        configDir: join(homedir(), ".config", "opencode"),
-        hookFormat: "opencode",
-        detectBin: "opencode",
-    },
-    {
-        id: "codex",
-        name: "Codex CLI",
-        configDir: join(homedir(), ".codex"),
-        hookFormat: "codex",
-        detectBin: "codex",
-    },
-    {
-        id: "gemini",
-        name: "Gemini CLI",
-        configDir: join(homedir(), ".gemini"),
-        hookFormat: "gemini",
-        detectBin: "gemini",
-    },
-];
-function binExists(name) {
-    try {
-        execSync(`which ${name}`, { stdio: "ignore" });
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
+import { getObservableTools } from "./detect-tools.js";
+// ── Agent Config Directories ───────────────────────────────────────────
+const AGENT_CONFIG_DIRS = {
+    "claude-code": join(homedir(), ".claude"),
+    "cursor": join(homedir(), ".cursor"),
+    "opencode": join(homedir(), ".config", "opencode"),
+    "codex": join(homedir(), ".codex"),
+    "gemini": join(homedir(), ".gemini"),
+};
+const AGENT_HOOK_FORMATS = {
+    "claude-code": "claude",
+    "cursor": "cursor",
+    "opencode": "opencode",
+    "codex": "codex",
+    "gemini": "gemini",
+};
+/**
+ * Detect agents that support observation.
+ * Uses the shared detect-tools module for detection.
+ */
 export function detectAgents() {
-    return AGENT_DEFINITIONS.map((def) => {
-        const installed = (def.detectBin && binExists(def.detectBin)) ||
-            existsSync(def.configDir);
-        return {
-            id: def.id,
-            name: def.name,
-            configDir: def.configDir,
-            hookFormat: def.hookFormat,
-            installed: !!installed,
-            hookInstalled: installed ? isHookInstalled(def.id, def.configDir, def.hookFormat) : false,
-        };
-    });
-}
-// ── Hook Detection ─────────────────────────────────────────────────────
-function isHookInstalled(agentId, configDir, format) {
-    try {
-        switch (format) {
-            case "claude":
-            case "cursor": {
-                const hookFile = join(configDir, "hooks.json");
-                if (!existsSync(hookFile))
-                    return false;
-                const content = readFileSync(hookFile, "utf-8");
-                return content.includes("jobarbiter");
-            }
-            case "opencode": {
-                const pluginDir = join(configDir, "plugins");
-                return existsSync(join(pluginDir, "jobarbiter-observer.ts"));
-            }
-            case "codex": {
-                const configFile = join(configDir, "config.toml");
-                if (!existsSync(configFile))
-                    return false;
-                const content = readFileSync(configFile, "utf-8");
-                return content.includes("jobarbiter");
-            }
-            case "gemini": {
-                const settingsFile = join(configDir, "settings.json");
-                if (!existsSync(settingsFile))
-                    return false;
-                const content = readFileSync(settingsFile, "utf-8");
-                return content.includes("jobarbiter");
-            }
-            default:
-                return false;
-        }
-    }
-    catch {
-        return false;
-    }
+    const observableTools = getObservableTools();
+    return observableTools.map((tool) => ({
+        id: tool.id,
+        name: tool.name,
+        configDir: AGENT_CONFIG_DIRS[tool.id] || tool.configDir || "",
+        hookFormat: AGENT_HOOK_FORMATS[tool.id] || "claude",
+        installed: tool.installed,
+        hookInstalled: tool.observerActive,
+    }));
 }
 // ── Observer Data Directory ────────────────────────────────────────────
 const OBSERVER_DIR = join(homedir(), ".config", "jobarbiter", "observer");
@@ -519,6 +449,54 @@ function installGeminiHook(configDir, scriptPath) {
     writeFileSync(settingsFile, JSON.stringify(settings, null, 2) + "\n");
 }
 // ── Public API ─────────────────────────────────────────────────────────
+// ── Agent Name Mapping ─────────────────────────────────────────────────
+const AGENT_NAMES = {
+    "claude-code": "Claude Code",
+    "cursor": "Cursor",
+    "opencode": "OpenCode",
+    "codex": "Codex CLI",
+    "gemini": "Gemini CLI",
+};
+/**
+ * Check if observer hook is installed for an agent.
+ */
+function isHookInstalled(agentId, configDir, format) {
+    try {
+        switch (format) {
+            case "claude":
+            case "cursor": {
+                const hookFile = join(configDir, "hooks.json");
+                if (!existsSync(hookFile))
+                    return false;
+                const content = readFileSync(hookFile, "utf-8");
+                return content.includes("jobarbiter");
+            }
+            case "opencode": {
+                const pluginDir = join(configDir, "plugins");
+                return existsSync(join(pluginDir, "jobarbiter-observer.js"));
+            }
+            case "codex": {
+                const configFile = join(configDir, "config.toml");
+                if (!existsSync(configFile))
+                    return false;
+                const content = readFileSync(configFile, "utf-8");
+                return content.includes("jobarbiter");
+            }
+            case "gemini": {
+                const settingsFile = join(configDir, "settings.json");
+                if (!existsSync(settingsFile))
+                    return false;
+                const content = readFileSync(settingsFile, "utf-8");
+                return content.includes("jobarbiter");
+            }
+            default:
+                return false;
+        }
+    }
+    catch {
+        return false;
+    }
+}
 /**
  * Install observer hooks for the specified agents.
  * Returns a summary of what was installed.
@@ -531,39 +509,41 @@ export function installObservers(agentIds) {
         errors: [],
     };
     for (const agentId of agentIds) {
-        const def = AGENT_DEFINITIONS.find((d) => d.id === agentId);
-        if (!def) {
+        const configDir = AGENT_CONFIG_DIRS[agentId];
+        const hookFormat = AGENT_HOOK_FORMATS[agentId];
+        const agentName = AGENT_NAMES[agentId] || agentId;
+        if (!configDir || !hookFormat) {
             result.errors.push({ agent: agentId, error: "Unknown agent" });
             continue;
         }
         // Check if already installed
-        if (isHookInstalled(def.id, def.configDir, def.hookFormat)) {
-            result.skipped.push(def.name);
+        if (isHookInstalled(agentId, configDir, hookFormat)) {
+            result.skipped.push(agentName);
             continue;
         }
         try {
-            switch (def.hookFormat) {
+            switch (hookFormat) {
                 case "claude":
-                    installClaudeCodeHook(def.configDir, scriptPath);
+                    installClaudeCodeHook(configDir, scriptPath);
                     break;
                 case "cursor":
-                    installCursorHook(def.configDir, scriptPath);
+                    installCursorHook(configDir, scriptPath);
                     break;
                 case "opencode":
-                    installOpenCodeHook(def.configDir, scriptPath);
+                    installOpenCodeHook(configDir, scriptPath);
                     break;
                 case "codex":
-                    installCodexHook(def.configDir, scriptPath);
+                    installCodexHook(configDir, scriptPath);
                     break;
                 case "gemini":
-                    installGeminiHook(def.configDir, scriptPath);
+                    installGeminiHook(configDir, scriptPath);
                     break;
             }
-            result.installed.push(def.name);
+            result.installed.push(agentName);
         }
         catch (err) {
             result.errors.push({
-                agent: def.name,
+                agent: agentName,
                 error: err instanceof Error ? err.message : String(err),
             });
         }
@@ -576,16 +556,18 @@ export function installObservers(agentIds) {
 export function removeObservers(agentIds) {
     const result = { removed: [], notFound: [] };
     for (const agentId of agentIds) {
-        const def = AGENT_DEFINITIONS.find((d) => d.id === agentId);
-        if (!def) {
+        const configDir = AGENT_CONFIG_DIRS[agentId];
+        const hookFormat = AGENT_HOOK_FORMATS[agentId];
+        const agentName = AGENT_NAMES[agentId] || agentId;
+        if (!configDir || !hookFormat) {
             result.notFound.push(agentId);
             continue;
         }
         try {
-            switch (def.hookFormat) {
+            switch (hookFormat) {
                 case "claude":
                 case "cursor": {
-                    const hookFile = join(def.configDir, "hooks.json");
+                    const hookFile = join(configDir, "hooks.json");
                     if (existsSync(hookFile)) {
                         const config = JSON.parse(readFileSync(hookFile, "utf-8"));
                         for (const [key, hooks] of Object.entries(config.hooks || {})) {
@@ -594,26 +576,26 @@ export function removeObservers(agentIds) {
                             }
                         }
                         writeFileSync(hookFile, JSON.stringify(config, null, 2) + "\n");
-                        result.removed.push(def.name);
+                        result.removed.push(agentName);
                     }
                     else {
-                        result.notFound.push(def.name);
+                        result.notFound.push(agentName);
                     }
                     break;
                 }
                 case "opencode": {
-                    const pluginFile = join(def.configDir, "plugins", "jobarbiter-observer.js");
+                    const pluginFile = join(configDir, "plugins", "jobarbiter-observer.js");
                     if (existsSync(pluginFile)) {
                         unlinkSync(pluginFile);
-                        result.removed.push(def.name);
+                        result.removed.push(agentName);
                     }
                     else {
-                        result.notFound.push(def.name);
+                        result.notFound.push(agentName);
                     }
                     break;
                 }
                 case "codex": {
-                    const configFile = join(def.configDir, "config.toml");
+                    const configFile = join(configDir, "config.toml");
                     if (existsSync(configFile)) {
                         let content = readFileSync(configFile, "utf-8");
                         content = content
@@ -621,15 +603,15 @@ export function removeObservers(agentIds) {
                             .filter((line) => !line.includes("jobarbiter"))
                             .join("\n");
                         writeFileSync(configFile, content);
-                        result.removed.push(def.name);
+                        result.removed.push(agentName);
                     }
                     else {
-                        result.notFound.push(def.name);
+                        result.notFound.push(agentName);
                     }
                     break;
                 }
                 case "gemini": {
-                    const settingsFile = join(def.configDir, "settings.json");
+                    const settingsFile = join(configDir, "settings.json");
                     if (existsSync(settingsFile)) {
                         const settings = JSON.parse(readFileSync(settingsFile, "utf-8"));
                         for (const [key, hookGroups] of Object.entries(settings.hooks || {})) {
@@ -638,17 +620,17 @@ export function removeObservers(agentIds) {
                             }
                         }
                         writeFileSync(settingsFile, JSON.stringify(settings, null, 2) + "\n");
-                        result.removed.push(def.name);
+                        result.removed.push(agentName);
                     }
                     else {
-                        result.notFound.push(def.name);
+                        result.notFound.push(agentName);
                     }
                     break;
                 }
             }
         }
         catch {
-            result.notFound.push(def.name);
+            result.notFound.push(agentName);
         }
     }
     return result;