@iola_adm/iola-cli 0.1.108 → 0.1.110

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iola_adm/iola-cli",
-  "version": "0.1.108",
+  "version": "0.1.110",
   "description": "CLI и AI-агент городского округа Йошкар-Ола.",
   "license": "MIT",
   "homepage": "https://github.com/adm-iola/iola-cli#readme",

package/src/cli.js

@@ -101,6 +101,19 @@ const FEATURES = {
   "mcp-management": { stage: "stable", defaultEnabled: true, description: "Команды управления MCP-интеграциями." },
   "web-search": { stage: "experimental", defaultEnabled: false, description: "Резерв под web-search режимы AI." },
 };
+const MAIN_OPENROUTER_DEVELOPERS = [
+  ["openai", "OpenAI"],
+  ["anthropic", "Anthropic"],
+  ["google", "Google"],
+  ["qwen", "Qwen / Alibaba"],
+  ["deepseek", "DeepSeek"],
+  ["meta-llama", "Meta / Llama"],
+  ["mistralai", "Mistral AI"],
+  ["x-ai", "xAI"],
+  ["cohere", "Cohere"],
+  ["microsoft", "Microsoft"],
+  ["perplexity", "Perplexity"],
+];
 const SKILL_BUNDLES = {
   analyst: {
     description: "Аналитик открытых данных: поиск, карточки, отчеты и память.",
@@ -4288,6 +4301,7 @@ async function aiModels(args) {
   printTable(filtered, [
     ["id", "Модель"],
     ["provider", "Провайдер"],
+    ["releaseDate", "Дата"],
     ["note", "Примечание"],
   ]);
 }
@@ -4361,11 +4375,7 @@ async function listAiModels(provider) {
     if (apiKey && getAiNetworkMode(relayConfig) === "gateway") {
       const payload = await callAiRelayModels(relayConfig, apiKey, "OpenRouter");
       return (payload.data || [])
-        .map((model) => ({
-          id: model.id,
-          provider: "openrouter",
-          note: model.name || "",
-        }))
+        .map(mapOpenRouterModel)
         .sort((left, right) => left.id.localeCompare(right.id));
     }
     const response = await fetch("https://openrouter.ai/api/v1/models", {
@@ -4378,11 +4388,7 @@ async function listAiModels(provider) {
 
     const payload = await response.json();
     return (payload.data || [])
-      .map((model) => ({
-        id: model.id,
-        provider: "openrouter",
-        note: model.name || "",
-      }))
+      .map(mapOpenRouterModel)
       .sort((left, right) => left.id.localeCompare(right.id));
   }
 
@@ -4405,6 +4411,77 @@ async function getApiProviderNetworkConfig(provider) {
   };
 }
 
+function mapOpenRouterModel(model) {
+  const id = String(model.id || "");
+  const architecture = model.architecture || {};
+  const created = Number(model.created || 0);
+  const developer = id.includes("/") ? id.split("/")[0] : "";
+  return {
+    id,
+    provider: "openrouter",
+    note: model.name || "",
+    developer,
+    created,
+    releaseDate: formatUnixDate(created),
+    modality: architecture.modality || "",
+    inputModalities: Array.isArray(architecture.input_modalities) ? architecture.input_modalities : [],
+    outputModalities: Array.isArray(architecture.output_modalities) ? architecture.output_modalities : [],
+    contextLength: Number(model.context_length || model.top_provider?.context_length || 0),
+  };
+}
+
+function isOpenRouterTextGenerationModel(model) {
+  const inputs = model.inputModalities || [];
+  const outputs = model.outputModalities || [];
+  if (inputs.length > 0 && !inputs.includes("text")) return false;
+  if (outputs.length > 0 && !outputs.includes("text")) return false;
+  if (outputs.includes("image") || outputs.includes("audio") || outputs.includes("video")) return false;
+  const id = String(model.id || "").toLocaleLowerCase("en-US");
+  const note = String(model.note || "").toLocaleLowerCase("en-US");
+  return !/\b(image|video|audio|tts|embed|embedding|rerank|moderation|safeguard)\b/.test(`${id} ${note}`);
+}
+
+function buildOpenRouterDeveloperChoices(models) {
+  const byDeveloper = new Map();
+  for (const model of models) {
+    if (!model.developer) continue;
+    const current = byDeveloper.get(model.developer) || { count: 0 };
+    current.count += 1;
+    byDeveloper.set(model.developer, current);
+  }
+
+  return MAIN_OPENROUTER_DEVELOPERS
+    .map(([id, label]) => {
+      const stat = byDeveloper.get(id);
+      if (!stat) return null;
+      return {
+        id,
+        label,
+        count: stat.count,
+      };
+    })
+    .filter(Boolean);
+}
+
+function sortModelsByFreshness(left, right) {
+  return Number(right.created || 0) - Number(left.created || 0)
+    || String(left.id).localeCompare(String(right.id));
+}
+
+function formatUnixDate(value) {
+  const seconds = Number(value || 0);
+  if (!seconds) return "";
+  return new Date(seconds * 1000).toISOString().slice(0, 10);
+}
+
+function formatCompactNumber(value) {
+  const number = Number(value || 0);
+  if (!number) return "";
+  if (number >= 1_000_000) return `${Math.round(number / 100_000) / 10}M`;
+  if (number >= 1_000) return `${Math.round(number / 100) / 10}K`;
+  return String(number);
+}
+
 function getRecommendedOllamaModels(notePrefix = "recommended") {
   return [
     { id: IOLA_LOCAL_OLLAMA_MODEL, provider: "ollama", note: `${notePrefix} IOLA default low RAM` },
@@ -4711,8 +4788,12 @@ async function getDefaultApiProviderForModelSwitch() {
 }
 
 async function chooseAiModel(provider) {
+  if (provider === "openrouter") {
+    return chooseOpenRouterModel();
+  }
+
   let search = "";
-  if (provider === "openrouter" || provider === "openai") {
+  if (provider === "openai") {
     search = (await askText("Фильтр моделей (Enter - без фильтра): ")).trim();
   }
 
@@ -4747,6 +4828,58 @@ async function chooseAiModel(provider) {
   return filtered[answer - 1]?.id || "";
 }
 
+async function chooseOpenRouterModel() {
+  let models;
+  try {
+    models = await listAiModels("openrouter");
+  } catch (error) {
+    console.log(error instanceof Error ? error.message : String(error));
+    return "";
+  }
+
+  const textModels = models.filter(isOpenRouterTextGenerationModel);
+  if (textModels.length === 0) {
+    console.log("Текстовые модели OpenRouter не найдены.");
+    return "";
+  }
+
+  while (true) {
+    const developerChoices = buildOpenRouterDeveloperChoices(textModels);
+    console.log("Выберите разработчика моделей OpenRouter:");
+    developerChoices.forEach((choice, index) => {
+      console.log(`  ${index + 1}. ${choice.label} (${choice.count})`);
+    });
+    console.log("  0. Отмена");
+
+    const developerAnswer = Number(await askText("Номер: "));
+    if (!developerAnswer) return "";
+
+    const selectedDeveloper = developerChoices[developerAnswer - 1];
+    if (!selectedDeveloper) continue;
+    const filtered = textModels
+      .filter((model) => model.developer === selectedDeveloper.id)
+      .sort(sortModelsByFreshness)
+      .slice(0, 30);
+
+    if (filtered.length === 0) {
+      console.log("Модели не найдены.");
+      continue;
+    }
+
+    console.log("Выберите текстовую модель:");
+    filtered.forEach((model, index) => {
+      const date = model.releaseDate || "дата неизвестна";
+      const context = model.contextLength ? `, ctx ${formatCompactNumber(model.contextLength)}` : "";
+      console.log(`  ${index + 1}. ${model.id} (${date}${context}) - ${model.note || model.id}`);
+    });
+    console.log("  0. Назад");
+
+    const modelAnswer = Number(await askText("Номер: "));
+    if (!modelAnswer) continue;
+    return filtered[modelAnswer - 1]?.id || "";
+  }
+}
+
 async function chooseAndSaveApiModel(provider) {
   const model = await chooseAiModel(provider);
   if (!model) {

package/test/smoke-test.js

@@ -47,6 +47,9 @@ assertIncludes(help, "iola master", "help");
 assertIncludes(help, "iola ask", "help");
 
 assertIncludes(cliSource, "force: Boolean(options.force)", "IOLA setup should not force model reinstall by default");
+assertIncludes(cliSource, "MAIN_OPENROUTER_DEVELOPERS", "OpenRouter model selection should group models by developer");
+assertIncludes(cliSource, "isOpenRouterTextGenerationModel", "OpenRouter model selection should prefer text-generation models");
+assertIncludes(cliSource, "console.log(\"  0. Назад\")", "OpenRouter model selection should return to developer menu");
 
 const commands = await runCli(["commands"]);
 assertIncludes(commands, "iola browser status|install|open|text|html|screenshot|pdf|click|type|eval", "commands");