@cortexkit/pi-magic-context 0.27.3 → 0.29.0

package/dist/index.js

@@ -15568,7 +15568,7 @@ function compareTaskOrder(a, b) {
 }
 
 // ../plugin/src/features/magic-context/dreamer/task-config.ts
-function buildDreamTaskRuntimeConfigs(dreamer) {
+function buildDreamTaskRuntimeConfigs(dreamer, language) {
   const tasks = dreamer.tasks ?? {};
   return CANONICAL_DREAM_TASKS.map((task) => {
     const t = tasks[task] ?? {
@@ -15584,6 +15584,7 @@ function buildDreamTaskRuntimeConfigs(dreamer) {
       model,
       fallbackModels,
       thinkingLevel,
+      language,
       timeoutMinutes: t.timeout_minutes ?? 20,
       promotionThreshold: t.promotion_threshold
     };
@@ -15905,6 +15906,17 @@ function getRawSessionMessageCountFromDb(db, sessionId) {
   return typeof row?.count === "number" ? row.count : 0;
 }
 
+// ../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");
+}
+
 // ../../node_modules/.bun/ai-tokenizer@1.0.6/node_modules/ai-tokenizer/dist/index.js
 function _typeof(o) {
   "@babel/helpers - typeof";
@@ -148344,8 +148356,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) {
@@ -148449,7 +148459,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;
@@ -148462,10 +148472,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
@@ -148687,6 +148697,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",
@@ -155056,6 +155096,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 [];
@@ -155065,10 +155108,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) => ({
@@ -155179,7 +155230,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,
@@ -156335,13 +156386,10 @@ function compareSemverCore(a, b) {
 
 // ../plugin/src/shared/announcement.ts
 init_data_path();
-var ANNOUNCEMENT_VERSION = "0.27.0";
+var ANNOUNCEMENT_VERSION = "0.29.0";
 var ANNOUNCEMENT_FEATURES = [
-  "Dreamer V2: each maintenance task now runs on its own schedule (cron), with its own model. Configure them in setup, the dashboard, or magic-context.jsonc.",
-  "New 'classify' task scores each memory's importance so the most relevant stay in context as your work shifts; new 'retrospective' learns from moments you had to correct or re-explain. Both cache-safe, on by default, off anytime.",
-  "New Primers: durable answers to the questions that keep coming up about your project, kept current by the dreamer investigating the actual code.",
-  "Embedding storage no longer wipes your vectors when you change model or endpoint. Different models now coexist, so switching providers keeps your existing vectors.",
-  "Config moved to a shared CortexKit location (~/.config/cortexkit/ and <project>/.cortexkit/). This happens automatically on first run; your old file is preserved."
+  `New 'smart_drops' option (opt-in, off by default): on long, edit-heavy sessions it reclaims more context by dropping tool output a later call made obsolete (superseded edits, old todowrite/ctx_reduce, spent status calls) instead of only the oldest. When off, the prompt is byte-identical to before. Enable with "smart_drops": true.`,
+  "When memory is disabled, the ctx_memory tool and its guidance are no longer shown (they had nothing to write to). ctx_search stays, searching conversation history and git commits."
 ];
 var ANNOUNCEMENT_FOOTER = "Join us on Discord: https://discord.gg/F2uWxjGnU";
 var STATE_FILENAME = "last_announced_version";
@@ -156403,6 +156451,95 @@ function shouldKeepSubagents() {
 // src/index.ts
 init_logger();
 
+// ../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/sidekick/core.ts
 var SIDEKICK_SYSTEM_PROMPT = `You are Sidekick, a focused memory-retrieval subagent for an AI coding assistant.
 
@@ -157123,7 +157260,7 @@ function registerCtxAugCommand(pi, config) {
       sessionLog(sessionLabel, "/ctx-aug: project identity", projectIdentity);
       const result = await runner.run({
         agent: "sidekick",
-        systemPrompt: config.systemPrompt ?? SIDEKICK_SYSTEM_PROMPT,
+        systemPrompt: withContentLanguageDirective(config.systemPrompt ?? SIDEKICK_SYSTEM_PROMPT, config.language),
         userMessage: prompt,
         model: config.model,
         fallbackModels: config.fallbackModels,
@@ -172319,6 +172456,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.)"),
@@ -172356,6 +172494,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.")
@@ -176175,6 +176314,7 @@ var MAINTAIN_DOCS_SYSTEM_PROMPT = `You are a documentation maintainer for the ma
 
 ## Rules
 - **NEVER touch protected regions.** Any content between \`<!-- mc:protected START ... -->\` and \`<!-- mc:protected END -->\` is hand-authored and cache-critical. Reproduce it BYTE-FOR-BYTE — do not edit, reword, reorder, summarize, trim, or drop a single line, and keep the marker comments. Only a human edits that region.
+- **Preserve an existing doc's structure, voice, and density.** When a doc already exists, it is the source of truth for shape: keep its headings, ordering, level of detail, and writing style. Make the SMALLEST edits that bring it back in sync with the code. NEVER reshape hand-written prose into a generic template, collapse a dense section into bullet stubs, or drop hard-won detail (specific invariants, edge cases, mechanism descriptions) because it does not fit a standard layout. A doc denser and more specific than a template is BETTER, not worse: leave it that way.
 - **Be prescriptive** ("Use X pattern", not "X pattern is used"). **Current state only** — no temporal language, no history.
 - **Verify before writing** — read the actual files, never guess. All file paths in the docs must point to files that exist.`;
 var REVIEW_USER_MEMORIES_SYSTEM_PROMPT = `You are a user-profile reviewer for the magic-context system. You run during a scheduled dream window to decide which recurring behavioral observations about the human user are real, persistent patterns worth keeping in their global user profile.
@@ -176290,7 +176430,7 @@ Return only XML in this exact shape:
 function buildMaintainDocsPrompt(projectPath, lastDreamAt, existingDocs) {
   const hasAny = existingDocs.architecture || existingDocs.structure;
   const gitSinceClause = lastDreamAt ? `Run \`git log --oneline --since="${new Date(Number(lastDreamAt)).toISOString()}"\` to see what changed since the last dream.` : "No previous dream timestamp — treat this as a full analysis.";
-  const modeIntro = hasAny ? `Some docs already exist. Update only the sections affected by recent changes. Do NOT rewrite unchanged sections.` : `No docs exist yet. Create both ARCHITECTURE.md and STRUCTURE.md from scratch using the templates below.`;
+  const modeIntro = hasAny ? `Some docs already exist and are the source of truth for shape. Make SURGICAL \`edit\` changes to only the sections affected by recent code changes; preserve every other section, the existing structure, and the existing density verbatim. Do NOT regenerate a whole file, do NOT reshape prose into a template, and do NOT use the templates below (they are for creation only). If nothing material changed, change nothing.` : `No docs exist yet. Create both ARCHITECTURE.md and STRUCTURE.md from scratch using the templates below as a STARTING shape, then go deeper than the template wherever the code warrants it.`;
   return `## Task: Maintain Codebase Documentation
 
 **Project:** ${projectPath}
@@ -176305,15 +176445,16 @@ ${modeIntro}
 ### Process
 
 1. **Check what changed.** ${gitSinceClause}
-2. **Read existing docs** (if they exist) to understand current state.
+2. **Read existing docs** (if they exist) IN FULL to understand their current structure, depth, and voice; you will preserve all of it except what code changes force you to touch.
 3. **Explore the codebase** to verify and update:
    - Directory structure: \`find . -type d -not -path '*/node_modules/*' -not -path '*/.git/*' -not -path '*/dist/*' | head -60\`
    - Entry points: \`ls src/index.* src/main.* 2>/dev/null\`
    - Key imports: \`grep -r "^import\\|^export" src/ --include="*.ts" | head -80\`
-4. **Write or update** using the Write tool. Always write to project root, NOT to .planning/.
+4. **Apply the change.** If the doc EXISTS: use \`edit\` for the specific sections that drifted, never rewrite the whole file with \`write\`. If the doc is MISSING: create it with \`write\`. Always at project root, NOT \`.planning/\`.
 
 ### Rules
 - **NEVER touch protected regions**: any content between \`<!-- mc:protected START ... -->\` and \`<!-- mc:protected END -->\` is hand-authored and cache-critical. Reproduce it BYTE-FOR-BYTE in your rewrite — do not edit, reword, reorder, summarize, trim, or drop a single line of it, and keep the marker comments themselves. Only a human edits that region.
+- **Preserve existing structure and density**: when a doc exists, keep its headings, ordering, level of detail, and voice. Make the smallest edits that re-sync it with the code. NEVER flatten dense hand-written prose into the generic template, collapse a detailed section into bullet stubs, or drop specific invariants/edge-cases/mechanism detail because it does not match a standard layout. Denser and more specific than the template is BETTER.
 - **Be prescriptive**: "Use X pattern" not "X pattern is used"
 - **Always include file paths** in backticks
 - **Write current state only**: no temporal language, no history
@@ -176616,7 +176757,7 @@ If no promotions are warranted, return empty arrays. Always consume reviewed can
       query: { directory: args.sessionDirectory },
       body: {
         agent: DREAMER_REVIEWER_AGENT,
-        system: REVIEW_USER_MEMORIES_SYSTEM_PROMPT,
+        system: withContentLanguageDirective(REVIEW_USER_MEMORIES_SYSTEM_PROMPT, args.language),
         ...modelBodyField(args.model),
         parts: [{ type: "text", text: prompt, synthetic: true }]
       }
@@ -177718,10 +177859,23 @@ function getAsyncModule() {
   asyncModulePromise ??= newQuickJSAsyncWASMModuleFromVariant(import_quickjs_singlefile_cjs_release_asyncify.default);
   return asyncModulePromise;
 }
+var sandboxRunChain = Promise.resolve();
+function withSandboxLock(fn) {
+  const run = sandboxRunChain.then(fn, fn);
+  sandboxRunChain = run.then(() => {
+    return;
+  }, () => {
+    return;
+  });
+  return run;
+}
 var DEFAULT_TIMEOUT_MS = 2000;
 var DEFAULT_HEAP_LIMIT_BYTES = 8 * 1024 * 1024;
 var DEFAULT_STACK_LIMIT_BYTES = 512 * 1024;
 async function runCompiledSmartNoteCheck(options) {
+  return withSandboxLock(() => runCompiledSmartNoteCheckLocked(options));
+}
+async function runCompiledSmartNoteCheckLocked(options) {
   const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
   const controller = new AbortController;
   const externalAbort = () => controller.abort(options.signal?.reason);
@@ -179430,7 +179584,7 @@ async function refreshOnePrimer(args, primer, sliceMs, signal) {
       query: { directory: args.sessionDirectory },
       body: {
         agent: DREAMER_PRIMER_INVESTIGATOR_AGENT,
-        system: PRIMER_INVESTIGATOR_SYSTEM_PROMPT,
+        system: withContentLanguageDirective(PRIMER_INVESTIGATOR_SYSTEM_PROMPT, args.language),
         ...modelBodyField(args.model),
         parts: [{ type: "text", text: prompt, synthetic: true }]
       }
@@ -180211,7 +180365,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
       query: { directory: args.sessionDirectory },
       body: {
         agent: DREAMER_MEMORY_MAPPER_AGENT,
-        system: VERIFY_SYSTEM_PROMPT,
+        system: withContentLanguageDirective(VERIFY_SYSTEM_PROMPT, args.language),
         ...modelBodyField(args.model),
         parts: [{ type: "text", text: prompt, synthetic: true }]
       }
@@ -180491,7 +180645,8 @@ function createDreamTaskExecutor(deps) {
           deadline,
           promotionThreshold: config2.promotionThreshold ?? 3,
           model: config2.model,
-          fallbackModels: config2.fallbackModels
+          fallbackModels: config2.fallbackModels,
+          language: config2.language ?? deps.language
         });
         recordRun("completed", null);
         log(`[dreamer] review-user-memories: promoted=${result.promoted} merged=${result.merged} dismissed=${result.dismissed}`);
@@ -180527,7 +180682,8 @@ function createDreamTaskExecutor(deps) {
           deadline,
           forceBroad: config2.task === "verify-broad",
           model: config2.model,
-          fallbackModels: config2.fallbackModels
+          fallbackModels: config2.fallbackModels,
+          language: config2.language ?? deps.language
         });
         recordRun("completed", null, {
           memoryChanges: computeMemoryDelta(memoryBefore)
@@ -180579,6 +180735,7 @@ function createDreamTaskExecutor(deps) {
           deadline,
           model: config2.model,
           fallbackModels: config2.fallbackModels,
+          language: config2.language ?? deps.language,
           rawProviderFactory: deps.primerRawProviderFactory
         });
         recordRun("completed", null);
@@ -180696,6 +180853,7 @@ function retrospectiveEventsForSessions(db, sessionIds) {
     try {
       for (const event of getCompartmentEvents(db, sessionId)) {
         if (event.kind !== "causal_incident" && event.kind !== "trajectory_correction") {
+          log(`[dreamer] dropping event: unknown kind="${event.kind}"`);
           continue;
         }
         events.push({
@@ -180820,7 +180978,9 @@ async function runRetrospectiveTask(config2, ctx, helpers) {
     const frictionWindow = renderFrictionWindow(messages, flagged.map((message) => message.ordinal));
     const eventSessionIds = new Set(messages.map((message) => message.sessionId));
     const events = retrospectiveEventsForSessions(db, eventSessionIds);
-    const deepenRun = await runChildTurn(RETROSPECTIVE_SYSTEM_PROMPT, buildRetrospectivePrompt({ projectPath: projectIdentity, frictionWindow, events }));
+    const deepenRun = await runChildTurn(withContentLanguageDirective(RETROSPECTIVE_SYSTEM_PROMPT, config2.language ?? deps.language, {
+      retrospective: true
+    }), buildRetrospectivePrompt({ projectPath: projectIdentity, frictionWindow, events }));
     if (leaseLost)
       throw new Error("Dream lease lost during retrospective");
     const sourceSessionId = flagged[0]?.sessionId ?? userMessages[0]?.sessionId ?? "retrospective";
@@ -180906,7 +181066,7 @@ async function runAgenticTask(config2, ctx, helpers) {
       query: { directory: docsDir },
       body: {
         agent: task === "maintain-docs" ? DREAMER_DOCS_AGENT : DREAMER_AGENT,
-        system: task === "maintain-docs" ? MAINTAIN_DOCS_SYSTEM_PROMPT : CURATE_SYSTEM_PROMPT,
+        system: task === "maintain-docs" ? MAINTAIN_DOCS_SYSTEM_PROMPT : withContentLanguageDirective(CURATE_SYSTEM_PROMPT, config2.language ?? deps.language),
         ...modelBodyField(config2.model),
         parts: [{ type: "text", text: taskPrompt, synthetic: true }]
       }
@@ -181788,7 +181948,7 @@ async function sweepProject(reg, origin, db, gitCommitEnabled) {
   }
   try {
     await runCompiledSmartNoteSweep(reg, db);
-    const runtimeConfigs = buildDreamTaskRuntimeConfigs(dreamerConfig);
+    const runtimeConfigs = buildDreamTaskRuntimeConfigs(dreamerConfig, reg.language);
     const executor = createDreamTaskExecutor({
       client: reg.client,
       sessionDirectory: reg.directory,
@@ -181796,7 +181956,8 @@ async function sweepProject(reg, origin, db, gitCommitEnabled) {
       retrospectiveRawProvider: reg.retrospectiveRawProvider ?? ((db2) => new OpenCodeRetrospectiveRawProvider({ contextDb: db2, openOpenCodeDb })),
       primerRawProviderFactory: reg.primerRawProviderFactory,
       userMemoryCollectionEnabled: userMemoryCollectionEnabled(dreamerConfig),
-      ensureProjectRegistered: reg.ensureRegistered
+      ensureProjectRegistered: reg.ensureRegistered,
+      language: reg.language
     });
     const ran = await runDueTasksForProject({
       db,
@@ -182349,6 +182510,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).");
@@ -183404,6 +183569,7 @@ function registerPiDreamerProject(opts) {
     projectIdentity: opts.projectIdentity,
     client,
     dreamerConfig: opts.config,
+    language: opts.language,
     gitCommitIndexing: opts.gitCommitIndexing,
     ensureRegistered: ensureProjectRegisteredFromPiDirectory,
     retrospectiveRawProvider: () => new PiRetrospectiveRawProvider({ projectCwd: opts.projectDir }),
@@ -183418,7 +183584,7 @@ function registerPiDreamerProject(opts) {
   const runManual = async (task) => runManualDream({
     db: opts.db,
     projectIdentity: opts.projectIdentity,
-    tasks: buildDreamTaskRuntimeConfigs(opts.config),
+    tasks: buildDreamTaskRuntimeConfigs(opts.config, opts.language),
     executor: createDreamTaskExecutor({
       client,
       sessionDirectory: opts.projectDir,
@@ -183428,7 +183594,8 @@ function registerPiDreamerProject(opts) {
       }),
       primerRawProviderFactory: createPiPrimerRawProviderFactory(),
       userMemoryCollectionEnabled: userMemoryCollectionEnabled(opts.config),
-      ensureProjectRegistered: ensureProjectRegisteredFromPiDirectory
+      ensureProjectRegistered: ensureProjectRegisteredFromPiDirectory,
+      language: opts.language
     }),
     task
   });
@@ -184540,7 +184707,7 @@ var RECENT_TOOL_SKELETON_WINDOW = 20;
 function buildReplacementContent(tagId) {
   return `[dropped §${tagId}§]`;
 }
-function applyPendingOperations(sessionId, db, targets, protectedTags = 0, preloadedTags, preloadedPendingOps, syntheticPendingOps = []) {
+function applyPendingOperations(sessionId, db, targets, protectedTags = 0, preloadedTags, preloadedPendingOps, syntheticPendingOps = [], editMarkerTagIds = new Set) {
   let didMutateMessage = false;
   db.transaction(() => {
     const tags = preloadedTags ?? getTagsBySession(db, sessionId);
@@ -184571,7 +184738,15 @@ function applyPendingOperations(sessionId, db, targets, protectedTags = 0, prelo
       }
       let shouldPersistDrop = false;
       if (isToolTag) {
-        if (skeletonWindow.has(pendingOp.tagId)) {
+        if (editMarkerTagIds.has(pendingOp.tagId)) {
+          const markResult = target?.editMarker?.() ?? "absent";
+          if (markResult === "incomplete" || markResult === "absent") {
+            continue;
+          }
+          didMutateMessage = true;
+          updateTagDropMode(db, sessionId, pendingOp.tagId, "edit_marker");
+          shouldPersistDrop = true;
+        } else if (skeletonWindow.has(pendingOp.tagId)) {
           const truncResult = target?.truncate?.() ?? "absent";
           if (truncResult === "incomplete" || synthetic && truncResult !== "truncated") {
             continue;
@@ -184616,7 +184791,12 @@ function applyFlushedStatuses(sessionId, db, targets, preloadedTags) {
     if (tag.status === "dropped") {
       const target = targets.get(tag.tagNumber);
       if (tag.type === "tool") {
-        if (tag.dropMode === "truncated") {
+        if (tag.dropMode === "edit_marker") {
+          const markResult = target?.editMarker?.() ?? "absent";
+          if (markResult === "truncated") {
+            didMutateMessage = true;
+          }
+        } else if (tag.dropMode === "truncated") {
           const truncResult = target?.truncate?.() ?? "absent";
           if (truncResult === "truncated") {
             didMutateMessage = true;
@@ -186213,6 +186393,7 @@ function channel1RefireTokens(workingWindowTokens) {
 var S_GENTLE = 0.2;
 var S_FIRM = 0.4;
 var S_URGENT = 0.65;
+var CHANNEL1_PRESSURE_FLOOR = 0.8;
 var LEVEL_RANK = { gentle: 1, firm: 2, urgent: 3 };
 var DROP_SENTINELS = ["[dropped", "[truncated"];
 function isDroppedToolOutput(output) {
@@ -186223,7 +186404,8 @@ function toolOutputTokens(output) {
   return Math.round(byteSize(output) * TOKENS_PER_BYTE);
 }
 function decideChannel1(input) {
-  const { undroppedTokens, pressure, workingWindowTokens, hasRecentReduce } = input;
+  const { undroppedTokens, workingWindowTokens, hasRecentReduce } = input;
+  const pressure = Math.min(1, Math.max(0, input.pressure));
   const resetCycle = hasRecentReduce || undroppedTokens < input.lastNudgeUndropped;
   const lastNudge = resetCycle ? 0 : input.lastNudgeUndropped;
   const lastLevel = resetCycle ? "" : input.lastNudgeLevel;
@@ -186238,8 +186420,10 @@ function decideChannel1(input) {
     return quiet();
   if (undroppedTokens < CHANNEL1_FLOOR_TOKENS)
     return quiet();
-  const budget = workingWindowTokens > 0 ? workingWindowTokens : undroppedTokens || 1;
-  const severity = undroppedTokens / budget * pressure;
+  if (pressure < CHANNEL1_PRESSURE_FLOOR)
+    return quiet();
+  const denom = Math.max(input.estimatedInputTokens, 1);
+  const severity = Math.min(1, undroppedTokens / denom);
   if (severity < S_GENTLE)
     return quiet();
   let level;
@@ -186763,6 +186947,97 @@ function renderMemoryBlockV2(memories, wrapper = "project-memory", renderOptions
 `);
 }
 
+// ../plugin/src/hooks/magic-context/supersession-reclaim.ts
+var TODOWRITE_KEEP = 1;
+var CTX_REDUCE_KEEP = 5;
+var ZERO_VALUE_META_TOOLS = new Set(["bash_status", "bash_kill"]);
+var CTX_NOTE_ZERO_VALUE_ACTIONS = new Set(["read", "dismiss"]);
+function buildSupersessionReclaimOps(input) {
+  const realPendingTagIds = new Set((input.pendingOps ?? []).map((op) => op.tagId));
+  const tags = getActiveTagsBySession(input.db, input.sessionId);
+  const toolTags = tags.filter((tag) => tag.type === "tool" && tag.status === "active").sort((left, right) => right.tagNumber - left.tagNumber);
+  const dropTagIds = [];
+  let todowriteSeen = 0;
+  let ctxReduceSeen = 0;
+  for (const tag of toolTags) {
+    const name2 = tag.toolName;
+    if (!name2)
+      continue;
+    let isTarget = false;
+    if (name2 === "todowrite") {
+      todowriteSeen += 1;
+      isTarget = todowriteSeen > TODOWRITE_KEEP;
+    } else if (name2 === "ctx_reduce") {
+      ctxReduceSeen += 1;
+      isTarget = ctxReduceSeen > CTX_REDUCE_KEEP;
+    } else if (ZERO_VALUE_META_TOOLS.has(name2)) {
+      isTarget = true;
+    } else if (name2 === "ctx_note") {
+      const action = input.targets.get(tag.tagNumber)?.readInput?.()?.action;
+      isTarget = typeof action === "string" && CTX_NOTE_ZERO_VALUE_ACTIONS.has(action);
+    }
+    if (isTarget)
+      dropTagIds.push(tag.tagNumber);
+  }
+  const synthetic = [];
+  for (const tagId of dropTagIds) {
+    if (realPendingTagIds.has(tagId))
+      continue;
+    if (input.targets.get(tagId)?.canDrop?.() !== true)
+      continue;
+    synthetic.push({
+      id: 0,
+      sessionId: input.sessionId,
+      tagId,
+      operation: "drop",
+      queuedAt: 0
+    });
+  }
+  return synthetic;
+}
+function buildEditSupersessionReclaim(input) {
+  const realPendingTagIds = new Set((input.pendingOps ?? []).map((op) => op.tagId));
+  const tags = getActiveTagsBySession(input.db, input.sessionId);
+  const editTags = tags.filter((tag) => tag.type === "tool" && tag.status === "active" && isEditTool(tag.toolName)).sort((left, right) => right.tagNumber - left.tagNumber);
+  const seenFile = new Set;
+  const ops = [];
+  const editMarkerTagIds = new Set;
+  for (const tag of editTags) {
+    const filePath = readFilePath(input.targets.get(tag.tagNumber));
+    if (!filePath)
+      continue;
+    if (!seenFile.has(filePath)) {
+      seenFile.add(filePath);
+      continue;
+    }
+    if (realPendingTagIds.has(tag.tagNumber))
+      continue;
+    if (input.targets.get(tag.tagNumber)?.canDrop?.() !== true)
+      continue;
+    editMarkerTagIds.add(tag.tagNumber);
+    ops.push({
+      id: 0,
+      sessionId: input.sessionId,
+      tagId: tag.tagNumber,
+      operation: "drop",
+      queuedAt: 0
+    });
+  }
+  return { ops, editMarkerTagIds };
+}
+var FILE_PATH_KEYS = ["filePath", "file_path", "path"];
+function readFilePath(target) {
+  const input = target?.readInput?.();
+  if (!input)
+    return null;
+  for (const key of FILE_PATH_KEYS) {
+    const value = input[key];
+    if (typeof value === "string" && value.length > 0)
+      return value;
+  }
+  return null;
+}
+
 // ../plugin/src/hooks/magic-context/tool-reclaim.ts
 function buildSyntheticToolReclaimOps(input) {
   const watermark = Math.max(0, input.watermark);
@@ -187257,9 +187532,35 @@ function buildAggregateTarget(tagId, occurrences) {
       }
       return any2 ? "truncated" : "absent";
     },
+    editMarker() {
+      const sentinel = `[dropped §${tagId}§]`;
+      let any2 = false;
+      for (const occ of occurrences) {
+        if (occ.kind === "tool_use") {
+          const input = occ.part.getToolInput?.();
+          if (input) {
+            const next = { ...input };
+            applyEditMarkerToInput(next);
+            if (occ.part.setToolInput?.(next))
+              any2 = true;
+          }
+        } else if (setToolContentOrText(occ.part, sentinel)) {
+          any2 = true;
+        }
+      }
+      return any2 ? "truncated" : "absent";
+    },
     canDrop() {
       return occurrences.length > 0;
     },
+    readInput() {
+      for (const occ of occurrences) {
+        const input = occ.part.getToolInput?.();
+        if (input)
+          return input;
+      }
+      return null;
+    },
     message: {
       info: { id: messageId, role },
       parts: []
@@ -188555,6 +188856,7 @@ function maybeChannel1ReminderForToolResult(args) {
   const decision = decideChannel1({
     undroppedTokens,
     pressure,
+    estimatedInputTokens: state.lastInputTokens + state.turnToolTokens,
     workingWindowTokens,
     lastNudgeUndropped: getLastNudgeUndropped(db, sessionId),
     lastNudgeLevel: getLastNudgeLevel(db, sessionId),
@@ -188643,8 +188945,6 @@ function maybeDeliverChannel2Pi(pi, db, sessionId, deliverAs = "followUp") {
 
 // src/detect-recent-commit.ts
 var COMMIT_LOOKBACK = 5;
-var COMMIT_HASH_PATTERN2 = /\b[0-9a-f]{7,12}\b/;
-var COMMIT_VERB_PATTERN = /\b(commit|committed|cherry-pick|merge|rebas)/i;
 function detectRecentCommit(messages) {
   let assistantsScanned = 0;
   for (let i = messages.length - 1;i >= 0; i--) {
@@ -188662,8 +188962,7 @@ function detectRecentCommit(messages) {
       continue;
     for (const part of content) {
       if (part && typeof part === "object" && "type" in part && part.type === "text" && "text" in part && typeof part.text === "string") {
-        const text = part.text;
-        if (COMMIT_HASH_PATTERN2.test(text) && COMMIT_VERB_PATTERN.test(text)) {
+        if (textMentionsRecentCommit(part.text)) {
           return true;
         }
       }
@@ -191362,8 +191661,8 @@ function buildHistorianFailureNotice(failureCount, lastError) {
   ].join(`
 `);
 }
-function buildHistorianRepairPrompt(originalPrompt, previousOutput, validationError) {
-  return [
+function buildHistorianRepairPrompt(originalPrompt, previousOutput, validationError, language) {
+  const prompt = [
     originalPrompt,
     "",
     "Your previous XML response was invalid and cannot be persisted.",
@@ -191376,6 +191675,7 @@ function buildHistorianRepairPrompt(originalPrompt, previousOutput, validationEr
     previousOutput
   ].join(`
 `);
+  return withContentLanguageDirective(prompt, language, { preserveUserQuotes: true });
 }
 function validateStoredCompartments(compartments) {
   if (compartments.length === 0) {
@@ -193499,9 +193799,11 @@ ${chunkText}`,
         };
       };
       retainDrainReservationForRetryThrottle = true;
+      const historianSystemPrompt = withContentLanguageDirective(COMPARTMENT_AGENT_SYSTEM_PROMPT, deps.language, { preserveUserQuotes: true });
+      const historianEditorSystemPrompt = withContentLanguageDirective(HISTORIAN_EDITOR_SYSTEM_PROMPT, deps.language, { preserveUserQuotes: true });
       const firstResult = await runner.run({
         agent: HISTORIAN_AGENT_NAME,
-        systemPrompt: COMPARTMENT_AGENT_SYSTEM_PROMPT,
+        systemPrompt: historianSystemPrompt,
         userMessage: prompt,
         model: historianModel,
         fallbackModels,
@@ -193516,10 +193818,10 @@ ${chunkText}`,
       let validatedDraftText = firstResult.ok ? firstResult.assistantText : null;
       if (validatedPass.kind === "validation-failed") {
         sessionLog(sessionId, `historian: first pass validation failed, retrying with repair prompt: ${validatedPass.error}`);
-        const repairPrompt = buildHistorianRepairPrompt(prompt, validatedPass.rawText, validatedPass.error);
+        const repairPrompt = buildHistorianRepairPrompt(prompt, validatedPass.rawText, validatedPass.error, deps.language);
         const repairResult = await runner.run({
           agent: HISTORIAN_AGENT_NAME,
-          systemPrompt: COMPARTMENT_AGENT_SYSTEM_PROMPT,
+          systemPrompt: historianSystemPrompt,
           userMessage: repairPrompt,
           model: historianModel,
           fallbackModels,
@@ -193544,7 +193846,7 @@ ${chunkText}`,
           sessionLog(sessionId, `historian: escalating to configured fallback model ${candidate}`);
           const fbResult = await runner.run({
             agent: HISTORIAN_AGENT_NAME,
-            systemPrompt: COMPARTMENT_AGENT_SYSTEM_PROMPT,
+            systemPrompt: historianSystemPrompt,
             userMessage: prompt,
             model: candidate,
             fallbackModels: undefined,
@@ -193580,7 +193882,7 @@ ${chunkText}`,
           sessionLog(sessionId, "historian two-pass: running editor on draft");
           const editorResult = await runner.run({
             agent: HISTORIAN_AGENT_NAME,
-            systemPrompt: HISTORIAN_EDITOR_SYSTEM_PROMPT,
+            systemPrompt: historianEditorSystemPrompt,
             userMessage: buildHistorianEditorPrompt(draftAssistantText),
             model: historianModel,
             timeoutMs: historianTimeoutMs,
@@ -194338,16 +194640,20 @@ var PARTNER_FRAME_CLOSER_NO_REDUCE = `
 Context is managed for you entirely automatically — there's nothing to prune and no warnings to act on. Stay reasonably concise per operation, and never let context size change *what* work you take on or *how thoroughly* you do it.`;
 var CTX_NOTE_GUIDANCE = `Use \`ctx_note\` ONLY for genuinely future concerns — something to revisit much later, not work coming up in the next few turns (that's already in your active context) and not active multi-step work (use todos for that). Magic Context preserves your full context across both compaction and restarts, so an upcoming restart or "let's come back to this later" is never a reason to take a note — nothing is lost either way. Notes you do take survive compression and resurface at natural work boundaries (after commits, historian runs, todo completion).`;
 var TOOL_HISTORY_GUIDANCE = `Compressed history intentionally omits tool calls and their outputs — summaries like "I edited file X" are historian records, not patterns to replicate. In the live conversation, older tool calls and their results are cleaned up to save context — you may see your own past messages referencing actions without the corresponding tool call or result visible. This is normal context management. ALWAYS use real tool calls; never simulate, fabricate, or inline tool outputs in your text. If there is no tool result message, the action did not happen. NEVER simulate, hallucinate or claim tool calls, command output, search results, file edits, or diffs in plain text as if they actually occurred.`;
-var BASE_INTRO = (protectedTags) => `Messages and tool outputs are tagged with §N§ identifiers (e.g., §1§, §42§).
-Use \`ctx_reduce\` to mark spent tagged content as discardable and reclaim space. Marking is NOT an immediate delete — it queues the content, which stays fully visible until space is actually needed (as soon as the next turn if you're already under pressure, much later if not), so mark a tool output as soon as you're done with it rather than hoarding the call for the end of the turn. The last ${protectedTags} tags are protected (marking one just queues it until it ages out). Syntax: "3-5", "1,2,9", or "1-5,8,12-15".
-Do not announce or narrate \`ctx_reduce\` drops — just call the tool silently. Saying "I'll drop these outputs" wastes tokens the user does not care about.
-${CTX_NOTE_GUIDANCE}
-Use \`ctx_memory\` for durable project knowledge: write what future sessions must know, update/archive/merge the memories you see in \`<project-memory>\` when they drift. Memories persist across sessions and every new session starts with them.
+var MEMORY_GUIDANCE = `Use \`ctx_memory\` for durable project knowledge: write what future sessions must know, update/archive/merge the memories you see in \`<project-memory>\` when they drift. Memories persist across sessions and every new session starts with them.
 **Save to memory proactively**: If you spent multiple turns finding something (a file path, a DB location, a config pattern, a workaround), save it with \`ctx_memory\` so future sessions don't repeat the search. Examples:
 - Found a project's source code path after searching → \`ctx_memory(action="write", category="CONFIG_VALUES", content="OpenCode source is at ~/Work/OSS/opencode")\`
 - Discovered a non-obvious build/test command → \`ctx_memory(action="write", category="PROJECT_RULES", content="Always use scripts/release.sh for releases")\`
-- Learned a constraint the hard way → \`ctx_memory(action="write", category="CONSTRAINTS", content="Dashboard Tauri build needs RGBA PNGs, not grayscale")\`
-Use \`ctx_search\` to search across project memories, indexed git commits, and this session's full conversation history (including compacted parts) from one query.
+- Learned a constraint the hard way → \`ctx_memory(action="write", category="CONSTRAINTS", content="Dashboard Tauri build needs RGBA PNGs, not grayscale")\``;
+function memoryGuidanceBlock(memoryEnabled) {
+  return memoryEnabled ? `${MEMORY_GUIDANCE}
+` : "";
+}
+var BASE_INTRO = (protectedTags, memoryEnabled) => `Messages and tool outputs are tagged with §N§ identifiers (e.g., §1§, §42§).
+Use \`ctx_reduce\` to mark spent tagged content as discardable and reclaim space. Marking is NOT an immediate delete — it queues the content, which stays fully visible until space is actually needed (as soon as the next turn if you're already under pressure, much later if not), so mark a tool output as soon as you're done with it rather than hoarding the call for the end of the turn. The last ${protectedTags} tags are protected (marking one just queues it until it ages out). Syntax: "3-5", "1,2,9", or "1-5,8,12-15".
+Do not announce or narrate \`ctx_reduce\` drops — just call the tool silently. Saying "I'll drop these outputs" wastes tokens the user does not care about.
+${CTX_NOTE_GUIDANCE}
+${memoryGuidanceBlock(memoryEnabled)}Use \`ctx_search\` to search across project memories, indexed git commits, and this session's full conversation history (including compacted parts) from one query.
 Use \`ctx_expand\` to recover the raw conversation behind a \`<compartment>\` summary in \`<session-history>\` — pass its \`start\`/\`end\` attributes when the summary is not enough (exact wording, values, error text).
 **Search before asking the user**: If you can't remember or don't know something that might have been discussed before or stored in project memory, use \`ctx_search\` before asking the user. Examples:
 - Can't remember where a related codebase or dependency lives → \`ctx_search(query="opencode source code path")\`
@@ -194361,13 +194667,8 @@ NEVER drop large ranges blindly (e.g., "1-50"). Review each tag before deciding.
 Keep your user's instructions and intent — never drop a user message for its directive, even an old one. But a large block of pasted content inside a user message (logs, data dumps, long code, attachments) is fair to mark discardable once you've extracted what you need — it stays searchable via \`ctx_search\`.
 NEVER drop assistant text messages unless they are exceptionally large. Your conversation messages are lightweight; only large tool outputs are worth dropping.
 Before your turn finishes, consider using \`ctx_reduce\` to drop large tool outputs you no longer need.`;
-var BASE_INTRO_NO_REDUCE = () => `${CTX_NOTE_GUIDANCE}
-Use \`ctx_memory\` for durable project knowledge: write what future sessions must know, update/archive/merge the memories you see in \`<project-memory>\` when they drift. Memories persist across sessions and every new session starts with them.
-**Save to memory proactively**: If you spent multiple turns finding something (a file path, a DB location, a config pattern, a workaround), save it with \`ctx_memory\` so future sessions don't repeat the search. Examples:
-- Found a project's source code path after searching → \`ctx_memory(action="write", category="CONFIG_VALUES", content="OpenCode source is at ~/Work/OSS/opencode")\`
-- Discovered a non-obvious build/test command → \`ctx_memory(action="write", category="PROJECT_RULES", content="Always use scripts/release.sh for releases")\`
-- Learned a constraint the hard way → \`ctx_memory(action="write", category="CONSTRAINTS", content="Dashboard Tauri build needs RGBA PNGs, not grayscale")\`
-Use \`ctx_search\` to search across project memories, indexed git commits, and this session's full conversation history (including compacted parts) from one query.
+var BASE_INTRO_NO_REDUCE = (memoryEnabled) => `${CTX_NOTE_GUIDANCE}
+${memoryGuidanceBlock(memoryEnabled)}Use \`ctx_search\` to search across project memories, indexed git commits, and this session's full conversation history (including compacted parts) from one query.
 Use \`ctx_expand\` to recover the raw conversation behind a \`<compartment>\` summary in \`<session-history>\` — pass its \`start\`/\`end\` attributes when the summary is not enough (exact wording, values, error text).
 **Search before asking the user**: If you can't remember or don't know something that might have been discussed before or stored in project memory, use \`ctx_search\` before asking the user. Examples:
 - Can't remember where a related codebase or dependency lives → \`ctx_search(query="opencode source code path")\`
@@ -194401,7 +194702,7 @@ Drop silently — do not narrate it. NEVER drop large ranges blindly (e.g., "1-5
 Older tool calls may show \`[dropped §N§]\` sentinels; that is normal context management, not a pattern to copy. ALWAYS make fresh real tool calls when you need data again; never fabricate or inline tool output.`;
 var CAVEMAN_COMPRESSION_WARNING = `
 **BEWARE**: History compression is on; older user AND assistant text — including your own earlier responses — has been deterministically rewritten in a terse caveman style (dropped articles, missing auxiliaries, \`//\` instead of connectives like \`because\`). This is automatic context compression that runs after the fact, not your actual prior wording or the user's. **DO NOT mimic this style in new turns.** Write fresh responses in normal prose. If you notice your output drifting into caveman cadence, that drift is in-context-learning bleeding from the compressed history — consciously revert to full sentences.`;
-function buildMagicContextSection(_agent, protectedTags, ctxReduceEnabled = true, dreamerEnabled = false, temporalAwarenessEnabled = false, cavemanTextCompressionEnabled = false, subagentMode = false) {
+function buildMagicContextSection(_agent, protectedTags, ctxReduceEnabled = true, dreamerEnabled = false, temporalAwarenessEnabled = false, cavemanTextCompressionEnabled = false, subagentMode = false, language, memoryEnabled = true) {
   if (subagentMode) {
     return `## Magic Context
 
@@ -194413,23 +194714,27 @@ The dreamer evaluates smart note conditions during nightly runs and surfaces the
 Example: \`ctx_note(action="write", content="Implement X because Y", surface_condition="When PR #42 is merged in this repo")\`` : "";
   const temporalGuidance = temporalAwarenessEnabled ? TEMPORAL_AWARENESS_GUIDANCE : "";
   const cavemanWarning = cavemanTextCompressionEnabled && !ctxReduceEnabled ? CAVEMAN_COMPRESSION_WARNING : "";
+  const languageDirective = buildPrimaryLanguageDirective(language);
+  const languageGuidance = languageDirective ? `
+
+${languageDirective}` : "";
   if (!ctxReduceEnabled) {
     return `## Magic Context
 
 ${LONG_TERM_PARTNER_FRAME}
 ${PARTNER_FRAME_CLOSER_NO_REDUCE}
 
-${BASE_INTRO_NO_REDUCE()}${smartNoteGuidance}${temporalGuidance}${cavemanWarning}`;
+${BASE_INTRO_NO_REDUCE(memoryEnabled)}${smartNoteGuidance}${temporalGuidance}${cavemanWarning}${languageGuidance}`;
   }
   return `## Magic Context
 
 ${LONG_TERM_PARTNER_FRAME}
 ${PARTNER_FRAME_CLOSER_REDUCE}
 
-${BASE_INTRO(protectedTags)}${smartNoteGuidance}${temporalGuidance}
+${BASE_INTRO(protectedTags, memoryEnabled)}${smartNoteGuidance}${temporalGuidance}
 ${GENERIC_SECTION}
 
-Prefer many small targeted operations over one large blanket operation, and keep the working set tidy as routine maintenance.`;
+Prefer many small targeted operations over one large blanket operation, and keep the working set tidy as routine maintenance.${languageGuidance}`;
 }
 
 // src/system-prompt.ts
@@ -194441,7 +194746,7 @@ function buildMagicContextBlock(opts) {
   const includeGuidance = (opts.includeGuidance ?? true) && !existing.includes(MAGIC_CONTEXT_MARKER);
   if (!includeGuidance)
     return null;
-  return buildMagicContextSection(null, opts.protectedTags ?? 20, opts.ctxReduceEnabled ?? true, opts.dreamerEnabled ?? false, opts.temporalAwarenessEnabled ?? false, opts.cavemanTextCompressionEnabled ?? false);
+  return buildMagicContextSection(null, opts.protectedTags ?? 20, opts.ctxReduceEnabled ?? true, opts.dreamerEnabled ?? false, opts.temporalAwarenessEnabled ?? false, opts.cavemanTextCompressionEnabled ?? false, false, opts.language, opts.memoryEnabled !== false);
 }
 var DATE_PATTERN = /Today's date: .+/;
 function processSystemPromptForCache(args) {
@@ -194976,6 +195281,31 @@ function createPiAssistantPart(working, messageIndex, partIndex, markDirty) {
       }
       return { toolName: p.name, inputByteSize, inputTokenCount };
     },
+    getToolInput() {
+      const current = working[messageIndex].content;
+      const p = current[partIndex];
+      if (p?.type !== "toolCall")
+        return null;
+      return p.arguments && typeof p.arguments === "object" ? p.arguments : null;
+    },
+    setToolInput(input) {
+      const current = working[messageIndex].content;
+      const p = current[partIndex];
+      if (p?.type !== "toolCall")
+        return false;
+      try {
+        if (JSON.stringify(p.arguments) === JSON.stringify(input))
+          return false;
+      } catch {}
+      const newContent = current.slice();
+      newContent[partIndex] = { ...p, arguments: input };
+      working[messageIndex] = {
+        ...working[messageIndex],
+        content: newContent
+      };
+      markDirty(messageIndex);
+      return true;
+    },
     replaceWithSentinel(sentinelText) {
       const current = working[messageIndex].content;
       const existing = current[partIndex];
@@ -195809,6 +196139,7 @@ function registerPiContextHandler(pi, baseOptions) {
         projectDirectory,
         messages: event.messages,
         ctxReduceEnabled: options.ctxReduceEnabled,
+        smartDrops: options.smartDrops === true,
         protectedTags: options.protectedTags ?? 20,
         heuristics: options.heuristics,
         emergencyCeilingTokens,
@@ -196133,6 +196464,7 @@ function spawnPiHistorianRun(args) {
         memoryEnabled: historian.memoryEnabled,
         autoPromote: historian.autoPromote,
         userMemoriesEnabled: historian.userMemoriesEnabled,
+        language: historian.language,
         compartmentLeaseHolderId: holderId,
         onPublished: () => {
           const sessionStillActive = isContextHandlerSessionActive(sessionId);
@@ -196598,9 +196930,38 @@ async function runPipeline(args) {
       watermark: reclaimMeta.toolReclaimWatermark ?? 0,
       pendingOps
     });
+    const editMarkerTagIds = new Set;
+    if (args.smartDrops) {
+      const selectedIds = new Set(syntheticPendingOps.map((op) => op.tagId));
+      const supersessionOps = buildSupersessionReclaimOps({
+        db: args.db,
+        sessionId: args.sessionId,
+        targets,
+        pendingOps
+      });
+      for (const op of supersessionOps) {
+        if (!selectedIds.has(op.tagId)) {
+          syntheticPendingOps.push(op);
+          selectedIds.add(op.tagId);
+        }
+      }
+      const editReclaim = buildEditSupersessionReclaim({
+        db: args.db,
+        sessionId: args.sessionId,
+        targets,
+        pendingOps
+      });
+      for (const op of editReclaim.ops) {
+        if (!selectedIds.has(op.tagId)) {
+          syntheticPendingOps.push(op);
+          selectedIds.add(op.tagId);
+          editMarkerTagIds.add(op.tagId);
+        }
+      }
+    }
     autoReclaimTargetCount = syntheticPendingOps.length;
     if (syntheticPendingOps.length > 0) {
-      autoReclaimDidMutate = applyPendingOperations(args.sessionId, args.db, targets, args.protectedTags, undefined, [], syntheticPendingOps);
+      autoReclaimDidMutate = applyPendingOperations(args.sessionId, args.db, targets, args.protectedTags, undefined, [], syntheticPendingOps, editMarkerTagIds);
       if (autoReclaimDidMutate) {
         droppedCount += syntheticPendingOps.length;
         autoReclaimDidMutateThisPass = true;
@@ -197082,7 +197443,7 @@ async function runValidatedHistorianPass(args) {
     return finalResult;
   }
   await args.callbacks?.onRepairRetry?.(firstValidation.error ?? "invalid compartment output");
-  const repairPrompt = buildHistorianRepairPrompt(args.prompt, firstRun.result, firstValidation.error ?? "invalid compartment output");
+  const repairPrompt = buildHistorianRepairPrompt(args.prompt, firstRun.result, firstValidation.error ?? "invalid compartment output", args.language);
   const repairRun = await runHistorianPrompt({
     ...args,
     prompt: repairPrompt,
@@ -197724,6 +198085,7 @@ Historian pass ${passCount + 1}, attempt ${passAttempt} started for messages ${c
         twoPass: deps.historianTwoPass,
         subagentKind: "recomp",
         agentId: HISTORIAN_RECOMP_AGENT,
+        language: deps.language,
         callbacks: {
           onRepairRetry: async (error51) => {
             emitProgress(`Repair retry (pass ${passCount + 1})…`);
@@ -198142,6 +198504,7 @@ Historian pass ${passCount + 1}, attempt ${passAttempt} started for messages ${c
         twoPass: deps.historianTwoPass,
         subagentKind: "recomp",
         agentId: HISTORIAN_RECOMP_AGENT,
+        language: deps.language,
         callbacks: {
           onRepairRetry: async (error51) => {
             await sendIgnoredMessage(client, sessionId, `## Magic Recomp — Partial
@@ -198634,7 +198997,7 @@ Historian recomp started. Rebuilding compartments and facts from raw Pi session
             client: createPiHistorianClient({
               runner: deps.runner,
               model: deps.historianModel,
-              systemPrompt: COMPARTMENT_STRUCTURAL_SYSTEM_PROMPT,
+              systemPrompt: withContentLanguageDirective(COMPARTMENT_STRUCTURAL_SYSTEM_PROMPT, deps.language, { preserveUserQuotes: true }),
               fallbackModels: deps.historianFallbacks,
               timeoutMs: deps.historianTimeoutMs,
               thinkingLevel: deps.historianThinkingLevel,
@@ -198657,6 +199020,7 @@ Historian recomp started. Rebuilding compartments and facts from raw Pi session
             autoPromote: deps.autoPromote,
             ensureProjectRegistered: ensureProjectRegisteredFromPiDirectory,
             fallbackModels: deps.historianFallbacks,
+            language: deps.language,
             fallbackModelId: ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : undefined
           }, parsed.kind === "partial" ? { range: parsed.range } : {});
           if (result.published) {
@@ -198909,7 +199273,7 @@ async function runPiMemoryMigration(deps) {
     }
     const result = await deps.runner.run({
       agent: "magic-context-historian",
-      systemPrompt: MIGRATION_SYSTEM_PROMPT2,
+      systemPrompt: withMigrationLanguageDirective(MIGRATION_SYSTEM_PROMPT2, deps.language),
       userMessage: prompt,
       model,
       fallbackModels: undefined,
@@ -199021,7 +199385,8 @@ An upgrade or recomp is already running for this session in the background. Wait
             thinkingLevel: deps.historianThinkingLevel,
             directory: ctx.cwd,
             sessionId,
-            userMemoriesEnabled: deps.userMemoriesEnabled
+            userMemoriesEnabled: deps.userMemoriesEnabled,
+            language: deps.language
           });
           return outcome.summary;
         } catch (error51) {
@@ -199093,7 +199458,7 @@ Rebuilding compartments into the v2 format and re-organizing project memories. T
               thinkingLevel: deps.historianThinkingLevel,
               directory: ctx.cwd,
               accountingSessionId: sessionId,
-              systemPrompt: COMPARTMENT_STRUCTURAL_SYSTEM_PROMPT,
+              systemPrompt: withContentLanguageDirective(COMPARTMENT_STRUCTURAL_SYSTEM_PROMPT, deps.language, { preserveUserQuotes: true }),
               notify: (text) => sendCtxStatusMessage(pi, {
                 title: "/ctx-session-upgrade",
                 text,
@@ -199109,7 +199474,8 @@ Rebuilding compartments into the v2 format and re-organizing project memories. T
             autoPromote: deps.autoPromote,
             ensureProjectRegistered: ensureProjectRegisteredFromPiDirectory,
             fallbackModels: deps.historianFallbacks,
-            fallbackModelId: sessionMainModel
+            fallbackModelId: sessionMainModel,
+            language: deps.language
           }, {});
           if (!recompResult.published || !isRecompComplete(recompResult.message)) {
             const reason = contextualizeUpgradeReason(isRecompFailure(recompResult.message) ? extractRecompReason(recompResult.message) : `Compartments were not fully rebuilt: ${extractRecompReason(recompResult.message)}`);
@@ -199321,7 +199687,7 @@ function formatThresholdPercent(value) {
 // package.json
 var package_default = {
   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",
@@ -205476,7 +205842,8 @@ function resolveSidekickFromConfig(config2) {
     systemPrompt: sidekick.system_prompt,
     timeoutMs: sidekick.timeout_ms,
     thinking_level: sidekick.thinking_level,
-    fallbackModels: resolveFallbackChain(sidekick.fallback_models)
+    fallbackModels: resolveFallbackChain(sidekick.fallback_models),
+    language: config2.language
   };
 }
 function resolveHistorianFromConfig(config2) {
@@ -205505,7 +205872,8 @@ function resolveHistorianFromConfig(config2) {
     historyBudgetPercentage: config2.history_budget_percentage,
     memoryEnabled: config2.memory.enabled,
     autoPromote: config2.memory.auto_promote,
-    userMemoriesEnabled: userMemoryCollectionEnabled(config2.dreamer)
+    userMemoriesEnabled: userMemoryCollectionEnabled(config2.dreamer),
+    language: config2.language
   };
 }
 function resolveAutoSearchFromConfig(config2) {
@@ -205583,6 +205951,7 @@ async function src_default2(pi) {
     db,
     ensureProjectRegistered: ensureProjectRegisteredFromPiDirectory,
     allowDreamerActions: false,
+    memoryToolEnabled: true,
     ctxReduceEnabled: config2.ctx_reduce_enabled === true,
     protectedTags: config2.protected_tags ?? 20,
     dreamerEnabled: isDreamerRunnable(config2)
@@ -205602,6 +205971,7 @@ async function src_default2(pi) {
   const buildContextOptions = (cfg, hist, auto) => ({
     db: database,
     ctxReduceEnabled: cfg.ctx_reduce_enabled,
+    smartDrops: cfg.smart_drops === true,
     protectedTags: cfg.protected_tags ?? 20,
     heuristics: {
       caveman: cfg.ctx_reduce_enabled === false && cfg.caveman_text_compression ? {
@@ -205620,6 +205990,7 @@ async function src_default2(pi) {
       executeThresholdTokens: cfg.execute_threshold_tokens
     },
     historian: hist,
+    language: cfg.language,
     autoSearch: auto,
     resolveForProject: resolveContextOptionsForProject,
     maybeAutoEmbedSession: (sessionId, dir, identity) => {
@@ -205692,6 +206063,7 @@ async function src_default2(pi) {
     historianFallbacks: historianConfig?.fallbackModels,
     historianTimeoutMs: config2.historian_timeout_ms,
     historianThinkingLevel: historianConfig?.thinkingLevel,
+    language: config2.language,
     memoryEnabled: config2.memory.enabled,
     autoPromote: config2.memory.auto_promote
   });
@@ -205704,6 +206076,7 @@ async function src_default2(pi) {
     historianFallbacks: historianConfig?.fallbackModels,
     historianTimeoutMs: config2.historian_timeout_ms,
     historianThinkingLevel: historianConfig?.thinkingLevel,
+    language: config2.language,
     memoryEnabled: config2.memory.enabled,
     autoPromote: config2.memory.auto_promote,
     userMemoriesEnabled: userMemoryCollectionEnabled(config2.dreamer)
@@ -205735,6 +206108,7 @@ async function src_default2(pi) {
       config: dreamerConfig,
       embeddingConfig: config2.embedding,
       memoryEnabled: config2.memory.enabled,
+      language: config2.language,
       gitCommitIndexing: config2.memory.git_commit_indexing,
       onAdjunctsRefreshNeeded: signalPiSystemPromptRefreshForProject
     });
@@ -205849,6 +206223,7 @@ async function src_default2(pi) {
         dreamerEnabled: effectiveDreamerRunnable,
         temporalAwarenessEnabled: effectiveConfig.temporal_awareness ?? false,
         cavemanTextCompressionEnabled: effectiveConfig.ctx_reduce_enabled === false && effectiveConfig.caveman_text_compression?.enabled === true,
+        language: effectiveConfig.language,
         userMemoriesEnabled: userMemoryCollectionEnabled(effectiveConfig.dreamer),
         isCacheBusting,
         existingSystemPrompt: event.systemPrompt