cortexkit
diff --git a/‎.github/workflows/dashboard-release.yml‎
Lines changed: 35 additions & 13 deletions b/‎.github/workflows/dashboard-release.yml‎
Lines changed: 35 additions & 13 deletions
diff --git a/‎.github/workflows/release.yml‎
Lines changed: 5 additions & 1 deletion b/‎.github/workflows/release.yml‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎README.md‎
Lines changed: 2 additions & 2 deletions b/‎README.md‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎packages/cli/src/adapters/opencode.ts‎
Lines changed: 20 additions & 11 deletions b/‎packages/cli/src/adapters/opencode.ts‎
Lines changed: 20 additions & 11 deletions
diff --git a/‎packages/cli/src/commands/doctor-opencode.ts‎
Lines changed: 86 additions & 51 deletions b/‎packages/cli/src/commands/doctor-opencode.ts‎
Lines changed: 86 additions & 51 deletions
@@ -121,33 +121,55 @@ jobs:
           APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
           APPLE_API_KEY_PATH: ${{ runner.temp }}/apple-api-key.p8
 
-  # Deploy latest.json to gh-pages for the updater endpoint
+  # Deploy latest.json to gh-pages for the updater endpoint.
+  #
+  # Tauri's updater endpoint lives at https://cortexkit.github.io/magic-context/latest.json.
+  # That URL must keep serving the latest signed manifest after every dashboard
+  # release. We deploy ONLY latest.json by staging it in an isolated directory
+  # and pointing publish_dir at that directory — previous configs used
+  # `publish_dir: .` together with the (non-existent) `include_files` input,
+  # which silently published the entire repo checkout to gh-pages on every
+  # release.
   deploy-updater:
     name: Deploy updater manifest
     needs: build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Wait for release assets
-        run: sleep 30
-
-      - name: Download latest.json from release
+      - name: Download latest.json from release (with retry)
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           TAG="${{ github.ref_name }}"
-          # Try draft release first, then published
-          gh release download "$TAG" --pattern "latest.json" --output latest.json --clobber 2>/dev/null || \
-            gh release download "$TAG" --pattern "latest.json" --output latest.json --clobber
-          cat latest.json
+          mkdir -p _updater_publish
+          OUT=_updater_publish/latest.json
+          # Retry up to 20×15s (5 minutes) — first-time uploads of large
+          # platform binaries can take longer than a single fixed sleep,
+          # and tauri-action publishes assets in parallel.
+          for attempt in $(seq 1 20); do
+            if gh release download "$TAG" --pattern "latest.json" --output "$OUT" --clobber 2>/dev/null; then
+              echo "✓ downloaded latest.json on attempt $attempt"
+              cat "$OUT"
+              exit 0
+            fi
+            echo "attempt $attempt: latest.json not yet available, sleeping 15s…"
+            sleep 15
+          done
+          echo "::error::latest.json never became available on release $TAG"
+          exit 1
 
       - name: Deploy to gh-pages
         uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: .
+          # Publish ONLY the staging dir, which contains exactly one file:
+          # latest.json. Anything else in the workspace stays out of gh-pages.
+          publish_dir: ./_updater_publish
           publish_branch: gh-pages
-          keep_files: false
-          force_orphan: true
-          include_files: latest.json
+          # keep_files: true preserves any other files that already exist
+          # on gh-pages so we don't wipe the branch on each release.
+          keep_files: true
+          # force_orphan would discard gh-pages history; we keep history so
+          # the branch acts as a normal append-only artifact log.
+          force_orphan: false
@@ -198,7 +198,11 @@ jobs:
   github-release:
     name: Create GitHub Release
     runs-on: ubuntu-latest
-    needs: [test, test-pi, test-cli]
+    # Wait for ALL three npm publishes to succeed before tagging the GitHub
+    # release. Previously this depended only on the test jobs, so a publish
+    # timeout or registry failure could leave a published release page on
+    # GitHub while one of the @cortexkit/* packages was missing from npm.
+    needs: [test, test-pi, test-cli, publish-npm, publish-npm-pi, publish-npm-cli]
     steps:
       - uses: actions/checkout@v4
 
 
@@ -9,7 +9,7 @@
   <a href="https://www.npmjs.com/package/@cortexkit/magic-context"><img src="https://img.shields.io/npm/v/@cortexkit/magic-context?label=cli&color=orange&style=flat-square" alt="npm @cortexkit/magic-context"></a>
   <a href="https://www.npmjs.com/package/@cortexkit/opencode-magic-context"><img src="https://img.shields.io/npm/v/@cortexkit/opencode-magic-context?label=opencode&color=blue&style=flat-square" alt="npm @cortexkit/opencode-magic-context"></a>
   <a href="https://www.npmjs.com/package/@cortexkit/pi-magic-context"><img src="https://img.shields.io/npm/v/@cortexkit/pi-magic-context?label=pi&color=purple&style=flat-square" alt="npm @cortexkit/pi-magic-context"></a>
-  <a href="https://discord.gg/F2uWxjGnU"><img src="https://img.shields.io/discord/1488852091056295957?style=flat-square&logo=discord&logoColor=white&label=Discord&color=5865F2" alt="Discord"></a>
+  <a href="https://discord.gg/DSa65w8wuf"><img src="https://img.shields.io/discord/1488852091056295957?style=flat-square&logo=discord&logoColor=white&label=Discord&color=5865F2" alt="Discord"></a>
   <a href="https://github.com/cortexkit/magic-context/stargazers"><img src="https://img.shields.io/github/stars/cortexkit/magic-context?style=flat-square&color=yellow" alt="stars"></a>
   <a href="https://github.com/cortexkit/magic-context/commits"><img src="https://img.shields.io/github/last-commit/cortexkit/magic-context?style=flat-square&color=green" alt="last commit"></a>
   <a href="https://github.com/cortexkit/magic-context/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-green?style=flat-square" alt="MIT License"></a>
@@ -31,7 +31,7 @@
   <a href="#magic-context-app">🖥️ Desktop App</a> ·
   <a href="#commands">Commands</a> ·
   <a href="#configuration">Configuration</a> ·
-  <a href="https://discord.gg/F2uWxjGnU">💬 Discord</a>
+  <a href="https://discord.gg/DSa65w8wuf">💬 Discord</a>
 </p>
 
 ---
 
@@ -239,15 +239,6 @@ export class OpenCodeAdapter implements HarnessAdapter {
     }
 }
 
-/**
- * Match a plugin array entry against our plugin name. Plugin entries can be:
- *   - a string: "@cortexkit/opencode-magic-context@latest" or "@cortexkit/opencode-magic-context"
- *   - a tuple: ["@cortexkit/opencode-magic-context@latest", { ... options }]
- *   - a file URL: "file:///path/to/local/dev/checkout"
- *
- * For matching purposes we strip everything after `@` (after the first `@org/pkg`
- * segment) so versioned and unversioned entries are equivalent.
- */
 /**
  * Match a plugin entry that resolves to a local dev checkout of magic-context:
  *   - "file:///abs/path/.../opencode-magic-context"
@@ -259,8 +250,12 @@ export class OpenCodeAdapter implements HarnessAdapter {
  * Setup and doctor must detect these so they don't double-add @latest, but
  * must NEVER replace them — that would silently disable the developer's
  * local plugin instance.
+ *
+ * Exported because both `setup-opencode.ts` and `doctor-opencode.ts` need this
+ * exact same logic; previous duplication caused drift (e.g. one path matching
+ * `opencode-magic-context` only, the other also matching bare `magic-context`).
  */
-function isDevPathPluginEntry(entry: unknown): boolean {
+export function isDevPathPluginEntry(entry: unknown): boolean {
     let candidate: string | null = null;
     if (typeof entry === "string") candidate = entry;
     else if (Array.isArray(entry) && typeof entry[0] === "string") candidate = entry[0];
@@ -271,7 +266,21 @@ function isDevPathPluginEntry(entry: unknown): boolean {
     return candidate.includes("opencode-magic-context") || candidate.includes("magic-context");
 }
 
-function matchesPluginEntry(entry: unknown, pkgName: string): boolean {
+/**
+ * Match a plugin array entry against a package name. Plugin entries can be:
+ *   - a string: "@cortexkit/opencode-magic-context@latest" or "@cortexkit/opencode-magic-context"
+ *   - a tuple: ["@cortexkit/opencode-magic-context@latest", { ... options }]
+ *   - a file URL: "file:///path/to/local/dev/checkout"
+ *
+ * For matching purposes we strip everything after `@` (after the first `@org/pkg`
+ * segment) so versioned and unversioned entries are equivalent.
+ *
+ * Returns false for `file://` entries so dev paths are not classified as
+ * "the published plugin". Use `isDevPathPluginEntry` for that detection.
+ *
+ * Exported for reuse across setup and doctor flows.
+ */
+export function matchesPluginEntry(entry: unknown, pkgName: string): boolean {
     let candidate: string | null = null;
     if (typeof entry === "string") candidate = entry;
     else if (Array.isArray(entry) && typeof entry[0] === "string") candidate = entry[0];
 
@@ -18,6 +18,7 @@ import {
 import { Database } from "@magic-context/core/shared/sqlite";
 import { ensureTuiPluginEntry } from "@magic-context/core/shared/tui-config";
 import { parse, stringify } from "comment-json";
+import { isDevPathPluginEntry, matchesPluginEntry } from "../adapters/opencode";
 import { collectDiagnostics } from "../lib/diagnostics-opencode";
 import { bundleIssueReport } from "../lib/logs-opencode";
 import { isOpenCodeInstalled } from "../lib/opencode-helpers";
@@ -689,64 +690,78 @@ export async function runDoctor(
         try {
             const raw = readFileSync(paths.opencodeConfig, "utf-8");
             const config = parse(raw) as Record<string, unknown>;
-            const plugins = Array.isArray(config?.plugin) ? config.plugin : [];
-            const pluginList = (plugins as unknown[]).filter(
-                (p): p is string => typeof p === "string",
-            );
-            // Detect any plugin entry that resolves to magic-context, including
-            // local dev paths (file://..., /abs/path, ./relative). Dev paths
-            // are recognized so we don't double-add an @latest entry on top,
-            // but they are NOT replaced — replacing a developer worktree
-            // path with `@latest` would make the dev plugin instance vanish
-            // from OpenCode.
-            const isDevPathEntry = (p: string): boolean =>
-                p.startsWith("file://") || p.startsWith("/") || p.startsWith("./");
-            const existingIdx = pluginList.findIndex(
-                (p) =>
-                    p === PLUGIN_NAME ||
-                    p.startsWith(`${PLUGIN_NAME}@`) ||
-                    (isDevPathEntry(p) && p.includes("opencode-magic-context")),
+            // Operate on the raw plugin array. Entries can be:
+            //   • a string  "@cortexkit/opencode-magic-context@latest"
+            //   • a tuple   ["@pkg/name@latest", { ...options }]
+            //   • a dev URL "file:///abs/path/.../packages/plugin"
+            // We MUST preserve every entry shape on write — filtering out
+            // tuples (or stripping options) would silently drop user config.
+            // matchesPluginEntry / isDevPathPluginEntry are imported from
+            // ../adapters/opencode and accept both strings and tuples.
+            const rawPlugins: unknown[] = Array.isArray(config?.plugin) ? config.plugin : [];
+            const existingIdx = rawPlugins.findIndex(
+                (entry) => matchesPluginEntry(entry, PLUGIN_NAME) || isDevPathPluginEntry(entry),
             );
             const configName =
                 paths.opencodeConfigFormat === "jsonc" ? "opencode.jsonc" : "opencode.json";
-            if (existingIdx >= 0 && pluginList[existingIdx] === PLUGIN_ENTRY_WITH_VERSION) {
+
+            // Helper: extract the plain string (or first element of a tuple) so
+            // we can compare against the desired @latest entry.
+            const entryAsString = (entry: unknown): string | null => {
+                if (typeof entry === "string") return entry;
+                if (Array.isArray(entry) && typeof entry[0] === "string") return entry[0];
+                return null;
+            };
+
+            if (existingIdx >= 0 && rawPlugins[existingIdx] === PLUGIN_ENTRY_WITH_VERSION) {
                 pass(`Plugin registered in ${configName}`);
             } else if (existingIdx >= 0) {
-                const oldEntry = pluginList[existingIdx];
+                const oldEntry = rawPlugins[existingIdx];
+                const oldEntryStr = entryAsString(oldEntry) ?? "";
 
                 // Dev-path entries (file://, absolute, relative) are detected
                 // so we don't double-add @latest, but we MUST NOT replace them
                 // — that would silently disable the developer's local plugin
                 // checkout. Always log as-is and leave the entry alone, even
                 // under --force.
-                if (isDevPathEntry(oldEntry)) {
-                    pass(`Plugin registered in ${configName} (dev path: ${oldEntry})`);
+                if (isDevPathPluginEntry(oldEntry)) {
+                    pass(`Plugin registered in ${configName} (dev path: ${oldEntryStr})`);
                 } else {
                     const isPinned =
-                        oldEntry !== PLUGIN_NAME &&
-                        oldEntry !== PLUGIN_ENTRY_WITH_VERSION &&
-                        /^@cortexkit\/opencode-magic-context@\d/.test(oldEntry);
+                        oldEntryStr !== PLUGIN_NAME &&
+                        oldEntryStr !== PLUGIN_ENTRY_WITH_VERSION &&
+                        /^@cortexkit\/opencode-magic-context@\d/.test(oldEntryStr);
 
                     if (isPinned && !options.force) {
                         // Warn but don't change — user intentionally pinned
                         warn(
-                            `Plugin pinned to ${oldEntry} in ${configName} — use 'doctor --force' to upgrade`,
+                            `Plugin pinned to ${oldEntryStr} in ${configName} — use 'doctor --force' to upgrade`,
                         );
                     } else {
-                        // Upgrade versionless entry to @latest, or --force upgrades pinned
-                        pluginList[existingIdx] = PLUGIN_ENTRY_WITH_VERSION;
-                        config.plugin = pluginList;
+                        // Upgrade versionless entry to @latest, or --force upgrades pinned.
+                        // If the existing entry is a tuple, preserve options by
+                        // updating only the package-name slot; otherwise replace
+                        // with the plain string entry.
+                        if (Array.isArray(oldEntry) && oldEntry.length >= 1) {
+                            const replacement = [...oldEntry];
+                            replacement[0] = PLUGIN_ENTRY_WITH_VERSION;
+                            rawPlugins[existingIdx] = replacement;
+                        } else {
+                            rawPlugins[existingIdx] = PLUGIN_ENTRY_WITH_VERSION;
+                        }
+                        config.plugin = rawPlugins;
                         writeFileSync(paths.opencodeConfig, `${stringify(config, null, 2)}\n`);
                         pass(
-                            `Upgraded plugin entry in ${configName}: ${oldEntry} → ${PLUGIN_ENTRY_WITH_VERSION}`,
+                            `Upgraded plugin entry in ${configName}: ${oldEntryStr} → ${PLUGIN_ENTRY_WITH_VERSION}`,
                         );
                         fixed++;
                     }
                 }
             } else {
-                // Auto-add plugin entry — preserves comments
-                pluginList.push(PLUGIN_ENTRY_WITH_VERSION);
-                config.plugin = pluginList;
+                // Auto-add plugin entry — preserves comments AND every existing
+                // tuple/options entry the user already had.
+                rawPlugins.push(PLUGIN_ENTRY_WITH_VERSION);
+                config.plugin = rawPlugins;
                 writeFileSync(paths.opencodeConfig, `${stringify(config, null, 2)}\n`);
                 pass(`Added plugin to ${configName}`);
                 fixed++;
@@ -784,32 +799,52 @@ export async function runDoctor(
         warn("Restart OpenCode to see the sidebar");
         fixed++;
     } else if (existsSync(paths.tuiConfig)) {
-        // Check for pinned version in tui config
+        // Check for pinned version in tui config. Same tuple/dev-path rules
+        // as the main opencode config — preserve every entry shape on write.
         try {
             const tuiRaw = readFileSync(paths.tuiConfig, "utf-8");
             const tuiConfig = parse(tuiRaw) as Record<string, unknown>;
-            const tuiPlugins = Array.isArray(tuiConfig?.plugin)
-                ? (tuiConfig.plugin as unknown[]).filter((p): p is string => typeof p === "string")
+            const tuiRawPlugins: unknown[] = Array.isArray(tuiConfig?.plugin)
+                ? tuiConfig.plugin
                 : [];
-            const tuiIdx = tuiPlugins.findIndex(
-                (p) => p === PLUGIN_NAME || p.startsWith(`${PLUGIN_NAME}@`),
+            const tuiIdx = tuiRawPlugins.findIndex(
+                (entry) => matchesPluginEntry(entry, PLUGIN_NAME) || isDevPathPluginEntry(entry),
             );
+            const tuiEntryAsString = (entry: unknown): string => {
+                if (typeof entry === "string") return entry;
+                if (Array.isArray(entry) && typeof entry[0] === "string") return entry[0];
+                return "";
+            };
             if (tuiIdx >= 0) {
-                const tuiEntry = tuiPlugins[tuiIdx];
-                const tuiPinned =
-                    tuiEntry !== PLUGIN_NAME &&
-                    tuiEntry !== PLUGIN_ENTRY_WITH_VERSION &&
-                    /^@cortexkit\/opencode-magic-context@\d/.test(tuiEntry);
-                if (tuiPinned && !options.force) {
-                    warn(`TUI plugin pinned to ${tuiEntry} — use 'doctor --force' to upgrade`);
-                } else if (tuiPinned && options.force) {
-                    tuiPlugins[tuiIdx] = PLUGIN_ENTRY_WITH_VERSION;
-                    tuiConfig.plugin = tuiPlugins;
-                    writeFileSync(paths.tuiConfig, `${stringify(tuiConfig, null, 2)}\n`);
-                    pass(`Upgraded TUI plugin: ${tuiEntry} → ${PLUGIN_ENTRY_WITH_VERSION}`);
-                    fixed++;
+                const tuiEntry = tuiRawPlugins[tuiIdx];
+                const tuiEntryStr = tuiEntryAsString(tuiEntry);
+                if (isDevPathPluginEntry(tuiEntry)) {
+                    pass(`TUI sidebar plugin configured (dev path: ${tuiEntryStr})`);
                 } else {
-                    pass("TUI sidebar plugin configured");
+                    const tuiPinned =
+                        tuiEntryStr !== PLUGIN_NAME &&
+                        tuiEntryStr !== PLUGIN_ENTRY_WITH_VERSION &&
+                        /^@cortexkit\/opencode-magic-context@\d/.test(tuiEntryStr);
+                    if (tuiPinned && !options.force) {
+                        warn(
+                            `TUI plugin pinned to ${tuiEntryStr} — use 'doctor --force' to upgrade`,
+                        );
+                    } else if (tuiPinned && options.force) {
+                        // Preserve tuple options when upgrading.
+                        if (Array.isArray(tuiEntry) && tuiEntry.length >= 1) {
+                            const replacement = [...tuiEntry];
+                            replacement[0] = PLUGIN_ENTRY_WITH_VERSION;
+                            tuiRawPlugins[tuiIdx] = replacement;
+                        } else {
+                            tuiRawPlugins[tuiIdx] = PLUGIN_ENTRY_WITH_VERSION;
+                        }
+                        tuiConfig.plugin = tuiRawPlugins;
+                        writeFileSync(paths.tuiConfig, `${stringify(tuiConfig, null, 2)}\n`);
+                        pass(`Upgraded TUI plugin: ${tuiEntryStr} → ${PLUGIN_ENTRY_WITH_VERSION}`);
+                        fixed++;
+                    } else {
+                        pass("TUI sidebar plugin configured");
+                    }
                 }
             } else {
                 pass("TUI sidebar plugin configured");