@getjack/jack 0.1.26 → 0.1.28

package/package.json

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

package/src/commands/logs.ts

@@ -1,14 +1,85 @@
 import { existsSync } from "node:fs";
 import { output } from "../lib/output.ts";
-import { getDeployMode } from "../lib/project-link.ts";
+import { getDeployMode, getProjectId } from "../lib/project-link.ts";
+import { authFetch } from "../lib/auth/index.ts";
+import { getControlApiUrl, startLogSession } from "../lib/control-plane.ts";
 
 // Lines containing these strings will be filtered out
 const FILTERED_PATTERNS = ["⛅️ wrangler"];
 
 const shouldFilter = (line: string) => FILTERED_PATTERNS.some((pattern) => line.includes(pattern));
 
-export default async function logs(): Promise<void> {
-	// Check for wrangler config
+export interface LogsOptions {
+	label?: string;
+}
+
+async function streamManagedLogs(projectId: string, label?: string): Promise<void> {
+	const session = await startLogSession(projectId, label);
+	const streamUrl = `${getControlApiUrl()}${session.stream.url}`;
+
+	output.info(`Log session active until ${session.session.expires_at}`);
+	output.info("Streaming logs (JSON). Press Ctrl+C to stop.\n");
+
+	const response = await authFetch(streamUrl, {
+		method: "GET",
+		headers: { Accept: "text/event-stream" },
+	});
+
+	if (!response.ok || !response.body) {
+		const err = (await response.json().catch(() => ({ message: "Failed to open log stream" }))) as {
+			message?: string;
+		};
+		throw new Error(err.message || `Failed to open log stream: ${response.status}`);
+	}
+
+	const reader = response.body.getReader();
+	const decoder = new TextDecoder();
+	let buffer = "";
+
+	while (true) {
+		const { done, value } = await reader.read();
+		if (done) break;
+
+		buffer += decoder.decode(value, { stream: true });
+		const lines = buffer.split("\n");
+		buffer = lines.pop() || "";
+
+		for (const line of lines) {
+			if (!line.startsWith("data:")) continue;
+			const data = line.slice(5).trim();
+			if (!data) continue;
+			try {
+				const parsed = JSON.parse(data) as { type?: string };
+				if (parsed.type === "heartbeat") continue;
+			} catch {
+				// If it's not JSON, pass through.
+			}
+			process.stdout.write(`${data}\n`);
+		}
+	}
+}
+
+export default async function logs(options: LogsOptions = {}): Promise<void> {
+	// Check if this is a managed project (read from .jack/project.json)
+	const deployMode = await getDeployMode(process.cwd());
+	if (deployMode === "managed") {
+		const projectId = await getProjectId(process.cwd());
+		if (!projectId) {
+			output.error("No .jack/project.json found");
+			output.info("Run this from a linked jack cloud project directory");
+			process.exit(1);
+		}
+
+		try {
+			await streamManagedLogs(projectId, options.label);
+			return;
+		} catch (err) {
+			output.error(err instanceof Error ? err.message : String(err));
+			process.exit(1);
+		}
+	}
+
+	// BYOC requires a wrangler config in the working directory.
 	const hasWranglerJson = existsSync("wrangler.jsonc") || existsSync("wrangler.json");
 	const hasWranglerToml = existsSync("wrangler.toml");
 
@@ -18,15 +89,6 @@ export default async function logs(): Promise<void> {
 		process.exit(1);
 	}
 
-	// Check if this is a managed project (read from .jack/project.json)
-	const deployMode = await getDeployMode(process.cwd());
-	if (deployMode === "managed") {
-		output.warn("Real-time logs not yet available for managed projects");
-		output.info("Logs are being collected - web UI coming soon");
-		output.info("Track progress: https://github.com/getjack-org/jack/issues/2");
-		return;
-	}
-
 	// BYOC project - use wrangler tail
 	output.info("Streaming logs from Cloudflare Worker...");
 	output.info("Press Ctrl+C to stop\n");

package/src/commands/services.ts

@@ -20,6 +20,10 @@ import {
 	getDatabaseInfo as getWranglerDatabaseInfo,
 } from "../lib/services/db.ts";
 import { getRiskDescription } from "../lib/services/sql-classifier.ts";
+import { createStorageBucket } from "../lib/services/storage-create.ts";
+import { deleteStorageBucket } from "../lib/services/storage-delete.ts";
+import { getStorageBucketInfo } from "../lib/services/storage-info.ts";
+import { listStorageBuckets } from "../lib/services/storage-list.ts";
 import { getProjectNameFromDir } from "../lib/storage/index.ts";
 import { Events, track } from "../lib/telemetry.ts";
 
@@ -105,9 +109,11 @@ export default async function services(
 	switch (subcommand) {
 		case "db":
 			return await dbCommand(args, options);
+		case "storage":
+			return await storageCommand(args, options);
 		default:
 			error(`Unknown service: ${subcommand}`);
-			info("Available: db");
+			info("Available: db, storage");
 			process.exit(1);
 	}
 }
@@ -118,6 +124,7 @@ function showHelp(): void {
 	console.error("");
 	console.error("Commands:");
 	console.error("  db         Manage database");
+	console.error("  storage    Manage storage (R2 buckets)");
 	console.error("");
 	console.error("Run 'jack services <command>' for more information.");
 	console.error("");
@@ -805,7 +812,7 @@ async function dbExecute(args: string[], _options: ServiceOptions): Promise<void
 				return;
 			}
 
-			// NOW execute with confirmation (interactive: false means "already confirmed")
+			// NOW execute with confirmation
 			outputSpinner.start("Executing SQL...");
 			if (execArgs.filePath) {
 				result = await executeSqlFile({
@@ -813,7 +820,8 @@ async function dbExecute(args: string[], _options: ServiceOptions): Promise<void
 					filePath: execArgs.filePath,
 					databaseName: execArgs.databaseName,
 					allowWrite: true,
-					interactive: false, // Already confirmed, execute now
+					interactive: true,
+					confirmed: true, // Already confirmed, skip re-prompting
 				});
 			} else {
 				result = await executeSql({
@@ -821,7 +829,8 @@ async function dbExecute(args: string[], _options: ServiceOptions): Promise<void
 					sql: execArgs.sql!,
 					databaseName: execArgs.databaseName,
 					allowWrite: true,
-					interactive: false, // Already confirmed, execute now
+					interactive: true,
+					confirmed: true, // Already confirmed, skip re-prompting
 				});
 			}
 		}
@@ -918,3 +927,245 @@ async function dbExecute(args: string[], _options: ServiceOptions): Promise<void
 		process.exit(1);
 	}
 }
+
+// ============================================================================
+// Storage (R2) Commands
+// ============================================================================
+
+function showStorageHelp(): void {
+	console.error("");
+	info("jack services storage - Manage storage buckets");
+	console.error("");
+	console.error("Actions:");
+	console.error("  info [name]    Show bucket information (default)");
+	console.error("  create         Create a new storage bucket");
+	console.error("  list           List all storage buckets in the project");
+	console.error("  delete <name>  Delete a storage bucket");
+	console.error("");
+	console.error("Examples:");
+	console.error(
+		"  jack services storage                         Show info about the default bucket",
+	);
+	console.error("  jack services storage create                  Create a new storage bucket");
+	console.error("  jack services storage list                    List all storage buckets");
+	console.error("  jack services storage delete my-bucket        Delete a bucket");
+	console.error("");
+}
+
+async function storageCommand(args: string[], options: ServiceOptions): Promise<void> {
+	const action = args[0] || "info"; // Default to info
+
+	switch (action) {
+		case "--help":
+		case "-h":
+		case "help":
+			return showStorageHelp();
+		case "info":
+			return await storageInfo(args.slice(1), options);
+		case "create":
+			return await storageCreate(args.slice(1), options);
+		case "list":
+			return await storageList(options);
+		case "delete":
+			return await storageDelete(args.slice(1), options);
+		default:
+			error(`Unknown action: ${action}`);
+			info("Available: info, create, list, delete");
+			process.exit(1);
+	}
+}
+
+/**
+ * Show storage bucket information
+ */
+async function storageInfo(args: string[], options: ServiceOptions): Promise<void> {
+	const bucketName = parseNameFlag(args);
+	const projectDir = process.cwd();
+
+	outputSpinner.start("Fetching storage info...");
+	try {
+		const bucketInfo = await getStorageBucketInfo(projectDir, bucketName);
+		outputSpinner.stop();
+
+		if (!bucketInfo) {
+			console.error("");
+			error(bucketName ? `Bucket "${bucketName}" not found` : "No storage buckets found for this project");
+			info("Create one with: jack services storage create");
+			console.error("");
+			return;
+		}
+
+		console.error("");
+		success(`Bucket: ${bucketInfo.name}`);
+		console.error("");
+		item(`Binding: ${bucketInfo.binding}`);
+		item(`Source: ${bucketInfo.source === "control-plane" ? "managed (jack cloud)" : "BYO (wrangler)"}`);
+		console.error("");
+	} catch (err) {
+		outputSpinner.stop();
+		console.error("");
+		error(`Failed to fetch storage info: ${err instanceof Error ? err.message : String(err)}`);
+		console.error("");
+		process.exit(1);
+	}
+}
+
+/**
+ * Create a new storage bucket
+ */
+async function storageCreate(args: string[], options: ServiceOptions): Promise<void> {
+	// Parse --name flag
+	const name = parseNameFlag(args);
+
+	outputSpinner.start("Creating storage bucket...");
+	try {
+		const result = await createStorageBucket(process.cwd(), {
+			name,
+			interactive: true,
+		});
+		outputSpinner.stop();
+
+		// Track telemetry
+		track(Events.SERVICE_CREATED, {
+			service_type: "r2",
+			binding_name: result.bindingName,
+			created: result.created,
+		});
+
+		console.error("");
+		if (result.created) {
+			success(`Storage bucket created: ${result.bucketName}`);
+		} else {
+			success(`Using existing bucket: ${result.bucketName}`);
+		}
+		console.error("");
+		item(`Binding: ${result.bindingName}`);
+
+		// Auto-deploy to activate the storage binding
+		console.error("");
+		outputSpinner.start("Deploying to activate storage binding...");
+		try {
+			const { deployProject } = await import("../lib/project-operations.ts");
+			await deployProject(process.cwd(), { interactive: true });
+			outputSpinner.stop();
+			console.error("");
+			success("Storage ready");
+			console.error("");
+		} catch (err) {
+			outputSpinner.stop();
+			console.error("");
+			warn("Deploy failed - run 'jack ship' to activate the binding");
+			console.error("");
+		}
+	} catch (err) {
+		outputSpinner.stop();
+		console.error("");
+		error(`Failed to create storage bucket: ${err instanceof Error ? err.message : String(err)}`);
+		process.exit(1);
+	}
+}
+
+/**
+ * List all storage buckets in the project
+ */
+async function storageList(options: ServiceOptions): Promise<void> {
+	outputSpinner.start("Fetching storage buckets...");
+	try {
+		const buckets = await listStorageBuckets(process.cwd());
+		outputSpinner.stop();
+
+		if (buckets.length === 0) {
+			console.error("");
+			info("No storage buckets found in this project.");
+			console.error("");
+			info("Create one with: jack services storage create");
+			console.error("");
+			return;
+		}
+
+		console.error("");
+		success(`Found ${buckets.length} storage bucket${buckets.length === 1 ? "" : "s"}:`);
+		console.error("");
+
+		for (const bucket of buckets) {
+			item(`${bucket.name} (${bucket.binding})`);
+		}
+		console.error("");
+	} catch (err) {
+		outputSpinner.stop();
+		console.error("");
+		error(`Failed to list storage buckets: ${err instanceof Error ? err.message : String(err)}`);
+		process.exit(1);
+	}
+}
+
+/**
+ * Delete a storage bucket
+ */
+async function storageDelete(args: string[], options: ServiceOptions): Promise<void> {
+	const bucketName = parseNameFlag(args);
+
+	if (!bucketName) {
+		console.error("");
+		error("Bucket name required");
+		info("Usage: jack services storage delete <bucket-name>");
+		console.error("");
+		process.exit(1);
+	}
+
+	const projectDir = process.cwd();
+
+	// Get bucket info first
+	outputSpinner.start("Fetching bucket info...");
+	const bucketInfo = await getStorageBucketInfo(projectDir, bucketName);
+	outputSpinner.stop();
+
+	if (!bucketInfo) {
+		console.error("");
+		error(`Bucket "${bucketName}" not found in this project`);
+		console.error("");
+		process.exit(1);
+	}
+
+	// Show what will be deleted
+	console.error("");
+	info(`Bucket: ${bucketInfo.name}`);
+	item(`Binding: ${bucketInfo.binding}`);
+	console.error("");
+	warn("This will permanently delete the bucket and all its contents");
+	console.error("");
+
+	// Confirm deletion
+	const { promptSelect } = await import("../lib/hooks.ts");
+	const choice = await promptSelect(["Yes, delete", "No, cancel"], `Delete bucket '${bucketName}'?`);
+
+	if (choice !== 0) {
+		info("Cancelled");
+		return;
+	}
+
+	outputSpinner.start("Deleting bucket...");
+
+	try {
+		const result = await deleteStorageBucket(projectDir, bucketName);
+		outputSpinner.stop();
+
+		// Track telemetry
+		track(Events.SERVICE_DELETED, {
+			service_type: "r2",
+			deleted: result.deleted,
+		});
+
+		console.error("");
+		success("Bucket deleted");
+		if (result.bindingRemoved) {
+			item("Binding removed from wrangler.jsonc");
+		}
+		console.error("");
+	} catch (err) {
+		outputSpinner.stop();
+		console.error("");
+		error(`Failed to delete bucket: ${err instanceof Error ? err.message : String(err)}`);
+		process.exit(1);
+	}
+}

package/src/index.ts

@@ -89,6 +89,9 @@ const cli = meow(
 			as: {
 				type: "string",
 			},
+			label: {
+				type: "string",
+			},
 			dash: {
 				type: "boolean",
 				default: false,
@@ -261,7 +264,7 @@ try {
 		case "logs":
 		case "tail": {
 			const { default: logs } = await import("./commands/logs.ts");
-			await withTelemetry("logs", logs)();
+			await withTelemetry("logs", logs)({ label: cli.flags.label });
 			break;
 		}
 		case "agents": {

package/src/lib/control-plane.ts

@@ -742,3 +742,42 @@ export async function downloadProjectSource(slug: string): Promise<Buffer> {
 
 	return Buffer.from(await response.arrayBuffer());
 }
+
+export interface LogSessionInfo {
+	id: string;
+	project_id: string;
+	label: string | null;
+	status: "active" | "expired" | "revoked" | string;
+	expires_at: string;
+}
+
+export interface StartLogSessionResponse {
+	success: boolean;
+	session: LogSessionInfo;
+	stream: { url: string; type: "sse" };
+}
+
+/**
+ * Start or renew a 1-hour log tailing session for a managed (jack cloud) project.
+ */
+export async function startLogSession(
+	projectId: string,
+	label?: string,
+): Promise<StartLogSessionResponse> {
+	const { authFetch } = await import("./auth/index.ts");
+
+	const response = await authFetch(`${getControlApiUrl()}/v1/projects/${projectId}/logs/session`, {
+		method: "POST",
+		headers: { "Content-Type": "application/json" },
+		body: JSON.stringify(label ? { label } : {}),
+	});
+
+	if (!response.ok) {
+		const err = (await response.json().catch(() => ({ message: "Unknown error" }))) as {
+			message?: string;
+		};
+		throw new Error(err.message || `Failed to start log session: ${response.status}`);
+	}
+
+	return response.json() as Promise<StartLogSessionResponse>;
+}

package/src/lib/hooks.ts

@@ -11,6 +11,10 @@ import { restoreTty } from "./tty";
  * User pastes JSON, then presses Enter on empty line to submit
  */
 async function readMultilineJson(prompt: string): Promise<string> {
+	// Ensure TTY is in a clean state before starting readline
+	// This prevents conflicts with previous @clack/prompts selections
+	restoreTty();
+
 	console.error(prompt);
 	console.error("(Paste JSON, then press Enter on empty line to submit)\n");
 

package/src/lib/services/db-execute.ts

@@ -34,6 +34,8 @@ export interface ExecuteSqlOptions {
 	allowWrite?: boolean;
 	/** Allow interactive confirmation for destructive ops. Default: true */
 	interactive?: boolean;
+	/** Skip destructive confirmation (already confirmed by CLI). Default: false */
+	confirmed?: boolean;
 	/** For MCP: wrap results with anti-injection header */
 	wrapResults?: boolean;
 }
@@ -328,6 +330,7 @@ export async function executeSql(options: ExecuteSqlOptions): Promise<ExecuteSql
 		databaseName,
 		allowWrite = false,
 		interactive = true,
+		confirmed = false,
 		wrapResults = false,
 	} = options;
 
@@ -350,7 +353,7 @@ export async function executeSql(options: ExecuteSqlOptions): Promise<ExecuteSql
 	}
 
 	// Check for destructive operations
-	if (highestRisk === "destructive") {
+	if (highestRisk === "destructive" && !confirmed) {
 		const destructiveStmt = statements.find((s) => s.risk === "destructive");
 		if (destructiveStmt) {
 			if (!interactive) {
@@ -476,7 +479,7 @@ export async function executeSql(options: ExecuteSqlOptions): Promise<ExecuteSql
 export async function executeSqlFile(
 	options: Omit<ExecuteSqlOptions, "sql"> & { filePath: string },
 ): Promise<ExecuteSqlResult> {
-	const { projectDir, filePath, databaseName, allowWrite = false, interactive = true } = options;
+	const { projectDir, filePath, databaseName, allowWrite = false, interactive = true, confirmed = false } = options;
 
 	// Read the file
 	if (!existsSync(filePath)) {
@@ -509,7 +512,7 @@ export async function executeSqlFile(
 	}
 
 	// Check for destructive operations
-	if (highestRisk === "destructive") {
+	if (highestRisk === "destructive" && !confirmed) {
 		const destructiveStmt = statements.find((s) => s.risk === "destructive");
 		if (destructiveStmt) {
 			if (!interactive) {