@cortexkit/pi-magic-context 0.28.0 → 0.29.1

package/dist/subagent-entry.js

@@ -8080,6 +8080,102 @@ function closeQuietly(db) {
 // ../plugin/src/features/magic-context/migrations.ts
 init_logger();
 
+// ../plugin/src/features/magic-context/storage-schema-helpers.ts
+function ensureColumn(db, table, column, definition) {
+  if (!/^[a-z][a-z0-9_]*$/.test(table) || !/^[a-z][a-z0-9_]*$/.test(column) || !/^[A-Z0-9_"'(),[\]\s]+$/i.test(definition)) {
+    throw new Error(`Unsafe schema identifier: ${table}.${column} ${definition}`);
+  }
+  const rows = db.prepare(`PRAGMA table_info(${table})`).all();
+  if (rows.some((row) => row.name === column)) {
+    return;
+  }
+  try {
+    db.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${definition}`);
+  } catch (err) {
+    const recheck = db.prepare(`PRAGMA table_info(${table})`).all();
+    if (recheck.some((row) => row.name === column)) {
+      return;
+    }
+    throw err;
+  }
+}
+function healAllNullColumns(db) {
+  healNullTextColumns(db);
+  healNullIntegerColumns(db);
+  healMissingMemoryBlockIds(db);
+}
+function healMissingMemoryBlockIds(db) {
+  try {
+    db.prepare("UPDATE session_meta SET memory_block_cache = '' WHERE memory_block_cache != '' AND (memory_block_ids IS NULL OR memory_block_ids = '') AND memory_block_count > 0").run();
+  } catch {}
+}
+function healNullTextColumns(db) {
+  const columns = [
+    ["cache_ttl", ""],
+    ["last_nudge_band", ""],
+    ["last_nudge_level", ""],
+    ["last_transform_error", ""],
+    ["nudge_anchor_message_id", ""],
+    ["nudge_anchor_text", ""],
+    ["sticky_turn_reminder_text", ""],
+    ["sticky_turn_reminder_message_id", ""],
+    ["note_nudge_trigger_message_id", ""],
+    ["note_nudge_sticky_text", ""],
+    ["note_nudge_sticky_message_id", ""],
+    ["last_todo_state", ""],
+    ["todo_synthetic_call_id", ""],
+    ["todo_synthetic_anchor_message_id", ""],
+    ["todo_synthetic_state_json", ""],
+    ["system_prompt_hash", ""],
+    ["stripped_placeholder_ids", ""],
+    ["stale_reduce_stripped_ids", ""],
+    ["processed_image_stripped_ids", ""],
+    ["memory_block_cache", ""],
+    ["memory_block_ids", ""],
+    ["compaction_marker_state", ""],
+    ["key_files", ""]
+  ];
+  for (const [column, fallback] of columns) {
+    try {
+      db.prepare(`UPDATE session_meta SET ${column} = ? WHERE ${column} IS NULL`).run(fallback);
+    } catch (_error) {}
+  }
+}
+function healNullIntegerColumns(db) {
+  const columns = [
+    ["times_execute_threshold_reached", 0],
+    ["compartment_in_progress", 0],
+    ["historian_failure_count", 0],
+    ["cleared_reasoning_through_tag", 0],
+    ["memory_block_count", 0],
+    ["system_prompt_tokens", 0],
+    ["conversation_tokens", 0],
+    ["tool_call_tokens", 0],
+    ["note_nudge_trigger_pending", 0],
+    ["observed_safe_input_tokens", 0],
+    ["cache_alert_sent", 0],
+    ["new_work_tokens", 0],
+    ["total_input_tokens", 0],
+    ["last_emergency_input_sample", 0],
+    ["channel2_nudge_claimed_at", 0],
+    ["last_usage_context_limit", 0],
+    ["prior_boundary_ordinal", 1],
+    ["protected_tail_policy_version", 0],
+    ["protected_tail_drain_window_started_at", 0],
+    ["protected_tail_drain_tokens", 0],
+    ["recovery_no_eligible_head_count", 0],
+    ["force_emergency_bypass_window_start", 0],
+    ["force_emergency_bypass_used", 0],
+    ["emergency_drain_active", 0],
+    ["historian_drain_failure_at", 0]
+  ];
+  for (const [column, fallback] of columns) {
+    try {
+      db.prepare(`UPDATE session_meta SET ${column} = ? WHERE ${column} IS NULL`).run(fallback);
+    } catch (_error) {}
+  }
+}
+
 // ../plugin/src/features/magic-context/workspaces.ts
 import { createHash as createHash2 } from "node:crypto";
 
@@ -9923,6 +10019,17 @@ function runMigrations(db) {
   log(`[migrations] schema version now: ${MIGRATIONS[MIGRATIONS.length - 1].version}`);
 }
 
+// ../plugin/src/shared/commit-detection.ts
+var HASH_HEX = "[0-9a-f]{7,12}";
+var COMMIT_HASH_TEST_PATTERN = new RegExp(`\\b${HASH_HEX}\\b`, "i");
+var COMMIT_VERB_PATTERN = /\b(?:commit(?:ted|ting|s)?|cherry-?pick(?:ed|ing|s)?|merge[ds]?|merging|rebas(?:e|ed|es|ing))\b/i;
+function textMentionsRecentCommit(text) {
+  return COMMIT_HASH_TEST_PATTERN.test(text) && COMMIT_VERB_PATTERN.test(text);
+}
+function createCommitHashExtractPattern() {
+  return new RegExp(`\`?\\b(${HASH_HEX})\\b\`?`, "gi");
+}
+
 // ../plugin/src/shared/internal-initiator-marker.ts
 var OMO_INTERNAL_INITIATOR_MARKER = "<!-- OMO_INTERNAL_INITIATOR -->";
 
@@ -142374,8 +142481,6 @@ var decoder = {
 };
 
 // ../plugin/src/hooks/magic-context/read-session-formatting.ts
-var COMMIT_HASH_PATTERN = /`?\b([0-9a-f]{6,12})\b`?/gi;
-var COMMIT_HINT_PATTERN = /\b(commit(?:ted)?|cherry-?pick(?:ed)?|hash(?:es)?|sha)\b/i;
 var MAX_COMMITS_PER_BLOCK = 5;
 function hasMeaningfulUserText(parts) {
   for (const part of parts) {
@@ -142479,7 +142584,7 @@ function formatBlock(block) {
 function extractCommitHashes(text) {
   const hashes = [];
   const seen = new Set;
-  for (const match of text.matchAll(COMMIT_HASH_PATTERN)) {
+  for (const match of text.matchAll(createCommitHashExtractPattern())) {
     const hash = match[1]?.toLowerCase();
     if (!hash || seen.has(hash))
       continue;
@@ -142492,10 +142597,10 @@ function extractCommitHashes(text) {
 }
 function compactTextForSummary(text, role) {
   const commitHashes = role === "assistant" ? extractCommitHashes(text) : [];
-  if (commitHashes.length === 0 || !COMMIT_HINT_PATTERN.test(text)) {
+  if (commitHashes.length === 0 || !COMMIT_VERB_PATTERN.test(text)) {
     return { text, commitHashes };
   }
-  const withoutHashes = text.replace(COMMIT_HASH_PATTERN, "").replace(/\(\s*\)/g, "").replace(/\s+,/g, ",").replace(/,\s*,+/g, ", ").replace(/\s{2,}/g, " ").replace(/\s+([,.;:])/g, "$1").trim();
+  const withoutHashes = text.replace(createCommitHashExtractPattern(), "").replace(/\(\s*\)/g, "").replace(/\s+,/g, ",").replace(/,\s*,+/g, ", ").replace(/\s{2,}/g, " ").replace(/\s+([,.;:])/g, "$1").trim();
   return {
     text: withoutHashes.length > 0 ? withoutHashes : text,
     commitHashes
@@ -143907,11 +144012,6 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "message_history_index", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
   ensureColumn(db, "workspaces", "share_categories", `TEXT NOT NULL DEFAULT '["CONSTRAINTS"]'`);
 }
-function healAllNullColumns(db) {
-  healNullTextColumns(db);
-  healNullIntegerColumns(db);
-  healMissingMemoryBlockIds(db);
-}
 var CHANNEL2_CLAIM_TTL_MS = 120000;
 function healWedgedChannel2Claims(db) {
   try {
@@ -143919,95 +144019,6 @@ function healWedgedChannel2Claims(db) {
     db.prepare("UPDATE session_meta SET channel2_nudge_state = 'pending', channel2_nudge_claimed_at = 0 WHERE channel2_nudge_state = 'claimed' AND (channel2_nudge_claimed_at IS NULL OR channel2_nudge_claimed_at = 0 OR channel2_nudge_claimed_at <= ?)").run(staleBefore);
   } catch {}
 }
-function healMissingMemoryBlockIds(db) {
-  try {
-    db.prepare("UPDATE session_meta SET memory_block_cache = '' WHERE memory_block_cache != '' AND (memory_block_ids IS NULL OR memory_block_ids = '') AND memory_block_count > 0").run();
-  } catch {}
-}
-function healNullTextColumns(db) {
-  const columns = [
-    ["cache_ttl", ""],
-    ["last_nudge_band", ""],
-    ["last_nudge_level", ""],
-    ["last_transform_error", ""],
-    ["nudge_anchor_message_id", ""],
-    ["nudge_anchor_text", ""],
-    ["sticky_turn_reminder_text", ""],
-    ["sticky_turn_reminder_message_id", ""],
-    ["note_nudge_trigger_message_id", ""],
-    ["note_nudge_sticky_text", ""],
-    ["note_nudge_sticky_message_id", ""],
-    ["last_todo_state", ""],
-    ["todo_synthetic_call_id", ""],
-    ["todo_synthetic_anchor_message_id", ""],
-    ["todo_synthetic_state_json", ""],
-    ["system_prompt_hash", ""],
-    ["stripped_placeholder_ids", ""],
-    ["stale_reduce_stripped_ids", ""],
-    ["processed_image_stripped_ids", ""],
-    ["memory_block_cache", ""],
-    ["memory_block_ids", ""],
-    ["compaction_marker_state", ""],
-    ["key_files", ""]
-  ];
-  for (const [column, fallback] of columns) {
-    try {
-      db.prepare(`UPDATE session_meta SET ${column} = ? WHERE ${column} IS NULL`).run(fallback);
-    } catch (_error) {}
-  }
-}
-function healNullIntegerColumns(db) {
-  const columns = [
-    ["times_execute_threshold_reached", 0],
-    ["compartment_in_progress", 0],
-    ["historian_failure_count", 0],
-    ["cleared_reasoning_through_tag", 0],
-    ["memory_block_count", 0],
-    ["system_prompt_tokens", 0],
-    ["conversation_tokens", 0],
-    ["tool_call_tokens", 0],
-    ["note_nudge_trigger_pending", 0],
-    ["observed_safe_input_tokens", 0],
-    ["cache_alert_sent", 0],
-    ["new_work_tokens", 0],
-    ["total_input_tokens", 0],
-    ["last_emergency_input_sample", 0],
-    ["channel2_nudge_claimed_at", 0],
-    ["last_usage_context_limit", 0],
-    ["prior_boundary_ordinal", 1],
-    ["protected_tail_policy_version", 0],
-    ["protected_tail_drain_window_started_at", 0],
-    ["protected_tail_drain_tokens", 0],
-    ["recovery_no_eligible_head_count", 0],
-    ["force_emergency_bypass_window_start", 0],
-    ["force_emergency_bypass_used", 0],
-    ["emergency_drain_active", 0],
-    ["historian_drain_failure_at", 0]
-  ];
-  for (const [column, fallback] of columns) {
-    try {
-      db.prepare(`UPDATE session_meta SET ${column} = ? WHERE ${column} IS NULL`).run(fallback);
-    } catch (_error) {}
-  }
-}
-function ensureColumn(db, table, column, definition) {
-  if (!/^[a-z][a-z0-9_]*$/.test(table) || !/^[a-z][a-z0-9_]*$/.test(column) || !/^[A-Z0-9_"'(),[\]\s]+$/i.test(definition)) {
-    throw new Error(`Unsafe schema identifier: ${table}.${column} ${definition}`);
-  }
-  const rows = db.prepare(`PRAGMA table_info(${table})`).all();
-  if (rows.some((row) => row.name === column)) {
-    return;
-  }
-  try {
-    db.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${definition}`);
-  } catch (err) {
-    const recheck = db.prepare(`PRAGMA table_info(${table})`).all();
-    if (recheck.some((row) => row.name === column)) {
-      return;
-    }
-    throw err;
-  }
-}
 function openDatabase(dbPathOrOptions) {
   const options = typeof dbPathOrOptions === "string" ? { dbPath: dbPathOrOptions } : dbPathOrOptions;
   const explicitDbPath = options?.dbPath !== undefined;
@@ -159431,7 +159442,6 @@ var CANONICAL_DREAM_TASKS = [
   "refresh-primers"
 ];
 var AGENTIC_DREAM_TASKS = ["curate", "maintain-docs"];
-var AGENTIC_SET = new Set(AGENTIC_DREAM_TASKS);
 var MEMORY_DOMAIN_TASKS = [
   "map-memories",
   "verify",
@@ -159667,6 +159677,7 @@ var MagicContextConfigSchema = exports_external.object({
   }).describe("Embedding provider configuration"),
   temporal_awareness: exports_external.boolean().default(true).describe('Inject wall-clock gap markers (<!-- +Xm -->) between user messages where > 5 min elapsed since the previous message, and add start/end date attributes on compartments. Gives the agent a sense of session pacing and "how long ago" across multi-day sessions. Graduated from experimental.temporal_awareness; default: true (set false to opt out).'),
   keep_subagents: exports_external.boolean().default(false).describe("Debug: keep the child sessions Magic Context spawns for its own subagents (historian, dreamer, sidekick, memory-migration) instead of deleting them on success. Useful for short-term inspection/data collection — their full transcript (prompt, tool calls, token usage, output) stays in the host session store. Kept sessions accumulate until manually cleared; leave false for normal use. Requires a restart to take effect."),
+  smart_drops: exports_external.boolean().default(false).describe("Content-aware reclaim of provably-superseded tool output, layered on the existing execute-pass auto-drop. When on: superseded todowrite (keep newest 1), spent ctx_reduce (keep newest 5), and zero-value meta (bash_status, bash_kill, ctx_note read/dismiss) outputs are dropped; older edits to a file are compressed to a filePath-preserving marker while the newest edit per file stays full. Only acts on passes already busting the cache, so it never originates a cache bust. Honors the protected-tag reserve. Experimental: opt-in, default off until cache stability is proven; when off the wire is byte-identical to the positional-only reclaim. Requires a restart."),
   caveman_text_compression: exports_external.object({
     enabled: exports_external.boolean().default(false).describe("Apply deterministic caveman-style text compression to old conversation text. Only active when ctx_reduce_enabled=false. Compresses user/assistant text in oldest-first tiers: ultra (oldest 20%), full, lite, untouched (newest 40%)."),
     min_chars: exports_external.number().min(100).max(1e4).default(500).describe("Text parts shorter than this (characters) stay untouched. Min 100, max 10000. Default: 500.")
@@ -163577,6 +163588,36 @@ function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
+// ../plugin/src/hooks/magic-context/edit-marker.ts
+var TRUNCATION_SENTINEL = "...[truncated]";
+var EDIT_REGION_HINT_LEN = 40;
+var PATH_KEYS = new Set(["filePath", "file_path", "path"]);
+var DIFF_KEYS = new Set(["oldString", "newString", "content", "old_string", "new_string"]);
+function safeSlice(str, maxLen) {
+  if (str.length <= maxLen)
+    return str;
+  const lastCharCode = str.charCodeAt(maxLen - 1);
+  if (lastCharCode >= 55296 && lastCharCode <= 56319) {
+    return str.slice(0, maxLen - 1);
+  }
+  return str.slice(0, maxLen);
+}
+function isEditTool(name2) {
+  return name2 === "edit" || name2 === "write";
+}
+function applyEditMarkerToInput(input) {
+  for (const key of Object.keys(input)) {
+    if (PATH_KEYS.has(key))
+      continue;
+    const value = input[key];
+    if (typeof value !== "string" || !DIFF_KEYS.has(key))
+      continue;
+    if (value.endsWith(TRUNCATION_SENTINEL))
+      continue;
+    input[key] = value.length > EDIT_REGION_HINT_LEN ? `${safeSlice(value, EDIT_REGION_HINT_LEN)}${TRUNCATION_SENTINEL}` : value;
+  }
+}
+
 // ../plugin/src/hooks/magic-context/tool-drop-target.ts
 var IGNORE_PART_TYPES = new Set([
   "thinking",
@@ -171706,7 +171747,7 @@ function toTagEntry(row) {
     messageId: row.message_id,
     type,
     status,
-    dropMode: row.drop_mode === "truncated" ? "truncated" : "full",
+    dropMode: row.drop_mode === "truncated" ? "truncated" : row.drop_mode === "edit_marker" ? "edit_marker" : "full",
     toolName: row.tool_name ?? null,
     inputByteSize: row.input_byte_size ?? 0,
     byteSize: row.byte_size,
@@ -172613,7 +172654,7 @@ function createCtxNoteTool(deps) {
     parameters: ParamsSchema3,
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
       const sessionId = ctx.sessionManager.getSessionId();
-      const action2 = params.action ?? (typeof params.content === "string" ? "write" : "read");
+      const action2 = params.action ?? (params.content?.trim() ? "write" : "read");
       if (action2 === "write") {
         const content = params.content?.trim();
         if (!content)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cortexkit/pi-magic-context",
-	"version": "0.28.0",
+	"version": "0.29.1",
 	"type": "module",
 	"description": "Pi coding agent extension for Magic Context — cross-session memory and context management",
 	"main": "dist/index.js",