@retaw106/mmc-pi 2.6.0 → 2.7.1

package/dist/index.js

@@ -13915,6 +13915,39 @@ function keywordRelevance(query, content) {
   const words = new Set(terms(cleanSearchText(content)));
   return 0.8 * needles.filter((term) => words.has(term)).length / needles.length;
 }
+var CJK_RUN = /^[\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Hangul}]+$/u;
+var CJK_RUN_SPLIT = /([\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Hangul}]+)/u;
+function hintTerms(text) {
+  return [
+    ...new Set(terms(text).flatMap((term) => term.split(CJK_RUN_SPLIT)).filter((term) => term.length > 0 && !QUERY_STOP_WORDS.has(term)))
+  ];
+}
+function characterBigrams(run) {
+  const characters = [...run];
+  return characters.length === 1 ? characters : characters.slice(1).map((character, index) => characters[index] + character);
+}
+function hintKeywordRelevance(query, content) {
+  const needles = hintTerms(query);
+  if (needles.length === 0)
+    return 0;
+  const words = new Set(hintTerms(cleanSearchText(content)));
+  const runs = [...words].filter((word) => CJK_RUN.test(word));
+  const bigrams = new Set(runs.flatMap(characterBigrams));
+  let matched = 0;
+  for (const needle of needles) {
+    if (!CJK_RUN.test(needle)) {
+      matched += Number(words.has(needle));
+      continue;
+    }
+    const grams = characterBigrams(needle);
+    if ([...needle].length === 1) {
+      matched += Number(runs.some((run) => run.includes(needle)));
+      continue;
+    }
+    matched += Math.min(1, grams.filter((gram) => bigrams.has(gram)).length / Math.ceil(grams.length / 2));
+  }
+  return 0.8 * matched / needles.length;
+}
 function matchedSearchSnippet(content, query, cap = 220) {
   const text = cleanSearchText(content);
   const needles = new Set(terms(query));
@@ -21080,7 +21113,7 @@ function registerStandalonePluginMarker(version) {
 // package.json
 var package_default = {
   name: "@retaw106/mmc-pi",
-  version: "2.6.0",
+  version: "2.7.1",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -29681,6 +29714,38 @@ function buildToolTarget(part, message, tagId) {
   };
 }
 
+// ../plugin/src/features/magic-context/auto-search-diagnostics.ts
+var memoryHintContent = new WeakMap;
+function withMemoryHintContent(result, fullContent) {
+  memoryHintContent.set(result, fullContent);
+  return result;
+}
+function createAutoSearchDiagnostics(threshold) {
+  return {
+    threshold,
+    lanes: {},
+    pool: "unknown",
+    poolRows: null,
+    peek: "not-run",
+    workerStarted: false
+  };
+}
+function autoSearchRelevance(query, result) {
+  const content = result.source === "memory" ? memoryHintContent.get(result) ?? result.content : result.content;
+  if (cleanSearchText(content).length === 0)
+    return 0;
+  return result.source === "message" || "matchType" in result ? hintKeywordRelevance(query, content) : result.score;
+}
+function recordAutoSearchLane(diagnostics, lane, query, results) {
+  if (!diagnostics)
+    return;
+  const scores = results.map((result) => result.relevanceScore ?? autoSearchRelevance(query, result));
+  diagnostics.lanes[lane] = {
+    top: scores.length ? Math.max(...scores) : null,
+    nearMisses: scores.filter((score) => score >= 0.5 && score < diagnostics.threshold).length
+  };
+}
+
 // ../plugin/src/features/magic-context/literal-probes.ts
 var MAX_PROBES = 5;
 var MIN_PROBE_LENGTH = 3;
@@ -30307,7 +30372,7 @@ function mergeMemoryResults(args) {
       suppressedVisibleIds.push(id);
       continue;
     }
-    results.push({
+    results.push(withMemoryHintContent({
       source: "memory",
       content: previewText(memory.content),
       score,
@@ -30315,7 +30380,7 @@ function mergeMemoryResults(args) {
       category: memory.category,
       matchType: "fts",
       sourceName: args.sourceNameByMemoryId?.get(memory.id)
-    });
+    }, memory.content));
   }
   return {
     results: results.sort((left, right) => {
@@ -30912,8 +30977,12 @@ async function unifiedSearch(db, sessionId, projectPath, query, options = {}) {
       options.diagnostics.suppressedLiveMessageMatches = outcome.suppressedLiveMessageMatches;
     }
     messageResults = outcome.results.filter((result) => result.messageId !== options.excludeMessageId);
+    recordAutoSearchLane(options.autoSearchDiagnostics, "messages", trimmedQuery, messageResults);
+    options.onAutoSearchDiagnostics?.();
   }
   const workspace = resolveSearchWorkspaceContext(db, projectPath);
+  if (options.autoSearchDiagnostics)
+    options.autoSearchDiagnostics.pool = "off";
   const [memoryOutcome, primerResults, noteResults] = await Promise.all([
     runMemory ? searchMemories({
       db,
@@ -30948,6 +31017,10 @@ async function unifiedSearch(db, sessionId, projectPath, query, options = {}) {
   if (options.diagnostics) {
     options.diagnostics.suppressedVisibleMemoryIds = memoryOutcome.suppressedVisibleIds;
   }
+  recordAutoSearchLane(options.autoSearchDiagnostics, "memory", trimmedQuery, memoryOutcome.results);
+  recordAutoSearchLane(options.autoSearchDiagnostics, "primers", trimmedQuery, primerResults);
+  recordAutoSearchLane(options.autoSearchDiagnostics, "notes", trimmedQuery, noteResults);
+  options.onAutoSearchDiagnostics?.();
   const results = [...memoryOutcome.results, ...primerResults, ...messageResults, ...noteResults].sort(compareUnifiedResults).slice(0, limit);
   const countRetrievals = options.countRetrievals ?? true;
   if (countRetrievals) {
@@ -30969,7 +31042,7 @@ async function unifiedSearch(db, sessionId, projectPath, query, options = {}) {
   if (options.autoHint) {
     return results.map((result) => ({
       ...result,
-      relevanceScore: cleanSearchText(result.content).length === 0 ? 0 : keywordRelevance(trimmedQuery, result.content)
+      relevanceScore: autoSearchRelevance(trimmedQuery, result)
     }));
   }
   return results;
@@ -31215,6 +31288,32 @@ function selectAutoSearchResults(results, threshold) {
   return results.filter((result) => relevance(result) >= threshold).sort((left, right) => relevance(right) - relevance(left));
 }
 
+// ../plugin/src/hooks/magic-context/auto-search-observation.ts
+var disabledTurns = new WeakMap;
+function logDisabledAutoSearch(db, sessionId, messageId, threshold, startedAt) {
+  const sessions = disabledTurns.get(db) ?? new Map;
+  disabledTurns.set(db, sessions);
+  if (sessions.get(sessionId) === messageId)
+    return;
+  sessions.set(sessionId, messageId);
+  observeAutoSearch(sessionId, threshold, startedAt).finish("disabled");
+}
+function observeAutoSearch(sessionId, threshold, startedAt) {
+  const diagnostics = createAutoSearchDiagnostics(threshold);
+  let logged = false;
+  return {
+    diagnostics,
+    finish(outcome, reason) {
+      if (logged)
+        return;
+      logged = true;
+      const lanes = Object.entries(diagnostics.lanes).map(([lane, value]) => `${lane}:${value.top?.toFixed(3) ?? "none"}`).join(",");
+      const nearMisses = Object.values(diagnostics.lanes).reduce((sum, lane) => sum + lane.nearMisses, 0);
+      sessionLog(sessionId, `auto-search: decision outcome=${outcome}${reason ? ` reason=${reason}` : ""} lanes=${lanes || "none"} nearMisses=${nearMisses} threshold=${threshold} pool=${diagnostics.pool} rows=${diagnostics.poolRows ?? "unknown"} workerStarted=${diagnostics.workerStarted ?? "unknown"} peek=${diagnostics.peek} elapsedMs=${Math.round(performance.now() - startedAt)}`);
+    }
+  };
+}
+
 // src/auto-search-pi.ts
 var DEFAULT_SCORE_THRESHOLD = 0.55;
 var DEFAULT_MIN_PROMPT_CHARS = 20;
@@ -31351,8 +31450,6 @@ async function runAutoSearchHintForPi(args) {
     const timestamp = message.timestamp;
     return `test-entry-${index}:${typeof timestamp === "number" ? timestamp : "no-ts"}`;
   }) : args.entryIds;
-  if (!options.enabled)
-    return messages;
   const strictResolutionFailed = entryIds === null;
   const effectiveEntryIds = strictResolutionFailed ? messages.map((message) => {
     const id = message.id;
@@ -31362,6 +31459,11 @@ async function runAutoSearchHintForPi(args) {
   if (found === null)
     return messages;
   const { message: userMsg, messageId: userMsgId } = found;
+  if (!options.enabled) {
+    if (found.index === messages.length - 1)
+      logDisabledAutoSearch(db, sessionId, userMsgId, options.scoreThreshold ?? DEFAULT_SCORE_THRESHOLD, startedAt);
+    return messages;
+  }
   const replayServedDecision = () => {
     const decision = getAutoSearchHintDecisions(db, sessionId).find((entry) => entry.messageId === userMsgId);
     if (decision?.decision === "hint") {
@@ -31390,21 +31492,24 @@ async function runAutoSearchHintForPi(args) {
       return messages;
     if (!isUsableProjectIdentity(options.projectPath))
       return messages;
+    const observation = observeAutoSearch(sessionId, options.scoreThreshold ?? DEFAULT_SCORE_THRESHOLD, startedAt);
     const writeNoHintAndReconcile = (reason) => {
       const outcome = appendAutoSearchHintDecision(db, sessionId, {
         messageId: userMsgId,
         decision: "no-hint",
         reason
       });
-      if (!outcome.ok)
+      if (!outcome.ok) {
+        observation.finish("error", "cas-exhausted");
         return;
+      }
       if (outcome.kind === "already-present" && outcome.decision.decision === "hint") {
         appendHintToUserMessage(userMsg, outcome.decision.text);
       }
+      observation.finish(outcome.decision.decision === "hint" ? "attached" : reason === "below-threshold" ? "below-threshold" : reason === "error" ? "error" : "no-candidates", reason);
     };
     const rawPartsText = collectUserPromptParts(userMsg);
     if (hasStackedAugmentation(rawPartsText)) {
-      sessionLog(sessionId, "auto-search: skipping — user message already carries augmentation/hint");
       writeNoHintAndReconcile("stacked");
       return messages;
     }
@@ -31417,6 +31522,7 @@ async function runAutoSearchHintForPi(args) {
     let results;
     try {
       const searchOptions = {
+        autoSearchDiagnostics: observation.diagnostics,
         limit: 10,
         autoHint: true,
         maxMessageOrdinal: Math.max(0, getLastCompartmentEndMessage(db, sessionId)),
@@ -31432,13 +31538,13 @@ async function runAutoSearchHintForPi(args) {
           countRetrievals: false
         });
       }, startedAt);
-    } catch (error) {
-      log(`[auto-search] unified search failed for session ${sessionId} (will retry next pass): ${error instanceof Error ? error.message : String(error)}`);
+    } catch {
+      observation.finish("error");
       return messages;
     }
     if (results === null) {
       persistAutoSearchSkip(db, sessionId, userMsgId, "timeout");
-      sessionLog(sessionId, `auto-search: timed out after ${AUTO_SEARCH_TIMEOUT_MS}ms, skipping hint for this turn (frozen)`);
+      observation.finish("timeout");
       return messages;
     }
     if (results.length === 0) {
@@ -31448,7 +31554,6 @@ async function runAutoSearchHintForPi(args) {
     const scoreThreshold = options.scoreThreshold ?? DEFAULT_SCORE_THRESHOLD;
     results = selectAutoSearchResults(results, scoreThreshold);
     if (results.length === 0) {
-      sessionLog(sessionId, `auto-search: no fragment meets relevance threshold ${scoreThreshold}`);
       writeNoHintAndReconcile("below-threshold");
       return messages;
     }
@@ -31468,12 +31573,14 @@ ${hintText}`;
       decision: "hint",
       text: payload
     });
-    if (!outcome.ok)
+    if (!outcome.ok) {
+      observation.finish("error", "cas-exhausted");
       return messages;
+    }
     if (outcome.decision.decision === "hint") {
       appendHintToUserMessage(userMsg, outcome.decision.text);
     }
-    sessionLog(sessionId, `auto-search: attached hint to ${userMsgId} (${results.length} fragments, top score ${results[0].score.toFixed(3)})`);
+    observation.finish(outcome.decision.decision === "hint" ? "attached" : "no-candidates");
     return messages;
   }, replayServedDecision));
 }
@@ -42489,16 +42596,6 @@ function registerPiGuardedContext(pi, handler, options = {}) {
     refused: false,
     ended: false
   });
-  const lifecycle = new Map;
-  receiptMaps.add(lifecycle);
-  const lifecycleCounts = (key) => {
-    let counts = lifecycle.get(key);
-    if (!counts) {
-      counts = { starts: 0, ends: 0 };
-      lifecycle.set(key, counts);
-    }
-    return counts;
-  };
   const fenceEnabled = resolvePiHarnessKind() === "omp";
   const unsendableNonces = new Map;
   receiptMaps.add(unsendableNonces);
@@ -59480,9 +59577,9 @@ var FULL_PARAMETER_DESCRIPTIONS = {
   },
   mmc_memory: {
     action: "write | update | archive | merge | get",
-    content: "The memory text — one standalone fact (write, update, merge).",
-    category: "Kind of fact (required for write; on update/merge, pass the memory's current category to keep it).",
-    ids: "Memory ids from <project-memory>: one for update, one or more for archive, two or more for merge, 1–20 for get.",
+    content: "The memory text — one standalone fact (write, update, merge). Archive and get take an empty string.",
+    category: "Kind of fact: the new fact's kind for write; on update/merge, the memory's current category to keep it. Archive and get ignore it.",
+    ids: "Memory ids from <project-memory>: one for update, one or more for archive, two or more for merge, 1–20 for get. Write takes an empty list.",
     reason: "Why it is being archived (optional)."
   },
   mmc_search: {
@@ -59514,9 +59611,9 @@ var LIGHT_PARAMETER_DESCRIPTIONS = {
   },
   mmc_memory: {
     action: "write | update | archive | merge | get",
-    content: "One standalone fact (write, update, merge).",
-    category: "Kind of fact (required for write; on update/merge pass the current category to keep it).",
-    ids: "Ids from <project-memory>: one for update, 1+ for archive, 2+ for merge, 1–20 for get.",
+    content: "One standalone fact (write, update, merge). Archive and get: empty string.",
+    category: "Kind of fact (write; on update/merge pass the current category to keep it). Archive and get ignore it.",
+    ids: "Ids from <project-memory>: one for update, 1+ for archive, 2+ for merge, 1–20 for get. Write: empty list.",
     reason: "Why it is archived (optional)."
   },
   mmc_search: {
@@ -59631,6 +59728,17 @@ function resolveCtxExpandMode(args, domain) {
 
 // ../plugin/src/tools/ctx-expand/render.ts
 import { createHash as createHash25 } from "node:crypto";
+function recoveryParts(sessionId, message, attachments) {
+  return attachments ? [...message.parts, ...attachments(sessionId, message.id)] : message.parts;
+}
+function attachmentNotice(part) {
+  const field = (value) => typeof value === "string" ? value.trim().replace(/[\r\n]+/g, " ") : "";
+  const source = isRecord7(part.source) ? part.source : {};
+  const location = [part.url, part.path, source.uri, source.url, source.path].map(field).find((value) => value && !/^(data|blob):/i.test(value));
+  const name = field(part.filename) || field(part.name);
+  const mime = field(part.mime) || field(part.mimeType) || field(part.mediaType);
+  return `[file]${name ? ` ${name}` : ""}${mime ? ` (${mime})` : ""}` + `${location ? ` — stored location: ${location}` : ""}` + "; content not recovered. If needed, ask the user to attach it again.";
+}
 function isRecord7(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
@@ -59737,8 +59845,8 @@ function renderPartPreview(part, expandTools) {
   if (reasoning !== null)
     return `    • [reasoning] ${truncate2(reasoning, 120)}`;
   const type = typeof part.type === "string" ? part.type : "part";
-  if (type === "file")
-    return "    • [file]";
+  if (type === "file" || type === "image")
+    return `    • ${attachmentNotice(part)}`;
   if (type === "step-start" || type === "step-finish")
     return null;
   return `    • [${type}]`;
@@ -59768,13 +59876,11 @@ ${tool.output}`);
 `);
   }
   const type = typeof part.type === "string" ? part.type : "part";
-  if (type === "file") {
-    const name = typeof part.filename === "string" && part.filename || typeof part.url === "string" && part.url || "";
-    return `  [file]${name ? ` ${name}` : ""}`;
-  }
+  if (type === "file" || type === "image")
+    return `  ${attachmentNotice(part)}`;
   return null;
 }
-function renderMessageByOrdinal(sessionId, ordinal) {
+function renderMessageByOrdinal(sessionId, ordinal, attachments) {
   const found = [];
   visitRawSessionMessages2(sessionId, ordinal, ordinal, (m) => {
     if (m.ordinal === ordinal)
@@ -59785,7 +59891,7 @@ function renderMessageByOrdinal(sessionId, ordinal) {
   if (!msg) {
     return `No message at ordinal ${ordinal} is currently in this session's stored history — ` + `it may have been removed by a session prune/revert, or the ordinal may be wrong. ` + `Re-run the tool if you still need the data.`;
   }
-  const rendered = msg.parts.map(renderPartFull).filter((l) => l !== null);
+  const rendered = recoveryParts(sessionId, msg, attachments).map(renderPartFull).filter((l) => l !== null);
   const lines = [`[${msg.ordinal}] ${roleLabel(msg.role)} — full recovery:`, ""];
   if (rendered.length === 0) {
     lines.push("  (no recoverable content — message had only structural/reasoning parts)");
@@ -59795,14 +59901,14 @@ function renderMessageByOrdinal(sessionId, ordinal) {
   return lines.join(`
 `);
 }
-function renderVerboseRange(sessionId, start, end, tokenBudget, expandTools) {
+function renderVerboseRange(sessionId, start, end, tokenBudget, expandTools, attachments) {
   const out = [];
   let usedTokens = 0;
   let lastOrdinal = start - 1;
   let truncated = false;
   visitRawSessionMessages2(sessionId, start, end, (msg) => {
     const header = `[${msg.ordinal}] ${verboseRoleLabel(msg)}`;
-    const partLines = msg.parts.map((part) => renderPartPreview(part, expandTools)).filter((l) => l !== null);
+    const partLines = recoveryParts(sessionId, msg, attachments).map((part) => renderPartPreview(part, expandTools)).filter((l) => l !== null);
     const block = partLines.length > 0 ? `${header}
 ${partLines.join(`
 `)}` : header;
@@ -59820,7 +59926,7 @@ ${partLines.join(`
 
 `), lastOrdinal, truncated };
 }
-function renderItemByTag(db, sessionId, number, textIndexDomain = "part") {
+function renderItemByTag(db, sessionId, number, textIndexDomain = "part", attachments) {
   const tag = getTagById(db, sessionId, number);
   if (!tag)
     return `no tag ${number} in this session; if ${number} came from a <session-history> heading or a ctx_search hit, it is an ordinal: use message=${number}`;
@@ -59845,17 +59951,19 @@ function renderItemByTag(db, sessionId, number, textIndexDomain = "part") {
     return rendered.length ? rendered.join(`
 `) : `Tag ${number}'s original tool call is no longer in stored history.`;
   }
-  const scoped = /^(.*):p(\d+)$/.exec(tag.messageId);
+  const scoped = /^(.*):(?:p|file)(\d+)$/.exec(tag.messageId);
   const derived = /^(.*):mc-text-v1:([a-f0-9]+):([a-f0-9]+):o(\d+)$/.exec(tag.messageId);
   const owner = scoped?.[1] ?? derived?.[1] ?? tag.messageId;
   const message = readRawSessionMessageById2(sessionId, owner);
   if (!message)
     return `Tag ${number}'s original text is no longer in stored history.`;
   const index = scoped ? Number(scoped[2]) : 0;
-  const piText = message.parts.filter((part) => isRecord7(part) && part.type === "text");
-  const part = message.parts[index];
+  const attached = attachments?.(sessionId, message.id) ?? [];
+  const parts = [...message.parts, ...attached];
+  const piText = parts.filter((part) => isRecord7(part) && part.type === "text");
+  const part = tag.type === "file" ? attached.find((part) => isRecord7(part) && part.partIndex === index) ?? message.parts[index] : parts[index];
   const matching = derived ? piText.filter((part) => isRecord7(part) && typeof part.text === "string" && createHash25("sha256").update(part.text).digest("hex") === derived[3]) : [];
-  const selected = derived ? matching[Number(derived[4])] : textIndexDomain === "text" ? piText[index] : part;
+  const selected = derived ? matching[Number(derived[4])] : textIndexDomain === "text" && tag.type !== "file" ? piText[index] : part;
   if (!selected)
     return `Tag ${number}'s original text part is no longer in stored history.`;
   const renderedPart = renderPartFull(selected);
@@ -60298,6 +60406,34 @@ var integerKeyPattern = new RegExp("^(?:0|[1-9][0-9]*)$");
 
 // ../../node_modules/.bun/typebox@1.3.27/node_modules/typebox/build/type/engine/indexed/from_object.mjs
 var NumericKeyPattern = new RegExp(IntegerKey);
+// src/tools/expand-attachments.ts
+function piRecoveryAttachments(entries) {
+  return (_sessionId, messageId) => {
+    const entry = entries.find((entry) => entry !== null && typeof entry === "object" && entry.id === messageId);
+    if (entry?.message?.role !== "user" || !Array.isArray(entry.message.content))
+      return [];
+    return entry.message.content.flatMap((part, partIndex) => {
+      if (!part || part.type !== "image" && part.type !== "file")
+        return [];
+      return [
+        {
+          type: part.type,
+          filename: part.filename ?? part.name,
+          mime: part.mimeType ?? part.mime,
+          url: [
+            part.url,
+            part.source?.uri,
+            part.source?.url,
+            part.providerFile?.uri
+          ].find((value) => typeof value === "string" && value.trim() && !/^(data|blob):/i.test(value.trim())),
+          path: part.path ?? part.source?.path,
+          partIndex
+        }
+      ];
+    });
+  };
+}
+
 // src/tools/ctx-expand.ts
 var ParamsSchema = _Object_({
   tag: Optional(Union([Number2(), String2()], {
@@ -60347,12 +60483,13 @@ function createCtxExpandTool(deps) {
         readMessages: () => readPiSessionMessages(ctx, piRawOrdinalOffsetSource(deps.db, sessionId))
       });
       try {
+        const attachments = piRecoveryAttachments(ctx.sessionManager.getBranch());
         const mode = resolveCtxExpandMode(params, "positive");
         if (mode.kind === "error") {
           return err(mode.message);
         }
         if (mode.kind === "tag") {
-          return ok(renderItemByTag(deps.db, sessionId, mode.tag, "text"));
+          return ok(renderItemByTag(deps.db, sessionId, mode.tag, "text", attachments));
         }
         const alignment = resolvePiOrdinalAlignmentForContext(deps.db, sessionId, ctx);
         if (isPiOrdinalAlignmentUnanchored(alignment)) {
@@ -60370,7 +60507,7 @@ function createCtxExpandTool(deps) {
           if (mode.message <= lostThrough) {
             return ok(`No message at ordinal ${mode.message}: it is no longer in this session's history, which now starts at message ${firstAvailable}.`);
           }
-          return ok(renderMessageByOrdinal(sessionId, mode.message));
+          return ok(renderMessageByOrdinal(sessionId, mode.message, attachments));
         }
         const { end, verbose } = mode;
         const requestedStart = mode.start;
@@ -60390,7 +60527,7 @@ function createCtxExpandTool(deps) {
 
 ` : "";
         if (verbose) {
-          const v = renderVerboseRange(sessionId, start, effectiveEnd, CTX_EXPAND_TOKEN_BUDGET, deps.expandTools);
+          const v = renderVerboseRange(sessionId, start, effectiveEnd, CTX_EXPAND_TOKEN_BUDGET, deps.expandTools, attachments);
           if (!v.text) {
             return ok(`No messages found in range ${start}-${effectiveEnd}. The range may be outside this session's history.`);
           }
@@ -60480,6 +60617,20 @@ var ParamsShape = {
 var PrimaryParamsSchema = _Object_(ParamsShape, {
   additionalProperties: true
 });
+function rejectInvalidMemoryArguments(args) {
+  if (args === null || typeof args !== "object")
+    return;
+  const record = args;
+  if (record.content !== undefined && typeof record.content !== "string") {
+    throw new Error("Error: 'content' must be a string.");
+  }
+  if (record.reason !== undefined && typeof record.reason !== "string") {
+    throw new Error("Error: 'reason' must be a string.");
+  }
+  if (record.ids !== undefined && (!Array.isArray(record.ids) || record.ids.some((id) => typeof id !== "number" || !Number.isSafeInteger(id) || id < 1))) {
+    throw new Error("Error: 'ids' must be an array of positive memory IDs.");
+  }
+}
 function ok2(text) {
   return { content: [{ type: "text", text }], details: undefined };
 }
@@ -60578,6 +60729,10 @@ function createCtxMemoryTool(deps) {
     label: "Magic Context: Memory",
     description: CTX_MEMORY_DESCRIPTION,
     parameters: PrimaryParamsSchema,
+    prepareArguments(args) {
+      rejectInvalidMemoryArguments(args);
+      return args;
+    },
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
       params = unwrapImitatedReducedArgs(params, ["action"], {
         action: { type: "enum", values: PRIMARY_ACTIONS },
@@ -60965,6 +61120,17 @@ var ParamsSchema2 = _Object_({
     description: "Skip this many newest rows (default 0)."
   }))
 }, { additionalProperties: true });
+function rejectInvalidNoteArguments(args) {
+  if (args === null || typeof args !== "object")
+    return;
+  const record = args;
+  if (record.content !== undefined && typeof record.content !== "string") {
+    throw new Error("Error: 'content' must be a string.");
+  }
+  if (record.note_ids !== undefined && (!Array.isArray(record.note_ids) || record.note_ids.some((id) => typeof id !== "number" || !Number.isSafeInteger(id) || id < 1))) {
+    throw new Error("Error: 'note_ids' must be an array of positive note IDs.");
+  }
+}
 function ok3(text) {
   return { content: [{ type: "text", text }], details: undefined };
 }
@@ -61021,6 +61187,10 @@ function createCtxNoteTool(deps) {
     label: "Magic Context: Notes",
     description: CTX_NOTE_DESCRIPTION,
     parameters: ParamsSchema2,
+    prepareArguments(args) {
+      rejectInvalidNoteArguments(args);
+      return args;
+    },
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
       params = unwrapImitatedReducedArgs(params, ["action", "content"], {
         action: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@retaw106/mmc-pi",
-	"version": "2.6.0",
+	"version": "2.7.1",
 	"type": "module",
 	"description": "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
 	"main": "dist/index.js",