@cortexkit/opencode-magic-context 0.42.6 → 0.43.1

package/dist/{index-s61hh7gv.js → index-kpmmr8s0.js}

@@ -1,9 +1,9 @@
 import {
   log
-} from "./index-qp20p2py.js";
+} from "./index-wgzyeyf5.js";
 import {
   sendStatusNotification2
-} from "./index-ngjmj6xx.js";
+} from "./index-yc81txp4.js";
 import {
   readJsoncFile
 } from "./index-sd3egckz.js";
@@ -20,28 +20,25 @@ import { join as join2 } from "node:path";
 // src/shared/opencode-config-dir.ts
 import { homedir } from "node:os";
 import { join, resolve } from "node:path";
-function getCliConfigDir() {
-  const envConfigDir = process.env.OPENCODE_CONFIG_DIR?.trim();
-  if (envConfigDir) {
-    return resolve(envConfigDir);
-  }
+function resolveHomeDir() {
+  return process.env.HOME?.trim() || homedir();
+}
+function getOpenCodeGlobalConfigDir() {
   if (process.platform === "win32") {
-    return join(homedir(), ".config", "opencode");
+    return join(resolveHomeDir(), ".config", "opencode");
   }
-  return join(process.env.XDG_CONFIG_HOME || join(homedir(), ".config"), "opencode");
+  return join(process.env.XDG_CONFIG_HOME || join(resolveHomeDir(), ".config"), "opencode");
 }
-function getOpenCodeConfigDir(_options) {
-  return getCliConfigDir();
+function getEnvConfigDir() {
+  const envConfigDir = process.env.OPENCODE_CONFIG_DIR?.trim();
+  return envConfigDir ? resolve(envConfigDir) : undefined;
 }
-function getOpenCodeConfigPaths(options) {
-  const configDir = getOpenCodeConfigDir(options);
-  return {
-    configDir,
-    configJson: join(configDir, "opencode.json"),
-    configJsonc: join(configDir, "opencode.jsonc"),
-    packageJson: join(configDir, "package.json"),
-    omoConfig: join(configDir, "magic-context.jsonc")
-  };
+function getOpenCodeConfigDirs() {
+  const dirs = [getOpenCodeGlobalConfigDir(), join(resolveHomeDir(), ".opencode")];
+  const envDir = getEnvConfigDir();
+  if (envDir)
+    dirs.push(envDir);
+  return [...new Set(dirs)];
 }
 
 // src/shared/conflict-detector.ts
@@ -130,11 +127,11 @@ async function resolveCompactionForBoot(client, timeoutMs = 2000, hostGeneration
         ...buffer === undefined ? {} : { buffer }
       };
     }
-    if (typeof compaction?.auto !== "boolean" || typeof compaction?.prune !== "boolean") {
-      log(`[magic-context] conflict-detector: resolved config carried no explicit compaction block (${JSON.stringify(compaction) ?? "absent"}); falling back to file-based detection`);
+    if (typeof compaction?.auto !== "boolean") {
+      log(`[magic-context] conflict-detector: resolved config carried no explicit compaction.auto (${JSON.stringify(compaction) ?? "absent"}); falling back to file-based detection`);
       return null;
     }
-    return { auto: compaction.auto, prune: compaction.prune };
+    return { auto: compaction.auto, prune: compaction.prune === true };
   } catch {
     return null;
   } finally {
@@ -146,47 +143,69 @@ function checkCompaction(directory, hostGeneration) {
   if (process.env.OPENCODE_DISABLE_AUTOCOMPACT) {
     return { auto: false, prune: false };
   }
-  const projectResult = readProjectCompaction(directory, hostGeneration);
-  if (projectResult.resolved)
-    return projectResult;
-  const userResult = readUserCompaction(hostGeneration);
-  if (userResult.resolved)
-    return userResult;
-  return { auto: true, prune: false };
-}
-function readProjectCompaction(directory, hostGeneration) {
-  const dotOcJsonc = join2(directory, ".opencode", "opencode.jsonc");
-  const dotOcJson = join2(directory, ".opencode", "opencode.json");
-  const dotOcConfig = readJsoncFile(dotOcJsonc) ?? readJsoncFile(dotOcJson);
-  if (dotOcConfig?.compaction) {
-    const c = dotOcConfig.compaction;
-    if (c.auto !== undefined || hostGeneration === "v1" && c.prune !== undefined || hostGeneration === "v2" && (c.keep?.tokens !== undefined || c.buffer !== undefined)) {
-      return resolvedCompactionBlock(c, hostGeneration);
-    }
+  const merged = readCompactionFromConfigFiles(directory, hostGeneration);
+  if (isRelevantCompactionBlock(merged, hostGeneration)) {
+    return resolvedCompactionBlock(merged, hostGeneration);
   }
-  const rootJsonc = join2(directory, "opencode.jsonc");
-  const rootJson = join2(directory, "opencode.json");
-  const rootConfig = readJsoncFile(rootJsonc) ?? readJsoncFile(rootJson);
-  if (rootConfig?.compaction) {
-    const c = rootConfig.compaction;
-    if (c.auto !== undefined || hostGeneration === "v1" && c.prune !== undefined || hostGeneration === "v2" && (c.keep?.tokens !== undefined || c.buffer !== undefined)) {
-      return resolvedCompactionBlock(c, hostGeneration);
-    }
-  }
-  return { auto: false, prune: false, resolved: false };
+  log("[magic-context] conflict-detector: no OpenCode config file carried an explicit compaction block; treating native compaction as inconclusive (not disabling the plugin)");
+  return { auto: false, prune: false };
 }
-function readUserCompaction(hostGeneration) {
-  try {
-    const paths = getOpenCodeConfigPaths({ binary: "opencode" });
-    const config = readJsoncFile(paths.configJsonc) ?? readJsoncFile(paths.configJson);
-    if (config?.compaction) {
-      const c = config.compaction;
-      if (c.auto !== undefined || hostGeneration === "v1" && c.prune !== undefined || hostGeneration === "v2" && (c.keep?.tokens !== undefined || c.buffer !== undefined)) {
-        return resolvedCompactionBlock(c, hostGeneration);
-      }
-    }
-  } catch {}
-  return { auto: false, prune: false, resolved: false };
+function openCodeConfigFileChain(directory, hostGeneration) {
+  const globalDir = getOpenCodeGlobalConfigDir();
+  const wellKnown = [
+    join2(globalDir, "config.json"),
+    join2(globalDir, "opencode.json"),
+    join2(globalDir, "opencode.jsonc")
+  ];
+  const globalSupplementary = getOpenCodeConfigDirs().filter((dir) => dir !== globalDir).flatMap((dir) => [join2(dir, "opencode.json"), join2(dir, "opencode.jsonc")]);
+  const explicitConfig = process.env.OPENCODE_CONFIG?.trim();
+  const explicit = explicitConfig ? [explicitConfig] : [];
+  const direct = [join2(directory, "opencode.json"), join2(directory, "opencode.jsonc")];
+  const projectSupplementary = [
+    join2(directory, ".opencode", "opencode.json"),
+    join2(directory, ".opencode", "opencode.jsonc")
+  ];
+  const files = hostGeneration === "v2" ? [
+    ...wellKnown,
+    ...globalSupplementary,
+    ...explicit,
+    ...direct,
+    ...projectSupplementary
+  ] : [
+    ...wellKnown,
+    ...explicit,
+    ...direct,
+    ...projectSupplementary,
+    ...globalSupplementary
+  ];
+  return [...new Set(files)];
+}
+function readCompactionFromConfigFiles(directory, hostGeneration) {
+  const merged = {};
+  for (const filePath of openCodeConfigFileChain(directory, hostGeneration)) {
+    let block;
+    try {
+      block = readJsoncFile(filePath)?.compaction;
+    } catch {}
+    if (!block || typeof block !== "object")
+      continue;
+    if (block.auto !== undefined)
+      merged.auto = block.auto;
+    if (block.prune !== undefined)
+      merged.prune = block.prune;
+    if (block.buffer !== undefined)
+      merged.buffer = block.buffer;
+    if (block.keep !== undefined)
+      merged.keep = { ...merged.keep, ...block.keep };
+  }
+  return merged;
+}
+function isRelevantCompactionBlock(block, hostGeneration) {
+  if (block.auto !== undefined)
+    return true;
+  if (hostGeneration === "v1")
+    return block.prune !== undefined;
+  return block.keep?.tokens !== undefined || block.buffer !== undefined;
 }
 function resolvedCompactionBlock(block, hostGeneration) {
   if (hostGeneration === "v2") {
@@ -241,10 +260,13 @@ function collectPluginEntries(directory) {
     pushFrom(config?.plugin);
   }
   try {
-    const paths = getOpenCodeConfigPaths({ binary: "opencode" });
-    for (const configPath of [paths.configJsonc, paths.configJson]) {
-      const config = readJsoncFile(configPath);
-      pushFrom(config?.plugin);
+    const globalDir = getOpenCodeGlobalConfigDir();
+    for (const dir of getOpenCodeConfigDirs()) {
+      const names = dir === globalDir ? ["config.json", "opencode.json", "opencode.jsonc"] : ["opencode.json", "opencode.jsonc"];
+      for (const name of names) {
+        const config = readJsoncFile(join2(dir, name));
+        pushFrom(config?.plugin);
+      }
     }
   } catch {}
   return plugins;
@@ -275,13 +297,13 @@ function readOmoDisabledHooks(directory) {
     "oh-my-openagent.json"
   ];
   try {
-    const paths = getOpenCodeConfigPaths({ binary: "opencode" });
-    for (const name of configNames) {
-      const configPath = join2(paths.configDir, name);
-      const config = readJsoncFile(configPath);
-      if (config?.disabled_hooks) {
-        for (const hook of config.disabled_hooks) {
-          disabled.add(hook);
+    for (const dir of getOpenCodeConfigDirs()) {
+      for (const name of configNames) {
+        const config = readJsoncFile(join2(dir, name));
+        if (config?.disabled_hooks) {
+          for (const hook of config.disabled_hooks) {
+            disabled.add(hook);
+          }
         }
       }
     }

package/dist/{index-a9ssj59b.js → index-v8qr6tt2.js}

@@ -1,6 +1,6 @@
 import {
   log
-} from "./index-qp20p2py.js";
+} from "./index-wgzyeyf5.js";
 
 // src/shared/opencode-db-path.ts
 import { existsSync, readdirSync, statSync } from "node:fs";
@@ -111,9 +111,13 @@ function resolveOpenCodeDbPath(hostGeneration = "v1", options = {}) {
   return resolution;
 }
 function schemaTableNames(db, schema = "main") {
-  const rows = db.prepare(`SELECT name FROM ${schema}.sqlite_master WHERE type = 'table' AND name IN ('message', 'part', 'session', 'project', 'session_message')`).all();
+  const rows = db.prepare(`SELECT name FROM ${schema}.sqlite_master WHERE type = 'table' AND name IN ('message', 'part', 'session', 'project', 'session_message', 'session_v2')`).all();
   return new Set(rows.flatMap((row) => typeof row.name === "string" ? [row.name] : []));
 }
+function hasV1MessageTables(db, schema = "main") {
+  const tables = schemaTableNames(db, schema);
+  return tables.has("message") && tables.has("part");
+}
 function detectOpenCodeStoreGeneration(db, schema = "main") {
   const tables = schemaTableNames(db, schema);
   const hasV1Messages = tables.has("message") && tables.has("part");
@@ -125,10 +129,18 @@ function detectOpenCodeStoreGeneration(db, schema = "main") {
     return "v1";
   return "unknown";
 }
+function hasMigratedV2Schema(tables) {
+  return tables.has("session_message") && tables.has("session_v2");
+}
+function isOpenCodeV2Store(db, schema = "main") {
+  return detectOpenCodeStoreGeneration(db, schema) === "v2" || hasMigratedV2Schema(schemaTableNames(db, schema));
+}
 function assertOpenCodeStoreGeneration(db, expected, path, schema = "main") {
   const actual = detectOpenCodeStoreGeneration(db, schema);
   if (actual === expected)
     return;
+  if (expected === "v2" && isOpenCodeV2Store(db, schema))
+    return;
   if (actual === "unknown")
     return;
   throw new Error(`OpenCode store generation mismatch at ${path}: expected ${expected}, found ${actual}; refusing generation-specific database access`);
@@ -831,18 +843,44 @@ function getMessageTimesFromOpenCodeDb(sessionId, messageIds) {
   return result;
 }
 function findLastAssistantModelFromOpenCodeDb(sessionId) {
+  const resolution = resolveOpenCodeDbPath();
   try {
-    return withReadOnlySessionDb((db) => {
-      const row = db.prepare(`SELECT json_extract(data, '$.providerID') as providerID,
-                            json_extract(data, '$.modelID') as modelID,
-                            json_extract(data, '$.agent') as agent
-                     FROM message
-                     WHERE session_id = ?
-                       AND json_extract(data, '$.role') = 'assistant'
-                       AND json_extract(data, '$.providerID') IS NOT NULL
-                       AND json_extract(data, '$.modelID') IS NOT NULL
-                     ORDER BY time_created DESC
-                     LIMIT 1`).get(sessionId);
+    if (!openCodeDbPathExists(resolution)) {
+      throw new Error(`OpenCode session database is unavailable at ${resolution.path}`);
+    }
+    const db = new Database(resolution.path, { readonly: true });
+    try {
+      const queryV2 = () => db.prepare(`SELECT json_extract(data, '$.model.providerID') as providerID,
+                                json_extract(data, '$.model.id') as modelID,
+                                json_extract(data, '$.agent') as agent
+                         FROM session_message
+                         WHERE session_id = ?
+                           AND type = 'assistant'
+                           AND json_extract(data, '$.model.providerID') IS NOT NULL
+                           AND json_extract(data, '$.model.id') IS NOT NULL
+                         ORDER BY seq DESC
+                         LIMIT 1`).get(sessionId);
+      const queryV1 = () => db.prepare(`SELECT json_extract(data, '$.providerID') as providerID,
+                                json_extract(data, '$.modelID') as modelID,
+                                json_extract(data, '$.agent') as agent
+                         FROM message
+                         WHERE session_id = ?
+                           AND json_extract(data, '$.role') = 'assistant'
+                           AND json_extract(data, '$.providerID') IS NOT NULL
+                           AND json_extract(data, '$.modelID') IS NOT NULL
+                         ORDER BY time_created DESC
+                         LIMIT 1`).get(sessionId);
+      let row = null;
+      try {
+        assertOpenCodeStoreGeneration(db, "v2", resolution.path);
+        row = queryV2();
+      } catch {}
+      if (!row) {
+        try {
+          assertOpenCodeStoreGeneration(db, "v1", resolution.path);
+          row = queryV1();
+        } catch {}
+      }
       if (!row || typeof row.providerID !== "string" || typeof row.modelID !== "string") {
         return null;
       }
@@ -852,11 +890,13 @@ function findLastAssistantModelFromOpenCodeDb(sessionId) {
         modelID: row.modelID,
         ...agent ? { agent } : {}
       };
-    });
+    } finally {
+      closeQuietly(db);
+    }
   } catch (error) {
-    logProbeFailureOnce(resolveOpenCodeDbPath(), error);
+    logProbeFailureOnce(resolution, error);
     return null;
   }
 }
 
-export { resolveOpenCodeDbPath, assertOpenCodeStoreGeneration, openCodeDbPathExists, formatOpenCodeDbMissingBanner, formatOpenCodeDbMissingStatusLine, formatOpenCodeDbReadFailureStatusLine, recordOpenCodeDbReadFailure, clearOpenCodeDbReadFailure, getOpenCodeDbReadFailure, claimOpenCodeDbDiagnosticOnce, registerSlowWriteReporter, detectSqliteRuntime, Database, getSqliteMemoryStats, withPrivilegedWriter, closeQuietly, openCodeDbExists, withReadOnlySessionDb, getRawSessionMessageCountFromDb, observeOpenCodeTurnEvent, clearTrackedOpenCodeSession, assistantAwaitingTools, shouldHoldIgnoredNotification, latestPersistedMessageForRecovery, getMessageTimesFromOpenCodeDb, findLastAssistantModelFromOpenCodeDb };
+export { resolveOpenCodeDbPath, hasV1MessageTables, assertOpenCodeStoreGeneration, openCodeDbPathExists, getOpenCodeDbProbeDescriptions, formatOpenCodeDbMissingBanner, formatOpenCodeDbMissingStatusLine, formatOpenCodeDbReadFailureStatusLine, recordOpenCodeDbReadFailure, clearOpenCodeDbReadFailure, getOpenCodeDbReadFailure, claimOpenCodeDbDiagnosticOnce, registerSlowWriteReporter, detectSqliteRuntime, Database, getSqliteMemoryStats, withPrivilegedWriter, closeQuietly, openCodeDbExists, withReadOnlySessionDb, getRawSessionMessageCountFromDb, observeOpenCodeTurnEvent, clearTrackedOpenCodeSession, assistantAwaitingTools, shouldHoldIgnoredNotification, latestPersistedMessageForRecovery, getMessageTimesFromOpenCodeDb, findLastAssistantModelFromOpenCodeDb };

package/dist/{index-qp20p2py.js → index-wgzyeyf5.js}

@@ -1,6 +1,6 @@
 import {
   getMagicContextLogPath
-} from "./index-4ftb5hcq.js";
+} from "./index-6z9g64js.js";
 
 // src/shared/logger.ts
 import * as fs from "node:fs";