@vatio-ai/cli 0.53.0 → 0.54.0

package/lib/support.mjs

@@ -3,6 +3,8 @@
 
 import { execFileSync } from "node:child_process";
 
+import { branchEnvironment } from "./branch.mjs";
+
 export class UserError extends Error {
   constructor(message) {
     super(message);
@@ -16,15 +18,17 @@ export function fail(message) {
   throw new UserError(message);
 }
 
-// `--env NAME` is the one way to say which deployment a command is about:
-// live, preview, or a named preview like pr-42.
+// `--env NAME` is the one way to say which environment a command is about:
+// live, preview, or a branch's own like fix-pagos.
 //
-// The default is the command's own and is passed in, because the sensible
-// answer differs: push writes a preview, pull brings down whatever is actually
-// running. `--as` was the spelling on push and publish and stays as an alias --
-// it is sitting in CI jobs, and there is nothing wrong with what it does.
-export function takeEnv(args, { fallback = null } = {}) {
-  let environment = fallback;
+// Without it, a workspace checked out on a branch other than the default one
+// means that branch's environment (see branch.mjs), said once on stderr so it
+// is never a surprise. Otherwise the default is the command's own and is passed
+// in, because the sensible answer differs: push writes a preview, tokens are
+// for live. `--as` was the spelling on push and publish and stays as an alias
+// -- it is sitting in CI jobs, and there is nothing wrong with what it does.
+export function takeEnv(args, { fallback = null, cwd = null } = {}) {
+  let environment;
   const rest = [];
 
   for (let i = 0; i < args.length; i += 1) {
@@ -39,13 +43,22 @@ export function takeEnv(args, { fallback = null } = {}) {
       continue;
     }
     i += 1;
-    if (i >= args.length) fail(`${match[0]} needs a deployment name (live, preview, or a preview name)`);
+    if (i >= args.length) fail(`${match[0]} needs an environment name (live, preview, or a branch's)`);
     environment = args[i];
   }
 
   args.length = 0;
   args.push(...rest);
-  return environment;
+  return environment !== undefined ? environment : branchDefault(cwd, fallback);
+}
+
+// The branch's environment when the workspace is on one, else `fallback`.
+export function branchDefault(cwd, fallback) {
+  const fromBranch = cwd ? branchEnvironment(cwd) : null;
+  if (!fromBranch) return fallback;
+
+  process.stderr.write(paint("cyan", `vatio: environment ${fromBranch.environment} (branch ${fromBranch.branch})`) + "\n");
+  return fromBranch.environment;
 }
 
 export function takeFlag(args, name) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vatio-ai/cli",
-  "version": "0.53.0",
+  "version": "0.54.0",
   "description": "Vatio CLI — deploy and manage Vatio agent workspaces",
   "keywords": [
     "vatio",