@getjack/jack 0.1.4 → 0.1.5

package/src/lib/telemetry.ts

@@ -1,30 +1,28 @@
-import { PostHog } from "posthog-node";
 import type { TelemetryConfig } from "./telemetry-config.ts";
 import { getTelemetryConfig, setTelemetryEnabled } from "./telemetry-config.ts";
 
+// Telemetry proxy endpoint (keeps PostHog API key secret)
+// Override with TELEMETRY_PROXY_URL for local testing
+const TELEMETRY_PROXY = process.env.TELEMETRY_PROXY_URL || "https://telemetry.getjack.org";
+
+// Session ID - unique per CLI invocation, groups related events
+const SESSION_ID = crypto.randomUUID();
+
 // ============================================
-// EVENT REGISTRY - Single source of truth
-// Add new events here, they become type-safe
+// EVENT REGISTRY
 // ============================================
 export const Events = {
-	// Automatic (via wrapper)
 	COMMAND_INVOKED: "command_invoked",
 	COMMAND_COMPLETED: "command_completed",
 	COMMAND_FAILED: "command_failed",
-
-	// Business events (for future use)
 	PROJECT_CREATED: "project_created",
 	DEPLOY_STARTED: "deploy_started",
 	CONFIG_CHANGED: "config_changed",
-
-	// Intent-driven creation events
 	INTENT_MATCHED: "intent_matched",
 	INTENT_NO_MATCH: "intent_no_match",
 	INTENT_CUSTOMIZATION_STARTED: "intent_customization_started",
 	INTENT_CUSTOMIZATION_COMPLETED: "intent_customization_completed",
 	INTENT_CUSTOMIZATION_FAILED: "intent_customization_failed",
-
-	// Deploy mode events
 	DEPLOY_MODE_SELECTED: "deploy_mode_selected",
 	MANAGED_PROJECT_CREATED: "managed_project_created",
 	MANAGED_DEPLOY_STARTED: "managed_deploy_started",
@@ -34,72 +32,59 @@ export const Events = {
 
 type EventName = (typeof Events)[keyof typeof Events];
 
-// Re-export config functions for convenience
 export { getTelemetryConfig, setTelemetryEnabled };
 
 // ============================================
-// CLIENT SETUP
+// STATE
 // ============================================
-let client: PostHog | null = null;
 let telemetryConfig: TelemetryConfig | null = null;
+let enabledCache: boolean | null = null;
+let userProps: Partial<UserProperties> = {};
+
+// ============================================
+// FIRE-AND-FORGET SEND (detached subprocess)
+// ============================================
+function send(url: string, data: object): void {
+	const payload = Buffer.from(JSON.stringify(data)).toString("base64");
+
+	// Spawn detached process that sends HTTP and exits
+	// Parent doesn't wait - child outlives parent
+	const proc = Bun.spawn(
+		[
+			"bun",
+			"-e",
+			`await fetch("${url}",{method:"POST",headers:{"Content-Type":"application/json"},body:Buffer.from("${payload}","base64").toString()}).catch(()=>{})`,
+		],
+		{
+			detached: true,
+			stdio: ["ignore", "ignore", "ignore"],
+		},
+	);
+	proc.unref();
+}
 
-/**
- * Check if telemetry is enabled based on environment and config
- * Priority order:
- * 1. DO_NOT_TRACK=1 -> disabled
- * 2. CI=true -> disabled
- * 3. JACK_TELEMETRY_DISABLED=1 -> disabled
- * 4. Config file enabled: false -> disabled
- * 5. Default -> enabled
- */
+// ============================================
+// HELPERS
+// ============================================
 async function isEnabled(): Promise<boolean> {
-	// Environment variable checks (highest priority)
-	if (process.env.DO_NOT_TRACK === "1") return false;
-	if (process.env.CI === "true") return false;
-	if (process.env.JACK_TELEMETRY_DISABLED === "1") return false;
+	if (enabledCache !== null) return enabledCache;
+
+	if (process.env.DO_NOT_TRACK === "1" || process.env.CI === "true" || process.env.JACK_TELEMETRY_DISABLED === "1") {
+		enabledCache = false;
+		return false;
+	}
 
-	// Check config file
 	try {
 		const config = await getTelemetryConfig();
 		telemetryConfig = config;
+		enabledCache = config.enabled;
 		return config.enabled;
 	} catch {
-		// If config loading fails, default to enabled
+		enabledCache = true;
 		return true;
 	}
 }
 
-/**
- * Get or initialize PostHog client
- * Returns null if telemetry is disabled or API key is missing
- */
-async function getClient(): Promise<PostHog | null> {
-	const enabled = await isEnabled();
-	if (!enabled) return null;
-
-	// Lazy initialization
-	if (!client) {
-		const apiKey = process.env.POSTHOG_API_KEY;
-		if (!apiKey) return null;
-
-		try {
-			client = new PostHog(apiKey, {
-				host: "https://us.i.posthog.com",
-				flushAt: 1, // Flush immediately (CLI is short-lived)
-				flushInterval: 0, // No delay
-			});
-		} catch {
-			// Silent failure - never block execution
-			return null;
-		}
-	}
-
-	return client;
-}
-
-/**
- * Get anonymous ID from config
- */
 async function getAnonymousId(): Promise<string> {
 	if (!telemetryConfig) {
 		telemetryConfig = await getTelemetryConfig();
@@ -108,7 +93,7 @@ async function getAnonymousId(): Promise<string> {
 }
 
 // ============================================
-// USER PROPERTIES - Set once, sent with all events
+// USER PROPERTIES
 // ============================================
 export interface UserProperties {
 	jack_version: string;
@@ -116,71 +101,71 @@ export interface UserProperties {
 	arch: string;
 	node_version: string;
 	is_ci: boolean;
+	shell?: string;
+	terminal?: string;
+	terminal_width?: number;
+	is_tty?: boolean;
+	locale?: string;
 	config_style?: "byoc" | "jack-cloud";
 }
 
-let userProps: Partial<UserProperties> = {};
+// Detect environment properties
+export function getEnvironmentProps(): Pick<UserProperties, "shell" | "terminal" | "terminal_width" | "is_tty" | "locale"> {
+	return {
+		shell: process.env.SHELL?.split("/").pop(), // e.g., /bin/zsh -> zsh
+		terminal: process.env.TERM_PROGRAM, // e.g., iTerm.app, vscode, Apple_Terminal
+		terminal_width: process.stdout.columns,
+		is_tty: process.stdout.isTTY ?? false,
+		locale: Intl.DateTimeFormat().resolvedOptions().locale,
+	};
+}
 
-/**
- * Set user properties (sent with all events)
- * Safe to call multiple times - properties are merged
- */
 export async function identify(properties: Partial<UserProperties>): Promise<void> {
 	userProps = { ...userProps, ...properties };
-
-	const ph = await getClient();
-	if (!ph) return;
+	if (!(await isEnabled())) return;
 
 	try {
 		const distinctId = await getAnonymousId();
-		ph.identify({
+		send(`${TELEMETRY_PROXY}/identify`, {
 			distinctId,
 			properties: userProps,
+			setOnce: { first_seen: new Date().toISOString() }, // Only sets on first identify
 		});
 	} catch {
-		// Silent failure - never block execution
+		// Silent
 	}
 }
 
 // ============================================
-// TRACK - Fire-and-forget event tracking
+// TRACK
 // ============================================
-/**
- * Track an event with optional properties
- * This is fire-and-forget and will never throw or block
- */
 export async function track(event: EventName, properties?: Record<string, unknown>): Promise<void> {
-	const ph = await getClient();
-	if (!ph) return;
+	if (!(await isEnabled())) return;
 
 	try {
 		const distinctId = await getAnonymousId();
-		ph.capture({
+		send(`${TELEMETRY_PROXY}/t`, {
 			distinctId,
 			event,
 			properties: {
 				...properties,
 				...userProps,
-				timestamp: Date.now(),
+				$session_id: SESSION_ID, // Groups events from same CLI invocation
 			},
+			timestamp: Date.now(),
 		});
 	} catch {
-		// Silent failure - never block execution
+		// Silent
 	}
 }
 
 // ============================================
-// THE MAGIC: withTelemetry() wrapper
-// Commands wrapped with this get automatic tracking
+// WRAPPER
 // ============================================
 export interface TelemetryOptions {
 	platform?: "cli" | "mcp";
 }
 
-/**
- * Wrap a command function with automatic telemetry tracking
- * Tracks command_invoked, command_completed, and command_failed events
- */
 // biome-ignore lint/suspicious/noExplicitAny: Required for flexible command wrapping
 export function withTelemetry<T extends (...args: any[]) => Promise<any>>(
 	commandName: string,
@@ -190,109 +175,37 @@ export function withTelemetry<T extends (...args: any[]) => Promise<any>>(
 	const platform = options?.platform ?? "cli";
 
 	return (async (...args: Parameters<T>) => {
-		// Fire-and-forget: don't await track() to avoid blocking command execution
 		track(Events.COMMAND_INVOKED, { command: commandName, platform });
 		const start = Date.now();
 
 		try {
 			const result = await fn(...args);
-			track(Events.COMMAND_COMPLETED, {
-				command: commandName,
-				platform,
-				duration_ms: Date.now() - start,
-			});
+			track(Events.COMMAND_COMPLETED, { command: commandName, platform, duration_ms: Date.now() - start });
 			return result;
 		} catch (error) {
-			track(Events.COMMAND_FAILED, {
-				command: commandName,
-				platform,
-				error_type: classifyError(error),
-				duration_ms: Date.now() - start,
-			});
+			track(Events.COMMAND_FAILED, { command: commandName, platform, error_type: classifyError(error), duration_ms: Date.now() - start });
 			throw error;
 		}
 	}) as T;
 }
 
 // ============================================
-// SHUTDOWN - Call before process exit
+// SHUTDOWN - No-op (detached processes handle themselves)
 // ============================================
-/**
- * Gracefully shutdown telemetry client
- * Times out after 500ms to never block CLI exit
- */
 export async function shutdown(): Promise<void> {
-	if (!client) return;
-
-	try {
-		await Promise.race([
-			client.shutdown(),
-			new Promise((_, reject) =>
-				setTimeout(() => reject(new Error("Telemetry shutdown timeout")), 500),
-			),
-		]);
-	} catch {
-		// Silent failure - never block exit
-	}
+	// No-op - detached subprocesses send telemetry independently
 }
 
 // ============================================
 // ERROR CLASSIFICATION
 // ============================================
-/**
- * Classify error into broad categories for analytics
- * Returns: 'validation' | 'network' | 'build' | 'deploy' | 'config' | 'unknown'
- */
 function classifyError(error: unknown): string {
-	const msg = (error as Error)?.message || "";
-	const errorStr = String(error).toLowerCase();
-	const combined = `${msg} ${errorStr}`.toLowerCase();
-
-	// Check for validation errors
-	if (
-		combined.includes("validation") ||
-		combined.includes("invalid") ||
-		combined.includes("required") ||
-		combined.includes("missing")
-	) {
-		return "validation";
-	}
-
-	// Check for network errors
-	if (
-		combined.includes("enotfound") ||
-		combined.includes("etimedout") ||
-		combined.includes("econnrefused") ||
-		combined.includes("network") ||
-		combined.includes("fetch")
-	) {
-		return "network";
-	}
-
-	// Check for build errors
-	if (
-		combined.includes("vite") ||
-		combined.includes("build") ||
-		combined.includes("compile") ||
-		combined.includes("bundle")
-	) {
-		return "build";
-	}
-
-	// Check for deploy errors
-	if (combined.includes("deploy") || combined.includes("publish") || combined.includes("upload")) {
-		return "deploy";
-	}
-
-	// Check for config errors
-	if (
-		combined.includes("wrangler") ||
-		combined.includes("config") ||
-		combined.includes("toml") ||
-		combined.includes("json")
-	) {
-		return "config";
-	}
+	const combined = `${(error as Error)?.message || ""} ${String(error)}`.toLowerCase();
 
+	if (/validation|invalid|required|missing/.test(combined)) return "validation";
+	if (/enotfound|etimedout|econnrefused|network|fetch/.test(combined)) return "network";
+	if (/vite|build|compile|bundle/.test(combined)) return "build";
+	if (/deploy|publish|upload/.test(combined)) return "deploy";
+	if (/wrangler|config|toml|json/.test(combined)) return "config";
 	return "unknown";
 }

package/src/lib/zip-packager.ts

@@ -41,6 +41,7 @@ export interface ManifestData {
 				| "none";
 		};
 		vars?: Record<string, string>;
+		r2?: Array<{ binding: string; bucket_name: string }>;
 	};
 }
 
@@ -160,6 +161,14 @@ function extractBindingsFromConfig(config?: WranglerConfig): ManifestData["bindi
 		bindings.vars = config.vars;
 	}
 
+	// Extract R2 bucket bindings (support multiple)
+	if (config.r2_buckets && config.r2_buckets.length > 0) {
+		bindings.r2 = config.r2_buckets.map((bucket) => ({
+			binding: bucket.binding,
+			bucket_name: bucket.bucket_name,
+		}));
+	}
+
 	// Return undefined if no bindings were extracted
 	return Object.keys(bindings).length > 0 ? bindings : undefined;
 }

package/src/templates/index.ts

@@ -2,13 +2,13 @@ import { existsSync } from "node:fs";
 import { readFile, readdir } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import { parseJsonc } from "../lib/jsonc.ts";
-import type { TemplateOrigin } from "../lib/registry.ts";
+import type { TemplateMetadata as TemplateOrigin } from "../lib/project-link.ts";
 import type { Template } from "./types";
 
 // Resolve templates directory relative to this file (src/templates -> templates)
 const TEMPLATES_DIR = join(dirname(dirname(import.meta.dir)), "templates");
 
-export const BUILTIN_TEMPLATES = ["hello", "miniapp", "api"];
+export const BUILTIN_TEMPLATES = ["hello", "miniapp", "api", "nextjs"];
 
 /**
  * Resolved template with origin tracking for lineage
@@ -28,6 +28,7 @@ async function readTemplateFiles(dir: string, base = ""): Promise<Record<string,
 	// Skip these directories/files (but keep bun.lock for faster installs)
 	const SKIP = [
 		".jack.json",
+		".jack", // Skip .jack directory (template.json is for origin tracking, not project files)
 		"node_modules",
 		".git",
 		"package-lock.json",
@@ -149,9 +150,10 @@ export async function resolveTemplateWithOrigin(
 export function renderTemplate(template: Template, vars: { name: string }): Template {
 	const rendered: Record<string, string> = {};
 	for (const [path, content] of Object.entries(template.files)) {
-		// Replace -db variant first to avoid partial matches
+		// Replace suffixed variants first to avoid partial matches
 		rendered[path] = content
 			.replace(/jack-template-db/g, `${vars.name}-db`)
+			.replace(/jack-template-cache/g, `${vars.name}-cache`)
 			.replace(/jack-template/g, vars.name);
 	}
 	return { ...template, files: rendered };

package/templates/api/.jack/template.json

@@ -0,0 +1,4 @@
+{
+	"type": "builtin",
+	"name": "api"
+}

package/templates/hello/.jack/template.json

@@ -0,0 +1,4 @@
+{
+	"type": "builtin",
+	"name": "hello"
+}

package/templates/miniapp/.jack/template.json

@@ -0,0 +1,4 @@
+{
+	"type": "builtin",
+	"name": "miniapp"
+}

package/templates/nextjs/.jack.json

@@ -0,0 +1,28 @@
+{
+  "name": "nextjs",
+  "description": "Next.js App (SSR on Cloudflare)",
+  "secrets": [],
+  "capabilities": [],
+  "intent": {
+    "keywords": ["next", "nextjs", "react", "ssr", "full-stack", "server components", "rsc"],
+    "examples": ["next.js app", "server-rendered react", "react ssr"]
+  },
+  "agentContext": {
+    "summary": "A Next.js app deployed with jack. Supports SSR, SSG, and React Server Components.",
+    "full_text": "## Project Structure\n\n- `app/` - Next.js App Router pages and layouts\n- `public/` - Static assets\n- `open-next.config.ts` - OpenNext configuration\n- `wrangler.jsonc` - Worker configuration\n\n## Commands\n\n- `bun run dev` - Local development\n- `jack ship` - Deploy to production\n- `bun run preview` - Preview production build locally\n\n## Conventions\n\n- Uses App Router (not Pages Router)\n- SSR and SSG work out of the box\n- Server Components supported\n\n## Resources\n\n- [OpenNext Docs](https://opennext.js.org/cloudflare)\n- [Next.js App Router](https://nextjs.org/docs/app)"
+  },
+  "hooks": {
+    "postDeploy": [
+      {
+        "action": "clipboard",
+        "text": "{{url}}",
+        "message": "Deploy URL copied to clipboard"
+      },
+      {
+        "action": "box",
+        "title": "Deployed: {{name}}",
+        "lines": ["URL: {{url}}", "", "Next.js app is live!"]
+      }
+    ]
+  }
+}

package/templates/nextjs/app/globals.css

@@ -0,0 +1,9 @@
+* {
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+}
+
+body {
+  font-family: system-ui, -apple-system, sans-serif;
+}

package/templates/nextjs/app/isr-test/page.tsx

@@ -0,0 +1,22 @@
+// ISR Test Page - regenerates every 10 seconds
+// After first request, page is cached in R2
+// Subsequent requests serve cached version while revalidating in background
+
+export const revalidate = 10; // seconds
+
+export default async function ISRTestPage() {
+  const timestamp = new Date().toISOString();
+
+  return (
+    <main style={{ padding: '2rem', fontFamily: 'system-ui' }}>
+      <h1>ISR Test</h1>
+      <p>Generated at: <strong>{timestamp}</strong></p>
+      <p style={{ color: '#888', marginTop: '1rem' }}>
+        Refresh the page - timestamp updates every ~10 seconds (cached in R2)
+      </p>
+      <p style={{ marginTop: '2rem' }}>
+        <a href="/" style={{ color: '#0070f3' }}>← Back home</a>
+      </p>
+    </main>
+  );
+}

package/templates/nextjs/app/layout.tsx

@@ -0,0 +1,19 @@
+import type { Metadata } from 'next';
+import './globals.css';
+
+export const metadata: Metadata = {
+  title: 'jack-template',
+  description: 'Next.js app built with jack',
+};
+
+export default function RootLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  );
+}

package/templates/nextjs/app/page.tsx

@@ -0,0 +1,8 @@
+export default function Home() {
+  return (
+    <main style={{ padding: '2rem', fontFamily: 'system-ui' }}>
+      <h1>jack-template</h1>
+      <p>Ship it with <code>jack ship</code></p>
+    </main>
+  );
+}