@vm0/cli 9.82.1 → 9.83.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vm0/cli",
-  "version": "9.82.1",
+  "version": "9.83.0",
   "description": "CLI application",
   "repository": {
     "type": "git",

package/zero.js

@@ -9,6 +9,7 @@ import {
   createZeroAgent,
   createZeroComputerConnector,
   createZeroConnectorSession,
+  decodeCliTokenPayload,
   decodeZeroTokenPayload,
   deleteZeroAgent,
   deleteZeroComputerConnector,
@@ -73,6 +74,7 @@ import {
   setZeroOrgVariable,
   setZeroSecret,
   setZeroVariable,
+  switchZeroOrg,
   updateZeroAgent,
   updateZeroAgentInstructions,
   updateZeroOrg,
@@ -80,7 +82,7 @@ import {
   updateZeroUserPreferences,
   upsertZeroOrgModelProvider,
   withErrorHandler
-} from "./chunk-2KN52BP2.js";
+} from "./chunk-Z7ZCVASY.js";
 
 // src/zero.ts
 import { Command as Command55 } from "commander";
@@ -127,7 +129,16 @@ var setCommand = new Command2().name("set").description("Rename your organizatio
         );
       }
       const org = await updateZeroOrg({ slug, force: true });
-      await saveConfig({ activeOrg: org.slug });
+      const token = await getToken();
+      if (decodeCliTokenPayload(token)) {
+        const result = await switchZeroOrg(org.slug);
+        await saveConfig({
+          token: result.access_token,
+          activeOrg: result.org_slug
+        });
+      } else {
+        await saveConfig({ activeOrg: org.slug });
+      }
       console.log(chalk2.green(`\u2713 Organization updated to ${org.slug}`));
       console.log();
       console.log("Your agents will now be namespaced as:");
@@ -171,7 +182,16 @@ var useCommand = new Command4().name("use").description("Switch to a different o
     if (!target) {
       throw new Error(`Organization '${slug}' not found or not accessible.`);
     }
-    await saveConfig({ activeOrg: slug });
+    const token = await getToken();
+    if (decodeCliTokenPayload(token)) {
+      const result = await switchZeroOrg(slug);
+      await saveConfig({
+        token: result.access_token,
+        activeOrg: result.org_slug
+      });
+    } else {
+      await saveConfig({ activeOrg: slug });
+    }
     console.log(chalk4.green(`\u2713 Switched to organization: ${slug}`));
   })
 );
@@ -224,7 +244,7 @@ var leaveCommand = new Command8().name("leave").description("Leave the current o
     await leaveZeroOrg();
     const { orgs } = await listZeroOrgs();
     if (orgs.length === 0) {
-      await saveConfig({ activeOrg: void 0 });
+      await saveConfig({ activeOrg: void 0, token: void 0 });
       console.log(chalk8.green("\u2713 Left organization."));
       console.log(
         chalk8.yellow("No remaining organizations. Run: vm0 auth login")
@@ -232,7 +252,16 @@ var leaveCommand = new Command8().name("leave").description("Leave the current o
       return;
     }
     const nextOrg = orgs[0].slug;
-    await saveConfig({ activeOrg: nextOrg });
+    const token = await getToken();
+    if (decodeCliTokenPayload(token)) {
+      const result = await switchZeroOrg(nextOrg);
+      await saveConfig({
+        token: result.access_token,
+        activeOrg: result.org_slug
+      });
+    } else {
+      await saveConfig({ activeOrg: nextOrg });
+    }
     console.log(chalk8.green(`\u2713 Left organization. Switched to: ${nextOrg}`));
   })
 );
@@ -296,7 +325,8 @@ var setCommand2 = new Command11().name("set").description("Create or update an o
       } else if (isInteractive()) {
         const prompted = await promptPassword("Enter secret value:");
         if (prompted === void 0) {
-          process.exit(0);
+          console.log(chalk11.dim("Cancelled"));
+          return;
         }
         value = prompted;
       } else {
@@ -783,6 +813,11 @@ async function handleInteractiveMode() {
       )
     });
   }
+  let cancelled = false;
+  const onCancel = () => {
+    cancelled = true;
+    return false;
+  };
   const { modelProviders: configuredProviders } = await listZeroOrgModelProviders();
   const configuredTypes = new Set(configuredProviders.map((p) => p.type));
   const annotatedChoices = getSelectableProviderTypes().map((type2) => {
@@ -808,8 +843,12 @@ async function handleInteractiveMode() {
       message: "Select provider type:",
       choices: annotatedChoices
     },
-    { onCancel: () => process.exit(0) }
+    { onCancel }
   );
+  if (cancelled) {
+    console.log(chalk18.dim("Cancelled"));
+    return null;
+  }
   const type = typeResponse.type;
   const existingProvider = configuredProviders.find((p) => p.type === type);
   if (existingProvider) {
@@ -826,8 +865,12 @@ async function handleInteractiveMode() {
           { title: "Update secret", value: "update" }
         ]
       },
-      { onCancel: () => process.exit(0) }
+      { onCancel }
     );
+    if (cancelled) {
+      console.log(chalk18.dim("Cancelled"));
+      return null;
+    }
     if (actionResponse.action === "keep") {
       const selectedModel2 = await promptForModelSelection(type);
       return {
@@ -864,14 +907,19 @@ async function handleInteractiveMode() {
       message: `Enter your ${secretLabel}:`,
       validate: (value) => value.length > 0 || `${secretLabel} is required`
     },
-    { onCancel: () => process.exit(0) }
+    { onCancel }
   );
+  if (cancelled) {
+    console.log(chalk18.dim("Cancelled"));
+    return null;
+  }
   const secret = secretResponse.secret;
   const selectedModel = await promptForModelSelection(type);
   return { type, secret, selectedModel, isInteractiveMode: true };
 }
 async function promptSetAsDefault(type, framework, isDefault) {
   if (isDefault) return;
+  let cancelled = false;
   const response = await prompts2(
     {
       type: "confirm",
@@ -879,8 +927,17 @@ async function promptSetAsDefault(type, framework, isDefault) {
       message: "Set this provider as default?",
       initial: false
     },
-    { onCancel: () => process.exit(0) }
+    {
+      onCancel: () => {
+        cancelled = true;
+        return false;
+      }
+    }
   );
+  if (cancelled) {
+    console.log(chalk18.dim("Cancelled"));
+    return;
+  }
   if (response.setDefault) {
     await setZeroOrgModelProviderDefault(type);
     console.log(chalk18.green(`\u2713 Default for ${framework} set to "${type}"`));
@@ -1040,7 +1097,7 @@ var createCommand = new Command24().name("create").description("Create a new zer
         const content = readFileSync(options.instructionsFile, "utf-8");
         await updateZeroAgentInstructions(agent.agentId, content);
       }
-      console.log(chalk21.green(`\u2713 Zero agent '${agent.agentId}' created`));
+      console.log(chalk21.green(`\u2713 Agent "${agent.agentId}" created`));
       console.log(`  Agent ID:     ${agent.agentId}`);
       console.log(`  Connectors:   ${agent.connectors.join(", ")}`);
       if (agent.displayName) {
@@ -1083,7 +1140,7 @@ var editCommand = new Command25().name("edit").description("Edit a zero agent").
         const content = readFileSync2(options.instructionsFile, "utf-8");
         await updateZeroAgentInstructions(agentId, content);
       }
-      console.log(chalk22.green(`\u2713 Zero agent '${agentId}' updated`));
+      console.log(chalk22.green(`\u2713 Agent "${agentId}" updated`));
     }
   )
 );
@@ -1174,7 +1231,7 @@ var deleteCommand2 = new Command28().name("delete").alias("rm").description("Del
       }
     }
     await deleteZeroAgent(agentId);
-    console.log(chalk25.green(`\u2713 Zero agent '${agentId}' deleted`));
+    console.log(chalk25.green(`\u2713 Agent "${agentId}" deleted`));
   })
 );
 
@@ -1399,7 +1456,8 @@ async function connectViaApiToken(connectorType, tokenValue) {
         `${secretConfig.label}${secretConfig.placeholder ? chalk27.dim(` (${secretConfig.placeholder})`) : ""}:`
       );
       if (!value) {
-        throw new Error("Cancelled");
+        console.log(chalk27.dim("Cancelled"));
+        return;
       }
       inputSecrets[secretName] = value;
     }
@@ -1411,10 +1469,8 @@ async function connectViaApiToken(connectorType, tokenValue) {
       description: `API token for ${config.label} connector`
     });
   }
-  console.log(
-    chalk27.green(`
-\u2713 ${config.label} connected successfully via API token!`)
-  );
+  console.log(chalk27.green(`
+\u2713 Connector "${connectorType}" connected`));
 }
 async function connectComputer() {
   await checkComputerDependencies();
@@ -1451,7 +1507,8 @@ async function resolveAuthMethod(connectorType, tokenFlag) {
       ]
     );
     if (!selected) {
-      throw new Error("Cancelled");
+      console.log(chalk27.dim("Cancelled"));
+      return null;
     }
     return selected;
   }
@@ -1489,7 +1546,7 @@ The session expires in ${Math.floor(session.expiresIn / 60)} minutes.`
         console.log(
           chalk27.green(`
 
-${connectorType} connected successfully!`)
+\u2713 Connector "${connectorType}" connected`)
         );
         return;
       case "expired":
@@ -1520,6 +1577,7 @@ var connectCommand = new Command30().name("connect").description("Connect a thir
       return;
     }
     const authMethod = await resolveAuthMethod(connectorType, options.token);
+    if (!authMethod) return;
     if (authMethod === "api-token") {
       await connectViaApiToken(connectorType, options.token);
       return;
@@ -2216,15 +2274,11 @@ Deploying schedule for agent ${chalk32.cyan(params.agentName)}...`
   });
   return deployResult;
 }
-function displayDeployResult(agentName, deployResult) {
+function displayDeployResult(scheduleName, deployResult) {
   if (deployResult.created) {
-    console.log(
-      chalk32.green(`\u2713 Created schedule for agent ${chalk32.cyan(agentName)}`)
-    );
+    console.log(chalk32.green(`\u2713 Schedule "${scheduleName}" created`));
   } else {
-    console.log(
-      chalk32.green(`\u2713 Updated schedule for agent ${chalk32.cyan(agentName)}`)
-    );
+    console.log(chalk32.green(`\u2713 Schedule "${scheduleName}" updated`));
   }
   console.log(chalk32.dim(`  Timezone: ${deployResult.schedule.timezone}`));
   if (deployResult.schedule.triggerType === "loop" && deployResult.schedule.intervalSeconds != null) {
@@ -2253,9 +2307,7 @@ function displayDeployResult(agentName, deployResult) {
 async function tryEnableSchedule(scheduleName, agentId, agentName) {
   try {
     await enableZeroSchedule({ name: scheduleName, agentId });
-    console.log(
-      chalk32.green(`\u2713 Enabled schedule for agent ${chalk32.cyan(agentName)}`)
-    );
+    console.log(chalk32.green(`\u2713 Schedule "${scheduleName}" enabled`));
   } catch (error) {
     console.error(chalk32.yellow("\u26A0 Failed to enable schedule"));
     if (error instanceof ApiRequestError) {
@@ -2365,7 +2417,7 @@ var setupCommand2 = new Command36().name("setup").description("Create or edit a
       notifyEmail,
       notifySlack
     });
-    displayDeployResult(agentName, deployResult);
+    displayDeployResult(scheduleName, deployResult);
     const shouldPromptEnable = deployResult.created || existingSchedule !== void 0 && !existingSchedule.enabled;
     await handleScheduleEnabling({
       scheduleName,
@@ -2536,9 +2588,7 @@ var deleteCommand3 = new Command39().name("delete").alias("rm").description("Del
         name: resolved.name,
         agentId: resolved.agentId
       });
-      console.log(
-        chalk35.green(`\u2713 Deleted schedule for agent ${chalk35.cyan(agentName)}`)
-      );
+      console.log(chalk35.green(`\u2713 Schedule "${resolved.name}" deleted`));
     }
   )
 );
@@ -2559,9 +2609,7 @@ var enableCommand = new Command40().name("enable").description("Enable a zero sc
       name: resolved.name,
       agentId: resolved.agentId
     });
-    console.log(
-      chalk36.green(`\u2713 Enabled schedule for agent ${chalk36.cyan(agentName)}`)
-    );
+    console.log(chalk36.green(`\u2713 Schedule "${resolved.name}" enabled`));
   })
 );
 
@@ -2581,9 +2629,7 @@ var disableCommand = new Command41().name("disable").description("Disable a zero
       name: resolved.name,
       agentId: resolved.agentId
     });
-    console.log(
-      chalk37.green(`\u2713 Disabled schedule for agent ${chalk37.cyan(agentName)}`)
-    );
+    console.log(chalk37.green(`\u2713 Schedule "${resolved.name}" disabled`));
   })
 );
 
@@ -2663,7 +2709,8 @@ var setCommand4 = new Command44().name("set").description("Create or update a se
       } else if (isInteractive()) {
         const prompted = await promptPassword("Enter secret value:");
         if (prompted === void 0) {
-          process.exit(0);
+          console.log(chalk39.dim("Cancelled"));
+          return;
         }
         value = prompted;
       } else {
@@ -2878,12 +2925,9 @@ function isInsideSandbox() {
 async function showSandboxInfo() {
   const agentId = process.env.ZERO_AGENT_ID;
   const payload = decodeZeroTokenPayload();
-  console.log(chalk45.bold("Agent:"));
-  console.log(`  ID:           ${agentId}`);
-  console.log();
-  console.log(chalk45.bold("Run:"));
-  console.log(`  ID:           ${payload?.runId ?? chalk45.dim("unavailable")}`);
-  console.log(`  Org:          ${payload?.orgId ?? chalk45.dim("unavailable")}`);
+  console.log(`Agent ID:   ${agentId}`);
+  console.log(`Run ID:     ${payload?.runId ?? chalk45.dim("unavailable")}`);
+  console.log(`Org ID:     ${payload?.orgId ?? chalk45.dim("unavailable")}`);
   if (payload?.capabilities?.length) {
     console.log();
     console.log(chalk45.bold("Capabilities:"));
@@ -2927,46 +2971,40 @@ var COMMAND_CAPABILITY_MAP = {
   slack: "slack:write",
   whoami: null
 };
-function applyCapabilityVisibility(prog) {
+var DEFAULT_COMMANDS = [
+  zeroOrgCommand,
+  zeroAgentCommand,
+  zeroConnectorCommand,
+  zeroPreferenceCommand,
+  zeroScheduleCommand,
+  zeroSecretCommand,
+  zeroSlackCommand,
+  zeroVariableCommand,
+  zeroWhoamiCommand
+];
+function shouldHideCommand(name, payload) {
+  if (!payload) return false;
+  const requiredCap = COMMAND_CAPABILITY_MAP[name];
+  if (requiredCap === void 0) return true;
+  return requiredCap !== null && !payload.capabilities.includes(requiredCap);
+}
+function registerZeroCommands(prog, commands) {
   const token = process.env.ZERO_TOKEN;
-  if (!token) return;
-  const payload = decodeZeroTokenPayload(token);
-  if (!payload) return;
-  for (const cmd of prog.commands) {
-    const requiredCap = COMMAND_CAPABILITY_MAP[cmd.name()];
-    if (requiredCap === void 0) {
-      cmd._hidden = true;
-    } else if (requiredCap !== null && !payload.capabilities.includes(requiredCap)) {
-      cmd._hidden = true;
-    }
+  const payload = token ? decodeZeroTokenPayload(token) : void 0;
+  for (const cmd of commands ?? DEFAULT_COMMANDS) {
+    const hidden = shouldHideCommand(cmd.name(), payload);
+    prog.addCommand(cmd, hidden ? { hidden: true } : {});
   }
 }
 var program = new Command55();
-program.name("zero").description("Zero CLI - Manage your zero platform").version("9.82.1");
-program.addCommand(zeroOrgCommand);
-program.addCommand(zeroAgentCommand);
-program.addCommand(zeroConnectorCommand);
-program.addCommand(zeroPreferenceCommand);
-program.addCommand(zeroScheduleCommand);
-program.addCommand(zeroSecretCommand);
-program.addCommand(zeroSlackCommand);
-program.addCommand(zeroVariableCommand);
-program.addCommand(zeroWhoamiCommand);
+program.name("zero").description("Zero CLI - Manage your zero platform").version("9.83.0");
 if (process.argv[1]?.endsWith("zero.js") || process.argv[1]?.endsWith("zero.ts") || process.argv[1]?.endsWith("zero")) {
-  process.stdout.on("error", (err) => {
-    if (err.code === "EPIPE") process.exit(0);
-    throw err;
-  });
-  process.stderr.on("error", (err) => {
-    if (err.code === "EPIPE") process.exit(0);
-    throw err;
-  });
   configureGlobalProxyFromEnv();
-  applyCapabilityVisibility(program);
+  registerZeroCommands(program);
   program.parse();
 }
 export {
-  applyCapabilityVisibility,
-  program
+  program,
+  registerZeroCommands
 };
 //# sourceMappingURL=zero.js.map