@cortexkit/opencode-magic-context 0.24.1 → 0.25.0

package/src/shared/tag-transcript.ts

@@ -611,7 +611,7 @@ function tagToolPart(args: TagToolPartArgs): void {
         args.part.setText(tagged);
     }
 
-    args.targets.set(tagId, buildToolTarget(args.part, args.message));
+    args.targets.set(tagId, buildToolTarget(args.part, args.message, tagId));
 }
 
 function setToolContentOrText(part: TranscriptPart, content: string): boolean {
@@ -679,10 +679,11 @@ function buildAggregateTarget(tagId: number, occurrences: ToolOccurrence[]): Tag
             return any ? "removed" : "absent";
         },
         truncate(): "truncated" | "absent" {
-            // Truncate BOTH halves. For tool_use, this typically truncates
-            // the args; for tool_result, the output. The sentinel string
-            // matches OpenCode's truncate sentinel exactly.
-            const sentinel = "[truncated]";
+            // Skeleton-drop: replace BOTH halves' content with the one
+            // canonical `[dropped §N§]` placeholder (byte-identical to a full
+            // drop and to OpenCode). Frozen by the dropMode column → replays
+            // the same string every pass. The tool_use call survives intact.
+            const sentinel = `[dropped \u00a7${tagId}\u00a7]`;
             let any = false;
             for (const occ of occurrences) {
                 if (setToolContentOrText(occ.part, sentinel)) {
@@ -739,16 +740,17 @@ function buildTextTarget(
 }
 
 /**
- * TagTarget for a tag-eligible tool part. Tool parts get full-drop
- * (replace with `[dropped §N§]`) or truncated-drop (replace with
- * `[truncated]`) treatment from `applyFlushedStatuses` based on the
- * stored `drop_mode` column. We expose both via the standard target
- * surface; replaceWithSentinel is the canonical mutation, with
- * truncated-drop using the "[truncated]" string.
+ * TagTarget for a tag-eligible tool part. Tool parts get full-drop or
+ * skeleton-drop treatment from `applyFlushedStatuses` based on the stored
+ * `drop_mode` column. Both render the SAME canonical `[dropped §N§]`
+ * placeholder — full-drop replaces the whole pair, skeleton-drop keeps the
+ * tool_use call and replaces only its output. One placeholder string,
+ * byte-identical across passes and across harnesses.
  */
 function buildToolTarget(
     part: TranscriptPart,
     message: { info: { id?: string; role: string } },
+    tagId: number,
 ): TagTarget {
     return {
         setContent(content: string): boolean {
@@ -765,15 +767,15 @@ function buildToolTarget(
             // For Pi the current Transcript contract treats both
             // invocation and result parts symmetrically — both expose
             // setText / setToolOutput.
-            const replaced = part.replaceWithSentinel(`[dropped \u00a7${part.id ?? "?"}\u00a7]`);
+            const replaced = part.replaceWithSentinel(`[dropped \u00a7${tagId}\u00a7]`);
             return replaced ? "removed" : "absent";
         },
         truncate(): "truncated" | "absent" {
-            // Truncate the tool output to a fixed sentinel string. Done
-            // via setToolOutput so the underlying tool_result content
-            // gets the truncation; falls back to setText for cases
-            // where the part type doesn't support setToolOutput.
-            const ok = setToolContentOrText(part, "[truncated]");
+            // Skeleton-drop: replace the tool output with the one canonical
+            // `[dropped §N§]` placeholder (byte-identical to a full drop and to
+            // OpenCode). Frozen by the dropMode column, so it replays the same
+            // string every pass. The tool_use call itself survives intact.
+            const ok = setToolContentOrText(part, `[dropped \u00a7${tagId}\u00a7]`);
             return ok ? "truncated" : "absent";
         },
         message: {

package/src/tui/data/context-db.ts

@@ -5,9 +5,14 @@
 import os from "node:os";
 import path from "node:path";
 import { MagicContextRpcClient } from "../../shared/rpc-client";
-import type { RpcNotificationMessage, SidebarSnapshot, StatusDetail } from "../../shared/rpc-types";
+import type {
+    EmbedDetail,
+    RpcNotificationMessage,
+    SidebarSnapshot,
+    StatusDetail,
+} from "../../shared/rpc-types";
 
-export type { SidebarSnapshot, StatusDetail };
+export type { EmbedDetail, SidebarSnapshot, StatusDetail };
 
 let rpcClient: MagicContextRpcClient | null = null;
 let rpcGeneration = 0;
@@ -218,6 +223,33 @@ export async function loadStatusDetail(
     }
 }
 
+const EMPTY_EMBED_DETAIL: EmbedDetail = {
+    enabled: false,
+    model: "off",
+    provider: "off",
+    session: { embedded: 0, total: 0 },
+    memories: { embedded: 0, total: 0 },
+    commits: { embedded: 0, total: 0, gitEnabled: false },
+    statusText: "Embedding is off (no provider configured).",
+};
+
+/** Fetch embedding coverage status for `/ctx-embed` via RPC. */
+export async function loadEmbedDetail(sessionId: string, directory: string): Promise<EmbedDetail> {
+    if (!rpcClient) return EMPTY_EMBED_DETAIL;
+    try {
+        const result = await rpcClient.call<EmbedDetail>("embed-detail", {
+            sessionId,
+            directory,
+        });
+        if ((result as unknown as Record<string, unknown>).error) {
+            return EMPTY_EMBED_DETAIL;
+        }
+        return result;
+    } catch {
+        return EMPTY_EMBED_DETAIL;
+    }
+}
+
 /** Get compartment count via RPC. */
 export async function getCompartmentCount(sessionId: string): Promise<number> {
     if (!rpcClient) return 0;

package/src/tui/index.tsx

@@ -6,7 +6,7 @@ import { createMemo } from "solid-js"
 import type { TuiPlugin, TuiPluginApi, TuiThemeCurrent } from "@opencode-ai/plugin/tui"
 import { createSidebarContentSlot, kickRecompProgressRefresh } from "./slots/sidebar-content"
 import packageJson from "../../package.json"
-import { closeRpc, consumeTuiMessages, dismissUpgradeReminder, getAnnouncement, getCompartmentCount, getRpcGeneration, initRpcClient, loadStatusDetail, markAnnounced, markTuiMessagesHandled, requestRecomp, requestUpgrade, type TuiMessage, type StatusDetail } from "./data/context-db"
+import { closeRpc, consumeTuiMessages, dismissUpgradeReminder, getAnnouncement, getCompartmentCount, getRpcGeneration, initRpcClient, loadEmbedDetail, loadStatusDetail, markAnnounced, markTuiMessagesHandled, requestRecomp, requestUpgrade, type EmbedDetail, type TuiMessage, type StatusDetail } from "./data/context-db"
 import { formatThresholdPercent } from "../shared/format-threshold"
 import { detectConflicts } from "../shared/conflict-detector"
 import { fixConflicts } from "../shared/conflict-fixer"
@@ -353,7 +353,7 @@ const StatusDialog = (props: { api: TuiPluginApi; s: StatusDetail }) => {
                         }
                         if (p.phase === "migration") return <R t={t()} l="Status" v={p.note ?? "Migrating memories ⟳"} fg={t().warning} />
                         if (p.phase === "done") return <R t={t()} l="Status" v={`✓ ${verb} complete`} fg={t().accent} />
-                        if (p.phase === "skipped") return <R t={t()} l="Status" v={`${verb} skipped — retry shortly${p.message ? `: ${p.message}` : ""}`} fg={t().textMuted} />
+                        if (p.phase === "skipped") return <R t={t()} l="Status" v={p.message ?? `${verb} stopped early`} fg={t().textMuted} />
                         return <R t={t()} l="Status" v={`✗ ${verb} failed${p.message ? `: ${p.message}` : ""}`} fg={t().error} />
                     })()}
                 </box>
@@ -580,14 +580,53 @@ async function showStatusDialog(api: TuiPluginApi, targetSessionId = getSessionI
     const directory = api.state.path.directory ?? ""
     const modelKey = getModelKeyFromMessages(api, sessionId)
     const detail = await loadStatusDetail(sessionId, directory, modelKey)
-    // Ack only after the dialog is actually shown for the same active session;
-    // route switches while the RPC detail load is in flight must leave it pending.
     if (getSessionId(api) !== sessionId) return false
 
     api.ui.dialog.replace(() => <StatusDialog api={api} s={detail} />)
     return true
 }
 
+const EmbedDialog = (props: { api: TuiPluginApi; detail: EmbedDetail }) => {
+    const theme = createMemo(() => (props.api as any).theme.current)
+    const t = () => theme()
+    const lines = () => props.detail.statusText.split("\n")
+    return (
+        <box flexDirection="column" width="100%" paddingLeft={2} paddingRight={2} paddingTop={1} paddingBottom={1}>
+            <box justifyContent="center" width="100%" marginBottom={1}>
+                <text fg={t().accent}><b>Embedding</b></text>
+            </box>
+            {lines().map((line) => (
+                <text fg={t().text}>{line}</text>
+            ))}
+        </box>
+    )
+}
+
+async function showEmbedDialog(api: TuiPluginApi, targetSessionId = getSessionId(api)): Promise<boolean> {
+    const sessionId = targetSessionId
+    if (!sessionId) {
+        api.ui.toast({ message: "No active session", variant: "warning" })
+        return false
+    }
+    const directory = api.state.path.directory ?? ""
+    const detail = await loadEmbedDetail(sessionId, directory)
+    if (getSessionId(api) !== sessionId) return false
+    api.ui.dialog.replace(() => <EmbedDialog api={api} detail={detail} />)
+    return true
+}
+
+function showResultDialog(api: TuiPluginApi, title: string, message: string): boolean {
+    api.ui.dialog.replace(() => (
+        <api.ui.DialogAlert
+            title={title}
+            message={message}
+            onConfirm={() => {}}
+        />
+    ))
+    return true
+}
+
+
 /**
  * Register Magic Context command palette entries, preferring the v1.14.42+
  * `keymap.registerLayer` API and falling back to the legacy
@@ -842,6 +881,21 @@ const tui: TuiPlugin = async (api, _options, meta) => {
                         if (showUpgradeDialog(api, resume, requestedSessionId)) {
                             handledMessageIds.add(msg.id)
                         }
+                    } else if (action === "show-embed-dialog") {
+                        if (await showEmbedDialog(api, requestedSessionId)) {
+                            handledMessageIds.add(msg.id)
+                        }
+                    } else if (action === "show-flush-dialog") {
+                        const flushMsg = String(msg.payload?.message ?? "Flushed.")
+                        if (showResultDialog(api, "Flush", flushMsg)) {
+                            handledMessageIds.add(msg.id)
+                        }
+                    } else if (action === "show-result-dialog") {
+                        const title = String(msg.payload?.title ?? "Magic Context")
+                        const body = String(msg.payload?.message ?? "")
+                        if (showResultDialog(api, title, body)) {
+                            handledMessageIds.add(msg.id)
+                        }
                     }
                 }
             }

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

@@ -394,8 +394,13 @@ const RecompProgressSection = (props: {
             case "done":
                 return { text: `✓ ${verb()} complete`, color: props.theme.success ?? props.theme.accent }
             case "skipped":
-                // Transient (lease busy) — neutral, not an error.
-                return { text: `${verb()} skipped — retry shortly`, color: props.theme.textMuted }
+                // Neutral terse status next to the bold verb header; the full,
+                // self-contained reason (lease-busy "try again shortly" vs a
+                // partial-stall "run /ctx-embed start again") renders on its own
+                // line below. Don't re-prepend verb here (it's already the bold
+                // header — doing so read as "EmbedEmbed"), and don't hardcode
+                // "retry shortly" (wrong for a partial stall).
+                return { text: "stopped", color: props.theme.textMuted }
             case "failed":
                 return { text: `✗ ${verb()} failed`, color: props.theme.error }
         }