@primitivedotdev/cli 0.32.1 → 0.33.0

package/dist/oclif/index.js

@@ -1,7 +1,7 @@
 import { Args, Command, Errors, Flags } from "@oclif/core";
-import { chmodSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { chmodSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { randomUUID } from "node:crypto";
-import { basename, dirname, join, resolve } from "node:path";
+import { basename, dirname, join, relative, resolve, sep } from "node:path";
 import { hostname } from "node:os";
 import process$1 from "node:process";
 import { createInterface } from "node:readline/promises";
@@ -6769,16 +6769,21 @@ const openapiDocument = {
 						"type": "string",
 						"minLength": 1,
 						"maxLength": 1048576,
-						"description": "Bundled handler as a single ESM module. Up to 1 MiB UTF-8.\nMust export a default `{ async fetch(req, env, ctx) { ... } }`\nobject.\n"
+						"description": "Pre-built handler as a single ESM module. Up to 1 MiB UTF-8.\nMust export a default `{ async fetch(req, env, ctx) { ... } }`\nobject. Provide either `code` or `files`, not both.\n"
 					},
 					"sourceMap": {
 						"type": "string",
 						"minLength": 1,
 						"maxLength": 5242880,
-						"description": "Optional source map for the bundle. Up to 5 MiB UTF-8.\nStored with the deployment attempt and sent to the runtime\nto symbolicate stack traces in the function's logs.\n"
+						"description": "Optional source map for the bundle. Up to 5 MiB UTF-8.\nStored with the deployment attempt and sent to the runtime\nto symbolicate stack traces in the function's logs. Only\nvalid with `code`.\n"
+					},
+					"files": {
+						"type": "object",
+						"additionalProperties": { "type": "string" },
+						"description": "Source files for a managed build, as a map of path to file\ncontents (for example {\"package.json\": \"...\",\n\"src/index.ts\": \"...\"}). Provide this INSTEAD of `code` to\nhave the server install dependencies and bundle the source\nfor the Workers runtime before deploying. Include a\npackage.json (its `dependencies` are installed). Provide\neither `code` or `files`, not both.\n"
 					}
 				},
-				"required": ["name", "code"]
+				"required": ["name"]
 			},
 			"CreateFunctionResult": {
 				"type": "object",
@@ -6805,15 +6810,20 @@ const openapiDocument = {
 						"type": "string",
 						"minLength": 1,
 						"maxLength": 1048576,
-						"description": "New bundled handler. Same rules as CreateFunctionInput.code."
+						"description": "New pre-built handler. Same rules as CreateFunctionInput.code. Provide either `code` or `files`, not both."
 					},
 					"sourceMap": {
 						"type": "string",
 						"minLength": 1,
 						"maxLength": 5242880
+					},
+					"files": {
+						"type": "object",
+						"additionalProperties": { "type": "string" },
+						"description": "Source files for a managed build, as a map of path to file\ncontents. Provide this INSTEAD of `code` to rebuild and\nredeploy from source. Same rules as CreateFunctionInput.files.\n"
 					}
 				},
-				"required": ["code"]
+				"required": []
 			},
 			"TestInvocationResult": {
 				"type": "object",
@@ -10512,16 +10522,21 @@ const operationManifest = [
 					"type": "string",
 					"minLength": 1,
 					"maxLength": 1048576,
-					"description": "Bundled handler as a single ESM module. Up to 1 MiB UTF-8.\nMust export a default `{ async fetch(req, env, ctx) { ... } }`\nobject.\n"
+					"description": "Pre-built handler as a single ESM module. Up to 1 MiB UTF-8.\nMust export a default `{ async fetch(req, env, ctx) { ... } }`\nobject. Provide either `code` or `files`, not both.\n"
 				},
 				"sourceMap": {
 					"type": "string",
 					"minLength": 1,
 					"maxLength": 5242880,
-					"description": "Optional source map for the bundle. Up to 5 MiB UTF-8.\nStored with the deployment attempt and sent to the runtime\nto symbolicate stack traces in the function's logs.\n"
+					"description": "Optional source map for the bundle. Up to 5 MiB UTF-8.\nStored with the deployment attempt and sent to the runtime\nto symbolicate stack traces in the function's logs. Only\nvalid with `code`.\n"
+				},
+				"files": {
+					"type": "object",
+					"additionalProperties": { "type": "string" },
+					"description": "Source files for a managed build, as a map of path to file\ncontents (for example {\"package.json\": \"...\",\n\"src/index.ts\": \"...\"}). Provide this INSTEAD of `code` to\nhave the server install dependencies and bundle the source\nfor the Workers runtime before deploying. Include a\npackage.json (its `dependencies` are installed). Provide\neither `code` or `files`, not both.\n"
 				}
 			},
-			"required": ["name", "code"]
+			"required": ["name"]
 		},
 		"responseSchema": {
 			"type": "object",
@@ -11574,15 +11589,20 @@ const operationManifest = [
 					"type": "string",
 					"minLength": 1,
 					"maxLength": 1048576,
-					"description": "New bundled handler. Same rules as CreateFunctionInput.code."
+					"description": "New pre-built handler. Same rules as CreateFunctionInput.code. Provide either `code` or `files`, not both."
 				},
 				"sourceMap": {
 					"type": "string",
 					"minLength": 1,
 					"maxLength": 5242880
+				},
+				"files": {
+					"type": "object",
+					"additionalProperties": { "type": "string" },
+					"description": "Source files for a managed build, as a map of path to file\ncontents. Provide this INSTEAD of `code` to rebuild and\nredeploy from source. Same rules as CreateFunctionInput.files.\n"
 				}
 			},
-			"required": ["code"]
+			"required": []
 		},
 		"responseSchema": {
 			"type": "object",
@@ -16274,6 +16294,129 @@ async function waitForFunctionDeploy(params) {
 	}
 }
 //#endregion
+//#region src/oclif/function-source.ts
+function collectSourceFiles(dir) {
+	let pkgRaw;
+	try {
+		pkgRaw = readFileSync(join(dir, "package.json"), "utf8");
+	} catch {
+		return {
+			kind: "error",
+			message: `No package.json found in ${dir}. A managed build needs a package.json (its "dependencies" are installed).`
+		};
+	}
+	let pkg;
+	try {
+		pkg = JSON.parse(pkgRaw);
+	} catch (error) {
+		return {
+			kind: "error",
+			message: `package.json in ${dir} is not valid JSON: ${error instanceof Error ? error.message : String(error)}`
+		};
+	}
+	delete pkg.devDependencies;
+	const files = { "package.json": `${JSON.stringify(pkg, null, 2)}\n` };
+	const srcDir = join(dir, "src");
+	if (isDirectory(srcDir)) for (const abs of walk(srcDir)) files[relative(dir, abs).split(sep).join("/")] = readFileSync(abs, "utf8");
+	if (Object.keys(files).length === 1) return {
+		kind: "error",
+		message: `No source files found under ${srcDir}. Put your handler at src/index.ts.`
+	};
+	return {
+		kind: "ok",
+		files
+	};
+}
+function isDirectory(path) {
+	try {
+		return statSync(path).isDirectory();
+	} catch {
+		return false;
+	}
+}
+function* walk(dir) {
+	for (const entry of readdirSync(dir, { withFileTypes: true })) {
+		const abs = join(dir, entry.name);
+		if (entry.isDirectory()) yield* walk(abs);
+		else yield abs;
+	}
+}
+async function runSourceDeploy(api, params) {
+	const listed = await api.listFunctions();
+	if (listed.error) return {
+		kind: "error",
+		payload: extractErrorPayload(listed.error),
+		stage: "lookup"
+	};
+	const foundId = (listed.data?.data ?? []).find((f) => f.name === params.name)?.id ?? null;
+	if (foundId !== null) {
+		const updated = await api.updateFunction({
+			files: params.files,
+			id: foundId
+		});
+		if (updated.error) return {
+			kind: "error",
+			payload: extractErrorPayload(updated.error),
+			stage: "redeploy"
+		};
+		const data = updated.data?.data;
+		if (!data) return {
+			kind: "error",
+			payload: {
+				code: "client_error",
+				message: "Redeploy returned no data"
+			},
+			stage: "redeploy"
+		};
+		return {
+			action: "redeployed",
+			kind: "ok",
+			result: data
+		};
+	}
+	const created = await api.createFunction({
+		files: params.files,
+		name: params.name
+	});
+	if (created.error) return {
+		kind: "error",
+		payload: extractErrorPayload(created.error),
+		stage: "create"
+	};
+	const data = created.data?.data;
+	if (!data) return {
+		kind: "error",
+		payload: {
+			code: "client_error",
+			message: "Create returned no data"
+		},
+		stage: "create"
+	};
+	return {
+		action: "created",
+		kind: "ok",
+		result: data
+	};
+}
+function renderBuildFailure(payload, write) {
+	if (typeof payload !== "object" || payload === null) return false;
+	const error = payload.error ?? payload;
+	if (typeof error !== "object" || error === null) return false;
+	if (error.code !== "build_failed") return false;
+	const details = error.details;
+	const phase = typeof details === "object" && details !== null ? details.phase : void 0;
+	write(`Build failed${typeof phase === "string" ? ` during ${phase}` : ""}.\n`);
+	const errors = typeof details === "object" && details !== null ? details.errors : void 0;
+	if (Array.isArray(errors)) for (const e of errors) {
+		if (typeof e !== "object" || e === null) continue;
+		const item = e;
+		const loc = typeof item.file === "string" ? ` (${item.file}${typeof item.line === "number" ? `:${item.line}` : ""})` : "";
+		write(`  [${String(item.code)}] ${String(item.message)}${loc}\n`);
+		if (typeof item.hint === "string") write(`     hint: ${item.hint}\n`);
+	}
+	return true;
+}
+//#endregion
 //#region src/oclif/lint/raw-send-mail-fetch.ts
 const RAW_SEND_MAIL_FETCH_REGEX = /fetch\s*\(\s*[`'"][^`'"]*primitive\.dev[^`'"]*\/send-mail(?![A-Za-z0-9_-])/g;
 const SNIPPET_PADDING = 60;
@@ -16740,6 +16883,8 @@ var FunctionsDeployCommand = class FunctionsDeployCommand extends Command {
 	static summary = "Deploy a new function from a bundled handler file";
 	static examples = [
 		"<%= config.bin %> functions deploy --name forwarder --file ./bundle.js",
+		"<%= config.bin %> functions deploy --name triage --source ./triage-agent",
+		"<%= config.bin %> functions deploy --name triage --source . --wait",
 		"<%= config.bin %> functions deploy --name forwarder --file ./bundle.js --wait",
 		"<%= config.bin %> functions deploy --name forwarder --file ./bundle.js --source-map-file ./bundle.js.map",
 		"<%= config.bin %> functions deploy --name forwarder --file ./bundle.js --secret OPENAI_KEY=sk-... --secret OWNER_EMAIL=me@example.com",
@@ -16765,10 +16910,8 @@ var FunctionsDeployCommand = class FunctionsDeployCommand extends Command {
 			description: "Slug-style name. Lowercase letters, digits, hyphens, underscores. 1-64 chars. Must be unique within the org.",
 			required: true
 		}),
-		file: Flags.string({
-			description: "Path to the bundled ESM handler file (single self-contained module). Loaded as the `code` body field.",
-			required: true
-		}),
+		file: Flags.string({ description: "Path to the bundled ESM handler file (single self-contained module). Loaded as the `code` body field. Exactly one of --file or --source is required." }),
+		source: Flags.string({ description: "Path to a project directory (containing package.json and src/) to deploy via managed build: the source is uploaded and the server installs dependencies, bundles for the Workers runtime, and deploys. Idempotent by name (creates the function, or redeploys it if --name already exists), so it is safe to run on every push. Exactly one of --file or --source is required." }),
 		"source-map-file": Flags.string({ description: "Optional path to a source map for the bundle. Stored with the deployment attempt and used to symbolicate stack traces in function logs." }),
 		secret: Flags.string({
 			description: `Secret KEY=VALUE to seed on the deployed function. Repeatable. KEY must match \`^[A-Z_][A-Z0-9_]*$\`; VALUE may contain \`=\` (only the first \`=\` is treated as a delimiter). Each KEY may only appear once per command. Passing one or more --secret flags fans out the deploy to create-function, set-secret per pair, then a final redeploy so the running handler picks up the bindings. ${SECRET_FLAG_SECURITY_NOTE}`,
@@ -16810,6 +16953,17 @@ var FunctionsDeployCommand = class FunctionsDeployCommand extends Command {
 				process.exitCode = 1;
 				return;
 			}
+			if (flags.file === void 0 === (flags.source === void 0)) {
+				process.stderr.write("Provide exactly one of --file (a pre-built bundle) or --source (a project directory for managed build).\n");
+				process.exitCode = 1;
+				return;
+			}
+			if (flags.source !== void 0) {
+				await this.runSourceMode(flags, flags.source);
+				return;
+			}
+			const file = flags.file;
+			if (file === void 0) return;
 			const parsedSecrets = resolveSecretFlags({
 				fromEnv: flags["secret-from-env"] ?? [],
 				fromEnvFile: flags["secret-from-env-file"] ?? [],
@@ -16822,7 +16976,7 @@ var FunctionsDeployCommand = class FunctionsDeployCommand extends Command {
 				process.exitCode = 1;
 				return;
 			}
-			const code = readTextFileFlag(flags.file, "--file");
+			const code = readTextFileFlag(file, "--file");
 			const sourceMap = flags["source-map-file"] ? readTextFileFlag(flags["source-map-file"], "--source-map-file") : void 0;
 			emitRawSendMailFetchWarning(code, (chunk) => process.stderr.write(chunk));
 			const { apiClient, auth, baseUrlOverridden } = await createAuthenticatedCliApiClient({
@@ -16928,6 +17082,101 @@ var FunctionsDeployCommand = class FunctionsDeployCommand extends Command {
 			this.log(JSON.stringify(payload, null, 2));
 		});
 	}
+	async runSourceMode(flags, sourceDir) {
+		if ((flags.secret?.length ?? 0) > 0 || (flags["secret-from-env"]?.length ?? 0) > 0 || (flags["secret-from-file"]?.length ?? 0) > 0 || (flags["secret-from-env-file"]?.length ?? 0) > 0 || flags["secret-from-stdin"] !== void 0) {
+			process.stderr.write("Secret flags are not supported with --source yet. Deploy from source first, then set secrets with `primitive functions set-secret` and redeploy.\n");
+			process.exitCode = 1;
+			return;
+		}
+		const collected = collectSourceFiles(sourceDir);
+		if (collected.kind === "error") {
+			process.stderr.write(`${collected.message}\n`);
+			process.exitCode = 1;
+			return;
+		}
+		const { apiClient, auth, baseUrlOverridden } = await createAuthenticatedCliApiClient({
+			apiKey: flags["api-key"],
+			apiBaseUrl1: flags["api-base-url-1"],
+			apiBaseUrl2: flags["api-base-url-2"],
+			configDir: this.config.configDir
+		});
+		const authFailureContext = {
+			auth,
+			baseUrlOverridden,
+			configDir: this.config.configDir
+		};
+		const outcome = await runSourceDeploy({
+			createFunction: (p) => createFunction({
+				body: {
+					files: p.files,
+					name: p.name
+				},
+				client: apiClient.client,
+				responseStyle: "fields"
+			}),
+			listFunctions: () => listFunctions({
+				client: apiClient.client,
+				responseStyle: "fields"
+			}),
+			updateFunction: (p) => updateFunction({
+				body: { files: p.files },
+				client: apiClient.client,
+				path: { id: p.id },
+				responseStyle: "fields"
+			})
+		}, {
+			files: collected.files,
+			name: flags.name
+		});
+		if (outcome.kind === "error") {
+			renderBuildFailure(outcome.payload, (chunk) => process.stderr.write(chunk));
+			writeErrorWithHints(outcome.payload);
+			surfaceUnauthorizedHint({
+				...authFailureContext,
+				payload: outcome.payload
+			});
+			process.exitCode = 1;
+			return;
+		}
+		const payload = outcome.result;
+		if (flags.wait) {
+			const waitResult = await waitForFunctionDeploy({
+				getFunction: (p) => getFunction({
+					client: apiClient.client,
+					path: { id: p.id },
+					responseStyle: "fields"
+				}),
+				id: payload.id,
+				initial: payload,
+				pollIntervalSeconds: flags["poll-interval"],
+				timeoutSeconds: flags.timeout,
+				writeStderr: (chunk) => process.stderr.write(chunk)
+			});
+			if (waitResult.kind === "error") {
+				writeErrorWithHints(waitResult.payload);
+				surfaceUnauthorizedHint({
+					...authFailureContext,
+					payload: waitResult.payload
+				});
+				process.exitCode = 1;
+				return;
+			}
+			if (waitResult.kind === "timeout") {
+				const status = waitResult.lastFunction?.deploy_status ?? "unknown";
+				process.stderr.write(`Timed out after ${flags.timeout}s waiting for function ${payload.id} deploy to finish (last status: ${status}).\n`);
+				process.exitCode = 2;
+				return;
+			}
+			this.log(JSON.stringify(waitResult.function, null, 2));
+			if (waitResult.kind === "failed") {
+				const detail = waitResult.function.deploy_error ? `: ${waitResult.function.deploy_error}` : ".";
+				process.stderr.write(`Function ${payload.id} deploy failed${detail}\n`);
+				process.exitCode = 1;
+			}
+			return;
+		}
+		this.log(JSON.stringify(payload, null, 2));
+	}
 };
 //#endregion
 //#region src/oclif/function-templates.ts
@@ -16937,8 +17186,8 @@ const PRIMITIVE_TEAM_AUTHOR = {
 	name: "Primitive Team",
 	url: "https://primitive.dev"
 };
-const SDK_VERSION_RANGE = "^0.32.0";
-const CLI_VERSION_RANGE = "^0.32.1";
+const SDK_VERSION_RANGE = "^0.33.0";
+const CLI_VERSION_RANGE = "^0.33.0";
 const ESBUILD_VERSION_RANGE = "^0.27.0";
 function renderHandler() {
 	return `// env.PRIMITIVE_API_KEY, env.PRIMITIVE_WEBHOOK_SECRET, and

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primitivedotdev/cli",
-  "version": "0.32.1",
+  "version": "0.33.0",
   "description": "Official Primitive CLI: deploy Primitive Functions, send and inspect mail, manage endpoints, all from the terminal. Wraps the @primitivedotdev/sdk runtime client with one-shot commands.",
   "type": "module",
   "sideEffects": false,