commandmate 0.22.2 → 0.24.0

package/dist/server/src/lib/verification/verify-config.js

@@ -0,0 +1,314 @@
+"use strict";
+/**
+ * Loader and validator for `.commandmate/verify.yaml`.
+ *
+ * Canonical spec: docs/design/verification-config.md
+ * Phase 0 reference implementation: .claude/skills/cmate-verify/scripts/verify-run.sh
+ *
+ * Server-only: reads from disk, so import this from API routes / CLI only.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VerifyConfigError = exports.GATE_ID_PATTERN = exports.DEFAULT_MAX_LOG_TAIL_BYTES = exports.DEFAULT_TIMEOUT_SEC = exports.VERIFY_CONFIG_RELATIVE_PATH = exports.RESERVED_GATE_IDS = exports.ENV_CLEAN_GATE_ID = exports.SCOPE_GATE_ID = exports.WORK_EVIDENCE_GATE_ID = void 0;
+exports.validateGateEntries = validateGateEntries;
+exports.loadVerifyConfig = loadVerifyConfig;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const yaml_1 = require("yaml");
+/**
+ * Built-in gate that answers "is there any work here to verify?".
+ *
+ * Declared here rather than in the runner so modules that only reason *about*
+ * gate selection (task contracts) can name it without importing the engine.
+ */
+exports.WORK_EVIDENCE_GATE_ID = 'work-evidence';
+/**
+ * Built-in gate that reconciles the changed files against the contract's
+ * `scope.allow` / `scope.deny` (#1546). Declared alongside work-evidence for the
+ * same reason: `lib/tasks/contract-message.ts` has to name it while resolving a
+ * contract's gate list, and must not pull the engine in to do so.
+ */
+exports.SCOPE_GATE_ID = 'scope';
+/**
+ * Built-in gate that reconciles the *machine* against the snapshot taken when
+ * the task was created (#1740): listening CommandMate servers, `mcbd-*` tmux
+ * sessions, `$HOME` and `~/.commandmate`. `scope` answers what a delegation
+ * changed inside the repository; this answers what it changed outside one.
+ */
+exports.ENV_CLEAN_GATE_ID = 'env-clean';
+/** Gate IDs reserved for built-in gates; using one in `gates` is a config error. */
+exports.RESERVED_GATE_IDS = [
+    exports.WORK_EVIDENCE_GATE_ID,
+    exports.SCOPE_GATE_ID,
+    exports.ENV_CLEAN_GATE_ID,
+];
+exports.VERIFY_CONFIG_RELATIVE_PATH = '.commandmate/verify.yaml';
+exports.DEFAULT_TIMEOUT_SEC = 600;
+exports.DEFAULT_MAX_LOG_TAIL_BYTES = 8192;
+const MIN_TIMEOUT_SEC = 1;
+const MAX_TIMEOUT_SEC = 7200;
+const MAX_LOG_TAIL_BYTES = 1048576;
+/**
+ * Shape a gate id may take, wherever a gate is declared.
+ *
+ * Exported because the task contract declares gates too (#1791) and names them
+ * in `verify.gates`. A second copy of this expression would let the two
+ * declaration sites drift into accepting different ids, and a contract gate the
+ * runner refuses to resolve is a completion criterion nothing can evaluate.
+ */
+exports.GATE_ID_PATTERN = /^[a-z0-9][a-z0-9-]{0,31}$/;
+const TOP_LEVEL_KEYS = ['version', 'gates', 'options'];
+const GATE_KEYS = ['id', 'command', 'timeoutSec'];
+const OPTION_KEYS = [
+    'baseRef',
+    'skipInPrimaryCheckout',
+    'maxLogTailBytes',
+    'requireCommit',
+    'requireEnvClean',
+];
+class VerifyConfigError extends Error {
+    issues;
+    constructor(issues) {
+        super(`invalid verify config:\n${issues.map((issue) => `  - ${issue}`).join('\n')}`);
+        this.name = 'VerifyConfigError';
+        this.issues = issues;
+    }
+}
+exports.VerifyConfigError = VerifyConfigError;
+function isMapping(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+/**
+ * The bash reference parser strips outer quotes before comparing, so `timeoutSec: "900"`
+ * means 900 there. Accept the same spelling, but only an exact decimal literal.
+ */
+function asInteger(value) {
+    if (typeof value === 'number')
+        return Number.isInteger(value) ? value : null;
+    if (typeof value === 'string' && /^-?\d+$/.test(value))
+        return Number(value);
+    return null;
+}
+function asBoolean(value) {
+    if (typeof value === 'boolean')
+        return value;
+    if (value === 'true')
+        return true;
+    if (value === 'false')
+        return false;
+    return null;
+}
+function describe(value) {
+    if (value === undefined)
+        return 'nothing';
+    if (value === null)
+        return 'null';
+    if (typeof value === 'string')
+        return JSON.stringify(value);
+    if (Array.isArray(value))
+        return 'a list';
+    if (typeof value === 'object')
+        return 'a mapping';
+    return String(value);
+}
+function collectUnknownKeys(mapping, allowed, at, issues) {
+    for (const key of Object.keys(mapping)) {
+        if (!allowed.includes(key)) {
+            issues.push(`${at}: unknown key "${key}" (v1 is a closed set)`);
+        }
+    }
+}
+/**
+ * Validate a list of `{ id, command, timeoutSec }` entries.
+ *
+ * Shared with the task contract's `verify.gateDefinitions` (#1791), which
+ * declares gates in the same shape and must be held to the same constraints —
+ * id pattern, reserved ids, duplicates, integer timeout in range. Calling this
+ * is what makes "the same constraints" a fact rather than a comment: a contract
+ * gate accepted here is one the runner can execute and the report can name.
+ *
+ * Deliberately does *not* decide whether the list may be absent or empty. That
+ * is the caller's rule: verify.yaml requires at least one gate, a contract that
+ * declares none is the normal case.
+ *
+ * @param at path prefix for issue messages (`gates`, `verify.gateDefinitions`)
+ * @returns the accepted entries; an entry that produced an issue is dropped so
+ *          the result never carries a value that failed validation
+ */
+function validateGateEntries(value, at, issues) {
+    if (!Array.isArray(value)) {
+        issues.push(`${at}: must be a list (got ${describe(value)})`);
+        return [];
+    }
+    const gates = [];
+    const seenIds = new Set();
+    value.forEach((entry, index) => {
+        const entryAt = `${at}[${index}]`;
+        validateGateEntry(entry, entryAt, seenIds, gates, issues);
+    });
+    return gates;
+}
+/** One gate entry; accepted entries are appended to `gates`. */
+function validateGateEntry(entry, at, seenIds, gates, issues) {
+    const issuesBefore = issues.length;
+    if (!isMapping(entry)) {
+        issues.push(`${at}: must be a mapping (got ${describe(entry)})`);
+        return;
+    }
+    collectUnknownKeys(entry, GATE_KEYS, at, issues);
+    if (typeof entry.id !== 'string' || entry.id === '') {
+        issues.push(`${at}.id: required, must be a non-empty string (got ${describe(entry.id)})`);
+    }
+    else if (!exports.GATE_ID_PATTERN.test(entry.id)) {
+        issues.push(`${at}.id: "${entry.id}" must match ${exports.GATE_ID_PATTERN.source}`);
+    }
+    else if (exports.RESERVED_GATE_IDS.includes(entry.id)) {
+        issues.push(`${at}.id: "${entry.id}" is reserved for a built-in gate`);
+    }
+    else if (seenIds.has(entry.id)) {
+        issues.push(`${at}.id: duplicate gate id "${entry.id}"`);
+    }
+    else {
+        seenIds.add(entry.id);
+    }
+    if (typeof entry.command !== 'string' || entry.command.trim() === '') {
+        issues.push(`${at}.command: required, must be a non-empty string (got ${describe(entry.command)})`);
+    }
+    let timeoutSec = exports.DEFAULT_TIMEOUT_SEC;
+    if (entry.timeoutSec !== undefined) {
+        const parsed = asInteger(entry.timeoutSec);
+        if (parsed === null) {
+            issues.push(`${at}.timeoutSec: must be an integer (got ${describe(entry.timeoutSec)})`);
+        }
+        else if (parsed < MIN_TIMEOUT_SEC || parsed > MAX_TIMEOUT_SEC) {
+            issues.push(`${at}.timeoutSec: must be ${MIN_TIMEOUT_SEC}..${MAX_TIMEOUT_SEC} (got ${parsed})`);
+        }
+        else {
+            timeoutSec = parsed;
+        }
+    }
+    if (issues.length === issuesBefore) {
+        gates.push({ id: entry.id, command: entry.command, timeoutSec });
+    }
+}
+function validateGates(value, issues) {
+    if (value === undefined || value === null) {
+        issues.push('gates: required, at least one gate must be defined');
+        return [];
+    }
+    if (Array.isArray(value) && value.length === 0) {
+        issues.push('gates: at least one gate must be defined');
+        return [];
+    }
+    return validateGateEntries(value, 'gates', issues);
+}
+function validateOptions(value, issues) {
+    const options = {
+        baseRef: null,
+        skipInPrimaryCheckout: true,
+        maxLogTailBytes: exports.DEFAULT_MAX_LOG_TAIL_BYTES,
+        requireCommit: false,
+        requireEnvClean: false,
+    };
+    // A childless `options:` key parses as null and means "all defaults".
+    if (value === undefined || value === null)
+        return options;
+    if (!isMapping(value)) {
+        issues.push(`options: must be a mapping (got ${describe(value)})`);
+        return options;
+    }
+    collectUnknownKeys(value, OPTION_KEYS, 'options', issues);
+    if (value.baseRef !== undefined) {
+        if (typeof value.baseRef !== 'string' || value.baseRef.trim() === '') {
+            issues.push(`options.baseRef: must be a non-empty string (got ${describe(value.baseRef)})`);
+        }
+        else {
+            options.baseRef = value.baseRef;
+        }
+    }
+    if (value.skipInPrimaryCheckout !== undefined) {
+        const parsed = asBoolean(value.skipInPrimaryCheckout);
+        if (parsed === null) {
+            issues.push(`options.skipInPrimaryCheckout: must be true or false (got ${describe(value.skipInPrimaryCheckout)})`);
+        }
+        else {
+            options.skipInPrimaryCheckout = parsed;
+        }
+    }
+    if (value.requireCommit !== undefined) {
+        const parsed = asBoolean(value.requireCommit);
+        if (parsed === null) {
+            issues.push(`options.requireCommit: must be true or false (got ${describe(value.requireCommit)})`);
+        }
+        else {
+            options.requireCommit = parsed;
+        }
+    }
+    if (value.requireEnvClean !== undefined) {
+        const parsed = asBoolean(value.requireEnvClean);
+        if (parsed === null) {
+            issues.push(`options.requireEnvClean: must be true or false (got ${describe(value.requireEnvClean)})`);
+        }
+        else {
+            options.requireEnvClean = parsed;
+        }
+    }
+    if (value.maxLogTailBytes !== undefined) {
+        const parsed = asInteger(value.maxLogTailBytes);
+        if (parsed === null) {
+            issues.push(`options.maxLogTailBytes: must be an integer (got ${describe(value.maxLogTailBytes)})`);
+        }
+        else if (parsed < 0 || parsed > MAX_LOG_TAIL_BYTES) {
+            issues.push(`options.maxLogTailBytes: must be 0..${MAX_LOG_TAIL_BYTES} (got ${parsed})`);
+        }
+        else {
+            options.maxLogTailBytes = parsed;
+        }
+    }
+    return options;
+}
+function parseVerifyConfig(raw, configPath) {
+    let document;
+    try {
+        document = (0, yaml_1.parse)(raw);
+    }
+    catch (error) {
+        throw new VerifyConfigError([`${configPath}: YAML parse error: ${error.message}`]);
+    }
+    if (!isMapping(document)) {
+        throw new VerifyConfigError([
+            `${configPath}: expected a YAML mapping at the top level (got ${describe(document)})`,
+        ]);
+    }
+    const issues = [];
+    collectUnknownKeys(document, TOP_LEVEL_KEYS, 'top level', issues);
+    if (!('version' in document)) {
+        issues.push('version: required, v1 configs must declare "version: 1"');
+    }
+    else if (asInteger(document.version) !== 1) {
+        issues.push(`version: must be 1 (got ${describe(document.version)})`);
+    }
+    const gates = validateGates(document.gates, issues);
+    const options = validateOptions(document.options, issues);
+    if (issues.length > 0)
+        throw new VerifyConfigError(issues);
+    return { version: 1, gates, options };
+}
+/**
+ * Read and validate `<repoPath>/.commandmate/verify.yaml`.
+ *
+ * @returns the validated config, or null when the file does not exist
+ * @throws VerifyConfigError with every violation collected in `issues`
+ */
+function loadVerifyConfig(repoPath) {
+    const configPath = (0, path_1.join)(repoPath, exports.VERIFY_CONFIG_RELATIVE_PATH);
+    let raw;
+    try {
+        raw = (0, fs_1.readFileSync)(configPath, 'utf8');
+    }
+    catch (error) {
+        if (error.code === 'ENOENT')
+            return null;
+        throw new VerifyConfigError([`${configPath}: ${error.message}`]);
+    }
+    return parseVerifyConfig(raw, configPath);
+}

package/dist/server/src/lib/ws-server.js

@@ -28,6 +28,7 @@ const tmux_control_mode_flags_1 = require("./tmux/tmux-control-mode-flags");
 const cache_1 = require("./external-apps/cache");
 const version_checker_1 = require("../lib/version-checker");
 const types_2 = require("../lib/realtime/types");
+const waiting_broadcast_1 = require("../lib/realtime/waiting-broadcast");
 const logger_1 = require("../lib/logger");
 const logger = (0, logger_1.createLogger)('ws-server');
 // Global state
@@ -231,6 +232,11 @@ function isExpectedWebSocketError(error) {
  */
 function setupWebSocket(server) {
     wss = new ws_1.WebSocketServer({ noServer: true });
+    // Issue #1788: publish the waiting edge to the worktree room. Started here
+    // rather than at module scope so the listener's lifetime matches the server's
+    // — and so the closure it registers is the one holding *this* bundle's `rooms`
+    // map, which is what a broadcast has to reach.
+    (0, waiting_broadcast_1.startWaitingStatusBroadcast)(handleBroadcast);
     // Handle upgrade requests - only accept app WebSocket connections, not Next.js HMR
     server.on('upgrade', (request, socket, head) => {
         const pathname = request.url || '/';
@@ -881,6 +887,9 @@ function cleanupRooms(worktreeIds) {
  * Used for testing and graceful shutdown
  */
 function closeWebSocket() {
+    // Issue #1788: drop the waiting-edge subscription first — it outlives `wss`
+    // otherwise, and CI shares one process across the whole suite.
+    (0, waiting_broadcast_1.stopWaitingStatusBroadcast)();
     if (wss) {
         // Close all client connections
         clients.forEach((clientInfo) => {

package/dist/server/src/types/sidebar.js

@@ -8,12 +8,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deriveCliStatus = void 0;
 exports.aggregateCliStatus = aggregateCliStatus;
 exports.formatCliStatusBreakdown = formatCliStatusBreakdown;
+exports.deriveWorktreeWaitingDetail = deriveWorktreeWaitingDetail;
 exports.calculateHasUnread = calculateHasUnread;
 exports.toBranchItem = toBranchItem;
 const types_1 = require("../lib/cli-tools/types");
 const selected_agents_validator_1 = require("../lib/selected-agents-validator");
 const status_mapping_1 = require("../lib/session/status-mapping");
 Object.defineProperty(exports, "deriveCliStatus", { enumerable: true, get: function () { return status_mapping_1.deriveCliStatus; } });
+const next_action_helper_1 = require("../lib/session/next-action-helper");
+/**
+ * `BranchStatus` → `SessionStatus`, so the sidebar can reuse `getNextAction`
+ * (Issue #1787) instead of growing a second next-action table.
+ *
+ * `generating` folds into `running`: `SessionStatus` has no fifth value, and the
+ * next action is identical for both ("it is working, leave it alone").
+ * `idle` maps to `null` — `getNextAction` distinguishes "no session" from
+ * "session sitting idle" only through null, and both mean "start it".
+ */
+const BRANCH_STATUS_TO_SESSION_STATUS = {
+    idle: null,
+    ready: 'ready',
+    running: 'running',
+    generating: 'running',
+    waiting: 'waiting',
+};
 /**
  * Aggregate per-agent CLI statuses into a single representative BranchStatus
  * for the sidebar's single status indicator (Issue #867).
@@ -65,6 +83,42 @@ function formatCliStatusBreakdown(cliStatus, labels) {
         .map(([instanceId, status]) => `${labels?.[instanceId] ?? (0, types_1.getCliToolDisplayNameSafe)(instanceId, instanceId)}: ${status ?? 'idle'}`)
         .join(', ');
 }
+/** Precedence for folding per-instance kinds: answerable-now wins (Issue #1786). */
+const WAITING_KIND_PRECEDENCE = [
+    'prompt',
+    'menu',
+    'unclassified',
+];
+/**
+ * Fold every instance's {@link SessionWaitingDetail} into one worktree-level
+ * verdict (Issue #1787).
+ *
+ * Reads `sessionStatusByInstance` when present and falls back to
+ * `sessionStatusByCli`, matching how `deriveSidebarCliStatus` picks its source
+ * — the two must not disagree about which map is authoritative, or the dot and
+ * its emphasis would come from different snapshots.
+ *
+ * The kind fold uses `prompt > menu > unclassified` (the same precedence the
+ * server uses per CLI tool): with two agents waiting, the one the user can
+ * answer from the app is the one worth shouting about.
+ *
+ * @param worktree - Source worktree data (any vintage of the payload)
+ * @returns The folded waiting detail; `{ waitingKind: null, awaitingInstruction: false }`
+ *   when nothing in the payload carries the #1786 fields
+ */
+function deriveWorktreeWaitingDetail(worktree) {
+    const entries = Object.values(worktree.sessionStatusByInstance ?? worktree.sessionStatusByCli ?? {}).filter((entry) => entry !== undefined);
+    let awaitingInstruction = false;
+    const kinds = new Set();
+    for (const entry of entries) {
+        if (entry.awaitingInstruction)
+            awaitingInstruction = true;
+        if (entry.waitingKind)
+            kinds.add(entry.waitingKind);
+    }
+    const waitingKind = WAITING_KIND_PRECEDENCE.find((kind) => kinds.has(kind)) ?? null;
+    return { waitingKind, awaitingInstruction };
+}
 /**
  * Calculate whether a worktree has unread messages
  *
@@ -178,6 +232,10 @@ function toBranchItem(worktree) {
     // reflected. Falls back to the legacy selectedAgents path when no per-instance
     // data is present.
     const { cliStatus, cliStatusLabels } = deriveSidebarCliStatus(worktree);
+    // Issue #1787: the row's emphasis and its "what do I do next" label both come
+    // from the AGGREGATED status, matching the single dot the row renders.
+    const aggregated = aggregateCliStatus(cliStatus);
+    const { waitingKind, awaitingInstruction } = deriveWorktreeWaitingDetail(worktree);
     return {
         id: worktree.id,
         name: worktree.name,
@@ -189,5 +247,15 @@ function toBranchItem(worktree) {
         cliStatus,
         cliStatusLabels,
         worktreePath: worktree.path,
+        waitingKind,
+        awaitingInstruction,
+        // `promptType` mirrors what `/api/worktrees` does with the same data
+        // (`isWaitingForResponse ? 'approval' : null`) rather than branching on
+        // `waitingKind`: the card and the sidebar row show the same worktree, and
+        // one saying "Approve / Reject" while the other says "Reply to prompt"
+        // would be a bug the user cannot explain. `isStalled` is server-only
+        // (`isWorktreeStalled` needs the detector's timers), so the sidebar never
+        // claims "Check stalled".
+        nextActionKey: (0, next_action_helper_1.getNextAction)(BRANCH_STATUS_TO_SESSION_STATUS[aggregated], aggregated === 'waiting' ? 'approval' : null, false),
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commandmate",
-  "version": "0.22.2",
+  "version": "0.24.0",
   "description": "A local control plane for agent CLIs — orchestration and visibility for Claude Code, Codex, Gemini CLI, and more across Git worktrees",
   "keywords": [
     "claude-code",

package/scripts/hooks/cmate-agent-event.sh

@@ -6,6 +6,21 @@
 # `notify`) so the server learns that a turn ended from the agent itself rather
 # than by reading the terminal. See docs/user-guide/agent-event-hooks.md.
 #
+# **This script is on the critical path for every tool except Claude Code.**
+# Issue #1757 measured `type:"http"` handlers against codex, copilot, gemini and
+# antigravity and none of the four accept them — codex is the worst case, where
+# a single `"type":"http"` entry makes it discard the whole hooks.json and every
+# event dies with one line on stderr. So `type:"command"` running this script is
+# the only delivery mechanism those tools have, and a word this script refuses
+# is a word that tool can never report.
+#
+# Which is what Issue #1759 fixed here. Before it, `--event` accepted five words
+# while the API accepted seven: `pre_tool_use` and `post_tool_use`, added to
+# `AGENT_EVENT_TYPES` by #1726, exited 2 rather than posting. `map_event_name`
+# also knew only Claude's spellings, so gemini's `BeforeTool` / `AfterAgent`
+# family died as "unrecognized hook event name". Both are now complete: seven
+# words, and the native spellings of all five push-mode tools.
+#
 # Written for bash 3.2 — the version macOS still ships — so no associative
 # arrays, `mapfile`, or `${var^^}`.
 #
@@ -24,11 +39,12 @@ Usage: cmate-agent-event.sh [options] [JSON]
 Options:
   --tool ID          Agent CLI id (default: $CM_AGENT_TOOL, else "claude")
   --event EVENT      stop | notification | session_start | user_prompt_submit |
-                     session_end (default: "stop")
+                     session_end | pre_tool_use | post_tool_use (default: "stop")
   --cwd PATH         Agent working directory (default: $CLAUDE_PROJECT_DIR, else $PWD)
   --session-id ID    Opaque agent session id
   --worktree-id ID   CommandMate worktree id; skips cwd-based resolution
   --instance-id ID   Agent instance id; without it the event lands on the primary
+  --detail TEXT      Event subtype; without it, read from the payload
   --json JSON        Hook payload to read cwd/session/event from
   --stdin-json       Read that payload from stdin instead
   --url URL          Endpoint (default: http://$CM_HOST:$CM_PORT/api/hooks/agent-event)
@@ -61,13 +77,37 @@ json_escape() {
 }
 
 # Map an agent's own event name onto the API vocabulary.
+#
+# The spellings come from Issue #1757's live capture of all four tools
+# (docs/design/agent-hooks-phase4-live-verification.md §8.1) and #1721's of
+# Claude. Three dialects share this function because a single relay serves every
+# tool; a name that is not below is refused rather than guessed at, so a tool
+# whose vocabulary grows fails loudly instead of filing an unknown event under
+# something adjacent.
+#
+# Deliberately absent: `PreInvocation` / `PostInvocation` (antigravity),
+# `BeforeModel` / `AfterModel` / `PreCompress` (gemini), `PreCompact` /
+# `PostCompact` / `SubagentStart` (codex). They are real events with no word in
+# AGENT_EVENT_TYPES, and inventing one for them here would put a meaning in the
+# API that no consumer agreed to.
 map_event_name() {
   case "$1" in
+    # Claude Code / codex / copilot / antigravity — the CamelCase dialect.
+    # (antigravity never reaches this function from a payload: its payloads carry
+    # no event name at all, so its hooks must pass --event. #1757 R2.)
     Stop|SubagentStop|agent-turn-complete) printf 'stop' ;;
     Notification) printf 'notification' ;;
     SessionStart) printf 'session_start' ;;
     SessionEnd) printf 'session_end' ;;
     UserPromptSubmit) printf 'user_prompt_submit' ;;
+    PreToolUse) printf 'pre_tool_use' ;;
+    PostToolUse) printf 'post_tool_use' ;;
+    # gemini renames four of the seven. The table is the CLI's own, read out of
+    # `gemini hooks migrate --from-claude` rather than guessed (#1757 §5.3.1).
+    BeforeAgent) printf 'user_prompt_submit' ;;
+    AfterAgent) printf 'stop' ;;
+    BeforeTool) printf 'pre_tool_use' ;;
+    AfterTool) printf 'post_tool_use' ;;
     *) printf '' ;;
   esac
 }
@@ -75,11 +115,15 @@ map_event_name() {
 # The event's subtype, where it has one. Each event spells it differently and
 # none of them share a field. Notification is judged on notification_type, never
 # on the human-facing "message" (Issue #1721, D3).
+#
+# pre_tool_use / post_tool_use carry `tool_name`, which is what the receiver
+# stores as the detail and what a matcher is tested against (Issue #1726).
 detail_field_for_event() {
   case "$1" in
     notification) printf 'notification_type' ;;
     session_end) printf 'reason' ;;
     session_start) printf 'source' ;;
+    pre_tool_use|post_tool_use) printf 'tool_name' ;;
     *) printf '' ;;
   esac
 }
@@ -104,6 +148,7 @@ while [ $# -gt 0 ]; do
     --session-id) [ $# -ge 2 ] || die "--session-id requires a value"; SESSION_ID="$2"; shift 2 ;;
     --worktree-id) [ $# -ge 2 ] || die "--worktree-id requires a value"; WORKTREE_ID="$2"; shift 2 ;;
     --instance-id) [ $# -ge 2 ] || die "--instance-id requires a value"; INSTANCE_ID="$2"; shift 2 ;;
+    --detail) [ $# -ge 2 ] || die "--detail requires a value"; DETAIL="$2"; shift 2 ;;
     --json) [ $# -ge 2 ] || die "--json requires a value"; HOOK_JSON="$2"; shift 2 ;;
     --url) [ $# -ge 2 ] || die "--url requires a value"; URL="$2"; shift 2 ;;
     --stdin-json) READ_STDIN=1; shift ;;
@@ -131,9 +176,21 @@ if [ -n "$HOOK_JSON" ]; then
       [ -n "$EVENT" ] || die "unrecognized hook event name: $JSON_EVENT"
     fi
   fi
+  # Session id spellings, in preference order. `session_id` covers Claude,
+  # codex, copilot and gemini; `conversationId` is antigravity's protojson name
+  # for the same thing (#1757 R4). The two turn-ids are last because they
+  # identify a turn rather than a session and are only worth sending when
+  # nothing better exists: `turn_id` is codex's, `turn-id` predates #1757 and is
+  # kept so a hook configured against an older release keeps working.
   if [ -z "$SESSION_ID" ]; then
     SESSION_ID="$(json_string_field "$HOOK_JSON" 'session_id')"
   fi
+  if [ -z "$SESSION_ID" ]; then
+    SESSION_ID="$(json_string_field "$HOOK_JSON" 'conversationId')"
+  fi
+  if [ -z "$SESSION_ID" ]; then
+    SESSION_ID="$(json_string_field "$HOOK_JSON" 'turn_id')"
+  fi
   if [ -z "$SESSION_ID" ]; then
     SESSION_ID="$(json_string_field "$HOOK_JSON" 'turn-id')"
   fi
@@ -141,9 +198,12 @@ fi
 
 [ -n "$EVENT" ] || EVENT="stop"
 
+# All seven words of AGENT_EVENT_TYPES. Kept in the same order as
+# src/lib/hooks/agent-event-types.ts so the two are read side by side; a word
+# missing here is a word the API accepts and the relay silently cannot send.
 case "$EVENT" in
-  stop|notification|session_start|user_prompt_submit|session_end) ;;
-  *) die "--event must be one of: stop, notification, session_start, user_prompt_submit, session_end (got \"$EVENT\")" ;;
+  stop|notification|session_start|user_prompt_submit|session_end|pre_tool_use|post_tool_use) ;;
+  *) die "--event must be one of: stop, notification, session_start, user_prompt_submit, session_end, pre_tool_use, post_tool_use (got \"$EVENT\")" ;;
 esac
 
 if [ -z "$DETAIL" ] && [ -n "$HOOK_JSON" ]; then
@@ -153,6 +213,16 @@ if [ -z "$DETAIL" ] && [ -n "$HOOK_JSON" ]; then
   fi
 fi
 
+# antigravity nests the tool name under `toolCall.name` and has no `tool_name`
+# at all (#1757 R3: its payload is camelCase protojson throughout). Only
+# consulted when the flat field produced nothing, so no other tool's payload can
+# reach it.
+if [ -z "$DETAIL" ] && [ -n "$HOOK_JSON" ]; then
+  case "$EVENT" in
+    pre_tool_use|post_tool_use) DETAIL="$(json_string_field "$HOOK_JSON" 'name')" ;;
+  esac
+fi
+
 [ -n "$TOOL" ] || die "--tool must not be empty"
 
 if [ -z "$CWD" ]; then

package/.next/server/chunks/6283.js

@@ -1 +0,0 @@
-"use strict";exports.id=6283,exports.ids=[6283],exports.modules={26283:(a,b,c)=>{c.d(b,{kT:()=>Y,aU:()=>j,l8:()=>K,hx:()=>n,XY:()=>L,F0:()=>aa,Fw:()=>ab,CX:()=>q,Dd:()=>y,pn:()=>z,gm:()=>r,Jn:()=>x,aW:()=>A,Du:()=>O,Mi:()=>R,J7:()=>S,wN:()=>C,kD:()=>I,uA:()=>F,sy:()=>E,Md:()=>H,LO:()=>J,sx:()=>N,fW:()=>B,KO:()=>ac,ut:()=>$,GT:()=>p,_X:()=>function a(b){switch(b){case"claude":return{promptPattern:n,separatorPattern:o,thinkingPattern:i,skipPatterns:[/^─{10,}$/,/^[>❯]\s*$/,i,/^\s*[⎿⏋]\s+Tip:/,/^\s*Tip:/,/^\s*\?\s*for shortcuts/,/to interrupt\)/,B]};case"codex":return{promptPattern:r,separatorPattern:w,thinkingPattern:k,skipPatterns:[/^─.*─+$/,/^›\s*$/,/^›\s+(Implement|Find and fix|Type)/,k,/^\s*\d+%\s+context left/,/^\s*for shortcuts$/,/╭─+╮/,/╰─+╯/,/•\s*Ran\s+/,/^\s*└/,/^\s*│/,/\(.*esc to interrupt\)/,B]};case"gemini":return{promptPattern:C,separatorPattern:/^[─━]{3,}$/m,thinkingPattern:D,skipPatterns:[C,D,/^\s*$/,/Gemini\s+\d+\.\d+/,B]};case"vibe-local":return{promptPattern:T,separatorPattern:/^[·]{10,}$/m,thinkingPattern:U,skipPatterns:[T,U,/^\s*$/,/vibe-local|vibe-coder/,/ctx:\s*\d+%/,/Model\s+\w/,/Engine\s+\w/,/Mode\s+/,/RAM\s+/,/CWD\s+/,/^[·]{10,}$/,/✦\s*Ready/,/ESC:\s*stop/,B]};case"opencode":return{promptPattern:E,separatorPattern:M,thinkingPattern:G,skipPatterns:[...N]};case"copilot":return{promptPattern:O,separatorPattern:Q,thinkingPattern:P,skipPatterns:[...S]};case"antigravity":return{promptPattern:V,separatorPattern:X,thinkingPattern:W,skipPatterns:[...Z]};default:return a("claude")}},Qh:()=>v,zZ:()=>u,DR:()=>m,aJ:()=>f,_A:()=>_});var d=c(72626);let e=/\x1b\[[0-9;]*[a-zA-Z]|\x1b\][^\x07]*\x07|\[[0-9;]*m/g;function f(a){return a.replace(e,"")}var g=c(46423);let h=(0,d.h)("cli-patterns"),i=RegExp(`[✻✽⏺\xb7∴✢✳✶⦿◉●○◌◎⊙⊚⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏]\\s+.+…|esc to interrupt`,"m"),j=/esc to interrupt/,k=/•\s*(Planning|Searching|Exploring|Running|Thinking|Working|Reading|Writing|Analyzing|Ran|Deciding)/m,l=/esc to interrupt/;function m(a,b){let c=f(a.slice(Math.max(0,a.length-b)).join("\n"));if(l.test(c))return!0;let d=-1;for(let b=a.length-1;b>=Math.max(0,a.length-8);b--)if(r.test(f(a[b]))){d=b;break}if(d<0)return k.test(c);let e=Math.max(0,d-g.$+1),h=f(a.slice(e,d+1).join("\n"));return k.test(h)}let n=/^[>❯](\s*$|\s+\S)/m,o=/^─{10,}$/m;function p(a){let b=a=>/^─{10,}$/.test(f(a).trimEnd()),c=a.length-1;for(;c>=0&&""===a[c].trim();)c--;if(c<0)return -1;let d=-1;for(let e=c;e>=Math.max(0,c-4);e--)if(b(a[e])){d=e;break}if(d<0)return -1;let e=-1;for(let c=d-1;c>=Math.max(0,d-40);c--)if(b(a[c])){e=c;break}return e<0||!/^[>❯]/.test(f(a[e+1]??""))?-1:Math.max(0,e-1)}let q=/Yes, I trust this folder/m,r=/^›\s*/m,s=/Skip until next version|Do you trust|Press enter to continue|^\s*›\s*\d+\.\s/m,t=/^\s*›(?!\s*\d+\.)/;function u(a){let b=a.split("\n"),c=-1,d=-1;for(let a=0;a<b.length;a++){let e=b[a];if(s.test(e)){c=a;continue}t.test(e)&&(d=a)}return d>=0&&d>c}function v(a){let b=a.split("\n"),c=-1;for(let a=b.length-1;a>=0;a--)if(t.test(b[a])){c=a;break}let d=b.slice(c+1).join("\n");return""===d?null:d.includes("Skip until next version")||d.includes("Update")&&d.includes("Skip")?"update":d.includes("Do you trust")?"trust":d.includes("Press enter to continue")?"press-enter":null}let w=/^─.*Worked for.*─+$/m,x=/press\s+enter\s+to\s+(?:confirm|select)/i,y=/esc\s+to\s+cancel/i,z=/(?:↑\/↓|pgup\/pgdn|home\/end)\s+to\s+(?:scroll|page|jump)|to\s+edit\s+(?:prev|next|message)/i,A=/^\s*\S.*·\s*~?\/\S*\s*$/,B=/\[Pasted text #\d+/,C=/^[>❯]\s*$|^\s*[>❯]\s+Type your message.*$/m,D=/[\u2800-\u28FF]|Thinking\.\.\./,E=/Ask anything\.\.\./,F=/tab agents\s+ctrl\+p commands/,G=/Thinking:/,H=/\u25A3\s+\w+\s+\u00b7\s+\S+(?:\s+\u00b7\s+(?:[\d]+h\s*)?(?:[\d]+m\s*)?[\d.]+s)?/,I=/esc interrupt/,J=/^\s*(Select\s+(model|provider)|Connect\s+a\s+provider)/m,K=/Enter\s+to\s+set\s+as\s+default\b/i,L=/Enter\s+to\s+(?:select\s+.*to\s+navigate|confirm\s+·\s+Esc|set\s+as\s+default)/,M=/^[\u2503\u2579\u25A3\u2580\u2500\u250C\u2510\u2514\u2518\u251C\u2524\u252C\u2534\u253C]+$/,N=[M,/\u2B1D{4,}/,/^Build\s+/,F,I,E,B],O=/^[>❯]\s|^\?\s+/m,P=/[\u2800-\u28FF]|\(Esc to cancel|Reasoning\s+[■▪▮]|\.\.\.\s+Thinking|Generating|Processing/,Q=/^─{10,}$/m,R=/Search\s+\w+\.\.\.|Select\s+Model|to (?:navigate|select).*Enter to (?:select|confirm)/m,S=[B,Q,P,R,/^GitHub Copilot\s+v/,/[█▘▝▖▗▔▄▌▐]/,/[╭╮╰╯│]/,/\[⎇\s+\w[^\]]*\]/,/^shift\+tab\s/,/^\?\s+for\s+shortcuts/,/^ctrl\+[a-z]\s+\w/,/^[❯>]\s*(Type\s+@|$)/,/^Tip:\s+\//,/^Describe a task to get started/,/^Copilot uses AI, so always check for mistakes\.$/,/^● 💡/,/^● Environment loaded:/],T=/ctx:\d+%\s*[>❯]/m,U=/[\u2800-\u28FF]|Thinking|⠋|⠙|⠹|⠸|⠼|⠴|⠦|⠧|⠇|⠏|Running|Executing/,V=/^>\s*$/m,W=/[\u2800-\u28FF]|Generating|esc to cancel/,X=/^─{3,}$/m,Y=/Switch Model|↑\/↓\s*Navigate/m,Z=[X,/^>\s*$/,/^\?\s+for\s+shortcuts/,W,/[▄▀█▌▐]/,B];function $(a,b){let c,d=h.withContext({cliToolId:a});switch(d.debug("detectThinking:check",{contentLength:b.length}),a){case"claude":default:c=i.test(b);break;case"codex":c=k.test(b);break;case"gemini":c=D.test(b);break;case"vibe-local":c=U.test(b);break;case"opencode":c=G.test(b);break;case"copilot":c=P.test(b);break;case"antigravity":c=W.test(b)}return d.debug("detectThinking:result",{isThinking:c}),c}function _(a){return a.split("\n").map(a=>/^[\u2502\u2503\u256D\u256E\u256F\u2570\u2500\u2579\u2580\u2588\s]+$/.test(a)?"":a.replace(/^\s*[\u2502\u2503]\s?/,"").replace(/\s*[\u2502\u2503\u2588]$/,"")).join("\n")}let aa=["Claude Code cannot be launched inside another Claude Code session"],ab=[/^Error:.*Claude Code/];function ac(a){if("claude"===a||"opencode"===a||"copilot"===a||"antigravity"===a)return{requireDefaultIndicator:!1}}},46423:(a,b,c)=>{c.d(b,{$:()=>d});let d=5}};