@cocorograph/hub-agent 0.5.12 → 0.5.13

package/bin/hub-agent.mjs

@@ -34,7 +34,11 @@ import {
   uninstallPlugin,
 } from "../src/plugin-install.mjs"
 import { loadPlugins } from "../src/plugin-loader.mjs"
-import { installService, uninstallService } from "../src/service-install.mjs"
+import {
+  installService,
+  restartService,
+  uninstallService,
+} from "../src/service-install.mjs"
 
 const here = path.dirname(fileURLToPath(import.meta.url))
 const pkg = JSON.parse(readFileSync(path.join(here, "..", "package.json"), "utf-8"))
@@ -164,6 +168,24 @@ program
     }
   })
 
+program
+  .command("restart")
+  .description("install-service 済みの daemon を再起動 (macOS=launchctl kickstart / Linux=systemctl --user restart)")
+  .action(async () => {
+    try {
+      const r = await restartService()
+      console.log(`restarted: ${r.platform} ${r.path}`)
+      if (r.platform === "darwin") {
+        console.log(`label: ${r.label}`)
+      } else {
+        console.log(`unit: ${r.unit}`)
+      }
+    } catch (err) {
+      console.error(`restart failed: ${err.message}`)
+      process.exit(1)
+    }
+  })
+
 program
   .command("uninstall-service")
   .description("OS サービス登録を解除")

package/package.json

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

package/scripts/install.sh

@@ -30,14 +30,54 @@ present() { command -v "$1" >/dev/null 2>&1; }
 
 ensure_brew() {
   if [[ "$(uname)" != "Darwin" ]]; then return 0; fi
-  if present brew; then color_ok "brew already installed"; return 0; fi
-  color_step "Homebrew をインストール"
-  /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-  # Apple Silicon の brew はデフォルト PATH に入らないので追加
-  if [[ -d /opt/homebrew/bin ]]; then
-    export PATH="/opt/homebrew/bin:$PATH"
+  if present brew; then
+    color_ok "brew already installed"
+  else
+    color_step "Homebrew をインストール"
+    /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+    # Apple Silicon の brew はデフォルト PATH に入らないので追加
+    if [[ -d /opt/homebrew/bin ]]; then
+      export PATH="/opt/homebrew/bin:$PATH"
+    fi
+    present brew || { color_err "brew install failed"; exit 1; }
   fi
-  present brew || { color_err "brew install failed"; exit 1; }
+  # Apple Silicon Mac は `/opt/homebrew/bin` がデフォルト PATH に入らないので、
+  # `~/.zprofile` / `~/.bash_profile` に `brew shellenv` の eval を **永続化** する。
+  # これを入れないと install.sh 終了後の新規ターミナルから `npm` / `node` /
+  # `hub-agent` が `command not found` になる (葛西氏 Mac で 0.5.11 リリース直後に踏んだ)。
+  persist_brew_shellenv
+}
+
+# Apple Silicon Mac で brew のパスを zsh / bash 永続化する。既に追記済みなら no-op。
+# `eval "$(/opt/homebrew/bin/brew shellenv)"` を書くことで、Homebrew が用意する
+# HOMEBREW_PREFIX / PATH / MANPATH / INFOPATH すべてを新規シェルで自動セットする。
+persist_brew_shellenv() {
+  local brew_bin=""
+  if [[ -x /opt/homebrew/bin/brew ]]; then
+    brew_bin="/opt/homebrew/bin/brew"
+  elif [[ -x /usr/local/bin/brew ]]; then
+    # Intel Mac は `/usr/local/bin` がデフォルト PATH に入るので追記不要
+    return 0
+  else
+    return 0
+  fi
+  local snippet="eval \"\$(${brew_bin} shellenv)\""
+  local marker="# >>> hub-agent: brew shellenv (Apple Silicon PATH) >>>"
+  local end_marker="# <<< hub-agent: brew shellenv <<<"
+  local target
+  for target in "$HOME/.zprofile" "$HOME/.bash_profile"; do
+    if [[ -f "$target" ]] && grep -Fq "$snippet" "$target"; then
+      color_ok "brew shellenv は既に $target にあります"
+      continue
+    fi
+    color_step "$target に brew shellenv を追記"
+    {
+      printf '\n%s\n' "$marker"
+      printf '%s\n' "$snippet"
+      printf '%s\n' "$end_marker"
+    } >> "$target"
+    color_ok "$target に追記しました (新規シェルから有効)"
+  done
 }
 
 ensure_pkg() {

package/src/service-install.mjs

@@ -105,6 +105,47 @@ export async function installService({ bin } = {}) {
   throw new Error(`unsupported platform: ${process.platform}`)
 }
 
+/**
+ * install-service 済みの hub-agent を再起動する。
+ *
+ * - macOS: `launchctl kickstart -k gui/<uid>/<label>` で SIGTERM + 再起動
+ * - Linux: `systemctl --user restart hub-agent.service`
+ *
+ * service が install されていない場合は分かりやすい error を投げる。
+ * (cockpit web UI から `hub-agent restart` 案内が出ても、enroll 直後の
+ *  ユーザーが叩くケースを想定)
+ */
+export async function restartService() {
+  if (process.platform === "darwin") {
+    const dest = macPlistPath()
+    try {
+      await fs.access(dest)
+    } catch {
+      throw new Error(
+        `service not installed (${dest} not found). run \`hub-agent install-service\` first`,
+      )
+    }
+    const uid = ensureUnixUid()
+    run("launchctl", ["kickstart", "-k", `gui/${uid}/${PLIST_LABEL}`])
+    return { platform: "darwin", path: dest, label: PLIST_LABEL }
+  }
+
+  if (process.platform === "linux") {
+    const dest = linuxUnitPath()
+    try {
+      await fs.access(dest)
+    } catch {
+      throw new Error(
+        `service not installed (${dest} not found). run \`hub-agent install-service\` first`,
+      )
+    }
+    run("systemctl", ["--user", "restart", SYSTEMD_UNIT_NAME])
+    return { platform: "linux", path: dest, unit: SYSTEMD_UNIT_NAME }
+  }
+
+  throw new Error(`unsupported platform: ${process.platform}`)
+}
+
 export async function uninstallService() {
   if (process.platform === "darwin") {
     const uid = ensureUnixUid()