@cortexkit/magic-context 0.27.0 → 0.27.2

package/dist/index.js

@@ -7806,8 +7806,10 @@ var require_src2 = __commonJS((exports, module) => {
 });
 
 // src/lib/atomic-write.ts
-import { chmodSync, renameSync, statSync, writeFileSync } from "node:fs";
+import { chmodSync, mkdirSync, renameSync, statSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
 function writeFileAtomic(targetPath, data) {
+  mkdirSync(dirname(targetPath), { recursive: true });
   const tmpPath = `${targetPath}.tmp`;
   writeFileSync(tmpPath, data, { encoding: "utf-8" });
   try {
@@ -7881,7 +7883,7 @@ var init_opencode_install = __esm(() => {
 import {
   closeSync,
   existsSync as existsSync3,
-  mkdirSync,
+  mkdirSync as mkdirSync2,
   openSync,
   readFileSync,
   renameSync as renameSync2,
@@ -7891,7 +7893,7 @@ import {
   writeFileSync as writeFileSync2
 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
-import { basename, dirname, isAbsolute, join as join3 } from "node:path";
+import { basename, dirname as dirname2, isAbsolute, join as join3 } from "node:path";
 function homeDir() {
   if (process.platform === "win32") {
     return process.env.USERPROFILE || process.env.HOME || homedir2();
@@ -7922,7 +7924,18 @@ function legacySourcesForBase(basePath, label) {
     { path: `${basePath}.json`, label: `${label} magic-context.json` }
   ];
 }
+function userScopeConfigPaths() {
+  return new Set([
+    `${cortexKitUserConfigBasePath()}.jsonc`,
+    `${cortexKitUserConfigBasePath()}.json`,
+    join3(configHome(), "opencode", `${CONFIG_FILE_BASENAME}.jsonc`),
+    join3(configHome(), "opencode", `${CONFIG_FILE_BASENAME}.json`),
+    join3(homeDir(), ".pi", "agent", `${CONFIG_FILE_BASENAME}.jsonc`),
+    join3(homeDir(), ".pi", "agent", `${CONFIG_FILE_BASENAME}.json`)
+  ]);
+}
 function resolveLegacyConfigSources(directory) {
+  const userPaths = userScopeConfigPaths();
   return {
     user: [
       ...legacySourcesForBase(join3(configHome(), "opencode", CONFIG_FILE_BASENAME), "OpenCode user"),
@@ -7932,7 +7945,7 @@ function resolveLegacyConfigSources(directory) {
       ...legacySourcesForBase(join3(directory, CONFIG_FILE_BASENAME), "project root"),
       ...legacySourcesForBase(join3(directory, ".opencode", CONFIG_FILE_BASENAME), "OpenCode project"),
       ...legacySourcesForBase(join3(directory, ".pi", CONFIG_FILE_BASENAME), "Pi project")
-    ]
+    ].filter((source) => !userPaths.has(source.path))
   };
 }
 function resolveLegacyConfigSourcesForHarness(directory, harness) {
@@ -8046,7 +8059,7 @@ function fileSemanticsMatch(a, b) {
 function acquireConfigMigrationLock(lockDir) {
   for (let attempt = 0;attempt < 2; attempt++) {
     try {
-      mkdirSync(lockDir, { recursive: false });
+      mkdirSync2(lockDir, { recursive: false });
       return () => {
         try {
           rmSync(lockDir, { recursive: true, force: true });
@@ -8071,8 +8084,8 @@ function acquireConfigMigrationLock(lockDir) {
   return null;
 }
 function atomicCopyConfigFile(sourcePath, targetPath) {
-  mkdirSync(dirname(targetPath), { recursive: true });
-  const tmpPath = join3(dirname(targetPath), `.${basename(targetPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
+  mkdirSync2(dirname2(targetPath), { recursive: true });
+  const tmpPath = join3(dirname2(targetPath), `.${basename(targetPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
   let fd = null;
   try {
     fd = openSync(tmpPath, "wx", 384);
@@ -8093,8 +8106,8 @@ function atomicCopyConfigFile(sourcePath, targetPath) {
   }
 }
 function atomicWriteConfigFile(targetPath, content) {
-  mkdirSync(dirname(targetPath), { recursive: true });
-  const tmpPath = join3(dirname(targetPath), `.${basename(targetPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
+  mkdirSync2(dirname2(targetPath), { recursive: true });
+  const tmpPath = join3(dirname2(targetPath), `.${basename(targetPath)}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
   let fd = null;
   try {
     fd = openSync(tmpPath, "wx", 384);
@@ -8166,7 +8179,7 @@ function migrateConfigFile(opts) {
   if (existingSources.length === 0) {
     return { migrated: false, conflict: false, targetPath: opts.targetPath, warnings };
   }
-  mkdirSync(dirname(opts.targetPath), { recursive: true });
+  mkdirSync2(dirname2(opts.targetPath), { recursive: true });
   const release = acquireConfigMigrationLock(`${opts.targetPath}.lock`);
   if (!release) {
     warnings.push(`Config migration for ${opts.scope} skipped this run (another instance is migrating); will retry on next start.`);
@@ -8341,7 +8354,7 @@ function detectConfigPaths() {
     tuiConfig = tuiJsonPath;
     tuiConfigFormat = "json";
   } else {
-    tuiConfig = tuiJsonPath;
+    tuiConfig = tuiJsoncPath;
     tuiConfigFormat = "none";
   }
   return {
@@ -8415,7 +8428,7 @@ var init_paths = __esm(() => {
 
 // src/adapters/opencode.ts
 import { existsSync as existsSync5, readFileSync as readFileSync2 } from "node:fs";
-import { dirname as dirname2 } from "node:path";
+import { dirname as dirname3 } from "node:path";
 
 class OpenCodeAdapter {
   kind = "opencode";
@@ -8641,10 +8654,10 @@ function matchesPluginEntry(entry, pkgName) {
   return head === pkgName;
 }
 function ensureDir(filePath) {
-  const dir = dirname2(filePath);
+  const dir = dirname3(filePath);
   if (!existsSync5(dir)) {
-    const { mkdirSync: mkdirSync2 } = __require("node:fs");
-    mkdirSync2(dir, { recursive: true });
+    const { mkdirSync: mkdirSync3 } = __require("node:fs");
+    mkdirSync3(dir, { recursive: true });
   }
 }
 var import_comment_json, PLUGIN_NAME = "@cortexkit/opencode-magic-context", PLUGIN_ENTRY;
@@ -8746,7 +8759,7 @@ var init_pi_helpers = __esm(() => {
 // src/adapters/pi.ts
 import { execFileSync as execFileSync2 } from "node:child_process";
 import { existsSync as existsSync7, readFileSync as readFileSync3 } from "node:fs";
-import { dirname as dirname3 } from "node:path";
+import { dirname as dirname4 } from "node:path";
 
 class PiAdapter {
   kind = "pi";
@@ -8903,10 +8916,10 @@ function matchesPiPackage(entry) {
   return false;
 }
 function ensureDir2(filePath) {
-  const dir = dirname3(filePath);
+  const dir = dirname4(filePath);
   if (!existsSync7(dir)) {
-    const { mkdirSync: mkdirSync2 } = __require("node:fs");
-    mkdirSync2(dir, { recursive: true });
+    const { mkdirSync: mkdirSync3 } = __require("node:fs");
+    mkdirSync3(dir, { recursive: true });
   }
 }
 var import_comment_json2, PLUGIN_NAME2 = "@cortexkit/pi-magic-context";
@@ -11484,11 +11497,11 @@ var init_opencode_helpers = __esm(() => {
 });
 
 // src/commands/setup-opencode.ts
-import { existsSync as existsSync10, mkdirSync as mkdirSync2, readFileSync as readFileSync6 } from "node:fs";
-import { dirname as dirname4 } from "node:path";
+import { existsSync as existsSync10, mkdirSync as mkdirSync3, readFileSync as readFileSync6 } from "node:fs";
+import { basename as basename2, dirname as dirname5 } from "node:path";
 function ensureDir3(dir) {
   if (!existsSync10(dir)) {
-    mkdirSync2(dir, { recursive: true });
+    mkdirSync3(dir, { recursive: true });
   }
 }
 function readJsonc(path2) {
@@ -11501,7 +11514,7 @@ function readJsonc(path2) {
   }
 }
 function addPluginToOpenCodeConfig(configPath, format) {
-  ensureDir3(dirname4(configPath));
+  ensureDir3(dirname5(configPath));
   if (format === "none") {
     const config = {
       plugin: [PLUGIN_ENTRY2],
@@ -11531,7 +11544,7 @@ function addPluginToOpenCodeConfig(configPath, format) {
 `);
 }
 function addPluginToTuiConfig(configPath, format) {
-  ensureDir3(dirname4(configPath));
+  ensureDir3(dirname5(configPath));
   if (format === "none") {
     writeFileAtomic(configPath, `${import_comment_json4.stringify({ plugin: [PLUGIN_ENTRY2] }, null, 2)}
 `);
@@ -11734,7 +11747,7 @@ async function runSetup(dryRun = false) {
   }
   if (dryRun) {
     log.message(`[dry-run] would write Magic Context config to ${paths.magicContextConfig}`);
-    log.message("[dry-run] would add the TUI sidebar plugin to tui.json");
+    log.message(`[dry-run] would add the TUI sidebar plugin to ${paths.tuiConfig}`);
   } else {
     writeMagicContextConfig(paths.magicContextConfig, {
       historianModel,
@@ -11747,7 +11760,7 @@ async function runSetup(dryRun = false) {
     });
     log.success(`Config written to ${paths.magicContextConfig}`);
     addPluginToTuiConfig(paths.tuiConfig, paths.tuiConfigFormat);
-    log.success("TUI sidebar plugin added to tui.json");
+    log.success(`TUI sidebar plugin added to ${basename2(paths.tuiConfig)}`);
   }
   if (paths.omoConfig && !hadExistingSetup) {
     log.warn(`Found oh-my-opencode config: ${paths.omoConfig}`);
@@ -11872,11 +11885,11 @@ var init_pi_package_entry = __esm(() => {
 });
 
 // src/commands/setup-pi.ts
-import { existsSync as existsSync11, mkdirSync as mkdirSync3, readFileSync as readFileSync7 } from "node:fs";
-import { dirname as dirname5 } from "node:path";
+import { existsSync as existsSync11, mkdirSync as mkdirSync4, readFileSync as readFileSync7 } from "node:fs";
+import { dirname as dirname6 } from "node:path";
 function ensureDir4(path2) {
   if (!existsSync11(path2))
-    mkdirSync3(path2, { recursive: true });
+    mkdirSync4(path2, { recursive: true });
 }
 async function getDefaultPrompts() {
   const { promptIO: promptIO2 } = await Promise.resolve().then(() => (init_prompts(), exports_prompts));
@@ -11916,7 +11929,7 @@ function comparePiVersion(a, b2) {
   return 0;
 }
 function writePiSettingsPackage(settingsPath, packageSource = PI_PACKAGE_SOURCE) {
-  ensureDir4(dirname5(settingsPath));
+  ensureDir4(dirname6(settingsPath));
   const settings = existsSync11(settingsPath) ? readJsonc2(settingsPath) ?? {} : {};
   const packages = Array.isArray(settings.packages) ? settings.packages : [];
   const hasPackage = hasPiMagicContextPackage(packages);
@@ -11928,7 +11941,7 @@ function writePiSettingsPackage(settingsPath, packageSource = PI_PACKAGE_SOURCE)
   return !hasPackage;
 }
 function writeMagicContextConfig2(configPath, options) {
-  ensureDir4(dirname5(configPath));
+  ensureDir4(dirname6(configPath));
   const config = existsSync11(configPath) ? readJsonc2(configPath) ?? {} : {};
   if (!config.$schema) {
     config.$schema = "https://raw.githubusercontent.com/cortexkit/magic-context/master/assets/magic-context.schema.json";
@@ -12262,7 +12275,7 @@ __export(exports_migrate, {
   formatPiFilenameTimestamp: () => formatPiFilenameTimestamp
 });
 import { randomBytes } from "node:crypto";
-import { existsSync as existsSync12, mkdirSync as mkdirSync4, unlinkSync as unlinkSync2, writeFileSync as writeFileSync4 } from "node:fs";
+import { existsSync as existsSync12, mkdirSync as mkdirSync5, unlinkSync as unlinkSync2, writeFileSync as writeFileSync4 } from "node:fs";
 import { homedir as homedir7 } from "node:os";
 import { join as join10 } from "node:path";
 function defaultOpenCodeDbPath() {
@@ -12275,7 +12288,7 @@ function defaultPiSessionsRoot() {
   return join10(homedir7(), ".pi", "agent", "sessions");
 }
 function defaultFs() {
-  return { existsSync: existsSync12, mkdirSync: mkdirSync4, writeFileSync: writeFileSync4, unlinkSync: unlinkSync2 };
+  return { existsSync: existsSync12, mkdirSync: mkdirSync5, writeFileSync: writeFileSync4, unlinkSync: unlinkSync2 };
 }
 function stmt(db, sql) {
   return db.prepare(sql);
@@ -146500,10 +146513,10 @@ var init_tool_owner_backfill = __esm(() => {
 });
 
 // ../plugin/src/features/magic-context/storage-db.ts
-import { chmodSync as chmodSync2, copyFileSync as copyFileSync2, cpSync, existsSync as existsSync15, mkdirSync as mkdirSync6, mkdtempSync } from "node:fs";
-import { dirname as dirname7, join as join13 } from "node:path";
+import { chmodSync as chmodSync2, copyFileSync as copyFileSync2, cpSync, existsSync as existsSync15, mkdirSync as mkdirSync7, mkdtempSync } from "node:fs";
+import { dirname as dirname8, join as join13 } from "node:path";
 function ensureSecureStorageDir(dir) {
-  mkdirSync6(dir, { recursive: true, mode: 448 });
+  mkdirSync7(dir, { recursive: true, mode: 448 });
   if (!PERMISSIONS_ENFORCEABLE)
     return;
   try {
@@ -146528,7 +146541,7 @@ function restrictDatabaseFilePermissions(dbPath) {
 }
 function resolveDatabasePath(dbPathOverride) {
   if (dbPathOverride) {
-    return { dbDir: dirname7(dbPathOverride), dbPath: dbPathOverride };
+    return { dbDir: dirname8(dbPathOverride), dbPath: dbPathOverride };
   }
   const testDataDir = process.env.MAGIC_CONTEXT_TEST_DATA_DIR;
   if (testDataDir && !process.env.XDG_DATA_HOME) {
@@ -164931,7 +164944,7 @@ var init_magic_context = __esm(() => {
 // ../plugin/src/config/variable.ts
 import { existsSync as existsSync16, readFileSync as readFileSync8 } from "node:fs";
 import { homedir as homedir9 } from "node:os";
-import { dirname as dirname8, isAbsolute as isAbsolute2, resolve as resolve2 } from "node:path";
+import { dirname as dirname9, isAbsolute as isAbsolute2, resolve as resolve2 } from "node:path";
 function sensitiveFilePathReason(resolvedPath) {
   const home = homedir9();
   const sensitiveDirs = [
@@ -164978,7 +164991,7 @@ function substituteConfigVariables(input) {
   if (fileMatches.length === 0) {
     return { text: text2, warnings };
   }
-  const configDir = input.configPath ? dirname8(input.configPath) : process.cwd();
+  const configDir = input.configPath ? dirname9(input.configPath) : process.cwd();
   let output = "";
   let cursor = 0;
   for (const match of fileMatches) {
@@ -165442,13 +165455,13 @@ var DEFAULT_TIMEOUT_MS = 1e4, MAX_PREVIEW_CHARS = 240;
 import {
   chmodSync as chmodSync3,
   existsSync as existsSync18,
-  mkdirSync as mkdirSync7,
+  mkdirSync as mkdirSync8,
   readFileSync as readFileSync10,
   renameSync as renameSync3,
   statSync as statSync6,
   writeFileSync as writeFileSync5
 } from "node:fs";
-import { dirname as dirname9, join as join14 } from "node:path";
+import { dirname as dirname10, join as join14 } from "node:path";
 function pluginEntryId(entry) {
   if (typeof entry === "string")
     return entry;
@@ -165495,7 +165508,7 @@ function resolveTuiConfigPath() {
     return jsoncPath;
   if (existsSync18(jsonPath))
     return jsonPath;
-  return jsonPath;
+  return jsoncPath;
 }
 function ensureTuiPluginEntry() {
   try {
@@ -165536,7 +165549,7 @@ function ensureTuiPluginEntry() {
       }
     }
     config2.plugin = plugins;
-    mkdirSync7(dirname9(configPath), { recursive: true });
+    mkdirSync8(dirname10(configPath), { recursive: true });
     writeTuiConfigAtomic(configPath, config2);
     log2(`[magic-context] updated TUI plugin entry in ${configPath}`);
     return true;
@@ -165721,6 +165734,12 @@ function redactionTypeForKey(key) {
   const suffix = normalized.split(".").filter(Boolean).at(-1) ?? normalized;
   return suffix || "secret";
 }
+function isNonSecretScalarValue(value) {
+  const v2 = value.trim();
+  if (v2 === "true" || v2 === "false" || v2 === "null" || v2 === "undefined")
+    return true;
+  return /^[+-]?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?$/.test(v2);
+}
 function isSecretKey(key) {
   const segments = key.replace(/([a-z0-9])([A-Z])/g, "$1_$2").toLowerCase().split(/[._-]+/).filter(Boolean);
   if (segments.length === 0)
@@ -165880,11 +165899,11 @@ var init_redaction = __esm(() => {
     },
     {
       pattern: /(["'])([^"']*(?:key|token|secret|password|auth|bearer|credential)[^"']*)\1(\s*:\s*)(["'])([^"']*)\4/gi,
-      replacement: (_full, quote, key, separator, valueQuote) => `${quote}${key}${quote}${separator}${valueQuote}<REDACTED:${redactionTypeForKey(key)}>${valueQuote}`
+      replacement: (full, quote, key, separator, valueQuote, value) => isNonSecretScalarValue(value) ? full : `${quote}${key}${quote}${separator}${valueQuote}<REDACTED:${redactionTypeForKey(key)}>${valueQuote}`
     },
     {
       pattern: /\b([A-Za-z0-9_.-]*(?:key|token|secret|password|auth|bearer|credential)[A-Za-z0-9_.-]*)\s*=\s*([^\s'"`]+)/gi,
-      replacement: (_full, key) => `${key}=<REDACTED:${redactionTypeForKey(key)}>`
+      replacement: (full, key, value) => isNonSecretScalarValue(value) ? full : `${key}=<REDACTED:${redactionTypeForKey(key)}>`
     }
   ];
 });
@@ -166382,7 +166401,7 @@ var init_diagnostics_opencode = __esm(() => {
 // src/lib/embedding-runtime.ts
 import { existsSync as existsSync20 } from "node:fs";
 import { createRequire as createRequire3 } from "node:module";
-import { dirname as dirname10, join as join16, sep } from "node:path";
+import { dirname as dirname11, join as join16, sep } from "node:path";
 function expectedBinaryRelPath(platform, arch) {
   const supportedPlatform = platform === "linux" || platform === "darwin" || platform === "win32";
   const supportedArch = arch === "x64" || arch === "arm64";
@@ -166426,7 +166445,7 @@ function checkLocalEmbeddingRuntime(installRoots, platform = process.platform, a
 function packageDirFromResolved(resolvedPath, packageName) {
   const marker = `node_modules${sep}${packageName.split("/").join(sep)}`;
   const idx = resolvedPath.indexOf(marker);
-  return idx >= 0 ? resolvedPath.slice(0, idx + marker.length) : dirname10(resolvedPath);
+  return idx >= 0 ? resolvedPath.slice(0, idx + marker.length) : dirname11(resolvedPath);
 }
 function checkLocalEmbeddingRuntimeByResolution(pluginDir, platform = process.platform, arch = process.arch) {
   if (!existsSync20(join16(pluginDir, "package.json"))) {
@@ -168454,10 +168473,10 @@ var init_logs_pi = __esm(() => {
 
 // src/commands/doctor-pi.ts
 import { execFileSync as execFileSync4, spawnSync as spawnSync3 } from "node:child_process";
-import { existsSync as existsSync24, mkdirSync as mkdirSync8, readdirSync as readdirSync4, readFileSync as readFileSync17, rmSync as rmSync3, statSync as statSync10 } from "node:fs";
+import { existsSync as existsSync24, mkdirSync as mkdirSync9, readdirSync as readdirSync4, readFileSync as readFileSync17, rmSync as rmSync3, statSync as statSync10 } from "node:fs";
 import { createRequire as createRequire6 } from "node:module";
 import { homedir as homedir15 } from "node:os";
-import { dirname as dirname11, isAbsolute as isAbsolute3, join as join21 } from "node:path";
+import { dirname as dirname12, isAbsolute as isAbsolute3, join as join21 } from "node:path";
 function depsFrom(options) {
   return {
     ...DEFAULT_DEPS,
@@ -168930,7 +168949,7 @@ async function runHealthChecks(options) {
   return { results, repairPlan, ...summarize(results) };
 }
 function writeDefaultMagicContextConfig(path6) {
-  mkdirSync8(dirname11(path6), { recursive: true });
+  mkdirSync9(dirname12(path6), { recursive: true });
   const config2 = {
     $schema: "https://raw.githubusercontent.com/cortexkit/magic-context/master/assets/magic-context.schema.json",
     ...MagicContextConfigSchema.parse({})

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cortexkit/magic-context",
-	"version": "0.27.0",
+	"version": "0.27.2",
 	"description": "Unified CLI for Magic Context — setup, doctor, and migration across OpenCode and Pi",
 	"keywords": [
 		"opencode",