@cortexkit/magic-context 0.49.7 → 0.49.8

package/dist/index.js

@@ -1949,7 +1949,7 @@ var init_redaction = __esm(() => {
       replacement: "<GITHUB_PAT_REDACTED>"
     },
     {
-      pattern: /\b(?:gh[opsu]|ghr)_[A-Za-z0-9]{30,}/g,
+      pattern: /\b(?:gh[opsu]|ghr)_[A-Za-z0-9_-]{30,}/g,
       replacement: "<GITHUB_TOKEN_REDACTED>"
     },
     {
@@ -1980,6 +1980,10 @@ var init_redaction = __esm(() => {
       pattern: /\b((?:x-)?(?:api-?key|api-?token|auth-?token|access-?token)\s*:\s*)([^\s'"`,;<>]{6,})/gi,
       replacement: (full, prefix, value) => isNonSecretScalarValue(value) ? full : `${prefix}<REDACTED:api_key>`
     },
+    {
+      pattern: /\b((?:api[_-]?key|client[_-]?secret|access[_-]?token|token|secret|password|passwd|pwd)\s*:\s*)([^\s'"`,;<>]{6,})/gi,
+      replacement: (full, prefix, value) => isNonSecretScalarValue(value) ? full : `${prefix}<REDACTED:credential>`
+    },
     {
       pattern: /\b([a-z][a-z0-9+.-]*:\/\/[^\s/:@]+:)([^\s/@]+)(@)/gi,
       replacement: (_full, prefix, _password, at) => `${prefix}<REDACTED:password>${at}`
@@ -8572,6 +8576,7 @@ function nextOccurrence(cron, after, excludeCivilMinute, maxSearchMs = MAX_SEARC
   let cursorMs = Math.floor(afterMs / MINUTE_MS) * MINUTE_MS + MINUTE_MS;
   const capMs = afterMs + Math.max(0, Math.min(MAX_SEARCH_MS, maxSearchMs));
   while (cursorMs <= capMs) {
+    candidateVisitsForTests?.();
     const candidate = new Date(cursorMs);
     if (matchesCron(cron, candidate)) {
       if (!excludeCivilMinute || civilMinuteKey(candidate) !== excludeCivilMinute) {
@@ -8592,7 +8597,7 @@ function nextDueAtMs(expression, afterMs, consumedScheduledAtMs, maxSearchMs = M
   const next = nextOccurrence(parsed.cron, new Date(afterMs), exclude, maxSearchMs);
   return next ? next.getTime() : null;
 }
-var FIELDS, MINUTE_MS = 60000, MAX_SEARCH_MS, MAX_DAYS_IN_MONTH;
+var FIELDS, MINUTE_MS = 60000, MAX_SEARCH_MS, candidateVisitsForTests, MAX_DAYS_IN_MONTH;
 var init_cron = __esm(() => {
   FIELDS = [
     { name: "minute", min: 0, max: 59 },
@@ -12817,6 +12822,7 @@ __export(exports_sqlite, {
   getSqliteMemoryStats: () => getSqliteMemoryStats,
   getTagIdentityWriteGeneration: () => getTagIdentityWriteGeneration,
   guardSqliteTransformPass: () => guardSqliteTransformPass,
+  inRootAsyncContext: () => inRootAsyncContext,
   indexCoordinationInput: () => indexCoordinationInput,
   isTransientSqliteError: () => isTransientSqliteError,
   loadSqliteModule: () => loadSqliteModule,
@@ -12833,8 +12839,11 @@ __export(exports_sqlite, {
   withoutSqliteTransformPass: () => withoutSqliteTransformPass,
   yieldIndexChunk: () => yieldIndexChunk
 });
-import { AsyncLocalStorage } from "node:async_hooks";
+import { AsyncLocalStorage, AsyncResource } from "node:async_hooks";
 import { statSync as statSync4 } from "node:fs";
+function inRootAsyncContext(operation) {
+  return resourceRoot.runInAsyncScope(operation);
+}
 function registerSlowWriteReporter(reporter) {
   reportSlowPrivilegedWrite = reporter;
 }
@@ -12988,7 +12997,7 @@ function installTransactionRouting(db, readonly) {
         return endWriterTransaction(db, () => nativeExec(sql), sql);
       if (!/^\s*(?:SELECT|EXPLAIN|PRAGMA|COMMIT|END|ROLLBACK|SAVEPOINT|RELEASE)\b/i.test(sql)) {
         try {
-          return withAutocommitTimeout(db, () => nativeExec(sql));
+          return withAutocommitTimeout(db, () => nativeExec(sql), false);
         } finally {
           if (mayChangeTagIdentity(sql))
             tagIdentityWriteGeneration += 1;
@@ -13349,29 +13358,48 @@ function foregroundWaitLease() {
   const lease = transformPassScope.getStore();
   return lease?.active && !admissionScope.getStore() && !backgroundWriterScope.getStore() ? lease : undefined;
 }
-function withAutocommitTimeout(db, operation) {
+function withAutocommitTimeout(db, operation, singleStatement = true) {
   assertTransformWrite();
   const lease = foregroundWaitLease();
   if (isInTransaction(db))
     return operation();
   const scoped = lease || backgroundWriterScope.getStore();
   const previous = scoped ? pragmaNumber(db, "busy_timeout") : null;
-  if (scoped)
-    db.exec(`PRAGMA busy_timeout=${lease ? Math.floor(Math.min(lease.remainingWaitMs, lease.guard?.remainingMs() ?? Infinity)) : SHORT_BUSY_TIMEOUT_MS}`);
   const started = performance.now();
   let completed = false;
-  try {
+  const execute = () => {
     const result = operation();
     completed = true;
     return result;
+  };
+  try {
+    if (!scoped)
+      return execute();
+    if (singleStatement) {
+      db.exec("PRAGMA busy_timeout=0");
+      try {
+        return execute();
+      } catch (error) {
+        if (!isTransientSqliteError(error) || isInTransaction(db))
+          throw error;
+      }
+      assertTransformWrite();
+    }
+    const timeout = Math.floor(Math.min(lease?.remainingWaitMs ?? SHORT_BUSY_TIMEOUT_MS, lease?.guard?.remainingMs() ?? Infinity));
+    db.exec(`PRAGMA busy_timeout=${timeout}`);
+    const waitStarted = performance.now();
+    try {
+      return execute();
+    } finally {
+      if (lease)
+        lease.remainingWaitMs = Math.max(0, lease.remainingWaitMs - (performance.now() - waitStarted));
+    }
   } catch (error) {
     if (lease && isTransientSqliteError(error))
       throw new SqliteAcquisitionBusyError(error, "autocommit");
     throw error;
   } finally {
     const elapsed = performance.now() - started;
-    if (lease)
-      lease.remainingWaitMs = Math.max(0, lease.remainingWaitMs - elapsed);
     if (previous !== null)
       db.exec(`PRAGMA busy_timeout=${previous}`);
     if (elapsed >= SLOW_WRITER_LOG_MS)
@@ -13624,8 +13652,9 @@ async function withIndexChunk(input, operation) {
 async function yieldIndexChunk() {
   await yieldIndexTurn();
 }
-var reportSlowPrivilegedWrite, sqliteDiagnosticSink, sqliteDiagnosticHost = () => "unknown", bunSpec, nodeSpec, SqliteRuntimeUnavailableError, detectedRuntime, isBun, sqliteModule, DatabaseImpl, trackedSqliteConnections, nextSqliteConnectionSequence = 1, TAG_COLUMNS_OUTSIDE_IDENTITY, tagIdentityWriteGeneration = 0, TrackedDatabase, Database, statementOwners, FIRST_PRUNE_AT = 256, privilegeDepth, transformPassScope, admissionScope, backgroundWriterScope, SqliteAcquisitionBusyError, SHORT_BUSY_TIMEOUT_MS = 25, FOREGROUND_IN_PASS_BUSY_TIMEOUT_MS = 2000, FOREGROUND_ACQUISITION_BUDGET_MS = 16500, SLOW_WRITER_LOG_MS = 100, WRITER_TRANSACTION_END, writerAcquisitionScope, openWriterTransactions, indexCoordinationKey, indexCoordinationHeap, indexCoordinationBuffer, indexCoordinationState, yieldIndexTurn = () => new Promise((resolve) => setTimeout(resolve, 1));
+var resourceRoot, reportSlowPrivilegedWrite, sqliteDiagnosticSink, sqliteDiagnosticHost = () => "unknown", bunSpec, nodeSpec, SqliteRuntimeUnavailableError, detectedRuntime, isBun, sqliteModule, DatabaseImpl, trackedSqliteConnections, nextSqliteConnectionSequence = 1, TAG_COLUMNS_OUTSIDE_IDENTITY, tagIdentityWriteGeneration = 0, TrackedDatabase, Database, statementOwners, FIRST_PRUNE_AT = 256, privilegeDepth, transformPassScope, admissionScope, backgroundWriterScope, SqliteAcquisitionBusyError, SHORT_BUSY_TIMEOUT_MS = 25, FOREGROUND_IN_PASS_BUSY_TIMEOUT_MS = 2000, FOREGROUND_ACQUISITION_BUDGET_MS = 16500, SLOW_WRITER_LOG_MS = 100, WRITER_TRANSACTION_END, writerAcquisitionScope, openWriterTransactions, indexCoordinationKey, indexCoordinationHeap, indexCoordinationBuffer, indexCoordinationState, yieldIndexTurn = () => new Promise((resolve) => setTimeout(resolve, 1));
 var init_sqlite = __esm(async () => {
+  resourceRoot = new AsyncResource("magic-context:root");
   bunSpec = "bun:" + "sqlite";
   nodeSpec = "node:" + "sqlite";
   SqliteRuntimeUnavailableError = class SqliteRuntimeUnavailableError extends Error {
@@ -13659,7 +13688,7 @@ var init_sqlite = __esm(async () => {
   ]);
   TrackedDatabase = new Proxy(DatabaseImpl, {
     construct(target, args) {
-      const db = Reflect.construct(target, args, target);
+      const db = inRootAsyncContext(() => Reflect.construct(target, args, target));
       return trackSqliteConnection(db, args[0], args[1]);
     }
   });
@@ -25099,11 +25128,14 @@ function bootQuietRemainingMs(now = Date.now()) {
   return Math.max(0, bootQuietUntilMs - now);
 }
 function scheduleAfterBootQuiet(task, additionalDelayMs = 0) {
-  const timer = setTimeout(task, bootQuietRemainingMs() + Math.max(0, additionalDelayMs));
+  const timer = inRootAsyncContext(() => setTimeout(task, bootQuietRemainingMs() + Math.max(0, additionalDelayMs)));
   timer.unref?.();
   return timer;
 }
 var bootQuietUntilMs = 0;
+var init_boot_quiet = __esm(async () => {
+  await init_sqlite();
+});
 
 // ../plugin/src/shared/error-message.ts
 function getErrorMessage(error) {
@@ -25888,9 +25920,10 @@ END`
 var init_off_thread_migration_clock = () => {};
 
 // ../plugin/src/features/magic-context/migration-worker-client.ts
-var init_migration_worker_client = __esm(() => {
+var init_migration_worker_client = __esm(async () => {
   init_logger();
   init_off_thread_migration_clock();
+  await init_sqlite();
 });
 
 // ../plugin/src/features/magic-context/memory/constants.ts
@@ -32212,7 +32245,7 @@ function runSessionWarmupWorker(input, options) {
       deadline.unref?.();
     };
     try {
-      worker = new Worker(options.entry ?? defaultEntry(), { workerData: input });
+      worker = inRootAsyncContext(() => new Worker(options.entry ?? defaultEntry(), { workerData: input }));
     } catch (error) {
       finish({ failure: "start-failed", detail: String(error) });
       return;
@@ -32302,7 +32335,8 @@ var init_raw_ordinal_warmup = __esm(async () => {
   init_logger();
   await __promiseAll([
     init_sqlite(),
-    init_read_session_raw()
+    init_read_session_raw(),
+    init_sqlite()
   ]);
   RESULT_TIMEOUT_MS = 10 * 60000;
   FAILURE_BACKOFF_MS = 5 * 60000;
@@ -33361,13 +33395,20 @@ function readRawSessionMessageOrdinalById(sessionId, messageId) {
     return null;
   return withReadOnlySessionDb((db) => readRawSessionMessageOrdinalByIdFromDb(db, sessionId, messageId));
 }
+function readRawSessionMessageOrderPosition(sessionId, messageId) {
+  const provider = sessionProviders.get(sessionId)?.provider;
+  if (provider) {
+    return provider.readMessageOrderById ? provider.readMessageOrderById(messageId) : provider.readMessageOrdinalById?.(messageId) ?? null;
+  }
+  return readRawSessionMessageOrdinalById(sessionId, messageId);
+}
 function compareRawSessionMessageOrder(sessionId, leftId, rightId) {
   const provider = sessionProviders.get(sessionId)?.provider;
   if (provider) {
-    if (!provider.readMessageOrdinalById)
+    if (!provider.readMessageOrderById && !provider.readMessageOrdinalById)
       return null;
-    const left = provider.readMessageOrdinalById(leftId);
-    const right = provider.readMessageOrdinalById(rightId);
+    const left = readRawSessionMessageOrderPosition(sessionId, leftId);
+    const right = readRawSessionMessageOrderPosition(sessionId, rightId);
     return left === null || right === null ? null : left - right;
   }
   if (!openCodeDbExists())
@@ -35842,15 +35883,16 @@ var init_storage_db = __esm(async () => {
   init_fail_closed_block();
   init_migration_v94_write_split();
   init_migration_v95_perf_indexes();
-  init_migration_worker_client();
   init_storage_schema_helpers();
   init_storage_tag_identity_revision();
   init_tool_definition_tokens();
   init_tool_owner_backfill();
   await __promiseAll([
+    init_boot_quiet(),
     init_sqlite(),
     init_context_store_uuid(),
     init_message_fts_rowid_map(),
+    init_migration_worker_client(),
     init_migrations()
   ]);
   registerSlowWriteReporter(logSlowWriteTransaction);
@@ -37835,10 +37877,11 @@ function findPluginEntry(directory, surface = "server") {
   };
 }
 var import_comment_json7;
-var init_checker = __esm(() => {
+var init_checker = __esm(async () => {
   init_logger();
   init_constants2();
   init_types();
+  await init_sqlite();
   import_comment_json7 = __toESM(require_src3(), 1);
 });
 
@@ -38045,10 +38088,10 @@ async function inspectPinnedOpenCodePluginSchemaFences(options, deps = {}) {
   return findings;
 }
 var PACKAGE_PATH_SEGMENTS, MAX_TARBALL_BYTES, NPM_TIMEOUT_MS = 5000, FENCE_PATTERN, EXACT_VERSION_PATTERN;
-var init_opencode_plugin_schema_fence = __esm(() => {
-  init_checker();
+var init_opencode_plugin_schema_fence = __esm(async () => {
   init_opencode_plugin_cache();
   init_paths();
+  await init_checker();
   PACKAGE_PATH_SEGMENTS = OPENCODE_PLUGIN_NAME.split("/");
   MAX_TARBALL_BYTES = 25 * 1024 * 1024;
   FENCE_PATTERN = /\bLATEST_SUPPORTED_VERSION\s*=\s*(\d+)\b/g;
@@ -38274,10 +38317,10 @@ function reportCachedPluginFences(findings, report) {
 }
 var init_doctor_cached_plugin_fence = __esm(async () => {
   init_opencode_plugin_cache();
-  init_opencode_plugin_schema_fence();
   await __promiseAll([
     init_storage_db(),
     init_database_access(),
+    init_opencode_plugin_schema_fence(),
     init_doctor_opencode_cache(),
     init_doctor_opencode2_cache()
   ]);
@@ -43247,8 +43290,8 @@ var init_user_facing_codes = __esm(() => {
     },
     history_boundary_unresolved: {
       code: "MC-H04",
-      sentence: "This request was not sent: the message that marks where this session's history summary ends is missing from the OpenCode store, and without it the request is larger than the model's context window.",
-      action: "Run /ctx-recomp to rebuild the history summary."
+      sentence: "This request was not sent: Magic Context could not safely place the history summary boundary in the loaded conversation, and the untrimmed request is larger than the model's context window.",
+      action: "Reopen this session in its current project directory, then run /ctx-recomp to rebuild the history summary. A model with a larger context window can also help."
     },
     history_over_window_unmanaged: {
       code: "MC-H06",
@@ -43594,6 +43637,9 @@ var init_store_ahead_refusal = __esm(() => {
 // ../plugin/src/hooks/magic-context/module-transport.ts
 import { realpathSync as realpathSync7 } from "node:fs";
 import { join as join31 } from "node:path";
+function monotonicNow() {
+  return monotonicClockForTests?.() ?? performance.now();
+}
 function getDefaultSubcConnectionFile() {
   return join31(getDataDir(), "cortexkit", "run", "subc-connection.json");
 }
@@ -43838,7 +43884,7 @@ class SubcModuleTransport {
     });
   }
   async call(args) {
-    const callStartedAt = performance.now();
+    const callStartedAt = monotonicNow();
     const timings = {
       lane: 0,
       route: 0,
@@ -43884,7 +43930,7 @@ class SubcModuleTransport {
       }
       throw error;
     }
-    timings.lane = performance.now() - callStartedAt;
+    timings.lane = monotonicNow() - callStartedAt;
     let rejectAbort;
     const aborted = new Promise((_resolve, reject) => {
       rejectAbort = reject;
@@ -43901,25 +43947,25 @@ class SubcModuleTransport {
             throw args.signal.reason ?? new Error("module transport call aborted");
           }
           const attemptDeadlineMs = Date.now() + attemptTimeoutMs;
-          const routeStartedAt = performance.now();
+          const routeStartedAt = monotonicNow();
           ensuredRoute = await this.ensureRoute(args.sessionId, args.projectRoot, attemptDeadlineMs, args.signal);
           if (args.signal?.aborted) {
             throw args.signal.reason ?? new Error("module transport call aborted");
           }
-          timings.route += performance.now() - routeStartedAt;
-          const encodeStartedAt = performance.now();
+          timings.route += monotonicNow() - routeStartedAt;
+          const encodeStartedAt = monotonicNow();
           const body = args.body instanceof Uint8Array ? args.body : Buffer.from(JSON.stringify(moduleRequestBody(args.body, args.method)));
-          timings.encode += performance.now() - encodeStartedAt;
-          const issueStartedAt = performance.now();
+          timings.encode += monotonicNow() - encodeStartedAt;
+          const issueStartedAt = monotonicNow();
           const request = ensuredRoute.client.request(ensuredRoute.route, body, {
             priority: Priority.Background,
             admissionClass: AdmissionClass.Normal,
             timeoutMs: Math.max(1, attemptDeadlineMs - Date.now())
           });
-          timings.issue += performance.now() - issueStartedAt;
-          const waitStartedAt = performance.now();
+          timings.issue += monotonicNow() - issueStartedAt;
+          const waitStartedAt = monotonicNow();
           const response = await this.beforeDeadline(Promise.race([request, aborted]), attemptDeadlineMs, "waiting for the module response");
-          timings.responseWait += performance.now() - waitStartedAt;
+          timings.responseWait += monotonicNow() - waitStartedAt;
           initialResponseReceived = true;
           if (this.client !== ensuredRoute.client || this.connectionGeneration !== ensuredRoute.generation) {
             throw this.connectionChangedError("subc connection changed while awaiting the module response");
@@ -44004,7 +44050,7 @@ class SubcModuleTransport {
       args.signal?.removeEventListener("abort", onAbort);
       finishWrapupTracking();
       releaseLane();
-      timings.settle = Math.max(0, performance.now() - callStartedAt - timings.lane - timings.route - timings.encode - timings.issue - timings.responseWait);
+      timings.settle = Math.max(0, monotonicNow() - callStartedAt - timings.lane - timings.route - timings.encode - timings.issue - timings.responseWait);
       args.onTimings?.(timings);
     }
   }
@@ -44103,10 +44149,10 @@ class SubcModuleTransport {
     return resolved;
   }
   connectClient() {
-    return SubcClient.connect({
+    return inRootAsyncContext(() => SubcClient.connect({
       connectionFile: this.connectionFile,
       handshakeTimeoutMs: HANDSHAKE_TIMEOUT_MS
-    });
+    }));
   }
   backoffActiveError() {
     const error = new Error(`subc connection backoff active until ${this.nextProbeMs}`);
@@ -44193,13 +44239,14 @@ class SubcModuleTransport {
     client?.close();
   }
 }
-var DEFAULT_MODULE_ID = "magic-context", CONNECT_BACKOFF_INITIAL_MS = 1000, CONNECT_BACKOFF_MAX_MS = 30000, CONNECT_BACKOFF_WAIT_BUDGET_MS = 12000, CONNECT_BACKOFF_WAIT_JITTER_MS = 100, HANDSHAKE_TIMEOUT_MS = 2000, MODULE_SEND_TIMEOUT_MS = 15000, TRANSFORM_PAGE_UPLOAD_TIMEOUT_MS = 5000, TRANSFORM_COLD_START_EXECUTE_TIMEOUT_MS = 15000, MAX_WRAPUP_REQUEST_BUDGET_MS = 3800000, SERIAL_LANE_MAX_WAITERS = 16, SERIAL_LANE_MAX_WAITERS_PER_SESSION = 8, SERIAL_LANE_MIN_REMAINING_MS = 25, CANONICAL_ROOT_CACHE_MAX_ENTRIES = 256;
-var init_module_transport = __esm(() => {
+var DEFAULT_MODULE_ID = "magic-context", CONNECT_BACKOFF_INITIAL_MS = 1000, CONNECT_BACKOFF_MAX_MS = 30000, CONNECT_BACKOFF_WAIT_BUDGET_MS = 12000, CONNECT_BACKOFF_WAIT_JITTER_MS = 100, HANDSHAKE_TIMEOUT_MS = 2000, MODULE_SEND_TIMEOUT_MS = 15000, TRANSFORM_PAGE_UPLOAD_TIMEOUT_MS = 5000, TRANSFORM_COLD_START_EXECUTE_TIMEOUT_MS = 15000, MAX_WRAPUP_REQUEST_BUDGET_MS = 3800000, SERIAL_LANE_MAX_WAITERS = 16, SERIAL_LANE_MAX_WAITERS_PER_SESSION = 8, SERIAL_LANE_MIN_REMAINING_MS = 25, CANONICAL_ROOT_CACHE_MAX_ENTRIES = 256, monotonicClockForTests;
+var init_module_transport = __esm(async () => {
   init_dist5();
   init_data_path();
   init_reply_pages();
   init_single_store_refusal();
   init_store_ahead_refusal();
+  await init_sqlite();
 });
 
 // src/commands/migrate-session.ts
@@ -44607,12 +44654,14 @@ var init_migrate_session = __esm(async () => {
   init_project_identity();
   init_relocate_memory();
   init_storage_project_state();
-  init_module_transport();
   init_data_path();
   init_opencode_db_path();
   init_migration_paths();
   init_prompts();
-  await init_database_access();
+  await __promiseAll([
+    init_module_transport(),
+    init_database_access()
+  ]);
   VALID_MEMORY_ACTIONS = new Set([
     "move-all",
     "move-originated",
@@ -45803,7 +45852,341 @@ var init_log_lines = __esm(() => {
   LEVEL_DEFAULT = LEVEL_ORDER.INFO;
 });
 
+// src/lib/redaction.ts
+function sanitizeDiagnosticEndpoint(value) {
+  const trimmed = value.trim();
+  if (!trimmed)
+    return sanitizeDiagnosticText(value);
+  try {
+    const url = new URL(trimmed);
+    url.username = "";
+    url.password = "";
+    url.search = "";
+    url.hash = "";
+    return sanitizeDiagnosticText(url.toString());
+  } catch {
+    const withoutQuery = trimmed.replace(/[?#].*$/, "");
+    const withoutUserInfo = withoutQuery.replace(/^([a-z][a-z0-9+.-]*:\/\/)[^/@\s]+@/i, "$1");
+    return sanitizeDiagnosticText(withoutUserInfo);
+  }
+}
+var init_redaction2 = __esm(() => {
+  init_redaction();
+});
+
+// src/lib/issue-privacy.ts
+class IssuePrivacy {
+  notice = "_Paths and IDs use per-report aliases. Free text, private package names, and source/tool content are omitted; add reproduction steps directly to the issue after reviewing it._";
+  projects = new Map;
+  sessions = new Map;
+  paths = new Map;
+  constructor(report, projectDirectories = []) {
+    this.discover(report);
+    for (const directory of projectDirectories) {
+      this.alias(this.projects, this.normalize(directory), "project");
+    }
+  }
+  normalize(value) {
+    let path = value.replaceAll("\\", "/");
+    const home = (process.env.HOME || process.env.USERPROFILE || "").replaceAll("\\", "/");
+    if (home && (path === home || path.startsWith(`${home}/`)))
+      path = `~${path.slice(home.length)}`;
+    return path.replace(/^(?:\/Users\/[^/]+|\/home\/[^/]+|[A-Za-z]:\/Users\/[^/]+)(?=\/|$)/, "~").replace(/\/$/, "");
+  }
+  alias(map, value, prefix) {
+    let alias = map.get(value);
+    if (!alias) {
+      alias = `${prefix}-${new Set(map.values()).size + 1}`;
+      map.set(value, alias);
+    }
+    return alias;
+  }
+  discover(value) {
+    if (Array.isArray(value)) {
+      for (const item of value)
+        this.discover(item);
+    } else if (value && typeof value === "object") {
+      const record = value;
+      const directory = typeof record.directory === "string" ? this.normalize(record.directory) : null;
+      if (directory) {
+        const alias = this.alias(this.projects, directory, "project");
+        for (const [key, item] of Object.entries(record)) {
+          if (PROJECT_KEY.test(key) && typeof item === "string")
+            this.projects.set(this.normalize(item), alias);
+        }
+      }
+      for (const [key, item] of Object.entries(record)) {
+        if (key !== "flags")
+          this.discover(item);
+      }
+    }
+  }
+  path(value) {
+    const normalized = this.normalize(value);
+    if (!normalized || normalized === "~")
+      return normalized;
+    for (const [root, alias] of [...this.projects].sort(([a], [b]) => b.length - a.length)) {
+      if (normalized === root || normalized.startsWith(`${root}/`)) {
+        return `${normalized.startsWith("~/") ? "~/" : ""}${alias}${normalized === root ? "" : "/<path>"}`;
+      }
+    }
+    return `${normalized.startsWith("~/") ? "~/" : ""}${this.alias(this.paths, normalized, "path")}`;
+  }
+  session(value) {
+    return value === "none" || !value ? value : this.alias(this.sessions, value, "session");
+  }
+  project(value) {
+    if (value.startsWith("dir:"))
+      return this.path(value.slice(4));
+    return this.alias(this.projects, this.normalize(value), "project");
+  }
+  summary(value) {
+    const safe = sanitizeDiagnosticText(value);
+    const errors = [
+      ...new Set(safe.match(/\b(?:[A-Z][A-Za-z]*Error|Error|SQLITE_[A-Z_]+|EACCES|EPERM|ENOENT|ENOSPC|ECONNRESET|ETIMEDOUT|MC-H[A-Z0-9-]+)\b/g) ?? [])
+    ];
+    if (/generation mismatch/i.test(safe))
+      errors.push("store generation mismatch");
+    if (/no such table/i.test(safe))
+      errors.push("SQLITE_ERROR");
+    if (/could not safely prepare this turn|refused\s*\(/i.test(safe))
+      errors.push("refused");
+    if (/\bfailed:|\bexception\b|\bEMERGENCY\b/i.test(safe))
+      errors.push("failed");
+    return errors.length ? `${errors.join(" ")}: ${OMITTED}` : OMITTED;
+  }
+  userText(value) {
+    return value === "Magic Context diagnostic report" || value === "Generated non-interactively by `doctor --issue --report`." ? value : OMITTED;
+  }
+  logLine(line) {
+    const parsed = parseLogLine(line);
+    const safe = sanitizeDiagnosticText(line);
+    const component = parsed?.tags.find((tag) => COMPONENTS.has(tag)) ?? [...COMPONENTS].find((name) => new RegExp(`\\b${name}\\b`).test(parsed?.message ?? ""));
+    const logger = component ? `magic-context.${component}` : "magic-context";
+    const session = parsed?.session ? ` [${this.session(parsed.session)}]` : "";
+    const fields = Object.entries(parsed?.kv ?? {}).filter(([key, value]) => NUMERIC_FIELD.test(key) && /^\d+(?:\.\d+)?$/.test(value)).map(([key, value]) => `${key}=${value}`);
+    const timings = safe.match(/\b\d+(?:\.\d+)?(?:ms|µs|us|s)\b/g) ?? [];
+    const identities = [
+      ...safe.matchAll(/\b(?:git:[a-f0-9]{16,64}|pj-[A-Za-z0-9_-]+|dir:[^\s"']+)/g)
+    ].map(([id]) => this.project(id));
+    return [
+      parsed?.ts && /^\d{4}-\d{2}-\d{2}T[\d:.]+Z$/.test(parsed.ts) ? parsed.ts : "",
+      parsed?.level ?? line.match(/^(TRACE|DEBUG|INFO|WARN|ERROR)\b/)?.[1] ?? "LOG",
+      `${logger}${session}`,
+      this.summary(line),
+      ...fields,
+      ...timings,
+      ...identities
+    ].filter(Boolean).join(" ");
+  }
+  healthMessage(value) {
+    const labels = [
+      "compaction.enabled",
+      "memory.backend",
+      "@cortexkit/pi-magic-context",
+      "native compaction",
+      "memory backend",
+      "agent directory",
+      "config",
+      "plugin",
+      "manifest",
+      "Shared storage",
+      "context DB",
+      "SQLite integrity_check",
+      "Background maintenance",
+      "runtime log",
+      "sessions",
+      "package override"
+    ];
+    const label = labels.find((entry) => value.toLowerCase().includes(entry.toLowerCase())) ?? "host detection";
+    const staticMessages = [
+      "OMP native compaction is disabled",
+      "OMP automatic memory backend is disabled",
+      "SQLite integrity_check: ok",
+      "Background maintenance completed its last pass",
+      "Magic Context runtime config loads successfully",
+      "Plugin exposes an OMP/Pi extension manifest",
+      "Installed plugin has no OMP/Pi extension manifest"
+    ];
+    if (staticMessages.includes(value))
+      return value;
+    const paths = [...value.matchAll(/(?:[A-Za-z]:[\\/]|~\/|\/)[^\s,;)]+/g)].map(([path]) => this.path(path));
+    const versions = value.match(/\b\d+\.\d+\.\d+\b/g) ?? [];
+    const fields = [
+      ...value.matchAll(/\b(grammar|lines|source)[=:]\s*(environment override|[\w-]+)/g)
+    ].map(([, key, item]) => `${key}=${/^\d+$/.test(item) || ENUMS.has(item) ? item : OMITTED}`);
+    const measurements = value.match(/\b\d+(?:\.\d+)?\s?(?:KB|MB|GB|ms|s)\b/g) ?? [];
+    return [label, ...versions, ...paths, ...fields, ...measurements, this.summary(value)].join(" ");
+  }
+  report(value, key = "", config = false) {
+    if (value === null || typeof value === "number" || typeof value === "boolean")
+      return value;
+    if (isSecretKey(key))
+      return sanitizeConfigValue(value, [key]);
+    if (Array.isArray(value))
+      return value.map((item) => this.report(item, key, config));
+    if (value && typeof value === "object") {
+      return Object.fromEntries(Object.entries(value).map(([childKey, item]) => [
+        key === "factCountByCategory" ? `category-${Object.keys(value).indexOf(childKey) + 1}` : /[\s/@\\:]|[a-f0-9]{24,}/i.test(childKey) ? "<key omitted>" : childKey,
+        this.report(item, childKey, config || key === "flags")
+      ]));
+    }
+    if (typeof value !== "string")
+      return value;
+    const safe = sanitizeDiagnosticText(value);
+    if (/^<[^<>]*REDACTED[^<>]*>$/.test(safe))
+      return safe;
+    if (SESSION_KEY.test(key))
+      return this.session(value);
+    if (PROJECT_KEY.test(key) || /^(?:git:[a-f0-9]{16,64}|pj-)/.test(value))
+      return this.project(value);
+    if (PATH_KEY.test(key) || /^(?:~\/|\/|[A-Za-z]:[\\/]|file:)/.test(value))
+      return this.path(value);
+    if (VERSION_KEY.test(key) && VERSION.test(value))
+      return value;
+    if (/^(?:timestamp|lastActiveAt|lastFailureAt|lastRunAt|lastUpdatedAt)$/.test(key) && /^\d{4}-\d\d-\d\dT[\d:.]+Z$/.test(value))
+      return value;
+    if (MODEL_KEY.test(key) && /^[A-Za-z0-9][A-Za-z0-9._/-]*$/.test(safe) && !safe.includes("..") && !/^(?:git:|dir:|pj-)/.test(safe))
+      return safe;
+    if (ENUMS.has(value) || value === "")
+      return value;
+    if (config && (CONFIG_ENUMS.has(value) || key === "language" && /^[a-z]{2}$/.test(value)))
+      return value;
+    if (config)
+      return OMITTED;
+    return this.summary(value);
+  }
+}
+var OMITTED = "<text omitted>", COMPONENTS, NUMERIC_FIELD, ENUMS, CONFIG_ENUMS, PATH_KEY, SESSION_KEY, PROJECT_KEY, VERSION_KEY, MODEL_KEY, VERSION;
+var init_issue_privacy = __esm(() => {
+  init_log_lines();
+  init_redaction2();
+  COMPONENTS = new Set([
+    "historian",
+    "hist",
+    "perf",
+    "compaction",
+    "dreamer",
+    "janitor",
+    "retina",
+    "storage",
+    "embedding",
+    "transform",
+    "session",
+    "runtime",
+    "config"
+  ]);
+  NUMERIC_FIELD = /^(?:duration_?ms|elapsed_?ms|latency_?ms|timeout_?ms|retry|retries|attempt|count|total|success|failed|noop|tokens|input_?tokens|output_?tokens|prompt_?tokens|completion_?tokens|bytes|size_?kb|lines|turns|messages|compartments|pruned|kept)$/i;
+  ENUMS = new Set([
+    "true",
+    "false",
+    "on",
+    "off",
+    "auto",
+    "none",
+    "unknown",
+    "local",
+    "remote",
+    "disabled",
+    "enabled",
+    "default",
+    "debug",
+    "info",
+    "warn",
+    "error",
+    "trace",
+    "cli",
+    "desktop",
+    "darwin",
+    "linux",
+    "win32",
+    "arm64",
+    "x64",
+    "ia32",
+    "json",
+    "jsonc",
+    "opencode1",
+    "opencode2",
+    "fleet-r1",
+    "fleet-r2",
+    "legacy",
+    "mixed",
+    "PATH",
+    "path",
+    "app",
+    "openchamber",
+    "environment override",
+    "OPENCODE_DB",
+    "stable",
+    "beta",
+    "latest",
+    "query error",
+    "path missing",
+    "schema too old"
+  ]);
+  CONFIG_ENUMS = new Set([
+    "ts",
+    "rust",
+    "broca",
+    "host",
+    "minimal",
+    "low",
+    "medium",
+    "high",
+    "xhigh",
+    "max",
+    "inherit",
+    "full",
+    "light",
+    "synapse",
+    "native",
+    "wasm",
+    "fp32",
+    "fp16",
+    "q8",
+    "int8",
+    "uint8",
+    "q4",
+    "bnb4",
+    "q4f16",
+    "q2",
+    "q2f16",
+    "q1",
+    "q1f16",
+    "*",
+    "read",
+    "aft_outline",
+    "aft_zoom",
+    "aft_search",
+    "subagent",
+    "primary",
+    "all",
+    "ask",
+    "allow",
+    "deny"
+  ]);
+  PATH_KEY = /^(?:path|dir|directory|configDir|agentDir|opencodeConfig|magicContextConfig|tuiConfig|omoConfig|userConfig|projectConfig|loadedConfigPaths|piPath)$/;
+  SESSION_KEY = /session_?ids?$/i;
+  PROJECT_KEY = /^(?:project|project_?id|projectKey|rootCommit|root_commit|rootCommitHash)$/i;
+  VERSION_KEY = /(?:version|cached|latest|spec)$/i;
+  MODEL_KEY = /^(?:model|models|provider|providerID|modelID|fallback_provider|fallback_model|fallback_models|model_chain)$/i;
+  VERSION = /^(?:(?:opencode|pi|omp)\s+)?v?\d+\.\d+\.\d+(?:[-+][A-Za-z0-9.-]+)?$/;
+});
+
 // src/lib/issue-body.ts
+function prepareIssueReport(report, lines, sessionFilter = null, projectDirectories = [process.cwd()]) {
+  const privacy = new IssuePrivacy(report, projectDirectories);
+  const logLines = filterLogLinesBySession(lines, sessionFilter);
+  return {
+    privacy,
+    report: privacy.report(report),
+    logLines,
+    recentLog: logLines.slice(-400).map((line) => privacy.logLine(line)).join(`
+`).trim(),
+    recentErrorLines: extractRecentErrors(logLines.slice(-4000).join(`
+`), 20).map((line) => privacy.logLine(line))
+  };
+}
 function isErrorLogLine(line) {
   const parsed = parseLogLine(line);
   if (parsed?.level !== null && parsed?.level !== undefined) {
@@ -45934,6 +46317,7 @@ var MAX_GITHUB_BODY_BYTES = 60000, LOG_TRUNCATION_MARKER = `[truncated for GitHu
 [truncated for GitHub 64KB limit]
 `, ERROR_LOG_PATTERNS;
 var init_issue_body = __esm(() => {
+  init_issue_privacy();
   init_log_lines();
   ERROR_LOG_PATTERNS = [
     /\bfailed:/i,
@@ -45948,28 +46332,6 @@ var init_issue_body = __esm(() => {
   ];
 });
 
-// src/lib/redaction.ts
-function sanitizeDiagnosticEndpoint(value) {
-  const trimmed = value.trim();
-  if (!trimmed)
-    return sanitizeDiagnosticText(value);
-  try {
-    const url = new URL(trimmed);
-    url.username = "";
-    url.password = "";
-    url.search = "";
-    url.hash = "";
-    return sanitizeDiagnosticText(url.toString());
-  } catch {
-    const withoutQuery = trimmed.replace(/[?#].*$/, "");
-    const withoutUserInfo = withoutQuery.replace(/^([a-z][a-z0-9+.-]*:\/\/)[^/@\s]+@/i, "$1");
-    return sanitizeDiagnosticText(withoutUserInfo);
-  }
-}
-var init_redaction2 = __esm(() => {
-  init_redaction();
-});
-
 // src/commands/doctor-omp.ts
 import { execFileSync as execFileSync8, spawnSync as spawnSync8 } from "node:child_process";
 import { existsSync as existsSync42, readFileSync as readFileSync24 } from "node:fs";
@@ -46239,27 +46601,24 @@ async function repair(plan, deps, prompts, cwd) {
 function timestamp2(date) {
   return date.toISOString().replace(/[-:]/g, "").replace(/\.\d{3}Z$/, "Z");
 }
-function ompIssueBody(description, report, logLines, sessionFilter) {
+function ompIssueBody(description, report, logLines, sessionFilter, cwd) {
   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);
+  const { privacy, recentLog, recentErrorLines } = prepareIssueReport(report, logLines, sessionFilter, [cwd]);
   return [
     "## Description",
-    sanitizeDiagnosticText(description),
+    privacy.userText(description),
+    "",
+    privacy.notice,
     "",
     "## Environment",
-    `- Magic Context plugin: ${report.pluginVersion ? `v${sanitizeDiagnosticText(report.pluginVersion)}` : "not installed"}`,
-    `- Oh My Pi: ${report.ompVersion ? sanitizeDiagnosticText(report.ompVersion) : "not detected"}`,
+    `- Magic Context plugin: ${report.pluginVersion ? `v${privacy.report(report.pluginVersion, "pluginVersion")}` : "not installed"}`,
+    `- Oh My Pi: ${report.ompVersion ? privacy.report(report.ompVersion, "ompVersion") : "not detected"}`,
     `- OS: ${process.platform} ${process.arch}`,
     `- Runtime: Node.js ${process.version}`,
     "",
     "## OMP diagnostics",
     `- Magic Context CLI: v${selfVersion()}`,
-    ...report.results.map((result) => `- ${result.status.toUpperCase()}: ${sanitizeDiagnosticText(result.message)}`),
+    ...report.results.map((result) => `- ${result.status.toUpperCase()}: ${privacy.healthMessage(result.message)}`),
     "",
     "## Recent errors (last 20, sanitized)",
     recentErrorLines.length === 0 ? "_No error-shaped log lines found in recent history._" : ["```", recentErrorLines.join(`
@@ -46317,7 +46676,7 @@ async function runIssueFlow(options) {
   if (options.reportPath) {
     const report = await runHealthChecks({ ...options, quiet: true });
     const path = isAbsolute8(options.reportPath) ? options.reportPath : join34(options.cwd, options.reportPath);
-    const bundle = writeOmpIssueReport(path, ompIssueBody("Generated non-interactively by `doctor --issue --report`.", report, readLogLines(report.logFiles), null));
+    const bundle = writeOmpIssueReport(path, ompIssueBody("Generated non-interactively by `doctor --issue --report`.", report, readLogLines(report.logFiles), null, options.cwd));
     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;
   }
@@ -46344,7 +46703,7 @@ async function runIssueFlow(options) {
     sessionFilter = choice === "__all__" ? null : choice;
   }
   const path = join34(options.cwd, `magic-context-omp-issue-${timestamp2(options.deps.now())}.md`);
-  const bundle = writeOmpIssueReport(path, ompIssueBody(description, report, logLines, sessionFilter));
+  const bundle = writeOmpIssueReport(path, ompIssueBody(description, report, logLines, sessionFilter, options.cwd));
   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}`, bundle.path, (args) => runGhCommandWithDeps(options.deps, args));
@@ -46400,7 +46759,6 @@ var init_doctor_omp = __esm(async () => {
   init_omp_helpers();
   init_paths();
   init_prompts();
-  init_redaction2();
   await init_database_access();
   import_comment_json8 = __toESM(require_src3(), 1);
   DEFAULT_DEPS4 = {
@@ -46822,7 +47180,7 @@ async function getSharedClient(options) {
   if (sharedClientPromise && sharedClientFile === options.connectionFile)
     return sharedClientPromise;
   sharedClientFile = options.connectionFile;
-  sharedClientPromise = SubcClient.connect({ connectionFile: options.connectionFile }).then((client) => {
+  sharedClientPromise = inRootAsyncContext(() => SubcClient.connect({ connectionFile: options.connectionFile })).then((client) => {
     sharedClient = client;
     return client;
   });
@@ -47207,10 +47565,11 @@ class SynapseEmbeddingProvider {
   }
 }
 var SYNAPSE_DEFAULT_MODEL = "gte-modernbert-base-f16", SYNAPSE_DEFAULT_QUERY_TIMEOUT_MS = 3000, SYNAPSE_DEFAULT_BATCH_TIMEOUT_MS = 120000, SYNAPSE_CERTIFICATION_REFUSAL_REASONS, embeddingRowMetadata, SynapseEmbeddingError, sharedClient = null, sharedClientFile = null, sharedClientPromise = null, factoryClients;
-var init_embedding_synapse = __esm(() => {
+var init_embedding_synapse = __esm(async () => {
   init_dist5();
   init_read_session_formatting();
   init_logger();
+  await init_sqlite();
   SYNAPSE_CERTIFICATION_REFUSAL_REASONS = new Set([
     "not_certified",
     "probe_required",
@@ -48042,20 +48401,21 @@ var init_embedding_model_match = () => {};
 var init_normalize_hash = () => {};
 
 // ../plugin/src/features/magic-context/memory/embedding-identity.ts
-var init_embedding_identity = __esm(() => {
+var init_embedding_identity = __esm(async () => {
   init_magic_context();
   init_embedding_model_match();
-  init_embedding_synapse();
   init_normalize_hash();
+  await init_embedding_synapse();
 });
 
 // ../plugin/src/features/magic-context/memory/onnx-telemetry.ts
 var init_onnx_telemetry = () => {};
 
 // ../plugin/src/features/magic-context/memory/embedding-worker-client.ts
-var init_embedding_worker_client = __esm(() => {
+var init_embedding_worker_client = __esm(async () => {
   init_logger();
   init_onnx_telemetry();
+  await init_sqlite();
 });
 // ../plugin/src/features/magic-context/memory/embedding-local.ts
 function currentLocalEmbeddingHost() {
@@ -48091,14 +48451,17 @@ function resolveLocalEmbeddingWorkerRuntime(preference = "auto", host = currentL
   return resolveLocalEmbeddingRuntime(preference, host);
 }
 var BUN_NAPI_TEARDOWN_FIX_VERSION, STALE_LOCK_MS, MAX_LOCK_WAIT_MS, loadedLocalEmbeddingRuntimes;
-var init_embedding_local = __esm(() => {
+var init_embedding_local = __esm(async () => {
   init_magic_context();
   init_data_path();
   init_logger();
   init_stale_plugin_build();
   init_storage_permissions();
-  init_embedding_identity();
-  init_embedding_worker_client();
+  await __promiseAll([
+    init_embedding_identity(),
+    init_embedding_worker_client(),
+    init_sqlite()
+  ]);
   BUN_NAPI_TEARDOWN_FIX_VERSION = [1, 4, 0];
   STALE_LOCK_MS = 3 * 60000;
   MAX_LOCK_WAIT_MS = 5 * 60000;
@@ -48450,8 +48813,8 @@ function checkLocalEmbeddingRuntimeByResolution(pluginDir, platform = process.pl
   return withWasmFallback(native, () => probeWasmRuntimeByResolution(pluginDir));
 }
 var ONNX_LOAD_PROBE_TIMEOUT_MS = 1e4, ONNX_LOAD_PROBE_OUTPUT_LIMIT = 800, ONNX_LOAD_PROBE_PACKAGE_DIR_ENV = "MAGIC_CONTEXT_ONNX_RUNTIME_NODE_PACKAGE_DIR", ONNX_RUNTIME_NODE_LOAD_PROBE_SCRIPT, runOnnxRuntimeNodeLoadProbeChildForRuntime, HUGGING_FACE_DOWNLOAD_MIRROR_HINT = " If a Hugging Face model download fails because huggingface.co is unreachable, set HF_ENDPOINT to a compatible mirror.";
-var init_embedding_runtime = __esm(() => {
-  init_embedding_local();
+var init_embedding_runtime = __esm(async () => {
+  await init_embedding_local();
   ONNX_RUNTIME_NODE_LOAD_PROBE_SCRIPT = [
     'const { createRequire } = require("node:module");',
     'const { join } = require("node:path");',
@@ -48477,9 +48840,6 @@ var init_embedding_runtime = __esm(() => {
 // src/lib/logs-opencode.ts
 import { mkdirSync as mkdirSync8, writeFileSync as writeFileSync8 } from "node:fs";
 import { dirname as dirname25, join as join38 } from "node:path";
-function sanitizeLogContent(content) {
-  return sanitizeDiagnosticText(content);
-}
 function formatTimestamp(date) {
   const pad = (value) => String(value).padStart(2, "0");
   return [
@@ -48509,20 +48869,17 @@ function extractHistorianFailureLines(sanitized, limit = 30) {
 async function bundleIssueReport(report, description, title, sessionFilter = null, options = {}) {
   const LOG_TAIL_LINES = 400;
   const allLogLines = readLogLines(report.logFiles ?? [report.logFile]);
-  const logLines = filterLogLinesBySession(allLogLines, sessionFilter);
-  const recentLog = sanitizeLogContent(logLines.slice(-LOG_TAIL_LINES).join(`
-`)).trim();
-  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 prepared = prepareIssueReport(report, allLogLines, sessionFilter);
+  const { privacy, logLines, recentLog, recentErrorLines } = prepared;
+  report = prepared.report;
+  const historianScanWindow = logLines.slice(-4000).join(`
+`);
+  const historianFailureLines = extractHistorianFailureLines(historianScanWindow, 30).map((line) => privacy.logLine(line));
   const configBody = JSON.stringify(sanitizeConfigValue(report.magicContextConfig.flags), null, 2);
   const sanitizedConfigPath = sanitizeDiagnosticText(report.configPaths.magicContextConfig);
-  const sanitizedDescription = sanitizeDiagnosticText(description);
-  const sanitizedTitle = sanitizeDiagnosticText(title).trim();
-  const selectedSession = sessionFilter ? (report.recentSessions.available ? report.recentSessions.rows : []).find((session) => session.sessionId === sessionFilter) : undefined;
+  const sanitizedDescription = privacy.userText(description);
+  const sanitizedTitle = privacy.userText(title).trim();
+  const selectedSession = sessionFilter ? (report.recentSessions.available ? report.recentSessions.rows : []).find((session) => session.sessionId === privacy.session(sessionFilter)) : undefined;
   const sessionContext = selectedSession ? [
     "## Session context",
     `- Selected session: ${sanitizeDiagnosticText(selectedSession.sessionId)}`,
@@ -48535,6 +48892,8 @@ async function bundleIssueReport(report, description, title, sessionFilter = nul
     "## Description",
     sanitizedDescription,
     "",
+    privacy.notice,
+    "",
     "## Environment",
     `- Plugin: v${report.pluginVersion}`,
     `- OS: ${report.platform} ${report.arch}`,
@@ -50738,7 +51097,6 @@ var init_doctor_opencode = __esm(async () => {
   init_removed_agent_config();
   init_variable();
   init_tick_failure();
-  init_embedding_synapse();
   init_auto_update_provenance();
   init_conflict_detector();
   init_conflict_fixer();
@@ -50748,7 +51106,6 @@ var init_doctor_opencode = __esm(async () => {
   init_tui_config();
   init_atomic_write();
   init_config_location_migration();
-  init_embedding_runtime();
   init_github_issue();
   init_log_lines();
   init_migrate_dreamer_v2_doctor();
@@ -50756,17 +51113,19 @@ var init_doctor_opencode = __esm(async () => {
   init_opencode_helpers();
   init_opencode_plugin_cache();
   init_opencode_plugin_registration();
-  init_opencode_plugin_schema_fence();
   init_paths();
   init_prompts();
   init_redaction2();
   await __promiseAll([
+    init_embedding_synapse(),
     init_storage_db(),
     init_sqlite(),
     init_opencode(),
     init_database_access(),
     init_diagnostics_opencode(),
+    init_embedding_runtime(),
     init_logs_opencode(),
+    init_opencode_plugin_schema_fence(),
     init_storage_versions(),
     init_v22_backfill_commands(),
     init_doctor_cached_plugin_fence(),
@@ -51374,9 +51733,6 @@ var init_diagnostics_pi = __esm(() => {
 // src/lib/logs-pi.ts
 import { mkdirSync as mkdirSync9, writeFileSync as writeFileSync9 } from "node:fs";
 import { dirname as dirname27, join as join41 } from "node:path";
-function sanitizeLogContent2(content) {
-  return sanitizeString2(content);
-}
 function formatTimestamp2(date) {
   const pad = (value) => String(value).padStart(2, "0");
   return [
@@ -51392,18 +51748,19 @@ function formatTimestamp2(date) {
 async function bundleIssueReport2(report, description, title, options = {}) {
   const LOG_TAIL_LINES = 400;
   const allLogLines = readLogLines(report.logFiles ?? [report.logFile]);
-  const logLines = filterLogLinesBySession(allLogLines, options.sessionFilter ?? null);
-  const recentLog = sanitizeLogContent2(logLines.slice(-LOG_TAIL_LINES).join(`
-`)).trim();
-  const errorScanWindow = sanitizeLogContent2(logLines.slice(-4000).join(`
-`));
-  const recentErrorLines = extractRecentErrors(errorScanWindow, 20);
+  const prepared = prepareIssueReport(report, allLogLines, options.sessionFilter ?? null, [
+    options.cwd ?? process.cwd()
+  ]);
+  const { privacy, recentLog, recentErrorLines } = prepared;
+  report = prepared.report;
   const rawBodyMarkdown = [
     "## Title",
-    `[pi] ${sanitizeString2(title)}`,
+    `[pi] ${privacy.userText(title)}`,
     "",
     "## Description",
-    sanitizeString2(description),
+    privacy.userText(description),
+    "",
+    privacy.notice,
     "",
     "## Environment",
     `- Pi plugin: v${report.pluginVersion}`,
@@ -52352,7 +52709,6 @@ var init_doctor_pi = __esm(async () => {
   init_raw_loader();
   init_variable();
   init_tick_failure();
-  init_embedding_synapse();
   init_data_path();
   init_jsonc_edit();
   init_jsonc_parser();
@@ -52361,7 +52717,6 @@ var init_doctor_pi = __esm(async () => {
   init_atomic_write();
   init_config_location_migration();
   init_diagnostics_pi();
-  init_embedding_runtime();
   init_github_issue();
   init_log_lines();
   init_logs_pi();
@@ -52372,8 +52727,10 @@ var init_doctor_pi = __esm(async () => {
   init_redaction2();
   init_setup_pi();
   await __promiseAll([
+    init_embedding_synapse(),
     init_storage_db(),
     init_database_access(),
+    init_embedding_runtime(),
     init_storage_versions(),
     init_v22_backfill_commands()
   ]);

package/package.json

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