@cocorograph/hub-agent 0.7.89 → 0.7.90

package/package.json

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

package/src/claude-md-sync.mjs

@@ -26,12 +26,18 @@ import path from "node:path"
 import crypto from "node:crypto"
 
 const DEFAULT_HUB_API = "https://api.hub.cocorograph.com"
-const TOKEN_PATH = path.join(os.homedir(), ".claude", ".hub_token.json")
 const META_DIR = ".cockpit-sync"
-const META_FILE = "claude-md.json"
-const BASE_FILE = "CLAUDE.md.base"
 const BAK_KEEP = 3 // 通常 .bak と衝突 .bak それぞれ直近 3 件まで保持
 
+function configPaths(configFilename = "CLAUDE.md") {
+  const filename = configFilename === "AGENTS.md" ? "AGENTS.md" : "CLAUDE.md"
+  return {
+    filename,
+    metaFile: filename === "AGENTS.md" ? "agents-md.json" : "claude-md.json",
+    baseFile: `${filename}.base`,
+  }
+}
+
 async function readJsonOrNull(p) {
   try {
     const text = await fs.readFile(p, "utf-8")
@@ -41,9 +47,13 @@ async function readJsonOrNull(p) {
   }
 }
 
-async function loadAccessToken() {
-  const data = await readJsonOrNull(TOKEN_PATH)
-  return (data && typeof data.access === "string" && data.access) || null
+async function loadAccessToken(configFilename = "CLAUDE.md") {
+  const cliDir = configPaths(configFilename).filename === "AGENTS.md" ? ".codex" : ".claude"
+  const primary = await readJsonOrNull(path.join(os.homedir(), cliDir, ".hub_token.json"))
+  if (primary && typeof primary.access === "string" && primary.access) return primary.access
+  // 既存のhub-agent enrollmentは ~/.claude にtokenを持つため、Codex単独導入前の端末も救済する。
+  const legacy = await readJsonOrNull(path.join(os.homedir(), ".claude", ".hub_token.json"))
+  return (legacy && typeof legacy.access === "string" && legacy.access) || null
 }
 
 function sha256(s) {
@@ -133,29 +143,29 @@ async function putHubClaudeMd({ hubUrl, accessToken, dirName, body, fetchImpl, l
   }
 }
 
-async function readLocalClaudeMd(targetDir) {
+async function readLocalConfigMd(targetDir, configFilename) {
   try {
-    return await fs.readFile(path.join(targetDir, "CLAUDE.md"), "utf-8")
+    return await fs.readFile(path.join(targetDir, configPaths(configFilename).filename), "utf-8")
   } catch (err) {
     if (err?.code === "ENOENT") return null
     throw err
   }
 }
 
-async function writeLocalClaudeMd(targetDir, body) {
-  await fs.writeFile(path.join(targetDir, "CLAUDE.md"), body, "utf-8")
+async function writeLocalConfigMd(targetDir, body, configFilename) {
+  await fs.writeFile(path.join(targetDir, configPaths(configFilename).filename), body, "utf-8")
 }
 
-async function readMeta(targetDir) {
-  const metaPath = path.join(targetDir, META_DIR, META_FILE)
+async function readMeta(targetDir, configFilename) {
+  const metaPath = path.join(targetDir, META_DIR, configPaths(configFilename).metaFile)
   return await readJsonOrNull(metaPath)
 }
 
-async function writeMeta(targetDir, meta) {
+async function writeMeta(targetDir, meta, configFilename) {
   const metaDir = path.join(targetDir, META_DIR)
   await fs.mkdir(metaDir, { recursive: true })
   await fs.writeFile(
-    path.join(metaDir, META_FILE),
+    path.join(metaDir, configPaths(configFilename).metaFile),
     JSON.stringify(meta, null, 2),
     "utf-8",
   )
@@ -171,11 +181,11 @@ async function writeMeta(targetDir, meta) {
  * meta(claude-md.json) は hash と updated_at しか持たないため、本文そのものが要る
  * 3-way merge の用途ではこのファイルが必要。
  */
-async function writeBaseBody(targetDir, body) {
+async function writeBaseBody(targetDir, body, configFilename) {
   if (body == null) return
   const metaDir = path.join(targetDir, META_DIR)
   await fs.mkdir(metaDir, { recursive: true })
-  await fs.writeFile(path.join(metaDir, BASE_FILE), body, "utf-8")
+  await fs.writeFile(path.join(metaDir, configPaths(configFilename).baseFile), body, "utf-8")
 }
 
 /**
@@ -184,11 +194,12 @@ async function writeBaseBody(targetDir, body) {
  *
  * @param {'normal'|'conflict'} kind バックアップ種別（命名 prefix）
  */
-async function backupLocalClaudeMd(targetDir, body, kind) {
+async function backupLocalConfigMd(targetDir, body, kind, configFilename) {
   if (body == null) return
   const metaDir = path.join(targetDir, META_DIR)
   await fs.mkdir(metaDir, { recursive: true })
-  const prefix = kind === "conflict" ? "CLAUDE.md.conflict" : "CLAUDE.md"
+  const filename = configPaths(configFilename).filename
+  const prefix = kind === "conflict" ? `${filename}.conflict` : filename
   const bakName = makeBakName(prefix)
   await fs.writeFile(path.join(metaDir, bakName), body, "utf-8")
   // 同 prefix の .bak を新しい順に BAK_KEEP 件まで残す。
@@ -224,12 +235,13 @@ export async function syncClaudeMdWithHub({
   accessToken,
   logger,
   fetchImpl,
+  configFilename = "CLAUDE.md",
 } = {}) {
   if (!targetDir) throw new Error("syncClaudeMdWithHub requires targetDir")
   if (!dirName) throw new Error("syncClaudeMdWithHub requires dirName")
 
   const token =
-    accessToken === undefined ? await loadAccessToken() : accessToken || null
+    accessToken === undefined ? await loadAccessToken(configFilename) : accessToken || null
   if (!token) {
     logger?.info?.({ dirName }, "syncClaudeMdWithHub: no access token, skip")
     return { action: "skipped", reason: "no-token" }
@@ -252,11 +264,11 @@ export async function syncClaudeMdWithHub({
   const hubUpdatedAt = hub.claude_md_updated_at || null
 
   // 2) ローカル CLAUDE.md を読み、現在 hash を計算
-  const localBody = await readLocalClaudeMd(targetDir)
+  const localBody = await readLocalConfigMd(targetDir, configFilename)
   const localCurrentHash = localBody == null ? null : sha256(localBody)
 
   // 3) メタファイルを読み、前回 sync の状態を取得
-  const meta = await readMeta(targetDir)
+  const meta = await readMeta(targetDir, configFilename)
 
   // Hub が一度も保存されていない（空本文 + updated_at が null）プロジェクトは
   // 「Hub UI で意図的に未設定にしている」運用（テナント標準 CLAUDE.md に任せる等）の
@@ -276,7 +288,12 @@ export async function syncClaudeMdWithHub({
   if (!meta) {
     // 初回 sync。
     hubChanged = !!hubBody
-    if (localBody == null) {
+    if (configPaths(configFilename).filename === "AGENTS.md") {
+      // Codex の AGENTS.md は既存リポジトリにも通常存在し、案件正本とは別の
+      // ローカル規約を含む。初回に terminal-wins で Project.claude_md を壊さないよう、
+      // Hub 正本を優先して pull（既存 AGENTS.md は .bak に退避）する。
+      localChanged = false
+    } else if (localBody == null) {
       localChanged = false
     } else {
       localChanged = !!localBody // 非空なら端末側に何かある＝衝突候補
@@ -300,15 +317,15 @@ export async function syncClaudeMdWithHub({
 
   if (hubChanged && !localChanged) {
     // pull: ローカルを .bak 退避 → Hub の本文で上書き
-    await backupLocalClaudeMd(targetDir, localBody, "normal")
-    await writeLocalClaudeMd(targetDir, hubBody)
+    await backupLocalConfigMd(targetDir, localBody, "normal", configFilename)
+    await writeLocalConfigMd(targetDir, hubBody, configFilename)
     await writeMeta(targetDir, {
       lastSyncedHubUpdatedAt: hubUpdatedAt,
       lastSyncedHash: hubHash || sha256(hubBody),
       lastSyncedAt: nowIso(),
-    })
+    }, configFilename)
     // 3-way merge 用 base: pull 直後はローカル == Hub なので Hub 本文を base に。
-    await writeBaseBody(targetDir, hubBody)
+    await writeBaseBody(targetDir, hubBody, configFilename)
     logger?.info?.({ dirName }, "syncClaudeMdWithHub: pull")
     return { action: "pull" }
   }
@@ -334,17 +351,17 @@ export async function syncClaudeMdWithHub({
       lastSyncedHubUpdatedAt: nowIso(),
       lastSyncedHash: localCurrentHash,
       lastSyncedAt: nowIso(),
-    })
+    }, configFilename)
     // 3-way merge 用 base: push 直後は Hub の正本がローカルと一致するので、
     // 次回の base は今 push した本文 (= localBody)。
-    await writeBaseBody(targetDir, localBody || "")
+    await writeBaseBody(targetDir, localBody || "", configFilename)
     logger?.info?.({ dirName }, "syncClaudeMdWithHub: push")
     return { action: "push" }
   }
 
   // hubChanged && localChanged → 衝突。端末側を勝者にして Hub に PUT。
   // Hub の取り込み内容は .bak.conflict に退避（後で人手マージできるよう）。
-  await backupLocalClaudeMd(targetDir, hubBody, "conflict")
+  await backupLocalConfigMd(targetDir, hubBody, "conflict", configFilename)
   const ok = await putHubClaudeMd({
     hubUrl: url,
     accessToken: token,
@@ -361,9 +378,9 @@ export async function syncClaudeMdWithHub({
     lastSyncedHubUpdatedAt: nowIso(),
     lastSyncedHash: localCurrentHash,
     lastSyncedAt: nowIso(),
-  })
+  }, configFilename)
   // 3-way merge 用 base: conflict push 後の Hub 正本は端末側本文 (= localBody)。
-  await writeBaseBody(targetDir, localBody || "")
+  await writeBaseBody(targetDir, localBody || "", configFilename)
   logger?.warn?.(
     { dirName },
     "syncClaudeMdWithHub: conflict (terminal wins); hub body saved to .bak.conflict",
@@ -374,7 +391,7 @@ export async function syncClaudeMdWithHub({
 // メタ操作・ハッシュ計算は ensureClaudeMd 側 (Hub pull 初回配信) でも使うため
 // named export する。同じファイルパス・同じスキーマで管理することで、初回配信と
 // 以降の sync で食い違いを起こさない。
-export { sha256, readMeta, writeMeta, writeBaseBody, nowIso }
+export { sha256, readMeta, writeMeta, writeBaseBody, nowIso, configPaths }
 
 // 内部テスト用エクスポート
 export const _internals = {
@@ -382,7 +399,7 @@ export const _internals = {
   readMeta,
   writeMeta,
   writeBaseBody,
-  backupLocalClaudeMd,
+  backupLocalConfigMd,
   BAK_KEEP,
-  BASE_FILE,
+  configPaths,
 }

package/src/claude-md.mjs

@@ -27,7 +27,6 @@ import {
 } from "./claude-md-sync.mjs"
 
 const DEFAULT_HUB_API = "https://api.hub.cocorograph.com"
-const TOKEN_PATH = path.join(os.homedir(), ".claude", ".hub_token.json")
 
 async function readJsonOrNull(p) {
   try {
@@ -38,9 +37,12 @@ async function readJsonOrNull(p) {
   }
 }
 
-async function loadAccessToken() {
-  const data = await readJsonOrNull(TOKEN_PATH)
-  return (data && typeof data.access === "string" && data.access) || null
+async function loadAccessToken(configFilename = "CLAUDE.md") {
+  const cliDir = configFilename === "AGENTS.md" ? ".codex" : ".claude"
+  const primary = await readJsonOrNull(path.join(os.homedir(), cliDir, ".hub_token.json"))
+  if (primary && typeof primary.access === "string" && primary.access) return primary.access
+  const legacy = await readJsonOrNull(path.join(os.homedir(), ".claude", ".hub_token.json"))
+  return (legacy && typeof legacy.access === "string" && legacy.access) || null
 }
 
 /**
@@ -134,7 +136,7 @@ function isGitHubSlug(repoUrl) {
   return /^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(repoUrl)
 }
 
-function renderRepositorySection(repositories, dirName = "") {
+function renderRepositorySection(repositories, dirName = "", cliKind = "claude") {
   if (!Array.isArray(repositories) || repositories.length === 0) return ""
 
   const lines = ["## Cockpit クローンレス開発フロー", ""]
@@ -211,7 +213,7 @@ function renderRepositorySection(repositories, dirName = "") {
         "# 秘密鍵を ~/.ssh/hub_deploy/ に書き出し、ssh コマンドだけ受け取る",
       )
       lines.push(
-        `python3 ~/.claude/scripts/hub_helper.py deploy_creds ${dirName || "<dir_name>"} --env ${envExample}`,
+        `python3 ~/.${cliKind === "codex" ? "codex" : "claude"}/scripts/hub_helper.py deploy_creds ${dirName || "<dir_name>"} --env ${envExample}`,
       )
       lines.push("```")
       lines.push("")
@@ -235,7 +237,7 @@ function renderRepositorySection(repositories, dirName = "") {
   return lines.join("\n")
 }
 
-function renderWithDirector(dirName, director, repositorySection = "") {
+function renderWithDirector(dirName, director, repositorySection = "", configFilename = "CLAUDE.md") {
   const fm = director?.frontmatter || {}
   const client = (fm.client || "").trim()
   const domain = (fm.domain || "").trim()
@@ -245,9 +247,9 @@ function renderWithDirector(dirName, director, repositorySection = "") {
   const googleDrive = (fm.google_drive || "").trim()
 
   const lines = [
-    "# CLAUDE.md",
+    `# ${configFilename}`,
     "",
-    "This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.",
+    `This file provides guidance to ${configFilename === "AGENTS.md" ? "Codex" : "Claude Code"} when working with code in this repository.`,
     "",
     "## プロジェクト概要",
     "",
@@ -291,17 +293,17 @@ function renderWithDirector(dirName, director, repositorySection = "") {
     "開発手順・SSH 接続情報・横断ナレッジへのポインタなど、より詳細な内容は",
   )
   lines.push(
-    "このリポジトリで `claude` を起動して `/init-claude-md` スキルを実行してください。",
+    `このリポジトリで ${configFilename === "AGENTS.md" ? "`codex` を起動して `/init-Codex-md`" : "`claude` を起動して `/init-claude-md`"} スキルを実行してください。`,
   )
   lines.push("")
   return lines.join("\n")
 }
 
-function renderPlaceholder(dirName, repositorySection = "") {
+function renderPlaceholder(dirName, repositorySection = "", configFilename = "CLAUDE.md") {
   const sections = [
-    "# CLAUDE.md",
+    `# ${configFilename}`,
     "",
-    "This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.",
+    `This file provides guidance to ${configFilename === "AGENTS.md" ? "Codex" : "Claude Code"} when working with code in this repository.`,
     "",
     "## 関連",
     "",
@@ -315,7 +317,7 @@ function renderPlaceholder(dirName, repositorySection = "") {
     "## 初期化",
     "",
     "これは hub-agent の自動生成プレースホルダです。Hub director も未作成です。",
-    "詳細を生成するには、このリポジトリで `claude` を起動して `/init-claude-md` スキルを実行してください。",
+    `詳細を生成するには、このリポジトリで ${configFilename === "AGENTS.md" ? "`codex` を起動して `/init-Codex-md`" : "`claude` を起動して `/init-claude-md`"} スキルを実行してください。`,
     "",
   )
   return sections.join("\n")
@@ -344,12 +346,16 @@ export async function ensureClaudeMd({
   accessToken,
   logger,
   fetchImpl,
+  configFilename = "CLAUDE.md",
 } = {}) {
   if (!targetDir) throw new Error("ensureClaudeMd requires targetDir")
   if (!dirName) throw new Error("ensureClaudeMd requires dirName")
-  const claudeMdPath = path.join(targetDir, "CLAUDE.md")
+  const configMdPath = path.join(
+    targetDir,
+    configFilename === "AGENTS.md" ? "AGENTS.md" : "CLAUDE.md",
+  )
   try {
-    await fs.access(claudeMdPath)
+    await fs.access(configMdPath)
     return { written: false, source: "existing" }
   } catch {
     /* not found → continue */
@@ -358,7 +364,7 @@ export async function ensureClaudeMd({
   // accessToken は明示 null (テスト用) で「token を読まない」を選べるようにする。
   // undefined のときだけ ~/.claude/.hub_token.json にフォールバックする。
   const token =
-    accessToken === undefined ? await loadAccessToken() : accessToken || null
+    accessToken === undefined ? await loadAccessToken(configFilename) : accessToken || null
   const url = hubUrl || DEFAULT_HUB_API
 
   // Stage 3: Hub に正本があればそれを最優先で書き込み、メタも初期化する
@@ -374,17 +380,17 @@ export async function ensureClaudeMd({
     const hubBody = hub?.claude_md || ""
     const hubInitialized = !!hub?.claude_md_updated_at
     if (hubInitialized && hubBody) {
-      await fs.writeFile(claudeMdPath, hubBody, "utf-8")
+      await fs.writeFile(configMdPath, hubBody, "utf-8")
       await writeMeta(targetDir, {
         lastSyncedHubUpdatedAt: hub.claude_md_updated_at,
         lastSyncedHash: hub.claude_md_hash || sha256(hubBody),
         lastSyncedAt: nowIso(),
-      })
+      }, configFilename)
       // 初回 pull 直後は base = Hub 本文。以降の session-end 3-way merge の入力。
-      await writeBaseBody(targetDir, hubBody)
+      await writeBaseBody(targetDir, hubBody, configFilename)
       logger?.info?.(
-        { dirName, claudeMdPath },
-        "wrote CLAUDE.md from Hub project claude_md (initial sync)",
+        { dirName, configMdPath },
+        "wrote project instruction file from Hub project claude_md (initial sync)",
       )
       return { written: true, source: "hub" }
     }
@@ -399,16 +405,17 @@ export async function ensureClaudeMd({
       ])
     : [null, []]
 
-  const repositorySection = renderRepositorySection(repositories, dirName)
+  const cliKind = configFilename === "AGENTS.md" ? "codex" : "claude"
+  const repositorySection = renderRepositorySection(repositories, dirName, cliKind)
   const body = director
-    ? renderWithDirector(dirName, director, repositorySection)
-    : renderPlaceholder(dirName, repositorySection)
+    ? renderWithDirector(dirName, director, repositorySection, configFilename)
+    : renderPlaceholder(dirName, repositorySection, configFilename)
   const source = director ? "director" : "placeholder"
 
-  await fs.writeFile(claudeMdPath, body, "utf-8")
+  await fs.writeFile(configMdPath, body, "utf-8")
   logger?.info?.(
-    { dirName, claudeMdPath, source },
-    "wrote CLAUDE.md for new workspace dir",
+    { dirName, configMdPath, source },
+    "wrote project instruction file for new workspace dir",
   )
   return { written: true, source }
 }

package/src/tmux.mjs

@@ -78,6 +78,18 @@ export function isUnderHubProjectsBase(p) {
   return true
 }
 
+/**
+ * Hub workspace またはその worktree から、案件指示ファイルを置く親 workspace を返す。
+ * worktree 内の AGENTS.md / CLAUDE.md を別管理すると Hub 正本が分岐するため、
+ * `<workspace>/.claude/worktrees/<name>` で起動しても常に `<workspace>` を対象にする。
+ */
+export function projectInstructionDir(p) {
+  if (!isUnderHubProjectsBase(p)) return path.resolve(p)
+  const base = path.resolve(hubProjectsBase())
+  const [workspace] = path.relative(base, path.resolve(p)).split(path.sep)
+  return path.join(base, workspace)
+}
+
 /**
  * git branch 名から worktree dir 名 (= tmux session 名) を導出する。
  * 例: "feature/multi-area" -> "feature-multi-area"
@@ -788,15 +800,18 @@ export async function createSession(name, cwd, opts = {}) {
   //   何もしない（テナント標準 CLAUDE.md の運用を尊重する）。
   // どちらも失敗しても session 起動自体は止めない (warn のみ)。
   if (isUnderHubProjectsBase(resolvedCwd)) {
-    const dirName = path.basename(resolvedCwd)
+    const instructionDir = projectInstructionDir(resolvedCwd)
+    const dirName = path.basename(instructionDir)
+    const configFilename = opts.cliKind === "codex" ? "AGENTS.md" : "CLAUDE.md"
     try {
       await ensureClaudeMd({
-        targetDir: resolvedCwd,
+        targetDir: instructionDir,
         dirName,
         hubUrl: opts.hubUrl,
         accessToken: opts.hubAccessToken,
         logger: opts.logger,
         fetchImpl: opts.fetchImpl,
+        configFilename,
       })
     } catch (err) {
       opts.logger?.warn?.(
@@ -806,12 +821,13 @@ export async function createSession(name, cwd, opts = {}) {
     }
     try {
       const syncResult = await syncClaudeMdWithHub({
-        targetDir: resolvedCwd,
+        targetDir: instructionDir,
         dirName,
         hubUrl: opts.hubUrl,
         accessToken: opts.hubAccessToken,
         logger: opts.logger,
         fetchImpl: opts.fetchImpl,
+        configFilename,
       })
       opts.logger?.debug?.(
         { session: name, dirName, sync: syncResult },