@iola_adm/iola-cli 0.1.40 → 0.1.42

package/package.json

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

package/src/cli.js

@@ -120,6 +120,7 @@ const SKILL_BUNDLES = {
     requirements: ["Ollama", "локальная модель"],
   },
 };
+let onboardRanThisProcess = false;
 const DEFAULT_AI_CONFIG = {
   api: {
     baseUrl: "https://apiiola.yasg.ru/api/v1",
@@ -622,6 +623,7 @@ async function runDefaultCli() {
 
 async function startAgent() {
   await showBanner();
+  await ensureAgentAiReady();
   console.log("Интерактивный режим. Введите /help для списка команд, /exit для выхода.");
   await runHooks("SessionStart", { mode: "agent" });
 
@@ -635,6 +637,73 @@ async function startAgent() {
   await runHooks("SessionEnd", { mode: "agent" });
 }
 
+async function ensureAgentAiReady() {
+  const readiness = await getAiReadiness();
+  if (readiness.ready) return readiness;
+
+  if (!input.isTTY || !output.isTTY) {
+    console.log("AI-провайдер не настроен. Для настройки запустите: iola wizard");
+    return readiness;
+  }
+
+  if (onboardRanThisProcess) {
+    console.log("AI-провайдер пока не настроен. Агент откроется, но AI-запросы потребуют настройки.");
+    console.log("Повторно открыть мастер можно командой: /wizard");
+    return readiness;
+  }
+
+  console.log("AI-провайдер не настроен: нет локальной модели Ollama, API-ключей OpenAI/OpenRouter и авторизации Codex.");
+  console.log("Сейчас откроется мастер настройки. Уже существующие настройки не будут сброшены.");
+  console.log("");
+  await onboard([]);
+
+  const updated = await getAiReadiness();
+  if (!updated.ready) {
+    console.log("");
+    console.log("AI-провайдер пока не настроен. Агент откроется, но AI-запросы потребуют настройки.");
+    console.log("Повторно открыть мастер можно командой: /wizard");
+  }
+  return updated;
+}
+
+async function getAiReadiness() {
+  const [secrets, ollama, codex] = await Promise.all([
+    loadSecrets(),
+    hasUsableOllamaModel(),
+    hasUsableCodexAuth(),
+  ]);
+  const openai = Boolean(process.env.OPENAI_API_KEY || secrets.openai?.apiKey);
+  const openrouter = Boolean(process.env.OPENROUTER_API_KEY || secrets.openrouter?.apiKey);
+  return {
+    ready: Boolean(ollama || openai || openrouter || codex),
+    ollama,
+    openai,
+    openrouter,
+    codex,
+  };
+}
+
+async function hasUsableOllamaModel() {
+  try {
+    const config = await loadConfig();
+    const baseUrl = config.ai.profiles?.local?.baseUrl || "http://127.0.0.1:11434";
+    const response = await fetch(`${baseUrl}/api/tags`, { signal: AbortSignal.timeout(1200) });
+    if (!response.ok) return false;
+    const payload = await response.json();
+    const models = Array.isArray(payload.models) ? payload.models : [];
+    return models.length > 0;
+  } catch {
+    return false;
+  }
+}
+
+async function hasUsableCodexAuth() {
+  const version = await getCommandVersion("codex", ["--version"]);
+  if (version === "не найден") return false;
+  if (process.env.OPENAI_API_KEY) return true;
+  return existsSync(path.join(os.homedir(), ".codex", "auth.json"));
+}
+
 async function startAgentReadline() {
   const rl = readline.createInterface({ input, output, prompt: "iola> " });
   const state = {
@@ -674,7 +743,7 @@ async function startAgentReadline() {
 }
 
 async function startAgentRawInput() {
-  const state = { history: [], buffer: "", selected: 0, slashOpen: false, running: false };
+  const state = { history: [], buffer: "", selected: 0, slashOpen: false, running: false, renderedInputLines: 0 };
   emitKeypressEvents(input);
   const wasRaw = input.isRaw;
   input.setRawMode(true);
@@ -728,11 +797,12 @@ async function startAgentRawInput() {
         const line = state.buffer.trim();
         state.buffer = "";
         state.slashOpen = false;
-        clearAgentInputArea();
+        clearAgentInputArea(state);
         if (!line) {
           render();
           continue;
         }
+        output.write(`iola> ${line}\n`);
         try {
           const shouldExit = await handleAgentLine(line, state);
           if (shouldExit) break;
@@ -1179,29 +1249,49 @@ function currentSlashMatches(state) {
 }
 
 function renderAgentInput(state) {
-  clearAgentInputArea();
+  clearAgentInputArea(state);
   const prompt = "iola> ";
   const lines = state.buffer.split("\n");
-  output.write(`${prompt}${lines[0] || ""}`);
-  for (const line of lines.slice(1)) output.write(`      ${line}\n`);
+  const inputLines = [`${prompt}${lines[0] || ""}`, ...lines.slice(1).map((line) => `      ${line}`)];
+  const menuLines = [];
   if (state.slashOpen) {
-    output.write("\n");
     const matches = currentSlashMatches(state);
     if (matches.length === 0) {
-      output.write("  нет команд\n");
+      menuLines.push("  нет команд");
     } else {
       for (let index = 0; index < matches.length; index += 1) {
-        const marker = index === state.selected ? ">" : " ";
-        output.write(`${marker} ${matches[index].command.padEnd(24)} ${matches[index].description}\n`);
+        const selected = index === state.selected;
+        const marker = selected ? ">" : " ";
+        const row = `${marker} ${matches[index].command.padEnd(24)} ${matches[index].description}`;
+        menuLines.push(selected ? colorSlashSelection(row) : `  ${row.slice(2)}`);
       }
-      output.write("  ↑/↓ выбрать • Enter вставить/выполнить • Esc закрыть\n");
+      menuLines.push("  ↑/↓ выбрать • Enter вставить/выполнить • Esc закрыть");
     }
   }
+
+  const renderedLines = [...inputLines, ...menuLines];
+  output.write(renderedLines.join("\n"));
+  if (menuLines.length > 0 && output.isTTY) {
+    output.write(`\x1b[${menuLines.length}A`);
+  }
+  if (output.isTTY) {
+    const cursorColumn = visibleLength(inputLines[inputLines.length - 1]);
+    output.write(`\x1b[${cursorColumn + 1}G`);
+  }
+  state.renderedInputLines = inputLines.length;
 }
 
-function clearAgentInputArea() {
+function clearAgentInputArea(state = null) {
   if (!output.isTTY) return;
-  output.write("\x1b[2K\r");
+  const inputLines = Math.max(1, Number(state?.renderedInputLines || 1));
+  if (inputLines > 1) output.write(`\x1b[${inputLines - 1}A`);
+  output.write("\r\x1b[0J");
+  if (state) state.renderedInputLines = 0;
+}
+
+function colorSlashSelection(row) {
+  if (!output.isTTY || process.env.NO_COLOR === "1") return row;
+  return `\x1b[38;5;213m${row}\x1b[0m`;
 }
 
 function readKeypress() {
@@ -6569,6 +6659,7 @@ async function setupClient(args) {
 }
 
 async function onboard(args = []) {
+  onboardRanThisProcess = true;
   const options = parseOptions(args);
   await showBanner();
   console.log("Мастер настройки iola-cli.");