@vm0/cli 9.9.2 → 9.11.0

package/index.js

@@ -1904,19 +1904,55 @@ var MODEL_PROVIDER_TYPES = {
     label: "Anthropic API Key",
     credentialLabel: "API key",
     helpText: "Get your API key at: https://console.anthropic.com/settings/keys"
+  },
+  "moonshot-api-key": {
+    framework: "claude-code",
+    credentialName: "MOONSHOT_API_KEY",
+    label: "Moonshot API Key (Kimi)",
+    credentialLabel: "API key",
+    helpText: "Get your API key at: https://platform.moonshot.ai/console/api-keys",
+    environmentMapping: {
+      ANTHROPIC_AUTH_TOKEN: "$credential",
+      ANTHROPIC_BASE_URL: "https://api.moonshot.ai/anthropic",
+      ANTHROPIC_MODEL: "$model",
+      ANTHROPIC_DEFAULT_OPUS_MODEL: "$model",
+      ANTHROPIC_DEFAULT_SONNET_MODEL: "$model",
+      ANTHROPIC_DEFAULT_HAIKU_MODEL: "$model",
+      CLAUDE_CODE_SUBAGENT_MODEL: "$model"
+    },
+    models: [
+      "kimi-k2.5",
+      "kimi-k2-thinking-turbo",
+      "kimi-k2-thinking"
+    ],
+    defaultModel: "kimi-k2.5"
   }
 };
 var modelProviderTypeSchema = z14.enum([
   "claude-code-oauth-token",
-  "anthropic-api-key"
+  "anthropic-api-key",
+  "moonshot-api-key"
 ]);
 var modelProviderFrameworkSchema = z14.enum(["claude-code", "codex"]);
+function getModels(type) {
+  const config = MODEL_PROVIDER_TYPES[type];
+  return "models" in config ? config.models : void 0;
+}
+function getDefaultModel(type) {
+  const config = MODEL_PROVIDER_TYPES[type];
+  return "defaultModel" in config ? config.defaultModel : void 0;
+}
+function hasModelSelection(type) {
+  const config = MODEL_PROVIDER_TYPES[type];
+  return "models" in config && config.models.length > 0;
+}
 var modelProviderResponseSchema = z14.object({
   id: z14.string().uuid(),
   type: modelProviderTypeSchema,
   framework: modelProviderFrameworkSchema,
   credentialName: z14.string(),
   isDefault: z14.boolean(),
+  selectedModel: z14.string().nullable(),
   createdAt: z14.string(),
   updatedAt: z14.string()
 });
@@ -1926,7 +1962,8 @@ var modelProviderListResponseSchema = z14.object({
 var upsertModelProviderRequestSchema = z14.object({
   type: modelProviderTypeSchema,
   credential: z14.string().min(1, "Credential is required"),
-  convert: z14.boolean().optional()
+  convert: z14.boolean().optional(),
+  selectedModel: z14.string().optional()
 });
 var upsertModelProviderResponseSchema = z14.object({
   provider: modelProviderResponseSchema,
@@ -6655,12 +6692,11 @@ function showNextSteps(result) {
 function handleGenericRunError(error, commandLabel) {
   if (error instanceof ApiRequestError && error.code === "concurrent_run_limit_exceeded") {
     console.error(chalk7.red(`\u2717 ${commandLabel} failed`));
-    console.error(chalk7.dim(`  ${error.message}`));
-    console.log();
-    console.log("  To view active runs:");
-    console.log(chalk7.cyan("    vm0 run list"));
-    console.log("  To cancel a run:");
-    console.log(chalk7.cyan("    vm0 run kill <run-id>"));
+    console.error(
+      chalk7.dim(
+        `  ${error.message} Use 'vm0 run list' to view runs, 'vm0 run kill <id>' to cancel.`
+      )
+    );
   } else {
     console.error(chalk7.red(`\u2717 ${commandLabel} failed`));
     console.error(chalk7.dim(`  ${error.message}`));
@@ -8465,7 +8501,7 @@ var cookAction = new Command27().name("cook").description("Quick start: prepare,
 ).option("-y, --yes", "Skip confirmation prompts").option("-v, --verbose", "Show full tool inputs and outputs").addOption(new Option4("--debug-no-mock-claude").hideHelp()).addOption(new Option4("--no-auto-update").hideHelp()).action(
   async (prompt, options) => {
     if (!options.noAutoUpdate) {
-      const shouldExit = await checkAndUpgrade("9.9.2", prompt);
+      const shouldExit = await checkAndUpgrade("9.11.0", prompt);
       if (shouldExit) {
         process.exit(0);
       }
@@ -10843,7 +10879,8 @@ var listCommand7 = new Command51().name("list").alias("ls").description("List al
       console.log(`  ${chalk50.cyan(framework)}:`);
       for (const provider of providers) {
         const defaultTag = provider.isDefault ? chalk50.green(" (default)") : "";
-        console.log(`    ${provider.type}${defaultTag}`);
+        const modelTag = provider.selectedModel ? chalk50.dim(` [${provider.selectedModel}]`) : "";
+        console.log(`    ${provider.type}${defaultTag}${modelTag}`);
         console.log(
           chalk50.dim(
             `      Updated: ${new Date(provider.updatedAt).toLocaleString()}`
@@ -10879,122 +10916,184 @@ var providerChoices = Object.entries(MODEL_PROVIDER_TYPES).map(
     value: type
   })
 );
+function validateProviderType(typeStr) {
+  if (!Object.keys(MODEL_PROVIDER_TYPES).includes(typeStr)) {
+    console.error(chalk51.red(`\u2717 Invalid type "${typeStr}"`));
+    console.log();
+    console.log("Valid types:");
+    for (const [t, config] of Object.entries(MODEL_PROVIDER_TYPES)) {
+      console.log(`  ${chalk51.cyan(t)} - ${config.label}`);
+    }
+    process.exit(1);
+  }
+  return typeStr;
+}
+function validateModel(type, modelStr) {
+  const models = getModels(type);
+  if (models && !models.includes(modelStr)) {
+    console.error(chalk51.red(`\u2717 Invalid model "${modelStr}"`));
+    console.log();
+    console.log("Valid models:");
+    for (const m of models) {
+      console.log(`  ${chalk51.cyan(m)}`);
+    }
+    process.exit(1);
+  }
+  return modelStr;
+}
+function handleNonInteractiveMode(options) {
+  const type = validateProviderType(options.type);
+  let selectedModel;
+  if (options.model) {
+    selectedModel = validateModel(type, options.model);
+  } else if (hasModelSelection(type)) {
+    selectedModel = getDefaultModel(type);
+  }
+  return { type, credential: options.credential, selectedModel };
+}
+async function promptForModelSelection(type) {
+  if (!hasModelSelection(type)) {
+    return void 0;
+  }
+  const models = getModels(type) ?? [];
+  const defaultModel = getDefaultModel(type);
+  const modelChoices = models.map((model) => ({
+    title: model === defaultModel ? `${model} (Recommended)` : model,
+    value: model
+  }));
+  const modelResponse = await prompts2(
+    {
+      type: "select",
+      name: "model",
+      message: "Select model:",
+      choices: modelChoices
+    },
+    { onCancel: () => process.exit(0) }
+  );
+  return modelResponse.model;
+}
+async function handleInteractiveMode() {
+  if (!isInteractive()) {
+    console.error(chalk51.red("\u2717 Interactive mode requires a TTY"));
+    console.log();
+    console.log("Use non-interactive mode:");
+    console.log(
+      chalk51.cyan(
+        '  vm0 model-provider setup --type <type> --credential "<value>"'
+      )
+    );
+    process.exit(1);
+  }
+  const typeResponse = await prompts2(
+    {
+      type: "select",
+      name: "type",
+      message: "Select provider type:",
+      choices: providerChoices
+    },
+    { onCancel: () => process.exit(0) }
+  );
+  const type = typeResponse.type;
+  const checkResult = await checkModelProviderCredential(type);
+  if (checkResult.exists && checkResult.currentType === "user") {
+    const convertResponse = await prompts2(
+      {
+        type: "confirm",
+        name: "convert",
+        message: `Credential "${checkResult.credentialName}" already exists. Convert to model provider?`,
+        initial: true
+      },
+      { onCancel: () => process.exit(0) }
+    );
+    if (convertResponse.convert) {
+      const provider = await convertModelProviderCredential(type);
+      const defaultNote = provider.isDefault ? ` (default for ${provider.framework})` : "";
+      console.log(
+        chalk51.green(
+          `\u2713 Converted "${checkResult.credentialName}" to model provider${defaultNote}`
+        )
+      );
+      return null;
+    }
+    console.log(chalk51.dim("Aborted"));
+    process.exit(0);
+  }
+  const config = MODEL_PROVIDER_TYPES[type];
+  console.log();
+  console.log(chalk51.dim(config.helpText));
+  console.log();
+  const credentialResponse = await prompts2(
+    {
+      type: "password",
+      name: "credential",
+      message: `Enter your ${config.credentialLabel}:`,
+      validate: (value) => value.length > 0 || `${config.credentialLabel} is required`
+    },
+    { onCancel: () => process.exit(0) }
+  );
+  const credential = credentialResponse.credential;
+  const selectedModel = await promptForModelSelection(type);
+  return { type, credential, selectedModel };
+}
+function handleSetupError2(error) {
+  if (error instanceof Error) {
+    if (error.message.includes("already exists")) {
+      console.error(chalk51.red(`\u2717 ${error.message}`));
+      console.log();
+      console.log("To convert the existing credential, run:");
+      console.log(chalk51.cyan("  vm0 model-provider setup --convert"));
+    } else if (error.message.includes("Not authenticated")) {
+      console.error(chalk51.red("\u2717 Not authenticated. Run: vm0 auth login"));
+    } else {
+      console.error(chalk51.red(`\u2717 ${error.message}`));
+    }
+  } else {
+    console.error(chalk51.red("\u2717 An unexpected error occurred"));
+  }
+  process.exit(1);
+}
 var setupCommand2 = new Command52().name("setup").description("Configure a model provider").option("-t, --type <type>", "Provider type (for non-interactive mode)").option(
   "-c, --credential <credential>",
   "Credential value (for non-interactive mode)"
-).option("--convert", "Convert existing user credential to model provider").action(
+).option("-m, --model <model>", "Model selection (for non-interactive mode)").option("--convert", "Convert existing user credential to model provider").action(
   async (options) => {
     try {
-      let type;
-      let credential;
+      let input;
       const shouldConvert = options.convert ?? false;
       if (options.type && options.credential) {
-        if (!Object.keys(MODEL_PROVIDER_TYPES).includes(options.type)) {
-          console.error(chalk51.red(`\u2717 Invalid type "${options.type}"`));
-          console.log();
-          console.log("Valid types:");
-          for (const [t, config] of Object.entries(MODEL_PROVIDER_TYPES)) {
-            console.log(`  ${chalk51.cyan(t)} - ${config.label}`);
-          }
-          process.exit(1);
-        }
-        type = options.type;
-        credential = options.credential;
+        input = handleNonInteractiveMode({
+          type: options.type,
+          credential: options.credential,
+          model: options.model
+        });
       } else if (options.type || options.credential) {
         console.error(
           chalk51.red("\u2717 Both --type and --credential are required")
         );
         process.exit(1);
       } else {
-        if (!isInteractive()) {
-          console.error(chalk51.red("\u2717 Interactive mode requires a TTY"));
-          console.log();
-          console.log("Use non-interactive mode:");
-          console.log(
-            chalk51.cyan(
-              '  vm0 model-provider setup --type <type> --credential "<value>"'
-            )
-          );
-          process.exit(1);
-        }
-        const typeResponse = await prompts2(
-          {
-            type: "select",
-            name: "type",
-            message: "Select provider type:",
-            choices: providerChoices
-          },
-          { onCancel: () => process.exit(0) }
-        );
-        type = typeResponse.type;
-        const checkResult = await checkModelProviderCredential(type);
-        if (checkResult.exists && checkResult.currentType === "user") {
-          const convertResponse = await prompts2(
-            {
-              type: "confirm",
-              name: "convert",
-              message: `Credential "${checkResult.credentialName}" already exists. Convert to model provider?`,
-              initial: true
-            },
-            { onCancel: () => process.exit(0) }
-          );
-          if (convertResponse.convert) {
-            const provider2 = await convertModelProviderCredential(type);
-            const defaultNote2 = provider2.isDefault ? ` (default for ${provider2.framework})` : "";
-            console.log(
-              chalk51.green(
-                `\u2713 Converted "${checkResult.credentialName}" to model provider${defaultNote2}`
-              )
-            );
-            return;
-          } else {
-            console.log(chalk51.dim("Aborted"));
-            process.exit(0);
-          }
+        const result = await handleInteractiveMode();
+        if (result === null) {
+          return;
         }
-        const config = MODEL_PROVIDER_TYPES[type];
-        console.log();
-        console.log(chalk51.dim(config.helpText));
-        console.log();
-        const credentialResponse = await prompts2(
-          {
-            type: "password",
-            name: "credential",
-            message: `Enter your ${config.credentialLabel}:`,
-            validate: (value) => value.length > 0 || `${config.credentialLabel} is required`
-          },
-          { onCancel: () => process.exit(0) }
-        );
-        credential = credentialResponse.credential;
+        input = result;
       }
       const { provider, created } = await upsertModelProvider({
-        type,
-        credential,
-        convert: shouldConvert
+        type: input.type,
+        credential: input.credential,
+        convert: shouldConvert,
+        selectedModel: input.selectedModel
       });
       const action = created ? "created" : "updated";
       const defaultNote = provider.isDefault ? ` (default for ${provider.framework})` : "";
+      const modelNote = provider.selectedModel ? ` with model: ${provider.selectedModel}` : "";
       console.log(
-        chalk51.green(`\u2713 Model provider "${type}" ${action}${defaultNote}`)
+        chalk51.green(
+          `\u2713 Model provider "${input.type}" ${action}${defaultNote}${modelNote}`
+        )
       );
     } catch (error) {
-      if (error instanceof Error) {
-        if (error.message.includes("already exists")) {
-          console.error(chalk51.red(`\u2717 ${error.message}`));
-          console.log();
-          console.log("To convert the existing credential, run:");
-          console.log(chalk51.cyan("  vm0 model-provider setup --convert"));
-        } else if (error.message.includes("Not authenticated")) {
-          console.error(
-            chalk51.red("\u2717 Not authenticated. Run: vm0 auth login")
-          );
-        } else {
-          console.error(chalk51.red(`\u2717 ${error.message}`));
-        }
-      } else {
-        console.error(chalk51.red("\u2717 An unexpected error occurred"));
-      }
-      process.exit(1);
+      handleSetupError2(error);
     }
   }
 );
@@ -11300,7 +11399,9 @@ function getProviderChoices() {
       type,
       label: MODEL_PROVIDER_TYPES[type].label,
       helpText: MODEL_PROVIDER_TYPES[type].helpText,
-      credentialLabel: MODEL_PROVIDER_TYPES[type].credentialLabel
+      credentialLabel: MODEL_PROVIDER_TYPES[type].credentialLabel,
+      models: getModels(type),
+      defaultModel: getDefaultModel(type)
     })
   );
 }
@@ -11308,7 +11409,8 @@ async function setupModelProvider(type, credential, options) {
   const response = await upsertModelProvider({
     type,
     credential,
-    convert: options?.convert
+    convert: options?.convert,
+    selectedModel: options?.selectedModel
   });
   return {
     provider: response.provider,
@@ -11397,10 +11499,27 @@ async function addMarketplace() {
     );
   }
 }
+async function updateMarketplace() {
+  const result = await runClaudeCommand([
+    "plugin",
+    "marketplace",
+    "update",
+    MARKETPLACE_NAME
+  ]);
+  if (!result.success) {
+    console.warn(
+      chalk56.yellow(
+        `Warning: Could not update marketplace: ${result.error ?? "unknown error"}`
+      )
+    );
+  }
+}
 async function ensureMarketplace() {
   const installed = await isMarketplaceInstalled();
   if (!installed) {
     await addMarketplace();
+  } else {
+    await updateMarketplace();
   }
 }
 async function installVm0Plugin(scope = "user", cwd) {
@@ -11491,10 +11610,29 @@ async function handleModelProvider(ctx) {
       console.log(chalk57.dim("Cancelled"));
       process.exit(0);
     }
-    const result = await setupModelProvider(providerType, credential);
+    let selectedModel;
+    if (selectedChoice?.models && selectedChoice.models.length > 0) {
+      selectedModel = await step.prompt(
+        () => promptSelect(
+          "Select model:",
+          selectedChoice.models.map((model) => ({
+            title: model === selectedChoice.defaultModel ? `${model} (Recommended)` : model,
+            value: model
+          }))
+        )
+      );
+      if (!selectedModel) {
+        console.log(chalk57.dim("Cancelled"));
+        process.exit(0);
+      }
+    }
+    const result = await setupModelProvider(providerType, credential, {
+      selectedModel
+    });
+    const modelNote = result.provider.selectedModel ? ` with model: ${result.provider.selectedModel}` : "";
     step.detail(
       chalk57.green(
-        `${providerType} ${result.created ? "created" : "updated"}${result.isDefault ? ` (default for ${result.framework})` : ""}`
+        `${providerType} ${result.created ? "created" : "updated"}${result.isDefault ? ` (default for ${result.framework})` : ""}${modelNote}`
       )
     );
   });
@@ -11642,7 +11780,7 @@ var setupClaudeCommand = new Command57().name("setup-claude").description("Insta
 
 // src/index.ts
 var program = new Command58();
-program.name("vm0").description("VM0 CLI - Build and run agents with natural language").version("9.9.2");
+program.name("vm0").description("VM0 CLI - Build and run agents with natural language").version("9.11.0");
 program.addCommand(authCommand);
 program.addCommand(infoCommand);
 program.addCommand(composeCommand);

package/package.json

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