@bagdock/cli 0.6.1 → 0.8.0

package/dist/bagdock.js

@@ -993,7 +993,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
         this._exitCallback = (err) => {
           if (err.code !== "commander.executeSubCommandAsync") {
             throw err;
-          } else {}
+          }
         };
       }
       return this;
@@ -4105,7 +4105,9 @@ Deploying ${config.slug}@${config.version} → ${envLabel}
   formData.append("metadata", JSON.stringify({
     version: config.version,
     environment,
-    compatibilityDate: config.compatibilityDate ?? "2024-09-23"
+    compatibilityDate: config.compatibilityDate ?? "2024-09-23",
+    ...config.kv ? { kv: config.kv } : {},
+    ...config.webhooks ? { webhooks: config.webhooks } : {}
   }));
   try {
     const res = await fetch(`${getApiBase()}/api/v1/developer/apps/${config.slug}/deploy`, {
@@ -4376,6 +4378,35 @@ async function validate() {
       checks.push({ name: "Bundle size", status: "pass", message: `${(size / 1024).toFixed(1)} KB` });
     }
   }
+  if (config.webhooks !== undefined) {
+    if (!Array.isArray(config.webhooks)) {
+      checks.push({ name: "Webhooks", status: "fail", message: '"webhooks" must be an array of { name, path, description? }' });
+    } else {
+      const problems = [];
+      const seen = new Set;
+      config.webhooks.forEach((wh, i) => {
+        if (!wh || typeof wh !== "object") {
+          problems.push(`#${i} is not an object`);
+          return;
+        }
+        if (!wh.name)
+          problems.push(`#${i} missing "name"`);
+        if (!wh.path)
+          problems.push(`#${i} missing "path"`);
+        else if (!wh.path.startsWith("/"))
+          problems.push(`"${wh.name ?? i}" path must start with "/" (got "${wh.path}")`);
+        if (wh.name && seen.has(wh.name))
+          problems.push(`duplicate name "${wh.name}"`);
+        if (wh.name)
+          seen.add(wh.name);
+      });
+      if (problems.length) {
+        checks.push({ name: "Webhooks", status: "fail", message: problems.join("; ") });
+      } else {
+        checks.push({ name: "Webhooks", status: "pass", message: `${config.webhooks.length} declared` });
+      }
+    }
+  }
   const linked = resolveSlug();
   if (linked && linked !== config.slug) {
     checks.push({ name: "Project link", status: "warn", message: `bagdock.json slug "${config.slug}" differs from linked project "${linked}"` });
@@ -4638,16 +4669,40 @@ function requireConfig() {
   }
   return config;
 }
-async function envList() {
+function parseTarget(target) {
+  if (!target)
+    return;
+  const t = target.toLowerCase();
+  if (t === "staging")
+    return ["staging"];
+  if (t === "production")
+    return ["production"];
+  if (t === "both")
+    return ["staging", "production"];
+  console.error(source_default.red(`Invalid --target: ${target}. Use staging, production, or both.`));
+  process.exit(1);
+}
+async function envList(opts) {
   const config = requireConfig();
   try {
+    if (opts?.reconcile) {
+      status("Reconciling with Cloudflare...");
+      const reconcileRes = await apiFetchJson(`/api/v1/developer/apps/${config.slug}/env/reconcile`, "POST", {});
+      if (!reconcileRes.ok) {
+        console.error(source_default.yellow(`Reconcile failed (${reconcileRes.status}) — showing cached data`));
+      }
+    }
     const res = await apiFetch(`/api/v1/developer/apps/${config.slug}/env`);
     if (!res.ok) {
       console.error(source_default.red(`Failed to list env vars (${res.status})`));
       process.exit(1);
     }
-    const { data } = await res.json();
-    if (!data.length) {
+    const body = await res.json();
+    if (isJsonMode()) {
+      outputSuccess(body);
+      return;
+    }
+    if (!body.data.length) {
       console.log(source_default.yellow("No environment variables set."));
       console.log("Use", source_default.cyan("bagdock env set <KEY> <VALUE>"), "to add one.");
       return;
@@ -4655,8 +4710,13 @@ async function envList() {
     console.log(source_default.bold(`
 Environment variables for ${config.slug}:
 `));
-    for (const v of data) {
-      console.log(`  ${source_default.cyan(v.key)}  ${source_default.dim(`(updated ${v.updatedAt})`)}`);
+    for (const v of body.data) {
+      const envLabel = v.environments?.length ? source_default.dim(`[${v.environments.join(", ")}]`) : source_default.dim("[no target]");
+      console.log(`  ${source_default.cyan(v.key)}  ${envLabel}  ${source_default.dim(`updated ${v.updatedAt}`)}`);
+    }
+    if (body.last_reconciled_at) {
+      console.log(source_default.dim(`
+Last synced with Cloudflare: ${body.last_reconciled_at}`));
     }
     console.log();
   } catch (err) {
@@ -4664,22 +4724,40 @@ Environment variables for ${config.slug}:
     process.exit(1);
   }
 }
-async function envSet(key, value) {
+async function envSet(key, value, opts) {
   const config = requireConfig();
+  const environments = parseTarget(opts?.target);
   try {
-    const res = await apiFetchJson(`/api/v1/developer/apps/${config.slug}/env`, "PUT", { key, value });
+    const payload = { key, value };
+    if (environments)
+      payload.environments = environments;
+    const res = await apiFetchJson(`/api/v1/developer/apps/${config.slug}/env`, "PUT", payload);
     if (!res.ok) {
       const body = await res.text();
       console.error(source_default.red(`Failed to set ${key} (${res.status}):`), body.slice(0, 200));
       process.exit(1);
     }
-    console.log(source_default.green(`Set ${key}`), source_default.dim("— will take effect on next deploy"));
+    const result = await res.json();
+    if (isJsonMode()) {
+      outputSuccess(result);
+      return;
+    }
+    if (result.status === "partial") {
+      console.log(source_default.yellow(`Partially set ${key}:`));
+      for (const [env2, status2] of Object.entries(result.environments ?? {})) {
+        const icon = status2 === "ok" ? source_default.green("✓") : source_default.red("✗");
+        console.log(`  ${icon} ${env2}: ${status2}`);
+      }
+    } else {
+      const targetLabel = environments ? ` (${environments.join(", ")})` : "";
+      console.log(source_default.green(`Set ${key}${targetLabel}`));
+    }
   } catch (err) {
     console.error(source_default.red("Failed:"), err.message);
     process.exit(1);
   }
 }
-async function envRemove(key) {
+async function envRemove(key, opts) {
   const config = requireConfig();
   try {
     const res = await apiFetch(`/api/v1/developer/apps/${config.slug}/env/${key}`, { method: "DELETE" });
@@ -4687,7 +4765,12 @@ async function envRemove(key) {
       console.error(source_default.red(`Failed to remove ${key} (${res.status})`));
       process.exit(1);
     }
-    console.log(source_default.green(`Removed ${key}`), source_default.dim("— will take effect on next deploy"));
+    if (isJsonMode()) {
+      const result = await res.json();
+      outputSuccess(result);
+      return;
+    }
+    console.log(source_default.green(`Removed ${key}`));
   } catch (err) {
     console.error(source_default.red("Failed:"), err.message);
     process.exit(1);
@@ -5081,8 +5164,19 @@ async function init(dir, opts) {
     const template = selectTemplate(type, kind, slug);
     writeFileSync2(entryFile, template);
   }
+  if (type === "edge" && kind === "comms") {
+    const typesFile = join2(srcDir, "types.ts");
+    if (!existsSync2(typesFile)) {
+      writeFileSync2(typesFile, COMMS_TYPES_TEMPLATE());
+    }
+    const verifyFile = join2(srcDir, "verify.ts");
+    if (!existsSync2(verifyFile)) {
+      writeFileSync2(verifyFile, COMMS_VERIFY_TEMPLATE());
+    }
+  }
   const pkgFile = join2(projectDir, "package.json");
   if (!existsSync2(pkgFile)) {
+    const deps = {};
     const devDeps = {
       "@cloudflare/workers-types": "^4.20240909.0",
       typescript: "^5.3.3"
@@ -5090,11 +5184,15 @@ async function init(dir, opts) {
     if (type === "edge" && kind === "adapter") {
       devDeps["@bagdock/adapter-worker-template"] = "workspace:*";
     }
+    if (type === "edge" && kind === "comms") {
+      deps["@bagdock/worker-sdk"] = "^0.1.0";
+    }
     writeFileSync2(pkgFile, JSON.stringify({
       name: slug,
       version: "0.1.0",
       private: true,
       main: "src/index.ts",
+      ...Object.keys(deps).length ? { dependencies: deps } : {},
       devDependencies: devDeps
     }, null, 2));
   }
@@ -5103,12 +5201,17 @@ async function init(dir, opts) {
 Initialised Bagdock ${label} project!
 `));
   console.log("Created:");
-  console.log(`  ${source_default.cyan("bagdock.json")}  — project config`);
-  console.log(`  ${source_default.cyan("src/index.ts")} — worker entry point`);
+  console.log(`  ${source_default.cyan("bagdock.json")}   — project config`);
+  console.log(`  ${source_default.cyan("src/index.ts")}  — worker entry point`);
+  if (type === "edge" && kind === "comms") {
+    console.log(`  ${source_default.cyan("src/types.ts")}  — environment bindings`);
+    console.log(`  ${source_default.cyan("src/verify.ts")} — webhook verification (customise for your vendor)`);
+  }
   console.log();
   console.log("Next steps:");
-  console.log(`  1. ${source_default.cyan("bagdock dev")}     — start local dev server`);
-  console.log(`  2. ${source_default.cyan("bagdock deploy")}  — deploy to Bagdock platform`);
+  console.log(`  1. ${source_default.cyan("bun install")}    — install dependencies`);
+  console.log(`  2. ${source_default.cyan("bagdock dev")}    — start local dev server`);
+  console.log(`  3. ${source_default.cyan("bagdock deploy")} — deploy to Bagdock platform`);
 }
 function resolveKind(type, kindOpt) {
   if (kindOpt)
@@ -5154,33 +5257,75 @@ export default createAdapterWorker(new ${toPascalCase(slug)}Adapter())
 `;
 }
 function COMMS_TEMPLATE(slug) {
-  return `/**
- * ${toPascalCase(slug)} — Communications edge worker.
- *
- * Handles SMS, Voice, or Telephony actions dispatched by the workflow engine.
- */
+  return `import { createCommsWorker } from '@bagdock/worker-sdk'
+import type { HandlerContext } from '@bagdock/worker-sdk'
+import type { Env } from './types'
+import { vendorWebhookVerify } from './verify'
 
-interface Env {
-  API_KEY: string
+async function handleSmsSend(ctx: HandlerContext<Env>): Promise<Response> {
+  const { to, body } = await ctx.request.json() as { to: string; body: string }
+  // TODO: call your vendor's SMS API using ctx.env for secrets
+  return Response.json({ id: crypto.randomUUID(), status: 'queued', provider: '${slug}', from: '', to })
 }
 
-export default {
-  async fetch(request: Request, env: Env): Promise<Response> {
-    const url = new URL(request.url)
-    const action = url.pathname.replace(/^\\//, '')
+async function handleSmsWebhook(ctx: HandlerContext<Env>): Promise<Response> {
+  const payload = await ctx.request.json()
+  ctx.logger.info('webhook.sms', { payload })
+  return Response.json({ received: true })
+}
 
-    if (action === 'send-sms') {
-      const body = await request.json() as { to: string; text: string; from?: string }
-      return Response.json({ id: crypto.randomUUID(), status: 'queued' })
-    }
+export default createCommsWorker<Env, readonly ['sms']>({
+  version: '0.1.0',
+  capabilities: ['sms'],
 
-    if (action === 'health') {
-      return Response.json({ status: 'healthy', version: '0.1.0' })
-    }
+  async onInstall(ctx) {
+    // TODO: provision vendor resources
+    ctx.logger.info('lifecycle.install', { operatorId: ctx.operatorId })
+    return { installation_state: { provisioned: true } }
+  },
+
+  async onUninstall(ctx) {
+    // TODO: clean up vendor resources
+    ctx.logger.info('lifecycle.uninstall', { operatorId: ctx.operatorId })
+  },
 
-    return Response.json({ error: 'Unknown action', action }, { status: 404 })
+  routes: {
+    'sms/send': handleSmsSend,
+    'webhooks/sms': { handler: handleSmsWebhook, verify: vendorWebhookVerify },
   },
+})
+`;
 }
+function COMMS_TYPES_TEMPLATE() {
+  return `import type { BaseEnv } from '@bagdock/worker-sdk'
+
+export interface Env extends BaseEnv {
+  ADAPTER_NAME: string
+  PROVIDER_SLUG: string
+  API_KEY: string
+  WEBHOOK_SECRET: string
+  OPERATOR_CONFIG?: KVNamespace
+}
+`;
+}
+function COMMS_VERIFY_TEMPLATE() {
+  return `import { hmacSha256Verify } from '@bagdock/worker-sdk'
+import type { VerifyFunction } from '@bagdock/worker-sdk'
+import type { Env } from './types'
+
+/**
+ * Adapter-local webhook verification.
+ *
+ * Replace with your vendor's signing method. See the @bagdock/worker-sdk
+ * README for examples using vendor SDKs or the ed25519Verify primitive.
+ */
+export const vendorWebhookVerify: VerifyFunction<Env> = (request, env, rawBody) =>
+  hmacSha256Verify({
+    signature: request.headers.get('x-webhook-signature'),
+    secret: env.WEBHOOK_SECRET,
+    signingString: rawBody,
+    timestamp: request.headers.get('x-webhook-timestamp'),
+  })
 `;
 }
 function WEBHOOK_TEMPLATE(slug) {
@@ -5358,17 +5503,17 @@ program2.command("link").description("Link current directory to a Bagdock app or
   await link2(opts);
 });
 var envCmd = program2.command("env").description("Manage app environment variables");
-envCmd.command("list").description("List environment variables for this app").action(async () => {
+envCmd.command("list").description("List environment variables for this app").option("--reconcile", "Force sync with Cloudflare before listing").action(async (opts) => {
   const { envList: envList2 } = await Promise.resolve().then(() => (init_env_cmd(), exports_env_cmd));
-  await envList2();
+  await envList2({ reconcile: opts.reconcile });
 });
-envCmd.command("set <key> <value>").description("Set an environment variable").action(async (key, value) => {
+envCmd.command("set <key> <value>").description("Set an environment variable").option("--target <target>", "Target namespace: staging, production, or both (default: both)").action(async (key, value, opts) => {
   const { envSet: envSet2 } = await Promise.resolve().then(() => (init_env_cmd(), exports_env_cmd));
-  await envSet2(key, value);
+  await envSet2(key, value, { target: opts.target });
 });
-envCmd.command("remove <key>").description("Remove an environment variable").action(async (key) => {
+envCmd.command("remove <key>").description("Remove an environment variable").option("--target <target>", "Target namespace: staging, production, or both (default: both)").action(async (key, opts) => {
   const { envRemove: envRemove2 } = await Promise.resolve().then(() => (init_env_cmd(), exports_env_cmd));
-  await envRemove2(key);
+  await envRemove2(key, { target: opts.target });
 });
 envCmd.command("pull [file]").description("Pull remote env var keys to a local .env file").action(async (file) => {
   const { envPull: envPull2 } = await Promise.resolve().then(() => (init_env_cmd(), exports_env_cmd));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bagdock/cli",
-  "version": "0.6.1",
+  "version": "0.8.0",
   "description": "Bagdock developer CLI — build, test, and deploy apps and edges on the Bagdock platform",
   "keywords": [
     "bagdock",
@@ -17,7 +17,7 @@
     "type": "git",
     "url": "git+https://github.com/bagdock/bagdock-cli.git"
   },
-  "homepage": "https://github.com/bagdock/bagdock-cli#readme",
+  "homepage": "https://bagdock.com/docs/cli",
   "bugs": {
     "url": "https://github.com/bagdock/bagdock-cli/issues"
   },