@termhub/agent 0.4.0 → 0.4.2

package/dist/cli.js

@@ -611,7 +611,7 @@ function claudeConfigDirs(accountDirs) {
 function expandHome(dir, home) {
   return dir.startsWith("~/") ? `${home}/${dir.slice(2)}` : dir;
 }
-var CLAUDE_HOOK_EVENTS = ["SessionStart", "UserPromptSubmit", "Notification", "Stop", "SessionEnd"];
+var CLAUDE_HOOK_EVENTS = ["SessionStart", "UserPromptSubmit", "PreToolUse", "Notification", "Stop", "SessionEnd"];
 var HOOK_SCRIPT = `#!/bin/sh
 # termhub monitor hook \u2014 installed by termhub; forwards Claude Code / Codex hook events to
 # termhub tagged with the tmux session, so the app knows which tab is waiting for you.
@@ -626,6 +626,56 @@ SESSION=$(tmux display-message -p -t "$TMUX_PANE" '#{session_name}' 2>/dev/null)
 [ -n "$SESSION" ] || exit 0
 if [ "$TOOL" = codex ]; then EVENT="$2"; else EVENT=$(cat 2>/dev/null); fi
 [ -n "$EVENT" ] || EVENT='{}'
+# Tool calls: only the tool's name travels (never its input), with the spinner's verb when one is on
+# screen, and only when the pair changed since the last one for this session \u2014 twenty edits in a row
+# are one request as long as the verb stays the same (a new verb mid-run is a new request). The marker is per tmux
+# session, under TMPDIR, with the session name reduced to filename-safe characters.
+MARK="\${TMPDIR:-/tmp}/termhub-hook-$(printf '%s' "$SESSION" | tr -c 'A-Za-z0-9_-' '_')"
+case "$EVENT" in
+  *'"hook_event_name":"PreToolUse"'*|*'"hook_event_name": "PreToolUse"'*)
+    # The event's own tool name is the FIRST "tool_name" of the payload (Claude Code serialises it
+    # before tool_input), so the shortest prefix is cut \u2014 a "tool_name" nested in a tool's input
+    # must not win. Only letters, digits, "_", "." and "-" are posted (a bare Claude Code tool name,
+    # or an MCP tool name such as mcp__claude-in-chrome__click): anything else (a number, a name with
+    # a quote or a backslash) is dropped rather than sent \u2014 those are the only characters the
+    # hand-built JSON body below cannot survive as-is.
+    REST=\${EVENT#*'"tool_name"'}
+    [ "$REST" != "$EVENT" ] || exit 0
+    REST=\${REST#*'"'}
+    NAME=\${REST%%'"'*}
+    case "$NAME" in '' | *[!A-Za-z0-9_.-]*) exit 0 ;; esac
+    # Claude Code's spinner verb ("\u273B Moonwalking\u2026 (12s \xB7 esc to interrupt)"): the visible pane is
+    # read here, on the machine, and only the verb may leave it \u2014 one word of 2 to 24 ASCII letters
+    # right after a spinner glyph at column 0 and a single space, immediately followed by "\u2026" or
+    # "...", then the end of the line or a space. Column 0 because Claude Code draws its spinner
+    # there, while a draft in the input box or indented tool output can look just like one. The
+    # lowest such line of the last 24 non-blank rows wins (the live spinner sits above the todo list
+    # and the input box; blank rows under a short session are skipped). Both grep and sed run under
+    # LC_ALL=C: bytes the locale calls invalid then neither trip grep's "binary file matches" (which
+    # would also swallow the rest of the screen) nor sed's "illegal byte sequence" on macOS, and
+    # the match works the same on GNU, BSD and busybox. ASCII only on purpose: a customised verb
+    # with accents is dropped rather than half-matched. The case below checks the result again, so
+    # the hand-built JSON only ever gets letters.
+    VERB=$(tmux capture-pane -p -t "$TMUX_PANE" 2>/dev/null | LC_ALL=C grep -v '^[[:space:]]*$' 2>/dev/null | tail -n 24 |
+      LC_ALL=C sed -n -E 's/^(\xB7|\u2722|\u2733|\u2736|\u273B|\u273D|\\*) ([A-Za-z]{2,24})(\u2026|\\.\\.\\.)( .*)?$/\\2/p' | tail -n 1)
+    case "$VERB" in *[!A-Za-z]*) VERB= ;; esac
+    [ "\${#VERB}" -le 24 ] || VERB=
+    KEY="$NAME\${VERB:+ $VERB}"
+    [ "$(cat "$MARK" 2>/dev/null)" = "$KEY" ] && exit 0
+    printf '%s' "$KEY" 2>/dev/null > "$MARK"
+    if [ -n "$VERB" ]; then
+      EVENT=$(printf '{"hook_event_name":"PreToolUse","tool_name":"%s","verb":"%s"}' "$NAME" "$VERB")
+    else
+      EVENT=$(printf '{"hook_event_name":"PreToolUse","tool_name":"%s"}' "$NAME")
+    fi
+    ;;
+  # A new turn starts fresh, and so does an answered notification: a permission prompt takes the tab
+  # out of working, and the tool the person approves is the same one that set the marker, so without
+  # this reset the retry is suppressed and nothing says the tab is working again.
+  *'"hook_event_name":"SessionStart"'*|*'"hook_event_name": "SessionStart"'*|*'"hook_event_name":"UserPromptSubmit"'*|*'"hook_event_name": "UserPromptSubmit"'*|*'"hook_event_name":"Notification"'*|*'"hook_event_name": "Notification"'*)
+    rm -f "$MARK"
+    ;;
+esac
 { printf '{"tool":"%s","session":"%s","event":' "$TOOL" "$SESSION"; printf '%s' "$EVENT"; printf '}'; } |
   curl -s -m 5 -o /dev/null -X POST "$TERMHUB_HOOK_URL" \\
     -H "authorization: Bearer $TERMHUB_HOOK_TOKEN" -H 'content-type: application/json' --data-binary @- >/dev/null 2>&1 &
@@ -649,7 +699,10 @@ function mergeClaudeSettings(current, scriptPath) {
   for (const event of CLAUDE_HOOK_EVENTS) {
     const list3 = Array.isArray(hooks[event]) ? hooks[event] : [];
     const others = list3.filter((e) => !isOurs(e));
-    others.push({ hooks: [{ type: "command", command: `${scriptPath} claude`, timeout: 10 }] });
+    const entry = { hooks: [{ type: "command", command: `${scriptPath} claude`, timeout: 10 }] };
+    if (event === "PreToolUse")
+      entry.matcher = "*";
+    others.push(entry);
     hooks[event] = others;
   }
   settings.hooks = hooks;
@@ -925,7 +978,9 @@ async function install(params, home = os3.homedir()) {
 async function heal(home = os3.homedir()) {
   const scriptPath = path3.join(home, HOOK_SCRIPT_REL);
   const env = await readOrEmpty2(path3.join(home, HOOK_ENV_REL));
-  if (!env.trim() || !await readOrEmpty2(scriptPath)) return [];
+  const script = await readOrEmpty2(scriptPath);
+  if (!env.trim() || !script) return [];
+  if (script !== HOOK_SCRIPT) await writeAtomic(scriptPath, HOOK_SCRIPT, 493);
   const healed = [];
   for (const dir of await discoverClaudeDirs(home)) {
     const file = path3.join(expandHome(dir, home), "settings.json");
@@ -1833,7 +1888,7 @@ async function status3() {
 }
 
 // src/version.ts
-var AGENT_VERSION = "0.4.0";
+var AGENT_VERSION = "0.4.2";
 
 // src/rpc/update.ts
 var PACKAGE = "@termhub/agent";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@termhub/agent",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Agente do termhub: conecta esta máquina ao servidor por WebSocket de saída (sem SSH) e expõe os terminais tmux no navegador.",
   "license": "MIT",
   "private": false,