@akiojin/gwt 9.11.10 → 9.11.11

package/README.ja.md

@@ -12,7 +12,7 @@ gwt は Git worktree の管理と、`Claude Code` / `Codex` / `Gemini` /
 
 - GUI 向けの主配布物: `gwt-macos-universal.dmg`
 - マウントした DMG から `GWT.app` を開くとネイティブ GUI をそのまま起動できます
-- `PATH` に `gwtd` CLI を入れたい場合は install script を使います
+- `PATH` に `gwt` / `gwtd` CLI を入れたい場合は install script を使います
 
 ```bash
 curl -fsSL https://raw.githubusercontent.com/akiojin/gwt/main/installers/macos/install.sh | bash

package/README.md

@@ -14,7 +14,7 @@ Download the release asset for your platform from
 
 - GUI-first installer: `gwt-macos-universal.dmg`
 - Open `GWT.app` from the mounted DMG for the native desktop launch surface
-- Use the install script when you want the `gwtd` CLI in your `PATH`
+- Use the install script when you want the `gwt` and `gwtd` CLIs in your `PATH`
 
 ```bash
 curl -fsSL https://raw.githubusercontent.com/akiojin/gwt/main/installers/macos/install.sh | bash

package/bin/gwt.cjs

@@ -5,84 +5,20 @@
  * it will be downloaded on-demand from GitHub Releases.
  */
 
-const { spawn } = require("child_process");
-const path = require("path");
-const fs = require("fs");
+const { binaryNameForPlatform } = require("../scripts/release-assets.cjs");
+const { createLauncher } = require("./launcher.cjs");
 
-const {
-  bundleBinaryNamesForPlatform,
+const launcher = createLauncher({
+  commandName: "gwt",
   binaryNameForPlatform,
-  installReleaseBinary,
-  releaseAssetUrl,
-} = require("../scripts/release-assets.cjs");
-
-const REPO = "akiojin/gwt";
-const BIN_DIR = __dirname;
-const BIN_NAME = binaryNameForPlatform(process.platform);
-const BIN_PATH = path.join(BIN_DIR, BIN_NAME);
-const BUNDLE_BINARIES = bundleBinaryNamesForPlatform(process.platform);
-
-function readVersion() {
-  const pkg = path.join(__dirname, "..", "package.json");
-  return JSON.parse(fs.readFileSync(pkg, "utf8")).version;
-}
-
-async function ensureBinary() {
-  if (BUNDLE_BINARIES.every((name) => fs.existsSync(path.join(BIN_DIR, name)))) {
-    return;
-  }
-
-  const version = readVersion();
-  const { url } = releaseAssetUrl(REPO, version, process.platform, process.arch);
-
-  console.log(`Downloading gwt bundle for ${process.platform}-${process.arch}...`);
-  console.log(`Downloading from: ${url}`);
-
-  await installReleaseBinary({
-    repo: REPO,
-    version,
-    binDir: BIN_DIR,
-    platform: process.platform,
-    arch: process.arch,
-  });
-
-  console.log(`gwt bundle installed successfully: ${BUNDLE_BINARIES.join(", ")}`);
-}
-
-async function main() {
-  try {
-    await ensureBinary();
-  } catch (err) {
-    console.error(`Failed to download gwt binary: ${err.message}`);
-    console.error(`https://github.com/${REPO}/releases`);
-    process.exit(1);
-  }
-
-  const child = spawn(BIN_PATH, process.argv.slice(2), {
-    stdio: "inherit",
-    env: process.env,
-  });
-
-  child.on("error", (err) => {
-    console.error(`Failed to start gwt: ${err.message}`);
-    process.exit(1);
-  });
-
-  child.on("exit", (code, signal) => {
-    if (signal) {
-      process.kill(process.pid, signal);
-    } else {
-      process.exit(code ?? 0);
-    }
-  });
-}
+});
 
 if (require.main === module) {
-  main();
+  launcher.main();
 }
 
 module.exports = {
-  ensureBinary,
-  main,
-  readVersion,
+  ensureBinary: launcher.ensureBinary,
+  main: launcher.main,
+  readVersion: launcher.readVersion,
 };

package/bin/gwtd.cjs

@@ -0,0 +1,24 @@
+#!/usr/bin/env node
+/**
+ * Wrapper script to execute the gwtd Rust binary.
+ * If the bundle is not found (e.g., bunx skips postinstall),
+ * it will be downloaded on-demand from GitHub Releases.
+ */
+
+const { daemonBinaryNameForPlatform } = require("../scripts/release-assets.cjs");
+const { createLauncher } = require("./launcher.cjs");
+
+const launcher = createLauncher({
+  commandName: "gwtd",
+  binaryNameForPlatform: daemonBinaryNameForPlatform,
+});
+
+if (require.main === module) {
+  launcher.main();
+}
+
+module.exports = {
+  ensureBinary: launcher.ensureBinary,
+  main: launcher.main,
+  readVersion: launcher.readVersion,
+};

package/bin/launcher.cjs

@@ -0,0 +1,84 @@
+const { spawn } = require("child_process");
+const path = require("path");
+const fs = require("fs");
+
+const {
+  bundleBinaryNamesForPlatform,
+  installReleaseBinary,
+  releaseAssetUrl,
+} = require("../scripts/release-assets.cjs");
+
+const REPO = "akiojin/gwt";
+const BIN_DIR = __dirname;
+
+function readVersion() {
+  const pkg = path.join(__dirname, "..", "package.json");
+  return JSON.parse(fs.readFileSync(pkg, "utf8")).version;
+}
+
+function createLauncher({ commandName, binaryNameForPlatform }) {
+  const binName = binaryNameForPlatform(process.platform);
+  const binPath = path.join(BIN_DIR, binName);
+  const bundleBinaries = bundleBinaryNamesForPlatform(process.platform);
+
+  async function ensureBinary() {
+    if (bundleBinaries.every((name) => fs.existsSync(path.join(BIN_DIR, name)))) {
+      return;
+    }
+
+    const version = readVersion();
+    const { url } = releaseAssetUrl(REPO, version, process.platform, process.arch);
+
+    console.log(`Downloading gwt bundle for ${process.platform}-${process.arch}...`);
+    console.log(`Downloading from: ${url}`);
+
+    await installReleaseBinary({
+      repo: REPO,
+      version,
+      binDir: BIN_DIR,
+      platform: process.platform,
+      arch: process.arch,
+    });
+
+    console.log(`gwt bundle installed successfully: ${bundleBinaries.join(", ")}`);
+  }
+
+  async function main() {
+    try {
+      await ensureBinary();
+    } catch (err) {
+      console.error(`Failed to download gwt binary: ${err.message}`);
+      console.error(`https://github.com/${REPO}/releases`);
+      process.exit(1);
+    }
+
+    const child = spawn(binPath, process.argv.slice(2), {
+      stdio: "inherit",
+      env: process.env,
+    });
+
+    child.on("error", (err) => {
+      console.error(`Failed to start ${commandName}: ${err.message}`);
+      process.exit(1);
+    });
+
+    child.on("exit", (code, signal) => {
+      if (signal) {
+        process.kill(process.pid, signal);
+      } else {
+        process.exit(code ?? 0);
+      }
+    });
+  }
+
+  return {
+    ensureBinary,
+    main,
+    readVersion,
+  };
+}
+
+module.exports = {
+  createLauncher,
+  readVersion,
+};

package/installers/macos/install.sh

@@ -0,0 +1,87 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+REPO="akiojin/gwt"
+INSTALL_DIR="${GWT_INSTALL_DIR:-$HOME/.local/bin}"
+VERSION="latest"
+
+usage() {
+  cat <<'USAGE'
+Usage: install.sh [--version <version>] [--dir <install-dir>]
+
+Installs both gwt and gwtd into the target directory.
+Defaults:
+  version: latest GitHub Release
+  dir:     $GWT_INSTALL_DIR or $HOME/.local/bin
+USAGE
+}
+
+while [ "$#" -gt 0 ]; do
+  case "$1" in
+    --version)
+      VERSION="${2:?missing value for --version}"
+      shift 2
+      ;;
+    --dir)
+      INSTALL_DIR="${2:?missing value for --dir}"
+      shift 2
+      ;;
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "Unknown argument: $1" >&2
+      usage >&2
+      exit 2
+      ;;
+  esac
+done
+
+case "$(uname -m)" in
+  arm64|aarch64)
+    ARCH="arm64"
+    ;;
+  x86_64|amd64)
+    ARCH="x86_64"
+    ;;
+  *)
+    echo "Unsupported macOS architecture: $(uname -m)" >&2
+    exit 1
+    ;;
+esac
+
+ASSET="gwt-macos-${ARCH}.tar.gz"
+if [ "$VERSION" = "latest" ]; then
+  URL="https://github.com/${REPO}/releases/latest/download/${ASSET}"
+else
+  TAG="v${VERSION#v}"
+  URL="https://github.com/${REPO}/releases/download/${TAG}/${ASSET}"
+fi
+
+TMPDIR="$(mktemp -d)"
+trap 'rm -rf "$TMPDIR"' EXIT
+
+mkdir -p "$INSTALL_DIR"
+curl -fsSL "$URL" -o "$TMPDIR/$ASSET"
+tar -xzf "$TMPDIR/$ASSET" -C "$TMPDIR"
+
+for BIN in gwt gwtd; do
+  SOURCE="$(find "$TMPDIR" -type f -name "$BIN" | head -n 1)"
+  if [ -z "$SOURCE" ]; then
+    echo "Downloaded archive does not contain $BIN" >&2
+    exit 1
+  fi
+  cp "$SOURCE" "$INSTALL_DIR/$BIN"
+  chmod +x "$INSTALL_DIR/$BIN"
+done
+
+case ":$PATH:" in
+  *":$INSTALL_DIR:"*) ;;
+  *)
+    echo "Warning: $INSTALL_DIR is not in PATH." >&2
+    echo "Add it to your shell profile before running gwt or gwtd by name." >&2
+    ;;
+esac
+
+echo "Installed gwt and gwtd into $INSTALL_DIR"

package/installers/macos/uninstall.sh

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+INSTALL_DIR="${GWT_INSTALL_DIR:-$HOME/.local/bin}"
+
+usage() {
+  cat <<'USAGE'
+Usage: uninstall.sh [--dir <install-dir>]
+
+Removes both gwt and gwtd from the target directory.
+Defaults:
+  dir: $GWT_INSTALL_DIR or $HOME/.local/bin
+USAGE
+}
+
+while [ "$#" -gt 0 ]; do
+  case "$1" in
+    --dir)
+      INSTALL_DIR="${2:?missing value for --dir}"
+      shift 2
+      ;;
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "Unknown argument: $1" >&2
+      usage >&2
+      exit 2
+      ;;
+  esac
+done
+
+for BIN in gwt gwtd; do
+  rm -f "$INSTALL_DIR/$BIN"
+done
+
+echo "Removed gwt and gwtd from $INSTALL_DIR"

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@akiojin/gwt",
-  "version": "9.11.10",
+  "version": "9.11.11",
   "description": "Desktop GUI for Git worktree management and coding agent launch",
   "type": "module",
   "bin": {
-    "gwt": "bin/gwt.cjs"
+    "gwt": "bin/gwt.cjs",
+    "gwtd": "bin/gwtd.cjs"
   },
   "scripts": {
     "postinstall": "node scripts/postinstall.cjs",

package/scripts/test_release_assets.cjs

@@ -7,6 +7,7 @@ const { execFileSync } = require("child_process");
 const {
   binaryNameForPlatform,
   bundleBinaryNamesForPlatform,
+  daemonBinaryNameForPlatform,
   installBundleFromArchive,
   primaryReleaseAssetName,
   releaseAssetName,
@@ -47,6 +48,9 @@ run("release helper keeps platform binary names stable", () => {
   assert.equal(binaryNameForPlatform("win32"), "gwt.exe");
   assert.equal(binaryNameForPlatform("linux"), "gwt");
   assert.equal(binaryNameForPlatform("darwin"), "gwt");
+  assert.equal(daemonBinaryNameForPlatform("win32"), "gwtd.exe");
+  assert.equal(daemonBinaryNameForPlatform("linux"), "gwtd");
+  assert.equal(daemonBinaryNameForPlatform("darwin"), "gwtd");
 });
 
 run("release helper keeps bundle binary names stable", () => {
@@ -56,8 +60,12 @@ run("release helper keeps bundle binary names stable", () => {
 });
 
 run("installer entrypoints are loadable under package type module", () => {
+  const daemonLauncher = require("../bin/gwtd.cjs");
+
   assert.equal(typeof postinstall.main, "function");
   assert.equal(typeof launcher.main, "function");
+  assert.equal(typeof daemonLauncher.main, "function");
+  assert.equal(typeof daemonLauncher.readVersion, "function");
 });
 
 run("windows installer definition includes the gwtd companion binary", () => {
@@ -78,6 +86,8 @@ run("release workflow packages gwtd alongside gwt", () => {
 
 run("package scripts keep the GUI front door and release contract explicit", () => {
   const pkg = JSON.parse(fs.readFileSync(path.join(__dirname, "..", "package.json"), "utf8"));
+  assert.equal(pkg.bin.gwt, "bin/gwt.cjs");
+  assert.equal(pkg.bin.gwtd, "bin/gwtd.cjs");
   assert.equal(pkg.scripts["test:release-assets"], "node scripts/test_release_assets.cjs");
   assert.equal(
     pkg.scripts["test:frontend-bundle"],
@@ -88,6 +98,23 @@ run("package scripts keep the GUI front door and release contract explicit", ()
   assert.equal(pkg.scripts.build, "cargo build --release -p gwt --bin gwt --bin gwtd");
 });
 
+run("macos install scripts install and remove both public command shims", () => {
+  const install = fs.readFileSync(
+    path.join(__dirname, "..", "installers", "macos", "install.sh"),
+    "utf8"
+  );
+  const uninstall = fs.readFileSync(
+    path.join(__dirname, "..", "installers", "macos", "uninstall.sh"),
+    "utf8"
+  );
+
+  assert.match(install, /gwt-macos-\$\{ARCH\}\.tar\.gz/);
+  assert.match(install, /for BIN in gwt gwtd/);
+  assert.match(install, /chmod \+x "\$INSTALL_DIR\/\$BIN"/);
+  assert.match(uninstall, /for BIN in gwt gwtd/);
+  assert.match(uninstall, /rm -f "\$INSTALL_DIR\/\$BIN"/);
+});
+
 run("test all script keeps rust tests plus frontend release checks", () => {
   const testAll = fs.readFileSync(path.join(__dirname, "test-all.sh"), "utf8");
   assert.match(testAll, /test -p gwt-core -p gwt --all-features/);