@vm0/cli 9.148.0 → 9.148.2

package/package.json

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

package/zero.js

@@ -6,9 +6,9 @@ import {
   CONNECTOR_TYPES,
   Command,
   EventRenderer,
+  EventStreamNormalizer,
   MODEL_PROVIDER_TYPES,
   Option,
-  allowsCustomModel,
   completePhoneFileUpload,
   completeSlackFileUpload,
   completeTelegramFileUpload,
@@ -47,10 +47,7 @@ import {
   getConnectorEnvironmentMapping,
   getConnectorFirewall,
   getConnectorTypeForSecretName,
-  getCustomModelPlaceholder,
   getDefaultAuthMethod,
-  getDefaultModel,
-  getModels,
   getScopeDiff,
   getSecretsForAuthMethod,
   getSelectableProviderTypes,
@@ -67,7 +64,6 @@ import {
   getZeroRunContext,
   getZeroUserPreferences,
   hasAuthMethods,
-  hasModelSelection,
   hasRequiredScopes,
   initPhoneFileUpload,
   initSlackFileUpload,
@@ -113,7 +109,6 @@ import {
   sendPhoneMessage,
   sendSlackMessage,
   sendTelegramMessage,
-  setZeroOrgModelProviderDefault,
   setZeroOrgSecret,
   setZeroOrgVariable,
   setZeroSecret,
@@ -126,14 +121,13 @@ import {
   updateZeroAgent,
   updateZeroAgentInstructions,
   updateZeroOrg,
-  updateZeroOrgModelProviderModel,
   updateZeroUserPreferences,
   uploadWebFile,
   upsertZeroOrgModelProvider,
   withErrorHandler,
   zeroAgentCustomSkillNameSchema,
   zeroRemoteAgentCommand
-} from "./chunk-7S6FB5HX.js";
+} from "./chunk-KAN2DFAY.js";
 import {
   __toESM,
   init_esm_shims
@@ -543,23 +537,8 @@ var listCommand4 = new Command().name("list").alias("ls").description("List all
     for (const [framework, providers] of Object.entries(byFramework)) {
       console.log(`  ${source_default.cyan(framework)}:`);
       for (const provider of providers) {
-        const defaultTag = provider.isDefault ? source_default.green(" (default)") : "";
-        const modelTag = provider.selectedModel ? source_default.dim(` [${provider.selectedModel}]`) : "";
-        console.log(`    ${provider.type}${defaultTag}${modelTag}`);
+        console.log(`    ${provider.type}`);
         console.log(source_default.dim(`      ID: ${provider.id}`));
-        if (provider.type in MODEL_PROVIDER_TYPES) {
-          const type = provider.type;
-          const available = getModels(type) ?? [];
-          if (available.length > 0) {
-            console.log(
-              source_default.dim(`      Available models: ${available.join(", ")}`)
-            );
-          } else if (allowsCustomModel(type)) {
-            console.log(
-              source_default.dim("      Available models: (custom \u2014 any model name)")
-            );
-          }
-        }
         console.log(
           source_default.dim(
             `      Updated: ${new Date(provider.updatedAt).toLocaleString()}`
@@ -571,12 +550,6 @@ var listCommand4 = new Command().name("list").alias("ls").description("List all
     console.log(
       source_default.dim(`Total: ${result.modelProviders.length} provider(s)`)
     );
-    console.log();
-    console.log(
-      source_default.dim(
-        "Use a provider ID with: zero agent edit <agent-id> --model-provider <id> --model <name>"
-      )
-    );
   })
 );
 
@@ -596,18 +569,6 @@ function validateProviderType(typeStr) {
   }
   return typeStr;
 }
-function validateModel(type, modelStr) {
-  const models = getModels(type);
-  if (allowsCustomModel(type)) {
-    return modelStr;
-  }
-  if (models && !models.includes(modelStr)) {
-    throw new Error(`Invalid model "${modelStr}"`, {
-      cause: new Error(`Valid models: ${models.join(", ")}`)
-    });
-  }
-  return modelStr;
-}
 function validateAuthMethod(type, authMethodStr) {
   const authMethods = getAuthMethodsForType(type);
   if (!authMethods || !(authMethodStr in authMethods)) {
@@ -681,13 +642,6 @@ function validateSecrets(type, authMethod, secrets) {
 function handleNonInteractiveMode(options) {
   const type = validateProviderType(options.type);
   const cmdPrefix = options.commandPrefix ?? "zero org model-provider setup";
-  let selectedModel;
-  if (options.model) {
-    selectedModel = validateModel(type, options.model);
-  } else if (hasModelSelection(type)) {
-    const defaultModel = getDefaultModel(type);
-    selectedModel = defaultModel || void 0;
-  }
   if (hasAuthMethods(type)) {
     let authMethod;
     if (options.authMethod) {
@@ -719,7 +673,6 @@ function handleNonInteractiveMode(options) {
       type,
       authMethod,
       secrets,
-      selectedModel,
       isInteractiveMode: false
     };
   }
@@ -737,68 +690,9 @@ function handleNonInteractiveMode(options) {
   return {
     type,
     secret,
-    selectedModel,
     isInteractiveMode: false
   };
 }
-async function promptForModelSelection(type) {
-  if (!hasModelSelection(type)) {
-    return void 0;
-  }
-  const models = getModels(type) ?? [];
-  const defaultModel = getDefaultModel(type);
-  const supportsCustomModel = allowsCustomModel(type);
-  const modelChoices = [];
-  if (defaultModel === "") {
-    modelChoices.push({ title: "auto (Recommended)", value: "" });
-  }
-  for (const model of models) {
-    modelChoices.push({
-      title: model === defaultModel ? `${model} (Recommended)` : model,
-      value: model
-    });
-  }
-  if (supportsCustomModel) {
-    modelChoices.push({ title: "Custom model ID", value: "__custom__" });
-  }
-  const modelResponse = await (0, import_prompts.default)(
-    {
-      type: "select",
-      name: "model",
-      message: "Select model:",
-      choices: modelChoices
-    },
-    {
-      onCancel: () => {
-        return process.exit(0);
-      }
-    }
-  );
-  const selected = modelResponse.model;
-  if (selected === "__custom__") {
-    const placeholder = getCustomModelPlaceholder(type);
-    if (placeholder) {
-      console.log(source_default.dim(`Example: ${placeholder}`));
-    }
-    const customResponse = await (0, import_prompts.default)(
-      {
-        type: "text",
-        name: "customModel",
-        message: "Enter model ID:",
-        validate: (value) => {
-          return value.length > 0 || "Model ID is required";
-        }
-      },
-      {
-        onCancel: () => {
-          return process.exit(0);
-        }
-      }
-    );
-    return customResponse.customModel;
-  }
-  return selected === "" ? void 0 : selected;
-}
 async function promptForAuthMethod(type) {
   const authMethods = getAuthMethodsForType(type);
   const defaultAuthMethod = getDefaultAuthMethod(type);
@@ -886,11 +780,6 @@ async function promptForSecrets(type, authMethod) {
 function collectSecrets(value, previous) {
   return previous.concat([value]);
 }
-function parseModelFlag(value) {
-  if (value === void 0) return void 0;
-  if (value === "default") return null;
-  return value;
-}
 
 // src/commands/zero/org/model-provider/setup.ts
 async function handleInteractiveMode() {
@@ -966,11 +855,9 @@ async function handleInteractiveMode() {
       return null;
     }
     if (actionResponse.action === "keep") {
-      const selectedModel2 = await promptForModelSelection(type);
       return {
         type,
         keepExistingSecret: true,
-        selectedModel: selectedModel2,
         isInteractiveMode: true
       };
     }
@@ -984,12 +871,10 @@ async function handleInteractiveMode() {
   if (hasAuthMethods(type)) {
     const authMethod = await promptForAuthMethod(type);
     const secrets = await promptForSecrets(type, authMethod);
-    const selectedModel2 = await promptForModelSelection(type);
     return {
       type,
       authMethod,
       secrets,
-      selectedModel: selectedModel2,
       isInteractiveMode: true
     };
   }
@@ -1010,34 +895,7 @@ async function handleInteractiveMode() {
     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 (0, import_prompts2.default)(
-    {
-      type: "confirm",
-      name: "setDefault",
-      message: "Set this provider as default?",
-      initial: false
-    },
-    {
-      onCancel: () => {
-        cancelled = true;
-        return false;
-      }
-    }
-  );
-  if (cancelled) {
-    console.log(source_default.dim("Cancelled"));
-    return;
-  }
-  if (response.setDefault) {
-    await setZeroOrgModelProviderDefault(type);
-    console.log(source_default.green(`\u2713 Default for ${framework} set to "${type}"`));
-  }
+  return { type, secret, isInteractiveMode: true };
 }
 var setupCommand = new Command().name("setup").description("Configure an org-level model provider").option("-t, --type <type>", "Provider type (for non-interactive mode)").option(
   "-s, --secret <value>",
@@ -1047,7 +905,7 @@ var setupCommand = new Command().name("setup").description("Configure an org-lev
 ).option(
   "-a, --auth-method <method>",
   "Auth method (required for multi-auth providers like aws-bedrock)"
-).option("-m, --model <model>", "Model selection (for non-interactive mode)").action(
+).action(
   withErrorHandler(
     async (options) => {
       let input;
@@ -1057,7 +915,6 @@ var setupCommand = new Command().name("setup").description("Configure an org-lev
           type: options.type,
           secret: secretArgs,
           authMethod: options.authMethod,
-          model: options.model,
           commandPrefix: "zero org model-provider setup"
         });
       } else if (options.type || secretArgs.length > 0) {
@@ -1070,54 +927,21 @@ var setupCommand = new Command().name("setup").description("Configure an org-lev
         input = result;
       }
       if (input.keepExistingSecret) {
-        const provider2 = await updateZeroOrgModelProviderModel(
-          input.type,
-          input.selectedModel
+        console.log(
+          source_default.green(`\u2713 Org model provider "${input.type}" unchanged`)
         );
-        const defaultNote2 = provider2.isDefault ? ` (default for ${provider2.framework})` : "";
-        const modelNote2 = provider2.selectedModel ? ` with model: ${provider2.selectedModel}` : "";
-        if (!hasModelSelection(input.type)) {
-          console.log(
-            source_default.green(`\u2713 Org model provider "${input.type}" unchanged`)
-          );
-        } else {
-          console.log(
-            source_default.green(
-              `\u2713 Org model provider "${input.type}" updated${defaultNote2}${modelNote2}`
-            )
-          );
-        }
-        if (input.isInteractiveMode) {
-          await promptSetAsDefault(
-            input.type,
-            provider2.framework,
-            provider2.isDefault
-          );
-        }
         return;
       }
-      const { provider, created } = await upsertZeroOrgModelProvider({
+      const { created } = await upsertZeroOrgModelProvider({
         type: input.type,
         secret: input.secret,
         authMethod: input.authMethod,
-        secrets: input.secrets,
-        selectedModel: input.selectedModel
+        secrets: input.secrets
       });
       const action = created ? "created" : "updated";
-      const defaultNote = provider.isDefault ? ` (default for ${provider.framework})` : "";
-      const modelNote = provider.selectedModel ? ` with model: ${provider.selectedModel}` : "";
       console.log(
-        source_default.green(
-          `\u2713 Org model provider "${input.type}" ${action}${defaultNote}${modelNote}`
-        )
+        source_default.green(`\u2713 Org model provider "${input.type}" ${action}`)
       );
-      if (input.isInteractiveMode) {
-        await promptSetAsDefault(
-          input.type,
-          provider.framework,
-          provider.isDefault
-        );
-      }
     }
   )
 );
@@ -1137,29 +961,8 @@ var removeCommand4 = new Command().name("remove").description("Remove an org-lev
   })
 );
 
-// src/commands/zero/org/model-provider/set-default.ts
-init_esm_shims();
-var setDefaultCommand = new Command().name("set-default").description("Set an org-level model provider as default for its framework").argument("<type>", "Model provider type to set as default").action(
-  withErrorHandler(async (type) => {
-    if (!Object.keys(MODEL_PROVIDER_TYPES).includes(type)) {
-      const validTypes = Object.keys(MODEL_PROVIDER_TYPES).join(", ");
-      throw new Error(`Invalid type "${type}"`, {
-        cause: new Error(`Valid types: ${validTypes}`)
-      });
-    }
-    const provider = await setZeroOrgModelProviderDefault(
-      type
-    );
-    console.log(
-      source_default.green(
-        `\u2713 Default for ${provider.framework} set to "${provider.type}"`
-      )
-    );
-  })
-);
-
 // src/commands/zero/org/model-provider/index.ts
-var zeroOrgModelProviderCommand = new Command().name("model-provider").description("Manage org-level model providers").addCommand(listCommand4).addCommand(setupCommand).addCommand(removeCommand4).addCommand(setDefaultCommand);
+var zeroOrgModelProviderCommand = new Command().name("model-provider").description("Manage org-level model providers").addCommand(listCommand4).addCommand(setupCommand).addCommand(removeCommand4);
 
 // src/commands/zero/org/index.ts
 var zeroOrgCommand = new Command().name("org").description("Manage organization settings, members, and providers").addCommand(statusCommand).addCommand(setCommand).addCommand(listCommand).addCommand(useCommand).addCommand(membersCommand).addCommand(inviteCommand).addCommand(removeCommand).addCommand(leaveCommand).addCommand(deleteCommand).addCommand(zeroOrgSecretCommand).addCommand(zeroOrgVariableCommand).addCommand(zeroOrgModelProviderCommand);
@@ -1435,24 +1238,20 @@ function hasAvatarUpdate(options) {
   return options.avatar !== void 0 || options.avatarRotation !== void 0 || options.avatarSkin !== void 0 || options.avatarHairStyle !== void 0 || options.avatarHairColor !== void 0 || options.avatarExpression !== void 0 || options.avatarIntensity !== void 0;
 }
 function hasAgentFieldUpdate(options) {
-  return options.displayName !== void 0 || options.description !== void 0 || options.sound !== void 0 || hasAvatarUpdate(options) || options.skills !== void 0 || options.addSkill !== void 0 || options.removeSkill !== void 0 || options.modelProvider !== void 0 || options.model !== void 0;
+  return options.displayName !== void 0 || options.description !== void 0 || options.sound !== void 0 || hasAvatarUpdate(options) || options.skills !== void 0 || options.addSkill !== void 0 || options.removeSkill !== void 0;
 }
 async function applyAgentUpdate(agentId, options) {
   const hasAvatar = hasAvatarUpdate(options);
   const resolvedAvatarUrl = hasAvatar ? resolveAvatarUrl(options) : void 0;
   const current = await getZeroAgent(agentId);
   const customSkills = resolveCustomSkills(options, current.customSkills ?? []);
-  const modelProviderId = options.modelProvider !== void 0 ? parseModelFlag(options.modelProvider) : current.modelProviderId;
-  const selectedModel = options.model !== void 0 ? parseModelFlag(options.model) : current.selectedModel;
   const avatarUrl = hasAvatar ? resolvedAvatarUrl : current.avatarUrl ?? void 0;
   await updateZeroAgent(agentId, {
     displayName: options.displayName !== void 0 ? options.displayName : current.displayName ?? void 0,
     description: options.description !== void 0 ? options.description : current.description ?? void 0,
     sound: options.sound !== void 0 ? options.sound : current.sound ?? void 0,
     avatarUrl,
-    customSkills,
-    modelProviderId,
-    selectedModel
+    customSkills
   });
 }
 function validateSkillName(name) {
@@ -1515,13 +1314,7 @@ var editCommand = new Command().name("edit").description("Edit a zero agent").ar
 ).option("--avatar-intensity <level>", "Intensity: chill | normal | hyped").option(
   "--skills <items>",
   "Comma-separated custom skill names to attach (replaces existing)"
-).option("--add-skill <name>", "Add a custom skill to the agent").option("--remove-skill <name>", "Remove a custom skill from the agent").option("--instructions-file <path>", "Path to new instructions file").option(
-  "--model-provider <id>",
-  "Model provider UUID, or 'default' to inherit org default"
-).option(
-  "--model <name>",
-  "Model name (e.g. claude-sonnet-4-6, MiniMax-M2.7), or 'default' to inherit provider default"
-).addHelpText(
+).option("--add-skill <name>", "Add a custom skill to the agent").option("--remove-skill <name>", "Remove a custom skill from the agent").option("--instructions-file <path>", "Path to new instructions file").addHelpText(
   "after",
   `
 Avatar:
@@ -1551,8 +1344,6 @@ Examples:
   Add a skill:             zero agent edit <agent-id> --add-skill my-skill
   Remove a skill:          zero agent edit <agent-id> --remove-skill my-skill
   Update instructions:     zero agent edit <agent-id> --instructions-file ./instructions.md
-  Set model:               zero agent edit <agent-id> --model-provider <provider-id> --model MiniMax-M2.7
-  Reset model:             zero agent edit <agent-id> --model-provider default --model default
   Update yourself:         zero agent edit $ZERO_AGENT_ID --description "new role"
 
 Notes:
@@ -1560,14 +1351,13 @@ Notes:
   - Unspecified fields are preserved (not cleared)
   - --skills replaces the entire skill list; --add-skill/--remove-skill modify incrementally
   - --skills cannot be combined with --add-skill or --remove-skill
-  - Use 'zero org model-provider list' to see available providers and models
   - To create or edit skill content, use: zero skill --help`
 ).action(
   withErrorHandler(async (agentId, options) => {
     const hasAgentUpdate = hasAgentFieldUpdate(options);
     if (!hasAgentUpdate && !options.instructionsFile) {
       throw new Error(
-        "At least one option is required (--display-name, --description, --sound, --avatar, --avatar-*, --skills, --add-skill, --remove-skill, --model-provider, --model, --instructions-file)"
+        "At least one option is required (--display-name, --description, --sound, --avatar, --avatar-*, --skills, --add-skill, --remove-skill, --instructions-file)"
       );
     }
     if (hasAgentUpdate) {
@@ -3426,12 +3216,18 @@ function sleep(ms) {
 }
 async function pollZeroEvents(runId, options) {
   const renderer = new EventRenderer({ verbose: options?.verbose });
+  const normalizer = new EventStreamNormalizer();
   let lastSequence = -1;
   let complete = false;
   let result = { succeeded: true, runId };
   let terminalRunResponse;
   let terminalSeenAt = 0;
   let lastTerminalProgressAt = 0;
+  const flushPendingEvents = () => {
+    for (const parsed of normalizer.flush()) {
+      renderer.render(parsed);
+    }
+  };
   while (!complete) {
     const eventsResponse = await getZeroRunAgentEvents(runId, {
       since: lastSequence,
@@ -3443,9 +3239,11 @@ async function pollZeroEvents(runId, options) {
       lastSequence
     );
     for (const event of contiguousEvents) {
-      const eventData = event.eventData;
-      const parsed = parseEvent(eventData, eventsResponse.framework);
-      if (parsed) {
+      const parsedEvents = normalizer.process(
+        event.eventData,
+        eventsResponse.framework
+      );
+      for (const parsed of parsedEvents) {
         renderer.render(parsed);
       }
     }
@@ -3473,6 +3271,7 @@ async function pollZeroEvents(runId, options) {
         lastTerminalProgressAt,
         blockedByGap
       )) {
+        flushPendingEvents();
         result = renderTerminalRunResult(runId, terminalRunResponse);
         complete = true;
       }
@@ -3947,12 +3746,6 @@ Deploying schedule for agent ${source_default.cyan(params.agentName)}...`
     prompt: params.prompt,
     ...params.existingEnabled !== void 0 && {
       enabled: params.existingEnabled
-    },
-    ...params.modelProviderId !== void 0 && {
-      modelProviderId: params.modelProviderId
-    },
-    ...params.selectedModel !== void 0 && {
-      selectedModel: params.selectedModel
     }
   });
   return deployResult;
@@ -4035,13 +3828,7 @@ async function handleScheduleEnabling(params) {
 var setupCommand2 = new Command().name("setup").description("Create or edit a schedule for a zero agent").argument("<agent-id>", "Agent ID").option("-n, --name <schedule-name>", 'Schedule name (default: "default")').option("-f, --frequency <type>", "Frequency: daily|weekly|monthly|once|loop").option("-t, --time <HH:MM>", "Time to run (24-hour format)").option("-d, --day <day>", "Day of week (mon-sun) or day of month (1-31)").option("-i, --interval <seconds>", "Interval in seconds for loop mode").option("-z, --timezone <tz>", "IANA timezone").option("-p, --prompt <text>", "Prompt to run").option(
   "--prompt-file <path>",
   "Read prompt from file (cannot be used with --prompt)"
-).option("-e, --enable", "Enable schedule immediately after creation").option(
-  "--model-provider <id>",
-  "Model provider UUID, or 'default' to inherit from agent/org"
-).option(
-  "--model <name>",
-  "Model name (e.g. claude-sonnet-4-6, MiniMax-M2.7), or 'default' to inherit"
-).addHelpText(
+).option("-e, --enable", "Enable schedule immediately after creation").addHelpText(
   "after",
   `
 Examples:
@@ -4052,14 +3839,10 @@ Examples:
   Loop every 5 minutes:  zero schedule setup <agent-id> -f loop -i 300 -p "poll for updates"
   Prompt from file:      zero schedule setup <agent-id> -f daily -t 09:00 --prompt-file ./prompt.md
   Create and enable:     zero schedule setup <agent-id> -f daily -t 09:00 -p "run report" --enable
-  Override model:        zero schedule setup <agent-id> -f daily -t 09:00 -p "..." --model-provider <id> --model MiniMax-M2.7
-  Reset model override:  zero schedule setup <agent-id> -f daily -t 09:00 -p "..." --model-provider default --model default
 
 Notes:
   - Re-running setup with the same agent updates the existing "default" schedule
   - Use -n to manage multiple named schedules for the same agent
-  - --model-provider and --model default to inheriting the agent's configuration
-  - Use 'zero org model-provider list' to see available providers and models
   - All flags are required in non-interactive mode; interactive mode prompts for missing values
   - If the user wants to be notified when a schedule completes, ask them where they want to receive the notification: web chat or Slack, then include it in the prompt`
 ).action(
@@ -4123,9 +3906,7 @@ Notes:
       intervalSeconds,
       timezone,
       prompt: promptText_,
-      existingEnabled: existingSchedule?.enabled,
-      modelProviderId: parseModelFlag(options.modelProvider),
-      selectedModel: parseModelFlag(options.model)
+      existingEnabled: existingSchedule?.enabled
     });
     displayDeployResult(scheduleName, deployResult);
     const shouldPromptEnable = deployResult.created || existingSchedule !== void 0 && !existingSchedule.enabled;
@@ -5963,11 +5744,13 @@ Examples:
 
 // src/commands/zero/logs/index.ts
 var PAGE_LIMIT = 100;
-function renderAgentEvent(event, renderer, framework) {
-  const eventData = event.eventData;
-  const parsed = parseEvent(eventData, framework);
-  if (parsed) {
-    parsed.timestamp = new Date(event.createdAt);
+function renderAgentEvent(event, renderer, normalizer, framework) {
+  const parsedEvents = normalizer.process(
+    event.eventData,
+    framework,
+    new Date(event.createdAt)
+  );
+  for (const parsed of parsedEvents) {
     renderer.render(parsed);
   }
 }
@@ -6012,9 +5795,13 @@ async function showAgentEvents(runId, options) {
     showTimestamp: true,
     verbose: true
   });
+  const normalizer = new EventStreamNormalizer();
   const framework = firstResponse.framework;
   for (const event of events) {
-    renderAgentEvent(event, renderer, framework);
+    renderAgentEvent(event, renderer, normalizer, framework);
+  }
+  for (const parsed of normalizer.flush()) {
+    renderer.render(parsed);
   }
 }
 var zeroLogsCommand = new Command().name("logs").description("View and search agent run logs").argument("[runId]", "Run ID to view agent events for").addCommand(listCommand12).addCommand(searchCommand2).option(
@@ -7648,7 +7435,7 @@ function registerZeroCommands(prog, commands) {
 var program = new Command();
 program.name("zero").description(
   "Zero CLI \u2014 interact with the zero platform from inside the sandbox"
-).version("9.148.0").addHelpText(
+).version("9.148.2").addHelpText(
   "after",
   `
 Examples: