@cocorograph/hub-agent 0.8.34 → 0.8.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocorograph/hub-agent",
-  "version": "0.8.34",
+  "version": "0.8.36",
   "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 &&
+    (typeof threadSpawn.parent_thread_id !== "string" ||
+      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
@@ -748,8 +762,8 @@ export class CodexStreamBridge extends EventEmitter {
        *  deliveryId: string, sourceStreamId: string, deliveryPending: boolean,
        *  deliveryPromise: Promise<object>, settleDelivery: Function}>} */
       pendingInjectSources: [],
-      /** 組み込み collaboration subagent の表示用台帳。ライフサイクルの安定キーは
-       * agentThreadId（item.id は dynamicToolCall とのメタデータ結合にだけ使う）。 */
+      /** 組み込み collaboration subagent の表示用台帳。検索キーは agentThreadId、
+       * 外部へ出す安定した委譲 ID は subAgentActivity の lifecycle ID を保持する。 */
       subagents: new Map(),
       /** dynamicToolCall(spawn_agent) の item.id -> 表示メタデータ。 */
       subagentSpawnMetadata: new Map(),
@@ -1460,6 +1474,12 @@ export class CodexStreamBridge extends EventEmitter {
     const list = session?.pendingInjectSources
     if (!list || !list.length) return null
     if (msg?.method !== "item/completed") return null
+    const sourceThreadId = msg.params?.threadId
+    if (
+      typeof sourceThreadId === "string" &&
+      sourceThreadId &&
+      sourceThreadId !== session?.threadId
+    ) return null
     const item = msg.params?.item
     if (!item || item.type !== "userMessage") return null
     const content = item.content
@@ -1582,13 +1602,15 @@ export class CodexStreamBridge extends EventEmitter {
       notification: {
         method: "cockpit/subagent_state",
         params: {
-          delegationId: record.agentThreadId,
+          delegationId: record.delegationId,
           agentThreadId: record.agentThreadId,
           agentPath: record.agentPath,
           phase: record.phase,
           agent: record.agent,
+          agentExplicit: record.agentExplicit === true,
           description: record.description,
           prompt: record.prompt,
+          background: record.background === true,
           atMs: record.atMs,
         },
       },
@@ -1609,6 +1631,14 @@ export class CodexStreamBridge extends EventEmitter {
         ? details.agentPath
         : previous?.agentPath || ""
     const metadata = details.metadata || null
+    const delegationId =
+      previous?.delegationId ||
+      (typeof details.delegationId === "string" && details.delegationId
+        ? details.delegationId
+        : null)
+    // raw child thread ID を委譲 ID に代用しない。spawn lifecycle 由来の安定 ID が無い
+    // 通知は台帳へ登録せず、後続 item も unknown として未タグのまま扱う。
+    if (typeof delegationId !== "string" || !delegationId) return null
     const transitionAtMs =
       previous?.phase === phase
         ? previous.atMs
@@ -1616,10 +1646,12 @@ export class CodexStreamBridge extends EventEmitter {
           ? details.atMs
           : Date.now()
     const record = {
+      delegationId,
       agentThreadId,
       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 || "",
@@ -1638,15 +1670,30 @@ export class CodexStreamBridge extends EventEmitter {
     return record
   }
 
-  _observeSubagentItem(session, item, atMs = Date.now(), { emit = true } = {}) {
+  _observeSubagentItem(
+    session,
+    item,
+    atMs = Date.now(),
+    { emit = true, sourceThreadId = session?.threadId } = {},
+  ) {
     if (!item || typeof item !== "object") return
+    // root thread の collaboration item だけが root subagent 台帳の正本。子 thread 内の
+    // spawn/subAgentActivity（孫）を root の lifecycle/snapshot へ昇格しない。
+    if (
+      typeof sourceThreadId === "string" &&
+      sourceThreadId &&
+      sourceThreadId !== session?.threadId
+    ) return
     if (item.type === "dynamicToolCall") {
       const namespace = item.namespace
       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,
@@ -1674,6 +1721,7 @@ export class CodexStreamBridge extends EventEmitter {
       agentThreadId,
       phase,
       {
+        delegationId: item.id,
         agentPath: item.agentPath,
         metadata,
         atMs,
@@ -1736,10 +1784,11 @@ export class CodexStreamBridge extends EventEmitter {
       const startedHistoryIndex = startedIndexByThread.get(record.agentThreadId)
       if (startedHistoryIndex === undefined) continue
       snapshots.push({
-        delegationId: record.agentThreadId,
+        delegationId: record.delegationId,
         agentThreadId: record.agentThreadId,
         agentPath: record.agentPath,
         agent: record.agent,
+        agentExplicit: record.agentExplicit === true,
         description: record.description,
         prompt: record.prompt,
         background: record.background === true,
@@ -1773,6 +1822,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)
@@ -1787,7 +1840,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 (
@@ -1800,6 +1853,7 @@ export class CodexStreamBridge extends EventEmitter {
               "started",
               {
                 agentPath: record.agentPath,
+                metadata,
                 atMs: record.startedAtMs,
               },
               { emit: false },
@@ -1880,25 +1934,46 @@ export class CodexStreamBridge extends EventEmitter {
     // ※ hub-agent 再起動 (cold resume) では historyItems が揮発するため青バブルへ戻る (claude の
     //    jsonl at-rest と同じ許容範囲。source 永続マップは TTL/ID 再利用の複雑さに見合わないため不採用)。
     const eventThreadId = msg?.params?.threadId
-    const backgroundChildItemNotification =
-      typeof eventThreadId === "string" &&
-      typeof msg?.method === "string" &&
-      msg.method.startsWith("item/") &&
-      session.subagents.get(eventThreadId)?.background === true
-    if (backgroundChildItemNotification) {
-      // 背景子の item は root の履歴・バブルへ混ぜない。子自身の lifecycle は
-      // turn 通知と root 側 subAgentActivity が正本なので、子 item から孫を登録しない。
-      // foreground / background 不明（spawn record 生成前の短い窓を含む）は fail-open で
-      // 既存どおり root へ通す。背景出力の過剰抑止より既存表示の維持を優先する。
+    const taggedParams = this._tagInjectSourceOnItem(session, msg)
+    let effectiveParams = taggedParams || msg.params
+    const childRecord =
+      typeof eventThreadId === "string" ? session.subagents.get(eventThreadId) : null
+    const childTextDelta =
+      msg.method === "item/agentMessage/delta" ||
+      msg.method === "item/reasoning/summaryTextDelta" ||
+      msg.method === "item/reasoning/textDelta"
+    if (childRecord && childTextDelta) {
+      // 子の message/reasoning 途中 delta を root liveText へ混ぜない。前景・背景とも
+      // attribution 付き item/completed が表示の正本で、root/unknown delta は従来どおり
+      // fail-open で通す。
       return
     }
-    const taggedParams = this._tagInjectSourceOnItem(session, msg)
-    const effectiveParams = taggedParams || msg.params
+    if (
+      childRecord &&
+      (msg.method === "item/started" || msg.method === "item/completed") &&
+      effectiveParams?.item &&
+      typeof effectiveParams.item === "object"
+    ) {
+      // app-server 所有の item は変更せず、既知の子 thread だけを attribution 付きで複製する。
+      // unknown/root を推測で子扱いしない。delegationId は child thread ID ではなく、spawn
+      // lifecycle が保持する安定 ID を使う。
+      const attributedItem = {
+        ...effectiveParams.item,
+        _hubSubagent: {
+          delegationId: childRecord.delegationId,
+          threadId: eventThreadId,
+          runtime: "codex",
+          background: childRecord.background === true,
+        },
+      }
+      effectiveParams = { ...effectiveParams, item: attributedItem }
+    }
     if (msg.method === "item/started" || msg.method === "item/completed") {
       this._observeSubagentItem(
         session,
         effectiveParams?.item,
         effectiveParams?.completedAtMs || Date.now(),
+        { sourceThreadId: eventThreadId },
       )
     }
     const childTurnNotification =
@@ -1968,8 +2043,8 @@ export class CodexStreamBridge extends EventEmitter {
         void this._pumpInputs(session)
         break
       case "item/completed":
-        // T06541 案1: 完了した ThreadItem を高忠実度履歴に追記する（cwd reattach で返す用）。
-        // Phase 2: タグ済み item (effectiveParams.item) を積む = reattach でも source が残る。
+        // 完了した ThreadItem を高忠実度履歴に追記する（cwd reattach で返す用）。
+        // attribution/source 済み item (effectiveParams.item) を積み、emit と同じ clone を使う。
         this._appendHistoryItem(session, effectiveParams?.item, effectiveParams?.completedAtMs)
         break
       default:

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,