@einja/dev-cli 0.1.45 → 0.1.48

package/presets/default/package.json

@@ -0,0 +1,73 @@
+{
+	"name": "einja-management-monorepo",
+	"version": "0.1.0",
+	"private": true,
+	"packageManager": "pnpm@10.14.0",
+	"workspaces": [
+		"apps/*",
+		"packages/*"
+	],
+	"scripts": {
+		"prepare": "husky",
+		"dev": "tsx scripts/worktree/dev.ts",
+		"dev:bg": "tsx scripts/worktree/dev.ts --background",
+		"dev:stop": "tsx scripts/worktree/dev.ts --stop",
+		"dev:status": "tsx scripts/worktree/dev.ts --status",
+		"dev:logs": "tail -f log/dev.log",
+		"dev:skip-setup": "turbo run dev",
+		"build": "dotenvx run -f .env.production -- turbo run build",
+		"build:dev": "dotenvx run -f .env.develop -- turbo run build",
+		"build:local": "turbo run build",
+		"start": "turbo run start",
+		"generate": "turbo run generate",
+		"lint": "turbo run lint",
+		"lint:fix": "turbo run lint:fix",
+		"format": "turbo run format",
+		"format:fix": "turbo run format:fix",
+		"typecheck": "turbo run typecheck",
+		"test": "turbo run test",
+		"test:watch": "turbo run test:watch",
+		"test:ui": "turbo run test:ui",
+		"test:coverage": "turbo run test:coverage",
+		"prepush": "pnpm prepush:lint && pnpm prepush:typecheck && pnpm prepush:test",
+		"prepush:lint": "lint-staged",
+		"prepush:typecheck": "turbo run typecheck",
+		"prepush:test": "turbo run test",
+		"db:generate": "turbo run db:generate",
+		"db:push": "turbo run db:push",
+		"db:migrate": "turbo run db:migrate",
+		"db:migrate:deploy": "turbo run db:migrate:deploy",
+		"db:studio": "turbo run db:studio",
+		"db:seed": "turbo run db:seed",
+		"dev:setup": "tsx scripts/setup-dev.ts",
+		"dotenvx": "dotenvx",
+		"env:update": "tsx scripts/env.ts",
+		"env:encrypt": "dotenvx encrypt",
+		"env:show": "tsx scripts/env-show.ts",
+		"env:rotate-secrets": "tsx scripts/env-rotate-secrets.ts",
+		"einja:sync": "npx --yes @einja/dev-cli@latest sync",
+		"init:github": "tsx scripts/init-github.ts",
+		"task:loop": "npx --yes @einja/dev-cli@latest task:loop",
+		"changeset": "changeset"
+	},
+	"devDependencies": {
+		"@changesets/changelog-github": "^0.5.1",
+		"@changesets/cli": "^2.29.0",
+		"@clack/prompts": "^0.11.0",
+		"@dotenvx/dotenvx": "^1.51.4",
+		"@types/node": "^25.0.3",
+		"husky": "^9.1.7",
+		"lint-staged": "^16.1.0",
+		"tsx": "^4.7.0",
+		"turbo": "^2.5.8"
+	},
+	"volta": {
+		"node": "22.16.0",
+		"pnpm": "10.14.0"
+	},
+	"dependencies": {
+		"@hono/zod-validator": "^0.7.6",
+		"hono": "^4.11.3",
+		"zod": "^4.3.5"
+	}
+}

package/presets/default/preset.yaml

@@ -124,8 +124,8 @@ requirements:
     "format:fix": "biome format --write ."
     typecheck: "tsc --noEmit"
     prepush: "{pm} run lint && {pm} run typecheck"
-    "task:loop": "npx @einja/dev-cli task:loop"
-    "einja:sync": "npx @einja/dev-cli sync"
+    "task:loop": "npx @einja/dev-cli@latest task:loop"
+    "einja:sync": "npx @einja/dev-cli@latest sync"
 
   # システムコマンド（警告表示のみ、自動インストールしない）
   systemCommands:

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

@@ -7,15 +7,34 @@ _SERENA_BASE="${1:-$(pwd)}"
 _SERENA_PORT_FILE="$_SERENA_BASE/.serena-port"
 _SERENA_DEFAULT_PORT="${SERENA_PORT:-9850}"
 
-# --- 既存インスタンスチェック（PIDベース） ---
+# --- ヘルパー関数 ---
+_is_uint() {
+  case "$1" in
+    ""|0|*[!0-9]*) return 1 ;;
+    *) return 0 ;;
+  esac
+}
+_escape_ere() {
+  printf '%s' "$1" | sed -e 's/[][(){}.^$*+?|\\]/\\&/g'
+}
+
+# --- 既存インスタンスチェック（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
+  IFS=' ' read -r _saved_port _saved_pid _rest < "$_SERENA_PORT_FILE" || true
+
+  if _is_uint "$_saved_pid" && _is_uint "$_saved_port"; then
+    _cmd="$(ps -p "$_saved_pid" -ww -o command= 2>/dev/null || true)"
+    _base_ere="$(_escape_ere "$_SERENA_BASE")"
+
+    if [ -n "$_cmd" ] \
+       && printf '%s\n' "$_cmd" | grep -Eq -- "(^|[[:space:]])--project(=|[[:space:]])${_base_ere}([[:space:]]|$)"; then
+      # 自プロジェクトのSerenaプロセス → 再利用
+      export SERENA_PORT="$_saved_port"
+      return 0 2>/dev/null || true
+    fi
   fi
-  # PID死亡 → クリーンアップ
+
+  # PID死亡 or 数値不正 or 別プロセス/別プロジェクトのSerena → クリーンアップ
   rm -f "$_SERENA_PORT_FILE"
 fi