@cocorograph/hub-agent 0.8.44 → 0.8.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocorograph/hub-agent",
-  "version": "0.8.44",
+  "version": "0.8.45",
   "description": "Hub Hosted Cockpit のローカル常駐 agent。Hub と outbound WSS で接続し、ローカルの Claude / Codex チャットと tmux セッションを中継する。",
   "type": "module",
   "license": "UNLICENSED",

package/src/codex-stream-bridge.mjs

@@ -136,6 +136,14 @@ const STUCK_TURN_TTL_MS = readPositiveIntEnv(
   60 * 60 * 1000,
 )
 
+// 子 turn の停止 handle 台帳を回収できる最短 age（既定 4h）。通常は保護 TTL（既定 1h）を
+// 先に超えて protectionExpiredAtMs が立ち、その後も長時間 heartbeat が無い record だけを回収する。
+// つまり保護 TTL 直後には停止可能性を残し、台帳だけが永久化することも避ける。設定で保護 TTL を
+// 4h 以上へ延ばした場合も、protectionExpiredAtMs が立つまでは active handle を回収しない。
+const SUBAGENT_INTERRUPT_RECORD_TTL_MS = 4 * 60 * 60 * 1000
+/** 個別停止中に後発 descendant を拾う再走査回数。無制限 spawn に応答を占有されない上限。 */
+const SUBAGENT_INTERRUPT_SCAN_ROUNDS = 3
+
 // 案B (T06542): 死端末 GC の TTL。多端末購読で、応答を返さなくなった（クラッシュ / タブ強制終了で
 // codex.detach を送れなかった）購読端末を購読集合から掃除する閾値。claude-stream-bridge.mjs の
 // DEAD_TERMINAL_TTL_MS（既定 1h）と同型・同既定。stuck turn TTL とは別軸（あちらはターン固着、
@@ -774,6 +782,8 @@ export class CodexStreamBridge extends EventEmitter {
       subagentInterruptRegistry: new Map(),
       /** dynamicToolCall(spawn_agent) の item.id -> 表示メタデータ。 */
       subagentSpawnMetadata: new Map(),
+      /** invalid background の同一 item 再送で warn を重複させない bounded set。 */
+      subagentInvalidBackgroundWarned: new Set(),
       /** live subAgentActivity の spawn metadata miss を child thread/read で補完する
        * single-flight 台帳。key = agentThreadId, value = 進行中 Promise。 */
       subagentRoleReads: new Map(),
@@ -1668,8 +1678,12 @@ export class CodexStreamBridge extends EventEmitter {
       description:
         metadata?.description || previous?.description || subagentFallbackName(agentPath),
       prompt: metadata?.prompt || previous?.prompt || "",
-      // background は spawn 時に確定する属性。後続通知に metadata が無くても true を失わない。
-      background: metadata?.background === true || previous?.background === true,
+      // metadata に明示 boolean があるときは後着値を権威とする。metadata miss は spawn の
+      // background 省略既定と同じ true に倒し、明示 false だけが訂正する。
+      background:
+        typeof metadata?.background === "boolean"
+          ? metadata.background
+          : previous?.background ?? true,
       atMs: transitionAtMs,
       startedAtMs:
         phase === "started" && terminalSubagentPhase(previous?.phase)
@@ -1791,12 +1805,35 @@ export class CodexStreamBridge extends EventEmitter {
       if (!args) return
       const agent = typeof args.agent_type === "string" ? args.agent_type.trim() : ""
       const agentExplicit = agent.length > 0
+      // 現行 Codex schema は background を送らず spawn は非同期で返るため、省略・非 boolean は
+      // 背景扱いにする。invalid 値は本文を永続ログへ出さず、型と item id だけを記録する。
+      const hasBackground = Object.prototype.hasOwnProperty.call(args, "background")
+      const background = typeof args.background === "boolean" ? args.background : true
+      if (hasBackground && typeof args.background !== "boolean") {
+        if (!session.subagentInvalidBackgroundWarned.has(item.id)) {
+          session.subagentInvalidBackgroundWarned.add(item.id)
+          while (session.subagentInvalidBackgroundWarned.size > 256) {
+            session.subagentInvalidBackgroundWarned.delete(
+              session.subagentInvalidBackgroundWarned.values().next().value,
+            )
+          }
+          const backgroundType = Array.isArray(args.background)
+            ? "array"
+            : args.background === null
+              ? "null"
+              : typeof args.background
+          this.logger?.warn?.(
+            { item_id: item.id, background_type: backgroundType },
+            "codex subagent spawn background must be boolean; defaulting to background",
+          )
+        }
+      }
       const metadata = {
         agent: agentExplicit ? agent : null,
         agentExplicit,
         description: typeof args.task_name === "string" && args.task_name ? args.task_name : null,
         prompt: typeof args.message === "string" ? args.message : null,
-        background: args.background === true,
+        background,
       }
       session.subagentSpawnMetadata.set(item.id, metadata)
       while (session.subagentSpawnMetadata.size > 256) {
@@ -1892,32 +1929,52 @@ export class CodexStreamBridge extends EventEmitter {
     }
     const { parentThreadId, ownerTurnId, ...mutableFields } = fields
     Object.assign(record, mutableFields, { lastSeenAtMs: now })
+    delete record.protectionExpiredAtMs
     if (!record.parentThreadId && typeof parentThreadId === "string" && parentThreadId) {
       record.parentThreadId = parentThreadId
     }
     if (!record.ownerTurnId && typeof ownerTurnId === "string" && ownerTurnId) {
       record.ownerTurnId = ownerTurnId
     }
-    const expiredBefore = now - 4 * 60 * 60 * 1000
+    this._sweepSubagentInterruptRegistry(session, now)
+    return record
+  }
+
+  /** delta hot path。対象 record だけを更新し、全台帳 sweep/sort は行わない。 */
+  _heartbeatSubagentInterruptRecord(session, threadId, now = Date.now()) {
+    const record = session?.subagentInterruptRegistry?.get(threadId)
+    if (!record) return null
+    record.lastSeenAtMs = now
+    delete record.protectionExpiredAtMs
+    return record
+  }
+
+  /** lifecycle 更新時だけ、完了済みまたは保護失効済みの古い停止 record と上限超過を回収する。 */
+  _sweepSubagentInterruptRegistry(session, now = Date.now()) {
+    const registry = session?.subagentInterruptRegistry
+    if (!registry) return
+    const expiredBefore = now - SUBAGENT_INTERRUPT_RECORD_TTL_MS
     for (const [id, candidate] of session.subagentInterruptRegistry) {
-      if (candidate.turnId === null && candidate.lastSeenAtMs < expiredBefore) {
+      const evictable = candidate.turnId === null || candidate.protectionExpiredAtMs !== undefined
+      if (evictable && candidate.lastSeenAtMs < expiredBefore) {
         this._evictSubagentInterruptRecord(session, id, candidate)
       }
     }
-    while (session.subagentInterruptRegistry.size > 256) {
-      const oldest = [...session.subagentInterruptRegistry.entries()]
-        .filter(([, candidate]) => candidate.turnId === null)
+    while (registry.size > 256) {
+      const oldest = [...registry.entries()]
+        .filter(([, candidate]) => (
+          candidate.turnId === null || candidate.protectionExpiredAtMs !== undefined
+        ))
         .sort((a, b) => a[1].lastSeenAtMs - b[1].lastSeenAtMs)[0]
       if (!oldest) {
         this.logger?.warn?.(
-          { size: session.subagentInterruptRegistry.size, limit: 256 },
+          { size: registry.size, limit: 256 },
           "codex subagent interrupt registry exceeds limit with all records active",
         )
         break
       }
       this._evictSubagentInterruptRecord(session, oldest[0], oldest[1])
     }
-    return record
   }
 
   _evictSubagentInterruptRecord(session, threadId, record) {
@@ -1927,25 +1984,50 @@ export class CodexStreamBridge extends EventEmitter {
     session.subagentInterruptRegistry.delete(threadId)
   }
 
+  /**
+   * 子 record から root までの所有チェーンを辿る。cycle は呼び出し側が停止対象から除外する。
+   * @returns {{ownerRootTurnId:string|null, hasBackgroundAncestor:boolean, lineage:string[], cycle:boolean}}
+   */
   _subagentOwnership(session, record) {
     const visited = new Set()
+    const lineage = []
     let current = record
     let hasBackgroundAncestor = false
     while (current) {
-      if (visited.has(current.threadId)) return { ownerRootTurnId: null, hasBackgroundAncestor }
+      if (visited.has(current.threadId)) {
+        return { ownerRootTurnId: null, hasBackgroundAncestor, lineage, cycle: true }
+      }
       visited.add(current.threadId)
+      lineage.push(current.threadId)
+      // background は表示台帳の省略既定を含む。親チェーン上の背景 root を一度検出したら、
+      // capability 対応 browser の root interrupt では部分木全体を残す。
       if (session.subagents.get(current.threadId)?.background === true) {
         hasBackgroundAncestor = true
       }
       if (current.parentThreadId === session.threadId) {
-        return { ownerRootTurnId: current.ownerTurnId || null, hasBackgroundAncestor }
+        return {
+          ownerRootTurnId: current.ownerTurnId || null,
+          hasBackgroundAncestor,
+          lineage,
+          cycle: false,
+        }
       }
       current = session.subagentInterruptRegistry.get(current.parentThreadId)
     }
-    return { ownerRootTurnId: null, hasBackgroundAncestor }
+    return { ownerRootTurnId: null, hasBackgroundAncestor, lineage, cycle: false }
   }
 
-  async _interruptSubagent(session, record, targetRootTurnId) {
+  async _interruptSubagent(
+    session,
+    record,
+    targetRootTurnId,
+    {
+      allowBackground = false,
+      requireRootOwnership = true,
+      expectedDelegationId = null,
+      expectedAncestorThreadId = null,
+    } = {},
+  ) {
     const displayed = session.subagents.get(record.threadId)
     const backgroundKnown = displayed ? typeof displayed.background === "boolean" : false
     const background = backgroundKnown ? displayed.background : null
@@ -1957,11 +2039,21 @@ export class CodexStreamBridge extends EventEmitter {
       const mismatch = parseTurnMismatch(reason)
       const latestRecord = session.subagentInterruptRegistry.get(record.threadId)
       const latestOwnership = latestRecord ? this._subagentOwnership(session, latestRecord) : null
+      const latestDisplayed = session.subagents.get(record.threadId)
+      const lineageStillMatches = !expectedAncestorThreadId || (
+        latestOwnership &&
+        !latestOwnership.cycle &&
+        latestOwnership.lineage.includes(expectedAncestorThreadId)
+      )
       if (
         mismatch &&
         latestRecord?.turnId === mismatch.found &&
-        latestOwnership?.ownerRootTurnId === targetRootTurnId &&
-        !latestOwnership.hasBackgroundAncestor
+        (!expectedDelegationId || latestDisplayed?.delegationId === expectedDelegationId) &&
+        lineageStillMatches &&
+        (!requireRootOwnership || (
+          latestOwnership?.ownerRootTurnId === targetRootTurnId &&
+          (allowBackground || !latestOwnership.hasBackgroundAncestor)
+        ))
       ) {
         try {
           await session.client.request("turn/interrupt", {
@@ -1986,6 +2078,15 @@ export class CodexStreamBridge extends EventEmitter {
           }
         }
       }
+      if (mismatch && latestRecord?.turnId === mismatch.found && !lineageStillMatches) {
+        this.logger?.warn?.(
+          {
+            thread_id: record.threadId,
+            expected_ancestor_thread_id: expectedAncestorThreadId,
+          },
+          "codex subagent interrupt retry skipped after ownership changed",
+        )
+      }
       return {
         threadId: record.threadId,
         turnId: record.turnId,
@@ -1997,6 +2098,111 @@ export class CodexStreamBridge extends EventEmitter {
     }
   }
 
+  /**
+   * 対象子と active descendants を停止する。対象 RPC 待ちや子停止中に増えた descendant も
+   * 最大3ラウンド再走査する。上限後の未処理 active turn は skipped へ明示し、無限 spawn に
+   * WebSocket 応答を占有されないようにする。
+   * @returns {Promise<object>} targetOutcome/targetReason は対象自身、outcome は部分木全体の結果。
+   */
+  async interruptSubagent({ stream_id, delegation_id, agent_thread_id }) {
+    const session = this._require(stream_id)
+    this._touch(session, stream_id)
+    const displayed = session.subagents.get(agent_thread_id)
+    if (!displayed || displayed.delegationId !== delegation_id) {
+      return { outcome: "failed", reason: "subagent_not_found", children: [], skipped: [] }
+    }
+    const record = session.subagentInterruptRegistry.get(agent_thread_id)
+    const result = record?.turnId
+      ? await this._interruptSubagent(session, { ...record }, null, {
+          allowBackground: true,
+          requireRootOwnership: false,
+          expectedDelegationId: delegation_id,
+        })
+      : { outcome: "no_active_turn", reason: "subagent_not_active" }
+    const children = []
+    const processedTurns = new Set()
+    const warnedCycleThreads = new Set()
+    const turnKey = (candidate) => `${candidate.threadId}\u0000${candidate.turnId}`
+    const activeDescendants = () => [...session.subagentInterruptRegistry.values()]
+      .filter((candidate) => {
+        if (!candidate?.turnId || candidate.threadId === agent_thread_id) return false
+        const ownership = this._subagentOwnership(session, candidate)
+        if (ownership.cycle) {
+          if (!warnedCycleThreads.has(candidate.threadId)) {
+            warnedCycleThreads.add(candidate.threadId)
+            this.logger?.warn?.(
+              { thread_id: candidate.threadId },
+              "codex subagent descendant skipped because ownership chain is cyclic",
+            )
+          }
+          return false
+        }
+        return ownership.lineage.includes(agent_thread_id)
+      })
+
+    for (let round = 0; round < SUBAGENT_INTERRUPT_SCAN_ROUNDS; round += 1) {
+      const descendants = activeDescendants()
+        .filter((candidate) => !processedTurns.has(turnKey(candidate)))
+        .map((candidate) => ({ ...candidate }))
+      if (descendants.length === 0) break
+      for (const descendant of descendants) {
+        const key = turnKey(descendant)
+        // 同じ round の先行 RPC 待ち中にも lineage/turn は動き得るため、送信直前にも live 台帳で確認する。
+        const current = session.subagentInterruptRegistry.get(descendant.threadId)
+        const ownership = current ? this._subagentOwnership(session, current) : null
+        if (
+          !current?.turnId ||
+          current.turnId !== descendant.turnId ||
+          ownership?.cycle ||
+          !ownership?.lineage.includes(agent_thread_id)
+        ) {
+          this.logger?.warn?.(
+            { thread_id: descendant.threadId, round: round + 1 },
+            "codex subagent descendant skipped after ownership changed before interrupt",
+          )
+          continue
+        }
+        processedTurns.add(key)
+        const childResult = await this._interruptSubagent(session, { ...current }, null, {
+          allowBackground: true,
+          requireRootOwnership: false,
+          expectedAncestorThreadId: agent_thread_id,
+        })
+        children.push(childResult)
+        if (childResult?.threadId && childResult?.turnId) {
+          processedTurns.add(turnKey(childResult))
+        }
+      }
+    }
+    const targetOutcome = result.outcome
+    const descendantInterrupted = children.some((child) => child.outcome === "interrupted")
+    const outcome =
+      targetOutcome === "no_active_turn" && descendantInterrupted
+        ? "interrupted"
+        : targetOutcome
+    const response = {
+      ...result,
+      outcome,
+      targetOutcome,
+      delegationId: displayed.delegationId,
+      agentThreadId: displayed.agentThreadId,
+      children,
+      skipped: activeDescendants()
+        .filter((candidate) => !processedTurns.has(turnKey(candidate)))
+        .map((candidate) => ({
+          threadId: candidate.threadId,
+          turnId: candidate.turnId,
+          reason: "spawned_during_interrupt",
+        })),
+    }
+    // 部分木として成功した応答に failure 用 reason を残さない。対象単体の理由は別軸で保持する。
+    if (outcome === "interrupted" && result.reason) {
+      delete response.reason
+      response.targetReason = result.reason
+    }
+    return response
+  }
+
   _subagentSnapshots(session, history = session?.historyItems) {
     const items = Array.isArray(history) ? history : []
     const startedIndexByThread = new Map()
@@ -2077,21 +2283,47 @@ export class CodexStreamBridge extends EventEmitter {
               { agentPath: record.agentPath, metadata, atMs: lastTurnAtMs },
               { emit: false },
             )
-          } else if (
-            thread?.status?.type === "active" &&
-            (!lastTurn || lastTurn.status === "inProgress")
-          ) {
-            this._setSubagentPhase(
-              session,
-              record.agentThreadId,
-              "started",
-              {
-                agentPath: record.agentPath,
-                metadata,
-                atMs: record.startedAtMs,
-              },
-              { emit: false },
-            )
+          } else if (thread?.status?.type === "active") {
+            if (
+              lastTurn?.status === "inProgress" &&
+              typeof lastTurn.id === "string" &&
+              lastTurn.id
+            ) {
+              this._setSubagentPhase(
+                session,
+                record.agentThreadId,
+                "started",
+                {
+                  agentPath: record.agentPath,
+                  metadata,
+                  atMs: record.startedAtMs,
+                },
+                { emit: false },
+              )
+              this._touchSubagentInterruptRecord(session, record.agentThreadId, {
+                turnId: lastTurn.id,
+                startedAtMs: lastTurnAtMs,
+              })
+            } else {
+              // active 表示なのに停止 RPC に必要な turn ID が無い。running と表示すると停止可能な
+              // capability を偽るため、cold snapshot は正直な terminal へ倒す。
+              this._setSubagentPhase(
+                session,
+                record.agentThreadId,
+                "failed",
+                { agentPath: record.agentPath, metadata, atMs: lastTurnAtMs },
+                { emit: false },
+              )
+              this.logger?.warn?.(
+                {
+                  thread_id: session.threadId,
+                  subagent_thread_id: record.agentThreadId,
+                  child_status: thread?.status?.type || null,
+                  last_turn_status: lastTurn?.status || null,
+                },
+                "codex active subagent resume lacked an interruptible turn id; marked failed",
+              )
+            }
           } else {
             session.subagents.delete(record.agentThreadId)
           }
@@ -2168,6 +2400,14 @@ export class CodexStreamBridge extends EventEmitter {
     // ※ hub-agent 再起動 (cold resume) では historyItems が揮発するため青バブルへ戻る (claude の
     //    jsonl at-rest と同じ許容範囲。source 永続マップは TTL/ID 再利用の複雑さに見合わないため不採用)。
     const eventThreadId = msg?.params?.threadId
+    if (
+      typeof eventThreadId === "string" &&
+      eventThreadId !== session.threadId &&
+      session.subagentInterruptRegistry.has(eventThreadId)
+    ) {
+      // lifecycle 以外の message/reasoning/tool delta も子 turn の生存証跡。root 通知は更新しない。
+      this._heartbeatSubagentInterruptRecord(session, eventThreadId)
+    }
     const taggedParams = this._tagInjectSourceOnItem(session, msg)
     let effectiveParams = taggedParams || msg.params
     const childRecord =
@@ -2350,6 +2590,7 @@ export class CodexStreamBridge extends EventEmitter {
 
   _onClientExit(session, info) {
     if (session.dead) return
+    this._markRunningSubagentsKilled(session)
     session.dead = true
     // round3: app-server が死んだら barrier を解除し queue を reject する（promise 宙吊り防止）。
     this._settleTurnActiveWaiter(session)
@@ -2614,15 +2855,17 @@ export class CodexStreamBridge extends EventEmitter {
 
   /**
    * @returns {Promise<
-   *   | { outcome: "interrupted", turnId: string, corrected: boolean }
-   *   | { outcome: "no_active_turn" }
-   *   | { outcome: "failed", reason: string }
+   *   ({children: object[], skipped: object[]} & (
+   *     | { outcome: "interrupted", turnId: string, corrected: boolean }
+   *     | { outcome: "no_active_turn" }
+   *     | { outcome: "failed", reason: string }
+   *   ))
    * >}
    */
-  async interrupt({ stream_id }) {
+  async interrupt({ stream_id, preserve_background_subagents = false }) {
     const session = this._require(stream_id)
     this._touch(session, stream_id)
-    if (!session.activeTurnId) return { outcome: "no_active_turn", children: [] }
+    if (!session.activeTurnId) return { outcome: "no_active_turn", children: [], skipped: [] }
 
     const turnId = session.activeTurnId
     let attemptedRootTurnId = turnId
@@ -2665,13 +2908,35 @@ export class CodexStreamBridge extends EventEmitter {
     const children = []
     const targetRootTurnId = attemptedRootTurnId
     const interruptSnapshot = [...session.subagentInterruptRegistry.values()].map((record) => ({ ...record }))
+    // skipped は「今回の owner turn の停止候補」ではなく、応答時点で実際に継続中の
+    // root 直下 background 一覧。frontend の「継続中」表示と一致させるため owner に依存しない。
+    const skipped = preserve_background_subagents === true
+      ? interruptSnapshot.flatMap((record) => {
+          const displayed = session.subagents.get(record.threadId)
+          if (
+            !record.turnId ||
+            record.parentThreadId !== session.threadId ||
+            displayed?.background !== true
+          ) return []
+          return [{
+            threadId: record.threadId,
+            delegationId: displayed.delegationId,
+            reason: "background",
+          }]
+        })
+      : []
     for (const record of interruptSnapshot) {
       if (!record.turnId) continue
       const ownership = this._subagentOwnership(session, record)
-      if (ownership.ownerRootTurnId !== targetRootTurnId || ownership.hasBackgroundAncestor) continue
-      children.push(await this._interruptSubagent(session, { ...record }, targetRootTurnId))
+      if (preserve_background_subagents === true && ownership.hasBackgroundAncestor) {
+        continue
+      }
+      if (ownership.ownerRootTurnId !== targetRootTurnId) continue
+      children.push(await this._interruptSubagent(session, { ...record }, targetRootTurnId, {
+        allowBackground: preserve_background_subagents !== true,
+      }))
     }
-    return { ...result, children }
+    return { ...result, children, skipped }
   }
 
   /** サーバー発の承認/入力要求への応答。result の shape は method ごとに呼び出し側が組み立てる。 */
@@ -3298,13 +3563,57 @@ export class CodexStreamBridge extends EventEmitter {
     // ⚠️ activeTurnId の判定より **前** に置くこと。背景コマンドが残るのは turn/completed の
     //    後（= activeTurnId が null に戻った後）なので、下の early return を通すと届かない。
     if (this._hasLiveExec(session, now)) return true
+    if (this._hasLiveSubagentTurn(session, now)) return true
     if (!session.activeTurnId) return false
     return now - (session.lastActivityMs ?? now) <= this._stuckTurnTtlMs
   }
 
+  _hasLiveSubagentTurn(session, now = Date.now()) {
+    const registry = session?.subagentInterruptRegistry
+    if (!registry || registry.size === 0) return false
+    let active = false
+    for (const record of registry.values()) {
+      if (!record?.turnId) continue
+      const elapsed = now - (record.lastSeenAtMs ?? 0)
+      if (elapsed <= this._stuckTurnTtlMs) {
+        active = true
+        continue
+      }
+      // TTL は warm-session 保護だけを失効させる。停止 RPC に必要な turnId は破壊しない。
+      // 長時間無出力の正常な子でも、明示停止を受けたときに同じ handle を利用できるようにする。
+      if (record.protectionExpiredAtMs === undefined) {
+        record.protectionExpiredAtMs = now
+        this.logger?.warn?.(
+          {
+            stream_id: session.stream_id,
+            thread_id: record.threadId,
+            turn_id: record.turnId,
+            elapsed_ms: elapsed,
+            ttl_ms: this._stuckTurnTtlMs,
+          },
+          "codex subagent turn protection expired",
+        )
+      }
+    }
+    return active
+  }
+
+  _markRunningSubagentsKilled(session, atMs = Date.now()) {
+    for (const record of session?.subagents?.values?.() || []) {
+      if (record.phase !== "started") continue
+      this._setSubagentPhase(
+        session,
+        record.agentThreadId,
+        "killed",
+        { agentPath: record.agentPath, atMs },
+      )
+    }
+  }
+
   /** 実際に app-server を止めてセッションを撤去し exit を emit する（reconcile 共通処理）。 */
   _reapSession(session, now, reason) {
     if (session.dead) return
+    this._markRunningSubagentsKilled(session, now)
     session.dead = true
     // round3: reap した session の barrier を解除し queue を reject する（promise 宙吊り防止）。
     this._settleTurnActiveWaiter(session)
@@ -3492,6 +3801,7 @@ export class CodexStreamBridge extends EventEmitter {
   shutdown() {
     // 案B: distinct session で走査（多対一 Map の重複 stop を避ける）。
     for (const session of this._liveSessions()) {
+      this._markRunningSubagentsKilled(session)
       session.dead = true
       // round3: shutdown で barrier を解除し queue 入力を reject（promise 宙吊り防止）。
       this._settleTurnActiveWaiter(session)

package/src/main.mjs

@@ -2123,6 +2123,9 @@ export function buildCodexReadyPayload(streamId, info, queueState) {
     thread_status: info?.threadStatus || null,
     last_turn_status: info?.lastTurnStatus || null,
     queue_state: queueState,
+    // Browser は旧 hub-agent との混在期間、この明示 capability が true のときだけ
+    // 子 thread の個別停止 UI を有効化する。省略は未対応を意味する。
+    supports_subagent_interrupt: true,
   }
   if (Array.isArray(info?.subagents)) {
     payload.subagents = info.subagents.map((subagent) => ({
@@ -3249,26 +3252,69 @@ export function handleCodexChatInput(msg, ctx) {
   return p
 }
 
+/**
+ * codex.interrupt を root / individual へ振り分ける。
+ * - delegation_id と agent_thread_id が非空文字列なら individual（request_id 必須・echo する）
+ * - 両 ID が欠落または null なら root（現 frontend 契約。request_id は相関に使わず常に null）
+ * - 片方だけ、または非 null の不正値が混ざれば individual ID validation error
+ */
 export async function handleCodexInterrupt(msg, ctx) {
   let result
-  if (!ctx.codexBridge) {
-    result = { outcome: "failed", reason: "bridge_unavailable", children: [] }
+  const hasDelegationId = typeof msg.delegation_id === "string" && msg.delegation_id.length > 0
+  const hasAgentThreadId = typeof msg.agent_thread_id === "string" && msg.agent_thread_id.length > 0
+  const hasEitherId = msg.delegation_id != null || msg.agent_thread_id != null
+  const isSubagentInterrupt = hasDelegationId && hasAgentThreadId
+  const hasRequestId = typeof msg.request_id === "string" && msg.request_id.length > 0
+  if (hasEitherId && !(hasDelegationId && hasAgentThreadId)) {
+    result = { outcome: "failed", reason: "invalid_subagent_interrupt_ids", children: [], skipped: [] }
+  } else if (isSubagentInterrupt && !hasRequestId) {
+    result = { outcome: "failed", reason: "invalid_subagent_interrupt_request_id", children: [], skipped: [] }
+  } else if (!ctx.codexBridge) {
+    result = { outcome: "failed", reason: "bridge_unavailable", children: [], skipped: [] }
   } else {
     try {
-      result = await ctx.codexBridge.interrupt({ stream_id: msg.stream_id })
-      if (result.outcome === "failed") {
+      const bridgeResult = hasDelegationId
+        ? await ctx.codexBridge.interruptSubagent({
+            stream_id: msg.stream_id,
+            delegation_id: msg.delegation_id,
+            agent_thread_id: msg.agent_thread_id,
+          })
+        : await ctx.codexBridge.interrupt({
+            stream_id: msg.stream_id,
+            preserve_background_subagents: msg.preserve_background_subagents === true,
+          })
+      const validOutcome = ["interrupted", "failed", "no_active_turn"].includes(
+        bridgeResult?.outcome,
+      )
+      if (!bridgeResult || typeof bridgeResult !== "object" || Array.isArray(bridgeResult) || !validOutcome) {
+        ctx.logger?.warn?.(
+          {
+            bridge_result_type: Array.isArray(bridgeResult) ? "array" : typeof bridgeResult,
+            bridge_outcome: typeof bridgeResult?.outcome === "string" ? bridgeResult.outcome : null,
+          },
+          "codex.interrupt bridge returned an invalid result",
+        )
+        result = { outcome: "failed", reason: "invalid_bridge_result", children: [], skipped: [] }
+      } else {
+        result = {
+          ...bridgeResult,
+          children: Array.isArray(bridgeResult.children) ? bridgeResult.children : [],
+          skipped: Array.isArray(bridgeResult.skipped) ? bridgeResult.skipped : [],
+        }
+      }
+      if (result.outcome === "failed" && result.reason !== "invalid_bridge_result") {
         ctx.logger?.warn?.({ err: result.reason }, "codex.interrupt failed")
       }
     } catch (err) {
       const reason = err?.message || String(err)
       ctx.logger?.warn?.({ err: reason }, "codex.interrupt failed")
-      result = { outcome: "failed", reason, children: [] }
+      result = { outcome: "failed", reason, children: [], skipped: [] }
     }
   }
   ctx.client.send({
     type: "codex.interrupt.response",
     stream_id: msg.stream_id,
-    request_id: msg.request_id ?? null,
+    request_id: isSubagentInterrupt && hasRequestId ? msg.request_id : null,
     ...result,
   })
 }