agentglow 0.2.7 → 0.2.9

package/cli/agentglow.mjs

@@ -7,7 +7,7 @@ import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { fetchText, probe } from "./lib/net.mjs";
 import {
-  baseUrl, claudeSettings, installSettingsFile, isOurHook, readState, startHookCommand, uninstallSettingsFile,
+  baseUrl, claudeSettings, installSettingsFile, isOurHook, pluginIdsIn, readState, startHookCommand, uninstallSettingsFile,
 } from "./lib/settings.mjs";
 import {
   clearLock, installCliCopy, localBase, readLock, readPid, removeCliCopies, serveForeground, spawnStarter,
@@ -141,16 +141,23 @@ async function cmdSetup(o) {
   const remote = remoteUrl();
   const port = o.port;
   const base = remote || baseUrl({ port });
+  // The AgentGlow Claude Code plugin brings the same hooks + server start; adding ours too would post every event twice.
+  const plugin = pluginIdsIn(file);
+  if (plugin.length) {
+    console.log(`The AgentGlow Claude Code plugin is enabled (${plugin.join(", ")}): it already provides the hooks, so setup`);
+    console.log(`skips them and only adds the traces env (token counts). Use one or the other: plugin, or setup's hooks.`);
+  }
   let startCommand = null;
-  if (!remote) {
+  if (!remote && !plugin.length) {
     const script = installCliCopy({ srcCliDir: here, version: VERSION });
     startCommand = startHookCommand({
       port, version: VERSION, node: nodeForHook(), script, cacheDir: process.env.AGENTGLOW_CACHE_DIR,
     });
   }
-  const r = installSettingsFile(file, base, { startCommand, extra: remote ? {} : { port } });
-  if (!r.changed) console.log(`AgentGlow hooks are already in ${file} (${base}).`);
-  else console.log(`Added AgentGlow hooks + traces env to ${file}${r.backup ? ` (backup: ${r.backup})` : ""}.`);
+  const r = installSettingsFile(file, base, { startCommand, hooks: !plugin.length, extra: remote ? {} : { port } });
+  const what = plugin.length ? "traces env" : "hooks + traces env";
+  if (!r.changed) console.log(`AgentGlow ${what} already in ${file} (${base}).`);
+  else console.log(`Added AgentGlow ${what} to ${file}${r.backup ? ` (backup: ${r.backup})` : ""}.`);
   if (r.skipped.length) console.log(`Left your own values for: ${r.skipped.join(", ")}`);
   if (process.env.AGENTGLOW_API_KEY) console.log('For traces with an ingest key also export OTEL_EXPORTER_OTLP_HEADERS="x-api-key=$AGENTGLOW_API_KEY".');
 
@@ -317,7 +324,12 @@ async function cmdStatus(o) {
   console.log(`agentglow CLI ${VERSION}`);
   console.log(`server:  ${health?.ok ? `healthy at ${base} (server ${health.version || "?"})` : starting ? `starting on port ${port}` : `not running at ${base}`}`);
   if (!remote) console.log(`port:    ${port}${pid ? `  pid ${pid} (started by this CLI)` : ""}`);
-  console.log(`hooks:   ${installed ? `installed in ${file}${startHook ? " (server auto-starts with claude)" : ""}` : "not installed (run: npx agentglow setup)"}`);
+  const plugin = pluginIdsIn(file);
+  const hooksLine = installed ? `installed in ${file}${startHook ? " (server auto-starts with claude)" : ""}`
+    : plugin.length ? `from the Claude Code plugin ${plugin.join(", ")} (server auto-starts with claude)`
+    : "not installed (run: npx agentglow setup, or install the Claude Code plugin)";
+  console.log(`hooks:   ${hooksLine}`);
+  if (installed && plugin.length) console.log(`warning: hooks are in ${file} AND the plugin is enabled, so events post twice. Run \`npx agentglow remove\` or disable the plugin.`);
   if (hasAutostart()) console.log(`login:   server starts at login and restarts on crash`);
   if (health?.ok) console.log(`view:    ${base}/neural`);
   return 0;

package/cli/lib/settings.mjs

@@ -16,6 +16,7 @@ export const HOOK_EVENTS = [
   ["SubagentStart", true],
   ["SubagentStop", true],
   ["Stop", false],
+  ["StopFailure", false],
   ["SessionEnd", false],
 ];
 
@@ -144,14 +145,16 @@ export function unmergeSettings(settings, state = null) {
  * `startCommand` adds the SessionStart command hook that starts the local server (see startHookCommand).
  * Returns { settings, state: { addedEnv, base, startHook }, skipped }.
  */
-export function mergeSettings(settings, base, state = null, { startCommand = null } = {}) {
+export function mergeSettings(settings, base, state = null, { startCommand = null, hooks = true } = {}) {
   const s = unmergeSettings(settings, state);
   const ours = claudeSettings(base);
-  if (startCommand) ours.hooks.SessionStart.unshift(startHookGroup(startCommand));
+  if (!hooks) { ours.hooks = {}; startCommand = null; } // the AgentGlow plugin already provides them
+  else if (startCommand) ours.hooks.SessionStart.unshift(startHookGroup(startCommand));
   s.hooks = s.hooks && typeof s.hooks === "object" ? s.hooks : {};
   for (const [event, groups] of Object.entries(ours.hooks)) {
     s.hooks[event] = [...(Array.isArray(s.hooks[event]) ? s.hooks[event] : []), ...groups];
   }
+  if (!Object.keys(s.hooks).length) delete s.hooks;
   s.env = s.env && typeof s.env === "object" ? s.env : {};
   const addedEnv = [];
   const skipped = [];
@@ -163,6 +166,13 @@ export function mergeSettings(settings, base, state = null, { startCommand = nul
   return { settings: s, state: { base, addedEnv, startHook: !!startCommand }, skipped };
 }
 
+/** Plugin ids like "agentglow@agentglow" that `enabledPlugins` turns on (the Claude Code plugin brings its own hooks). */
+export function enabledAgentglowPlugins(settings) {
+  return Object.entries(settings?.enabledPlugins || {})
+    .filter(([id, on]) => on === true && id.split("@")[0] === "agentglow")
+    .map(([id]) => id);
+}
+
 // ---------- files ----------
 
 export function statePath(settingsFile) {
@@ -189,10 +199,10 @@ const same = (a, b) => JSON.stringify(a) === JSON.stringify(b);
 const sorted = (o) => Object.fromEntries(Object.entries(o || {}).sort(([a], [b]) => a.localeCompare(b)));
 
 /** Merge into a settings file. Returns { changed, backup, skipped, file }. */
-export function installSettingsFile(file, base, { now = Date.now(), startCommand = null, extra = {} } = {}) {
+export function installSettingsFile(file, base, { now = Date.now(), startCommand = null, hooks = true, extra = {} } = {}) {
   const before = readJson(file, {});
   const st = readJson(statePath(file), null);
-  const merged = mergeSettings(before, base, st, { startCommand });
+  const merged = mergeSettings(before, base, st, { startCommand, hooks });
   const { settings, skipped } = merged;
   const state = { ...merged.state, ...extra };
   // keep the first backup we made, so `remove` can point at the pre-AgentGlow settings
@@ -208,6 +218,11 @@ export function installSettingsFile(file, base, { now = Date.now(), startCommand
   return { changed: true, backup: bak, skipped, file };
 }
 
+/** enabledAgentglowPlugins() of a settings file ([] when it is missing or unreadable). */
+export function pluginIdsIn(file) {
+  try { return enabledAgentglowPlugins(readJson(file, {})); } catch { return []; }
+}
+
 /** Read the install sidecar (null when AgentGlow is not installed in `file`). */
 export function readState(file) {
   return readJson(statePath(file), null);