@termhub/agent 0.5.0 → 0.5.2

package/dist/cli.js

@@ -60,7 +60,12 @@ var def = (params, result, timeoutMs = DEFAULT_TIMEOUT) => ({ params, result, ti
 var RPC = {
   "tmux.list": def(z.object({}), z.object({ sessions: z.array(sessionName) })),
   "tmux.kill": def(z.object({ session: sessionName }), z.object({ killed: z.boolean() })),
-  "tmux.capture": def(z.object({ session: sessionName, lines: z.number().int().min(1).max(5e3) }), z.object({ text: z.string() })),
+  /**
+   * `escapes`: keep the SGR attributes (`capture-pane -e`) so the server can tell dimmed text from typed
+   * text (since agent 0.5.2). An older agent strips the unknown param and answers plain text with no
+   * `escapes` in the result — which is how the server knows.
+   */
+  "tmux.capture": def(z.object({ session: sessionName, lines: z.number().int().min(1).max(5e3), escapes: z.boolean().optional() }), z.object({ text: z.string(), escapes: z.boolean().optional() })),
   /** Idempotent: creates the detached session in `cwd` when it is missing. `created` says whether it had to. */
   "tmux.ensure": def(z.object({ session: sessionName, cwd: machinePath }), z.object({ created: z.boolean() }), 1e4),
   /**
@@ -653,7 +658,8 @@ function claudeConfigDirs(accountDirs) {
 function expandHome(dir, home) {
   return dir.startsWith("~/") ? `${home}/${dir.slice(2)}` : dir;
 }
-var CLAUDE_HOOK_EVENTS = ["SessionStart", "UserPromptSubmit", "PreToolUse", "Notification", "Stop", "SessionEnd"];
+var CLAUDE_HOOK_EVENTS = ["SessionStart", "UserPromptSubmit", "PreToolUse", "PermissionRequest", "Notification", "Stop", "SessionEnd"];
+var CLAUDE_TOOL_EVENTS = /* @__PURE__ */ new Set(["PreToolUse", "PermissionRequest"]);
 var CURSOR_HOOK_EVENTS = ["sessionStart", "beforeSubmitPrompt", "afterAgentResponse", "stop", "sessionEnd"];
 var HOOK_SCRIPT = `#!/bin/sh
 # termhub monitor hook \u2014 installed by termhub; forwards Claude Code / Codex / Cursor CLI hook
@@ -674,9 +680,21 @@ if [ "$TOOL" = codex ]; then EVENT="$2"; else EVENT=$(cat 2>/dev/null); fi
 # 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.
+# AskUserQuestion is the one exception (below).
 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 branch below is picked on the event's OWN hook_event_name \u2014 the FIRST "hook_event_name" key of
+# the payload (Claude Code serialises it before tool_input, same reasoning as tool_name below) \u2014
+# never a value a substring search could find nested inside a tool's input (e.g. a PermissionRequest
+# whose tool_input happened to contain the text "hook_event_name":"PreToolUse").
+KIND_REST=\${EVENT#*'"hook_event_name"'}
+if [ "$KIND_REST" != "$EVENT" ]; then
+  KIND_REST=\${KIND_REST#*'"'}
+  KIND=\${KIND_REST%%'"'*}
+else
+  KIND=
+fi
+case "$KIND" in
+  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,
@@ -688,35 +706,63 @@ case "$EVENT" in
     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")
+    # AskUserQuestion's input is the question itself, written to be shown to the person (spec
+    # 2026-09-25 \xA74.1): the whole event goes as it came \u2014 the server keeps tool_use_id and
+    # tool_input and drops the rest \u2014 and the marker is neither read nor written, so two questions
+    # in a row are two questions. NAME is real only when $REST (everything from the first "tool_name"
+    # on) holds no SECOND "tool_name": a real question never repeats that key, so a second one means
+    # the first was actually nested inside another tool's tool_input (tool_input serialised before
+    # tool_name) and NAME does not name the real tool \u2014 fall back to the ordinary name-only path below
+    # (which, worst case, mislabels that one event; it never forwards the input).
+    ASK=false
+    if [ "$NAME" = AskUserQuestion ]; then
+      case "$REST" in
+        *'"tool_name"'*) ;;
+        *) ASK=true ;;
+      esac
     fi
+    if [ "$ASK" != true ]; then
+      # 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
+    fi
+    ;;
+  PermissionRequest)
+    # A permission prompt: only the tool's name travels, exactly like a tool call (never its input,
+    # never the suggestions). AskUserQuestion's own prompt is dropped \u2014 its PreToolUse already carried
+    # the question. Same first-"tool_name" rule and character set as above.
+    REST=\${EVENT#*'"tool_name"'}
+    [ "$REST" != "$EVENT" ] || exit 0
+    REST=\${REST#*'"'}
+    NAME=\${REST%%'"'*}
+    case "$NAME" in '' | *[!A-Za-z0-9_.-]* | AskUserQuestion) exit 0 ;; esac
+    EVENT=$(printf '{"hook_event_name":"PermissionRequest","tool_name":"%s"}' "$NAME")
     ;;
   # 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"'*)
+  SessionStart | UserPromptSubmit | Notification)
     rm -f "$MARK"
     ;;
 esac
@@ -753,7 +799,7 @@ function mergeClaudeSettings(current, scriptPath, shown = "~/.claude/settings.js
     const list4 = Array.isArray(next[event]) ? next[event] : [];
     const others = list4.filter((e) => !isOurs(e));
     const entry = { hooks: [{ type: "command", command: `${scriptPath} claude`, timeout: 10 }] };
-    if (event === "PreToolUse")
+    if (CLAUDE_TOOL_EVENTS.has(event))
       entry.matcher = "*";
     others.push(entry);
     next[event] = others;
@@ -1979,11 +2025,11 @@ async function kill(params) {
   return { killed: r.code === 0 };
 }
 async function capture(params) {
-  const r = await run(tmuxPath(), ["capture-pane", "-p", "-S", `-${params.lines}`, "-t", `=${params.session}:`]);
+  const r = await run(tmuxPath(), ["capture-pane", "-p", ...params.escapes ? ["-e"] : [], "-S", `-${params.lines}`, "-t", `=${params.session}:`]);
   const failure = processFailure2(r);
   if (failure) throw failure;
   if (r.code !== 0) throw new RpcFailure("notfound", "session not found");
-  return { text: r.stdout };
+  return params.escapes ? { text: r.stdout, escapes: true } : { text: r.stdout };
 }
 var pane = (session) => `=${session}:`;
 var why = (stderr, fallback) => stderr.trim().split("\n")[0] || fallback;
@@ -2271,7 +2317,7 @@ async function status3() {
 }
 
 // src/version.ts
-var AGENT_VERSION = "0.5.0";
+var AGENT_VERSION = "0.5.2";
 
 // src/rpc/update.ts
 var PACKAGE = "@termhub/agent";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@termhub/agent",
-  "version": "0.5.0",
+  "version": "0.5.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,