ynosis-agent-mcp 0.2.0 → 0.2.2

package/README.md

@@ -35,10 +35,13 @@ Ynosis Agent API 用の **MCP（stdio）**。Cursor など Node がある環境
 ## 施設登録フロー（Python MCP と同一）
 
 ```
-find_existing_facility → update_facility（既存）
+find_existing_facility → update_facility（既存・認定・タグ不足時も編集依頼）
                       → resolve_place_candidates → prepare_facility_for_register → register_facility（新規）
+誤登録整理: remediate_duplicate_facility（正規へ依頼 + withdraw）
 ```
 
+主要ツール: `find_existing_facility`, `prepare_facility_for_register`, `resolve_place_candidates`, `withdraw_facility`, `remediate_duplicate_facility`, `get_tag_options`
+
 ## 運営: npm 公開
 
 リポジトリ内手順: [docs/agent/publishing.md](../../docs/agent/publishing.md#npmynosis-agent-mcp)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ynosis-agent-mcp",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "scripts": {
     "test": "node --test test/*.test.mjs"
   },

package/src/client.mjs

@@ -106,6 +106,30 @@ export class AgentApiClient {
     return findExisting(this, name, prefecture, options);
   }
 
+  async withdrawFacility(facilityId) {
+    const res = await this.request("POST", `/api/agent/facilities/${facilityId}/withdraw`);
+    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 });
+  }
+
   async prepareFacilityPayload(payload, { place = null, maxResults = 5 } = {}) {
     const { filterValidTags, resolvePlaceForPayload } = await import("./facility_prepare.mjs");
     const prepared = { ...payload };
@@ -245,6 +269,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/facility_remediate.mjs

@@ -0,0 +1,102 @@
+/** Agent 重複誤登録の整理（Python ynosis_agent.facility_remediate と同期）。 */
+
+import { MATCH_SCORE_MIN, facilitySearchQueries, scoreFacilityItem } from "./facility_match.mjs";
+import { mergeFacilityUpdates } from "./facility_prepare.mjs";
+
+function appendNote(existing, line) {
+  const base = String(existing || "").trim();
+  if (base.includes(line)) return base;
+  return base ? `${base}\n${line}` : line;
+}
+
+export async function findCanonicalFacility(client, duplicate, { searchLimit = 30 } = {}) {
+  const dupId = Number(duplicate.id);
+  const name = String(duplicate.name || "").trim();
+  const prefecture = duplicate.prefecture;
+  if (!name) return null;
+
+  let bestScore = 0;
+  let bestItem = null;
+  const queries = facilitySearchQueries(name);
+
+  for (const q of queries) {
+    const params = { q, limit: searchLimit };
+    if (prefecture) params.prefecture = prefecture;
+    let res;
+    try {
+      res = await client.searchFacilities(params);
+    } catch {
+      continue;
+    }
+    for (const item of res.items || []) {
+      if (Number(item.id) === dupId) continue;
+      if (prefecture && (item.prefecture || "") !== prefecture) continue;
+      const sc = await scoreFacilityItem(name, item);
+      if (sc > bestScore) {
+        bestScore = sc;
+        bestItem = item;
+      }
+    }
+  }
+
+  if (bestScore < MATCH_SCORE_MIN || !bestItem) return null;
+  return bestItem;
+}
+
+export async function remediateDuplicateFacility(
+  client,
+  duplicateId,
+  { canonicalId = null, dryRun = false } = {}
+) {
+  const duplicate = await client.getFacility(duplicateId);
+  if (duplicate.is_agent_approved) {
+    return { ok: false, error: "承認済みのため取り下げ不可", duplicate_id: duplicateId };
+  }
+
+  let canonical = canonicalId != null ? await client.getFacility(canonicalId) : await findCanonicalFacility(client, duplicate);
+  if (!canonical) {
+    return {
+      ok: false,
+      action: "no_canonical",
+      duplicate_id: duplicateId,
+      duplicate_name: duplicate.name,
+    };
+  }
+
+  const canonId = Number(canonical.id);
+  canonical = await client.getFacility(canonId);
+  const marker =
+    `[Agent重複整理] 未承認ID ${duplicateId}「${duplicate.name}」は` +
+    ` 当施設（ID ${canonId}）と同一の誤登録。Agent 側で取り下げ${dryRun ? "予定" : "済み"}。`;
+  const proposed = { ...duplicate, notes: appendNote(canonical.notes, marker) };
+  const updates = mergeFacilityUpdates(canonical, proposed) || {};
+  if (proposed.notes !== canonical.notes) updates.notes = proposed.notes;
+
+  const result = {
+    ok: true,
+    action: "remediate",
+    duplicate_id: duplicateId,
+    duplicate_name: duplicate.name,
+    canonical_id: canonId,
+    canonical_name: canonical.name,
+    updates,
+    dry_run: dryRun,
+  };
+
+  if (dryRun) return result;
+
+  let editRequestId = null;
+  if (!Object.keys(updates).length) {
+    result.warning = "正規施設への追記差分なし（認定・タグは既に付与済みの可能性）";
+  } else {
+    const resp = await client.updateFacility(canonId, updates);
+    editRequestId = resp.edit_request_id;
+    if (!editRequestId) {
+      result.warning = "編集依頼が作成されなかった（差分なし扱い）";
+    }
+  }
+  const withdraw = await client.withdrawFacility(duplicateId);
+  result.edit_request_id = editRequestId;
+  result.withdraw = withdraw;
+  return result;
+}

package/src/server.mjs

@@ -29,7 +29,7 @@ function textResult(text) {
 
 const server = new McpServer({
   name: "ynosis-agent",
-  version: "0.2.0",
+  version: "0.2.2",
   instructions:
     "Ynosis（温泉データベース）への施設・成分表登録・検索用ツール。" +
     "新規施設登録前: find_existing_facility で重複確認 → 既存なら update_facility、" +
@@ -88,6 +88,81 @@ server.tool(
   }
 );
 
+server.tool(
+  "withdraw_facility",
+  "未承認 Agent 新規施設を取り下げ（削除）。重複誤登録の整理用。",
+  { facility_id: z.number() },
+  async ({ facility_id }) => {
+    try {
+      return textResult(dump(await client().withdrawFacility(facility_id)));
+    } catch (e) {
+      return textResult(errText(e));
+    }
+  }
+);
+
+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。",
+  {
+    duplicate_id: z.number(),
+    canonical_id: z.number().optional(),
+    dry_run: z.boolean().optional(),
+  },
+  async ({ duplicate_id, canonical_id, dry_run }) => {
+    try {
+      return textResult(
+        dump(
+          await client().remediateDuplicateFacility(duplicate_id, {
+            canonicalId: canonical_id ?? null,
+            dryRun: dry_run ?? false,
+          })
+        )
+      );
+    } catch (e) {
+      return textResult(errText(e));
+    }
+  }
+);
+
 server.tool(
   "find_existing_facility",
   "登録前に既存施設を照合（未承認含む）。ヒット時は update_facility、無ければ新規 register_facility。",
@@ -122,7 +197,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 {
@@ -208,7 +283,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 {