@getjack/jack 0.1.5 → 0.1.7

package/src/templates/index.ts

@@ -1,6 +1,8 @@
 import { existsSync } from "node:fs";
 import { readFile, readdir } from "node:fs/promises";
 import { dirname, join } from "node:path";
+import { unzipSync } from "fflate";
+import { getControlApiUrl } from "../lib/control-plane.ts";
 import { parseJsonc } from "../lib/jsonc.ts";
 import type { TemplateMetadata as TemplateOrigin } from "../lib/project-link.ts";
 import type { Template } from "./types";
@@ -97,8 +99,118 @@ async function loadTemplate(name: string): Promise<Template> {
 	};
 }
 
+// Internal files that should be excluded from templates
+const INTERNAL_FILES = [".jack.json", ".jack/template.json"];
+
+/**
+ * Extract zip buffer to file map, excluding internal files
+ */
+function extractZipToFiles(zipData: ArrayBuffer): Record<string, string> {
+	const files: Record<string, string> = {};
+	const unzipped = unzipSync(new Uint8Array(zipData));
+
+	for (const [path, content] of Object.entries(unzipped)) {
+		// Skip directories (they have zero-length content or end with /)
+		if (content.length === 0 || path.endsWith("/")) continue;
+
+		// Skip internal files
+		if (path && !INTERNAL_FILES.includes(path)) {
+			files[path] = new TextDecoder().decode(content);
+		}
+	}
+
+	return files;
+}
+
+/**
+ * Read metadata from extracted files (before they're filtered)
+ */
+function extractMetadataFromZip(zipData: ArrayBuffer): Record<string, unknown> {
+	const unzipped = unzipSync(new Uint8Array(zipData));
+
+	for (const [path, content] of Object.entries(unzipped)) {
+		// Skip directories
+		if (content.length === 0 || path.endsWith("/")) continue;
+
+		if (path === ".jack.json") {
+			return parseJsonc(new TextDecoder().decode(content));
+		}
+	}
+
+	return {};
+}
+
+/**
+ * Fetch a published template from jack cloud (public endpoint, no auth)
+ */
+async function fetchPublishedTemplate(username: string, slug: string): Promise<Template> {
+	const response = await fetch(
+		`${getControlApiUrl()}/v1/projects/${encodeURIComponent(username)}/${encodeURIComponent(slug)}/source`,
+	);
+
+	if (!response.ok) {
+		if (response.status === 404) {
+			throw new Error(
+				`Template not found: ${username}/${slug}\n\nMake sure the project exists and is published with: jack publish`,
+			);
+		}
+		throw new Error(`Failed to fetch template: ${response.status}`);
+	}
+
+	const zipData = await response.arrayBuffer();
+	const metadata = extractMetadataFromZip(zipData);
+	const files = extractZipToFiles(zipData);
+
+	return {
+		description: (metadata.description as string) || `Fork of ${username}/${slug}`,
+		secrets: (metadata.secrets as string[]) || [],
+		optionalSecrets: metadata.optionalSecrets as Template["optionalSecrets"],
+		capabilities: metadata.capabilities as Template["capabilities"],
+		requires: metadata.requires as Template["requires"],
+		hooks: metadata.hooks as Template["hooks"],
+		agentContext: metadata.agentContext as Template["agentContext"],
+		intent: metadata.intent as Template["intent"],
+		files,
+	};
+}
+
+/**
+ * Fetch user's own project as a template (authenticated)
+ */
+async function fetchUserTemplate(slug: string): Promise<Template | null> {
+	const { authFetch } = await import("../lib/auth/index.ts");
+
+	const response = await authFetch(
+		`${getControlApiUrl()}/v1/me/projects/${encodeURIComponent(slug)}/source`,
+	);
+
+	if (response.status === 404) {
+		return null; // Not found, will try other sources
+	}
+
+	if (!response.ok) {
+		throw new Error(`Failed to fetch your project: ${response.status}`);
+	}
+
+	const zipData = await response.arrayBuffer();
+	const metadata = extractMetadataFromZip(zipData);
+	const files = extractZipToFiles(zipData);
+
+	return {
+		description: (metadata.description as string) || `Your project: ${slug}`,
+		secrets: (metadata.secrets as string[]) || [],
+		optionalSecrets: metadata.optionalSecrets as Template["optionalSecrets"],
+		capabilities: metadata.capabilities as Template["capabilities"],
+		requires: metadata.requires as Template["requires"],
+		hooks: metadata.hooks as Template["hooks"],
+		agentContext: metadata.agentContext as Template["agentContext"],
+		intent: metadata.intent as Template["intent"],
+		files,
+	};
+}
+
 /**
- * Resolve template by name or GitHub URL
+ * Resolve template by name
  */
 export async function resolveTemplate(template?: string): Promise<Template> {
 	// No template → hello (omakase default)
@@ -111,14 +223,26 @@ export async function resolveTemplate(template?: string): Promise<Template> {
 		return loadTemplate(template);
 	}
 
-	// GitHub: user/repo or full URL → fetch from network
+	// username/slug format - fetch from jack cloud
 	if (template.includes("/")) {
-		const { fetchFromGitHub } = await import("../lib/github");
-		return fetchFromGitHub(template);
+		const [username, slug] = template.split("/", 2);
+		return fetchPublishedTemplate(username, slug);
+	}
+
+	// Try as user's own project first
+	try {
+		const userTemplate = await fetchUserTemplate(template);
+		if (userTemplate) {
+			return userTemplate;
+		}
+	} catch (_err) {
+		// If auth fails or project not found, fall through to error
 	}
 
 	// Unknown template
-	throw new Error(`Unknown template: ${template}\n\nAvailable: ${BUILTIN_TEMPLATES.join(", ")}`);
+	throw new Error(
+		`Unknown template: ${template}\n\nAvailable built-in templates: ${BUILTIN_TEMPLATES.join(", ")}\nOr use username/slug format for published projects`,
+	);
 }
 
 /**
@@ -131,9 +255,15 @@ export async function resolveTemplateWithOrigin(
 	const templateName = templateOption || "hello";
 
 	// Determine origin type
-	const isGitHub = templateName.includes("/");
+	let originType: "builtin" | "user" | "published" = "builtin";
+	if (templateOption?.includes("/")) {
+		originType = "published";
+	} else if (templateOption && !BUILTIN_TEMPLATES.includes(templateOption)) {
+		originType = "user";
+	}
+
 	const origin: TemplateOrigin = {
-		type: isGitHub ? "github" : "builtin",
+		type: originType,
 		name: templateName,
 	};
 

package/templates/nextjs/.jack.json

@@ -1,28 +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!"]
-      }
-    ]
-  }
+	"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

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

package/templates/nextjs/app/layout.tsx

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

package/templates/nextjs/app/page.tsx

@@ -1,8 +1,10 @@
 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>
-  );
+	return (
+		<main style={{ padding: "2rem", fontFamily: "system-ui" }}>
+			<h1>jack-template</h1>
+			<p>
+				Ship it with <code>jack ship</code>
+			</p>
+		</main>
+	);
 }

package/templates/nextjs/cloudflare-env.d.ts

@@ -1,3 +1,3 @@
 interface CloudflareEnv {
-  ASSETS: Fetcher;
+	ASSETS: Fetcher;
 }

package/templates/nextjs/next.config.ts

@@ -1,5 +1,5 @@
-import type { NextConfig } from "next";
 import { initOpenNextCloudflareForDev } from "@opennextjs/cloudflare";
+import type { NextConfig } from "next";
 
 initOpenNextCloudflareForDev();
 

package/templates/nextjs/open-next.config.ts

@@ -2,5 +2,5 @@ import { defineCloudflareConfig } from "@opennextjs/cloudflare";
 import r2IncrementalCache from "@opennextjs/cloudflare/overrides/incremental-cache/r2-incremental-cache";
 
 export default defineCloudflareConfig({
-  incrementalCache: r2IncrementalCache,
+	incrementalCache: r2IncrementalCache,
 });

package/templates/nextjs/package.json

@@ -1,24 +1,24 @@
 {
-  "name": "jack-template",
-  "type": "module",
-  "private": true,
-  "scripts": {
-    "dev": "next dev",
-    "build": "next build",
-    "preview": "opennextjs-cloudflare build && opennextjs-cloudflare preview",
-    "deploy": "opennextjs-cloudflare build && opennextjs-cloudflare deploy",
-    "cf-typegen": "wrangler types --env-interface CloudflareEnv cloudflare-env.d.ts"
-  },
-  "dependencies": {
-    "@opennextjs/cloudflare": "^1.0.0",
-    "next": "^15.0.0",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0"
-  },
-  "devDependencies": {
-    "@cloudflare/workers-types": "^4.20241205.0",
-    "@types/react": "^19.0.0",
-    "@types/react-dom": "^19.0.0",
-    "typescript": "^5.6.0"
-  }
+	"name": "jack-template",
+	"type": "module",
+	"private": true,
+	"scripts": {
+		"dev": "next dev",
+		"build": "next build",
+		"preview": "opennextjs-cloudflare build && opennextjs-cloudflare preview",
+		"deploy": "opennextjs-cloudflare build && opennextjs-cloudflare deploy",
+		"cf-typegen": "wrangler types --env-interface CloudflareEnv cloudflare-env.d.ts"
+	},
+	"dependencies": {
+		"@opennextjs/cloudflare": "^1.0.0",
+		"next": "^15.0.0",
+		"react": "^19.0.0",
+		"react-dom": "^19.0.0"
+	},
+	"devDependencies": {
+		"@cloudflare/workers-types": "^4.20241205.0",
+		"@types/react": "^19.0.0",
+		"@types/react-dom": "^19.0.0",
+		"typescript": "^5.6.0"
+	}
 }

package/templates/nextjs/tsconfig.json

@@ -1,44 +1,28 @@
 {
-  "compilerOptions": {
-    "target": "ES2022",
-    "lib": [
-      "ES2022",
-      "DOM",
-      "DOM.Iterable"
-    ],
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "jsx": "preserve",
-    "strict": true,
-    "skipLibCheck": true,
-    "noEmit": true,
-    "incremental": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "paths": {
-      "@/*": [
-        "./*"
-      ]
-    },
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ],
-    "types": [
-      "@cloudflare/workers-types"
-    ],
-    "allowJs": true
-  },
-  "include": [
-    "next-env.d.ts",
-    "**/*.ts",
-    "**/*.tsx",
-    ".next/types/**/*.ts",
-    "cloudflare-env.d.ts"
-  ],
-  "exclude": [
-    "node_modules"
-  ]
+	"compilerOptions": {
+		"target": "ES2022",
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
+		"module": "ESNext",
+		"moduleResolution": "bundler",
+		"jsx": "preserve",
+		"strict": true,
+		"skipLibCheck": true,
+		"noEmit": true,
+		"incremental": true,
+		"esModuleInterop": true,
+		"resolveJsonModule": true,
+		"isolatedModules": true,
+		"paths": {
+			"@/*": ["./*"]
+		},
+		"plugins": [
+			{
+				"name": "next"
+			}
+		],
+		"types": ["@cloudflare/workers-types"],
+		"allowJs": true
+	},
+	"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", "cloudflare-env.d.ts"],
+	"exclude": ["node_modules"]
 }

package/templates/nextjs/wrangler.jsonc

@@ -1,17 +1,17 @@
 {
-  "$schema": "node_modules/wrangler/config-schema.json",
-  "name": "jack-template",
-  "main": ".open-next/worker.js",
-  "compatibility_date": "2024-12-30",
-  "compatibility_flags": ["nodejs_compat"],
-  "assets": {
-    "directory": ".open-next/assets",
-    "binding": "ASSETS"
-  },
-  "r2_buckets": [
-    {
-      "binding": "NEXT_INC_CACHE_R2_BUCKET",
-      "bucket_name": "jack-template-cache"
-    }
-  ]
+	"$schema": "node_modules/wrangler/config-schema.json",
+	"name": "jack-template",
+	"main": ".open-next/worker.js",
+	"compatibility_date": "2024-12-30",
+	"compatibility_flags": ["nodejs_compat"],
+	"assets": {
+		"directory": ".open-next/assets",
+		"binding": "ASSETS"
+	},
+	"r2_buckets": [
+		{
+			"binding": "NEXT_INC_CACHE_R2_BUCKET",
+			"bucket_name": "jack-template-cache"
+		}
+	]
 }

package/src/lib/github.ts

@@ -1,151 +0,0 @@
-import { mkdtemp, readFile, readdir, rm } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { $ } from "bun";
-import type { AgentContext, Capability, Template, TemplateHooks } from "../templates/types";
-import { parseJsonc } from "./jsonc.ts";
-import type { ServiceTypeKey } from "./services/index.ts";
-
-/**
- * Parse GitHub input: "user/repo" or "https://github.com/user/repo"
- */
-function parseGitHubInput(input: string): { owner: string; repo: string } {
-	// Full URL: https://github.com/user/repo
-	const urlMatch = input.match(/github\.com\/([^\/]+)\/([^\/\s]+)/);
-	if (urlMatch?.[1] && urlMatch[2]) {
-		return { owner: urlMatch[1], repo: urlMatch[2].replace(/\.git$/, "") };
-	}
-
-	// Shorthand: user/repo
-	const shortMatch = input.match(/^([^\/]+)\/([^\/]+)$/);
-	if (shortMatch?.[1] && shortMatch[2]) {
-		return { owner: shortMatch[1], repo: shortMatch[2] };
-	}
-
-	throw new Error(
-		`Invalid GitHub URL: ${input}\n\nExpected: user/repo or https://github.com/user/repo`,
-	);
-}
-
-/**
- * Recursively read all files in a directory
- */
-async function readDirRecursive(dir: string, base = ""): Promise<Record<string, string>> {
-	const files: Record<string, string> = {};
-	const entries = await readdir(dir, { withFileTypes: true });
-
-	for (const entry of entries) {
-		const relativePath = base ? `${base}/${entry.name}` : entry.name;
-		const fullPath = join(dir, entry.name);
-
-		if (entry.isDirectory()) {
-			// Skip common non-source directories
-			if (["node_modules", ".git", ".wrangler"].includes(entry.name)) continue;
-			Object.assign(files, await readDirRecursive(fullPath, relativePath));
-		} else {
-			// Read file content
-			const content = await readFile(fullPath, "utf-8");
-			files[relativePath] = content;
-		}
-	}
-
-	return files;
-}
-
-/**
- * Fetch template from GitHub tarball API
- */
-export async function fetchFromGitHub(input: string): Promise<Template> {
-	const { owner, repo } = parseGitHubInput(input);
-	const tarballUrl = `https://api.github.com/repos/${owner}/${repo}/tarball`;
-
-	// Fetch tarball
-	const headers: Record<string, string> = {
-		"User-Agent": "jack-cli",
-	};
-	if (process.env.GITHUB_TOKEN) {
-		headers.Authorization = `Bearer ${process.env.GITHUB_TOKEN}`;
-	}
-
-	const response = await fetch(tarballUrl, { headers, redirect: "follow" });
-
-	if (!response.ok) {
-		if (response.status === 404) {
-			throw new Error(
-				`Repository not found: ${owner}/${repo}\n\nMake sure it exists and is public.`,
-			);
-		}
-		if (response.status === 403) {
-			throw new Error(
-				"GitHub rate limit exceeded.\n\nSet GITHUB_TOKEN to continue:\n  export GITHUB_TOKEN=ghp_xxxxx\n\nGet a token at: https://github.com/settings/tokens",
-			);
-		}
-		throw new Error(`Failed to fetch template: ${response.statusText}`);
-	}
-
-	// Create temp directory
-	const tempDir = await mkdtemp(join(tmpdir(), "jack-template-"));
-	const tarPath = join(tempDir, "template.tar.gz");
-
-	try {
-		// Write tarball to temp file
-		const buffer = await response.arrayBuffer();
-		await Bun.write(tarPath, buffer);
-
-		// Extract tarball
-		await $`tar -xzf ${tarPath} -C ${tempDir}`.quiet();
-
-		// Find extracted directory (GitHub tarballs have a prefix like "user-repo-sha")
-		const entries = await readdir(tempDir);
-		const extractedDir = entries.find((e) => e !== "template.tar.gz");
-		if (!extractedDir) {
-			throw new Error("Failed to extract template: no directory found");
-		}
-
-		// Read all files
-		const files = await readDirRecursive(join(tempDir, extractedDir));
-
-		// Warn if it doesn't look like a worker
-		const hasWorkerFiles = files["wrangler.toml"] || files["worker.ts"] || files["src/index.ts"];
-		if (!hasWorkerFiles) {
-			console.warn("\n⚠ This doesn't look like a Cloudflare Worker");
-			console.warn("  (no wrangler.toml or worker entry point found)\n");
-		}
-
-		// Read .jack.json metadata if it exists
-		const jackJsonContent = files[".jack.json"];
-		if (jackJsonContent) {
-			try {
-				const metadata = parseJsonc(jackJsonContent) as {
-					description?: string;
-					secrets?: string[];
-					capabilities?: Capability[];
-					requires?: ServiceTypeKey[];
-					hooks?: TemplateHooks;
-					agentContext?: AgentContext;
-				};
-				// Remove .jack.json from files (not needed in project)
-				const { ".jack.json": _, ...filesWithoutJackJson } = files;
-				return {
-					description: metadata.description || `GitHub: ${owner}/${repo}`,
-					secrets: metadata.secrets,
-					capabilities: metadata.capabilities,
-					requires: metadata.requires,
-					hooks: metadata.hooks,
-					agentContext: metadata.agentContext,
-					files: filesWithoutJackJson,
-				};
-			} catch {
-				// Invalid JSON, fall through to default
-			}
-		}
-
-		return {
-			description: `GitHub: ${owner}/${repo}`,
-			files,
-		};
-	} finally {
-		// Cleanup
-		await rm(tempDir, { recursive: true, force: true });
-	}
-}

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

@@ -1,22 +0,0 @@
-// 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>
-  );
-}