@iola_adm/iola-cli 0.1.81 → 0.1.83

package/package.json

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

package/src/cli.js

@@ -774,9 +774,10 @@ async function startAgentReadline() {
 }
 
 async function startAgentRawInput() {
-  const state = { history: [], buffer: "", selected: 0, slashOffset: 0, slashOpen: false, running: false, renderedInputLines: 0, renderedLines: 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, statusBar: false, statusRows: 0 };
   const wasRaw = input.isRaw;
   activateRawInput(input);
+  setupAgentStatusBar(state);
 
   await refreshAgentAiStatus(state);
   const render = () => renderAgentInput(state);
@@ -857,6 +858,8 @@ async function startAgentRawInput() {
       }
     }
   } finally {
+    clearAgentInputArea(state);
+    clearAgentStatusBar(state);
     if (!wasRaw) input.setRawMode(false);
     input.pause();
   }
@@ -1305,8 +1308,6 @@ function renderAgentInput(state) {
   const prompt = "> ";
   const lines = state.buffer.split("\n");
   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);
@@ -1328,7 +1329,8 @@ function renderAgentInput(state) {
     }
   }
 
-  const renderedLines = [cwdLine, ...menuLines, ...inputLines];
+  renderAgentStatusBar(state);
+  const renderedLines = [...menuLines, ...inputLines];
   output.write(renderedLines.join("\n"));
   if (output.isTTY) {
     const cursorColumn = visibleLength(inputLines[inputLines.length - 1]);
@@ -1349,6 +1351,37 @@ function clearAgentInputArea(state = null) {
   }
 }
 
+function setupAgentStatusBar(state) {
+  if (!output.isTTY) return;
+  const rows = Number(output.rows || 0);
+  if (rows < 4) return;
+  state.statusBar = true;
+  state.statusRows = rows;
+  output.write(`\x1b[1;${rows - 1}r`);
+  output.write(`\x1b[${rows - 1};1H`);
+}
+
+function renderAgentStatusBar(state) {
+  if (!output.isTTY || !state.statusBar) return;
+  const rows = Number(output.rows || state.statusRows || 0);
+  if (rows < 4) return;
+  if (rows !== state.statusRows) {
+    state.statusRows = rows;
+    output.write(`\x1b[1;${rows - 1}r`);
+  }
+  const statusLine = colorMuted(truncateTerminalLine(` ${buildAgentStatusLine(state)} `));
+  output.write(`\x1b7\x1b[${rows};1H\x1b[2K${statusLine}\x1b8`);
+}
+
+function clearAgentStatusBar(state) {
+  if (!output.isTTY || !state?.statusBar) return;
+  const rows = Number(output.rows || state.statusRows || 0);
+  output.write("\x1b[r");
+  if (rows >= 1) output.write(`\x1b7\x1b[${rows};1H\x1b[2K\x1b8`);
+  state.statusBar = false;
+  state.statusRows = 0;
+}
+
 function startActivityIndicator(label = "работаю") {
   const doneLabel = "готово";
   if (!output.isTTY || process.env.NO_COLOR === "1") {
@@ -6107,7 +6140,7 @@ function pickDirectDataItem(question, dataContext, rows) {
 function itemNameHasNumber(item, number) {
   const name = String(item.name || item.title || item.fns_full_name || item.fns_short_name || "").toLocaleLowerCase("ru-RU");
   const escaped = String(number).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  return new RegExp(`(?:№\\s*${escaped}|\\b(?:школа|сош|лицей|гимназия|сад|детский сад)\\s*№?\\s*${escaped}\\b)`, "iu").test(name);
+  return new RegExp(`(?:№\\s*${escaped}(?!\\d)|\\b(?:школа|сош|лицей|гимназия|сад|детский сад)\\s*№?\\s*${escaped}\\b)`, "iu").test(name);
 }
 
 function formatDirectDataField(field, item) {
@@ -6115,7 +6148,7 @@ function formatDirectDataField(field, item) {
   if (field === "head") {
     const head = item.head || item.fns_head_name;
     if (!head) return "";
-    const position = item.fns_head_position || (item.layer === "kindergartens" ? "заведующий" : "директор");
+    const position = capitalizeFirst(item.fns_head_position || (item.layer === "kindergartens" ? "заведующий" : "директор"));
     return `${position}: ${head} (${name}).`;
   }
   if (field === "website") return item.website ? `Сайт: ${item.website}` : `Сайт для ${name} в открытых данных не указан.`;
@@ -6138,6 +6171,11 @@ function getDirectDataItemName(item) {
   return item.name || item.title || item.fns_short_name || item.fns_full_name || "организация";
 }
 
+function capitalizeFirst(value) {
+  const text = String(value || "");
+  return text ? `${text[0].toLocaleUpperCase("ru-RU")}${text.slice(1)}` : text;
+}
+
 async function resolveUsableAiProfile(config, options = {}) {
   const explicit = Boolean(options.profile || options.provider);
   const providerConfig = resolveAiProfile(config, options);
@@ -6556,6 +6594,7 @@ async function buildDataContext(question) {
   try {
     const context = await callPublicMcpTool("layer_answer_context", { question, limit: 8 });
     const layerMap = Object.fromEntries((context.results || []).map((result) => [result.layer?.id || result.layer, result.items || []]));
+    await enrichLayerMapWithExactMatches(layerMap, question, queryTerms, patterns);
     return {
       source: "remote-mcp",
       contract_version: context.contract_version,
@@ -6593,6 +6632,31 @@ async function buildDataContext(question) {
   }
 }
 
+async function enrichLayerMapWithExactMatches(layerMap, question, queryTerms, patterns) {
+  if (!patterns.numbers?.length) return;
+  const targetLayerIds = resolveTargetLayerIds(patterns);
+  await Promise.all(targetLayerIds.map(async (layer) => {
+    try {
+      const result = await queryLayer(layer, { query: question, terms: queryTerms, patterns, limit: 8 });
+      const existing = layerMap[layer] || [];
+      const existingKeys = new Set(existing.map((item) => item.inn || item.name || item.fns_short_name).filter(Boolean));
+      const exact = (result.items || []).filter((item) =>
+        patterns.numbers.some((number) => itemNameHasNumber(item, number)));
+      layerMap[layer] = [
+        ...exact.filter((item) => {
+          const key = item.inn || item.name || item.fns_short_name;
+          if (!key || existingKeys.has(key)) return false;
+          existingKeys.add(key);
+          return true;
+        }),
+        ...existing,
+      ];
+    } catch {
+      // Remote MCP remains the primary source; exact local/API enrichment is best effort.
+    }
+  }));
+}
+
 function resolveTargetLayerIds(patterns = {}) {
   const knownLayers = Object.keys(DATASETS);
   if (patterns.targetLayers?.length) return patterns.targetLayers.filter((layer) => DATASETS[layer]);
@@ -6690,13 +6754,16 @@ function extractSearchTerms(question) {
 
 function extractStructuredPatterns(question) {
   const normalized = question.toLocaleLowerCase("ru-RU");
-  const numbers = [...new Set([...normalized.matchAll(/\b\d{1,3}\b/g)].map((match) => match[0]))];
+  const numbers = [...new Set([
+    ...[...normalized.matchAll(/\b\d{1,3}\b/g)].map((match) => match[0]),
+    ...extractOrdinalNumbers(normalized),
+  ])];
   const inns = [...new Set([...normalized.matchAll(/\b\d{10,12}\b/g)].map((match) => match[0]))];
   const targetLayers = [];
-  if (/(^|[^а-яёa-z])(школа|школы|лицей|лицея|гимназия|гимназии)(?=$|[^а-яёa-z])/iu.test(normalized)) {
+  if (/(школ|сош|лице|гимнази)/iu.test(normalized)) {
     targetLayers.push("schools");
   }
-  if (/(^|[^а-яёa-z])(сад|сады|детсад|детский|детские|доу|мбдоу)(?=$|[^а-яёa-z])/iu.test(normalized)) {
+  if (/(детсад|детск|сад|сады|доу|мбдоу)/iu.test(normalized)) {
     targetLayers.push("kindergartens");
   }
   const streetMatches = [
@@ -6708,6 +6775,24 @@ function extractStructuredPatterns(question) {
   return { numbers, inns, streets, targetLayers: [...new Set(targetLayers)] };
 }
 
+function extractOrdinalNumbers(normalizedQuestion) {
+  const ordinals = [
+    ["1", "(?:перв(?:ая|ой|ую|ое|ого|ом|ым|ых)?|первую)"],
+    ["2", "(?:втор(?:ая|ой|ую|ое|ого|ом|ым|ых)?|вторую)"],
+    ["3", "(?:трет(?:ья|ий|ью|ье|ьего|ьем|ьим|ьих)?|третью)"],
+    ["4", "четверт(?:ая|ой|ую|ое|ого|ом|ым|ых)?"],
+    ["5", "пят(?:ая|ой|ую|ое|ого|ом|ым|ых)?"],
+    ["6", "шест(?:ая|ой|ую|ое|ого|ом|ым|ых)?"],
+    ["7", "седьм(?:ая|ой|ую|ое|ого|ом|ым|ых)?"],
+    ["8", "восьм(?:ая|ой|ую|ое|ого|ом|ым|ых)?"],
+    ["9", "девят(?:ая|ой|ую|ое|ого|ом|ым|ых)?"],
+    ["10", "десят(?:ая|ой|ую|ое|ого|ом|ым|ых)?"],
+  ];
+  return ordinals
+    .filter(([, pattern]) => new RegExp(`(^|[^а-яёa-z])${pattern}(?=$|[^а-яёa-z])`, "iu").test(normalizedQuestion))
+    .map(([number]) => number);
+}
+
 function cleanupPattern(value) {
   return value
     .replace(/\b(школа|школы|сад|детский|детские|сады|лицей|гимназия|контакты|телефон|адрес|найди|покажи)\b/giu, " ")