@iola_adm/iola-cli 0.1.70 → 0.1.72

package/package.json

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

package/src/cli.js

@@ -766,7 +766,7 @@ async function startAgentReadline() {
 }
 
 async function startAgentRawInput() {
-  const state = { history: [], buffer: "", selected: 0, slashOffset: 0, slashOpen: false, running: false, renderedInputLines: 0, rawMode: true, pendingOutput: "", aiStatus: null };
+  const state = { history: [], buffer: "", selected: 0, slashOffset: 0, slashOpen: false, running: false, renderedInputLines: 0, renderedLines: 0, rawMode: true, pendingOutput: "", aiStatus: null };
   const wasRaw = input.isRaw;
   activateRawInput(input);
 
@@ -1330,14 +1330,18 @@ function renderAgentInput(state) {
     output.write(`\x1b[${cursorColumn + 1}G`);
   }
   state.renderedInputLines = inputLines.length;
+  state.renderedLines = renderedLines.length;
 }
 
 function clearAgentInputArea(state = null) {
   if (!output.isTTY) return;
-  const inputLines = Math.max(1, Number(state?.renderedInputLines || 1));
-  if (inputLines > 1) output.write(`\x1b[${inputLines - 1}A`);
+  const renderedLines = Math.max(1, Number(state?.renderedLines || state?.renderedInputLines || 1));
+  if (renderedLines > 1) output.write(`\x1b[${renderedLines - 1}A`);
   output.write("\r\x1b[0J");
-  if (state) state.renderedInputLines = 0;
+  if (state) {
+    state.renderedInputLines = 0;
+    state.renderedLines = 0;
+  }
 }
 
 function startActivityIndicator(label = "работаю") {
@@ -5965,6 +5969,20 @@ async function aiAsk(args, context = {}) {
   const historyEnabled = !options.bare && !options["no-history"] && isFeatureEnabled("sqlite-history");
   const sessionId = historyEnabled && isFeatureEnabled("sessions") ? ensureSessionForAsk(options, providerConfig, question) : null;
   const history = context.history || (sessionId ? getSessionAiHistory(sessionId) : []);
+  const directAnswer = buildDirectDataAnswer(question, dataContext);
+  if (directAnswer) {
+    if (historyEnabled) {
+      recordAskHistory({ question, answer: directAnswer, providerConfig, dataContext, error: "", sessionId });
+      appendSessionExchange(sessionId, question, directAnswer, dataContext, "");
+    }
+    emitEvent(options, "answer", { length: directAnswer.length, sessionId, direct: true });
+    if (options.output) {
+      await assertPermission("writeFiles");
+      await writeFile(options.output, directAnswer, "utf8");
+    }
+    if (!options.quiet) console.log(directAnswer);
+    return directAnswer;
+  }
   const messages = await buildAiMessages(question, dataContext, history, options, config);
   let answer = "";
   let errorMessage = "";
@@ -6014,6 +6032,28 @@ async function aiAsk(args, context = {}) {
   return answer;
 }
 
+function buildDirectDataAnswer(question, dataContext) {
+  const normalized = question.toLocaleLowerCase("ru-RU");
+  if (!/(директор|руководител)/iu.test(normalized)) return "";
+  const terms = extractSearchTerms(question).filter((term) => !/^\d+$/.test(term));
+  if (terms.length < 2) return "";
+  const rows = [
+    ...dataContext.schools.map((item) => ({ layer: "schools", layerName: "школы", ...item })),
+    ...dataContext.kindergartens.map((item) => ({ layer: "kindergartens", layerName: "детские сады", ...item })),
+  ];
+  const matches = rows.filter((item) => {
+    const head = String(item.head || "").toLocaleLowerCase("ru-RU");
+    return terms.every((term) => head.includes(term));
+  });
+  if (matches.length !== 1) return "";
+  const item = matches[0];
+  return [
+    `${item.head} — руководитель ${item.name}.`,
+    item.address ? `Адрес: ${item.address}.` : "",
+    `Источник: слой ${item.layer}, ИНН ${item.inn || "-"}.`,
+  ].filter(Boolean).join("\n");
+}
+
 async function resolveUsableAiProfile(config, options = {}) {
   const explicit = Boolean(options.profile || options.provider);
   const providerConfig = resolveAiProfile(config, options);
@@ -6431,8 +6471,8 @@ async function buildDataContext(question) {
   const mcpBaseUrl = await getMcpBaseUrl();
   const [layers, schools, kindergartens] = await Promise.all([
     fetchJson(`${mcpBaseUrl}/mcp-version`),
-    fetchJson(`${apiBaseUrl}/schools?limit=100&offset=0`),
-    fetchJson(`${apiBaseUrl}/kindergartens?limit=100&offset=0`),
+    fetchAllApiItems(`${apiBaseUrl}/schools`),
+    fetchAllApiItems(`${apiBaseUrl}/kindergartens`),
   ]);
   const queryTerms = extractSearchTerms(question);
   const patterns = extractStructuredPatterns(question);
@@ -6457,6 +6497,18 @@ async function buildDataContext(question) {
   };
 }
 
+async function fetchAllApiItems(endpoint, limit = 500, maxItems = 5000) {
+  const all = [];
+  for (let offset = 0; offset < maxItems; offset += limit) {
+    const separator = endpoint.includes("?") ? "&" : "?";
+    const payload = await fetchJson(`${endpoint}${separator}limit=${limit}&offset=${offset}`);
+    const items = normalizeItems(payload);
+    all.push(...items);
+    if (items.length < limit) break;
+  }
+  return all;
+}
+
 function emptyDataContext(question) {
   return {
     enabled: false,
@@ -6477,7 +6529,13 @@ function shouldUseDataContext(question, options = {}) {
   if (/^(привет|здравствуй|здравствуйте|добрый день|доброе утро|добрый вечер|hi|hello|hey)[!.?\s]*$/iu.test(normalized)) return false;
   if (/^(спасибо|благодарю|ок|окей|понял|поняла|ясно|хорошо|да|нет)[!.?\s]*$/iu.test(normalized)) return false;
   if (normalized.length <= 24 && /^(как дела|что нового|ты тут|ты здесь|кто ты)[?.!\s]*$/iu.test(normalized)) return false;
-  return /\b(школ|сад|детсад|детский сад|лицей|гимнази|инн|адрес|телефон|почт|email|сайт|лиценз|руководител|директор|слой|слои|данн|отчет|отчёт|выгруз|csv|json|найди|покажи|список|карточк|организац|учрежден|йошкар|ола|петрова|строител|советск|первомайск)\b/iu.test(normalized);
+  const dataKeywords = [
+    "школ", "сад", "детсад", "детский сад", "лицей", "гимнази", "инн", "адрес", "телефон",
+    "почт", "email", "сайт", "лиценз", "руководител", "директор", "слой", "слои", "данн",
+    "отчет", "отчёт", "выгруз", "csv", "json", "найди", "покажи", "список", "карточк",
+    "организац", "учрежден", "йошкар", "ола", "петрова", "строител", "советск", "первомайск",
+  ];
+  return dataKeywords.some((keyword) => normalized.includes(keyword));
 }
 
 function extractSearchTerms(question) {
@@ -6487,7 +6545,13 @@ function extractSearchTerms(question) {
     .split(/\s+/)
     .map((term) => term.trim())
     .filter(Boolean)
-    .filter((term) => !["какие", "какая", "какой", "есть", "найди", "покажи", "контакты", "адрес", "телефон", "школы", "школа", "сад", "детский", "детские", "сады", "улица", "ул"].includes(term));
+    .filter((term) => ![
+      "в", "во", "на", "по", "и", "а", "ну", "так", "слушай", "скажи", "подскажи",
+      "какие", "какая", "какой", "каком", "какой", "есть", "найди", "покажи",
+      "контакты", "адрес", "телефон", "школы", "школа", "школе", "сад", "детский",
+      "детские", "сады", "улица", "ул", "директор", "руководитель",
+    ].includes(term))
+    .filter((term) => term.length > 2 || /^\d+$/.test(term));
 
   return normalized.length > 0 ? normalized : [question];
 }
@@ -6535,8 +6599,10 @@ function scoreItem(item, terms, patterns, layer) {
   const text = JSON.stringify(summary).toLocaleLowerCase("ru-RU");
   const name = String(summary.name || "").toLocaleLowerCase("ru-RU");
   const address = String(summary.address || "").toLocaleLowerCase("ru-RU");
+  const head = String(summary.head || "").toLocaleLowerCase("ru-RU");
   const generalTerms = terms.filter((term) => !/^\d+$/.test(term));
   let score = generalTerms.reduce((value, term) => value + (text.includes(term.toLocaleLowerCase("ru-RU")) ? 1 : 0), 0);
+  score += generalTerms.reduce((value, term) => value + (head.includes(term.toLocaleLowerCase("ru-RU")) ? 5 : 0), 0);
 
   for (const inn of patterns.inns) {
     if (String(summary.inn) === inn) {