create-patties 0.0.10 → 0.0.11

package/README.md

@@ -49,5 +49,5 @@ guide.
 
 ## Requires
 
-Bun 1.0+. `bunx create-patties@latest` won't work under Node — install
+Bun 1.3+. `bunx create-patties@latest` won't work under Node — install
 Bun first from [bun.sh](https://bun.sh).

package/package.json

@@ -1,8 +1,9 @@
 {
 	"name": "create-patties",
-	"version": "0.0.10",
+	"version": "0.0.11",
 	"type": "module",
 	"description": "Scaffolder for new Patties projects.",
+	"license": "MIT",
 	"bin": {
 		"create-patties": "./bin/create-patties.ts"
 	},
@@ -22,6 +23,6 @@
 		"lint": "biome check ."
 	},
 	"engines": {
-		"bun": ">=1.0.0"
+		"bun": ">=1.3.0"
 	}
 }

package/src/index.ts

@@ -1,4 +1,4 @@
-import { existsSync, readdirSync } from "node:fs";
+import { existsSync, readdirSync, realpathSync } from "node:fs";
 import { dirname, isAbsolute, resolve } from "node:path";
 import { hasGit, probeTools } from "./probes.ts";
 import {
@@ -175,13 +175,43 @@ export async function run(argv: string[]): Promise<number> {
 	let gitSkippedReason: string | undefined;
 	if (args.git) {
 		if (hasGit()) {
-			await Bun.$`git init`.cwd(targetDir).quiet().nothrow();
-			await Bun.$`git add -A`.cwd(targetDir).quiet().nothrow();
-			await Bun.$`git commit -m ${"chore: initial commit from create-patties"}`
+			// Strip git hook env vars so these commands resolve relative to targetDir
+			// rather than inheriting GIT_DIR/GIT_INDEX_FILE from a running commit hook.
+			const gitEnv: NodeJS.ProcessEnv = { ...process.env };
+			for (const key of ["GIT_DIR", "GIT_WORK_TREE", "GIT_INDEX_FILE"]) {
+				delete gitEnv[key];
+			}
+			const init = await Bun.$`git init`
+				.cwd(targetDir)
+				.env(gitEnv)
+				.quiet()
+				.nothrow();
+			// Only stage/commit once `targetDir` is itself the git top-level. If
+			// `git init` failed, or the scaffold landed inside an existing repo (e.g.
+			// a git worktree), git resolves `.git` to a parent and `git add`/`commit`
+			// would clobber that outer repo. Compare the resolved top-level to be sure.
+			const top = await Bun.$`git rev-parse --show-toplevel`
 				.cwd(targetDir)
+				.env(gitEnv)
 				.quiet()
 				.nothrow();
-			step("initialized git and committed");
+			// `git rev-parse` reports a symlink-resolved path; resolve `targetDir` the
+			// same way so the comparison holds on macOS (/var → /private/var).
+			const ownsRepo =
+				init.exitCode === 0 &&
+				top.exitCode === 0 &&
+				top.stdout.toString().trim() === realpathSync(targetDir);
+			if (ownsRepo) {
+				await Bun.$`git add -A`.cwd(targetDir).env(gitEnv).quiet().nothrow();
+				await Bun.$`git commit -m ${"chore: initial commit from create-patties"}`
+					.cwd(targetDir)
+					.env(gitEnv)
+					.quiet()
+					.nothrow();
+				step("initialized git and committed");
+			} else {
+				gitSkippedReason = "git-init-failed";
+			}
 		} else {
 			gitSkippedReason = "git-missing";
 		}
@@ -194,6 +224,9 @@ export async function run(argv: string[]): Promise<number> {
 	if (gitSkippedReason === "git-missing") {
 		stderr("create-patties: `git` not found — skipping `git init`.");
 	}
+	if (gitSkippedReason === "git-init-failed") {
+		stderr("create-patties: `git init` failed — skipping the initial commit.");
+	}
 	if (args.template === "claude") {
 		process.stdout.write(
 			"\nClaude Code is configured (CLAUDE.md). Run `claude` in the project to start a session.\n",
@@ -337,6 +370,7 @@ async function writePackageJson(dir: string, name: string): Promise<void> {
 			"bun-types": "latest",
 			typescript: "^5.5.0",
 		}),
+		engines: { bun: ">=1.3.0" },
 	};
 	await Bun.write(`${dir}/package.json`, `${JSON.stringify(pkg, null, 2)}\n`);
 }