@cocorograph/hub-agent 0.5.4 → 0.5.5

package/package.json

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

package/src/main.mjs

@@ -24,6 +24,7 @@ import { listSkills } from "./skills.mjs"
 import { listSessionStates } from "./state.mjs"
 import {
   createSession as createTmuxSession,
+  createWorktreeDir,
   execTmux,
   killManySessions,
   killSession as killTmuxSession,
@@ -313,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

@@ -33,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 を返す。