@iola_adm/iola-cli 0.1.101 → 0.1.103

package/package.json

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

package/src/cli.js

@@ -6512,7 +6512,15 @@ async function localToolAsk(question, providerConfig, options) {
     }
   }
   const runId = `run-${Date.now()}-${Math.random().toString(16).slice(2)}`;
-  const result = await executeToolPlan(validated, { ...options, runId });
+  let result;
+  try {
+    result = await executeToolPlan(validated, { ...options, runId });
+  } catch (error) {
+    const friendlyError = formatToolExecutionError(error, validated);
+    if (!friendlyError) throw error;
+    if (!options.quiet) console.log(friendlyError);
+    return friendlyError;
+  }
   const answer = formatToolResult(result, options);
 
   if (!options["no-history"] && isFeatureEnabled("sqlite-history")) {
@@ -6614,12 +6622,12 @@ function buildPersonRoleDirectAnswer(question) {
 
 function extractPersonNameTokens(question) {
   const stopWords = new Set([
-    "так", "а", "и", "или", "кто", "что", "какой", "какая", "какого", "какой-то", "это",
+    "так", "а", "в", "во", "и", "или", "кто", "что", "какой", "какая", "какого", "каком", "какую", "какой-то", "это",
     "директор", "директора", "директором", "руководитель", "руководителем", "заведующая", "заведующий",
-    "школа", "школы", "школе", "сад", "сада", "детский", "детского", "гимназия", "лицей",
+    "школа", "школы", "школе", "школу", "сад", "сада", "саду", "детсад", "детсаду", "детский", "детского", "детском", "гимназия", "лицей",
     "является", "возглавляет", "найди", "покажи",
   ]);
-  return [...String(question || "").toLocaleLowerCase("ru-RU").matchAll(/\p{L}{3,}/gu)]
+  return [...String(question || "").toLocaleLowerCase("ru-RU").matchAll(/\p{L}{2,}/gu)]
     .map((match) => match[0])
     .filter((token) => !stopWords.has(token));
 }
@@ -6686,7 +6694,7 @@ function normalizeIolaRouterPlan(raw, question, options = {}) {
       if (casualAnswer) return { directAnswer: casualAnswer };
       return inferToolPlan(question, options);
     }
-    return { steps: [{ tool, args: payload.args || {} }] };
+    return { steps: [{ tool, args: { ...(payload.args || {}), source_question: question } }] };
   }
   if (payload.action === "direct_answer") {
     return { directAnswer: payload.answer || "" };
@@ -6776,22 +6784,36 @@ async function resolvePublicEntityField(args = {}) {
   const endpoint = `${await getApiBaseUrl()}/resolve-entity-field`;
   const requestedField = normalizeEntityField(args.field);
   const layer = normalizeEntityLayer(args.layer);
+  const strictQuestionNumber = extractEntityNumberFromQuestion(args.source_question, layer);
   const payload = {
     layer,
-    entity_number: args.entity_number ?? args.number,
+    entity_number: strictQuestionNumber || (args.entity_number ?? args.number),
     entity_name: args.entity_name || args.name,
     inn: args.inn,
     field: requestedField,
     must_refute_user_value: args.must_refute_user_value,
+    source_question: args.source_question,
+    strict_entity_number: Boolean(strictQuestionNumber),
   };
   try {
-    return await postJson(endpoint, payload);
+    const resolved = await postJson(endpoint, stripInternalResolveArgs(payload));
+    const correctedByNumber = await correctResolvedEntityByQuestionNumber(resolved, payload);
+    if (correctedByNumber) return correctedByNumber;
+    return await correctResolvedEntityByQuestionName(resolved, payload) || resolved;
   } catch (error) {
+    if (payload.strict_entity_number && isEntityNotFoundError(error)) throw error;
+    if (isLocalEntityValidationError(error)) throw error;
     const fallbackField = pickResolveFieldFallback(requestedField, error);
     if (fallbackField && fallbackField !== requestedField) {
       try {
-        return await postJson(endpoint, { ...payload, field: fallbackField });
+        const fallbackPayload = { ...payload, field: fallbackField };
+        const resolved = await postJson(endpoint, stripInternalResolveArgs(fallbackPayload));
+        const correctedByNumber = await correctResolvedEntityByQuestionNumber(resolved, fallbackPayload);
+        if (correctedByNumber) return correctedByNumber;
+        return await correctResolvedEntityByQuestionName(resolved, fallbackPayload) || resolved;
       } catch (retryError) {
+        if (payload.strict_entity_number && isEntityNotFoundError(retryError)) throw retryError;
+        if (isLocalEntityValidationError(retryError)) throw retryError;
         const resolvedBySearch = await resolvePublicEntityFieldViaSearch({ ...payload, field: fallbackField }, retryError);
         if (resolvedBySearch) return resolvedBySearch;
         throw retryError;
@@ -6807,17 +6829,142 @@ async function resolvePublicEntityFieldViaSearch(payload, originalError) {
   const details = parseErrorJsonDetails(originalError);
   if (details?.error !== "entity_not_found") return null;
   if (payload.inn) return null;
+  if (payload.strict_entity_number) return null;
   const query = payload.entity_name || buildEntitySearchQuery(payload.layer, payload.entity_number);
   if (!query) return null;
   const candidates = await searchPublicEntities({ layer: payload.layer, query, limit: 10 });
   const candidate = pickResolvedEntityCandidate(candidates, payload);
   if (!candidate?.inn) return null;
-  return postJson(`${await getApiBaseUrl()}/resolve-entity-field`, {
+  return postJson(`${await getApiBaseUrl()}/resolve-entity-field`, stripInternalResolveArgs({
     layer: payload.layer,
     inn: candidate.inn,
     field: payload.field,
     must_refute_user_value: payload.must_refute_user_value,
-  });
+  }));
+}
+
+function stripInternalResolveArgs(payload) {
+  const { source_question: _sourceQuestion, strict_entity_number: _strictEntityNumber, ...publicPayload } = payload || {};
+  return publicPayload;
+}
+
+async function correctResolvedEntityByQuestionNumber(resolved, payload) {
+  if (!payload.strict_entity_number || !payload.entity_number) return null;
+  const resolvedEntity = resolved?.entity || resolved || {};
+  if (itemNameHasNumber(resolvedEntity, payload.entity_number)) return null;
+
+  const candidates = await searchPublicEntities({ layer: payload.layer, query: buildEntitySearchQuery(payload.layer, payload.entity_number), limit: 10 });
+  const candidate = candidates.find((item) => itemNameHasNumber(item, payload.entity_number));
+  if (!candidate?.inn) throw createEntityNotFoundError(payload, buildEntitySearchQuery(payload.layer, payload.entity_number));
+  if (candidate.inn === resolvedEntity.inn) return null;
+
+  return postJson(`${await getApiBaseUrl()}/resolve-entity-field`, stripInternalResolveArgs({
+    layer: payload.layer,
+    inn: candidate.inn,
+    field: payload.field,
+    must_refute_user_value: payload.must_refute_user_value,
+  }));
+}
+
+async function correctResolvedEntityByQuestionName(resolved, payload) {
+  const questionNameQuery = extractEntityNameQueryFromQuestion(payload.source_question, payload.layer);
+  if (!questionNameQuery) return null;
+  const resolvedEntity = resolved?.entity || resolved || {};
+  if (entityNameMatchesQuery(resolvedEntity.name, questionNameQuery)) return null;
+
+  const candidates = await searchPublicEntities({ layer: payload.layer, query: questionNameQuery, limit: 5 });
+  const candidate = pickNamedEntityCandidate(candidates, questionNameQuery);
+  if (!candidate?.inn) throw createEntityNotFoundError(payload, questionNameQuery);
+  if (candidate.inn === resolvedEntity.inn) return null;
+
+  return postJson(`${await getApiBaseUrl()}/resolve-entity-field`, stripInternalResolveArgs({
+    layer: payload.layer,
+    inn: candidate.inn,
+    field: payload.field,
+    must_refute_user_value: payload.must_refute_user_value,
+  }));
+}
+
+function extractEntityNameQueryFromQuestion(question, layer) {
+  let text = String(question || "").toLocaleLowerCase("ru-RU");
+  if (extractEntityNumberFromQuestion(text, layer)) return "";
+  const correction = text.match(/(?:просил|просила|просили)\s+(.+?)\s+а\s+не(?:\s|$)/iu);
+  if (correction?.[1]) text = correction[1];
+
+  const stopWords = new Set([
+    "а", "в", "во", "где", "же", "и", "или", "как", "какая", "какие", "какой", "кто", "на", "не",
+    "найди", "находится", "подскажи", "покажи", "просил", "скажи", "так", "там", "это",
+    "адрес", "директор", "директора", "заведующая", "заведующий", "инн", "почта", "сайт", "телефон",
+    "гимназия", "гимназии", "детсад", "детсада", "детский", "лицей", "лицея", "лицее", "мбдоу", "мбоу", "сад", "сада", "садик",
+    "сош", "школа", "школе", "школу", "школы",
+  ]);
+  const tokens = [...text.normalize("NFC").matchAll(/[\p{L}\d]+/gu)]
+    .map((match) => normalizeEntityText(match[0]))
+    .filter((token) => token && !stopWords.has(token) && !/^\d+$/.test(token));
+  const uniqueTokens = [...new Set(tokens)];
+  if (uniqueTokens.length === 0) return "";
+  if (uniqueTokens.length === 1 && uniqueTokens[0].length < 5) return "";
+  return uniqueTokens.join(" ");
+}
+
+function pickNamedEntityCandidate(candidates, query) {
+  if (!Array.isArray(candidates) || candidates.length === 0) return null;
+  const tokens = entityQueryTokens(query);
+  const exact = candidates.find((item) => entityNameMatchesQuery(item.name, query));
+  if (exact) return exact;
+  if (candidates.length === 1 && Number(candidates[0].score || 0) >= 0.5) return candidates[0];
+  return candidates.find((item) => {
+    const name = normalizeEntityText(item.name || "");
+    return Number(item.score || 0) >= 0.8 && tokens.filter((token) => name.includes(token)).length >= Math.ceil(tokens.length / 2);
+  }) || null;
+}
+
+function entityNameMatchesQuery(name, query) {
+  const normalizedName = normalizeEntityText(name || "");
+  const tokens = entityQueryTokens(query);
+  return tokens.length > 0 && tokens.every((token) => normalizedName.includes(token));
+}
+
+function entityQueryTokens(query) {
+  return [...String(query || "").matchAll(/[\p{L}\d]+/gu)]
+    .map((match) => normalizeEntityText(match[0]))
+    .filter(Boolean);
+}
+
+function normalizeEntityText(text) {
+  return String(text || "").toLocaleLowerCase("ru-RU").replace(/ё/g, "е");
+}
+
+function extractEntityNumberFromQuestion(question, layer) {
+  const text = String(question || "").toLocaleLowerCase("ru-RU");
+  const isKindergarten = layer === "kindergartens";
+  const isSchool = layer === "schools";
+  const patterns = isKindergarten
+    ? [/(?:детск\w*\s+сад\w*|детсад\w*|сад\w*)\s*(?:№|номер|n)?\s*(\d{1,4})/iu, /№\s*(\d{1,4})/iu]
+    : isSchool
+      ? [/(?:школ\w*|сош|гимнази\w*|лице\w*)\s*(?:№|номер|n)?\s*(\d{1,4})/iu, /№\s*(\d{1,4})/iu]
+      : [/№\s*(\d{1,4})/iu];
+  for (const pattern of patterns) {
+    const match = text.match(pattern);
+    if (match?.[1]) return match[1];
+  }
+  return "";
+}
+
+function createEntityNotFoundError(payload, query = "") {
+  const detail = {
+    error: "entity_not_found",
+    message: "No public entity matched the provided selector",
+    layer: payload.layer,
+    entity_number: payload.entity_number,
+    entity_name: payload.entity_name || query,
+    local_validation: true,
+  };
+  return new Error(`Request failed: 404 Not Found (${awaitedApiPlaceholder()})\n${JSON.stringify({ detail })}`);
+}
+
+function awaitedApiPlaceholder() {
+  return "local-validation";
 }
 
 function buildEntitySearchQuery(layer, number) {
@@ -6880,6 +7027,35 @@ function parseErrorJsonDetails(error) {
   }
 }
 
+function isEntityNotFoundError(error) {
+  return parseErrorJsonDetails(error)?.error === "entity_not_found";
+}
+
+function isLocalEntityValidationError(error) {
+  return Boolean(parseErrorJsonDetails(error)?.local_validation);
+}
+
+function formatToolExecutionError(error, plan) {
+  const details = parseErrorJsonDetails(error);
+  if (details?.error !== "entity_not_found") return "";
+  if (details.local_validation && details.entity_name) {
+    return `В открытом слое не нашел организацию по названию "${details.entity_name}". Проверьте название.`;
+  }
+
+  const step = (plan?.steps || []).find((item) => item.tool === "resolve_entity_field" || item.tool === "search_entities");
+  const args = step?.args || {};
+  const layer = normalizeEntityLayer(args.layer);
+  const number = args.entity_number ?? args.number;
+  const name = args.entity_name || args.name;
+  const entityLabel = layer === "kindergartens" ? "детский сад" : "школу";
+  const selector = number !== undefined && number !== null && number !== ""
+    ? `${entityLabel} № ${number}`
+    : name
+      ? `${entityLabel} "${name}"`
+      : "такую организацию";
+  return `В открытом слое не нашел ${selector}. Проверьте номер или название.`;
+}
+
 function availableToolNames(options = {}) {
   const names = new Set(LOCAL_TOOLS);
   for (const tool of getLocalMcpToolNames()) names.add(tool);