@avsbhq/cli 3.8.1 → 3.8.2

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { createRequire } from "node:module";
-const require = createRequire(import.meta.url);
+import { createRequire as __cliCreateRequire } from "node:module";
+const require = __cliCreateRequire(import.meta.url);
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -1150,8 +1150,8 @@ var require_command = __commonJS({
   "node_modules/commander/lib/command.js"(exports) {
     var EventEmitter2 = __require("node:events").EventEmitter;
     var childProcess = __require("node:child_process");
-    var path22 = __require("node:path");
-    var fs18 = __require("node:fs");
+    var path23 = __require("node:path");
+    var fs19 = __require("node:fs");
     var process11 = __require("node:process");
     var { Argument: Argument2, humanReadableArgName } = require_argument();
     var { CommanderError: CommanderError2 } = require_error();
@@ -2132,7 +2132,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {string} subcommandName
        */
       _checkForMissingExecutable(executableFile, executableDir, subcommandName) {
-        if (fs18.existsSync(executableFile)) return;
+        if (fs19.existsSync(executableFile)) return;
         const executableDirMessage = executableDir ? `searched for local subcommand relative to directory '${executableDir}'` : "no directory for search for local subcommand, use .executableDir() to supply a custom directory";
         const executableMissing = `'${executableFile}' does not exist
  - if '${subcommandName}' is not meant to be an executable command, remove description parameter from '.command()' and use '.description()' instead
@@ -2150,11 +2150,11 @@ Expecting one of '${allowedValues.join("', '")}'`);
         let launchWithNode = false;
         const sourceExt = [".js", ".ts", ".tsx", ".mjs", ".cjs"];
         function findFile(baseDir, baseName) {
-          const localBin = path22.resolve(baseDir, baseName);
-          if (fs18.existsSync(localBin)) return localBin;
-          if (sourceExt.includes(path22.extname(baseName))) return void 0;
+          const localBin = path23.resolve(baseDir, baseName);
+          if (fs19.existsSync(localBin)) return localBin;
+          if (sourceExt.includes(path23.extname(baseName))) return void 0;
           const foundExt = sourceExt.find(
-            (ext) => fs18.existsSync(`${localBin}${ext}`)
+            (ext) => fs19.existsSync(`${localBin}${ext}`)
           );
           if (foundExt) return `${localBin}${foundExt}`;
           return void 0;
@@ -2166,21 +2166,21 @@ Expecting one of '${allowedValues.join("', '")}'`);
         if (this._scriptPath) {
           let resolvedScriptPath;
           try {
-            resolvedScriptPath = fs18.realpathSync(this._scriptPath);
+            resolvedScriptPath = fs19.realpathSync(this._scriptPath);
           } catch {
             resolvedScriptPath = this._scriptPath;
           }
-          executableDir = path22.resolve(
-            path22.dirname(resolvedScriptPath),
+          executableDir = path23.resolve(
+            path23.dirname(resolvedScriptPath),
             executableDir
           );
         }
         if (executableDir) {
           let localFile = findFile(executableDir, executableFile);
           if (!localFile && !subcommand._executableFile && this._scriptPath) {
-            const legacyName = path22.basename(
+            const legacyName = path23.basename(
               this._scriptPath,
-              path22.extname(this._scriptPath)
+              path23.extname(this._scriptPath)
             );
             if (legacyName !== this._name) {
               localFile = findFile(
@@ -2191,7 +2191,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
           }
           executableFile = localFile || executableFile;
         }
-        launchWithNode = sourceExt.includes(path22.extname(executableFile));
+        launchWithNode = sourceExt.includes(path23.extname(executableFile));
         let proc;
         if (process11.platform !== "win32") {
           if (launchWithNode) {
@@ -3038,7 +3038,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @return {Command}
        */
       nameFromFilename(filename) {
-        this._name = path22.basename(filename, path22.extname(filename));
+        this._name = path23.basename(filename, path23.extname(filename));
         return this;
       }
       /**
@@ -3052,9 +3052,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {string} [path]
        * @return {(string|null|Command)}
        */
-      executableDir(path23) {
-        if (path23 === void 0) return this._executableDir;
-        this._executableDir = path23;
+      executableDir(path24) {
+        if (path24 === void 0) return this._executableDir;
+        this._executableDir = path24;
         return this;
       }
       /**
@@ -3227,13 +3227,13 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {(string | Function)} text - string to add, or a function returning a string
        * @return {Command} `this` command for chaining
        */
-      addHelpText(position, text) {
+      addHelpText(position2, text) {
         const allowedValues = ["beforeAll", "before", "after", "afterAll"];
-        if (!allowedValues.includes(position)) {
+        if (!allowedValues.includes(position2)) {
           throw new Error(`Unexpected value for position to addHelpText.
 Expecting one of '${allowedValues.join("', '")}'`);
         }
-        const helpEvent = `${position}Help`;
+        const helpEvent = `${position2}Help`;
         this.on(helpEvent, (context) => {
           let helpStr;
           if (typeof text === "function") {
@@ -4418,15 +4418,15 @@ var require_route = __commonJS({
       };
     }
     function wrapConversion(toModel, graph) {
-      const path22 = [graph[toModel].parent, toModel];
+      const path23 = [graph[toModel].parent, toModel];
       let fn = conversions[graph[toModel].parent][toModel];
       let cur = graph[toModel].parent;
       while (graph[cur].parent) {
-        path22.unshift(graph[cur].parent);
+        path23.unshift(graph[cur].parent);
         fn = link(conversions[graph[cur].parent][cur], fn);
         cur = graph[cur].parent;
       }
-      fn.conversion = path22;
+      fn.conversion = path23;
       return fn;
     }
     module.exports = function(fromModel) {
@@ -10482,10 +10482,10 @@ var require_lib2 = __commonJS({
     exports.analyse = analyse;
     var detectFile = (filepath, opts = {}) => new Promise((resolve3, reject) => {
       let fd;
-      const fs18 = (0, node_1.default)();
+      const fs19 = (0, node_1.default)();
       const handler = (err, buffer) => {
         if (fd) {
-          fs18.closeSync(fd);
+          fs19.closeSync(fd);
         }
         if (err) {
           reject(err);
@@ -10497,9 +10497,9 @@ var require_lib2 = __commonJS({
       };
       const sampleSize = (opts === null || opts === void 0 ? void 0 : opts.sampleSize) || 0;
       if (sampleSize > 0) {
-        fd = fs18.openSync(filepath, "r");
+        fd = fs19.openSync(filepath, "r");
         let sample = Buffer.allocUnsafe(sampleSize);
-        fs18.read(fd, sample, 0, sampleSize, opts.offset, (err, bytesRead) => {
+        fs19.read(fd, sample, 0, sampleSize, opts.offset, (err, bytesRead) => {
           if (err) {
             handler(err, null);
           } else {
@@ -10511,22 +10511,22 @@ var require_lib2 = __commonJS({
         });
         return;
       }
-      fs18.readFile(filepath, handler);
+      fs19.readFile(filepath, handler);
     });
     exports.detectFile = detectFile;
     var detectFileSync = (filepath, opts = {}) => {
-      const fs18 = (0, node_1.default)();
+      const fs19 = (0, node_1.default)();
       if (opts && opts.sampleSize) {
-        const fd = fs18.openSync(filepath, "r");
+        const fd = fs19.openSync(filepath, "r");
         let sample = Buffer.allocUnsafe(opts.sampleSize);
-        const bytesRead = fs18.readSync(fd, sample, 0, opts.sampleSize, opts.offset);
+        const bytesRead = fs19.readSync(fd, sample, 0, opts.sampleSize, opts.offset);
         if (bytesRead < opts.sampleSize) {
           sample = sample.subarray(0, bytesRead);
         }
-        fs18.closeSync(fd);
+        fs19.closeSync(fd);
         return (0, exports.detect)(sample);
       }
-      return (0, exports.detect)(fs18.readFileSync(filepath));
+      return (0, exports.detect)(fs19.readFileSync(filepath));
     };
     exports.detectFileSync = detectFileSync;
     exports.default = {
@@ -29097,9 +29097,9 @@ var require_websocket_server = __commonJS({
 });
 
 // src/cli.ts
-import fs17 from "node:fs";
+import fs18 from "node:fs";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
-import path21 from "node:path";
+import path22 from "node:path";
 
 // node_modules/commander/esm.mjs
 var import_index = __toESM(require_commander(), 1);
@@ -29119,7 +29119,7 @@ var {
 } = import_index.default;
 
 // src/commands/init.ts
-import path9 from "node:path";
+import path10 from "node:path";
 
 // node_modules/@inquirer/core/dist/esm/lib/key.js
 var isUpKey = (key, keybindings = []) => (
@@ -30382,16 +30382,16 @@ var esm_default2 = createPrompt((config, done) => {
     } else if (isNumberKey(key)) {
       const selectedIndex = Number(key.name) - 1;
       let selectableIndex = -1;
-      const position = items.findIndex((item) => {
+      const position2 = items.findIndex((item) => {
         if (Separator.isSeparator(item))
           return false;
         selectableIndex++;
         return selectableIndex === selectedIndex;
       });
-      const selectedItem = items[position];
+      const selectedItem = items[position2];
       if (selectedItem && isSelectable(selectedItem)) {
-        setActive(position);
-        setItems(items.map((choice, i) => i === position ? toggle(choice) : choice));
+        setActive(position2);
+        setItems(items.map((choice, i) => i === position2 ? toggle(choice) : choice));
       }
     }
   });
@@ -31442,15 +31442,15 @@ var esm_default11 = createPrompt((config, done) => {
     } else if (isNumberKey(key) && !Number.isNaN(Number(rl.line))) {
       const selectedIndex = Number(rl.line) - 1;
       let selectableIndex = -1;
-      const position = items.findIndex((item2) => {
+      const position2 = items.findIndex((item2) => {
         if (Separator.isSeparator(item2))
           return false;
         selectableIndex++;
         return selectableIndex === selectedIndex;
       });
-      const item = items[position];
+      const item = items[position2];
       if (item != null && isSelectable3(item)) {
-        setActive(position);
+        setActive(position2);
       }
       searchTimeoutRef.current = setTimeout(() => {
         rl.clearLine(0);
@@ -31529,9 +31529,9 @@ var import_run_async = __toESM(require_run_async(), 1);
 var import_mute_stream2 = __toESM(require_lib(), 1);
 import readline3 from "node:readline";
 var _ = {
-  set: (obj, path22 = "", value) => {
+  set: (obj, path23 = "", value) => {
     let pointer = obj;
-    path22.split(".").forEach((key, index, arr) => {
+    path23.split(".").forEach((key, index, arr) => {
       if (key === "__proto__" || key === "constructor")
         return;
       if (index === arr.length - 1) {
@@ -31542,8 +31542,8 @@ var _ = {
       pointer = pointer[key];
     });
   },
-  get: (obj, path22 = "", defaultValue) => {
-    const travel = (regexp) => String.prototype.split.call(path22, regexp).filter(Boolean).reduce(
+  get: (obj, path23 = "", defaultValue) => {
+    const travel = (regexp) => String.prototype.split.call(path23, regexp).filter(Boolean).reduce(
       // @ts-expect-error implicit any on res[key]
       (res, key) => res == null ? res : res[key],
       obj
@@ -31853,7 +31853,8 @@ var EXIT_FOR_CODE = {
   cli_not_found: EXIT.failure,
   cli_conflict: EXIT.conflict,
   cli_io_failed: EXIT.failure,
-  cli_failed: EXIT.failure
+  cli_failed: EXIT.failure,
+  cli_network: EXIT.failure
 };
 var CliError = class extends Error {
   code;
@@ -32062,9 +32063,9 @@ import os2 from "node:os";
 import tty from "node:tty";
 function hasFlag(flag, argv = globalThis.Deno ? globalThis.Deno.args : process4.argv) {
   const prefix = flag.startsWith("-") ? "" : flag.length === 1 ? "-" : "--";
-  const position = argv.indexOf(prefix + flag);
+  const position2 = argv.indexOf(prefix + flag);
   const terminatorPosition = argv.indexOf("--");
-  return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
+  return position2 !== -1 && (terminatorPosition === -1 || position2 < terminatorPosition);
 }
 var { env } = process4;
 var flagForceColor;
@@ -33105,6 +33106,14 @@ function label(key, value) {
   if (isQuiet()) return;
   writeOut(`  ${source_default.dim(key + ":")} ${value}`);
 }
+function field(key, value) {
+  if (isJsonOutput()) return;
+  if (isQuiet()) {
+    writeOut(`${key}: ${value}`);
+    return;
+  }
+  writeOut(`  ${source_default.dim(key + ":")} ${value}`);
+}
 function fileTree(lines) {
   if (isQuiet()) return;
   for (const line2 of lines) {
@@ -33117,6 +33126,62 @@ function line(msg = "") {
   writeOut(msg);
 }
 
+// src/lib/apiErrorDetails.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function readPath(value) {
+  if (!Array.isArray(value)) return void 0;
+  const path23 = value.filter((part) => typeof part === "string" || typeof part === "number");
+  return path23.length === value.length ? path23 : void 0;
+}
+function readValidationIssues(details) {
+  const raw = details?.issues;
+  if (!Array.isArray(raw)) return [];
+  const issues = [];
+  for (const entry of raw) {
+    if (!isRecord(entry) || typeof entry.message !== "string") continue;
+    const path23 = readPath(entry.path) ?? [];
+    const param = typeof entry.param === "string" ? entry.param : path23.join(".");
+    issues.push({ path: path23, param, message: entry.message });
+  }
+  return issues;
+}
+function readCompilationErrors(details) {
+  const raw = details?.compilationErrors;
+  if (!Array.isArray(raw)) return [];
+  const errors = [];
+  for (const entry of raw) {
+    if (!isRecord(entry) || typeof entry.file !== "string" || typeof entry.message !== "string") continue;
+    const path23 = readPath(entry.path);
+    errors.push({
+      file: entry.file,
+      line: typeof entry.line === "number" ? entry.line : 0,
+      column: typeof entry.column === "number" ? entry.column : 0,
+      message: entry.message,
+      ...path23 ? { path: path23 } : {}
+    });
+  }
+  return errors;
+}
+function position(file, line2, column) {
+  if (line2 <= 0) return file;
+  return column > 0 ? `${file}:${line2}:${column}` : `${file}:${line2}`;
+}
+function describeErrorDetails(details, labelForPath) {
+  const lines = [];
+  for (const issue of readValidationIssues(details)) {
+    const label2 = issue.path.length > 0 ? labelForPath?.(issue.path) : void 0;
+    const where = label2 ? `${label2} (${issue.param})` : issue.param || "(request body)";
+    lines.push(`${where}: ${issue.message}`);
+  }
+  for (const error2 of readCompilationErrors(details)) {
+    const label2 = error2.path ? labelForPath?.(error2.path) : void 0;
+    lines.push(`${position(label2 ?? error2.file, error2.line, error2.column)}: ${error2.message}`);
+  }
+  return lines;
+}
+
 // src/lib/tokenShape.ts
 var CREDENTIAL_NAMES = {
   personalAccessToken: "personal access token",
@@ -33171,7 +33236,7 @@ var ApiRequestError = class extends Error {
     return exitCodeForStatus(this.status);
   }
 };
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function asString(value) {
@@ -33185,16 +33250,16 @@ function parseRetryAfter(raw) {
 function toApiRequestError(input) {
   const retryAfterSeconds = parseRetryAfter(input.retryAfter);
   const headerRequestId = asString(input.requestId ?? void 0);
-  if (isRecord(input.body)) {
+  if (isRecord2(input.body)) {
     const raw = input.body.error;
-    if (isRecord(raw)) {
+    if (isRecord2(raw)) {
       return new ApiRequestError({
         status: input.status,
         message: asString(raw.message) ?? `API error ${input.status}`,
         code: asString(raw.code),
         docUrl: asString(raw.docUrl),
         requestId: asString(raw.requestId) ?? headerRequestId,
-        details: isRecord(raw.details) ? raw.details : void 0,
+        details: isRecord2(raw.details) ? raw.details : void 0,
         retryAfterSeconds
       });
     }
@@ -33215,13 +33280,13 @@ function toApiRequestError(input) {
   }
   return new ApiRequestError({
     status: input.status,
-    message: `API error ${input.status}`,
+    message: input.host ? `${input.host} answered HTTP ${input.status}, which is not an A vs B API response. Check the API URL.` : `API error ${input.status}`,
     requestId: headerRequestId,
     retryAfterSeconds
   });
 }
-function describeApiFailure(error2) {
-  const lines = [];
+function describeApiFailure(error2, labelForPath) {
+  const lines = describeErrorDetails(error2.details, labelForPath);
   if (error2.status === 401) {
     lines.push(
       `Check the credential: the CLI signs in with a ${CREDENTIAL_NAMES.personalAccessToken} (${CREDENTIAL_NAMES.personalAccessTokenPrefix}\u2026). Run \`avsb whoami\` to see which one is in use, or \`avsb login\` to replace it.`
@@ -33296,31 +33361,31 @@ function exitCodeFor(error2) {
   if (error2 instanceof CliError) return error2.exitCode;
   return EXIT.failure;
 }
-function hintsFor(error2) {
-  if (error2 instanceof ApiRequestError) return describeApiFailure(error2);
+function hintsFor(error2, labelForPath) {
+  if (error2 instanceof ApiRequestError) return describeApiFailure(error2, labelForPath);
   if (error2 instanceof CliError) return error2.hints;
   return [];
 }
-function failCommand(error2) {
+function failCommand(error2, options = {}) {
   const body = toJsonErrorBody(error2);
   if (isJsonOutput()) {
     writeOut(JSON.stringify({ ok: false, command: commandName, error: body }, null, 2));
   }
   error(body.message);
-  for (const hint of hintsFor(error2)) errorDetail(hint);
+  for (const hint of hintsFor(error2, options.labelForPath)) errorDetail(hint);
   process.exit(exitCodeFor(error2));
 }
 
 // src/lib/credentials.ts
 var CONFIG_VERSION = 2;
-function isRecord2(value) {
+function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isNonEmptyString(value) {
   return typeof value === "string" && value.trim().length > 0;
 }
 function isStoredLogin(value) {
-  return isRecord2(value) && isNonEmptyString(value.orgId) && typeof value.orgName === "string" && isNonEmptyString(value.token);
+  return isRecord3(value) && isNonEmptyString(value.orgId) && typeof value.orgName === "string" && isNonEmptyString(value.token);
 }
 function parseConfigDocument(raw) {
   let parsed;
@@ -33329,7 +33394,7 @@ function parseConfigDocument(raw) {
   } catch {
     return { status: "unreadable", detail: "it is not valid JSON" };
   }
-  if (!isRecord2(parsed)) {
+  if (!isRecord3(parsed)) {
     return { status: "unreadable", detail: "it does not contain a JSON object" };
   }
   if (parsed.version !== CONFIG_VERSION) {
@@ -33534,6 +33599,17 @@ var FRAMEWORK_IDS = [
   "node",
   "none"
 ];
+var BUNDLERS = [
+  { id: "vite", dependency: "vite" },
+  { id: "create-react-app", dependency: "react-scripts" },
+  { id: "vue-cli", dependency: "@vue/cli-service" }
+];
+function detectBundler(deps) {
+  for (const bundler of BUNDLERS) {
+    if (Object.prototype.hasOwnProperty.call(deps, bundler.dependency)) return bundler;
+  }
+  return null;
+}
 function parsePackageJson(raw) {
   let parsed;
   try {
@@ -33566,12 +33642,13 @@ function allDependencies(pkg2) {
 }
 function detectFramework(pkg2) {
   if (!pkg2) {
-    return { id: "none", matchedDependency: null, usesVite: false, usesSvelteKit: false };
+    return { id: "none", matchedDependency: null, usesVite: false, usesSvelteKit: false, bundler: null };
   }
   const deps = allDependencies(pkg2);
   const has = (name) => Object.prototype.hasOwnProperty.call(deps, name);
   const usesVite = has("vite");
   const usesSvelteKit = has("@sveltejs/kit");
+  const bundler = detectBundler(deps);
   const ordered = [
     { id: "nuxt", dependency: "nuxt" },
     { id: "next", dependency: "next" },
@@ -33588,11 +33665,12 @@ function detectFramework(pkg2) {
         id: candidate.id,
         matchedDependency: candidate.dependency,
         usesVite,
-        usesSvelteKit
+        usesSvelteKit,
+        bundler
       };
     }
   }
-  return { id: "node", matchedDependency: null, usesVite, usesSvelteKit };
+  return { id: "node", matchedDependency: null, usesVite, usesSvelteKit, bundler };
 }
 function isFrameworkId(value) {
   return FRAMEWORK_IDS.includes(value);
@@ -33640,9 +33718,26 @@ function installArgv(manager, npmPackage) {
 }
 
 // src/lib/frameworkProfiles.ts
-var VITE_ENV_VAR = "VITE_AVSB_SDK_KEY";
-var VITE_ENV_FILE = ".env.local";
-var UNPREFIXED_CAVEAT = "No Vite in this project, so the browser variable prefix is your bundler's call. Create React App wants REACT_APP_, Vite wants VITE_. Rename the variable to match, or pass the key to the provider directly.";
+var BROWSER_ENV_FILE = ".env.local";
+var UNPREFIXED_CAVEAT = "No Vite, Create React App or Vue CLI in this project, so the browser variable prefix is your bundler's call. Rename AVSB_SDK_KEY to the prefix your bundler exposes to the browser, or pass the key to the provider directly.";
+var BUNDLER_VARIABLES = {
+  vite: { envVar: "VITE_AVSB_SDK_KEY", label: "Vite", prefix: "VITE_" },
+  "create-react-app": { envVar: "REACT_APP_AVSB_SDK_KEY", label: "Create React App", prefix: "REACT_APP_" },
+  "vue-cli": { envVar: "VUE_APP_AVSB_SDK_KEY", label: "Vue CLI", prefix: "VUE_APP_" }
+};
+function browserVariable(detection) {
+  const bundler = detection.bundler;
+  const applies = bundler !== null && (bundler.id === "vite" || bundler.id === "create-react-app" && detection.id === "react" || bundler.id === "vue-cli" && detection.id === "vue");
+  if (!applies || bundler === null) {
+    return { envVar: "AVSB_SDK_KEY", envVarReason: null, caveat: UNPREFIXED_CAVEAT };
+  }
+  const known = BUNDLER_VARIABLES[bundler.id];
+  return {
+    envVar: known.envVar,
+    envVarReason: `found ${bundler.dependency}, and ${known.label} only exposes ${known.prefix} variables to the browser`,
+    caveat: null
+  };
+}
 function buildFrameworkProfile(detection) {
   switch (detection.id) {
     case "next":
@@ -33654,6 +33749,7 @@ function buildFrameworkProfile(detection) {
         envVar: "AVSB_SDK_KEY",
         exampleFile: "avsb-example.tsx",
         caveat: null,
+        envVarReason: null,
         docsPath: "/docs/integrations/nextjs-app-router"
       };
     case "nuxt":
@@ -33665,6 +33761,7 @@ function buildFrameworkProfile(detection) {
         envVar: "NUXT_PUBLIC_AVSB_SDK_KEY",
         exampleFile: "components/AvsbExample.vue",
         caveat: 'Add "@avsbhq/nuxt" to the modules array in nuxt.config.ts. The module reads the key from this variable.',
+        envVarReason: null,
         docsPath: "/docs/integrations/nuxt"
       };
     case "angular":
@@ -33676,6 +33773,7 @@ function buildFrameworkProfile(detection) {
         envVar: null,
         exampleFile: "src/app/avsb-example.component.ts",
         caveat: "Angular reads configuration from src/environments/environment.ts rather than an environment file, so the example carries the key inline. Move it into your environment file if you keep one per build target.",
+        envVarReason: null,
         docsPath: "/docs/integrations/angular-cli"
       };
     case "svelte":
@@ -33687,15 +33785,15 @@ function buildFrameworkProfile(detection) {
         envVar: "PUBLIC_AVSB_SDK_KEY",
         exampleFile: "src/lib/AvsbExample.svelte",
         caveat: null,
+        envVarReason: null,
         docsPath: "/docs/integrations/sveltekit"
       } : {
         id: "svelte",
         label: "Svelte",
         sdkPackage: "@avsbhq/svelte",
-        envFile: VITE_ENV_FILE,
-        envVar: detection.usesVite ? VITE_ENV_VAR : "AVSB_SDK_KEY",
+        envFile: BROWSER_ENV_FILE,
+        ...browserVariable(detection),
         exampleFile: "src/AvsbExample.svelte",
-        caveat: detection.usesVite ? null : UNPREFIXED_CAVEAT,
         docsPath: "/docs/integrations/vite-svelte"
       };
     case "vue":
@@ -33703,10 +33801,9 @@ function buildFrameworkProfile(detection) {
         id: "vue",
         label: "Vue",
         sdkPackage: "@avsbhq/vue",
-        envFile: VITE_ENV_FILE,
-        envVar: detection.usesVite ? VITE_ENV_VAR : "AVSB_SDK_KEY",
+        envFile: BROWSER_ENV_FILE,
+        ...browserVariable(detection),
         exampleFile: "src/AvsbExample.vue",
-        caveat: detection.usesVite ? null : UNPREFIXED_CAVEAT,
         docsPath: "/docs/integrations/vite-vue"
       };
     case "solid":
@@ -33714,10 +33811,9 @@ function buildFrameworkProfile(detection) {
         id: "solid",
         label: "Solid",
         sdkPackage: "@avsbhq/solid",
-        envFile: VITE_ENV_FILE,
-        envVar: detection.usesVite ? VITE_ENV_VAR : "AVSB_SDK_KEY",
+        envFile: BROWSER_ENV_FILE,
+        ...browserVariable(detection),
         exampleFile: "src/avsb-example.tsx",
-        caveat: detection.usesVite ? null : UNPREFIXED_CAVEAT,
         docsPath: "/docs/integrations/vite-solid"
       };
     case "react":
@@ -33725,10 +33821,9 @@ function buildFrameworkProfile(detection) {
         id: "react",
         label: "React",
         sdkPackage: "@avsbhq/react",
-        envFile: VITE_ENV_FILE,
-        envVar: detection.usesVite ? VITE_ENV_VAR : "AVSB_SDK_KEY",
+        envFile: BROWSER_ENV_FILE,
+        ...browserVariable(detection),
         exampleFile: "src/avsb-example.tsx",
-        caveat: detection.usesVite ? null : UNPREFIXED_CAVEAT,
         docsPath: "/docs/integrations/vite-react"
       };
     case "node":
@@ -33740,6 +33835,7 @@ function buildFrameworkProfile(detection) {
         envVar: "AVSB_SDK_KEY",
         exampleFile: "avsb-example.ts",
         caveat: null,
+        envVarReason: null,
         docsPath: "/docs/developer-reference/avsb-node"
       };
     case "none":
@@ -33754,6 +33850,7 @@ function buildFrameworkProfile(detection) {
         // a feature flags project set up from a folder with no package.json was
         // being told it was a web experiments project.
         caveat: "No package.json here, so no framework was detected. Run this in your application directory to have the SDK wired up for you.",
+        envVarReason: null,
         docsPath: "/docs/getting-started/installing-the-snippet"
       };
   }
@@ -33762,13 +33859,19 @@ function buildFrameworkProfile(detection) {
 // src/lib/heartbeatWait.ts
 var HEARTBEAT_INTERVAL_MS = 3e3;
 var HEARTBEAT_TIMEOUT_MS = 12e4;
-var CLOCK_ALLOWANCE_MS = 6e4;
+var CLOCK_ALLOWANCE_MS = 5e3;
 function isFreshHeartbeat(lastSdkSeenAt, startedAt, allowanceMs = CLOCK_ALLOWANCE_MS) {
   if (!lastSdkSeenAt) return false;
   const seenAt = Date.parse(lastSdkSeenAt);
   if (Number.isNaN(seenAt)) return false;
   return seenAt >= startedAt - allowanceMs;
 }
+function isNewerThan(stamp, previous) {
+  if (!stamp || !previous) return false;
+  const seenAt = Date.parse(stamp);
+  const before = Date.parse(previous);
+  return !Number.isNaN(seenAt) && !Number.isNaN(before) && seenAt > before;
+}
 async function waitForHeartbeat(options) {
   const timeoutMs = options.timeoutMs ?? HEARTBEAT_TIMEOUT_MS;
   const intervalMs = options.intervalMs ?? HEARTBEAT_INTERVAL_MS;
@@ -33788,7 +33891,8 @@ async function waitForHeartbeat(options) {
       previousSeenAt = sample.lastSdkSeenAt;
       first = false;
     }
-    if (isFreshHeartbeat(sample.lastSdkSeenAt, options.startedAt) && sample.lastSdkSeenAt) {
+    const arrivedWhileWatching = isNewerThan(sample.lastSdkSeenAt, previousSeenAt);
+    if (sample.lastSdkSeenAt && (arrivedWhileWatching || isFreshHeartbeat(sample.lastSdkSeenAt, options.startedAt))) {
       return {
         seen: true,
         at: sample.lastSdkSeenAt,
@@ -33809,6 +33913,7 @@ function heartbeatTimeoutGuidance(input) {
   const seconds = Math.round(input.waitedMs / 1e3);
   const lines = [
     `No check-in from ${input.environmentName} in ${seconds}s. Everything above is written; only the proof is missing.`,
+    `${turnFlagOnCommand(input.flagKey ?? null, input.environmentKey ?? "production")} An environment where nothing has been turned on has no configuration for the SDK to load, and the SDK checks in only after it loads one.`,
     "Start your app once, then run `avsb init --wait 120` again to watch for it.",
     `Check that the key your code loads is ${input.sdkKey}.`,
     `Check that outbound requests to ${input.cdnHost} and ${input.appHost} are allowed.`
@@ -33820,14 +33925,109 @@ function heartbeatTimeoutGuidance(input) {
   }
   return lines;
 }
+function turnFlagOnCommand(flagKey, environmentKey) {
+  return `Turn a flag on with \`avsb flags toggle ${flagKey ?? "<key>"} --env ${environmentKey} --on\`.`;
+}
 function defaultSleep(ms) {
   return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
 
+// src/lib/networkError.ts
+var DNS_CODES = /* @__PURE__ */ new Set(["ENOTFOUND", "EAI_AGAIN", "EAI_NONAME", "EAI_FAIL"]);
+var TIMEOUT_CODES = /* @__PURE__ */ new Set(["ETIMEDOUT", "UND_ERR_CONNECT_TIMEOUT", "UND_ERR_HEADERS_TIMEOUT", "ESOCKETTIMEDOUT"]);
+var RESET_CODES = /* @__PURE__ */ new Set(["ECONNRESET", "EPIPE", "UND_ERR_SOCKET", "ECONNABORTED"]);
+function isRecord4(value) {
+  return typeof value === "object" && value !== null;
+}
+function networkErrorCode(err) {
+  let current = err;
+  for (let depth = 0; depth < 5 && isRecord4(current); depth++) {
+    if (typeof current.code === "string") return current.code;
+    if (Array.isArray(current.errors)) {
+      for (const inner of current.errors) {
+        const code = networkErrorCode(inner);
+        if (code) return code;
+      }
+    }
+    current = current.cause;
+  }
+  return null;
+}
+function networkErrorReason(err) {
+  let current = err;
+  let reason = null;
+  for (let depth = 0; depth < 5 && isRecord4(current); depth++) {
+    const message = current.message;
+    if (typeof message === "string" && message.length > 0 && message !== "fetch failed") reason = message;
+    current = current.cause;
+  }
+  return reason;
+}
+function classifyNetworkError(code) {
+  if (code === null) return "other";
+  if (DNS_CODES.has(code)) return "dns";
+  if (code === "ECONNREFUSED") return "refused";
+  if (TIMEOUT_CODES.has(code)) return "timeout";
+  if (RESET_CODES.has(code)) return "reset";
+  if (/CERT|TLS|SSL|SELF_SIGNED|UNABLE_TO_VERIFY|UNABLE_TO_GET_ISSUER/.test(code)) return "tls";
+  return "other";
+}
+function hostOf(baseUrl) {
+  try {
+    return new URL(baseUrl).host;
+  } catch {
+    return baseUrl;
+  }
+}
+function describeNetworkFailure(baseUrl, err) {
+  const host = hostOf(baseUrl);
+  const code = networkErrorCode(err);
+  const kind = classifyNetworkError(code);
+  const urlHint = `The API URL in use is ${baseUrl}. Check AVSB_API_URL, or the URL \`avsb login --url\` saved.`;
+  const networkHint = "Check your network connection, VPN or proxy.";
+  switch (kind) {
+    case "dns":
+      return new CliError("cli_network", `Cannot find ${host}: the name does not resolve (DNS lookup failed).`, [urlHint, networkHint]);
+    case "refused":
+      return new CliError("cli_network", `Nothing is listening at ${host}: the connection was refused.`, [urlHint]);
+    case "timeout":
+      return new CliError("cli_network", `${host} did not answer in time (the connection timed out).`, [networkHint]);
+    case "reset":
+      return new CliError("cli_network", `${host} closed the connection before answering.`, [networkHint]);
+    case "tls":
+      return new CliError("cli_network", `Could not make a secure connection to ${host} (${code}).`, [
+        "A proxy or antivirus that inspects HTTPS can cause this. Check its certificate settings."
+      ]);
+    case "other": {
+      const reason = code ?? networkErrorReason(err) ?? "no answer";
+      return new CliError("cli_network", `Could not reach ${host} (${reason}).`, [urlHint, networkHint]);
+    }
+  }
+}
+function invalidBaseUrl(baseUrl) {
+  let protocol = "";
+  try {
+    protocol = new URL(baseUrl).protocol;
+  } catch {
+    protocol = "";
+  }
+  if (protocol === "http:" || protocol === "https:") return null;
+  return new CliError("cli_usage", `"${baseUrl}" is not a valid API URL.`, [
+    "Use a full address such as https://app.avsb.cloud, in AVSB_API_URL or `avsb login --url`."
+  ]);
+}
+
 // src/lib/apiTransport.ts
 var API_VERSION = "v1";
 var API_VERSION_HEADER = "AvsB-API-Version";
 var REQUEST_ID_HEADER = "X-Request-Id";
+function hostOf2(baseUrl) {
+  try {
+    return new URL(baseUrl).host;
+  } catch {
+    return void 0;
+  }
+}
 var ApiTransport = class {
   baseUrl;
   token;
@@ -33858,18 +34058,25 @@ var ApiTransport = class {
    * body parsing. It reports what came back and judges nothing, so both the
    * plain and the conditional paths below share exactly one implementation.
    */
-  async send(path22, options) {
+  async send(path23, options) {
     this.assertUsableToken();
-    const url = `${this.baseUrl}${path22}`;
-    const res = await fetch(url, {
-      ...options,
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${this.token}`,
-        [API_VERSION_HEADER]: API_VERSION,
-        ...options.headers
-      }
-    });
+    const badUrl = invalidBaseUrl(this.baseUrl);
+    if (badUrl) throw badUrl;
+    const url = `${this.baseUrl}${path23}`;
+    let res;
+    try {
+      res = await fetch(url, {
+        ...options,
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${this.token}`,
+          [API_VERSION_HEADER]: API_VERSION,
+          ...options.headers
+        }
+      });
+    } catch (err) {
+      throw describeNetworkFailure(this.baseUrl, err);
+    }
     let body = null;
     const text = await res.text();
     if (text.length > 0) {
@@ -33886,7 +34093,8 @@ var ApiTransport = class {
       status: res.status,
       body,
       requestId: res.headers.get(REQUEST_ID_HEADER),
-      retryAfter: res.headers.get("Retry-After")
+      retryAfter: res.headers.get("Retry-After"),
+      host: hostOf2(this.baseUrl)
     });
   }
   /**
@@ -33894,8 +34102,8 @@ var ApiTransport = class {
    * named methods. Returns the body and the ETag; `request` unwraps it for the
    * common case.
    */
-  async requestWithMeta(path22, options = {}) {
-    const { res, body } = await this.send(path22, options);
+  async requestWithMeta(path23, options = {}) {
+    const { res, body } = await this.send(path23, options);
     if (!res.ok) throw this.refusal(res, body);
     return { body, etag: res.headers.get("ETag") };
   }
@@ -33907,9 +34115,9 @@ var ApiTransport = class {
    * back to comparing what it generated. Nothing here assumes the platform
    * supports conditional reads.
    */
-  async requestIfNoneMatch(path22, etag) {
+  async requestIfNoneMatch(path23, etag) {
     const { res, body } = await this.send(
-      path22,
+      path23,
       etag ? { headers: { "If-None-Match": etag } } : {}
     );
     if (res.status === 304) {
@@ -33918,8 +34126,8 @@ var ApiTransport = class {
     if (!res.ok) throw this.refusal(res, body);
     return { status: "ok", body, etag: res.headers.get("ETag") };
   }
-  async request(path22, options = {}) {
-    const result = await this.requestWithMeta(path22, options);
+  async request(path23, options = {}) {
+    const result = await this.requestWithMeta(path23, options);
     return result.body;
   }
 };
@@ -33947,6 +34155,11 @@ var ApiClient = class extends ApiTransport {
       body: JSON.stringify(data)
     });
   }
+  /**
+   * Publish an experiment's pending changes, as the dashboard's Publish
+   * changes button does. `warning` is set when the change is saved but the
+   * live datafile could not be written yet (the platform retries it).
+   */
   async publishChanges(shortId) {
     return this.request(`/api/cli/experiments/${shortId}/publish`, {
       method: "POST"
@@ -33961,11 +34174,6 @@ var ApiClient = class extends ApiTransport {
       body: JSON.stringify(data)
     });
   }
-  async publishProject(shortId) {
-    return this.request(`/api/cli/projects/${shortId}/publish`, {
-      method: "POST"
-    });
-  }
   /**
    * Fetch a project's published datafile for a given environment.
    *
@@ -33983,8 +34191,8 @@ var ApiClient = class extends ApiTransport {
     if (opts.type) params.set("type", opts.type);
     if (opts.includeArchived) params.set("includeArchived", "true");
     const qs = params.toString();
-    const path22 = `/api/cli/projects/${projectShortId}/metrics${qs ? `?${qs}` : ""}`;
-    return this.request(path22);
+    const path23 = `/api/cli/projects/${projectShortId}/metrics${qs ? `?${qs}` : ""}`;
+    return this.request(path23);
   }
   async createMetric(projectShortId, body) {
     return this.request(
@@ -33995,14 +34203,9 @@ var ApiClient = class extends ApiTransport {
       }
     );
   }
-  async getMetric(projectShortId, metricId) {
-    return this.request(
-      `/api/cli/projects/${projectShortId}/metrics/${metricId}`
-    );
-  }
   async updateMetric(projectShortId, metricId, patch) {
     return this.request(
-      `/api/cli/projects/${projectShortId}/metrics/${metricId}`,
+      `/api/cli/projects/${projectShortId}/metrics/${encodeURIComponent(metricId)}`,
       {
         method: "PATCH",
         body: JSON.stringify(patch)
@@ -34011,19 +34214,19 @@ var ApiClient = class extends ApiTransport {
   }
   async archiveMetric(projectShortId, metricId) {
     return this.request(
-      `/api/cli/projects/${projectShortId}/metrics/${metricId}/archive`,
+      `/api/cli/projects/${projectShortId}/metrics/${encodeURIComponent(metricId)}/archive`,
       { method: "POST" }
     );
   }
   async unarchiveMetric(projectShortId, metricId) {
     return this.request(
-      `/api/cli/projects/${projectShortId}/metrics/${metricId}/unarchive`,
+      `/api/cli/projects/${projectShortId}/metrics/${encodeURIComponent(metricId)}/unarchive`,
       { method: "POST" }
     );
   }
   async deleteMetric(projectShortId, metricId) {
     return this.request(
-      `/api/cli/projects/${projectShortId}/metrics/${metricId}`,
+      `/api/cli/projects/${projectShortId}/metrics/${encodeURIComponent(metricId)}`,
       { method: "DELETE" }
     );
   }
@@ -34035,8 +34238,8 @@ var ApiClient = class extends ApiTransport {
     if (opts.includeArchived) params.set("includeArchived", "true");
     if (opts.limit != null) params.set("limit", String(opts.limit));
     const qs = params.toString();
-    const path22 = `/api/cli/projects/${projectShortId}/metric-bindings${qs ? `?${qs}` : ""}`;
-    return this.request(path22);
+    const path23 = `/api/cli/projects/${projectShortId}/metric-bindings${qs ? `?${qs}` : ""}`;
+    return this.request(path23);
   }
   async createMetricBinding(projectShortId, body) {
     return this.request(
@@ -34047,14 +34250,9 @@ var ApiClient = class extends ApiTransport {
       }
     );
   }
-  async getMetricBinding(projectShortId, metricBindingId) {
-    return this.request(
-      `/api/cli/projects/${projectShortId}/metric-bindings/${metricBindingId}`
-    );
-  }
   async updateMetricBinding(projectShortId, metricBindingId, patch) {
     return this.request(
-      `/api/cli/projects/${projectShortId}/metric-bindings/${metricBindingId}`,
+      `/api/cli/projects/${projectShortId}/metric-bindings/${encodeURIComponent(metricBindingId)}`,
       {
         method: "PATCH",
         body: JSON.stringify(patch)
@@ -34063,19 +34261,19 @@ var ApiClient = class extends ApiTransport {
   }
   async archiveMetricBinding(projectShortId, metricBindingId) {
     return this.request(
-      `/api/cli/projects/${projectShortId}/metric-bindings/${metricBindingId}/archive`,
+      `/api/cli/projects/${projectShortId}/metric-bindings/${encodeURIComponent(metricBindingId)}/archive`,
       { method: "POST" }
     );
   }
   async unarchiveMetricBinding(projectShortId, metricBindingId) {
     return this.request(
-      `/api/cli/projects/${projectShortId}/metric-bindings/${metricBindingId}/unarchive`,
+      `/api/cli/projects/${projectShortId}/metric-bindings/${encodeURIComponent(metricBindingId)}/unarchive`,
       { method: "POST" }
     );
   }
   async deleteMetricBinding(projectShortId, metricBindingId) {
     return this.request(
-      `/api/cli/projects/${projectShortId}/metric-bindings/${metricBindingId}`,
+      `/api/cli/projects/${projectShortId}/metric-bindings/${encodeURIComponent(metricBindingId)}`,
       { method: "DELETE" }
     );
   }
@@ -34123,11 +34321,16 @@ var ApiClient = class extends ApiTransport {
    * presigned PUTs reject chunked transfer encoding).
    */
   async uploadNdjson(uploadUrl, body) {
-    const res = await fetch(uploadUrl, {
-      method: "PUT",
-      headers: { "Content-Type": "application/x-ndjson" },
-      body
-    });
+    let res;
+    try {
+      res = await fetch(uploadUrl, {
+        method: "PUT",
+        headers: { "Content-Type": "application/x-ndjson" },
+        body
+      });
+    } catch (err) {
+      throw describeNetworkFailure(new URL(uploadUrl).origin, err);
+    }
     if (!res.ok) {
       throw new Error(`Upload failed: HTTP ${res.status}`);
     }
@@ -34411,9 +34614,9 @@ function servedValueFor(flag) {
   if (!variation) return null;
   return { variationKey: variation.key, value: variation.value };
 }
-function describeServedValue(flagKey, served) {
+function describeServedValue(flagKey, served, environmentKey = "production") {
   if (!served) {
-    return `${flagKey} is not being served in this environment yet, so your code gets the fallback you pass.`;
+    return `${flagKey} is not being served in this environment yet, so your code gets the fallback you pass. Turn it on with \`avsb flags toggle ${flagKey} --env ${environmentKey} --on\`.`;
   }
   return `${flagKey} serves ${JSON.stringify(served.value)} (variation ${served.variationKey}) when no targeting rule matches.`;
 }
@@ -34426,12 +34629,46 @@ function canPrompt(ctx) {
   if (envFlagEnabled(ctx.env.CI)) return false;
   return true;
 }
-function isInteractiveRun(options = {}) {
-  return canPrompt({
+function currentPromptContext(options = {}) {
+  return {
     input: options.input !== false,
     quiet: isQuiet(),
     isTty: process.stdin.isTTY === true,
     env: process.env
+  };
+}
+function isInteractiveRun(options = {}) {
+  return canPrompt(currentPromptContext(options));
+}
+function refusalWithoutPrompt(refusal, ctx = currentPromptContext()) {
+  if (canPrompt(ctx)) return null;
+  return new CliError(refusal.code, refusal.message, refusal.hints);
+}
+var STDIN_IDLE_TIMEOUT_MS = 3e3;
+function readPipedStdin(stream = process.stdin, idleMs = STDIN_IDLE_TIMEOUT_MS) {
+  return new Promise((resolve3) => {
+    const chunks = [];
+    let timer = null;
+    const finish = () => {
+      if (timer) clearTimeout(timer);
+      stream.removeListener("data", onData);
+      stream.removeListener("end", finish);
+      stream.removeListener("error", finish);
+      if ("pause" in stream && typeof stream.pause === "function") stream.pause();
+      resolve3(Buffer.concat(chunks).toString("utf-8"));
+    };
+    const arm = () => {
+      if (timer) clearTimeout(timer);
+      timer = setTimeout(finish, idleMs);
+    };
+    const onData = (chunk) => {
+      chunks.push(typeof chunk === "string" ? Buffer.from(chunk) : chunk);
+      arm();
+    };
+    stream.on("data", onData);
+    stream.once("end", finish);
+    stream.once("error", finish);
+    arm();
   });
 }
 
@@ -34514,10 +34751,40 @@ function unquote(value) {
   return quote2 === '"' ? body.replace(/\\(["\\])/g, "$1") : body;
 }
 
-// src/commands/init.write.ts
+// src/lib/gitignore.ts
 import { spawnSync as spawnSync2 } from "node:child_process";
 import fs3 from "node:fs";
 import path4 from "node:path";
+var GITIGNORE_BANNER = "# A vs B: the SDK key file `avsb init` writes";
+function gitIgnoreState(dir, file) {
+  const result = spawnSync2("git", ["check-ignore", "-q", "--", file], { cwd: dir, stdio: "ignore" });
+  if (result.error) return "no-repo";
+  if (result.status === 0) return "ignored";
+  if (result.status === 1) return "not-ignored";
+  return "no-repo";
+}
+function appendGitignoreEntry(existing, file) {
+  const entry = `${GITIGNORE_BANNER}
+${file}
+`;
+  if (existing === null || existing.length === 0) return entry;
+  const separator = existing.endsWith("\n") ? "\n" : "\n\n";
+  return `${existing}${separator}${entry}`;
+}
+function ensureGitignored(dir, file, state = gitIgnoreState) {
+  const current = state(dir, file);
+  if (current === "ignored") return { outcome: "already-ignored", gitignorePath: null };
+  if (current === "no-repo") return { outcome: "no-repo", gitignorePath: null };
+  const gitignorePath = path4.join(dir, ".gitignore");
+  const existing = fs3.existsSync(gitignorePath) ? fs3.readFileSync(gitignorePath, "utf-8") : null;
+  fs3.writeFileSync(gitignorePath, appendGitignoreEntry(existing, file), "utf-8");
+  return { outcome: "added", gitignorePath };
+}
+
+// src/commands/init.write.ts
+import { spawnSync as spawnSync3 } from "node:child_process";
+import fs4 from "node:fs";
+import path5 from "node:path";
 
 // src/lib/jsonTypeInference.ts
 var MAX_JSON_DEPTH = 4;
@@ -35023,14 +35290,14 @@ console.log('${input.flagKey}', flag.value, 'from', flag.source)
 
 // src/commands/init.write.ts
 function exampleFileExists(dir, profile, overridePath) {
-  return fs3.existsSync(resolveExamplePath(dir, profile, overridePath));
+  return fs4.existsSync(resolveExamplePath(dir, profile, overridePath));
 }
 function resolveExamplePath(dir, profile, overridePath) {
-  return path4.resolve(dir, overridePath ?? profile.exampleFile);
+  return path5.resolve(dir, overridePath ?? profile.exampleFile);
 }
 function writeExampleFile(input) {
   const filePath = resolveExamplePath(input.dir, input.profile, input.overridePath);
-  if (fs3.existsSync(filePath)) {
+  if (fs4.existsSync(filePath)) {
     return { filePath, wrote: false, existed: true };
   }
   const contents = buildSample({
@@ -35042,14 +35309,14 @@ function writeExampleFile(input) {
   if (contents === null) {
     return { filePath, wrote: false, existed: false };
   }
-  fs3.mkdirSync(path4.dirname(filePath), { recursive: true });
-  fs3.writeFileSync(filePath, contents, "utf-8");
+  fs4.mkdirSync(path5.dirname(filePath), { recursive: true });
+  fs4.writeFileSync(filePath, contents, "utf-8");
   return { filePath, wrote: true, existed: false };
 }
 function runInstall(dir, manager, npmPackage, options) {
   const { command, args } = installArgv(manager, npmPackage);
   const printable = [command, ...args].join(" ");
-  const result = spawnSync2(command, args, {
+  const result = spawnSync3(command, args, {
     cwd: dir,
     // A quiet or JSON run must leave stdout carrying only the result, so the
     // package manager's own output is captured and dropped instead of printed.
@@ -35079,10 +35346,10 @@ async function runCodegen(input) {
     projectId: String(input.projectShortId),
     env: input.environmentKey
   });
-  const filePath = path4.resolve(input.dir, input.outputPath ?? DEFAULT_CODEGEN_OUTPUT);
+  const filePath = path5.resolve(input.dir, input.outputPath ?? DEFAULT_CODEGEN_OUTPUT);
   try {
-    fs3.mkdirSync(path4.dirname(filePath), { recursive: true });
-    fs3.writeFileSync(filePath, generated, "utf-8");
+    fs4.mkdirSync(path5.dirname(filePath), { recursive: true });
+    fs4.writeFileSync(filePath, generated, "utf-8");
   } catch (err) {
     throw new CliError(
       "cli_io_failed",
@@ -35093,14 +35360,14 @@ async function runCodegen(input) {
 }
 function readFileOrNull(filePath) {
   try {
-    return fs3.readFileSync(filePath, "utf-8");
+    return fs4.readFileSync(filePath, "utf-8");
   } catch {
     return null;
   }
 }
 function listDirectory(dir) {
   try {
-    return fs3.readdirSync(dir);
+    return fs4.readdirSync(dir);
   } catch {
     return [];
   }
@@ -35108,7 +35375,7 @@ function listDirectory(dir) {
 
 // src/commands/init.execute.ts
 async function executePlan(input) {
-  const files = { env: null, envOutcome: null, example: null, codegen: null };
+  const files = { env: null, envOutcome: null, example: null, codegen: null, gitignore: null };
   let install = null;
   const { profile, environment } = input;
   if (stepFor(input.plan, "env").action === "write" && environment && profile.envFile && profile.envVar) {
@@ -35121,6 +35388,11 @@ async function executePlan(input) {
     files.env = result.filePath;
     files.envOutcome = result.outcome;
     info(describeEnvWrite(result, profile.envVar));
+    const ignored = ensureGitignored(input.dir, profile.envFile);
+    if (ignored.outcome === "added" && ignored.gitignorePath) {
+      files.gitignore = ignored.gitignorePath;
+      info(`Added ${profile.envFile} to ${ignored.gitignorePath}, so git does not pick it up`);
+    }
   }
   const installStep = stepFor(input.plan, "install");
   if (profile.sdkPackage) {
@@ -35188,17 +35460,17 @@ async function watchForCheckIn(api, projectShortId, environment, wait) {
 
 // src/lib/projectScaffold.ts
 import { createHash as createHash2 } from "node:crypto";
-import fs7 from "node:fs";
-import path8 from "node:path";
+import fs8 from "node:fs";
+import path9 from "node:path";
 
 // src/lib/scaffold.ts
-import fs6 from "node:fs";
-import path7 from "node:path";
+import fs7 from "node:fs";
+import path8 from "node:path";
 
 // src/lib/manifest.ts
 import { createHash } from "node:crypto";
-import fs4 from "node:fs";
-import path5 from "node:path";
+import fs5 from "node:fs";
+import path6 from "node:path";
 var MANIFEST_FILENAME = ".avsb.json";
 function parseExperimentInput(input) {
   const urlMatch = input.match(/experiments\/(\d+)/);
@@ -35213,12 +35485,12 @@ function parseExperimentInput(input) {
 function findManifest(startDir) {
   let dir = startDir ?? process.cwd();
   for (let i = 0; i < 10; i++) {
-    const manifestPath = path5.join(dir, MANIFEST_FILENAME);
-    if (fs4.existsSync(manifestPath)) {
-      const raw = fs4.readFileSync(manifestPath, "utf-8");
+    const manifestPath = path6.join(dir, MANIFEST_FILENAME);
+    if (fs5.existsSync(manifestPath)) {
+      const raw = fs5.readFileSync(manifestPath, "utf-8");
       return JSON.parse(raw);
     }
-    const parent = path5.dirname(dir);
+    const parent = path6.dirname(dir);
     if (parent === dir) break;
     dir = parent;
   }
@@ -35227,17 +35499,17 @@ function findManifest(startDir) {
 function findManifestDir(startDir) {
   let dir = startDir ?? process.cwd();
   for (let i = 0; i < 10; i++) {
-    const manifestPath = path5.join(dir, MANIFEST_FILENAME);
-    if (fs4.existsSync(manifestPath)) return dir;
-    const parent = path5.dirname(dir);
+    const manifestPath = path6.join(dir, MANIFEST_FILENAME);
+    if (fs5.existsSync(manifestPath)) return dir;
+    const parent = path6.dirname(dir);
     if (parent === dir) break;
     dir = parent;
   }
   return null;
 }
 function writeManifest(dir, manifest) {
-  const manifestPath = path5.join(dir, MANIFEST_FILENAME);
-  fs4.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
+  const manifestPath = path6.join(dir, MANIFEST_FILENAME);
+  fs5.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
 }
 function readManifestOrExit(startDir) {
   const dir = findManifestDir(startDir);
@@ -35275,30 +35547,30 @@ function computeSyncHashes(triggersJs, variations) {
 }
 
 // src/lib/snippetTypeDefs.ts
-import fs5 from "node:fs";
-import path6 from "node:path";
+import fs6 from "node:fs";
+import path7 from "node:path";
 import { createRequire } from "node:module";
 import { fileURLToPath } from "node:url";
 var SNIPPET_TYPES_PACKAGE = "@avsbhq/snippet-types";
 var SNIPPET_TYPE_DEF_FILES = ["avsb.d.ts", "variation-code.d.ts"];
 var MAX_WALK_UP = 24;
 function snippetTypeDefCandidates(filename, lookup) {
-  const candidates = [path6.join(lookup.moduleDir, "types", filename)];
+  const candidates = [path7.join(lookup.moduleDir, "types", filename)];
   const packageDir = lookup.packageDir();
-  if (packageDir) candidates.push(path6.join(packageDir, filename));
+  if (packageDir) candidates.push(path7.join(packageDir, filename));
   const isRepoRoot = lookup.isRepoRoot ?? defaultIsRepoRoot;
   let dir = lookup.moduleDir;
   for (let depth = 0; depth < MAX_WALK_UP; depth += 1) {
-    candidates.push(path6.join(dir, "packages", "avsb-snippet-types", filename));
+    candidates.push(path7.join(dir, "packages", "avsb-snippet-types", filename));
     if (isRepoRoot(dir)) break;
-    const parent = path6.dirname(dir);
+    const parent = path7.dirname(dir);
     if (parent === dir) break;
     dir = parent;
   }
   return candidates;
 }
 function defaultIsRepoRoot(dir) {
-  return fs5.existsSync(path6.join(dir, ".git"));
+  return fs6.existsSync(path7.join(dir, ".git"));
 }
 function findSnippetTypeDefPath(filename, lookup) {
   for (const candidate of snippetTypeDefCandidates(filename, lookup)) {
@@ -35316,15 +35588,15 @@ function typeDefBanner(filename) {
 function defaultPackageDir() {
   try {
     const moduleRequire = createRequire(import.meta.url);
-    return path6.dirname(moduleRequire.resolve(`${SNIPPET_TYPES_PACKAGE}/package.json`));
+    return path7.dirname(moduleRequire.resolve(`${SNIPPET_TYPES_PACKAGE}/package.json`));
   } catch {
     return null;
   }
 }
 function defaultLookup() {
   return {
-    moduleDir: path6.dirname(fileURLToPath(import.meta.url)),
-    exists: (candidate) => fs5.existsSync(candidate),
+    moduleDir: path7.dirname(fileURLToPath(import.meta.url)),
+    exists: (candidate) => fs6.existsSync(candidate),
     packageDir: defaultPackageDir
   };
 }
@@ -35341,7 +35613,7 @@ function readSnippetTypeDefs(lookup = defaultLookup()) {
         ]
       );
     }
-    return { filename, contents: typeDefBanner(filename) + fs5.readFileSync(found, "utf-8") };
+    return { filename, contents: typeDefBanner(filename) + fs6.readFileSync(found, "utf-8") };
   });
 }
 
@@ -35366,7 +35638,7 @@ function writeTypeDefinitions(dir) {
   try {
     const written = [];
     for (const file of readSnippetTypeDefs()) {
-      fs6.writeFileSync(path7.join(dir, file.filename), file.contents);
+      fs7.writeFileSync(path8.join(dir, file.filename), file.contents);
       written.push(file.filename);
     }
     return written;
@@ -35382,24 +35654,24 @@ function scaffoldExperiment(options) {
   const { data, script, style, apiBaseUrl, targetDir } = options;
   const { experiment, project, org } = data;
   const folderName = toKebabCase(experiment.name);
-  const baseDir = targetDir ?? path7.join(process.cwd(), folderName);
-  if (fs6.existsSync(baseDir)) {
+  const baseDir = targetDir ?? path8.join(process.cwd(), folderName);
+  if (fs7.existsSync(baseDir)) {
     throw new Error(`Directory already exists: ${baseDir}`);
   }
-  fs6.mkdirSync(baseDir, { recursive: true });
+  fs7.mkdirSync(baseDir, { recursive: true });
   const files = [];
   const manifestVariations = [];
-  const triggerFile = `trigger.${script}`;
-  fs6.writeFileSync(path7.join(baseDir, triggerFile), experiment.triggersJs);
-  files.push(triggerFile);
+  const triggerFile2 = `trigger.${script}`;
+  fs7.writeFileSync(path8.join(baseDir, triggerFile2), experiment.triggersJs);
+  files.push(triggerFile2);
   for (const variation of experiment.variations) {
     const folder = variationFolderName(variation.name);
-    const varDir = path7.join(baseDir, folder);
-    fs6.mkdirSync(varDir, { recursive: true });
+    const varDir = path8.join(baseDir, folder);
+    fs7.mkdirSync(varDir, { recursive: true });
     const scriptFile = `${folder}.${script}`;
     const styleFile = `${folder}.${style}`;
-    fs6.writeFileSync(path7.join(varDir, scriptFile), variation.controlJs);
-    fs6.writeFileSync(path7.join(varDir, styleFile), variation.controlCss);
+    fs7.writeFileSync(path8.join(varDir, scriptFile), variation.controlJs);
+    fs7.writeFileSync(path8.join(varDir, styleFile), variation.controlCss);
     files.push(`${folder}/${scriptFile}`);
     files.push(`${folder}/${styleFile}`);
     manifestVariations.push({
@@ -35438,7 +35710,7 @@ function scaffoldExperiment(options) {
   writeManifest(baseDir, manifest);
   files.push(".avsb.json");
   if (script === "ts") {
-    fs6.writeFileSync(path7.join(baseDir, "tsconfig.json"), TSCONFIG_TEMPLATE);
+    fs7.writeFileSync(path8.join(baseDir, "tsconfig.json"), TSCONFIG_TEMPLATE);
     files.push("tsconfig.json");
     files.push(...writeTypeDefinitions(baseDir));
   }
@@ -35454,10 +35726,10 @@ function refreshTypeDefinitions(dir, script) {
   }
   const changed = [];
   for (const file of current) {
-    const target = path7.join(dir, file.filename);
-    const onDisk = fs6.existsSync(target) ? fs6.readFileSync(target, "utf-8") : null;
+    const target = path8.join(dir, file.filename);
+    const onDisk = fs7.existsSync(target) ? fs7.readFileSync(target, "utf-8") : null;
     if (onDisk === file.contents) continue;
-    fs6.writeFileSync(target, file.contents);
+    fs7.writeFileSync(target, file.contents);
     changed.push(file.filename);
   }
   return changed;
@@ -35467,26 +35739,26 @@ function updateLocalFiles(dir, manifest, data) {
   const { script, style } = manifest.languages;
   const updated = [];
   updated.push(...refreshTypeDefinitions(dir, script));
-  const triggerFile = `trigger.${script}`;
-  const triggerPath = path7.join(dir, triggerFile);
-  const currentTrigger = fs6.existsSync(triggerPath) ? fs6.readFileSync(triggerPath, "utf-8") : "";
+  const triggerFile2 = `trigger.${script}`;
+  const triggerPath = path8.join(dir, triggerFile2);
+  const currentTrigger = fs7.existsSync(triggerPath) ? fs7.readFileSync(triggerPath, "utf-8") : "";
   if (currentTrigger !== experiment.triggersJs) {
-    fs6.writeFileSync(triggerPath, experiment.triggersJs);
-    updated.push(triggerFile);
+    fs7.writeFileSync(triggerPath, experiment.triggersJs);
+    updated.push(triggerFile2);
   }
   for (const variation of experiment.variations) {
     const mv = manifest.variations.find((v) => v.id === variation.id);
     if (!mv) continue;
-    const jsPath = path7.join(dir, mv.folder, mv.scriptFile);
-    const cssPath = path7.join(dir, mv.folder, mv.styleFile);
-    const currentJs = fs6.existsSync(jsPath) ? fs6.readFileSync(jsPath, "utf-8") : "";
-    const currentCss = fs6.existsSync(cssPath) ? fs6.readFileSync(cssPath, "utf-8") : "";
+    const jsPath = path8.join(dir, mv.folder, mv.scriptFile);
+    const cssPath = path8.join(dir, mv.folder, mv.styleFile);
+    const currentJs = fs7.existsSync(jsPath) ? fs7.readFileSync(jsPath, "utf-8") : "";
+    const currentCss = fs7.existsSync(cssPath) ? fs7.readFileSync(cssPath, "utf-8") : "";
     if (currentJs !== variation.controlJs) {
-      fs6.writeFileSync(jsPath, variation.controlJs);
+      fs7.writeFileSync(jsPath, variation.controlJs);
       updated.push(`${mv.folder}/${mv.scriptFile}`);
     }
     if (currentCss !== variation.controlCss) {
-      fs6.writeFileSync(cssPath, variation.controlCss);
+      fs7.writeFileSync(cssPath, variation.controlCss);
       updated.push(`${mv.folder}/${mv.styleFile}`);
     }
   }
@@ -35519,27 +35791,27 @@ function diffLocalFiles(dir, manifest, data) {
   const { experiment } = data;
   const { script } = manifest.languages;
   const changed = [];
-  const triggerFile = `trigger.${script}`;
-  const triggerPath = path7.join(dir, triggerFile);
-  if (fs6.existsSync(triggerPath)) {
-    const localContent = fs6.readFileSync(triggerPath, "utf-8");
+  const triggerFile2 = `trigger.${script}`;
+  const triggerPath = path8.join(dir, triggerFile2);
+  if (fs7.existsSync(triggerPath)) {
+    const localContent = fs7.readFileSync(triggerPath, "utf-8");
     if (localContent !== experiment.triggersJs) {
-      changed.push(triggerFile);
+      changed.push(triggerFile2);
     }
   }
   for (const variation of experiment.variations) {
     const mv = manifest.variations.find((v) => v.id === variation.id);
     if (!mv) continue;
-    const jsPath = path7.join(dir, mv.folder, mv.scriptFile);
-    const cssPath = path7.join(dir, mv.folder, mv.styleFile);
-    if (fs6.existsSync(jsPath)) {
-      const localJs = fs6.readFileSync(jsPath, "utf-8");
+    const jsPath = path8.join(dir, mv.folder, mv.scriptFile);
+    const cssPath = path8.join(dir, mv.folder, mv.styleFile);
+    if (fs7.existsSync(jsPath)) {
+      const localJs = fs7.readFileSync(jsPath, "utf-8");
       if (localJs !== variation.controlJs) {
         changed.push(`${mv.folder}/${mv.scriptFile}`);
       }
     }
-    if (fs6.existsSync(cssPath)) {
-      const localCss = fs6.readFileSync(cssPath, "utf-8");
+    if (fs7.existsSync(cssPath)) {
+      const localCss = fs7.readFileSync(cssPath, "utf-8");
       if (localCss !== variation.controlCss) {
         changed.push(`${mv.folder}/${mv.styleFile}`);
       }
@@ -35580,21 +35852,21 @@ function parseProjectInput(input) {
   return num;
 }
 function writeProjectManifest(dir, manifest) {
-  const manifestPath = path8.join(dir, PROJECT_MANIFEST_FILENAME);
-  fs7.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
+  const manifestPath = path9.join(dir, PROJECT_MANIFEST_FILENAME);
+  fs8.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
 }
 function readProjectManifest(dir) {
-  const manifestPath = path8.join(dir, PROJECT_MANIFEST_FILENAME);
-  if (!fs7.existsSync(manifestPath)) return null;
-  const raw = fs7.readFileSync(manifestPath, "utf-8");
+  const manifestPath = path9.join(dir, PROJECT_MANIFEST_FILENAME);
+  if (!fs8.existsSync(manifestPath)) return null;
+  const raw = fs8.readFileSync(manifestPath, "utf-8");
   return JSON.parse(raw);
 }
 function findProjectManifestDir(startDir) {
   let dir = startDir ?? process.cwd();
   for (let i = 0; i < 10; i++) {
-    const manifestPath = path8.join(dir, PROJECT_MANIFEST_FILENAME);
-    if (fs7.existsSync(manifestPath)) return dir;
-    const parent = path8.dirname(dir);
+    const manifestPath = path9.join(dir, PROJECT_MANIFEST_FILENAME);
+    if (fs8.existsSync(manifestPath)) return dir;
+    const parent = path9.dirname(dir);
     if (parent === dir) break;
     dir = parent;
   }
@@ -35614,20 +35886,29 @@ function readProjectManifestOrExit(startDir) {
   const manifest = readProjectManifest(dir);
   return { manifest, dir };
 }
+function resolveProjectPullTarget(cwd, shortId) {
+  const enclosing = findProjectManifestDir(cwd);
+  if (enclosing && readProjectManifest(enclosing)?.projectShortId === shortId) {
+    return { kind: "existing", dir: enclosing };
+  }
+  const beside = path9.join(cwd, `project-${shortId}`);
+  if (!fs8.existsSync(beside)) return { kind: "fresh", dir: beside };
+  return readProjectManifest(beside)?.projectShortId === shortId ? { kind: "existing", dir: beside } : { kind: "blocked", dir: beside };
+}
 function scaffoldProject(options) {
   const { data, apiBaseUrl, targetDir } = options;
   const { project } = data;
   const lang = project.projectJsLang === "TYPESCRIPT" ? "ts" : "js";
   const folderName = `project-${project.shortId}`;
-  const baseDir = targetDir ?? path8.join(process.cwd(), folderName);
-  if (fs7.existsSync(baseDir)) {
+  const baseDir = targetDir ?? path9.join(process.cwd(), folderName);
+  if (fs8.existsSync(baseDir)) {
     throw new Error(`Directory already exists: ${baseDir}`);
   }
-  fs7.mkdirSync(baseDir, { recursive: true });
+  fs8.mkdirSync(baseDir, { recursive: true });
   const files = [];
   const scriptFile = `project.${lang}`;
   const content = lang === "ts" ? project.editorProjectTs ?? project.editorProjectJs ?? "" : project.editorProjectJs ?? "";
-  fs7.writeFileSync(path8.join(baseDir, scriptFile), content);
+  fs8.writeFileSync(path9.join(baseDir, scriptFile), content);
   files.push(scriptFile);
   const manifest = {
     version: 1,
@@ -35644,7 +35925,7 @@ function scaffoldProject(options) {
   writeProjectManifest(baseDir, manifest);
   files.push(".avsb-project.json");
   if (lang === "ts") {
-    fs7.writeFileSync(path8.join(baseDir, "tsconfig.json"), PROJECT_TSCONFIG);
+    fs8.writeFileSync(path9.join(baseDir, "tsconfig.json"), PROJECT_TSCONFIG);
     files.push("tsconfig.json");
     files.push(...writeTypeDefinitions(baseDir));
   }
@@ -35655,11 +35936,11 @@ function updateProjectFile(dir, manifest, data) {
   const updated = [];
   updated.push(...refreshTypeDefinitions(dir, manifest.language));
   const scriptFile = `project.${manifest.language}`;
-  const scriptPath = path8.join(dir, scriptFile);
-  const current = fs7.existsSync(scriptPath) ? fs7.readFileSync(scriptPath, "utf-8") : "";
+  const scriptPath = path9.join(dir, scriptFile);
+  const current = fs8.existsSync(scriptPath) ? fs8.readFileSync(scriptPath, "utf-8") : "";
   const remote = manifest.language === "ts" ? project.editorProjectTs ?? project.editorProjectJs ?? "" : project.editorProjectJs ?? "";
   if (current !== remote) {
-    fs7.writeFileSync(scriptPath, remote);
+    fs8.writeFileSync(scriptPath, remote);
     updated.push(scriptFile);
   }
   manifest.lastSyncedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -35878,28 +36159,47 @@ function renderInitSummary(input) {
 }
 function describeDetection(input) {
   const manager = `installs with ${input.packageManager}`;
+  const variable = input.profile.envVar && input.profile.envVarReason ? `, key in ${input.profile.envVar}: ${input.profile.envVarReason}` : "";
   if (input.detection.matchedDependency) {
-    return `${input.profile.label} (found ${input.detection.matchedDependency} in package.json, ${manager})`;
+    return `${input.profile.label} (found ${input.detection.matchedDependency} in package.json${variable}, ${manager})`;
   }
   if (input.profile.id === "none") {
     return "no package.json found here";
   }
   return `${input.profile.label} (${manager})`;
 }
-function renderSteps(input) {
-  const written = [input.files.env, input.files.example, input.files.codegen].filter(
+function fileReport(files) {
+  const envWritten = files.envOutcome === "created" || files.envOutcome === "appended";
+  const written = [envWritten ? files.env : null, files.example, files.codegen, files.gitignore].filter(
     (file) => file !== null
   );
+  const leftAlone = !envWritten && files.env !== null ? [files.env] : [];
+  return { written, leftAlone };
+}
+function renderSteps(input) {
+  const { written, leftAlone } = fileReport(input.files);
   if (written.length > 0) {
     heading("Written");
     fileTree(written);
     line();
   }
+  if (leftAlone.length > 0) {
+    heading("Left alone");
+    fileTree(leftAlone);
+    line();
+  }
   const skipped = input.plan.filter((step) => step.action === "skip");
   for (const step of skipped) dim(`  Skipped ${step.id}: ${step.detail}`);
   if (skipped.length > 0) line();
 }
 function renderWhatIsLeft(input) {
+  const todo = whatIsLeftLines(input);
+  if (todo.length === 0) return;
+  line();
+  heading("Next");
+  for (const line2 of todo) dim(`  ${line2}`);
+}
+function whatIsLeftLines(input) {
   const todo = [];
   if (input.install && !input.install.ran) {
     todo.push(`Install the SDK: ${input.install.command}`);
@@ -35911,17 +36211,15 @@ function renderWhatIsLeft(input) {
     todo.push(input.profile.caveat);
   }
   if (input.flagKey && !input.flagExists) {
+    const envKey = input.environment?.key ?? "production";
     todo.push(
-      `The example reads "${input.flagKey}", which does not exist yet. Create it with \`avsb flags create ${input.flagKey}\`.`
+      `The example reads "${input.flagKey}", which does not exist yet. Create it with \`avsb flags create ${input.flagKey}\`, then turn it on with \`avsb flags toggle ${input.flagKey} --env ${envKey} --on\`.`
     );
   }
   if (input.servedLine) {
     todo.push(input.servedLine);
   }
-  if (todo.length === 0) return;
-  line();
-  heading("Next");
-  for (const line2 of todo) dim(`  ${line2}`);
+  return todo;
 }
 function renderAssistantPrompt(input) {
   if (!input.environment && input.project.type === "FEATURE_FLAG") return;
@@ -35978,11 +36276,11 @@ var initCommand = withOutputOptions(
 ).action(async (opts) => {
   beginCommand("init", opts);
   try {
-    const dir = path9.resolve(opts.dir ?? ".");
+    const dir = path10.resolve(opts.dir ?? ".");
     parseWaitSeconds(opts.wait);
     assertHeartbeatFlagsAgree(opts);
     const interactive = isInteractiveRun({ input: opts.input });
-    const pkg2 = parsePackageJson(readFileOrNull(path9.join(dir, "package.json")) ?? "");
+    const pkg2 = parsePackageJson(readFileOrNull(path10.join(dir, "package.json")) ?? "");
     const detection = resolveDetection(pkg2, opts.framework);
     const profile = buildFrameworkProfile(detection);
     const packageManager = detectPackageManager(pkg2, listDirectory(dir));
@@ -36056,7 +36354,9 @@ var initCommand = withOutputOptions(
         id: profile.id,
         label: profile.label,
         detectedFrom: detection.matchedDependency,
-        packageManager
+        packageManager,
+        bundler: detection.bundler?.id ?? null,
+        envVar: profile.envVar
       },
       flag: sample ? { key: sample.flagKey, exists: sample.flag !== null, served } : null,
       steps: plan,
@@ -36079,12 +36379,14 @@ var initCommand = withOutputOptions(
       install: outcome.install,
       flagKey: sample?.flagKey ?? null,
       flagExists: sample !== null && sample.flag !== null,
-      servedLine: sample?.flag ? describeServedValue(sample.flagKey, served) : null,
+      servedLine: sample?.flag ? describeServedValue(sample.flagKey, served, opts.env) : null,
       heartbeat,
       proof,
       timeoutGuidance: heartbeat && !heartbeat.seen && environment ? heartbeatTimeoutGuidance({
         sdkKey: environment.sdkKey,
         environmentName: environment.name,
+        environmentKey: environment.key,
+        flagKey: sample?.flagKey ?? null,
         previousSeenAt: heartbeat.previousSeenAt,
         waitedMs: heartbeat.elapsedMs,
         cdnHost: new URL(DEFAULT_CDN_BASE_URL).host,
@@ -36134,8 +36436,8 @@ async function decideCodegen(opts, interactive, hasSdkKey) {
 }
 
 // src/commands/agents-md.ts
-import fs8 from "node:fs";
-import path10 from "node:path";
+import fs9 from "node:fs";
+import path11 from "node:path";
 
 // src/lib/agentsMd.ts
 var AGENTS_MARKER_START = "<!-- avsb:start -->";
@@ -36285,8 +36587,8 @@ var agentsMdInstallCommand = withOutputOptions(
 ).action((opts) => {
   beginCommand("agents-md install", opts);
   try {
-    const dir = path10.resolve(opts.dir ?? ".");
-    const pkg2 = parsePackageJson(readFileOrNull(path10.join(dir, "package.json")) ?? "");
+    const dir = path11.resolve(opts.dir ?? ".");
+    const pkg2 = parsePackageJson(readFileOrNull(path11.join(dir, "package.json")) ?? "");
     const profile = buildFrameworkProfile(detectFramework(pkg2));
     const section = renderAgentsSection({
       projectShortId: readProjectShortId(opts.project),
@@ -36310,12 +36612,12 @@ var agentsMdInstallCommand = withOutputOptions(
   }
 });
 function writeTarget(dir, file, section) {
-  const filePath = path10.join(dir, file);
+  const filePath = path11.join(dir, file);
   const existing = readFileOrNull(filePath);
   const applied = applyAgentsSection(existing, section);
   if (applied.outcome !== "unchanged") {
     try {
-      fs8.writeFileSync(filePath, applied.content, "utf-8");
+      fs9.writeFileSync(filePath, applied.content, "utf-8");
     } catch (err) {
       throw new CliError(
         "cli_io_failed",
@@ -36351,7 +36653,8 @@ var loginCommand = new Command("login").description("Save a personal access toke
         `Replacing the saved login in ${getConfigPath()}: ${existing.detail}.`
       );
     }
-    if (existingConfig && options.input && !explicitToken && !envToken) {
+    const interactive = canPrompt(currentPromptContext({ input: options.input }));
+    if (existingConfig && interactive && !explicitToken && !envToken) {
       const active = existingConfig.logins.find(
         (login) => login.orgId === existingConfig.activeOrgId
       );
@@ -36373,7 +36676,12 @@ var loginCommand = new Command("login").description("Save a personal access toke
     const token = await resolveToken({
       explicitToken,
       envToken,
-      allowPrompt: options.input
+      source: tokenSourceFor({
+        explicitToken,
+        envToken,
+        input: options.input,
+        isTty: process.stdin.isTTY === true
+      })
     });
     const spinner = ora("Verifying token...").start();
     const client = new ApiClient({ token, apiBaseUrl }, { useEnvOverrides: false });
@@ -36381,8 +36689,9 @@ var loginCommand = new Command("login").description("Save a personal access toke
     try {
       verified = await client.verifyAuth();
     } catch (err) {
-      spinner.fail("Token rejected");
-      if (err instanceof ApiRequestError && err.status === 401) {
+      const rejected = err instanceof ApiRequestError && err.status === 401;
+      spinner.fail(rejected ? "Token rejected" : "Could not check the token");
+      if (rejected) {
         dim(`  ${WHERE_TO_GET_A_TOKEN}`);
       }
       failCommand(err);
@@ -36417,13 +36726,22 @@ var loginCommand = new Command("login").description("Save a personal access toke
     failCommand(err);
   }
 });
+function tokenSourceFor(input) {
+  if (input.explicitToken) return "flag";
+  if (input.envToken) return "env";
+  if (!input.input) return "refuse";
+  return input.isTty ? "prompt" : "stdin";
+}
+var NO_TOKEN_HINTS = [
+  `Pass --token <token>, set ${TOKEN_ENV_VAR}, or pipe it in: echo "$TOKEN" | avsb login`
+];
 async function resolveToken(input) {
-  if (input.explicitToken) return input.explicitToken;
-  if (input.envToken) {
+  if (input.source === "flag" && input.explicitToken) return input.explicitToken;
+  if (input.source === "env" && input.envToken) {
     info(`Using the token from ${TOKEN_ENV_VAR}.`);
     return input.envToken;
   }
-  if (!input.allowPrompt) {
+  if (input.source === "refuse") {
     failCommand(
       new CliError(
         "cli_usage",
@@ -36431,6 +36749,13 @@ async function resolveToken(input) {
       )
     );
   }
+  if (input.source === "stdin") {
+    const piped = (await readPipedStdin()).trim();
+    if (piped.length === 0) {
+      failCommand(new CliError("cli_usage", "No token supplied, and there is no terminal to ask in.", NO_TOKEN_HINTS));
+    }
+    return piped;
+  }
   const { token } = await esm_default12.prompt([
     {
       type: "password",
@@ -36467,12 +36792,19 @@ var logoutCommand = new Command("logout").description("Delete the saved logins o
 });
 
 // src/commands/whoami.ts
+function roleName(role) {
+  if (typeof role === "string") return role;
+  if (typeof role === "object" && role !== null && "name" in role && typeof role.name === "string") {
+    return role.name;
+  }
+  return "unknown";
+}
 function buildWhoamiRows(verified, session, configPath) {
   return [
     { label: "Email", value: verified.email },
     { label: "Organization", value: verified.orgName },
     { label: "Org ID", value: verified.orgId },
-    { label: "Role", value: verified.role },
+    { label: "Role", value: roleName(verified.role) },
     { label: "API URL", value: session.apiBaseUrl },
     { label: "Token from", value: describeTokenSource(session, configPath) }
   ];
@@ -36498,7 +36830,7 @@ var whoamiCommand = withOutputOptions(
     email: verified.data.email,
     orgId: verified.data.orgId,
     orgName: verified.data.orgName,
-    role: verified.data.role,
+    role: roleName(verified.data.role),
     apiBaseUrl: session.apiBaseUrl,
     tokenSource: session.tokenSource,
     configPath: getConfigPath()
@@ -36508,7 +36840,7 @@ var whoamiCommand = withOutputOptions(
   line();
   heading("Signed in");
   for (const row of buildWhoamiRows(verified.data, session, getConfigPath())) {
-    label(row.label, row.value);
+    field(row.label, row.value);
   }
   line();
 });
@@ -36525,12 +36857,14 @@ function configForSession(session) {
     apiBaseUrl: session.apiBaseUrl
   };
 }
+function describeCandidates(candidates) {
+  return candidates.map((c) => c.shortId != null ? `${c.shortId} (${c.name})` : c.name).join(", ");
+}
 function describeSwitchFailure(candidates, needle) {
   if (candidates.length === 0) {
     return `No organization matches "${needle}". This token cannot reach any organization.`;
   }
-  const known = candidates.map((c) => c.shortId != null ? `${c.shortId} (${c.name})` : c.name).join(", ");
-  return `No organization matches "${needle}". Available: ${known}.`;
+  return `No organization matches "${needle}". Available: ${describeCandidates(candidates)}.`;
 }
 var orgCommand = withOutputOptions(
   new Command("org").description("Show, list, and switch the active organization")
@@ -36548,13 +36882,13 @@ var orgCommand = withOutputOptions(
   }
   heading("Current organization");
   if (session.orgName) {
-    label("Name", session.orgName);
-    label("ID", session.orgId);
+    field("Name", session.orgName);
+    field("ID", session.orgId);
   } else {
-    label("Name", "not saved on this machine");
+    field("Name", "not saved on this machine");
   }
-  label("API URL", session.apiBaseUrl);
-  label("Token from", describeTokenSource(session, getConfigPath()));
+  field("API URL", session.apiBaseUrl);
+  field("Token from", describeTokenSource(session, getConfigPath()));
   if (session.tokenSource === "env") {
     dim(
       `  ${TOKEN_ENV_VAR} is set, so commands use that token. Run \`avsb whoami\` to see which account and organization it reaches.`
@@ -36564,8 +36898,8 @@ var orgCommand = withOutputOptions(
 orgCommand.addCommand(
   withOutputOptions(
     new Command("list").description("List the organizations this token can reach")
-  ).action(async (opts) => {
-    beginCommand("org list", opts);
+  ).action(async (_opts, command) => {
+    beginCommand("org list", command.optsWithGlobals());
     try {
       const session = ensureLoggedIn();
       const config = configForSession(session);
@@ -36629,12 +36963,16 @@ orgCommand.command("switch").description("Choose which organization commands use
     failCommand(err);
   }
 });
-async function promptForOrg(candidates, allowPrompt) {
-  if (!allowPrompt) {
-    failCommand(
-      new CliError("cli_usage", "Name an organization: `avsb org switch <short id | id | name>`.")
-    );
-  }
+async function promptForOrg(candidates, input) {
+  const refusal = refusalWithoutPrompt(
+    {
+      code: "cli_usage",
+      message: "Name an organization: `avsb org switch <short id | id | name>`.",
+      hints: [`Available: ${describeCandidates(candidates)}.`]
+    },
+    currentPromptContext({ input })
+  );
+  if (refusal) failCommand(refusal);
   const { chosen } = await esm_default12.prompt([
     {
       type: "list",
@@ -36750,6 +37088,15 @@ var pullCommand = new Command("pull").description("Pull latest experiment data f
           dim(`  ${file}`);
         }
         line();
+        const refusal = refusalWithoutPrompt({
+          code: "cli_conflict",
+          message: "Pulling would overwrite these local changes, and this run cannot ask first.",
+          hints: [
+            "Run `avsb pull --force` to overwrite them,",
+            "or `avsb push` first to keep them on the platform."
+          ]
+        });
+        if (refusal) failCommand(refusal);
         const { proceed } = await esm_default12.prompt([
           {
             type: "confirm",
@@ -36785,14 +37132,16 @@ var pullCommand = new Command("pull").description("Pull latest experiment data f
 
 // src/commands/push.ts
 import { createHash as createHash3 } from "node:crypto";
-import fs10 from "node:fs";
-import path12 from "node:path";
+
+// src/commands/push.payload.ts
+import fs11 from "node:fs";
+import path13 from "node:path";
 
 // src/lib/compiler.ts
 import { transform } from "esbuild";
 import * as sass from "sass";
-import fs9 from "node:fs";
-import path11 from "node:path";
+import fs10 from "node:fs";
+import path12 from "node:path";
 async function compileTypeScript(source) {
   const result = await transform(source, {
     loader: "ts",
@@ -36803,7 +37152,7 @@ async function compileTypeScript(source) {
 function compileScss(filePath) {
   const result = sass.compile(filePath, {
     style: "expanded",
-    loadPaths: [path11.dirname(filePath)]
+    loadPaths: [path12.dirname(filePath)]
   });
   return result.css;
 }
@@ -36879,8 +37228,8 @@ function parseEsbuildErrors(err, fallbackFile) {
   ];
 }
 async function compileFile(filePath) {
-  const ext = path11.extname(filePath);
-  const source = fs9.readFileSync(filePath, "utf-8");
+  const ext = path12.extname(filePath);
+  const source = fs10.readFileSync(filePath, "utf-8");
   switch (ext) {
     case ".ts":
       return compileTypeScript(source);
@@ -36895,21 +37244,21 @@ async function compileFile(filePath) {
 }
 async function compileExperiment(dir, manifest) {
   const { script } = manifest.languages;
-  const triggerPath = path11.join(dir, `trigger.${script}`);
+  const triggerPath = path12.join(dir, `trigger.${script}`);
   let triggersJs = "";
-  if (fs9.existsSync(triggerPath)) {
+  if (fs10.existsSync(triggerPath)) {
     triggersJs = await compileFile(triggerPath);
   }
   const variations = [];
   for (const v of manifest.variations) {
-    const jsPath = path11.join(dir, v.folder, v.scriptFile);
-    const cssPath = path11.join(dir, v.folder, v.styleFile);
+    const jsPath = path12.join(dir, v.folder, v.scriptFile);
+    const cssPath = path12.join(dir, v.folder, v.styleFile);
     let js = "";
     let css = "";
-    if (fs9.existsSync(jsPath)) {
+    if (fs10.existsSync(jsPath)) {
       js = await compileFile(jsPath);
     }
-    if (fs9.existsSync(cssPath)) {
+    if (fs10.existsSync(cssPath)) {
       css = await compileFile(cssPath);
     }
     variations.push({
@@ -36928,14 +37277,91 @@ async function compileExperiment(dir, manifest) {
   };
 }
 function detectChangeType(filePath) {
-  const basename3 = path11.basename(filePath, path11.extname(filePath));
-  const ext = path11.extname(filePath);
+  const basename3 = path12.basename(filePath, path12.extname(filePath));
+  const ext = path12.extname(filePath);
   if (basename3 === "trigger") return "trigger";
   if (ext === ".scss" || ext === ".css") return "css-only";
   if (ext === ".ts" || ext === ".js") return "js-only";
   return "both";
 }
 
+// src/commands/push.payload.ts
+function triggerFile(manifest) {
+  return `trigger.${manifest.languages.script}`;
+}
+function variationFile(manifest, index, kind) {
+  const variation = manifest.variations[index];
+  if (!variation) return void 0;
+  return path13.posix.join(variation.folder, kind === "script" ? variation.scriptFile : variation.styleFile);
+}
+function labelForPushPath(manifest, bodyPath) {
+  const [head, index, field2] = bodyPath;
+  if (head === "triggersJs") return triggerFile(manifest);
+  if (head !== "variations" || typeof index !== "number") return void 0;
+  if (field2 === "controlJs") return variationFile(manifest, index, "script");
+  if (field2 === "controlCss") return variationFile(manifest, index, "style");
+  return manifest.variations[index]?.folder;
+}
+function readSource(dir, relativePath) {
+  const absolute = path13.join(dir, relativePath);
+  if (!fs11.existsSync(absolute)) {
+    return {
+      missing: {
+        file: relativePath,
+        line: 0,
+        column: 0,
+        message: "File not found. Restore it, or run `avsb pull --force` to get the platform copy back."
+      }
+    };
+  }
+  return { source: fs11.readFileSync(absolute, "utf-8") };
+}
+async function buildPushPayload(dir, manifest) {
+  const scriptLang = manifest.languages.script === "ts" ? "TYPESCRIPT" : "JAVASCRIPT";
+  const styleLang = manifest.languages.style === "scss" ? "SCSS" : "CSS";
+  const triggerPath = triggerFile(manifest);
+  const trigger = readSource(dir, triggerPath);
+  if ("missing" in trigger) return { ok: false, summary: `${triggerPath} is missing`, errors: [trigger.missing] };
+  const triggerCompile = await compileScript(trigger.source, scriptLang, triggerPath);
+  if (!triggerCompile.success) {
+    return { ok: false, summary: "Trigger compilation failed", errors: triggerCompile.errors };
+  }
+  const payload = {
+    triggersJs: { source: trigger.source, compiled: triggerCompile.code },
+    variations: []
+  };
+  const sources = { triggersJs: trigger.source, variations: [] };
+  for (const [index, variation] of manifest.variations.entries()) {
+    const scriptPath = variationFile(manifest, index, "script") ?? variation.scriptFile;
+    const stylePath = variationFile(manifest, index, "style") ?? variation.styleFile;
+    const script = readSource(dir, scriptPath);
+    if ("missing" in script) return { ok: false, summary: `${scriptPath} is missing`, errors: [script.missing] };
+    const style = readSource(dir, stylePath);
+    if ("missing" in style) return { ok: false, summary: `${stylePath} is missing`, errors: [style.missing] };
+    const jsCompile = await compileScript(script.source, scriptLang, scriptPath);
+    if (!jsCompile.success) {
+      return { ok: false, summary: `Variation "${variation.name}" script compilation failed`, errors: jsCompile.errors };
+    }
+    const cssCompile = compileStyle(style.source, styleLang, stylePath);
+    if (!cssCompile.success) {
+      return { ok: false, summary: `Variation "${variation.name}" style compilation failed`, errors: cssCompile.errors };
+    }
+    payload.variations.push({
+      id: variation.id,
+      controlJs: { source: script.source, compiled: jsCompile.code },
+      controlCss: { source: style.source, compiled: cssCompile.code }
+    });
+    sources.variations.push({ id: variation.id, controlJs: script.source, controlCss: style.source });
+  }
+  return { ok: true, payload, sources };
+}
+function publishPromptFor(status) {
+  if (status === "PAUSED") {
+    return "The experiment is paused. Publish the changes now? (Visitors see them when it resumes.)";
+  }
+  return "The experiment is running. Publish the changes now?";
+}
+
 // src/commands/push.ts
 function sha2563(content) {
   return createHash3("sha256").update(content).digest("hex");
@@ -36960,35 +37386,60 @@ function detectRemoteChanges(remoteExp, syncedHashes) {
   }
   return changed;
 }
-var pushCommand = new Command("push").description("Compile and push local changes to the platform").option("-f, --force", "Skip conflict check and push without confirmation").action(async (options) => {
+async function confirmOverwrite() {
+  if (!isInteractiveRun()) {
+    failCommand(
+      new CliError(
+        "cli_conflict",
+        "The platform copy changed since your last pull, and this run cannot ask before overwriting it.",
+        [
+          "Run `avsb pull` to fetch the remote changes first (it overwrites your local files),",
+          "or `avsb push --force` to overwrite the remote changes."
+        ]
+      )
+    );
+  }
+  const { proceed } = await esm_default12.prompt([
+    { type: "confirm", name: "proceed", message: "Pushing will overwrite remote changes. Continue?", default: false }
+  ]);
+  return proceed;
+}
+async function shouldPublish(options, status) {
+  if (options.publish !== void 0) return options.publish;
+  if (!isInteractiveRun()) return false;
+  const { publish } = await esm_default12.prompt([
+    { type: "confirm", name: "publish", message: publishPromptFor(status), default: false }
+  ]);
+  return publish;
+}
+var pushCommand = new Command("push").description("Compile and push local changes to the platform").option("-f, --force", "Skip conflict check and push without confirmation").option("--publish", "Publish the changes right away when the experiment is running or paused").option("--no-publish", "Leave the changes pending without asking").action(async (options) => {
+  let manifest = null;
   try {
     const config = ensureLoggedIn();
-    const { manifest, dir } = readManifestOrExit();
+    const read = readManifestOrExit();
+    manifest = read.manifest;
+    const { dir } = read;
     let spinner = ora("Compiling experiment...").start();
-    await compileExperiment(dir, manifest);
+    const built = await buildPushPayload(dir, manifest);
+    if (!built.ok) {
+      spinner.fail(built.summary);
+      for (const e of built.errors) {
+        error(`  ${e.line > 0 ? `${e.file}:${e.line}:${e.column}` : e.file}: ${e.message}`);
+      }
+      process.exit(EXIT.failure);
+    }
     const client = new ApiClient(config);
     if (!options.force && manifest.syncedHashes) {
       spinner.text = "Checking for remote changes...";
       const remote = await client.getExperiment(manifest.experimentShortId);
-      const remoteExp = remote.data.experiment;
-      const remoteChanges = detectRemoteChanges(remoteExp, manifest.syncedHashes);
+      const remoteChanges = detectRemoteChanges(remote.data.experiment, manifest.syncedHashes);
       if (remoteChanges.length > 0) {
         spinner.warn("Remote has changes you haven't pulled");
         line();
         heading("Files changed on remote:");
-        for (const file of remoteChanges) {
-          dim(`  ${file}`);
-        }
+        for (const file of remoteChanges) dim(`  ${file}`);
         line();
-        const { proceed } = await esm_default12.prompt([
-          {
-            type: "confirm",
-            name: "proceed",
-            message: "Pushing will overwrite remote changes. Continue?",
-            default: false
-          }
-        ]);
-        if (!proceed) {
+        if (!await confirmOverwrite()) {
           info("Push aborted. Run `avsb pull` to fetch remote changes first.");
           warn("Note: pulling will overwrite your local files.");
           process.exit(EXIT.success);
@@ -37000,78 +37451,37 @@ var pushCommand = new Command("push").description("Compile and push local change
     } else {
       spinner.text = "Pushing to platform...";
     }
-    const scriptLang = manifest.languages.script === "ts" ? "TYPESCRIPT" : "JAVASCRIPT";
-    const styleLang = manifest.languages.style === "scss" ? "SCSS" : "CSS";
-    const rawTrigger = fs10.readFileSync(
-      path12.join(dir, `trigger.${manifest.languages.script}`),
-      "utf-8"
-    );
-    const triggerCompile = await compileScript(rawTrigger, scriptLang, `trigger.${manifest.languages.script}`);
-    if (!triggerCompile.success) {
-      spinner.fail("Trigger compilation failed");
-      for (const e of triggerCompile.errors) {
-        error(`  trigger.${manifest.languages.script}:${e.line}:${e.column}: ${e.message}`);
-      }
-      process.exit(EXIT.failure);
-    }
-    const rawVariations = [];
-    const compiledVariations = [];
-    for (const v of manifest.variations) {
-      const rawJs = fs10.readFileSync(path12.join(dir, v.folder, v.scriptFile), "utf-8");
-      const rawCss = fs10.readFileSync(path12.join(dir, v.folder, v.styleFile), "utf-8");
-      const jsCompile = await compileScript(rawJs, scriptLang, `${v.name}.${manifest.languages.script}`);
-      const cssCompile = compileStyle(rawCss, styleLang, `${v.name}.${manifest.languages.style}`);
-      if (!jsCompile.success) {
-        spinner.fail(`Variation "${v.name}" JS compilation failed`);
-        for (const e of jsCompile.errors) error(`  ${e.file}:${e.line}:${e.column}: ${e.message}`);
-        process.exit(EXIT.failure);
-      }
-      if (!cssCompile.success) {
-        spinner.fail(`Variation "${v.name}" CSS compilation failed`);
-        for (const e of cssCompile.errors) error(`  ${e.file}:${e.line}:${e.column}: ${e.message}`);
-        process.exit(EXIT.failure);
-      }
-      rawVariations.push({ id: v.id, controlJs: rawJs, controlCss: rawCss });
-      compiledVariations.push({
-        id: v.id,
-        controlJs: { source: rawJs, compiled: jsCompile.code },
-        controlCss: { source: rawCss, compiled: cssCompile.code }
-      });
+    let response;
+    try {
+      response = await client.pushExperiment(manifest.experimentShortId, built.payload);
+    } catch (err) {
+      spinner.fail("Push refused");
+      throw err;
     }
-    const response = await client.pushExperiment(manifest.experimentShortId, {
-      triggersJs: { source: rawTrigger, compiled: triggerCompile.code },
-      variations: compiledVariations
-    });
-    manifest.syncedHashes = computeSyncHashes(rawTrigger, rawVariations);
+    manifest.syncedHashes = computeSyncHashes(built.sources.triggersJs, built.sources.variations);
     writeManifest(dir, manifest);
     spinner.succeed("Pushed successfully");
     line();
     if (response.data.hasPendingChanges) {
-      const { publish } = await esm_default12.prompt([
-        {
-          type: "confirm",
-          name: "publish",
-          message: "Experiment is running. Publish changes now?",
-          default: false
-        }
-      ]);
-      if (publish) {
+      if (await shouldPublish(options, response.data.status)) {
         const publishSpinner = ora("Publishing changes...").start();
-        await client.publishChanges(manifest.experimentShortId);
+        const published = await client.publishChanges(manifest.experimentShortId);
         publishSpinner.succeed("Changes published");
+        if (published.data.warning) warn(published.data.warning.message);
       } else {
-        info("Changes saved as pending. Publish from the platform when ready.");
+        info("Changes saved as pending. Publish them with `avsb push --publish`, or from the dashboard.");
       }
     }
     line();
     success("Push complete");
   } catch (err) {
-    failCommand(err);
+    const current = manifest;
+    failCommand(err, current ? { labelForPath: (bodyPath) => labelForPushPath(current, bodyPath) } : {});
   }
 });
 
 // src/commands/dev.ts
-import path14 from "node:path";
+import path15 from "node:path";
 
 // node_modules/chokidar/esm/index.js
 import { stat as statcb } from "fs";
@@ -37149,7 +37559,7 @@ var ReaddirpStream = class extends Readable {
     this._directoryFilter = normalizeFilter(opts.directoryFilter);
     const statMethod = opts.lstat ? lstat : stat;
     if (wantBigintFsStats) {
-      this._stat = (path22) => statMethod(path22, { bigint: true });
+      this._stat = (path23) => statMethod(path23, { bigint: true });
     } else {
       this._stat = statMethod;
     }
@@ -37174,8 +37584,8 @@ var ReaddirpStream = class extends Readable {
         const par = this.parent;
         const fil = par && par.files;
         if (fil && fil.length > 0) {
-          const { path: path22, depth } = par;
-          const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path22));
+          const { path: path23, depth } = par;
+          const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path23));
           const awaited = await Promise.all(slice);
           for (const entry of awaited) {
             if (!entry)
@@ -37215,20 +37625,20 @@ var ReaddirpStream = class extends Readable {
       this.reading = false;
     }
   }
-  async _exploreDir(path22, depth) {
+  async _exploreDir(path23, depth) {
     let files;
     try {
-      files = await readdir(path22, this._rdOptions);
+      files = await readdir(path23, this._rdOptions);
     } catch (error2) {
       this._onError(error2);
     }
-    return { files, depth, path: path22 };
+    return { files, depth, path: path23 };
   }
-  async _formatEntry(dirent, path22) {
+  async _formatEntry(dirent, path23) {
     let entry;
     const basename3 = this._isDirent ? dirent.name : dirent;
     try {
-      const fullPath = presolve(pjoin(path22, basename3));
+      const fullPath = presolve(pjoin(path23, basename3));
       entry = { path: prelative(this._root, fullPath), fullPath, basename: basename3 };
       entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
     } catch (err) {
@@ -37628,16 +38038,16 @@ var delFromSet = (main3, prop, item) => {
 };
 var isEmptySet = (val) => val instanceof Set ? val.size === 0 : !val;
 var FsWatchInstances = /* @__PURE__ */ new Map();
-function createFsWatchInstance(path22, options, listener, errHandler, emitRaw) {
+function createFsWatchInstance(path23, options, listener, errHandler, emitRaw) {
   const handleEvent = (rawEvent, evPath) => {
-    listener(path22);
-    emitRaw(rawEvent, evPath, { watchedPath: path22 });
-    if (evPath && path22 !== evPath) {
-      fsWatchBroadcast(sysPath.resolve(path22, evPath), KEY_LISTENERS, sysPath.join(path22, evPath));
+    listener(path23);
+    emitRaw(rawEvent, evPath, { watchedPath: path23 });
+    if (evPath && path23 !== evPath) {
+      fsWatchBroadcast(sysPath.resolve(path23, evPath), KEY_LISTENERS, sysPath.join(path23, evPath));
     }
   };
   try {
-    return fs_watch(path22, {
+    return fs_watch(path23, {
       persistent: options.persistent
     }, handleEvent);
   } catch (error2) {
@@ -37653,12 +38063,12 @@ var fsWatchBroadcast = (fullPath, listenerType, val1, val2, val3) => {
     listener(val1, val2, val3);
   });
 };
-var setFsWatchListener = (path22, fullPath, options, handlers) => {
+var setFsWatchListener = (path23, fullPath, options, handlers) => {
   const { listener, errHandler, rawEmitter } = handlers;
   let cont = FsWatchInstances.get(fullPath);
   let watcher;
   if (!options.persistent) {
-    watcher = createFsWatchInstance(path22, options, listener, errHandler, rawEmitter);
+    watcher = createFsWatchInstance(path23, options, listener, errHandler, rawEmitter);
     if (!watcher)
       return;
     return watcher.close.bind(watcher);
@@ -37669,7 +38079,7 @@ var setFsWatchListener = (path22, fullPath, options, handlers) => {
     addAndConvert(cont, KEY_RAW, rawEmitter);
   } else {
     watcher = createFsWatchInstance(
-      path22,
+      path23,
       options,
       fsWatchBroadcast.bind(null, fullPath, KEY_LISTENERS),
       errHandler,
@@ -37684,7 +38094,7 @@ var setFsWatchListener = (path22, fullPath, options, handlers) => {
         cont.watcherUnusable = true;
       if (isWindows && error2.code === "EPERM") {
         try {
-          const fd = await open(path22, "r");
+          const fd = await open(path23, "r");
           await fd.close();
           broadcastErr(error2);
         } catch (err) {
@@ -37715,7 +38125,7 @@ var setFsWatchListener = (path22, fullPath, options, handlers) => {
   };
 };
 var FsWatchFileInstances = /* @__PURE__ */ new Map();
-var setFsWatchFileListener = (path22, fullPath, options, handlers) => {
+var setFsWatchFileListener = (path23, fullPath, options, handlers) => {
   const { listener, rawEmitter } = handlers;
   let cont = FsWatchFileInstances.get(fullPath);
   const copts = cont && cont.options;
@@ -37737,7 +38147,7 @@ var setFsWatchFileListener = (path22, fullPath, options, handlers) => {
         });
         const currmtime = curr.mtimeMs;
         if (curr.size !== prev.size || currmtime > prev.mtimeMs || currmtime === 0) {
-          foreach(cont.listeners, (listener2) => listener2(path22, curr));
+          foreach(cont.listeners, (listener2) => listener2(path23, curr));
         }
       })
     };
@@ -37765,13 +38175,13 @@ var NodeFsHandler = class {
    * @param listener on fs change
    * @returns closer for the watcher instance
    */
-  _watchWithNodeFs(path22, listener) {
+  _watchWithNodeFs(path23, listener) {
     const opts = this.fsw.options;
-    const directory = sysPath.dirname(path22);
-    const basename3 = sysPath.basename(path22);
+    const directory = sysPath.dirname(path23);
+    const basename3 = sysPath.basename(path23);
     const parent = this.fsw._getWatchedDir(directory);
     parent.add(basename3);
-    const absolutePath = sysPath.resolve(path22);
+    const absolutePath = sysPath.resolve(path23);
     const options = {
       persistent: opts.persistent
     };
@@ -37781,12 +38191,12 @@ var NodeFsHandler = class {
     if (opts.usePolling) {
       const enableBin = opts.interval !== opts.binaryInterval;
       options.interval = enableBin && isBinaryPath(basename3) ? opts.binaryInterval : opts.interval;
-      closer = setFsWatchFileListener(path22, absolutePath, options, {
+      closer = setFsWatchFileListener(path23, absolutePath, options, {
         listener,
         rawEmitter: this.fsw._emitRaw
       });
     } else {
-      closer = setFsWatchListener(path22, absolutePath, options, {
+      closer = setFsWatchListener(path23, absolutePath, options, {
         listener,
         errHandler: this._boundHandleError,
         rawEmitter: this.fsw._emitRaw
@@ -37808,7 +38218,7 @@ var NodeFsHandler = class {
     let prevStats = stats;
     if (parent.has(basename3))
       return;
-    const listener = async (path22, newStats) => {
+    const listener = async (path23, newStats) => {
       if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file, 5))
         return;
       if (!newStats || newStats.mtimeMs === 0) {
@@ -37822,11 +38232,11 @@ var NodeFsHandler = class {
             this.fsw._emit(EV.CHANGE, file, newStats2);
           }
           if ((isMacos || isLinux || isFreeBSD) && prevStats.ino !== newStats2.ino) {
-            this.fsw._closeFile(path22);
+            this.fsw._closeFile(path23);
             prevStats = newStats2;
             const closer2 = this._watchWithNodeFs(file, listener);
             if (closer2)
-              this.fsw._addPathCloser(path22, closer2);
+              this.fsw._addPathCloser(path23, closer2);
           } else {
             prevStats = newStats2;
           }
@@ -37858,7 +38268,7 @@ var NodeFsHandler = class {
    * @param item basename of this item
    * @returns true if no more processing is needed for this entry.
    */
-  async _handleSymlink(entry, directory, path22, item) {
+  async _handleSymlink(entry, directory, path23, item) {
     if (this.fsw.closed) {
       return;
     }
@@ -37868,7 +38278,7 @@ var NodeFsHandler = class {
       this.fsw._incrReadyCount();
       let linkPath;
       try {
-        linkPath = await fsrealpath(path22);
+        linkPath = await fsrealpath(path23);
       } catch (e) {
         this.fsw._emitReady();
         return true;
@@ -37878,12 +38288,12 @@ var NodeFsHandler = class {
       if (dir.has(item)) {
         if (this.fsw._symlinkPaths.get(full) !== linkPath) {
           this.fsw._symlinkPaths.set(full, linkPath);
-          this.fsw._emit(EV.CHANGE, path22, entry.stats);
+          this.fsw._emit(EV.CHANGE, path23, entry.stats);
         }
       } else {
         dir.add(item);
         this.fsw._symlinkPaths.set(full, linkPath);
-        this.fsw._emit(EV.ADD, path22, entry.stats);
+        this.fsw._emit(EV.ADD, path23, entry.stats);
       }
       this.fsw._emitReady();
       return true;
@@ -37912,9 +38322,9 @@ var NodeFsHandler = class {
         return;
       }
       const item = entry.path;
-      let path22 = sysPath.join(directory, item);
+      let path23 = sysPath.join(directory, item);
       current.add(item);
-      if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path22, item)) {
+      if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path23, item)) {
         return;
       }
       if (this.fsw.closed) {
@@ -37923,8 +38333,8 @@ var NodeFsHandler = class {
       }
       if (item === target || !target && !previous.has(item)) {
         this.fsw._incrReadyCount();
-        path22 = sysPath.join(dir, sysPath.relative(dir, path22));
-        this._addToNodeFs(path22, initialAdd, wh, depth + 1);
+        path23 = sysPath.join(dir, sysPath.relative(dir, path23));
+        this._addToNodeFs(path23, initialAdd, wh, depth + 1);
       }
     }).on(EV.ERROR, this._boundHandleError);
     return new Promise((resolve3, reject) => {
@@ -37993,13 +38403,13 @@ var NodeFsHandler = class {
    * @param depth Child path actually targeted for watch
    * @param target Child path actually targeted for watch
    */
-  async _addToNodeFs(path22, initialAdd, priorWh, depth, target) {
+  async _addToNodeFs(path23, initialAdd, priorWh, depth, target) {
     const ready = this.fsw._emitReady;
-    if (this.fsw._isIgnored(path22) || this.fsw.closed) {
+    if (this.fsw._isIgnored(path23) || this.fsw.closed) {
       ready();
       return false;
     }
-    const wh = this.fsw._getWatchHelpers(path22);
+    const wh = this.fsw._getWatchHelpers(path23);
     if (priorWh) {
       wh.filterPath = (entry) => priorWh.filterPath(entry);
       wh.filterDir = (entry) => priorWh.filterDir(entry);
@@ -38015,8 +38425,8 @@ var NodeFsHandler = class {
       const follow = this.fsw.options.followSymlinks;
       let closer;
       if (stats.isDirectory()) {
-        const absPath = sysPath.resolve(path22);
-        const targetPath = follow ? await fsrealpath(path22) : path22;
+        const absPath = sysPath.resolve(path23);
+        const targetPath = follow ? await fsrealpath(path23) : path23;
         if (this.fsw.closed)
           return;
         closer = await this._handleDir(wh.watchPath, stats, initialAdd, depth, target, wh, targetPath);
@@ -38026,29 +38436,29 @@ var NodeFsHandler = class {
           this.fsw._symlinkPaths.set(absPath, targetPath);
         }
       } else if (stats.isSymbolicLink()) {
-        const targetPath = follow ? await fsrealpath(path22) : path22;
+        const targetPath = follow ? await fsrealpath(path23) : path23;
         if (this.fsw.closed)
           return;
         const parent = sysPath.dirname(wh.watchPath);
         this.fsw._getWatchedDir(parent).add(wh.watchPath);
         this.fsw._emit(EV.ADD, wh.watchPath, stats);
-        closer = await this._handleDir(parent, stats, initialAdd, depth, path22, wh, targetPath);
+        closer = await this._handleDir(parent, stats, initialAdd, depth, path23, wh, targetPath);
         if (this.fsw.closed)
           return;
         if (targetPath !== void 0) {
-          this.fsw._symlinkPaths.set(sysPath.resolve(path22), targetPath);
+          this.fsw._symlinkPaths.set(sysPath.resolve(path23), targetPath);
         }
       } else {
         closer = this._handleFile(wh.watchPath, stats, initialAdd);
       }
       ready();
       if (closer)
-        this.fsw._addPathCloser(path22, closer);
+        this.fsw._addPathCloser(path23, closer);
       return false;
     } catch (error2) {
       if (this.fsw._handleError(error2)) {
         ready();
-        return path22;
+        return path23;
       }
     }
   }
@@ -38091,26 +38501,26 @@ function createPattern(matcher) {
   }
   return () => false;
 }
-function normalizePath(path22) {
-  if (typeof path22 !== "string")
+function normalizePath(path23) {
+  if (typeof path23 !== "string")
     throw new Error("string expected");
-  path22 = sysPath2.normalize(path22);
-  path22 = path22.replace(/\\/g, "/");
+  path23 = sysPath2.normalize(path23);
+  path23 = path23.replace(/\\/g, "/");
   let prepend = false;
-  if (path22.startsWith("//"))
+  if (path23.startsWith("//"))
     prepend = true;
   const DOUBLE_SLASH_RE2 = /\/\//;
-  while (path22.match(DOUBLE_SLASH_RE2))
-    path22 = path22.replace(DOUBLE_SLASH_RE2, "/");
+  while (path23.match(DOUBLE_SLASH_RE2))
+    path23 = path23.replace(DOUBLE_SLASH_RE2, "/");
   if (prepend)
-    path22 = "/" + path22;
-  return path22;
+    path23 = "/" + path23;
+  return path23;
 }
 function matchPatterns(patterns, testString, stats) {
-  const path22 = normalizePath(testString);
+  const path23 = normalizePath(testString);
   for (let index = 0; index < patterns.length; index++) {
     const pattern = patterns[index];
-    if (pattern(path22, stats)) {
+    if (pattern(path23, stats)) {
       return true;
     }
   }
@@ -38150,19 +38560,19 @@ var toUnix = (string) => {
   }
   return str;
 };
-var normalizePathToUnix = (path22) => toUnix(sysPath2.normalize(toUnix(path22)));
-var normalizeIgnored = (cwd = "") => (path22) => {
-  if (typeof path22 === "string") {
-    return normalizePathToUnix(sysPath2.isAbsolute(path22) ? path22 : sysPath2.join(cwd, path22));
+var normalizePathToUnix = (path23) => toUnix(sysPath2.normalize(toUnix(path23)));
+var normalizeIgnored = (cwd = "") => (path23) => {
+  if (typeof path23 === "string") {
+    return normalizePathToUnix(sysPath2.isAbsolute(path23) ? path23 : sysPath2.join(cwd, path23));
   } else {
-    return path22;
+    return path23;
   }
 };
-var getAbsolutePath = (path22, cwd) => {
-  if (sysPath2.isAbsolute(path22)) {
-    return path22;
+var getAbsolutePath = (path23, cwd) => {
+  if (sysPath2.isAbsolute(path23)) {
+    return path23;
   }
-  return sysPath2.join(cwd, path22);
+  return sysPath2.join(cwd, path23);
 };
 var EMPTY_SET = Object.freeze(/* @__PURE__ */ new Set());
 var DirEntry = class {
@@ -38217,10 +38627,10 @@ var DirEntry = class {
 var STAT_METHOD_F = "stat";
 var STAT_METHOD_L = "lstat";
 var WatchHelper = class {
-  constructor(path22, follow, fsw) {
+  constructor(path23, follow, fsw) {
     this.fsw = fsw;
-    const watchPath = path22;
-    this.path = path22 = path22.replace(REPLACER_RE, "");
+    const watchPath = path23;
+    this.path = path23 = path23.replace(REPLACER_RE, "");
     this.watchPath = watchPath;
     this.fullWatchPath = sysPath2.resolve(watchPath);
     this.dirParts = [];
@@ -38342,20 +38752,20 @@ var FSWatcher = class extends EventEmitter {
     this._closePromise = void 0;
     let paths = unifyPaths(paths_);
     if (cwd) {
-      paths = paths.map((path22) => {
-        const absPath = getAbsolutePath(path22, cwd);
+      paths = paths.map((path23) => {
+        const absPath = getAbsolutePath(path23, cwd);
         return absPath;
       });
     }
-    paths.forEach((path22) => {
-      this._removeIgnoredPath(path22);
+    paths.forEach((path23) => {
+      this._removeIgnoredPath(path23);
     });
     this._userIgnored = void 0;
     if (!this._readyCount)
       this._readyCount = 0;
     this._readyCount += paths.length;
-    Promise.all(paths.map(async (path22) => {
-      const res = await this._nodeFsHandler._addToNodeFs(path22, !_internal, void 0, 0, _origAdd);
+    Promise.all(paths.map(async (path23) => {
+      const res = await this._nodeFsHandler._addToNodeFs(path23, !_internal, void 0, 0, _origAdd);
       if (res)
         this._emitReady();
       return res;
@@ -38377,17 +38787,17 @@ var FSWatcher = class extends EventEmitter {
       return this;
     const paths = unifyPaths(paths_);
     const { cwd } = this.options;
-    paths.forEach((path22) => {
-      if (!sysPath2.isAbsolute(path22) && !this._closers.has(path22)) {
+    paths.forEach((path23) => {
+      if (!sysPath2.isAbsolute(path23) && !this._closers.has(path23)) {
         if (cwd)
-          path22 = sysPath2.join(cwd, path22);
-        path22 = sysPath2.resolve(path22);
+          path23 = sysPath2.join(cwd, path23);
+        path23 = sysPath2.resolve(path23);
       }
-      this._closePath(path22);
-      this._addIgnoredPath(path22);
-      if (this._watched.has(path22)) {
+      this._closePath(path23);
+      this._addIgnoredPath(path23);
+      if (this._watched.has(path23)) {
         this._addIgnoredPath({
-          path: path22,
+          path: path23,
           recursive: true
         });
       }
@@ -38451,38 +38861,38 @@ var FSWatcher = class extends EventEmitter {
    * @param stats arguments to be passed with event
    * @returns the error if defined, otherwise the value of the FSWatcher instance's `closed` flag
    */
-  async _emit(event, path22, stats) {
+  async _emit(event, path23, stats) {
     if (this.closed)
       return;
     const opts = this.options;
     if (isWindows)
-      path22 = sysPath2.normalize(path22);
+      path23 = sysPath2.normalize(path23);
     if (opts.cwd)
-      path22 = sysPath2.relative(opts.cwd, path22);
-    const args = [path22];
+      path23 = sysPath2.relative(opts.cwd, path23);
+    const args = [path23];
     if (stats != null)
       args.push(stats);
     const awf = opts.awaitWriteFinish;
     let pw;
-    if (awf && (pw = this._pendingWrites.get(path22))) {
+    if (awf && (pw = this._pendingWrites.get(path23))) {
       pw.lastChange = /* @__PURE__ */ new Date();
       return this;
     }
     if (opts.atomic) {
       if (event === EVENTS.UNLINK) {
-        this._pendingUnlinks.set(path22, [event, ...args]);
+        this._pendingUnlinks.set(path23, [event, ...args]);
         setTimeout(() => {
-          this._pendingUnlinks.forEach((entry, path23) => {
+          this._pendingUnlinks.forEach((entry, path24) => {
             this.emit(...entry);
             this.emit(EVENTS.ALL, ...entry);
-            this._pendingUnlinks.delete(path23);
+            this._pendingUnlinks.delete(path24);
           });
         }, typeof opts.atomic === "number" ? opts.atomic : 100);
         return this;
       }
-      if (event === EVENTS.ADD && this._pendingUnlinks.has(path22)) {
+      if (event === EVENTS.ADD && this._pendingUnlinks.has(path23)) {
         event = EVENTS.CHANGE;
-        this._pendingUnlinks.delete(path22);
+        this._pendingUnlinks.delete(path23);
       }
     }
     if (awf && (event === EVENTS.ADD || event === EVENTS.CHANGE) && this._readyEmitted) {
@@ -38500,16 +38910,16 @@ var FSWatcher = class extends EventEmitter {
           this.emitWithAll(event, args);
         }
       };
-      this._awaitWriteFinish(path22, awf.stabilityThreshold, event, awfEmit);
+      this._awaitWriteFinish(path23, awf.stabilityThreshold, event, awfEmit);
       return this;
     }
     if (event === EVENTS.CHANGE) {
-      const isThrottled = !this._throttle(EVENTS.CHANGE, path22, 50);
+      const isThrottled = !this._throttle(EVENTS.CHANGE, path23, 50);
       if (isThrottled)
         return this;
     }
     if (opts.alwaysStat && stats === void 0 && (event === EVENTS.ADD || event === EVENTS.ADD_DIR || event === EVENTS.CHANGE)) {
-      const fullPath = opts.cwd ? sysPath2.join(opts.cwd, path22) : path22;
+      const fullPath = opts.cwd ? sysPath2.join(opts.cwd, path23) : path23;
       let stats2;
       try {
         stats2 = await stat3(fullPath);
@@ -38540,23 +38950,23 @@ var FSWatcher = class extends EventEmitter {
    * @param timeout duration of time to suppress duplicate actions
    * @returns tracking object or false if action should be suppressed
    */
-  _throttle(actionType, path22, timeout) {
+  _throttle(actionType, path23, timeout) {
     if (!this._throttled.has(actionType)) {
       this._throttled.set(actionType, /* @__PURE__ */ new Map());
     }
     const action = this._throttled.get(actionType);
     if (!action)
       throw new Error("invalid throttle");
-    const actionPath = action.get(path22);
+    const actionPath = action.get(path23);
     if (actionPath) {
       actionPath.count++;
       return false;
     }
     let timeoutObject;
     const clear = () => {
-      const item = action.get(path22);
+      const item = action.get(path23);
       const count = item ? item.count : 0;
-      action.delete(path22);
+      action.delete(path23);
       clearTimeout(timeoutObject);
       if (item)
         clearTimeout(item.timeoutObject);
@@ -38564,7 +38974,7 @@ var FSWatcher = class extends EventEmitter {
     };
     timeoutObject = setTimeout(clear, timeout);
     const thr = { timeoutObject, clear, count: 0 };
-    action.set(path22, thr);
+    action.set(path23, thr);
     return thr;
   }
   _incrReadyCount() {
@@ -38578,44 +38988,44 @@ var FSWatcher = class extends EventEmitter {
    * @param event
    * @param awfEmit Callback to be called when ready for event to be emitted.
    */
-  _awaitWriteFinish(path22, threshold, event, awfEmit) {
+  _awaitWriteFinish(path23, threshold, event, awfEmit) {
     const awf = this.options.awaitWriteFinish;
     if (typeof awf !== "object")
       return;
     const pollInterval = awf.pollInterval;
     let timeoutHandler;
-    let fullPath = path22;
-    if (this.options.cwd && !sysPath2.isAbsolute(path22)) {
-      fullPath = sysPath2.join(this.options.cwd, path22);
+    let fullPath = path23;
+    if (this.options.cwd && !sysPath2.isAbsolute(path23)) {
+      fullPath = sysPath2.join(this.options.cwd, path23);
     }
     const now = /* @__PURE__ */ new Date();
     const writes = this._pendingWrites;
     function awaitWriteFinishFn(prevStat) {
       statcb(fullPath, (err, curStat) => {
-        if (err || !writes.has(path22)) {
+        if (err || !writes.has(path23)) {
           if (err && err.code !== "ENOENT")
             awfEmit(err);
           return;
         }
         const now2 = Number(/* @__PURE__ */ new Date());
         if (prevStat && curStat.size !== prevStat.size) {
-          writes.get(path22).lastChange = now2;
+          writes.get(path23).lastChange = now2;
         }
-        const pw = writes.get(path22);
+        const pw = writes.get(path23);
         const df = now2 - pw.lastChange;
         if (df >= threshold) {
-          writes.delete(path22);
+          writes.delete(path23);
           awfEmit(void 0, curStat);
         } else {
           timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval, curStat);
         }
       });
     }
-    if (!writes.has(path22)) {
-      writes.set(path22, {
+    if (!writes.has(path23)) {
+      writes.set(path23, {
         lastChange: now,
         cancelWait: () => {
-          writes.delete(path22);
+          writes.delete(path23);
           clearTimeout(timeoutHandler);
           return event;
         }
@@ -38626,8 +39036,8 @@ var FSWatcher = class extends EventEmitter {
   /**
    * Determines whether user has asked to ignore this path.
    */
-  _isIgnored(path22, stats) {
-    if (this.options.atomic && DOT_RE.test(path22))
+  _isIgnored(path23, stats) {
+    if (this.options.atomic && DOT_RE.test(path23))
       return true;
     if (!this._userIgnored) {
       const { cwd } = this.options;
@@ -38637,17 +39047,17 @@ var FSWatcher = class extends EventEmitter {
       const list = [...ignoredPaths.map(normalizeIgnored(cwd)), ...ignored];
       this._userIgnored = anymatch(list, void 0);
     }
-    return this._userIgnored(path22, stats);
+    return this._userIgnored(path23, stats);
   }
-  _isntIgnored(path22, stat4) {
-    return !this._isIgnored(path22, stat4);
+  _isntIgnored(path23, stat4) {
+    return !this._isIgnored(path23, stat4);
   }
   /**
    * Provides a set of common helpers and properties relating to symlink handling.
    * @param path file or directory pattern being watched
    */
-  _getWatchHelpers(path22) {
-    return new WatchHelper(path22, this.options.followSymlinks, this);
+  _getWatchHelpers(path23) {
+    return new WatchHelper(path23, this.options.followSymlinks, this);
   }
   // Directory helpers
   // -----------------
@@ -38679,63 +39089,63 @@ var FSWatcher = class extends EventEmitter {
    * @param item      base path of item/directory
    */
   _remove(directory, item, isDirectory) {
-    const path22 = sysPath2.join(directory, item);
-    const fullPath = sysPath2.resolve(path22);
-    isDirectory = isDirectory != null ? isDirectory : this._watched.has(path22) || this._watched.has(fullPath);
-    if (!this._throttle("remove", path22, 100))
+    const path23 = sysPath2.join(directory, item);
+    const fullPath = sysPath2.resolve(path23);
+    isDirectory = isDirectory != null ? isDirectory : this._watched.has(path23) || this._watched.has(fullPath);
+    if (!this._throttle("remove", path23, 100))
       return;
     if (!isDirectory && this._watched.size === 1) {
       this.add(directory, item, true);
     }
-    const wp = this._getWatchedDir(path22);
+    const wp = this._getWatchedDir(path23);
     const nestedDirectoryChildren = wp.getChildren();
-    nestedDirectoryChildren.forEach((nested) => this._remove(path22, nested));
+    nestedDirectoryChildren.forEach((nested) => this._remove(path23, nested));
     const parent = this._getWatchedDir(directory);
     const wasTracked = parent.has(item);
     parent.remove(item);
     if (this._symlinkPaths.has(fullPath)) {
       this._symlinkPaths.delete(fullPath);
     }
-    let relPath = path22;
+    let relPath = path23;
     if (this.options.cwd)
-      relPath = sysPath2.relative(this.options.cwd, path22);
+      relPath = sysPath2.relative(this.options.cwd, path23);
     if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
       const event = this._pendingWrites.get(relPath).cancelWait();
       if (event === EVENTS.ADD)
         return;
     }
-    this._watched.delete(path22);
+    this._watched.delete(path23);
     this._watched.delete(fullPath);
     const eventName = isDirectory ? EVENTS.UNLINK_DIR : EVENTS.UNLINK;
-    if (wasTracked && !this._isIgnored(path22))
-      this._emit(eventName, path22);
-    this._closePath(path22);
+    if (wasTracked && !this._isIgnored(path23))
+      this._emit(eventName, path23);
+    this._closePath(path23);
   }
   /**
    * Closes all watchers for a path
    */
-  _closePath(path22) {
-    this._closeFile(path22);
-    const dir = sysPath2.dirname(path22);
-    this._getWatchedDir(dir).remove(sysPath2.basename(path22));
+  _closePath(path23) {
+    this._closeFile(path23);
+    const dir = sysPath2.dirname(path23);
+    this._getWatchedDir(dir).remove(sysPath2.basename(path23));
   }
   /**
    * Closes only file-specific watchers
    */
-  _closeFile(path22) {
-    const closers = this._closers.get(path22);
+  _closeFile(path23) {
+    const closers = this._closers.get(path23);
     if (!closers)
       return;
     closers.forEach((closer) => closer());
-    this._closers.delete(path22);
+    this._closers.delete(path23);
   }
-  _addPathCloser(path22, closer) {
+  _addPathCloser(path23, closer) {
     if (!closer)
       return;
-    let list = this._closers.get(path22);
+    let list = this._closers.get(path23);
     if (!list) {
       list = [];
-      this._closers.set(path22, list);
+      this._closers.set(path23, list);
     }
     list.push(closer);
   }
@@ -38765,7 +39175,7 @@ function watch(paths, options = {}) {
 var esm_default13 = { watch, FSWatcher };
 
 // src/lib/watcher.ts
-import path13 from "node:path";
+import path14 from "node:path";
 function startWatcher(options) {
   const { dir, extensions, onChange } = options;
   const extSet = new Set(extensions);
@@ -38779,7 +39189,7 @@ function startWatcher(options) {
   });
   let debounceTimer = null;
   const handleChange2 = (filePath) => {
-    const ext = path13.extname(filePath);
+    const ext = path14.extname(filePath);
     if (!extSet.has(ext)) return;
     if (debounceTimer) clearTimeout(debounceTimer);
     debounceTimer = setTimeout(() => {
@@ -38805,29 +39215,30 @@ var import_websocket_server = __toESM(require_websocket_server(), 1);
 import http from "node:http";
 var PORT_START = 4400;
 var PORT_END = 4409;
+var PING_INTERVAL_MS = 3e4;
+function portsBusyError(start, end) {
+  return new CliError("cli_failed", `Ports ${start} to ${end} are all busy.`, [
+    "Another `avsb dev` (or another program) is holding them. Stop it, then run this again.",
+    `\`lsof -i :${start}\` shows what is listening on a port.`
+  ]);
+}
+function isAddressInUse(err) {
+  return typeof err === "object" && err !== null && "code" in err && err.code === "EADDRINUSE";
+}
 async function startDevServer(options) {
   const { experimentName, experimentId, onExtensionMessage } = options;
-  let resolvedPort = 0;
-  let httpServer = null;
-  let wss = null;
-  for (let port = PORT_START; port <= PORT_END; port++) {
+  const start = options.portRange?.start ?? PORT_START;
+  const end = options.portRange?.end ?? PORT_END;
+  let bound = null;
+  for (let port2 = start; port2 <= end && !bound; port2++) {
     try {
-      const result = await tryPort(port, experimentName, experimentId, onExtensionMessage);
-      httpServer = result.httpServer;
-      wss = result.wss;
-      resolvedPort = port;
-      break;
-    } catch {
-      continue;
+      bound = { ...await tryPort(port2, experimentName, experimentId, onExtensionMessage), port: port2 };
+    } catch (err) {
+      if (!isAddressInUse(err)) throw err;
     }
   }
-  if (!httpServer || !wss) {
-    throw new Error(`Could not find available port in range ${PORT_START}-${PORT_END}`);
-  }
-  const pingInterval = setInterval(() => {
-    const msg = { type: "ping", timestamp: Date.now() };
-    broadcast(JSON.stringify(msg));
-  }, 3e4);
+  if (!bound) throw portsBusyError(start, end);
+  const { httpServer, wss, port } = bound;
   function broadcast(data) {
     wss.clients.forEach((client) => {
       if (client.readyState === import_websocket.default.OPEN) {
@@ -38835,8 +39246,12 @@ async function startDevServer(options) {
       }
     });
   }
+  const pingInterval = setInterval(() => {
+    const msg = { type: "ping", timestamp: Date.now() };
+    broadcast(JSON.stringify(msg));
+  }, PING_INTERVAL_MS);
   return {
-    port: resolvedPort,
+    port,
     broadcast(msg) {
       broadcast(JSON.stringify(msg));
     },
@@ -38879,6 +39294,16 @@ function tryPort(port, experimentName, experimentId, onExtensionMessage) {
       );
     });
     const wss = new import_websocket_server.default({ server: httpServer });
+    let settled = false;
+    const fail2 = (err) => {
+      if (settled) return;
+      settled = true;
+      wss.close();
+      httpServer.close();
+      reject(err);
+    };
+    httpServer.on("error", fail2);
+    wss.on("error", fail2);
     wss.on("connection", (ws) => {
       ws.on("message", (raw) => {
         try {
@@ -38888,8 +39313,11 @@ function tryPort(port, experimentName, experimentId, onExtensionMessage) {
         }
       });
     });
-    httpServer.on("error", reject);
-    httpServer.listen(port, () => resolve3({ httpServer, wss }));
+    httpServer.listen(port, () => {
+      if (settled) return;
+      settled = true;
+      resolve3({ httpServer, wss });
+    });
   });
 }
 
@@ -38945,7 +39373,7 @@ var devCommand = new Command("dev").description("Start dev server with live relo
       dir,
       extensions: [".ts", ".js", ".scss", ".css"],
       onChange: async (filePath) => {
-        const relativePath = path14.relative(dir, filePath);
+        const relativePath = path15.relative(dir, filePath);
         info(`File changed: ${relativePath}`);
         try {
           compiled = await compileExperiment(dir, manifest);
@@ -39061,15 +39489,15 @@ var statusCommand = withOutputOptions(
   heading(manifest.experimentName);
   line();
   for (const row of buildStatusRows(manifest)) {
-    label(row.label, row.value);
+    field(row.label, row.value);
   }
   line();
 });
 
 // src/commands/project.ts
 import { createHash as createHash4 } from "node:crypto";
-import fs11 from "node:fs";
-import path15 from "node:path";
+import fs12 from "node:fs";
+import path16 from "node:path";
 function sha2564(content) {
   return createHash4("sha256").update(content).digest("hex");
 }
@@ -39100,16 +39528,29 @@ var projectPullCommand = new Command("pull").description("Pull project script fr
     label("ID", `PRJ-${project.shortId}`);
     label("Language", project.projectJsLang === "TYPESCRIPT" ? "TypeScript" : "JavaScript");
     line();
-    const folderName = `project-${project.shortId}`;
-    const dir = path15.join(process.cwd(), folderName);
-    if (fs11.existsSync(dir)) {
+    const target = resolveProjectPullTarget(process.cwd(), project.shortId);
+    const dir = target.dir;
+    if (target.kind === "blocked") {
+      failCommand(
+        new CliError("cli_usage", `${dir} already exists and is not a pulled copy of PRJ-${project.shortId}.`, [
+          "Move or rename it, or run `avsb project pull` from another folder."
+        ])
+      );
+    }
+    if (target.kind === "existing") {
       const { manifest } = readProjectManifestOrExit(dir);
       if (!options.force) {
         const scriptFile = `project.${manifest.language}`;
-        const scriptPath = path15.join(dir, scriptFile);
-        const localContent = fs11.existsSync(scriptPath) ? fs11.readFileSync(scriptPath, "utf-8") : "";
+        const scriptPath = path16.join(dir, scriptFile);
+        const localContent = fs12.existsSync(scriptPath) ? fs12.readFileSync(scriptPath, "utf-8") : "";
         const remoteContent = manifest.language === "ts" ? project.editorProjectTs ?? project.editorProjectJs ?? "" : project.editorProjectJs ?? "";
         if (localContent !== remoteContent && localContent !== "") {
+          const refusal = refusalWithoutPrompt({
+            code: "cli_conflict",
+            message: `Pulling would overwrite your local ${scriptFile}, and this run cannot ask first.`,
+            hints: [`Run \`avsb project pull ${projectInput} --force\` to overwrite it.`]
+          });
+          if (refusal) failCommand(refusal);
           const { proceed } = await esm_default12.prompt([
             {
               type: "confirm",
@@ -39127,7 +39568,7 @@ var projectPullCommand = new Command("pull").description("Pull project script fr
       const updateSpinner = ora("Updating files...").start();
       const updated = updateProjectFile(dir, manifest, response.data);
       if (updated.length > 0) {
-        updateSpinner.succeed("Files updated");
+        updateSpinner.succeed(`Files updated in ${path16.relative(process.cwd(), dir) || "this folder"}`);
         fileTree(updated);
       } else {
         updateSpinner.succeed("Already up to date");
@@ -39135,12 +39576,12 @@ var projectPullCommand = new Command("pull").description("Pull project script fr
     } else {
       const scaffoldSpinner = ora("Scaffolding project files...").start();
       try {
-        const result = scaffoldProject({ data: response.data, apiBaseUrl: config.apiBaseUrl });
+        const result = scaffoldProject({ data: response.data, apiBaseUrl: config.apiBaseUrl, targetDir: dir });
         scaffoldSpinner.succeed("Files created");
         line();
         fileTree(result.files);
         line();
-        success(`Project cloned to ${folderName}/`);
+        success(`Project cloned to ${path16.relative(process.cwd(), dir) || "."}/`);
       } catch (err) {
         scaffoldSpinner.fail("Scaffolding failed");
         failCommand(err);
@@ -39156,11 +39597,11 @@ var projectPushCommand = new Command("push").description("Compile and push proje
     const { manifest, dir } = readProjectManifestOrExit();
     const api = new ApiClient(config);
     const scriptFile = `project.${manifest.language}`;
-    const scriptPath = path15.join(dir, scriptFile);
-    if (!fs11.existsSync(scriptPath)) {
+    const scriptPath = path16.join(dir, scriptFile);
+    if (!fs12.existsSync(scriptPath)) {
       failCommand(new CliError("cli_no_manifest", `File not found: ${scriptFile}`));
     }
-    const source = fs11.readFileSync(scriptPath, "utf-8");
+    const source = fs12.readFileSync(scriptPath, "utf-8");
     const projLang = manifest.language === "ts" ? "TYPESCRIPT" : "JAVASCRIPT";
     const compileSpinner = ora(`Compiling ${scriptFile}...`).start();
     const compileResult = await compileScript(source, projLang, scriptFile, { minify: true });
@@ -39182,6 +39623,18 @@ var projectPushCommand = new Command("push").description("Compile and push proje
       if (remoteHash !== manifest.syncedHash) {
         spinner.warn("Remote has changes you haven't pulled");
         line();
+        if (!isInteractiveRun()) {
+          failCommand(
+            new CliError(
+              "cli_conflict",
+              "The platform copy changed since your last pull, and this run cannot ask before overwriting it.",
+              [
+                "Run `avsb project pull --force` to fetch the remote script first (it overwrites your local file),",
+                "or `avsb project push --force` to overwrite the remote changes."
+              ]
+            )
+          );
+        }
         const { proceed } = await esm_default12.prompt([
           {
             type: "confirm",
@@ -39200,12 +39653,18 @@ var projectPushCommand = new Command("push").description("Compile and push proje
       }
     }
     const payload = manifest.language === "ts" ? { editorProjectTs: { source, compiled: compiledSource } } : { editorProjectJs: { source, compiled: compiledSource } };
-    await api.pushProject(manifest.projectShortId, payload);
+    try {
+      await api.pushProject(manifest.projectShortId, payload);
+    } catch (err) {
+      spinner.fail("Push refused");
+      failCommand(err, { labelForPath: (bodyPath) => bodyPath.length > 0 ? scriptFile : void 0 });
+    }
     manifest.syncedHash = sha2564(source);
     manifest.lastSyncedAt = (/* @__PURE__ */ new Date()).toISOString();
     writeProjectManifest(dir, manifest);
     spinner.succeed("Pushed successfully");
     line();
+    info("Saved as unpublished changes. Publish the script from the project's Snippet settings to put it live.");
     success("Push complete");
   } catch (err) {
     failCommand(err);
@@ -39216,11 +39675,11 @@ var projectDevCommand = new Command("dev").description("Watch project script and
     ensureLoggedIn();
     const { manifest, dir } = readProjectManifestOrExit();
     const scriptFile = `project.${manifest.language}`;
-    const scriptPath = path15.join(dir, scriptFile);
+    const scriptPath = path16.join(dir, scriptFile);
     heading(`Dev mode: ${manifest.projectName} (project script)`);
     line();
     let compiledJs;
-    const source = fs11.readFileSync(scriptPath, "utf-8");
+    const source = fs12.readFileSync(scriptPath, "utf-8");
     if (manifest.language === "ts") {
       const spinner = ora("Compiling...").start();
       try {
@@ -39259,10 +39718,10 @@ var projectDevCommand = new Command("dev").description("Watch project script and
       dir,
       extensions: [".ts", ".js"],
       onChange: async (filePath) => {
-        const relativePath = path15.relative(dir, filePath);
+        const relativePath = path16.relative(dir, filePath);
         info(`File changed: ${relativePath}`);
         try {
-          const newSource = fs11.readFileSync(filePath, "utf-8");
+          const newSource = fs12.readFileSync(filePath, "utf-8");
           compiledJs = manifest.language === "ts" ? await compileTypeScript(newSource) : newSource;
           const updateMsg = {
             type: "project:update",
@@ -39508,6 +39967,57 @@ function isConflictError(err) {
   if (!(err instanceof Error)) return false;
   return /409|conflict|referenc/i.test(err.message);
 }
+function isRecord5(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isCliMetric(value) {
+  return isRecord5(value) && typeof value.id === "string" && typeof value.shortId === "number" && typeof value.name === "string" && typeof value.type === "string";
+}
+function readMetricList(data) {
+  if (!isRecord5(data) || !Array.isArray(data.metrics)) return null;
+  const metrics = data.metrics.filter(isCliMetric);
+  const usage = isRecord5(data.usage) ? data.usage : {};
+  return { metrics, usage };
+}
+function readMetric(data) {
+  return isRecord5(data) && isCliMetric(data.metric) ? data.metric : null;
+}
+function formatMetricTable(metrics, usage) {
+  const rows = metrics.map((metric) => ({
+    id: metricIdLabel(metric),
+    type: metric.type,
+    name: truncate(metric.name, 32),
+    definition: truncate(describeMetric(metric), 48),
+    usage: formatUsage(usage[metric.id]),
+    archived: metric.archivedAt != null
+  }));
+  const widths = {
+    id: Math.max(2, ...rows.map((r) => r.id.length)),
+    type: Math.max(4, ...rows.map((r) => r.type.length)),
+    name: Math.max(4, ...rows.map((r) => r.name.length)),
+    definition: Math.max(10, ...rows.map((r) => r.definition.length))
+  };
+  const heading2 = [
+    "ID".padEnd(widths.id),
+    "Type".padEnd(widths.type),
+    "Name".padEnd(widths.name),
+    "Definition".padEnd(widths.definition),
+    "Usage"
+  ].join("  ");
+  return {
+    heading: heading2,
+    rows: rows.map((row) => {
+      const line2 = [
+        row.id.padEnd(widths.id),
+        row.type.padEnd(widths.type),
+        row.name.padEnd(widths.name),
+        row.definition.padEnd(widths.definition),
+        row.usage
+      ].join("  ");
+      return row.archived ? `${line2}  (archived)` : line2;
+    })
+  };
+}
 
 // src/commands/metrics.ts
 var metricsListCommand = withOutputOptions(
@@ -39527,49 +40037,26 @@ var metricsListCommand = withOutputOptions(
     spinner.fail("Failed to fetch metrics");
     failCommand(err);
   }
-  const { metrics, usage } = response.data;
   if (emitJsonResult(response.data)) return;
-  if (metrics.length === 0) {
+  const list = readMetricList(response.data);
+  if (!list) {
+    failCommand(
+      new CliError("cli_failed", "The platform answered in a shape this CLI does not read.", [
+        "Upgrade the CLI with `npm install -g @avsbhq/cli`, or pass --json to see the raw answer."
+      ])
+    );
+  }
+  if (list.metrics.length === 0) {
     line();
     info(
       'No metrics yet. Create one with `avsb metrics create --type click --name "..." --selector ".cta"`'
     );
     return;
   }
-  const rows = metrics.map((metric) => ({
-    id: metricIdLabel(metric),
-    type: metric.type,
-    name: truncate(metric.name, 32),
-    definition: truncate(describeMetric(metric), 48),
-    usage: formatUsage(usage[metric.id]),
-    archived: metric.archivedAt != null
-  }));
-  const widths = {
-    id: Math.max(2, ...rows.map((r) => r.id.length)),
-    type: Math.max(4, ...rows.map((r) => r.type.length)),
-    name: Math.max(4, ...rows.map((r) => r.name.length)),
-    definition: Math.max(10, ...rows.map((r) => r.definition.length))
-  };
+  const table = formatMetricTable(list.metrics, list.usage);
   line();
-  heading(
-    [
-      "ID".padEnd(widths.id),
-      "Type".padEnd(widths.type),
-      "Name".padEnd(widths.name),
-      "Definition".padEnd(widths.definition),
-      "Usage"
-    ].join("  ")
-  );
-  for (const row of rows) {
-    const line2 = [
-      row.id.padEnd(widths.id),
-      row.type.padEnd(widths.type),
-      row.name.padEnd(widths.name),
-      row.definition.padEnd(widths.definition),
-      row.usage
-    ].join("  ");
-    line(row.archived ? `${line2}  (archived)` : line2);
-  }
+  heading(table.heading);
+  for (const row of table.rows) line(row);
   line();
 });
 var metricsCreateCommand = new Command("create").description("Create a new metric").option("--project <project>", "Project ID (PRJ-42 or numeric); defaults to local manifest").option("--type <type>", "Metric type (CLICK | PAGEVIEW | CUSTOM)").option("--name <name>", "Display name").option("--description <text>", "Optional description").option("--selector <selector>", "CSS selector (CLICK only)").option("--page-url <url>", "Page URL filter (CLICK only)").option("--url-match <pattern>", "URL match pattern (PAGEVIEW only)").option("--match-mode <mode>", "URL match mode for PAGEVIEW (SIMPLE | EXACT | PATH | SUBSTRING | PATTERN | REGEX)").option("--key <key>", "Metric key (CUSTOM only)").option("--has-value", "Toggle value-field tracking on a CUSTOM metric").action(async (opts) => {
@@ -39585,21 +40072,20 @@ var metricsCreateCommand = new Command("create").description("Create a new metri
   const body = buildCreateBody(type, opts, opts.name);
   const api = new ApiClient(config);
   const spinner = ora("Creating metric...").start();
+  let response;
   try {
-    const response = await api.createMetric(shortId, body);
-    const { metric } = response.data;
-    spinner.succeed(`Metric created: ${metric.name} (${metricIdLabel(metric)})`);
-    printMetricDetails(metric);
+    response = await api.createMetric(shortId, body);
   } catch (err) {
     spinner.fail("Failed to create metric");
-    const message = err instanceof Error ? err.message : "Unknown error";
-    if (/already exists|conflict|409|unique/i.test(message)) {
-      error(`Conflict: a metric with that name or key already exists. ${message}`);
-    } else {
-      error(message);
-    }
-    process.exit(EXIT.failure);
+    failCommand(err);
+  }
+  const metric = readMetric(response.data);
+  if (!metric) {
+    spinner.warn("Metric created. Run `avsb metrics list` to see it.");
+    return;
   }
+  spinner.succeed(`Metric created: ${metric.name} (${metricIdLabel(metric)})`);
+  printMetricDetails(metric);
 });
 var metricsUpdateCommand = new Command("update").argument("<metricId>", "Metric ID (cuid or numeric short ID)").description("Update a metric").option("--project <project>", "Project ID (PRJ-42 or numeric); defaults to local manifest").option("--name <name>", "New display name").option("--description <text>", "New description").option("--selector <selector>", "New CSS selector (CLICK)").option("--page-url <url>", "New page URL filter (CLICK)").option("--url-match <pattern>", "New URL match pattern (PAGEVIEW)").option("--match-mode <mode>", "New URL match mode (PAGEVIEW)").option("--key <key>", "New metric key (CUSTOM)").option("--has-value", "Enable value-field tracking (CUSTOM)").option("--no-has-value", "Disable value-field tracking (CUSTOM)").action(async (metricId, opts) => {
   const config = ensureLoggedIn();
@@ -39615,49 +40101,65 @@ var metricsUpdateCommand = new Command("update").argument("<metricId>", "Metric
   }
   const api = new ApiClient(config);
   const spinner = ora("Updating metric...").start();
+  let response;
   try {
-    const response = await api.updateMetric(shortId, metricId, patch);
-    const { metric } = response.data;
-    spinner.succeed(`Metric updated: ${metric.name} (${metricIdLabel(metric)})`);
-    printMetricDetails(metric);
+    response = await api.updateMetric(shortId, metricId, patch);
   } catch (err) {
     spinner.fail("Failed to update metric");
     failCommand(err);
   }
+  const metric = readMetric(response.data);
+  if (!metric) {
+    spinner.warn(`Metric ${metricId} updated.`);
+    return;
+  }
+  spinner.succeed(`Metric updated: ${metric.name} (${metricIdLabel(metric)})`);
+  printMetricDetails(metric);
 });
 var metricsArchiveCommand = new Command("archive").argument("<metricId>", "Metric ID").description("Archive a metric (soft-delete, preserves history)").option("--project <project>", "Project ID (PRJ-42 or numeric); defaults to local manifest").action(async (metricId, opts) => {
   const config = ensureLoggedIn();
   const shortId = resolveProjectShortId(opts);
   const api = new ApiClient(config);
   const spinner = ora("Archiving metric...").start();
+  let response;
   try {
-    const response = await api.archiveMetric(shortId, metricId);
-    const { metric } = response.data;
-    spinner.succeed(`Metric archived: ${metric.name} (${metricIdLabel(metric)})`);
+    response = await api.archiveMetric(shortId, metricId);
   } catch (err) {
     spinner.fail("Failed to archive metric");
     failCommand(err);
   }
+  const metric = readMetric(response.data);
+  spinner.succeed(metric ? `Metric archived: ${metric.name} (${metricIdLabel(metric)})` : `Metric ${metricId} archived`);
 });
 var metricsUnarchiveCommand = new Command("unarchive").argument("<metricId>", "Metric ID").description("Restore an archived metric").option("--project <project>", "Project ID (PRJ-42 or numeric); defaults to local manifest").action(async (metricId, opts) => {
   const config = ensureLoggedIn();
   const shortId = resolveProjectShortId(opts);
   const api = new ApiClient(config);
   const spinner = ora("Restoring metric...").start();
+  let response;
   try {
-    const response = await api.unarchiveMetric(shortId, metricId);
-    const { metric } = response.data;
-    spinner.succeed(`Metric restored from archive: ${metric.name} (${metricIdLabel(metric)})`);
+    response = await api.unarchiveMetric(shortId, metricId);
   } catch (err) {
     spinner.fail("Failed to unarchive metric");
     failCommand(err);
   }
+  const metric = readMetric(response.data);
+  spinner.succeed(
+    metric ? `Metric restored from archive: ${metric.name} (${metricIdLabel(metric)})` : `Metric ${metricId} restored from archive`
+  );
 });
 var metricsDeleteCommand = new Command("delete").argument("<metricId>", "Metric ID").description("Delete a metric (rejected if metric bindings reference it)").option("--project <project>", "Project ID (PRJ-42 or numeric); defaults to local manifest").option("-f, --force", "Skip confirmation prompt").action(async (metricId, opts) => {
   const config = ensureLoggedIn();
   const shortId = resolveProjectShortId(opts);
   const api = new ApiClient(config);
   if (!opts.force) {
+    if (!isInteractiveRun()) {
+      failCommand(
+        new CliError("cli_usage", `Deleting metric ${metricId} needs a confirmation this run cannot ask for.`, [
+          `Pass -f to delete without asking: \`avsb metrics delete ${metricId} -f\``
+        ])
+      );
+    }
     const { proceed } = await esm_default12.prompt([
       {
         type: "confirm",
@@ -39677,19 +40179,12 @@ var metricsDeleteCommand = new Command("delete").argument("<metricId>", "Metric
     spinner.succeed(`Metric deleted: ${metricId}`);
   } catch (err) {
     spinner.fail("Failed to delete metric");
-    const message = err instanceof Error ? err.message : "Unknown error";
     if (isConflictError(err)) {
       const refs = extractBindingsReferencing(err);
-      if (refs.length > 0) {
-        error(`Cannot delete: referenced by ${refs.join(", ")}.`);
-      } else {
-        error(`Cannot delete: metric bindings still reference this metric. ${message}`);
-      }
+      if (refs.length > 0) error(`Referenced by ${refs.join(", ")}.`);
       info(`Tip: run \`avsb metrics archive ${metricId}\` instead to hide it without losing history.`);
-    } else {
-      error(message);
     }
-    process.exit(EXIT.failure);
+    failCommand(err);
   }
 });
 var metricsCommand = new Command("metrics").description("Manage metric tracking definitions").addCommand(metricsListCommand).addCommand(metricsCreateCommand).addCommand(metricsUpdateCommand).addCommand(metricsArchiveCommand).addCommand(metricsUnarchiveCommand).addCommand(metricsDeleteCommand);
@@ -39904,6 +40399,40 @@ function isConflictError2(err) {
   if (!(err instanceof Error)) return false;
   return /409|conflict|attached|referenc/i.test(err.message);
 }
+function isRecord6(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isCliMetricBinding(value) {
+  return isRecord6(value) && typeof value.id === "string" && typeof value.shortId === "number" && typeof value.name === "string" && typeof value.measure === "string";
+}
+function readMetricBindingList(data) {
+  if (!isRecord6(data) || !Array.isArray(data.metricBindings)) return null;
+  return data.metricBindings.filter(isCliMetricBinding);
+}
+function readMetricBinding(data) {
+  return isRecord6(data) && isCliMetricBinding(data.metricBinding) ? data.metricBinding : null;
+}
+function formatMetricBindingTable(bindings) {
+  const rows = bindings.map((binding) => ({
+    id: metricBindingIdLabel(binding),
+    measure: measureBadge(binding.measure),
+    name: truncate2(binding.name, 28),
+    sentence: truncate2(renderMetricBindingSentence(binding), 64),
+    archived: binding.archivedAt != null
+  }));
+  const widths = {
+    id: Math.max(2, ...rows.map((r) => r.id.length)),
+    measure: Math.max(7, ...rows.map((r) => r.measure.length)),
+    name: Math.max(4, ...rows.map((r) => r.name.length))
+  };
+  return {
+    heading: ["ID".padEnd(widths.id), "Measure".padEnd(widths.measure), "Name".padEnd(widths.name), "Sentence"].join("  "),
+    rows: rows.map((row) => {
+      const line2 = [row.id.padEnd(widths.id), row.measure.padEnd(widths.measure), row.name.padEnd(widths.name), row.sentence].join("  ");
+      return row.archived ? `${line2}  (archived)` : line2;
+    })
+  };
+}
 
 // src/commands/metric-bindings.body.ts
 function parseComposition(opts) {
@@ -39965,12 +40494,11 @@ function parseWinsorization(opts) {
   }
   return { enabled: true, upperPercentile: upper, lowerPercentile: lower };
 }
-function buildCreateMetricBindingBody(projectId, measure, opts, name) {
+function buildCreateMetricBindingBody(measure, opts, name) {
   const direction = opts.direction ? normalizeDirection(opts.direction) : "INCREASE";
   const body = {
     name,
     description: opts.description ?? void 0,
-    projectId,
     measure,
     direction,
     isLibrary: true
@@ -40081,8 +40609,15 @@ var metricBindingsListCommand = withOutputOptions(
       spinner.fail("Failed to fetch metric bindings");
       failCommand(err);
     }
-    const { metricBindings } = response.data;
     if (emitJsonResult(response.data)) return;
+    const metricBindings = readMetricBindingList(response.data);
+    if (!metricBindings) {
+      failCommand(
+        new CliError("cli_failed", "The platform answered in a shape this CLI does not read.", [
+          "Upgrade the CLI with `npm install -g @avsbhq/cli`, or pass --json to see the raw answer."
+        ])
+      );
+    }
     if (metricBindings.length === 0) {
       line();
       info(
@@ -40090,45 +40625,19 @@ var metricBindingsListCommand = withOutputOptions(
       );
       return;
     }
-    const rows = metricBindings.map((binding) => ({
-      id: metricBindingIdLabel(binding),
-      measure: measureBadge(binding.measure),
-      name: truncate2(binding.name, 28),
-      sentence: truncate2(renderMetricBindingSentence(binding), 64),
-      archived: binding.archivedAt != null
-    }));
-    const widths = {
-      id: Math.max(2, ...rows.map((r) => r.id.length)),
-      measure: Math.max(7, ...rows.map((r) => r.measure.length)),
-      name: Math.max(4, ...rows.map((r) => r.name.length))
-    };
+    const table = formatMetricBindingTable(metricBindings);
     line();
-    heading(
-      [
-        "ID".padEnd(widths.id),
-        "Measure".padEnd(widths.measure),
-        "Name".padEnd(widths.name),
-        "Sentence"
-      ].join("  ")
-    );
-    for (const row of rows) {
-      const line2 = [
-        row.id.padEnd(widths.id),
-        row.measure.padEnd(widths.measure),
-        row.name.padEnd(widths.name),
-        row.sentence
-      ].join("  ");
-      line(row.archived ? `${line2}  (archived)` : line2);
-    }
+    heading(table.heading);
+    for (const row of table.rows) line(row);
     line();
   }
 );
 var metricBindingsCreateCommand = new Command("create").description("Create a new metric binding").option("--project <project>", "Project ID (PRJ-42 or numeric); defaults to local manifest").option(
   "--measure <measure>",
   "Measure (UNIQUE_CONVERSIONS_PER_VISITOR | TOTAL_EVENTS | UNIQUE_VISITORS_WHO_FIRED | TOTAL_VALUE_PER_VISITOR | TOTAL_VALUE | PERCENTILE | RATE | COMPOSITE)"
-).option("--direction <direction>", "Direction (INCREASE | DECREASE)", "INCREASE").option("--name <name>", "Display name").option("--description <text>", "Optional description").option("--metric <metricId>", "Source metric (required for single-metric measures)").option("--numerator-metric <metricId>", "Numerator metric (required for RATE)").option("--denominator-metric <metricId>", "Denominator metric (required for RATE)").option("--composition <json>", "COMPOSITE composition as JSON array of { metricId,weight}").option(
-  "--component <metricId:weight>",
-  "Repeatable component for COMPOSITE (e.g. --component b1:0.5 --component b2:0.5)",
+).option("--direction <direction>", "Direction (INCREASE | DECREASE)", "INCREASE").option("--name <name>", "Display name").option("--description <text>", "Optional description").option("--metric <metricId>", "Source metric: MET-17, 17 or the long id (required for single-metric measures)").option("--numerator-metric <metricId>", "Numerator metric (required for RATE)").option("--denominator-metric <metricId>", "Denominator metric (required for RATE)").option("--composition <json>", "COMPOSITE components as a JSON array of { metricId, weight }, where metricId names a metric binding").option(
+  "--component <bindingId:weight>",
+  "Repeatable COMPOSITE component, a metric binding and its weight (e.g. --component MBD-8:0.5 --component MBD-9:0.5)",
   (value, prev = []) => prev.concat(value),
   []
 ).option("--percentile <n>", "Percentile (required for PERCENTILE measure, 0 < n < 100)").option("--value-source <name>", "Numeric field on the metric (value/percentile measures)", "value").option("--winsorize-upper <pct>", "Upper winsorization percentile (enables winsorization)").option("--winsorize-lower <pct>", "Lower winsorization percentile (enables winsorization)").action(async (opts) => {
@@ -40142,29 +40651,26 @@ var metricBindingsCreateCommand = new Command("create").description("Create a ne
   const shortId = resolveProjectShortId2(opts);
   const measure = normalizeMeasure(opts.measure);
   const api = new ApiClient(config);
-  const projectResponse = await api.getProject(shortId);
-  const projectId = projectResponse.data.project.id;
-  const body = buildCreateMetricBindingBody(projectId, measure, opts, opts.name);
+  const body = buildCreateMetricBindingBody(measure, opts, opts.name);
   const spinner = ora("Creating metric binding...").start();
+  let response;
   try {
-    const response = await api.createMetricBinding(shortId, body);
-    const { metricBinding } = response.data;
-    spinner.succeed(`Metric binding created: ${metricBinding.name} (${metricBindingIdLabel(metricBinding)})`);
-    printMetricBindingDetails(metricBinding);
+    response = await api.createMetricBinding(shortId, body);
   } catch (err) {
     spinner.fail("Failed to create metric binding");
-    const message = err instanceof Error ? err.message : "Unknown error";
-    if (/already exists|conflict|409|unique/i.test(message)) {
-      error(`Conflict: a metric binding with that name already exists. ${message}`);
-    } else {
-      error(message);
-    }
-    process.exit(EXIT.failure);
+    failCommand(err);
+  }
+  const metricBinding = readMetricBinding(response.data);
+  if (!metricBinding) {
+    spinner.warn("Metric binding created. Run `avsb metric-bindings list` to see it.");
+    return;
   }
+  spinner.succeed(`Metric binding created: ${metricBinding.name} (${metricBindingIdLabel(metricBinding)})`);
+  printMetricBindingDetails(metricBinding);
 });
 var metricBindingsUpdateCommand = new Command("update").argument("<metricBindingId>", "Metric binding ID (cuid or numeric short ID)").description("Update a metric binding").option("--project <project>", "Project ID (PRJ-42 or numeric); defaults to local manifest").option("--name <name>", "New display name").option("--description <text>", "New description").option("--direction <direction>", "New direction (INCREASE | DECREASE)").option("--metric <metricId>", "New source metric").option("--numerator-metric <metricId>", "New numerator metric (RATE)").option("--denominator-metric <metricId>", "New denominator metric (RATE)").option("--composition <json>", "New COMPOSITE composition as JSON array of { metricId,weight}").option(
-  "--component <metricId:weight>",
-  "Repeatable component (replaces composition)",
+  "--component <bindingId:weight>",
+  "Repeatable COMPOSITE component, a metric binding and its weight (replaces the composition)",
   (value, prev = []) => prev.concat(value),
   []
 ).option("--percentile <n>", "New percentile (PERCENTILE measure)").option("--value-source <name>", "New value source field name").option("--winsorize-upper <pct>", "New upper winsorization percentile").option("--winsorize-lower <pct>", "New lower winsorization percentile").option("--library", "Mark as a library metric binding").option("--no-library", "Mark as a non-library metric binding").action(async (metricBindingId, opts) => {
@@ -40172,54 +40678,73 @@ var metricBindingsUpdateCommand = new Command("update").argument("<metricBinding
   const shortId = resolveProjectShortId2(opts);
   const patch = buildUpdateMetricBindingPatch(opts);
   if (Object.keys(patch).length === 0) {
-    error("No update fields provided. Pass at least one of --name, --description, etc.");
-    process.exit(EXIT.failure);
+    failCommand(
+      new CliError("cli_usage", "No update fields provided. Pass at least one of --name, --description, --direction, etc.")
+    );
   }
   const api = new ApiClient(config);
   const spinner = ora("Updating metric binding...").start();
+  let response;
   try {
-    const response = await api.updateMetricBinding(shortId, metricBindingId, patch);
-    const { metricBinding } = response.data;
-    spinner.succeed(`Metric binding updated: ${metricBinding.name} (${metricBindingIdLabel(metricBinding)})`);
-    printMetricBindingDetails(metricBinding);
+    response = await api.updateMetricBinding(shortId, metricBindingId, patch);
   } catch (err) {
     spinner.fail("Failed to update metric binding");
     failCommand(err);
   }
+  const metricBinding = readMetricBinding(response.data);
+  if (!metricBinding) {
+    spinner.warn(`Metric binding ${metricBindingId} updated.`);
+    return;
+  }
+  spinner.succeed(`Metric binding updated: ${metricBinding.name} (${metricBindingIdLabel(metricBinding)})`);
+  printMetricBindingDetails(metricBinding);
 });
 var metricBindingsArchiveCommand = new Command("archive").argument("<metricBindingId>", "Metric binding ID").description("Archive a metric binding (soft-delete, preserves history)").option("--project <project>", "Project ID (PRJ-42 or numeric); defaults to local manifest").action(async (metricBindingId, opts) => {
   const config = ensureLoggedIn();
   const shortId = resolveProjectShortId2(opts);
   const api = new ApiClient(config);
   const spinner = ora("Archiving metric binding...").start();
+  let response;
   try {
-    const response = await api.archiveMetricBinding(shortId, metricBindingId);
-    const { metricBinding } = response.data;
-    spinner.succeed(`Metric binding archived: ${metricBinding.name} (${metricBindingIdLabel(metricBinding)})`);
+    response = await api.archiveMetricBinding(shortId, metricBindingId);
   } catch (err) {
     spinner.fail("Failed to archive metric binding");
     failCommand(err);
   }
+  const metricBinding = readMetricBinding(response.data);
+  spinner.succeed(
+    metricBinding ? `Metric binding archived: ${metricBinding.name} (${metricBindingIdLabel(metricBinding)})` : `Metric binding ${metricBindingId} archived`
+  );
 });
 var metricBindingsUnarchiveCommand = new Command("unarchive").argument("<metricBindingId>", "Metric binding ID").description("Restore an archived metric binding").option("--project <project>", "Project ID (PRJ-42 or numeric); defaults to local manifest").action(async (metricBindingId, opts) => {
   const config = ensureLoggedIn();
   const shortId = resolveProjectShortId2(opts);
   const api = new ApiClient(config);
   const spinner = ora("Restoring metric binding...").start();
+  let response;
   try {
-    const response = await api.unarchiveMetricBinding(shortId, metricBindingId);
-    const { metricBinding } = response.data;
-    spinner.succeed(`Metric binding restored from archive: ${metricBinding.name} (${metricBindingIdLabel(metricBinding)})`);
+    response = await api.unarchiveMetricBinding(shortId, metricBindingId);
   } catch (err) {
     spinner.fail("Failed to unarchive metric binding");
     failCommand(err);
   }
+  const metricBinding = readMetricBinding(response.data);
+  spinner.succeed(
+    metricBinding ? `Metric binding restored from archive: ${metricBinding.name} (${metricBindingIdLabel(metricBinding)})` : `Metric binding ${metricBindingId} restored from archive`
+  );
 });
 var metricBindingsDeleteCommand = new Command("delete").argument("<metricBindingId>", "Metric binding ID").description("Delete a metric binding (rejected if experiments still attach it)").option("--project <project>", "Project ID (PRJ-42 or numeric); defaults to local manifest").option("-f, --force", "Skip confirmation prompt").action(async (metricBindingId, opts) => {
   const config = ensureLoggedIn();
   const shortId = resolveProjectShortId2(opts);
   const api = new ApiClient(config);
   if (!opts.force) {
+    if (!isInteractiveRun()) {
+      failCommand(
+        new CliError("cli_usage", `Deleting metric binding ${metricBindingId} needs a confirmation this run cannot ask for.`, [
+          `Pass -f to delete without asking: \`avsb metric-bindings delete ${metricBindingId} -f\``
+        ])
+      );
+    }
     const { proceed } = await esm_default12.prompt([
       {
         type: "confirm",
@@ -40239,28 +40764,21 @@ var metricBindingsDeleteCommand = new Command("delete").argument("<metricBinding
     spinner.succeed(`Metric binding deleted: ${metricBindingId}`);
   } catch (err) {
     spinner.fail("Failed to delete metric binding");
-    const message = err instanceof Error ? err.message : "Unknown error";
     if (isConflictError2(err)) {
       const refs = extractExperimentsReferencing(err);
-      if (refs.length > 0) {
-        error(`Cannot delete: referenced by ${refs.join(", ")}.`);
-      } else {
-        error(`Cannot delete: experiments still attach this metric binding. ${message}`);
-      }
+      if (refs.length > 0) error(`Attached to ${refs.join(", ")}.`);
       info(
         `Tip: run \`avsb metric-bindings archive ${metricBindingId}\` instead to hide it without losing history.`
       );
-    } else {
-      error(message);
     }
-    process.exit(EXIT.failure);
+    failCommand(err);
   }
 });
 var metricBindingsCommand = new Command("metric-bindings").description("Manage saved/library metric bindings").addCommand(metricBindingsListCommand).addCommand(metricBindingsCreateCommand).addCommand(metricBindingsUpdateCommand).addCommand(metricBindingsArchiveCommand).addCommand(metricBindingsUnarchiveCommand).addCommand(metricBindingsDeleteCommand);
 
 // src/commands/codegen.ts
-import path16 from "node:path";
-import fs12 from "node:fs/promises";
+import path17 from "node:path";
+import fs13 from "node:fs/promises";
 
 // src/lib/codegenApi.ts
 var CodegenApiClient = class extends ApiClient {
@@ -40317,6 +40835,9 @@ function serialiseManifest(manifest) {
 }
 
 // src/lib/codegenCheck.ts
+function withoutPublishStamp(text) {
+  return text.replace(/^(\/\/ Source: .*\bpublishedAt=)\S+/m, "$1*").replace(/^(\s*"publishedAt": )(?:"[^"\n]*"|null)/gm, "$1*");
+}
 function diffArtifact(artifact) {
   const expectedLines = artifact.expected.split("\n");
   if (artifact.actual === null) {
@@ -40331,11 +40852,13 @@ function diffArtifact(artifact) {
     };
   }
   const actual = artifact.actual.replace(/\r\n/g, "\n");
-  if (actual === artifact.expected) return null;
+  const expectedComparable = withoutPublishStamp(artifact.expected).split("\n");
+  const actualComparable = withoutPublishStamp(actual).split("\n");
+  if (expectedComparable.join("\n") === actualComparable.join("\n")) return null;
   const actualLines = actual.split("\n");
-  const shared = Math.min(expectedLines.length, actualLines.length);
+  const shared = Math.min(expectedComparable.length, actualComparable.length);
   let index = 0;
-  while (index < shared && expectedLines[index] === actualLines[index]) index += 1;
+  while (index < shared && expectedComparable[index] === actualComparable[index]) index += 1;
   return {
     path: artifact.path,
     reason: "different",
@@ -40489,7 +41012,7 @@ function planArtifacts(datafile, targets) {
 }
 async function readIfPresent(filePath) {
   try {
-    return await fs12.readFile(filePath, "utf-8");
+    return await fs13.readFile(filePath, "utf-8");
   } catch (err) {
     if (isMissingFile(err)) return null;
     throw err;
@@ -40503,8 +41026,8 @@ async function writeArtifacts(artifacts) {
   for (const artifact of artifacts) {
     const existing = await readIfPresent(artifact.path);
     if (existing === artifact.contents) continue;
-    await fs12.mkdir(path16.dirname(artifact.path), { recursive: true });
-    await fs12.writeFile(artifact.path, artifact.contents, "utf-8");
+    await fs13.mkdir(path17.dirname(artifact.path), { recursive: true });
+    await fs13.writeFile(artifact.path, artifact.contents, "utf-8");
     written.push(artifact.path);
   }
   return written;
@@ -40526,6 +41049,7 @@ function flagCountLine(datafile) {
 }
 async function runCheck(artifacts, datafile, targets) {
   const drifts = diffArtifacts(await toComparisons(artifacts));
+  const exitCode = drifts.length === 0 ? EXIT.success : EXIT.failure;
   if (emitJsonResult({
     upToDate: drifts.length === 0,
     checked: artifacts.map((a) => a.path),
@@ -40534,25 +41058,25 @@ async function runCheck(artifacts, datafile, targets) {
     flagCount: datafile.flags.length,
     publishedAt: datafile.publishedAt ?? null
   })) {
-    process.exit(drifts.length === 0 ? EXIT.success : EXIT.failure);
+    return exitCode;
   }
   if (drifts.length === 0) {
     success(describeDriftSummary(drifts));
     dim(`  Checked ${artifacts.length === 1 ? "1 file" : `${artifacts.length} files`} against ${flagCountLine(datafile)} in ${targets.env}.`);
-    process.exit(EXIT.success);
+    return exitCode;
   }
   error(describeDriftSummary(drifts));
   for (const drift of drifts) {
     for (const line2 of describeDrift(drift)) errorDetail(line2);
   }
   errorDetail("Run the same command without --check, then commit the result.");
-  process.exit(EXIT.failure);
+  return exitCode;
 }
 function reportWatchEvent(event, targets) {
   switch (event.kind) {
     case "polled":
       if (event.changed) {
-        success(`Updated ${event.written.map((p) => path16.relative(process.cwd(), p)).join(", ")}`);
+        success(`Updated ${event.written.map((p) => path17.relative(process.cwd(), p)).join(", ")}`);
       }
       return;
     case "failed":
@@ -40643,6 +41167,7 @@ var codegenCommand = withOutputOptions(
   const project = resolveProjectRefOrExit(opts);
   const config = ensureLoggedIn();
   const spinner = startSpinner("Fetching datafile...");
+  let checkExitCode = null;
   try {
     const client = new CodegenApiClient(config);
     const first = await client.getDatafileConditional(project.shortId, opts.env, null);
@@ -40655,15 +41180,15 @@ var codegenCommand = withOutputOptions(
     const datafile = first.body;
     spinner.succeed("Datafile fetched");
     const targets = {
-      typesPath: path16.resolve(opts.output),
-      manifestPath: opts.manifest ? path16.resolve(opts.manifest) : null,
+      typesPath: path17.resolve(opts.output),
+      manifestPath: opts.manifest ? path17.resolve(opts.manifest) : null,
       projectShortId: project.shortId,
       env: opts.env,
       augment: opts.augment !== false
     };
     const artifacts = planArtifacts(datafile, targets);
     if (opts.check) {
-      await runCheck(artifacts, datafile, targets);
+      checkExitCode = await runCheck(artifacts, datafile, targets);
       return;
     }
     const written = await writeArtifacts(artifacts);
@@ -40693,12 +41218,14 @@ var codegenCommand = withOutputOptions(
   } catch (err) {
     spinner.fail("Codegen failed");
     failCommand(err);
+  } finally {
+    if (checkExitCode !== null) process.exit(checkExitCode);
   }
 });
 
 // src/commands/find-refs.ts
-import fs13 from "node:fs/promises";
-import path18 from "node:path";
+import fs14 from "node:fs/promises";
+import path19 from "node:path";
 
 // src/lib/findRefs.ts
 var FLAG_GETTERS = /* @__PURE__ */ new Map([
@@ -40861,7 +41388,7 @@ function byKeyName(a, b) {
 }
 
 // src/lib/ignoreRules.ts
-import path17 from "node:path";
+import path18 from "node:path";
 var ALWAYS_SKIPPED_DIRECTORIES = [
   ".git",
   "node_modules",
@@ -40965,7 +41492,7 @@ function relativeToBase(relPath, base) {
   return relPath.slice(base.length + 1);
 }
 function toRelativePosix(root, target) {
-  return path17.relative(root, target).split(path17.sep).join("/");
+  return path18.relative(root, target).split(path18.sep).join("/");
 }
 
 // src/commands/find-refs.ts
@@ -41021,13 +41548,13 @@ async function scanTree(root, extraRules, knownKeys, maxFiles) {
     if (truncated) return;
     let entries;
     try {
-      entries = await fs13.readdir(dir, { withFileTypes: true });
+      entries = await fs14.readdir(dir, { withFileTypes: true });
     } catch {
       return;
     }
     let rules = inherited;
     if (entries.some((e) => e.isFile() && e.name === ".gitignore")) {
-      const contents = await readTextFile(path18.join(dir, ".gitignore"));
+      const contents = await readTextFile(path19.join(dir, ".gitignore"));
       if (contents !== null) {
         rules = [...inherited, ...parseIgnoreFile(contents, toRelativePosix(root, dir))];
       }
@@ -41035,7 +41562,7 @@ async function scanTree(root, extraRules, knownKeys, maxFiles) {
     for (const entry of entries) {
       if (truncated) return;
       if (entry.isSymbolicLink()) continue;
-      const full = path18.join(dir, entry.name);
+      const full = path19.join(dir, entry.name);
       const rel = toRelativePosix(root, full);
       if (entry.isDirectory()) {
         if (ALWAYS_SKIPPED_DIRECTORIES.includes(entry.name)) continue;
@@ -41044,7 +41571,7 @@ async function scanTree(root, extraRules, knownKeys, maxFiles) {
         continue;
       }
       if (!entry.isFile()) continue;
-      if (!SOURCE_EXTENSIONS.has(path18.extname(entry.name))) continue;
+      if (!SOURCE_EXTENSIONS.has(path19.extname(entry.name))) continue;
       if (isIgnored(rel, false, rules)) continue;
       if (filesScanned >= maxFiles) {
         truncated = true;
@@ -41061,9 +41588,9 @@ async function scanTree(root, extraRules, knownKeys, maxFiles) {
 }
 async function readTextFile(filePath) {
   try {
-    const stat4 = await fs13.stat(filePath);
+    const stat4 = await fs14.stat(filePath);
     if (stat4.size > MAX_FILE_BYTES) return null;
-    const contents = await fs13.readFile(filePath, "utf-8");
+    const contents = await fs14.readFile(filePath, "utf-8");
     return contents.includes("\0") ? null : contents;
   } catch {
     return null;
@@ -41129,7 +41656,7 @@ var findRefsCommand = withOutputOptions(
     const api = new FlagsApiClient(config);
     const registry = await readRegistry(api, project.shortId);
     spinner.succeed(`Read ${registry.length} flag${registry.length === 1 ? "" : "s"}`);
-    const root = path18.resolve(opts.dir);
+    const root = path19.resolve(opts.dir);
     await assertDirectory(root, opts.dir);
     const extraRules = (opts.ignore ?? []).flatMap((pattern) => parseIgnoreFile(pattern));
     const knownKeys = new Set(registry.map((f) => f.key));
@@ -41164,7 +41691,7 @@ function parseMaxFiles(raw) {
 }
 async function assertDirectory(root, asTyped) {
   try {
-    const stat4 = await fs13.stat(root);
+    const stat4 = await fs14.stat(root);
     if (stat4.isDirectory()) return;
   } catch {
   }
@@ -41172,11 +41699,11 @@ async function assertDirectory(root, asTyped) {
 }
 
 // src/commands/datasets.ts
-import fs15 from "node:fs";
+import fs16 from "node:fs";
 
 // src/commands/datasets.helpers.ts
-import fs14 from "node:fs";
-import path19 from "node:path";
+import fs15 from "node:fs";
+import path20 from "node:path";
 function parseVersionArg(raw) {
   const normalized = raw.trim().replace(/^[vV]/, "");
   if (!/^\d+$/.test(normalized)) {
@@ -41191,13 +41718,13 @@ function parseVersionArg(raw) {
   return shortId;
 }
 function validateNdjsonPath(filePath) {
-  const resolved = path19.resolve(filePath);
-  if (!fs14.existsSync(resolved) || !fs14.statSync(resolved).isFile()) {
+  const resolved = path20.resolve(filePath);
+  if (!fs15.existsSync(resolved) || !fs15.statSync(resolved).isFile()) {
     throw new Error(`File not found: ${resolved}`);
   }
-  if (path19.extname(resolved).toLowerCase() !== ".ndjson") {
+  if (path20.extname(resolved).toLowerCase() !== ".ndjson") {
     throw new Error(
-      `Expected an .ndjson file, got "${path19.basename(resolved)}". Convert CSV files in the dashboard upload modal, or export NDJSON directly.`
+      `Expected an .ndjson file, got "${path20.basename(resolved)}". Convert CSV files in the dashboard upload modal, or export NDJSON directly.`
     );
   }
   return resolved;
@@ -41386,7 +41913,7 @@ var datasetsPushCommand = new Command("push").argument("<slug>", "Dataset slug")
     try {
       const result = await runPushFlow(api, projectShortId, {
         slug,
-        fileBody: fs15.readFileSync(resolvedPath),
+        fileBody: fs16.readFileSync(resolvedPath),
         label: opts.label,
         activate: opts.activate,
         poll: { timeoutMs: timeoutSeconds * 1e3 },
@@ -41480,6 +42007,12 @@ var datasetsRollbackCommand = new Command("rollback").argument("<slug>", "Datase
     fail(spinner, "Failed to resolve rollback target", err);
   }
   if (!opts.force) {
+    const refusal = refusalWithoutPrompt({
+      code: "cli_usage",
+      message: `Rolling back "${slug}" (${summary}) needs a confirmation this run cannot ask for.`,
+      hints: [`Pass -f to roll back without asking: \`avsb datasets rollback ${slug} -f\``]
+    });
+    if (refusal) failCommand(refusal);
     const { proceed } = await esm_default12.prompt([
       {
         type: "confirm",
@@ -41755,7 +42288,7 @@ function printSecretHint() {
     "  A vs B shows a webhook signing secret only when the webhook is created and when its"
   );
   dim("  secret is rotated, so copy it then. If you no longer have it, rotate it:");
-  dim("    Dashboard: Organisation Settings > Integrations > Webhooks");
+  dim("    Dashboard: Organization Settings > Integrations > Webhooks");
   dim("    API: POST /api/v1/projects/{projectId}/webhooks/{webhookId}/secret");
   dim(
     "  Put it in AVSB_WEBHOOK_SECRET and verify with verifyWebhookSignature from @avsbhq/node."
@@ -41777,8 +42310,7 @@ var listenCommand = new Command("listen").description("Watch this project's webh
     if (opts.forward) {
       const validated = validateForwardUrl(opts.forward);
       if (!validated.ok) {
-        error(validated.reason);
-        process.exit(EXIT.failure);
+        failCommand(new CliError("cli_usage", validated.reason));
       }
       forwardUrl = validated.url;
     }
@@ -42304,7 +42836,7 @@ var flagsCreateCommand = withOutputOptions(
 var flagsUpdateCommand = withOutputOptions(
   withProjectOption(
     new Command("update").argument("<flag>", "Flag key, numeric short id, or id").description("Rename a flag or change its description").option("--name <name>", "New display name").option("--description <text>", 'New description. Pass "" to clear it').option("--key <key>", "New key (refused once the flag has served traffic)").option(
-      "--if-match <etag>",
+      "--if-match <version>",
       "Only write if the flag still matches this version (from `avsb flags get`)"
     ).option("--force", "Write without checking the version first")
   )
@@ -42608,46 +43140,127 @@ var openCommand = withOutputOptions(
 
 // src/commands/completion.ts
 var COMPLETION_SHELLS = ["bash", "zsh", "fish"];
-function commandNames(program3) {
-  return program3.commands.map((command) => command.name()).filter((name) => name !== "completion").sort();
+var ARGUMENT_CHOICES = {
+  completion: COMPLETION_SHELLS,
+  open: OPEN_TARGETS
+};
+function flagsOf(command, isRoot) {
+  const flags = command.options.map((option) => option.long).filter((long) => typeof long === "string");
+  flags.push("--help");
+  if (isRoot) flags.push("--version");
+  return [...new Set(flags)].sort();
+}
+function completionEntries(program3) {
+  const entries = [];
+  function visit(command, path23) {
+    const subcommands = command.commands.map((child) => child.name()).sort();
+    entries.push({
+      path: path23,
+      words: [...subcommands, ...ARGUMENT_CHOICES[path23] ?? []],
+      flags: flagsOf(command, path23 === "")
+    });
+    for (const child of command.commands) {
+      visit(child, path23 === "" ? child.name() : `${path23} ${child.name()}`);
+    }
+  }
+  visit(program3, "");
+  return entries;
 }
-function bashCompletion(names) {
+var quoteBash = (value) => `"${value}"`;
+function bashCompletion(entries) {
+  const known = entries.filter((entry) => entry.path !== "").map((entry) => quoteBash(entry.path));
+  const cases = entries.map((entry) => {
+    const offer = [...entry.words, ...entry.flags].join(" ");
+    return `    ${quoteBash(entry.path)}) offer="${offer}" ;;`;
+  });
   return `# avsb completion for bash. Add to ~/.bashrc:
 #   eval "$(avsb completion bash)"
 _avsb_completions() {
-  local commands="${names.join(" ")}"
-  COMPREPLY=($(compgen -W "$commands" -- "\${COMP_WORDS[COMP_CWORD]}"))
+  local cur="\${COMP_WORDS[COMP_CWORD]}" cmdpath="" word candidate i offer=""
+  for ((i = 1; i < COMP_CWORD; i++)); do
+    word="\${COMP_WORDS[i]}"
+    [[ "$word" == -* ]] && continue
+    candidate="\${cmdpath:+$cmdpath }$word"
+    case "$candidate" in
+      ${known.length > 0 ? known.join("|") : '"__none__"'}) cmdpath="$candidate" ;;
+    esac
+  done
+  case "$cmdpath" in
+${cases.join("\n")}
+  esac
+  COMPREPLY=($(compgen -W "$offer" -- "$cur"))
 }
 complete -F _avsb_completions avsb`;
 }
-function zshCompletion(names) {
+var quoteZsh = (value) => `'${value}'`;
+function zshCompletion(entries) {
+  const known = entries.filter((entry) => entry.path !== "").map((entry) => quoteZsh(entry.path));
+  const cases = entries.map((entry) => {
+    const offer = [...entry.words, ...entry.flags].map(quoteZsh).join(" ");
+    return `    (${quoteZsh(entry.path)}) offer=(${offer}) ;;`;
+  });
   return `# avsb completion for zsh. Add to ~/.zshrc:
 #   eval "$(avsb completion zsh)"
 _avsb() {
-  local -a commands
-  commands=(${names.map((name) => `'${name}'`).join(" ")})
-  _describe 'command' commands
+  local cmdpath="" word candidate i
+  local -a offer
+  for ((i = 2; i < CURRENT; i++)); do
+    word="\${words[i]}"
+    [[ "$word" == -* ]] && continue
+    candidate="\${cmdpath:+$cmdpath }$word"
+    case "$candidate" in
+      (${known.length > 0 ? known.join("|") : "'__none__'"}) cmdpath="$candidate" ;;
+    esac
+  done
+  case "$cmdpath" in
+${cases.join("\n")}
+  esac
+  compadd -- $offer
 }
 compdef _avsb avsb`;
 }
-function fishCompletion(names) {
-  const lines = names.map(
-    (name) => `complete -c avsb -n __fish_use_subcommand -a ${name}`
-  );
+var quoteFish = (value) => `'${value}'`;
+function fishCompletion(entries) {
+  const known = entries.filter((entry) => entry.path !== "").map((entry) => quoteFish(entry.path));
+  const lines = [];
+  for (const entry of entries) {
+    const condition = `'test (__avsb_path) = "${entry.path}"'`;
+    if (entry.words.length > 0) {
+      lines.push(`complete -c avsb -n ${condition} -a ${quoteFish(entry.words.join(" "))}`);
+    }
+    for (const flag of entry.flags) {
+      lines.push(`complete -c avsb -n ${condition} -l ${flag.replace(/^--/, "")}`);
+    }
+  }
   return [
     "# avsb completion for fish. Save as:",
     "#   avsb completion fish > ~/.config/fish/completions/avsb.fish",
+    `set -g __avsb_known_paths ${known.join(" ")}`,
+    // Drops the first token (`avsb`) with `set -e` rather than a [2..-1]
+    // slice, and always prints exactly one line, so `test (__avsb_path) = ""`
+    // compares one value even at the top level.
+    "function __avsb_path",
+    "  set -l tokens (commandline -opc)",
+    "  set -e tokens[1]",
+    "  set -l cmdpath",
+    "  for word in $tokens",
+    "    string match -q -- '-*' $word; and continue",
+    "    set -l candidate (string join ' ' $cmdpath $word)",
+    "    contains -- $candidate $__avsb_known_paths; and set cmdpath $cmdpath $word",
+    "  end",
+    "  echo (string join ' ' $cmdpath)",
+    "end",
     ...lines
   ].join("\n");
 }
-function completionScript(shell, names) {
+function completionScript(shell, entries) {
   switch (shell) {
     case "bash":
-      return bashCompletion(names);
+      return bashCompletion(entries);
     case "zsh":
-      return zshCompletion(names);
+      return zshCompletion(entries);
     case "fish":
-      return fishCompletion(names);
+      return fishCompletion(entries);
   }
 }
 function buildCompletionCommand(program3) {
@@ -42661,16 +43274,16 @@ function buildCompletionCommand(program3) {
         ])
       );
     }
-    line(completionScript(requested, commandNames(program3)));
+    line(completionScript(requested, completionEntries(program3)));
   });
 }
 
 // src/lib/updateNotifier.ts
-import fs16 from "node:fs";
+import fs17 from "node:fs";
 import os4 from "node:os";
-import path20 from "node:path";
+import path21 from "node:path";
 var REGISTRY_URL = "https://registry.npmjs.org/@avsbhq/cli/latest";
-var CACHE_FILE = path20.join(os4.homedir(), ".avsb", "update-check.json");
+var CACHE_FILE = path21.join(os4.homedir(), ".avsb", "update-check.json");
 var CHECK_INTERVAL_MS = 24 * 60 * 60 * 1e3;
 var FETCH_TIMEOUT_MS = 1500;
 function isNewerVersion(latest, current) {
@@ -42710,8 +43323,8 @@ function updateMessage(latest, current) {
 }
 function writeCache(cache) {
   try {
-    fs16.mkdirSync(path20.dirname(CACHE_FILE), { recursive: true });
-    fs16.writeFileSync(CACHE_FILE, JSON.stringify(cache));
+    fs17.mkdirSync(path21.dirname(CACHE_FILE), { recursive: true });
+    fs17.writeFileSync(CACHE_FILE, JSON.stringify(cache));
   } catch {
   }
 }
@@ -42735,7 +43348,7 @@ async function checkForUpdate(currentVersion, notify) {
   }
   let cache = null;
   try {
-    cache = readCache(() => fs16.readFileSync(CACHE_FILE, "utf-8"));
+    cache = readCache(() => fs17.readFileSync(CACHE_FILE, "utf-8"));
   } catch {
     cache = null;
   }
@@ -42748,8 +43361,8 @@ async function checkForUpdate(currentVersion, notify) {
 }
 
 // src/cli.ts
-var __dirname = path21.dirname(fileURLToPath2(import.meta.url));
-var pkg = JSON.parse(fs17.readFileSync(path21.resolve(__dirname, "..", "package.json"), "utf-8"));
+var __dirname = path22.dirname(fileURLToPath2(import.meta.url));
+var pkg = JSON.parse(fs18.readFileSync(path22.resolve(__dirname, "..", "package.json"), "utf-8"));
 var program2 = new Command();
 program2.name("avsb").description(
   "A vs B command line tool: experiments, flags, project scripts, metrics, datasets, webhooks, and typed flags"