@vm0/cli 9.59.0 → 9.59.2

package/index.js

@@ -45,7 +45,7 @@ if (DSN) {
   Sentry.init({
     dsn: DSN,
     environment: process.env.SENTRY_ENVIRONMENT ?? "production",
-    release: "9.59.0",
+    release: "9.59.2",
     sendDefaultPii: false,
     tracesSampleRate: 0,
     shutdownTimeout: 500,
@@ -64,7 +64,7 @@ if (DSN) {
     }
   });
   Sentry.setContext("cli", {
-    version: "9.59.0",
+    version: "9.59.2",
     command: process.argv.slice(2).join(" ")
   });
   Sentry.setContext("runtime", {
@@ -673,7 +673,7 @@ function getConfigPath() {
   return join2(homedir2(), ".vm0", "config.json");
 }
 var infoCommand = new Command6().name("info").description("Display environment and debug information").action(async () => {
-  console.log(chalk4.bold(`VM0 CLI v${"9.59.0"}`));
+  console.log(chalk4.bold(`VM0 CLI v${"9.59.2"}`));
   console.log();
   const config = await loadConfig();
   const hasEnvToken = !!process.env.VM0_TOKEN;
@@ -1227,7 +1227,8 @@ var ALL_RUN_STATUSES = [
   "running",
   "completed",
   "failed",
-  "timeout"
+  "timeout",
+  "cancelled"
 ];
 var runStatusSchema = z5.enum(ALL_RUN_STATUSES);
 var unifiedRunRequestSchema = z5.object({
@@ -7005,6 +7006,191 @@ function getServiceConfig(type2) {
   return { ...config, name: type2 };
 }
 
+// ../../packages/core/src/contracts/service-expander.ts
+var VALID_RULE_METHODS = /* @__PURE__ */ new Set([
+  "GET",
+  "POST",
+  "PUT",
+  "PATCH",
+  "DELETE",
+  "HEAD",
+  "OPTIONS",
+  "ANY"
+]);
+function validateRule(rule, permName, serviceName) {
+  const parts = rule.split(" ", 2);
+  if (parts.length !== 2 || !parts[1]) {
+    throw new Error(
+      `Invalid rule "${rule}" in permission "${permName}" of service "${serviceName}": must be "METHOD /path"`
+    );
+  }
+  const [method, path18] = parts;
+  if (!VALID_RULE_METHODS.has(method)) {
+    throw new Error(
+      `Invalid rule "${rule}" in permission "${permName}" of service "${serviceName}": unknown method "${method}" (must be uppercase)`
+    );
+  }
+  if (!path18.startsWith("/")) {
+    throw new Error(
+      `Invalid rule "${rule}" in permission "${permName}" of service "${serviceName}": path must start with "/"`
+    );
+  }
+  if (path18.includes("?") || path18.includes("#")) {
+    throw new Error(
+      `Invalid rule "${rule}" in permission "${permName}" of service "${serviceName}": path must not contain query string or fragment`
+    );
+  }
+  const segments = path18.split("/").filter(Boolean);
+  const paramNames = /* @__PURE__ */ new Set();
+  for (let i = 0; i < segments.length; i++) {
+    const seg = segments[i];
+    if (seg.startsWith("{") && seg.endsWith("}")) {
+      const name = seg.slice(1, -1);
+      const baseName = name.endsWith("+") ? name.slice(0, -1) : name;
+      if (!baseName) {
+        throw new Error(
+          `Invalid rule "${rule}" in permission "${permName}" of service "${serviceName}": empty parameter name`
+        );
+      }
+      if (paramNames.has(baseName)) {
+        throw new Error(
+          `Invalid rule "${rule}" in permission "${permName}" of service "${serviceName}": duplicate parameter name "{${baseName}}"`
+        );
+      }
+      paramNames.add(baseName);
+      if (name.endsWith("+") && i !== segments.length - 1) {
+        throw new Error(
+          `Invalid rule "${rule}" in permission "${permName}" of service "${serviceName}": {${name}} must be the last segment`
+        );
+      }
+    }
+  }
+}
+function validateBaseUrl(base, serviceName) {
+  let url;
+  try {
+    url = new URL(base);
+  } catch {
+    throw new Error(
+      `Invalid base URL "${base}" in service "${serviceName}": not a valid URL`
+    );
+  }
+  if (url.search) {
+    throw new Error(
+      `Invalid base URL "${base}" in service "${serviceName}": must not contain query string`
+    );
+  }
+  if (url.hash) {
+    throw new Error(
+      `Invalid base URL "${base}" in service "${serviceName}": must not contain fragment`
+    );
+  }
+}
+function resolveServiceConfig(ref) {
+  const parsed = connectorTypeSchema.safeParse(ref);
+  if (!parsed.success) {
+    throw new Error(
+      `Cannot resolve service ref "${ref}": no built-in service with this name`
+    );
+  }
+  const serviceConfig = getServiceConfig(parsed.data);
+  if (!serviceConfig) {
+    throw new Error(
+      `Service ref "${ref}" resolved to "${parsed.data}" but it does not support proxy-side token replacement`
+    );
+  }
+  return serviceConfig;
+}
+function collectAndValidatePermissions(ref, serviceConfig) {
+  if (serviceConfig.apis.length === 0) {
+    throw new Error(
+      `Service "${serviceConfig.name}" (ref "${ref}") has no api entries`
+    );
+  }
+  const available = /* @__PURE__ */ new Set();
+  for (const api2 of serviceConfig.apis) {
+    validateBaseUrl(api2.base, serviceConfig.name);
+    if (!api2.permissions || api2.permissions.length === 0) {
+      throw new Error(
+        `API entry "${api2.base}" in service "${serviceConfig.name}" (ref "${ref}") has no permissions`
+      );
+    }
+    const seen = /* @__PURE__ */ new Set();
+    for (const perm of api2.permissions) {
+      if (!perm.name) {
+        throw new Error(
+          `Service "${serviceConfig.name}" (ref "${ref}") has a permission with empty name`
+        );
+      }
+      if (perm.name === "all") {
+        throw new Error(
+          `Service "${serviceConfig.name}" (ref "${ref}") has a permission named "all", which is a reserved keyword`
+        );
+      }
+      if (seen.has(perm.name)) {
+        throw new Error(
+          `Duplicate permission name "${perm.name}" in API entry "${api2.base}" of service "${serviceConfig.name}" (ref "${ref}")`
+        );
+      }
+      if (perm.rules.length === 0) {
+        throw new Error(
+          `Permission "${perm.name}" in service "${serviceConfig.name}" (ref "${ref}") has no rules`
+        );
+      }
+      for (const rule of perm.rules) {
+        validateRule(rule, perm.name, serviceConfig.name);
+      }
+      seen.add(perm.name);
+      available.add(perm.name);
+    }
+  }
+  return available;
+}
+function expandServiceConfigs(config) {
+  const compose = config;
+  if (!compose?.agents) return;
+  for (const agent of Object.values(compose.agents)) {
+    const services = agent.experimental_services;
+    if (!services) continue;
+    if (Array.isArray(services)) continue;
+    const expanded = [];
+    for (const [ref, selection] of Object.entries(services)) {
+      const serviceConfig = resolveServiceConfig(ref);
+      const availablePermissions = collectAndValidatePermissions(
+        ref,
+        serviceConfig
+      );
+      if (selection.permissions !== "all") {
+        for (const name of selection.permissions) {
+          if (!availablePermissions.has(name)) {
+            const available = [...availablePermissions].join(", ");
+            throw new Error(
+              `Permission "${name}" does not exist in service "${serviceConfig.name}" (ref "${ref}"). Available: ${available}`
+            );
+          }
+        }
+      }
+      const selectedSet = selection.permissions === "all" ? null : new Set(selection.permissions);
+      const filteredApis = serviceConfig.apis.map((api2) => ({
+        ...api2,
+        permissions: selectedSet ? (api2.permissions ?? []).filter((p) => selectedSet.has(p.name)) : api2.permissions
+      })).filter((api2) => (api2.permissions ?? []).length > 0);
+      if (filteredApis.length === 0) continue;
+      const entry = {
+        name: serviceConfig.name,
+        ref,
+        apis: filteredApis
+      };
+      if (serviceConfig.description !== void 0)
+        entry.description = serviceConfig.description;
+      if (serviceConfig.placeholders !== void 0)
+        entry.placeholders = serviceConfig.placeholders;
+      expanded.push(entry);
+    }
+    agent.experimental_services = expanded;
+  }
+}
+
 // ../../packages/core/src/contracts/user-preferences.ts
 import { z as z21 } from "zod";
 var c19 = initContract();
@@ -9393,7 +9579,7 @@ async function uploadAssets(agentName, agent, basePath, jsonMode) {
   }
   return skillResults;
 }
-async function collectSkillVariables(skillResults, environment, agentName) {
+async function collectSkillVariables(skillResults, environment, agentName, options) {
   const skillSecrets = /* @__PURE__ */ new Map();
   const skillVars = /* @__PURE__ */ new Map();
   for (const result of skillResults) {
@@ -9421,12 +9607,15 @@ async function collectSkillVariables(skillResults, environment, agentName) {
   const newVars = [...skillVars.entries()].filter(
     ([name]) => !(name in environment)
   );
-  let headSecrets = /* @__PURE__ */ new Set();
-  const existingCompose = await getComposeByName(agentName);
-  if (existingCompose?.content) {
-    headSecrets = getSecretsFromComposeContent(existingCompose.content);
+  let trulyNewSecrets = [];
+  if (!options.json) {
+    let headSecrets = /* @__PURE__ */ new Set();
+    const existingCompose = await getComposeByName(agentName);
+    if (existingCompose?.content) {
+      headSecrets = getSecretsFromComposeContent(existingCompose.content);
+    }
+    trulyNewSecrets = newSecrets.map(([name]) => name).filter((name) => !headSecrets.has(name));
   }
-  const trulyNewSecrets = newSecrets.map(([name]) => name).filter((name) => !headSecrets.has(name));
   return { newSecrets, newVars, trulyNewSecrets };
 }
 async function displayAndConfirmVariables(variables, options) {
@@ -9495,189 +9684,6 @@ function mergeSkillVariables(agent, variables) {
     agent.environment = environment;
   }
 }
-function resolveServiceConfig(ref) {
-  const parsed = connectorTypeSchema.safeParse(ref);
-  if (!parsed.success) {
-    throw new Error(
-      `Cannot resolve service ref "${ref}": no built-in service with this name`
-    );
-  }
-  const serviceConfig = getServiceConfig(parsed.data);
-  if (!serviceConfig) {
-    throw new Error(
-      `Service ref "${ref}" resolved to "${parsed.data}" but it does not support proxy-side token replacement`
-    );
-  }
-  return serviceConfig;
-}
-var VALID_RULE_METHODS = /* @__PURE__ */ new Set([
-  "GET",
-  "POST",
-  "PUT",
-  "PATCH",
-  "DELETE",
-  "HEAD",
-  "OPTIONS",
-  "ANY"
-]);
-function validateRule(rule, permName, serviceName) {
-  const parts = rule.split(" ", 2);
-  if (parts.length !== 2 || !parts[1]) {
-    throw new Error(
-      `Invalid rule "${rule}" in permission "${permName}" of service "${serviceName}": must be "METHOD /path"`
-    );
-  }
-  const [method, path18] = parts;
-  if (!VALID_RULE_METHODS.has(method)) {
-    throw new Error(
-      `Invalid rule "${rule}" in permission "${permName}" of service "${serviceName}": unknown method "${method}" (must be uppercase)`
-    );
-  }
-  if (!path18.startsWith("/")) {
-    throw new Error(
-      `Invalid rule "${rule}" in permission "${permName}" of service "${serviceName}": path must start with "/"`
-    );
-  }
-  if (path18.includes("?") || path18.includes("#")) {
-    throw new Error(
-      `Invalid rule "${rule}" in permission "${permName}" of service "${serviceName}": path must not contain query string or fragment`
-    );
-  }
-  const segments = path18.split("/").filter(Boolean);
-  const paramNames = /* @__PURE__ */ new Set();
-  for (let i = 0; i < segments.length; i++) {
-    const seg = segments[i];
-    if (seg.startsWith("{") && seg.endsWith("}")) {
-      const name = seg.slice(1, -1);
-      const baseName = name.endsWith("+") ? name.slice(0, -1) : name;
-      if (!baseName) {
-        throw new Error(
-          `Invalid rule "${rule}" in permission "${permName}" of service "${serviceName}": empty parameter name`
-        );
-      }
-      if (paramNames.has(baseName)) {
-        throw new Error(
-          `Invalid rule "${rule}" in permission "${permName}" of service "${serviceName}": duplicate parameter name "{${baseName}}"`
-        );
-      }
-      paramNames.add(baseName);
-      if (name.endsWith("+") && i !== segments.length - 1) {
-        throw new Error(
-          `Invalid rule "${rule}" in permission "${permName}" of service "${serviceName}": {${name}} must be the last segment`
-        );
-      }
-    }
-  }
-}
-function validateBaseUrl(base, serviceName) {
-  let url;
-  try {
-    url = new URL(base);
-  } catch {
-    throw new Error(
-      `Invalid base URL "${base}" in service "${serviceName}": not a valid URL`
-    );
-  }
-  if (url.search) {
-    throw new Error(
-      `Invalid base URL "${base}" in service "${serviceName}": must not contain query string`
-    );
-  }
-  if (url.hash) {
-    throw new Error(
-      `Invalid base URL "${base}" in service "${serviceName}": must not contain fragment`
-    );
-  }
-}
-function collectAndValidatePermissions(ref, serviceConfig) {
-  if (serviceConfig.apis.length === 0) {
-    throw new Error(
-      `Service "${serviceConfig.name}" (ref "${ref}") has no api entries`
-    );
-  }
-  const available = /* @__PURE__ */ new Set();
-  for (const api2 of serviceConfig.apis) {
-    validateBaseUrl(api2.base, serviceConfig.name);
-    if (!api2.permissions || api2.permissions.length === 0) {
-      throw new Error(
-        `API entry "${api2.base}" in service "${serviceConfig.name}" (ref "${ref}") has no permissions`
-      );
-    }
-    const seen = /* @__PURE__ */ new Set();
-    for (const perm of api2.permissions) {
-      if (!perm.name) {
-        throw new Error(
-          `Service "${serviceConfig.name}" (ref "${ref}") has a permission with empty name`
-        );
-      }
-      if (perm.name === "all") {
-        throw new Error(
-          `Service "${serviceConfig.name}" (ref "${ref}") has a permission named "all", which is a reserved keyword`
-        );
-      }
-      if (seen.has(perm.name)) {
-        throw new Error(
-          `Duplicate permission name "${perm.name}" in API entry "${api2.base}" of service "${serviceConfig.name}" (ref "${ref}")`
-        );
-      }
-      if (perm.rules.length === 0) {
-        throw new Error(
-          `Permission "${perm.name}" in service "${serviceConfig.name}" (ref "${ref}") has no rules`
-        );
-      }
-      for (const rule of perm.rules) {
-        validateRule(rule, perm.name, serviceConfig.name);
-      }
-      seen.add(perm.name);
-      available.add(perm.name);
-    }
-  }
-  return available;
-}
-function expandServiceConfigs(config) {
-  const compose = config;
-  if (!compose?.agents) return;
-  for (const agent of Object.values(compose.agents)) {
-    const services = agent.experimental_services;
-    if (!services) continue;
-    if (Array.isArray(services)) continue;
-    const expanded = [];
-    for (const [ref, selection] of Object.entries(services)) {
-      const serviceConfig = resolveServiceConfig(ref);
-      const availablePermissions = collectAndValidatePermissions(
-        ref,
-        serviceConfig
-      );
-      if (selection.permissions !== "all") {
-        for (const name of selection.permissions) {
-          if (!availablePermissions.has(name)) {
-            const available = [...availablePermissions].join(", ");
-            throw new Error(
-              `Permission "${name}" does not exist in service "${serviceConfig.name}" (ref "${ref}"). Available: ${available}`
-            );
-          }
-        }
-      }
-      const selectedSet = selection.permissions === "all" ? null : new Set(selection.permissions);
-      const filteredApis = serviceConfig.apis.map((api2) => ({
-        ...api2,
-        permissions: selectedSet ? (api2.permissions ?? []).filter((p) => selectedSet.has(p.name)) : api2.permissions
-      })).filter((api2) => (api2.permissions ?? []).length > 0);
-      if (filteredApis.length === 0) continue;
-      const entry = {
-        name: serviceConfig.name,
-        ref,
-        apis: filteredApis
-      };
-      if (serviceConfig.description !== void 0)
-        entry.description = serviceConfig.description;
-      if (serviceConfig.placeholders !== void 0)
-        entry.placeholders = serviceConfig.placeholders;
-      expanded.push(entry);
-    }
-    agent.experimental_services = expanded;
-  }
-}
 function getPlatformUrl(apiUrl) {
   const url = new URL(apiUrl);
   url.hostname = url.hostname.replace("www", "platform");
@@ -9745,9 +9751,8 @@ async function finalizeCompose(config, agent, variables, options) {
     console.log("Uploading compose...");
   }
   const response = await createOrUpdateCompose({ content: config });
-  const orgResponse = await getOrg();
   const shortVersionId = response.versionId.slice(0, 8);
-  const displayName = `${orgResponse.slug}/${response.name}`;
+  const displayName = options.json ? response.name : `${(await getOrg()).slug}/${response.name}`;
   const result = {
     composeId: response.composeId,
     composeName: response.name,
@@ -9755,11 +9760,13 @@ async function finalizeCompose(config, agent, variables, options) {
     action: response.action,
     displayName
   };
-  const missingItems = await checkAndPromptMissingItems(config, options);
-  if (missingItems.missingSecrets.length > 0 || missingItems.missingVars.length > 0) {
-    result.missingSecrets = missingItems.missingSecrets;
-    result.missingVars = missingItems.missingVars;
-    result.setupUrl = missingItems.setupUrl;
+  if (!options.json) {
+    const missingItems = await checkAndPromptMissingItems(config, options);
+    if (missingItems.missingSecrets.length > 0 || missingItems.missingVars.length > 0) {
+      result.missingSecrets = missingItems.missingSecrets;
+      result.missingVars = missingItems.missingVars;
+      result.setupUrl = missingItems.setupUrl;
+    }
   }
   if (!options.json) {
     if (response.action === "created") {
@@ -9846,7 +9853,8 @@ async function handleGitHubCompose(url, options) {
     const variables = await collectSkillVariables(
       skillResults,
       environment,
-      agentName
+      agentName,
+      options
     );
     return await finalizeCompose(config, agent, variables, options);
   } finally {
@@ -9878,7 +9886,7 @@ var composeCommand = new Command7().name("compose").description("Create or updat
         options.autoUpdate = false;
       }
       if (options.autoUpdate !== false) {
-        await startSilentUpgrade("9.59.0");
+        await startSilentUpgrade("9.59.2");
       }
       try {
         let result;
@@ -9899,7 +9907,8 @@ var composeCommand = new Command7().name("compose").description("Create or updat
           const variables = await collectSkillVariables(
             skillResults,
             environment,
-            agentName
+            agentName,
+            options
           );
           result = await finalizeCompose(config, agent, variables, options);
         }
@@ -11051,7 +11060,7 @@ var mainRunCommand = new Command8().name("run").description("Run an agent").argu
   withErrorHandler(
     async (identifier, prompt, options) => {
       if (options.autoUpdate !== false) {
-        await startSilentUpgrade("9.59.0");
+        await startSilentUpgrade("9.59.2");
       }
       const { org, name, version } = parseIdentifier(identifier);
       if (org && !options.experimentalSharedAgent) {
@@ -12738,7 +12747,7 @@ var cookAction = new Command34().name("cook").description("Quick start: prepare,
   withErrorHandler(
     async (prompt, options) => {
       if (options.autoUpdate !== false) {
-        const shouldExit = await checkAndUpgrade("9.59.0", prompt);
+        const shouldExit = await checkAndUpgrade("9.59.2", prompt);
         if (shouldExit) {
           process.exit(0);
         }
@@ -18089,13 +18098,13 @@ var upgradeCommand = new Command90().name("upgrade").description("Upgrade vm0 CL
     if (latestVersion === null) {
       throw new Error("Could not check for updates. Please try again later.");
     }
-    if (latestVersion === "9.59.0") {
-      console.log(chalk84.green(`\u2713 Already up to date (${"9.59.0"})`));
+    if (latestVersion === "9.59.2") {
+      console.log(chalk84.green(`\u2713 Already up to date (${"9.59.2"})`));
       return;
     }
     console.log(
       chalk84.yellow(
-        `Current version: ${"9.59.0"} -> Latest version: ${latestVersion}`
+        `Current version: ${"9.59.2"} -> Latest version: ${latestVersion}`
       )
     );
     console.log();
@@ -18122,7 +18131,7 @@ var upgradeCommand = new Command90().name("upgrade").description("Upgrade vm0 CL
     const success = await performUpgrade(packageManager);
     if (success) {
       console.log(
-        chalk84.green(`\u2713 Upgraded from ${"9.59.0"} to ${latestVersion}`)
+        chalk84.green(`\u2713 Upgraded from ${"9.59.2"} to ${latestVersion}`)
       );
       return;
     }
@@ -18136,7 +18145,7 @@ var upgradeCommand = new Command90().name("upgrade").description("Upgrade vm0 CL
 
 // src/index.ts
 var program = new Command91();
-program.name("vm0").description("VM0 CLI - Build and run agents with natural language").version("9.59.0");
+program.name("vm0").description("VM0 CLI - Build and run agents with natural language").version("9.59.2");
 program.addCommand(authCommand);
 program.addCommand(infoCommand);
 program.addCommand(composeCommand);

package/package.json

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