@cocorograph/hub-agent 0.5.2 → 0.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocorograph/hub-agent",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Hub Hosted Cockpit のローカル常駐 agent。Hub と outbound WSS で接続し、ローカルの tmux/pty を中継する。",
   "type": "module",
   "license": "UNLICENSED",

package/src/main.mjs

@@ -10,6 +10,10 @@
  *
  * 仕様書: ナレッジ/インフラ/cockpit-hub-hosted-integration-spec (id=6080)
  */
+import { readFile } from "node:fs/promises"
+import os from "node:os"
+import path from "node:path"
+
 import pino from "pino"
 
 import { readConfig } from "./config.mjs"
@@ -29,6 +33,24 @@ import { getSessionUsages, getUsage } from "./usage.mjs"
 
 const logger = pino({ name: "hub-agent" })
 
+const BUNDLE_MANIFEST_PATH =
+  process.env.HUB_BUNDLE_MANIFEST ||
+  path.join(os.homedir(), ".claude", "scripts", "manifest.json")
+
+/**
+ * `~/.claude/scripts/manifest.json` から Hub AI bundle の version を読む。
+ * 未セットアップなら null を返す。
+ */
+async function readBundleVersion() {
+  try {
+    const text = await readFile(BUNDLE_MANIFEST_PATH, "utf-8")
+    const data = JSON.parse(text)
+    return typeof data?.version === "string" ? data.version : null
+  } catch {
+    return null
+  }
+}
+
 export async function startDaemon({ version, ptyModule } = {}) {
   const config = await readConfig()
   if (!config) {
@@ -45,7 +67,12 @@ export async function startDaemon({ version, ptyModule } = {}) {
   const resolvedPty = ptyModule || (await import("node-pty"))
   const ptyBridge = new PtyBridge({ ptyModule: resolvedPty, logger, plugins })
 
-  const client = new WsClient(config, { logger, version })
+  const bundleVersion = await readBundleVersion()
+  if (bundleVersion) {
+    logger.info({ bundleVersion }, "hub bundle version detected")
+  }
+
+  const client = new WsClient(config, { logger, version, bundleVersion })
 
   // EventEmitter の 'error' は listener が無いと process が落ちる。
   // ws-client は close 側で reconnect を予約しているので、ここでは log だけ。

package/src/tmux.mjs

@@ -14,13 +14,64 @@
  * 仕様書: ナレッジ/インフラ/cockpit-hub-hosted-integration-spec (id=6080)
  */
 import { execFile } from "node:child_process"
+import fs from "node:fs/promises"
+import os from "node:os"
+import path from "node:path"
 import { promisify } from "node:util"
 
 import { detectSessionState } from "./state.mjs"
+import { getSessionUsages } from "./usage.mjs"
 
 const execFileP = promisify(execFile)
 
 const DEFAULT_TMUX_BIN = "tmux"
+
+const HUB_PROJECTS_BASE =
+  process.env.HUB_PROJECTS_BASE || path.join(os.homedir(), "hub", "projects")
+
+function sanitizeTmuxName(s) {
+  return s.replace(/[.:]/g, "-")
+}
+
+/**
+ * `~/hub/projects/<project>/.claude/worktrees/<wt>` を走査し、
+ * worktree_session_name → parent_session_name の Map を返す。
+ *
+ * - 各 worktree dir は `.git` ファイル/ディレクトリの存在で git worktree と判定
+ * - session 名はディレクトリ名を sanitize したもの (tmux session 名命名規則)
+ *
+ * 移植元: D00000_cockpit/webapp/lib/workspaces.ts (findWorktrees)
+ */
+async function buildWorktreeParentMap() {
+  const out = new Map()
+  let projects
+  try {
+    projects = await fs.readdir(HUB_PROJECTS_BASE, { withFileTypes: true })
+  } catch {
+    return out
+  }
+  for (const p of projects) {
+    if (!p.isDirectory() || p.name.startsWith(".")) continue
+    const wtBase = path.join(HUB_PROJECTS_BASE, p.name, ".claude", "worktrees")
+    let wts
+    try {
+      wts = await fs.readdir(wtBase, { withFileTypes: true })
+    } catch {
+      continue
+    }
+    for (const wt of wts) {
+      if (!wt.isDirectory() || wt.name.startsWith(".")) continue
+      try {
+        // .git が存在する = 正規 git worktree
+        await fs.stat(path.join(wtBase, wt.name, ".git"))
+      } catch {
+        continue
+      }
+      out.set(sanitizeTmuxName(wt.name), sanitizeTmuxName(p.name))
+    }
+  }
+  return out
+}
 const DEFAULT_CLAUDE_CMD =
   process.env.HUB_CLAUDE_CMD ||
   "claude --continue --model claude-opus-4-7 --permission-mode auto || claude --model claude-opus-4-7 --permission-mode auto"
@@ -109,18 +160,39 @@ export async function listSessions(opts = {}) {
       }
     })
 
-  // state + cwd を並列付与
+  // state + cwd + worktree 親判定 + statusLine 由来 context% を並列付与
+  // statusLine の `used_percentage` を context_pct (USED %) として使う。
+  // pane 解析 (state.detectSessionState) はフォーマット変動に脆いので、
+  // statusLine cache がある cwd では優先採用する。
+  const [wtParentMap, sessionUsages] = await Promise.all([
+    buildWorktreeParentMap(),
+    getSessionUsages().catch(() => []),
+  ])
+  // cwd → context_pct の lookup (同一 cwd で複数 session_id ある場合は最新 mtime 優先)
+  const ctxByCwd = new Map()
+  for (const u of sessionUsages) {
+    const prev = ctxByCwd.get(u.cwd)
+    if (!prev || u.updatedAtMs > prev.updatedAtMs) {
+      ctxByCwd.set(u.cwd, { contextPercent: u.contextPercent, updatedAtMs: u.updatedAtMs })
+    }
+  }
+
   return Promise.all(
     base.map(async (s) => {
       const [state, cwd] = await Promise.all([
         detectSessionState(s.name, opts),
         getSessionCwd(s.name, opts),
       ])
+      // statusLine 由来 context% を最優先 (USED %), なければ pane 解析の fallback
+      const fromStatusLine = cwd ? ctxByCwd.get(cwd)?.contextPercent : null
+      const context_pct =
+        typeof fromStatusLine === "number" ? fromStatusLine : state.context_pct
       return {
         ...s,
         status: state.status,
-        context_pct: state.context_pct,
+        context_pct,
         cwd,
+        parent_session_name: wtParentMap.get(s.name) || null,
       }
     }),
   )

package/src/ws-client.mjs

@@ -20,13 +20,14 @@ const MAX_BACKOFF_MS = 30_000
 export class WsClient extends EventEmitter {
   /**
    * @param {{ hub_url: string, agent_id: string, agent_token: string }} config
-   * @param {{ logger?: import('pino').Logger, version?: string }} opts
+   * @param {{ logger?: import('pino').Logger, version?: string, bundleVersion?: string|null, hostname?: string }} opts
    */
   constructor(config, opts = {}) {
     super()
     this.config = config
     this.logger = opts.logger
     this.version = opts.version || "0.1.0"
+    this.bundleVersion = opts.bundleVersion || null
     this.hostname = opts.hostname || os.hostname()
     this.ws = null
     this.heartbeatTimer = null
@@ -56,6 +57,7 @@ export class WsClient extends EventEmitter {
         agent_id: this.config.agent_id,
         hostname: this.hostname,
         version: this.version,
+        bundle_version: this.bundleVersion,
       })
       this._startHeartbeat()
       this.emit("open")
@@ -142,6 +144,7 @@ export class WsClient extends EventEmitter {
       const ok = this._sendJson({
         type: "heartbeat",
         uptime_sec: Math.floor((Date.now() - this.startedAt) / 1000),
+        bundle_version: this.bundleVersion,
       })
       if (!ok) {
         this.logger?.warn("heartbeat send failed, forcing reconnect")