clefbase 1.5.3 → 2.0.1

package/dist/cli.js

@@ -33684,8 +33684,7 @@ function writeEnvExample(cfg, cwd = process.cwd()) {
     "# Clefbase \u2014 copy to .env and fill in your values",
     `CLEFBASE_SERVER_URL=${cfg.serverUrl}`,
     `CLEFBASE_PROJECT_ID=${cfg.projectId}`,
-    "CLEFBASE_API_KEY=your_api_key_here",
-    "CLEFBASE_ADMIN_SECRET=your_admin_secret_here"
+    "CLEFBASE_API_KEY=your_api_key_here"
   ];
   import_fs2.default.writeFileSync(p, lines.join("\n") + "\n");
 }
@@ -33721,49 +33720,46 @@ async function apiFetch(url, opts) {
 function base(cfg) {
   return cfg.serverUrl.replace(/\/+$/, "");
 }
-function adminHeaders(cfg) {
-  return { "Content-Type": "application/json", "x-admin-secret": cfg.adminSecret };
-}
 function cfxHeaders(cfg) {
   return { "Content-Type": "application/json", "x-cfx-key": cfg.apiKey };
 }
 async function listSites(cfg) {
   return apiFetch(
-    `${base(cfg)}/api/hosting/databases/${cfg.projectId}/sites`,
-    { headers: adminHeaders(cfg) }
+    `${base(cfg)}/hosting/sites`,
+    { headers: cfxHeaders(cfg) }
   );
 }
 async function createSite(cfg, name, description) {
   return apiFetch(
-    `${base(cfg)}/api/hosting/databases/${cfg.projectId}/sites`,
-    { method: "POST", headers: adminHeaders(cfg), body: JSON.stringify({ name, description }) }
+    `${base(cfg)}/hosting/sites`,
+    { method: "POST", headers: cfxHeaders(cfg), body: JSON.stringify({ name, description }) }
   );
 }
 async function getDnsStatus(cfg, siteId) {
   return apiFetch(
-    `${base(cfg)}/api/hosting/databases/${cfg.projectId}/sites/${siteId}/dns`,
-    { headers: adminHeaders(cfg) }
+    `${base(cfg)}/hosting/sites/${siteId}/dns`,
+    { headers: cfxHeaders(cfg) }
   );
 }
 async function reprovisionDns(cfg, siteId) {
   return apiFetch(
-    `${base(cfg)}/api/hosting/databases/${cfg.projectId}/sites/${siteId}/dns/provision`,
-    { method: "POST", headers: adminHeaders(cfg), body: JSON.stringify({}) }
+    `${base(cfg)}/hosting/sites/${siteId}/dns/reprovision`,
+    { method: "POST", headers: cfxHeaders(cfg), body: JSON.stringify({}) }
   );
 }
 async function createDeploy(cfg, siteId, entrypoint = "index.html") {
   return apiFetch(
-    `${base(cfg)}/api/hosting/databases/${cfg.projectId}/sites/${siteId}/deploys`,
+    `${base(cfg)}/hosting/sites/${siteId}/deploys`,
     {
       method: "POST",
-      headers: adminHeaders(cfg),
+      headers: cfxHeaders(cfg),
       body: JSON.stringify({ entrypoint, deployedBy: "clefbase-cli" })
     }
   );
 }
 async function uploadFileBatch(cfg, deployId, files) {
   const fetchFn = await getFetch();
-  const url = `${base(cfg)}/api/hosting/databases/${cfg.projectId}/deploys/${deployId}/files/batch`;
+  const url = `${base(cfg)}/hosting/deploys/${deployId}/files/batch`;
   let res;
   if (typeof FormData !== "undefined") {
     const form = new FormData();
@@ -33776,7 +33772,7 @@ async function uploadFileBatch(cfg, deployId, files) {
     }
     res = await fetchFn(url, {
       method: "POST",
-      headers: { "x-admin-secret": cfg.adminSecret },
+      headers: { "x-cfx-key": cfg.apiKey },
       body: form
     });
   } else {
@@ -33792,7 +33788,7 @@ async function uploadFileBatch(cfg, deployId, files) {
     }
     res = await fetchFn(url, {
       method: "POST",
-      headers: { "x-admin-secret": cfg.adminSecret, ...form.getHeaders() },
+      headers: { "x-cfx-key": cfg.apiKey, ...form.getHeaders() },
       body: form
     });
   }
@@ -33809,10 +33805,10 @@ async function uploadFileBatch(cfg, deployId, files) {
 }
 async function finalizeDeploy(cfg, deployId, message) {
   return apiFetch(
-    `${base(cfg)}/api/hosting/databases/${cfg.projectId}/deploys/${deployId}/finalize`,
+    `${base(cfg)}/hosting/deploys/${deployId}/finalize`,
     {
       method: "POST",
-      headers: adminHeaders(cfg),
+      headers: cfxHeaders(cfg),
       body: JSON.stringify({ message: message ?? "Deployed via clefbase CLI" })
     }
   );
@@ -33820,8 +33816,8 @@ async function finalizeDeploy(cfg, deployId, message) {
 async function getActiveDeploy(cfg, siteId) {
   try {
     return await apiFetch(
-      `${base(cfg)}/api/hosting/databases/${cfg.projectId}/sites/${siteId}/active`,
-      { headers: adminHeaders(cfg) }
+      `${base(cfg)}/hosting/sites/${siteId}/active`,
+      { headers: cfxHeaders(cfg) }
     );
   } catch (err) {
     if (err.status === 404) return null;
@@ -33903,18 +33899,10 @@ async function runInit(cwd = process.cwd()) {
     mask: "\u25CF",
     validate: (v) => v.trim().length > 0 || "Required"
   }]);
-  const { adminSecret } = await lib_default.prompt([{
-    type: "password",
-    name: "adminSecret",
-    message: "Admin Secret  (x-admin-secret, needed for hosting)",
-    mask: "\u25CF",
-    validate: (v) => v.trim().length > 0 || "Required"
-  }]);
   const cfg = {
     serverUrl: serverUrl.replace(/\/+$/, ""),
     projectId: projectId.trim(),
     apiKey: apiKey.trim(),
-    adminSecret: adminSecret.trim(),
     services: { database: false, auth: false, storage: false, hosting: false, functions: false }
   };
   const connSpinner = ora2("Testing connection\u2026").start();
@@ -33947,6 +33935,10 @@ async function runInit(cwd = process.cwd()) {
   if (cfg.services.hosting) {
     await setupHosting(cfg, cwd);
   }
+  let functionsRuntime;
+  if (cfg.services.functions) {
+    functionsRuntime = await setupFunctions(cfg, cwd);
+  }
   const configPath = saveConfig(cfg, cwd);
   ensureGitignore(cwd);
   writeEnvExample(cfg, cwd);
@@ -33961,9 +33953,591 @@ async function runInit(cwd = process.cwd()) {
     console.log(source_default.dim(`  Lib config:    ${libResult.configCopy}`));
     console.log(source_default.dim(`  Lib entry:     ${libResult.libFile}`));
   }
+  if (cfg.services.functions) {
+    console.log(source_default.dim(`  Functions:     functions/  (${functionsRuntime ?? "node"})`));
+    console.log(source_default.dim(`                 run: node functions/deploy.mjs`));
+  }
   console.log();
   printUsageHint(cfg);
 }
+async function setupFunctions(cfg, cwd) {
+  console.log();
+  console.log(source_default.bold("  Functions"));
+  console.log();
+  const { runtime } = await lib_default.prompt([{
+    type: "list",
+    name: "runtime",
+    message: "Default functions runtime",
+    choices: [
+      { name: "Node.js / TypeScript  (recommended)", value: "node" },
+      { name: "Python 3", value: "python" },
+      { name: "Both  (create examples for each)", value: "both" }
+    ],
+    default: "node"
+  }]);
+  const scaffoldResult = scaffoldFunctions(cfg, cwd, runtime);
+  const sp = ora2("Creating functions/ folder\u2026").start();
+  sp.succeed(
+    source_default.green(
+      `functions/ created  (${scaffoldResult.files.length} file${scaffoldResult.files.length !== 1 ? "s" : ""})`
+    )
+  );
+  return runtime;
+}
+function scaffoldFunctions(cfg, cwd = process.cwd(), runtime = "node") {
+  const dir = import_path2.default.join(cwd, "functions");
+  const files = [];
+  import_fs3.default.mkdirSync(dir, { recursive: true });
+  const write = (rel, content) => {
+    const abs = import_path2.default.join(dir, rel);
+    import_fs3.default.mkdirSync(import_path2.default.dirname(abs), { recursive: true });
+    if (!import_fs3.default.existsSync(abs)) {
+      import_fs3.default.writeFileSync(abs, content);
+      files.push(import_path2.default.join("functions", rel));
+    }
+  };
+  const wantNode = runtime === "node" || runtime === "both";
+  const wantPython = runtime === "python" || runtime === "both";
+  write("README.md", buildFunctionsReadme(cfg, runtime));
+  write(".env", buildFunctionsEnv(cfg));
+  write(".env.example", buildFunctionsEnvExample(cfg));
+  write(".gitignore", FUNCTIONS_GITIGNORE);
+  if (wantNode) {
+    write("src/hello.ts", NODE_HELLO_TS);
+    write("src/onUserCreate.ts", NODE_ON_USER_CREATE_TS);
+    write("src/scheduled.ts", NODE_SCHEDULED_TS);
+    write("tsconfig.json", FUNCTIONS_TSCONFIG);
+  }
+  if (wantPython) {
+    write("python/hello.py", PYTHON_HELLO_PY);
+    write("python/on_user_create.py", PYTHON_ON_USER_CREATE_PY);
+    write("python/scheduled.py", PYTHON_SCHEDULED_PY);
+    write("python/requirements.txt", PYTHON_REQUIREMENTS_TXT);
+  }
+  write("package.json", buildFunctionsPackageJson(cfg, runtime));
+  write("deploy.mjs", buildDeployMjs(cfg, runtime));
+  return { dir, files };
+}
+function buildFunctionsReadme(cfg, runtime) {
+  const wantNode = runtime === "node" || runtime === "both";
+  const wantPython = runtime === "python" || runtime === "both";
+  const baseUrl = cfg.serverUrl.replace(/\/+$/, "");
+  return `# Clefbase Functions
+
+Serverless functions for project \`${cfg.projectId}\`.
+
+Functions run on the Clefbase server and are triggered by HTTP calls,
+database events, auth events, storage events, or a cron schedule.
+No infrastructure to manage \u2014 just write code and deploy.
+
+---
+
+## Quick start
+${wantNode ? `
+### Node.js / TypeScript
+
+\`\`\`bash
+# 1. Install the Clefbase CLI (if not already)
+npm install -g clefbase
+
+# 2. Deploy a function
+clefbase functions:deploy -f src/hello.ts --name hello --trigger http
+
+# 3. Call it
+clefbase functions:call hello -d '{"name":"World"}'
+# or via HTTP
+curl -X POST ${baseUrl}/functions/call/hello \\
+  -H "x-cfx-key: <YOUR_API_KEY>" \\
+  -H "Content-Type: application/json" \\
+  -d '{"data":{"name":"World"}}'
+\`\`\`
+` : ""}${wantPython ? `
+### Python 3
+
+\`\`\`bash
+# Deploy a Python function
+clefbase functions:deploy -f python/hello.py --name hello-py --runtime python --trigger http
+
+# Call it
+clefbase functions:call hello-py -d '{"name":"World"}'
+\`\`\`
+` : ""}
+---
+
+## Writing functions
+
+Every function must export a single async **\`handler\`** (or the name you
+pass as \`--entry\`).  It receives one argument \u2014 a **\`FunctionContext\`** \u2014 and
+can return any JSON-serialisable value.
+
+### FunctionContext shape
+
+\`\`\`ts
+interface FunctionContext {
+  /** Payload supplied by the caller (HTTP) or the event (triggers). */
+  data: unknown;
+
+  /** Populated when the caller includes a valid auth token. */
+  auth?: {
+    uid:      string;
+    email?:   string;
+    metadata: Record<string, unknown>;
+  };
+
+  /** Describes what fired the function. */
+  trigger: {
+    type:      string;        // "http" | "schedule" | "onDocumentCreate" | \u2026
+    timestamp: string;        // ISO 8601
+    document?: unknown;       // populated for document triggers
+    before?:   unknown;       // populated for onDocumentUpdate / onDocumentWrite
+    after?:    unknown;       // populated for onDocumentUpdate / onDocumentWrite
+    user?:     unknown;       // populated for onUserCreate / onUserDelete
+    file?:     unknown;       // populated for onFileUpload / onFileDelete
+  };
+
+  /** Key-value env vars you passed at deploy time. */
+  env: Record<string, string>;
+}
+\`\`\`
+
+### Trigger types
+
+| Type | When it fires |
+|------|---------------|
+| \`http\` | \`POST /functions/call/:name\` |
+| \`schedule\` | Cron timer (e.g. \`0 * * * *\` = every hour) |
+| \`onDocumentCreate\` | A document is created in the watched collection |
+| \`onDocumentUpdate\` | A document is updated |
+| \`onDocumentDelete\` | A document is deleted |
+| \`onDocumentWrite\` | Any of create / update / delete |
+| \`onUserCreate\` | A new user account is created |
+| \`onUserDelete\` | A user account is deleted |
+| \`onFileUpload\` | A file is uploaded to Storage |
+| \`onFileDelete\` | A file is deleted from Storage |
+
+---
+
+## Deployment examples
+
+\`\`\`bash
+# HTTP function
+clefbase functions:deploy -f src/hello.ts --trigger http
+
+# Scheduled (every day at midnight UTC)
+clefbase functions:deploy -f src/scheduled.ts --trigger schedule --cron "0 0 * * *"
+
+# Document trigger (fires on every new "orders" document)
+clefbase functions:deploy -f src/onOrder.ts --trigger onDocumentCreate --collection orders
+
+# With env vars and a custom timeout
+clefbase functions:deploy -f src/sendEmail.ts \\
+  --trigger http \\
+  --env SENDGRID_KEY=SG.xxx \\
+  --timeout 15000
+
+# Use the deploy script in this folder (deploys everything at once)
+node deploy.mjs
+\`\`\`
+
+---
+
+## Calling HTTP functions
+
+### From the Clefbase SDK
+
+\`\`\`ts
+import { getFunctions, httpsCallable } from "clefbase";
+// or: import { fns } from "@lib/clefBase";
+
+const greet = httpsCallable<{ name: string }, { message: string }>(fns, "hello");
+const { data, durationMs } = await greet({ name: "Alice" });
+console.log(data.message);   // "Hello, Alice!"
+console.log(durationMs);     // e.g. 42
+\`\`\`
+
+### Auth-aware calls
+
+\`\`\`ts
+import { getAuth, setAuthToken } from "clefbase";
+
+const { token } = await getAuth(app).signIn("alice@example.com", "password");
+setAuthToken(app, token);
+
+// ctx.auth.uid and ctx.auth.email are now available inside the function
+const { data } = await callFunction(fns, "getProfile");
+\`\`\`
+
+### Raw HTTP (no SDK)
+
+\`\`\`bash
+curl -X POST ${baseUrl}/functions/call/<functionName> \\
+  -H "x-cfx-key: <YOUR_API_KEY>" \\
+  -H "Content-Type: application/json" \\
+  -H "Authorization: Bearer <USER_JWT>"   # optional auth
+  -d '{"data": { "key": "value" }}'
+\`\`\`
+
+---
+
+## Viewing logs
+
+\`\`\`bash
+# Last 20 executions
+clefbase functions:logs hello
+
+# Last 50
+clefbase functions:logs hello -l 50
+
+# All functions
+clefbase functions:list
+\`\`\`
+
+---
+
+## Managing functions
+
+\`\`\`bash
+clefbase functions:list                  # see all deployed functions
+clefbase functions:delete oldFunction    # delete (prompts for confirmation)
+clefbase functions:delete oldFunction -y # delete without confirmation
+\`\`\`
+
+---
+
+## Environment variables
+
+Secrets and config for your functions live in \`functions/.env\`.
+They are **never** committed to git (already in \`.gitignore\`).
+
+Pass them at deploy time with \`--env KEY=VALUE\` or edit \`deploy.sh\`
+to read them automatically from \`.env\`.
+
+---
+
+## Project info
+
+| Key | Value |
+|-----|-------|
+| Project ID | \`${cfg.projectId}\` |
+| Server | \`${baseUrl}\` |
+| Functions base URL | \`${baseUrl}/functions\` |
+`;
+}
+function buildFunctionsEnv(cfg) {
+  return `# Clefbase Functions \u2014 secrets for this project
+# This file is git-ignored. Do NOT commit it.
+# Copy values from your Clefbase dashboard.
+
+CLEFBASE_SERVER_URL=${cfg.serverUrl}
+CLEFBASE_PROJECT_ID=${cfg.projectId}
+CLEFBASE_API_KEY=${cfg.apiKey}
+
+# Add your own secrets below:
+# SENDGRID_API_KEY=
+# STRIPE_SECRET_KEY=
+# DATABASE_URL=
+`;
+}
+function buildFunctionsEnvExample(cfg) {
+  return `# Clefbase Functions \u2014 environment variable template
+# Copy this to .env and fill in your values.
+
+CLEFBASE_SERVER_URL=${cfg.serverUrl}
+CLEFBASE_PROJECT_ID=${cfg.projectId}
+CLEFBASE_API_KEY=your_api_key_here
+
+# Add your own secrets below:
+# SENDGRID_API_KEY=
+# STRIPE_SECRET_KEY=
+# DATABASE_URL=
+`;
+}
+var FUNCTIONS_GITIGNORE = `# Dependencies
+node_modules/
+
+# Python
+__pycache__/
+*.pyc
+*.pyo
+.venv/
+venv/
+
+# Secrets \u2014 never commit these
+.env
+
+# Build artefacts
+dist/
+*.js.map
+`;
+var FUNCTIONS_TSCONFIG = `{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "lib": ["ES2022"],
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "outDir": "dist"
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "dist"]
+}
+`;
+var NODE_HELLO_TS = `/**
+ * hello.ts \u2014 HTTP-triggered "hello world" function.
+ *
+ * Deploy:
+ *   clefbase functions:deploy -f src/hello.ts --name hello --trigger http
+ *
+ * Call:
+ *   clefbase functions:call hello -d '{"name":"World"}'
+ */
+
+import type { FunctionContext } from "clefbase";
+
+interface Input  { name?: string }
+interface Output { message: string; timestamp: string }
+
+export async function handler(ctx: FunctionContext): Promise<Output> {
+  const { name = "World" } = (ctx.data ?? {}) as Input;
+
+  return {
+    message:   \`Hello, \${name}!\`,
+    timestamp: ctx.trigger.timestamp,
+  };
+}
+`;
+var NODE_ON_USER_CREATE_TS = `/**
+ * onUserCreate.ts \u2014 fires whenever a new user signs up.
+ *
+ * Deploy:
+ *   clefbase functions:deploy -f src/onUserCreate.ts \\
+ *     --name onUserCreate --trigger onUserCreate
+ *
+ * ctx.trigger.user contains the new user's profile.
+ */
+
+import type { FunctionContext } from "clefbase";
+
+export async function handler(ctx: FunctionContext): Promise<void> {
+  const user = ctx.trigger.user as {
+    uid:      string;
+    email?:   string;
+    metadata: Record<string, unknown>;
+  } | undefined;
+
+  if (!user) return;
+
+  console.log(\`New user: \${user.uid}  email: \${user.email ?? "\u2014"}\`);
+
+  // Example: send a welcome email, add to a mailing list, seed default data\u2026
+  // const emailKey = ctx.env["SENDGRID_API_KEY"];
+}
+`;
+var NODE_SCHEDULED_TS = `/**
+ * scheduled.ts \u2014 runs on a cron schedule.
+ *
+ * Deploy (every day at midnight UTC):
+ *   clefbase functions:deploy -f src/scheduled.ts \\
+ *     --name dailyCleanup --trigger schedule --cron "0 0 * * *"
+ *
+ * Common cron expressions:
+ *   "* * * * *"    every minute
+ *   "0 * * * *"    every hour
+ *   "0 9 * * 1"    every Monday at 09:00 UTC
+ */
+
+import type { FunctionContext } from "clefbase";
+
+export async function handler(ctx: FunctionContext): Promise<{ cleaned: number }> {
+  console.log("Running scheduled cleanup at", ctx.trigger.timestamp);
+
+  // TODO: your scheduled work here
+  const cleaned = 0;
+
+  return { cleaned };
+}
+`;
+var PYTHON_HELLO_PY = `"""
+hello.py \u2014 HTTP-triggered "hello world" function.
+
+Deploy:
+    clefbase functions:deploy -f python/hello.py \\
+        --name hello-py --runtime python --trigger http
+
+Call:
+    clefbase functions:call hello-py -d '{"name":"World"}'
+"""
+
+
+async def handler(ctx):
+    """
+    ctx.data       \u2014 payload from the caller
+    ctx.auth       \u2014 populated when a valid auth token is included
+    ctx.trigger    \u2014 describes what fired this function
+    ctx.env        \u2014 env vars you passed at deploy time
+    """
+    data = ctx.get("data") or {}
+    name = data.get("name", "World")
+
+    return {
+        "message":   f"Hello, {name}!",
+        "timestamp": ctx["trigger"]["timestamp"],
+    }
+`;
+var PYTHON_ON_USER_CREATE_PY = `"""
+on_user_create.py \u2014 fires whenever a new user signs up.
+
+Deploy:
+    clefbase functions:deploy -f python/on_user_create.py \\
+        --name onUserCreate-py --runtime python --trigger onUserCreate
+"""
+
+
+async def handler(ctx):
+    user = (ctx.get("trigger") or {}).get("user") or {}
+
+    uid   = user.get("uid", "unknown")
+    email = user.get("email", "\u2014")
+
+    print(f"New user: {uid}  email: {email}")
+
+    # Example: send a welcome email, seed default data, etc.
+    # sendgrid_key = ctx["env"].get("SENDGRID_API_KEY")
+`;
+var PYTHON_SCHEDULED_PY = `"""
+scheduled.py \u2014 runs on a cron schedule.
+
+Deploy (every day at midnight UTC):
+    clefbase functions:deploy -f python/scheduled.py \\
+        --name dailyCleanup-py --runtime python \\
+        --trigger schedule --cron "0 0 * * *"
+"""
+
+
+async def handler(ctx):
+    print("Running scheduled cleanup at", ctx["trigger"]["timestamp"])
+
+    # TODO: your scheduled work here
+    cleaned = 0
+
+    return {"cleaned": cleaned}
+`;
+var PYTHON_REQUIREMENTS_TXT = `# Add your Python dependencies here.
+# They are NOT automatically installed on the server \u2014 include only stdlib
+# and packages already available in the Clefbase Python runtime.
+#
+# For heavier workloads, consider the Node.js runtime and npm packages.
+#
+# httpx>=0.27
+# pydantic>=2.0
+`;
+function buildDeployMjs(cfg, runtime) {
+  const wantNode = runtime === "node" || runtime === "both";
+  const wantPython = runtime === "python" || runtime === "both";
+  const fns = [];
+  if (wantNode) {
+    fns.push(
+      { name: "hello", file: "src/hello.ts", runtime: "node", trigger: "http" },
+      { name: "onUserCreate", file: "src/onUserCreate.ts", runtime: "node", trigger: "onUserCreate" },
+      { name: "dailyCleanup", file: "src/scheduled.ts", runtime: "node", trigger: "schedule", cron: "0 0 * * *" }
+    );
+  }
+  if (wantPython) {
+    fns.push(
+      { name: "hello-py", file: "python/hello.py", runtime: "python", trigger: "http" },
+      { name: "onUserCreate-py", file: "python/on_user_create.py", runtime: "python", trigger: "onUserCreate" },
+      { name: "dailyCleanup-py", file: "python/scheduled.py", runtime: "python", trigger: "schedule", cron: "0 0 * * *" }
+    );
+  }
+  const fnJson = JSON.stringify(fns, null, 2);
+  return `#!/usr/bin/env node
+// deploy.mjs \u2014 deploy all functions in this folder to Clefbase
+// Generated by \`clefbase init\`  \u2022  project: ${cfg.projectId}
+//
+// Usage (any OS):  node deploy.mjs
+//
+// Node.js 18+ required (uses built-in fetch + fs).
+// No extra dependencies \u2014 just the Clefbase CLI on your PATH.
+
+import { execSync }  from "node:child_process";
+import { existsSync, readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { dirname, join }  from "node:path";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+// \u2500\u2500 Load .env \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+
+const envPath = join(__dirname, ".env");
+if (existsSync(envPath)) {
+  for (const line of readFileSync(envPath, "utf8").split("\\n")) {
+    const match = line.match(/^\\s*([^#][^=]*)=(.*)$/);
+    if (match) process.env[match[1].trim()] = match[2].trim();
+  }
+}
+
+// \u2500\u2500 Functions to deploy \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+
+const functions = ${fnJson};
+
+// \u2500\u2500 Deploy \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+
+let passed = 0;
+let failed = 0;
+
+for (const fn of functions) {
+  const args = [
+    \`--name     \${fn.name}\`,
+    \`--file     \${fn.file}\`,
+    \`--runtime  \${fn.runtime}\`,
+    \`--trigger  \${fn.trigger}\`,
+    fn.cron       ? \`--cron       "\${fn.cron}"\`       : "",
+    fn.collection ? \`--collection "\${fn.collection}"\` : "",
+  ].filter(Boolean).join(" ");
+
+  console.log(\`\\n\u2192 Deploying "\${fn.name}"\u2026\`);
+  try {
+    execSync(\`clefbase functions:deploy \${args}\`, { stdio: "inherit", cwd: __dirname });
+    passed++;
+  } catch {
+    console.error(\`  \u2717 "\${fn.name}" failed\`);
+    failed++;
+  }
+}
+
+// \u2500\u2500 Summary \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+
+console.log(\`\\n\${passed} deployed, \${failed} failed \u2014 project: ${cfg.projectId}\\n\`);
+if (failed > 0) process.exit(1);
+`;
+}
+function buildFunctionsPackageJson(cfg, runtime) {
+  const wantNode = runtime === "node" || runtime === "both";
+  const scripts = {
+    "deploy:all": "node deploy.mjs"
+  };
+  if (wantNode) {
+    scripts["deploy:hello"] = "clefbase functions:deploy -f src/hello.ts        --name hello        --runtime node   --trigger http";
+    scripts["deploy:onUserCreate"] = "clefbase functions:deploy -f src/onUserCreate.ts --name onUserCreate --runtime node   --trigger onUserCreate";
+    scripts["deploy:scheduled"] = 'clefbase functions:deploy -f src/scheduled.ts    --name dailyCleanup --runtime node   --trigger schedule --cron "0 0 * * *"';
+  }
+  if (runtime === "python" || runtime === "both") {
+    scripts["deploy:hello-py"] = "clefbase functions:deploy -f python/hello.py           --name hello-py        --runtime python --trigger http";
+    scripts["deploy:onUserCreate-py"] = "clefbase functions:deploy -f python/on_user_create.py  --name onUserCreate-py --runtime python --trigger onUserCreate";
+    scripts["deploy:scheduled-py"] = 'clefbase functions:deploy -f python/scheduled.py        --name dailyCleanup-py --runtime python --trigger schedule --cron "0 0 * * *"';
+  }
+  const pkg = {
+    name: `${cfg.projectId}-functions`,
+    version: "1.0.0",
+    description: `Clefbase Functions for project ${cfg.projectId}`,
+    private: true,
+    type: "module",
+    scripts
+  };
+  return JSON.stringify(pkg, null, 2) + "\n";
+}
 function scaffoldLib(cfg, cwd = process.cwd()) {
   const libDir = import_path2.default.join(cwd, "src", "lib");
   import_fs3.default.mkdirSync(libDir, { recursive: true });
@@ -34018,10 +34592,9 @@ function buildLibTs(cfg) {
     `// \u2500\u2500\u2500 App \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`,
     ``,
     `const app = initClefbase({`,
-    `  serverUrl:   config.serverUrl,`,
-    `  projectId:   config.projectId,`,
-    `  apiKey:      config.apiKey,`,
-    `  adminSecret: "",`,
+    `  serverUrl: config.serverUrl,`,
+    `  projectId: config.projectId,`,
+    `  apiKey:    config.apiKey,`,
     `});`,
     ``
   ];
@@ -34069,7 +34642,6 @@ function buildLibTs(cfg) {
   return lines.join("\n");
 }
 async function setupHosting(cfg, cwd) {
-  var _a;
   console.log();
   console.log(source_default.bold("  Hosting"));
   console.log();
@@ -34086,6 +34658,7 @@ async function setupHosting(cfg, cwd) {
   }
   let siteId = "";
   let siteName = "";
+  let previewUrl = "";
   if (existing.length > 0) {
     const choices = [
       ...existing.map((s) => ({ name: `${s.name}  ${source_default.dim(s.id)}`, value: s.id })),
@@ -34098,8 +34671,10 @@ async function setupHosting(cfg, cwd) {
       choices
     }]);
     if (chosen !== "__new__") {
+      const found = existing.find((s) => s.id === chosen);
       siteId = chosen;
-      siteName = ((_a = existing.find((s) => s.id === chosen)) == null ? void 0 : _a.name) ?? chosen;
+      siteName = (found == null ? void 0 : found.name) ?? chosen;
+      previewUrl = (found == null ? void 0 : found.previewUrl) ?? "";
     }
   }
   if (!siteId) {
@@ -34114,6 +34689,7 @@ async function setupHosting(cfg, cwd) {
       const site = await createSite(cfg, newName.trim());
       siteId = site.id;
       siteName = site.name;
+      previewUrl = site.previewUrl ?? "";
       s.succeed(source_default.green(`Created "${siteName}"  ${source_default.dim(siteId)}`));
     } catch (err) {
       s.fail(`Failed: ${err.message}`);
@@ -34137,6 +34713,7 @@ async function setupHosting(cfg, cwd) {
   cfg.hosting = {
     siteId,
     siteName,
+    previewUrl,
     distDir: distDir.trim(),
     entrypoint: entrypoint.trim()
   };
@@ -34175,12 +34752,15 @@ function printUsageHint(cfg) {
   if (cfg.services.functions) {
     console.log();
     console.log(source_default.bold("  Functions:"));
-    console.log(source_default.cyan(`  // Deploy from a file`));
-    console.log(source_default.cyan(`  $ clefbase functions:deploy -f ./src/functions/hello.ts`));
+    console.log(source_default.cyan(`  # Edit your functions in functions/src/`));
+    console.log(source_default.cyan(`  $ clefbase functions:deploy -f functions/src/hello.ts`));
     console.log();
-    console.log(source_default.cyan(`  // Call from your app`));
+    console.log(source_default.cyan(`  # Call from your app`));
     console.log(source_default.cyan(`  const greet = httpsCallable(fns, "greetUser");`));
     console.log(source_default.cyan(`  const { data } = await greet({ name: "Alice" });`));
+    console.log();
+    console.log(source_default.dim(`  Full guide: functions/README.md`));
+    console.log(source_default.dim(`  Deploy all: node functions/deploy.mjs`));
   }
   if (cfg.services.hosting && cfg.hosting) {
     console.log();
@@ -34194,6 +34774,7 @@ function printUsageHint(cfg) {
 // src/cli/commands/deploy.ts
 var import_path3 = __toESM(require("path"));
 var import_fs4 = __toESM(require("fs"));
+var import_child_process2 = require("child_process");
 var SKIP_FILES = /* @__PURE__ */ new Set([".DS_Store", "Thumbs.db", ".gitkeep", ".gitignore"]);
 var SKIP_DIRS = /* @__PURE__ */ new Set(["node_modules", ".git", ".svn", ".hg"]);
 function scanDir(dir, base2, out) {
@@ -34218,15 +34799,51 @@ function fmtBytes(n) {
   return `${(n / (1024 * 1024)).toFixed(2)} MB`;
 }
 async function runDeploy(opts) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
   const cwd = opts.cwd ?? process.cwd();
   const cfg = requireConfig(cwd);
+  const deployHosting = !opts.only || opts.only === "hosting";
+  const deployFunctions = !opts.only || opts.only === "functions";
+  if (deployHosting && !cfg.services.hosting && opts.only === "hosting") {
+    console.error(source_default.red("\n  Hosting is not enabled for this project.\n  Run `clefbase hosting:init` to set it up.\n"));
+    process.exit(1);
+  }
+  if (deployFunctions && !cfg.services.functions && opts.only === "functions") {
+    console.error(source_default.red("\n  Functions is not enabled for this project.\n  Run `clefbase init` and enable Functions to set it up.\n"));
+    process.exit(1);
+  }
   console.log();
-  console.log(source_default.bold.cyan("  Clefbase Deploy"));
+  if (opts.only === "hosting") {
+    console.log(source_default.bold.cyan("  Clefbase Deploy  \xB7  Hosting"));
+  } else if (opts.only === "functions") {
+    console.log(source_default.bold.cyan("  Clefbase Deploy  \xB7  Functions"));
+  } else {
+    console.log(source_default.bold.cyan("  Clefbase Deploy"));
+  }
   console.log();
+  if (deployFunctions && cfg.services.functions) {
+    await runFunctionsDeploy({ cwd });
+    if (deployHosting && cfg.services.hosting) {
+      console.log();
+    }
+  }
+  if (deployHosting && cfg.services.hosting) {
+    await runHostingDeploy({ dir: opts.dir, message: opts.message, site: opts.site, cwd });
+  }
+  if (!deployHosting && !deployFunctions) {
+    console.log(source_default.yellow("  Nothing to deploy \u2014 no services matched.\n"));
+  }
+}
+async function runHostingDeploy(opts) {
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  const cwd = opts.cwd ?? process.cwd();
+  const cfg = requireConfig(cwd);
+  if (!cfg.services.hosting) {
+    console.error(source_default.red("\n  Hosting is not enabled for this project.\n  Run `clefbase hosting:init` to set it up.\n"));
+    process.exit(1);
+  }
   let siteId = opts.site ?? ((_a = cfg.hosting) == null ? void 0 : _a.siteId) ?? "";
   let siteName = ((_b = cfg.hosting) == null ? void 0 : _b.siteName) ?? "";
-  let previewUrl = "";
+  let previewUrl = ((_c = cfg.hosting) == null ? void 0 : _c.previewUrl) ?? "";
   if (!siteId) {
     const site = await pickOrCreateSite(cfg);
     siteId = site.id;
@@ -34236,12 +34853,10 @@ async function runDeploy(opts) {
       siteId,
       siteName,
       previewUrl,
-      distDir: ((_c = cfg.hosting) == null ? void 0 : _c.distDir) ?? "dist",
-      entrypoint: ((_d = cfg.hosting) == null ? void 0 : _d.entrypoint) ?? "index.html"
+      distDir: ((_d = cfg.hosting) == null ? void 0 : _d.distDir) ?? "dist",
+      entrypoint: ((_e = cfg.hosting) == null ? void 0 : _e.entrypoint) ?? "index.html"
     };
     saveConfig(cfg, cwd);
-  } else {
-    previewUrl = ((_e = cfg.hosting) == null ? void 0 : _e.previewUrl) ?? "";
   }
   const distDir = opts.dir ?? ((_f = cfg.hosting) == null ? void 0 : _f.distDir) ?? await promptDistDir(cwd);
   const absDir = import_path3.default.isAbsolute(distDir) ? distDir : import_path3.default.join(cwd, distDir);
@@ -34321,6 +34936,35 @@ async function runDeploy(opts) {
   }
   console.log();
 }
+async function runFunctionsDeploy(opts = {}) {
+  const cwd = opts.cwd ?? process.cwd();
+  const cfg = requireConfig(cwd);
+  if (!cfg.services.functions) {
+    console.error(source_default.red("\n  Functions is not enabled for this project.\n  Run `clefbase init` and enable Functions.\n"));
+    process.exit(1);
+  }
+  const deployMjs = import_path3.default.join(cwd, "functions", "deploy.mjs");
+  if (!import_fs4.default.existsSync(deployMjs)) {
+    console.error(source_default.red(`
+  \u2717 functions/deploy.mjs not found.`));
+    console.error(source_default.dim("    Re-run `clefbase init` to regenerate the functions/ folder,"));
+    console.error(source_default.dim("    or deploy individual functions with:"));
+    console.error(source_default.cyan("    clefbase functions:deploy -f functions/src/hello.ts --name hello --trigger http\n"));
+    process.exit(1);
+  }
+  console.log(source_default.bold("  Deploying functions\u2026"));
+  console.log(source_default.dim(`  Running: node functions/deploy.mjs
+`));
+  try {
+    (0, import_child_process2.execSync)("node deploy.mjs", {
+      cwd: import_path3.default.join(cwd, "functions"),
+      stdio: "inherit"
+    });
+  } catch {
+    console.error(source_default.red("\n  \u2717 One or more functions failed to deploy.\n"));
+    process.exit(1);
+  }
+}
 async function runHostingInit(cwd = process.cwd()) {
   var _a, _b;
   const cfg = requireConfig(cwd);
@@ -34647,7 +35291,7 @@ var RUNTIME_BADGE = {
   node: source_default.green("[JS/TS]"),
   python: source_default.blue("[PY]   ")
 };
-async function runFunctionsDeploy(opts) {
+async function runFunctionsDeploy2(opts) {
   const cwd = opts.cwd ?? process.cwd();
   const cfg = requireConfig(cwd);
   console.log();
@@ -34878,7 +35522,7 @@ async function promptRequired(message) {
 }
 
 // package.json
-var version = "1.5.3";
+var version = "2.0.1";
 
 // src/cli/index.ts
 var program2 = new Command();
@@ -34890,9 +35534,30 @@ program2.command("init").description("Initialise a Clefbase project in the curre
     fatal(err);
   }
 });
-program2.command("deploy").description("Deploy your built site to Clefbase Hosting").option("-d, --dir <path>", "Build output directory (overrides clefbase.json)").option("-s, --site <siteId>", "Site ID to deploy to (overrides clefbase.json)").option("-m, --message <text>", "Deploy message / release note").action(async (opts) => {
+program2.command("deploy").description("Deploy hosting and/or functions. Deploys both by default if both are enabled.").option("-d, --dir <path>", "Build output directory (overrides clefbase.json)").option("-s, --site <siteId>", "Site ID to deploy to (overrides clefbase.json)").option("-m, --message <text>", "Deploy message / release note").option("--only <target>", "Deploy only one target: hosting | functions").action(async (opts) => {
+  const only = opts.only;
+  if (only && only !== "hosting" && only !== "functions") {
+    console.error(source_default.red(`
+  --only must be "hosting" or "functions" (got: "${only}")
+`));
+    process.exit(1);
+  }
+  try {
+    await runDeploy({ ...opts, only });
+  } catch (err) {
+    fatal(err);
+  }
+});
+program2.command("deploy:hosting").description("Deploy your built site to Clefbase Hosting").option("-d, --dir <path>", "Build output directory (overrides clefbase.json)").option("-s, --site <siteId>", "Site ID to deploy to (overrides clefbase.json)").option("-m, --message <text>", "Deploy message / release note").action(async (opts) => {
+  try {
+    await runHostingDeploy(opts);
+  } catch (err) {
+    fatal(err);
+  }
+});
+program2.command("deploy:functions").description("Deploy all functions via functions/deploy.mjs").action(async () => {
   try {
-    await runDeploy(opts);
+    await runFunctionsDeploy();
   } catch (err) {
     fatal(err);
   }
@@ -34939,9 +35604,9 @@ program2.command("functions:list").alias("fn:list").description("List all deploy
     fatal(err);
   }
 });
-program2.command("functions:deploy").alias("fn:deploy").description("Deploy (or redeploy) a function from a source file or interactively").option("-n, --name <name>", "Function name").option("-f, --file <path>", "Path to source file (.js, .ts, .py)").option("-r, --runtime <runtime>", "Runtime: node | python  (auto-detected from file ext)").option("-t, --trigger <type>", "Trigger type (http, schedule, onDocumentCreate, \u2026)").option("-c, --cron <expr>", "Cron expression for schedule triggers").option("-C, --collection <path>", "Collection path for document triggers").option("-T, --timeout <ms>", "Execution timeout in milliseconds (default: 30000)").option("-e, --entry <name>", "Exported function name to call (default: handler)").option("--env <KEY=VALUE...>", "Environment variable(s) \u2014 repeatable").action(async (opts) => {
+program2.command("functions:deploy").alias("fn:deploy").description("Deploy (or redeploy) a single function from a source file or interactively").option("-n, --name <name>", "Function name").option("-f, --file <path>", "Path to source file (.js, .ts, .py)").option("-r, --runtime <runtime>", "Runtime: node | python  (auto-detected from file ext)").option("-t, --trigger <type>", "Trigger type (http, schedule, onDocumentCreate, \u2026)").option("-c, --cron <expr>", "Cron expression for schedule triggers").option("-C, --collection <path>", "Collection path for document triggers").option("-T, --timeout <ms>", "Execution timeout in milliseconds (default: 30000)").option("-e, --entry <name>", "Exported function name to call (default: handler)").option("--env <KEY=VALUE...>", "Environment variable(s) \u2014 repeatable").action(async (opts) => {
   try {
-    await runFunctionsDeploy(opts);
+    await runFunctionsDeploy2(opts);
   } catch (err) {
     fatal(err);
   }
@@ -34980,9 +35645,15 @@ ${source_default.bold("Examples:")}
   ${source_default.cyan("clefbase init")}                              Set up a new project
   ${source_default.cyan("clefbase info")}                              Show config & connection status
 
+  ${source_default.bold("Deploy:")}
+  ${source_default.cyan("clefbase deploy")}                            Deploy functions + hosting (both if enabled)
+  ${source_default.cyan("clefbase deploy --only hosting")}             Deploy hosting only
+  ${source_default.cyan("clefbase deploy --only functions")}           Deploy all functions only
+  ${source_default.cyan('clefbase deploy -d ./dist -m "v2"')}         Deploy hosting from a dir with a note
+  ${source_default.cyan("clefbase deploy:hosting")}                    Deploy hosting (alias)
+  ${source_default.cyan("clefbase deploy:functions")}                  Deploy all functions via deploy.mjs (alias)
+
   ${source_default.bold("Hosting:")}
-  ${source_default.cyan("clefbase deploy")}                            Deploy your built site
-  ${source_default.cyan('clefbase deploy -d ./dist -m "v2"')}         Deploy from a dir with a note
   ${source_default.cyan("clefbase hosting:init")}                      Link or create a hosted site
   ${source_default.cyan("clefbase hosting:status")}                    Show current live deploy
   ${source_default.cyan("clefbase hosting:sites")}                     List all sites
@@ -34991,9 +35662,9 @@ ${source_default.bold("Examples:")}
 
   ${source_default.bold("Functions:")}
   ${source_default.cyan("clefbase functions:list")}                    List all deployed functions
-  ${source_default.cyan("clefbase functions:deploy")}                  Interactive deploy wizard
-  ${source_default.cyan("clefbase functions:deploy -f ./fn.ts")}       Deploy from a file (auto-detects runtime)
-  ${source_default.cyan("clefbase functions:deploy -n greet -f fn.ts --trigger http")}
+  ${source_default.cyan("clefbase functions:deploy")}                  Interactive deploy wizard (single function)
+  ${source_default.cyan("clefbase functions:deploy -f functions/src/hello.ts --name hello --trigger http")}
+  ${source_default.cyan('clefbase functions:deploy -f functions/src/scheduled.ts --name daily --trigger schedule --cron "0 0 * * *"')}
   ${source_default.cyan("clefbase functions:call greetUser")}          Call an HTTP function
   ${source_default.cyan(`clefbase functions:call greetUser -d '{"name":"Alice"}'}`)}
   ${source_default.cyan("clefbase functions:logs greetUser")}          View execution history