@cocorograph/hub-agent 0.8.48 → 0.8.50

package/src/codex-stream-bridge.mjs

@@ -47,6 +47,17 @@ import { recordInjectSourcePersistent } from "./inject-source-store.mjs"
 
 import { AsyncTtlCache } from "./async-ttl-cache.mjs"
 import { CodexAppServerClient } from "./codex-appserver-client.mjs"
+import {
+  buildCodexArtifactTemplatePickerConfig,
+  preflightCodexArtifactTemplatePicker,
+} from "./codex-artifact-template-picker.mjs"
+import {
+  codexDynamicToolFailure,
+  createCodexDynamicToolExecutor,
+  sanitizeCodexDynamicErrorCode,
+  sanitizeCodexDynamicToolName,
+} from "./codex-dynamic-tools.mjs"
+import { resolveCodexWorkspaceDependencies } from "./codex-workspace-dependencies.mjs"
 import {
   snapshotCodexDeliveryAudit,
   verifyCodexDeliveryAudit,
@@ -61,6 +72,120 @@ function parseTurnMismatch(reason) {
   return mismatch ? { expected: mismatch[1], found: mismatch[2] } : null
 }
 
+function codexHostCapabilityErrorCode(error, fallback) {
+  return sanitizeCodexDynamicErrorCode(error?.code, fallback)
+}
+
+function flattenCodexSkillsList(result) {
+  if (!result || !Array.isArray(result.data)) {
+    const error = new Error("invalid skills/list response")
+    error.code = "CODEX_SKILLS_LIST_RESPONSE_INVALID"
+    throw error
+  }
+  const skills = []
+  for (const entry of result.data) {
+    if (!entry || !Array.isArray(entry.skills)) {
+      const error = new Error("invalid skills/list response")
+      error.code = "CODEX_SKILLS_LIST_RESPONSE_INVALID"
+      throw error
+    }
+    // SkillMetadata は Codex が正本。未知 field を選別・再構築せず、そのまま picker へ渡す。
+    skills.push(...entry.skills)
+  }
+  return skills
+}
+
+function deadlineError(code) {
+  const error = new Error(code)
+  error.code = code
+  return error
+}
+
+async function withDeadline(promise, timeoutMs, code) {
+  let timer
+  const timeout = new Promise((_, reject) => {
+    timer = setTimeout(() => reject(deadlineError(code)), timeoutMs)
+    timer.unref?.()
+  })
+  try {
+    return await Promise.race([Promise.resolve(promise), timeout])
+  } finally {
+    clearTimeout(timer)
+  }
+}
+
+async function buildCodexHostCapabilities({
+  client,
+  cwd,
+  artifactTemplatePickerConfigBuilder,
+  artifactTemplatePickerPreflight,
+  resolveWorkspaceDependencies,
+}) {
+  let preflight
+  try {
+    preflight = await artifactTemplatePickerPreflight()
+  } catch (error) {
+    return {
+      config: null,
+      warning: {
+        error_code: codexHostCapabilityErrorCode(
+          error,
+          "CODEX_ARTIFACT_TEMPLATE_PICKER_PREFLIGHT_FAILED",
+        ),
+        skill_count: 0,
+      },
+    }
+  }
+  let skills
+  try {
+    skills = flattenCodexSkillsList(await client.request("skills/list", { cwds: [cwd] }))
+  } catch (error) {
+    return {
+      config: null,
+      warning: {
+        error_code: codexHostCapabilityErrorCode(error, "CODEX_SKILLS_LIST_FAILED"),
+        skill_count: 0,
+      },
+    }
+  }
+
+  const diagnosticCounts = new Map()
+  try {
+    const config = await artifactTemplatePickerConfigBuilder({
+      skills,
+      preflight,
+      resolveWorkspaceDependencies,
+      onDiagnostic: (item) => {
+        const code = codexHostCapabilityErrorCode(
+          item,
+          "CODEX_ARTIFACT_TEMPLATE_PICKER_DIAGNOSTIC",
+        )
+        diagnosticCounts.set(code, (diagnosticCounts.get(code) || 0) + 1)
+      },
+    })
+    return {
+      config: config && typeof config === "object" && !Array.isArray(config) ? config : null,
+      warning: diagnosticCounts.size > 0
+        ? { diagnostic_counts: Object.fromEntries(diagnosticCounts), skill_count: skills.length }
+        : null,
+    }
+  } catch (error) {
+    return {
+      config: null,
+      warning: {
+        error_code: codexHostCapabilityErrorCode(
+          error,
+          "CODEX_ARTIFACT_TEMPLATE_PICKER_CONFIG_FAILED",
+        ),
+        ...(diagnosticCounts.size > 0
+          ? { diagnostic_counts: Object.fromEntries(diagnosticCounts) }
+          : {}),
+        skill_count: skills.length,
+      },
+    }
+  }
+}
+
 /**
  * sibling-inject (2026-07-04) 用: spawn する codex app-server プロセス自身の
  * 環境変数に、この cwd の capability トークンを乗せる。ディスクには書かず、
@@ -209,6 +334,24 @@ const DELIVERY_ECHO_TIMEOUT_MS = readPositiveIntEnv(
 )
 
 const CLIENT_INFO = { name: "cockpit-hub-agent", title: "Cockpit", version: "1.0.0" }
+const WORKSPACE_DEPENDENCIES_CACHE_TTL_MS = 30_000
+const WORKSPACE_DEPENDENCIES_FAILURE_TTL_MS = readPositiveIntEnv(
+  "HUB_AGENT_CODEX_WORKSPACE_DEPENDENCIES_FAILURE_TTL_MS",
+  30_000,
+)
+const WORKSPACE_DEPENDENCIES_DEADLINE_MS = readPositiveIntEnv(
+  "HUB_AGENT_CODEX_WORKSPACE_DEPENDENCIES_DEADLINE_MS",
+  45_000,
+)
+const HOST_CAPABILITIES_DEADLINE_MS = readPositiveIntEnv(
+  "HUB_AGENT_CODEX_HOST_CAPABILITIES_DEADLINE_MS",
+  10_000,
+)
+const FORM_ELICITATION_TIMEOUT_MS = readPositiveIntEnv(
+  "HUB_AGENT_CODEX_FORM_ELICITATION_TIMEOUT_MS",
+  10 * 60_000,
+)
+const DYNAMIC_TOOL_REQUEST_LEDGER_MAX = 256
 
 // T06499 (2026-07-18): 巨大スレッドの resume ガード。長期運用したスレッドの rollout は
 // 20MB 超まで肥大し得る (実測: メイン repo 540KB が正常なのに対し 20MB のスレッドあり)。
@@ -466,11 +609,80 @@ export class CodexStreamBridge extends EventEmitter {
     historyMaxBytes,
     listThreadsCacheTtlMs,
     accountRateLimitsCacheTtlMs,
+    workspaceDependenciesCacheTtlMs,
+    workspaceDependenciesFailureTtlMs,
+    workspaceDependenciesDeadlineMs,
+    hostCapabilitiesDeadlineMs,
+    formElicitationTimeoutMs,
+    resolveWorkspaceDependencies,
+    dynamicToolExecutorFactory,
+    artifactTemplatePickerConfigBuilder,
+    artifactTemplatePickerPreflight,
   } = {}) {
     super()
     this.codexCmd = codexCmd
     this.logger = logger
     this._clientFactory = clientFactory || ((opts) => new CodexAppServerClient(opts))
+    const uncachedWorkspaceDependencies = resolveWorkspaceDependencies || resolveCodexWorkspaceDependencies
+    this._workspaceDependenciesCacheTtlMs = sanitizePositiveInt(
+      workspaceDependenciesCacheTtlMs,
+      WORKSPACE_DEPENDENCIES_CACHE_TTL_MS,
+      { logger: this.logger, label: "codex.workspaceDependenciesCacheTtlMs" },
+    )
+    this._workspaceDependenciesFailureTtlMs = sanitizePositiveInt(
+      workspaceDependenciesFailureTtlMs,
+      WORKSPACE_DEPENDENCIES_FAILURE_TTL_MS,
+      { logger: this.logger, label: "codex.workspaceDependenciesFailureTtlMs" },
+    )
+    this._workspaceDependenciesDeadlineMs = sanitizePositiveInt(
+      workspaceDependenciesDeadlineMs,
+      WORKSPACE_DEPENDENCIES_DEADLINE_MS,
+      { logger: this.logger, label: "codex.workspaceDependenciesDeadlineMs" },
+    )
+    this._hostCapabilitiesDeadlineMs = sanitizePositiveInt(
+      hostCapabilitiesDeadlineMs,
+      HOST_CAPABILITIES_DEADLINE_MS,
+      { logger: this.logger, label: "codex.hostCapabilitiesDeadlineMs" },
+    )
+    this._formElicitationTimeoutMs = sanitizePositiveInt(
+      formElicitationTimeoutMs,
+      FORM_ELICITATION_TIMEOUT_MS,
+      { logger: this.logger, label: "codex.formElicitationTimeoutMs" },
+    )
+    this._workspaceDependenciesCache = new AsyncTtlCache({
+      ttlMs: this._workspaceDependenciesCacheTtlMs,
+    })
+    this._workspaceDependenciesFailure = null
+    this._resolveWorkspaceDependencies = async () => {
+      const cachedFailure = this._workspaceDependenciesFailure
+      if (cachedFailure && cachedFailure.expiresAt > Date.now()) {
+        throw deadlineError(cachedFailure.code)
+      }
+      this._workspaceDependenciesFailure = null
+      try {
+        const dependencies = await this._workspaceDependenciesCache.get(
+          () => withDeadline(
+            Promise.resolve().then(uncachedWorkspaceDependencies),
+            this._workspaceDependenciesDeadlineMs,
+            "CODEX_WORKSPACE_DEPENDENCIES_TIMEOUT",
+          ),
+        )
+        this._workspaceDependenciesFailure = null
+        return dependencies
+      } catch (error) {
+        // Negative cacheには安全なcodeと期限だけを保持する。cause/messageは秘密を含み得る。
+        this._workspaceDependenciesFailure = {
+          code: codexHostCapabilityErrorCode(error, "CODEX_WORKSPACE_DEPENDENCIES_FAILED"),
+          expiresAt: Date.now() + this._workspaceDependenciesFailureTtlMs,
+        }
+        throw deadlineError(this._workspaceDependenciesFailure.code)
+      }
+    }
+    this._dynamicToolExecutorFactory = dynamicToolExecutorFactory || createCodexDynamicToolExecutor
+    this._artifactTemplatePickerConfigBuilder = artifactTemplatePickerConfigBuilder
+      || buildCodexArtifactTemplatePickerConfig
+    this._artifactTemplatePickerPreflight = artifactTemplatePickerPreflight
+      || preflightCodexArtifactTemplatePicker
     // Stage 5: warm 保持の idle TTL（既定 7 日）。テストから短縮できるよう注入可能。
     this._detachTtlMs = detachTtlMs ?? IDLE_DETACH_TTL_MS
     // 子⑤ (T06544): 同時 warm 保持する cwd 数の上限 N（既定 20）。各 cwd は K 本に畳む。
@@ -741,6 +953,14 @@ export class CodexStreamBridge extends EventEmitter {
       // request_id -> { turnId, method, params }。major#1: reattach で新 stream へ未応答の承認要求を
       // 再送できるよう、元の method/params も保持する (Claude の _permissionResolvers と同型)。
       pendingApprovals: new Map(),
+      // host dynamic tool は permission request と別経路で即時応答する。
+      dynamicToolExecutor: this._dynamicToolExecutorFactory({
+        resolveWorkspaceDependencies: this._resolveWorkspaceDependencies,
+        logger: this.logger,
+      }),
+      // JSON-RPC request id ごとの exactly-once 応答台帳。callId の resolver single-flight は
+      // executor が別に担い、同じ callId でも request id が違えば各 request へ応答する。
+      handledDynamicToolRequestIds: new Set(),
       // ブラウザから codex.detach を受け取った (= 画面の持ち主が居なくなった) か。診断・ログ用。
       // Stage 5: 回収の可否は detachRequested ではなく lastActivityMs（LRU）と activeTurnId
       // （busy/stuck）で決める。detach してもすぐには殺さず warm 保持する。
@@ -827,7 +1047,13 @@ export class CodexStreamBridge extends EventEmitter {
         { stream_id, cwd, resuming, lifecycle_stage: "initialize_started" },
         "codex app-server session initialization",
       )
-      await client.request("initialize", { clientInfo: CLIENT_INFO })
+      await client.request("initialize", {
+        clientInfo: CLIENT_INFO,
+        capabilities: {
+          experimentalApi: true,
+          mcpServerOpenaiFormElicitation: true,
+        },
+      })
       // ここまでが「app-server プロセスが起動して JSON-RPC に応答できるようになるまで」。
       timing.initialize_ms = lap()
       // 公式 App Server handshake: initialize 応答後、同じ transport 上で initialized を
@@ -837,10 +1063,43 @@ export class CodexStreamBridge extends EventEmitter {
         { stream_id, cwd, resuming, lifecycle_stage: "initialized_sent" },
         "codex app-server session initialization",
       )
-      reachedThreadOp = true
       const startParams = { cwd, model: model || undefined, sandbox: sandbox || undefined }
       if (effort) startParams.effort = effort
       if (approvalPolicy) startParams.approvalPolicy = approvalPolicy
+      // app-serverを跨ぐcold resumeではthreadのhost側MCP/dynamic tool登録が復元されない実測が
+      // あるため、fresh startと同じcapabilityを毎回再注入する。in-memory reattachはこのcold経路へ
+      // 入らないので、既存process上での再buildは発生しない。
+      try {
+        const hostCapabilities = await withDeadline(
+          buildCodexHostCapabilities({
+            client,
+            cwd,
+            artifactTemplatePickerConfigBuilder: this._artifactTemplatePickerConfigBuilder,
+            artifactTemplatePickerPreflight: this._artifactTemplatePickerPreflight,
+            resolveWorkspaceDependencies: this._resolveWorkspaceDependencies,
+          }),
+          this._hostCapabilitiesDeadlineMs,
+          "CODEX_HOST_CAPABILITIES_TIMEOUT",
+        )
+        if (hostCapabilities.config) startParams.config = { ...hostCapabilities.config }
+        if (hostCapabilities.warning) {
+          this.logger?.warn?.(
+            hostCapabilities.warning,
+            "codex artifact template picker degraded",
+          )
+        }
+      } catch (error) {
+        this.logger?.warn?.(
+          {
+            error_code: codexHostCapabilityErrorCode(error, "CODEX_HOST_CAPABILITIES_FAILED"),
+            skill_count: 0,
+          },
+          "codex artifact template picker degraded",
+        )
+      }
+      startParams.dynamicTools = session.dynamicToolExecutor.definitions
+      startParams.runtimeWorkspaceRoots = [cwd]
+      timing.host_capabilities_ms = lap()
       this.logger?.info?.(
         {
           stream_id,
@@ -851,6 +1110,7 @@ export class CodexStreamBridge extends EventEmitter {
         },
         "codex app-server session initialization",
       )
+      reachedThreadOp = true
       const result = resuming
         ? await client.request("thread/resume", { ...startParams, threadId: resumeThreadId })
         : await client.request("thread/start", startParams)
@@ -951,6 +1211,7 @@ export class CodexStreamBridge extends EventEmitter {
       }
     } catch (err) {
       this.sessions.delete(stream_id)
+      this._settleAllPendingApprovals(session, { respond: false })
       client.stop()
       settleReady(null) // reattach 待ちへ「失敗」を通知 (reject しない)
       // 失敗も 1 行に落とす。**_classifyAttachFailure より前**に出す (分類は rollout の disk 走査を
@@ -987,6 +1248,7 @@ export class CodexStreamBridge extends EventEmitter {
    * ## 読み方
    * - `warm=true` / `mode=reattach_*` … app-server を立てていない (所要は `reattach_wait_ms` だけ)
    * - `warm=false` / `mode=cold_*` … `spawn_ms`(同期 spawn) + `initialize_ms`(プロセス起動待ち)
+   *   + `host_capabilities_ms`(cold start/resume の skills/runtime 構築)
    *   + `thread_op_ms`(thread/start|resume。resume は rollout 読み込み込み) + `history_flatten_ms`
    *
    * ログ量: attach 時のみ (ターン毎には出ない)。既存の "codex session attached" と同オーダー。
@@ -1000,6 +1262,7 @@ export class CodexStreamBridge extends EventEmitter {
         reattach_wait_ms: timing.reattach_wait_ms ?? null,
         spawn_ms: timing.spawn_ms ?? null,
         initialize_ms: timing.initialize_ms ?? null,
+        host_capabilities_ms: timing.host_capabilities_ms ?? null,
         thread_op_ms: timing.thread_op_ms ?? null,
         history_flatten_ms: timing.history_flatten_ms ?? null,
       },
@@ -1249,9 +1512,22 @@ export class CodexStreamBridge extends EventEmitter {
   /** app-server を 1 本 spawn して account/rateLimits/read を取る実処理 (キャッシュ miss 時のみ)。 */
   async _fetchAccountRateLimits({ cwd, profileId }) {
     const client = this._clientFactory({ cwd: cwd || process.cwd(), codexCmd: this.codexCmd, logger: this.logger })
+    client.on("error", (error) => {
+      this.logger?.warn?.(
+        {
+          error_code: codexHostCapabilityErrorCode(
+            error,
+            "CODEX_ACCOUNT_RATE_LIMITS_CLIENT_ERROR",
+          ),
+        },
+        "codex account rate limits client error",
+      )
+    })
     client.start()
     try {
-      await client.request("initialize", { clientInfo: CLIENT_INFO })
+      await client.request("initialize", {
+        clientInfo: CLIENT_INFO,
+      })
       client.notify("initialized", {})
       const result = await client.request("account/rateLimits/read", {})
       this._accountRateLimitsByProfile.set(profileId, result)
@@ -2540,13 +2816,27 @@ export class CodexStreamBridge extends EventEmitter {
   }
 
   _onServerRequest(session, msg) {
+    if (msg?.method === "item/tool/call") {
+      this._onDynamicToolCall(session, msg)
+      return
+    }
     const { stream_id } = session
+    const previous = session.pendingApprovals.get(msg.id)
+    if (previous?.timer) clearTimeout(previous.timer)
     // major#1: reattach 時に新 stream へ再送できるよう method/params も保持する。
-    session.pendingApprovals.set(msg.id, {
+    const pending = {
       turnId: session.activeTurnId,
       method: msg.method,
       params: msg.params,
-    })
+      timer: null,
+    }
+    if (msg.method === "mcpServer/elicitation/request") {
+      pending.timer = setTimeout(() => {
+        this._expireFormElicitation(session, msg.id, pending)
+      }, this._formElicitationTimeoutMs)
+      pending.timer.unref?.()
+    }
+    session.pendingApprovals.set(msg.id, pending)
     this.emit("permission", {
       stream_id,
       thread_id: session.threadId,
@@ -2557,6 +2847,49 @@ export class CodexStreamBridge extends EventEmitter {
     })
   }
 
+  _onDynamicToolCall(session, msg) {
+    if (session.handledDynamicToolRequestIds.has(msg?.id)) return
+    session.handledDynamicToolRequestIds.add(msg?.id)
+    if (session.handledDynamicToolRequestIds.size > DYNAMIC_TOOL_REQUEST_LEDGER_MAX) {
+      session.handledDynamicToolRequestIds.delete(
+        session.handledDynamicToolRequestIds.values().next().value,
+      )
+    }
+
+    const tool = sanitizeCodexDynamicToolName(msg?.params?.tool)
+    let execution
+    const requestThreadId = msg?.params?.threadId
+    const allowedThread = requestThreadId === session.threadId
+      // 表示台帳と停止台帳は観測経路・寿命が異なる。どちらか一方で既知なら、このsessionが
+      // 所有するsubagent threadとして許可する意図的なOR結合（積集合へ狭めない）。
+      || session.subagents.has(requestThreadId)
+      || session.subagentInterruptRegistry.has(requestThreadId)
+    if (!allowedThread) {
+      this.logger?.warn?.(
+        { tool, error_code: "THREAD_MISMATCH" },
+        "codex dynamic tool call rejected",
+      )
+      execution = Promise.resolve(codexDynamicToolFailure("THREAD_MISMATCH"))
+    } else {
+      execution = Promise.resolve().then(() => session.dynamicToolExecutor.execute(msg?.params))
+    }
+
+    void execution.catch(() => {
+      this.logger?.warn?.(
+        { tool, error_code: "DYNAMIC_TOOL_EXECUTOR_REJECTED" },
+        "codex dynamic tool call failed",
+      )
+      return codexDynamicToolFailure("DYNAMIC_TOOL_EXECUTOR_REJECTED")
+    }).then((result) => {
+      session.client.respond(msg.id, result)
+    }).catch(() => {
+      this.logger?.warn?.(
+        { tool, error_code: "DYNAMIC_TOOL_RESPONSE_FAILED" },
+        "codex dynamic tool response failed",
+      )
+    })
+  }
+
   /**
    * major#1: 未応答の承認要求を現在の stream へ再送する (reattach から呼ぶ)。Claude の
    * _replayPendingPermissions と同型。frontend は request_id で重複排除するため、既に表示済みの
@@ -2576,14 +2909,63 @@ export class CodexStreamBridge extends EventEmitter {
     }
   }
 
+  _pendingApprovalResult(info) {
+    return info?.method === "mcpServer/elicitation/request"
+      ? { action: "cancel", content: null }
+      : { decision: "decline" }
+  }
+
+  _settlePendingApproval(session, requestId, result, { respond = true } = {}) {
+    const info = session?.pendingApprovals?.get(requestId)
+    if (!info) return false
+    session.pendingApprovals.delete(requestId)
+    if (info.timer) clearTimeout(info.timer)
+    if (respond) session.client.respond(requestId, result)
+    return true
+  }
+
+  _settleAllPendingApprovals(session, { respond = true } = {}) {
+    for (const [requestId, info] of session?.pendingApprovals || []) {
+      this._settlePendingApproval(
+        session,
+        requestId,
+        this._pendingApprovalResult(info),
+        { respond },
+      )
+    }
+  }
+
+  _expireFormElicitation(session, requestId, expected) {
+    if (session?.pendingApprovals?.get(requestId) !== expected) return
+    if (!this._settlePendingApproval(
+      session,
+      requestId,
+      { action: "cancel", content: null },
+    )) return
+    this.emit("event", {
+      stream_id: session.stream_id,
+      producer_seq: session.seq,
+      thread_id: session.threadId,
+      cwd: session.cwd,
+      notification: {
+        method: "cockpit/permission_expired",
+        params: { request_id: requestId, method: expected.method },
+      },
+    })
+  }
+
   // ターン完了時、そのターンに紐づく未解決の承認要求は自動 decline する
   // (browser が応答する前にターンが打ち切られた/クラッシュ相当のケース。
   // claude-stream-bridge.mjs の「ターン終了時に未解決分は自動 deny」と同じ設計)。
   _autoResolveStalePendingApprovals(session, completedTurnId) {
     for (const [requestId, info] of session.pendingApprovals) {
-      if (info.turnId !== completedTurnId) continue
-      session.pendingApprovals.delete(requestId)
-      session.client.respond(requestId, { decision: "decline" })
+      const belongsToCompletedTurn = info.turnId !== null && info.turnId === completedTurnId
+      if (!belongsToCompletedTurn) continue
+      this._settlePendingApproval(
+        session,
+        requestId,
+        this._pendingApprovalResult(info),
+      )
     }
   }
 
@@ -2595,6 +2977,7 @@ export class CodexStreamBridge extends EventEmitter {
     this._settleTurnActiveWaiter(session)
     this._drainRejectQueue(session, { reason: "queue_dead" })
     this._settlePendingInjectDeliveries(session, "session_dead")
+    this._settleAllPendingApprovals(session, { respond: false })
     // 案B: app-server が死んだら全購読 stream_id キーを Map から外す（1 端末分だけでは
     // 他の購読キーが dangling で残る）。
     this._dropAllStreamKeys(session)
@@ -2947,8 +3330,7 @@ export class CodexStreamBridge extends EventEmitter {
       this.logger?.warn?.({ stream_id, request_id }, "codex permissionReply: unknown request_id (ignored)")
       return
     }
-    session.pendingApprovals.delete(request_id)
-    session.client.respond(request_id, result)
+    this._settlePendingApproval(session, request_id, result)
   }
 
   /**
@@ -3567,6 +3949,17 @@ export class CodexStreamBridge extends EventEmitter {
     return now - (session.lastActivityMs ?? now) <= this._stuckTurnTtlMs
   }
 
+  /**
+   * daemon の deferred restart が待つべき実作業があるか。
+   * warm 保持とは異なり、購読端末数や detach 状態は作業として数えない。
+   */
+  hasActiveWork(now = Date.now()) {
+    for (const session of this._liveSessions()) {
+      if (this._isProtected(session, now)) return true
+    }
+    return false
+  }
+
   _hasLiveSubagentTurn(session, now = Date.now()) {
     const registry = session?.subagentInterruptRegistry
     if (!registry || registry.size === 0) return false
@@ -3618,6 +4011,7 @@ export class CodexStreamBridge extends EventEmitter {
     this._settleTurnActiveWaiter(session)
     this._drainRejectQueue(session, { reason: "queue_dead" })
     this._settlePendingInjectDeliveries(session, "session_dead")
+    this._settleAllPendingApprovals(session)
     // 案B: 全購読 stream_id キーを Map から外す（primary 1 個だけ消すと dangling が残る）。
     this._dropAllStreamKeys(session)
     try {
@@ -3806,6 +4200,7 @@ export class CodexStreamBridge extends EventEmitter {
       this._settleTurnActiveWaiter(session)
       this._drainRejectQueue(session, { reason: "queue_dead" })
       this._settlePendingInjectDeliveries(session, "session_dead")
+      this._settleAllPendingApprovals(session)
       // hub-agent 再起動時にターン実行中のセッションを落とすと thread が汚染されうる
       // (exec 中の kill → output 欠落)。因果を後から辿れるよう必ず記録する。
       this.logger?.[session.activeTurnId ? "warn" : "info"]?.(