@cortexkit/pi-magic-context 0.27.3 → 0.29.0

package/dist/subagent-entry.js

@@ -9923,6 +9923,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 +142385,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 +142488,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 +142501,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
@@ -144835,6 +144844,10 @@ function stripUnsafeProjectConfigFields(projectRaw) {
     delete projectRaw.auto_update;
     warnings.push("Ignoring auto_update from project config (security: this setting only honors user-level config).");
   }
+  if ("language" in projectRaw) {
+    delete projectRaw.language;
+    warnings.push("Ignoring language from project config (security: output language is a user-level setting).");
+  }
   if ("sqlite" in projectRaw) {
     delete projectRaw.sqlite;
     warnings.push("Ignoring sqlite.* from project config (security: SQLite cache/mmap PRAGMAs apply to the " + "process-global shared database handle; only user-level config may set them).");
@@ -159180,6 +159193,95 @@ function date4(params) {
 
 // ../../node_modules/.bun/zod@4.4.3/node_modules/zod/v4/classic/external.js
 config(en_default());
+// ../plugin/src/agents/language-directive.ts
+var ENGLISH_LANGUAGE_NAMES = new Intl.DisplayNames(["en"], {
+  type: "language",
+  fallback: "none"
+});
+function resolveLanguageName(language) {
+  const code = typeof language === "string" ? language.trim().toLowerCase() : "";
+  if (!/^[a-z]{2}$/.test(code))
+    return "";
+  let english;
+  try {
+    english = ENGLISH_LANGUAGE_NAMES.of(code) ?? undefined;
+  } catch {
+    return "";
+  }
+  if (!english)
+    return "";
+  let endonym;
+  try {
+    endonym = new Intl.DisplayNames([code], { type: "language", fallback: "none" }).of(code) ?? undefined;
+  } catch {
+    endonym = undefined;
+  }
+  return endonym && endonym !== english ? `${english} (${endonym})` : english;
+}
+function isValidLanguageCode(language) {
+  return resolveLanguageName(language) !== "";
+}
+function buildContentLanguageDirective(language, options = {}) {
+  const target = resolveLanguageName(language);
+  if (!target)
+    return "";
+  const lines = [
+    "## Output language",
+    "",
+    `Write human-readable prose you author in: ${target}.`,
+    "",
+    "Do not translate or rename structural tokens. Copy required output schemas exactly:",
+    "- XML tag names, XML attribute names, JSON keys, tool names, tool-call argument keys, enum values, booleans/null, and required sentinel strings stay in English exactly as shown.",
+    "- Keep code identifiers, file paths, commands, config keys, CLI flags, URLs, commit hashes, model/provider IDs, stack traces, diagnostics, and transcript role markers such as U:, A:, and TC: verbatim.",
+    "- Localize only free-text prose values/content: summaries, memory text, explanations, titles, observations, and answers — unless the prompt says to preserve original wording.",
+    "",
+    "These literal values must remain English when used:",
+    "PROJECT_RULES, ARCHITECTURE, CONSTRAINTS, CONFIG_VALUES, NAMING;",
+    "causal_incident, trajectory_correction;",
+    "feature, design, docs, release, investigation, bug, refactor, infra;",
+    "memory, observation; true, false; No relevant memories found.",
+    "",
+    "Preserve the required output shape. Do not add commentary outside the requested XML/JSON/tool output."
+  ];
+  if (options.preserveUserQuotes) {
+    lines.push("", `Preserve U: lines and directly quoted user text in their original source language; write the surrounding summary prose in ${target}.`);
+  }
+  if (options.retrospective) {
+    lines.push("", `Write the lesson text in ${target}; paraphrase source text and never quote the user.`);
+  }
+  return lines.join(`
+`);
+}
+function withContentLanguageDirective(systemPrompt, language, options = {}) {
+  const directive = buildContentLanguageDirective(language, options);
+  return directive ? `${systemPrompt}
+
+${directive}` : systemPrompt;
+}
+function buildMigrationLanguageDirective(language) {
+  const target = resolveLanguageName(language);
+  if (!target)
+    return "";
+  return [
+    "## Output language",
+    "",
+    "Preserve each migrated memory's existing language — do NOT translate a memory just because an output language is set. When merging memories written in different languages, use the language of the clearest / source-majority memory; otherwise keep the source phrasing. Only the category re-mapping changes."
+  ].join(`
+`);
+}
+function withMigrationLanguageDirective(systemPrompt, language) {
+  const directive = buildMigrationLanguageDirective(language);
+  return directive ? `${systemPrompt}
+
+${directive}` : systemPrompt;
+}
+function buildPrimaryLanguageDirective(language) {
+  const target = resolveLanguageName(language);
+  if (!target)
+    return "";
+  return `Use ${target} for your natural-language replies to the user unless the user explicitly asks for another language. Keep code, identifiers, file paths, commands, logs, and quoted text verbatim.`;
+}
+
 // ../plugin/src/features/magic-context/defaults.ts
 var DEFAULT_PROTECTED_TAGS = 20;
 
@@ -159536,6 +159638,7 @@ var EmbeddingConfigSchema = BaseEmbeddingConfigSchema.transform((data) => {
 var MagicContextConfigSchema = exports_external.object({
   enabled: exports_external.boolean().default(true).describe("Enable magic context (default: true)"),
   auto_update: exports_external.boolean().optional().describe("Enable automatic npm self-update checks for the OpenCode plugin. Security: USER-only in config loader, so hostile project configs cannot suppress updates."),
+  language: exports_external.string().trim().toLowerCase().refine((s) => isValidLanguageCode(s), 'language must be a 2-letter ISO 639-1 code (e.g. "tr", "es", "de")').optional().describe("Output language for Magic Context's generated content and guidance, as a " + '2-letter ISO 639-1 code (e.g. "tr", "es", "de", "ja", "pt"). When set, the ' + "historian, dreamer, sidekick, and the agent-guidance block instruct the model to " + "write its PROSE in this language while keeping all structural tokens (XML tags, " + "the five memory category names, code identifiers, file paths) in English. " + "USER-LEVEL ONLY (ignored in project config for security). Unset = today's " + "behavior (model mirrors the conversation; English scaffolding). Changing it " + "triggers one cache re-materialization; existing compartments/memories keep their " + "original language until naturally rewritten."),
   ctx_reduce_enabled: exports_external.boolean().default(true).describe("When false, ctx_reduce tool is hidden, all nudges disabled, and prompt guidance about ctx_reduce stripped. Heuristic cleanup, compartments, memory, and other features still work. (default: true)"),
   historian: HistorianConfigSchema.describe("Historian agent configuration (model, fallback_models, variant, temperature, maxTokens, permission, two_pass, etc.)"),
   dreamer: DreamerConfigSchema.optional().describe("Dreamer agent + scheduling configuration (model, fallback_models, disable, schedule, tasks, etc.)"),
@@ -159573,6 +159676,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.")
@@ -163483,6 +163587,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",
@@ -171478,6 +171612,9 @@ function getActiveTagTokenAggregate(db, sessionId, protectedTags = 0) {
     nullCount: row?.null_count ?? 0
   };
 }
+var RECLAIM_HINT_EXCLUDED_TOOLS = ["todowrite"];
+var RECLAIM_HINT_MIN_TOKENS = 250;
+var RECLAIM_HINT_EXCLUDED_LIST = RECLAIM_HINT_EXCLUDED_TOOLS.map((name2) => `'${name2.replace(/'/g, "''")}'`).join(", ");
 function getOldestActiveUnprotectedToolTags(db, sessionId, protectedTags = 0, limit = 4) {
   if (limit <= 0)
     return [];
@@ -171487,10 +171624,18 @@ function getOldestActiveUnprotectedToolTags(db, sessionId, protectedTags = 0, li
                     WHERE session_id = ? AND status = 'active'
                     ORDER BY tag_number DESC LIMIT 1 OFFSET ?
                 )` : "";
-  const params = protectedTags > 0 ? [sessionId, sessionId, protectedTags - 1, boundedLimit] : [sessionId, boundedLimit];
+  const excludeStateTools = RECLAIM_HINT_EXCLUDED_LIST ? `AND (tool_name IS NULL OR tool_name NOT IN (${RECLAIM_HINT_EXCLUDED_LIST}))` : "";
+  const valueFloor = `AND (
+            (token_count IS NULL AND input_token_count IS NULL)
+            OR (COALESCE(token_count, 0) + COALESCE(input_token_count, 0)) >= ?
+        )`;
+  const params = protectedTags > 0 ? [sessionId, RECLAIM_HINT_MIN_TOKENS, sessionId, protectedTags - 1, boundedLimit] : [sessionId, RECLAIM_HINT_MIN_TOKENS, boundedLimit];
   const rows = db.prepare(`SELECT tag_number, tool_name
              FROM tags
-             WHERE session_id = ? AND status = 'active' AND type = 'tool' ${whereProtected}
+             WHERE session_id = ? AND status = 'active' AND type = 'tool'
+             ${excludeStateTools}
+             ${valueFloor}
+             ${whereProtected}
              ORDER BY tag_number ASC, id ASC
              LIMIT ?`).all(...params);
   return rows.filter((row) => typeof row.tag_number === "number").map((row) => ({
@@ -171601,7 +171746,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,

package/package.json

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