@cocorograph/hub-agent 0.8.42 → 0.8.43

package/package.json

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

package/src/main.mjs

@@ -3791,11 +3791,11 @@ async function dispatch(msg, ctx) {
           })
           if (resumeSessionId) {
             void ctx.siblingInjectBridge
-              ?.replayActiveDelegations(cwdArg || process.env.HOME || process.cwd(), resumeSessionId)
+              ?.replayDelegations(cwdArg || process.env.HOME || process.cwd(), resumeSessionId)
               .catch((err) => {
                 ctx.logger?.warn?.(
                   { err: err?.message || String(err), stream_id, session_id: resumeSessionId },
-                  "failed to replay active delegations after Claude attach",
+                  "failed to replay delegations after Claude attach",
                 )
               })
           }

package/src/sibling-inject.mjs

@@ -75,20 +75,68 @@ 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 TERMINAL_DELEGATE_PROMPT_MAX_LENGTH = 2_000
+const TERMINAL_DELEGATE_AGENT_MAX_LENGTH = 200
+const TERMINAL_DELEGATE_DESCRIPTION_MAX_LENGTH = 2_000
+const DELEGATION_ID_MAX_LENGTH = 200
 
 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)
+function truncateString(value, maxLength, truncationNote) {
+  if (value.length <= maxLength) return value
+  let end = maxLength
+  const lastCodeUnit = value.charCodeAt(end - 1)
   if (lastCodeUnit >= 0xd800 && lastCodeUnit <= 0xdbff) end -= 1
-  return (
-    prompt.slice(0, end) +
-    `\n\n[依頼本文はここで打ち切られています（全 ${prompt.length} 文字）]`
+  return value.slice(0, end) + truncationNote(value.length)
+}
+
+function truncateDelegatePrompt(prompt) {
+  return truncateString(
+    prompt,
+    DELEGATE_PROMPT_MAX_LENGTH,
+    (length) => `\n\n[依頼本文はここで打ち切られています（全 ${length} 文字）]`,
   )
 }
 
+function compactTerminalEvent(event, includePrompt = false) {
+  const storedEvent = {}
+  for (const field of [
+    "type",
+    "subtype",
+    "delegation_id",
+    "phase",
+    "background",
+    "timestamp",
+  ]) {
+    if (event[field] !== undefined) storedEvent[field] = event[field]
+  }
+
+  if (typeof event.agent === "string") {
+    storedEvent.agent = truncateString(
+      event.agent,
+      TERMINAL_DELEGATE_AGENT_MAX_LENGTH,
+      (length) => `\n\n[エージェント名はここで打ち切られています（全 ${length} 文字）]`,
+    )
+  }
+  if (typeof event.description === "string") {
+    storedEvent.description = truncateString(
+      event.description,
+      TERMINAL_DELEGATE_DESCRIPTION_MAX_LENGTH,
+      (length) => `\n\n[説明はここで打ち切られています（全 ${length} 文字）]`,
+    )
+  }
+  if (includePrompt && typeof event.prompt === "string") {
+    storedEvent.prompt = truncateString(
+      event.prompt,
+      TERMINAL_DELEGATE_PROMPT_MAX_LENGTH,
+      (length) =>
+        `\n\n[終了済み委譲の依頼本文はここで打ち切られています（全 ${length} 文字）]`,
+    )
+  }
+
+  return storedEvent
+}
+
 /**
  * `ps` の起動時刻を送受信双方で比較する契約形へ正規化する。
  * 先頭・末尾の Unicode 空白だけを除去し、日時本体の内部空白は変更しない。
@@ -312,7 +360,7 @@ export class SiblingInjectBridge {
     this._pidStartedAt = pidStartedAt
     /** @type {Map<string, Map<string, {event: object, recordedAt: number}>>} cwd+session ごとの進行中委譲。 */
     this._activeDelegations = new Map()
-    /** @type {Map<string, Map<string, number>>} 終端→開始の逆転で遅着 started を復活させない墓標。 */
+    /** @type {Map<string, Map<string, {startedEvent?: object, terminalEvent: object, startedAt?: number, recordedAt: number}>>} 終了済み委譲の再送情報を兼ねた墓標。 */
     this._terminalDelegations = new Map()
   }
 
@@ -329,8 +377,8 @@ export class SiblingInjectBridge {
       if (entries.size === 0) this._activeDelegations.delete(sessionKey)
     }
     for (const [sessionKey, entries] of this._terminalDelegations) {
-      for (const [delegationId, recordedAt] of entries) {
-        if (recordedAt < cutoff) entries.delete(delegationId)
+      for (const [delegationId, entry] of entries) {
+        if (entry.recordedAt < cutoff) entries.delete(delegationId)
       }
       if (entries.size === 0) this._terminalDelegations.delete(sessionKey)
     }
@@ -340,6 +388,10 @@ export class SiblingInjectBridge {
     this._pruneDelegations()
     const sessionKey = this._delegationSessionKey(cwd, sessionId)
     if (event.phase !== "started") {
+      const activeEntry = this._activeDelegations.get(sessionKey)?.get(event.delegation_id)
+      const existingTerminalEntry = this._terminalDelegations
+        .get(sessionKey)
+        ?.get(event.delegation_id)
       this._activeDelegations.get(sessionKey)?.delete(event.delegation_id)
       if (this._activeDelegations.get(sessionKey)?.size === 0) {
         this._activeDelegations.delete(sessionKey)
@@ -350,7 +402,21 @@ export class SiblingInjectBridge {
         this._terminalDelegations.set(sessionKey, terminalEntries)
       }
       terminalEntries.delete(event.delegation_id)
-      terminalEntries.set(event.delegation_id, this._now())
+      terminalEntries.set(event.delegation_id, {
+        ...(activeEntry
+          ? {
+              startedEvent: compactTerminalEvent(activeEntry.event, true),
+              startedAt: activeEntry.recordedAt,
+            }
+          : existingTerminalEntry?.startedEvent && existingTerminalEntry.startedAt !== undefined
+            ? {
+                startedEvent: existingTerminalEntry.startedEvent,
+                startedAt: existingTerminalEntry.startedAt,
+              }
+            : {}),
+        terminalEvent: compactTerminalEvent(event),
+        recordedAt: this._now(),
+      })
       while (terminalEntries.size > ACTIVE_DELEGATIONS_PER_SESSION_LIMIT) {
         terminalEntries.delete(terminalEntries.keys().next().value)
       }
@@ -394,14 +460,35 @@ export class SiblingInjectBridge {
     }
   }
 
-  /** attach/再接続時に同じ cwd+session の進行中委譲だけを再送する。 */
-  async replayActiveDelegations(cwd, sessionId) {
+  /** attach/再接続時に同じ cwd+session の進行中・終了済み委譲を開始順で再送する。 */
+  async replayDelegations(cwd, sessionId) {
     if (!cwd || !sessionId) return
     this._pruneDelegations()
     const sessionKey = this._delegationSessionKey(cwd, sessionId)
-    const entries = this._activeDelegations.get(sessionKey)
-    if (!entries) return
-    for (const [delegationId, entry] of [...entries]) {
+    const replayEntries = [
+      ...[...(this._activeDelegations.get(sessionKey) || [])].map(([delegationId, entry]) => ({
+        delegationId,
+        entry,
+        kind: "active",
+        startedAt: entry.recordedAt,
+      })),
+      ...[...(this._terminalDelegations.get(sessionKey) || [])]
+        .filter(([, entry]) => entry.startedEvent && entry.startedAt !== undefined)
+        .map(([delegationId, entry]) => ({
+          delegationId,
+          entry,
+          kind: "terminal",
+          startedAt: entry.startedAt,
+        })),
+    ].sort((a, b) => a.startedAt - b.startedAt)
+
+    for (const { delegationId, entry, kind } of replayEntries) {
+      if (kind === "terminal") {
+        if (this._terminalDelegations.get(sessionKey)?.get(delegationId) !== entry) continue
+        this.claudeBridge?.emitToStream?.(cwd, sessionId, entry.startedEvent)
+        this.claudeBridge?.emitToStream?.(cwd, sessionId, entry.terminalEvent)
+        continue
+      }
       const alive = await this._delegateProcessAlive(entry.event)
       // 生存確認中に終端が届いた場合、古い snapshot の started/stopped を後から流さない。
       if (this._activeDelegations.get(sessionKey)?.get(delegationId) !== entry) continue
@@ -571,6 +658,7 @@ export class SiblingInjectBridge {
       phase,
       agent,
       description,
+      background,
       prompt,
       timestamp,
       pid,
@@ -590,10 +678,12 @@ export class SiblingInjectBridge {
     const badDelegateBody =
       typeof delegation_id !== "string" ||
       !delegation_id ||
+      delegation_id.length > DELEGATION_ID_MAX_LENGTH ||
       !delegatePhases.has(phase) ||
       (phase === "started" && (typeof agent !== "string" || !agent)) ||
       (agent !== undefined && typeof agent !== "string") ||
       (description !== undefined && typeof description !== "string") ||
+      (background !== undefined && typeof background !== "boolean") ||
       (prompt !== undefined && typeof prompt !== "string") ||
       (pid !== undefined && (!Number.isInteger(pid) || pid <= 0)) ||
       (pid_started_at !== undefined && typeof pid_started_at !== "string") ||
@@ -656,6 +746,7 @@ export class SiblingInjectBridge {
             phase,
             ...(agent !== undefined ? { agent } : {}),
             ...(description !== undefined ? { description } : {}),
+            ...(background !== undefined ? { background } : {}),
             ...(phase === "started" && prompt ? { prompt: truncateDelegatePrompt(prompt) } : {}),
             ...(pid !== undefined ? { pid } : {}),
             ...(pid_started_at !== undefined ? { pid_started_at } : {}),