@preziosiraffaele/agent-watch 0.2.0 → 0.3.0

package/dist/agent-watchd.js

@@ -1,6 +1,6 @@
 // @bun
 // packages/agent-core/src/types.ts
-var AGENT_FILTER_KEYS = ["nvim_server", "repo"];
+var AGENT_FILTER_KEYS = ["repo"];
 // packages/agent-core/src/protocol.ts
 var DEFAULT_DAEMON_HOST = "127.0.0.1";
 var DEFAULT_DAEMON_PORT = 3847;
@@ -30,6 +30,7 @@ var STATES = {
   FAILED: "failed"
 };
 var STALE_AFTER_MS = 30 * 60 * 1000;
+var MAX_EXITED_RECORDS = 50;
 // packages/agent-core/src/events.ts
 var CLAUDE_STATE = {
   SessionStart: STATES.SESSION_STARTED,
@@ -41,9 +42,7 @@ var CLAUDE_STATE = {
   PostToolUse: STATES.WORKING,
   PostToolUseFailure: STATES.WORKING,
   PostToolBatch: STATES.WORKING,
-  Notification: STATES.WAITING,
   SubagentStart: STATES.RUNNING_TOOL,
-  SubagentStop: STATES.IDLE,
   TaskCreated: STATES.RUNNING_TOOL,
   TaskCompleted: STATES.WORKING,
   Stop: STATES.IDLE,
@@ -88,18 +87,19 @@ function stateFor(agent, event) {
   return STATES.WORKING;
 }
 // packages/agent-core/src/repo.ts
-import { basename } from "path";
+import { basename, dirname } from "path";
 function inferRepoContext(folder, runGit) {
   if (!folder)
-    return { repo: null, repo_root: null, branch: null };
+    return { repo: null, branch: null, project_root: folder };
   const root = runGit(folder, ["rev-parse", "--show-toplevel"]);
   if (!root)
-    return { repo: null, repo_root: null, branch: null };
+    return { repo: null, branch: null, project_root: folder };
   const branch = runGit(folder, ["branch", "--show-current"]) || runGit(folder, ["rev-parse", "--short", "HEAD"]);
+  const commonGitDir = runGit(folder, ["rev-parse", "--path-format=absolute", "--git-common-dir"]);
   return {
     repo: basename(root),
-    repo_root: root,
-    branch: branch || null
+    branch: branch || null,
+    project_root: commonGitDir ? dirname(commonGitDir) : root
   };
 }
 var realGitRunner = (folder, args) => {
@@ -196,7 +196,7 @@ function pickClaudeEventName(payload) {
 // packages/agent-core/src/daemon-state.ts
 import { mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "fs";
 import { homedir } from "os";
-import { dirname, join } from "path";
+import { dirname as dirname2, join } from "path";
 var DAEMON_RUNTIME_DIR_NAME = ".agent-watch";
 var DAEMON_STATE_FILE_NAME = "daemon.json";
 function daemonRuntimeDir(home = homedir()) {
@@ -206,7 +206,7 @@ function daemonStatePath(runtimeDir = daemonRuntimeDir()) {
   return join(runtimeDir, DAEMON_STATE_FILE_NAME);
 }
 function writeDaemonState(state, path = daemonStatePath()) {
-  mkdirSync(dirname(path), { recursive: true });
+  mkdirSync(dirname2(path), { recursive: true });
   const tempPath = `${path}.${process.pid}.${Date.now()}.tmp`;
   writeFileSync(tempPath, `${JSON.stringify(state, null, 2)}
 `);
@@ -245,12 +245,11 @@ function createRegistry(options = {}) {
       tool: "-",
       folder: reg.folder,
       repo: repo2.repo,
-      repo_root: repo2.repo_root,
       branch: repo2.branch,
+      project_root: repo2.project_root,
       updated: now().toISOString(),
       agent_process_pid: null,
-      nvim_server: reg.nvim?.server ?? null,
-      nvim_terminal_bufnr: reg.nvim?.terminalBufnr ?? null
+      client_ref: reg.client_ref ?? null
     };
     records.set(id, record);
     broadcast({ type: "created", record });
@@ -260,28 +259,49 @@ function createRegistry(options = {}) {
     const current = records.get(id);
     if (!current)
       return null;
+    const folder = patch.folder ?? current.folder;
+    const repo2 = folder !== current.folder ? inferRepoContext(folder, gitRunner) : null;
     const next = {
       ...current,
       agent_process_pid: patch.agent_process_pid !== undefined ? patch.agent_process_pid : current.agent_process_pid,
       state: patch.state ?? current.state,
       title: patch.title !== undefined ? patch.title : current.title,
+      client_ref: patch.client_ref !== undefined ? patch.client_ref : current.client_ref,
+      folder,
+      ...repo2 ? {
+        repo: repo2.repo,
+        branch: repo2.branch,
+        project_root: repo2.project_root
+      } : {},
       updated: now().toISOString()
     };
     records.set(id, next);
     broadcast({ type: "updated", record: next });
     return next;
   };
+  const claimResume = (id, patch) => {
+    const current = records.get(id);
+    if (!current)
+      return null;
+    if (current.state !== STATES.EXITED)
+      return { type: "not_resumable", state: current.state };
+    const record = update(id, { ...patch, state: STATES.SESSION_STARTED });
+    if (!record)
+      return null;
+    return { type: "claimed", record };
+  };
   const applyHook = (id, agent, hook) => {
     const current = records.get(id);
     if (!current)
       return null;
+    if (current.state === STATES.EXITED)
+      return current;
     const received_at = now().toISOString();
     seq += 1;
-    const state = agent === "claude" && hook.event === "SubagentStop" && current.state === STATES.IDLE ? current.state : hook.state;
     const next = {
       ...current,
       agent: current.agent || agent,
-      state,
+      state: hook.state,
       tool: hook.tool || current.tool,
       session_id: hook.session_id ?? current.session_id,
       recent_events: [...current.recent_events, { event: hook.event, received_at, seq }].slice(-3),
@@ -298,11 +318,44 @@ function createRegistry(options = {}) {
     broadcast({ type: "removed", id });
     return true;
   };
+  const markExited = (id) => {
+    const current = records.get(id);
+    if (!current)
+      return null;
+    if (!current.session_id) {
+      records.delete(id);
+      broadcast({ type: "removed", id });
+      return { type: "removed" };
+    }
+    const next = {
+      ...current,
+      state: STATES.EXITED,
+      agent_process_pid: null,
+      updated: now().toISOString()
+    };
+    records.set(id, next);
+    broadcast({ type: "updated", record: next });
+    evictExcessExited();
+    return { type: "exited", record: next };
+  };
+  const evictExcessExited = () => {
+    const exited = Array.from(records.values()).filter((record) => record.state === STATES.EXITED);
+    const excess = exited.length - MAX_EXITED_RECORDS;
+    if (excess <= 0)
+      return;
+    exited.sort((a, b) => a.updated.localeCompare(b.updated) || a.id - b.id);
+    for (const victim of exited.slice(0, excess)) {
+      records.delete(victim.id);
+      broadcast({ type: "removed", id: victim.id });
+    }
+  };
   const refreshRepoContext = () => {
     const recordsByFolder = new Map;
     for (const record of records.values()) {
       if (!record.folder)
         continue;
+      if (record.state === STATES.EXITED)
+        continue;
       const grouped = recordsByFolder.get(record.folder);
       if (grouped) {
         grouped.push(record);
@@ -314,15 +367,14 @@ function createRegistry(options = {}) {
     for (const [folder, folderRecords] of recordsByFolder) {
       const repo2 = inferRepoContext(folder, gitRunner);
       for (const current of folderRecords) {
-        if (current.repo === repo2.repo && current.repo_root === repo2.repo_root && current.branch === repo2.branch) {
+        if (current.repo === repo2.repo && current.branch === repo2.branch && current.project_root === repo2.project_root) {
           continue;
         }
         const next = {
           ...current,
           repo: repo2.repo,
-          repo_root: repo2.repo_root,
           branch: repo2.branch,
-          updated: now().toISOString()
+          project_root: repo2.project_root
         };
         records.set(next.id, next);
         changed.push(next);
@@ -335,6 +387,8 @@ function createRegistry(options = {}) {
     register,
     update,
     remove,
+    markExited,
+    claimResume,
     applyHook,
     refreshRepoContext,
     get(id) {
@@ -505,6 +559,30 @@ async function handle(request, registry, queue, onShutdown) {
       return text(404, "launch not found");
     return json({ ok: true });
   }
+  const launchResume = method === "POST" && path.match(/^\/launches\/(\d+)\/resume$/);
+  if (launchResume) {
+    const id = Number(launchResume[1]);
+    const patch = await readLaunchUpdate(request);
+    if (!patch)
+      return text(400, "invalid resume request");
+    const result = await queue.enqueue(id, () => registry.claimResume(id, patch));
+    if (!result)
+      return text(404, "launch not found");
+    if (result.type === "not_resumable") {
+      return json({ error: "not resumable", state: result.state }, { status: 409 });
+    }
+    return json(result.record);
+  }
+  const launchExit = method === "POST" && path.match(/^\/launches\/(\d+)\/exit$/);
+  if (launchExit) {
+    const id = Number(launchExit[1]);
+    const result = registry.markExited(id);
+    if (!result)
+      return text(404, "launch not found");
+    if (result.type === "removed")
+      return json({ ok: true });
+    return json(result.record);
+  }
   const hookMatch = method === "POST" && path.match(/^\/hooks\/(claude|codex|agent)$/);
   if (hookMatch) {
     const agent = hookMatch[1];
@@ -540,10 +618,7 @@ async function readLaunchRegistration(request) {
     agent: data.agent,
     folder: data.folder,
     title: typeof data.title === "string" ? data.title : null,
-    nvim: {
-      server: typeof data.nvim_server === "string" ? data.nvim_server : null,
-      terminalBufnr: typeof data.nvim_terminal_bufnr === "string" ? data.nvim_terminal_bufnr : null
-    }
+    client_ref: typeof data.client_ref === "string" ? data.client_ref : null
   };
 }
 async function readLaunchUpdate(request) {
@@ -560,6 +635,11 @@ async function readLaunchUpdate(request) {
   if ("title" in data) {
     patch.title = typeof data.title === "string" ? data.title : null;
   }
+  if (typeof data.folder === "string" && data.folder)
+    patch.folder = data.folder;
+  if ("client_ref" in data) {
+    patch.client_ref = typeof data.client_ref === "string" ? data.client_ref : null;
+  }
   return patch;
 }
 async function readJson(request) {

package/dist/aw.js

@@ -47,9 +47,7 @@ var CLAUDE_STATE = {
   PostToolUse: STATES.WORKING,
   PostToolUseFailure: STATES.WORKING,
   PostToolBatch: STATES.WORKING,
-  Notification: STATES.WAITING,
   SubagentStart: STATES.RUNNING_TOOL,
-  SubagentStop: STATES.IDLE,
   TaskCreated: STATES.RUNNING_TOOL,
   TaskCompleted: STATES.WORKING,
   Stop: STATES.IDLE,
@@ -149,8 +147,7 @@ function createDaemonClient(url) {
         agent: reg.agent,
         folder: reg.folder,
         title: reg.title ?? null,
-        nvim_server: reg.nvim?.server ?? null,
-        nvim_terminal_bufnr: reg.nvim?.terminalBufnr ?? null
+        client_ref: reg.client_ref ?? null
       };
       return post("/launches", body);
     },
@@ -174,6 +171,40 @@ function createDaemonClient(url) {
         throw new Error(`DELETE /launches/${id} failed: ${response.status}`);
       return true;
     },
+    async getLaunch(id) {
+      const agents = await this.listAgents();
+      return agents.find((a) => a.id === id) ?? null;
+    },
+    async resumeLaunch(id, ctx) {
+      const response = await fetch(`${url}/launches/${id}/resume`, {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({
+          folder: ctx.folder,
+          client_ref: ctx.client_ref
+        })
+      });
+      if (response.status === 404)
+        return { type: "not_found" };
+      if (response.status === 409) {
+        const body = await response.json().catch(() => null);
+        return { type: "not_resumable", state: body?.state ?? "unknown" };
+      }
+      if (!response.ok)
+        throw new Error(`POST /launches/${id}/resume failed: ${response.status}`);
+      return { type: "resumed", record: await response.json() };
+    },
+    async reportExit(id) {
+      const response = await fetch(`${url}/launches/${id}/exit`, { method: "POST" });
+      if (response.status === 404)
+        return null;
+      if (!response.ok)
+        throw new Error(`POST /launches/${id}/exit failed: ${response.status}`);
+      const body = await response.json();
+      if ("ok" in body)
+        return null;
+      return body;
+    },
     async listAgents(filters) {
       const qs = filters ? new URLSearchParams(filters).toString() : "";
       const response = await fetch(`${url}/agents${qs ? `?${qs}` : ""}`);
@@ -260,26 +291,11 @@ function resolveDaemonEntry() {
   throw new Error("Could not locate agent-watchd entrypoint");
 }
 
-// packages/aw/src/nvim.ts
-function nvimContextFromEnv(env) {
-  return {
-    server: env.NVIM ?? null,
-    terminalBufnr: null
-  };
-}
-function mergeNvim(base, override) {
-  return {
-    server: override.server ?? base.server,
-    terminalBufnr: override.terminalBufnr ?? base.terminalBufnr
-  };
-}
-
 // packages/aw/src/commands/launch.ts
 function parseLaunchArgv(argv) {
   const rest = [];
   let title = null;
-  let nvimServer = null;
-  let nvimBufnr = null;
+  let clientRef = null;
   let separatorSeen = false;
   for (let i = 0;i < argv.length; i++) {
     const arg = argv[i] ?? "";
@@ -299,27 +315,19 @@ function parseLaunchArgv(argv) {
       title = arg.slice("--title=".length);
       continue;
     }
-    if (arg === "--nvim-server") {
-      nvimServer = argv[++i] ?? "";
-      continue;
-    }
-    if (arg.startsWith("--nvim-server=")) {
-      nvimServer = arg.slice("--nvim-server=".length);
+    if (arg === "--client-ref") {
+      clientRef = argv[++i] ?? "";
       continue;
     }
-    if (arg === "--nvim-bufnr") {
-      nvimBufnr = argv[++i] ?? "";
-      continue;
-    }
-    if (arg.startsWith("--nvim-bufnr=")) {
-      nvimBufnr = arg.slice("--nvim-bufnr=".length);
+    if (arg.startsWith("--client-ref=")) {
+      clientRef = arg.slice("--client-ref=".length);
       continue;
     }
     rest.push(arg);
   }
   return {
     title: title || null,
-    nvim: { server: nvimServer, terminalBufnr: nvimBufnr },
+    client_ref: clientRef || null,
     rest
   };
 }
@@ -332,18 +340,19 @@ async function runLaunch(args) {
     return 1;
   }
   const client = await ensureDaemonRunning();
-  const baseNvim = nvimContextFromEnv(process.env);
-  const nvim = mergeNvim(baseNvim, parsed.nvim);
   const record = await client.registerLaunch({
     agent: args.agent,
-    folder: process.cwd(),
+    folder: args.folder ?? process.cwd(),
     title: parsed.title,
-    nvim
+    client_ref: parsed.client_ref
   });
+  return spawnAndWait(executable, record.id, parsed.rest, client);
+}
+async function spawnAndWait(executable, id, argv, client) {
   const env = { ...process.env };
-  env[ENV.LAUNCH_ID] = String(record.id);
+  env[ENV.LAUNCH_ID] = String(id);
   env[ENV.DAEMON_URL] = client.url;
-  const child = spawn2(executable, parsed.rest, { stdio: "inherit", env });
+  const child = spawn2(executable, argv, { stdio: "inherit", env });
   const cleanupSignals = ["SIGINT", "SIGTERM", "SIGHUP"];
   for (const signal of cleanupSignals) {
     process.on(signal, () => {
@@ -352,21 +361,21 @@ async function runLaunch(args) {
     });
   }
   if (typeof child.pid === "number") {
-    client.updateLaunch(record.id, { agent_process_pid: child.pid }).catch(() => {
+    client.updateLaunch(id, { agent_process_pid: child.pid }).catch(() => {
       return;
     });
   }
   return await new Promise((resolve2) => {
     child.on("exit", (code, signal) => {
       const exitCode = signal ? 128 + signalNumber(signal) : code ?? 0;
-      client.deleteLaunch(record.id).catch(() => {
+      client.reportExit(id).catch(() => {
         return;
       }).finally(() => resolve2(exitCode));
     });
     child.on("error", (err) => {
-      process.stderr.write(`Could not launch ${args.agent}: ${err.message}
+      process.stderr.write(`Could not launch ${executable}: ${err.message}
 `);
-      client.deleteLaunch(record.id).catch(() => {
+      client.deleteLaunch(id).catch(() => {
         return;
       }).finally(() => resolve2(1));
     });
@@ -603,15 +612,15 @@ ${END}
   writeFileSync3(file, content);
 }
 function ensureCodexFeatures(content) {
-  if (/^\s*\[features\]/m.test(content)) {
-    if (/^\s*codex_hooks\s*=/m.test(content)) {
-      return content.replace(/^\s*codex_hooks\s*=.*$/m, "codex_hooks = true");
+  if (/^\s*\[features\]\s*$/m.test(content)) {
+    if (/^\s*hooks\s*=/m.test(content)) {
+      return content.replace(/^\s*hooks\s*=.*$/m, "hooks = true");
     }
     return content.replace(/^\s*\[features\]\s*$/m, `[features]
-codex_hooks = true`);
+hooks = true`);
   }
   return `[features]
-codex_hooks = true
+hooks = true
 
 ${content}`;
 }
@@ -689,6 +698,8 @@ function runHooksInstall(provider) {
     const file = join3(HOME2, ".codex", "config.toml");
     patchCodexConfig(file);
     process.stdout.write(`Patched ${file}
+`);
+    process.stdout.write(`Open Codex and run /hooks to review the installed hooks.
 `);
     return 0;
   }
@@ -734,15 +745,84 @@ async function waitUntilStopped(client, timeoutMs) {
   return false;
 }
 
+// packages/aw/src/commands/resume.ts
+async function runResume(args) {
+  const [idStr, ...rest] = args;
+  if (!idStr) {
+    process.stderr.write(`Usage: aw resume <id> [--client-ref <token>] [-- agent args...]
+`);
+    return 1;
+  }
+  const id = Number(idStr);
+  if (!Number.isInteger(id) || id <= 0) {
+    process.stderr.write(`Invalid launch id: ${idStr}
+`);
+    return 1;
+  }
+  const parsed = parseLaunchArgv(rest);
+  const client = await ensureDaemonRunning();
+  const record = await client.getLaunch(id);
+  if (!record) {
+    process.stderr.write(`Launch ${id} not found
+`);
+    return 1;
+  }
+  if (record.state !== STATES.EXITED) {
+    process.stderr.write(`Launch ${id} is not resumable (state: ${record.state})
+`);
+    return 1;
+  }
+  if (!record.session_id) {
+    process.stderr.write(`Launch ${id} has no session_id
+`);
+    return 1;
+  }
+  const executable = Bun.which(record.agent);
+  if (!executable) {
+    process.stderr.write(`Could not find ${record.agent} on PATH.
+`);
+    return 1;
+  }
+  const argv = buildResumeArgs(record.agent, record.session_id);
+  if (parsed.rest.length)
+    argv.push("--", ...parsed.rest);
+  const claim = await client.resumeLaunch(id, {
+    folder: process.cwd(),
+    client_ref: parsed.client_ref
+  });
+  if (claim.type === "not_found") {
+    process.stderr.write(`Launch ${id} not found
+`);
+    return 1;
+  }
+  if (claim.type === "not_resumable") {
+    process.stderr.write(`Launch ${id} is not resumable (state: ${claim.state})
+`);
+    return 1;
+  }
+  return spawnAndWait(executable, id, argv, client);
+}
+function buildResumeArgs(agent, sessionId) {
+  switch (agent) {
+    case "claude":
+      return ["--resume", sessionId];
+    case "codex":
+      return ["resume", sessionId];
+    case "agent":
+      return ["--resume", sessionId];
+  }
+}
+
 // packages/aw/src/index.ts
 var HELP = `aw \u2014 launcher and live view for terminal AI coding agents.
 
 Usage:
-  aw claude [--title <title>] [--nvim-server <addr>] [--nvim-bufnr <nr>] [-- claude args...]
-  aw codex  [--title <title>] [--nvim-server <addr>] [--nvim-bufnr <nr>] [-- codex args...]
-  aw agent  [--title <title>] [--nvim-server <addr>] [--nvim-bufnr <nr>] [-- agent args...]
+  aw claude [--title <title>] [--client-ref <token>] [-- claude args...]
+  aw codex  [--title <title>] [--client-ref <token>] [-- codex args...]
+  aw agent  [--title <title>] [--client-ref <token>] [-- agent args...]
   aw stream
   aw stop
+  aw resume <id> [--client-ref <token>] [-- agent args...]
   aw hooks install <claude|codex|agent>
   aw help
 `;
@@ -761,6 +841,9 @@ async function main(argv) {
   if (command === "stop") {
     return runStop();
   }
+  if (command === "resume") {
+    return runResume(rest);
+  }
   if (command === "hooks") {
     const [sub, provider] = rest;
     if (sub !== "install" || !provider) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@preziosiraffaele/agent-watch",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "private": false,
   "type": "module",
   "description": "Local observability layer for terminal-based AI coding agents.",
@@ -17,6 +17,7 @@
   },
   "scripts": {
     "build": "bun build ./packages/aw/src/index.ts --outfile ./dist/aw.js --target bun && bun build ./packages/agent-watchd/src/index.ts --outfile ./dist/agent-watchd.js --target bun",
+    "link": "bun run build && bun link",
     "prepare": "bun run build",
     "test": "bun test",
     "lint": "eslint .",
@@ -36,6 +37,7 @@
     "@types/bun": "^1.1.0",
     "eslint": "^9.26.0",
     "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-jsdoc": "^62.9.0",
     "prettier": "^3.8.3",
     "typescript": "^5.6.0",
     "typescript-eslint": "^8.20.0"