@getjack/jack 0.1.34 → 0.1.36

package/src/lib/services/vectorize-delete.ts

@@ -4,8 +4,8 @@
  * Uses wrangler CLI to delete Vectorize indexes.
  */
 
-import { join } from "node:path";
 import { $ } from "bun";
+import { findWranglerConfig } from "../wrangler-config.ts";
 import { removeVectorizeBinding } from "./vectorize-config.ts";
 
 export interface DeleteVectorizeResult {
@@ -42,9 +42,11 @@ export async function deleteVectorizeIndex(
 	// Delete via wrangler
 	await deleteIndexViaWrangler(indexName);
 
-	// Remove binding from wrangler.jsonc
-	const wranglerPath = join(projectDir, "wrangler.jsonc");
-	const bindingRemoved = await removeVectorizeBinding(wranglerPath, indexName);
+	// Remove binding from wrangler config
+	const wranglerPath = findWranglerConfig(projectDir);
+	const bindingRemoved = wranglerPath
+		? await removeVectorizeBinding(wranglerPath, indexName)
+		: false;
 
 	return {
 		indexName,

package/src/lib/services/vectorize-list.ts

@@ -4,7 +4,7 @@
  * Lists Vectorize indexes configured in wrangler.jsonc with their metadata.
  */
 
-import { join } from "node:path";
+import { findWranglerConfig } from "../wrangler-config.ts";
 import { getExistingVectorizeBindings } from "./vectorize-config.ts";
 import { getVectorizeInfo } from "./vectorize-info.ts";
 
@@ -23,9 +23,12 @@ export interface VectorizeListEntry {
  * (dimensions, metric, vector count) via wrangler vectorize info for each index.
  */
 export async function listVectorizeIndexes(projectDir: string): Promise<VectorizeListEntry[]> {
-	const wranglerPath = join(projectDir, "wrangler.jsonc");
+	const wranglerPath = findWranglerConfig(projectDir);
+	if (!wranglerPath) {
+		return [];
+	}
 
-	// Get existing Vectorize bindings from wrangler.jsonc
+	// Get existing Vectorize bindings from wrangler config
 	const bindings = await getExistingVectorizeBindings(wranglerPath);
 
 	if (bindings.length === 0) {

package/src/lib/storage/index.ts

@@ -4,6 +4,8 @@
 
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
+import { parseJsonc } from "../jsonc.ts";
+import { findWranglerConfig } from "../wrangler-config.ts";
 
 // Re-export submodules
 export * from "./checksum.ts";
@@ -63,34 +65,30 @@ export interface CloudProject {
  * @throws Error if wrangler file not found or name not found
  */
 export async function getProjectNameFromDir(projectDir: string): Promise<string> {
-	// Try wrangler.toml first
-	const tomlPath = join(projectDir, "wrangler.toml");
-	try {
-		const content = await Bun.file(tomlPath).text();
-		const match = content.match(/^name\s*=\s*["']([^"']+)["']/m);
-		if (match?.[1]) {
-			return match[1];
-		}
-	} catch {
-		// File doesn't exist, try JSON
+	const configPath = findWranglerConfig(projectDir);
+	if (!configPath) {
+		throw new Error(
+			"Could not find project name. Please ensure wrangler.toml or wrangler.jsonc exists with a 'name' field",
+		);
 	}
 
-	// Try wrangler.jsonc
-	const jsoncPath = join(projectDir, "wrangler.jsonc");
 	try {
-		const content = await Bun.file(jsoncPath).text();
-		// Remove comments and parse JSON
-		// Note: Only remove line comments at the start of a line (with optional whitespace)
-		// to avoid breaking URLs like https://example.com
-		const jsonContent = content
-			.replace(/\/\*[\s\S]*?\*\//g, "") // block comments
-			.replace(/^\s*\/\/.*$/gm, ""); // line comments at start of line only
-		const config = JSON.parse(jsonContent);
-		if (config.name) {
-			return config.name;
+		const content = await Bun.file(configPath).text();
+
+		if (configPath.endsWith(".toml")) {
+			const match = content.match(/^name\s*=\s*["']([^"']+)["']/m);
+			if (match?.[1]) {
+				return match[1];
+			}
+		} else {
+			// .jsonc or .json
+			const config = parseJsonc<{ name?: string }>(content);
+			if (config.name) {
+				return config.name;
+			}
 		}
 	} catch {
-		// File doesn't exist or parse failed
+		// Parse failed
 	}
 
 	throw new Error(

package/src/lib/telemetry.ts

@@ -17,6 +17,7 @@ export const Events = {
 	COMMAND_COMPLETED: "command_completed",
 	COMMAND_FAILED: "command_failed",
 	PROJECT_CREATED: "project_created",
+	PROJECT_DELETED: "project_deleted",
 	DEPLOY_STARTED: "deploy_started",
 	CONFIG_CHANGED: "config_changed",
 	INTENT_MATCHED: "intent_matched",

package/src/lib/wrangler-config.ts

@@ -1,10 +1,51 @@
 /**
- * Utilities for modifying wrangler.jsonc while preserving comments
+ * Utilities for wrangler config detection and modification.
+ *
+ * All wrangler config path resolution should go through this module.
+ * Priority: .jsonc > .toml > .json (jsonc is jack's default)
  */
 
 import { existsSync } from "node:fs";
+import { join } from "node:path";
+import {
+	addSectionBeforeClosingBrace,
+	findLastObjectEndInArray,
+	findMatchingBracket,
+	isOnlyCommentsAndWhitespace,
+	shouldAddCommaBefore,
+} from "./jsonc-edit.ts";
 import { parseJsonc } from "./jsonc.ts";
 
+// ============================================================================
+// Wrangler Config Path Resolution
+// ============================================================================
+
+/** Canonical priority order: jsonc (jack's default) > toml > json */
+const WRANGLER_CONFIG_NAMES = ["wrangler.jsonc", "wrangler.toml", "wrangler.json"] as const;
+
+/**
+ * Find the wrangler config file in a project directory.
+ * Returns the full absolute path, or null if none found.
+ */
+export function findWranglerConfig(projectDir: string): string | null {
+	for (const name of WRANGLER_CONFIG_NAMES) {
+		const fullPath = join(projectDir, name);
+		if (existsSync(fullPath)) return fullPath;
+	}
+	return null;
+}
+
+/**
+ * Check whether a project directory has any wrangler config file.
+ */
+export function hasWranglerConfig(projectDir: string): boolean {
+	return findWranglerConfig(projectDir) !== null;
+}
+
+// ============================================================================
+// D1 Binding Config
+// ============================================================================
+
 export interface D1BindingConfig {
 	binding: string; // e.g., "DB" or "ANALYTICS_DB"
 	database_name: string; // e.g., "my-app-db"
@@ -145,317 +186,7 @@ function appendToD1DatabasesArray(content: string, bindingJson: string): string
  * Inserts before the final closing brace.
  */
 function addD1DatabasesSection(content: string, bindingJson: string): string {
-	// Find the last closing brace in the file
-	const lastBraceIndex = content.lastIndexOf("}");
-	if (lastBraceIndex === -1) {
-		throw new Error("Invalid JSON: no closing brace found");
-	}
-
-	// Check what comes before the last brace to determine if we need a comma
-	const beforeBrace = content.slice(0, lastBraceIndex);
-	const needsComma = shouldAddCommaBefore(beforeBrace);
-
-	// Build the d1_databases section
-	const d1Section = `"d1_databases": [
-		${bindingJson}
-	]`;
-
-	// Find proper insertion point - look for last non-whitespace content
-	const trimmedBefore = beforeBrace.trimEnd();
-	const whitespaceAfterContent = beforeBrace.slice(trimmedBefore.length);
-
-	let insertion: string;
-	if (needsComma) {
-		insertion = `,\n\t${d1Section}`;
-	} else {
-		insertion = `\n\t${d1Section}`;
-	}
-
-	// Reconstruct: content before + insertion + newline + closing brace
-	return trimmedBefore + insertion + "\n" + content.slice(lastBraceIndex);
-}
-
-/**
- * Find the matching closing bracket/brace for an opening one
- */
-function findMatchingBracket(
-	content: string,
-	startIndex: number,
-	openChar: string,
-	closeChar: string,
-): number {
-	let depth = 0;
-	let inString = false;
-	let stringChar = "";
-	let escaped = false;
-	let inLineComment = false;
-	let inBlockComment = false;
-
-	for (let i = startIndex; i < content.length; i++) {
-		const char = content[i] ?? "";
-		const next = content[i + 1] ?? "";
-
-		// Handle line comments
-		if (inLineComment) {
-			if (char === "\n") {
-				inLineComment = false;
-			}
-			continue;
-		}
-
-		// Handle block comments
-		if (inBlockComment) {
-			if (char === "*" && next === "/") {
-				inBlockComment = false;
-				i++;
-			}
-			continue;
-		}
-
-		// Handle strings
-		if (inString) {
-			if (escaped) {
-				escaped = false;
-				continue;
-			}
-			if (char === "\\") {
-				escaped = true;
-				continue;
-			}
-			if (char === stringChar) {
-				inString = false;
-				stringChar = "";
-			}
-			continue;
-		}
-
-		// Check for comment start
-		if (char === "/" && next === "/") {
-			inLineComment = true;
-			i++;
-			continue;
-		}
-		if (char === "/" && next === "*") {
-			inBlockComment = true;
-			i++;
-			continue;
-		}
-
-		// Check for string start
-		if (char === '"' || char === "'") {
-			inString = true;
-			stringChar = char;
-			continue;
-		}
-
-		// Track bracket depth
-		if (char === openChar) {
-			depth++;
-		} else if (char === closeChar) {
-			depth--;
-			if (depth === 0) {
-				return i;
-			}
-		}
-	}
-
-	return -1;
-}
-
-/**
- * Check if content is only whitespace and comments
- */
-function isOnlyCommentsAndWhitespace(content: string): boolean {
-	let inLineComment = false;
-	let inBlockComment = false;
-
-	for (let i = 0; i < content.length; i++) {
-		const char = content[i] ?? "";
-		const next = content[i + 1] ?? "";
-
-		if (inLineComment) {
-			if (char === "\n") {
-				inLineComment = false;
-			}
-			continue;
-		}
-
-		if (inBlockComment) {
-			if (char === "*" && next === "/") {
-				inBlockComment = false;
-				i++;
-			}
-			continue;
-		}
-
-		if (char === "/" && next === "/") {
-			inLineComment = true;
-			i++;
-			continue;
-		}
-
-		if (char === "/" && next === "*") {
-			inBlockComment = true;
-			i++;
-			continue;
-		}
-
-		if (!/\s/.test(char)) {
-			return false;
-		}
-	}
-
-	return true;
-}
-
-/**
- * Find the last closing brace of an object within an array range
- */
-function findLastObjectEndInArray(content: string, startIndex: number, endIndex: number): number {
-	let lastBraceIndex = -1;
-	let inString = false;
-	let stringChar = "";
-	let escaped = false;
-	let inLineComment = false;
-	let inBlockComment = false;
-
-	for (let i = startIndex; i < endIndex; i++) {
-		const char = content[i] ?? "";
-		const next = content[i + 1] ?? "";
-
-		if (inLineComment) {
-			if (char === "\n") {
-				inLineComment = false;
-			}
-			continue;
-		}
-
-		if (inBlockComment) {
-			if (char === "*" && next === "/") {
-				inBlockComment = false;
-				i++;
-			}
-			continue;
-		}
-
-		if (inString) {
-			if (escaped) {
-				escaped = false;
-				continue;
-			}
-			if (char === "\\") {
-				escaped = true;
-				continue;
-			}
-			if (char === stringChar) {
-				inString = false;
-				stringChar = "";
-			}
-			continue;
-		}
-
-		if (char === "/" && next === "/") {
-			inLineComment = true;
-			i++;
-			continue;
-		}
-
-		if (char === "/" && next === "*") {
-			inBlockComment = true;
-			i++;
-			continue;
-		}
-
-		if (char === '"' || char === "'") {
-			inString = true;
-			stringChar = char;
-			continue;
-		}
-
-		if (char === "}") {
-			lastBraceIndex = i;
-		}
-	}
-
-	return lastBraceIndex;
-}
-
-/**
- * Determine if we need to add a comma before new content.
- * Looks at the last non-whitespace, non-comment character.
- */
-function shouldAddCommaBefore(content: string): boolean {
-	// Strip trailing comments and whitespace to find last meaningful char
-	let i = content.length - 1;
-	const inLineComment = false;
-
-	// First pass: find where any trailing line comment starts
-	for (let j = content.length - 1; j >= 0; j--) {
-		if (content[j] === "\n") {
-			// Check if there's a // comment on this line
-			const lineStart = content.lastIndexOf("\n", j - 1) + 1;
-			const line = content.slice(lineStart, j);
-			const commentIndex = findLineCommentStart(line);
-			if (commentIndex !== -1) {
-				i = lineStart + commentIndex - 1;
-			}
-			break;
-		}
-	}
-
-	// Skip whitespace
-	while (i >= 0 && /\s/.test(content[i] ?? "")) {
-		i--;
-	}
-
-	if (i < 0) return false;
-
-	const lastChar = content[i];
-	// Need comma if last char is }, ], ", number, or identifier char
-	// Don't need comma if last char is { or [ or ,
-	return lastChar !== "{" && lastChar !== "[" && lastChar !== ",";
-}
-
-/**
- * Find the start of a line comment (//) in a string, respecting strings
- */
-function findLineCommentStart(line: string): number {
-	let inString = false;
-	let stringChar = "";
-	let escaped = false;
-
-	for (let i = 0; i < line.length - 1; i++) {
-		const char = line[i] ?? "";
-		const next = line[i + 1] ?? "";
-
-		if (inString) {
-			if (escaped) {
-				escaped = false;
-				continue;
-			}
-			if (char === "\\") {
-				escaped = true;
-				continue;
-			}
-			if (char === stringChar) {
-				inString = false;
-				stringChar = "";
-			}
-			continue;
-		}
-
-		if (char === '"' || char === "'") {
-			inString = true;
-			stringChar = char;
-			continue;
-		}
-
-		if (char === "/" && next === "/") {
-			return i;
-		}
-	}
-
-	return -1;
+	return addSectionBeforeClosingBrace(content, `"d1_databases": [\n\t\t${bindingJson}\n\t]`);
 }
 
 /**

package/src/lib/zip-packager.ts

@@ -51,7 +51,17 @@ export interface ManifestData {
 			dimensions?: number;
 			metric?: string;
 		}>;
+		durable_objects?: Array<{
+			binding: string;
+			class_name: string;
+		}>;
 	};
+	migrations?: Array<{
+		tag: string;
+		new_sqlite_classes?: string[];
+		deleted_classes?: string[];
+		renamed_classes?: Array<{ from: string; to: string }>;
+	}>;
 }
 
 export type ZipProgressCallback = (current: number, total: number) => void;
@@ -238,6 +248,14 @@ function extractBindingsFromConfig(config?: WranglerConfig): ManifestData["bindi
 		}));
 	}
 
+	// Extract Durable Object bindings
+	if (config?.durable_objects?.bindings && config.durable_objects.bindings.length > 0) {
+		bindings.durable_objects = config.durable_objects.bindings.map((dob) => ({
+			binding: dob.name,
+			class_name: dob.class_name,
+		}));
+	}
+
 	// Return undefined if no bindings were extracted
 	return Object.keys(bindings).length > 0 ? bindings : undefined;
 }
@@ -305,6 +323,16 @@ export async function packageForDeploy(
 		bindings: extractBindingsFromConfig(config),
 	};
 
+	// Extract migrations (top-level, for DO support)
+	if (config?.migrations?.length) {
+		manifest.migrations = config.migrations.map((m) => ({
+			tag: m.tag,
+			new_sqlite_classes: m.new_sqlite_classes,
+			deleted_classes: m.deleted_classes,
+			renamed_classes: m.renamed_classes,
+		}));
+	}
+
 	await Bun.write(manifestPath, JSON.stringify(manifest, null, 2));
 
 	// 4. Check for optional files (schema.sql and .secrets.json)

package/src/mcp/test-utils.ts

@@ -156,3 +156,34 @@ export async function callMcpGetProjectStatus(
 
 	return parseMcpToolResult(response);
 }
+
+export async function callMcpGetProjectEnvironment(
+	client: Client,
+	args: { project_path?: string },
+): Promise<unknown> {
+	const response = await client.callTool({
+		name: "get_project_environment",
+		arguments: args,
+	});
+
+	return parseMcpToolResult(response);
+}
+
+export async function callMcpTestEndpoint(
+	client: Client,
+	args: {
+		project_path?: string;
+		path: string;
+		method?: string;
+		headers?: Record<string, string>;
+		body?: string;
+		include_logs?: boolean;
+	},
+): Promise<unknown> {
+	const response = await client.callTool({
+		name: "test_endpoint",
+		arguments: args,
+	});
+
+	return parseMcpToolResult(response);
+}