@cortexkit/pi-magic-context 0.30.5 → 0.30.6

package/dist/index.js

@@ -157096,6 +157096,8 @@ class PiSubagentRunner {
           return;
         const parsed = parsePiEventLine(line);
         if (!parsed.ok) {
+          if ("noise" in parsed)
+            return;
           parseError = parsed.error;
           return;
         }
@@ -157396,6 +157398,9 @@ function countToolCalls(messages) {
   return count;
 }
 function parsePiEventLine(line) {
+  if (!line.trimStart().startsWith("{")) {
+    return { ok: false, noise: true };
+  }
   try {
     return { ok: true, event: JSON.parse(line) };
   } catch (error) {
@@ -174383,6 +174388,7 @@ function enforceProjectCap(db, projectPath, maxCommits) {
 // ../plugin/src/features/magic-context/git-commits/sweep-coordinator.ts
 var GIT_SWEEP_COOLDOWN_MS = 10 * 60 * 1000;
 var GIT_SWEEP_LEASE_TTL_MS = 5 * 60 * 1000;
+var GIT_SWEEP_NON_INDEXABLE_REPROBE_MS = 24 * 60 * 60 * 1000;
 var GIT_SWEEP_LEASE_RENEWAL_MS = 60 * 1000;
 function runImmediate(db, body) {
   db.exec("BEGIN IMMEDIATE");
@@ -174489,6 +174495,20 @@ function markGitSweepSuccessAndRelease(db, projectPath, holderId) {
     return result.changes === 1;
   });
 }
+function parkGitSweepNonIndexable(db, projectPath, holderId, reprobeMs = GIT_SWEEP_NON_INDEXABLE_REPROBE_MS) {
+  return runImmediate(db, () => {
+    const now = Date.now();
+    const sweptAt = now + reprobeMs - GIT_SWEEP_COOLDOWN_MS;
+    const result = db.prepare(`UPDATE git_sweep_coordinator
+                 SET lease_holder = NULL,
+                     lease_expires_at = NULL,
+                     last_swept_at = ?
+                 WHERE project_path = ?
+                   AND lease_holder = ?
+                   AND lease_expires_at > ?`).run(sweptAt, projectPath, holderId, now);
+    return result.changes === 1;
+  });
+}
 function releaseGitSweepLease(db, projectPath, holderId) {
   runImmediate(db, () => {
     db.prepare(`UPDATE git_sweep_coordinator
@@ -181657,11 +181677,21 @@ function recordTransientFailure(db, projectIdentity, due, finishedAt, error51) {
     });
   }
 }
+var LEASE_WAIT_POLL_MS = 2000;
+var MANUAL_RUN_LEASE_WAIT_MS = 60000;
 async function runDomainGroup(deps, group, cb) {
   const { db, projectIdentity, executor } = deps;
   const leaseKey = leaseKeyFor(group[0].config.task, projectIdentity);
   const holderId = crypto.randomUUID();
-  if (!acquireLease(db, holderId, leaseKey)) {
+  let acquired = acquireLease(db, holderId, leaseKey);
+  if (!acquired && cb?.leaseWaitMs) {
+    const deadline = Date.now() + cb.leaseWaitMs;
+    while (!acquired && Date.now() < deadline) {
+      await new Promise((resolve) => setTimeout(resolve, LEASE_WAIT_POLL_MS));
+      acquired = acquireLease(db, holderId, leaseKey);
+    }
+  }
+  if (!acquired) {
     log(`[dreamer] domain lease busy (${leaseKey}) — deferring ${group.length} task(s)`);
     for (const due of group)
       cb?.onBusy?.(due.config.task);
@@ -181756,6 +181786,7 @@ async function runManualDream(deps) {
   }
   await Promise.all([...groups.values()].map((group) => runDomainGroup({ ...deps, executor: deps.executor }, group, {
     forceGate,
+    leaseWaitMs: MANUAL_RUN_LEASE_WAIT_MS,
     onRan: (t) => result.ran.push(t),
     onFailed: (t) => result.failed.push(t),
     onBusy: (t) => result.deferredBusy.push(t)
@@ -181886,7 +181917,15 @@ var GIT_TIMEOUT_MS3 = 1e4;
 var DEFAULT_MAX_COMMITS = 5000;
 var RECORD_SEPARATOR = "\x1E";
 var FIELD_SEPARATOR = "\x1F";
-async function readGitCommits(directory, options = {}) {
+function classifyGitLogFailure(message) {
+  if (message.includes("not a git repository"))
+    return "not_a_repo";
+  if (message.includes("unknown revision or path not in the working tree") || message.includes("does not have any commits yet") || message.includes("bad revision")) {
+    return "no_head";
+  }
+  return "transient";
+}
+async function readGitCommitsResult(directory, options = {}) {
   const revision = options.branch ?? "HEAD";
   if (revision.startsWith("-")) {
     throw new Error(`readGitCommits: refusing revision that looks like an option: "${revision}"`);
@@ -181914,13 +181953,18 @@ async function readGitCommits(directory, options = {}) {
     stdout = result.stdout;
   } catch (error51) {
     const message = error51 instanceof Error ? error51.message : String(error51);
-    log(`[git-commits] readGitCommits failed for ${projectLabel}: ${message.slice(0, 500)}`);
-    return [];
+    const failure = classifyGitLogFailure(message);
+    if (failure === "transient") {
+      log(`[git-commits] readGitCommits failed for ${projectLabel}: ${message.slice(0, 500)}`);
+    } else {
+      log(`[git-commits] ${projectLabel} is not indexable (${failure})`);
+    }
+    return { commits: [], failure };
   }
   if (stdout.trim().length === 0) {
     log(`[git-commits] readGitCommits returned empty stdout for ${projectLabel} (sinceMs=${options.sinceMs ?? "none"} args=${args.slice(0, 4).join(" ")})`);
   }
-  return parseGitLogOutput(stdout);
+  return { commits: parseGitLogOutput(stdout), failure: null };
 }
 function parseGitLogOutput(stdout) {
   const commits = [];
@@ -181976,7 +182020,8 @@ async function indexCommitsForProject(db, projectPath, directory, options) {
     inserted: 0,
     updated: 0,
     evicted: 0,
-    embedded: 0
+    embedded: 0,
+    nonIndexable: false
   };
   if (indexInProgress.has(projectPath)) {
     log(`[git-commits] index already in progress for ${projectPath}, skipping`);
@@ -181986,12 +182031,17 @@ async function indexCommitsForProject(db, projectPath, directory, options) {
   try {
     const latestIndexed = getLatestIndexedCommitTimeMs(db, projectPath);
     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, {
+    const read = await readGitCommitsResult(directory, {
       sinceMs,
       maxCommits: options.maxCommits,
       projectIdentity: projectPath
     });
+    const commits = read.commits;
     result.scanned = commits.length;
+    if (read.failure === "not_a_repo" || read.failure === "no_head") {
+      result.nonIndexable = true;
+      return result;
+    }
     if (commits.length === 0) {
       result.evicted = enforceProjectCap(db, projectPath, options.maxCommits);
       log(`[git-commits] no new commits for ${projectPath} (sinceMs=${sinceMs} latestIndexed=${latestIndexed ?? "none"} evicted=${result.evicted})`);
@@ -182413,6 +182463,12 @@ async function sweepGitCommits(args) {
       sinceDays: gitCommitIndexing.since_days,
       maxCommits: gitCommitIndexing.max_commits
     });
+    if (result.nonIndexable) {
+      if (!parkGitSweepNonIndexable(db, projectIdentity, holderId)) {
+        releaseGitSweepLease(db, projectIdentity, holderId);
+      }
+      return;
+    }
     let drainedEmbeddings = 0;
     if (result.embedded > 0) {
       drainedEmbeddings = await embedUnembeddedCommits(db, projectIdentity);
@@ -184229,7 +184285,7 @@ Unknown task "${requested}".`,
         if (result.skippedNoWork.length > 0)
           lines.push(`Skipped (no work): ${result.skippedNoWork.join(", ")}`);
         if (result.deferredBusy.length > 0)
-          lines.push(`Busy (already running): ${result.deferredBusy.join(", ")}`);
+          lines.push(`Busy: ${result.deferredBusy.join(", ")} — another dream task holds this domain's lease; retry in a minute`);
         if (lines.length === 0)
           lines.push("No enabled dream tasks to run.");
         sendCtxStatusMessage(pi, {
@@ -194574,6 +194630,9 @@ function getMessageId(message) {
   }
   return "";
 }
+function isReplayableAnchor(message) {
+  return message.stopReason !== "aborted" && message.stopReason !== "error";
+}
 function hasToolCallWithId(message, callId) {
   if (!Array.isArray(message.content))
     return false;
@@ -194630,6 +194689,8 @@ function injectByAssistantId(messages, messageId, part) {
     const assistant = m;
     if (getMessageId(assistant) !== messageId)
       continue;
+    if (!isReplayableAnchor(assistant))
+      return false;
     if (hasToolCallWithId(assistant, part.callID)) {
       if (findToolResultAfter(messages, i, part.callID) >= 0)
         return true;
@@ -194655,6 +194716,8 @@ function injectIntoLatestAssistant(messages, part) {
     if (m.role !== "assistant")
       continue;
     const assistant = m;
+    if (!isReplayableAnchor(assistant))
+      continue;
     const id = getMessageId(assistant);
     if (id.length === 0)
       continue;
@@ -200063,7 +200126,7 @@ function formatThresholdPercent(value) {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.30.5",
+  version: "0.30.6",
   type: "module",
   description: "Pi coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",

package/dist/subagent-entry.js

@@ -161941,6 +161941,7 @@ function enforceProjectCap(db, projectPath, maxCommits) {
 // ../plugin/src/features/magic-context/git-commits/sweep-coordinator.ts
 var GIT_SWEEP_COOLDOWN_MS = 10 * 60 * 1000;
 var GIT_SWEEP_LEASE_TTL_MS = 5 * 60 * 1000;
+var GIT_SWEEP_NON_INDEXABLE_REPROBE_MS = 24 * 60 * 60 * 1000;
 var GIT_SWEEP_LEASE_RENEWAL_MS = 60 * 1000;
 function runImmediate(db, body) {
   db.exec("BEGIN IMMEDIATE");
@@ -162047,6 +162048,20 @@ function markGitSweepSuccessAndRelease(db, projectPath, holderId) {
     return result.changes === 1;
   });
 }
+function parkGitSweepNonIndexable(db, projectPath, holderId, reprobeMs = GIT_SWEEP_NON_INDEXABLE_REPROBE_MS) {
+  return runImmediate(db, () => {
+    const now = Date.now();
+    const sweptAt = now + reprobeMs - GIT_SWEEP_COOLDOWN_MS;
+    const result = db.prepare(`UPDATE git_sweep_coordinator
+                 SET lease_holder = NULL,
+                     lease_expires_at = NULL,
+                     last_swept_at = ?
+                 WHERE project_path = ?
+                   AND lease_holder = ?
+                   AND lease_expires_at > ?`).run(sweptAt, projectPath, holderId, now);
+    return result.changes === 1;
+  });
+}
 function releaseGitSweepLease(db, projectPath, holderId) {
   runImmediate(db, () => {
     db.prepare(`UPDATE git_sweep_coordinator
@@ -173417,7 +173432,15 @@ var GIT_TIMEOUT_MS3 = 1e4;
 var DEFAULT_MAX_COMMITS = 5000;
 var RECORD_SEPARATOR = "\x1E";
 var FIELD_SEPARATOR = "\x1F";
-async function readGitCommits(directory, options = {}) {
+function classifyGitLogFailure(message) {
+  if (message.includes("not a git repository"))
+    return "not_a_repo";
+  if (message.includes("unknown revision or path not in the working tree") || message.includes("does not have any commits yet") || message.includes("bad revision")) {
+    return "no_head";
+  }
+  return "transient";
+}
+async function readGitCommitsResult(directory, options = {}) {
   const revision = options.branch ?? "HEAD";
   if (revision.startsWith("-")) {
     throw new Error(`readGitCommits: refusing revision that looks like an option: "${revision}"`);
@@ -173445,13 +173468,18 @@ async function readGitCommits(directory, options = {}) {
     stdout = result.stdout;
   } catch (error51) {
     const message = error51 instanceof Error ? error51.message : String(error51);
-    log(`[git-commits] readGitCommits failed for ${projectLabel}: ${message.slice(0, 500)}`);
-    return [];
+    const failure = classifyGitLogFailure(message);
+    if (failure === "transient") {
+      log(`[git-commits] readGitCommits failed for ${projectLabel}: ${message.slice(0, 500)}`);
+    } else {
+      log(`[git-commits] ${projectLabel} is not indexable (${failure})`);
+    }
+    return { commits: [], failure };
   }
   if (stdout.trim().length === 0) {
     log(`[git-commits] readGitCommits returned empty stdout for ${projectLabel} (sinceMs=${options.sinceMs ?? "none"} args=${args.slice(0, 4).join(" ")})`);
   }
-  return parseGitLogOutput(stdout);
+  return { commits: parseGitLogOutput(stdout), failure: null };
 }
 function parseGitLogOutput(stdout) {
   const commits = [];
@@ -173507,7 +173535,8 @@ async function indexCommitsForProject(db, projectPath, directory, options) {
     inserted: 0,
     updated: 0,
     evicted: 0,
-    embedded: 0
+    embedded: 0,
+    nonIndexable: false
   };
   if (indexInProgress.has(projectPath)) {
     log(`[git-commits] index already in progress for ${projectPath}, skipping`);
@@ -173517,12 +173546,17 @@ async function indexCommitsForProject(db, projectPath, directory, options) {
   try {
     const latestIndexed = getLatestIndexedCommitTimeMs(db, projectPath);
     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, {
+    const read = await readGitCommitsResult(directory, {
       sinceMs,
       maxCommits: options.maxCommits,
       projectIdentity: projectPath
     });
+    const commits = read.commits;
     result.scanned = commits.length;
+    if (read.failure === "not_a_repo" || read.failure === "no_head") {
+      result.nonIndexable = true;
+      return result;
+    }
     if (commits.length === 0) {
       result.evicted = enforceProjectCap(db, projectPath, options.maxCommits);
       log(`[git-commits] no new commits for ${projectPath} (sinceMs=${sinceMs} latestIndexed=${latestIndexed ?? "none"} evicted=${result.evicted})`);

package/package.json

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