@getjack/jack 0.1.10 → 0.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@getjack/jack",
-	"version": "0.1.10",
+	"version": "0.1.12",
 	"description": "Ship before you forget why you started. The vibecoder's deployment CLI.",
 	"license": "Apache-2.0",
 	"type": "module",

package/src/lib/build-helper.ts

@@ -7,6 +7,19 @@ import { JackError, JackErrorCode } from "./errors.ts";
 import { parseJsonc } from "./jsonc.ts";
 import type { OperationReporter } from "./project-operations.ts";
 
+/**
+ * Get the wrangler config file path for a project
+ */
+function getWranglerConfigPath(projectPath: string): string | null {
+	const configs = ["wrangler.jsonc", "wrangler.toml", "wrangler.json"];
+	for (const config of configs) {
+		if (existsSync(join(projectPath, config))) {
+			return config;
+		}
+	}
+	return null;
+}
+
 export interface BuildOutput {
 	outDir: string;
 	entrypoint: string;
@@ -195,7 +208,9 @@ export async function buildProject(options: BuildOptions): Promise<BuildOutput>
 	// Run wrangler dry-run to build without deploying
 	reporter?.start("Bundling runtime...");
 
-	const dryRunResult = await $`wrangler deploy --dry-run --outdir=${outDir}`
+	const configFile = getWranglerConfigPath(projectPath);
+	const configArg = configFile ? ["--config", configFile] : [];
+	const dryRunResult = await $`wrangler deploy ${configArg} --dry-run --outdir=${outDir}`
 		.cwd(projectPath)
 		.nothrow()
 		.quiet();

package/src/lib/hooks.ts

@@ -1,10 +1,44 @@
 import { existsSync } from "node:fs";
 import { join } from "node:path";
+import * as readline from "node:readline";
 import type { HookAction } from "../templates/types";
 import { applyJsonWrite } from "./json-edit";
 import { getSavedSecrets } from "./secrets";
 import { restoreTty } from "./tty";
 
+/**
+ * Read multi-line JSON input from stdin
+ * User pastes JSON, then presses Enter on empty line to submit
+ */
+async function readMultilineJson(prompt: string): Promise<string> {
+	console.error(prompt);
+	console.error("(Paste JSON, then press Enter on empty line to submit)\n");
+
+	const rl = readline.createInterface({
+		input: process.stdin,
+		output: process.stderr,
+	});
+
+	const lines: string[] = [];
+
+	return new Promise((resolve) => {
+		rl.on("line", (line) => {
+			if (line.trim() === "" && lines.length > 0) {
+				rl.close();
+				resolve(lines.join("\n"));
+				return;
+			}
+			if (line.trim() !== "") {
+				lines.push(line);
+			}
+		});
+
+		rl.on("close", () => {
+			resolve(lines.join("\n"));
+		});
+	});
+}
+
 export interface HookContext {
 	domain?: string; // deployed domain (e.g., "my-app.username.workers.dev")
 	url?: string; // full deployed URL
@@ -147,14 +181,39 @@ function resolveHookPath(filePath: string, context: HookContext): string {
 	return join(context.projectDir, filePath);
 }
 
-function isAccountAssociation(value: unknown): value is { header: string; payload: string; signature: string } {
+function isAccountAssociation(value: unknown): boolean {
 	if (!value || typeof value !== "object") return false;
-	const obj = value as { header?: unknown; payload?: unknown; signature?: unknown };
-	return (
-		typeof obj.header === "string" &&
-		typeof obj.payload === "string" &&
-		typeof obj.signature === "string"
-	);
+	// Check direct format: { header, payload, signature }
+	const obj = value as Record<string, unknown>;
+	if (typeof obj.header === "string" && typeof obj.payload === "string" && typeof obj.signature === "string") {
+		return true;
+	}
+	// Check nested format from Farcaster: { accountAssociation: { header, payload, signature } }
+	if (obj.accountAssociation && typeof obj.accountAssociation === "object") {
+		const inner = obj.accountAssociation as Record<string, unknown>;
+		return typeof inner.header === "string" && typeof inner.payload === "string" && typeof inner.signature === "string";
+	}
+	return false;
+}
+
+/**
+ * Extract the accountAssociation object (handles both nested and flat formats)
+ */
+function extractAccountAssociation(value: unknown): { header: string; payload: string; signature: string } | null {
+	if (!value || typeof value !== "object") return null;
+	const obj = value as Record<string, unknown>;
+	// Direct format
+	if (typeof obj.header === "string" && typeof obj.payload === "string" && typeof obj.signature === "string") {
+		return { header: obj.header, payload: obj.payload, signature: obj.signature };
+	}
+	// Nested format from Farcaster
+	if (obj.accountAssociation && typeof obj.accountAssociation === "object") {
+		const inner = obj.accountAssociation as Record<string, unknown>;
+		if (typeof inner.header === "string" && typeof inner.payload === "string" && typeof inner.signature === "string") {
+			return { header: inner.header, payload: inner.payload, signature: inner.signature };
+		}
+	}
+	return null;
 }
 
 /**
@@ -363,16 +422,21 @@ const actionHandlers: {
 			return true;
 		}
 
-		const { input } = await import("@inquirer/prompts");
-
 		let rawValue = "";
-		try {
-			rawValue = await input({ message: action.message });
-		} catch (err) {
-			if (err instanceof Error && err.name === "ExitPromptError") {
-				return true;
+
+		// Use multi-line input for JSON validation (handles paste from Farcaster etc.)
+		if (action.validate === "json" || action.validate === "accountAssociation") {
+			rawValue = await readMultilineJson(action.message);
+		} else {
+			const { input } = await import("@inquirer/prompts");
+			try {
+				rawValue = await input({ message: action.message });
+			} catch (err) {
+				if (err instanceof Error && err.name === "ExitPromptError") {
+					return true;
+				}
+				throw err;
 			}
-			throw err;
 		}
 
 		if (!rawValue.trim()) {
@@ -384,14 +448,24 @@ const actionHandlers: {
 			try {
 				parsedInput = JSON.parse(rawValue);
 			} catch {
-				ui.error("Invalid JSON input");
-				return action.required ? false : true;
+				// Try normalizing whitespace (handles some multi-line paste issues)
+				try {
+					const normalized = rawValue.replace(/\n\s*/g, "");
+					parsedInput = JSON.parse(normalized);
+				} catch {
+					ui.error("Invalid JSON input");
+					return action.required ? false : true;
+				}
 			}
 		}
 
-		if (action.validate === "accountAssociation" && !isAccountAssociation(parsedInput)) {
-			ui.error("Invalid accountAssociation JSON (expected header, payload, signature)");
-			return action.required ? false : true;
+		if (action.validate === "accountAssociation") {
+			if (!isAccountAssociation(parsedInput)) {
+				ui.error("Invalid accountAssociation JSON (expected header, payload, signature)");
+				return action.required ? false : true;
+			}
+			// Extract the actual accountAssociation object (handles nested format from Farcaster)
+			parsedInput = extractAccountAssociation(parsedInput);
 		}
 
 		if (action.writeJson) {

package/src/lib/project-operations.ts

@@ -168,6 +168,36 @@ const noopReporter: OperationReporter = {
 	box() {},
 };
 
+/**
+ * Get the wrangler config file path for a project
+ * Returns the first found: wrangler.jsonc, wrangler.toml, wrangler.json
+ */
+function getWranglerConfigPath(projectPath: string): string | null {
+	const configs = ["wrangler.jsonc", "wrangler.toml", "wrangler.json"];
+	for (const config of configs) {
+		if (existsSync(join(projectPath, config))) {
+			return config;
+		}
+	}
+	return null;
+}
+
+/**
+ * Run wrangler deploy with explicit config to avoid parent directory conflicts
+ */
+async function runWranglerDeploy(
+	projectPath: string,
+	options: { dryRun?: boolean; outDir?: string } = {},
+) {
+	const configFile = getWranglerConfigPath(projectPath);
+	const configArg = configFile ? ["--config", configFile] : [];
+	const dryRunArgs = options.dryRun
+		? ["--dry-run", ...(options.outDir ? ["--outdir", options.outDir] : [])]
+		: [];
+
+	return await $`wrangler deploy ${configArg} ${dryRunArgs}`.cwd(projectPath).nothrow().quiet();
+}
+
 /**
  * Run bun install and managed project creation in parallel.
  * Handles partial failures with cleanup.
@@ -1072,7 +1102,7 @@ export async function createProject(
 
 		reporter.start("Deploying...");
 
-		const deployResult = await $`wrangler deploy`.cwd(targetDir).nothrow().quiet();
+		const deployResult = await runWranglerDeploy(targetDir);
 
 		if (deployResult.exitCode !== 0) {
 			reporter.stop();
@@ -1357,7 +1387,7 @@ export async function deployProject(options: DeployOptions = {}): Promise<Deploy
 		}
 
 		const spin = reporter.spinner("Deploying...");
-		const result = await $`wrangler deploy`.cwd(projectPath).nothrow().quiet();
+		const result = await runWranglerDeploy(projectPath);
 
 		if (result.exitCode !== 0) {
 			spin.error("Deploy failed");