@cocorograph/hub-agent 0.8.81 → 0.8.83

package/src/codex-stream-bridge.mjs

@@ -1,3 +1,4 @@
+import { recordConversationFocus } from "./chat-signals.mjs"
 /**
  * Codex 版チャットブリッジ (Cockpit Codex 両対応 item#3, Slice 2)。
  *
@@ -1109,6 +1110,7 @@ export class CodexStreamBridge extends EventEmitter {
       settleReady = resolve
     })
     this.sessions.set(stream_id, session)
+    recordConversationFocus(session.cwd, "codex", this.sessions.get(stream_id), this)
     this._wireClient(session)
     const resuming = !!resumeThreadId
     // #3: initialize と thread op を分離し、thread op に到達したかを記録する。initialize / config
@@ -1297,9 +1299,8 @@ export class CodexStreamBridge extends EventEmitter {
         turnActive: turnState.turnActive,
       }
     } catch (err) {
-      this.sessions.delete(stream_id)
-      this._settleAllPendingApprovals(session, { respond: false })
-      this._disposeSessionHistory(session)
+      // 代表実体も終了扱いにし、exit 転送と producer usage の解放を既存経路へ通す。
+      this._onClientExit(session, { code: 1, signal: null })
       client.stop()
       settleReady(null) // reattach 待ちへ「失敗」を通知 (reject しない)
       // 失敗も 1 行に落とす。**_classifyAttachFailure より前**に出す (分類は rollout の disk 走査を
@@ -1850,6 +1851,7 @@ export class CodexStreamBridge extends EventEmitter {
     session.streamIds.add(newStreamId)
     session.lastActivityByStream.set(newStreamId, now)
     this.sessions.set(newStreamId, session)
+    recordConversationFocus(session.cwd, "codex", this.sessions.get(newStreamId), this)
     session.stream_id = newStreamId
     session.detachRequested = false
     session.browserDetachedAtMs = null
@@ -1989,6 +1991,14 @@ export class CodexStreamBridge extends EventEmitter {
     return 1
   }
 
+  /** 指定 cwd の live 会話をすべて停止する。Map の変更前に対象を確定する。 */
+  stopSessionsForCwd({ cwd, reason }) {
+    const sessions = this._liveSessions().filter((session) => session.cwd === cwd)
+    const now = Date.now()
+    for (const session of sessions) this._reapSession(session, now, reason)
+    return sessions.length
+  }
+
   async operateSession(options) {
     const invalid = validateCodexSessionOperation(options)
     if (invalid) return { ok: false, error: invalid }
@@ -3678,6 +3688,7 @@ export class CodexStreamBridge extends EventEmitter {
       this.logger?.info?.(payload, "codex app-server exited")
     }
     this.emit("exit", {
+      cwd: session.cwd,
       stream_id: session.stream_id,
       producer_seq: session.seq,
       thread_id: session.threadId,
@@ -4200,12 +4211,16 @@ export class CodexStreamBridge extends EventEmitter {
    * @returns {object|null} 権威セッション（無ければ null）
    */
   liveSessionForCwd(cwd) {
+    return this._selectLiveSession(cwd, () => true)
+  }
+
+  _selectLiveSession(cwd, matches) {
     if (!cwd) return null
     let best = null
     let bestAt = -1
     // 案B: distinct session で走査（多対一 Map の重複を除く）。
     for (const session of this._liveSessions()) {
-      if (session.cwd !== cwd || !session.threadId) continue
+      if (session.cwd !== cwd || !session.threadId || session.threadId.startsWith("fresh:") || !matches(session)) continue
       const at = session.lastTurnAtMs ?? session.lastActivityMs ?? 0
       if (at >= bestAt) {
         bestAt = at
@@ -4741,6 +4756,7 @@ export class CodexStreamBridge extends EventEmitter {
       "codex session reaped",
     )
     this.emit("exit", {
+      cwd: session.cwd,
       stream_id: session.stream_id,
       producer_seq: session.seq,
       thread_id: session.threadId,
@@ -4947,6 +4963,7 @@ export class CodexStreamBridge extends EventEmitter {
       // (forgetCodexLiveTokenUsage) を必ず通す。これが無いと profile 切替ごとに producer Map が
       // リークする。dead は既に上で立てているので二重 emit にはならない。
       this.emit("exit", {
+        cwd: session.cwd,
         stream_id: session.stream_id,
         producer_seq: session.seq,
         thread_id: session.threadId,
@@ -4958,6 +4975,15 @@ export class CodexStreamBridge extends EventEmitter {
     this.sessions.clear()
   }
 
+  liveSessionsForCwd(cwd) {
+    return this._liveSessions().filter((session) => session.cwd === cwd)
+  }
+
+  getThreadId(stream_id) {
+    const session = this.sessions.get(stream_id)
+    return session && !session.dead ? session.threadId ?? null : null
+  }
+
   getCwd(stream_id) {
     const session = this.sessions.get(stream_id)
     if (!session || session.dead) return null

package/src/dispatch-scheduler.mjs

@@ -189,6 +189,11 @@ export class DispatchScheduler {
     if (type === "usage.request") return "usage"
 
     if (type === "chat.session.stop") {
+      if (msg.scope === "cwd") {
+        const cwd = typeof msg.cwd === "string" ? msg.cwd.trim() : ""
+        return cwd && (msg.cli_kind === "claude" || msg.cli_kind === "codex")
+          ? `${msg.cli_kind}:cwd:${cwd}` : "control"
+      }
       if (msg.cli_kind === "claude") {
         const cwd = typeof msg.cwd === "string" ? msg.cwd.trim() : ""
         return cwd ? `claude:cwd:${cwd}` : "control"