@cortexkit/opencode-magic-context 0.29.1 → 0.30.0

package/dist/index.js

@@ -163278,7 +163278,7 @@ var require_src = __commonJS((exports, module) => {
   };
 });
 
-// ../../node_modules/.bun/comment-json@4.6.2/node_modules/comment-json/src/common.js
+// ../../node_modules/.bun/comment-json@5.0.0/node_modules/comment-json/src/common.js
 var require_common = __commonJS((exports, module) => {
   var PREFIX_BEFORE = "before";
   var PREFIX_AFTER_PROP = "after-prop";
@@ -163310,8 +163310,6 @@ var require_common = __commonJS((exports, module) => {
   var NON_PROP_SYMBOL_KEYS = NON_PROP_SYMBOL_PREFIXES.map(Symbol.for);
   var COLON = ":";
   var UNDEFINED = undefined;
-  var LINE_BREAKS_BEFORE = new WeakMap;
-  var LINE_BREAKS_AFTER = new WeakMap;
   var RAW_STRING_LITERALS = new WeakMap;
   var is_string = (subject) => typeof subject === "string";
   var is_number = (subject) => typeof subject === "number";
@@ -163414,17 +163412,49 @@ var require_common = __commonJS((exports, module) => {
     });
     return target;
   };
-  var is_raw_json = typeof JSON.isRawJSON === "function" ? JSON.isRawJSON : () => false;
-  var set_comment_line_breaks = (comment, before, after) => {
-    if (is_number(before) && before >= 0) {
-      LINE_BREAKS_BEFORE.set(comment, before);
+  var is_comment_symbol = (subject) => {
+    const key = Symbol.keyFor(subject);
+    return is_string(key) && (NON_PROP_SYMBOL_PREFIXES.includes(key) || PROP_SYMBOL_PREFIXES.some((prefix) => key.indexOf(prefix + COLON) === 0));
+  };
+  var remove_blank_line_tokens = (comments) => {
+    let write = 0;
+    let removed = false;
+    comments.forEach((comment) => {
+      if (comment && comment.type === "BlankLine") {
+        removed = true;
+        return;
+      }
+      comments[write++] = comment;
+    });
+    comments.length = write;
+    return removed;
+  };
+  var remove_blank_lines_from_prop = (target, prop) => {
+    if (!Object.hasOwn(target, prop)) {
+      return;
     }
-    if (is_number(after) && after >= 0) {
-      LINE_BREAKS_AFTER.set(comment, after);
+    const comments = target[prop];
+    if (!Array.isArray(comments) || !remove_blank_line_tokens(comments)) {
+      return;
+    }
+    if (!comments.length) {
+      delete target[prop];
     }
   };
-  var get_comment_line_breaks_before = (comment) => LINE_BREAKS_BEFORE.get(comment);
-  var get_comment_line_breaks_after = (comment) => LINE_BREAKS_AFTER.get(comment);
+  var remove_blank_lines_deep = (target) => {
+    Object.getOwnPropertySymbols(target).forEach((prop) => {
+      if (is_comment_symbol(prop)) {
+        remove_blank_lines_from_prop(target, prop);
+      }
+    });
+    Object.keys(target).forEach((key) => {
+      const value = target[key];
+      if (is_object(value)) {
+        remove_blank_lines_deep(value);
+      }
+    });
+  };
+  var is_raw_json = typeof JSON.isRawJSON === "function" ? JSON.isRawJSON : () => false;
   module.exports = {
     PROP_SYMBOL_PREFIXES,
     PREFIX_BEFORE,
@@ -163454,9 +163484,6 @@ var require_common = __commonJS((exports, module) => {
     is_raw_json,
     set_raw_string_literal,
     get_raw_string_literal,
-    set_comment_line_breaks,
-    get_comment_line_breaks_before,
-    get_comment_line_breaks_after,
     assign(target, source, keys) {
       if (!is_object(target)) {
         throw new TypeError("Cannot convert undefined or null to object");
@@ -163518,11 +163545,26 @@ var require_common = __commonJS((exports, module) => {
         return;
       }
       delete target[prop];
+    },
+    removeBlankLines(target, location) {
+      if (!is_object(target)) {
+        throw new TypeError("target must be an object");
+      }
+      if (location === UNDEFINED) {
+        remove_blank_lines_deep(target);
+        return;
+      }
+      const {
+        where,
+        key
+      } = location;
+      const prop = symbol_checked(where, key);
+      remove_blank_lines_from_prop(target, prop);
     }
   };
 });
 
-// ../../node_modules/.bun/comment-json@4.6.2/node_modules/comment-json/src/array.js
+// ../../node_modules/.bun/comment-json@5.0.0/node_modules/comment-json/src/array.js
 var require_array = __commonJS((exports, module) => {
   var { sort } = require_src();
   var {
@@ -163680,7 +163722,7 @@ var require_array = __commonJS((exports, module) => {
   };
 });
 
-// ../../node_modules/.bun/comment-json@4.6.2/node_modules/comment-json/src/parse.js
+// ../../node_modules/.bun/comment-json@5.0.0/node_modules/comment-json/src/parse.js
 var require_parse = __commonJS((exports, module) => {
   var esprima = require_esprima();
   var {
@@ -163706,7 +163748,6 @@ var require_parse = __commonJS((exports, module) => {
     is_object,
     define: define2,
     set_raw_string_literal,
-    set_comment_line_breaks,
     assign_non_prop_comments
   } = require_common();
   var tokenize = (code) => esprima.tokenize(code, {
@@ -163720,23 +163761,27 @@ var require_parse = __commonJS((exports, module) => {
   var previous_props = [];
   var last_prop;
   var remove_comments = false;
+  var remove_blank_lines = false;
   var inline = false;
   var tokens = null;
   var last = null;
   var current = null;
   var index;
   var reviver = null;
+  var source_line_count = 0;
   var clean = () => {
     current_code = UNDEFINED;
     previous_props.length = previous_hosts.length = 0;
     last = null;
     last_prop = UNDEFINED;
+    remove_blank_lines = false;
   };
   var free = () => {
     clean();
     tokens.length = 0;
     unassigned_comments = comments_host = tokens = last = current = reviver = null;
     current_code = UNDEFINED;
+    source_line_count = 0;
   };
   var symbolFor = (prefix) => Symbol.for(last_prop !== UNDEFINED ? prefix + COLON + last_prop : prefix);
   var transform2 = (k, { value, context = {} }) => reviver ? reviver(k, value, context) : value;
@@ -163780,6 +163825,37 @@ var require_parse = __commonJS((exports, module) => {
   var restore_comments_host = () => {
     comments_host = previous_hosts.pop();
   };
+  var create_blank_line = () => ({
+    type: "BlankLine",
+    inline: false
+  });
+  var append_blank_lines = (comments, from_line, to_line) => {
+    if (remove_blank_lines) {
+      return;
+    }
+    let blank_lines = Math.max(0, to_line - from_line - 1);
+    while (blank_lines-- > 0) {
+      comments.push(create_blank_line());
+    }
+  };
+  var normalize_parse_options = (options) => {
+    if (typeof options === "boolean") {
+      return {
+        no_comments: options,
+        no_blank_lines: false
+      };
+    }
+    if (!is_object(options)) {
+      return {
+        no_comments: false,
+        no_blank_lines: false
+      };
+    }
+    return {
+      no_comments: !!options.no_comments,
+      no_blank_lines: !!options.no_blank_lines
+    };
+  };
   var assign_after_comments = () => {
     if (!unassigned_comments) {
       return;
@@ -163812,26 +163888,26 @@ var require_parse = __commonJS((exports, module) => {
   };
   var parse_comments = (prefix) => {
     const comments = [];
+    let previous_line = last ? last.loc.end.line : 0;
     while (current && (is("LineComment") || is("BlockComment"))) {
+      append_blank_lines(comments, previous_line, current.loc.start.line);
       const comment = {
         ...current,
         inline
       };
-      const previous_line = last ? last.loc.end.line : 1;
-      set_comment_line_breaks(comment, Math.max(0, comment.loc.start.line - previous_line));
       comments.push(comment);
+      previous_line = comment.loc.end.line;
       next();
     }
-    const { length } = comments;
-    if (length) {
-      const comment = comments[length - 1];
-      const current_line = current ? current.loc.start.line : comment.loc.end.line;
-      set_comment_line_breaks(comment, undefined, Math.max(0, current_line - comment.loc.end.line));
-    }
+    append_blank_lines(comments, previous_line, current ? current.loc.start.line : source_line_count);
     if (remove_comments) {
-      return;
+      for (let i = comments.length - 1;i >= 0; i--) {
+        if (comments[i].type !== "BlankLine") {
+          comments.splice(i, 1);
+        }
+      }
     }
-    if (!length) {
+    if (!comments.length) {
       return;
     }
     if (prefix) {
@@ -163970,12 +164046,19 @@ var require_parse = __commonJS((exports, module) => {
         return {};
     }
   }
-  var parse5 = (code, rev, no_comments) => {
+  var parse5 = (code, rev, options) => {
     clean();
+    const {
+      no_comments,
+      no_blank_lines
+    } = normalize_parse_options(options);
     current_code = code;
+    source_line_count = code.split(`
+`).length;
     tokens = tokenize(code);
     reviver = rev;
     remove_comments = no_comments;
+    remove_blank_lines = no_blank_lines;
     if (!tokens.length) {
       unexpected_end();
     }
@@ -164005,7 +164088,7 @@ var require_parse = __commonJS((exports, module) => {
   };
 });
 
-// ../../node_modules/.bun/comment-json@4.6.2/node_modules/comment-json/src/stringify.js
+// ../../node_modules/.bun/comment-json@5.0.0/node_modules/comment-json/src/stringify.js
 var require_stringify = __commonJS((exports, module) => {
   var {
     PREFIX_BEFORE_ALL,
@@ -164027,8 +164110,6 @@ var require_stringify = __commonJS((exports, module) => {
     is_number,
     is_object,
     get_raw_string_literal,
-    get_comment_line_breaks_before,
-    get_comment_line_breaks_after,
     is_raw_json
   } = require_common();
   var SPACE = " ";
@@ -164043,26 +164124,18 @@ var require_stringify = __commonJS((exports, module) => {
   var quote = JSON.stringify;
   var comment_stringify = (value, line) => line ? `//${value}` : `/*${value}*/`;
   var repeat_line_breaks = (line_breaks, gap) => (LF + gap).repeat(line_breaks);
-  var read_line_breaks = (line_breaks) => is_number(line_breaks) && line_breaks >= 0 ? line_breaks : null;
-  var read_line_breaks_from_loc = (previous_comment, comment) => {
-    if (!previous_comment || !previous_comment.loc || !comment.loc) {
-      return null;
-    }
-    const { end } = previous_comment.loc;
-    const { start } = comment.loc;
-    if (!end || !start || !is_number(end.line) || !is_number(start.line)) {
-      return null;
-    }
-    const line_breaks = start.line - end.line;
-    return line_breaks >= 0 ? line_breaks : null;
-  };
-  var count_trailing_line_breaks = (str, gap) => {
-    const unit = LF + gap;
-    const { length } = unit;
+  var is_inline_whitespace = (char) => char === SPACE || char === "\t";
+  var count_trailing_line_breaks = (str) => {
     let i = str.length;
     let count = 0;
-    while (i >= length && str.slice(i - length, i) === unit) {
-      i -= length;
+    while (i > 0) {
+      while (i > 0 && is_inline_whitespace(str[i - 1])) {
+        i--;
+      }
+      if (i === 0 || str[i - 1] !== LF) {
+        return count;
+      }
+      i--;
       count++;
     }
     return count;
@@ -164073,27 +164146,30 @@ var require_stringify = __commonJS((exports, module) => {
       return EMPTY;
     }
     let str = EMPTY;
+    let blank_lines = 0;
     let last_comment = null;
     comments.forEach((comment, i) => {
+      if (comment.type === "BlankLine") {
+        blank_lines++;
+        return;
+      }
       const {
         inline,
         type,
         value
       } = comment;
-      let line_breaks_before = read_line_breaks(get_comment_line_breaks_before(comment));
-      if (line_breaks_before === null) {
-        line_breaks_before = read_line_breaks_from_loc(last_comment, comment);
-      }
-      if (line_breaks_before === null) {
-        line_breaks_before = inline ? 0 : 1;
-      }
-      const delimiter = line_breaks_before > 0 ? repeat_line_breaks(line_breaks_before, deeper_gap) : inline ? SPACE : i === 0 ? EMPTY : LF + deeper_gap;
+      const line_breaks_before = blank_lines > 0 ? blank_lines + (inline ? 0 : 1) : null;
+      const delimiter = line_breaks_before > 0 ? repeat_line_breaks(line_breaks_before, deeper_gap) : inline ? SPACE : i === 0 && symbol_tag === PREFIX_BEFORE_ALL && deeper_gap === EMPTY ? EMPTY : LF + deeper_gap;
       const is_line_comment = type === "LineComment";
       str += delimiter + comment_stringify(value, is_line_comment);
+      blank_lines = 0;
       last_comment = comment;
     });
+    if (!last_comment) {
+      return blank_lines ? repeat_line_breaks(blank_lines + 1, deeper_gap) : EMPTY;
+    }
     const default_line_breaks_after = display_block || last_comment.type === "LineComment" ? 1 : 0;
-    const line_breaks_after = Math.max(default_line_breaks_after, read_line_breaks(get_comment_line_breaks_after(last_comment)) || 0);
+    const line_breaks_after = blank_lines > 0 ? blank_lines + 1 : default_line_breaks_after;
     return str + repeat_line_breaks(line_breaks_after, deeper_gap);
   };
   var replacer = null;
@@ -164102,7 +164178,7 @@ var require_stringify = __commonJS((exports, module) => {
     replacer = null;
     indent = EMPTY;
   };
-  var join6 = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(one, gap)), gap) : two ? two.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(two, gap)), gap) : EMPTY;
+  var join6 = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(one)), gap) : two ? two.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(two)), gap) : EMPTY;
   var join_content = (inside, value, gap) => {
     const comment = process_comments(value, PREFIX_BEFORE, gap + indent, true);
     return join6(comment, inside, gap);
@@ -164201,6 +164277,8 @@ var require_stringify = __commonJS((exports, module) => {
     const str = toString.call(subject);
     return PRIMITIVE_OBJECT_TYPES.includes(str);
   };
+  var normalize_blank_lines = (str) => typeof str === "string" ? str.replace(/\n[ \t]+(?=\n)/g, `
+`) : str;
   module.exports = (value, replacer_, space) => {
     const indent_ = get_indent(space);
     if (!indent_) {
@@ -164213,11 +164291,12 @@ var require_stringify = __commonJS((exports, module) => {
     indent = indent_;
     const str = is_primitive_object(value) ? JSON.stringify(value) : stringify("", { "": value }, EMPTY);
     clean();
-    return is_object(value) ? process_comments(value, PREFIX_BEFORE_ALL, EMPTY, true).trimLeft() + str + process_comments(value, PREFIX_AFTER_ALL, EMPTY).trimRight() : str;
+    const output = is_object(value) ? process_comments(value, PREFIX_BEFORE_ALL, EMPTY, true).trimLeft() + str + process_comments(value, PREFIX_AFTER_ALL, EMPTY).trimRight() : str;
+    return normalize_blank_lines(output);
   };
 });
 
-// ../../node_modules/.bun/comment-json@4.6.2/node_modules/comment-json/src/index.js
+// ../../node_modules/.bun/comment-json@5.0.0/node_modules/comment-json/src/index.js
 var require_src2 = __commonJS((exports, module) => {
   var { parse: parse5, tokenize } = require_parse();
   var stringify = require_stringify();
@@ -164232,7 +164311,8 @@ var require_src2 = __commonJS((exports, module) => {
     PREFIX_AFTER_ALL,
     assign,
     moveComments,
-    removeComments
+    removeComments,
+    removeBlankLines
   } = require_common();
   module.exports = {
     PREFIX_BEFORE,
@@ -164248,7 +164328,8 @@ var require_src2 = __commonJS((exports, module) => {
     CommentArray,
     assign,
     moveComments,
-    removeComments
+    removeComments,
+    removeBlankLines
   };
 });
 
@@ -184641,12 +184722,13 @@ function shouldShowAnnouncement() {
   }
   return ordering > 0;
 }
-var ANNOUNCEMENT_VERSION = "0.29.0", ANNOUNCEMENT_FEATURES, ANNOUNCEMENT_FOOTER = "Join us on Discord: https://discord.gg/F2uWxjGnU", STATE_FILENAME = "last_announced_version";
+var ANNOUNCEMENT_VERSION = "0.30.0", ANNOUNCEMENT_FEATURES, ANNOUNCEMENT_FOOTER = "Join us on Discord: https://discord.gg/F2uWxjGnU", STATE_FILENAME = "last_announced_version";
 var init_announcement = __esm(() => {
   init_data_path();
   ANNOUNCEMENT_FEATURES = [
-    `New 'smart_drops' option (opt-in, off by default): on long, edit-heavy sessions it reclaims more context by dropping tool output a later call made obsolete (superseded edits, old todowrite/ctx_reduce, spent status calls) instead of only the oldest. When off, the prompt is byte-identical to before. Enable with "smart_drops": true.`,
-    "When memory is disabled, the ctx_memory tool and its guidance are no longer shown (they had nothing to write to). ctx_search stays, searching conversation history and git commits."
+    "Setup and doctor now recognize an OpenCode Desktop install that has no CLI on PATH, instead of reporting OpenCode as not installed (#196). Desktop-only users continue setup with manual model entry.",
+    "TUI sidebar badge color follows your theme again (#198): it uses the theme background like sibling badges, with a fallback so the label can't disappear on transparent themes.",
+    "doctor clears a stale plugin cache more reliably (#199): it compares against the plugin's latest published version and preserves the cache when offline."
   ];
 });
 

package/dist/shared/announcement.d.ts

@@ -18,7 +18,7 @@
  * Bump only when there are user-visible changes worth a startup dialog.
  * Does NOT need to match the published package version.
  */
-export declare const ANNOUNCEMENT_VERSION = "0.29.0";
+export declare const ANNOUNCEMENT_VERSION = "0.30.0";
 /**
  * Short, user-facing bullet strings. Keep each line ~80 chars or shorter so the
  * TUI dialog renders cleanly without horizontal scroll on a typical terminal.

package/dist/shared/announcement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"announcement.d.ts","sourceRoot":"","sources":["../../src/shared/announcement.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAOH;;;GAGG;AACH,eAAO,MAAM,oBAAoB,WAAW,CAAC;AAE7C;;;GAGG;AACH,eAAO,MAAM,qBAAqB,EAAE,aAAa,CAAC,MAAM,CAGvD,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,qDAAqD,CAAC;AAyBtF;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CAGjD;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAS1D;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CA0BhD"}
+{"version":3,"file":"announcement.d.ts","sourceRoot":"","sources":["../../src/shared/announcement.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAOH;;;GAGG;AACH,eAAO,MAAM,oBAAoB,WAAW,CAAC;AAE7C;;;GAGG;AACH,eAAO,MAAM,qBAAqB,EAAE,aAAa,CAAC,MAAM,CAIvD,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,qDAAqD,CAAC;AAyBtF;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CAGjD;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAS1D;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CA0BhD"}

package/dist/tui/badge-contrast.d.ts

@@ -1,31 +1,46 @@
 /**
- * Pick a readable text color (black or white) for text drawn ON TOP of a given
- * background color.
+ * Pick the text color for the sidebar header badge (a bold label drawn on a
+ * `theme.accent` background).
  *
- * The sidebar header badge previously drew its label with `fg={theme.background}`
- * on a `theme.accent` background. That breaks for themes that set
- * `background: "none"` (transparent) to respect terminal transparency: the
- * resolved background is `RGBA(0,0,0,0)`, so the badge text renders fully
- * transparent and disappears (issue #186). The badge background (`accent`) is
- * always opaque, so deriving the text color from it is transparency-proof.
+ * Primary rule (matches AFT's sidebar by construction): paint the theme's own
+ * `background` color as the label, the inverse-of-panel look. Because it is a
+ * fixed theme token rather than an accent-derived computation, MC's badge and
+ * AFT's badge agree on EVERY accent automatically, so the same theme can never
+ * make one badge black and the other white (issue #198).
  *
- * The pick is WHITE-BIASED off the accent's relative luminance: white for any
- * accent in the dark half (luminance < 0.5), black only for genuinely light
- * accents. A strict "higher-contrast-wins" pick (crossover at luminance 0.179)
- * flips ordinary mid-tone accents to black: a typical orange/amber sidebar
- * accent (luminance ~0.3) reads black ~5:1 vs white ~3.7:1, so contrast-wins
- * picks black even though white at ~3.7:1 is perfectly legible for a short bold
- * label. That looks heavy and clashes with the sibling status badges, so we
- * prefer white across the whole dark half and only fall to black once the accent
- * is actually light (pale/pastel/near-white), where white would be unreadable.
+ * Fallback rule (the reason a luminance pick exists at all): `theme.background`
+ * can be unusable as a label color in two degenerate cases, where it would
+ * render the label invisible on the accent:
+ *   1. Transparent background. Themes that respect terminal transparency set
+ *      `background: "none"`, which resolves to `RGBA(0,0,0,0)`; drawing it as
+ *      text renders fully transparent and the label disappears (issue #186).
+ *   2. Background ~= accent. If the theme's background and accent are nearly the
+ *      same color, background-on-accent text has no contrast.
+ * In either case we fall back to a black/white pick that is guaranteed visible
+ * on the always-opaque accent.
  *
- * `RGBA` channels from @opentui/core are normalized 0..1 floats. We accept the
- * minimal `{ r, g, b }` shape so this stays a pure, trivially testable function
- * independent of the native color class.
+ * `RGBA` channels from @opentui/core are normalized 0..1 floats (alpha included).
+ * We accept the minimal `{ r, g, b, a? }` shape so this stays a pure, trivially
+ * testable function independent of the native color class, and we return the
+ * passed-in `background` object unchanged on the primary path so it stays the
+ * exact same theme token AFT uses.
  */
-export declare function readableTextColorOn(bg: {
+type Color = {
     r: number;
     g: number;
     b: number;
-}): string;
+    a?: number;
+};
+/**
+ * Pure black/white pick by accent luminance. Used as the badge fallback and kept
+ * exported for callers that only have the accent.
+ */
+export declare function readableTextColorOn(bg: Color): string;
+/**
+ * Badge label color on the accent: the theme background (AFT parity) when it is
+ * usable, else a guaranteed-visible black/white fallback. Returns the passed-in
+ * `background` reference unchanged on the primary path.
+ */
+export declare function badgeTextColor<T extends Color>(accent: T, background: T): T | string;
+export {};
 //# sourceMappingURL=badge-contrast.d.ts.map

package/dist/tui/badge-contrast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"badge-contrast.d.ts","sourceRoot":"","sources":["../../src/tui/badge-contrast.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAmBH,wBAAgB,mBAAmB,CAAC,EAAE,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAEnF"}
+{"version":3,"file":"badge-contrast.d.ts","sourceRoot":"","sources":["../../src/tui/badge-contrast.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,KAAK,KAAK,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAoC7D;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,KAAK,GAAG,MAAM,CAErD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,MAAM,CAMpF"}

package/package.json

@@ -1,80 +1,80 @@
 {
-	"name": "@cortexkit/opencode-magic-context",
-	"version": "0.29.1",
-	"type": "module",
-	"description": "OpenCode plugin for Magic Context — cross-session memory and context management",
-	"main": "dist/index.js",
-	"types": "dist/index.d.ts",
-	"author": "ualtinok",
-	"license": "MIT",
-	"keywords": [
-		"opencode",
-		"plugin",
-		"context",
-		"memory",
-		"ai",
-		"llm",
-		"prompt-caching",
-		"session-history"
-	],
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/cortexkit/magic-context",
-		"directory": "packages/plugin"
-	},
-	"files": [
-		"dist",
-		"src/tui",
-		"src/shared",
-		"README.md"
-	],
-	"scripts": {
-		"build": "bun build src/index.ts --outdir dist --target node --format esm --external @opencode-ai/plugin --external @huggingface/transformers --external onnxruntime-web --external bun:sqlite --external node:sqlite && tsc --emitDeclarationOnly",
-		"typecheck": "tsc --noEmit && tsc -p tsconfig.scripts.json",
-		"test": "bun test",
-		"lint": "biome check .",
-		"lint:fix": "biome check --write .",
-		"format": "biome format --write .",
-		"format:check": "biome format .",
-		"clean": "rm -rf dist",
-		"prepublishOnly": "bun run build"
-	},
-	"dependencies": {
-		"@huggingface/transformers": "^4.1.0",
-		"@jitl/quickjs-singlefile-cjs-release-asyncify": "0.32.0",
-		"@opencode-ai/plugin": "^1.15.13",
-		"@opencode-ai/sdk": "^1.15.13",
-		"@opentui/core": "^0.4.2",
-		"@opentui/solid": "^0.4.2",
-		"ai-tokenizer": "^1.0.6",
-		"comment-json": "^4.2.5",
-		"quickjs-emscripten": "^0.32.0",
-		"solid-js": "1.9.12",
-		"zod": "^4.1.8"
-	},
-	"devDependencies": {
-		"@biomejs/biome": "^2.4.7",
-		"@types/better-sqlite3": "^7.6.13",
-		"@types/bun": "^1.3.10",
-		"@types/node": "^22.0.0",
-		"bun-types": "^1.3.10",
-		"typescript": "^5.8.0"
-	},
-	"exports": {
-		".": {
-			"types": "./dist/index.d.ts",
-			"import": "./dist/index.js"
-		},
-		"./tui": {
-			"types": "./src/tui/index.tsx",
-			"import": "./src/tui/index.tsx"
-		}
-	},
-	"oc-plugin": [
-		"server",
-		"tui"
-	],
-	"peerDependencies": {
-		"@opencode-ai/plugin": ">=1.15.0"
-	}
+  "name": "@cortexkit/opencode-magic-context",
+  "version": "0.30.0",
+  "type": "module",
+  "description": "OpenCode plugin for Magic Context — cross-session memory and context management",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "author": "ualtinok",
+  "license": "MIT",
+  "keywords": [
+    "opencode",
+    "plugin",
+    "context",
+    "memory",
+    "ai",
+    "llm",
+    "prompt-caching",
+    "session-history"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/cortexkit/magic-context",
+    "directory": "packages/plugin"
+  },
+  "files": [
+    "dist",
+    "src/tui",
+    "src/shared",
+    "README.md"
+  ],
+  "scripts": {
+    "build": "bun build src/index.ts --outdir dist --target node --format esm --external @opencode-ai/plugin --external @huggingface/transformers --external onnxruntime-web --external bun:sqlite --external node:sqlite && tsc --emitDeclarationOnly",
+    "typecheck": "tsc --noEmit && tsc -p tsconfig.scripts.json",
+    "test": "bun test",
+    "lint": "biome check .",
+    "lint:fix": "biome check --write .",
+    "format": "biome format --write .",
+    "format:check": "biome format .",
+    "clean": "rm -rf dist",
+    "prepublishOnly": "bun run build"
+  },
+  "dependencies": {
+    "@huggingface/transformers": "^4.1.0",
+    "@jitl/quickjs-singlefile-cjs-release-asyncify": "0.32.0",
+    "@opencode-ai/plugin": "^1.17.11",
+    "@opencode-ai/sdk": "^1.17.11",
+    "@opentui/core": "^0.4.2",
+    "@opentui/solid": "^0.4.2",
+    "ai-tokenizer": "^1.0.6",
+    "comment-json": "^5.0.0",
+    "quickjs-emscripten": "^0.32.0",
+    "solid-js": "1.9.12",
+    "zod": "^4.1.8"
+  },
+  "devDependencies": {
+    "@biomejs/biome": "^2.5.1",
+    "@types/better-sqlite3": "^7.6.13",
+    "@types/bun": "^1.3.10",
+    "@types/node": "^22.20.0",
+    "bun-types": "^1.3.10",
+    "typescript": "^5.8.0"
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    },
+    "./tui": {
+      "types": "./src/tui/index.tsx",
+      "import": "./src/tui/index.tsx"
+    }
+  },
+  "oc-plugin": [
+    "server",
+    "tui"
+  ],
+  "peerDependencies": {
+    "@opencode-ai/plugin": ">=1.15.0"
+  }
 }

package/src/shared/announcement.ts

@@ -24,15 +24,16 @@ import { getMagicContextStorageDir } from "./data-path";
  * Bump only when there are user-visible changes worth a startup dialog.
  * Does NOT need to match the published package version.
  */
-export const ANNOUNCEMENT_VERSION = "0.29.0";
+export const ANNOUNCEMENT_VERSION = "0.30.0";
 
 /**
  * Short, user-facing bullet strings. Keep each line ~80 chars or shorter so the
  * TUI dialog renders cleanly without horizontal scroll on a typical terminal.
  */
 export const ANNOUNCEMENT_FEATURES: ReadonlyArray<string> = [
-    "New 'smart_drops' option (opt-in, off by default): on long, edit-heavy sessions it reclaims more context by dropping tool output a later call made obsolete (superseded edits, old todowrite/ctx_reduce, spent status calls) instead of only the oldest. When off, the prompt is byte-identical to before. Enable with \"smart_drops\": true.",
-    "When memory is disabled, the ctx_memory tool and its guidance are no longer shown (they had nothing to write to). ctx_search stays, searching conversation history and git commits.",
+    "Setup and doctor now recognize an OpenCode Desktop install that has no CLI on PATH, instead of reporting OpenCode as not installed (#196). Desktop-only users continue setup with manual model entry.",
+    "TUI sidebar badge color follows your theme again (#198): it uses the theme background like sibling badges, with a fallback so the label can't disappear on transparent themes.",
+    "doctor clears a stale plugin cache more reliably (#199): it compares against the plugin's latest published version and preserves the cache when offline.",
 ];
 
 /**

package/src/tui/badge-contrast.test.ts

@@ -1,5 +1,43 @@
 import { describe, expect, test } from "bun:test";
-import { readableTextColorOn } from "./badge-contrast";
+import { badgeTextColor, readableTextColorOn } from "./badge-contrast";
+
+describe("badgeTextColor (AFT parity with #186 safety net)", () => {
+    // A purple/lavender accent on a dark theme: the badge label should be the
+    // theme background (the inverse-of-panel look), the same fixed token the AFT
+    // sidebar uses, so two sibling badges never disagree on the same accent.
+    const accent = { r: 0.6, g: 0.5, b: 0.9, a: 1 };
+
+    test("opaque distinct background is used verbatim as the label", () => {
+        const background = { r: 0.05, g: 0.05, b: 0.07, a: 1 }; // near-black dark theme
+        // Returns the SAME background token rather than a computed color.
+        expect(badgeTextColor(accent, background)).toBe(background);
+    });
+
+    test("light theme: background is used verbatim too (near-white label inverse)", () => {
+        const background = { r: 0.97, g: 0.97, b: 0.95, a: 1 };
+        expect(badgeTextColor(accent, background)).toBe(background);
+    });
+
+    test("transparent background (alpha 0) falls back to a visible pick (#186)", () => {
+        // background:"none" resolves to RGBA(0,0,0,0); using it as text would
+        // render the label invisible, so fall back to a contrast pick on accent.
+        const transparent = { r: 0, g: 0, b: 0, a: 0 };
+        const result = badgeTextColor(accent, transparent);
+        expect(result).not.toBe(transparent);
+        expect(result).toBe(readableTextColorOn(accent));
+    });
+
+    test("background ~= accent falls back to a visible pick", () => {
+        const sameAsAccent = { r: 0.6, g: 0.5, b: 0.9, a: 1 };
+        const result = badgeTextColor(accent, sameAsAccent);
+        expect(result).toBe(readableTextColorOn(accent));
+    });
+
+    test("missing alpha is treated as opaque", () => {
+        const background = { r: 0.05, g: 0.05, b: 0.07 };
+        expect(badgeTextColor(accent, background)).toBe(background);
+    });
+});
 
 describe("readableTextColorOn", () => {
     test("dark accent gets white text", () => {

package/src/tui/badge-contrast.ts

@@ -1,39 +1,52 @@
 /**
- * Pick a readable text color (black or white) for text drawn ON TOP of a given
- * background color.
+ * Pick the text color for the sidebar header badge (a bold label drawn on a
+ * `theme.accent` background).
  *
- * The sidebar header badge previously drew its label with `fg={theme.background}`
- * on a `theme.accent` background. That breaks for themes that set
- * `background: "none"` (transparent) to respect terminal transparency: the
- * resolved background is `RGBA(0,0,0,0)`, so the badge text renders fully
- * transparent and disappears (issue #186). The badge background (`accent`) is
- * always opaque, so deriving the text color from it is transparency-proof.
+ * Primary rule (matches AFT's sidebar by construction): paint the theme's own
+ * `background` color as the label, the inverse-of-panel look. Because it is a
+ * fixed theme token rather than an accent-derived computation, MC's badge and
+ * AFT's badge agree on EVERY accent automatically, so the same theme can never
+ * make one badge black and the other white (issue #198).
  *
- * The pick is WHITE-BIASED off the accent's relative luminance: white for any
- * accent in the dark half (luminance < 0.5), black only for genuinely light
- * accents. A strict "higher-contrast-wins" pick (crossover at luminance 0.179)
- * flips ordinary mid-tone accents to black: a typical orange/amber sidebar
- * accent (luminance ~0.3) reads black ~5:1 vs white ~3.7:1, so contrast-wins
- * picks black even though white at ~3.7:1 is perfectly legible for a short bold
- * label. That looks heavy and clashes with the sibling status badges, so we
- * prefer white across the whole dark half and only fall to black once the accent
- * is actually light (pale/pastel/near-white), where white would be unreadable.
+ * Fallback rule (the reason a luminance pick exists at all): `theme.background`
+ * can be unusable as a label color in two degenerate cases, where it would
+ * render the label invisible on the accent:
+ *   1. Transparent background. Themes that respect terminal transparency set
+ *      `background: "none"`, which resolves to `RGBA(0,0,0,0)`; drawing it as
+ *      text renders fully transparent and the label disappears (issue #186).
+ *   2. Background ~= accent. If the theme's background and accent are nearly the
+ *      same color, background-on-accent text has no contrast.
+ * In either case we fall back to a black/white pick that is guaranteed visible
+ * on the always-opaque accent.
  *
- * `RGBA` channels from @opentui/core are normalized 0..1 floats. We accept the
- * minimal `{ r, g, b }` shape so this stays a pure, trivially testable function
- * independent of the native color class.
+ * `RGBA` channels from @opentui/core are normalized 0..1 floats (alpha included).
+ * We accept the minimal `{ r, g, b, a? }` shape so this stays a pure, trivially
+ * testable function independent of the native color class, and we return the
+ * passed-in `background` object unchanged on the primary path so it stays the
+ * exact same theme token AFT uses.
  */
 
-// Luminance midpoint: accents below this keep white text, accents at/above it
-// (light/pastel/near-white) get black. White-biased relative to the strict
-// equal-contrast crossover (~0.179) so saturated mid-tone accents stay white.
+type Color = { r: number; g: number; b: number; a?: number };
+
+// Below this alpha the theme background is too transparent to read as a label on
+// the accent (issue #186: background:"none" resolves to alpha 0).
+const MIN_OPAQUE_ALPHA = 0.5;
+
+// If the theme background and accent are within this per-channel distance they
+// are effectively the same color, so background-on-accent text is unreadable.
+const MIN_CHANNEL_DISTANCE = 0.06;
+
+// Luminance midpoint for the fallback pick: accents below this keep white text,
+// accents at/above it (light/pastel/near-white) get black. White-biased relative
+// to the strict equal-contrast crossover (~0.179) so saturated mid-tone accents
+// stay white. Only consulted on the degenerate fallback path.
 const LIGHT_ACCENT_LUMINANCE = 0.5;
 
 function srgbChannelToLinear(c: number): number {
     return c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4;
 }
 
-function relativeLuminance(bg: { r: number; g: number; b: number }): number {
+function relativeLuminance(bg: Color): number {
     return (
         0.2126 * srgbChannelToLinear(bg.r) +
         0.7152 * srgbChannelToLinear(bg.g) +
@@ -41,6 +54,31 @@ function relativeLuminance(bg: { r: number; g: number; b: number }): number {
     );
 }
 
-export function readableTextColorOn(bg: { r: number; g: number; b: number }): string {
+function nearlyEqual(a: Color, b: Color): boolean {
+    return (
+        Math.abs(a.r - b.r) < MIN_CHANNEL_DISTANCE &&
+        Math.abs(a.g - b.g) < MIN_CHANNEL_DISTANCE &&
+        Math.abs(a.b - b.b) < MIN_CHANNEL_DISTANCE
+    );
+}
+
+/**
+ * Pure black/white pick by accent luminance. Used as the badge fallback and kept
+ * exported for callers that only have the accent.
+ */
+export function readableTextColorOn(bg: Color): string {
     return relativeLuminance(bg) < LIGHT_ACCENT_LUMINANCE ? "#ffffff" : "#000000";
 }
+
+/**
+ * Badge label color on the accent: the theme background (AFT parity) when it is
+ * usable, else a guaranteed-visible black/white fallback. Returns the passed-in
+ * `background` reference unchanged on the primary path.
+ */
+export function badgeTextColor<T extends Color>(accent: T, background: T): T | string {
+    const alpha = background.a ?? 1;
+    if (alpha >= MIN_OPAQUE_ALPHA && !nearlyEqual(accent, background)) {
+        return background;
+    }
+    return readableTextColorOn(accent);
+}

package/src/tui/slots/sidebar-content.tsx

@@ -2,7 +2,7 @@
 import { Show, createEffect, createMemo, createSignal, on, onCleanup } from "solid-js"
 import type { TuiSlotPlugin, TuiPluginApi, TuiThemeCurrent } from "@opencode-ai/plugin/tui"
 import packageJson from "../../../package.json"
-import { readableTextColorOn } from '../badge-contrast';
+import { badgeTextColor } from '../badge-contrast';
 import { loadSidebarSnapshot, type SidebarSnapshot } from "../data/context-db"
 import { formatThresholdPercent } from "../../shared/format-threshold"
 import {
@@ -695,7 +695,7 @@ const SidebarContent = (props: {
                 onMouseDown={() => props.controller.toggleCollapsed()}
             >
                 <box paddingLeft={1} paddingRight={1} backgroundColor={props.theme.accent}>
-                    <text fg={readableTextColorOn(props.theme.accent)}>
+                    <text fg={badgeTextColor(props.theme.accent, props.theme.background)}>
                         <b>{collapsed() ? "▶ " : "▼ "}{headerLabel()}</b>
                     </text>
                 </box>