@wolfx/opencode-magic-context 0.24.0 → 0.24.1

package/dist/index.js

@@ -154609,15 +154609,22 @@ function ownerMessageIdForTagRow(row) {
   }
   return row.message_id.replace(CONTENT_ID_SUFFIX, "");
 }
-function getActiveTagTokenAggregate(db, sessionId) {
-  const row = db.prepare(`SELECT
+function getActiveTagTokenAggregate(db, sessionId, protectedTags = 0) {
+  const toolOutputExpr = protectedTags > 0 ? `COALESCE(SUM(CASE WHEN type = 'tool' AND tag_number < (
+                    SELECT tag_number FROM tags
+                    WHERE session_id = ? AND status = 'active'
+                    ORDER BY tag_number DESC LIMIT 1 OFFSET ?
+                ) THEN COALESCE(token_count, 0) ELSE 0 END), 0)` : `COALESCE(SUM(CASE WHEN type = 'tool' THEN COALESCE(token_count, 0) ELSE 0 END), 0)`;
+  const sql = `SELECT
                 COALESCE(SUM(CASE WHEN type != 'tool' THEN COALESCE(token_count, 0) ELSE 0 END), 0)
                     + COALESCE(SUM(COALESCE(reasoning_token_count, 0)), 0) AS conversation,
                 COALESCE(SUM(CASE WHEN type = 'tool' THEN COALESCE(token_count, 0) + COALESCE(input_token_count, 0) ELSE 0 END), 0) AS tool_call,
-                COALESCE(SUM(CASE WHEN type = 'tool' THEN COALESCE(token_count, 0) ELSE 0 END), 0) AS tool_output,
+                ${toolOutputExpr} AS tool_output,
                 COALESCE(SUM(CASE WHEN token_count IS NULL THEN 1 ELSE 0 END), 0) AS null_count
              FROM tags
-             WHERE session_id = ? AND status = 'active'`).get(sessionId);
+             WHERE session_id = ? AND status = 'active'`;
+  const params = protectedTags > 0 ? [sessionId, protectedTags - 1, sessionId] : [sessionId];
+  const row = db.prepare(sql).get(...params);
   return {
     conversation: row?.conversation ?? 0,
     toolCall: row?.tool_call ?? 0,
@@ -165372,9 +165379,10 @@ function chunkCanonicalText(canonicalText, startOrdinal, endOrdinal, maxInputTok
   if (lines.length === 0 || endOrdinal < startOrdinal)
     return [];
   const normalizedMax = normalizeCompartmentChunkMaxInputTokens(maxInputTokens);
+  const effectiveMax = Math.max(1, Math.floor(normalizedMax * CHUNK_WINDOW_SAFETY_RATIO));
   const fullText = lines.join(`
 `);
-  if (estimateTokens(fullText) <= normalizedMax) {
+  if (estimateTokens(fullText) <= effectiveMax) {
     return [
       {
         windowIndex: 0,
@@ -165412,7 +165420,7 @@ function chunkCanonicalText(canonicalText, startOrdinal, endOrdinal, maxInputTok
     const lineStart = range?.start ?? startOrdinal;
     const lineEnd = range?.end ?? lineStart;
     const lineTokens = estimateTokens(line);
-    if (currentLines.length > 0 && currentTokens + lineTokens > normalizedMax) {
+    if (currentLines.length > 0 && currentTokens + lineTokens > effectiveMax) {
       flush2();
     }
     if (currentLines.length === 0) {
@@ -165567,7 +165575,7 @@ function countUnembeddedSessionCompartments(db, projectPath, sessionId, modelId)
                )`).get(projectPath, sessionId, projectPath, modelId);
   return typeof row?.n === "number" ? row.n : 0;
 }
-var DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS = 512, loadFtsRowsStatements, existingHashStatements, existingHashByProjectStatements, deleteByCompartmentStatements, insertEmbeddingStatements, distinctModelStatements, clearProjectStatements, clearProjectModelStatements, searchRowsStatements, searchRowsByModelStatements, backfillCandidateStatements, sessionBackfillCandidateStatements;
+var DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS = 512, CHUNK_WINDOW_SAFETY_RATIO = 0.9, loadFtsRowsStatements, existingHashStatements, existingHashByProjectStatements, deleteByCompartmentStatements, insertEmbeddingStatements, distinctModelStatements, clearProjectStatements, clearProjectModelStatements, searchRowsStatements, searchRowsByModelStatements, backfillCandidateStatements, sessionBackfillCandidateStatements;
 var init_compartment_chunk_embedding = __esm(() => {
   init_read_session_formatting();
   loadFtsRowsStatements = new WeakMap;
@@ -166035,6 +166043,13 @@ var init_embedding_ssrf = __esm(() => {
 function normalizeEndpoint3(endpoint) {
   return endpoint?.trim().replace(/\/+$/, "") ?? "";
 }
+function embeddingModelsMatch(served, requested) {
+  const a = served.trim().toLowerCase();
+  const b = requested.trim().toLowerCase();
+  if (a.length === 0 || b.length === 0)
+    return true;
+  return a === b || a.includes(b) || b.includes(a);
+}
 
 class OpenAICompatibleEmbeddingProvider {
   modelId;
@@ -166048,6 +166063,7 @@ class OpenAICompatibleEmbeddingProvider {
   failureTimes = [];
   circuitOpenUntil = 0;
   openLogged = false;
+  modelMismatchLogged = false;
   halfOpenProbeInFlight = false;
   constructor(options) {
     this.endpoint = normalizeEndpoint3(options.endpoint);
@@ -166146,6 +166162,15 @@ class OpenAICompatibleEmbeddingProvider {
         this.recordFailure(isProbe);
         return Array.from({ length: texts.length }, () => null);
       }
+      const servedModel = typeof body.model === "string" ? body.model : "";
+      if (this.model && servedModel && !embeddingModelsMatch(servedModel, this.model)) {
+        if (!this.modelMismatchLogged) {
+          log(`[magic-context] embedding endpoint served a DIFFERENT model than requested — refusing the substituted vectors (they have the wrong dimensions/space). requested="${this.model}" served="${servedModel}". The endpoint likely substituted a loaded model; load/select "${this.model}" on the endpoint, or set embedding.model to the served model.`);
+          this.modelMismatchLogged = true;
+        }
+        this.recordFailure(isProbe);
+        return Array.from({ length: texts.length }, () => null);
+      }
       const items = Array.isArray(body.data) ? body.data : [];
       const results = Array.from({ length: texts.length }, (_, index) => {
         const embedding = items[index]?.embedding;
@@ -166632,7 +166657,7 @@ function getChunkEmbeddingModelId(config2, providerIdentity) {
   }
   const chunkIdentity = {
     providerIdentity,
-    chunkerVersion: 1,
+    chunkerVersion: 2,
     maxInputTokens: normalizeCompartmentChunkMaxInputTokens("max_input_tokens" in config2 ? config2.max_input_tokens : undefined),
     truncate: config2.provider === "openai-compatible" ? config2.truncate ?? "" : ""
   };
@@ -169271,7 +169296,7 @@ ${prepared.block}
   if (!firstMessage || !textPart || isDroppedPlaceholder(textPart.text)) {
     messages.unshift({
       info: { role: "user", sessionID: sessionId },
-      parts: [{ type: "text", text: historyBlock }]
+      parts: [{ type: "text", text: historyBlock, synthetic: true }]
     });
   } else {
     textPart.text = `${historyBlock}
@@ -170161,10 +170186,16 @@ function softRefreshCachedM1(options) {
 function prependM0M1Messages(sessionId, messages, m0Text, m1Text) {
   messages.unshift({
     info: { role: "user", sessionID: sessionId },
-    parts: [{ type: "text", text: m0Text.length > 0 ? m0Text : M0_EMPTY_BODY }]
+    parts: [
+      {
+        type: "text",
+        text: m0Text.length > 0 ? m0Text : M0_EMPTY_BODY,
+        synthetic: true
+      }
+    ]
   }, {
     info: { role: "user", sessionID: sessionId },
-    parts: [{ type: "text", text: m1Text }]
+    parts: [{ type: "text", text: m1Text, synthetic: true }]
   });
 }
 function renderFreshM0NonPersisted(options) {
@@ -177054,6 +177085,11 @@ async function runManagedRecomp(ctx, sessionId, options) {
   try {
     const message = await executeContextRecomp(buildRecompDeps(ctx, sessionId), options);
     const terminalPhase = isRecompSkip(message) ? "skipped" : isRecompFailure(message) ? "failed" : "done";
+    if (terminalPhase === "done") {
+      try {
+        clearEmergencyRecovery(ctx.db, sessionId);
+      } catch {}
+    }
     setRecompTerminal(ctx.liveSessionState, sessionId, terminalPhase, extractRecompReason(message));
     return message;
   } catch (error51) {
@@ -177152,6 +177188,7 @@ var RECOMP_DONE_GRACE_MS = 30000;
 var init_recomp_orchestrator = __esm(async () => {
   init_compartment_storage();
   init_project_identity2();
+  init_storage_meta_persisted();
   await __promiseAll([
     init_memory_migration(),
     init_compartment_runner()
@@ -182686,8 +182723,8 @@ var CHANNEL1_SENTINEL = "<system-reminder>";
 var TOKENS_PER_BYTE = 0.25;
 var CHANNEL1_FLOOR_TOKENS = 1e4;
 var CHANNEL1_REFIRE_FLOOR_TOKENS = 1e4;
-function channel1RefireTokens(historyBudgetTokens) {
-  const scaled = Math.round(0.05 * Math.max(0, historyBudgetTokens));
+function channel1RefireTokens(workingWindowTokens) {
+  const scaled = Math.round(0.05 * Math.max(0, workingWindowTokens));
   return Math.max(CHANNEL1_REFIRE_FLOOR_TOKENS, scaled);
 }
 var S_GENTLE = 0.2;
@@ -182757,7 +182794,7 @@ function computeTailTokenEstimate(messages) {
   };
 }
 function decideChannel1(input) {
-  const { undroppedTokens, pressure, historyBudgetTokens, hasRecentReduce } = input;
+  const { undroppedTokens, pressure, workingWindowTokens, hasRecentReduce } = input;
   const resetCycle = hasRecentReduce || undroppedTokens < input.lastNudgeUndropped;
   const lastNudge = resetCycle ? 0 : input.lastNudgeUndropped;
   const lastLevel = resetCycle ? "" : input.lastNudgeLevel;
@@ -182772,7 +182809,7 @@ function decideChannel1(input) {
     return quiet();
   if (undroppedTokens < CHANNEL1_FLOOR_TOKENS)
     return quiet();
-  const budget = historyBudgetTokens > 0 ? historyBudgetTokens : undroppedTokens || 1;
+  const budget = workingWindowTokens > 0 ? workingWindowTokens : undroppedTokens || 1;
   const severity = undroppedTokens / budget * pressure;
   if (severity < S_GENTLE)
     return quiet();
@@ -182784,7 +182821,7 @@ function decideChannel1(input) {
   else
     level = "gentle";
   if (lastLevel === "") {
-    if (undroppedTokens < lastNudge + channel1RefireTokens(historyBudgetTokens)) {
+    if (undroppedTokens < lastNudge + channel1RefireTokens(workingWindowTokens)) {
       return quiet();
     }
   } else if (LEVEL_RANK[level] <= LEVEL_RANK[lastLevel]) {
@@ -182829,13 +182866,13 @@ function buildChannel1Reminder(level, undroppedTokens) {
   let body;
   switch (level) {
     case "gentle":
-      body = `You have ~${amount} tokens of tool output you have not reduced. ` + `Once you are done with earlier outputs, drop them with ctx_reduce to keep context lean.`;
+      body = `You have ~${amount} tokens of tool output you have not reduced. ` + `When you are done with earlier outputs, dropping them with ctx_reduce keeps context lean.`;
       break;
     case "firm":
-      body = `~${amount} tokens of unreduced tool output is accumulating. ` + `Drop what you have already processed with ctx_reduce before continuing.`;
+      body = `~${amount} tokens of unreduced tool output has built up. ` + `At your next natural stopping point, consider dropping what you have already processed with ctx_reduce.`;
       break;
     case "urgent":
-      body = `~${amount} tokens of unreduced tool output remain. ` + `A large span of this session will be comparted soon; drop spent outputs with ctx_reduce first so the archived span is the part that matters.`;
+      body = `~${amount} tokens of unreduced tool output remain, and a large span of this session will be comparted before long. ` + `Consider dropping spent outputs with ctx_reduce so the archived span is the part that matters.`;
       break;
   }
   return `
@@ -184423,8 +184460,55 @@ function appendReminderToUserMessage(message, reminder) {
 }
 
 // src/hooks/magic-context/apply-operations.ts
-init_tag_part_guards();
 await init_storage();
+
+// src/hooks/magic-context/system-injection-stripper.ts
+var SYSTEM_INJECTION_MARKERS = [
+  "<!-- OMO_INTERNAL_INITIATOR -->",
+  "[SYSTEM DIRECTIVE: MAGIC-CONTEXT",
+  "[SYSTEM DIRECTIVE: OH-MY-OPENCODE",
+  "[Category+Skill Reminder]",
+  "[EDIT ERROR - IMMEDIATE ACTION REQUIRED]",
+  "[task CALL FAILED - IMMEDIATE RETRY REQUIRED]",
+  "[EMERGENCY CONTEXT WINDOW WARNING]",
+  "Unstable background agent appears idle",
+  "**THE SUBAGENT JUST CLAIMED THIS TASK IS DONE."
+];
+var SYSTEM_REMINDER_REGEX = /<system-reminder>[\s\S]*?<\/system-reminder>/gi;
+var OMO_MARKER_REGEX = /<!-- OMO_INTERNAL_INITIATOR -->/g;
+function stripSystemInjection(text) {
+  let hasInjection = false;
+  for (const marker of SYSTEM_INJECTION_MARKERS) {
+    if (text.includes(marker)) {
+      hasInjection = true;
+      break;
+    }
+  }
+  if (SYSTEM_REMINDER_REGEX.test(text))
+    hasInjection = true;
+  SYSTEM_REMINDER_REGEX.lastIndex = 0;
+  if (!hasInjection)
+    return null;
+  let cleaned = text;
+  cleaned = cleaned.replace(SYSTEM_REMINDER_REGEX, "");
+  cleaned = cleaned.replace(OMO_MARKER_REGEX, "");
+  cleaned = cleaned.replace(/\[SYSTEM DIRECTIVE: OH-MY-(?:OPENCODE|CLAUDE)[^\]]*\][\s\S]*?(?=\n\n(?!\s*[-*])|$)/g, "");
+  for (const marker of SYSTEM_INJECTION_MARKERS) {
+    if (marker.startsWith("<!-- ") || marker.startsWith("[SYSTEM DIRECTIVE"))
+      continue;
+    const idx = cleaned.indexOf(marker);
+    if (idx === -1)
+      continue;
+    const blockEnd = cleaned.indexOf(`
+
+`, idx + marker.length);
+    cleaned = blockEnd !== -1 ? cleaned.slice(0, idx) + cleaned.slice(blockEnd) : cleaned.slice(0, idx);
+  }
+  return cleaned.trim();
+}
+
+// src/hooks/magic-context/apply-operations.ts
+init_tag_part_guards();
 var USER_DROP_PREVIEW_CHARS = 250;
 var RECENT_TOOL_SKELETON_WINDOW = 20;
 function buildReplacementContent(tagId, target) {
@@ -184433,6 +184517,10 @@ function buildReplacementContent(tagId, target) {
     return `[dropped §${tagId}§]`;
   }
   const currentContent = target.getContent?.() ?? "";
+  const strippedInjection = stripSystemInjection(currentContent);
+  if (strippedInjection !== null && stripTagPrefix(strippedInjection).trim().length === 0) {
+    return `[dropped §${tagId}§]`;
+  }
   const originalText = stripTagPrefix(currentContent);
   if (originalText.length <= USER_DROP_PREVIEW_CHARS) {
     return `[truncated §${tagId}§]
@@ -186139,51 +186227,6 @@ function planEmergencyDrop(input) {
   };
 }
 
-// src/hooks/magic-context/system-injection-stripper.ts
-var SYSTEM_INJECTION_MARKERS = [
-  "<!-- OMO_INTERNAL_INITIATOR -->",
-  "[SYSTEM DIRECTIVE: MAGIC-CONTEXT",
-  "[SYSTEM DIRECTIVE: OH-MY-OPENCODE",
-  "[Category+Skill Reminder]",
-  "[EDIT ERROR - IMMEDIATE ACTION REQUIRED]",
-  "[task CALL FAILED - IMMEDIATE RETRY REQUIRED]",
-  "[EMERGENCY CONTEXT WINDOW WARNING]",
-  "Unstable background agent appears idle",
-  "**THE SUBAGENT JUST CLAIMED THIS TASK IS DONE."
-];
-var SYSTEM_REMINDER_REGEX = /<system-reminder>[\s\S]*?<\/system-reminder>/gi;
-var OMO_MARKER_REGEX = /<!-- OMO_INTERNAL_INITIATOR -->/g;
-function stripSystemInjection(text) {
-  let hasInjection = false;
-  for (const marker of SYSTEM_INJECTION_MARKERS) {
-    if (text.includes(marker)) {
-      hasInjection = true;
-      break;
-    }
-  }
-  if (SYSTEM_REMINDER_REGEX.test(text))
-    hasInjection = true;
-  SYSTEM_REMINDER_REGEX.lastIndex = 0;
-  if (!hasInjection)
-    return null;
-  let cleaned = text;
-  cleaned = cleaned.replace(SYSTEM_REMINDER_REGEX, "");
-  cleaned = cleaned.replace(OMO_MARKER_REGEX, "");
-  cleaned = cleaned.replace(/\[SYSTEM DIRECTIVE: OH-MY-(?:OPENCODE|CLAUDE)[^\]]*\][\s\S]*?(?=\n\n(?!\s*[-*])|$)/g, "");
-  for (const marker of SYSTEM_INJECTION_MARKERS) {
-    if (marker.startsWith("<!-- ") || marker.startsWith("[SYSTEM DIRECTIVE"))
-      continue;
-    const idx = cleaned.indexOf(marker);
-    if (idx === -1)
-      continue;
-    const blockEnd = cleaned.indexOf(`
-
-`, idx + marker.length);
-    cleaned = blockEnd !== -1 ? cleaned.slice(0, idx) + cleaned.slice(blockEnd) : cleaned.slice(0, idx);
-  }
-  return cleaned.trim();
-}
-
 // src/hooks/magic-context/heuristic-cleanup.ts
 init_tag_part_guards();
 var DEDUP_SAFE_TOOLS = new Set([
@@ -187647,7 +187690,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         let tailToolTokens;
         let liveTailTokens;
         try {
-          const agg = getActiveTagTokenAggregate(db, sessionId);
+          const agg = getActiveTagTokenAggregate(db, sessionId, deps.protectedTags);
           tailToolTokens = agg.toolOutput;
           liveTailTokens = agg.conversation + agg.toolCall;
         } catch {
@@ -188282,10 +188325,11 @@ function maybeInjectChannel1Nudge(args, sessionId, tool, output) {
     contextLimit: state.contextLimit,
     executeThresholdPercentage: state.executeThresholdPercentage
   });
+  const workingWindowTokens = Math.round(state.contextLimit * state.executeThresholdPercentage / 100);
   const decision = decideChannel1({
     undroppedTokens,
     pressure,
-    historyBudgetTokens: state.historyBudgetTokens,
+    workingWindowTokens,
     lastNudgeUndropped: getLastNudgeUndropped(args.db, sessionId),
     lastNudgeLevel: getLastNudgeLevel(args.db, sessionId),
     hasRecentReduce: false

package/dist/shared/tui-preferences.d.ts

@@ -0,0 +1,32 @@
+export declare const TUI_PREFS_FILE_ENV = "OPENCODE_TUI_PREFERENCES_FILE";
+export declare function getTuiPreferencesFile(): string;
+export declare function readTuiPreferencesFile(): Promise<Record<string, unknown>>;
+export declare function readTuiPreferencesFileSync(): Record<string, unknown>;
+export declare const PLUGIN_KEY = "magic-context";
+export declare const DEFAULT_SLOT_ORDER = 200;
+export interface MagicContextTuiPrefs {
+    forceToTop: boolean;
+    order: number;
+    startCollapsed: boolean;
+    rememberCollapsed: boolean;
+    collapsed: boolean | null;
+    header: {
+        label: string;
+    };
+    sections: {
+        historian: boolean;
+        memory: boolean;
+        status: boolean;
+        dreamer: boolean;
+        stats: boolean;
+    };
+}
+export type TuiSections = MagicContextTuiPrefs["sections"];
+export declare const DEFAULT_PREFS: MagicContextTuiPrefs;
+export declare function resolveMagicContextPrefs(root: Record<string, unknown>): MagicContextTuiPrefs;
+export declare function computeEffectiveOrder(root: Record<string, unknown>, pluginKey: string, defaultOrder: number): number;
+type JsonValue = string | number | boolean | null;
+export declare function queueTuiPreferenceUpdate(pluginKey: string, path: string[], value: JsonValue): Promise<void>;
+export declare function watchTuiPreferences(onChange: () => void): () => void;
+export {};
+//# sourceMappingURL=tui-preferences.d.ts.map

package/dist/shared/tui-preferences.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tui-preferences.d.ts","sourceRoot":"","sources":["../../src/shared/tui-preferences.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,kBAAkB,kCAAkC,CAAC;AAGlE,wBAAgB,qBAAqB,IAAI,MAAM,CAO9C;AAQD,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAS/E;AAMD,wBAAgB,0BAA0B,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASpE;AAED,eAAO,MAAM,UAAU,kBAAkB,CAAC;AAC1C,eAAO,MAAM,kBAAkB,MAAM,CAAC;AAEtC,MAAM,WAAW,oBAAoB;IACjC,UAAU,EAAE,OAAO,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAE3B,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC;IAC1B,MAAM,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,QAAQ,EAAE;QACN,SAAS,EAAE,OAAO,CAAC;QACnB,MAAM,EAAE,OAAO,CAAC;QAChB,MAAM,EAAE,OAAO,CAAC;QAChB,OAAO,EAAE,OAAO,CAAC;QACjB,KAAK,EAAE,OAAO,CAAC;KAClB,CAAC;CACL;AAED,MAAM,MAAM,WAAW,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAC;AAE3D,eAAO,MAAM,aAAa,EAAE,oBAc3B,CAAC;AAmBF,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,oBAAoB,CAyB5F;AAgBD,wBAAgB,qBAAqB,CACjC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,GACrB,MAAM,CAOR;AASD,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;AA0DlD,wBAAgB,wBAAwB,CACpC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EAAE,EACd,KAAK,EAAE,SAAS,GACjB,OAAO,CAAC,IAAI,CAAC,CAGf;AAeD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAuCpE"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wolfx/opencode-magic-context",
-	"version": "0.24.0",
+	"version": "0.24.1",
 	"type": "module",
 	"description": "OpenCode plugin for Magic Context — cross-session memory and context management",
 	"main": "dist/index.js",

package/src/shared/tui-preferences.test.ts

@@ -0,0 +1,210 @@
+import { afterEach, beforeEach, describe, expect, test } from "bun:test";
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { parse } from "comment-json";
+import {
+    computeEffectiveOrder,
+    DEFAULT_PREFS,
+    DEFAULT_SLOT_ORDER,
+    getTuiPreferencesFile,
+    PLUGIN_KEY,
+    queueTuiPreferenceUpdate,
+    readTuiPreferencesFile,
+    resolveMagicContextPrefs,
+    TUI_PREFS_FILE_ENV,
+} from "./tui-preferences";
+
+let dir: string;
+let file: string;
+const savedEnv: Record<string, string | undefined> = {};
+const ENV_KEYS = [TUI_PREFS_FILE_ENV, "OPENCODE_CONFIG_DIR", "XDG_CONFIG_HOME"];
+
+beforeEach(async () => {
+    for (const key of ENV_KEYS) savedEnv[key] = process.env[key];
+    dir = await mkdtemp(join(tmpdir(), "mc-tui-prefs-test-"));
+    file = join(dir, "tui-preferences.jsonc");
+    process.env[TUI_PREFS_FILE_ENV] = file;
+});
+
+afterEach(async () => {
+    for (const key of ENV_KEYS) {
+        if (savedEnv[key] === undefined) delete process.env[key];
+        else process.env[key] = savedEnv[key];
+    }
+    await rm(dir, { recursive: true, force: true });
+});
+
+describe("getTuiPreferencesFile", () => {
+    test("env override wins", () => {
+        expect(getTuiPreferencesFile()).toBe(file);
+    });
+
+    test("falls back to OPENCODE_CONFIG_DIR then XDG then ~/.config", () => {
+        delete process.env[TUI_PREFS_FILE_ENV];
+        process.env.OPENCODE_CONFIG_DIR = "/tmp/cfgdir";
+        expect(getTuiPreferencesFile()).toBe("/tmp/cfgdir/tui-preferences.jsonc");
+        delete process.env.OPENCODE_CONFIG_DIR;
+        process.env.XDG_CONFIG_HOME = "/tmp/xdg";
+        expect(getTuiPreferencesFile()).toBe("/tmp/xdg/opencode/tui-preferences.jsonc");
+    });
+});
+
+describe("readTuiPreferencesFile (tolerant)", () => {
+    test("missing file → {}", async () => {
+        expect(await readTuiPreferencesFile()).toEqual({});
+    });
+
+    test("malformed JSON → {}", async () => {
+        await writeFile(file, "{ this is not json ", "utf8");
+        expect(await readTuiPreferencesFile()).toEqual({});
+    });
+
+    test("non-object root → {}", async () => {
+        await writeFile(file, "[1, 2, 3]", "utf8");
+        expect(await readTuiPreferencesFile()).toEqual({});
+    });
+
+    test("jsonc with comments + trailing comma parses", async () => {
+        await writeFile(
+            file,
+            `{
+  // a comment
+  "magic-context": { "order": 205, },
+}`,
+            "utf8",
+        );
+        const root = await readTuiPreferencesFile();
+        expect(resolveMagicContextPrefs(root).order).toBe(205);
+    });
+});
+
+describe("resolveMagicContextPrefs (per-key validation)", () => {
+    test("missing key → full defaults clone", () => {
+        expect(resolveMagicContextPrefs({})).toEqual(DEFAULT_PREFS);
+        // clone, not the shared object
+        expect(resolveMagicContextPrefs({})).not.toBe(DEFAULT_PREFS);
+    });
+
+    test("one bad value never poisons the rest", () => {
+        const prefs = resolveMagicContextPrefs({
+            "magic-context": {
+                order: "nope",
+                rememberCollapsed: 1,
+                collapsed: true,
+                sections: { historian: false, memory: "bad" },
+            },
+        });
+        expect(prefs.order).toBe(DEFAULT_SLOT_ORDER); // bad → default
+        expect(prefs.rememberCollapsed).toBe(true); // bad → default true
+        expect(prefs.collapsed).toBe(true); // valid bool preserved
+        expect(prefs.sections.historian).toBe(false); // valid bool preserved
+        expect(prefs.sections.memory).toBe(true); // bad → default true
+    });
+
+    test("order clamps to -10000..10000", () => {
+        expect(resolveMagicContextPrefs({ "magic-context": { order: 99999 } }).order).toBe(10000);
+        expect(resolveMagicContextPrefs({ "magic-context": { order: -99999 } }).order).toBe(-10000);
+    });
+
+    test("collapsed non-boolean → null (seed from startCollapsed)", () => {
+        expect(resolveMagicContextPrefs({ "magic-context": {} }).collapsed).toBeNull();
+    });
+
+    test("header label clamps length, empty → default", () => {
+        expect(
+            resolveMagicContextPrefs({ "magic-context": { header: { label: "" } } }).header.label,
+        ).toBe(DEFAULT_PREFS.header.label);
+        expect(
+            resolveMagicContextPrefs({
+                "magic-context": { header: { label: "x".repeat(50) } },
+            }).header.label.length,
+        ).toBe(24);
+    });
+});
+
+describe("computeEffectiveOrder (cross-plugin convention)", () => {
+    test("default when key missing", () => {
+        expect(computeEffectiveOrder({}, PLUGIN_KEY, DEFAULT_SLOT_ORDER)).toBe(DEFAULT_SLOT_ORDER);
+    });
+
+    test("explicit order clamped", () => {
+        expect(computeEffectiveOrder({ "magic-context": { order: 250 } }, PLUGIN_KEY, 200)).toBe(
+            250,
+        );
+    });
+
+    test("forceToTop sorts below FORCE_TOP_BASE by key position", () => {
+        const root = { aft: { forceToTop: true }, "magic-context": { forceToTop: true } };
+        expect(computeEffectiveOrder(root, "aft", 200)).toBe(-100000 + 0);
+        expect(computeEffectiveOrder(root, "magic-context", 200)).toBe(-100000 + 1);
+        // forced always beats any manual order (clamped band is strictly above)
+        expect(computeEffectiveOrder(root, "aft", 200)).toBeLessThan(-10000);
+    });
+});
+
+describe("write path — comment-json full round-trip", () => {
+    test("persists a nested key and reads back", async () => {
+        await queueTuiPreferenceUpdate(PLUGIN_KEY, ["collapsed"], true);
+        const prefs = resolveMagicContextPrefs(await readTuiPreferencesFile());
+        expect(prefs.collapsed).toBe(true);
+    });
+
+    test("seeds the file from the template when absent", async () => {
+        await queueTuiPreferenceUpdate(PLUGIN_KEY, ["order"], 205);
+        const text = await readFile(file, "utf8");
+        expect(text).toContain("Shared preferences for OpenCode TUI plugins");
+        expect(resolveMagicContextPrefs(await readTuiPreferencesFile()).order).toBe(205);
+    });
+
+    test("INTEROP: a sibling plugin's values AND comments survive MC writing only its key", async () => {
+        // A shared file owned partly by anthropic-auth, with comments and an
+        // appearance block MC knows nothing about. MC must touch ONLY its key.
+        await writeFile(
+            file,
+            `{
+  // anthropic-auth section — DO NOT lose this BLOCK comment
+  "anthropic-auth": {
+    "order": 160,
+    "header": { "label": "CLAUDE" },
+    // bar appearance knobs MC has no schema for
+    "appearance": { "barWidth": 10, "barFilledChar": "#" },
+    "pollMs": 2000 // INLINE trailing comment — must survive too
+  },
+  "magic-context": { "order": 200 }
+}
+`,
+            "utf8",
+        );
+
+        await queueTuiPreferenceUpdate(PLUGIN_KEY, ["collapsed"], true);
+
+        const text = await readFile(file, "utf8");
+        // sibling comments preserved — BOTH block and inline trailing
+        // (comment-json round-trips both faithfully; enforce the guarantee).
+        expect(text).toContain("anthropic-auth section — DO NOT lose this BLOCK comment");
+        expect(text).toContain("bar appearance knobs MC has no schema for");
+        expect(text).toContain("INLINE trailing comment — must survive too");
+
+        // sibling VALUES intact (incl. nested keys MC has no schema for)
+        const root = parse(text) as Record<string, Record<string, unknown>>;
+        const aa = root["anthropic-auth"] as Record<string, unknown>;
+        expect(aa.order).toBe(160);
+        expect((aa.header as Record<string, unknown>).label).toBe("CLAUDE");
+        const appearance = aa.appearance as Record<string, unknown>;
+        expect(appearance.barWidth).toBe(10);
+        expect(appearance.barFilledChar).toBe("#");
+
+        // MC's own change landed
+        expect(resolveMagicContextPrefs(root).collapsed).toBe(true);
+        expect(resolveMagicContextPrefs(root).order).toBe(200);
+    });
+
+    test("malformed existing file → write is a no-op, sibling content untouched", async () => {
+        const broken = `{ "anthropic-auth": { "order": 160 } broken `;
+        await writeFile(file, broken, "utf8");
+        await queueTuiPreferenceUpdate(PLUGIN_KEY, ["collapsed"], true);
+        // unchanged — we never clobber a file we can't safely parse
+        expect(await readFile(file, "utf8")).toBe(broken);
+    });
+});