@cocorograph/hub-agent 0.8.117 → 0.8.118

package/package.json

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

package/src/grok-stream-bridge.mjs

@@ -479,6 +479,10 @@ export class GrokStreamBridge extends EventEmitter {
     session.cancelledTurn = session.turnSeq
     this._clearTurnPermissions(session, session.turnSeq, true)
     session.client.notify('session/cancel', { sessionId: session.sessionId })
+    if (!session.promptInFlight && !session.dispatchingInput) {
+      this.emit('grok_turn_complete', { stream_id: session.stream_id, session_id: session.sessionId,
+        stopReason: 'cancelled', lastSeq: session.updateSeq })
+    }
   }
 
   permissionReply({ stream_id, request_id, result }) {

package/src/main.mjs

@@ -3794,10 +3794,11 @@ export async function dispatch(msg, ctx) {
           runInLane: scheduler && ((lane, fn) => scheduler.runInLane(lane, fn)),
           claudeBridge: ctx.claudeBridge,
           codexBridge: ctx.codexBridge,
+          grokBridge: ctx.grokBridge,
           claudeAttachOptions: () => resolveClaudeAttachOptions(ctx.config),
           available: (kind) => kind === "codex"
             ? codexAvailableForDispatch(ctx)
-            : ctx.availableClis?.includes("claude") === true,
+            : ctx.availableClis?.includes(kind) === true,
           logger: ctx.logger,
         })
         return
@@ -4990,6 +4991,7 @@ export async function dispatch(msg, ctx) {
               noteRestoreStop(ctx.sessionRestoreState, "claude", cwd)
               result.stopped = await ctx.claudeBridge.stopSessionsFor({ cwd, reason: "chat-stop" })
             } else if (msg.cli_kind === "grok") {
+              noteRestoreStop(ctx.sessionRestoreState, "grok", cwd)
               result.stopped = await ctx.grokBridge?.stopSessionsForCwd({ cwd, reason: "chat-stop" }) ?? 0
             } else {
               noteRestoreStop(ctx.sessionRestoreState, "codex", cwd)
@@ -5010,7 +5012,11 @@ export async function dispatch(msg, ctx) {
             }
           } else if (msg.cli_kind === "grok") {
             if (typeof msg.stream_id !== "string" || !msg.stream_id) result.error = "stream_id required"
-            else result.stopped = await ctx.grokBridge?.stopSessionForStream({ stream_id: msg.stream_id, reason: "chat-stop" }) ?? 0
+            else {
+              const streamCwd = ctx.grokBridge?.sessions?.get?.(msg.stream_id)?.cwd
+              if (streamCwd) noteRestoreStop(ctx.sessionRestoreState, "grok", streamCwd)
+              result.stopped = await ctx.grokBridge?.stopSessionForStream({ stream_id: msg.stream_id, reason: "chat-stop" }) ?? 0
+            }
           } else if (msg.cli_kind === "codex") {
             if (typeof msg.stream_id !== "string" || !msg.stream_id) result.error = "stream_id required"
             else {

package/src/session-restore.mjs

@@ -31,7 +31,7 @@ export function noteRestoreStop(state, cliKind, cwd) {
  * 受付状態と Hub の「接続ごとに 1 回」の送信がかみ合わず、復元が途中で止まる (2 巡目 blocker)。
  */
 export async function restoreSessions(message, {
-  state, claudeBridge, codexBridge, available, logger,
+  state, claudeBridge, codexBridge, grokBridge, available, logger,
   runInLane = (_lane, fn) => fn(), statCwd = stat,
   claudeAttachOptions = () => ({}),
 }) {
@@ -40,7 +40,7 @@ export async function restoreSessions(message, {
     return
   }
   state.accepted = true
-  const bridges = { claude: claudeBridge, codex: codexBridge }
+  const bridges = { claude: claudeBridge, codex: codexBridge, grok: grokBridge }
   const logSkip = (row, reason) => logger?.info?.({
     cli_kind: row?.cli_kind, cwd: row?.cwd, session_id: row?.session_id, reason,
   }, "agent.sessions.restore skipped")
@@ -48,7 +48,7 @@ export async function restoreSessions(message, {
     logSkip(null, "sessions must be an array")
     return
   }
-  const snapshot = () => describeLiveSessionsUnion({ claudeBridge, codexBridge }).map((s) => ({
+  const snapshot = () => describeLiveSessionsUnion({ claudeBridge, codexBridge, grokBridge }).map((s) => ({
     cli_kind: s.kind, cwd: s.cwd, session_id: s.session_id || s.thread_id,
   }))
   const same = (a, b) => a.cli_kind === b.cli_kind && a.cwd === b.cwd && a.session_id === b.session_id
@@ -73,7 +73,7 @@ export async function restoreSessions(message, {
       const live = [...current, ...selected.filter((r) => !current.some((s) => same(s, r)))]
       if (live.length >= WARM_TOTAL_MAX) break
       try {
-        if (!row || !["claude", "codex"].includes(row.cli_kind)) throw new Error("unknown CLI")
+        if (!row || !["claude", "codex", "grok"].includes(row.cli_kind)) throw new Error("unknown CLI")
         if (!bridges[row.cli_kind] || !available(row.cli_kind)) throw new Error("CLI unavailable")
         if (typeof row.session_id !== "string" || !row.session_id.trim()) throw new Error("empty session_id")
         if (typeof row.cwd !== "string" || !path.isAbsolute(row.cwd)) throw new Error("cwd must be absolute")
@@ -115,9 +115,11 @@ export async function restoreSessions(message, {
             // ここで欠けると復元した会話だけ権限モードが既定に落ちる (0.8.91 の実測)。
             ...(row.cli_kind === "claude"
               ? { ...claudeAttachOptions(), resumeSessionId: row.session_id }
-              // Codex は承認ポリシー / サンドボックスを thread 開始時にしか受け取らない。Hub が
-              // Cockpit の既定を行に載せる (空なら載せない = config.toml 既定。通常 attach と同じ)。
-              : {
+              : row.cli_kind === "grok"
+                ? { resumeSessionId: row.session_id }
+                // Codex は承認ポリシー / サンドボックスを thread 開始時にしか受け取らない。Hub が
+                // Cockpit の既定を行に載せる (空なら載せない = config.toml 既定。通常 attach と同じ)。
+                : {
                   resumeThreadId: row.session_id,
                   approvalPolicy: nonEmpty(row.approval_policy),
                   sandbox: nonEmpty(row.sandbox),