@cortexkit/opencode-magic-context 0.49.6 → 0.49.8

package/src/shared/tag-transcript.ts

@@ -55,6 +55,7 @@ import {
     updateTagTokenCount,
 } from "../features/magic-context/storage-tags";
 import { makeToolCompositeKey, type Tagger } from "../features/magic-context/tagger";
+import type { TagEntry } from "../features/magic-context/types";
 import { droppedInputMarker } from "../hooks/magic-context/dropped-input-guard";
 import { applyEditMarkerToInput } from "../hooks/magic-context/edit-marker";
 import { estimateImageTokensFromDataUrl } from "../hooks/magic-context/image-token-estimate";
@@ -121,6 +122,122 @@ export interface TagTranscriptResult {
     targets: Map<number, TagTarget>;
 }
 
+/**
+ * Bind durable drops to a saved request without tagging it again. Recovery must
+ * not allocate identities, inject prefixes, or write accounting while the store
+ * is failing. Reuse the normal targets so persisted modes render identically.
+ */
+export function buildPersistedDropTargets(
+    transcript: Transcript,
+    tags: readonly TagEntry[],
+    options: { allowReasoningPrefixRewrite?: boolean } = {},
+): Map<number, TagTarget> {
+    const targets = new Map<number, TagTarget>();
+    const tools = new Map(
+        tags
+            .filter((tag) => tag.type === "tool")
+            .map((tag) => [makeToolCompositeKey(tag.toolOwnerMessageId ?? "", tag.messageId), tag]),
+    );
+    const textTags = new Map(
+        tags.filter((tag) => tag.type !== "tool").map((tag) => [tag.messageId, tag]),
+    );
+    const byNumber = new Map(tags.map((tag) => [tag.tagNumber, tag]));
+    const aggregates = new Map<
+        string,
+        { tag?: TagEntry; occurrences: ToolOccurrence[]; reasoning: boolean }
+    >();
+    const pending = new Map<string, string[]>();
+    const resolved = new Map<string, string>();
+    const ambiguousCalls = new Set<string>();
+    const end = new ConversationEndGuard(transcript.messages);
+    for (const message of transcript.messages) {
+        let ordinal = 0;
+        let resultRun: { callId: string; key: string } | undefined;
+        const parts = message.parts;
+        const reasoning =
+            message.requiresToolArcSkeleton ??
+            (message.info.role === "assistant" && parts.some((part) => part.kind === "thinking"));
+        for (const part of parts) {
+            if (part.kind !== "tool_result") resultRun = undefined;
+            if (part.kind === "text") {
+                const prefix = /^§(\d+)§\s/.exec(part.getText() ?? "");
+                const tag =
+                    (prefix ? byNumber.get(Number(prefix[1])) : undefined) ??
+                    textTags.get(`${message.info.id}:p${ordinal}`);
+                ordinal++;
+                if (tag && tag.type !== "tool")
+                    targets.set(tag.tagNumber, buildTextTarget(part, message, ""));
+            } else if ((part.kind === "tool_use" || part.kind === "tool_result") && part.id) {
+                const open = pending.get(part.id) ?? [];
+                if (open.length > 1) ambiguousCalls.add(part.id);
+                const key =
+                    (part.kind === "tool_result"
+                        ? resultRun?.callId === part.id
+                            ? resultRun.key
+                            : (open.at(-1) ?? resolved.get(part.id))
+                        : undefined) ?? makeToolCompositeKey(message.info.id ?? "", part.id);
+                if (part.kind === "tool_use") open.push(key);
+                else {
+                    const position = open.lastIndexOf(key);
+                    if (position >= 0) open.splice(position, 1);
+                    resultRun = { callId: part.id, key };
+                    resolved.set(part.id, key);
+                }
+                pending.set(part.id, open);
+                let aggregate = aggregates.get(key);
+                if (!aggregate) {
+                    aggregate = {
+                        tag: tools.get(key),
+                        occurrences: [],
+                        reasoning: false,
+                    };
+                    aggregates.set(key, aggregate);
+                }
+                aggregate.occurrences.push({ message, part, kind: part.kind });
+                aggregate.reasoning ||= reasoning;
+            }
+        }
+    }
+    const arcsByCall = new Map<string, number>();
+    for (const { occurrences } of aggregates.values()) {
+        const callId = occurrences[0]?.part.id ?? "";
+        arcsByCall.set(callId, (arcsByCall.get(callId) ?? 0) + 1);
+    }
+    for (const aggregate of aggregates.values()) {
+        const { occurrences, reasoning } = aggregate;
+        const callId = occurrences[0]?.part.id ?? "";
+        if (ambiguousCalls.has(callId)) continue;
+        const tag =
+            aggregate.tag ??
+            (arcsByCall.get(callId) === 1
+                ? tools.get(makeToolCompositeKey("", callId))
+                : undefined);
+        if (tag)
+            targets.set(
+                tag.tagNumber,
+                buildAggregateTarget(tag.tagNumber, occurrences, reasoning, end),
+            );
+    }
+    if (!options.allowReasoningPrefixRewrite) {
+        // This target builder cannot persist removal of thinking. By default,
+        // withhold edits before reasoning rather than invalidate its signature.
+        // The Pi recovery handler opts in only to test edits on a saved copy;
+        // it must compare final request prefixes and refuse unsafe changes.
+        let lastThinking = -1;
+        transcript.messages.forEach((message, index) => {
+            if (message.parts.some((part) => part.kind === "thinking")) lastThinking = index;
+        });
+        const protectedIds = new Set(
+            transcript.messages.slice(0, lastThinking + 1).map((message) => message.info.id),
+        );
+        for (const [number, target] of targets) {
+            if (target.mutationParts?.some(({ message }) => protectedIds.has(message.info.id)))
+                targets.delete(number);
+        }
+    }
+    return targets;
+}
+
 /**
  * Tag eligible parts of a transcript and build TagTargets for them.
  *
@@ -1289,6 +1406,7 @@ function buildAggregateTarget(
             return any ? "truncated" : "absent";
         },
         // Open invocations still belong to the current turn; only complete arcs reclaim.
+        prepareDrop: () => !occurrences.some((occ) => occ.part.canRemove?.() === "defer"),
         canDrop: () => complete() && !occurrences.some((occ) => occ.part.hasUserAnswer?.()),
         requiresToolArcSkeleton,
         // Non-mutating read of the invocation input (the tool_use occurrence

package/src/shared/user-facing-codes.ts

@@ -17,8 +17,8 @@ export const USER_FACING_FAILURES = {
     history_boundary_unresolved: {
         code: "MC-H04",
         sentence:
-            "This request was not sent: the message that marks where this session's history summary ends is missing from the OpenCode store, and without it the request is larger than the model's context window.",
-        action: "Run /ctx-recomp to rebuild the history summary.",
+            "This request was not sent: Magic Context could not safely place the history summary boundary in the loaded conversation, and the untrimmed request is larger than the model's context window.",
+        action: "Reopen this session in its current project directory, then run /ctx-recomp to rebuild the history summary. A model with a larger context window can also help.",
     },
     history_over_window_unmanaged: {
         code: "MC-H06",

package/dist/embedding-backfill-dtjmyktb.js

@@ -1,21 +0,0 @@
-import {
-  ensureMemoryEmbeddings2
-} from "./index-7q1m1qjk.js";
-import"./index-9s58tq95.js";
-import"./index-j55vn694.js";
-import"./index-4dhv7mqz.js";
-import"./index-qt1qqasc.js";
-import"./index-gbmqa9x9.js";
-import"./index-vkbqdnkj.js";
-import"./index-g9exahnx.js";
-import"./index-bg5qqene.js";
-import"./index-k6xvbj2e.js";
-import"./index-4mjhqadz.js";
-import"./index-0nnd4bry.js";
-import"./index-qx53vezw.js";
-import"./index-nsjyysj0.js";
-import"./index-0sahzkwr.js";
-import"./index-pavzsdc6.js";
-export {
-  ensureMemoryEmbeddings2 as ensureMemoryEmbeddings
-};

package/dist/recomp-orchestrator-1d08g57a.js

@@ -1,60 +0,0 @@
-import {
-  isRecompFailure2,
-  isRecompSkip2,
-  extractRecompReason2,
-  setRecompStarting2,
-  setRecompNote2,
-  setRecompTerminal2,
-  buildRecompDeps2,
-  runManagedRecomp2
-} from "./index-ck6y3td2.js";
-import"./index-vh3e2mvr.js";
-import"./index-f3dnvnw6.js";
-import"./index-sd3egckz.js";
-import"./index-s0gsmthp.js";
-import"./index-1xaw2pq8.js";
-import"./index-7q1m1qjk.js";
-import"./index-cm4hmxyk.js";
-import"./index-9s58tq95.js";
-import"./index-j55vn694.js";
-import"./index-4dhv7mqz.js";
-import"./index-w23dh319.js";
-import"./index-hr64sth2.js";
-import"./index-qt1qqasc.js";
-import"./index-x8a7jmkh.js";
-import"./index-tqf7yg27.js";
-import"./index-gbmqa9x9.js";
-import"./index-vkbqdnkj.js";
-import"./index-besxhcsh.js";
-import"./index-fb3zxn06.js";
-import"./index-xqyj5c85.js";
-import"./index-9m7bn21d.js";
-import"./index-fr0wbhdn.js";
-import"./index-g9exahnx.js";
-import"./index-bg5qqene.js";
-import"./index-vztbgcdk.js";
-import"./index-1j8jcjpa.js";
-import"./index-1zx87sdm.js";
-import"./index-ab3bgm2m.js";
-import"./index-vnjhmkwk.js";
-import"./index-v0p37hm2.js";
-import"./index-k6xvbj2e.js";
-import"./index-h2wc01qk.js";
-import"./index-1bt88epp.js";
-import"./index-58e3y90n.js";
-import"./index-4mjhqadz.js";
-import"./index-0nnd4bry.js";
-import"./index-qx53vezw.js";
-import"./index-nsjyysj0.js";
-import"./index-0sahzkwr.js";
-import"./index-pavzsdc6.js";
-export {
-  buildRecompDeps2 as buildRecompDeps,
-  extractRecompReason2 as extractRecompReason,
-  isRecompFailure2 as isRecompFailure,
-  isRecompSkip2 as isRecompSkip,
-  runManagedRecomp2 as runManagedRecomp,
-  setRecompNote2 as setRecompNote,
-  setRecompStarting2 as setRecompStarting,
-  setRecompTerminal2 as setRecompTerminal
-};

package/dist/v2/embedding-backfill-cg4rv90f.js

@@ -1,20 +0,0 @@
-import {
-  ensureMemoryEmbeddings2
-} from "./server-f9py7s7a.js";
-import"./server-158ehmk2.js";
-import"./server-keswwkvv.js";
-import"./server-4dhv7mqz.js";
-import"./server-qt1qqasc.js";
-import"./server-ras2sxnc.js";
-import"./server-hb6xhh9q.js";
-import"./server-btgnsv7w.js";
-import"./server-yezz0cp2.js";
-import"./server-cw6521wn.js";
-import"./server-3t0q2cqx.js";
-import"./server-0nnd4bry.js";
-import"./server-kzns2hbz.js";
-import"./server-t4k4qexw.js";
-import"./server-pavzsdc6.js";
-export {
-  ensureMemoryEmbeddings2 as ensureMemoryEmbeddings
-};

package/dist/v2/recomp-orchestrator-v64r4s4r.js

@@ -1,59 +0,0 @@
-import {
-  isRecompFailure2,
-  isRecompSkip2,
-  extractRecompReason2,
-  setRecompStarting2,
-  setRecompNote2,
-  setRecompTerminal2,
-  buildRecompDeps2,
-  runManagedRecomp2
-} from "./server-7skbfb81.js";
-import"./server-6a9mxnb2.js";
-import"./server-x2r63c0x.js";
-import"./server-qn23p4h7.js";
-import"./server-f9py7s7a.js";
-import"./server-cm4hmxyk.js";
-import"./server-158ehmk2.js";
-import"./server-keswwkvv.js";
-import"./server-4dhv7mqz.js";
-import"./server-t528t8qm.js";
-import"./server-9zqewm6g.js";
-import"./server-qt1qqasc.js";
-import"./server-676xw7at.js";
-import"./server-d6g4whc2.js";
-import"./server-vb7pbd9p.js";
-import"./server-x8a7jmkh.js";
-import"./server-ras2sxnc.js";
-import"./server-hb6xhh9q.js";
-import"./server-09g9pkvx.js";
-import"./server-fb3zxn06.js";
-import"./server-ww9nr8pe.js";
-import"./server-wrem2nmz.js";
-import"./server-fr0wbhdn.js";
-import"./server-btgnsv7w.js";
-import"./server-yezz0cp2.js";
-import"./server-fby0cxbq.js";
-import"./server-yd01snxq.js";
-import"./server-1zx87sdm.js";
-import"./server-4tn95znb.js";
-import"./server-387vkhjq.js";
-import"./server-51779zs2.js";
-import"./server-cw6521wn.js";
-import"./server-7ekna9zs.js";
-import"./server-6byqfbqf.js";
-import"./server-2ra6pwf3.js";
-import"./server-3t0q2cqx.js";
-import"./server-0nnd4bry.js";
-import"./server-kzns2hbz.js";
-import"./server-t4k4qexw.js";
-import"./server-pavzsdc6.js";
-export {
-  buildRecompDeps2 as buildRecompDeps,
-  extractRecompReason2 as extractRecompReason,
-  isRecompFailure2 as isRecompFailure,
-  isRecompSkip2 as isRecompSkip,
-  runManagedRecomp2 as runManagedRecomp,
-  setRecompNote2 as setRecompNote,
-  setRecompStarting2 as setRecompStarting,
-  setRecompTerminal2 as setRecompTerminal
-};

package/dist/v2/search-bpa4fxq1.js

@@ -1,46 +0,0 @@
-import {
-  createUnifiedSearchDiagnostics2,
-  searchMessageHistory2,
-  parseIdShapedQuery2,
-  resolveMemoriesByIdsForSearch2,
-  unifiedSearch2,
-  formatSearchResults2
-} from "./server-aa9w15cs.js";
-import"./server-x2r63c0x.js";
-import"./server-qn23p4h7.js";
-import"./server-f9py7s7a.js";
-import"./server-cm4hmxyk.js";
-import"./server-158ehmk2.js";
-import"./server-keswwkvv.js";
-import"./server-4dhv7mqz.js";
-import"./server-qt1qqasc.js";
-import"./server-ras2sxnc.js";
-import"./server-hb6xhh9q.js";
-import"./server-ww9nr8pe.js";
-import"./server-wrem2nmz.js";
-import"./server-fr0wbhdn.js";
-import"./server-btgnsv7w.js";
-import"./server-yezz0cp2.js";
-import"./server-fby0cxbq.js";
-import"./server-yd01snxq.js";
-import"./server-1zx87sdm.js";
-import"./server-4tn95znb.js";
-import"./server-387vkhjq.js";
-import"./server-51779zs2.js";
-import"./server-cw6521wn.js";
-import"./server-7ekna9zs.js";
-import"./server-6byqfbqf.js";
-import"./server-2ra6pwf3.js";
-import"./server-3t0q2cqx.js";
-import"./server-0nnd4bry.js";
-import"./server-kzns2hbz.js";
-import"./server-t4k4qexw.js";
-import"./server-pavzsdc6.js";
-export {
-  createUnifiedSearchDiagnostics2 as createUnifiedSearchDiagnostics,
-  formatSearchResults2 as formatSearchResults,
-  parseIdShapedQuery2 as parseIdShapedQuery,
-  resolveMemoriesByIdsForSearch2 as resolveMemoriesByIdsForSearch,
-  searchMessageHistory2 as searchMessageHistory,
-  unifiedSearch2 as unifiedSearch
-};

package/dist/wrapup-orchestrator-mqp0v195.js

@@ -1,47 +0,0 @@
-import {
-  runManagedWrapup2
-} from "./index-a796ct3s.js";
-import"./index-ck6y3td2.js";
-import"./index-vh3e2mvr.js";
-import"./index-f3dnvnw6.js";
-import"./index-sd3egckz.js";
-import"./index-s0gsmthp.js";
-import"./index-1xaw2pq8.js";
-import"./index-7q1m1qjk.js";
-import"./index-cm4hmxyk.js";
-import"./index-9s58tq95.js";
-import"./index-j55vn694.js";
-import"./index-4dhv7mqz.js";
-import"./index-w23dh319.js";
-import"./index-hr64sth2.js";
-import"./index-qt1qqasc.js";
-import"./index-x8a7jmkh.js";
-import"./index-tqf7yg27.js";
-import"./index-gbmqa9x9.js";
-import"./index-vkbqdnkj.js";
-import"./index-besxhcsh.js";
-import"./index-fb3zxn06.js";
-import"./index-xqyj5c85.js";
-import"./index-9m7bn21d.js";
-import"./index-fr0wbhdn.js";
-import"./index-g9exahnx.js";
-import"./index-bg5qqene.js";
-import"./index-vztbgcdk.js";
-import"./index-1j8jcjpa.js";
-import"./index-1zx87sdm.js";
-import"./index-ab3bgm2m.js";
-import"./index-vnjhmkwk.js";
-import"./index-v0p37hm2.js";
-import"./index-k6xvbj2e.js";
-import"./index-h2wc01qk.js";
-import"./index-1bt88epp.js";
-import"./index-58e3y90n.js";
-import"./index-4mjhqadz.js";
-import"./index-0nnd4bry.js";
-import"./index-qx53vezw.js";
-import"./index-nsjyysj0.js";
-import"./index-0sahzkwr.js";
-import"./index-pavzsdc6.js";
-export {
-  runManagedWrapup2 as runManagedWrapup
-};