@termhub/agent 0.5.2 → 0.6.0

package/dist/cli.js

@@ -128,6 +128,8 @@ var closedReason = z2.enum(["cli_missing", "run_failed", "killed", "missing_sess
 var CAPABILITY_CLAUDE = "claude";
 var CAPABILITY_CLAUDE_SYSTEM_PROMPT = "claude.system_prompt";
 var CAPABILITY_SIM = "sim";
+var CAPABILITY_CLAUDE_STREAM_INPUT = "claude.stream_input";
+var STREAM_END_INPUT_LINE = '{"type":"termhub_end_input"}';
 var helloMessage = z2.object({
   type: z2.literal("hello"),
   protocol: z2.number().int().min(1),
@@ -171,9 +173,13 @@ var claudeOpenParams = z2.object({
   // belongs at, so there is no separate, later place to hand it over.
   token: z2.string(),
   model: z2.string().nullable().optional(),
-  // Project chats only: the server-composed focus text forwarded onto the CLI's argv (see
+  // Project chats and streamed runs: the server-composed text forwarded onto the CLI's argv (see
   // `CAPABILITY_CLAUDE_SYSTEM_PROMPT`). Absent for the account-wide chat, whose argv must not change.
-  append_system_prompt: z2.string().max(4e3).nullable().optional()
+  // 8000 because a streamed run carries the orchestrator prompt next to a project's (at most 4000
+  // each); only agents that advertise `CAPABILITY_CLAUDE_STREAM_INPUT` are ever sent more than 4000.
+  append_system_prompt: z2.string().max(8e3).nullable().optional(),
+  // See `CAPABILITY_CLAUDE_STREAM_INPUT`. Absent on every one-shot run, whose open frame must not change.
+  stream_input: z2.boolean().optional()
 });
 var tcpOpenParams = z2.object({ port: wdaPort }).strict();
 var openPty = z2.object({ type: z2.literal("open"), ch: channel, kind: z2.literal("pty"), params: ptyOpenParams });
@@ -693,6 +699,15 @@ if [ "$KIND_REST" != "$EVENT" ]; then
 else
   KIND=
 fi
+# A subagent's event (Claude Code 2.1.69+) carries an "agent_id" key before its own "hook_event_name" \u2014
+# the order is session_id, transcript_path, cwd, prompt_id, permission_mode, agent_id, agent_type,
+# hook_event_name, \u2026 \u2014 and the main thread's never does. Only that prefix is searched, and only for the
+# key form: a value holding the text "agent_id": would have its quotes escaped. The reduced bodies below
+# carry the flag; the server never lets a subagent's event close a card (spec 2026-09-26 \xA74.5). The
+# dedupe marker ignores it.
+BEFORE_KIND=\${EVENT%%'"hook_event_name"'*}
+SUB=
+case "$BEFORE_KIND" in *'"agent_id":'*) SUB=',"subagent":true' ;; esac
 case "$KIND" in
   PreToolUse)
     # The event's own tool name is the FIRST "tool_name" of the payload (Claude Code serialises it
@@ -742,9 +757,9 @@ case "$KIND" in
       [ "$(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")
+        EVENT=$(printf '{"hook_event_name":"PreToolUse","tool_name":"%s","verb":"%s"%s}' "$NAME" "$VERB" "$SUB")
       else
-        EVENT=$(printf '{"hook_event_name":"PreToolUse","tool_name":"%s"}' "$NAME")
+        EVENT=$(printf '{"hook_event_name":"PreToolUse","tool_name":"%s"%s}' "$NAME" "$SUB")
       fi
     fi
     ;;
@@ -757,7 +772,7 @@ case "$KIND" in
     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")
+    EVENT=$(printf '{"hook_event_name":"PermissionRequest","tool_name":"%s"%s}' "$NAME" "$SUB")
     ;;
   # 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
@@ -1291,6 +1306,10 @@ async function uninstall(params, home = os3.homedir()) {
 
 // ../../packages/claude-cli/dist/index.js
 var DISALLOWED_TOOLS = "Bash,Read,Write,Edit,WebFetch,WebSearch";
+var BACKGROUND_AGENT_HOOK = `input=$(cat); case "$input" in *'"agent_id"'*) exit 0;; esac; printf '%s' "$input" | grep -Eq '"run_in_background"[[:space:]]*:[[:space:]]*true' && exit 0; echo 'No chat do termhub todo subagente roda em segundo plano: repita esta chamada do Agent com run_in_background: true.' >&2; exit 2`;
+var CONCIERGE_SETTINGS = JSON.stringify({
+  hooks: { PreToolUse: [{ matcher: "Agent|Task", hooks: [{ type: "command", command: BACKGROUND_AGENT_HOOK }] }] }
+});
 function buildClaudeArgs(spec) {
   return [
     "-p",
@@ -1313,6 +1332,7 @@ function buildClaudeArgs(spec) {
     "mcp__termhub__*",
     "--disallowed-tools",
     DISALLOWED_TOOLS,
+    ...spec.stream_input ? ["--input-format", "stream-json", "--replay-user-messages", "--settings", CONCIERGE_SETTINGS] : [],
     ...spec.model ? ["--model", spec.model] : [],
     // Last, and only when set: the account-wide chat's argv stays exactly what it was. It is our own
     // server-composed text (a project's name, key and paths), never the user's prompt, which still
@@ -1337,6 +1357,8 @@ import { mkdtempSync, rmSync, writeFileSync } from "fs";
 import { tmpdir } from "os";
 import { join } from "path";
 var DEFAULT_TIMEOUT_MS2 = 10 * 60 * 1e3;
+var STREAM_TIMEOUT_MS = 60 * 60 * 1e3;
+var MAX_PENDING_INPUT_BYTES = 256 * 1024;
 var KILL_GRACE_MS = 2e3;
 var PROMPT_TIMEOUT_MS = 3e4;
 var MAX_LINE_BYTES = MAX_FRAME - HEADER_BYTES - 1;
@@ -1369,7 +1391,8 @@ function createClaudeManager(deps) {
       }
       const runDir = dir;
       socket.sendControl({ type: "opened", ch });
-      deps.log("claude run starting", { ch, resume: params.resume, model: params.model ?? null });
+      const stream = params.stream_input === true;
+      deps.log("claude run starting", { ch, resume: params.resume, model: params.model ?? null, stream });
       const env2 = { ...deps.env ?? agentEnv() };
       if (params.config_dir === null) delete env2.CLAUDE_CONFIG_DIR;
       else env2.CLAUDE_CONFIG_DIR = params.config_dir;
@@ -1378,7 +1401,8 @@ function createClaudeManager(deps) {
         resume: params.resume,
         mcp_config_path: mcpConfigPath,
         model: params.model ?? null,
-        append_system_prompt: params.append_system_prompt ?? null
+        append_system_prompt: params.append_system_prompt ?? null,
+        stream_input: stream
       });
       let child;
       try {
@@ -1454,10 +1478,11 @@ function createClaudeManager(deps) {
           deps.log("claude stream send failed", { ch, error: message(err) });
         }
       }
+      const timeoutMs = deps.timeoutMs ?? (stream ? STREAM_TIMEOUT_MS : DEFAULT_TIMEOUT_MS2);
       const timer = setTimeout(() => {
-        deps.log("claude run timed out", { ch, timeoutMs: deps.timeoutMs ?? DEFAULT_TIMEOUT_MS2 });
+        deps.log("claude run timed out", { ch, timeoutMs });
         killRun();
-      }, deps.timeoutMs ?? DEFAULT_TIMEOUT_MS2);
+      }, timeoutMs);
       timer.unref();
       const promptTimer = setTimeout(() => {
         deps.log("claude run got no prompt", { ch, promptTimeoutMs: deps.promptTimeoutMs ?? PROMPT_TIMEOUT_MS });
@@ -1470,7 +1495,11 @@ function createClaudeManager(deps) {
         promptSent: false,
         kill: killRun,
         promptArrived: () => clearTimeout(promptTimer),
-        settle
+        settle,
+        stream,
+        inputTail: "",
+        inputEnded: false,
+        discarding: false
       };
       runs.set(ch, run2);
       child.stdin?.on("error", () => {
@@ -1516,13 +1545,51 @@ function createClaudeManager(deps) {
     write(ch, data) {
       const run2 = runs.get(ch);
       if (!run2) return false;
-      if (run2.promptSent) {
-        deps.log("extra data on a claude channel ignored", { ch, bytes: data.length });
+      if (!run2.stream) {
+        if (run2.promptSent) {
+          deps.log("extra data on a claude channel ignored", { ch, bytes: data.length });
+          return true;
+        }
+        run2.promptSent = true;
+        run2.promptArrived();
+        run2.child.stdin?.end(data);
         return true;
       }
       run2.promptSent = true;
       run2.promptArrived();
-      run2.child.stdin?.end(data);
+      if (run2.inputEnded) {
+        deps.log("claude input after its end ignored", { ch, bytes: data.length });
+        return true;
+      }
+      let text = data.toString("utf8");
+      if (run2.discarding) {
+        const nl = text.indexOf("\n");
+        if (nl === -1) return true;
+        deps.log("claude input line too large, rest dropped", { ch, bytes: Buffer.byteLength(text.slice(0, nl), "utf8") });
+        run2.discarding = false;
+        text = text.slice(nl + 1);
+      }
+      run2.inputTail += text;
+      for (; ; ) {
+        const nl = run2.inputTail.indexOf("\n");
+        if (nl === -1) break;
+        const line = run2.inputTail.slice(0, nl);
+        run2.inputTail = run2.inputTail.slice(nl + 1);
+        if (line === STREAM_END_INPUT_LINE) {
+          run2.inputEnded = true;
+          if (run2.inputTail.length > 0) deps.log("claude input after its end ignored", { ch, bytes: Buffer.byteLength(run2.inputTail, "utf8") });
+          run2.inputTail = "";
+          run2.child.stdin?.end();
+          return true;
+        }
+        if (line.trim()) run2.child.stdin?.write(`${line}
+`);
+      }
+      if (Buffer.byteLength(run2.inputTail, "utf8") > (deps.maxPendingInputBytes ?? MAX_PENDING_INPUT_BYTES)) {
+        deps.log("claude input line too large, dropped", { ch, bytes: Buffer.byteLength(run2.inputTail, "utf8") });
+        run2.inputTail = "";
+        run2.discarding = true;
+      }
       return true;
     },
     close(ch) {
@@ -2317,7 +2384,7 @@ async function status3() {
 }
 
 // src/version.ts
-var AGENT_VERSION = "0.5.2";
+var AGENT_VERSION = "0.6.0";
 
 // src/rpc/update.ts
 var PACKAGE = "@termhub/agent";
@@ -2456,7 +2523,7 @@ function detectOs(platform = process.platform) {
   if (platform === "linux") return "linux";
   return null;
 }
-var CAPABILITIES = [CAPABILITY_CLAUDE, CAPABILITY_CLAUDE_SYSTEM_PROMPT];
+var CAPABILITIES = [CAPABILITY_CLAUDE, CAPABILITY_CLAUDE_SYSTEM_PROMPT, CAPABILITY_CLAUDE_STREAM_INPUT];
 function capabilitiesFor(osName) {
   return osName === "macos" ? [...CAPABILITIES, CAPABILITY_SIM] : [...CAPABILITIES];
 }

package/package.json

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