@cocorograph/hub-agent 0.5.3 → 0.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocorograph/hub-agent",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "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"
@@ -20,6 +24,7 @@ import { listSkills } from "./skills.mjs"
 import { listSessionStates } from "./state.mjs"
 import {
   createSession as createTmuxSession,
+  createWorktreeDir,
   execTmux,
   killManySessions,
   killSession as killTmuxSession,
@@ -29,6 +34,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 +68,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 だけ。
@@ -286,6 +314,53 @@ async function dispatch(msg, ctx) {
         }
         return
       }
+      case "worktree.create": {
+        // body: { request_id, dir, branch, claude_cmd? }
+        const dir = (msg.dir || "").trim()
+        const branch = (msg.branch || "").trim()
+        if (!dir || !branch) {
+          ctx.client.send({
+            type: "worktree.create.result",
+            request_id: msg.request_id,
+            ok: false,
+            error: "dir and branch required",
+          })
+          return
+        }
+        if (!/^[A-Za-z0-9._\-/]+$/.test(branch) || branch.startsWith("-")) {
+          ctx.client.send({
+            type: "worktree.create.result",
+            request_id: msg.request_id,
+            ok: false,
+            error: "invalid branch name",
+          })
+          return
+        }
+        try {
+          const { wtName, wtPath, createdBranch } = await createWorktreeDir(dir, branch)
+          // worktree dir で tmux session を作成 (claude_cmd は createSession の default)
+          await createTmuxSession(wtName, wtPath, {
+            claudeCmd: typeof msg.claude_cmd === "string" ? msg.claude_cmd : undefined,
+          })
+          ctx.client.send({
+            type: "worktree.create.result",
+            request_id: msg.request_id,
+            ok: true,
+            wt_name: wtName,
+            wt_path: wtPath,
+            branch,
+            created_branch: createdBranch,
+          })
+        } catch (err) {
+          ctx.client.send({
+            type: "worktree.create.result",
+            request_id: msg.request_id,
+            ok: false,
+            error: err.message,
+          })
+        }
+        return
+      }
       case "tmux.kill_session": {
         const names = Array.isArray(msg.session_names)
           ? msg.session_names

package/src/tmux.mjs

@@ -20,6 +20,7 @@ import path from "node:path"
 import { promisify } from "node:util"
 
 import { detectSessionState } from "./state.mjs"
+import { getSessionUsages } from "./usage.mjs"
 
 const execFileP = promisify(execFile)
 
@@ -32,6 +33,72 @@ function sanitizeTmuxName(s) {
   return s.replace(/[.:]/g, "-")
 }
 
+/**
+ * git branch 名から worktree dir 名 (= tmux session 名) を導出する。
+ * 例: "feature/multi-area" -> "feature-multi-area"
+ *     "fix.typo:v2"        -> "fix-typo-v2"
+ *
+ * 移植元: D00000_cockpit/webapp/lib/worktrees.ts (sanitizeBranchToWtName)
+ */
+export function sanitizeBranchToWtName(branch) {
+  return branch
+    .replace(/[\s/:.]+/g, "-")
+    .replace(/[^A-Za-z0-9_-]/g, "")
+    .replace(/^-+|-+$/g, "")
+}
+
+async function branchExists(repoDir, branch) {
+  try {
+    await execFileP("git", [
+      "-C",
+      repoDir,
+      "show-ref",
+      "--verify",
+      "--quiet",
+      `refs/heads/${branch}`,
+    ])
+    return true
+  } catch {
+    return false
+  }
+}
+
+/**
+ * `<repoDir>/.claude/worktrees/<wtName>` に worktree を作成する。
+ * branch が既存ならそれを checkout、無ければ `-b` で新規作成。
+ *
+ * 移植元: D00000_cockpit/webapp/lib/worktrees.ts (createWorktree)
+ */
+export async function createWorktreeDir(parentDir, branch) {
+  const repoDir = path.resolve(HUB_PROJECTS_BASE, parentDir)
+  if (repoDir !== HUB_PROJECTS_BASE && !repoDir.startsWith(HUB_PROJECTS_BASE + path.sep)) {
+    throw new Error("dir outside projects base")
+  }
+  // .git の存在チェック (file or dir)
+  try {
+    await fs.stat(path.join(repoDir, ".git"))
+  } catch {
+    throw new Error("not a git repository")
+  }
+  const wtName = sanitizeBranchToWtName(branch)
+  if (!wtName) throw new Error("invalid branch name")
+  const wtPath = path.join(repoDir, ".claude", "worktrees", wtName)
+  try {
+    await fs.stat(wtPath)
+    throw new Error("worktree already exists")
+  } catch (err) {
+    if (err.message === "worktree already exists") throw err
+    // ENOENT は期待動作
+  }
+  const exists = await branchExists(repoDir, branch)
+  if (exists) {
+    await execFileP("git", ["-C", repoDir, "worktree", "add", wtPath, branch])
+  } else {
+    await execFileP("git", ["-C", repoDir, "worktree", "add", "-b", branch, wtPath])
+  }
+  return { wtName, wtPath, createdBranch: !exists }
+}
+
 /**
  * `~/hub/projects/<project>/.claude/worktrees/<wt>` を走査し、
  * worktree_session_name → parent_session_name の Map を返す。
@@ -159,20 +226,38 @@ export async function listSessions(opts = {}) {
       }
     })
 
-  // state + cwd + worktree 親判定を並列付与
-  const wtParentMap = await buildWorktreeParentMap()
+  // 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,
-        // worktree session の場合は親 workspace の session 名を入れる (旧 cockpit webapp 互換)
         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")