@cortexkit/magic-context 0.21.4 → 0.21.6

package/dist/index.js

@@ -27378,6 +27378,21 @@ import { dirname as dirname7, isAbsolute, resolve as resolve2 } from "node:path"
 function substituteConfigVariables(input) {
   const warnings = [];
   let text2 = input.text;
+  if (input.isProjectConfig) {
+    const hasEnvTokens = ENV_PATTERN.test(text2);
+    const hasFileTokens = FILE_PATTERN.test(text2);
+    ENV_PATTERN.lastIndex = 0;
+    FILE_PATTERN.lastIndex = 0;
+    if (hasEnvTokens || hasFileTokens) {
+      const tokenTypes = [
+        hasEnvTokens ? "{env:}" : undefined,
+        hasFileTokens ? "{file:}" : undefined
+      ].filter(Boolean).join(" and ");
+      warnings.push(`Project-level config no longer supports ${tokenTypes} tokens for security reasons; leaving tokens literal. Move secret expansion to user-level config.`);
+    }
+    return { text: text2, warnings };
+  }
+  text2 = stripJsonComments(text2);
   text2 = text2.replace(ENV_PATTERN, (_, rawName) => {
     const varName = rawName.trim();
     const value = varName ? process.env[varName] : undefined;
@@ -27385,7 +27400,7 @@ function substituteConfigVariables(input) {
       warnings.push(`Environment variable ${varName} is not set (referenced via {env:${varName}}); using empty string`);
       return "";
     }
-    return value;
+    return JSON.stringify(value).slice(1, -1);
   });
   const fileMatches = Array.from(text2.matchAll(FILE_PATTERN));
   if (fileMatches.length === 0) {
@@ -27432,6 +27447,7 @@ function substituteConfigVariables(input) {
 }
 var ENV_PATTERN, FILE_PATTERN;
 var init_variable = __esm(() => {
+  init_jsonc_parser();
   ENV_PATTERN = /\{env:([^}]+)\}/g;
   FILE_PATTERN = /\{file:([^}]+)\}/g;
 });
@@ -27447,13 +27463,17 @@ function getUserConfigBasePath() {
 function getProjectConfigBasePath(directory) {
   return join11(directory, ".opencode", CONFIG_FILE_BASENAME);
 }
-function loadConfigFile(configPath) {
+function loadConfigFile(configPath, isProjectConfig = false) {
   try {
     if (!existsSync13(configPath)) {
       return null;
     }
     const rawText = readFileSync8(configPath, "utf-8");
-    const substituted = substituteConfigVariables({ text: rawText, configPath });
+    const substituted = substituteConfigVariables({
+      text: rawText,
+      configPath,
+      isProjectConfig
+    });
     return {
       config: parseJsonc3(substituted.text),
       warnings: substituted.warnings.map((w3) => `${configPath}: ${w3}`)
@@ -27617,7 +27637,7 @@ function loadPluginConfig(directory) {
   const dotOpenCodeDetected = detectConfigFile(getProjectConfigBasePath(directory));
   const projectDetected = rootDetected.format !== "none" ? rootDetected : dotOpenCodeDetected;
   const userLoaded = userDetected.format === "none" ? null : loadConfigFile(userDetected.path);
-  const projectLoaded = projectDetected.format === "none" ? null : loadConfigFile(projectDetected.path);
+  const projectLoaded = projectDetected.format === "none" ? null : loadConfigFile(projectDetected.path, true);
   const allWarnings = [];
   let mergedRaw = {};
   if (userLoaded) {
@@ -28543,6 +28563,91 @@ var init_diagnostics_opencode = __esm(() => {
   PLUGIN_ENTRY_WITH_VERSION = `${PLUGIN_NAME5}@latest`;
 });
 
+// src/lib/issue-body.ts
+function isErrorLogLine(line) {
+  return ERROR_LOG_PATTERNS.some((rx) => rx.test(line));
+}
+function extractRecentErrors(sanitized, limit = 20) {
+  const matches = [];
+  const lines = sanitized.split(/\r?\n/);
+  for (let i = lines.length - 1;i >= 0 && matches.length < limit; i -= 1) {
+    if (isErrorLogLine(lines[i])) {
+      matches.push(lines[i]);
+    }
+  }
+  return matches.reverse();
+}
+function capBodyToGithubLimit(body, maxBytes = MAX_GITHUB_BODY_BYTES) {
+  if (Buffer.byteLength(body, "utf8") <= maxBytes)
+    return body;
+  const heading = "## Log (last";
+  const headingIdx = body.indexOf(heading);
+  if (headingIdx === -1) {
+    const marker = `
+
+[truncated for GitHub 64KB limit]
+`;
+    const markerBytes2 = Buffer.byteLength(marker, "utf8");
+    return truncateToByteBudget(body, maxBytes - markerBytes2) + marker;
+  }
+  const fenceOpenIdx = body.indexOf("\n```", headingIdx);
+  if (fenceOpenIdx === -1)
+    return body;
+  const logStart = fenceOpenIdx + "\n```\n".length;
+  const fenceCloseIdx = body.indexOf("\n```", logStart);
+  if (fenceCloseIdx === -1)
+    return body;
+  const head = body.slice(0, logStart);
+  const log3 = body.slice(logStart, fenceCloseIdx);
+  const tail = body.slice(fenceCloseIdx);
+  const overheadBytes = Buffer.byteLength(head, "utf8") + Buffer.byteLength(tail, "utf8");
+  const truncationMarker = `[truncated for GitHub 64KB limit — older log lines dropped]
+`;
+  const markerBytes = Buffer.byteLength(truncationMarker, "utf8");
+  const logBudget = maxBytes - overheadBytes - markerBytes;
+  if (logBudget <= 0) {
+    return `${head}${truncationMarker}${tail}`;
+  }
+  const lines = log3.split(`
+`);
+  let keepLines = lines;
+  let kept = keepLines.join(`
+`);
+  while (Buffer.byteLength(kept, "utf8") > logBudget && keepLines.length > 1) {
+    const dropCount = Math.max(1, Math.floor(keepLines.length * 0.05));
+    keepLines = keepLines.slice(dropCount);
+    kept = keepLines.join(`
+`);
+  }
+  if (Buffer.byteLength(kept, "utf8") > logBudget) {
+    kept = truncateToByteBudget(kept, logBudget);
+  }
+  return `${head}${truncationMarker}${kept}${tail}`;
+}
+function truncateToByteBudget(input, maxBytes) {
+  if (maxBytes <= 0)
+    return "";
+  const buf = Buffer.from(input, "utf8");
+  if (buf.length <= maxBytes)
+    return input;
+  let end = maxBytes;
+  while (end > 0 && (buf[end] & 192) === 128) {
+    end -= 1;
+  }
+  return buf.subarray(0, end).toString("utf8");
+}
+var MAX_GITHUB_BODY_BYTES = 60000, ERROR_LOG_PATTERNS;
+var init_issue_body = __esm(() => {
+  ERROR_LOG_PATTERNS = [
+    /\bfailed:/i,
+    /\b(?:[A-Z][a-zA-Z]*)?Error:\s/,
+    /\bEMERGENCY\b/,
+    /\bexception\b/i,
+    /^\s+at\s+[\w.<>$]+\s+\(/,
+    /^\s+at\s+(?:file:|node_modules\/|[^/\s]+:\d+)/
+  ];
+});
+
 // src/lib/logs-opencode.ts
 import { readFileSync as readFileSync12, writeFileSync as writeFileSync9 } from "node:fs";
 import { homedir as homedir12 } from "node:os";
@@ -28595,9 +28700,12 @@ async function bundleIssueReport(report, description, _title, sessionFilter = nu
   const historianScanWindow = sanitizeLogContent(logLines.slice(-4000).join(`
 `));
   const historianFailureLines = extractHistorianFailureLines(historianScanWindow, 30);
+  const errorScanWindow = sanitizeLogContent(logLines.slice(-4000).join(`
+`));
+  const recentErrorLines = extractRecentErrors(errorScanWindow, 20);
   const configBody = JSON.stringify(sanitizeConfigValue(report.magicContextConfig.flags), null, 2);
   const sanitizedConfigPath = report.configPaths.magicContextConfig.replace(homedir12(), "~");
-  const bodyMarkdown = [
+  const rawBodyMarkdown = [
     "## Description",
     description,
     "",
@@ -28619,6 +28727,11 @@ async function bundleIssueReport(report, description, _title, sessionFilter = nu
     "## Historian failure signals (log, sanitized)",
     historianFailureLines.length === 0 ? "_No historian failure log lines found in recent history._" : ["```", historianFailureLines.join(`
 `), "```"].join(`
+`),
+    "",
+    "## Recent errors (last 20, sanitized)",
+    recentErrorLines.length === 0 ? "_No error-shaped log lines found in recent history._" : ["```", recentErrorLines.join(`
+`), "```"].join(`
 `),
     "",
     `## Log (last ${LOG_TAIL_LINES} lines, sanitized)`,
@@ -28627,6 +28740,7 @@ async function bundleIssueReport(report, description, _title, sessionFilter = nu
     "```"
   ].join(`
 `);
+  const bodyMarkdown = capBodyToGithubLimit(rawBodyMarkdown);
   const path4 = join15(process.cwd(), `magic-context-issue-${formatTimestamp(new Date)}.md`);
   writeFileSync9(path4, `${bodyMarkdown}
 `);
@@ -28635,6 +28749,7 @@ async function bundleIssueReport(report, description, _title, sessionFilter = nu
 var HISTORIAN_LOG_PATTERNS;
 var init_logs_opencode = __esm(() => {
   init_diagnostics_opencode();
+  init_issue_body();
   init_redaction();
   HISTORIAN_LOG_PATTERNS = [
     /historian failure:/,
@@ -162015,8 +162130,10 @@ function deleteOrphanProjectKeyFiles(db, now = Date.now()) {
     if (existsSync18(row.projectPath))
       continue;
     try {
-      db.prepare("DELETE FROM project_key_files WHERE project_path = ?").run(row.projectPath);
-      db.prepare("DELETE FROM project_key_files_version WHERE project_path = ?").run(row.projectPath);
+      db.transaction(() => {
+        db.prepare("DELETE FROM project_key_files WHERE project_path = ?").run(row.projectPath);
+        db.prepare("DELETE FROM project_key_files_version WHERE project_path = ?").run(row.projectPath);
+      })();
       deletedProjects++;
     } catch (error51) {
       log2(`[key-files] orphan GC failed for ${row.projectPath}:`, error51);
@@ -162044,7 +162161,7 @@ function getCurrentVersion(db) {
   const row = db.prepare("SELECT MAX(version) as version FROM schema_migrations").get();
   return row?.version ?? 0;
 }
-function isSiblingMigrationConflict(error51, version2) {
+function isSiblingMigrationConflict(db, error51, version2) {
   if (!(error51 instanceof Error))
     return false;
   const code = error51.code;
@@ -162056,7 +162173,8 @@ function isSiblingMigrationConflict(error51, version2) {
     return false;
   if (!msg.toLowerCase().includes("version"))
     return false;
-  return true;
+  const confirmed = db.prepare("SELECT 1 FROM schema_migrations WHERE version = ?").get(version2);
+  return confirmed != null;
 }
 function runMigrations(db) {
   ensureMigrationsTable(db);
@@ -162077,7 +162195,7 @@ function runMigrations(db) {
       log2(`[migrations] applied v${migration.version}: ${migration.description}`);
       migrationIndex += 1;
     } catch (error51) {
-      if (isSiblingMigrationConflict(error51, migration.version)) {
+      if (isSiblingMigrationConflict(db, error51, migration.version)) {
         log2(`[migrations] v${migration.version} already applied by sibling instance — resuming with re-read version`);
         const reReadVersion = getCurrentVersion(db);
         if (reReadVersion <= currentVersion) {
@@ -162483,6 +162601,16 @@ var init_migrations = __esm(async () => {
                 WHERE auto_search_hint_decisions IS NULL
             `);
       }
+    },
+    {
+      version: 18,
+      description: "Add pending_pi_compaction_marker_state column for Pi deferred marker drain",
+      up: (db) => {
+        const cols = db.prepare("PRAGMA table_info(session_meta)").all();
+        if (!cols.some((c2) => c2.name === "pending_pi_compaction_marker_state")) {
+          db.exec("ALTER TABLE session_meta ADD COLUMN pending_pi_compaction_marker_state TEXT");
+        }
+      }
     }
   ];
 });
@@ -163046,6 +163174,11 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       -- Excluded from healNullTextColumns. Readers filter IS NOT NULL AND
       -- != empty-string defensively. Plan v6 section 3.
       pending_compaction_marker_state TEXT,
+      -- pending_pi_compaction_marker_state: intentionally NULLABLE without a
+      -- default. Absence of a deferred Pi-native marker is SQL NULL; presence
+      -- is a valid JSON blob written via setPendingPiCompactionMarkerState.
+      -- Excluded from healNullTextColumns.
+      pending_pi_compaction_marker_state TEXT,
       -- deferred_execute_state: intentionally NULLABLE without a default.
       -- Absence is SQL NULL; presence is a JSON blob written via
       -- setDeferredExecutePendingIfAbsent. Excluded from healNullTextColumns.
@@ -163142,6 +163275,7 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "detected_context_limit", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "needs_emergency_recovery", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "pending_compaction_marker_state", "TEXT");
+  ensureColumn(db, "session_meta", "pending_pi_compaction_marker_state", "TEXT");
   ensureColumn(db, "session_meta", "deferred_execute_state", "TEXT");
   ensureColumn(db, "tags", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
   ensureColumn(db, "pending_ops", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
@@ -163969,7 +164103,10 @@ async function bundleIssueReport2(report, description, title, options = {}) {
   const logLines = filterLogLinesBySession2(allLogLines, options.sessionFilter ?? null);
   const recentLog = sanitizeLogContent2(logLines.slice(-LOG_TAIL_LINES).join(`
 `)).trim();
-  const bodyMarkdown = [
+  const errorScanWindow = sanitizeLogContent2(logLines.slice(-4000).join(`
+`));
+  const recentErrorLines = extractRecentErrors(errorScanWindow, 20);
+  const rawBodyMarkdown = [
     "## Title",
     `[pi] ${sanitizeString2(title)}`,
     "",
@@ -163984,6 +164121,11 @@ async function bundleIssueReport2(report, description, title, options = {}) {
     "",
     "## Diagnostics",
     renderDiagnosticsMarkdown2(report),
+    "",
+    "## Recent errors (last 20, sanitized)",
+    recentErrorLines.length === 0 ? "_No error-shaped log lines found in recent history._" : ["```", recentErrorLines.join(`
+`), "```"].join(`
+`),
     "",
     `## Log (last ${LOG_TAIL_LINES} lines, sanitized)`,
     "```",
@@ -163991,6 +164133,7 @@ async function bundleIssueReport2(report, description, title, options = {}) {
     "```"
   ].join(`
 `);
+  const bodyMarkdown = capBodyToGithubLimit(rawBodyMarkdown);
   const cwd = options.cwd ?? process.cwd();
   const path4 = join21(cwd, `magic-context-pi-issue-${formatTimestamp2(options.now ?? new Date)}.md`);
   writeFileSync11(path4, `${bodyMarkdown}
@@ -163999,6 +164142,7 @@ async function bundleIssueReport2(report, description, title, options = {}) {
 }
 var init_logs_pi = __esm(() => {
   init_diagnostics_pi();
+  init_issue_body();
 });
 
 // src/commands/doctor-pi.ts

package/package.json

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