ynosis-agent-mcp 0.2.1 → 0.2.3

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "ynosis-agent-mcp",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "scripts": {
     "test": "node --test test/*.test.mjs"
   },
   "description": "MCP stdio server for the Ynosis Agent API (facilities and spring analyses)",
   "type": "module",
   "bin": {
-    "ynosis-agent-mcp": "./src/server.mjs"
+    "ynosis-agent-mcp": "src/server.mjs"
   },
   "files": [
     "src",

package/src/client.mjs

@@ -1,4 +1,7 @@
+import { File } from "node:buffer";
+
 const DEFAULT_BASE = "https://ynosis.jp";
+const DEFAULT_REGISTER_MIN_INTERVAL_MS = 20_000;
 
 function resolveKey() {
   return process.env.YNOSIS_AGENT_API_KEY || process.env.AGENT_API_KEY || "";
@@ -13,6 +16,26 @@ function resolveBase() {
   return raw.replace(/\/$/, "");
 }
 
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+/** @type {number | null} */
+let lastRegisterRelatedAt = null;
+
+export async function paceRegisterRelated(minIntervalMs = DEFAULT_REGISTER_MIN_INTERVAL_MS) {
+  const now = Date.now();
+  if (lastRegisterRelatedAt != null && minIntervalMs > 0) {
+    const wait = minIntervalMs - (now - lastRegisterRelatedAt);
+    if (wait > 0) await sleep(wait);
+  }
+  lastRegisterRelatedAt = Date.now();
+}
+
+function appendUploadFile(form, fieldName, buf, filename, contentType) {
+  form.append(fieldName, new File([buf], filename, { type: contentType }));
+}
+
 function imageContentType(filePath) {
   const suffix = filePath.toLowerCase().split(".").pop();
   if (suffix === "png") return "image/png";
@@ -22,6 +45,14 @@ function imageContentType(filePath) {
   return "image/jpeg";
 }
 
+function preparedImageHeaders(filePath) {
+  const suffix = filePath.toLowerCase().split(".").pop();
+  if (suffix === "jpg" || suffix === "jpeg") {
+    return { "X-Ynosis-Image-Prepared": "1" };
+  }
+  return {};
+}
+
 export class AgentApiError extends Error {
   constructor(statusCode, detail) {
     super(`HTTP ${statusCode}: ${detail}`);
@@ -52,12 +83,17 @@ export class AgentApiClient {
     return headers;
   }
 
-  async request(method, path, { json, form } = {}) {
+  async request(method, path, { json, form, extraHeaders } = {}) {
     const url = `${this.baseUrl}${path}`;
     const ctrl = new AbortController();
     const timer = setTimeout(() => ctrl.abort(), form ? Math.max(this.timeoutMs, 180_000) : this.timeoutMs);
     try {
-      const init = { method, headers: form ? { "X-API-Key": this.apiKey } : this.headers(json != null), signal: ctrl.signal };
+      const formHeaders = { "X-API-Key": this.apiKey, ...(extraHeaders || {}) };
+      const init = {
+        method,
+        headers: form ? formHeaders : this.headers(json != null),
+        signal: ctrl.signal,
+      };
       if (form) init.body = form;
       else if (json != null) init.body = JSON.stringify(json);
       const res = await fetch(url, init);
@@ -111,6 +147,20 @@ export class AgentApiClient {
     return res.json;
   }
 
+  async requestFacilityDeletion(facilityId, { reason, sourceLink }) {
+    const res = await this.request("POST", `/api/agent/facilities/${facilityId}/deletion-requests`, {
+      json: { reason, source_link: sourceLink },
+    });
+    return res.json;
+  }
+
+  async requestSourceDeletion(sourceId, { reason, sourceLink }) {
+    const res = await this.request("POST", `/api/agent/sources/${sourceId}/deletion-requests`, {
+      json: { reason, source_link: sourceLink },
+    });
+    return res.json;
+  }
+
   async remediateDuplicateFacility(duplicateId, { canonicalId = null, dryRun = false } = {}) {
     const { remediateDuplicateFacility: remediate } = await import("./facility_remediate.mjs");
     return remediate(this, duplicateId, { canonicalId, dryRun });
@@ -177,21 +227,31 @@ export class AgentApiClient {
       const res = await this.request("POST", "/api/agent/register", { json: payload });
       return res.json;
     }
+    await paceRegisterRelated();
     const buf = await readFile(imagePath);
     const form = new FormData();
     form.append("payload", JSON.stringify(payload));
-    form.append("file", new Blob([buf], { type: imageContentType(imagePath) }), basename(imagePath));
-    const res = await this.request("POST", "/api/agent/register", { form });
+    const name = basename(imagePath);
+    appendUploadFile(form, "file", buf, name, imageContentType(imagePath));
+    const res = await this.request("POST", "/api/agent/register", {
+      form,
+      extraHeaders: preparedImageHeaders(imagePath),
+    });
     return res.json;
   }
 
   async analyzeImage(imagePath) {
     const { readFile } = await import("node:fs/promises");
     const { basename } = await import("node:path");
+    await paceRegisterRelated();
     const buf = await readFile(imagePath);
     const form = new FormData();
-    form.append("file", new Blob([buf], { type: imageContentType(imagePath) }), basename(imagePath));
-    const res = await this.request("POST", "/api/agent/analyze", { form });
+    const name = basename(imagePath);
+    appendUploadFile(form, "file", buf, name, imageContentType(imagePath));
+    const res = await this.request("POST", "/api/agent/analyze", {
+      form,
+      extraHeaders: preparedImageHeaders(imagePath),
+    });
     return res.json;
   }
 
@@ -201,6 +261,7 @@ export class AgentApiClient {
   }
 
   async parseTranscript(rawText, llmJson) {
+    await paceRegisterRelated();
     const body = { raw_text: rawText };
     if (llmJson != null) body.llm_json = llmJson;
     const res = await this.request("POST", "/api/agent/parse", { json: body });
@@ -215,9 +276,11 @@ export class AgentApiClient {
   async uploadSourceImage(sourceId, imagePath) {
     const { readFile } = await import("node:fs/promises");
     const { basename } = await import("node:path");
+    await paceRegisterRelated();
     const buf = await readFile(imagePath);
     const form = new FormData();
-    form.append("file", new Blob([buf], { type: imageContentType(imagePath) }), basename(imagePath));
+    const name = basename(imagePath);
+    appendUploadFile(form, "file", buf, name, imageContentType(imagePath));
     const res = await this.request("POST", `/api/sources/${sourceId}/image`, { form });
     return res.json;
   }
@@ -255,6 +318,7 @@ export const FACILITY_TAG_OPTIONS = [
   "露天あり",
   "貸切湯あり",
   "日帰り入浴可",
+  "飲泉可",
   "共同浴場",
   "造成泉",
   "モール泉",

package/src/facility_match.mjs

@@ -45,16 +45,28 @@ export function facilitySearchQueries(name) {
   return queries;
 }
 
+async function coreNameInFacilityName(query, facilityName) {
+  const core = await normalizeFacilityName(query);
+  const normDb = await normalizeFacilityName(facilityName);
+  if (core.length < 2) return false;
+  return normDb.includes(core);
+}
+
 export async function scoreFacilityItem(candidateName, item) {
   const dbName = item?.name || "";
   let score = await nameSimilarity(candidateName, dbName);
+  let contains = await coreNameInFacilityName(candidateName, dbName);
   for (const alias of item?.aliases || []) {
     const aliasName = typeof alias === "object" ? alias?.name : alias;
-    if (aliasName) score = Math.max(score, await nameSimilarity(candidateName, String(aliasName)));
+    if (aliasName) {
+      const aliasStr = String(aliasName);
+      score = Math.max(score, await nameSimilarity(candidateName, aliasStr));
+      if (await coreNameInFacilityName(candidateName, aliasStr)) contains = true;
+    }
   }
+  if (contains) return score >= 0.95 ? 100 : 95;
   if (score >= 0.95) return 100;
   if (score >= NAME_SIMILARITY_HIGH) return 90;
-  if (score >= NAME_SIMILARITY_LOW_WITH_LOCATION_HINT) return 85;
   return 0;
 }
 
@@ -88,6 +100,7 @@ export async function findExistingFacility(
     lat = null,
     lng = null,
     searchLimit = 30,
+    expectedAreas = null,
   } = {}
 ) {
   const primary = String(name || "").trim();
@@ -109,9 +122,8 @@ export async function findExistingFacility(
     }
   }
 
-  let bestScore = 0;
-  let bestItem = null;
-  let bestSim = 0;
+  /** @type {Array<[number, number, object]>} */
+  const candidates = [];
 
   for (const q of searchQs) {
     const params = { q, limit: searchLimit };
@@ -124,19 +136,34 @@ export async function findExistingFacility(
     }
     for (const item of res.items || []) {
       if (prefecture && (item.prefecture || "") !== prefecture) continue;
+      if (expectedAreas) {
+        const area = String(item.area || "").trim();
+        if (area && !expectedAreas.has(area)) continue;
+      }
       const sc = await scoreWithLocation(names, item, lat, lng);
+      if (sc < MATCH_SCORE_MIN) continue;
       let sim = 0;
       for (const cn of names) {
         sim = Math.max(sim, await nameSimilarity(cn, item.name || ""));
       }
-      if (sc > bestScore) {
-        bestScore = sc;
-        bestItem = item;
-        bestSim = sim;
-      }
+      candidates.push([sc, sim, item]);
     }
   }
 
-  if (bestScore < MATCH_SCORE_MIN || !bestItem) return null;
+  if (!candidates.length) return null;
+
+  const rank = ([sc, sim, item]) => {
+    const unapprovedAgent = item.is_agent_registered && !item.is_agent_approved;
+    return [sc - (unapprovedAgent ? 15 : 0), sim, unapprovedAgent ? 0 : 1];
+  };
+  candidates.sort((a, b) => {
+    const ra = rank(a);
+    const rb = rank(b);
+    for (let i = 0; i < 3; i += 1) {
+      if (ra[i] !== rb[i]) return rb[i] - ra[i];
+    }
+    return 0;
+  });
+  const [bestScore, bestSim, bestItem] = candidates[0];
   return { facility: bestItem, match_score: bestScore, name_similarity: bestSim };
 }

package/src/server.mjs

@@ -29,19 +29,20 @@ function textResult(text) {
 
 const server = new McpServer({
   name: "ynosis-agent",
-  version: "0.2.1",
+  version: "0.2.3",
   instructions:
     "Ynosis（温泉データベース）への施設・成分表登録・検索用ツール。" +
     "新規施設登録前: find_existing_facility で重複確認 → 既存なら update_facility、" +
     "新規のみ resolve_place_candidates → LLM が同一候補を選び prepare_facility_for_register → register_facility（推測禁止）。" +
     "検索は search_facilities / get_facility / find_existing_facility。" +
     "施設登録は register_facilities_batch または register_facility。" +
-    "成分表は手元 Vision なら get_parse_prompt → 手元 LLM → parse_transcript、" +
-    "または analyze_source_image（Ynosis OCR）。" +
-    "その後 register_source。新規源泉は image_path 必須。" +
-    "OCR / サーバー抽出の parse は並列禁止。" +
+    "成分表一括は CLI register-batch 推奨（3件ごと60秒休憩）。MCP は1件ずつ。" +
+    "成分表は手元 Vision なら get_parse_prompt → 手元 LLM → parse_transcript（llm_json 推奨）、" +
+    "または analyze_source_image（Ynosis OCR・負荷大）。" +
+    "その後 register_source。新規源泉は image_path 必須。ツール呼び出し間隔20秒以上。" +
+    "並列禁止。本番512MBのため4件以上を休憩なしで連打しない。" +
     "YNOSIS_AGENT_API_KEY と座標候補用 GOOGLE_MAPS_API_KEY が必要。" +
-    "CLI は PyPI の ynosis-agent。CSV ファイル一括は CLI / MCP。",
+    "CLI は PyPI ynosis-agent 0.2.6+。CSV 一括は CLI / MCP。",
 });
 
 const dict = z.record(z.any());
@@ -101,6 +102,44 @@ server.tool(
   }
 );
 
+server.tool(
+  "request_facility_deletion",
+  "施設の削除依頼（管理者承認後に削除）。source_link 必須。",
+  {
+    facility_id: z.number(),
+    reason: z.string(),
+    source_link: z.string(),
+  },
+  async ({ facility_id, reason, source_link }) => {
+    try {
+      return textResult(
+        dump(await client().requestFacilityDeletion(facility_id, { reason, sourceLink: source_link }))
+      );
+    } catch (e) {
+      return textResult(errText(e));
+    }
+  }
+);
+
+server.tool(
+  "request_source_deletion",
+  "源泉の削除依頼（管理者承認後に削除）。source_link 必須。",
+  {
+    source_id: z.number(),
+    reason: z.string(),
+    source_link: z.string(),
+  },
+  async ({ source_id, reason, source_link }) => {
+    try {
+      return textResult(
+        dump(await client().requestSourceDeletion(source_id, { reason, sourceLink: source_link }))
+      );
+    } catch (e) {
+      return textResult(errText(e));
+    }
+  }
+);
+
 server.tool(
   "remediate_duplicate_facility",
   "正規施設へ編集依頼（備考に重複整理メモ）→ 誤登録を withdraw。",
@@ -159,7 +198,7 @@ server.tool(
 
 server.tool(
   "register_facility",
-  "施設を1件登録する（FacilityCreate 形式）。新規前に find_existing_facility → prepare_facility_for_register 推奨。",
+  "施設を1件登録する（FacilityCreate 形式）。新規前に find_existing_facility → prepare_facility_for_register 推奨。既存ヒットで編集依頼になる場合は source_link 必須。",
   { facility: dict },
   async ({ facility }) => {
   try {
@@ -245,7 +284,7 @@ server.tool(
 
 server.tool(
   "update_facility",
-  "既存施設を部分更新する（Agent キー時は編集依頼）。",
+  "既存施設を部分更新する（Agent キー時は編集依頼）。updates に source_link（根拠 URL・http/https）必須。",
   { facility_id: z.number(), updates: dict },
   async ({ facility_id, updates }) => {
     try {
@@ -258,7 +297,7 @@ server.tool(
 
 server.tool(
   "register_source",
-  "成分表付きで施設・源泉を登録する。新規源泉は image_path（成分表画像）必須。",
+  "成分表付きで施設・源泉を登録する。新規源泉は image_path 必須。3件以上は60秒休憩。HEICは事前JPEG化推奨。",
   { payload: dict, image_path: z.string().optional() },
   async ({ payload, image_path }) => {
     try {
@@ -290,13 +329,18 @@ server.tool(
   }
 );
 
-server.tool("analyze_source_image", "成分表画像を Ynosis OCR で解析する（DB 未書込）。並列禁止。", { image_path: z.string() }, async ({ image_path }) => {
-  try {
-    return textResult(dump(await client().analyzeImage(image_path)));
-  } catch (e) {
-    return textResult(errText(e));
+server.tool(
+  "analyze_source_image",
+  "成分表画像を Ynosis OCR で解析する（DB 未書込）。並列禁止。連続呼び出しは20秒以上空ける。一括は CLI register-batch 推奨。",
+  { image_path: z.string() },
+  async ({ image_path }) => {
+    try {
+      return textResult(dump(await client().analyzeImage(image_path)));
+    } catch (e) {
+      return textResult(errText(e));
+    }
   }
-});
+);
 
 server.tool("prepare_parsed", "register_source 用に dissolved_material を mg 換算する。", { parsed: dict }, async ({ parsed }) => {
   try {