@getjack/jack 0.1.4 → 0.1.5

package/src/commands/unlink.ts

@@ -0,0 +1,30 @@
+/**
+ * jack unlink - Remove .jack/ directory from current project
+ *
+ * Removes the local project link but does NOT delete the project from cloud.
+ * You can re-link anytime with: jack link
+ */
+
+import { error, info, success } from "../lib/output.ts";
+import { unregisterPath } from "../lib/paths-index.ts";
+import { readProjectLink, unlinkProject } from "../lib/project-link.ts";
+
+export default async function unlink(): Promise<void> {
+	// Check if linked
+	const link = await readProjectLink(process.cwd());
+
+	if (!link) {
+		error("This directory is not linked");
+		info("Nothing to unlink");
+		process.exit(1);
+	}
+
+	// Remove from paths index
+	await unregisterPath(link.project_id, process.cwd());
+
+	// Remove .jack/ directory
+	await unlinkProject(process.cwd());
+
+	success("Project unlinked");
+	info("You can re-link with: jack link");
+}

package/src/index.ts

@@ -4,7 +4,7 @@ import pkg from "../package.json";
 import { enableDebug } from "./lib/debug.ts";
 import { isJackError } from "./lib/errors.ts";
 import { info, error as printError } from "./lib/output.ts";
-import { identify, shutdown, withTelemetry } from "./lib/telemetry.ts";
+import { getEnvironmentProps, identify, shutdown, withTelemetry } from "./lib/telemetry.ts";
 
 const cli = meow(
 	`
@@ -35,6 +35,11 @@ const cli = meow(
     logout              Sign out
     whoami              Show current user
 
+  Project Management
+    link [name]         Link directory to a project
+    unlink              Remove project link
+    tag                 Manage project tags
+
   Advanced
     agents              Manage AI agent configs
     secrets             Manage project secrets
@@ -105,6 +110,18 @@ const cli = meow(
 				type: "boolean",
 				default: false,
 			},
+			all: {
+				type: "boolean",
+				shortFlag: "a",
+				default: false,
+			},
+			status: {
+				type: "string",
+			},
+			json: {
+				type: "boolean",
+				default: false,
+			},
 			project: {
 				type: "string",
 				shortFlag: "p",
@@ -125,6 +142,10 @@ const cli = meow(
 				type: "boolean",
 				default: false,
 			},
+			tag: {
+				type: "string",
+				isMultiple: true,
+			},
 		},
 	},
 );
@@ -143,6 +164,7 @@ identify({
 	arch: process.arch,
 	node_version: process.version,
 	is_ci: !!process.env.CI,
+	...getEnvironmentProps(),
 });
 
 try {
@@ -200,6 +222,11 @@ try {
 			});
 			break;
 		}
+		case "tag": {
+			const { default: tag } = await import("./commands/tag.ts");
+			await withTelemetry("tag", tag)(args[0], args.slice(1));
+			break;
+		}
 		case "sync": {
 			const { default: sync } = await import("./commands/sync.ts");
 			await withTelemetry(
@@ -279,6 +306,14 @@ try {
 			if (cli.flags.local) lsArgs.push("--local");
 			if (cli.flags.deployed) lsArgs.push("--deployed");
 			if (cli.flags.cloud) lsArgs.push("--cloud");
+			if (cli.flags.all) lsArgs.push("--all");
+			if (cli.flags.json) lsArgs.push("--json");
+			if (cli.flags.status) lsArgs.push("--status", cli.flags.status);
+			if (cli.flags.tag) {
+				for (const t of cli.flags.tag) {
+					lsArgs.push("--tag", t);
+				}
+			}
 			await withTelemetry("projects", projects)("list", lsArgs);
 			break;
 		}
@@ -307,6 +342,16 @@ try {
 			await withTelemetry("feedback", feedback)();
 			break;
 		}
+		case "link": {
+			const { default: link } = await import("./commands/link.ts");
+			await withTelemetry("link", link)(args[0], { byo: cli.flags.byo });
+			break;
+		}
+		case "unlink": {
+			const { default: unlink } = await import("./commands/unlink.ts");
+			await withTelemetry("unlink", unlink)();
+			break;
+		}
 		default:
 			cli.showHelp(command ? 1 : 0);
 	}

package/src/lib/auth/index.ts

@@ -9,10 +9,12 @@ export {
 export { requireAuth, requireAuthOrLogin, getCurrentUser } from "./guard.ts";
 export {
 	deleteCredentials,
+	getAuthState,
 	getCredentials,
 	isLoggedIn,
 	isTokenExpired,
 	saveCredentials,
 	type AuthCredentials,
+	type AuthState,
 	type AuthUser,
 } from "./store.ts";

package/src/lib/auth/store.ts

@@ -42,9 +42,33 @@ export async function deleteCredentials(): Promise<void> {
 	}
 }
 
-export async function isLoggedIn(): Promise<boolean> {
+export type AuthState = "logged-in" | "not-logged-in" | "session-expired";
+
+/**
+ * Get detailed auth state
+ * - "logged-in": valid token (or successfully refreshed)
+ * - "not-logged-in": no credentials stored
+ * - "session-expired": had credentials but refresh failed
+ */
+export async function getAuthState(): Promise<AuthState> {
 	const creds = await getCredentials();
-	return creds !== null;
+	if (!creds) return "not-logged-in";
+
+	// If token is not expired, we're logged in
+	if (!isTokenExpired(creds)) return "logged-in";
+
+	// If expired, try to refresh (dynamic import to avoid circular dep)
+	try {
+		const { getValidAccessToken } = await import("./client.ts");
+		const token = await getValidAccessToken();
+		return token !== null ? "logged-in" : "session-expired";
+	} catch {
+		return "session-expired";
+	}
+}
+
+export async function isLoggedIn(): Promise<boolean> {
+	return (await getAuthState()) === "logged-in";
 }
 
 export function isTokenExpired(creds: AuthCredentials): boolean {

package/src/lib/binding-validator.ts

@@ -12,7 +12,7 @@ import type { WranglerConfig } from "./build-helper.ts";
 /**
  * Bindings supported by jack cloud managed deployments.
  */
-export const SUPPORTED_BINDINGS = ["d1_databases", "ai", "assets", "vars"] as const;
+export const SUPPORTED_BINDINGS = ["d1_databases", "ai", "assets", "vars", "r2_buckets"] as const;
 
 /**
  * Bindings not yet supported by jack cloud.
@@ -23,7 +23,6 @@ export const UNSUPPORTED_BINDINGS = [
 	"durable_objects",
 	"queues",
 	"services",
-	"r2_buckets",
 	"hyperdrive",
 	"vectorize",
 	"browser",
@@ -38,7 +37,6 @@ const BINDING_DISPLAY_NAMES: Record<string, string> = {
 	durable_objects: "Durable Objects",
 	queues: "Queues",
 	services: "Service Bindings",
-	r2_buckets: "R2 Buckets",
 	hyperdrive: "Hyperdrive",
 	vectorize: "Vectorize",
 	browser: "Browser Rendering",
@@ -68,16 +66,9 @@ export function validateBindings(
 		const value = config[binding as keyof WranglerConfig];
 		if (value !== undefined && value !== null) {
 			const displayName = BINDING_DISPLAY_NAMES[binding] || binding;
-			// Special message for R2 - suggest using Workers Assets instead
-			if (binding === "r2_buckets") {
-				errors.push(
-					`✗ R2 buckets not supported in managed deploy.\n  For static files, use Workers Assets instead (assets.directory in wrangler.jsonc).\n  Fix: Replace r2_buckets with assets config, or use 'wrangler deploy' for full control.`,
-				);
-			} else {
-				errors.push(
-					`✗ ${displayName} not supported in managed deploy.\n  Managed deploy supports: D1, AI, Assets, vars.\n  Fix: Remove ${binding} from wrangler.jsonc, or use 'wrangler deploy' for full control.`,
-				);
-			}
+			errors.push(
+				`✗ ${displayName} not supported in managed deploy.\n  Managed deploy supports: D1, AI, Assets, R2, vars.\n  Fix: Remove ${binding} from wrangler.jsonc, or use 'wrangler deploy' for full control.`,
+			);
 		}
 	}
 

package/src/lib/build-helper.ts

@@ -36,12 +36,15 @@ export interface WranglerConfig {
 		run_worker_first?: boolean;
 	};
 	vars?: Record<string, string>;
+	r2_buckets?: Array<{
+		binding: string;
+		bucket_name: string;
+	}>;
 	// Unsupported bindings (for validation)
 	kv_namespaces?: unknown;
 	durable_objects?: unknown;
 	queues?: unknown;
 	services?: unknown;
-	r2_buckets?: unknown;
 	hyperdrive?: unknown;
 	vectorize?: unknown;
 	browser?: unknown;
@@ -82,6 +85,18 @@ export async function needsViteBuild(projectPath: string): Promise<boolean> {
 	);
 }
 
+/**
+ * Checks if project requires OpenNext build by detecting open-next config files
+ * @param projectPath - Absolute path to project directory
+ * @returns true if open-next.config.ts or open-next.config.js exists
+ */
+export async function needsOpenNextBuild(projectPath: string): Promise<boolean> {
+	return (
+		existsSync(join(projectPath, "open-next.config.ts")) ||
+		existsSync(join(projectPath, "open-next.config.js"))
+	);
+}
+
 /**
  * Runs Vite build for the project
  * @param projectPath - Absolute path to project directory
@@ -105,6 +120,29 @@ export async function runViteBuild(projectPath: string): Promise<void> {
 	}
 }
 
+/**
+ * Runs OpenNext build for Next.js projects targeting Cloudflare
+ * @param projectPath - Absolute path to project directory
+ * @throws JackError if build fails
+ */
+export async function runOpenNextBuild(projectPath: string): Promise<void> {
+	// OpenNext builds Next.js for Cloudflare Workers
+	// Outputs to .open-next/worker.js and .open-next/assets/
+	const buildResult = await $`bunx opennextjs-cloudflare build`.cwd(projectPath).nothrow().quiet();
+
+	if (buildResult.exitCode !== 0) {
+		throw new JackError(
+			JackErrorCode.BUILD_FAILED,
+			"OpenNext build failed",
+			"Check your next.config and source files for errors",
+			{
+				exitCode: buildResult.exitCode,
+				stderr: buildResult.stderr.toString(),
+			},
+		);
+	}
+}
+
 /**
  * Builds a Cloudflare Worker project using wrangler dry-run
  * @param options - Build options with project path and optional reporter
@@ -117,13 +155,22 @@ export async function buildProject(options: BuildOptions): Promise<BuildOutput>
 	// Parse wrangler config first
 	const config = await parseWranglerConfig(projectPath);
 
-	// Check if Vite build is needed and run it
+	// Check if OpenNext build is needed (Next.js + Cloudflare)
+	const hasOpenNext = await needsOpenNextBuild(projectPath);
+	if (hasOpenNext) {
+		reporter?.start("Building...");
+		await runOpenNextBuild(projectPath);
+		reporter?.stop();
+		reporter?.success("Built");
+	}
+
+	// Check if Vite build is needed and run it (skip if OpenNext already built)
 	const hasVite = await needsViteBuild(projectPath);
-	if (hasVite) {
-		reporter?.start("Building with Vite...");
+	if (hasVite && !hasOpenNext) {
+		reporter?.start("Building...");
 		await runViteBuild(projectPath);
 		reporter?.stop();
-		reporter?.success("Built with Vite");
+		reporter?.success("Built");
 	}
 
 	// Create unique temp directory for build output
@@ -209,3 +256,44 @@ async function resolveEntrypoint(outDir: string, main?: string): Promise<string>
 		"Ensure wrangler outputs a single entry file (index.js or worker.js)",
 	);
 }
+
+/**
+ * Ensures R2 buckets exist for BYO deploy.
+ * Creates buckets via wrangler if they don't exist.
+ * @param projectPath - Absolute path to project directory
+ * @returns Array of bucket names that were created or already existed
+ */
+export async function ensureR2Buckets(projectPath: string): Promise<string[]> {
+	const config = await parseWranglerConfig(projectPath);
+
+	if (!config.r2_buckets || config.r2_buckets.length === 0) {
+		return [];
+	}
+
+	const results: string[] = [];
+
+	for (const bucket of config.r2_buckets) {
+		const bucketName = bucket.bucket_name;
+
+		// Try to create the bucket (wrangler handles "already exists" gracefully)
+		const result = await $`wrangler r2 bucket create ${bucketName}`
+			.cwd(projectPath)
+			.nothrow()
+			.quiet();
+
+		// Exit code 0 = created, non-zero with "already exists" = fine
+		const stderr = result.stderr.toString();
+		if (result.exitCode === 0 || stderr.includes("already exists")) {
+			results.push(bucketName);
+		} else {
+			throw new JackError(
+				JackErrorCode.RESOURCE_ERROR,
+				`Failed to create R2 bucket: ${bucketName}`,
+				"Check your Cloudflare account has R2 enabled",
+				{ stderr },
+			);
+		}
+	}
+
+	return results;
+}

package/src/lib/control-plane.ts

@@ -40,6 +40,7 @@ export interface CreateProjectResponse {
 	status?: "live" | "created";
 	url?: string;
 	prebuilt_failed?: boolean;
+	prebuilt_error?: string;
 }
 
 export interface SlugAvailabilityResponse {
@@ -164,6 +165,7 @@ export interface ManagedProject {
 	status: "active" | "error" | "deleted";
 	created_at: string;
 	updated_at: string;
+	tags?: string; // JSON string array from DB, e.g., '["backend", "api"]'
 }
 
 /**
@@ -293,3 +295,49 @@ export async function fetchProjectResources(projectId: string): Promise<ProjectR
 	const data = (await response.json()) as { resources: ProjectResource[] };
 	return data.resources;
 }
+
+/**
+ * Sync project tags to the control plane.
+ * Fire-and-forget: errors are logged but not thrown.
+ */
+export async function syncProjectTags(projectId: string, tags: string[]): Promise<void> {
+	const { authFetch } = await import("./auth/index.ts");
+	const { debug } = await import("./debug.ts");
+
+	try {
+		const response = await authFetch(`${getControlApiUrl()}/v1/projects/${projectId}/tags`, {
+			method: "PUT",
+			headers: { "Content-Type": "application/json" },
+			body: JSON.stringify({ tags }),
+		});
+
+		if (!response.ok) {
+			// Log but don't throw - tag sync is non-critical
+			debug(`Tag sync failed: ${response.status}`);
+		}
+	} catch (error) {
+		// Log but don't throw - tag sync is non-critical
+		debug(`Tag sync failed: ${error instanceof Error ? error.message : String(error)}`);
+	}
+}
+
+/**
+ * Fetch project tags from the control plane.
+ * Returns empty array on error.
+ */
+export async function fetchProjectTags(projectId: string): Promise<string[]> {
+	const { authFetch } = await import("./auth/index.ts");
+
+	try {
+		const response = await authFetch(`${getControlApiUrl()}/v1/projects/${projectId}/tags`);
+
+		if (!response.ok) {
+			return [];
+		}
+
+		const data = (await response.json()) as { tags: string[] };
+		return data.tags ?? [];
+	} catch {
+		return [];
+	}
+}

package/src/lib/deploy-mode.ts

@@ -4,7 +4,7 @@
 
 import { $ } from "bun";
 import { isLoggedIn } from "./auth/index.ts";
-import type { DeployMode } from "./registry.ts";
+import type { DeployMode } from "./project-link.ts";
 import { Events, track } from "./telemetry.ts";
 
 export interface ModeFlags {

package/src/lib/managed-deploy.ts

@@ -6,10 +6,11 @@
 
 import { validateBindings } from "./binding-validator.ts";
 import { buildProject, parseWranglerConfig } from "./build-helper.ts";
-import { createManagedProject } from "./control-plane.ts";
+import { createManagedProject, syncProjectTags } from "./control-plane.ts";
 import { uploadDeployment } from "./deploy-upload.ts";
 import { JackError, JackErrorCode } from "./errors.ts";
 import type { OperationReporter } from "./project-operations.ts";
+import { getProjectTags } from "./tags.ts";
 import { Events, track } from "./telemetry.ts";
 import { packageForDeploy } from "./zip-packager.ts";
 
@@ -138,6 +139,15 @@ export async function deployCodeToManagedProject(
 			duration_ms: Date.now() - startTime,
 		});
 
+		// Fire-and-forget tag sync (non-blocking)
+		getProjectTags(projectPath)
+			.then((tags) => {
+				if (tags.length > 0) {
+					void syncProjectTags(projectId, tags);
+				}
+			})
+			.catch(() => {});
+
 		return {
 			deploymentId: result.id,
 			status: result.status,

package/src/lib/managed-down.ts

@@ -8,25 +8,22 @@ import { join } from "node:path";
 import { deleteManagedProject, exportManagedDatabase } from "./control-plane.ts";
 import { promptSelect } from "./hooks.ts";
 import { error, info, item, output, success, warn } from "./output.ts";
-import type { Project } from "./registry.ts";
-import { updateProject } from "./registry.ts";
 
 export interface ManagedDownFlags {
 	force?: boolean;
 }
 
+export interface ManagedProjectInfo {
+	projectId: string;
+	runjackUrl: string | null;
+}
+
 export async function managedDown(
-	project: Project,
+	project: ManagedProjectInfo,
 	projectName: string,
 	flags: ManagedDownFlags = {},
 ): Promise<boolean> {
-	const remote = project.remote;
-	if (!remote?.project_id) {
-		throw new Error("Project is not linked to jack cloud");
-	}
-
-	const runjackUrl = remote.runjack_url;
-	const projectId = remote.project_id;
+	const { projectId, runjackUrl } = project;
 
 	// Force mode - quick deletion without prompts
 	if (flags.force) {
@@ -39,11 +36,6 @@ export async function managedDown(
 			await deleteManagedProject(projectId);
 			output.stop();
 
-			await updateProject(projectName, {
-				workerUrl: null,
-				lastDeployed: null,
-			});
-
 			console.error("");
 			success(`'${projectName}' undeployed`);
 			info("Database and backups were deleted");
@@ -142,11 +134,6 @@ export async function managedDown(
 			}
 		}
 
-		await updateProject(projectName, {
-			workerUrl: null,
-			lastDeployed: null,
-		});
-
 		console.error("");
 		success(`Project '${projectName}' undeployed`);
 		console.error("");