@cocorograph/hub-agent 0.4.1 → 0.5.0

package/bin/hub-agent.mjs

@@ -19,6 +19,7 @@ import { Command } from "commander"
 
 import { hasConfig, readConfig } from "../src/config.mjs"
 import { enroll } from "../src/enroll.mjs"
+import { syncBundle } from "../src/hub-bundle.mjs"
 import {
   installPlugin,
   listInstallableExamples,
@@ -38,10 +39,11 @@ program
 
 program
   .command("enroll <enrollment_token>")
-  .description("Hub から発行された enrollment token で agent を登録する")
+  .description("Hub から発行された enrollment token で agent を登録する + Hub AI bundle 同期")
   .option("--hub-url <url>", "Hub の base URL (default: $HUB_URL or https://hub.cocorograph.com)")
   .option("--hostname <name>", "Hub に表示するホスト名 (default: os.hostname())")
   .option("--force", "既存設定を上書きする")
+  .option("--no-bundle", "Hub AI bundle 同期 (~/.claude/ への展開) をスキップ")
   .action(async (token, opts) => {
     try {
       const r = await enroll(token, {
@@ -49,14 +51,45 @@ program
         hostname: opts.hostname,
         version: pkg.version,
         force: !!opts.force,
+        skipBundle: opts.bundle === false,
       })
       console.log(`enroll succeeded: agent_id=${r.agent_id} primary=${r.is_primary} hub=${r.hub_url}`)
+      if (r.bundle?.error) {
+        console.error(`hub bundle sync warning: ${r.bundle.error}`)
+      } else if (r.bundle) {
+        console.log(
+          `hub bundle synced: version=${r.bundle.version} written=${r.bundle.written?.length ?? 0} ` +
+          `skipped_same=${r.bundle.skipped_same?.length ?? 0}`,
+        )
+      }
     } catch (err) {
       console.error(`enroll failed: ${err.message}`)
       process.exit(1)
     }
   })
 
+program
+  .command("sync-bundle")
+  .description("Hub AI bundle を手動で再同期 (CLAUDE.md / scripts / hooks / projects.json を ~/.claude/ に展開)")
+  .action(async () => {
+    try {
+      const cfg = await readConfig()
+      if (!cfg) {
+        console.error("not enrolled (run `hub-agent enroll <token>` first)")
+        process.exit(2)
+      }
+      const r = await syncBundle({
+        hubUrl: cfg.hub_url,
+        agentId: cfg.agent_id,
+        agentToken: cfg.agent_token,
+      })
+      console.log(`hub bundle synced: version=${r.version} written=${r.written.length} skipped_same=${r.skipped_same.length}`)
+    } catch (err) {
+      console.error(`sync-bundle failed: ${err.message}`)
+      process.exit(1)
+    }
+  })
+
 program
   .command("start")
   .description("daemon を起動して Hub と WSS 接続する")

package/package.json

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

package/src/enroll.mjs

@@ -59,10 +59,31 @@ export async function enroll(enrollmentToken, opts = {}) {
     hub_url: hubUrl,
   })
 
+  // Hub AI bundle を続けて同期する (CLAUDE.md / scripts / hooks / projects.json
+  // を ~/.claude/ に展開)。失敗しても enroll 自体は成功扱いにする (--no-bundle
+  // で skip 可能)。
+  let bundleResult = null
+  if (!opts.skipBundle) {
+    try {
+      const { syncBundle } = await import("./hub-bundle.mjs")
+      bundleResult = await syncBundle({
+        hubUrl,
+        agentId: data.agent_id,
+        agentToken: data.agent_token,
+        logger: opts.logger,
+        fetchImpl,
+      })
+    } catch (err) {
+      opts.logger?.warn?.({ err: err.message }, "hub bundle sync failed (enroll still ok)")
+      bundleResult = { error: err.message }
+    }
+  }
+
   return {
     agent_id: data.agent_id,
     is_primary: !!data.is_primary,
     hub_url: hubUrl,
+    bundle: bundleResult,
   }
 }
 

package/src/hub-bundle.mjs

@@ -0,0 +1,242 @@
+/**
+ * Hub AI bundle 同期 (Sprint M)。
+ *
+ * Hub backend の `GET /api/knowledge/admin/hub-ai/setup-bundle/` を agent token
+ * 認証で叩き、レスポンスの files[] を `~/.claude/<path>` に配置する。
+ * MCP `setup_hub_ai_environment` ツールがやっているのと同じことを CLI 経由で
+ * 実行する形。
+ *
+ * 既存ユーザーで再実行しても idempotent:
+ *  - CLAUDE.md は `<!-- BEGIN HUB-AI-RULES -->` 〜 `<!-- END HUB-AI-RULES -->`
+ *    マーカー間のみ置換 (Hub backend 側の `_build_files` 経由で content が
+ *    そのまま入っているので、CLAUDE.md の場合は marker 範囲だけ replace する)
+ *  - 他のファイルは内容差分がある時のみ書き換え (mtime 比較ではなく hash 比較)
+ *  - post_install_commands は冪等なシェルコマンドを Hub manifest 側で記述する
+ *    想定
+ *
+ * 仕様書: ナレッジ/インフラ/cockpit-hub-hosted-integration-spec (id=6080)
+ */
+import { promises as fs } from "node:fs"
+import path from "node:path"
+import os from "node:os"
+import { spawn } from "node:child_process"
+
+const HUB_AI_RULES_BEGIN = "<!-- BEGIN HUB-AI-RULES -->"
+const HUB_AI_RULES_END = "<!-- END HUB-AI-RULES -->"
+
+function resolveClaudeDir() {
+  return process.env.CLAUDE_DIR || path.join(os.homedir(), ".claude")
+}
+
+function tokenPath() {
+  return path.join(resolveClaudeDir(), "scripts", ".hub_jwt.json")
+}
+
+function bundleUrl(hubUrl) {
+  return `${hubUrl.replace(/\/+$/, "")}/api/knowledge/admin/hub-ai/setup-bundle/`
+}
+
+/**
+ * Hub から bundle を fetch する。
+ * @returns {Promise<{ version: string, files: any[], post_install_commands?: any[], token?: any }>}
+ */
+export async function fetchBundle({ hubUrl, agentId, agentToken, fetchImpl } = {}) {
+  if (!hubUrl) throw new Error("fetchBundle requires hubUrl")
+  if (!agentId || !agentToken) throw new Error("fetchBundle requires agentId + agentToken")
+  const f = fetchImpl || globalThis.fetch
+  const res = await f(bundleUrl(hubUrl), {
+    headers: {
+      Authorization: `Bearer ${agentId}:${agentToken}`,
+    },
+  })
+  if (!res.ok) {
+    let detail = `HTTP ${res.status}`
+    try {
+      const j = await res.json()
+      if (j?.detail) detail = j.detail
+    } catch {
+      /* ignore */
+    }
+    throw new Error(`hub bundle fetch failed: ${detail}`)
+  }
+  return res.json()
+}
+
+function isClaudeMdEntry(entry) {
+  return entry.path === "CLAUDE.md" || entry.path === "./CLAUDE.md"
+}
+
+function intoClaudeAbsolute(rel) {
+  const base = resolveClaudeDir()
+  const cleaned = rel.replace(/^\.\//, "")
+  return path.join(base, cleaned)
+}
+
+function parseMode(mode) {
+  if (typeof mode === "number") return mode
+  if (typeof mode === "string") {
+    const v = parseInt(mode, 8)
+    if (Number.isFinite(v)) return v
+  }
+  return 0o644
+}
+
+/**
+ * Bundle の files[] を `~/.claude/<path>` に展開する。
+ * @returns {Promise<{ written: string[], skipped_same: string[], merged_claude_md: boolean }>}
+ */
+export async function applyBundle({ bundle, logger } = {}) {
+  if (!bundle || !Array.isArray(bundle.files)) {
+    throw new Error("applyBundle requires bundle.files[]")
+  }
+
+  const written = []
+  const skippedSame = []
+  let mergedClaudeMd = false
+
+  for (const entry of bundle.files) {
+    const dest = intoClaudeAbsolute(entry.path)
+    const mode = parseMode(entry.mode)
+    const content = entry.content ?? ""
+
+    if (isClaudeMdEntry(entry)) {
+      // CLAUDE.md は marker 範囲だけ置換、無ければ末尾追記
+      const result = await mergeClaudeMdMarkerBlock(dest, content, { logger })
+      if (result.changed) {
+        written.push(dest)
+        mergedClaudeMd = true
+      } else {
+        skippedSame.push(dest)
+      }
+      continue
+    }
+
+    // 通常ファイル: 既存と完全一致なら skip、差分あれば書き換え
+    const existing = await readOrNull(dest)
+    if (existing !== null && existing === content) {
+      skippedSame.push(dest)
+      continue
+    }
+    await fs.mkdir(path.dirname(dest), { recursive: true })
+    await fs.writeFile(dest, content, { mode })
+    written.push(dest)
+    logger?.info({ dest, mode: mode.toString(8) }, "hub-bundle wrote file")
+  }
+
+  // JWT を保存 (~/.claude/scripts/.hub_jwt.json)
+  if (bundle.token) {
+    const tp = tokenPath()
+    await fs.mkdir(path.dirname(tp), { recursive: true })
+    await fs.writeFile(
+      tp,
+      JSON.stringify({ ...bundle.token, version: bundle.version }, null, 2),
+      { mode: 0o600 },
+    )
+    written.push(tp)
+  }
+
+  return { written, skipped_same: skippedSame, merged_claude_md: mergedClaudeMd }
+}
+
+async function readOrNull(p) {
+  try {
+    return await fs.readFile(p, "utf-8")
+  } catch (err) {
+    if (err.code === "ENOENT") return null
+    throw err
+  }
+}
+
+/**
+ * CLAUDE.md のマーカー範囲を置換する。マーカーが無ければ末尾に追記。
+ * incoming content には marker 込みのテキストが入っている想定 (Hub 側 fragment)。
+ */
+export async function mergeClaudeMdMarkerBlock(dest, incoming, { logger } = {}) {
+  const existing = await readOrNull(dest)
+  // incoming は marker line を含む全文 (BEGIN ... END)、それ以外 (前後文) は剥がす
+  const incomingBlock = extractMarkerBlock(incoming) || incoming
+
+  if (existing === null) {
+    await fs.mkdir(path.dirname(dest), { recursive: true })
+    await fs.writeFile(dest, incomingBlock + "\n", { mode: 0o644 })
+    logger?.info({ dest }, "hub-bundle created CLAUDE.md")
+    return { changed: true, created: true }
+  }
+
+  const beginIdx = existing.indexOf(HUB_AI_RULES_BEGIN)
+  const endIdx = existing.indexOf(HUB_AI_RULES_END)
+  if (beginIdx === -1 || endIdx === -1 || endIdx < beginIdx) {
+    // marker が無い → 末尾に追記
+    if (existing.includes(incomingBlock)) {
+      return { changed: false }
+    }
+    const next = existing.endsWith("\n") ? `${existing}\n${incomingBlock}\n` : `${existing}\n\n${incomingBlock}\n`
+    await fs.writeFile(dest, next, { mode: 0o644 })
+    logger?.info({ dest }, "hub-bundle appended hub-ai marker block")
+    return { changed: true, appended: true }
+  }
+
+  const before = existing.slice(0, beginIdx)
+  const afterStart = endIdx + HUB_AI_RULES_END.length
+  const after = existing.slice(afterStart)
+  const next = `${before}${incomingBlock}${after}`
+  if (next === existing) {
+    return { changed: false }
+  }
+  await fs.writeFile(dest, next, { mode: 0o644 })
+  logger?.info({ dest }, "hub-bundle replaced hub-ai marker block")
+  return { changed: true }
+}
+
+function extractMarkerBlock(text) {
+  const a = text.indexOf(HUB_AI_RULES_BEGIN)
+  const b = text.indexOf(HUB_AI_RULES_END)
+  if (a === -1 || b === -1 || b < a) return null
+  return text.slice(a, b + HUB_AI_RULES_END.length)
+}
+
+/**
+ * post_install_commands を順次実行する。manifest に list で書く想定。
+ * Hub backend が冪等なコマンドを記述する責任を持つ (例: chmod +x ...)。
+ */
+export async function runPostInstall(bundle, { logger } = {}) {
+  const cmds = Array.isArray(bundle.post_install_commands)
+    ? bundle.post_install_commands
+    : []
+  for (const cmd of cmds) {
+    const argv = typeof cmd === "string" ? ["/bin/sh", "-c", cmd] : cmd
+    if (!Array.isArray(argv) || argv.length === 0) continue
+    await runOnce(argv, { logger })
+  }
+}
+
+function runOnce(argv, { logger } = {}) {
+  return new Promise((resolve, reject) => {
+    const [bin, ...args] = argv
+    const child = spawn(bin, args, { stdio: "inherit" })
+    child.on("exit", (code) => {
+      if (code === 0) {
+        logger?.info({ cmd: argv.join(" ") }, "hub-bundle post_install ok")
+        resolve(code)
+      } else {
+        const err = new Error(`post_install command failed (exit ${code}): ${argv.join(" ")}`)
+        logger?.warn({ cmd: argv.join(" "), code }, "hub-bundle post_install failed")
+        reject(err)
+      }
+    })
+  })
+}
+
+/**
+ * fetch + apply + post_install をまとめて実行。
+ */
+export async function syncBundle({ hubUrl, agentId, agentToken, logger, fetchImpl } = {}) {
+  const bundle = await fetchBundle({ hubUrl, agentId, agentToken, fetchImpl })
+  const result = await applyBundle({ bundle, logger })
+  try {
+    await runPostInstall(bundle, { logger })
+  } catch (err) {
+    logger?.warn({ err: err.message }, "post_install partially failed (continuing)")
+  }
+  return { version: bundle.version, ...result }
+}