@hanna84/mcp-writing 3.25.0 → 3.27.0

package/CHANGELOG.md

@@ -4,9 +4,23 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v3.27.0](https://github.com/hannasdev/mcp-writing/compare/v3.26.0...v3.27.0)
+
+- feat(metadata): accept forgiving relationship evidence inputs [`#237`](https://github.com/hannasdev/mcp-writing/pull/237)
+
+#### [v3.26.0](https://github.com/hannasdev/mcp-writing/compare/v3.25.0...v3.26.0)
+
+> 6 June 2026
+
+- feat: add canonical target resolver [`#236`](https://github.com/hannasdev/mcp-writing/pull/236)
+- Release 3.26.0 [`bb01109`](https://github.com/hannasdev/mcp-writing/commit/bb01109bdef98ad7020ffabc4fd249017b51998c)
+
 #### [v3.25.0](https://github.com/hannasdev/mcp-writing/compare/v3.24.1...v3.25.0)
 
+> 6 June 2026
+
 - feat: clarify M1 workflow and relationship responses [`#235`](https://github.com/hannasdev/mcp-writing/pull/235)
+- Release 3.25.0 [`45b7c47`](https://github.com/hannasdev/mcp-writing/commit/45b7c4782ca6d6e54d66a49bcee5ae40d3f1cd69)
 
 #### [v3.24.1](https://github.com/hannasdev/mcp-writing/compare/v3.24.0...v3.24.1)
 

package/README.md

@@ -152,7 +152,7 @@ Outcome: subplot structure stays visible and auditable, which reduces dropped th
 Goal: keep indexes accurate without manually re-tagging everything.
 
 1. After rewriting scenes, call `enrich_scene` to re-derive lightweight metadata from current prose.
-2. Use `update_scene_metadata` for intentional editorial fields (for example, beat, POV, status, and tags). It rejects scene `characters` and `places`; use `connect_character_place_evidence` when a scene proves paired sheet-backed character/place evidence, `connect_scene_character_evidence` for character-only evidence, and `connect_scene_place_evidence` for place-only evidence. Use `audit_relationship_metadata` for retained sidecar/frontmatter relationship fields. Use `list_chapters` plus `assign_scene_to_chapter` or `move_scene` for chapter placement and ordering.
+2. Use `update_scene_metadata` for intentional editorial fields (for example, beat, POV, status, and tags). It rejects scene `characters` and `places`; use `connect_character_place_evidence` when a scene proves paired sheet-backed character/place evidence, `connect_scene_character_evidence` for character-only evidence, and `connect_scene_place_evidence` for place-only evidence. Those relationship evidence tools prefer canonical IDs but also accept unambiguous scene titles, character names, place names, and case variants; ambiguous or suggested-only matches fail without mutating state. Use `audit_relationship_metadata` for retained sidecar/frontmatter relationship fields. Use `list_chapters` plus `assign_scene_to_chapter` or `move_scene` for chapter placement and ordering.
 3. Use `search_metadata` for keyword/FTS metadata searches across indexed titles, loglines, tags, characters, places, and versions, and use `find_scenes` to verify scenes are discoverable under structured filters. After identifying likely scenes, use `get_scene_prose` for prose context.
 
 Outcome: your AI assistant can reliably find the right scenes without drifting from the manuscript.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanna84/mcp-writing",
-  "version": "3.25.0",
+  "version": "3.27.0",
   "description": "MCP service for AI-assisted reasoning and editing on long-form fiction projects",
   "homepage": "https://hannasdev.github.io/mcp-writing/",
   "type": "module",

package/src/core/canonical-target-resolution.js

@@ -0,0 +1,416 @@
+const DEFAULT_CANDIDATE_LIMIT = 5;
+const HARD_CANDIDATE_LIMIT = 10;
+
+const MATCH_GROUP_ORDER = new Map([
+  ["exact_id", 0],
+  ["case_insensitive_id", 1],
+  ["case_insensitive_name", 2],
+  ["case_insensitive_title", 2],
+  ["near_match_suggestion", 3],
+]);
+
+function normalizeValue(value) {
+  return String(value ?? "").trim().toLowerCase();
+}
+
+function clampCandidateLimit(candidateLimit) {
+  if (!Number.isInteger(candidateLimit) || candidateLimit <= 0) {
+    return DEFAULT_CANDIDATE_LIMIT;
+  }
+  return Math.min(candidateLimit, HARD_CANDIDATE_LIMIT);
+}
+
+function getProjectUniverseId(db, projectId) {
+  return db.prepare(`SELECT universe_id FROM projects WHERE project_id = ?`).get(projectId)?.universe_id ?? null;
+}
+
+function levenshteinDistance(left, right) {
+  if (left === right) return 0;
+  if (left.length === 0) return right.length;
+  if (right.length === 0) return left.length;
+
+  const previous = Array.from({ length: right.length + 1 }, (_, index) => index);
+  const current = Array.from({ length: right.length + 1 }, () => 0);
+
+  for (let leftIndex = 1; leftIndex <= left.length; leftIndex += 1) {
+    current[0] = leftIndex;
+    for (let rightIndex = 1; rightIndex <= right.length; rightIndex += 1) {
+      const cost = left[leftIndex - 1] === right[rightIndex - 1] ? 0 : 1;
+      current[rightIndex] = Math.min(
+        current[rightIndex - 1] + 1,
+        previous[rightIndex] + 1,
+        previous[rightIndex - 1] + cost
+      );
+    }
+    for (let index = 0; index < previous.length; index += 1) {
+      previous[index] = current[index];
+    }
+  }
+
+  return previous[right.length];
+}
+
+function isNearMatch(input, value) {
+  const normalizedInput = normalizeValue(input);
+  const normalizedValue = normalizeValue(value);
+  if (!normalizedInput || !normalizedValue) return false;
+  if (normalizedInput.length < 3 || normalizedValue.length < 3) return false;
+  if (normalizedValue.includes(normalizedInput) || normalizedInput.includes(normalizedValue)) return true;
+
+  const distance = levenshteinDistance(normalizedInput, normalizedValue);
+  const threshold = Math.max(1, Math.floor(Math.max(normalizedInput.length, normalizedValue.length) / 4));
+  return distance <= threshold;
+}
+
+function sortCandidates(candidates) {
+  return [...candidates].sort((left, right) => {
+    const groupDelta = (MATCH_GROUP_ORDER.get(left.match_type) ?? 99) - (MATCH_GROUP_ORDER.get(right.match_type) ?? 99);
+    if (groupDelta !== 0) return groupDelta;
+
+    const labelDelta = normalizeValue(left.label).localeCompare(normalizeValue(right.label));
+    if (labelDelta !== 0) return labelDelta;
+
+    return left.id.localeCompare(right.id);
+  });
+}
+
+function capCandidates(candidates, candidateLimit) {
+  return sortCandidates(candidates).slice(0, clampCandidateLimit(candidateLimit));
+}
+
+function formatSceneCandidate(row, { matchedField, matchType }) {
+  return {
+    target_kind: "scene",
+    id: row.scene_id,
+    label: row.title || row.scene_id,
+    matched_field: matchedField,
+    match_type: matchType,
+    project_id: row.project_id,
+    context: {
+      project_id: row.project_id,
+      title: row.title ?? null,
+      chapter_id: row.chapter_id ?? null,
+      chapter_title: row.chapter_title ?? null,
+      timeline_position: row.timeline_position ?? null,
+    },
+  };
+}
+
+function formatCharacterCandidate(row, { matchedField, matchType }) {
+  return {
+    target_kind: "character",
+    id: row.character_id,
+    label: row.name || row.character_id,
+    matched_field: matchedField,
+    match_type: matchType,
+    project_id: row.project_id ?? null,
+    universe_id: row.universe_id ?? null,
+    context: {
+      role: row.role ?? null,
+      first_appearance: row.first_appearance ?? null,
+    },
+  };
+}
+
+function formatPlaceCandidate(row, { matchedField, matchType }) {
+  return {
+    target_kind: "place",
+    id: row.place_id,
+    label: row.name || row.place_id,
+    matched_field: matchedField,
+    match_type: matchType,
+    project_id: row.project_id ?? null,
+    universe_id: row.universe_id ?? null,
+  };
+}
+
+function buildResolvedFrom(argumentName, input, candidate) {
+  if (candidate.match_type === "exact_id") return undefined;
+  return {
+    [argumentName]: {
+      input,
+      matched_field: candidate.matched_field,
+      match_type: candidate.match_type,
+      id: candidate.id,
+    },
+  };
+}
+
+function nextStepForTargetKind(targetKind) {
+  if (targetKind === "scene") {
+    return "Use find_scenes with project_id to identify the canonical scene_id, then retry with the stable ID.";
+  }
+  if (targetKind === "character") {
+    return "Use list_characters to inspect candidate character_id values for this project or universe, then retry with the stable ID.";
+  }
+  return "Use list_places to inspect candidate place_id values for this project or universe, then retry with the stable ID.";
+}
+
+function buildResolutionFailure({ targetKind, input, projectId, universeId, candidates, candidateLimit }) {
+  const cappedCandidates = capCandidates(candidates, candidateLimit);
+  const details = {
+    lookup_kind: targetKind,
+    target_kind: targetKind,
+    input,
+    project_id: projectId,
+    ...(universeId !== undefined ? { universe_id: universeId } : {}),
+    candidate_matches: cappedCandidates,
+    next_step: nextStepForTargetKind(targetKind),
+  };
+
+  if (candidates.some(candidate => candidate.match_type !== "near_match_suggestion")) {
+    return {
+      ok: false,
+      error: {
+        code: "AMBIGUOUS_TARGET",
+        message: `${targetKind} '${input}' resolves to multiple canonical targets. Use a stable canonical ID.`,
+        details,
+      },
+    };
+  }
+
+  return {
+    ok: false,
+    error: {
+      code: "NOT_FOUND",
+      message: `${targetKind} '${input}' was not found in the provided scope.`,
+      details,
+    },
+  };
+}
+
+function buildSuccess({ targetKind, input, argumentName, row, candidate, idField, rowField }) {
+  const resolvedFrom = buildResolvedFrom(argumentName, input, candidate);
+  return {
+    ok: true,
+    target_kind: targetKind,
+    id: candidate.id,
+    [idField]: candidate.id,
+    [rowField]: row,
+    canonical: candidate.match_type === "exact_id",
+    match: {
+      matched_field: candidate.matched_field,
+      match_type: candidate.match_type,
+      id: candidate.id,
+    },
+    ...(resolvedFrom ? { resolved_from: resolvedFrom } : {}),
+  };
+}
+
+function resolveFromRows({
+  rows,
+  input,
+  targetKind,
+  idField,
+  nameField,
+  nameMatchType,
+  argumentName,
+  projectId,
+  universeId,
+  candidateLimit,
+  formatCandidate,
+}) {
+  const normalizedInput = normalizeValue(input);
+  if (!normalizedInput) {
+    return buildResolutionFailure({
+      targetKind,
+      input,
+      projectId,
+      universeId,
+      candidateLimit,
+      candidates: [],
+    });
+  }
+
+  const exactIdRows = rows.filter(row => row[idField] === input);
+  if (exactIdRows.length === 1) {
+    const candidate = formatCandidate(exactIdRows[0], { matchedField: idField, matchType: "exact_id" });
+    return buildSuccess({
+      targetKind,
+      input,
+      argumentName,
+      row: exactIdRows[0],
+      candidate,
+      idField,
+      rowField: targetKind,
+    });
+  }
+
+  const caseInsensitiveIdRows = rows.filter(row => normalizeValue(row[idField]) === normalizedInput);
+  if (caseInsensitiveIdRows.length === 1) {
+    const candidate = formatCandidate(caseInsensitiveIdRows[0], { matchedField: idField, matchType: "case_insensitive_id" });
+    return buildSuccess({
+      targetKind,
+      input,
+      argumentName,
+      row: caseInsensitiveIdRows[0],
+      candidate,
+      idField,
+      rowField: targetKind,
+    });
+  }
+  if (caseInsensitiveIdRows.length > 1) {
+    return buildResolutionFailure({
+      targetKind,
+      input,
+      projectId,
+      universeId,
+      candidateLimit,
+      candidates: caseInsensitiveIdRows.map(row => formatCandidate(row, {
+        matchedField: idField,
+        matchType: "case_insensitive_id",
+      })),
+    });
+  }
+
+  const caseInsensitiveNameRows = rows.filter(row => normalizeValue(row[nameField]) === normalizedInput);
+  if (caseInsensitiveNameRows.length === 1) {
+    const candidate = formatCandidate(caseInsensitiveNameRows[0], { matchedField: nameField, matchType: nameMatchType });
+    return buildSuccess({
+      targetKind,
+      input,
+      argumentName,
+      row: caseInsensitiveNameRows[0],
+      candidate,
+      idField,
+      rowField: targetKind,
+    });
+  }
+  if (caseInsensitiveNameRows.length > 1) {
+    return buildResolutionFailure({
+      targetKind,
+      input,
+      projectId,
+      universeId,
+      candidateLimit,
+      candidates: caseInsensitiveNameRows.map(row => formatCandidate(row, {
+        matchedField: nameField,
+        matchType: nameMatchType,
+      })),
+    });
+  }
+
+  const suggestionsById = rows
+    .filter(row => isNearMatch(input, row[idField]))
+    .map(row => formatCandidate(row, { matchedField: idField, matchType: "near_match_suggestion" }));
+  const suggestedIds = new Set(suggestionsById.map(candidate => candidate.id));
+  const suggestionsByName = rows
+    .filter(row => !suggestedIds.has(row[idField]) && isNearMatch(input, row[nameField]))
+    .map(row => formatCandidate(row, { matchedField: nameField, matchType: "near_match_suggestion" }));
+
+  return buildResolutionFailure({
+    targetKind,
+    input,
+    projectId,
+    universeId,
+    candidateLimit,
+    candidates: [...suggestionsById, ...suggestionsByName],
+  });
+}
+
+export function resolveSceneTarget(db, {
+  projectId,
+  input,
+  argumentName = "scene_id",
+  candidateLimit = DEFAULT_CANDIDATE_LIMIT,
+} = {}) {
+  const rows = db.prepare(`
+    SELECT scene_id, project_id, title, chapter_id, chapter_title, timeline_position
+    FROM scenes
+    WHERE project_id = ?
+    ORDER BY title COLLATE NOCASE, scene_id
+  `).all(projectId);
+
+  return resolveFromRows({
+    rows,
+    input,
+    targetKind: "scene",
+    idField: "scene_id",
+    nameField: "title",
+    nameMatchType: "case_insensitive_title",
+    argumentName,
+    projectId,
+    universeId: undefined,
+    candidateLimit,
+    formatCandidate: formatSceneCandidate,
+  });
+}
+
+function selectRelationshipScopedCharacters(db, { projectId }) {
+  const universeId = getProjectUniverseId(db, projectId);
+  return {
+    universeId,
+    rows: db.prepare(`
+      SELECT character_id, project_id, universe_id, name, role, first_appearance
+      FROM characters
+      WHERE project_id = ?
+        OR (universe_id IS NOT NULL AND universe_id = ?)
+        OR (project_id IS NULL AND universe_id IS NULL)
+      ORDER BY name COLLATE NOCASE, character_id
+    `).all(projectId, universeId),
+  };
+}
+
+function selectRelationshipScopedPlaces(db, { projectId }) {
+  const universeId = getProjectUniverseId(db, projectId);
+  return {
+    universeId,
+    rows: db.prepare(`
+      SELECT place_id, project_id, universe_id, name
+      FROM places
+      WHERE project_id = ?
+        OR (universe_id IS NOT NULL AND universe_id = ?)
+        OR (project_id IS NULL AND universe_id IS NULL)
+      ORDER BY name COLLATE NOCASE, place_id
+    `).all(projectId, universeId),
+  };
+}
+
+export function resolveCharacterTargetForProject(db, {
+  projectId,
+  input,
+  argumentName = "character_id",
+  candidateLimit = DEFAULT_CANDIDATE_LIMIT,
+} = {}) {
+  const { universeId, rows } = selectRelationshipScopedCharacters(db, { projectId });
+  return resolveFromRows({
+    rows,
+    input,
+    targetKind: "character",
+    idField: "character_id",
+    nameField: "name",
+    nameMatchType: "case_insensitive_name",
+    argumentName,
+    projectId,
+    universeId,
+    candidateLimit,
+    formatCandidate: formatCharacterCandidate,
+  });
+}
+
+export function resolvePlaceTargetForProject(db, {
+  projectId,
+  input,
+  argumentName = "place_id",
+  candidateLimit = DEFAULT_CANDIDATE_LIMIT,
+} = {}) {
+  const { universeId, rows } = selectRelationshipScopedPlaces(db, { projectId });
+  return resolveFromRows({
+    rows,
+    input,
+    targetKind: "place",
+    idField: "place_id",
+    nameField: "name",
+    nameMatchType: "case_insensitive_name",
+    argumentName,
+    projectId,
+    universeId,
+    candidateLimit,
+    formatCandidate: formatPlaceCandidate,
+  });
+}
+
+export const CANONICAL_TARGET_CANDIDATE_LIMITS = {
+  default: DEFAULT_CANDIDATE_LIMIT,
+  hard: HARD_CANDIDATE_LIMIT,
+};

package/src/tools/metadata.js

@@ -5,6 +5,11 @@ import matter from "gray-matter";
 import { readMeta, readSourceMeta, writeMeta, indexSceneFile, isManagedStructureProject, normalizeSceneMetaForPath, resolveSceneCharacterCompatibilityId } from "../sync/sync.js";
 import { validateProjectId, validateUniverseId } from "../sync/importer.js";
 import { resolveValidatedChapterFilter } from "../core/chapter-resolution.js";
+import {
+  resolveCharacterTargetForProject,
+  resolvePlaceTargetForProject,
+  resolveSceneTarget,
+} from "../core/canonical-target-resolution.js";
 import {
   FILESYSTEM_ARTIFACT_CLASSES,
   assertRegularFileReadTarget,
@@ -130,38 +135,26 @@ function buildRelationshipMetadataBoundaryDetails({ projectId, sceneId, blockedF
   };
 }
 
-function relationshipEvidenceNotFoundDetails({ lookupKind, input, projectId, sceneId }) {
-  const details = {
-    lookup_kind: lookupKind,
-    input,
-    project_id: projectId,
-  };
-  if (sceneId !== undefined) {
-    details.scene_id = sceneId;
-  }
-
-  if (lookupKind === "scene") {
-    return {
-      ...details,
-      next_step: "Use find_scenes with the project_id to confirm the canonical scene_id, then retry the relationship evidence tool.",
-    };
-  }
+function alreadyLinkedRelationshipNextStep({ entityKind }) {
+  return `This ${entityKind} was already linked to the scene, so no canonical relationship rows changed. Use the scene_relationships field in this response to inspect current links; call get_scene_prose with the scene_id and project_id if prose context is needed.`;
+}
 
-  if (lookupKind === "character") {
-    return {
-      ...details,
-      next_step: "Use list_characters to find the stable character_id for this project or universe, then retry the relationship evidence tool.",
-    };
+function mergeResolvedFrom(...resolutions) {
+  const merged = {};
+  for (const resolution of resolutions) {
+    if (resolution?.resolved_from) {
+      Object.assign(merged, resolution.resolved_from);
+    }
   }
-
-  return {
-    ...details,
-    next_step: "Use list_places to find the stable place_id for this project or universe, then retry the relationship evidence tool.",
-  };
+  return Object.keys(merged).length > 0 ? merged : undefined;
 }
 
-function alreadyLinkedRelationshipNextStep({ entityKind }) {
-  return `This ${entityKind} was already linked to the scene, so no canonical relationship rows changed. Use the scene_relationships field in this response to inspect current links; call get_scene_prose with the scene_id and project_id if prose context is needed.`;
+function relationshipEvidenceResolutionError(errorResponse, resolution, { sceneId } = {}) {
+  const details = {
+    ...(resolution.error.details ?? {}),
+    ...(sceneId !== undefined ? { scene_id: sceneId } : {}),
+  };
+  return errorResponse(resolution.error.code, resolution.error.message, details);
 }
 
 function persistReferenceDocLink({ filePath, syncDir, targetDocId, relation }) {
@@ -461,21 +454,6 @@ function resolveCharacterForProject(db, { characterId, projectId }) {
   `).get(characterId, projectId, universeId);
 }
 
-function resolvePlaceForProject(db, { placeId, projectId }) {
-  const universeId = getProjectUniverseId(db, projectId);
-  return db.prepare(`
-    SELECT place_id, project_id, universe_id, name
-    FROM places
-    WHERE place_id = ?
-      AND (
-        project_id = ?
-        OR (universe_id IS NOT NULL AND universe_id = ?)
-        OR (project_id IS NULL AND universe_id IS NULL)
-      )
-    LIMIT 1
-  `).get(placeId, projectId, universeId);
-}
-
 function querySceneRelationshipSnapshot(db, { sceneId, projectId }) {
   return {
     characters: db.prepare(`
@@ -890,61 +868,53 @@ export function registerMetadataTools(s, {
       return errorResponse("INVALID_PROJECT_ID", projectIdCheck.reason, { project_id });
     }
 
+    const sceneResolution = resolveSceneTarget(db, {
+      projectId: project_id,
+      input: scene_id,
+      argumentName: "scene_id",
+    });
+    if (!sceneResolution.ok) {
+      return relationshipEvidenceResolutionError(errorResponse, sceneResolution);
+    }
+    const canonicalSceneId = sceneResolution.scene_id;
+
     const scene = db.prepare(`
       SELECT scene_id, project_id, file_path
       FROM scenes
       WHERE scene_id = ? AND project_id = ?
-    `).get(scene_id, project_id);
-    if (!scene) {
-      return errorResponse(
-        "NOT_FOUND",
-        `Scene '${scene_id}' not found in project '${project_id}'.`,
-        relationshipEvidenceNotFoundDetails({
-          lookupKind: "scene",
-          input: scene_id,
-          projectId: project_id,
-        })
-      );
-    }
+    `).get(canonicalSceneId, project_id);
 
-    const character = resolveCharacterForProject(db, { characterId: character_id, projectId: project_id });
-    if (!character) {
-      return errorResponse(
-        "NOT_FOUND",
-        `Character '${character_id}' is not indexed for project '${project_id}' or its universe.`,
-        relationshipEvidenceNotFoundDetails({
-          lookupKind: "character",
-          input: character_id,
-          projectId: project_id,
-          sceneId: scene_id,
-        })
-      );
+    const characterResolution = resolveCharacterTargetForProject(db, {
+      projectId: project_id,
+      input: character_id,
+      argumentName: "character_id",
+    });
+    if (!characterResolution.ok) {
+      return relationshipEvidenceResolutionError(errorResponse, characterResolution, { sceneId: canonicalSceneId });
     }
-    const place = resolvePlaceForProject(db, { placeId: place_id, projectId: project_id });
-    if (!place) {
-      return errorResponse(
-        "NOT_FOUND",
-        `Place '${place_id}' is not indexed for project '${project_id}' or its universe.`,
-        relationshipEvidenceNotFoundDetails({
-          lookupKind: "place",
-          input: place_id,
-          projectId: project_id,
-          sceneId: scene_id,
-        })
-      );
+    const canonicalCharacterId = characterResolution.character_id;
+
+    const placeResolution = resolvePlaceTargetForProject(db, {
+      projectId: project_id,
+      input: place_id,
+      argumentName: "place_id",
+    });
+    if (!placeResolution.ok) {
+      return relationshipEvidenceResolutionError(errorResponse, placeResolution, { sceneId: canonicalSceneId });
     }
+    const canonicalPlaceId = placeResolution.place_id;
 
-    const before = querySceneRelationshipSnapshot(db, { sceneId: scene_id, projectId: project_id });
+    const before = querySceneRelationshipSnapshot(db, { sceneId: canonicalSceneId, projectId: project_id });
     try {
       db.exec("BEGIN");
       db.prepare(`
         INSERT OR IGNORE INTO scene_characters (scene_id, project_id, character_id)
         VALUES (?, ?, ?)
-      `).run(scene_id, project_id, character_id);
+      `).run(canonicalSceneId, project_id, canonicalCharacterId);
       db.prepare(`
         INSERT OR IGNORE INTO scene_places (scene_id, project_id, place_id)
         VALUES (?, ?, ?)
-      `).run(scene_id, project_id, place_id);
+      `).run(canonicalSceneId, project_id, canonicalPlaceId);
       db.exec("COMMIT");
     } catch (err) {
       try {
@@ -952,10 +922,10 @@ export function registerMetadataTools(s, {
       } catch (rollbackErr) {
         void rollbackErr;
       }
-      return errorResponse("IO_ERROR", `Failed to connect character/place evidence for scene '${scene_id}': ${err.message}`);
+      return errorResponse("IO_ERROR", `Failed to connect character/place evidence for scene '${canonicalSceneId}': ${err.message}`);
     }
 
-    const after = querySceneRelationshipSnapshot(db, { sceneId: scene_id, projectId: project_id });
+    const after = querySceneRelationshipSnapshot(db, { sceneId: canonicalSceneId, projectId: project_id });
     const backupResult = refreshProjectScopedBackupAfterMutation(db, {
       syncDir: SYNC_DIR,
       projectId: project_id,
@@ -963,11 +933,11 @@ export function registerMetadataTools(s, {
       operation: "connect_character_place_evidence",
       actor: createToolActor("connect_character_place_evidence"),
       affected: {
-        scenes: [scene_id],
-        characters: [character_id],
-        places: [place_id],
+        scenes: [canonicalSceneId],
+        characters: [canonicalCharacterId],
+        places: [canonicalPlaceId],
       },
-      summary: `Connected character "${character_id}" and place "${place_id}" as evidence in scene "${scene_id}".`,
+      summary: `Connected character "${canonicalCharacterId}" and place "${canonicalPlaceId}" as evidence in scene "${canonicalSceneId}".`,
       before: {
         scene_relationships: before,
       },
@@ -984,10 +954,10 @@ export function registerMetadataTools(s, {
       compatibilityDiagnostics.push({
         code: "STALE_PATH",
         severity: "warning",
-        message: `Canonical scene relationship evidence was committed, but scene '${scene_id}' has no indexed file path for generated compatibility output.`,
+        message: `Canonical scene relationship evidence was committed, but scene '${canonicalSceneId}' has no indexed file path for generated compatibility output.`,
         next_step: "Treat SQLite and project backup artifacts as current. Run sync and inspect the indexed scene path before retrying compatibility output.",
         details: {
-          scene_id,
+          scene_id: canonicalSceneId,
           project_id,
           indexed_path: null,
         },
@@ -996,7 +966,7 @@ export function registerMetadataTools(s, {
       try {
         writeSceneRelationshipCompatibilityOutput({
           db,
-          sceneId: scene_id,
+          sceneId: canonicalSceneId,
           projectId: project_id,
           scenePath: scene.file_path,
           syncDir: SYNC_DIR,
@@ -1009,7 +979,7 @@ export function registerMetadataTools(s, {
           message: `Canonical scene relationship evidence was committed, but generated scene metadata compatibility output could not be refreshed: ${err.message}`,
           next_step: "Treat SQLite and project backup artifacts as current. Run sync and inspect the indexed scene path before retrying compatibility output.",
           details: {
-            scene_id,
+            scene_id: canonicalSceneId,
             project_id,
             indexed_path: scene.file_path,
           },
@@ -1017,13 +987,15 @@ export function registerMetadataTools(s, {
       }
     }
 
+    const resolvedFrom = mergeResolvedFrom(sceneResolution, characterResolution, placeResolution);
     return jsonResponse({
       ok: true,
       action: "connected",
-      scene_id,
+      scene_id: canonicalSceneId,
       project_id,
-      character_id,
-      place_id,
+      character_id: canonicalCharacterId,
+      place_id: canonicalPlaceId,
+      ...(resolvedFrom ? { resolved_from: resolvedFrom } : {}),
       note: note ?? null,
       mutation_order: [
         "validated_request",
@@ -1059,45 +1031,36 @@ export function registerMetadataTools(s, {
       return errorResponse("INVALID_PROJECT_ID", projectIdCheck.reason, { project_id });
     }
 
+    const sceneResolution = resolveSceneTarget(db, {
+      projectId: project_id,
+      input: scene_id,
+      argumentName: "scene_id",
+    });
+    if (!sceneResolution.ok) {
+      return relationshipEvidenceResolutionError(errorResponse, sceneResolution);
+    }
+    const canonicalSceneId = sceneResolution.scene_id;
+
     const scene = db.prepare(`
       SELECT scene_id, project_id, file_path
       FROM scenes
       WHERE scene_id = ? AND project_id = ?
-    `).get(scene_id, project_id);
-    if (!scene) {
-      return errorResponse(
-        "NOT_FOUND",
-        `Scene '${scene_id}' not found in project '${project_id}'.`,
-        relationshipEvidenceNotFoundDetails({
-          lookupKind: "scene",
-          input: scene_id,
-          projectId: project_id,
-        })
-      );
-    }
+    `).get(canonicalSceneId, project_id);
 
-    if (!resolveEntity(entity_id)) {
-      const label = entityKind[0].toUpperCase() + entityKind.slice(1);
-      return errorResponse(
-        "NOT_FOUND",
-        `${label} '${entity_id}' is not indexed for project '${project_id}' or its universe.`,
-        relationshipEvidenceNotFoundDetails({
-          lookupKind: entityKind,
-          input: entity_id,
-          projectId: project_id,
-          sceneId: scene_id,
-        })
-      );
+    const entityResolution = resolveEntity(entity_id);
+    if (!entityResolution.ok) {
+      return relationshipEvidenceResolutionError(errorResponse, entityResolution, { sceneId: canonicalSceneId });
     }
+    const canonicalEntityId = entityResolution[idField];
 
-    const before = querySceneRelationshipSnapshot(db, { sceneId: scene_id, projectId: project_id });
-    const alreadyLinked = before[entityKind === "character" ? "characters" : "places"].includes(entity_id);
+    const before = querySceneRelationshipSnapshot(db, { sceneId: canonicalSceneId, projectId: project_id });
+    const alreadyLinked = before[entityKind === "character" ? "characters" : "places"].includes(canonicalEntityId);
     try {
       db.exec("BEGIN");
       db.prepare(`
         INSERT OR IGNORE INTO ${tableName} (scene_id, project_id, ${idField})
         VALUES (?, ?, ?)
-      `).run(scene_id, project_id, entity_id);
+      `).run(canonicalSceneId, project_id, canonicalEntityId);
       db.exec("COMMIT");
     } catch (err) {
       try {
@@ -1105,10 +1068,10 @@ export function registerMetadataTools(s, {
       } catch (rollbackErr) {
         void rollbackErr;
       }
-      return errorResponse("IO_ERROR", `Failed to connect scene ${entityKind} evidence for scene '${scene_id}': ${err.message}`);
+      return errorResponse("IO_ERROR", `Failed to connect scene ${entityKind} evidence for scene '${canonicalSceneId}': ${err.message}`);
     }
 
-    const after = querySceneRelationshipSnapshot(db, { sceneId: scene_id, projectId: project_id });
+    const after = querySceneRelationshipSnapshot(db, { sceneId: canonicalSceneId, projectId: project_id });
     const backupResult = refreshProjectScopedBackupAfterMutation(db, {
       syncDir: SYNC_DIR,
       projectId: project_id,
@@ -1116,10 +1079,10 @@ export function registerMetadataTools(s, {
       operation,
       actor: createToolActor(operation),
       affected: {
-        scenes: [scene_id],
-        [`${entityKind}s`]: [entity_id],
+        scenes: [canonicalSceneId],
+        [`${entityKind}s`]: [canonicalEntityId],
       },
-      summary: `Connected ${entityKind} "${entity_id}" as evidence in scene "${scene_id}".`,
+      summary: `Connected ${entityKind} "${canonicalEntityId}" as evidence in scene "${canonicalSceneId}".`,
       before: {
         scene_relationships: before,
       },
@@ -1136,10 +1099,10 @@ export function registerMetadataTools(s, {
       compatibilityDiagnostics.push({
         code: "STALE_PATH",
         severity: "warning",
-        message: `Canonical scene ${entityKind} evidence was committed, but scene '${scene_id}' has no indexed file path for generated compatibility output.`,
+        message: `Canonical scene ${entityKind} evidence was committed, but scene '${canonicalSceneId}' has no indexed file path for generated compatibility output.`,
         next_step: "Treat SQLite and project backup artifacts as current. Run sync and inspect the indexed scene path before retrying compatibility output.",
         details: {
-          scene_id,
+          scene_id: canonicalSceneId,
           project_id,
           indexed_path: null,
         },
@@ -1148,7 +1111,7 @@ export function registerMetadataTools(s, {
       try {
         writeSceneRelationshipCompatibilityOutput({
           db,
-          sceneId: scene_id,
+          sceneId: canonicalSceneId,
           projectId: project_id,
           scenePath: scene.file_path,
           syncDir: SYNC_DIR,
@@ -1161,7 +1124,7 @@ export function registerMetadataTools(s, {
           message: `Canonical scene ${entityKind} evidence was committed, but generated scene metadata compatibility output could not be refreshed: ${err.message}`,
           next_step: "Treat SQLite and project backup artifacts as current. Run sync and inspect the indexed scene path before retrying compatibility output.",
           details: {
-            scene_id,
+            scene_id: canonicalSceneId,
             project_id,
             indexed_path: scene.file_path,
           },
@@ -1169,6 +1132,7 @@ export function registerMetadataTools(s, {
       }
     }
 
+    const resolvedFrom = mergeResolvedFrom(sceneResolution, entityResolution);
     return jsonResponse({
       ok: true,
       action: "connected",
@@ -1177,9 +1141,10 @@ export function registerMetadataTools(s, {
       ...(alreadyLinked
         ? { next_step: alreadyLinkedRelationshipNextStep({ entityKind }) }
         : {}),
-      scene_id,
+      scene_id: canonicalSceneId,
       project_id,
-      [idField]: entity_id,
+      [idField]: canonicalEntityId,
+      ...(resolvedFrom ? { resolved_from: resolvedFrom } : {}),
       note: note ?? null,
       scene_relationships: after,
       mutation_order: [
@@ -1207,7 +1172,11 @@ export function registerMetadataTools(s, {
       entityKind: "character",
       idField: "character_id",
       tableName: "scene_characters",
-      resolveEntity: (characterId) => resolveCharacterForProject(db, { characterId, projectId: args.project_id }),
+      resolveEntity: (characterId) => resolveCharacterTargetForProject(db, {
+        projectId: args.project_id,
+        input: characterId,
+        argumentName: "character_id",
+      }),
     });
   }
 
@@ -1222,7 +1191,11 @@ export function registerMetadataTools(s, {
       entityKind: "place",
       idField: "place_id",
       tableName: "scene_places",
-      resolveEntity: (placeId) => resolvePlaceForProject(db, { placeId, projectId: args.project_id }),
+      resolveEntity: (placeId) => resolvePlaceTargetForProject(db, {
+        projectId: args.project_id,
+        input: placeId,
+        argumentName: "place_id",
+      }),
     });
   }
 
@@ -1733,12 +1706,12 @@ export function registerMetadataTools(s, {
   // ---- connect_character_place_evidence ------------------------------------
   s.tool(
     "connect_character_place_evidence",
-    "Connect a character and place as paired scene-backed story evidence. This outcome-level workflow covers sheet-backed character/place associations: SQLite scene relationship indexes commit first, project backups refresh after commit, and scene sidecar characters/places are regenerated only as generated compatibility output from canonical indexes. Use connect_scene_character_evidence or connect_scene_place_evidence for one-sided scene evidence.",
+    "Connect a character and place as paired scene-backed story evidence. This outcome-level workflow covers sheet-backed character/place associations: SQLite scene relationship indexes commit first, project backups refresh after commit, and scene sidecar characters/places are regenerated only as generated compatibility output from canonical indexes. Canonical IDs are preferred; unambiguous case-insensitive scene titles, character names, place names, and ID variants are resolved to canonical IDs before mutation. Ambiguous or suggested-only matches fail without mutating state. Use connect_scene_character_evidence or connect_scene_place_evidence for one-sided scene evidence.",
     {
       project_id: z.string().describe("Project the scene belongs to (e.g. 'the-lamb')."),
-      scene_id: z.string().describe("Scene that provides the evidence for this character/place association."),
-      character_id: z.string().describe("Character present in the scene. Use list_characters to find valid IDs."),
-      place_id: z.string().describe("Place present in the scene. Use list_places to find valid IDs."),
+      scene_id: z.string().describe("Scene that provides the evidence. Prefer canonical scene_id; an unambiguous case-insensitive scene_id or unique scene title in this project is also accepted."),
+      character_id: z.string().describe("Character present in the scene. Prefer canonical character_id; an unambiguous case-insensitive character_id or character name in this project/universe scope is also accepted."),
+      place_id: z.string().describe("Place present in the scene. Prefer canonical place_id; an unambiguous case-insensitive place_id or place name in this project/universe scope is also accepted."),
       note: z.string().optional().describe("Optional review note explaining the evidence. Stored in operation history, not in compatibility sidecars."),
     },
     async (args) => connectCharacterPlaceEvidence(args)
@@ -1747,11 +1720,11 @@ export function registerMetadataTools(s, {
   // ---- connect_scene_character_evidence -----------------------------------
   s.tool(
     "connect_scene_character_evidence",
-    "Connect a sheet-backed character to a scene without requiring paired place evidence. This outcome-level workflow records character-only scene evidence in SQLite first, refreshes project backups after commit, and regenerates scene sidecar characters/places only as generated compatibility output from canonical indexes.",
+    "Connect a sheet-backed character to a scene without requiring paired place evidence. This outcome-level workflow records character-only scene evidence in SQLite first, refreshes project backups after commit, and regenerates scene sidecar characters/places only as generated compatibility output from canonical indexes. Canonical IDs are preferred; unambiguous case-insensitive scene titles, character names, and ID variants are resolved to canonical IDs before mutation. Ambiguous or suggested-only matches fail without mutating state.",
     {
       project_id: z.string().describe("Project the scene belongs to (e.g. 'the-lamb')."),
-      scene_id: z.string().describe("Scene that provides the evidence for this character."),
-      character_id: z.string().describe("Sheet-backed character_id present in the scene. Use list_characters to find valid IDs; freeform names are rejected."),
+      scene_id: z.string().describe("Scene that provides the evidence. Prefer canonical scene_id; an unambiguous case-insensitive scene_id or unique scene title in this project is also accepted."),
+      character_id: z.string().describe("Sheet-backed character present in the scene. Prefer canonical character_id; an unambiguous case-insensitive character_id or character name in this project/universe scope is also accepted."),
       note: z.string().optional().describe("Optional review note explaining the evidence. Stored in operation history, not in compatibility sidecars."),
     },
     async (args) => connectSceneCharacterEvidence(args)
@@ -1760,11 +1733,11 @@ export function registerMetadataTools(s, {
   // ---- connect_scene_place_evidence ---------------------------------------
   s.tool(
     "connect_scene_place_evidence",
-    "Connect a sheet-backed place to a scene without requiring paired character evidence. This outcome-level workflow records place-only scene evidence in SQLite first, refreshes project backups after commit, and regenerates scene sidecar characters/places only as generated compatibility output from canonical indexes.",
+    "Connect a sheet-backed place to a scene without requiring paired character evidence. This outcome-level workflow records place-only scene evidence in SQLite first, refreshes project backups after commit, and regenerates scene sidecar characters/places only as generated compatibility output from canonical indexes. Canonical IDs are preferred; unambiguous case-insensitive scene titles, place names, and ID variants are resolved to canonical IDs before mutation. Ambiguous or suggested-only matches fail without mutating state.",
     {
       project_id: z.string().describe("Project the scene belongs to (e.g. 'the-lamb')."),
-      scene_id: z.string().describe("Scene that provides the evidence for this place."),
-      place_id: z.string().describe("Sheet-backed place_id present in the scene. Use list_places to find valid IDs; freeform names are rejected."),
+      scene_id: z.string().describe("Scene that provides the evidence. Prefer canonical scene_id; an unambiguous case-insensitive scene_id or unique scene title in this project is also accepted."),
+      place_id: z.string().describe("Sheet-backed place present in the scene. Prefer canonical place_id; an unambiguous case-insensitive place_id or place name in this project/universe scope is also accepted."),
       note: z.string().optional().describe("Optional review note explaining the evidence. Stored in operation history, not in compatibility sidecars."),
     },
     async (args) => connectScenePlaceEvidence(args)