@cocorograph/hub-agent 0.8.35 → 0.8.37

package/package.json

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

package/src/codex-stream-bridge.mjs

@@ -390,6 +390,20 @@ function subagentFallbackName(agentPath) {
   return agentPath.split("/").filter(Boolean).at(-1) || "subagent"
 }
 
+function explicitSubagentRoleFromThread(thread, expectedParentThreadId) {
+  const threadSpawn = thread?.source?.subAgent?.thread_spawn
+  if (
+    threadSpawn &&
+    Object.prototype.hasOwnProperty.call(threadSpawn, "parent_thread_id") &&
+    threadSpawn.parent_thread_id !== expectedParentThreadId
+  ) return null
+  const directRole = typeof thread?.agentRole === "string" ? thread.agentRole.trim() : ""
+  if (directRole) return directRole
+  const sourceRole = threadSpawn?.agent_role
+  const normalizedSourceRole = typeof sourceRole === "string" ? sourceRole.trim() : ""
+  return normalizedSourceRole || null
+}
+
 function parseDynamicToolArguments(value) {
   if (value && typeof value === "object" && !Array.isArray(value)) return value
   if (typeof value !== "string") return null
@@ -749,10 +763,16 @@ export class CodexStreamBridge extends EventEmitter {
        *  deliveryPromise: Promise<object>, settleDelivery: Function}>} */
       pendingInjectSources: [],
       /** 組み込み collaboration subagent の表示用台帳。検索キーは agentThreadId、
-       * 外部へ出す安定した委譲 ID は spawn dynamicToolCall の item.id を保持する。 */
+       * 外部へ出す安定した委譲 ID は subAgentActivity の lifecycle ID を保持する。 */
       subagents: new Map(),
       /** dynamicToolCall(spawn_agent) の item.id -> 表示メタデータ。 */
       subagentSpawnMetadata: new Map(),
+      /** live subAgentActivity の spawn metadata miss を child thread/read で補完する
+       * single-flight 台帳。key = agentThreadId, value = 進行中 Promise。 */
+      subagentRoleReads: new Map(),
+      /** role 補完を試行済みの child thread。取得不能・親不一致・RPC失敗後の後続 activity で
+       * 無制限に read/warn を再発火しない negative cache（session と同じ寿命）。 */
+      subagentRoleReadAttempted: new Set(),
       /** 実行中の背景コマンド（commandExecution）の台帳。claude 側 `_liveTasks` と同型。
        *  key = `item.id`（`item/started` / `item/completed` の両方に載る唯一の安定 ID）、
        *  value = { threadId, startedAt, lastSeenAt }。
@@ -1593,6 +1613,7 @@ export class CodexStreamBridge extends EventEmitter {
           agentPath: record.agentPath,
           phase: record.phase,
           agent: record.agent,
+          agentExplicit: record.agentExplicit === true,
           description: record.description,
           prompt: record.prompt,
           background: record.background === true,
@@ -1636,6 +1657,7 @@ export class CodexStreamBridge extends EventEmitter {
       agentPath,
       phase,
       agent: metadata?.agent || previous?.agent || subagentFallbackName(agentPath),
+      agentExplicit: metadata?.agentExplicit === true || previous?.agentExplicit === true,
       description:
         metadata?.description || previous?.description || subagentFallbackName(agentPath),
       prompt: metadata?.prompt || previous?.prompt || "",
@@ -1654,6 +1676,80 @@ export class CodexStreamBridge extends EventEmitter {
     return record
   }
 
+  _recoverLiveSubagentRole(session, record, itemId) {
+    if (!session || !record || record.agentExplicit === true || session.dead) return
+    const agentThreadId = record.agentThreadId
+    if (
+      session.subagentRoleReads.has(agentThreadId) ||
+      session.subagentRoleReadAttempted.has(agentThreadId)
+    ) return
+    session.subagentRoleReadAttempted.add(agentThreadId)
+    this.logger?.warn?.(
+      {
+        item_id: itemId,
+        parent_thread_id: session.threadId,
+        subagent_thread_id: agentThreadId,
+      },
+      "codex live subagent spawn metadata miss; recovering role from child thread",
+    )
+    const attempt = (async () => {
+      let result
+      try {
+        result = await session.client.request("thread/read", {
+          threadId: agentThreadId,
+          includeTurns: false,
+        })
+      } catch {
+        this.logger?.warn?.(
+          {
+            item_id: itemId,
+            parent_thread_id: session.threadId,
+            subagent_thread_id: agentThreadId,
+          },
+          "codex live subagent role recovery thread/read failed",
+        )
+        return
+      }
+      if (session.dead) return
+      const current = session.subagents.get(agentThreadId)
+      if (!current || current.agentExplicit === true) return
+      const explicitRole = explicitSubagentRoleFromThread(result?.thread, session.threadId)
+      if (!explicitRole) return
+      const updated = this._setSubagentPhase(
+        session,
+        agentThreadId,
+        current.phase,
+        {
+          agentPath: current.agentPath,
+          metadata: { agent: explicitRole, agentExplicit: true },
+          atMs: current.atMs,
+        },
+        { force: true },
+      )
+      // 成功後は record.agentExplicit が再試行を止めるため negative cache は不要。
+      if (updated?.agentExplicit === true) {
+        session.subagentRoleReadAttempted.delete(agentThreadId)
+      }
+    })()
+    const pending = attempt
+      .catch(() => {
+        this.logger?.warn?.(
+          {
+            item_id: itemId,
+            parent_thread_id: session.threadId,
+            subagent_thread_id: agentThreadId,
+          },
+          "codex live subagent role recovery failed",
+        )
+      })
+      .finally(() => {
+        if (session.subagentRoleReads.get(agentThreadId) === pending) {
+          session.subagentRoleReads.delete(agentThreadId)
+        }
+      })
+    session.subagentRoleReads.set(agentThreadId, pending)
+  }
+
   _observeSubagentItem(
     session,
     item,
@@ -1673,8 +1769,11 @@ export class CodexStreamBridge extends EventEmitter {
       if (namespace !== "collaboration" || item.tool !== "spawn_agent" || !item.id) return
       const args = parseDynamicToolArguments(item.arguments)
       if (!args) return
+      const agent = typeof args.agent_type === "string" ? args.agent_type.trim() : ""
+      const agentExplicit = agent.length > 0
       const metadata = {
-        agent: typeof args.agent_type === "string" && args.agent_type ? args.agent_type : null,
+        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,
@@ -1697,7 +1796,7 @@ export class CodexStreamBridge extends EventEmitter {
     }
     if (!phase) return
     const metadata = session.subagentSpawnMetadata.get(item.id) || null
-    this._setSubagentPhase(
+    const record = this._setSubagentPhase(
       session,
       agentThreadId,
       phase,
@@ -1709,6 +1808,11 @@ export class CodexStreamBridge extends EventEmitter {
       },
       { emit },
     )
+    // metadata が存在して agentExplicit=false なら agent_type 未指定という明示入力。
+    // thread/read 補完は metadata lookup 自体が外れた場合だけに限定し、その指定を上書きしない。
+    if (emit && record && !metadata) {
+      this._recoverLiveSubagentRole(session, record, item.id)
+    }
   }
 
   _observeSubagentTurn(session, msg) {
@@ -1769,6 +1873,7 @@ export class CodexStreamBridge extends EventEmitter {
         agentThreadId: record.agentThreadId,
         agentPath: record.agentPath,
         agent: record.agent,
+        agentExplicit: record.agentExplicit === true,
         description: record.description,
         prompt: record.prompt,
         background: record.background === true,
@@ -1802,6 +1907,10 @@ export class CodexStreamBridge extends EventEmitter {
           // RPC 待ち中に live lifecycle が進んだ場合、stale read で上書き・削除しない。
           if (session.subagents.get(record.agentThreadId) !== record) continue
           const thread = result?.thread
+          const explicitRole = explicitSubagentRoleFromThread(thread, session.threadId)
+          const metadata = explicitRole
+            ? { agent: explicitRole, agentExplicit: true }
+            : null
           const turns = Array.isArray(thread?.turns) ? thread.turns : []
           const lastTurn = turns.at(-1)
           const phase = terminalSubagentPhase(lastTurn?.status)
@@ -1816,7 +1925,7 @@ export class CodexStreamBridge extends EventEmitter {
               session,
               record.agentThreadId,
               phase,
-              { agentPath: record.agentPath, atMs: lastTurnAtMs },
+              { agentPath: record.agentPath, metadata, atMs: lastTurnAtMs },
               { emit: false },
             )
           } else if (
@@ -1829,6 +1938,7 @@ export class CodexStreamBridge extends EventEmitter {
               "started",
               {
                 agentPath: record.agentPath,
+                metadata,
                 atMs: record.startedAtMs,
               },
               { emit: false },

package/src/main.mjs

@@ -2076,6 +2076,7 @@ export function buildCodexReadyPayload(streamId, info, queueState) {
       agent_thread_id: subagent.agentThreadId,
       agent_path: subagent.agentPath,
       agent: subagent.agent,
+      agent_explicit: subagent.agentExplicit === true,
       // description は spawn_agent.task_name の既存 alias（人物の表示名ではない）。
       description: subagent.description,
       prompt: subagent.prompt,