@wolfx/pi-magic-context 0.27.2 → 0.28.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
     };
@@ -150534,7 +150535,7 @@ function enforceSchemaFence(db, dbPath, latestSupportedVersion) {
     return true;
   }
   lastSchemaFenceRejection = { persistedVersion, supportedVersion: latestSupportedVersion };
-  log(`[magic-context] storage fatal: refusing to open ${dbPath}; database schema v${persistedVersion} is newer than this binary supports (max v${latestSupportedVersion}). Upgrade Magic Context/OpenCode/Pi before writing to this cache.`);
+  log(`[magic-context] storage fatal: refusing to open ${dbPath}; database schema v${persistedVersion} is newer than this binary supports (max v${latestSupportedVersion}). A pinned or stale plugin is likely sharing this database with a newer instance; update or unpin Magic Context with 'npx @cortexkit/magic-context@latest doctor --force', then restart.`);
   return false;
 }
 var sqlitePragmaConfig = {
@@ -155056,6 +155057,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 +155069,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) => ({
@@ -156329,13 +156341,10 @@ function compareSemverCore(a, b) {
   const [b0, b1, b2] = core(b);
   return a0 - b0 || a1 - b1 || a2 - b2;
 }
-var ANNOUNCEMENT_VERSION = "0.27.0";
+var ANNOUNCEMENT_VERSION = "0.28.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 'language' option: set a top-level 2-letter language code (e.g. "tr" or "es") and Magic Context writes its summaries, memories, and guidance in that language, while keeping all structure (tags, categories, code, paths) in English. User-level only, off by default.`,
+  "The ctx_reduce reminder now reflects how much tool output is actually reclaimable, instead of escalating to 'urgent' just because you're near compaction. It also no longer suggests dropping the agent's task list or tiny status outputs."
 ];
 var ANNOUNCEMENT_FOOTER = "Join us on Discord: https://discord.gg/F2uWxjGnU";
 var STATE_FILENAME = "last_announced_version";
@@ -156397,6 +156406,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.
 
@@ -157117,7 +157215,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,
@@ -161583,7 +161681,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 }]
       }
@@ -164537,7 +164635,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 }]
       }
@@ -165318,7 +165416,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 }]
       }
@@ -165598,7 +165696,8 @@ function createDreamTaskExecutor(deps) {
           deadline,
           promotionThreshold: config.promotionThreshold ?? 3,
           model: config.model,
-          fallbackModels: config.fallbackModels
+          fallbackModels: config.fallbackModels,
+          language: config.language ?? deps.language
         });
         recordRun("completed", null);
         log(`[dreamer] review-user-memories: promoted=${result.promoted} merged=${result.merged} dismissed=${result.dismissed}`);
@@ -165634,7 +165733,8 @@ function createDreamTaskExecutor(deps) {
           deadline,
           forceBroad: config.task === "verify-broad",
           model: config.model,
-          fallbackModels: config.fallbackModels
+          fallbackModels: config.fallbackModels,
+          language: config.language ?? deps.language
         });
         recordRun("completed", null, {
           memoryChanges: computeMemoryDelta(memoryBefore)
@@ -165686,6 +165786,7 @@ function createDreamTaskExecutor(deps) {
           deadline,
           model: config.model,
           fallbackModels: config.fallbackModels,
+          language: config.language ?? deps.language,
           rawProviderFactory: deps.primerRawProviderFactory
         });
         recordRun("completed", null);
@@ -165803,6 +165904,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({
@@ -165927,7 +166029,9 @@ async function runRetrospectiveTask(config, 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, config.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";
@@ -166013,7 +166117,7 @@ async function runAgenticTask(config, 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, config.language ?? deps.language),
         ...modelBodyField(config.model),
         parts: [{ type: "text", text: taskPrompt, synthetic: true }]
       }
@@ -166895,7 +166999,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,
@@ -166903,7 +167007,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,
@@ -167460,6 +167565,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).");
@@ -181957,6 +182066,7 @@ var EmbeddingConfigSchema = BaseEmbeddingConfigSchema.transform((data) => {
 });
 var MagicContextConfigSchema = exports_external.object({
   enabled: exports_external.boolean().default(true).describe("Enable magic context (default: true)"),
+  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.)"),
@@ -182901,7 +183011,7 @@ class PiRetrospectiveRawProvider {
       result.push({
         sessionId: info.id,
         path: info.path,
-        updatedAt: typeof info.modified === "number" ? info.modified : undefined
+        updatedAt: typeof info.modified === "number" ? info.modified : info.modified instanceof Date ? info.modified.getTime() : undefined
       });
     }
     return result.sort((a, b) => (b.updatedAt ?? 0) - (a.updatedAt ?? 0));
@@ -182980,14 +183090,15 @@ function extractPiTextContent(content) {
 }
 async function loadDefaultPiSessionDeps2() {
   const mod = await import(PI_CODING_AGENT_MODULE2);
-  const listSessions = mod.SessionManager?.listSessions;
-  const loadEntriesFromFile = mod.loadEntriesFromFile;
-  if (typeof listSessions !== "function" || typeof loadEntriesFromFile !== "function") {
-    throw new Error("Pi session APIs unavailable: expected SessionManager.listSessions and loadEntriesFromFile");
+  const sessionListAll = mod.SessionManager?.listAll;
+  const parseEntries = mod.parseSessionEntries;
+  if (typeof sessionListAll !== "function" || typeof parseEntries !== "function") {
+    throw new Error("Pi session APIs unavailable: expected SessionManager.listAll and parseSessionEntries");
   }
+  const { readFileSync: readFileSync9 } = await import("node:fs");
   return {
-    listSessions: listSessions.bind(mod.SessionManager),
-    loadEntriesFromFile
+    listSessions: () => sessionListAll.call(mod.SessionManager),
+    loadEntriesFromFile: (filePath) => parseEntries(readFileSync9(filePath, "utf-8"))
   };
 }
 
@@ -183018,6 +183129,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 }),
@@ -183032,7 +183144,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,
@@ -183042,7 +183154,8 @@ function registerPiDreamerProject(opts) {
       }),
       primerRawProviderFactory: createPiPrimerRawProviderFactory(),
       userMemoryCollectionEnabled: userMemoryCollectionEnabled(opts.config),
-      ensureProjectRegistered: ensureProjectRegisteredFromPiDirectory
+      ensureProjectRegistered: ensureProjectRegisteredFromPiDirectory,
+      language: opts.language
     }),
     task
   });
@@ -183951,6 +184064,7 @@ var pendingPiDecisionBySession = new Map;
 var lastBoundMessageIdBySession = new Map;
 var scheduledWriteTokensBySession = new Map;
 var writerOverrideForTests = null;
+var retentionOverrideForTests = null;
 function normalizeMaterializeReason(harness, reason, rematerialized) {
   const raw = typeof reason === "string" ? reason.trim() : "";
   if (raw.length > 0) {
@@ -184091,7 +184205,7 @@ function writeTransformDecisionRow(dbPath, row) {
                  WHERE session_id = ? AND harness = ?
                  ORDER BY ts_ms DESC, rowid DESC
                  LIMIT ?
-               )`).run(row.sessionId, row.harness, row.sessionId, row.harness, TRANSFORM_DECISIONS_RETENTION);
+               )`).run(row.sessionId, row.harness, row.sessionId, row.harness, retentionOverrideForTests ?? TRANSFORM_DECISIONS_RETENTION);
   } finally {
     closeQuietly(db);
   }
@@ -185826,6 +185940,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) {
@@ -185836,7 +185951,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;
@@ -185851,8 +185967,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;
@@ -188168,6 +188286,7 @@ function maybeChannel1ReminderForToolResult(args) {
   const decision = decideChannel1({
     undroppedTokens,
     pressure,
+    estimatedInputTokens: state.lastInputTokens + state.turnToolTokens,
     workingWindowTokens,
     lastNudgeUndropped: getLastNudgeUndropped(db, sessionId),
     lastNudgeLevel: getLastNudgeLevel(db, sessionId),
@@ -190975,8 +191094,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.",
@@ -190989,6 +191108,7 @@ function buildHistorianRepairPrompt(originalPrompt, previousOutput, validationEr
     previousOutput
   ].join(`
 `);
+  return withContentLanguageDirective(prompt, language, { preserveUserQuotes: true });
 }
 function validateStoredCompartments(compartments) {
   if (compartments.length === 0) {
@@ -193112,9 +193232,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,
@@ -193129,10 +193251,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,
@@ -193157,7 +193279,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,
@@ -193193,7 +193315,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,
@@ -194014,7 +194136,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) {
   if (subagentMode) {
     return `## Magic Context
 
@@ -194026,13 +194148,17 @@ 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()}${smartNoteGuidance}${temporalGuidance}${cavemanWarning}${languageGuidance}`;
   }
   return `## Magic Context
 
@@ -194042,7 +194168,7 @@ ${PARTNER_FRAME_CLOSER_REDUCE}
 ${BASE_INTRO(protectedTags)}${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
@@ -194054,7 +194180,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);
 }
 var DATE_PATTERN = /Today's date: .+/;
 function processSystemPromptForCache(args) {
@@ -195746,6 +195872,7 @@ function spawnPiHistorianRun(args) {
         memoryEnabled: historian.memoryEnabled,
         autoPromote: historian.autoPromote,
         userMemoriesEnabled: historian.userMemoriesEnabled,
+        language: historian.language,
         compartmentLeaseHolderId: holderId,
         onPublished: () => {
           const sessionStillActive = isContextHandlerSessionActive(sessionId);
@@ -196695,7 +196822,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,
@@ -197337,6 +197464,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})…`);
@@ -197755,6 +197883,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
@@ -198247,7 +198376,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,
@@ -198270,6 +198399,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) {
@@ -198522,7 +198652,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,
@@ -198634,7 +198764,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) {
@@ -198706,7 +198837,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,
@@ -198722,7 +198853,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)}`);
@@ -198934,7 +199066,7 @@ function formatThresholdPercent(value) {
 // package.json
 var package_default = {
   name: "@wolfx/pi-magic-context",
-  version: "0.27.2",
+  version: "0.28.0",
   type: "module",
   description: "Pi coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -205113,7 +205245,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) {
@@ -205142,7 +205275,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) {
@@ -205169,7 +205303,7 @@ async function src_default2(pi) {
     return;
   }
   if (!db) {
-    warn(`Magic Context (pi) storage unavailable at ${dbPath} (cache schema is newer than this binary supports). ` + "Plugin will not register hooks; upgrade/restart Pi/OpenCode/Magic Context to recover.");
+    warn(`Magic Context (pi) storage unavailable at ${dbPath} (cache schema is newer than this binary supports). ` + "A pinned or stale plugin is likely sharing this database with a newer instance. " + "Plugin will not register hooks; run 'npx @cortexkit/magic-context@latest doctor --force' " + "(or update Pi/OpenCode) and restart to recover.");
     return;
   }
   const database = db;
@@ -205257,6 +205391,7 @@ async function src_default2(pi) {
       executeThresholdTokens: cfg.execute_threshold_tokens
     },
     historian: hist,
+    language: cfg.language,
     autoSearch: auto,
     resolveForProject: resolveContextOptionsForProject,
     maybeAutoEmbedSession: (sessionId, dir, identity) => {
@@ -205329,6 +205464,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
   });
@@ -205341,6 +205477,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)
@@ -205372,6 +205509,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
     });
@@ -205486,6 +205624,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

package/dist/subagent-entry.js

@@ -142942,7 +142942,7 @@ function enforceSchemaFence(db, dbPath, latestSupportedVersion) {
     return true;
   }
   lastSchemaFenceRejection = { persistedVersion, supportedVersion: latestSupportedVersion };
-  log(`[magic-context] storage fatal: refusing to open ${dbPath}; database schema v${persistedVersion} is newer than this binary supports (max v${latestSupportedVersion}). Upgrade Magic Context/OpenCode/Pi before writing to this cache.`);
+  log(`[magic-context] storage fatal: refusing to open ${dbPath}; database schema v${persistedVersion} is newer than this binary supports (max v${latestSupportedVersion}). A pinned or stale plugin is likely sharing this database with a newer instance; update or unpin Magic Context with 'npx @cortexkit/magic-context@latest doctor --force', then restart.`);
   return false;
 }
 var sqlitePragmaConfig = {
@@ -144839,6 +144839,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).");
@@ -159184,6 +159188,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;
 
@@ -159531,6 +159624,7 @@ var EmbeddingConfigSchema = BaseEmbeddingConfigSchema.transform((data) => {
 });
 var MagicContextConfigSchema = exports_external.object({
   enabled: exports_external.boolean().default(true).describe("Enable magic context (default: true)"),
+  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.)"),
@@ -171098,6 +171192,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 [];
@@ -171107,10 +171204,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) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wolfx/pi-magic-context",
-	"version": "0.27.2",
+	"version": "0.28.0",
 	"type": "module",
 	"description": "Pi coding agent extension for Magic Context — cross-session memory and context management",
 	"main": "dist/index.js",
@@ -37,7 +37,6 @@
 		"prepublishOnly": "bun run build"
 	},
 	"dependencies": {
-
 		"ai-tokenizer": "^1.0.6",
 		"comment-json": "^4.2.5",
 		"quickjs-emscripten": "^0.32.0",