ziku 0.20.0

package/dist/index.mjs

@@ -0,0 +1,3788 @@
+#!/usr/bin/env node
+import { createRequire } from "node:module";
+import * as p from "@clack/prompts";
+import { defineCommand, runMain } from "citty";
+import { copyFileSync, existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
+import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
+import { dirname, join, resolve } from "pathe";
+import { parse, stringify } from "yaml";
+import { z } from "zod";
+import { downloadTemplate } from "giget";
+import { applyEdits, modify, parse as parse$1 } from "jsonc-parser";
+import { applyPatch, createPatch, diffWords, structuredPatch } from "diff";
+import pc, { default as pc$1 } from "picocolors";
+import ignore from "ignore";
+import { glob, globSync } from "tinyglobby";
+import { match } from "ts-pattern";
+import { execFileSync } from "node:child_process";
+import { Octokit } from "@octokit/rest";
+import { createHash } from "node:crypto";
+
+//#region rolldown:runtime
+var __require = /* @__PURE__ */ createRequire(import.meta.url);
+
+//#endregion
+//#region package.json
+var version$2 = "0.20.0";
+
+//#endregion
+//#region src/modules/schemas.ts
+/** 非負整数（行数カウント用） */
+const nonNegativeIntSchema = z.number().int().nonnegative().brand();
+/** ファイルパス */
+const filePathSchema = z.string().min(1).brand();
+const overwriteStrategySchema = z.enum([
+	"overwrite",
+	"skip",
+	"prompt"
+]);
+const fileActionSchema = z.enum([
+	"copied",
+	"created",
+	"overwritten",
+	"skipped",
+	"skipped_ignored"
+]);
+const fileOperationResultSchema = z.object({
+	action: fileActionSchema,
+	path: z.string()
+});
+const moduleSchema = z.object({
+	id: z.string(),
+	name: z.string(),
+	description: z.string(),
+	setupDescription: z.string().optional(),
+	patterns: z.array(z.string())
+});
+const configSchema = z.object({
+	version: z.string(),
+	installedAt: z.string().datetime({ offset: true }),
+	modules: z.array(z.string()),
+	source: z.object({
+		owner: z.string(),
+		repo: z.string(),
+		ref: z.string().optional()
+	}),
+	excludePatterns: z.array(z.string()).optional(),
+	baseRef: z.string().optional(),
+	baseHashes: z.record(z.string(), z.string()).optional(),
+	pendingMerge: z.object({
+		conflicts: z.array(z.string()),
+		templateHashes: z.record(z.string(), z.string()),
+		latestRef: z.string().optional()
+	}).optional()
+});
+const answersSchema = z.object({
+	modules: z.array(z.string()).min(1, "少なくとも1つのモジュールを選択してください"),
+	overwriteStrategy: overwriteStrategySchema
+});
+const diffTypeSchema = z.enum([
+	"added",
+	"modified",
+	"deleted",
+	"unchanged"
+]);
+const fileDiffSchema = z.object({
+	path: z.string(),
+	type: diffTypeSchema,
+	localContent: z.string().optional(),
+	templateContent: z.string().optional()
+});
+const diffResultSchema = z.object({
+	files: z.array(fileDiffSchema),
+	summary: z.object({
+		added: z.number(),
+		modified: z.number(),
+		deleted: z.number(),
+		unchanged: z.number()
+	})
+});
+const prResultSchema = z.object({
+	url: z.string(),
+	number: z.number(),
+	branch: z.string()
+});
+/** マニフェスト内のファイルエントリ */
+const manifestFileSchema = z.object({
+	path: z.string(),
+	type: diffTypeSchema,
+	selected: z.boolean(),
+	lines_added: z.number().optional(),
+	lines_removed: z.number().optional()
+});
+/** マニフェスト内の未追跡ファイルエントリ */
+const manifestUntrackedFileSchema = z.object({
+	path: z.string(),
+	module_id: z.string(),
+	selected: z.boolean()
+});
+/** GitHub設定 */
+const manifestGitHubSchema = z.object({ token: z.string().optional() });
+/** PR設定 */
+const manifestPrSchema = z.object({
+	title: z.string(),
+	body: z.string().optional()
+});
+/** サマリー（読み取り専用） */
+const manifestSummarySchema = z.object({
+	added: z.number(),
+	modified: z.number(),
+	deleted: z.number()
+});
+/** Push マニフェスト全体 */
+const pushManifestSchema = z.object({
+	version: z.literal(1),
+	generated_at: z.string().datetime({ offset: true }),
+	github: manifestGitHubSchema,
+	pr: manifestPrSchema,
+	files: z.array(manifestFileSchema),
+	untracked_files: z.array(manifestUntrackedFileSchema).optional(),
+	summary: manifestSummarySchema
+});
+
+//#endregion
+//#region src/utils/manifest.ts
+/** マニフェストファイル名 */
+const MANIFEST_FILENAME = ".devenv-push-manifest.yaml";
+/** マニフェストファイルのヘッダーコメント */
+const MANIFEST_HEADER = `# ================================================================================
+# ziku push manifest
+# ================================================================================
+#
+# This file was generated by \`ziku push --prepare\`
+#
+# USAGE (for AI agents and humans):
+#   1. Review and edit this file:
+#      - Set \`selected: true\` for files you want to include in the PR
+#      - Set \`selected: false\` for files you want to exclude
+#      - Edit \`pr.title\` and \`pr.body\` as needed
+#   2. Run \`ziku push --execute\` to create the PR
+#
+# GITHUB TOKEN:
+#   Set the GITHUB_TOKEN or GH_TOKEN environment variable, or
+#   add the token directly in the github.token field below.
+#
+# ================================================================================
+
+`;
+/**
+* 差分の行数を計算（localContent と templateContent から）
+*/
+function countDiffLines(localContent, templateContent, type) {
+	if (type === "added" && localContent) return {
+		added: localContent.split("\n").length,
+		removed: 0
+	};
+	if (type === "deleted" && templateContent) return {
+		added: 0,
+		removed: templateContent.split("\n").length
+	};
+	if (type === "modified" && localContent && templateContent) {
+		const localLines = localContent.split("\n");
+		const templateLines = templateContent.split("\n");
+		const added = Math.max(0, localLines.length - templateLines.length);
+		const removed = Math.max(0, templateLines.length - localLines.length);
+		if (added === 0 && removed === 0 && localContent !== templateContent) return {
+			added: 1,
+			removed: 1
+		};
+		return {
+			added,
+			removed
+		};
+	}
+	return {
+		added: 0,
+		removed: 0
+	};
+}
+/**
+* マニフェストファイルを生成
+*/
+function generateManifest(options) {
+	const { diff, pushableFiles, untrackedByFolder, defaultTitle, modulesFileChange } = options;
+	return {
+		version: 1,
+		generated_at: (/* @__PURE__ */ new Date()).toISOString(),
+		github: { token: void 0 },
+		pr: {
+			title: defaultTitle || "feat: update template configuration",
+			body: void 0
+		},
+		files: [...pushableFiles.map((file) => {
+			const { added, removed } = countDiffLines(file.localContent, file.templateContent, file.type);
+			return {
+				path: file.path,
+				type: file.type,
+				selected: true,
+				lines_added: added > 0 ? added : void 0,
+				lines_removed: removed > 0 ? removed : void 0
+			};
+		}), ...modulesFileChange ? [{
+			path: modulesFileChange,
+			type: "modified",
+			selected: true
+		}] : []],
+		untracked_files: untrackedByFolder?.flatMap((folder) => folder.files.map((file) => ({
+			path: file.path,
+			module_id: file.moduleId,
+			selected: false
+		}))),
+		summary: {
+			added: diff.summary.added,
+			modified: diff.summary.modified,
+			deleted: diff.summary.deleted
+		}
+	};
+}
+/**
+* マニフェストをYAML文字列に変換
+*/
+function serializeManifest(manifest) {
+	return MANIFEST_HEADER + stringify(manifest, {
+		indent: 2,
+		lineWidth: 120
+	});
+}
+/**
+* マニフェストファイルを保存
+*/
+async function saveManifest(targetDir, manifest) {
+	const manifestPath = join(targetDir, MANIFEST_FILENAME);
+	await writeFile(manifestPath, serializeManifest(manifest), "utf-8");
+	return manifestPath;
+}
+/**
+* マニフェストファイルを読み込み
+*/
+async function loadManifest(targetDir) {
+	const manifestPath = join(targetDir, MANIFEST_FILENAME);
+	if (!existsSync(manifestPath)) throw new Error(`Manifest file not found: ${manifestPath}\nRun 'ziku push --prepare' first to generate the manifest.`);
+	const parsed = parse(await readFile(manifestPath, "utf-8"));
+	const result = pushManifestSchema.safeParse(parsed);
+	if (!result.success) throw new Error(`Invalid manifest file format: ${result.error.message}`);
+	return result.data;
+}
+/**
+* マニフェストファイルを削除する。
+*
+* 背景: --execute でPR作成が成功した後、マニフェストはもう不要なので自動的にクリーンアップする。
+* ファイルが存在しない場合は何もしない。
+*/
+async function deleteManifest(targetDir) {
+	const manifestPath = join(targetDir, MANIFEST_FILENAME);
+	if (existsSync(manifestPath)) await rm(manifestPath);
+}
+/**
+* 選択されたファイルのパスを取得
+*/
+function getSelectedFilePaths(manifest) {
+	return manifest.files.filter((f) => f.selected).map((f) => f.path);
+}
+/**
+* 選択された未追跡ファイルを取得（moduleId別）
+*/
+function getSelectedUntrackedFiles(manifest) {
+	const result = /* @__PURE__ */ new Map();
+	if (!manifest.untracked_files) return result;
+	for (const file of manifest.untracked_files) if (file.selected) {
+		const existing = result.get(file.module_id) || [];
+		existing.push(file.path);
+		result.set(file.module_id, existing);
+	}
+	return result;
+}
+
+//#endregion
+//#region src/docs/ai-guide.ts
+/**
+* AI Agent Guide
+*
+* This file serves as the single source of truth for AI-facing documentation.
+* It is used both for:
+*   - `ziku ai-docs` command output
+*   - README.md "For AI Agents" section generation
+*/
+/**
+* Generate the complete AI agent guide as markdown
+*/
+function generateAiGuide() {
+	return getDocSections().map((s) => `## ${s.title}\n\n${s.content}`).join("\n\n");
+}
+/**
+* Generate the AI agent guide with header for CLI output
+*/
+function generateAiGuideWithHeader() {
+	return `# ziku v${version$2} - AI Agent Guide
+
+This guide explains how AI coding agents (Claude Code, Cursor, etc.) can use this tool effectively.
+
+` + generateAiGuide();
+}
+/**
+* Get individual documentation sections
+* Used by both CLI output and README generation
+*/
+function getDocSections() {
+	return [
+		{
+			title: "Quick Reference",
+			content: `\`\`\`bash
+# Non-interactive init for AI agents
+npx ziku init --yes                           # All modules, overwrite strategy
+npx ziku init --modules .,devcontainer        # Specific modules only
+npx ziku init --modules .github -s skip       # Specific modules with skip strategy
+npx ziku init --yes --overwrite-strategy skip # All modules with skip strategy
+
+# Non-interactive push workflow for AI agents (simple)
+npx ziku push --yes --files "path1,path2" -m "feat: ..."  # Push specific files only
+
+# Non-interactive push workflow for AI agents (manifest-based)
+npx ziku push --prepare    # Generate manifest
+# Edit ${MANIFEST_FILENAME}              # Select files
+npx ziku push --execute    # Create PR
+
+# Add files to tracking (non-interactive)
+npx ziku track ".cloud/rules/*.md"            # Add pattern (auto-detect module)
+npx ziku track ".cloud/config.json" -m .cloud # Specify module explicitly
+npx ziku track --list                         # List tracked modules/patterns
+
+# Show differences and detect untracked files
+npx ziku diff              # Show differences (also reports untracked files)
+
+# Other commands
+npx ziku init [dir]        # Apply template (interactive)
+npx ziku ai-docs           # Show this guide
+\`\`\``
+		},
+		{
+			title: "Init Command for AI Agents",
+			content: `The \`init\` command supports non-interactive options for AI agents:
+
+### Options
+
+| Option | Alias | Description |
+|--------|-------|-------------|
+| \`--yes\` | \`-y\` | Select all modules with overwrite strategy |
+| \`--modules <ids>\` | \`-m\` | Comma-separated module IDs to apply |
+| \`--overwrite-strategy <strategy>\` | \`-s\` | Strategy for existing files: \`overwrite\`, \`skip\`, or \`prompt\` |
+| \`--force\` | | Force overwrite (overrides strategy to \`overwrite\`) |
+
+### Examples
+
+\`\`\`bash
+# Apply only specific modules (skips module selection prompt)
+npx ziku init --modules .github,.claude
+
+# Apply specific modules and skip existing files
+npx ziku init --modules devcontainer -s skip
+
+# Apply all modules but skip existing files
+npx ziku init --yes --overwrite-strategy skip
+
+# Re-init when .devenv.json exists, replacing only specific modules
+npx ziku init --modules . -s overwrite
+\`\`\`
+
+### Behavior
+
+- \`--modules\` or \`--yes\`: Skips the module selection prompt entirely
+- \`--overwrite-strategy\`: Sets how to handle existing files (default: \`overwrite\` in non-interactive mode)
+- When neither is provided, interactive prompts are shown
+- \`.devenv.json\` is always updated regardless of strategy`
+		},
+		{
+			title: "Important: Untracked Files and the Track Command",
+			content: `**The \`push\` and \`diff\` commands only operate on files that are in the sync whitelist (tracked patterns).**
+If you create new files or directories that don't match any existing pattern, they will appear as **untracked** and will NOT be included in diffs or push operations.
+
+To sync these files to the template, you **must** first add them to tracking:
+
+\`\`\`bash
+# 1. Check for untracked files
+npx ziku diff
+
+# 2. Add untracked files to the whitelist
+npx ziku track "<file-or-glob-pattern>"
+
+# 3. Now push will include these files
+npx ziku push --prepare
+\`\`\`
+
+**Key points:**
+- \`diff\` will report untracked files and suggest using \`track\`
+- \`push --prepare\` will list untracked files in the manifest (with \`selected: false\` by default)
+- \`track\` is non-interactive and designed for AI agents — no prompts required
+- After running \`track\`, re-run \`push --prepare\` to include the newly tracked files`
+		},
+		{
+			title: "Push Workflow for AI Agents",
+			content: `When contributing template improvements, use one of these workflows:
+
+### Simple: Direct Push with \`--files\`
+
+For quick, targeted pushes where you know exactly which files to include:
+
+\`\`\`bash
+# Push only specific files (non-interactive, no manifest needed)
+npx ziku push --yes --files ".claude/statusline.sh,.claude/settings.json" -m "feat: add statusline"
+\`\`\`
+
+- \`--files\`: Comma-separated list of file paths to include (only files with actual changes are eligible)
+- \`--yes\`: Skips confirmation prompts
+- \`-m\`: Sets the PR title
+- Files not found in pushable changes will be warned but won't block the push
+- This is the recommended approach for AI agents when you know which files to push
+
+### Manifest-based: \`--prepare\` + \`--execute\`
+
+For complex pushes where you need to review changes first:
+
+### Phase 1: Prepare
+
+\`\`\`bash
+npx ziku push --prepare
+\`\`\`
+
+This generates \`${MANIFEST_FILENAME}\` containing:
+- List of changed files with \`selected: true/false\`
+- PR title and body fields
+- Summary of changes
+
+### Phase 2: Edit Manifest
+
+Edit the generated \`${MANIFEST_FILENAME}\`:
+
+\`\`\`yaml
+pr:
+  title: "feat: add new workflow for CI"
+  body: |
+    ## Summary
+    Added new CI workflow for automated testing.
+
+    ## Changes
+    - Added .github/workflows/ci.yml
+
+files:
+  - path: .github/workflows/ci.yml
+    type: added
+    selected: true    # Include this file
+  - path: .github/labeler.yml
+    type: modified
+    selected: false   # Exclude this file
+\`\`\`
+
+### Phase 3: Execute
+
+\`\`\`bash
+# Set GitHub token (required)
+export GITHUB_TOKEN="your-token"
+
+# Create the PR
+npx ziku push --execute
+\`\`\``
+		},
+		{
+			title: "Manifest File Reference",
+			content: `The manifest file (\`${MANIFEST_FILENAME}\`) structure:
+
+| Field | Description |
+|-------|-------------|
+| \`version\` | Manifest format version (always \`1\`) |
+| \`generated_at\` | ISO 8601 timestamp |
+| \`github.token\` | GitHub token (prefer env var) |
+| \`pr.title\` | PR title (editable) |
+| \`pr.body\` | PR description (editable) |
+| \`files[].path\` | File path |
+| \`files[].type\` | \`added\` / \`modified\` / \`deleted\` |
+| \`files[].selected\` | Include in PR (\`true\`/\`false\`) |
+| \`untracked_files[]\` | Files outside whitelist (default: \`selected: false\`) |
+| \`summary\` | Change statistics |`
+		},
+		{
+			title: "Environment Variables",
+			content: `| Variable | Description |
+|----------|-------------|
+| \`GITHUB_TOKEN\` | GitHub personal access token (required for push) |
+| \`GH_TOKEN\` | Alternative to GITHUB_TOKEN |
+
+The token needs \`repo\` scope for creating PRs.`
+		},
+		{
+			title: "Track Command for AI Agents",
+			content: `The \`track\` command allows AI agents to add files or patterns to the sync whitelist non-interactively.
+This is useful when you create new files or directories that should be part of the template.
+
+### Add patterns to an existing module
+
+\`\`\`bash
+# Auto-detects module from path (.claude module)
+npx ziku track ".claude/commands/*.md"
+
+# Explicit module
+npx ziku track ".devcontainer/new-script.sh" --module .devcontainer
+\`\`\`
+
+### Create a new module with patterns
+
+When the module doesn't exist yet, it is automatically created:
+
+\`\`\`bash
+# Creates ".cloud" module and adds the pattern
+npx ziku track ".cloud/rules/*.md"
+
+# With custom name and description
+npx ziku track ".cloud/rules/*.md" \\
+  --module .cloud \\
+  --name "Cloud Rules" \\
+  --description "Cloud configuration and rule files"
+\`\`\`
+
+### List current tracking configuration
+
+\`\`\`bash
+npx ziku track --list
+\`\`\`
+
+### Options
+
+| Option | Alias | Description |
+|--------|-------|-------------|
+| \`--module <id>\` | \`-m\` | Module ID to add patterns to (auto-detected if omitted) |
+| \`--name <name>\` | | Module display name (for new modules) |
+| \`--description <desc>\` | | Module description (for new modules) |
+| \`--dir <path>\` | \`-d\` | Project directory (default: current directory) |
+| \`--list\` | \`-l\` | List all tracked modules and patterns |`
+		},
+		{
+			title: "Best Practices for AI Agents",
+			content: `1. **Use \`--modules\` and \`--overwrite-strategy\`** for granular non-interactive init (e.g., \`init --modules .github,.claude -s skip\`)
+2. **Use \`--files\` for simple pushes** — specify exactly which files to include (e.g., \`push --yes --files "path1,path2" -m "feat: ..."\`)
+3. **Use \`--prepare\` then \`--execute\`** for complex pushes where you need to review the full diff first
+4. **Review the diff first** with \`npx ziku diff\` — this also reports untracked files
+5. **Check for untracked files** — if \`diff\` or \`push --prepare\` reports untracked files, use \`track\` to add them before pushing
+6. **Use \`track\` command** to add new files to the sync whitelist (non-interactive, no prompts)
+7. **Set meaningful PR titles** that follow conventional commits (e.g., \`feat:\`, \`fix:\`, \`docs:\`)
+8. **Deselect unrelated changes** by using \`--files\` or setting \`selected: false\` in manifest
+9. **Use environment variables** for tokens instead of hardcoding in manifest`
+		},
+		{
+			title: "Track + Push: Adding New Files to Template",
+			content: `When you create new files that should be part of the template, use \`track\` then \`push\`.
+The \`push\` command **automatically detects** changes made by \`track\` to the local \`modules.jsonc\`
+and includes them in the PR.
+
+### Workflow
+
+\`\`\`bash
+# 1. Create files locally
+mkdir -p .cloud/rules
+echo "naming conventions..." > .cloud/rules/naming.md
+
+# 2. Add to tracking (updates local .devenv/modules.jsonc)
+npx ziku track ".cloud/rules/*.md"
+
+# 3. Push detects local module additions automatically
+npx ziku push --prepare
+\`\`\`
+
+### What happens internally
+
+1. \`track\` adds patterns to **local** \`.devenv/modules.jsonc\` (creates new modules if needed)
+2. \`push --prepare\` downloads the template and compares its \`modules.jsonc\` with local
+3. New modules and patterns are detected and merged into the detection scope
+4. The manifest includes:
+   - New files (\`.cloud/rules/naming.md\`) as \`type: added\` with \`selected: true\`
+   - \`.devenv/modules.jsonc\` as \`type: modified\` with \`selected: true\`
+5. \`push --execute\` creates a PR that adds both the files AND the updated module definitions
+
+### Key behavior
+
+- **No need to manually edit modules.jsonc** — \`track\` handles it
+- **push detects local changes** — no extra flags needed; just run \`push --prepare\` after \`track\`
+- **New modules are auto-created** — if \`.cloud\` doesn't exist in the template, it's added
+- **Existing module patterns can also be extended** — \`track\` works for both new and existing modules`
+		}
+	];
+}
+
+//#endregion
+//#region src/commands/ai-docs.ts
+const aiDocsCommand = defineCommand({
+	meta: {
+		name: "ai-docs",
+		description: "Show documentation for AI coding agents"
+	},
+	args: {},
+	run() {
+		console.log(generateAiGuideWithHeader());
+	}
+});
+
+//#endregion
+//#region src/errors.ts
+/**
+* ユーザー向けエラー。hint でリカバリ方法を提示する。
+*
+* 背景: process.exit(1) が各コマンドに散在していたのを解消するため導入。
+* 各コマンドは BermError を throw し、cli.ts のトップレベルで catch して
+* @clack/prompts の log.error() で統一的に表示する。
+* process.exit(1) は cli.ts の 1 箇所のみに制限。
+*/
+var BermError = class extends Error {
+	constructor(message, hint) {
+		super(message);
+		this.hint = hint;
+		this.name = "BermError";
+	}
+};
+
+//#endregion
+//#region src/modules/loader.ts
+const MODULES_FILE = ".devenv/modules.jsonc";
+/**
+* modules.jsonc のスキーマ
+*/
+const modulesFileSchema = z.object({
+	$schema: z.string().optional(),
+	modules: z.array(moduleSchema)
+});
+/**
+* modules.jsonc ファイルを読み込み
+*/
+async function loadModulesFile(baseDir) {
+	const filePath = join(baseDir, MODULES_FILE);
+	if (!existsSync(filePath)) throw new Error(`${MODULES_FILE} が見つかりません: ${filePath}`);
+	const content = await readFile(filePath, "utf-8");
+	const parsed = parse$1(content);
+	return {
+		modules: modulesFileSchema.parse(parsed).modules,
+		rawContent: content
+	};
+}
+/**
+* modules.jsonc にパターンを追加（コメントを保持）
+* @returns 更新後の JSONC 文字列
+*/
+function addPatternToModulesFile(rawContent, moduleId, patterns) {
+	const parsed = parse$1(rawContent);
+	const moduleIndex = parsed.modules.findIndex((m) => m.id === moduleId);
+	if (moduleIndex === -1) throw new Error(`モジュール ${moduleId} が見つかりません`);
+	const existingPatterns = parsed.modules[moduleIndex].patterns;
+	const newPatterns = patterns.filter((p$1) => !existingPatterns.includes(p$1));
+	if (newPatterns.length === 0) return rawContent;
+	const updatedPatterns = [...existingPatterns, ...newPatterns];
+	return applyEdits(rawContent, modify(rawContent, [
+		"modules",
+		moduleIndex,
+		"patterns"
+	], updatedPatterns, { formattingOptions: {
+		tabSize: 2,
+		insertSpaces: true
+	} }));
+}
+/**
+* modules.jsonc にパターンを追加（モジュールが存在しない場合は作成）
+* @returns 更新後の JSONC 文字列
+*/
+function addPatternToModulesFileWithCreate(rawContent, moduleId, patterns, moduleOptions) {
+	const parsed = parse$1(rawContent);
+	if (parsed.modules.findIndex((m) => m.id === moduleId) !== -1) return addPatternToModulesFile(rawContent, moduleId, patterns);
+	const newModule = {
+		id: moduleId,
+		name: moduleOptions?.name || (moduleId === "." ? "Root" : moduleId.replace(/^\./, "").replace(/[-_]/g, " ").replace(/\b\w/g, (c) => c.toUpperCase())),
+		description: moduleOptions?.description || `Files in ${moduleId === "." ? "root" : moduleId} directory`,
+		patterns
+	};
+	return applyEdits(rawContent, modify(rawContent, ["modules"], [...parsed.modules, newModule], { formattingOptions: {
+		tabSize: 2,
+		insertSpaces: true
+	} }));
+}
+/**
+* modules.jsonc を保存
+*/
+async function saveModulesFile(baseDir, content) {
+	await writeFile(join(baseDir, MODULES_FILE), content);
+}
+/**
+* モジュールファイルのパスを取得
+*/
+function getModulesFilePath(baseDir) {
+	return join(baseDir, MODULES_FILE);
+}
+/**
+* modules.jsonc が存在するか確認
+*/
+function modulesFileExists(baseDir) {
+	return existsSync(join(baseDir, MODULES_FILE));
+}
+
+//#endregion
+//#region src/modules/index.ts
+/**
+* デフォルトモジュール（modules.jsonc がない場合のフォールバック）
+* モジュール ID = ディレクトリパス（ルートは "."）
+*/
+const defaultModules = [
+	{
+		id: ".",
+		name: "ルート設定",
+		description: "MCP、mise などのルート設定ファイル",
+		setupDescription: "プロジェクトルートの設定ファイルが適用されます",
+		patterns: [".mcp.json", ".mise.toml"]
+	},
+	{
+		id: ".devcontainer",
+		name: "DevContainer",
+		description: "VS Code DevContainer、Docker-in-Docker",
+		setupDescription: "VS Code で DevContainer を開くと自動でセットアップされます",
+		patterns: [
+			".devcontainer/devcontainer.json",
+			".devcontainer/.gitignore",
+			".devcontainer/setup-*.sh",
+			".devcontainer/test-*.sh",
+			".devcontainer/.env.devcontainer.example"
+		]
+	},
+	{
+		id: ".github",
+		name: "GitHub",
+		description: "GitHub Actions、labeler ワークフロー",
+		setupDescription: "PR 作成時に自動でラベル付け、Issue リンクが行われます",
+		patterns: [
+			".github/workflows/issue-link.yml",
+			".github/workflows/label.yml",
+			".github/labeler.yml"
+		]
+	},
+	{
+		id: ".claude",
+		name: "Claude",
+		description: "Claude Code のプロジェクト共通設定",
+		setupDescription: "Claude Code のプロジェクト設定が適用されます",
+		patterns: [".claude/settings.json"]
+	}
+];
+/**
+* モジュールリストから ID でモジュールを取得
+*/
+function getModuleById(id, moduleList = defaultModules) {
+	return moduleList.find((m) => m.id === id);
+}
+/**
+* 指定モジュールIDのパターンを取得
+*/
+function getPatternsByModuleIds(moduleIds, moduleList = defaultModules) {
+	return moduleList.filter((m) => moduleIds.includes(m.id)).flatMap((m) => m.patterns);
+}
+
+//#endregion
+//#region src/utils/gitignore.ts
+/**
+* 複数ディレクトリの .gitignore をマージして読み込み
+* ローカルとテンプレートの両方の .gitignore を考慮することで、
+* クレデンシャル等の機密情報の誤流出を防止する
+*/
+async function loadMergedGitignore(dirs) {
+	const ig = ignore();
+	for (const dir of dirs) {
+		const gitignorePath = join(dir, ".gitignore");
+		if (existsSync(gitignorePath)) {
+			const content = await readFile(gitignorePath, "utf-8");
+			ig.add(content);
+		}
+	}
+	return ig;
+}
+/**
+* gitignore ルールでファイルをフィルタリング
+* gitignore に該当しないファイルのみを返す
+*/
+function filterByGitignore(files, ig) {
+	return ig.filter(files);
+}
+function separateByGitignore(files, ig) {
+	const tracked = [];
+	const ignored = [];
+	for (const file of files) if (ig.ignores(file)) ignored.push(file);
+	else tracked.push(file);
+	return {
+		tracked,
+		ignored
+	};
+}
+
+//#endregion
+//#region src/utils/patterns.ts
+/**
+* パターンにマッチするファイル一覧を取得
+*/
+function resolvePatterns(baseDir, patterns) {
+	return globSync(patterns, {
+		cwd: baseDir,
+		dot: true,
+		onlyFiles: true
+	}).sort();
+}
+/**
+* ファイルがパターンにマッチするか判定
+*/
+function matchesPatterns(filePath, patterns) {
+	for (const pattern of patterns) {
+		if (filePath === pattern) return true;
+		if (isGlobPattern(pattern)) {
+			if (globSync([pattern], {
+				cwd: ".",
+				expandDirectories: false
+			}).includes(filePath)) return true;
+		}
+	}
+	return false;
+}
+/**
+* パターンが glob パターンかどうかを判定
+*/
+function isGlobPattern(pattern) {
+	return /[*?[\]{}!]/.test(pattern);
+}
+/**
+* 設定からモジュールの有効パターンを取得
+*/
+function getEffectivePatterns(_moduleId, modulePatterns, config) {
+	let patterns = [...modulePatterns];
+	if (config?.excludePatterns) {
+		const excludePatterns = config.excludePatterns;
+		patterns = patterns.filter((p$1) => !matchesPatterns(p$1, excludePatterns));
+	}
+	return patterns;
+}
+
+//#endregion
+//#region src/ui/renderer.ts
+/**
+* 統一出力インターフェース — @clack/prompts のラッパー
+*
+* 背景: showHeader(), box(), showNextSteps(), log, withSpinner() 等の
+* 散在した UI 関数を @clack/prompts ベースで統一するために導入。
+* 全コマンドはこのモジュール経由で出力する。
+*
+* 削除条件: ziku が別の UI フレームワーク（ink 等）に移行する場合。
+*/
+const version$1 = "0.20.0";
+/** CLI の開始表示 */
+function intro(command) {
+	const title = command ? `ziku ${command}` : "ziku";
+	p.intro(`${pc$1.bgCyan(pc$1.black(` ${title} `))} ${pc$1.dim(`v${version$1}`)}`);
+}
+/** CLI の終了表示 */
+function outro(message) {
+	p.outro(message);
+}
+/** 構造化ログ — @clack/prompts の log を re-export */
+const log = {
+	info: (message) => p.log.info(message),
+	success: (message) => p.log.success(message),
+	warn: (message) => p.log.warn(message),
+	error: (message) => p.log.error(message),
+	step: (message) => p.log.step(message),
+	message: (message) => p.log.message(message)
+};
+/** スピナー付きで非同期タスクを実行 */
+async function withSpinner(message, task) {
+	const s = p.spinner();
+	s.start(message);
+	try {
+		const result = await task();
+		s.stop(message);
+		return result;
+	} catch (error) {
+		s.stop(pc$1.red(`Failed: ${message}`));
+		throw error;
+	}
+}
+/** ファイル操作結果を表示（init コマンド用） */
+function logFileResults(results) {
+	let added = 0;
+	let updated = 0;
+	let skipped = 0;
+	const lines = [];
+	for (const r of results) switch (r.action) {
+		case "copied":
+		case "created":
+			lines.push(`${pc$1.green("+")} ${r.path}`);
+			added++;
+			break;
+		case "overwritten":
+			lines.push(`${pc$1.yellow("~")} ${r.path}`);
+			updated++;
+			break;
+		default:
+			lines.push(`${pc$1.dim("-")} ${pc$1.dim(r.path)}`);
+			skipped++;
+			break;
+	}
+	const summary = [
+		added > 0 ? pc$1.green(`${added} added`) : null,
+		updated > 0 ? pc$1.yellow(`${updated} updated`) : null,
+		skipped > 0 ? pc$1.dim(`${skipped} skipped`) : null
+	].filter(Boolean).join(", ");
+	p.log.message([
+		...lines,
+		"",
+		summary
+	].join("\n"));
+	return {
+		added,
+		updated,
+		skipped
+	};
+}
+/** diff サマリーを表示（push/diff コマンド用） */
+function logDiffSummary(files) {
+	const changed = files.filter((f) => f.type !== "unchanged");
+	if (changed.length === 0) {
+		p.log.info("No changes detected");
+		return;
+	}
+	const lines = changed.map((f) => {
+		switch (f.type) {
+			case "added": return `${pc$1.green("+")} ${pc$1.green(f.path)}`;
+			case "modified": return `${pc$1.yellow("~")} ${pc$1.yellow(f.path)}`;
+			case "deleted": return `${pc$1.red("-")} ${pc$1.red(f.path)}`;
+			default: return `  ${pc$1.dim(f.path)}`;
+		}
+	});
+	const summary = files.reduce((acc, f) => {
+		if (f.type === "added") acc.added++;
+		else if (f.type === "modified") acc.modified++;
+		else if (f.type === "deleted") acc.deleted++;
+		return acc;
+	}, {
+		added: 0,
+		modified: 0,
+		deleted: 0
+	});
+	const summaryParts = [
+		summary.added > 0 ? pc$1.green(`+${summary.added} added`) : null,
+		summary.modified > 0 ? pc$1.yellow(`~${summary.modified} modified`) : null,
+		summary.deleted > 0 ? pc$1.red(`-${summary.deleted} deleted`) : null
+	].filter(Boolean).join(pc$1.dim(" | "));
+	p.log.message([
+		...lines,
+		"",
+		summaryParts
+	].join("\n"));
+}
+/** BermError を整形表示 */
+function logBermError(error) {
+	p.log.error(error.message);
+	if (error.hint) p.log.message(pc$1.dim(error.hint));
+}
+
+//#endregion
+//#region src/utils/diff.ts
+/**
+* ローカルとテンプレート間の差分を検出
+*/
+async function detectDiff(options) {
+	const { targetDir, templateDir, moduleIds, config, moduleList = defaultModules } = options;
+	const files = [];
+	let added = 0;
+	let modified = 0;
+	let deleted = 0;
+	let unchanged = 0;
+	const gitignore = await loadMergedGitignore([targetDir, templateDir]);
+	for (const moduleId of moduleIds) {
+		const mod = getModuleById(moduleId, moduleList);
+		if (!mod) {
+			log.warn(`Module "${pc.cyan(moduleId)}" not found`);
+			continue;
+		}
+		const patterns = getEffectivePatterns(moduleId, mod.patterns, config);
+		const templateFiles = filterByGitignore(resolvePatterns(templateDir, patterns), gitignore);
+		const localFiles = filterByGitignore(resolvePatterns(targetDir, patterns), gitignore);
+		const allFiles = new Set([...templateFiles, ...localFiles]);
+		for (const filePath of allFiles) {
+			const localPath = join(targetDir, filePath);
+			const templatePath = join(templateDir, filePath);
+			const localExists = existsSync(localPath);
+			const templateExists = existsSync(templatePath);
+			let type;
+			let localContent;
+			let templateContent;
+			if (localExists) localContent = await readFile(localPath, "utf-8");
+			if (templateExists) templateContent = await readFile(templatePath, "utf-8");
+			if (localExists && templateExists) if (localContent === templateContent) {
+				type = "unchanged";
+				unchanged++;
+			} else {
+				type = "modified";
+				modified++;
+			}
+			else if (localExists && !templateExists) {
+				type = "added";
+				added++;
+			} else {
+				type = "deleted";
+				deleted++;
+			}
+			files.push({
+				path: filePath,
+				type,
+				localContent,
+				templateContent
+			});
+		}
+	}
+	return {
+		files: files.sort((a, b) => a.path.localeCompare(b.path)),
+		summary: {
+			added,
+			modified,
+			deleted,
+			unchanged
+		}
+	};
+}
+/**
+* push 対象のファイルのみをフィルタリング
+* (ローカルで追加・変更されたファイル)
+*/
+function getPushableFiles(diff) {
+	return diff.files.filter((f) => f.type === "added" || f.type === "modified");
+}
+/**
+* 差分があるかどうかを判定
+*/
+function hasDiff(diff) {
+	return diff.summary.added > 0 || diff.summary.modified > 0 || diff.summary.deleted > 0;
+}
+/**
+* FileDiff から unified diff 形式の文字列を生成
+*/
+function generateUnifiedDiff(fileDiff) {
+	const { path, type, localContent, templateContent } = fileDiff;
+	switch (type) {
+		case "added": return createPatch(path, "", localContent || "", "template", "local");
+		case "modified": return createPatch(path, templateContent || "", localContent || "", "template", "local");
+		default: return "";
+	}
+}
+
+//#endregion
+//#region src/ui/diff-view.ts
+/**
+* Diff 表示コンポーネント
+*
+* 背景: utils/diff-viewer.ts (682行) を再構築。
+* cli-highlight を削除し picocolors のみで表示。
+* readline raw mode のインタラクティブビューアを削除し、
+* 単純な出力に変更（less にパイプ可能）。
+* 統計計算・word diff ロジックは維持。
+*
+* 削除条件: ziku が TUI フレームワーク（ink 等）に移行する場合。
+*/
+/** ファイルの差分統計を計算 */
+function calculateDiffStats(fileDiff) {
+	switch (fileDiff.type) {
+		case "unchanged": return {
+			additions: 0,
+			deletions: 0
+		};
+		case "deleted": return {
+			additions: 0,
+			deletions: fileDiff.templateContent?.split("\n").length ?? 0
+		};
+		case "added": return {
+			additions: fileDiff.localContent?.split("\n").length ?? 0,
+			deletions: 0
+		};
+		case "modified": {
+			const diff = generateUnifiedDiff(fileDiff);
+			let additions = 0;
+			let deletions = 0;
+			for (const line of diff.split("\n")) if (line.startsWith("+") && !line.startsWith("+++")) additions++;
+			else if (line.startsWith("-") && !line.startsWith("---")) deletions++;
+			return {
+				additions,
+				deletions
+			};
+		}
+	}
+}
+/** 統計フォーマット (+10 -5) */
+function formatStats(stats) {
+	const parts = [];
+	if (stats.additions > 0) parts.push(pc.green(`+${stats.additions}`));
+	if (stats.deletions > 0) parts.push(pc.red(`-${stats.deletions}`));
+	return parts.length === 0 ? pc.dim("(no changes)") : parts.join(" ");
+}
+/** 単一ファイルの diff を表示 */
+function renderFileDiff(file) {
+	const stats = calculateDiffStats(file);
+	const typeLabel = file.type === "added" ? pc.green("added") : file.type === "modified" ? pc.yellow("modified") : pc.red("deleted");
+	p.log.step(`${pc.bold(file.path)} ${pc.dim("—")} ${typeLabel} ${formatStats(stats)}`);
+	if (file.type === "unchanged") return;
+	const diff = generateUnifiedDiff(file);
+	if (!diff) return;
+	const rendered = applyWordDiffAndColorize(diff.split("\n").filter((l) => !l.startsWith("Index:") && !l.startsWith("===") && !l.startsWith("---") && !l.startsWith("+++")));
+	p.log.message(rendered.join("\n"));
+}
+/**
+* Diff 行に word diff + 色を適用
+*
+* 隣接する deletion/addition ペアを検出し、diffWords で
+* 変更箇所を背景色でハイライトする。それ以外の行は通常の色付け。
+*/
+function applyWordDiffAndColorize(lines) {
+	const result = [];
+	let i = 0;
+	while (i < lines.length) {
+		const line = lines[i];
+		if (line.startsWith("-") && !line.startsWith("---") && i + 1 < lines.length && lines[i + 1].startsWith("+") && !lines[i + 1].startsWith("+++")) {
+			const changes = diffWords(line.slice(1), lines[i + 1].slice(1));
+			let oldLine = pc.red("-");
+			let newLine = pc.green("+");
+			for (const change of changes) if (change.added) newLine += pc.bgGreen(pc.black(change.value));
+			else if (change.removed) oldLine += pc.bgRed(pc.white(change.value));
+			else {
+				oldLine += change.value;
+				newLine += change.value;
+			}
+			result.push(oldLine, newLine);
+			i += 2;
+			continue;
+		}
+		if (line.startsWith("@@")) result.push(pc.cyan(line));
+		else if (line.startsWith("+")) result.push(pc.green(line));
+		else if (line.startsWith("-")) result.push(pc.red(line));
+		else result.push(line);
+		i++;
+	}
+	return result;
+}
+
+//#endregion
+//#region src/utils/template.ts
+const TEMPLATE_SOURCE = "gh:tktcorporation/.github";
+/**
+* DevEnvConfig の source フィールドから giget 用のテンプレートソース文字列を構築する。
+*
+* 背景: giget は "gh:owner/repo" または "gh:owner/repo#ref" 形式を期待する。
+* .devenv.json の source: { owner, repo, ref? } をこの形式に変換する。
+*/
+function buildTemplateSource(source) {
+	const base = `gh:${source.owner}/${source.repo}`;
+	return source.ref ? `${base}#${source.ref}` : base;
+}
+/**
+* テンプレートをダウンロードして一時ディレクトリのパスを返す。
+*
+* @param targetDir - テンプレートを展開するベースディレクトリ
+* @param source - giget 形式のテンプレートソース (例: "gh:owner/repo")。
+*                 未指定時はデフォルトの TEMPLATE_SOURCE を使用。
+*/
+async function downloadTemplateToTemp(targetDir, source) {
+	const tempDir = join(targetDir, ".devenv-temp");
+	const { dir: templateDir } = await downloadTemplate(source ?? TEMPLATE_SOURCE, {
+		dir: tempDir,
+		force: true
+	});
+	const cleanup = () => {
+		if (existsSync(tempDir)) rmSync(tempDir, {
+			recursive: true,
+			force: true
+		});
+	};
+	return {
+		templateDir,
+		cleanup
+	};
+}
+/**
+* 上書き戦略に従ってファイルを書き込む
+*/
+async function writeFileWithStrategy(options) {
+	const { destPath, content, strategy, relativePath } = options;
+	if (!existsSync(destPath)) {
+		const destDir = dirname(destPath);
+		if (!existsSync(destDir)) mkdirSync(destDir, { recursive: true });
+		writeFileSync(destPath, content);
+		return {
+			action: "created",
+			path: relativePath
+		};
+	}
+	return match(strategy).with("overwrite", () => {
+		writeFileSync(destPath, content);
+		return {
+			action: "overwritten",
+			path: relativePath
+		};
+	}).with("skip", () => {
+		return {
+			action: "skipped",
+			path: relativePath
+		};
+	}).with("prompt", async () => {
+		const shouldOverwrite = await p.confirm({
+			message: `${relativePath} already exists. Overwrite?`,
+			initialValue: false
+		});
+		if (p.isCancel(shouldOverwrite) || !shouldOverwrite) return {
+			action: "skipped",
+			path: relativePath
+		};
+		writeFileSync(destPath, content);
+		return {
+			action: "overwritten",
+			path: relativePath
+		};
+	}).exhaustive();
+}
+/**
+* テンプレートを取得してパターンベースでコピー
+*/
+async function fetchTemplates(options) {
+	const { targetDir, modules, overwriteStrategy, config, moduleList, templateDir: preDownloadedDir } = options;
+	const allResults = [];
+	const shouldDownload = !preDownloadedDir;
+	const tempDir = join(targetDir, ".devenv-temp");
+	let templateDir;
+	try {
+		if (shouldDownload) templateDir = (await downloadTemplate(TEMPLATE_SOURCE, {
+			dir: tempDir,
+			force: true
+		})).dir;
+		else templateDir = preDownloadedDir;
+		const gitignore = await loadMergedGitignore([targetDir, templateDir]);
+		for (const moduleId of modules) {
+			const moduleDef = moduleList ? moduleList.find((m) => m.id === moduleId) : getModuleById(moduleId);
+			if (!moduleDef) continue;
+			const patterns = getEffectivePatterns(moduleId, moduleDef.patterns, config);
+			const { tracked, ignored } = separateByGitignore(resolvePatterns(templateDir, patterns), gitignore);
+			if (tracked.length === 0 && ignored.length === 0) {
+				log.warn(`No files matched for module "${pc.cyan(moduleId)}"`);
+				continue;
+			}
+			for (const relativePath of tracked) {
+				const result = await copyFile(join(templateDir, relativePath), join(targetDir, relativePath), overwriteStrategy, relativePath);
+				allResults.push(result);
+			}
+			for (const relativePath of ignored) {
+				const srcPath = join(templateDir, relativePath);
+				const destPath = join(targetDir, relativePath);
+				if (existsSync(destPath)) {
+					const result = {
+						action: "skipped_ignored",
+						path: relativePath
+					};
+					allResults.push(result);
+				} else {
+					const result = await copyFile(srcPath, destPath, overwriteStrategy, relativePath);
+					allResults.push(result);
+				}
+			}
+		}
+	} finally {
+		if (shouldDownload && existsSync(tempDir)) rmSync(tempDir, {
+			recursive: true,
+			force: true
+		});
+	}
+	return allResults;
+}
+/**
+* 単一ファイルをコピー
+*/
+async function copyFile(srcPath, destPath, strategy, relativePath) {
+	if (!existsSync(destPath)) {
+		const destDir = dirname(destPath);
+		if (!existsSync(destDir)) mkdirSync(destDir, { recursive: true });
+		copyFileSync(srcPath, destPath);
+		return {
+			action: "copied",
+			path: relativePath
+		};
+	}
+	switch (strategy) {
+		case "overwrite":
+			copyFileSync(srcPath, destPath);
+			return {
+				action: "overwritten",
+				path: relativePath
+			};
+		case "skip": return {
+			action: "skipped",
+			path: relativePath
+		};
+		case "prompt": {
+			const shouldOverwrite = await p.confirm({
+				message: `${relativePath} already exists. Overwrite?`,
+				initialValue: false
+			});
+			if (p.isCancel(shouldOverwrite) || !shouldOverwrite) return {
+				action: "skipped",
+				path: relativePath
+			};
+			copyFileSync(srcPath, destPath);
+			return {
+				action: "overwritten",
+				path: relativePath
+			};
+		}
+	}
+}
+
+//#endregion
+//#region src/utils/untracked.ts
+/**
+* ファイルパスからモジュール ID を取得
+* モジュール ID = ディレクトリパス（ルートは "."）
+*
+* 例:
+*   ".devcontainer/file.json" → ".devcontainer"
+*   ".mcp.json" → "."
+*   ".github/workflows/ci.yml" → ".github"
+*/
+function getModuleIdFromPath(filePath) {
+	const parts = filePath.split("/");
+	if (parts.length === 1) return ".";
+	return parts[0];
+}
+/**
+* 後方互換性のため: フォルダ名を表示用に取得
+* "." は "root" として表示
+*/
+function getDisplayFolder(moduleId) {
+	return moduleId === "." ? "root" : moduleId;
+}
+/**
+* モジュールのベースディレクトリを取得
+* モジュール ID がそのままディレクトリパスになる
+*/
+function getModuleBaseDir(moduleId) {
+	if (moduleId === ".") return null;
+	return moduleId;
+}
+/**
+* ディレクトリ内の全ファイルを取得
+*/
+function getAllFilesInDirs(baseDir, dirs) {
+	if (dirs.length === 0) return [];
+	return globSync(dirs.map((d) => `${d}/**/*`), {
+		cwd: baseDir,
+		dot: true,
+		onlyFiles: true
+	}).sort();
+}
+/**
+* ルート直下の隠しファイルを取得
+*/
+function getRootDotFiles(baseDir) {
+	return globSync([".*"], {
+		cwd: baseDir,
+		dot: true,
+		onlyFiles: true
+	}).sort();
+}
+/**
+* 複数ディレクトリの .gitignore をマージして読み込み
+* サブディレクトリの .gitignore も含める
+*/
+async function loadAllGitignores(baseDir, dirs) {
+	const ig = ignore();
+	const rootGitignore = join(baseDir, ".gitignore");
+	if (existsSync(rootGitignore)) {
+		const content = await readFile(rootGitignore, "utf-8");
+		ig.add(content);
+	}
+	for (const dir of dirs) {
+		const gitignorePath = join(baseDir, dir, ".gitignore");
+		if (existsSync(gitignorePath)) {
+			const prefixedContent = (await readFile(gitignorePath, "utf-8")).split("\n").map((line) => {
+				const trimmed = line.trim();
+				if (!trimmed || trimmed.startsWith("#")) return line;
+				if (trimmed.startsWith("!")) return `!${dir}/${trimmed.slice(1)}`;
+				return `${dir}/${trimmed}`;
+			}).join("\n");
+			ig.add(prefixedContent);
+		}
+	}
+	return ig;
+}
+/**
+* ホワイトリスト外のファイルをフォルダごとに検出
+*/
+async function detectUntrackedFiles(options) {
+	const { targetDir, moduleIds, config, moduleList = defaultModules } = options;
+	const installedModuleIds = new Set(moduleIds);
+	const allBaseDirs = [];
+	const allTrackedFiles = /* @__PURE__ */ new Set();
+	let hasRootModule = false;
+	for (const moduleId of moduleIds) {
+		const mod = getModuleById(moduleId, moduleList);
+		if (!mod) continue;
+		const baseDir = getModuleBaseDir(moduleId);
+		if (baseDir) allBaseDirs.push(baseDir);
+		else hasRootModule = true;
+		const trackedFiles = resolvePatterns(targetDir, getEffectivePatterns(moduleId, mod.patterns, config));
+		for (const file of trackedFiles) allTrackedFiles.add(file);
+	}
+	const gitignore = await loadAllGitignores(targetDir, allBaseDirs);
+	const allDirFiles = getAllFilesInDirs(targetDir, allBaseDirs);
+	const filteredDirFiles = gitignore.filter(allDirFiles);
+	const filteredRootFiles = hasRootModule ? gitignore.filter(getRootDotFiles(targetDir)) : [];
+	const allFiles = new Set([...filteredDirFiles, ...filteredRootFiles]);
+	const filesByFolder = /* @__PURE__ */ new Map();
+	for (const filePath of allFiles) {
+		if (allTrackedFiles.has(filePath)) continue;
+		const moduleId = getModuleIdFromPath(filePath);
+		if (!installedModuleIds.has(moduleId)) continue;
+		const displayFolder = getDisplayFolder(moduleId);
+		const file = {
+			path: filePath,
+			folder: displayFolder,
+			moduleId
+		};
+		const existing = filesByFolder.get(displayFolder) || [];
+		existing.push(file);
+		filesByFolder.set(displayFolder, existing);
+	}
+	const result = [];
+	const sortedFolders = Array.from(filesByFolder.keys()).sort((a, b) => {
+		if (a === "root") return 1;
+		if (b === "root") return -1;
+		return a.localeCompare(b);
+	});
+	for (const folder of sortedFolders) {
+		const files = filesByFolder.get(folder) || [];
+		if (files.length > 0) result.push({
+			folder,
+			files: files.sort((a, b) => a.path.localeCompare(b.path))
+		});
+	}
+	return result;
+}
+/**
+* 全フォルダの未追跡ファイル数を取得
+*/
+function getTotalUntrackedCount(untrackedByFolder) {
+	return untrackedByFolder.reduce((sum, f) => sum + f.files.length, 0);
+}
+
+//#endregion
+//#region src/commands/diff.ts
+const diffCommand = defineCommand({
+	meta: {
+		name: "diff",
+		description: "Show differences between local and template"
+	},
+	args: {
+		dir: {
+			type: "positional",
+			description: "Project directory",
+			default: "."
+		},
+		verbose: {
+			type: "boolean",
+			alias: "v",
+			description: "Show detailed diff",
+			default: false
+		}
+	},
+	async run({ args }) {
+		intro("diff");
+		const targetDir = resolve(args.dir);
+		const configPath = join(targetDir, ".devenv.json");
+		if (!existsSync(configPath)) throw new BermError(".devenv.json not found.", "Run 'ziku init' first.");
+		const configContent = await readFile(configPath, "utf-8");
+		const configData = JSON.parse(configContent);
+		const parseResult = configSchema.safeParse(configData);
+		if (!parseResult.success) throw new BermError("Invalid .devenv.json format", parseResult.error.message);
+		const config = parseResult.data;
+		if (config.modules.length === 0) {
+			log.warn("No modules installed");
+			return;
+		}
+		log.step("Fetching template...");
+		const templateSource = buildTemplateSource(config.source);
+		const tempDir = join(targetDir, ".devenv-temp");
+		try {
+			const { dir: templateDir } = await withSpinner("Downloading template from GitHub...", () => downloadTemplate(templateSource, {
+				dir: tempDir,
+				force: true
+			}));
+			let moduleList;
+			if (modulesFileExists(templateDir)) moduleList = (await loadModulesFile(templateDir)).modules;
+			else moduleList = defaultModules;
+			log.step("Detecting changes...");
+			const diff = await withSpinner("Analyzing differences...", () => detectDiff({
+				targetDir,
+				templateDir,
+				moduleIds: config.modules,
+				config,
+				moduleList
+			}));
+			const untrackedByFolder = await detectUntrackedFiles({
+				targetDir,
+				moduleIds: config.modules,
+				config,
+				moduleList
+			});
+			const untrackedCount = getTotalUntrackedCount(untrackedByFolder);
+			if (hasDiff(diff)) {
+				logDiffSummary(diff.files);
+				if (args.verbose) for (const file of diff.files.filter((f) => f.type !== "unchanged")) renderFileDiff(file);
+				if (untrackedCount > 0) {
+					log.warn(`${untrackedCount} untracked file(s) found outside the sync whitelist:`);
+					const untrackedLines = untrackedByFolder.flatMap((group) => group.files.map((file) => `  ${pc$1.dim("•")} ${file.path}`));
+					log.message(untrackedLines.join("\n"));
+					log.info(`To include these files in sync, add them to tracking with the ${pc$1.cyan("track")} command:`);
+					log.message(pc$1.dim(`  npx ziku track "<pattern>"`));
+					log.message(pc$1.dim(`  Example: npx ziku track "${untrackedByFolder[0]?.files[0]?.path || ".cloud/rules/*.md"}"`));
+				}
+				outro("Run 'ziku push' to push changes.");
+			} else if (untrackedCount > 0) {
+				log.success("Tracked files are in sync.");
+				log.warn(`However, ${untrackedCount} untracked file(s) exist outside the sync whitelist:`);
+				const untrackedLines = untrackedByFolder.flatMap((group) => group.files.map((file) => `  ${pc$1.dim("•")} ${file.path}`));
+				log.message(untrackedLines.join("\n"));
+				log.info(`Use ${pc$1.cyan("npx ziku track <pattern>")} to add them, then ${pc$1.cyan("push")} to sync.`);
+				outro("Tracked files are in sync, but untracked files exist.");
+			} else outro("No changes — in sync with template.");
+		} finally {
+			if (existsSync(tempDir)) await rm(tempDir, {
+				recursive: true,
+				force: true
+			});
+		}
+	}
+});
+
+//#endregion
+//#region src/ui/prompts.ts
+/** ユーザーが Ctrl+C でキャンセルした場合の統一処理 */
+function handleCancel(value) {
+	if (p.isCancel(value)) {
+		p.cancel("Cancelled.");
+		process.exit(0);
+	}
+}
+/** モジュール選択 */
+async function selectModules(moduleList) {
+	const selected = await p.multiselect({
+		message: "Select modules to install",
+		options: moduleList.map((m) => ({
+			value: m.id,
+			label: m.name,
+			hint: m.description
+		})),
+		initialValues: moduleList.map((m) => m.id),
+		required: true
+	});
+	handleCancel(selected);
+	return selected;
+}
+/**
+* 上書き戦略の選択（プロジェクト状態に応じたスマートデフォルト付き）
+*
+* 背景: 新規プロジェクトでは overwrite が自然だが、再実行時（.devenv.json 既存）は
+* カスタマイズ済みファイルを誤って上書きしないよう skip をデフォルトにする。
+* ユーザーが毎回3択を読んで判断する必要をなくす。
+*/
+async function selectOverwriteStrategy(options) {
+	const isReinit = options?.isReinit ?? false;
+	const strategy = await p.select({
+		message: isReinit ? "How to handle existing files? (re-init detected → Skip recommended)" : "How to handle existing files?",
+		initialValue: isReinit ? "skip" : "overwrite",
+		options: [
+			{
+				value: "overwrite",
+				label: "Overwrite all"
+			},
+			{
+				value: "skip",
+				label: "Skip (keep existing)"
+			},
+			{
+				value: "prompt",
+				label: "Ask for each file"
+			}
+		]
+	});
+	handleCancel(strategy);
+	return strategy;
+}
+/**
+* ファイルの行数統計を "+N -M" 形式で返す（hint テキスト用）。
+* git push の出力に合わせ、変更規模をひと目で把握できるようにする。
+*/
+function fileStatHint(file) {
+	let additions = 0;
+	let deletions = 0;
+	if (file.type === "added" && file.localContent) additions = file.localContent.split("\n").length;
+	else if (file.type === "deleted" && file.templateContent) deletions = file.templateContent.split("\n").length;
+	else if (file.type === "modified") {
+		const local = file.localContent?.split("\n").length ?? 0;
+		const tmpl = file.templateContent?.split("\n").length ?? 0;
+		additions = Math.max(0, local - tmpl);
+		deletions = Math.max(0, tmpl - local);
+		if (additions === 0 && deletions === 0 && file.localContent !== file.templateContent) {
+			additions = 1;
+			deletions = 1;
+		}
+	}
+	const parts = [];
+	if (additions > 0) parts.push(pc.green(`+${additions}`));
+	if (deletions > 0) parts.push(pc.red(`-${deletions}`));
+	return parts.join(" ");
+}
+/**
+* push 対象ファイルの選択（+N -M 統計付き）
+*
+* 背景: git の `git add -p` に相当するファイル選択 UI。
+* 変更規模（行数増減）をヒントとして表示し、何を同期するか判断しやすくする。
+*/
+async function selectPushFiles(files) {
+	const typeIcon = (type) => {
+		switch (type) {
+			case "added": return pc.green("+");
+			case "modified": return pc.yellow("~");
+			case "deleted": return pc.red("-");
+			default: return " ";
+		}
+	};
+	const selected = await p.multiselect({
+		message: "Select files to include in PR",
+		options: files.map((f) => {
+			const hint = fileStatHint(f);
+			return {
+				value: f.path,
+				label: `${typeIcon(f.type)} ${f.path}`,
+				hint: hint || void 0
+			};
+		}),
+		initialValues: files.map((f) => f.path),
+		required: false
+	});
+	handleCancel(selected);
+	const selectedPaths = new Set(selected);
+	return files.filter((f) => selectedPaths.has(f.path));
+}
+/**
+* PR タイトル入力（変更内容からスマートなデフォルトを生成）
+*
+* 背景: ユーザーが空欄からタイトルを考える手間を省く。
+* 変更ファイルのパスからモジュール名を推測し、自動生成したタイトルを
+* デフォルト値として表示する。Enter でそのまま採用可能。
+*/
+async function inputPrTitle(defaultTitle) {
+	const title = await p.text({
+		message: "PR title",
+		defaultValue: defaultTitle,
+		placeholder: defaultTitle ? void 0 : "feat: update template config",
+		validate: (value) => {
+			if (!value?.trim()) return "Title is required";
+		}
+	});
+	handleCancel(title);
+	return title;
+}
+/**
+* 変更ファイル一覧から PR タイトルを自動生成する。
+*
+* 背景: "feat: add .devcontainer config" のような具体的なタイトルを
+* ファイルのパスと変更種別から推測し、ユーザーの入力負担を減らす。
+*/
+function generatePrTitle(files) {
+	const added = files.filter((f) => f.type === "added");
+	const modified = files.filter((f) => f.type === "modified");
+	const prefix = added.length > 0 && modified.length === 0 ? "feat" : "chore";
+	const moduleNames = /* @__PURE__ */ new Set();
+	for (const f of files) {
+		const firstSegment = f.path.split("/")[0];
+		moduleNames.add(firstSegment);
+	}
+	const names = [...moduleNames];
+	if (names.length === 1) return `${prefix}: ${added.length > 0 && modified.length === 0 ? "add" : "update"} ${names[0]} config`;
+	if (names.length <= 3) return `${prefix}: update ${names.join(", ")} config`;
+	return `${prefix}: update template configuration`;
+}
+/**
+* PR 本文入力（変更一覧から自動生成したデフォルト付き）
+*
+* 背景: 以前は「追加する？」→「入力して」の2ステップだったが、
+* 変更ファイル一覧を自動生成してデフォルト表示することで
+* 1ステップ（Enter で採用 or 編集）に短縮する。
+*/
+async function inputPrBody(defaultBody) {
+	const body = await p.text({
+		message: "PR description (Enter to accept, or edit)",
+		defaultValue: defaultBody,
+		placeholder: defaultBody ? void 0 : "Optional description"
+	});
+	handleCancel(body);
+	return body?.trim() || void 0;
+}
+/**
+* 変更ファイル一覧から PR 本文を自動生成する。
+*
+* 背景: ユーザーが本文を一から書く手間を省く。
+* 変更種別ごとにファイルを分類し、箇条書きで表示する。
+*/
+function generatePrBody$1(files) {
+	const added = files.filter((f) => f.type === "added");
+	const modified = files.filter((f) => f.type === "modified");
+	const sections = ["## Changes", ""];
+	if (added.length > 0) {
+		sections.push("**Added:**");
+		for (const f of added) sections.push(`- \`${f.path}\``);
+		sections.push("");
+	}
+	if (modified.length > 0) {
+		sections.push("**Modified:**");
+		for (const f of modified) sections.push(`- \`${f.path}\``);
+		sections.push("");
+	}
+	sections.push("---");
+	sections.push("Generated by [ziku](https://github.com/tktcorporation/.github/tree/main/packages/ziku)");
+	return sections.join("\n");
+}
+/** GitHub トークン入力 */
+async function inputGitHubToken() {
+	p.log.warn("GitHub token not found.");
+	p.log.message([
+		"Set one of these environment variables:",
+		`  ${pc.cyan("GITHUB_TOKEN")} or ${pc.cyan("GH_TOKEN")}`,
+		"",
+		"Or enter it below:"
+	].join("\n"));
+	const token = await p.password({
+		message: "GitHub Personal Access Token",
+		validate: (value) => {
+			if (!value?.trim()) return "Token is required";
+			if (!value.startsWith("ghp_") && !value.startsWith("gho_") && !value.startsWith("github_pat_")) return "Invalid GitHub token format";
+		}
+	});
+	handleCancel(token);
+	return token;
+}
+/**
+* 確認プロンプト
+*
+* 背景: デフォルト値をコンテキストに応じて変更可能にする。
+* ファイル選択後の確認では true（ユーザーは既にレビュー済み）、
+* 破壊的操作の確認では false が適切。
+*/
+async function confirmAction(message, options) {
+	const confirmed = await p.confirm({
+		message,
+		initialValue: options?.initialValue ?? false
+	});
+	handleCancel(confirmed);
+	return confirmed;
+}
+/**
+* テンプレートで削除されたファイルの中から、ローカルでも削除するものを選択する。
+* 背景: テンプレートから削除されたファイルを自動削除すると意図しないデータ損失の
+* リスクがあるため、ユーザーに明示的に選ばせる。
+*/
+async function selectDeletedFiles(files) {
+	const result = await p.multiselect({
+		message: "These files were deleted in template. Select to delete locally:",
+		options: files.map((f) => ({
+			value: f,
+			label: f
+		})),
+		required: false
+	});
+	if (p.isCancel(result)) {
+		p.cancel("Operation cancelled.");
+		process.exit(0);
+	}
+	return result;
+}
+
+//#endregion
+//#region src/utils/git-remote.ts
+/** フォールバック用のデフォルトテンプレートオーナー */
+const DEFAULT_TEMPLATE_OWNER = "tktcorporation";
+/** フォールバック用のデフォルトテンプレートリポジトリ名 */
+const DEFAULT_TEMPLATE_REPO = ".github";
+/**
+* GitHub URL からオーナー名を抽出する。
+*
+* 背景: `ziku init` で --from が未指定の場合、git remote URL から
+* オーナーを推定し `{owner}/.github` をテンプレートソースとする。
+* テスト容易性のため detectGitHubOwner から分離した純粋関数。
+*
+* 対応形式:
+*   - https://github.com/{owner}/{repo}(.git)?
+*   - git@github.com:{owner}/{repo}(.git)?
+*/
+function parseGitHubOwner(url) {
+	const httpsMatch = url.match(/github\.com\/([^/]+)\//);
+	if (httpsMatch) return httpsMatch[1];
+	const sshMatch = url.match(/github\.com:([^/]+)\//);
+	if (sshMatch) return sshMatch[1];
+	return null;
+}
+/**
+* git remote origin の URL から GitHub オーナー名を検出する。
+*
+* 背景: テンプレートソースの自動解決に使用。
+* git リポジトリでない場合や origin が未設定の場合は null を返す。
+*/
+function detectGitHubOwner(cwd) {
+	try {
+		return parseGitHubOwner(execFileSync("git", [
+			"remote",
+			"get-url",
+			"origin"
+		], {
+			encoding: "utf-8",
+			cwd,
+			stdio: [
+				"pipe",
+				"pipe",
+				"pipe"
+			]
+		}).trim());
+	} catch {
+		return null;
+	}
+}
+
+//#endregion
+//#region src/utils/github.ts
+/**
+* GitHub API を使って PR を作成
+*/
+async function createPullRequest(token, options) {
+	const octokit = new Octokit({ auth: token });
+	const { owner, repo, files, title, body, baseBranch = "main" } = options;
+	const { data: user } = await octokit.users.getAuthenticated();
+	const forkOwner = user.login;
+	let forkRepo;
+	try {
+		const { data: fork } = await octokit.repos.get({
+			owner: forkOwner,
+			repo
+		});
+		forkRepo = fork.name;
+	} catch {
+		const { data: fork } = await octokit.repos.createFork({
+			owner,
+			repo
+		});
+		forkRepo = fork.name;
+		await sleep(3e3);
+	}
+	const { data: baseBranchRef } = await octokit.repos.getBranch({
+		owner,
+		repo,
+		branch: baseBranch
+	});
+	const baseSha = baseBranchRef.commit.sha;
+	const branchName = `devenv-sync-${Date.now()}`;
+	await octokit.git.createRef({
+		owner: forkOwner,
+		repo: forkRepo,
+		ref: `refs/heads/${branchName}`,
+		sha: baseSha
+	});
+	for (const file of files) {
+		let existingSha;
+		try {
+			const { data: existingFile } = await octokit.repos.getContent({
+				owner: forkOwner,
+				repo: forkRepo,
+				path: file.path,
+				ref: branchName
+			});
+			if (!Array.isArray(existingFile) && existingFile.type === "file") existingSha = existingFile.sha;
+		} catch {}
+		await octokit.repos.createOrUpdateFileContents({
+			owner: forkOwner,
+			repo: forkRepo,
+			path: file.path,
+			message: `Update ${file.path}`,
+			content: Buffer.from(file.content).toString("base64"),
+			branch: branchName,
+			sha: existingSha
+		});
+	}
+	const { data: pr } = await octokit.pulls.create({
+		owner,
+		repo,
+		title,
+		body: body || generatePrBody(files),
+		head: `${forkOwner}:${branchName}`,
+		base: baseBranch
+	});
+	return {
+		url: pr.html_url,
+		number: pr.number,
+		branch: branchName
+	};
+}
+/**
+* PR の本文を生成
+*/
+function generatePrBody(files) {
+	return `## Summary
+
+Auto-generated PR by ziku push command.
+
+## Changed files
+
+${files.map((f) => `- \`${f.path}\``).join("\n")}
+
+---
+Generated by [ziku](https://github.com/tktcorporation/.github/tree/main/packages/ziku)
+`;
+}
+/**
+* GitHub トークンを環境変数または gh CLI から取得
+*
+* 優先順位:
+*   1. GITHUB_TOKEN 環境変数
+*   2. GH_TOKEN 環境変数
+*   3. `gh auth token` コマンド出力（gh CLI がインストール済みの場合）
+*
+* 背景: gh CLI でログイン済みなのにトークンを手動入力させるのは不親切。
+* 多くの開発者は `gh auth login` 済みなので、そのトークンを自動取得する。
+*/
+function getGitHubToken() {
+	const envToken = process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
+	if (envToken) return envToken;
+	return getGhCliToken();
+}
+/**
+* gh CLI の `gh auth token` からトークンを取得する。
+* gh CLI が未インストール or 未ログインの場合は undefined を返す。
+*/
+function getGhCliToken() {
+	try {
+		const { execSync } = __require("node:child_process");
+		const token = execSync("gh auth token", {
+			encoding: "utf-8",
+			timeout: 5e3,
+			stdio: [
+				"pipe",
+				"pipe",
+				"pipe"
+			]
+		}).trim();
+		if (token && (token.startsWith("ghp_") || token.startsWith("gho_") || token.startsWith("github_pat_"))) return token;
+	} catch {}
+}
+/**
+* テンプレートリポジトリの最新コミット SHA を取得する。
+*
+* 背景: init/pull 時に baseRef として保存し、後で 3-way マージのベース取得に使用する。
+* GitHub API の `Accept: application/vnd.github.sha` を使い、SHA 文字列のみを取得する。
+* 認証不要（公開リポジトリの場合）。
+*/
+async function resolveLatestCommitSha(owner, repo, ref = "main") {
+	try {
+		const url = `https://api.github.com/repos/${owner}/${repo}/commits/${ref}`;
+		const res = await fetch(url, { headers: { Accept: "application/vnd.github.sha" } });
+		if (!res.ok) return void 0;
+		return (await res.text()).trim();
+	} catch {
+		return;
+	}
+}
+/**
+* sleep utility
+*/
+function sleep(ms) {
+	return new Promise((resolve$1) => setTimeout(resolve$1, ms));
+}
+
+//#endregion
+//#region src/utils/hash.ts
+/**
+* ファイル内容の SHA-256 ハッシュを計算する。
+*
+* 背景: pull 時に「ローカルが変更されたか」「テンプレートが更新されたか」を
+* ファイル全体のコピーを保持せずに判定するため、ハッシュで比較する。
+*/
+function hashContent(content) {
+	return createHash("sha256").update(content, "utf-8").digest("hex");
+}
+/**
+* ディレクトリ内のファイル群を glob パターンでマッチし、
+* 各ファイルの SHA-256 ハッシュを計算してマップを返す。
+*
+* 背景: init/pull 時に適用したテンプレートファイルのハッシュを
+* .devenv.json に記録し、次回 pull 時の差分検出に使用する。
+*
+* @param dir - 対象ディレクトリのルートパス
+* @param patterns - glob パターンの配列（例: [".devcontainer/**"]）
+* @returns パス（dir からの相対パス）-> SHA-256 ハッシュのマップ
+*/
+async function hashFiles(dir, patterns) {
+	const files = await glob(patterns, {
+		cwd: dir,
+		dot: true
+	});
+	const hashes = {};
+	for (const file of files) hashes[file] = hashContent(await readFile(join(dir, file), "utf-8"));
+	return hashes;
+}
+
+//#endregion
+//#region src/commands/init.ts
+const version = "0.20.0";
+const initCommand = defineCommand({
+	meta: {
+		name: "ziku",
+		version,
+		description: "Apply dev environment template to your project"
+	},
+	args: {
+		dir: {
+			type: "positional",
+			description: "Target directory",
+			default: "."
+		},
+		force: {
+			type: "boolean",
+			description: "Overwrite existing files",
+			default: false
+		},
+		yes: {
+			type: "boolean",
+			alias: "y",
+			description: "Select all modules (non-interactive mode)",
+			default: false
+		},
+		modules: {
+			type: "string",
+			alias: "m",
+			description: "Comma-separated module IDs to apply (non-interactive)"
+		},
+		"overwrite-strategy": {
+			type: "string",
+			alias: "s",
+			description: "Overwrite strategy: overwrite, skip, or prompt (non-interactive)"
+		},
+		from: {
+			type: "string",
+			description: "Template source as owner/repo (e.g., my-org/my-templates)"
+		}
+	},
+	async run({ args }) {
+		intro();
+		const targetDir = resolve(args.dir === "init" ? "." : args.dir);
+		log.info(`Target: ${pc$1.cyan(targetDir)}`);
+		if (!existsSync(targetDir)) {
+			mkdirSync(targetDir, { recursive: true });
+			log.message(pc$1.dim(`Created directory: ${targetDir}`));
+		}
+		const { sourceOwner, sourceRepo } = resolveTemplateSource(args.from);
+		const templateSourceStr = buildTemplateSource({
+			owner: sourceOwner,
+			repo: sourceRepo
+		});
+		log.info(`Template: ${pc$1.cyan(`${sourceOwner}/${sourceRepo}`)}`);
+		log.step("Fetching template...");
+		const { templateDir, cleanup } = await withSpinner("Downloading template from GitHub...", () => downloadTemplateToTemp(targetDir, templateSourceStr));
+		try {
+			let moduleList;
+			if (modulesFileExists(templateDir)) {
+				const { modules: loadedModules } = await loadModulesFile(templateDir);
+				moduleList = loadedModules;
+			} else moduleList = defaultModules;
+			log.step("Selecting modules...");
+			let answers;
+			const hasModulesArg = typeof args.modules === "string" && args.modules.length > 0;
+			const hasStrategyArg = typeof args["overwrite-strategy"] === "string" && args["overwrite-strategy"].length > 0;
+			if (args.yes || hasModulesArg) {
+				let selectedModules;
+				if (hasModulesArg) {
+					const requestedIds = args.modules.split(",").map((s) => s.trim());
+					const validIds = moduleList.map((m) => m.id);
+					const invalidIds = requestedIds.filter((id) => !validIds.includes(id));
+					if (invalidIds.length > 0) throw new BermError(`Unknown module(s): ${invalidIds.join(", ")}`, `Available modules: ${validIds.join(", ")}`);
+					selectedModules = requestedIds;
+				} else selectedModules = moduleList.map((m) => m.id);
+				let overwriteStrategy = "overwrite";
+				if (hasStrategyArg) {
+					const strategy = args["overwrite-strategy"];
+					if (strategy !== "overwrite" && strategy !== "skip" && strategy !== "prompt") throw new BermError(`Invalid overwrite strategy: ${strategy}`, "Must be: overwrite, skip, or prompt");
+					overwriteStrategy = strategy;
+				}
+				answers = {
+					modules: selectedModules,
+					overwriteStrategy
+				};
+				log.info(`Selected ${pc$1.cyan(selectedModules.length.toString())} modules`);
+			} else if (hasStrategyArg) {
+				const strategy = args["overwrite-strategy"];
+				if (strategy !== "overwrite" && strategy !== "skip" && strategy !== "prompt") throw new BermError(`Invalid overwrite strategy: ${strategy}`, "Must be: overwrite, skip, or prompt");
+				answers = {
+					modules: await selectModules(moduleList),
+					overwriteStrategy: strategy
+				};
+			} else answers = {
+				modules: await selectModules(moduleList),
+				overwriteStrategy: await selectOverwriteStrategy({ isReinit: existsSync(resolve(targetDir, ".devenv.json")) })
+			};
+			if (answers.modules.length === 0) {
+				log.warn("No modules selected");
+				return;
+			}
+			log.step("Applying templates...");
+			const effectiveStrategy = args.force ? "overwrite" : answers.overwriteStrategy;
+			const allResults = [...await fetchTemplates({
+				targetDir,
+				modules: answers.modules,
+				overwriteStrategy: effectiveStrategy,
+				moduleList,
+				templateDir
+			})];
+			if (answers.modules.includes("devcontainer")) {
+				const envResult = await createEnvExample(targetDir, effectiveStrategy);
+				allResults.push(envResult);
+			}
+			const modulesJsoncResult = await copyModulesJsonc(templateDir, targetDir, effectiveStrategy);
+			allResults.push(modulesJsoncResult);
+			const baseHashes = await hashFiles(templateDir, getPatternsByModuleIds(answers.modules, moduleList));
+			const baseRef = await resolveLatestCommitSha(sourceOwner, sourceRepo);
+			const configResult = await createDevEnvConfig(targetDir, answers.modules, {
+				owner: sourceOwner,
+				repo: sourceRepo,
+				baseHashes,
+				baseRef
+			});
+			allResults.push(configResult);
+			const summary = logFileResults(allResults);
+			if (summary.added === 0 && summary.updated === 0) {
+				log.info("No changes were made");
+				return;
+			}
+			displayModuleDescriptions(answers.modules, allResults, moduleList);
+			outro([
+				"Setup complete!",
+				"",
+				`${pc$1.bold("Next steps:")}`,
+				`  ${pc$1.cyan("git add . && git commit -m 'chore: add devenv config'")}`,
+				`  ${pc$1.dim("Commit the changes")}`,
+				`  ${pc$1.cyan("npx ziku diff")}`,
+				`  ${pc$1.dim("Check for updates from upstream")}`
+			].join("\n"));
+		} finally {
+			cleanup();
+		}
+	}
+});
+const ENV_EXAMPLE_CONTENT = `# 環境変数サンプル
+# このファイルを devcontainer.env にコピーして値を設定してください
+
+# GitHub Personal Access Token
+GH_TOKEN=
+
+# AWS Credentials (optional)
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=ap-northeast-1
+
+# WakaTime API Key (optional)
+WAKATIME_API_KEY=
+`;
+async function createEnvExample(targetDir, strategy) {
+	return writeFileWithStrategy({
+		destPath: resolve(targetDir, ".devcontainer/devcontainer.env.example"),
+		content: ENV_EXAMPLE_CONTENT,
+		strategy,
+		relativePath: ".devcontainer/devcontainer.env.example"
+	});
+}
+/**
+* 設定ファイル (.devenv.json) を生成する。常に上書き。
+*
+* 背景: baseHashes を記録することで、pull 時に「ユーザーがローカルで変更したか」を
+* ファイル全体のコピーを保持せずに判定できる。
+*/
+async function createDevEnvConfig(targetDir, selectedModules, source) {
+	const config = {
+		version: "0.1.0",
+		installedAt: (/* @__PURE__ */ new Date()).toISOString(),
+		modules: selectedModules,
+		source: {
+			owner: source.owner,
+			repo: source.repo
+		}
+	};
+	if (source.baseRef) config.baseRef = source.baseRef;
+	if (source.baseHashes && Object.keys(source.baseHashes).length > 0) config.baseHashes = source.baseHashes;
+	return writeFileWithStrategy({
+		destPath: resolve(targetDir, ".devenv.json"),
+		content: JSON.stringify(config, null, 2),
+		strategy: "overwrite",
+		relativePath: ".devenv.json"
+	});
+}
+/**
+* テンプレートから modules.jsonc をコピー
+*/
+async function copyModulesJsonc(templateDir, targetDir, strategy) {
+	const modulesRelPath = ".devenv/modules.jsonc";
+	const srcPath = join(templateDir, modulesRelPath);
+	const destPath = getModulesFilePath(targetDir);
+	if (!existsSync(srcPath)) return {
+		action: "skipped",
+		path: modulesRelPath
+	};
+	return copyFile(srcPath, destPath, strategy, modulesRelPath);
+}
+/**
+* モジュール別の説明を表示
+*
+* 背景: 選択されたモジュールが実際に変更を加えた場合のみ、
+* 各モジュールの名前と説明を一覧表示する。ユーザーが何がインストールされたかを確認できる。
+*/
+function displayModuleDescriptions(selectedModules, fileResults, moduleList) {
+	if (!fileResults.some((r) => r.action === "copied" || r.action === "created" || r.action === "overwritten")) return;
+	log.info(pc$1.bold("Installed modules:"));
+	const lines = [];
+	for (const moduleId of selectedModules) {
+		const mod = getModuleById(moduleId, moduleList);
+		if (mod) {
+			const description = mod.setupDescription || mod.description;
+			lines.push(`  ${pc$1.cyan("◆")} ${pc$1.bold(mod.name)}`);
+			if (description) lines.push(`    ${pc$1.dim(description)}`);
+		}
+	}
+	if (lines.length > 0) log.message(lines.join("\n"));
+}
+/**
+* テンプレートソースを解決する。
+*
+* 優先順位:
+*   1. --from owner/repo が指定されていればそのまま使用
+*   2. git remote origin から owner を検出 → {owner}/.github
+*   3. フォールバック: tktcorporation/.github
+*/
+function resolveTemplateSource(from) {
+	if (from) {
+		const slashIndex = from.indexOf("/");
+		if (slashIndex === -1 || slashIndex === 0 || slashIndex === from.length - 1) throw new BermError(`Invalid --from format: "${from}"`, "Expected: owner/repo (e.g., my-org/my-templates)");
+		return {
+			sourceOwner: from.slice(0, slashIndex),
+			sourceRepo: from.slice(slashIndex + 1)
+		};
+	}
+	const detectedOwner = detectGitHubOwner();
+	if (detectedOwner) return {
+		sourceOwner: detectedOwner,
+		sourceRepo: DEFAULT_TEMPLATE_REPO
+	};
+	return {
+		sourceOwner: DEFAULT_TEMPLATE_OWNER,
+		sourceRepo: DEFAULT_TEMPLATE_REPO
+	};
+}
+
+//#endregion
+//#region src/utils/config.ts
+/**
+* .devenv.json を読み込み
+*/
+async function loadConfig(targetDir) {
+	const content = await readFile(join(targetDir, ".devenv.json"), "utf-8");
+	const data = JSON.parse(content);
+	return configSchema.parse(data);
+}
+/**
+* .devenv.json を保存
+*/
+async function saveConfig(targetDir, config) {
+	await writeFile(join(targetDir, ".devenv.json"), `${JSON.stringify(config, null, 2)}\n`);
+}
+
+//#endregion
+//#region src/utils/merge.ts
+/**
+* base/local/template のハッシュを比較し、各ファイルを分類する。
+*
+* 背景: pull/push 時にファイルごとの処理方法（自動上書き・マージ・スキップ等）を
+* 決定するために使用する。3つのハッシュマップの差分パターンで分類を行う。
+*/
+function classifyFiles(opts) {
+	const { baseHashes, localHashes, templateHashes } = opts;
+	const result = {
+		autoUpdate: [],
+		localOnly: [],
+		conflicts: [],
+		newFiles: [],
+		deletedFiles: [],
+		unchanged: []
+	};
+	const allFiles = new Set([
+		...Object.keys(baseHashes),
+		...Object.keys(localHashes),
+		...Object.keys(templateHashes)
+	]);
+	for (const file of allFiles) {
+		const base = baseHashes[file];
+		const local = localHashes[file];
+		const template = templateHashes[file];
+		if (base === void 0 && template !== void 0 && local === void 0) result.newFiles.push(file);
+		else if (base !== void 0 && template === void 0) result.deletedFiles.push(file);
+		else if (base === void 0 && template === void 0 && local !== void 0) result.localOnly.push(file);
+		else if (base === void 0 && template !== void 0 && local !== void 0) if (local === template) result.unchanged.push(file);
+		else result.conflicts.push(file);
+		else {
+			const localChanged = local !== base;
+			const templateChanged = template !== base;
+			if (!localChanged && !templateChanged) result.unchanged.push(file);
+			else if (!localChanged && templateChanged) result.autoUpdate.push(file);
+			else if (localChanged && !templateChanged) result.localOnly.push(file);
+			else if (local === template) result.unchanged.push(file);
+			else result.conflicts.push(file);
+		}
+	}
+	return result;
+}
+/**
+* ファイルパスに応じた最適な 3-way マージを実行する。
+*
+* 背景: ファイルの種類によって最適なマージ戦略が異なる。
+* JSON/JSONC はキーレベルの構造マージが可能で、コンフリクトマーカーで
+* ファイル構造を壊さずにマージできる。テキストファイルは fuzz factor や
+* hunk 単位のマーカーで精度を上げる。
+*
+* @param filePath ファイルパス（拡張子でマージ戦略を選択）
+*/
+function threeWayMerge(base, local, template, filePath) {
+	if (local === template) return {
+		content: local,
+		hasConflicts: false,
+		conflictDetails: []
+	};
+	if (filePath && isJsonFile(filePath)) {
+		const jsonResult = mergeJsonContent(base, local, template);
+		if (jsonResult !== null) return jsonResult;
+	}
+	return textThreeWayMerge(base, local, template);
+}
+/**
+* JSON/JSONC ファイルをキーレベルで 3-way マージする。
+*
+* 背景: JSON ファイルにコンフリクトマーカーを挿入するとパーサーが壊れるため、
+* キーレベルで変更を検出し、非コンフリクト部分を自動マージする。
+* コンフリクトがあるキーはローカル値を採用し、conflictDetails で報告する。
+* jsonc-parser の modify/applyEdits を使い、ローカルのフォーマットとコメントを保持する。
+*
+* @returns マージ結果。JSON パースに失敗した場合は null（テキストマージにフォールバック）。
+*/
+function mergeJsonContent(base, local, template) {
+	let baseObj;
+	let localObj;
+	let templateObj;
+	try {
+		baseObj = parse$1(base);
+		localObj = parse$1(local);
+		templateObj = parse$1(template);
+	} catch {
+		return null;
+	}
+	if (baseObj == null || localObj == null || templateObj == null) return null;
+	const templateDiffs = getJsonDiffs(baseObj, templateObj);
+	const localDiffs = getJsonDiffs(baseObj, localObj);
+	let result = local;
+	const conflictDetails = [];
+	for (const diff of templateDiffs) {
+		if (localDiffs.some((ld) => pathsOverlap(ld.path, diff.path))) {
+			const localVal = getValueAtPath(localObj, diff.path);
+			const templateVal = diff.type === "remove" ? void 0 : diff.value;
+			if (deepEqual(localVal, templateVal)) continue;
+			conflictDetails.push({
+				path: diff.path,
+				localValue: localVal,
+				templateValue: templateVal
+			});
+			continue;
+		}
+		if (diff.type === "remove") {
+			const edits = modify(result, diff.path, void 0, { formattingOptions: {
+				tabSize: 2,
+				insertSpaces: true
+			} });
+			result = applyEdits(result, edits);
+		} else {
+			const edits = modify(result, diff.path, diff.value, { formattingOptions: {
+				tabSize: 2,
+				insertSpaces: true
+			} });
+			result = applyEdits(result, edits);
+		}
+	}
+	return {
+		content: result,
+		hasConflicts: conflictDetails.length > 0,
+		conflictDetails
+	};
+}
+/**
+* 2つの JSON 値の差分をパス単位で検出する。
+* オブジェクトはキーレベルで再帰比較し、配列はアトミックに扱う。
+*/
+function getJsonDiffs(base, target, path = []) {
+	if (deepEqual(base, target)) return [];
+	if (typeof base !== typeof target || base === null || target === null || typeof base !== "object" || typeof target !== "object" || Array.isArray(base) !== Array.isArray(target)) return [{
+		path,
+		type: "replace",
+		value: target
+	}];
+	if (Array.isArray(base)) return [{
+		path,
+		type: "replace",
+		value: target
+	}];
+	const diffs = [];
+	const baseObj = base;
+	const targetObj = target;
+	const allKeys = new Set([...Object.keys(baseObj), ...Object.keys(targetObj)]);
+	for (const key of allKeys) {
+		const childPath = [...path, key];
+		if (!(key in baseObj)) diffs.push({
+			path: childPath,
+			type: "add",
+			value: targetObj[key]
+		});
+		else if (!(key in targetObj)) diffs.push({
+			path: childPath,
+			type: "remove"
+		});
+		else diffs.push(...getJsonDiffs(baseObj[key], targetObj[key], childPath));
+	}
+	return diffs;
+}
+/**
+* 2つのパスが重複（祖先/子孫/同一）するかを判定する。
+* 例: ["a", "b"] と ["a", "b", "c"] → true（祖先と子孫）
+*      ["a", "b"] と ["a", "x"] → false
+*/
+function pathsOverlap(pathA, pathB) {
+	const minLen = Math.min(pathA.length, pathB.length);
+	for (let i = 0; i < minLen; i++) if (pathA[i] !== pathB[i]) return false;
+	return true;
+}
+/** ネストされたオブジェクトからパスを辿って値を取得する */
+function getValueAtPath(obj, path) {
+	let current = obj;
+	for (const key of path) {
+		if (current == null || typeof current !== "object") return void 0;
+		current = current[key];
+	}
+	return current;
+}
+/** 2つの値を深い比較で等しいか判定する */
+function deepEqual(a, b) {
+	if (a === b) return true;
+	if (a == null || b == null) return false;
+	if (typeof a !== typeof b) return false;
+	if (typeof a !== "object") return false;
+	if (Array.isArray(a) !== Array.isArray(b)) return false;
+	if (Array.isArray(a) && Array.isArray(b)) {
+		if (a.length !== b.length) return false;
+		return a.every((val, i) => deepEqual(val, b[i]));
+	}
+	const aObj = a;
+	const bObj = b;
+	const aKeys = Object.keys(aObj);
+	const bKeys = Object.keys(bObj);
+	if (aKeys.length !== bKeys.length) return false;
+	return aKeys.every((key) => key in bObj && deepEqual(aObj[key], bObj[key]));
+}
+function isJsonFile(filePath) {
+	const lower = filePath.toLowerCase();
+	return lower.endsWith(".json") || lower.endsWith(".jsonc");
+}
+/**
+* テキストファイルの 3-way マージ。fuzz factor によるパッチ適用と
+* hunk 単位のコンフリクトマーカーで、従来のファイル全体マーカーを改善。
+*
+* 背景: TOML 等の構造ファイルにファイル全体のコンフリクトマーカーを入れると
+* パーサーが壊れる。hunk 単位にすることで影響範囲を最小化する。
+*
+* 戦略:
+* 1. 標準パッチ適用（fuzz=0）
+* 2. fuzz factor を上げてリトライ（fuzz=2）
+* 3. 失敗時: hunk 単位で適用を試み、失敗した hunk のみにマーカーを付与
+*/
+function textThreeWayMerge(base, local, template) {
+	const patch = createPatch("file", base, template);
+	const result = applyPatch(local, patch);
+	if (typeof result === "string") return {
+		content: result,
+		hasConflicts: false,
+		conflictDetails: []
+	};
+	const resultFuzzy = applyPatch(local, patch, { fuzzFactor: 2 });
+	if (typeof resultFuzzy === "string") return {
+		content: resultFuzzy,
+		hasConflicts: false,
+		conflictDetails: []
+	};
+	return mergeWithPerHunkMarkers(base, local, template);
+}
+/**
+* hunk 単位でパッチを適用し、失敗した hunk のみにコンフリクトマーカーを付与する。
+*
+* 背景: ファイル全体をマーカーで囲むとファイルが完全に壊れる。
+* hunk 単位にすることで、成功した部分は正常なまま保持され、
+* コンフリクト箇所だけがマーカー付きになる。
+*/
+function mergeWithPerHunkMarkers(base, local, template) {
+	const patchObj = structuredPatch("file", "file", base, template);
+	const localLines = local.split("\n");
+	const resultLines = [];
+	let localIdx = 0;
+	let hasConflicts = false;
+	for (const hunk of patchObj.hunks) {
+		const hunkLocalStart = hunk.oldStart - 1;
+		while (localIdx < hunkLocalStart && localIdx < localLines.length) {
+			resultLines.push(localLines[localIdx]);
+			localIdx++;
+		}
+		const hunkApplied = tryApplyHunk(localLines, hunk);
+		if (hunkApplied !== null) {
+			resultLines.push(...hunkApplied);
+			localIdx = hunkLocalStart + hunk.oldLines;
+		} else {
+			hasConflicts = true;
+			const localSection = [];
+			for (let i = 0; i < hunk.oldLines && hunkLocalStart + i < localLines.length; i++) localSection.push(localLines[hunkLocalStart + i]);
+			const templateSection = [];
+			for (const line of hunk.lines) if (line.startsWith("+")) templateSection.push(line.slice(1));
+			else if (line.startsWith(" ")) templateSection.push(line.slice(1));
+			resultLines.push("<<<<<<< LOCAL");
+			resultLines.push(...localSection);
+			resultLines.push("=======");
+			resultLines.push(...templateSection);
+			resultLines.push(">>>>>>> TEMPLATE");
+			localIdx = hunkLocalStart + hunk.oldLines;
+		}
+	}
+	while (localIdx < localLines.length) {
+		resultLines.push(localLines[localIdx]);
+		localIdx++;
+	}
+	return {
+		content: resultLines.join("\n"),
+		hasConflicts,
+		conflictDetails: []
+	};
+}
+/**
+* 単一の hunk をローカル行に適用する。
+* コンテキスト行が一致し、削除行が存在する場合に適用成功として新しい行を返す。
+* 一致しない場合は null を返す。
+*/
+function tryApplyHunk(localLines, hunk) {
+	const startIdx = hunk.oldStart - 1;
+	const expectedOldLines = [];
+	const newLines = [];
+	for (const line of hunk.lines) {
+		const op = line[0];
+		const content = line.slice(1);
+		if (op === " ") {
+			expectedOldLines.push(content);
+			newLines.push(content);
+		} else if (op === "-") expectedOldLines.push(content);
+		else if (op === "+") newLines.push(content);
+	}
+	if (startIdx + expectedOldLines.length > localLines.length) return null;
+	for (let i = 0; i < expectedOldLines.length; i++) if (localLines[startIdx + i] !== expectedOldLines[i]) return null;
+	return newLines;
+}
+/**
+* base/local/template の3つの内容から 3-way マージを実行する。
+* (後方互換性のためのラッパー)
+*
+* @deprecated filePath を渡す新しい threeWayMerge を使用してください
+*/
+/**
+* ファイル内容にコンフリクトマーカーが含まれるかを検出する。
+*
+* 背景: マージ後のファイルにユーザーが手動解決すべきコンフリクトが
+* 残っているかを判定するために使用する。
+*/
+function hasConflictMarkers(content) {
+	const lines = [];
+	const contentLines = content.split("\n");
+	for (let i = 0; i < contentLines.length; i++) {
+		const line = contentLines[i];
+		if (line.startsWith("<<<<<<<") || line.startsWith("=======") || line.startsWith(">>>>>>>")) lines.push(i + 1);
+	}
+	return {
+		found: lines.length > 0,
+		lines
+	};
+}
+
+//#endregion
+//#region src/commands/pull.ts
+/**
+* テンプレートの最新更新をローカルに反映するコマンド。
+*
+* 背景: init 後にテンプレートが更新された場合、ローカルの変更を保持しつつ
+* テンプレートの変更を取り込むために使用する。base/local/template の
+* 3-way マージにより、コンフリクトを最小限に抑える。
+*
+* 呼び出し元: CLI から `ziku pull` で実行
+*/
+const pullCommand = defineCommand({
+	meta: {
+		name: "pull",
+		description: "Pull latest template updates"
+	},
+	args: {
+		dir: {
+			type: "positional",
+			description: "Project directory",
+			default: "."
+		},
+		force: {
+			type: "boolean",
+			alias: "f",
+			description: "Skip confirmations",
+			default: false
+		},
+		continue: {
+			type: "boolean",
+			description: "Continue after resolving merge conflicts",
+			default: false
+		}
+	},
+	async run({ args }) {
+		intro("pull");
+		const targetDir = resolve(args.dir);
+		let config;
+		try {
+			config = await loadConfig(targetDir);
+		} catch {
+			throw new BermError("Not initialized", "Run `ziku init` first");
+		}
+		if (args.continue) {
+			await runContinue(targetDir, config);
+			return;
+		}
+		if (config.modules.length === 0) {
+			log.warn("No modules installed");
+			return;
+		}
+		log.step("Fetching template...");
+		const { templateDir, cleanup } = await withSpinner("Downloading template from GitHub...", () => downloadTemplateToTemp(targetDir, `gh:${config.source.owner}/${config.source.repo}`));
+		try {
+			let moduleList;
+			if (modulesFileExists(templateDir)) moduleList = (await loadModulesFile(templateDir)).modules;
+			else moduleList = defaultModules;
+			log.step("Analyzing changes...");
+			const patterns = getInstalledModulePatterns(config.modules, moduleList, config);
+			const [templateHashes, localHashes] = await Promise.all([hashFiles(templateDir, patterns), hashFiles(targetDir, patterns)]);
+			const classification = classifyFiles({
+				baseHashes: config.baseHashes ?? {},
+				localHashes,
+				templateHashes
+			});
+			if (classification.autoUpdate.length + classification.newFiles.length + classification.conflicts.length + classification.deletedFiles.length === 0) {
+				log.success("Already up to date");
+				outro("No changes needed");
+				return;
+			}
+			logPullSummary(classification);
+			for (const file of classification.autoUpdate) {
+				const content = await readFile(join(templateDir, file), "utf-8");
+				const destPath = join(targetDir, file);
+				const destDir = dirname(destPath);
+				if (!existsSync(destDir)) await mkdir(destDir, { recursive: true });
+				await writeFile(destPath, content, "utf-8");
+			}
+			if (classification.autoUpdate.length > 0) log.success(`Updated ${classification.autoUpdate.length} file(s)`);
+			for (const file of classification.newFiles) {
+				const content = await readFile(join(templateDir, file), "utf-8");
+				const destPath = join(targetDir, file);
+				const destDir = dirname(destPath);
+				if (!existsSync(destDir)) await mkdir(destDir, { recursive: true });
+				await writeFile(destPath, content, "utf-8");
+			}
+			if (classification.newFiles.length > 0) log.success(`Added ${classification.newFiles.length} new file(s)`);
+			let hasUnresolvedConflicts = false;
+			if (classification.conflicts.length > 0) {
+				let baseTemplateDir;
+				let baseCleanup;
+				if (config.baseRef) try {
+					log.info(`Downloading base version (${config.baseRef.slice(0, 7)}...) for merge...`);
+					const baseResult = await downloadTemplateToTemp(targetDir, `gh:${config.source.owner}/${config.source.repo}#${config.baseRef}`);
+					baseTemplateDir = baseResult.templateDir;
+					baseCleanup = baseResult.cleanup;
+				} catch {
+					log.warn("Could not download base version. Falling back to 2-way conflict markers.");
+				}
+				try {
+					for (const file of classification.conflicts) {
+						const localContent = await readFile(join(targetDir, file), "utf-8");
+						const templateContent = await readFile(join(templateDir, file), "utf-8");
+						let baseContent = "";
+						if (baseTemplateDir && existsSync(join(baseTemplateDir, file))) baseContent = await readFile(join(baseTemplateDir, file), "utf-8");
+						const result = threeWayMerge(baseContent, localContent, templateContent, file);
+						await writeFile(join(targetDir, file), result.content, "utf-8");
+						if (result.hasConflicts) {
+							hasUnresolvedConflicts = true;
+							logMergeConflict(file, result);
+						}
+					}
+					if (hasUnresolvedConflicts) log.warn("Some files have conflicts. Resolve them, then run `ziku pull --continue`");
+				} finally {
+					baseCleanup?.();
+				}
+				if (hasUnresolvedConflicts) {
+					const latestRef$1 = await resolveLatestCommitSha(config.source.owner, config.source.repo);
+					await saveConfig(targetDir, {
+						...config,
+						pendingMerge: {
+							conflicts: classification.conflicts,
+							templateHashes,
+							...latestRef$1 ? { latestRef: latestRef$1 } : {}
+						}
+					});
+					outro("Merge paused — resolve conflicts then run `ziku pull --continue`");
+					return;
+				}
+			}
+			if (classification.deletedFiles.length > 0) {
+				let filesToDelete;
+				if (args.force) {
+					filesToDelete = classification.deletedFiles;
+					log.info(`Deleting ${filesToDelete.length} file(s) removed from template...`);
+				} else filesToDelete = await selectDeletedFiles(classification.deletedFiles);
+				for (const file of filesToDelete) try {
+					await rm(join(targetDir, file), { force: true });
+					log.success(`Deleted: ${file}`);
+				} catch {
+					log.warn(`Could not delete: ${file}`);
+				}
+			}
+			const latestRef = await resolveLatestCommitSha(config.source.owner, config.source.repo);
+			await saveConfig(targetDir, {
+				...config,
+				baseHashes: templateHashes,
+				...latestRef ? { baseRef: latestRef } : {}
+			});
+			outro("Pull complete");
+		} finally {
+			cleanup();
+		}
+	}
+});
+/**
+* `--continue` モードの処理: コンフリクト解決後に baseHashes/baseRef を更新する。
+*
+* 背景: `ziku pull` でコンフリクトが発生した際、ユーザーが手動解決した後に
+* `ziku pull --continue` を実行することで状態更新が完了する。
+* git の `git merge --continue` / `git rebase --continue` パターンを踏襲。
+*
+* 対になる操作: pull.ts の pendingMerge 保存ロジック（コンフリクト発生時）
+*/
+async function runContinue(targetDir, config) {
+	if (!config.pendingMerge) throw new BermError("No pending merge found", "Run `ziku pull` first to start a merge");
+	const { conflicts, templateHashes, latestRef } = config.pendingMerge;
+	const stillConflicted = [];
+	for (const file of conflicts) try {
+		if (hasConflictMarkers(await readFile(join(targetDir, file), "utf-8")).found) stillConflicted.push(file);
+	} catch {}
+	if (stillConflicted.length > 0) {
+		for (const file of stillConflicted) log.warn(`Still has conflict markers: ${pc$1.cyan(file)}`);
+		throw new BermError("Unresolved conflicts remain", "Resolve all conflict markers then run `ziku pull --continue` again");
+	}
+	await saveConfig(targetDir, {
+		...config,
+		baseHashes: templateHashes,
+		...latestRef ? { baseRef: latestRef } : {},
+		pendingMerge: void 0
+	});
+	log.success("All conflicts resolved");
+	outro("Pull complete");
+}
+/**
+* 1ファイルのマージ結果をユーザーに報告する。
+*
+* 背景: JSON/JSONC の構造マージ（conflictDetails あり）とテキストマージ（conflictMarkers あり）で
+* メッセージが異なるため、このヘルパーに集約する。
+* Step 8 と他の呼び出し元でログ出力のロジックを共有する。
+*/
+function logMergeConflict(file, result) {
+	if (result.conflictDetails.length > 0) {
+		log.warn(`Conflict in ${pc$1.cyan(file)} — review these keys:`);
+		for (const detail of result.conflictDetails) {
+			const pathStr = detail.path.join(".");
+			log.message(`  ${pc$1.dim("•")} ${pc$1.yellow(pathStr)} — kept local value`);
+		}
+	} else log.warn(`Conflict in ${pc$1.cyan(file)} — manual resolution needed`);
+}
+/**
+* インストール済みモジュールの有効パターンを全て取得する。
+*
+* 背景: pull 時にハッシュ計算対象のファイルを特定するため、
+* 各モジュールの patterns に excludePatterns を適用した結果を集約する。
+*/
+function getInstalledModulePatterns(moduleIds, moduleList, config) {
+	const patterns = [];
+	for (const moduleId of moduleIds) {
+		const mod = moduleList.find((m) => m.id === moduleId);
+		if (!mod) continue;
+		patterns.push(...getEffectivePatterns(moduleId, mod.patterns, config));
+	}
+	return patterns;
+}
+/**
+* pull のサマリーを表示する。
+*
+* 背景: ユーザーが pull の影響範囲を把握できるよう、
+* 分類結果を色分けして一覧表示する。diff.ts の表示スタイルに合わせる。
+*/
+function logPullSummary(classification) {
+	const lines = [];
+	for (const file of classification.autoUpdate) lines.push(`${pc$1.cyan("↓")} ${pc$1.cyan(file)}`);
+	for (const file of classification.newFiles) lines.push(`${pc$1.green("+")} ${pc$1.green(file)}`);
+	for (const file of classification.conflicts) lines.push(`${pc$1.yellow("!")} ${pc$1.yellow(file)}`);
+	for (const file of classification.deletedFiles) lines.push(`${pc$1.red("-")} ${pc$1.red(file)}`);
+	const summaryParts = [
+		classification.autoUpdate.length > 0 ? pc$1.cyan(`↓${classification.autoUpdate.length} updated`) : null,
+		classification.newFiles.length > 0 ? pc$1.green(`+${classification.newFiles.length} new`) : null,
+		classification.conflicts.length > 0 ? pc$1.yellow(`!${classification.conflicts.length} conflicts`) : null,
+		classification.deletedFiles.length > 0 ? pc$1.red(`-${classification.deletedFiles.length} deleted`) : null
+	].filter(Boolean).join(pc$1.dim(" | "));
+	log.message([
+		...lines,
+		"",
+		summaryParts
+	].join("\n"));
+}
+
+//#endregion
+//#region src/utils/readme.ts
+/**
+* README.md の自動生成ユーティリティ
+*/
+const MARKERS = {
+	features: {
+		start: "<!-- FEATURES:START -->",
+		end: "<!-- FEATURES:END -->"
+	},
+	commands: {
+		start: "<!-- COMMANDS:START -->",
+		end: "<!-- COMMANDS:END -->"
+	},
+	files: {
+		start: "<!-- FILES:START -->",
+		end: "<!-- FILES:END -->"
+	}
+};
+/**
+* modules.jsonc を読み込み
+*/
+async function loadModulesFromFile(modulesPath) {
+	if (!existsSync(modulesPath)) return [];
+	return parse$1(await readFile(modulesPath, "utf-8")).modules;
+}
+/**
+* 機能セクションを生成
+*/
+function generateFeaturesSection(modules) {
+	const lines = [];
+	lines.push("## 機能\n");
+	for (const mod of modules) lines.push(`- **${mod.name}** - ${mod.description}`);
+	lines.push("");
+	return lines.join("\n");
+}
+/**
+* 生成されるファイルセクションを生成
+*/
+function generateFilesSection(modules) {
+	const lines = [];
+	lines.push("## 生成されるファイル\n");
+	lines.push("選択したモジュールに応じて以下のファイルが生成されます：\n");
+	for (const mod of modules) {
+		const dirName = mod.id === "." ? "ルート" : `\`${mod.id}/\``;
+		lines.push(`### ${dirName}\n`);
+		lines.push(`${mod.description}\n`);
+		for (const pattern of mod.patterns) {
+			const displayPattern = pattern.includes("*") ? `\`${pattern}\` (パターン)` : `\`${pattern}\``;
+			lines.push(`- ${displayPattern}`);
+		}
+		lines.push("");
+	}
+	lines.push("### 設定ファイル\n");
+	lines.push("- `.devenv.json` - このツールの設定（適用したモジュール情報）\n");
+	return lines.join("\n");
+}
+/**
+* README のマーカー間を更新
+*/
+function updateSection(content, startMarker, endMarker, newSection) {
+	const startIndex = content.indexOf(startMarker);
+	const endIndex = content.indexOf(endMarker);
+	if (startIndex === -1 || endIndex === -1) return {
+		content,
+		updated: false
+	};
+	const newContent = `${content.slice(0, startIndex + startMarker.length)}\n\n${newSection}\n${content.slice(endIndex)}`;
+	return {
+		content: newContent,
+		updated: newContent !== content
+	};
+}
+/**
+* README を生成
+*/
+async function generateReadme(options) {
+	const { readmePath, modulesPath, generateCommandsSection } = options;
+	if (!existsSync(readmePath)) return {
+		updated: false,
+		content: "",
+		readmePath
+	};
+	const modules = await loadModulesFromFile(modulesPath);
+	let readme = await readFile(readmePath, "utf-8");
+	let anyUpdated = false;
+	if (modules.length > 0) {
+		const featuresSection = generateFeaturesSection(modules);
+		const result = updateSection(readme, MARKERS.features.start, MARKERS.features.end, featuresSection);
+		readme = result.content;
+		anyUpdated = anyUpdated || result.updated;
+	}
+	if (generateCommandsSection) {
+		const commandsSection = await generateCommandsSection();
+		const result = updateSection(readme, MARKERS.commands.start, MARKERS.commands.end, commandsSection);
+		readme = result.content;
+		anyUpdated = anyUpdated || result.updated;
+	}
+	if (modules.length > 0) {
+		const filesSection = generateFilesSection(modules);
+		const result = updateSection(readme, MARKERS.files.start, MARKERS.files.end, filesSection);
+		readme = result.content;
+		anyUpdated = anyUpdated || result.updated;
+	}
+	return {
+		updated: anyUpdated,
+		content: readme,
+		readmePath
+	};
+}
+/**
+* README を更新して保存
+*/
+async function updateReadmeFile(options) {
+	const result = await generateReadme(options);
+	if (result.updated) await writeFile(result.readmePath, result.content);
+	return result;
+}
+/**
+* プロジェクトディレクトリ内の README を検出して更新
+* @param targetDir プロジェクトのルートディレクトリ
+* @param templateDir テンプレートディレクトリ（modules.jsonc の場所）
+*/
+async function detectAndUpdateReadme(targetDir, templateDir) {
+	const readmePath = join(targetDir, "README.md");
+	const modulesPath = join(templateDir, ".devenv/modules.jsonc");
+	if (!existsSync(readmePath)) return null;
+	const readmeContent = await readFile(readmePath, "utf-8");
+	if (!(readmeContent.includes(MARKERS.features.start) || readmeContent.includes(MARKERS.files.start))) return null;
+	return updateReadmeFile({
+		readmePath,
+		modulesPath
+	});
+}
+
+//#endregion
+//#region src/commands/push.ts
+/**
+* FileDiff の差分統計を "+N -M" 形式でフォーマットする。
+*
+* 背景: git push の出力に合わせ、変更行数を可視化する。
+* "modified" の場合は行数の差を表示（詳細な unified diff は ziku diff で確認可能）。
+*/
+function formatFileStat(file) {
+	let additions = 0;
+	let deletions = 0;
+	if (file.type === "added" && file.localContent) additions = file.localContent.split("\n").length;
+	else if (file.type === "deleted" && file.templateContent) deletions = file.templateContent.split("\n").length;
+	else if (file.type === "modified") {
+		const local = file.localContent?.split("\n").length ?? 0;
+		const tmpl = file.templateContent?.split("\n").length ?? 0;
+		additions = Math.max(0, local - tmpl);
+		deletions = Math.max(0, tmpl - local);
+		if (additions === 0 && deletions === 0 && file.localContent !== file.templateContent) {
+			additions = 1;
+			deletions = 1;
+		}
+	}
+	const parts = [];
+	if (additions > 0) parts.push(pc$1.green(`+${additions}`));
+	if (deletions > 0) parts.push(pc$1.red(`-${deletions}`));
+	return parts.length > 0 ? parts.join(" ") : pc$1.dim("~");
+}
+/**
+* process.exit() でも確実に一時ディレクトリを削除するための同期クリーンアップを登録する。
+*
+* 背景: handleCancel() が process.exit(0) を呼ぶため async finally ブロックが
+* スキップされ、.devenv-temp が残る問題への対策。process.on('exit') は
+* process.exit() でも発火するが同期処理のみ実行可能なため rmSync を使用。
+*
+* 削除条件: handleCancel() が process.exit() を使わなくなった場合。
+*/
+function registerSyncCleanup(tempDir) {
+	const cleanup = () => {
+		try {
+			if (existsSync(tempDir)) rmSync(tempDir, {
+				recursive: true,
+				force: true
+			});
+		} catch {}
+	};
+	process.on("exit", cleanup);
+	return () => {
+		process.removeListener("exit", cleanup);
+	};
+}
+const MODULES_FILE_PATH = ".devenv/modules.jsonc";
+const README_PATH = "README.md";
+/**
+* ローカルの modules.jsonc とテンプレートの modules.jsonc を比較し、
+* ローカルにのみ存在するモジュール（track コマンドで追加されたもの等）を検出してマージする。
+* テンプレートの raw content をベースに新モジュールを追加した内容を返す。
+*/
+async function detectLocalModuleAdditions(targetDir, templateModules, templateRawContent) {
+	if (!modulesFileExists(targetDir)) return {
+		mergedModuleList: templateModules,
+		newModuleIds: [],
+		updatedModulesContent: void 0
+	};
+	const local = await loadModulesFile(targetDir);
+	const templateModuleIds = new Set(templateModules.map((m) => m.id));
+	const newModules = local.modules.filter((m) => !templateModuleIds.has(m.id));
+	if (newModules.length === 0) {
+		let updatedContent$1 = templateRawContent;
+		let hasPatternAdditions = false;
+		for (const localMod of local.modules) {
+			const templateMod = templateModules.find((m) => m.id === localMod.id);
+			if (!templateMod) continue;
+			const newPatterns = localMod.patterns.filter((p$1) => !templateMod.patterns.includes(p$1));
+			if (newPatterns.length > 0) {
+				updatedContent$1 = addPatternToModulesFileWithCreate(updatedContent$1, localMod.id, newPatterns);
+				hasPatternAdditions = true;
+			}
+		}
+		if (hasPatternAdditions) return {
+			mergedModuleList: parse$1(updatedContent$1).modules,
+			newModuleIds: [],
+			updatedModulesContent: updatedContent$1
+		};
+		return {
+			mergedModuleList: templateModules,
+			newModuleIds: [],
+			updatedModulesContent: void 0
+		};
+	}
+	let updatedContent = templateRawContent;
+	for (const mod of newModules) updatedContent = addPatternToModulesFileWithCreate(updatedContent, mod.id, mod.patterns, {
+		name: mod.name,
+		description: mod.description
+	});
+	for (const localMod of local.modules) {
+		const templateMod = templateModules.find((m) => m.id === localMod.id);
+		if (!templateMod) continue;
+		const newPatterns = localMod.patterns.filter((p$1) => !templateMod.patterns.includes(p$1));
+		if (newPatterns.length > 0) updatedContent = addPatternToModulesFileWithCreate(updatedContent, localMod.id, newPatterns);
+	}
+	return {
+		mergedModuleList: parse$1(updatedContent).modules,
+		newModuleIds: newModules.map((m) => m.id),
+		updatedModulesContent: updatedContent
+	};
+}
+/**
+* --execute モード: マニフェストファイルを使ってPRを作成
+*/
+async function runExecuteMode(targetDir, config, messageOverride) {
+	log.step("Loading manifest...");
+	let manifest;
+	try {
+		manifest = await loadManifest(targetDir);
+	} catch (error) {
+		throw new BermError(error.message);
+	}
+	const selectedFilePaths = getSelectedFilePaths(manifest);
+	const selectedUntracked = getSelectedUntrackedFiles(manifest);
+	if (selectedFilePaths.length === 0 && selectedUntracked.size === 0) {
+		log.info("No files selected in manifest. Nothing to push.");
+		log.message(pc$1.dim(`Edit ${MANIFEST_FILENAME} and set 'selected: true' for files you want to include.`));
+		return;
+	}
+	log.success(`${selectedFilePaths.length} files selected from manifest`);
+	if (selectedUntracked.size > 0) {
+		const untrackedCount = Array.from(selectedUntracked.values()).reduce((sum, files) => sum + files.length, 0);
+		log.success(`${untrackedCount} untracked files will be added to patterns`);
+	}
+	log.step("Fetching template...");
+	const templateSource = buildTemplateSource(config.source);
+	const tempDir = join(targetDir, ".devenv-temp");
+	const unregisterCleanup = registerSyncCleanup(tempDir);
+	try {
+		const { dir: templateDir } = await withSpinner("Downloading template from GitHub...", () => downloadTemplate(templateSource, {
+			dir: tempDir,
+			force: true
+		}));
+		let moduleList;
+		let modulesRawContent;
+		if (modulesFileExists(templateDir)) {
+			const loaded = await loadModulesFile(templateDir);
+			moduleList = loaded.modules;
+			modulesRawContent = loaded.rawContent;
+		} else moduleList = defaultModules;
+		const effectiveModuleIds = [...config.modules];
+		let updatedModulesContent;
+		if (modulesRawContent) {
+			const localAdditions = await detectLocalModuleAdditions(targetDir, moduleList, modulesRawContent);
+			moduleList = localAdditions.mergedModuleList;
+			updatedModulesContent = localAdditions.updatedModulesContent;
+			for (const id of localAdditions.newModuleIds) if (!effectiveModuleIds.includes(id)) effectiveModuleIds.push(id);
+		}
+		if (selectedUntracked.size > 0 && modulesRawContent) {
+			let currentContent = updatedModulesContent || modulesRawContent;
+			for (const [moduleId, filePaths] of selectedUntracked) currentContent = addPatternToModulesFileWithCreate(currentContent, moduleId, filePaths);
+			updatedModulesContent = currentContent;
+			moduleList = parse$1(updatedModulesContent).modules;
+		}
+		log.step("Preparing files...");
+		const diff = await withSpinner("Analyzing differences...", () => detectDiff({
+			targetDir,
+			templateDir,
+			moduleIds: effectiveModuleIds,
+			config,
+			moduleList
+		}));
+		const currentPushableFiles = getPushableFiles(diff);
+		const currentFilePaths = new Set(currentPushableFiles.map((f) => f.path));
+		const manifestFilePaths = new Set(manifest.files.map((f) => f.path));
+		const missingFiles = selectedFilePaths.filter((p$1) => !currentFilePaths.has(p$1));
+		const newFiles = currentPushableFiles.filter((f) => !manifestFilePaths.has(f.path)).map((f) => f.path);
+		if (missingFiles.length > 0 || newFiles.length > 0) {
+			log.warn("Manifest is out of sync with current changes:");
+			if (missingFiles.length > 0) log.message(pc$1.dim(`  Missing files (in manifest but no longer changed): ${missingFiles.join(", ")}`));
+			if (newFiles.length > 0) log.message(pc$1.dim(`  New files (changed but not in manifest): ${newFiles.join(", ")}`));
+			log.message(pc$1.dim("  Consider running 'ziku push --prepare' to regenerate the manifest."));
+		}
+		const pushableFiles = getPushableFiles(diff);
+		const allSelectedPaths = [...selectedFilePaths, ...Array.from(selectedUntracked.values()).flat()];
+		const files = pushableFiles.filter((f) => allSelectedPaths.includes(f.path)).map((f) => ({
+			path: f.path,
+			content: f.localContent || ""
+		}));
+		if (updatedModulesContent) {
+			if (selectedFilePaths.includes(MODULES_FILE_PATH) || selectedUntracked.size > 0) {
+				const existingIdx = files.findIndex((f) => f.path === MODULES_FILE_PATH);
+				if (existingIdx !== -1) files[existingIdx].content = updatedModulesContent;
+				else files.push({
+					path: MODULES_FILE_PATH,
+					content: updatedModulesContent
+				});
+			}
+		}
+		const readmeResult = await detectAndUpdateReadme(targetDir, templateDir);
+		if (readmeResult?.updated) files.push({
+			path: README_PATH,
+			content: readmeResult.content
+		});
+		if (files.length === 0) {
+			log.info("No files to push after processing.");
+			return;
+		}
+		let token = manifest.github.token || getGitHubToken();
+		if (!token) throw new BermError("GitHub token not found.", "Set GITHUB_TOKEN or GH_TOKEN environment variable, or add token to manifest.");
+		const title = messageOverride || manifest.pr.title;
+		const body = manifest.pr.body;
+		log.step("Creating pull request...");
+		const result = await withSpinner("Creating PR on GitHub...", () => createPullRequest(token, {
+			owner: config.source.owner,
+			repo: config.source.repo,
+			files,
+			title,
+			body,
+			baseBranch: config.source.ref || "main"
+		}));
+		await deleteManifest(targetDir);
+		log.success("Pull request created!");
+		log.message([
+			`${pc$1.dim("To")} ${pc$1.bold(`${config.source.owner}/${config.source.repo}`)}`,
+			`  ${pc$1.green(result.branch)}  ${pc$1.dim(`(${files.length} file${files.length !== 1 ? "s" : ""} changed)`)}`,
+			"",
+			`  ${pc$1.bold(`PR #${result.number}`)}  ${pc$1.cyan(result.url)}`
+		].join("\n"));
+		log.message(pc$1.dim(`Cleaned up ${MANIFEST_FILENAME}`));
+		outro(`Review and merge at ${pc$1.cyan(result.url)}`);
+	} finally {
+		unregisterCleanup();
+		if (existsSync(tempDir)) await rm(tempDir, {
+			recursive: true,
+			force: true
+		});
+	}
+}
+const pushCommand = defineCommand({
+	meta: {
+		name: "push",
+		description: "Push local changes to the template repository as a PR"
+	},
+	args: {
+		dir: {
+			type: "positional",
+			description: "Project directory",
+			default: "."
+		},
+		dryRun: {
+			type: "boolean",
+			alias: "n",
+			description: "Preview only, don't create PR",
+			default: false
+		},
+		message: {
+			type: "string",
+			alias: "m",
+			description: "PR title"
+		},
+		yes: {
+			type: "boolean",
+			alias: ["y", "f"],
+			description: "Skip confirmation prompts",
+			default: false
+		},
+		edit: {
+			type: "boolean",
+			description: "Edit PR title and description before creating",
+			default: false
+		},
+		prepare: {
+			type: "boolean",
+			alias: "p",
+			description: "Generate a manifest file for AI-agent friendly workflow (no PR created)",
+			default: false
+		},
+		execute: {
+			type: "boolean",
+			alias: "e",
+			description: "Execute push using the manifest file generated by --prepare",
+			default: false
+		},
+		files: {
+			type: "string",
+			description: "Comma-separated file paths to include in PR (non-interactive file selection for AI agents)"
+		}
+	},
+	async run({ args }) {
+		intro("push");
+		if (args.prepare && args.execute) throw new BermError("Cannot use --prepare and --execute together.", "Use --prepare to generate a manifest, then --execute to create the PR.");
+		if (args.prepare && args.dryRun) log.warn("--dry-run is ignored with --prepare (--prepare doesn't create a PR).");
+		if (args.execute && args.edit) log.message(pc$1.dim("Note: --edit is ignored in --execute mode (uses manifest)."));
+		const targetDir = resolve(args.dir);
+		const configPath = join(targetDir, ".devenv.json");
+		if (!existsSync(configPath)) throw new BermError(".devenv.json not found.", "Run 'ziku init' first.");
+		const configContent = await readFile(configPath, "utf-8");
+		const configData = JSON.parse(configContent);
+		const parseResult = configSchema.safeParse(configData);
+		if (!parseResult.success) throw new BermError("Invalid .devenv.json format", parseResult.error.message);
+		const config = parseResult.data;
+		if (config.modules.length === 0) {
+			log.warn("No modules installed");
+			return;
+		}
+		if (config.pendingMerge) throw new BermError("Unresolved merge conflicts from `ziku pull`", "Resolve conflicts in these files, then run `ziku pull --continue`:\n" + config.pendingMerge.conflicts.map((f) => `  • ${f}`).join("\n"));
+		if (args.execute) {
+			await runExecuteMode(targetDir, config, args.message);
+			return;
+		}
+		log.step("Fetching template...");
+		const templateSource = buildTemplateSource(config.source);
+		const tempDir = join(targetDir, ".devenv-temp");
+		const unregisterCleanup = registerSyncCleanup(tempDir);
+		try {
+			const { dir: templateDir } = await withSpinner("Downloading template from GitHub...", () => downloadTemplate(templateSource, {
+				dir: tempDir,
+				force: true
+			}));
+			let moduleList;
+			let modulesRawContent;
+			if (modulesFileExists(templateDir)) {
+				const loaded = await loadModulesFile(templateDir);
+				moduleList = loaded.modules;
+				modulesRawContent = loaded.rawContent;
+			} else moduleList = defaultModules;
+			const effectiveModuleIds = [...config.modules];
+			let updatedModulesContent;
+			if (modulesRawContent) {
+				const localAdditions = await detectLocalModuleAdditions(targetDir, moduleList, modulesRawContent);
+				moduleList = localAdditions.mergedModuleList;
+				updatedModulesContent = localAdditions.updatedModulesContent;
+				for (const id of localAdditions.newModuleIds) if (!effectiveModuleIds.includes(id)) effectiveModuleIds.push(id);
+				if (localAdditions.newModuleIds.length > 0) log.info(`Detected ${localAdditions.newModuleIds.length} new module(s) from local: ${localAdditions.newModuleIds.join(", ")}`);
+			}
+			const mergedContents = /* @__PURE__ */ new Map();
+			if (config.baseHashes) {
+				const { hashFiles: hashFiles$1 } = await import("./hash-DonjAgHQ.mjs");
+				const { classifyFiles: classifyFiles$1 } = await import("./merge-DFEjeYIq.mjs");
+				const { getModuleById: getModuleById$1 } = await import("./modules-DkQe-r1d.mjs");
+				const { getEffectivePatterns: getEffectivePatterns$1 } = await import("./patterns-C3oCRYgX.mjs");
+				const allPatterns = [];
+				for (const moduleId of effectiveModuleIds) {
+					const mod = getModuleById$1(moduleId, moduleList);
+					if (mod) {
+						const patterns = getEffectivePatterns$1(moduleId, mod.patterns, config);
+						allPatterns.push(...patterns);
+					}
+				}
+				const templateHashes = await hashFiles$1(templateDir, allPatterns);
+				const localHashes = await hashFiles$1(targetDir, allPatterns);
+				const classification = classifyFiles$1({
+					baseHashes: config.baseHashes,
+					localHashes,
+					templateHashes
+				});
+				if (classification.conflicts.length > 0) {
+					const { threeWayMerge: threeWayMerge$1 } = await import("./merge-DFEjeYIq.mjs");
+					const baseInfo = config.baseRef ? `since ${pc$1.bold(config.baseRef.slice(0, 7))} (your last sync)` : "since your last pull/init";
+					log.warn(`Template updated ${baseInfo} — ${classification.conflicts.length} conflict(s) detected, attempting auto-merge...`);
+					let baseTemplateDir;
+					let baseCleanup;
+					if (config.baseRef) try {
+						log.info(`Downloading base version (${config.baseRef.slice(0, 7)}...) for merge...`);
+						const { downloadTemplateToTemp: downloadBase } = await import("./template-BLwXZEZq.mjs");
+						const baseResult = await downloadBase(targetDir, `gh:${config.source.owner}/${config.source.repo}#${config.baseRef}`);
+						baseTemplateDir = baseResult.templateDir;
+						baseCleanup = baseResult.cleanup;
+					} catch {
+						log.warn("Could not download base version. Falling back to local content for conflicts.");
+					}
+					try {
+						const autoMerged = [];
+						const unresolved = [];
+						for (const file of classification.conflicts) {
+							const localContent = await readFile(join(targetDir, file), "utf-8");
+							const templateContent = await readFile(join(templateDir, file), "utf-8");
+							let baseContent;
+							if (baseTemplateDir && existsSync(join(baseTemplateDir, file))) baseContent = await readFile(join(baseTemplateDir, file), "utf-8");
+							if (baseContent) {
+								const result$1 = threeWayMerge$1(baseContent, templateContent, localContent, file);
+								if (!result$1.hasConflicts) {
+									mergedContents.set(file, result$1.content);
+									autoMerged.push(file);
+									continue;
+								}
+							}
+							unresolved.push(file);
+						}
+						if (autoMerged.length > 0) {
+							log.success(`Auto-merged ${autoMerged.length} file(s):`);
+							for (const file of autoMerged) log.message(`  ${pc$1.green("✓")} ${file}`);
+						}
+						if (unresolved.length > 0) {
+							log.warn(`${unresolved.length} file(s) could not be auto-merged:`);
+							for (const file of unresolved) log.message(`  ${pc$1.yellow("!")} ${file}`);
+							log.message([pc$1.dim("Your local changes will be included in the PR."), pc$1.dim(`hint: Run ${pc$1.cyan("ziku pull")} to sync changes first, then push again.`)].join("\n"));
+							if (!args.yes) {
+								if (!await confirmAction("Continue with unresolved conflicts?", { initialValue: true })) {
+									log.info("Run `ziku pull` first to sync template changes, then push again.");
+									return;
+								}
+							}
+						}
+					} finally {
+						baseCleanup?.();
+					}
+				}
+			}
+			if (!args.yes && !args.prepare && modulesRawContent) {
+				const untrackedByFolder = await detectUntrackedFiles({
+					targetDir,
+					moduleIds: effectiveModuleIds,
+					config,
+					moduleList
+				});
+				if (untrackedByFolder.length > 0) {
+					const untrackedCount = untrackedByFolder.reduce((sum, f) => sum + f.files.length, 0);
+					log.info(`${untrackedCount} untracked file(s) detected (not included in push)`);
+				}
+			}
+			log.step("Detecting changes...");
+			const diff = await withSpinner("Analyzing differences...", () => detectDiff({
+				targetDir,
+				templateDir,
+				moduleIds: effectiveModuleIds,
+				config,
+				moduleList
+			}));
+			let pushableFiles = getPushableFiles(diff);
+			if (pushableFiles.length === 0 && !updatedModulesContent) {
+				log.info("No changes to push");
+				log.step("Current status:");
+				logDiffSummary(diff.files);
+				return;
+			}
+			if (args.dryRun) {
+				log.info("Dry run mode");
+				log.step("Files that would be included in PR:");
+				logDiffSummary(diff.files);
+				if (updatedModulesContent) log.message(`${pc$1.green("+")} ${MODULES_FILE_PATH} ${pc$1.dim("(pattern additions)")}`);
+				log.info("No PR was created (dry run)");
+				return;
+			}
+			if (args.prepare) {
+				const untrackedByFolder = !args.yes && modulesRawContent ? await detectUntrackedFiles({
+					targetDir,
+					moduleIds: effectiveModuleIds,
+					config,
+					moduleList
+				}) : [];
+				const manifestPath = await saveManifest(targetDir, generateManifest({
+					targetDir,
+					diff,
+					pushableFiles,
+					untrackedByFolder,
+					defaultTitle: args.message,
+					modulesFileChange: updatedModulesContent ? MODULES_FILE_PATH : void 0
+				}));
+				log.success("Manifest file generated!");
+				log.message([
+					`File:   ${pc$1.cyan(manifestPath)}`,
+					`Files:  ${pushableFiles.length} files ready to push`,
+					...updatedModulesContent ? ["Modules: modules.jsonc will be updated (new modules/patterns detected)"] : [],
+					...untrackedByFolder.length > 0 ? (() => {
+						return [`Untracked: ${untrackedByFolder.reduce((sum, f) => sum + f.files.length, 0)} files detected (not selected by default)`];
+					})() : []
+				].join("\n"));
+				if (untrackedByFolder.length > 0) {
+					log.info(`${pc$1.bold("Hint:")} To sync untracked files to the template, first add them to tracking:`);
+					log.message(pc$1.dim([
+						`  npx ziku track "<pattern>"  # Add file patterns to the sync whitelist`,
+						`  npx ziku track --list        # List currently tracked patterns`,
+						`  Then re-run 'push --prepare' to include them in the manifest.`
+					].join("\n")));
+				}
+				outro(`Edit ${MANIFEST_FILENAME}, then run 'ziku push --execute' to create the PR`);
+				return;
+			}
+			if (args.files) {
+				const requestedPaths = args.files.split(",").map((p$1) => p$1.trim()).filter(Boolean);
+				const availablePaths = new Set(pushableFiles.map((f) => f.path));
+				const notFound = requestedPaths.filter((p$1) => !availablePaths.has(p$1));
+				if (notFound.length > 0) log.warn(`Files not found in pushable changes: ${notFound.join(", ")}`);
+				const requestedSet = new Set(requestedPaths);
+				pushableFiles = pushableFiles.filter((f) => requestedSet.has(f.path));
+				if (pushableFiles.length === 0 && !updatedModulesContent) {
+					log.info("No matching files found. Cancelled.");
+					return;
+				}
+				log.info(`${pushableFiles.length} file(s) selected via --files`);
+			} else {
+				log.step("Selecting files...");
+				pushableFiles = await selectPushFiles(pushableFiles);
+				if (pushableFiles.length === 0 && !updatedModulesContent) {
+					log.info("No files selected. Cancelled.");
+					return;
+				}
+			}
+			let token = getGitHubToken();
+			if (!token) token = await inputGitHubToken();
+			const suggestedTitle = generatePrTitle(pushableFiles);
+			const suggestedBody = generatePrBody$1(pushableFiles);
+			let title;
+			let body;
+			if (args.message) {
+				title = args.message;
+				body = suggestedBody;
+			} else if (args.edit) {
+				title = await inputPrTitle(suggestedTitle);
+				body = await inputPrBody(suggestedBody);
+			} else {
+				title = suggestedTitle;
+				body = suggestedBody;
+			}
+			const readmeResult = await detectAndUpdateReadme(targetDir, templateDir);
+			const files = pushableFiles.map((f) => ({
+				path: f.path,
+				content: mergedContents.get(f.path) ?? f.localContent ?? ""
+			}));
+			if (updatedModulesContent) files.push({
+				path: MODULES_FILE_PATH,
+				content: updatedModulesContent
+			});
+			if (readmeResult?.updated) files.push({
+				path: README_PATH,
+				content: readmeResult.content
+			});
+			const destination = `${config.source.owner}/${config.source.repo}`;
+			const baseBranch = config.source.ref || "main";
+			const baseHashStr = config.baseRef ? `  ${pc$1.dim(`since ${config.baseRef.slice(0, 7)}`)}` : "";
+			const fileLines = [];
+			for (const pf of pushableFiles) {
+				if (!files.some((f) => f.path === pf.path)) continue;
+				const stat = formatFileStat(pf);
+				const icon = pf.type === "added" ? pc$1.green("+") : pf.type === "modified" ? pc$1.yellow("~") : pc$1.red("-");
+				fileLines.push(`  ${icon} ${pf.path.padEnd(50)} ${stat}`);
+			}
+			for (const f of files) if (!pushableFiles.some((pf) => pf.path === f.path)) fileLines.push(`  ${pc$1.green("+")} ${f.path.padEnd(50)} ${pc$1.dim("(auto-updated)")}`);
+			log.message([
+				`${pc$1.dim("To")} ${pc$1.bold(destination)}  ${pc$1.dim(`→ ${baseBranch}`)}${baseHashStr}`,
+				pc$1.dim("─".repeat(62)),
+				...fileLines,
+				pc$1.dim("─".repeat(62)),
+				`  ${pc$1.dim("PR:")} ${title}`
+			].join("\n"));
+			if (!args.yes) {
+				if (!await confirmAction("Create PR?", { initialValue: true })) {
+					log.info("Cancelled. Use --edit to customize title/body, or --files to specify files.");
+					return;
+				}
+			}
+			log.step("Creating pull request...");
+			const result = await withSpinner("Creating PR on GitHub...", () => createPullRequest(token, {
+				owner: config.source.owner,
+				repo: config.source.repo,
+				files,
+				title,
+				body,
+				baseBranch: config.source.ref || "main"
+			}));
+			log.success("Pull request created!");
+			log.message([
+				`${pc$1.dim("To")} ${pc$1.bold(`${config.source.owner}/${config.source.repo}`)}`,
+				`  ${config.baseRef ? `${pc$1.dim(config.baseRef.slice(0, 7))}..` : ""}${pc$1.green(result.branch)}  ${pc$1.dim(`(${files.length} file${files.length !== 1 ? "s" : ""} changed)`)}`,
+				"",
+				`  ${pc$1.bold(`PR #${result.number}`)}  ${pc$1.cyan(result.url)}`
+			].join("\n"));
+			outro(`Review and merge at ${pc$1.cyan(result.url)}`);
+		} finally {
+			unregisterCleanup();
+			if (existsSync(tempDir)) await rm(tempDir, {
+				recursive: true,
+				force: true
+			});
+		}
+	}
+});
+
+//#endregion
+//#region src/commands/track.ts
+/**
+* パターン文字列からモジュール ID を推定
+* 例: ".cloud/rules/*.md" → ".cloud"
+*     ".mcp.json" → "."
+*     ".github/workflows/ci.yml" → ".github"
+*/
+function inferModuleId(pattern) {
+	return getModuleIdFromPath(pattern.replace(/\*.*$/, "").replace(/\{.*$/, "") || pattern);
+}
+const trackCommand = defineCommand({
+	meta: {
+		name: "track",
+		description: "Add file patterns to the tracking whitelist in modules.jsonc"
+	},
+	args: {
+		patterns: {
+			type: "positional",
+			description: "File paths or glob patterns to track (e.g., .cloud/rules/*.md)",
+			required: false
+		},
+		dir: {
+			type: "string",
+			alias: "d",
+			description: "Project directory (default: current directory)",
+			default: "."
+		},
+		module: {
+			type: "string",
+			alias: "m",
+			description: "Module ID to add patterns to (auto-detected from path if omitted)"
+		},
+		name: {
+			type: "string",
+			description: "Module name (used when creating a new module)"
+		},
+		description: {
+			type: "string",
+			description: "Module description (used when creating a new module)"
+		},
+		list: {
+			type: "boolean",
+			alias: "l",
+			description: "List all currently tracked modules and patterns",
+			default: false
+		}
+	},
+	async run({ args }) {
+		intro("track");
+		const targetDir = resolve(args.dir);
+		if (!modulesFileExists(targetDir)) throw new BermError(".devenv/modules.jsonc not found.", "Run 'ziku init' first to set up the project.");
+		if (args.list) {
+			const { modules } = await loadModulesFile(targetDir);
+			log.info("Tracked modules and patterns:");
+			for (const mod of modules) {
+				const lines = [];
+				lines.push(`${pc$1.cyan(mod.id)} ${pc$1.dim(`(${mod.name})`)}`);
+				if (mod.description) lines.push(`  ${pc$1.dim(mod.description)}`);
+				for (const pattern of mod.patterns) lines.push(`  ${pc$1.dim("→")} ${pattern}`);
+				log.message(lines.join("\n"));
+			}
+			outro("Done.");
+			return;
+		}
+		const rawArgs = process.argv.slice(2);
+		const trackIdx = rawArgs.indexOf("track");
+		const argsAfterTrack = trackIdx !== -1 ? rawArgs.slice(trackIdx + 1) : rawArgs;
+		const patterns = [];
+		let i = 0;
+		while (i < argsAfterTrack.length) {
+			const arg = argsAfterTrack[i];
+			if (arg === "--list" || arg === "-l" || arg === "--help" || arg === "-h") {
+				i++;
+				continue;
+			}
+			if (arg === "--dir" || arg === "-d" || arg === "--module" || arg === "-m" || arg === "--name" || arg === "--description") {
+				i += 2;
+				continue;
+			}
+			if (!arg.startsWith("-")) patterns.push(arg);
+			i++;
+		}
+		if (patterns.length === 0) throw new BermError("No patterns specified.", "Usage: ziku track <patterns...> [--module <id>]\nExample: ziku track '.cloud/rules/*.md' '.cloud/config.json'");
+		const moduleId = args.module || inferModuleId(patterns[0]);
+		const { rawContent } = await loadModulesFile(targetDir);
+		const updatedContent = addPatternToModulesFileWithCreate(rawContent, moduleId, patterns, {
+			name: args.name,
+			description: args.description
+		});
+		if (updatedContent === rawContent) {
+			log.info("All patterns are already tracked. No changes needed.");
+			return;
+		}
+		await saveModulesFile(targetDir, updatedContent);
+		log.success("Patterns added!");
+		const details = [
+			`Module: ${pc$1.cyan(moduleId)}`,
+			"Added:",
+			...patterns.map((p$1) => `  ${pc$1.green("+")} ${p$1}`)
+		];
+		log.message(details.join("\n"));
+		outro("Updated .devenv/modules.jsonc");
+	}
+});
+
+//#endregion
+//#region src/index.ts
+const main = defineCommand({
+	meta: {
+		name: "ziku",
+		version: version$2,
+		description: "Dev environment template manager"
+	},
+	subCommands: {
+		init: initCommand,
+		push: pushCommand,
+		pull: pullCommand,
+		diff: diffCommand,
+		track: trackCommand,
+		"ai-docs": aiDocsCommand
+	}
+});
+const commandMap = {
+	init: initCommand,
+	push: pushCommand,
+	pull: pullCommand,
+	diff: diffCommand
+};
+/**
+* コマンド選択プロンプト
+*
+* 背景: 引数なしで実行された場合に、ユーザーにコマンドを選択してもらう。
+* @inquirer/prompts の select を @clack/prompts に置き換え。
+*/
+async function promptCommand() {
+	intro();
+	p.log.message(pc$1.dim(`Are you an AI agent? Run ${pc$1.cyan("npx ziku ai-docs")} for non-interactive usage guide.`));
+	const command = await p.select({
+		message: "What would you like to do?",
+		options: [
+			{
+				value: "init",
+				label: "init",
+				hint: "Apply template to your project"
+			},
+			{
+				value: "push",
+				label: "push",
+				hint: "Push local changes as a PR"
+			},
+			{
+				value: "pull",
+				label: "pull",
+				hint: "Pull latest template updates"
+			},
+			{
+				value: "diff",
+				label: "diff",
+				hint: "Show differences from template"
+			}
+		]
+	});
+	if (p.isCancel(command)) {
+		p.cancel("Cancelled.");
+		process.exit(0);
+	}
+	const selectedCommand = commandMap[command];
+	await runMain(selectedCommand);
+}
+/**
+* トップレベルエラーハンドラ
+*
+* 背景: 各コマンドで throw された BermError をここでキャッチし、
+* @clack/prompts で統一的に表示する。process.exit(1) はこの 1 箇所のみ。
+*/
+async function run() {
+	try {
+		const args = process.argv.slice(2);
+		const hasSubCommand = args.length > 0 && [
+			"init",
+			"push",
+			"pull",
+			"diff",
+			"track",
+			"ai-docs",
+			"--help",
+			"-h",
+			"--version",
+			"-v"
+		].includes(args[0]);
+		if (!hasSubCommand && args.length > 0 && !args[0].startsWith("-")) await runMain(initCommand);
+		else if (!hasSubCommand && args.length === 0) await promptCommand();
+		else await runMain(main);
+	} catch (error) {
+		if (error instanceof BermError) {
+			logBermError(error);
+			process.exit(1);
+		}
+		throw error;
+	}
+}
+run();
+
+//#endregion
+export { modulesFileExists as C, loadModulesFile as S, getModuleById as _, hashContent as a, addPatternToModulesFileWithCreate as b, buildTemplateSource as c, fetchTemplates as d, writeFileWithStrategy as f, defaultModules as g, resolvePatterns as h, threeWayMerge as i, copyFile as l, matchesPatterns as m, hasConflictMarkers as n, hashFiles as o, getEffectivePatterns as p, mergeJsonContent as r, TEMPLATE_SOURCE as s, classifyFiles as t, downloadTemplateToTemp as u, getPatternsByModuleIds as v, saveModulesFile as w, getModulesFilePath as x, addPatternToModulesFile as y };