@openparachute/vault 0.7.0-rc.7 → 0.7.0-rc.8

package/src/mcp-http.ts

@@ -45,6 +45,48 @@ function requiredVerbForTool(tool: { requiredVerb?: VaultVerb }): VaultVerb {
   return tool.requiredVerb ?? "write";
 }
 
+/** Matches the JSON-RPC prefix the MCP SDK's `McpError` constructor bakes
+ *  into `.message` itself (not just `.toString()`) — e.g.
+ *  `"MCP error -32602: the actual message"`. */
+const MCP_ERROR_PREFIX_RE = /^MCP error -?\d+:\s*/;
+
+/**
+ * Build a JSON-RPC `McpError` for a domain error, in ONE place (vault#555
+ * fix 6 — was 15 duplicated `new McpError(...)` call sites below, each a
+ * chance to drift). Two things this fixes over the old inline construction:
+ *
+ * 1. **No double-wrap.** The MCP SDK's `McpError` constructor bakes
+ *    `"MCP error <code>: "` into `.message` ITSELF. If the message being
+ *    wrapped ALREADY carries that prefix (a message forwarded verbatim
+ *    from another MCP-speaking service, or a stale caller that read
+ *    `err.message` off an already-formed `McpError` instead of re-throwing
+ *    it — see the `err instanceof McpError` guard at the top of the catch
+ *    block below, which is the PRIMARY fix for that exact case), naively
+ *    constructing `new McpError(code, message, data)` doubles it:
+ *    `"MCP error -32602: MCP error -32602: ..."`. This strips any
+ *    pre-existing prefix before building the new one, so the message is
+ *    single-prefixed no matter how many times a message string passes
+ *    through this function.
+ * 2. **`error_type` in the human-readable message too** (optional polish,
+ *    vault#555) — a string-reading human (not just a JSON-parsing agent
+ *    keying off `data.error_type`) sees `[error_type] message` rather than
+ *    a bare message with no clue which structured category it belongs to.
+ *
+ * `data.error_type` fidelity was never actually broken — it was always
+ * threaded correctly through the JSON-RPC `data` field; only the
+ * human-readable `message` string could double-prefix.
+ */
+export function mcpDomainError(
+  code: ErrorCode,
+  rawMessage: string,
+  data: Record<string, unknown>,
+): McpError {
+  const cleanMessage = rawMessage.replace(MCP_ERROR_PREFIX_RE, "");
+  const errorType = typeof data.error_type === "string" ? data.error_type : undefined;
+  const humanMessage = errorType ? `[${errorType}] ${cleanMessage}` : cleanMessage;
+  return new McpError(code, humanMessage, data);
+}
+
 /**
  * Handle scoped MCP at /vault/{name}/mcp (single vault).
  *
@@ -75,7 +117,10 @@ export async function handleScopedMcp(
   );
 }
 
-async function handleMcp(
+/** Exported for direct testing (vault#555 fix 6) — lets a test inject a
+ *  synthetic failing tool to exercise the `err instanceof McpError` guard
+ *  without needing a real domain error class to construct one naturally. */
+export async function handleMcp(
   req: Request,
   getTools: () => McpToolDef[],
   serverName: string,
@@ -139,6 +184,18 @@ async function handleMcp(
         content: [{ type: "text" as const, text: JSON.stringify(result, null, 2) }],
       };
     } catch (err) {
+      // vault#555 fix 6 — never re-wrap an already-formed McpError. Passing
+      // the SAME instance straight through is strictly correct (no
+      // information lost — `.message` AND `.data.error_type` are already
+      // exactly right) and is the primary fix for the double-prefix bug
+      // ("MCP error -32602: MCP error -32602: ..."): every branch below
+      // reads `err.message` and feeds it into a NEW McpError, which would
+      // double the SDK's baked-in "MCP error <code>: " prefix if `err` were
+      // already one. See `mcpDomainError`'s doc comment for the belt-and-
+      // suspenders half of this fix (stripping a pre-existing prefix from a
+      // plain message too).
+      if (err instanceof McpError) throw err;
+
       // Domain errors from the core tools (conflict, missing precondition,
       // path collisions, batch caps, cursor/query validation, tag-field
       // conflicts, ...) get surfaced as JSON-RPC errors with a structured
@@ -182,7 +239,7 @@ async function handleMcp(
       // existing unstructured `isError: true` fallback — only the NEW #550
       // call sites that explicitly set `error_type` opt into this shape.
       if (e?.error_type === "invalid_query") {
-        throw new McpError(ErrorCode.InvalidParams, message, {
+        throw mcpDomainError(ErrorCode.InvalidParams, message, {
           error_type: "invalid_query",
           field: e.field,
           got: e.got,
@@ -195,7 +252,7 @@ async function handleMcp(
       // caller can tell "your search_mode:\"advanced\" syntax is malformed"
       // apart from "your query PARAMS are malformed."
       if (e?.error_type === "invalid_search_syntax") {
-        throw new McpError(ErrorCode.InvalidParams, message, {
+        throw mcpDomainError(ErrorCode.InvalidParams, message, {
           error_type: "invalid_search_syntax",
           field: e.field,
           got: e.got,
@@ -203,7 +260,7 @@ async function handleMcp(
         });
       }
       if (e?.code === "CONFLICT") {
-        throw new McpError(ErrorCode.InvalidRequest, message, {
+        throw mcpDomainError(ErrorCode.InvalidRequest, message, {
           error_type: "conflict",
           current_updated_at: e.current_updated_at ?? null,
           your_updated_at: e.expected_updated_at,
@@ -216,7 +273,7 @@ async function handleMcp(
       // DISTINCT vocabulary from `conflict` (settled lead #3): the value
       // didn't match, not the updated_at token.
       if (e?.code === "TRANSITION_CONFLICT") {
-        throw new McpError(ErrorCode.InvalidRequest, message, {
+        throw mcpDomainError(ErrorCode.InvalidRequest, message, {
           error_type: "transition_conflict",
           note_id: e.note_id,
           path: e.note_path ?? null,
@@ -230,14 +287,14 @@ async function handleMcp(
       // Strict-schema rejection (vault#299 Part A) — one error carrying ALL
       // per-field violations (settled lead #1).
       if (e?.code === "SCHEMA_VALIDATION") {
-        throw new McpError(ErrorCode.InvalidParams, message, {
+        throw mcpDomainError(ErrorCode.InvalidParams, message, {
           error_type: "schema_validation",
           violations: e.violations ?? [],
           hint: "fix every field listed in violations and retry — none of this write was applied",
         });
       }
       if (e?.code === "PRECONDITION_REQUIRED") {
-        throw new McpError(ErrorCode.InvalidParams, message, {
+        throw mcpDomainError(ErrorCode.InvalidParams, message, {
           error_type: "precondition_required",
           note_id: e.note_id,
           path: e.note_path ?? null,
@@ -252,7 +309,7 @@ async function handleMcp(
       // REST already uses for this whole error class — so these no longer
       // fall through to the unstructured `isError: true` text.
       if (e?.name === "QueryError") {
-        throw new McpError(ErrorCode.InvalidParams, message, {
+        throw mcpDomainError(ErrorCode.InvalidParams, message, {
           error_type: e.error_type ?? "invalid_query",
           code: e.code,
           field: e.field,
@@ -266,14 +323,14 @@ async function handleMcp(
       // already the exact `error_type` vocabulary: "cursor_invalid" or
       // "cursor_query_mismatch".
       if (e?.name === "CursorError" && typeof e.code === "string") {
-        throw new McpError(ErrorCode.InvalidParams, message, {
+        throw mcpDomainError(ErrorCode.InvalidParams, message, {
           error_type: e.code,
         });
       }
       // Path-rename/create collision (vault#126, vault#554) — schema's
       // UNIQUE(path) tripped. Mirrors REST's 409 `path_conflict` shape.
       if (e?.code === "PATH_CONFLICT") {
-        throw new McpError(ErrorCode.InvalidRequest, message, {
+        throw mcpDomainError(ErrorCode.InvalidRequest, message, {
           error_type: "path_conflict",
           path: e.path,
         });
@@ -282,7 +339,7 @@ async function handleMcp(
       // mirrors REST's 409 `ambiguous_path` shape (candidates = the
       // disambiguating extensions).
       if (e?.code === "AMBIGUOUS_PATH") {
-        throw new McpError(ErrorCode.InvalidRequest, message, {
+        throw mcpDomainError(ErrorCode.InvalidRequest, message, {
           error_type: "ambiguous_path",
           path: e.path,
           candidates: e.candidates,
@@ -291,7 +348,7 @@ async function handleMcp(
       // Bad `extension` value (vault#328, vault#554) — mirrors REST's 400
       // `invalid_extension` shape.
       if (e?.code === "INVALID_EXTENSION") {
-        throw new McpError(ErrorCode.InvalidParams, message, {
+        throw mcpDomainError(ErrorCode.InvalidParams, message, {
           error_type: "invalid_extension",
           extension: e.extension,
           reason: e.reason,
@@ -300,7 +357,7 @@ async function handleMcp(
       // Batch cap exceeded (#213, vault#554) — mirrors REST's 413
       // `batch_too_large` shape.
       if (e?.code === "BATCH_TOO_LARGE") {
-        throw new McpError(ErrorCode.InvalidRequest, message, {
+        throw mcpDomainError(ErrorCode.InvalidRequest, message, {
           error_type: "batch_too_large",
           limit: e.limit,
           got: e.got,
@@ -309,7 +366,7 @@ async function handleMcp(
       // update-tag cross-tag field conflicts (vault#553/#554) — carries
       // EVERY violation in one response (see `TagFieldConflictError`).
       if (e?.code === "TAG_FIELD_CONFLICT") {
-        throw new McpError(ErrorCode.InvalidParams, message, {
+        throw mcpDomainError(ErrorCode.InvalidParams, message, {
           error_type: "tag_field_conflict",
           tag: e.tag,
           violations: e.violations ?? [],
@@ -320,7 +377,7 @@ async function handleMcp(
       // wrapper (src/mcp-tools.ts) scope-scrubs `cycle` before this throw
       // for a tag-scoped caller, same as TAG_FIELD_CONFLICT above.
       if (e?.code === "PARENT_CYCLE") {
-        throw new McpError(ErrorCode.InvalidRequest, message, {
+        throw mcpDomainError(ErrorCode.InvalidRequest, message, {
           error_type: "parent_cycle",
           tag: e.tag,
           cycle: e.cycle ?? [],
@@ -338,7 +395,7 @@ async function handleMcp(
       // error" true by construction: only errors nobody tagged with
       // `error_type` still hit the fallback below.
       if (typeof e?.error_type === "string") {
-        throw new McpError(ErrorCode.InvalidParams, message, {
+        throw mcpDomainError(ErrorCode.InvalidParams, message, {
           error_type: e.error_type,
           field: e.field,
           hint: e.hint,

package/src/mcp-tools.ts

@@ -26,6 +26,7 @@ import {
   scrubParentCycleError,
   scrubReferencingTagsByScope,
   scrubTagFieldViolationsByScope,
+  scrubValidationStatusByScope,
   tagsWithinScope,
 } from "./tag-scope.ts";
 import { TagFieldConflictError, ParentCycleError } from "../core/src/tag-schemas.ts";
@@ -332,6 +333,16 @@ function applyTagScopeWrappers(
     if (n && Array.isArray(n.links)) {
       n.links = filterHydratedLinksByTagScope(n.links, allowedHolder?.value ?? null, rawTags);
     }
+    // vault#555 auth review — a note the caller can see may ALSO carry an
+    // out-of-scope co-tag whose schema `validation_status` would otherwise
+    // leak (field name / type / enum values, the #560 class). Scrub it with
+    // the same allowlist the link scrub uses. Reads the resolved holder for
+    // the same reason (see the ordering-invariant note above scrubNoteLinks).
+    if (n && n.validation_status) {
+      const scrubbed = scrubValidationStatusByScope(n.validation_status, allowedHolder?.value ?? null, rawTags);
+      if (scrubbed === undefined) delete n.validation_status;
+      else n.validation_status = scrubbed;
+    }
     return n;
   };
 

package/src/routes.ts

@@ -22,7 +22,7 @@ import {
   type QueryWarning,
 } from "../core/src/query-warnings.ts";
 import { SEARCH_MODES, buildLiteralSearchQuery, isValidSearchMode, type SearchMode } from "../core/src/search-query.ts";
-import { listUnresolvedWikilinks } from "../core/src/wikilinks.ts";
+import { listUnresolvedWikilinks, resolveOrQueueLink, resolveStructuredLinkNote } from "../core/src/wikilinks.ts";
 import { transactionAsync } from "../core/src/txn.ts";
 import { getNote, getNotes, getNoteTags, toNoteIndex, filterMetadata, mergeMetadata, MAX_BATCH_SIZE, validateExtension, ExtensionValidationError } from "../core/src/notes.ts";
 import {
@@ -52,10 +52,11 @@ import {
   scrubParentCycleError,
   scrubReferencingTagsByScope,
   scrubTagFieldViolationsByScope,
+  scrubValidationStatusByScope,
   tagScopeForbidden,
   tagsWithinScope,
 } from "./tag-scope.ts";
-import { ParentCycleError, InvalidFieldDefaultError } from "../core/src/tag-schemas.ts";
+import { ParentCycleError, InvalidFieldDefaultError, InvalidFieldTypeError } from "../core/src/tag-schemas.ts";
 import { findTokensReferencingTag } from "./token-store.ts";
 
 /**
@@ -1352,6 +1353,34 @@ async function handleNotesInner(
       if (contentRange.range && includeContent) {
         for (const n of output) applyContentRange(n, contentRange.range);
       }
+      // vault#555 fix 3 — attach validation_status on reads too (mirrors
+      // MCP query-notes). Additive, present only when a tag declares
+      // `fields`. Runs BEFORE metadata filtering so it sees full metadata
+      // regardless of `include_metadata`. Scrubbed for a tag-scoped caller
+      // (vault#555 auth review) so an out-of-scope co-tag's schema shape
+      // doesn't leak — `results` here is already scope-filtered, but a
+      // surviving note may carry an out-of-scope co-tag whose schema would
+      // otherwise appear in its validation_status. No-op when unscoped.
+      {
+        const statusById = new Map(
+          results.map((n) => [
+            n.id,
+            scrubValidationStatusByScope(
+              store.validateNoteAgainstSchemas({
+                path: n.path,
+                tags: n.tags,
+                metadata: n.metadata as Record<string, unknown> | undefined,
+              }),
+              tagScope.allowed,
+              tagScope.raw,
+            ),
+          ]),
+        );
+        for (const n of output as any[]) {
+          const status = statusById.get(n.id);
+          if (status) n.validation_status = status;
+        }
+      }
       if (inclMeta !== undefined && inclMeta !== true) {
         output = output.map((n: any) => filterMetadata(n, inclMeta));
       }
@@ -1475,6 +1504,14 @@ async function handleNotesInner(
       }
 
       const created: Note[] = [];
+      // Structured `links` are resolved in a second pass, after every note
+      // in this batch has been created (vault#555) — resolving inline (the
+      // old behavior) meant a link from item 0 to item 1's path silently
+      // dropped, since item 1 didn't exist yet at the moment item 0's links
+      // were processed. Mirrors the MCP create-note fix exactly (both
+      // layers share `resolveOrQueueLink` from core/wikilinks.ts).
+      const pendingLinks: { sourceId: string; links: { target: string; relationship: string }[] }[] = [];
+      const linkWarningsByNote = new Map<string, QueryWarning[]>();
       // Wrap multi-item batches in a SQLite transaction so a mid-batch
       // failure (path conflict, etc.) rolls back every prior insert. Without
       // this, callers got half-applied batches where the prefix landed and
@@ -1510,16 +1547,36 @@ async function handleNotesInner(
             via: writeCtx.via,
           });
 
-          // Create explicit links
           if (item.links) {
-            for (const link of item.links as { target: string; relationship: string }[]) {
-              const target = await resolveNote(store, link.target);
-              if (target) await store.createLink(note.id, target.id, link.relationship);
-            }
+            pendingLinks.push({ sourceId: note.id, links: item.links as { target: string; relationship: string }[] });
           }
 
           created.push((await store.getNote(note.id)) ?? note);
         }
+
+        // --- Resolve structured links (vault#555) ---
+        // Same semantics as [[wikilinks]]: ID or path/title match, tried now
+        // that every sibling note in this batch exists. A target that still
+        // doesn't resolve is queued for lazy resolution (backfills
+        // automatically when a matching note is created later) and surfaces
+        // an `unresolved_link` warning naming the target — never silent.
+        for (const { sourceId, links } of pendingLinks) {
+          for (const link of links) {
+            const targetId = resolveOrQueueLink(db, sourceId, link.target, link.relationship);
+            if (targetId) {
+              await store.createLink(sourceId, targetId, link.relationship);
+            } else {
+              const list = linkWarningsByNote.get(sourceId) ?? [];
+              list.push({
+                code: "unresolved_link",
+                message: `link target "${link.target}" (relationship "${link.relationship}") did not resolve to any note — queued and will backfill automatically if a matching note is created later.`,
+                target: link.target,
+                relationship: link.relationship,
+              });
+              linkWarningsByNote.set(sourceId, list);
+            }
+          }
+        }
       };
       try {
         await (batched ? transactionAsync(db, runBatch) : runBatch());
@@ -1584,8 +1641,14 @@ async function handleNotesInner(
       // Attach `validation_status` so HTTP create-note matches the MCP
       // surface (vault#287). `attachValidationStatus` returns the note
       // unchanged when no tag declares fields, so vaults without any tag
-      // schemas see no behavior change.
-      const final = refreshed.map((n) => attachValidationStatus(store, db, n));
+      // schemas see no behavior change. Fold in any `unresolved_link`
+      // warnings (vault#555) — additive, present only when this note's
+      // `links` had a target that didn't resolve.
+      const final = refreshed.map((n) => {
+        const validated = attachValidationStatus(store, db, n);
+        const warnings = linkWarningsByNote.get(n.id);
+        return warnings && warnings.length > 0 ? { ...validated, warnings } : validated;
+      });
       return json(body.notes ? final : final[0], 201);
     }
 
@@ -1741,6 +1804,24 @@ async function handleNotesInner(
     const contentRange = parseContentRangeQuery(url, includeContent);
     if (contentRange.error) return contentRange.error;
     let result: any = includeContent ? { ...note } : toNoteIndex(note);
+    // vault#555 fix 3 — mirror the MCP query-notes fix: attach
+    // validation_status on reads too, not just on the one-time create/update
+    // write response. See core/src/mcp.ts's query-notes handler for the
+    // full rationale. Scrubbed for a tag-scoped caller (vault#555 auth
+    // review) so an out-of-scope co-tag's schema shape doesn't leak — no-op
+    // for unscoped callers (tagScope.raw === null).
+    {
+      const status = scrubValidationStatusByScope(
+        store.validateNoteAgainstSchemas({
+          path: note.path,
+          tags: note.tags,
+          metadata: note.metadata as Record<string, unknown> | undefined,
+        }),
+        tagScope.allowed,
+        tagScope.raw,
+      );
+      if (status) result.validation_status = status;
+    }
     const expand = parseExpandParams(url, db, tagScope);
     if (expand && includeContent && typeof result.content === "string") {
       expand.ctx.expanded.add(note.id);
@@ -1834,22 +1915,35 @@ async function handleNotesInner(
           //     fresh note).
           //   - Missing target notes skip silently (mirrors MCP).
           const linksAdd = (body.links as any)?.add as { target: string; relationship: string; metadata?: Record<string, unknown> }[] | undefined;
+          // `unresolved_link` warnings (vault#555) — a target that doesn't
+          // resolve is queued for lazy resolution (backfills automatically
+          // when a matching note is created later), never silently dropped.
+          const createWarnings: QueryWarning[] = [];
           if (linksAdd) {
             for (const link of linksAdd) {
-              const target = await resolveNote(store, link.target);
-              if (target) {
-                await store.createLink(created.id, target.id, link.relationship, link.metadata);
+              const targetId = resolveOrQueueLink(db, created.id, link.target, link.relationship);
+              if (targetId) {
+                await store.createLink(created.id, targetId, link.relationship, link.metadata);
+              } else {
+                createWarnings.push({
+                  code: "unresolved_link",
+                  message: `link target "${link.target}" (relationship "${link.relationship}") did not resolve to any note — queued and will backfill automatically if a matching note is created later.`,
+                  target: link.target,
+                  relationship: link.relationship,
+                });
               }
             }
           }
           const final = await store.getNote(created.id);
           if (!final) return json({ error: "Note disappeared", error_type: "internal_error" }, 500);
-          const validated = attachValidationStatus(store, db, final);
+          const validated: any = attachValidationStatus(store, db, final);
+          if (createWarnings.length > 0) validated.warnings = createWarnings;
           const includeContentResp = body.include_content !== false;
           if (includeContentResp) return json({ ...validated, created: true });
           const lean: any = toNoteIndex(validated);
           const vs = (validated as any).validation_status;
           if (vs !== undefined) lean.validation_status = vs;
+          if (createWarnings.length > 0) lean.warnings = createWarnings;
           lean.created = true;
           return json(lean);
         }
@@ -1992,7 +2086,7 @@ async function handleNotesInner(
       const resolvedLinksToRemove: { targetId: string; relationship: string }[] = [];
       if (linksRemove) {
         for (const link of linksRemove) {
-          const target = await resolveNote(store, link.target);
+          const target = resolveStructuredLinkNote(db, link.target);
           if (!target) continue;
           resolvedLinksToRemove.push({ targetId: target.id, relationship: link.relationship });
           if (link.relationship === "wikilink" && target.path) {
@@ -2069,9 +2163,21 @@ async function handleNotesInner(
         gateStrictWrite(store, writeCtx, { path: note.path, tags: [...projectedTags], metadata: projectedMeta });
       }
 
-      if (Object.keys(updates).length > 0) {
+      // vault#555 fix 2 — tag and link mutations must bump `updated_at` too,
+      // not just core-field (content/path/metadata) changes. Mirrors the MCP
+      // `update-note` fix exactly: a tags-only or links-only PATCH with
+      // `force: true` (no `if_updated_at`) left `updates` empty, so
+      // `store.updateNote` was never even called and `updated_at` never
+      // moved despite a real tags/note_tags or links change.
+      const hasTagMutation = (body.tags?.add?.length ?? 0) > 0 || (body.tags?.remove?.length ?? 0) > 0;
+      const hasLinkMutation = body.links?.add !== undefined || body.links?.remove !== undefined;
+      if (Object.keys(updates).length > 0 || hasTagMutation || hasLinkMutation) {
         // Write-attribution (vault#298) — REST update. Stamp the most-recent-
-        // write columns on the same UPDATE that bumps updated_at.
+        // write columns on the same UPDATE that bumps updated_at. `updates`
+        // may carry no core fields at all (a pure tag/link mutation) — that's
+        // fine: `noteOps.updateNote` unconditionally SETs
+        // `updated_at`/`last_updated_by`/`last_updated_via` whenever
+        // `skipUpdatedAt` isn't set, so this still issues a real UPDATE.
         updates.actor = writeCtx.actor;
         updates.via = writeCtx.via;
         await store.updateNote(note.id, updates);
@@ -2091,11 +2197,24 @@ async function handleNotesInner(
         await store.untagNote(note.id, body.tags.remove);
       }
 
-      // Add links
+      // Add links. `unresolved_link` warnings (vault#555) — a target that
+      // doesn't resolve is queued for lazy resolution (backfills
+      // automatically when a matching note is created later), never
+      // silently dropped.
+      const linkWarnings: QueryWarning[] = [];
       if (body.links?.add) {
         for (const link of body.links.add as { target: string; relationship: string; metadata?: Record<string, unknown> }[]) {
-          const target = await resolveNote(store, link.target);
-          if (target) await store.createLink(note.id, target.id, link.relationship, link.metadata);
+          const targetId = resolveOrQueueLink(db, note.id, link.target, link.relationship);
+          if (targetId) {
+            await store.createLink(note.id, targetId, link.relationship, link.metadata);
+          } else {
+            linkWarnings.push({
+              code: "unresolved_link",
+              message: `link target "${link.target}" (relationship "${link.relationship}") did not resolve to any note — queued and will backfill automatically if a matching note is created later.`,
+              target: link.target,
+              relationship: link.relationship,
+            });
+          }
         }
       }
 
@@ -2130,6 +2249,7 @@ async function handleNotesInner(
           tagScope.raw,
         );
       }
+      if (linkWarnings.length > 0) validated.warnings = linkWarnings;
       const includeContentResp = body.include_content !== false;
       // `created: false` is appended to every update-path response so
       // sync-loop callers using `if_missing: "create"` can distinguish
@@ -2142,6 +2262,7 @@ async function handleNotesInner(
       // Carry the link echo across the lean conversion — `toNoteIndex`
       // drops unknown fields, same as the `validation_status` recipe above.
       if (validated.links !== undefined) lean.links = validated.links;
+      if (linkWarnings.length > 0) lean.warnings = linkWarnings;
       lean.created = false;
       return json(lean);
     } catch (e: any) {
@@ -2642,11 +2763,22 @@ export async function handleTags(
     // — silent 200s on main — is non-indexed type conflicts and indexed-flag
     // conflicts. See `collectCrossTagFieldViolations`'s doc comment.
     if (body.fields && typeof body.fields === "object" && !Array.isArray(body.fields)) {
+      const incomingFields = body.fields as Record<string, tagSchemaOps.TagFieldSchema>;
+      // vault#555 fix 5 — fold the own-field `default`/`type` checks into
+      // the SAME bundled report as the cross-tag ones. Before this, a bad
+      // `default` (and, since fix 4 added the check, an unrecognized
+      // `type`) went through `store.upsertTagRecord`'s fail-fast pre-
+      // validate below INSTEAD — a single-violation 400 that silently never
+      // mentioned any OTHER bad field in the same call. `unsupported_
+      // indexed_type`/`invalid_field_name` deliberately stay OUT of this
+      // bundle — REST's established single-violation `400
+      // invalid_indexed_field` contract for those two is unchanged
+      // (vault#478; see `collectCrossTagFieldViolations`'s doc comment).
       const fieldViolations = tagSchemaOps.collectCrossTagFieldViolations(
         store.db,
         putTagName,
-        body.fields as Record<string, tagSchemaOps.TagFieldSchema>,
-      );
+        incomingFields,
+      ).concat(tagSchemaOps.collectOwnFieldDefaultAndTypeViolations(incomingFields));
       if (fieldViolations.length > 0) {
         // Tag-scope scrub (vault#554 auth-and-scope fold): the write is
         // still rejected, but a violation whose conflicting declarer is
@@ -2694,15 +2826,26 @@ export async function handleTags(
       if (err instanceof InvalidFieldDefaultError) {
         // vault#553 Decision B — a declared `default` doesn't conform to its
         // own field's type/enum. Own-field error (no cross-tag data), so no
-        // scrub needed. Mirrors IndexedFieldError's 400 shape/posture — see
-        // store.upsertTagRecord's pre-validate comment for why REST hits
-        // this (fail-fast, single violation) while MCP's update-tag usually
-        // reports it bundled via `TagFieldConflictError` instead.
+        // scrub needed. DEFENSE-IN-DEPTH ONLY as of vault#555 fix 5 — the
+        // pre-check above (`collectOwnFieldDefaultAndTypeViolations`) now
+        // catches every `invalid_default` BEFORE reaching `store.upsertTagRecord`
+        // and reports it bundled via `tag_field_conflict` 422 instead; this
+        // branch only fires for a caller that somehow bypasses that pre-check.
         return json(
           { error: err.message, error_type: "invalid_field_default", field: err.field },
           400,
         );
       }
+      if (err instanceof InvalidFieldTypeError) {
+        // vault#555 fix 4 — a declared `type` isn't one of the six
+        // recognized values. Same defense-in-depth posture as
+        // InvalidFieldDefaultError above — the pre-check catches this in
+        // the normal path and reports it bundled instead.
+        return json(
+          { error: err.message, error_type: "invalid_field_type", field: err.field, type: err.type, valid_types: err.valid_types },
+          400,
+        );
+      }
       if (err instanceof ParentCycleError) {
         // vault#552: parent_names would close a cycle. Nothing was
         // persisted. Scope-scrub the cycle path for a tag-scoped caller —

package/src/tag-field-conflict-scope.test.ts

@@ -330,4 +330,48 @@ describe("invalid_indexed_field × tag scope — the 400 door is scrubbed too (w
     expect(caught).toBeInstanceOf(IndexedFieldError);
     expect(caught.message).toContain("mine-too");
   });
+
+  // vault#555 fix 4/5 — `invalid_type` and `invalid_default` are own-field
+  // violations (no `other_tag`, no cross-tag data to leak) so
+  // `scrubTagFieldViolationsByScope` is a documented no-op for them by
+  // construction. Pin that a scoped caller still gets the FULL violation
+  // (field/reason/message) — nothing accidentally strips it.
+  test("invalid_type and invalid_default violations pass through the scope-scrub untouched (no other_tag to scrub)", async () => {
+    seedVault("journal");
+    getVaultStore("journal");
+
+    // REST
+    const res = await handleTags(
+      new Request("http://localhost/api/tags/mine", {
+        method: "PUT",
+        body: JSON.stringify({
+          fields: {
+            weird: { type: "frobnicator" },
+            bad_default: { type: "string", enum: ["a", "b"], default: "zzz" },
+          },
+        }),
+      }),
+      getVaultStore("journal"),
+      "/mine",
+      { allowed: new Set(["mine"]), raw: ["mine"] },
+    );
+    expect(res.status).toBe(422);
+    const body: any = await res.json();
+    expect(body.violations).toHaveLength(2);
+    const byField = new Map(body.violations.map((v: any) => [v.field, v]));
+    expect(byField.get("weird").reason).toBe("invalid_type");
+    expect(byField.get("weird").other_tag).toBeUndefined();
+    expect(byField.get("bad_default").reason).toBe("invalid_default");
+
+    // MCP
+    const tool = await updateTagTool("journal", ["mine"]);
+    let caught: any;
+    try {
+      await tool.execute({ tag: "mine", fields: { weird: { type: "frobnicator" } } });
+    } catch (e) {
+      caught = e;
+    }
+    expect(caught.violations).toHaveLength(1);
+    expect(caught.violations[0].reason).toBe("invalid_type");
+  });
 });