@iola_adm/iola-cli 0.1.67 → 0.1.69

package/package.json

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

package/src/cli.js

@@ -1296,8 +1296,9 @@ function renderAgentInput(state) {
   clearAgentInputArea(state);
   const prompt = "> ";
   const lines = state.buffer.split("\n");
-  const inputLines = [`${prompt}${lines[0] || ""}`, ...lines.slice(1).map((line) => `      ${line}`)];
-  const cwdLine = colorMuted(`  ${buildAgentStatusLine(state)}`);
+  const inputLines = [`${prompt}${lines[0] || ""}`, ...lines.slice(1)];
+  const statusLine = truncateTerminalLine(`  ${buildAgentStatusLine(state)}`);
+  const cwdLine = colorMuted(statusLine);
   const menuLines = [];
   if (state.slashOpen) {
     const matches = currentSlashMatches(state);
@@ -1311,11 +1312,11 @@ function renderAgentInput(state) {
         const absoluteIndex = offset + index;
         const selected = absoluteIndex === state.selected;
         const marker = selected ? ">" : " ";
-        const row = `${marker} ${visibleMatches[index].command.padEnd(24)} ${visibleMatches[index].description}`;
+        const row = truncateTerminalLine(`${marker} ${visibleMatches[index].command.padEnd(24)} ${visibleMatches[index].description}`);
         menuLines.push(selected ? colorSlashSelection(row) : `  ${row.slice(2)}`);
       }
       const shownTo = Math.min(offset + visibleLimit, matches.length);
-      menuLines.push(`  ↑/↓ выбрать • Enter выполнить • Esc закрыть • ${offset + 1}-${shownTo} из ${matches.length}`);
+      menuLines.push(truncateTerminalLine(`  ↑/↓ выбрать • Enter выполнить • Esc закрыть • ${offset + 1}-${shownTo} из ${matches.length}`));
     }
   }
 
@@ -1458,6 +1459,13 @@ function buildAgentStatusLine(state) {
   return `${cwd}  |  AI: ${kind}${model} (${ai.name})`;
 }
 
+function truncateTerminalLine(value) {
+  const columns = Math.max(20, Number(output.columns || 100));
+  const text = String(value).replace(/\r?\n/g, " ");
+  if (visibleLength(text) <= columns) return text;
+  return `${text.slice(0, Math.max(0, columns - 1))}…`;
+}
+
 function compactAgentHistory(history) {
   if (history.length <= 8) return history;
   const summary = history.slice(0, -6)
@@ -4077,18 +4085,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 +4143,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 +4468,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 +4497,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 });