@cocorograph/hub-agent 0.8.31 → 0.8.32

package/package.json

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

package/src/sibling-inject.mjs

@@ -85,8 +85,12 @@ export function normalizeProcessStartedAt(raw) {
   return raw.trim()
 }
 
-async function defaultPidStartedAt(pid) {
-  const { stdout } = await execFile("ps", ["-o", "lstart=", "-p", String(pid)])
+export async function defaultPidStartedAt(pid, exec = execFile) {
+  // 送信側と同じ TZ/locale で比較可能な文字列を作る。契約の正本は Hub の codex_agent.py。
+  // launchd / WSL の環境は利用者のシェルと一致しないため、常駐サービスの環境は継承しない。
+  const { stdout } = await exec("ps", ["-o", "lstart=", "-p", String(pid)], {
+    env: { TZ: "UTC", LC_ALL: "C", LANG: "C" },
+  })
   return normalizeProcessStartedAt(stdout)
 }
 
@@ -352,6 +356,13 @@ export class SiblingInjectBridge {
     }
   }
 
+  _acceptsDelegateEvent(cwd, sessionId, event) {
+    this._pruneDelegations()
+    if (event.phase !== "started") return true
+    const sessionKey = this._delegationSessionKey(cwd, sessionId)
+    return !this._terminalDelegations.get(sessionKey)?.has(event.delegation_id)
+  }
+
   async _delegateProcessAlive(event) {
     if (!Number.isInteger(event.pid) || event.pid <= 0 || !event.pid_started_at) return true
     try {
@@ -610,17 +621,23 @@ export class SiblingInjectBridge {
             ...(pid_started_at !== undefined ? { pid_started_at } : {}),
             timestamp: timestamp || new Date().toISOString(),
           }
-          const r = this.claudeBridge?.emitToStream
-            ? this.claudeBridge.emitToStream(cwd, target_session_id, event)
-            : { status: "not_found" }
-          if (r.status === "delivered") {
-            this._recordDelegateEvent(cwd, target_session_id, event)
-            result = { ok: true, delivered_to: r.session }
+          // 墓標確認から配送成功時の台帳反映まで await を挟まない同期区間に閉じる。
+          // 配送失敗した started は台帳へ残さず、終端後に遅着した started は配送前に拒否する。
+          if (!this._acceptsDelegateEvent(cwd, target_session_id, event)) {
+            result = { ok: false, error: "stale_delegate_event" }
           } else {
-            result = {
-              ok: false,
-              error: AMBIGUOUS_TARGET_ERROR,
-              ...(r.candidates ? { candidates: r.candidates } : {}),
+            const r = this.claudeBridge?.emitToStream
+              ? this.claudeBridge.emitToStream(cwd, target_session_id, event)
+              : { status: "not_found" }
+            if (r.status === "delivered") {
+              this._recordDelegateEvent(cwd, target_session_id, event)
+              result = { ok: true, delivered_to: r.session }
+            } else {
+              result = {
+                ok: false,
+                error: AMBIGUOUS_TARGET_ERROR,
+                ...(r.candidates ? { candidates: r.candidates } : {}),
+              }
             }
           }
         }