@cocorograph/hub-agent 0.5.2 → 0.5.3

package/package.json

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

package/src/tmux.mjs

@@ -14,6 +14,9 @@
  * 仕様書: ナレッジ/インフラ/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"
@@ -21,6 +24,53 @@ import { detectSessionState } from "./state.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,7 +159,8 @@ export async function listSessions(opts = {}) {
       }
     })
 
-  // state + cwd を並列付与
+  // state + cwd + worktree 親判定を並列付与
+  const wtParentMap = await buildWorktreeParentMap()
   return Promise.all(
     base.map(async (s) => {
       const [state, cwd] = await Promise.all([
@@ -121,6 +172,8 @@ export async function listSessions(opts = {}) {
         status: state.status,
         context_pct: state.context_pct,
         cwd,
+        // worktree session の場合は親 workspace の session 名を入れる (旧 cockpit webapp 互換)
+        parent_session_name: wtParentMap.get(s.name) || null,
       }
     }),
   )