@cortexkit/opencode-magic-context 0.49.14 → 0.49.16

package/dist/{wrapup-orchestrator-kxqj4rwh.js → wrapup-orchestrator-vj2tbp22.js}

@@ -1,42 +1,42 @@
 import {
   runManagedWrapup2
-} from "./index-tyckte5c.js";
-import"./index-kf4epshg.js";
-import"./index-t4q9zbbf.js";
+} from "./index-v9asb16b.js";
+import"./index-v63beg1z.js";
+import"./index-ayym1x7f.js";
 import"./index-f71thw8j.js";
-import"./index-bxdg2nbt.js";
-import"./index-thvnpfsv.js";
+import"./index-wv9n2zcq.js";
+import"./index-p4vde22c.js";
 import"./index-sd3egckz.js";
-import"./index-3kdm78zp.js";
-import"./index-y1qysm3q.js";
+import"./index-9nkg2dzk.js";
+import"./index-qrahzcqv.js";
 import"./index-n78avt2p.js";
 import"./index-4dhv7mqz.js";
 import"./index-v10f1rjv.js";
-import"./index-dgs16axy.js";
+import"./index-b17m64g9.js";
 import"./index-qt1qqasc.js";
-import"./index-944w16m0.js";
-import"./index-mht7bq0z.js";
+import"./index-j6zw70pf.js";
+import"./index-nd7m2a5a.js";
 import"./index-1zx87sdm.js";
-import"./index-1d289pq2.js";
-import"./index-mmfa86mt.js";
-import"./index-v0p37hm2.js";
+import"./index-mtw9e71a.js";
 import"./index-x8a7jmkh.js";
 import"./index-y9f76s3f.js";
-import"./index-e20m7284.js";
-import"./index-1sarmj9z.js";
+import"./index-7b2cfmaz.js";
+import"./index-wgypt3cs.js";
 import"./index-saews2s3.js";
-import"./index-3kx0kg0f.js";
+import"./index-hehkf6zm.js";
 import"./index-fkx2qnvw.js";
-import"./index-yxycg7fs.js";
+import"./index-cj9g0j7a.js";
 import"./index-fb3zxn06.js";
 import"./index-wk0n1cgt.js";
 import"./index-a8bvhwqs.js";
-import"./index-dyvbsvga.js";
+import"./index-dqe8pq4x.js";
 import"./index-fr0wbhdn.js";
 import"./index-nj7yykkx.js";
 import"./index-n6m03s3n.js";
 import"./index-bp5083x2.js";
 import"./index-58e3y90n.js";
+import"./index-7pa32z07.js";
+import"./index-v0p37hm2.js";
 import"./index-k29z4aqh.js";
 import"./index-hqkczed7.js";
 import"./index-wafzvyhg.js";

package/package.json

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

package/src/config/schema/magic-context.ts

@@ -205,12 +205,14 @@ export type OmpEntry = z.infer<typeof OmpEntrySchema>;
 /** Strict model-resolution block used by historian.opencode. */
 export const OpenCodeHarnessBlockSchema = z
     .object({
-        model: OcEntrySchema.optional().describe("Primary OpenCode model entry."),
+        model: OcEntrySchema.optional().describe(
+            "Primary historian OpenCode model entry. When set, only this model and fallback_models are used; exhaustion reports failure, never the session model. When absent, OpenCode inherits the session model.",
+        ),
         fallback_models: z
             .array(OcEntrySchema)
             .optional()
             .describe(
-                "Ordered fallback OpenCode entries. New-shape configuration requires an array; legacy singleton values migrate to a one-element array.",
+                "Ordered historian fallback OpenCode entries. A configured primary never adds the session model after this list. Requires an array; legacy singleton values migrate to a one-element array.",
             ),
         variant: z
             .string()
@@ -226,12 +228,14 @@ export type OpenCodeHarnessBlock = z.infer<typeof OpenCodeHarnessBlockSchema>;
 /** Strict model-resolution block used by historian.pi. */
 export const PiHarnessBlockSchema = z
     .object({
-        model: PiEntrySchema.optional().describe("Primary Pi model entry."),
+        model: PiEntrySchema.optional().describe(
+            "Primary historian Pi model entry. When set, only this model and fallback_models are used; exhaustion reports failure, never the session model. When absent, Pi does not run the historian.",
+        ),
         fallback_models: z
             .array(PiEntrySchema)
             .optional()
             .describe(
-                "Ordered fallback Pi entries. New-shape configuration requires an array; legacy singleton values migrate to a one-element array.",
+                "Ordered historian fallback Pi entries. The session model is never appended. Requires an array; legacy singleton values migrate to a one-element array.",
             ),
         thinking_level: PiThinkingLevelSchema.describe(
             "Pi thinking level for the primary entry when it declares none. Fallback entries declare thinking levels per-entry.",
@@ -244,11 +248,15 @@ export type PiHarnessBlock = z.infer<typeof PiHarnessBlockSchema>;
 /** Strict model-resolution block used by historian.omp. */
 export const OmpHarnessBlockSchema = z
     .object({
-        model: OmpEntrySchema.optional().describe("Primary OMP model entry."),
+        model: OmpEntrySchema.optional().describe(
+            "Primary historian OMP model entry. When set, only this model and fallback_models are used; exhaustion reports failure, never the session model. An absent OMP block inherits the Pi block; a selected block without a model does not run the historian.",
+        ),
         fallback_models: z
             .array(OmpEntrySchema)
             .optional()
-            .describe("Ordered fallback OMP entries."),
+            .describe(
+                "Ordered historian fallback OMP entries. The session model is never appended.",
+            ),
         thinking_level: OmpThinkingLevelSchema.describe(
             "OMP thinking level for the primary entry when it declares none. Fallback entries declare thinking levels per-entry.",
         ),

package/src/shared/model-resolution.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, test } from "bun:test";
+import { parsePluginConfig } from "../config";
 
 import {
     normalizeModelEntry,
@@ -9,6 +10,27 @@ import {
 } from "./model-resolution";
 
 describe("model-resolution", () => {
+    test("loader defaults and historian metadata do not configure a primary model", () => {
+        for (const harness of ["opencode", "pi", "omp"] as const) {
+            for (const input of [
+                {},
+                { historian: {} },
+                { historian: { temperature: 0, [harness]: {} } },
+            ]) {
+                expect(
+                    resolveHistorianModel(parsePluginConfig(input), harness).primary,
+                ).toBeUndefined();
+            }
+            for (const model of [" provider/explicit ", { model: "provider/explicit" }]) {
+                expect(
+                    resolveHistorianModel(
+                        parsePluginConfig({ historian: { [harness]: { model } } }),
+                        harness,
+                    ).primary?.model,
+                ).toBe("provider/explicit");
+            }
+        }
+    });
     test("keeps historian temperature opt-in while preserving explicit overrides", () => {
         const fixtures = [
             { temperature: undefined, expected: undefined },

package/src/shared/model-suggestion-retry.ts

@@ -72,6 +72,8 @@ export interface PromptAttemptInfo {
 export interface PromptRetryOptions {
     transport?: PromptTransport;
     timeoutMs?: number;
+    /** False for callers whose configured model chain must not accept provider suggestions. Defaults to true. */
+    allowModelSuggestions?: boolean;
     /** External abort signal — cancels the in-flight LLM prompt immediately when aborted */
     signal?: AbortSignal;
     /**
@@ -508,6 +510,7 @@ async function attemptOnce(
     callContext: string,
     label: string,
     transport?: PromptTransport,
+    allowModelSuggestions = true,
 ): Promise<void> {
     // Keep this snapshot separate from the object passed to the client. A
     // failed prompt facade may rewrite its request body before rejecting; the
@@ -518,9 +521,9 @@ async function attemptOnce(
         await promptWithTimeout(client, attemptArgs, timeoutMs, signal, transport);
         return;
     } catch (error) {
-        // If non-retryable (abort, overflow, timeout), bubble up immediately.
-        // Don't even try suggestion retry — caller needs the original error.
-        if (isNonRetryable(error, signal)) throw error;
+        // Non-retryable failures and callers with model suggestions disabled
+        // must surface the original error without accepting a provider suggestion.
+        if (isNonRetryable(error, signal) || !allowModelSuggestions) throw error;
 
         const suggestion = parseModelSuggestion(error);
         if (!suggestion || !originalBody.model) {
@@ -596,6 +599,7 @@ export async function promptSyncWithModelSuggestionRetry(
             callContext,
             explicitPrimaryLabel,
             options.transport,
+            options.allowModelSuggestions,
         );
         return;
     } catch (error) {
@@ -640,6 +644,7 @@ export async function promptSyncWithModelSuggestionRetry(
                 callContext,
                 label,
                 options.transport,
+                options.allowModelSuggestions,
             );
             log(
                 `[${callContext}] fallback succeeded with ${label} (attempt ${i + 2}/${fallbacks.length + 1})`,
@@ -685,6 +690,7 @@ async function attemptAndValidate<TOutput, TValidated>(
             callContext,
             attempt.label,
             options.transport,
+            options.allowModelSuggestions,
         );
     } catch (error) {
         throw {

package/src/shared/resolve-fallbacks.test.ts

@@ -4,9 +4,8 @@ import { modelBodyField, parseProviderModel, resolveFallbackChain } from "./reso
 
 describe("resolveFallbackChain", () => {
     // Policy: user-config-only. There is NO builtin provider-agnostic chain —
-    // when the user configures no fallback_models the result is EMPTY, and the
-    // runner's session-model last resort (a model the user actually has) is the
-    // only fallback. A hardcoded chain named providers the user may not have and
+    // when the user configures no fallback_models the result is empty.
+    // A hardcoded chain named providers the user may not have and
     // produced `Model not found` retry storms.
     test("returns empty when user provides nothing (no builtin chain)", () => {
         expect(resolveFallbackChain(undefined)).toEqual([]);

package/src/shared/resolve-fallbacks.ts

@@ -9,9 +9,9 @@ import type { ModelInput, ResolvedModelEntry } from "./model-resolution";
  * inevitably names providers the user doesn't have (e.g. a metapi-only user got
  * a chain of google/github-copilot/opencode entries, every one a
  * `Model not found` retry), which produced confusing errors and wasted
- * attempts. If the user configured nothing, this returns an empty list and the
- * runner's session-model last resort (the model the user is actually using) is
- * the only fallback.
+ * attempts. If the user configured no alternates, this returns an empty list.
+ * A configured historian never adds the session model to this list; only an
+ * unconfigured OpenCode historian inherits the session model.
  *
  * The returned list does NOT include the primary model — it's the ordered list
  * of *alternates* to try after the primary fails. Each entry is