@cocorograph/hub-agent 0.5.5 → 0.5.7

package/package.json

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

package/src/agents.mjs

@@ -0,0 +1,79 @@
+/**
+ * Claude Code の subagent (`~/.claude/agents/<category>/<name>.md`) を集計する。
+ *
+ * - 各 .md の先頭 H1 から title / description を抽出 ("Title — description")
+ * - category=ディレクトリ名、name=basename
+ *
+ * 移植元: D00000_cockpit/webapp/lib/agents.ts
+ */
+import { promises as fs } from "node:fs"
+import os from "node:os"
+import path from "node:path"
+
+const AGENTS_DIR = process.env.CLAUDE_AGENTS_DIR || path.join(os.homedir(), ".claude", "agents")
+
+function parseH1(text) {
+  for (const line of text.split("\n")) {
+    const m = line.match(/^#\s+(.+)$/)
+    if (!m) continue
+    const heading = m[1].trim()
+    const dashIdx = heading.search(/\s*[-—–]\s*/)
+    if (dashIdx > 0) {
+      const title = heading.slice(0, dashIdx).trim()
+      const description = heading.slice(dashIdx).replace(/^[\s\-—–]+/, "").trim()
+      return { title, description }
+    }
+    return { title: heading, description: "" }
+  }
+  return { title: "", description: "" }
+}
+
+export async function listAgents() {
+  const agents = []
+  let categories
+  try {
+    categories = await fs.readdir(AGENTS_DIR)
+  } catch {
+    return []
+  }
+  for (const cat of categories) {
+    if (cat.startsWith(".") || cat.startsWith("_")) continue
+    const catPath = path.join(AGENTS_DIR, cat)
+    let st
+    try {
+      st = await fs.stat(catPath)
+    } catch {
+      continue
+    }
+    if (!st.isDirectory()) continue
+    let files
+    try {
+      files = await fs.readdir(catPath)
+    } catch {
+      continue
+    }
+    for (const f of files) {
+      if (!f.endsWith(".md")) continue
+      if (f.startsWith("_")) continue
+      const fp = path.join(catPath, f)
+      try {
+        const text = await fs.readFile(fp, "utf-8")
+        const { title, description } = parseH1(text)
+        const baseName = f.replace(/\.md$/, "")
+        agents.push({
+          name: baseName,
+          category: cat,
+          title: title || baseName,
+          description: description || "",
+          path: `${cat}/${baseName}`,
+        })
+      } catch {
+        /* skip */
+      }
+    }
+  }
+  agents.sort(
+    (a, b) => a.category.localeCompare(b.category) || a.name.localeCompare(b.name),
+  )
+  return agents
+}

package/src/main.mjs

@@ -10,6 +10,7 @@
  *
  * 仕様書: ナレッジ/インフラ/cockpit-hub-hosted-integration-spec (id=6080)
  */
+import { readFileSync } from "node:fs"
 import { readFile } from "node:fs/promises"
 import os from "node:os"
 import path from "node:path"
@@ -20,6 +21,7 @@ import { readConfig } from "./config.mjs"
 import { loadPlugins, runHookBroadcast, runHookChain } from "./plugin-loader.mjs"
 import { WsClient } from "./ws-client.mjs"
 import { PtyBridge } from "./pty-bridge.mjs"
+import { listAgents } from "./agents.mjs"
 import { listSkills } from "./skills.mjs"
 import { listSessionStates } from "./state.mjs"
 import {
@@ -52,6 +54,20 @@ async function readBundleVersion() {
   }
 }
 
+/**
+ * WsClient の runtime refresh / fs.watch コールバックから同期で呼ばれる版。
+ * 失敗時は null を返す (silent fail)。
+ */
+function readBundleVersionSync() {
+  try {
+    const text = readFileSync(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) {
@@ -73,7 +89,13 @@ export async function startDaemon({ version, ptyModule } = {}) {
     logger.info({ bundleVersion }, "hub bundle version detected")
   }
 
-  const client = new WsClient(config, { logger, version, bundleVersion })
+  const client = new WsClient(config, {
+    logger,
+    version,
+    bundleVersion,
+    bundleVersionProvider: readBundleVersionSync,
+    bundleManifestPath: BUNDLE_MANIFEST_PATH,
+  })
 
   // EventEmitter の 'error' は listener が無いと process が落ちる。
   // ws-client は close 側で reconnect を予約しているので、ここでは log だけ。
@@ -405,6 +427,24 @@ async function dispatch(msg, ctx) {
         }
         return
       }
+      case "agents.request": {
+        try {
+          const agents = await listAgents()
+          ctx.client.send({
+            type: "agents.response",
+            request_id: msg.request_id,
+            agents,
+          })
+        } catch (err) {
+          ctx.client.send({
+            type: "agents.response",
+            request_id: msg.request_id,
+            agents: [],
+            error: err.message,
+          })
+        }
+        return
+      }
       case "usage.request": {
         try {
           const [usage, sessions] = await Promise.all([

package/src/ws-client.mjs

@@ -5,10 +5,14 @@
  * - 起動時に `hello`、30s おきに `heartbeat` を送信
  * - 切断時は exponential backoff (1s, 2s, 4s, ..., max 30s) で再接続
  * - サーバから受け取った JSON は `onMessage` callback に渡す
+ * - `bundleVersionProvider` + `bundleManifestPath` を渡すと、manifest.json の
+ *   変更を fs.watch で検知して即時 heartbeat を送信し Cockpit UI に最新版を
+ *   リアルタイム反映する (heartbeat 30s 待ちを回避)
  *
  * 仕様書: ナレッジ/インフラ/cockpit-hub-hosted-integration-spec (id=6080)
  */
 import { EventEmitter } from "node:events"
+import fs from "node:fs"
 import os from "node:os"
 
 import WebSocket from "ws"
@@ -16,11 +20,19 @@ import WebSocket from "ws"
 const HEARTBEAT_INTERVAL_MS = 30_000
 const MIN_BACKOFF_MS = 1_000
 const MAX_BACKOFF_MS = 30_000
+const BUNDLE_WATCH_DEBOUNCE_MS = 500
 
 export class WsClient extends EventEmitter {
   /**
    * @param {{ hub_url: string, agent_id: string, agent_token: string }} config
-   * @param {{ logger?: import('pino').Logger, version?: string, bundleVersion?: string|null, hostname?: string }} opts
+   * @param {{
+   *   logger?: import('pino').Logger,
+   *   version?: string,
+   *   bundleVersion?: string|null,
+   *   bundleVersionProvider?: () => (string|null),
+   *   bundleManifestPath?: string|null,
+   *   hostname?: string,
+   * }} opts
    */
   constructor(config, opts = {}) {
     super()
@@ -28,6 +40,13 @@ export class WsClient extends EventEmitter {
     this.logger = opts.logger
     this.version = opts.version || "0.1.0"
     this.bundleVersion = opts.bundleVersion || null
+    this.bundleVersionProvider =
+      typeof opts.bundleVersionProvider === "function"
+        ? opts.bundleVersionProvider
+        : null
+    this.bundleManifestPath = opts.bundleManifestPath || null
+    this.bundleWatcher = null
+    this.bundleWatchDebounceTimer = null
     this.hostname = opts.hostname || os.hostname()
     this.ws = null
     this.heartbeatTimer = null
@@ -52,6 +71,8 @@ export class WsClient extends EventEmitter {
     ws.on("open", () => {
       this.backoff = MIN_BACKOFF_MS
       this.logger?.info("ws open")
+      // hello 前に最新の bundle version を読み直す (再接続時の鮮度確保)
+      this._refreshBundleVersion()
       this._sendJson({
         type: "hello",
         agent_id: this.config.agent_id,
@@ -60,6 +81,7 @@ export class WsClient extends EventEmitter {
         bundle_version: this.bundleVersion,
       })
       this._startHeartbeat()
+      this._startBundleWatcher()
       this.emit("open")
     })
 
@@ -76,6 +98,7 @@ export class WsClient extends EventEmitter {
 
     ws.on("close", (code, reason) => {
       this._stopHeartbeat()
+      this._stopBundleWatcher()
       this.logger?.info({ code, reason: reason?.toString() }, "ws close")
       this.emit("close", { code, reason })
       if (!this.stopped) this._scheduleReconnect()
@@ -101,6 +124,7 @@ export class WsClient extends EventEmitter {
   stop() {
     this.stopped = true
     this._stopHeartbeat()
+    this._stopBundleWatcher()
     if (this.reconnectTimer) {
       clearTimeout(this.reconnectTimer)
       this.reconnectTimer = null
@@ -138,6 +162,9 @@ export class WsClient extends EventEmitter {
   _startHeartbeat() {
     this._stopHeartbeat()
     this.heartbeatTimer = setInterval(() => {
+      // heartbeat 都度 provider 経由で bundle version を最新化する。
+      // fs.watch を取り逃した変更 (atomic rename / 別マウント越し等) への保険。
+      this._refreshBundleVersion()
       // 送信失敗 (= ws not OPEN) を検知したら即時 close + reconnect 発火。
       // setInterval を放置すると死んだコネクションに heartbeat を投げ続けて
       // 30s 間気付かないので、close を強制トリガーする。
@@ -162,6 +189,99 @@ export class WsClient extends EventEmitter {
     }
   }
 
+  /**
+   * bundleVersionProvider を呼んで `this.bundleVersion` を最新化する。
+   * 値が変わったら true を返す。provider が未設定 / 失敗時は false。
+   */
+  _refreshBundleVersion() {
+    if (!this.bundleVersionProvider) return false
+    try {
+      const next = this.bundleVersionProvider()
+      const normalized = typeof next === "string" && next.length > 0 ? next : null
+      if (normalized === this.bundleVersion) return false
+      this.logger?.info(
+        { from: this.bundleVersion, to: normalized },
+        "bundle version refreshed",
+      )
+      this.bundleVersion = normalized
+      return true
+    } catch (err) {
+      this.logger?.warn({ err: err.message }, "bundle version refresh failed")
+      return false
+    }
+  }
+
+  /**
+   * `bundleManifestPath` を fs.watch で監視し、変更時に即時 heartbeat を送る。
+   * Cockpit UI への反映ラグを 30s heartbeat 周期から ~15s (UI poll) に短縮する。
+   * fs.watch の起動に失敗しても heartbeat 都度 refresh が保険として動くので no-op。
+   */
+  _startBundleWatcher() {
+    if (!this.bundleManifestPath || this.bundleWatcher) return
+    try {
+      this.bundleWatcher = fs.watch(
+        this.bundleManifestPath,
+        { persistent: false },
+        () => this._onBundleManifestChange(),
+      )
+      this.bundleWatcher.on("error", (err) => {
+        this.logger?.warn(
+          { err: err.message, path: this.bundleManifestPath },
+          "bundle manifest watcher errored",
+        )
+      })
+      this.logger?.debug(
+        { path: this.bundleManifestPath },
+        "bundle manifest watcher started",
+      )
+    } catch (err) {
+      this.logger?.warn(
+        { err: err.message, path: this.bundleManifestPath },
+        "bundle manifest watcher failed to start",
+      )
+    }
+  }
+
+  _stopBundleWatcher() {
+    if (this.bundleWatchDebounceTimer) {
+      clearTimeout(this.bundleWatchDebounceTimer)
+      this.bundleWatchDebounceTimer = null
+    }
+    if (this.bundleWatcher) {
+      try {
+        this.bundleWatcher.close()
+      } catch {
+        /* ignore */
+      }
+      this.bundleWatcher = null
+    }
+  }
+
+  /**
+   * fs.watch のコールバック。同一書き込みで多重 fire することがある (macOS) ため
+   * デバウンスしてから refresh + 即時 heartbeat する。
+   */
+  _onBundleManifestChange() {
+    if (this.bundleWatchDebounceTimer) {
+      clearTimeout(this.bundleWatchDebounceTimer)
+    }
+    this.bundleWatchDebounceTimer = setTimeout(() => {
+      this.bundleWatchDebounceTimer = null
+      const changed = this._refreshBundleVersion()
+      if (!changed) return
+      const ok = this._sendJson({
+        type: "heartbeat",
+        uptime_sec: Math.floor((Date.now() - this.startedAt) / 1000),
+        bundle_version: this.bundleVersion,
+      })
+      if (!ok) {
+        this.logger?.warn("bundle-change heartbeat send failed, forcing reconnect")
+        this._forceReconnect()
+      }
+    }, BUNDLE_WATCH_DEBOUNCE_MS)
+    this.bundleWatchDebounceTimer.unref?.()
+  }
+
   _forceReconnect() {
     // 現在の ws を強制 close。close ハンドラが _scheduleReconnect を呼ぶので
     // それ以上の処理は不要。stopped 中は no-op。