@cortexkit/pi-magic-context 0.22.2 → 0.22.3

package/dist/index.js

@@ -140942,14 +140942,48 @@ function readRawSessionMessagesFromDb(db, sessionId) {
 var encoder = new TextEncoder;
 var TAG_PREFIX_REGEX = /^(?:§\d+§\s*)+/;
 var MALFORMED_TAG_PREFIX_REGEX = /^(?:§\d+">§(?:\d+§)?\s*)+/;
+var COMPLETE_TAG_PAIR_GLOBAL_REGEX = /\u00a7\d+\u00a7/g;
+var MALFORMED_TAG_GLOBAL_REGEX = /\u00a7\d+">(?:\u00a7(?:\d+\u00a7)?)?/g;
+var STRAY_SECTION_CHAR_REGEX = /\u00a7/g;
+function stripWellFormedLeadingTagPrefix(value) {
+  return value.replace(/^(\u00a7\d+\u00a7\s*)+/, "");
+}
+function stripCompleteTagPairsGlobally(value) {
+  return value.replace(COMPLETE_TAG_PAIR_GLOBAL_REGEX, "");
+}
+function stripMalformedTagNotationGlobally(value) {
+  return value.replace(MALFORMED_TAG_GLOBAL_REGEX, "");
+}
+function stripTagSectionCharacters(value) {
+  return value.replace(STRAY_SECTION_CHAR_REGEX, "");
+}
+function stripPersistedAssistantText(value) {
+  let text = stripWellFormedLeadingTagPrefix(value);
+  text = stripCompleteTagPairsGlobally(text);
+  text = stripMalformedTagNotationGlobally(text);
+  text = stripTagSectionCharacters(text);
+  return text.trim();
+}
 function byteSize(value) {
   return encoder.encode(value).length;
 }
 function stripTagPrefix(value) {
-  let stripped = value.replace(MALFORMED_TAG_PREFIX_REGEX, "");
-  stripped = stripped.replace(TAG_PREFIX_REGEX, "");
+  let stripped = value;
+  for (let pass = 0;pass < 8; pass++) {
+    const prev = stripped;
+    stripped = stripped.replace(MALFORMED_TAG_PREFIX_REGEX, "");
+    stripped = stripped.replace(TAG_PREFIX_REGEX, "");
+    if (stripped === prev)
+      break;
+  }
   return stripped;
 }
+function peelLeadingMcTagNotation(value) {
+  const body = stripTagPrefix(value);
+  if (body === value)
+    return { tagPrefix: "", body };
+  return { tagPrefix: value.slice(0, value.length - body.length), body };
+}
 function prependTag(tagId, value) {
   const stripped = stripTagPrefix(value);
   return `§${tagId}§ ${stripped}`;
@@ -140991,7 +141025,9 @@ function hasMeaningfulPart(part) {
     return false;
   const type = part.type;
   if (type === "text") {
-    return typeof part.text === "string" && part.text.trim().length > 0;
+    if (typeof part.text !== "string")
+      return false;
+    return stripTagPrefix(part.text).trim().length > 0;
   }
   if (typeof type !== "string")
     return false;
@@ -150220,7 +150256,7 @@ async function processDreamQueue(args) {
     return null;
   }
   const projectDirectory = args.sessionDirectoryOverride ?? resolveDreamSessionDirectory(entry.projectIdentity);
-  log(`[dreamer] dequeued project ${entry.projectIdentity} (dir=${projectDirectory}), starting dream run`);
+  log(`[dreamer] dequeued project ${entry.projectIdentity}, starting dream run`);
   let result;
   try {
     result = await runDream({
@@ -150344,6 +150380,7 @@ async function readGitCommits(directory, options = {}) {
   if (revision.startsWith("-")) {
     throw new Error(`readGitCommits: refusing revision that looks like an option: "${revision}"`);
   }
+  const projectLabel = options.projectIdentity ?? "<project>";
   const args = [
     "log",
     revision,
@@ -150366,11 +150403,11 @@ async function readGitCommits(directory, options = {}) {
     stdout = result.stdout;
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    log(`[git-commits] readGitCommits failed at cwd=${directory}: ${message.slice(0, 500)}`);
+    log(`[git-commits] readGitCommits failed for ${projectLabel}: ${message.slice(0, 500)}`);
     return [];
   }
   if (stdout.trim().length === 0) {
-    log(`[git-commits] readGitCommits returned empty stdout at cwd=${directory} (sinceMs=${options.sinceMs ?? "none"} args=${args.slice(0, 4).join(" ")})`);
+    log(`[git-commits] readGitCommits returned empty stdout for ${projectLabel} (sinceMs=${options.sinceMs ?? "none"} args=${args.slice(0, 4).join(" ")})`);
   }
   return parseGitLogOutput(stdout);
 }
@@ -166163,7 +166200,8 @@ async function indexCommitsForProject(db, projectPath, directory, options) {
     const sinceMs = latestIndexed !== null ? Math.max(latestIndexed - 60000, Date.now() - options.sinceDays * MS_PER_DAY) : Date.now() - options.sinceDays * MS_PER_DAY;
     const commits = await readGitCommits(directory, {
       sinceMs,
-      maxCommits: options.maxCommits
+      maxCommits: options.maxCommits,
+      projectIdentity: projectPath
     });
     result.scanned = commits.length;
     if (commits.length === 0) {
@@ -166430,7 +166468,7 @@ async function startDreamScheduleTimer(args) {
   const isNewRegistration = !registeredProjects.has(args.directory);
   registeredProjects.set(args.directory, args);
   if (isNewRegistration) {
-    log(`[dreamer] registered project ${args.directory} (dreaming=${dreamingEnabled} embeddings=${embeddingSweepEnabled} commits=${commitIndexingEnabled}; total=${registeredProjects.size})`);
+    log(`[dreamer] registered project ${args.projectIdentity} (dreaming=${dreamingEnabled} embeddings=${embeddingSweepEnabled} commits=${commitIndexingEnabled}; total=${registeredProjects.size})`);
   }
   if (!activeTimer) {
     log(`[dreamer] started independent schedule timer (every ${DREAM_TIMER_INTERVAL_MS / 60000}m)`);
@@ -166445,7 +166483,7 @@ async function startDreamScheduleTimer(args) {
   }
   return () => {
     registeredProjects.delete(args.directory);
-    log(`[dreamer] unregistered project ${args.directory} (remaining=${registeredProjects.size})`);
+    log(`[dreamer] unregistered project ${args.projectIdentity} (remaining=${registeredProjects.size})`);
     if (registeredProjects.size === 0 && activeTimer) {
       clearInterval(activeTimer);
       activeTimer = null;
@@ -166493,7 +166531,7 @@ async function sweepProject(reg, origin, db, gitCommitEnabled = getProjectEmbedd
     return;
   }
   try {
-    log(`[dreamer] timer tick (${origin}) ${reg.directory} — checking schedule window "${reg.dreamerConfig.schedule}"`);
+    log(`[dreamer] timer tick (${origin}) ${reg.projectIdentity} — checking schedule window "${reg.dreamerConfig.schedule}"`);
     checkScheduleAndEnqueue(db, reg.dreamerConfig.schedule, reg.projectIdentity);
     await processDreamQueue({
       db,
@@ -166508,7 +166546,7 @@ async function sweepProject(reg, origin, db, gitCommitEnabled = getProjectEmbedd
       fallbackModels: resolveFallbackChain(DREAMER_AGENT, reg.dreamerConfig.fallback_models)
     });
   } catch (error51) {
-    log(`[dreamer] timer-triggered queue processing failed for ${reg.directory}:`, error51);
+    log(`[dreamer] timer-triggered queue processing failed for ${reg.projectIdentity}:`, error51);
   }
 }
 function startGitSweepLeaseRenewal(db, projectIdentity, holderId) {
@@ -166530,12 +166568,12 @@ async function sweepGitCommits(args) {
   const lease2 = acquireGitSweepLease(db, projectIdentity, holderId);
   if (!lease2.acquired) {
     const reason = lease2.reason === "cooldown_active" ? `cooldown active until ${lease2.nextAllowedAt}` : `lease held by ${lease2.leaseHolder ?? "another holder"} until ${lease2.leaseExpiresAt ?? "unknown"}`;
-    log(`[git-commits] sweep skipped for ${projectIdentity} (${directory}): ${reason}`);
+    log(`[git-commits] sweep skipped for ${projectIdentity}: ${reason}`);
     return;
   }
   const startedAt = Date.now();
   const stopRenewal = startGitSweepLeaseRenewal(db, projectIdentity, holderId);
-  log(`[git-commits] sweep starting for ${directory} (project=${projectIdentity} sinceDays=${gitCommitIndexing.since_days} maxCommits=${gitCommitIndexing.max_commits})`);
+  log(`[git-commits] sweep starting for ${projectIdentity} (sinceDays=${gitCommitIndexing.since_days} maxCommits=${gitCommitIndexing.max_commits})`);
   try {
     const result = await indexCommitsForProject(db, projectIdentity, directory, {
       sinceDays: gitCommitIndexing.since_days,
@@ -166555,7 +166593,7 @@ async function sweepGitCommits(args) {
   } catch (error51) {
     releaseGitSweepLease(db, projectIdentity, holderId);
     const elapsedMs = Date.now() - startedAt;
-    log(`[git-commits] sweep failed for ${directory} after ${elapsedMs}ms: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    log(`[git-commits] sweep failed for ${projectIdentity} after ${elapsedMs}ms: ${error51 instanceof Error ? error51.message : String(error51)}`);
   } finally {
     stopRenewal();
   }
@@ -176017,10 +176055,8 @@ function injectPiTemporalMarkers(messages) {
       if (prefix !== null) {
         const userMsg = msg;
         if (typeof userMsg.content === "string") {
-          if (!TEMPORAL_MARKER_PATTERN.test(stripTagPrefix2(userMsg.content))) {
-            const tagMatch = userMsg.content.match(/^(?:§\d+§\s*)+/);
-            const tagPrefix = tagMatch ? tagMatch[0] : "";
-            const body = userMsg.content.slice(tagPrefix.length);
+          if (!TEMPORAL_MARKER_PATTERN.test(stripTagPrefix(userMsg.content))) {
+            const { tagPrefix, body } = peelLeadingMcTagNotation(userMsg.content);
             messages[i] = {
               ...userMsg,
               content: tagPrefix + prefix + body
@@ -176031,9 +176067,7 @@ function injectPiTemporalMarkers(messages) {
           const firstTextIndex = userMsg.content.findIndex((p) => p && typeof p === "object" && p.type === "text");
           if (firstTextIndex >= 0) {
             const existing = userMsg.content[firstTextIndex];
-            const tagMatch = existing.text.match(/^(?:§\d+§\s*)+/);
-            const tagPrefix = tagMatch ? tagMatch[0] : "";
-            const body = existing.text.slice(tagPrefix.length);
+            const { tagPrefix, body } = peelLeadingMcTagNotation(existing.text);
             if (!TEMPORAL_MARKER_PATTERN.test(body)) {
               const newContent = userMsg.content.slice();
               newContent[firstTextIndex] = {
@@ -176056,12 +176090,6 @@ function injectPiTemporalMarkers(messages) {
   }
   return injected;
 }
-function stripTagPrefix2(text) {
-  const match = text.match(/^(?:§\d+§\s*)+/);
-  if (!match)
-    return text;
-  return text.slice(match[0].length);
-}
 
 // src/timeout.ts
 function withTimeout(p, ms) {
@@ -180592,7 +180620,7 @@ function formatThresholdPercent(value) {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.22.2",
+  version: "0.22.3",
   type: "module",
   description: "Pi coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -181177,8 +181205,6 @@ function computePiPressure(usage, contextLimit) {
 }
 
 // src/strip-tag-prefix.ts
-var LEADING_TAG_PREFIX_REGEX = /^(\u00a7\d+\u00a7\s*)+/;
-var SECTION_CHAR_REGEX = /\u00a7/g;
 function stripTagPrefixFromAssistantMessage(message) {
   if (message.role !== "assistant")
     return false;
@@ -181192,7 +181218,7 @@ function stripTagPrefixFromAssistantMessage(message) {
     const textPart = part;
     if (typeof textPart.text !== "string")
       continue;
-    const stripped = textPart.text.replace(LEADING_TAG_PREFIX_REGEX, "").replace(SECTION_CHAR_REGEX, "");
+    const stripped = stripPersistedAssistantText(textPart.text);
     if (stripped !== textPart.text) {
       textPart.text = stripped;
       mutated = true;
@@ -186357,7 +186383,7 @@ async function persistPiPressureFromMessageEnd(args) {
         updates.cacheAlertSent = true;
         const safeTokens = Math.max(observedSafeInputTokens, pressure.inputTokens);
         const modelLabel = provider2 && model ? `${provider2}/${model}` : "the active model";
-        await args.notifyIssue?.(`⚠️ Magic Context: Pi reports a context limit of ${formatTokens(contextLimit)} tokens for ${modelLabel} but you've successfully sent ${formatTokens(safeTokens)} tokens in this session — the cached limit looks wrong. Restart Pi if you suspect this is incorrect.`);
+        await args.notifyIssue?.(`⚠️ Magic Context: Pi reports a context limit of ${formatTokens(contextLimit)} tokens for ${modelLabel} but you've successfully sent ${formatTokens(safeTokens)} tokens in this session — the reported limit looks wrong. Restart Pi if you suspect this is incorrect.`);
       }
     }
     updates.lastContextPercentage = percentage;

package/dist/subagent-entry.js

@@ -159835,14 +159835,48 @@ function readRawSessionMessagesFromDb(db, sessionId) {
 var encoder = new TextEncoder;
 var TAG_PREFIX_REGEX = /^(?:§\d+§\s*)+/;
 var MALFORMED_TAG_PREFIX_REGEX = /^(?:§\d+">§(?:\d+§)?\s*)+/;
+var COMPLETE_TAG_PAIR_GLOBAL_REGEX = /\u00a7\d+\u00a7/g;
+var MALFORMED_TAG_GLOBAL_REGEX = /\u00a7\d+">(?:\u00a7(?:\d+\u00a7)?)?/g;
+var STRAY_SECTION_CHAR_REGEX = /\u00a7/g;
+function stripWellFormedLeadingTagPrefix(value) {
+  return value.replace(/^(\u00a7\d+\u00a7\s*)+/, "");
+}
+function stripCompleteTagPairsGlobally(value) {
+  return value.replace(COMPLETE_TAG_PAIR_GLOBAL_REGEX, "");
+}
+function stripMalformedTagNotationGlobally(value) {
+  return value.replace(MALFORMED_TAG_GLOBAL_REGEX, "");
+}
+function stripTagSectionCharacters(value) {
+  return value.replace(STRAY_SECTION_CHAR_REGEX, "");
+}
+function stripPersistedAssistantText(value) {
+  let text = stripWellFormedLeadingTagPrefix(value);
+  text = stripCompleteTagPairsGlobally(text);
+  text = stripMalformedTagNotationGlobally(text);
+  text = stripTagSectionCharacters(text);
+  return text.trim();
+}
 function byteSize(value) {
   return encoder.encode(value).length;
 }
 function stripTagPrefix(value) {
-  let stripped = value.replace(MALFORMED_TAG_PREFIX_REGEX, "");
-  stripped = stripped.replace(TAG_PREFIX_REGEX, "");
+  let stripped = value;
+  for (let pass = 0;pass < 8; pass++) {
+    const prev = stripped;
+    stripped = stripped.replace(MALFORMED_TAG_PREFIX_REGEX, "");
+    stripped = stripped.replace(TAG_PREFIX_REGEX, "");
+    if (stripped === prev)
+      break;
+  }
   return stripped;
 }
+function peelLeadingMcTagNotation(value) {
+  const body = stripTagPrefix(value);
+  if (body === value)
+    return { tagPrefix: "", body };
+  return { tagPrefix: value.slice(0, value.length - body.length), body };
+}
 function prependTag(tagId, value) {
   const stripped = stripTagPrefix(value);
   return `§${tagId}§ ${stripped}`;
@@ -159884,7 +159918,9 @@ function hasMeaningfulPart(part) {
     return false;
   const type = part.type;
   if (type === "text") {
-    return typeof part.text === "string" && part.text.trim().length > 0;
+    if (typeof part.text !== "string")
+      return false;
+    return stripTagPrefix(part.text).trim().length > 0;
   }
   if (typeof type !== "string")
     return false;
@@ -167436,6 +167472,7 @@ async function readGitCommits(directory, options3 = {}) {
   if (revision.startsWith("-")) {
     throw new Error(`readGitCommits: refusing revision that looks like an option: "${revision}"`);
   }
+  const projectLabel = options3.projectIdentity ?? "<project>";
   const args = [
     "log",
     revision,
@@ -167458,11 +167495,11 @@ async function readGitCommits(directory, options3 = {}) {
     stdout = result.stdout;
   } catch (error51) {
     const message = error51 instanceof Error ? error51.message : String(error51);
-    log(`[git-commits] readGitCommits failed at cwd=${directory}: ${message.slice(0, 500)}`);
+    log(`[git-commits] readGitCommits failed for ${projectLabel}: ${message.slice(0, 500)}`);
     return [];
   }
   if (stdout.trim().length === 0) {
-    log(`[git-commits] readGitCommits returned empty stdout at cwd=${directory} (sinceMs=${options3.sinceMs ?? "none"} args=${args.slice(0, 4).join(" ")})`);
+    log(`[git-commits] readGitCommits returned empty stdout for ${projectLabel} (sinceMs=${options3.sinceMs ?? "none"} args=${args.slice(0, 4).join(" ")})`);
   }
   return parseGitLogOutput(stdout);
 }
@@ -167646,7 +167683,8 @@ async function indexCommitsForProject(db, projectPath, directory, options3) {
     const sinceMs = latestIndexed !== null ? Math.max(latestIndexed - 60000, Date.now() - options3.sinceDays * MS_PER_DAY) : Date.now() - options3.sinceDays * MS_PER_DAY;
     const commits = await readGitCommits(directory, {
       sinceMs,
-      maxCommits: options3.maxCommits
+      maxCommits: options3.maxCommits,
+      projectIdentity: projectPath
     });
     result.scanned = commits.length;
     if (commits.length === 0) {

package/package.json

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