@cortexkit/opencode-magic-context 0.2.4 → 0.2.6

package/README.md

@@ -99,9 +99,9 @@ Create `magic-context.jsonc` in your project root, `.opencode/`, or `~/.config/o
 
 That's it. Everything else has sensible defaults. Project config merges on top of user-wide settings.
 
-### Oh-My-OpenCode Users
+### Oh-My-OpenCode / Oh-My-OpenAgent Users
 
-If you use [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode), disable the hooks that conflict with Magic Context in your `oh-my-opencode.json`:
+If you use [oh-my-openagent](https://github.com/code-yeongyu/oh-my-openagent) (formerly oh-my-opencode), disable the hooks that conflict with Magic Context in your `oh-my-openagent.json`:
 
 ```json
 {
@@ -113,7 +113,7 @@ If you use [oh-my-opencode](https://github.com/code-yeongyu/oh-my-opencode), dis
 }
 ```
 
-The setup wizard handles this automatically if it detects an oh-my-opencode config.
+The setup wizard handles this automatically if it detects an oh-my-openagent or oh-my-opencode config.
 
 ---
 

package/dist/cli/config-paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-paths.d.ts","sourceRoot":"","sources":["../../src/cli/config-paths.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,WAAW;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IAChD,kBAAkB,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AA+BD,wBAAgB,iBAAiB,IAAI,WAAW,CA2B/C"}
+{"version":3,"file":"config-paths.d.ts","sourceRoot":"","sources":["../../src/cli/config-paths.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,WAAW;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IAChD,kBAAkB,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAmCD,wBAAgB,iBAAiB,IAAI,WAAW,CA2B/C"}

package/dist/cli/opencode-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"opencode-helpers.d.ts","sourceRoot":"","sources":["../../src/cli/opencode-helpers.ts"],"names":[],"mappings":"AAEA,wBAAgB,mBAAmB,IAAI,OAAO,CAO7C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,GAAG,IAAI,CAMlD;AAED,wBAAgB,kBAAkB,IAAI,MAAM,EAAE,CAU7C;AAED,2CAA2C;AAC3C,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAU7E;AAED,2CAA2C;AAC3C,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CASvD;AAED,uDAAuD;AACvD,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAE3E;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAC/B,SAAS,EAAE,MAAM,EAAE,EACnB,IAAI,EAAE,WAAW,GAAG,SAAS,GAAG,UAAU,GAC3C;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,EAAE,CA0E3D"}
+{"version":3,"file":"opencode-helpers.d.ts","sourceRoot":"","sources":["../../src/cli/opencode-helpers.ts"],"names":[],"mappings":"AAEA,wBAAgB,mBAAmB,IAAI,OAAO,CAO7C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,GAAG,IAAI,CAMlD;AAED,wBAAgB,kBAAkB,IAAI,MAAM,EAAE,CAU7C;AAED,2CAA2C;AAC3C,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAU7E;AAED,2CAA2C;AAC3C,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CASvD;AAED,uDAAuD;AACvD,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAE3E;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAC/B,SAAS,EAAE,MAAM,EAAE,EACnB,IAAI,EAAE,WAAW,GAAG,SAAS,GAAG,UAAU,GAC3C;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,EAAE,CA0D3D"}

package/dist/cli/setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/cli/setup.ts"],"names":[],"mappings":"AAgIA,wBAAsB,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAoJhD"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/cli/setup.ts"],"names":[],"mappings":"AAgMA,wBAAsB,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAmKhD"}

package/dist/cli.js

@@ -116,6 +116,8 @@ function getConfigDir() {
 }
 function findOmoConfig(configDir) {
   const locations = [
+    join(configDir, "oh-my-openagent.jsonc"),
+    join(configDir, "oh-my-openagent.json"),
     join(configDir, "oh-my-opencode.jsonc"),
     join(configDir, "oh-my-opencode.json")
   ];
@@ -179,64 +181,49 @@ function getAvailableModels() {
 function buildModelSelection(allModels, role) {
   const result = [];
   const added = new Set;
-  const addIfAvailable = (pattern, recommended = false) => {
+  const addIfAvailable = (pattern, hint) => {
     const matches = allModels.filter((m) => m === pattern || m.endsWith(`/${pattern}`));
     for (const m of matches) {
       if (!added.has(m)) {
         added.add(m);
         result.push({
-          label: m,
+          label: hint ? `${m} — ${hint}` : m,
           value: m,
-          recommended: recommended && result.length === 0
+          recommended: result.length === 0
         });
       }
     }
   };
   if (role === "historian") {
-    addIfAvailable("claude-sonnet-4-6", true);
-    addIfAvailable("claude-sonnet-4-5");
-    addIfAvailable("gemini-3.1-pro");
-    addIfAvailable("gpt-5.4");
-    addIfAvailable("glm-5");
-    addIfAvailable("minimax-m2.7");
-    for (const m of allModels.filter((m2) => m2.startsWith("github-copilot/"))) {
-      if (!added.has(m)) {
-        added.add(m);
-        result.push({ label: `${m} (free with Copilot)`, value: m });
-      }
-    }
+    addIfAvailable("github-copilot/claude-sonnet-4.6", "per-request billing");
+    addIfAvailable("anthropic/claude-sonnet-4-6");
+    addIfAvailable("github-copilot/gpt-5.4", "per-request billing");
+    addIfAvailable("openai/gpt-5.4");
+    addIfAvailable("github-copilot/gemini-3.1-pro-preview", "per-request billing");
+    addIfAvailable("opencode-go/minimax-m2.7");
+    addIfAvailable("opencode-go/glm-5");
   } else if (role === "dreamer") {
     for (const m of allModels.filter((m2) => m2.startsWith("ollama/"))) {
       if (!added.has(m)) {
         added.add(m);
-        result.push({ label: `${m} (local)`, value: m, recommended: result.length === 0 });
-      }
-    }
-    addIfAvailable("claude-sonnet-4-6", result.length === 0);
-    addIfAvailable("gemini-3-flash");
-    addIfAvailable("glm-5");
-    addIfAvailable("minimax-m2.7");
-    addIfAvailable("gpt-5.4-mini");
-    for (const m of allModels.filter((m2) => m2.startsWith("github-copilot/"))) {
-      if (!added.has(m)) {
-        added.add(m);
-        result.push({ label: `${m} (free with Copilot)`, value: m });
+        result.push({ label: `${m} — local`, value: m, recommended: result.length === 0 });
       }
     }
+    addIfAvailable("github-copilot/claude-sonnet-4.6", "per-request billing");
+    addIfAvailable("anthropic/claude-sonnet-4-6");
+    addIfAvailable("github-copilot/gemini-3-flash-preview", "per-request billing");
+    addIfAvailable("opencode-go/glm-5");
+    addIfAvailable("opencode-go/minimax-m2.7");
   } else if (role === "sidekick") {
     for (const m of allModels.filter((m2) => m2.startsWith("cerebras/"))) {
       if (!added.has(m)) {
         added.add(m);
-        result.push({
-          label: `${m} (fastest)`,
-          value: m,
-          recommended: result.length === 0
-        });
+        result.push({ label: m, value: m, recommended: result.length === 0 });
       }
     }
-    addIfAvailable("gpt-5-nano");
-    addIfAvailable("gemini-3-flash");
-    addIfAvailable("gpt-5.4-mini");
+    addIfAvailable("opencode/gpt-5-nano");
+    addIfAvailable("github-copilot/gemini-3-flash-preview");
+    addIfAvailable("github-copilot/gpt-5-mini");
   }
   return result;
 }
@@ -1293,69 +1280,130 @@ function ensureDir(dir) {
     mkdirSync(dir, { recursive: true });
   }
 }
-function stripJsoncComments(text) {
-  return text.replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "");
+function stripJsoncToJson(text) {
+  let result = "";
+  let i = 0;
+  let inString = false;
+  let escaped = false;
+  while (i < text.length) {
+    const ch = text[i];
+    if (escaped) {
+      result += ch;
+      escaped = false;
+      i++;
+      continue;
+    }
+    if (inString) {
+      if (ch === "\\")
+        escaped = true;
+      else if (ch === '"')
+        inString = false;
+      result += ch;
+      i++;
+      continue;
+    }
+    if (ch === "/" && text[i + 1] === "/") {
+      while (i < text.length && text[i] !== `
+`)
+        i++;
+      continue;
+    }
+    if (ch === "/" && text[i + 1] === "*") {
+      i += 2;
+      while (i < text.length && !(text[i] === "*" && text[i + 1] === "/"))
+        i++;
+      i += 2;
+      continue;
+    }
+    if (ch === '"')
+      inString = true;
+    result += ch;
+    i++;
+  }
+  return result.replace(/,(\s*[}\]])/g, "$1");
 }
 function readJsonc(path) {
   const content = readFileSync(path, "utf-8");
   try {
-    return JSON.parse(stripJsoncComments(content));
-  } catch {
-    return {};
+    return JSON.parse(stripJsoncToJson(content));
+  } catch (err) {
+    console.error(`  ⚠ Failed to parse ${path}: ${err instanceof Error ? err.message : err}`);
+    return null;
   }
 }
-function writeJsonc(path, data) {
-  writeFileSync(path, `${JSON.stringify(data, null, 2)}
-`);
-}
 function addPluginToOpenCodeConfig(configPath, format) {
   ensureDir(dirname(configPath));
   if (format === "none") {
-    const config2 = {
+    const config = {
       plugin: [PLUGIN_NAME],
       compaction: { auto: false, prune: false }
     };
-    writeJsonc(configPath, config2);
+    writeFileSync(configPath, `${JSON.stringify(config, null, 2)}
+`);
+    return;
+  }
+  const existing = readJsonc(configPath);
+  if (!existing) {
+    R2.warn(`Could not parse ${configPath} — skipping to avoid data loss`);
     return;
   }
-  const config = readJsonc(configPath);
-  const plugins = config.plugin ?? [];
+  const plugins = existing.plugin ?? [];
   const hasPlugin = plugins.some((p) => p === PLUGIN_NAME || p.startsWith(`${PLUGIN_NAME}@`));
   if (!hasPlugin) {
     plugins.push(PLUGIN_NAME);
-    config.plugin = plugins;
   }
-  const compaction = config.compaction ?? {};
+  existing.plugin = plugins;
+  const compaction = existing.compaction ?? {};
   compaction.auto = false;
   compaction.prune = false;
-  config.compaction = compaction;
-  writeJsonc(configPath, config);
+  existing.compaction = compaction;
+  writeFileSync(configPath, `${JSON.stringify(existing, null, 2)}
+`);
 }
 function writeMagicContextConfig(configPath, options) {
-  const config = {};
+  const config = (existsSync2(configPath) ? readJsonc(configPath) : null) ?? {};
   if (options.historianModel) {
-    config.historian = { model: options.historianModel };
+    const historian = config.historian ?? {};
+    historian.model = options.historianModel;
+    config.historian = historian;
   }
   if (options.dreamerEnabled) {
-    const dreamer = { enabled: true };
+    const dreamer = config.dreamer ?? {};
+    dreamer.enabled = true;
     if (options.dreamerModel) {
       dreamer.model = options.dreamerModel;
     }
     config.dreamer = dreamer;
   } else {
-    config.dreamer = { enabled: false };
+    const dreamer = config.dreamer ?? {};
+    dreamer.enabled = false;
+    config.dreamer = dreamer;
   }
   if (options.sidekickEnabled) {
-    const sidekick = { enabled: true };
+    const sidekick = config.sidekick ?? {};
+    sidekick.enabled = true;
     if (options.sidekickModel) {
       sidekick.model = options.sidekickModel;
     }
     config.sidekick = sidekick;
   }
-  writeJsonc(configPath, config);
+  if (options.claudeMax) {
+    const cacheTtl = config.cache_ttl ?? {};
+    if (!cacheTtl.default)
+      cacheTtl.default = "5m";
+    cacheTtl["anthropic/claude-sonnet-4-6"] = "59m";
+    cacheTtl["anthropic/claude-opus-4-6"] = "59m";
+    config.cache_ttl = cacheTtl;
+  }
+  writeFileSync(configPath, `${JSON.stringify(config, null, 2)}
+`);
 }
 function disableOmoHooks(omoConfigPath) {
   const config = readJsonc(omoConfigPath);
+  if (!config) {
+    R2.warn(`Could not parse ${omoConfigPath} — skipping to avoid data loss`);
+    return;
+  }
   const disabledHooks = config.disabled_hooks ?? [];
   const hooksToDisable = [
     "context-window-monitor",
@@ -1368,7 +1416,8 @@ function disableOmoHooks(omoConfigPath) {
     }
   }
   config.disabled_hooks = disabledHooks;
-  writeJsonc(omoConfigPath, config);
+  writeFileSync(omoConfigPath, `${JSON.stringify(config, null, 2)}
+`);
 }
 async function runSetup() {
   Wt2("Magic Context — Setup");
@@ -1440,12 +1489,23 @@ async function runSetup() {
   } else if (sidekickEnabled) {
     R2.info("Using built-in fallback chain for sidekick");
   }
+  const hasAnthropic = allModels.some((m) => m.startsWith("anthropic/"));
+  let claudeMax = false;
+  if (hasAnthropic) {
+    R2.message(`Claude Max/Pro subscribers get extended prompt caching (up to 1 hour).
+` + "This lets Magic Context defer context operations much longer, saving money.");
+    claudeMax = await confirm("Do you have a Claude Max or Pro subscription?", false);
+    if (claudeMax) {
+      R2.success("Cache TTL set to 59m for Anthropic models");
+    }
+  }
   writeMagicContextConfig(paths.magicContextConfig, {
     historianModel,
     dreamerEnabled,
     dreamerModel,
     sidekickEnabled,
-    sidekickModel
+    sidekickModel,
+    claudeMax
   });
   R2.success(`Config written to ${paths.magicContextConfig}`);
   if (paths.omoConfig) {

package/package.json

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