@getjack/jack 0.1.32 → 0.1.34

package/src/lib/managed-deploy.ts

@@ -7,7 +7,7 @@
 import { stat } from "node:fs/promises";
 import { validateBindings } from "./binding-validator.ts";
 import { buildProject, parseWranglerConfig } from "./build-helper.ts";
-import { createManagedProject, syncProjectTags, uploadSourceSnapshot } from "./control-plane.ts";
+import { createManagedProject, syncProjectTags } from "./control-plane.ts";
 import { debug } from "./debug.ts";
 import { uploadDeployment } from "./deploy-upload.ts";
 import { JackError, JackErrorCode } from "./errors.ts";
@@ -31,6 +31,7 @@ export interface ManagedCreateResult {
 export interface ManagedCreateOptions {
 	template?: string;
 	usePrebuilt?: boolean;
+	forkedFrom?: string;
 }
 
 /**
@@ -50,6 +51,7 @@ export async function createManagedProjectRemote(
 		const result = await createManagedProject(projectName, {
 			template: options?.template,
 			usePrebuilt: options?.usePrebuilt ?? true,
+			forkedFrom: options?.forkedFrom,
 		});
 
 		const runjackUrl = result.url || `https://${result.project.slug}.runjack.xyz`;
@@ -79,6 +81,7 @@ export interface ManagedCodeDeployOptions {
 	projectId: string;
 	projectPath: string;
 	reporter?: OperationReporter;
+	message?: string;
 }
 
 /**
@@ -88,7 +91,7 @@ export interface ManagedCodeDeployOptions {
  */
 export async function deployCodeToManagedProject(
 	options: ManagedCodeDeployOptions,
-): Promise<{ deploymentId: string; status: string }> {
+): Promise<{ deploymentId: string; status: string; errorMessage: string | null }> {
 	const { projectId, projectPath, reporter } = options;
 
 	// Track deploy start
@@ -161,6 +164,7 @@ export async function deployCodeToManagedProject(
 			secretsPath: pkg.secretsPath ?? undefined,
 			assetsZipPath: pkg.assetsZipPath ?? undefined,
 			assetManifest: pkg.assetManifest ?? undefined,
+			message: options.message,
 		});
 
 		uploadProgress.complete();
@@ -183,16 +187,13 @@ export async function deployCodeToManagedProject(
 			})
 			.catch(() => {});
 
-		// Upload source snapshot for forking (non-fatal, but must await before cleanup)
-		try {
-			await uploadSourceSnapshot(projectId, pkg.sourceZipPath);
-		} catch (err) {
-			debug("Source snapshot upload failed:", err instanceof Error ? err.message : String(err));
-		}
+		// Source snapshot for forking is now derived from deployment artifacts on the control plane.
+		// No separate upload needed — clone/fork reads from the latest live deployment's source.zip.
 
 		return {
 			deploymentId: result.id,
 			status: result.status,
+			errorMessage: result.error_message,
 		};
 	} catch (error) {
 		reporter?.stop();
@@ -218,10 +219,12 @@ export async function deployToManagedProject(
 	projectId: string,
 	projectPath: string,
 	reporter?: OperationReporter,
-): Promise<{ deploymentId: string; status: string }> {
+	message?: string,
+): Promise<{ deploymentId: string; status: string; errorMessage: string | null }> {
 	return deployCodeToManagedProject({
 		projectId,
 		projectPath,
 		reporter,
+		message,
 	});
 }

package/src/lib/project-link.ts

@@ -116,6 +116,12 @@ export async function linkProject(
 
 	// Auto-add .jack/ to .gitignore
 	await ensureGitignored(projectDir);
+
+	// Install Claude Code SessionStart hook to project-level .claude/settings.json
+	// Non-blocking, fire-and-forget — never delays project linking
+	import("./claude-hooks-installer.ts")
+		.then(({ installClaudeCodeHooks }) => installClaudeCodeHooks(projectDir))
+		.catch(() => {});
 }
 
 /**

package/src/lib/project-operations.ts

@@ -102,6 +102,7 @@ export interface DeployOptions {
 	managed?: boolean; // Force managed deploy mode
 	byo?: boolean; // Force BYO deploy mode
 	dryRun?: boolean; // Stop before actual deployment
+	message?: string; // Deploy message describing what changed
 }
 
 export interface DeployResult {
@@ -109,6 +110,9 @@ export interface DeployResult {
 	projectName: string;
 	deployOutput?: string;
 	deployMode: DeployMode; // The deploy mode used
+	deploymentId?: string;
+	deployStatus?: string;
+	errorMessage?: string | null;
 }
 
 export interface ProjectStatus {
@@ -126,6 +130,12 @@ export interface ProjectStatus {
 	missing: boolean;
 	backupFiles: number | null;
 	backupLastSync: string | null;
+	// Deploy tracking (managed projects only)
+	lastDeployAt: string | null;
+	deployCount: number;
+	lastDeployStatus: string | null;
+	lastDeploySource: string | null;
+	lastDeployMessage: string | null;
 }
 
 export interface StaleProject {
@@ -361,6 +371,7 @@ async function runParallelSetup(
 	options: {
 		template?: string;
 		usePrebuilt?: boolean;
+		forkedFrom?: string;
 		onRemoteReady?: (result: ManagedCreateResult) => void;
 	},
 ): Promise<{
@@ -391,6 +402,7 @@ async function runParallelSetup(
 	const remotePromise = createManagedProjectRemote(projectName, undefined, {
 		template: options.template || "hello",
 		usePrebuilt: options.usePrebuilt ?? true,
+		forkedFrom: options.forkedFrom,
 	}).then((result) => {
 		const duration = ((Date.now() - remoteStart) / 1000).toFixed(1);
 		debug(`Remote project created in ${duration}s (status: ${result.status})`);
@@ -785,19 +797,41 @@ export async function createProject(
 			? resolve(targetDirOption, name)
 			: join(getJackHome(), name);
 		if (existsSync(effectiveTargetDir)) {
+			const existingLink = await readProjectLink(effectiveTargetDir);
+			if (existingLink) {
+				throw new JackError(
+					JackErrorCode.VALIDATION_ERROR,
+					`'${name}' already exists`,
+					`cd ${effectiveTargetDir} && jack ship  to deploy it, or  rm -rf ${effectiveTargetDir}  to start fresh.`,
+				);
+			}
 			throw new JackError(
 				JackErrorCode.VALIDATION_ERROR,
-				`Folder exists at ${effectiveTargetDir}/`,
-				"Remove it first, or use 'jack ship' if it's a project.",
+				`Folder already exists at ${effectiveTargetDir}/`,
+				"Remove it or pick a different name.",
 			);
 		}
 	}
 
-	// Check if jack init was run (throws if not)
+	// Auto-initialize on first run (replaces "Run: jack init" error)
 	const { isInitialized } = await import("../commands/init.ts");
 	const initialized = await isInitialized();
 	if (!initialized) {
-		throw new JackError(JackErrorCode.VALIDATION_ERROR, "jack is not set up yet", "Run: jack init");
+		const { writeConfig, readConfig } = await import("./config.ts");
+		const existingConfig = await readConfig();
+		await writeConfig({
+			version: 1,
+			initialized: true,
+			initializedAt: existingConfig?.initializedAt || new Date().toISOString(),
+			...existingConfig,
+		});
+
+		// Best-effort MCP config install (non-blocking)
+		try {
+			const { installMcpConfigsToAllApps, saveMcpConfig } = await import("./mcp-config.ts");
+			await installMcpConfigsToAllApps();
+			await saveMcpConfig();
+		} catch {}
 	}
 
 	// Auth gate - check/prompt for authentication before any work
@@ -847,10 +881,18 @@ export async function createProject(
 
 	// Check directory doesn't exist (only needed for auto-generated names now)
 	if (!nameWasProvided && existsSync(targetDir)) {
+		const existingLink = await readProjectLink(targetDir);
+		if (existingLink) {
+			throw new JackError(
+				JackErrorCode.VALIDATION_ERROR,
+				`'${projectName}' already exists`,
+				`cd ${targetDir} && jack ship  to deploy it, or  rm -rf ${targetDir}  to start fresh.`,
+			);
+		}
 		throw new JackError(
 			JackErrorCode.VALIDATION_ERROR,
-			`Folder exists at ${targetDir}/`,
-			"Remove it first, or use 'jack ship' if it's a project.",
+			`Folder already exists at ${targetDir}/`,
+			"Remove it first or pick a different name.",
 		);
 	}
 
@@ -1019,8 +1061,8 @@ export async function createProject(
 		if (!hookResult.success) {
 			throw new JackError(
 				JackErrorCode.VALIDATION_ERROR,
-				"Project setup incomplete",
-				"Missing required configuration",
+				"Project setup cancelled",
+				`Run the same command again when you're ready — jack new ${projectName} -t ${resolvedTemplate}`,
 			);
 		}
 	}
@@ -1085,7 +1127,7 @@ export async function createProject(
 				placeholder: "paste value or press Esc to skip",
 			});
 
-			if (!isCancel(value) && value.trim()) {
+			if (!isCancel(value) && value && value.trim()) {
 				secretsToUse[optionalSecret.name] = value.trim();
 				// Save to global secrets for reuse
 				await saveSecrets([
@@ -1097,7 +1139,7 @@ export async function createProject(
 				]);
 				reporter.success(`Saved ${optionalSecret.name}`);
 			} else {
-				reporter.info(`Skipped ${optionalSecret.name}`);
+				reporter.info(`Skipped ${optionalSecret.name} — add it later with: jack secrets add ${optionalSecret.name}`);
 			}
 
 			reporter.start("Creating project...");
@@ -1199,9 +1241,11 @@ export async function createProject(
 			reporter.start("Setting up project...");
 
 			try {
+				const forkedFrom = templateOrigin.type !== "builtin" ? templateOrigin.name : undefined;
 				const result = await runParallelSetup(targetDir, projectName, {
 					template: resolvedTemplate || "hello",
 					usePrebuilt: templateOrigin.type === "builtin", // Only builtin templates have prebuilt bundles
+					forkedFrom,
 					onRemoteReady: (remote) => {
 						// Show URL immediately when prebuilt succeeds
 						reporter.stop();
@@ -1355,22 +1399,8 @@ export async function createProject(
 					reporter.success(`Deployed: ${workerUrl}`);
 				}
 
-				// Upload source snapshot for forking (prebuilt path needs this too)
-				try {
-					const { createSourceZip } = await import("./zip-packager.ts");
-					const { uploadSourceSnapshot } = await import("./control-plane.ts");
-					const { rm } = await import("node:fs/promises");
-
-					const sourceZipPath = await createSourceZip(targetDir);
-					await uploadSourceSnapshot(remoteResult.projectId, sourceZipPath);
-					await rm(sourceZipPath, { force: true });
-					debug("Source snapshot uploaded for prebuilt project");
-				} catch (err) {
-					debug(
-						"Source snapshot upload failed (prebuilt):",
-						err instanceof Error ? err.message : String(err),
-					);
-				}
+				// source.zip is now stored in deployment artifacts by the control plane
+				// during prebuilt deploy — no client-side upload needed
 			} else {
 				// Prebuilt not available - fall back to fresh build
 				if (remoteResult.prebuiltFailed) {
@@ -1688,11 +1718,10 @@ export async function deployProject(options: DeployOptions = {}): Promise<Deploy
 		deployMode = link?.deploy_mode ?? "byo";
 	}
 
-	// Ensure agent integration is set up (JACK.md, MCP config)
+	// Ensure agent integration is set up (MCP config)
 	// This is idempotent and runs silently
 	try {
 		await ensureAgentIntegration(projectPath, {
-			projectName,
 			silent: true,
 		});
 	} catch (err) {
@@ -1723,6 +1752,7 @@ export async function deployProject(options: DeployOptions = {}): Promise<Deploy
 
 	let workerUrl: string | null = null;
 	let deployOutput: string | undefined;
+	let managedDeployResult: { deploymentId: string; status: string; errorMessage: string | null } | undefined;
 
 	// Deploy based on mode
 	if (deployMode === "managed") {
@@ -1781,7 +1811,7 @@ export async function deployProject(options: DeployOptions = {}): Promise<Deploy
 		}
 
 		// deployToManagedProject now handles both template and code deploy
-		await deployToManagedProject(managedProjectId as string, projectPath, reporter);
+		managedDeployResult = await deployToManagedProject(managedProjectId as string, projectPath, reporter, options.message);
 
 		// Construct URL with username if available
 		workerUrl = link?.owner_username
@@ -1936,6 +1966,9 @@ export async function deployProject(options: DeployOptions = {}): Promise<Deploy
 		projectName,
 		deployOutput: workerUrl ? undefined : deployOutput,
 		deployMode,
+		deploymentId: managedDeployResult?.deploymentId,
+		deployStatus: managedDeployResult?.status,
+		errorMessage: managedDeployResult?.errorMessage,
 	};
 }
 
@@ -2025,11 +2058,35 @@ export async function getProjectStatus(
 		}
 	}
 
+	// Fetch real deployment data for managed projects
+	let lastDeployAt: string | null = null;
+	let deployCount = 0;
+	let lastDeployStatus: string | null = null;
+	let lastDeploySource: string | null = null;
+	let lastDeployMessage: string | null = null;
+
+	if (link?.deploy_mode === "managed") {
+		try {
+			const { fetchDeployments } = await import("./control-plane.ts");
+			const result = await fetchDeployments(link.project_id);
+			deployCount = result.total;
+			const latest = result.deployments[0];
+			if (latest) {
+				lastDeployAt = latest.created_at;
+				lastDeployStatus = latest.status;
+				lastDeploySource = latest.source;
+				lastDeployMessage = latest.message;
+			}
+		} catch {
+			// Silent fail — deploy tracking is supplementary
+		}
+	}
+
 	return {
 		name: projectName,
 		localPath,
 		workerUrl,
-		lastDeployed: link?.linked_at ?? null,
+		lastDeployed: lastDeployAt ?? link?.linked_at ?? null,
 		createdAt: link?.linked_at ?? null,
 		accountId: null, // No longer stored in registry
 		workerId: projectName,
@@ -2040,6 +2097,11 @@ export async function getProjectStatus(
 		missing: false,
 		backupFiles,
 		backupLastSync,
+		lastDeployAt,
+		deployCount,
+		lastDeployStatus,
+		lastDeploySource,
+		lastDeployMessage,
 	};
 }
 

package/src/lib/prompts.ts

@@ -68,7 +68,7 @@ async function promptAdditionalSecrets(): Promise<
 			message: "Enter secret name (or press enter to finish):",
 		});
 
-		if (isCancel(key) || !key.trim()) {
+		if (isCancel(key) || !key || !key.trim()) {
 			break;
 		}
 
@@ -76,7 +76,7 @@ async function promptAdditionalSecrets(): Promise<
 			message: `Enter value for ${key}:`,
 		});
 
-		if (isCancel(value)) {
+		if (isCancel(value) || !value) {
 			break;
 		}
 

package/src/lib/telemetry.ts

@@ -47,6 +47,8 @@ export const Events = {
 	// Token management events
 	TOKEN_CREATED: "token_created",
 	TOKEN_REVOKED: "token_revoked",
+	// Hook events
+	HOOK_SESSION_CONTEXT: "hook_session_context",
 } as const;
 
 type EventName = (typeof Events)[keyof typeof Events];

package/src/mcp/README.md

@@ -25,7 +25,7 @@ src/mcp/
 ### `tools/index.ts`
 - Centralized tool registration and dispatch
 - Implements 4 core tools:
-  - `create_project` - Create new Cloudflare Workers project
+  - `create_project` - Create new project (supports forking via template)
   - `deploy_project` - Deploy existing project
   - `get_project_status` - Get project status info
   - `list_projects` - List all projects with filters

package/src/mcp/resources/index.ts

@@ -74,30 +74,15 @@ export function registerResources(
 
 		if (uri === "agents://context") {
 			const projectPath = options.projectPath ?? process.cwd();
-			const jackPath = join(projectPath, "JACK.md");
 			const agentsPath = join(projectPath, "AGENTS.md");
 			const claudePath = join(projectPath, "CLAUDE.md");
 
 			const contents: string[] = [];
 
-			// Try to read JACK.md first (jack-specific context)
-			if (existsSync(jackPath)) {
-				try {
-					const jackContent = await Bun.file(jackPath).text();
-					contents.push("# JACK.md\n\n");
-					contents.push(jackContent);
-				} catch {
-					// Ignore read errors
-				}
-			}
-
 			// Try to read AGENTS.md
 			if (existsSync(agentsPath)) {
 				try {
 					const agentsContent = await Bun.file(agentsPath).text();
-					if (contents.length > 0) {
-						contents.push("\n\n---\n\n");
-					}
 					contents.push("# AGENTS.md\n\n");
 					contents.push(agentsContent);
 				} catch {
@@ -143,7 +128,7 @@ If connected, prefer \`mcp__jack__*\` tools over CLI:
 
 Full docs: https://docs.getjack.org/llms-full.txt
 
-Check for JACK.md in the project root for project-specific instructions.
+Check AGENTS.md in the project root for project-specific instructions.
 `;
 				return {
 					contents: [

package/src/mcp/server.ts

@@ -43,8 +43,31 @@ export async function createMcpServer(options: McpServerOptions = {}) {
 	return { server, debug };
 }
 
+/**
+ * Install runtime guards that prevent accidental stdout writes from corrupting
+ * the MCP JSON-RPC stdio transport. This catches console.log() and
+ * process.stdout.write() but NOT Bun.spawn({ stdout: "inherit" }) which writes
+ * directly to fd 1 — that case is handled by the `interactive` flag in hooks.
+ */
+function installStdoutGuards() {
+	// Redirect console.log to stderr so accidental calls don't corrupt the stream.
+	// We don't wrap process.stdout.write because the MCP SDK writes JSON-RPC
+	// messages through it — intercepting those risks breaking the protocol if
+	// messages are chunked or newlines are written separately.
+	console.log = (...args: unknown[]) => {
+		console.error(
+			"[jack-mcp] WARNING: console.log intercepted (would corrupt MCP protocol):",
+			...args,
+		);
+	};
+}
+
 export async function startMcpServer(options: McpServerOptions = {}) {
 	const { server, debug } = await createMcpServer(options);
+
+	// Install stdout guards BEFORE connecting transport to prevent corruption
+	installStdoutGuards();
+
 	const transport = new StdioServerTransport();
 
 	debug("Starting MCP server on stdio transport");