@iola_adm/iola-cli 0.1.56 → 0.1.58

package/package.json

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

package/src/cli.js

@@ -794,10 +794,8 @@ async function startAgentReadline() {
 
 async function startAgentRawInput() {
   const state = { history: [], buffer: "", selected: 0, slashOpen: false, running: false, renderedInputLines: 0, rawMode: true, pendingOutput: "" };
-  emitKeypressEvents(input);
   const wasRaw = input.isRaw;
-  input.setRawMode(true);
-  input.resume();
+  activateRawInput(input);
 
   const render = () => renderAgentInput(state);
   render();
@@ -848,13 +846,16 @@ async function startAgentRawInput() {
         }
         output.write(`> ${line}\n`);
         const stopActivity = line.startsWith("/") ? () => {} : startActivityIndicator("работаю");
+        const restoreRawInput = line.startsWith("/") ? suspendRawInputForCommand(input) : () => {};
         try {
           const shouldExit = await handleAgentLine(line, state);
           stopActivity();
           flushPendingAgentOutput(state);
+          if (!shouldExit) restoreRawInput();
           if (shouldExit) break;
         } catch (error) {
           stopActivity();
+          restoreRawInput();
           console.error(error instanceof Error ? error.message : String(error));
         }
         render();
@@ -1370,6 +1371,22 @@ function startActivityIndicator(label = "работаю") {
   };
 }
 
+function suspendRawInputForCommand(stream) {
+  if (!stream.isTTY || !stream.isRaw) return () => {};
+  stream.setRawMode(false);
+  stream.pause();
+  return () => {
+    activateRawInput(stream);
+  };
+}
+
+function activateRawInput(stream) {
+  if (!stream.isTTY) return;
+  emitKeypressEvents(stream);
+  stream.setRawMode(true);
+  stream.resume();
+}
+
 function flushPendingAgentOutput(state) {
   const text = state.pendingOutput;
   state.pendingOutput = "";
@@ -5886,27 +5903,29 @@ async function setupOllama(args) {
   const diagnostics = await getLocalDiagnostics();
   const recommendation = recommendOllamaModel(diagnostics);
   const model = options.model || recommendation.model;
+  const ollamaCommand = await resolveOllamaCommand();
 
   printDiagnostics(diagnostics, { ...recommendation, model });
 
-  if (!diagnostics.ollama.installed) {
+  if (!ollamaCommand) {
     console.log("");
-    console.log("Ollama не найден. Установите Ollama, затем повторите команду:");
-    console.log("  iola ai setup ollama");
+    console.log("Ollama не найден или команда пока недоступна в текущем терминале.");
+    console.log("Если Ollama только что установлена, откройте новый PowerShell или повторите после обновления PATH:");
+    console.log("  iola master");
     console.log("");
     console.log("Windows:");
-    console.log("  winget install Ollama.Ollama");
+    console.log("  $env:Path += ';' + \"$env:LOCALAPPDATA\\Programs\\Ollama\"");
     console.log("macOS:");
-    console.log("  brew install --cask ollama");
+    console.log("  перезапустите терминал после brew install --cask ollama");
     console.log("Linux:");
-    console.log("  curl -fsSL https://ollama.com/install.sh | sh");
+    console.log("  проверьте /usr/local/bin/ollama");
     return;
   }
 
   const shouldInstall = options.yes || (await confirm(`Установить модель ${model} через "ollama pull ${model}"? [Y/n] `));
 
   if (shouldInstall) {
-    await runCommand("ollama", ["pull", model], { inherit: true });
+    await runCommand(ollamaCommand, ["pull", model], { inherit: true });
   }
 
   const config = await loadConfig();
@@ -6964,8 +6983,8 @@ async function onboard(args = []) {
     else await installBrowserRuntime();
   }
   if (components.includes("gosuslugi")) {
-    await handleGosuslugi(["terms"]);
     if (process.stdin.isTTY) await handleGosuslugi(["consent"]);
+    else await handleGosuslugi(["terms"]);
     console.log("Параметры подключения можно указать командой: iola gosuslugi configure --auth-url URL --token-url URL --client-id ID --scope openid");
   }
   if (components.includes("index")) {
@@ -7329,14 +7348,38 @@ async function getWindowsGpu() {
 }
 
 async function getOllamaVersion() {
+  const command = await resolveOllamaCommand();
+  if (!command) return null;
   try {
-    const { stdout } = await runCommand("ollama", ["--version"]);
+    const { stdout } = await runCommand(command, ["--version"]);
     return stdout.trim();
   } catch {
     return null;
   }
 }
 
+async function resolveOllamaCommand() {
+  const candidates = ["ollama"];
+  if (process.platform === "win32") {
+    candidates.push(
+      path.join(os.homedir(), "AppData", "Local", "Programs", "Ollama", "ollama.exe"),
+      path.join(process.env.LOCALAPPDATA || "", "Programs", "Ollama", "ollama.exe"),
+    );
+  } else {
+    candidates.push("/usr/local/bin/ollama", "/opt/homebrew/bin/ollama", "/usr/bin/ollama");
+  }
+  for (const command of [...new Set(candidates.filter(Boolean))]) {
+    try {
+      if (command !== "ollama" && !existsSync(command)) continue;
+      await runCommand(command, ["--version"]);
+      return command;
+    } catch {
+      // Try next candidate.
+    }
+  }
+  return null;
+}
+
 async function getCommandVersion(command, args) {
   try {
     const { stdout } = await runCommand(command, args);
@@ -7406,6 +7449,9 @@ async function installOllamaIfMissing() {
     return;
   }
   await runCommand("sh", ["-c", "curl -fsSL https://ollama.com/install.sh | sh"], { inherit: true });
+  if (!(await getOllamaVersion())) {
+    console.log("Ollama установлен, но текущий терминал может еще не видеть команду. CLI попробует стандартный путь установки.");
+  }
 }
 
 async function installCodexIfMissing() {