@cortexkit/magic-context 0.49.1 → 0.49.2

package/dist/index.js

@@ -45104,6 +45104,151 @@ var init_log_lines = __esm(() => {
   LEVEL_DEFAULT = LEVEL_ORDER.INFO;
 });
 
+// src/lib/issue-body.ts
+function isErrorLogLine(line) {
+  const parsed = parseLogLine(line);
+  if (parsed?.level !== null && parsed?.level !== undefined) {
+    return parsed.level === "ERROR" || parsed.level === "WARN";
+  }
+  if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/.test(line))
+    return false;
+  const message = parsed?.message ?? line;
+  return ERROR_LOG_PATTERNS.some((rx) => rx.test(message));
+}
+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 filterLogLinesBySession(lines, sessionId) {
+  if (!sessionId)
+    return lines;
+  const otherSessionPattern = /\bses_[A-Za-z0-9]{3,64}\b/g;
+  return lines.filter((line) => {
+    const parsed = parseLogLine(line);
+    if (parsed?.session && parsed.session !== sessionId)
+      return false;
+    const matches = parsed?.message.match(otherSessionPattern) ?? line.match(otherSessionPattern);
+    if (!matches)
+      return true;
+    return matches.every((id) => id === sessionId);
+  });
+}
+function getLogSessionIds(lines) {
+  const otherSessionPattern = /\bses_[A-Za-z0-9]{3,64}\b/g;
+  const seen = new Set;
+  const sessions = [];
+  for (let index = lines.length - 1;index >= 0; index -= 1) {
+    const line = lines[index];
+    const parsed = parseLogLine(line);
+    if (parsed?.session && !seen.has(parsed.session)) {
+      seen.add(parsed.session);
+      sessions.push(parsed.session);
+    }
+    const matches = parsed?.message.match(otherSessionPattern) ?? line.match(otherSessionPattern);
+    for (const session of matches ?? []) {
+      if (!seen.has(session)) {
+        seen.add(session);
+        sessions.push(session);
+      }
+    }
+  }
+  return sessions;
+}
+function capBodyToGithubLimit(body, maxBytes = MAX_GITHUB_BODY_BYTES) {
+  if (Buffer.byteLength(body, "utf8") <= maxBytes)
+    return body;
+  let capped = body;
+  const heading = "## Log (last";
+  const headingIdx = body.indexOf(heading);
+  if (headingIdx === -1) {
+    const markerBytes = Buffer.byteLength(FALLBACK_TRUNCATION_MARKER, "utf8");
+    capped = truncateToByteBudget(body, maxBytes - markerBytes) + FALLBACK_TRUNCATION_MARKER;
+    return enforceFinalBodyLimit(capped, maxBytes);
+  }
+  const fenceOpenIdx = body.indexOf("\n```", headingIdx);
+  if (fenceOpenIdx === -1)
+    return enforceFinalBodyLimit(body, maxBytes);
+  const logStart = fenceOpenIdx + "\n```\n".length;
+  const fenceCloseIdx = body.indexOf("\n```", logStart);
+  if (fenceCloseIdx === -1)
+    return enforceFinalBodyLimit(body, maxBytes);
+  const head = body.slice(0, logStart);
+  const log = body.slice(logStart, fenceCloseIdx);
+  const tail = body.slice(fenceCloseIdx);
+  const overheadBytes = Buffer.byteLength(head, "utf8") + Buffer.byteLength(tail, "utf8");
+  const markerBytes = Buffer.byteLength(LOG_TRUNCATION_MARKER, "utf8");
+  const logBudget = maxBytes - overheadBytes - markerBytes;
+  if (logBudget <= 0) {
+    capped = `${head}${LOG_TRUNCATION_MARKER}${tail}`;
+    return enforceFinalBodyLimit(capped, maxBytes);
+  }
+  const lines = log.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);
+  }
+  capped = `${head}${LOG_TRUNCATION_MARKER}${kept}${tail}`;
+  return enforceFinalBodyLimit(capped, maxBytes);
+}
+function enforceFinalBodyLimit(body, maxBytes) {
+  if (Buffer.byteLength(body, "utf8") <= maxBytes)
+    return body;
+  const markerBytes = Buffer.byteLength(FINAL_TRUNCATION_MARKER, "utf8");
+  if (markerBytes >= maxBytes) {
+    return truncateToByteBudget(FINAL_TRUNCATION_MARKER, maxBytes);
+  }
+  return truncateToByteBudget(body, maxBytes - markerBytes) + FINAL_TRUNCATION_MARKER;
+}
+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, LOG_TRUNCATION_MARKER = `[truncated for GitHub 64KB limit — older log lines dropped]
+`, FINAL_TRUNCATION_MARKER = `
+
+[truncated further to fit GitHub body limit]
+`, FALLBACK_TRUNCATION_MARKER = `
+
+[truncated for GitHub 64KB limit]
+`, ERROR_LOG_PATTERNS;
+var init_issue_body = __esm(() => {
+  init_log_lines();
+  ERROR_LOG_PATTERNS = [
+    /\bfailed:/i,
+    /\b(?:[A-Z][a-zA-Z]*)?Error:\s/,
+    /\bEMERGENCY\b/,
+    /could not safely prepare this turn/i,
+    /\bMC-H[A-Z0-9-]+\b/i,
+    /\brefused\s*\(/i,
+    /\bexception\b/i,
+    /^\s+at\s+[\w.<>$]+\s+\(/,
+    /^\s+at\s+(?:file:|node_modules\/|[^/\s]+:\d+)/
+  ];
+});
+
 // src/lib/redaction.ts
 function sanitizeDiagnosticEndpoint(value) {
   const trimmed = value.trim();
@@ -45193,6 +45338,8 @@ function pluginDeclaresOmp(path) {
 }
 async function runHealthChecks(options) {
   const results = [];
+  let pluginVersion = null;
+  let ompVersion = null;
   const repairPlan = {
     installPlugin: false,
     disableCompaction: false,
@@ -45204,11 +45351,13 @@ async function runHealthChecks(options) {
     add(results, "fail", "OMP binary not found on PATH or in standard user bin directories");
   } else {
     const version = options.deps.getOmpVersion(omp.path);
+    ompVersion = version;
     const plugins = options.deps.listOmpPlugins(omp.path);
     if (!plugins) {
       add(results, "fail", "`omp plugin list --json` failed or returned invalid JSON");
     } else {
       const plugin = plugins.find((entry) => entry.name === OMP_PLUGIN_PACKAGE);
+      pluginVersion = plugin?.version ?? null;
       if (!plugin) {
         add(results, "info", `${version ? `Oh My Pi ${version}` : "Oh My Pi"} found; Magic Context is not installed there (run setup to add it)`);
         repairPlan.installPlugin = true;
@@ -45335,6 +45484,9 @@ ${formatDatabaseRepairGuidance(dbPath)}`);
   return {
     results,
     repairPlan,
+    pluginVersion,
+    ompVersion,
+    logFiles,
     pass: results.filter((result) => result.status === "pass").length,
     warn: results.filter((result) => result.status === "warn").length,
     fail: results.filter((result) => result.status === "fail").length
@@ -45388,17 +45540,51 @@ async function repair(plan, deps, prompts, cwd) {
 function timestamp2(date) {
   return date.toISOString().replace(/[-:]/g, "").replace(/\.\d{3}Z$/, "Z");
 }
-function ompIssueBody(description, report) {
+function ompIssueBody(description, report, logLines, sessionFilter) {
+  const LOG_TAIL_LINES = 400;
+  const filteredLogLines = filterLogLinesBySession(logLines, sessionFilter);
+  const recentLog = sanitizeDiagnosticText(filteredLogLines.slice(-LOG_TAIL_LINES).join(`
+`)).trim();
+  const errorScanWindow = sanitizeDiagnosticText(filteredLogLines.slice(-4000).join(`
+`));
+  const recentErrorLines = extractRecentErrors(errorScanWindow, 20);
   return [
     "## Description",
     sanitizeDiagnosticText(description),
     "",
+    "## Environment",
+    `- Magic Context plugin: ${report.pluginVersion ? `v${sanitizeDiagnosticText(report.pluginVersion)}` : "not installed"}`,
+    `- Oh My Pi: ${report.ompVersion ? sanitizeDiagnosticText(report.ompVersion) : "not detected"}`,
+    `- OS: ${process.platform} ${process.arch}`,
+    `- Runtime: Node.js ${process.version}`,
+    "",
     "## OMP diagnostics",
-    `- Magic Context CLI: ${selfVersion()}`,
-    ...report.results.map((result) => `- ${result.status.toUpperCase()}: ${sanitizeDiagnosticText(result.message)}`)
+    `- Magic Context CLI: v${selfVersion()}`,
+    ...report.results.map((result) => `- ${result.status.toUpperCase()}: ${sanitizeDiagnosticText(result.message)}`),
+    "",
+    "## 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)`,
+    "```",
+    recentLog || "<no log output>",
+    "```"
   ].join(`
 `);
 }
+function writeOmpIssueReport(path, fullBodyMarkdown) {
+  const bodyMarkdown = capBodyToGithubLimit(fullBodyMarkdown);
+  const truncated = bodyMarkdown !== fullBodyMarkdown;
+  writeFileAtomic(path, `${bodyMarkdown}
+`);
+  const fullPath = truncated ? `${path}.full.md` : undefined;
+  if (fullPath)
+    writeFileAtomic(fullPath, `${fullBodyMarkdown}
+`);
+  return { path, bodyMarkdown, ...fullPath ? { fullPath } : {}, truncated };
+}
 function runGhCommandWithDeps(deps, args) {
   if (args[0] === "issue") {
     const result = deps.spawnSync("gh", args, {
@@ -45432,9 +45618,8 @@ async function runIssueFlow(options) {
   if (options.reportPath) {
     const report = await runHealthChecks({ ...options, quiet: true });
     const path = isAbsolute8(options.reportPath) ? options.reportPath : join33(options.cwd, options.reportPath);
-    writeFileAtomic(path, `${ompIssueBody("Generated non-interactively by `doctor --issue --report`.", report)}
-`);
-    options.prompts.log.success(`Sanitized report written to ${path}`);
+    const bundle = writeOmpIssueReport(path, ompIssueBody("Generated non-interactively by `doctor --issue --report`.", report, readLogLines(report.logFiles), null));
+    options.prompts.log.success(bundle.fullPath ? `Sanitized report written to ${bundle.path}; full report at ${bundle.fullPath}` : `Sanitized report written to ${bundle.path}`);
     return 0;
   }
   const title = await options.prompts.text("Issue title", {
@@ -45446,19 +45631,31 @@ async function runIssueFlow(options) {
     validate: (value) => value.trim() ? undefined : "Description is required"
   });
   const report = await runHealthChecks({ ...options, quiet: true });
+  const logLines = readLogLines(report.logFiles);
+  const sessionIds = getLogSessionIds(logLines);
+  let sessionFilter = null;
+  if (sessionIds.length > 1) {
+    const choice = await options.prompts.selectOne("Which OMP session is this issue about? (filters log lines from other sessions)", [
+      ...sessionIds.map((sessionId, index) => ({
+        label: `${sessionId}${index === 0 ? " (most recent)" : ""}`,
+        value: sessionId
+      })),
+      { label: "All sessions (no filtering)", value: "__all__" }
+    ]);
+    sessionFilter = choice === "__all__" ? null : choice;
+  }
   const path = join33(options.cwd, `magic-context-omp-issue-${timestamp2(options.deps.now())}.md`);
-  writeFileAtomic(path, `${ompIssueBody(description, report)}
-`);
-  options.prompts.log.success(`Sanitized report written to ${path}`);
+  const bundle = writeOmpIssueReport(path, ompIssueBody(description, report, logLines, sessionFilter));
+  options.prompts.log.success(bundle.fullPath ? `Sanitized report written to ${bundle.path}; full report at ${bundle.fullPath}` : `Sanitized report written to ${bundle.path}`);
   if (await options.prompts.confirm("Submit this issue on GitHub now?", false)) {
-    const result = submitGithubIssue(`[omp] ${title}`, path, (args) => runGhCommandWithDeps(options.deps, args));
+    const result = submitGithubIssue(`[omp] ${title}`, bundle.path, (args) => runGhCommandWithDeps(options.deps, args));
     if (result.ok) {
       options.prompts.log.success(result.output);
     } else {
-      options.prompts.log.warn(formatGithubIssueFallback(result, path));
+      options.prompts.log.warn(formatGithubIssueFallback(result, bundle.fullPath ?? bundle.path));
     }
   }
-  options.prompts.log.info(`Open https://github.com/cortexkit/magic-context/issues/new and drag ${path} into the issue`);
+  options.prompts.log.info(`Open https://github.com/cortexkit/magic-context/issues/new and drag ${bundle.fullPath ?? bundle.path} into the issue`);
   return 0;
 }
 async function runDoctor(options = {}) {
@@ -45499,6 +45696,7 @@ var init_doctor_omp = __esm(async () => {
   init_atomic_write();
   init_config_location_migration();
   init_github_issue();
+  init_issue_body();
   init_log_lines();
   init_omp_helpers();
   init_paths();
@@ -47576,113 +47774,6 @@ var init_embedding_runtime = __esm(() => {
   runOnnxRuntimeNodeLoadProbeChildForRuntime = runOnnxRuntimeNodeLoadProbeChild;
 });
 
-// src/lib/issue-body.ts
-function isErrorLogLine(line) {
-  const parsed = parseLogLine(line);
-  if (parsed?.level !== null && parsed?.level !== undefined) {
-    return parsed.level === "ERROR" || parsed.level === "WARN";
-  }
-  if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/.test(line))
-    return false;
-  const message = parsed?.message ?? line;
-  return ERROR_LOG_PATTERNS.some((rx) => rx.test(message));
-}
-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;
-  let capped = body;
-  const heading = "## Log (last";
-  const headingIdx = body.indexOf(heading);
-  if (headingIdx === -1) {
-    const markerBytes = Buffer.byteLength(FALLBACK_TRUNCATION_MARKER, "utf8");
-    capped = truncateToByteBudget(body, maxBytes - markerBytes) + FALLBACK_TRUNCATION_MARKER;
-    return enforceFinalBodyLimit(capped, maxBytes);
-  }
-  const fenceOpenIdx = body.indexOf("\n```", headingIdx);
-  if (fenceOpenIdx === -1)
-    return enforceFinalBodyLimit(body, maxBytes);
-  const logStart = fenceOpenIdx + "\n```\n".length;
-  const fenceCloseIdx = body.indexOf("\n```", logStart);
-  if (fenceCloseIdx === -1)
-    return enforceFinalBodyLimit(body, maxBytes);
-  const head = body.slice(0, logStart);
-  const log = body.slice(logStart, fenceCloseIdx);
-  const tail = body.slice(fenceCloseIdx);
-  const overheadBytes = Buffer.byteLength(head, "utf8") + Buffer.byteLength(tail, "utf8");
-  const markerBytes = Buffer.byteLength(LOG_TRUNCATION_MARKER, "utf8");
-  const logBudget = maxBytes - overheadBytes - markerBytes;
-  if (logBudget <= 0) {
-    capped = `${head}${LOG_TRUNCATION_MARKER}${tail}`;
-    return enforceFinalBodyLimit(capped, maxBytes);
-  }
-  const lines = log.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);
-  }
-  capped = `${head}${LOG_TRUNCATION_MARKER}${kept}${tail}`;
-  return enforceFinalBodyLimit(capped, maxBytes);
-}
-function enforceFinalBodyLimit(body, maxBytes) {
-  if (Buffer.byteLength(body, "utf8") <= maxBytes)
-    return body;
-  const markerBytes = Buffer.byteLength(FINAL_TRUNCATION_MARKER, "utf8");
-  if (markerBytes >= maxBytes) {
-    return truncateToByteBudget(FINAL_TRUNCATION_MARKER, maxBytes);
-  }
-  return truncateToByteBudget(body, maxBytes - markerBytes) + FINAL_TRUNCATION_MARKER;
-}
-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, LOG_TRUNCATION_MARKER = `[truncated for GitHub 64KB limit — older log lines dropped]
-`, FINAL_TRUNCATION_MARKER = `
-
-[truncated further to fit GitHub body limit]
-`, FALLBACK_TRUNCATION_MARKER = `
-
-[truncated for GitHub 64KB limit]
-`, ERROR_LOG_PATTERNS;
-var init_issue_body = __esm(() => {
-  init_log_lines();
-  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 { mkdirSync as mkdirSync7, writeFileSync as writeFileSync7 } from "node:fs";
 import { dirname as dirname24, join as join37 } from "node:path";
@@ -47715,20 +47806,6 @@ function extractHistorianFailureLines(sanitized, limit = 30) {
   }
   return matches.reverse();
 }
-function filterLogLinesBySession(lines, sessionId) {
-  if (!sessionId)
-    return lines;
-  const otherSessionPattern = /\bses_[A-Za-z0-9]{3,64}\b/g;
-  return lines.filter((line) => {
-    const parsed = parseLogLine(line);
-    if (parsed?.session && parsed.session !== sessionId)
-      return false;
-    const matches = parsed?.message.match(otherSessionPattern) ?? line.match(otherSessionPattern);
-    if (!matches)
-      return true;
-    return matches.every((id) => id === sessionId);
-  });
-}
 async function bundleIssueReport(report, description, title, sessionFilter = null, options = {}) {
   const LOG_TAIL_LINES = 400;
   const allLogLines = readLogLines(report.logFiles ?? [report.logFile]);
@@ -50610,24 +50687,10 @@ function formatTimestamp2(date) {
     pad(date.getSeconds())
   ].join("");
 }
-function filterLogLinesBySession2(lines, sessionId) {
-  if (!sessionId)
-    return lines;
-  const otherSessionPattern = /\bses_[A-Za-z0-9]{3,64}\b/g;
-  return lines.filter((line) => {
-    const parsed = parseLogLine(line);
-    if (parsed?.session && parsed.session !== sessionId)
-      return false;
-    const matches = parsed?.message.match(otherSessionPattern) ?? line.match(otherSessionPattern);
-    if (!matches)
-      return true;
-    return matches.every((id) => id === sessionId);
-  });
-}
 async function bundleIssueReport2(report, description, title, options = {}) {
   const LOG_TAIL_LINES = 400;
   const allLogLines = readLogLines(report.logFiles ?? [report.logFile]);
-  const logLines = filterLogLinesBySession2(allLogLines, options.sessionFilter ?? null);
+  const logLines = filterLogLinesBySession(allLogLines, options.sessionFilter ?? null);
   const recentLog = sanitizeLogContent2(logLines.slice(-LOG_TAIL_LINES).join(`
 `)).trim();
   const errorScanWindow = sanitizeLogContent2(logLines.slice(-4000).join(`

package/package.json

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