golem-kit 0.2.3 → 0.2.4

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.4
+
+- Chat and builder no longer fight over one Stop hook: the turn-end relay asks tmux which window it ran in instead of trusting the key baked in when it was installed, so a chat message sent after the builder was opened gets its reply and the composer unlocks. `installHooks` also keeps exactly one entry for itself, matched by script name, so a source-pin change between releases replaces it instead of stacking another.
+
 ## 0.2.3
 
 - A model pin follows its agent: change `chat.agent` (or `agents.builder`) and the conversation saved on the old agent is retired on the next start instead of resumed with the new agent's pin. It stays readable in `.golem/conversations.json`, marked, and the next message opens a fresh conversation on the configured agent.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "golem-kit",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Starter kit and local CLI for Golem applications.",
   "type": "module",
   "exports": {

package/src/runtime/harness/claude-tmux.js

@@ -161,18 +161,19 @@ async function installHooks(cwd, session, stateDir, callbackUrl) {
   const command = ['node', s.shellQuote(HOOK_SCRIPT), s.shellQuote(stateDir), s.shellQuote(session)]
     .concat(callbackUrl ? [s.shellQuote(callbackUrl)] : [])
     .join(' ');
+  const hookName = path.basename(HOOK_SCRIPT);
   mergeLocalSettings(cwd, (settings) => {
     if (!settings.hooks || typeof settings.hooks !== 'object') settings.hooks = {};
     if (!Array.isArray(settings.hooks.Stop)) settings.hooks.Stop = [];
-    const ours = settings.hooks.Stop.some((m) =>
-      Array.isArray(m.hooks) && m.hooks.some((h) => h.command === command));
-    if (!ours) {
-      // Drop stale bc hook entries (e.g. a previous session in this cwd) first.
-      settings.hooks.Stop = settings.hooks.Stop.filter((m) =>
-        !(Array.isArray(m.hooks) && m.hooks.some((h) =>
-          typeof h.command === 'string' && h.command.includes(HOOK_SCRIPT))));
-      settings.hooks.Stop.push({ hooks: [{ type: 'command', command }] });
-    }
+    // Exactly ONE entry for our script, always. Matched on the basename, not the
+    // full path: a source pin (or an npx cache) moves the script between releases,
+    // and a path match let one entry per path pile up — every turn end then wrote
+    // every stale key's file. The hook resolves its own key at run time, so the
+    // single surviving entry serves every window in this cwd.
+    settings.hooks.Stop = settings.hooks.Stop.filter((m) =>
+      !(Array.isArray(m.hooks) && m.hooks.some((h) =>
+        typeof h.command === 'string' && h.command.includes(hookName))));
+    settings.hooks.Stop.push({ hooks: [{ type: 'command', command }] });
   });
   await excludeLocalSettings(cwd);
 }

package/src/runtime/harness/turnend-hook.js

@@ -22,18 +22,33 @@ const fs = require('node:fs');
 const path = require('node:path');
 const { execFileSync } = require('node:child_process');
 
-// The hook runs inside the agent's own pane, so its tmux session identifies
-// the session exactly (the server attributes lieutenant turn-ends by it).
+// The hook runs inside the agent's own pane, so tmux identifies it exactly.
 // Empty when not under tmux; never fails the hook when tmux is absent.
-function tmuxSession() {
+// golem: '#S:#W', and -t $TMUX_PANE, because a bare display-message answers for
+// the session's ACTIVE window — from the builder's pane, while the chat window
+// was current, it said ':chat'. The pane id is the only self-reference a hook
+// running outside the active window can trust.
+function tmuxPane() {
   if (!process.env.TMUX) return '';
+  const target = process.env.TMUX_PANE ? ['-t', process.env.TMUX_PANE] : [];
   try {
-    return execFileSync('tmux', ['display-message', '-p', '#S'], { encoding: 'utf8' }).trim();
+    return execFileSync('tmux', ['display-message', '-p'].concat(target, ['#S:#W']), { encoding: 'utf8' }).trim();
   } catch {
     return '';
   }
 }
 
+// golem: runtimeKey(argvKey) — which agent's turn just ended.
+// Claude Code keeps ONE Stop hook per cwd, and window-granular agents (the
+// builder and the chat) share a cwd: the key baked into argv at install time is
+// whichever spawned last, so the other one's turn ends would land in the wrong
+// file and its send() would wait forever. Ask tmux instead. Session-granular
+// agents own their whole session (no ':' in their key) and keep the argv key.
+function runtimeKey(argvKey) {
+  if (!argvKey.includes(':')) return argvKey;
+  return tmuxPane() || argvKey;
+}
+
 function readStdin() {
   return new Promise((resolve) => {
     let data = '';
@@ -53,7 +68,7 @@ function readStdin() {
 
 async function main() {
   const stateDir = process.argv[2];
-  const session = process.argv[3];
+  const session = runtimeKey(process.argv[3] || '');
   const url = process.argv[4] || process.env.BC_TURNEND_URL || '';
   if (!stateDir || !session) return;
 
@@ -70,7 +85,7 @@ async function main() {
     event: payload.hook_event_name || 'Stop',
     session_id: payload.session_id || null,
     cwd: payload.cwd || null,
-    tmux_session: tmuxSession(),
+    tmux_session: tmuxPane().split(':')[0],
   };
   // What the agent last said, when the harness hands it over — the stall
   // alert quotes it so the board knows what a silent worker was waiting on.