@retaw106/mmc-oc 2.6.0 → 2.7.1

package/dist/v2/server.js

@@ -25111,6 +25111,37 @@ function keywordRelevance(query, content) {
   const words = new Set(terms(cleanSearchText(content)));
   return 0.8 * needles.filter((term) => words.has(term)).length / needles.length;
 }
+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));
@@ -25135,9 +25166,11 @@ function matchedSearchSnippet(content, query, cap = 220) {
   const passage = text.slice(bestStart, bestStart + cap).trim();
   return `${bestStart > 0 ? "…" : ""}${passage}${bestStart + cap < text.length ? "…" : ""}`;
 }
-var QUERY_STOP_WORDS;
+var QUERY_STOP_WORDS, CJK_RUN, CJK_RUN_SPLIT;
 var init_search_text = __esm(() => {
   QUERY_STOP_WORDS = new Set("a an and are as at be been by can could did do does for from how i in is it me my of on or our please should that the their them there these they this to us was we were what when where which who why will with would you your".split(" "));
+  CJK_RUN = /^[\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Hangul}]+$/u;
+  CJK_RUN_SPLIT = /([\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Hangul}]+)/u;
 });
 
 // src/features/magic-context/compression-depth-storage.ts
@@ -50979,6 +51012,42 @@ var init_cache_ttl_seed = __esm(async () => {
   await init_storage_meta();
 });
 
+// src/features/magic-context/auto-search-diagnostics.ts
+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
+  };
+}
+var memoryHintContent;
+var init_auto_search_diagnostics = __esm(() => {
+  init_search_text();
+  memoryHintContent = new WeakMap;
+});
+
 // src/features/magic-context/literal-probes.ts
 function looksLikeSha(token) {
   return /[0-9]/.test(token) && /^[0-9a-f]{7,40}$/i.test(token);
@@ -51434,7 +51503,7 @@ function mergeMemoryResults(args) {
       suppressedVisibleIds.push(id);
       continue;
     }
-    results.push({
+    results.push(withMemoryHintContent({
       source: "memory",
       content: previewText(memory.content),
       score,
@@ -51442,7 +51511,7 @@ function mergeMemoryResults(args) {
       category: memory.category,
       matchType: "fts",
       sourceName: args.sourceNameByMemoryId?.get(memory.id)
-    });
+    }, memory.content));
   }
   return {
     results: results.sort((left, right) => {
@@ -52034,8 +52103,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,
@@ -52070,6 +52143,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) {
@@ -52091,7 +52168,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;
@@ -52199,6 +52276,7 @@ var DEFAULT_UNIFIED_SEARCH_LIMIT = 10, MAX_UNIFIED_SEARCH_LIMIT = 25, FTS_SEMANT
 var init_search = __esm(async () => {
   init_logger();
   init_search_text();
+  init_auto_search_diagnostics();
   init_literal_probes();
   init_message_fts_session_filter();
   init_storage_primers();
@@ -52800,6 +52878,37 @@ var init_auto_search_hint = __esm(() => {
   init_caveman();
 });
 
+// src/hooks/magic-context/auto-search-observation.ts
+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)}`);
+    }
+  };
+}
+var disabledTurns;
+var init_auto_search_observation = __esm(() => {
+  init_auto_search_diagnostics();
+  init_logger();
+  disabledTurns = new WeakMap;
+});
+
 // src/hooks/magic-context/transform-message-helpers.ts
 function isMeaningfulUserMessage(msg) {
   return msg.info.role === "user" && hasMeaningfulUserText(msg.parts);
@@ -52992,8 +53101,12 @@ async function coalesceAutoSearchTurn(db, sessionId, messageId, operation, repla
 async function runAutoSearchHint(args) {
   const startedAt = performance.now();
   const { sessionId, db, messages, options } = args;
-  if (!options.enabled)
+  if (!options.enabled) {
+    const tail = findLatestMeaningfulUserMessage(messages);
+    if (tail && typeof tail.info.id === "string" && messages.at(-1) === tail)
+      logDisabledAutoSearch(db, sessionId, tail.info.id, options.scoreThreshold, startedAt);
     return AUTO_SEARCH_OK;
+  }
   const userMsg = findLatestMeaningfulUserMessage(messages);
   if (!userMsg || typeof userMsg.info.id !== "string")
     return AUTO_SEARCH_OK;
@@ -53036,6 +53149,7 @@ async function runAutoSearchHint(args) {
       } catch {}
       return AUTO_SEARCH_OK;
     }
+    const observation = observeAutoSearch(sessionId, options.scoreThreshold, startedAt);
     const writeNoHintAndReconcile = (reason) => {
       let outcome;
       try {
@@ -53047,20 +53161,23 @@ async function runAutoSearchHint(args) {
       } catch (error) {
         if (isTransientSqliteError(error)) {
           rememberUnpublishedAutoSearchNoHint(sessionId, userMsgId, reason);
+          observation.finish("error", "storage-busy");
           return { ok: false, kind: "storage-busy" };
         }
         throw error;
       }
-      if (!outcome.ok)
+      if (!outcome.ok) {
+        observation.finish("error", "cas-exhausted");
         return { ok: false, kind: "cas-exhaustion" };
+      }
       if (outcome.kind === "already-present" && outcome.decision.decision === "hint") {
         appendReminderToUserMessageById(messages, userMsgId, outcome.decision.text);
       }
+      observation.finish(outcome.decision.decision === "hint" ? "attached" : reason === "below-threshold" ? "below-threshold" : reason === "error" ? "error" : "no-candidates", reason);
       return AUTO_SEARCH_OK;
     };
     const rawPartsText = collectUserPromptParts(userMsg);
     if (hasStackedAugmentation(rawPartsText)) {
-      sessionLog(sessionId, "auto-search: skipping — user message already carries augmentation/hint");
       return writeNoHintAndReconcile("stacked");
     }
     const rawPrompt = extractUserPromptText(userMsg);
@@ -53076,6 +53193,7 @@ async function runAutoSearchHint(args) {
         if (checkDeadline())
           return null;
         const searchOptions = {
+          autoSearchDiagnostics: observation.diagnostics,
           limit: 10,
           autoHint: true,
           maxMessageOrdinal: Math.max(0, getLastCompartmentEndMessage(db, sessionId)),
@@ -53089,16 +53207,15 @@ async function runAutoSearchHint(args) {
           countRetrievals: false
         });
       }, startedAt);
-    } catch (error) {
+    } catch {
       if (lifecycleSignal.aborted)
         return AUTO_SEARCH_OK;
-      log(`[auto-search] unified search failed for session ${sessionId} (no-hint frozen for this turn): ${error instanceof Error ? error.message : String(error)}`);
       const outcome = writeNoHintAndReconcile("error");
       return outcome.ok ? { ok: false, kind: "search-failure" } : outcome;
     }
     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 { ok: false, kind: "timeout" };
     }
     if (results.length === 0) {
@@ -53106,7 +53223,6 @@ async function runAutoSearchHint(args) {
     }
     results = selectAutoSearchResults(results, options.scoreThreshold);
     if (results.length === 0) {
-      sessionLog(sessionId, `auto-search: no fragment meets relevance threshold ${options.scoreThreshold}`);
       return writeNoHintAndReconcile("below-threshold");
     }
     const hintText = buildAutoSearchHint(results, {
@@ -53125,21 +53241,21 @@ ${hintText}`;
       text: payload
     });
     if (!outcome.ok) {
-      sessionLog(sessionId, `auto-search: CAS exhausted for ${userMsgId}; skipping wire append`);
+      observation.finish("error", "cas-exhausted");
       return { ok: false, kind: "cas-exhaustion" };
     }
     if (outcome.decision.decision === "hint") {
       appendReminderToUserMessageById(messages, userMsgId, 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 AUTO_SEARCH_OK;
   }, replayServedDecision);
 }
 var AUTO_SEARCH_OK, pendingTurns;
 var init_auto_search_runner = __esm(async () => {
   init_auto_search_lifecycle();
-  init_logger();
   init_auto_search_hint();
+  init_auto_search_observation();
   init_read_session_formatting();
   init_transform_message_helpers();
   await __promiseAll([
@@ -65487,9 +65603,9 @@ var init_parameter_descriptions = __esm(() => {
     },
     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: {
@@ -65521,9 +65637,9 @@ var init_parameter_descriptions = __esm(() => {
     },
     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: {
@@ -82244,6 +82360,17 @@ var init_mode = () => {};
 
 // src/tools/ctx-expand/render.ts
 import { createHash as createHash24 } 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);
 }
@@ -82350,8 +82477,8 @@ function renderPartPreview(part, expandTools) {
   if (reasoning !== null)
     return `    • [reasoning] ${truncate3(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}]`;
@@ -82381,13 +82508,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 = [];
   visitRawSessionMessages(sessionId, ordinal, ordinal, (m) => {
     if (m.ordinal === ordinal)
@@ -82398,7 +82523,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)");
@@ -82408,14 +82533,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;
   visitRawSessionMessages(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;
@@ -82433,7 +82558,23 @@ ${partLines.join(`
 
 `), lastOrdinal, truncated };
 }
-function renderItemByTag(db, sessionId, number, textIndexDomain = "part") {
+function renderVerboseRangeForTool(sessionId, start, end, tokenBudget, expandTools, attachments) {
+  const v = renderVerboseRange(sessionId, start, end, tokenBudget, expandTools, attachments);
+  if (!v.text) {
+    return `No messages found in range ${start}-${end}. The range may be outside this session's history.`;
+  }
+  const out = [
+    `Messages ${start}-${v.lastOrdinal} (verbose). Recover any one in full with mmc_expand(message=<ordinal>):`,
+    "",
+    v.text
+  ];
+  if (v.truncated) {
+    out.push("", `Truncated at message ${v.lastOrdinal} (budget: ~${tokenBudget} tokens). Call again with start=${v.lastOrdinal + 1} end=${end} verbose=true for more.`);
+  }
+  return out.join(`
+`);
+}
+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}`;
@@ -82458,17 +82599,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 = readRawSessionMessageById(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" && createHash24("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);
@@ -82561,10 +82704,10 @@ function createCtxExpandTool(deps) {
           return mode.message;
         }
         if (mode.kind === "tag") {
-          return renderItemByTag(deps.db, sessionId, mode.tag);
+          return renderItemByTag(deps.db, sessionId, mode.tag, "part", deps.recoveryAttachments);
         }
         if (mode.kind === "message") {
-          return renderSearchArchive(deps.db, sessionId, mode.message, mode.message, CTX_EXPAND_TOKEN_BUDGET) ?? renderMessageByOrdinal(sessionId, mode.message);
+          return renderSearchArchive(deps.db, sessionId, mode.message, mode.message, CTX_EXPAND_TOKEN_BUDGET) ?? renderMessageByOrdinal(sessionId, mode.message, deps.recoveryAttachments);
         }
         const { start, end, verbose } = mode;
         const lastCompartmentEnd = getLastCompartmentEndMessage(deps.db, sessionId);
@@ -82576,20 +82719,7 @@ function createCtxExpandTool(deps) {
         if (archived)
           return archived;
         if (verbose) {
-          const v = renderVerboseRange(sessionId, start, effectiveEnd, CTX_EXPAND_TOKEN_BUDGET, deps.expandTools);
-          if (!v.text) {
-            return `No messages found in range ${start}-${effectiveEnd}. The range may be outside this session's history.`;
-          }
-          const out = [
-            `Messages ${start}-${v.lastOrdinal} (verbose). Recover any one in full with mmc_expand(message=<ordinal>):`,
-            "",
-            v.text
-          ];
-          if (v.truncated) {
-            out.push("", `Truncated at message ${v.lastOrdinal} (budget: ~${CTX_EXPAND_TOKEN_BUDGET} tokens). Call again with start=${v.lastOrdinal + 1} end=${effectiveEnd} verbose=true for more.`);
-          }
-          return out.join(`
-`);
+          return renderVerboseRangeForTool(sessionId, start, effectiveEnd, CTX_EXPAND_TOKEN_BUDGET, deps.expandTools, deps.recoveryAttachments);
         }
         const chunk = readSessionChunk(sessionId, CTX_EXPAND_TOKEN_BUDGET, start, effectiveEnd + 1, { expand: false });
         if (!chunk.text || chunk.messageCount === 0) {
@@ -85502,7 +85632,7 @@ var init_context = __esm(async () => {
 // package.json
 var package_default = {
   name: "@retaw106/mmc-oc",
-  version: "2.6.0",
+  version: "2.7.1",
   type: "module",
   description: "OpenCode plugin for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -85533,14 +85663,16 @@ var package_default = {
   files: [
     "dist",
     "index.js",
+    "tui.js",
     "src/shared",
     "src/config",
     "src/agents",
     "README.md"
   ],
   scripts: {
-    build: "bun ../../scripts/check-bun.mjs && bun ../../scripts/clean-dist-chunks.mjs dist index.js config-init.js cli.js && rm -rf dist/web && bun build src/index.ts --outdir dist --target node --format esm --splitting --external @opencode-ai/plugin --external bun:sqlite --external node:sqlite && bun run build:v2 && bun run build:web && bun run build:config-init && bun run build:cli && tsc --emitDeclarationOnly",
+    build: "bun ../../scripts/check-bun.mjs && bun ../../scripts/clean-dist-chunks.mjs dist index.js config-init.js cli.js && rm -rf dist/web && bun build src/index.ts --outdir dist --target node --format esm --splitting --external @opencode-ai/plugin --external bun:sqlite --external node:sqlite && bun run build:v2 && bun run build:tui && bun run build:web && bun run build:config-init && bun run build:cli && tsc --emitDeclarationOnly",
     "build:v2": "bun build src/v2/server.ts --outfile dist/v2/server.js --target node --format esm --external @opencode/plugin && bun test src/v2/server.test.ts",
+    "build:tui": "bun build src/v2/tui/entry.ts --outfile dist/tui.js --target node --format esm",
     "build:web": "bun build src/web/main.ts --outfile dist/web/main.js --target node --format esm --external bun:sqlite --external node:sqlite && mkdir -p dist/web/ui && cp src/web/ui/* dist/web/ui/",
     "build:config-init": "bun build scripts/config-init-entry.ts --outfile dist/config-init.js --target node --format esm",
     "build:cli": "bun build scripts/cli.ts --outfile dist/cli.js --target node --format esm",
@@ -85582,10 +85714,18 @@ var package_default = {
     ".": {
       types: "./dist/index.d.ts",
       import: "./dist/index.js"
+    },
+    "./tui": {
+      import: "./tui.js"
     }
   },
   "oc-plugin": [
-    "server"
+    "server",
+    "tui"
+  ],
+  opencode: [
+    "server",
+    "tui"
   ],
   peerDependencies: {
     "@opencode-ai/plugin": ">=1.15.0"

package/dist/v2/tui/client.d.ts

@@ -0,0 +1,57 @@
+import type { StatusDetail } from "../../shared/rpc-types";
+import { type CommandRpcResult, type StatusDetailResult } from "./context-rpc";
+import { type SocketNotification } from "./notification-socket";
+import type { V2KeymapLayer, V2TuiContext } from "./types";
+/**
+ * Plain-text projection of the status snapshot for the host's native text
+ * dialog. This tier mounts no component dialog, so this is the only arm the
+ * `/mmc-status` dialog ever draws.
+ *
+ * Exported for test access.
+ */
+export declare function statusText(detail: Pick<StatusDetail, "contextLimit" | "usagePercentage" | "inputTokens" | "compaction_enabled" | "historianRunning" | "compartmentCount" | "memoryBlockCount" | "memoryCount" | "pendingOpsCount" | "configGeneration" | "configAdoptedAt" | "configReloadFailure" | "lastTransformError">): string;
+/**
+ * Plain-text status for one checked result: the status lines above, or the
+ * "status unavailable" view as text when there is no usable snapshot. A
+ * server/UI version difference is named first in both cases.
+ *
+ * Exported for test access.
+ */
+export declare function statusTextFor(status: StatusDetailResult): string;
+/** The command runner `buildKeymapLayer` hands each slash command. */
+export type CommandRunner = (title: string, call: (sessionID: string) => Promise<CommandRpcResult>, pending?: string) => Promise<boolean>;
+/**
+ * Every /mmc-* command this host can reach from the palette goes through this
+ * runner: OpenCode 2 has no `command.execute.before` hook, so the server-side
+ * command handler the OpenCode 1 plugin uses never runs here. Each call
+ * invokes the RPC handler that does the same server-side work and reports
+ * back through a dialog or toast, because this host has no ignored-message
+ * chat carrier.
+ *
+ * Exported (with the context injected) so the branches are unit-testable
+ * without a live socket.
+ */
+export declare function createCommandRunner(context: V2TuiContext): CommandRunner;
+/**
+ * The five fork slash commands, built with the context and dialog hooks
+ * injected so the command set is unit-testable without a live socket.
+ */
+export declare function buildKeymapLayer(context: V2TuiContext, hooks: {
+    showStatus: (target?: string | null) => Promise<boolean>;
+    showRecomp: (target?: string | null) => Promise<boolean>;
+    runCommand: CommandRunner;
+}): V2KeymapLayer;
+/**
+ * The four server→TUI notification branches this tier consumes. Everything the
+ * sidebar tier handled (refresh-sidebar and any unknown action) returns false,
+ * which leaves the notification unacknowledged instead of falsely consumed.
+ *
+ * Exported (with the dialog hooks injected) so the routing is unit-testable
+ * without a live socket.
+ */
+export declare function createNotificationHandler(context: V2TuiContext, hooks: {
+    showStatus: (target?: string | null) => Promise<boolean>;
+    showRecomp: (target?: string | null) => Promise<boolean>;
+}): (notification: SocketNotification) => Promise<boolean>;
+export declare function setup(context: V2TuiContext): Promise<() => void>;
+//# sourceMappingURL=client.d.ts.map

package/dist/v2/tui/client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/v2/tui/client.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAG3D,OAAO,EACH,KAAK,gBAAgB,EAQrB,KAAK,kBAAkB,EAC1B,MAAM,eAAe,CAAC;AACvB,OAAO,EACH,KAAK,kBAAkB,EAG1B,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAQ3D;;;;;;GAMG;AACH,wBAAgB,UAAU,CACtB,MAAM,EAAE,IAAI,CACR,YAAY,EACV,cAAc,GACd,iBAAiB,GACjB,aAAa,GACb,oBAAoB,GACpB,kBAAkB,GAClB,kBAAkB,GAClB,kBAAkB,GAClB,aAAa,GACb,iBAAiB,GACjB,kBAAkB,GAClB,iBAAiB,GACjB,qBAAqB,GACrB,oBAAoB,CACzB,GACF,MAAM,CA6BR;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAoBhE;AAOD,sEAAsE;AACtE,MAAM,MAAM,aAAa,GAAG,CACxB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,EACtD,OAAO,CAAC,EAAE,MAAM,KACf,OAAO,CAAC,OAAO,CAAC,CAAC;AAEtB;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,aAAa,CAyBxE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC5B,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE;IACH,UAAU,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzD,UAAU,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzD,UAAU,EAAE,aAAa,CAAC;CAC7B,GACF,aAAa,CAmFf;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACrC,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE;IACH,UAAU,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzD,UAAU,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC5D,GACF,CAAC,YAAY,EAAE,kBAAkB,KAAK,OAAO,CAAC,OAAO,CAAC,CAqCxD;AAqID,wBAAsB,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC,CAetE"}

package/dist/v2/tui/context-rpc.d.ts

@@ -0,0 +1,63 @@
+import { MagicContextRpcClient } from "../../shared/rpc-client";
+import { type OpenCodeStatusExtras, type StatusCheck } from "../../shared/status-view-check";
+/** Initialize the RPC client. Call once on TUI startup. */
+export declare function initRpcClient(directory: string): void;
+/**
+ * The server the notification socket should subscribe to: the one that owns
+ * the shown session's directory, so a push from the command that session runs
+ * (for example `/mmc-status` asking to open its dialog) reaches this TUI. That
+ * is the startup directory's server when no session is shown or the session is
+ * in the startup directory. A session directory with no discovery file falls
+ * back to the startup server so session-less notifications still arrive
+ * (upstream additionally asks every local server which one owns the session;
+ * this fork's rpc-client has no session-owner discovery, so that arm is not
+ * ported).
+ */
+export declare function resolveNotificationTarget(sessionDirectory: string | null): Promise<{
+    client: MagicContextRpcClient;
+    directory: string;
+    endpoint: {
+        port: number;
+        token: string | null;
+        instanceId: string | null;
+    };
+} | null>;
+/** The directory whose server a notification subscription for `sessionDirectory` targets first. */
+export declare function notificationDirectoryFor(sessionDirectory: string | null): string;
+export declare function getRpcGeneration(): number;
+/** Clean up the RPC client. */
+export declare function closeRpc(): void;
+export type StatusDetailResult = StatusCheck<OpenCodeStatusExtras>;
+/**
+ * Fetch the status for the `/mmc-status` dialog. Every reply, including a
+ * transport failure, comes back as a checked result: either a snapshot the
+ * view model can draw, or the reason there is none. The dialog never receives
+ * an unchecked payload.
+ */
+export declare function loadStatusDetail(sessionId: string, directory: string, modelKey?: string): Promise<StatusDetailResult>;
+/**
+ * Send recomp request to server via RPC. `directory` is the session's
+ * directory, so the request reaches the server instance that owns the session.
+ */
+export declare function requestRecomp(sessionId: string, directory?: string): Promise<boolean>;
+/** What a command RPC reports back: finished text, an acknowledgement that
+ *  background work started (no text yet), or the failure. */
+export type CommandRpcResult = {
+    ok: true;
+    message?: string;
+    started?: boolean;
+} | {
+    ok: false;
+    error?: string;
+};
+/** Run `/mmc-flush` for the session: apply the queued operations now. */
+export declare function requestFlush(sessionId: string): Promise<CommandRpcResult>;
+/** Start `/mmc-wrapup`: compact the older live tail, keeping the newest N raw. */
+export declare function requestWrapup(sessionId: string, messagesToKeep: number): Promise<CommandRpcResult>;
+/**
+ * Start one memory-maintenance pass for the session (fork-specific endpoint:
+ * the server command's default `status` subcommand is reachable through its
+ * own reply, so the TUI command always asks for a run).
+ */
+export declare function requestMaintenance(sessionId: string): Promise<CommandRpcResult>;
+//# sourceMappingURL=context-rpc.d.ts.map

package/dist/v2/tui/context-rpc.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"context-rpc.d.ts","sourceRoot":"","sources":["../../../src/v2/tui/context-rpc.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAEH,KAAK,oBAAoB,EACzB,KAAK,WAAW,EAEnB,MAAM,gCAAgC,CAAC;AAsBxC,2DAA2D;AAC3D,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CASrD;AA6BD;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC;IACtF,MAAM,EAAE,qBAAqB,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;CAC/E,GAAG,IAAI,CAAC,CAkBR;AAED,mGAAmG;AACnG,wBAAgB,wBAAwB,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAIhF;AAaD,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,+BAA+B;AAC/B,wBAAgB,QAAQ,IAAI,IAAI,CAQ/B;AAED,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC,oBAAoB,CAAC,CAAC;AAEnE;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAClC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CAY7B;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAU3F;AAED;6DAC6D;AAC7D,MAAM,MAAM,gBAAgB,GACtB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GACjD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAiBpC,yEAAyE;AACzE,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAE/E;AAED,kFAAkF;AAClF,wBAAsB,aAAa,CAC/B,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,GACvB,OAAO,CAAC,gBAAgB,CAAC,CAE3B;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAErF"}