@cocorograph/hub-agent 0.8.36 → 0.8.38

package/package.json

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

package/src/codex-stream-bridge.mjs

@@ -394,8 +394,8 @@ function explicitSubagentRoleFromThread(thread, expectedParentThreadId) {
   const threadSpawn = thread?.source?.subAgent?.thread_spawn
   if (
     threadSpawn &&
-    (typeof threadSpawn.parent_thread_id !== "string" ||
-      threadSpawn.parent_thread_id !== expectedParentThreadId)
+    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
@@ -767,6 +767,12 @@ export class CodexStreamBridge extends EventEmitter {
       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 }。
@@ -1670,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,
@@ -1716,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,
@@ -1728,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) {

package/src/sibling-inject.mjs

@@ -60,7 +60,7 @@
  */
 
 import { watch } from "node:fs"
-import { chmod, lstat, mkdir, readFile, writeFile, rename, unlink, readdir } from "node:fs/promises"
+import { chmod, lstat, mkdir, readFile, writeFile, rename, stat, unlink, readdir } from "node:fs/promises"
 import { execFile as execFileCallback } from "node:child_process"
 import { promisify } from "node:util"
 import path from "node:path"
@@ -73,9 +73,22 @@ export const SIBLING_REQUESTS_DIR =
 
 export const ACTIVE_DELEGATIONS_PER_SESSION_LIMIT = 100
 export const DELEGATION_LEDGER_RETENTION_MS = 24 * 60 * 60 * 1000
+const SIBLING_REQUEST_MAX_BYTES = 1024 * 1024
+const DELEGATE_PROMPT_MAX_LENGTH = 64_000
 
 const execFile = promisify(execFileCallback)
 
+function truncateDelegatePrompt(prompt) {
+  if (prompt.length <= DELEGATE_PROMPT_MAX_LENGTH) return prompt
+  let end = DELEGATE_PROMPT_MAX_LENGTH
+  const lastCodeUnit = prompt.charCodeAt(end - 1)
+  if (lastCodeUnit >= 0xd800 && lastCodeUnit <= 0xdbff) end -= 1
+  return (
+    prompt.slice(0, end) +
+    `\n\n[依頼本文はここで打ち切られています（全 ${prompt.length} 文字）]`
+  )
+}
+
 /**
  * `ps` の起動時刻を送受信双方で比較する契約形へ正規化する。
  * 先頭・末尾の Unicode 空白だけを除去し、日時本体の内部空白は変更しない。
@@ -506,6 +519,30 @@ export class SiblingInjectBridge {
     const fp = path.join(this.dir, filename)
     let body
     try {
+      const fileStat = await stat(fp)
+      if (fileStat.size > SIBLING_REQUEST_MAX_BYTES) {
+        this.logger?.warn(
+          { filename, size: fileStat.size, max_size: SIBLING_REQUEST_MAX_BYTES },
+          "sibling-inject: request file rejected because it exceeds the size limit",
+        )
+        // ⚠️ **結果ファイルを必ず書く**。ここで書かずに戻ると、結果をポーリングしている
+        // 呼び出し側 (cockpit_orch.py) には「タイムアウト」としか見えない。タイムアウトは
+        // 「不達とは限らない」と扱う契約なので、拒否した事実が呼び出し側で不達に化ける
+        // (＝黙って捨てたのと同じになる)。delegate-event の送り手は結果を読まないため、
+        // op を判別できないまま無条件に書いて構わない (余分な結果ファイルは stale 掃除の対象)。
+        await this._writeResult(request_id, {
+          ok: false,
+          error: "request_too_large",
+          size: fileStat.size,
+          max_size: SIBLING_REQUEST_MAX_BYTES,
+        })
+        try {
+          await unlink(fp)
+        } catch {
+          /* 既に無ければ no-op */
+        }
+        return
+      }
       body = JSON.parse(await readFile(fp, "utf-8"))
     } catch {
       // partial write / 既に消えた → 次の watch イベントで拾い直す (seen から外す)。
@@ -534,6 +571,7 @@ export class SiblingInjectBridge {
       phase,
       agent,
       description,
+      prompt,
       timestamp,
       pid,
       pid_started_at,
@@ -556,6 +594,7 @@ export class SiblingInjectBridge {
       (phase === "started" && (typeof agent !== "string" || !agent)) ||
       (agent !== undefined && typeof agent !== "string") ||
       (description !== undefined && typeof description !== "string") ||
+      (prompt !== undefined && typeof prompt !== "string") ||
       (pid !== undefined && (!Number.isInteger(pid) || pid <= 0)) ||
       (pid_started_at !== undefined && typeof pid_started_at !== "string") ||
       (timestamp !== undefined &&
@@ -617,6 +656,7 @@ export class SiblingInjectBridge {
             phase,
             ...(agent !== undefined ? { agent } : {}),
             ...(description !== undefined ? { description } : {}),
+            ...(phase === "started" && prompt ? { prompt: truncateDelegatePrompt(prompt) } : {}),
             ...(pid !== undefined ? { pid } : {}),
             ...(pid_started_at !== undefined ? { pid_started_at } : {}),
             timestamp: timestamp || new Date().toISOString(),

package/src/tool-result-mask.mjs

@@ -163,7 +163,23 @@ function redactBlocks(blocks) {
  * @returns {Record<string, unknown>}
  */
 export function maskMessageObject(obj, toolNames) {
+  if (!MASK_ENABLED) return obj
   if (!obj || typeof obj !== "object") return obj
+
+  if (obj.type === "system" && obj.subtype === "codex_delegate") {
+    let changed = false
+    const next = { ...obj }
+    for (const field of ["prompt", "description"]) {
+      if (typeof obj[field] !== "string") continue
+      const masked = redactSecrets(obj[field])
+      if (masked !== obj[field]) {
+        next[field] = masked
+        changed = true
+      }
+    }
+    return changed ? next : obj
+  }
+
   const message = obj.message
   if (!message || typeof message !== "object") return obj
   const content = message.content