@iola_adm/iola-cli 0.1.66 → 0.1.68

package/package.json

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

package/src/cli.js

@@ -4077,18 +4077,14 @@ async function listAiModels(provider) {
       }
 
       const payload = await response.json();
-      return (payload.models || []).map((model) => ({
+      const models = (payload.models || []).map((model) => ({
         id: model.name,
         provider: "ollama",
         note: model.modified_at ? `updated ${model.modified_at}` : "local",
       }));
+      return models.length > 0 ? models : getRecommendedOllamaModels("not installed");
     } catch {
-      return [
-        { id: "llama3.2:1b", provider: "ollama", note: "recommended low RAM" },
-        { id: "llama3.2:3b", provider: "ollama", note: "recommended standard" },
-        { id: "qwen3:4b", provider: "ollama", note: "recommended balanced" },
-        { id: "qwen3:8b", provider: "ollama", note: "recommended good GPU" },
-      ];
+      return getRecommendedOllamaModels("recommended");
     }
   }
 
@@ -4139,6 +4135,15 @@ async function listAiModels(provider) {
   ];
 }
 
+function getRecommendedOllamaModels(notePrefix = "recommended") {
+  return [
+    { id: "llama3.2:1b", provider: "ollama", note: `${notePrefix} low RAM` },
+    { id: "llama3.2:3b", provider: "ollama", note: `${notePrefix} standard` },
+    { id: "qwen3:4b", provider: "ollama", note: `${notePrefix} balanced` },
+    { id: "qwen3:8b", provider: "ollama", note: `${notePrefix} good GPU` },
+  ];
+}
+
 async function printAiProfiles() {
   const config = await loadConfig();
   const active = getActiveProfileName(config);
@@ -4455,6 +4460,10 @@ async function chooseAiModel(provider) {
 async function switchModelTarget(target, model) {
   const config = await loadConfig();
   const provider = target === "local" ? "ollama" : target;
+  if (provider === "ollama") {
+    const ready = await ensureOllamaModelAvailable(model, config);
+    if (!ready) return;
+  }
   const profileName = provider === "ollama" ? "local" : provider;
   const currentProfile = config.ai.profiles?.[profileName] || buildProfileFromOptions(provider, { model });
   const profile = {
@@ -4480,6 +4489,38 @@ async function switchModelTarget(target, model) {
   console.log(`Активная модель: ${profileName} (${provider}, ${model})`);
 }
 
+async function ensureOllamaModelAvailable(model, config = null) {
+  if (await isOllamaModelInstalled(model, config)) return true;
+
+  const command = await resolveOllamaCommand();
+  if (!command) {
+    console.log("Ollama CLI не найден в PATH, хотя локальный API может отвечать.");
+    console.log("Откройте новый PowerShell или запустите мастер: iola ai setup ollama");
+    return false;
+  }
+
+  const shouldInstall = await confirm(`Локальная модель ${model} не скачана. Скачать через "ollama pull ${model}"? [Y/n] `);
+  if (!shouldInstall) {
+    console.log("Переключение на локальную модель отменено.");
+    return false;
+  }
+
+  await runCommand(command, ["pull", model], { inherit: true });
+  return true;
+}
+
+async function isOllamaModelInstalled(model, loadedConfig = null) {
+  try {
+    const config = loadedConfig || await loadConfig();
+    const response = await fetch(`${config.ai.profiles?.local?.baseUrl || "http://127.0.0.1:11434"}/api/tags`);
+    if (!response.ok) return false;
+    const payload = await response.json();
+    return (payload.models || []).some((entry) => entry.name === model);
+  } catch {
+    return false;
+  }
+}
+
 async function askText(question) {
   if (!process.stdin.isTTY) return "";
   const rl = readline.createInterface({ input, output });
@@ -8771,7 +8812,8 @@ async function saveConfig(value) {
 }
 
 async function writeConfig(value) {
-  const errors = validateConfig(value);
+  const sanitized = sanitizeConfig(value);
+  const errors = validateConfig(sanitized);
   if (errors.length > 0) {
     throw new Error(`Конфигурация не сохранена: ${errors.join("; ")}`);
   }
@@ -8779,7 +8821,7 @@ async function writeConfig(value) {
   if (existsSync(CONFIG_FILE)) {
     await copyFile(CONFIG_FILE, LAST_GOOD_CONFIG_FILE).catch(() => {});
   }
-  await writeFile(CONFIG_FILE, `${JSON.stringify(value, null, 2)}\n`, "utf8");
+  await writeFile(CONFIG_FILE, `${JSON.stringify(sanitized, null, 2)}\n`, "utf8");
 }
 
 async function loadConfig() {
@@ -8788,7 +8830,7 @@ async function loadConfig() {
     const value = await readConfigLayer(layer);
     if (value) config = mergeConfig(config, value);
   }
-  return config;
+  return sanitizeConfig(config);
 }
 
 async function loadConfigLayers() {
@@ -8805,7 +8847,7 @@ async function loadConfigLayers() {
       continue;
     }
     const value = await readConfigLayer(layer.file);
-    rows.push({ ...layer, exists: Boolean(value), value, errors: value ? validateConfig(mergeConfig(DEFAULT_AI_CONFIG, value)) : [] });
+    rows.push({ ...layer, exists: Boolean(value), value, errors: value ? validateConfig(sanitizeConfig(mergeConfig(DEFAULT_AI_CONFIG, value))) : [] });
   }
   rows.push({ scope: "runtime", file: "process.env", exists: true, value: { IOLA_API_BASE_URL: process.env.IOLA_API_BASE_URL || "", IOLA_MCP_BASE_URL: process.env.IOLA_MCP_BASE_URL || "" }, errors: [] });
   return rows;
@@ -8900,6 +8942,18 @@ function mergeConfig(base, override) {
   };
 }
 
+function sanitizeConfig(config) {
+  const next = JSON.parse(JSON.stringify(config || {}));
+  if (next.permissions?.localTools && typeof next.permissions.localTools === "object") {
+    for (const tool of Object.keys(next.permissions.localTools)) {
+      if (!ALL_TOOL_ALIASES.includes(tool)) {
+        delete next.permissions.localTools[tool];
+      }
+    }
+  }
+  return next;
+}
+
 function validateConfig(config) {
   const errors = [];
   if (!config || typeof config !== "object") errors.push("config must be object");