create-einja-app 0.3.1 → 0.3.2

package/templates/default/scripts/ensure-serena.sh

@@ -0,0 +1,75 @@
+#!/bin/bash
+# Serena MCP サーバーの冪等起動
+# .envrc から source して使用
+
+# メインワークツリーをベースにする（worktree 間で共有）
+_SERENA_BASE="${1:-$(pwd)}"
+_SERENA_PORT_FILE="$_SERENA_BASE/.serena-port"
+_SERENA_DEFAULT_PORT="${SERENA_PORT:-9850}"
+
+# --- 既存インスタンスチェック（PIDベース） ---
+if [ -f "$_SERENA_PORT_FILE" ]; then
+  read -r _saved_port _saved_pid < "$_SERENA_PORT_FILE"
+  if [ -n "$_saved_pid" ] && kill -0 "$_saved_pid" 2>/dev/null; then
+    # PIDが生存 → 自プロジェクトのSerena
+    export SERENA_PORT="$_saved_port"
+    return 0 2>/dev/null || true
+  fi
+  # PID死亡 → クリーンアップ
+  rm -f "$_SERENA_PORT_FILE"
+fi
+
+# --- uvx 確認 ---
+if ! command -v uvx &> /dev/null; then
+  echo "[ensure-serena] Warning: uvx not found. Serena will not auto-start." >&2
+  echo "[ensure-serena] Install uv first: curl -LsSf https://astral.sh/uv/install.sh | sh" >&2
+  return 0 2>/dev/null || true
+fi
+
+# --- 空きポート検出 ---
+_port="$_SERENA_DEFAULT_PORT"
+_port_found=false
+for _i in $(seq 1 10); do
+  if ! lsof -i ":$_port" -sTCP:LISTEN > /dev/null 2>&1; then
+    _port_found=true
+    break
+  fi
+  _port=$((_port + 1))
+done
+
+if [ "$_port_found" = false ]; then
+  echo "[ensure-serena] Error: No available port found (tried $_SERENA_DEFAULT_PORT-$_port)" >&2
+  return 0 2>/dev/null || true
+fi
+
+# --- バックグラウンド起動 ---
+echo "[ensure-serena] Starting Serena on port $_port..."
+uvx --from git+https://github.com/oraios/serena \
+  serena start-mcp-server \
+  --transport streamable-http \
+  --host 127.0.0.1 \
+  --port "$_port" \
+  --context claude-code \
+  --project "$_SERENA_BASE" \
+  > /dev/null 2>&1 &
+_serena_pid=$!
+disown
+
+# --- 起動待機（PID生存 + ポートLISTEN、最大30秒） ---
+for _i in $(seq 1 60); do
+  if ! kill -0 "$_serena_pid" 2>/dev/null; then
+    echo "[ensure-serena] Warning: Serena process exited unexpectedly" >&2
+    return 0 2>/dev/null || true
+  fi
+  if lsof -p "$_serena_pid" -i ":$_port" -sTCP:LISTEN > /dev/null 2>&1; then
+    echo "$_port $_serena_pid" > "$_SERENA_PORT_FILE"
+    export SERENA_PORT="$_port"
+    echo "[ensure-serena] Serena ready on port $_port (PID: $_serena_pid)"
+    return 0 2>/dev/null || true
+  fi
+  sleep 0.5
+done
+
+# タイムアウト（起動失敗してもdirenvはブロックしない）
+echo "[ensure-serena] Warning: Serena failed to start within 30s" >&2
+return 0 2>/dev/null || true

package/templates/default/scripts/lib/worktree-config.ts

@@ -0,0 +1,64 @@
+import fs from "node:fs";
+import path from "node:path";
+
+export interface AppConfig {
+  id: string;
+  portRangeStart: number;
+  rangeSize: number;
+}
+
+export interface PostgresConfig {
+  port: number;
+  containerName: string;
+}
+
+export interface WorktreeConfig {
+  schemaVersion: number;
+  postgres: PostgresConfig;
+  apps: AppConfig[];
+}
+
+const defaultWorktreeConfig: WorktreeConfig = {
+  schemaVersion: 1,
+  postgres: { port: 25432, containerName: "einja-management-postgres" },
+  apps: [{ id: "web", portRangeStart: 3000, rangeSize: 1000 }],
+};
+
+function findProjectRoot(startDir: string = process.cwd()): string | null {
+  let currentDir = startDir;
+  while (currentDir !== path.dirname(currentDir)) {
+    if (fs.existsSync(path.join(currentDir, "package.json"))) {
+      return currentDir;
+    }
+    currentDir = path.dirname(currentDir);
+  }
+  return null;
+}
+
+export function loadWorktreeConfig(projectRoot?: string): WorktreeConfig {
+  const root = projectRoot ?? findProjectRoot();
+  if (!root) return defaultWorktreeConfig;
+
+  const configPath = path.join(root, "worktree.config.json");
+  if (!fs.existsSync(configPath)) return defaultWorktreeConfig;
+
+  try {
+    const raw = JSON.parse(fs.readFileSync(configPath, "utf-8"));
+    return {
+      schemaVersion: raw.schemaVersion ?? 1,
+      postgres: {
+        port: typeof raw.postgres?.port === "number" ? raw.postgres.port : 25432,
+        containerName: typeof raw.postgres?.containerName === "string"
+          ? raw.postgres.containerName : "einja-management-postgres",
+      },
+      apps: Array.isArray(raw.apps)
+        ? raw.apps.filter((a: unknown) =>
+            typeof a === "object" && a !== null && "id" in a && "portRangeStart" in a
+          )
+        : defaultWorktreeConfig.apps,
+    };
+  } catch {
+    console.warn("worktree.config.json の読み込みに失敗。デフォルト設定を使用します。");
+    return defaultWorktreeConfig;
+  }
+}

package/templates/default/scripts/stop-serena.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+PORT_FILE=".serena-port"
+if [ -f "$PORT_FILE" ]; then
+  read -r PORT PID < "$PORT_FILE"
+  if [ -n "$PID" ] && kill -0 "$PID" 2>/dev/null; then
+    kill "$PID"
+    # SIGTERM後、最大5秒待機
+    for _i in $(seq 1 10); do
+      if ! kill -0 "$PID" 2>/dev/null; then
+        echo "Serena stopped (PID: $PID, port: $PORT)"
+        rm -f "$PORT_FILE"
+        exit 0
+      fi
+      sleep 0.5
+    done
+    # 応答なし → 強制終了
+    kill -9 "$PID" 2>/dev/null
+    echo "Serena force-killed (PID: $PID, port: $PORT)"
+  else
+    echo "Serena process not running (PID: $PID)"
+  fi
+  rm -f "$PORT_FILE"
+else
+  echo "Serena not running (.serena-port not found)"
+fi

package/templates/default/scripts/worktree/dev.ts

@@ -11,8 +11,8 @@ import crypto from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
 import readline from "node:readline";
-import type { AppConfig, WorktreeConfig } from "../../packages/config/src/worktree-config.js";
-import { loadWorktreeConfig } from "../../packages/config/src/worktree-config-loader.js";
+import type { AppConfig, WorktreeConfig } from "../lib/worktree-config.js";
+import { loadWorktreeConfig } from "../lib/worktree-config.js";
 
 /** 設定を保持するグローバル変数 */
 let config: WorktreeConfig;