@brainervirus/workit-pi 8.30.0 → 8.31.1

package/dist/workit.js

@@ -14144,6 +14144,18 @@ function diffHash(cwd, base, head) {
   }
   return `sha256:${hash.digest("hex")}`;
 }
+function cleanRebase(cwd, range) {
+  if (!Object.values(range).every(safeRef2))
+    return false;
+  const fromFork = git4(cwd, ["merge-base", range.fromBase, range.from]);
+  const toFork = git4(cwd, ["merge-base", range.toBase, range.to]);
+  if (!fromFork || !toFork || fromFork === toFork)
+    return false;
+  const merged = gitRun2(cwd, ["merge-tree", "--write-tree", "--no-messages", `--merge-base=${fromFork}`, toFork, range.from], GIT_TIMEOUTS.worktree);
+  const tree = merged.ok ? merged.stdout.split(`
+`)[0]?.trim() : null;
+  return Boolean(tree) && tree === git4(cwd, ["rev-parse", "--verify", "-q", `${range.to}^{tree}`]);
+}
 function storeRoot(cwd) {
   const location = resolveStore(path16.resolve(cwd));
   if (location instanceof Error)
@@ -14807,23 +14819,24 @@ function checkVerdicts(cwd, branch, ledgerRows) {
     return drift;
   };
   const exactCache = new Map;
-  const exactCarry = (row) => {
-    if (FAILING.has(String(row.result)))
-      return true;
+  const exactMatch = (row) => {
     let exact = exactCache.get(row);
     if (exact === undefined) {
       const toBase = row.base ?? fallbackBase;
       const toBaseSha = toBase ? resolveCommit(cwd, toBase) : null;
       const fromBase = row.baseSha ?? toBaseSha;
-      exact = Boolean(row.head && head && toBaseSha && fromBase && sameOwnChange(cwd, { from: row.head, to: head, fromBase, toBase: toBaseSha }));
+      const range = row.head && head && toBaseSha && fromBase ? { from: row.head, to: head, fromBase, toBase: toBaseSha } : null;
+      exact = !range ? null : sameOwnChange(cwd, range) ? "same" : cleanRebase(cwd, range) ? "rebase" : null;
       exactCache.set(row, exact);
     }
     return exact;
   };
+  const exactCarry = (row) => FAILING.has(String(row.result)) || exactMatch(row) !== null;
   const keyBasis = (row) => {
     const basis = verdictBasis(row, { head, ...keyFor(row.base ?? fallbackBase) });
     return basis === "carried" && !exactCarry(row) ? "stale" : basis;
   };
+  const rebaseNote = (row) => row.head && head && row.head !== head && !FAILING.has(String(row.result)) && keyBasis(row) === "carried" && exactMatch(row) === "rebase" ? { rule: "rebase", since: row.head, files: [] } : null;
   const restacked = (row) => restackCarries(FAILING.has(String(row.result)) ? null : cwd, rows, branch, row.head, head);
   const carryOf = (row) => {
     if (keyBasis(row) !== "stale")
@@ -14901,7 +14914,7 @@ function checkVerdicts(cwd, branch, ledgerRows) {
       independent: independence.length === 0,
       accepted: reasons.length === 0,
       reasons,
-      carry: basis === "carried" ? carryOf(row) : null,
+      carry: basis === "carried" ? rebaseNote(row) ?? carryOf(row) : null,
       verdict: row
     });
     if (reasons.length === 0) {
@@ -24752,6 +24765,28 @@ var PI_DESCRIPTOR = {
     }
   ]
 };
+// packages/workit-core/src/hooks/model-switch.ts
+var MAX_SESSIONS = 256;
+var modelSwitched = (models, sessionId, model) => {
+  if (!model)
+    return false;
+  const previous = models.get(sessionId);
+  models.delete(sessionId);
+  models.set(sessionId, model);
+  if (models.size > MAX_SESSIONS)
+    models.delete(models.keys().next().value);
+  return previous !== undefined && previous !== model;
+};
+var modelKey = (model) => {
+  if (model === null || typeof model !== "object")
+    return null;
+  const { id, providerID, provider } = model;
+  if (typeof id !== "string" || !id)
+    return null;
+  const source = typeof providerID === "string" ? providerID : provider;
+  return typeof source === "string" && source ? `${source}/${id}` : id;
+};
+
 // packages/workit-pi/src/context.ts
 var piCapabilities = (ctx) => capabilitiesFor(PI_DESCRIPTOR, { ui: ctx?.hasUI === true });
 var piContext = (ctx) => ({
@@ -24767,7 +24802,7 @@ var piContext = (ctx) => ({
   constraints: [],
   now: () => new Date().toISOString().replace(/\.\d{3}Z$/, "Z")
 });
-var turnContext = (ctx) => {
+var taskTurnContext = (ctx) => {
   if (!ctx.isProjectTrusted())
     return null;
   try {
@@ -24777,6 +24812,13 @@ var turnContext = (ctx) => {
     return null;
   }
 };
+var sessionModels = new Map;
+var turnContext = (ctx) => {
+  const task = taskTurnContext(ctx);
+  const switched = modelSwitched(sessionModels, ctx.sessionManager.getSessionId(), modelKey(ctx.model));
+  return switched && ctx.isProjectTrusted() ? `${invariantBootstrap()}${task ? `
+${task}` : ""}` : task;
+};
 var turnInput = (ctx) => ({
   host: "pi",
   cwd: ctx.cwd,
@@ -24797,7 +24839,7 @@ var standingNotice = (ctx) => {
   const input = turnInput(ctx);
   return standingDelta(worker ? { ...input, session: { ...input.session, id: worker } } : input);
 };
-var workitContext = (ctx, taskContext = turnContext(ctx)) => {
+var workitContext = (ctx, taskContext = taskTurnContext(ctx)) => {
   const session = ctx.sessionManager.getSessionId();
   if (!ctx.isProjectTrusted())
     return `${invariantBootstrap()}
@@ -24820,6 +24862,38 @@ var unfinishedTaskOffer2 = (ctx) => {
   }
 };
 
+// packages/workit-core/src/hooks/repeat-failure.ts
+import { createHash as createHash18 } from "node:crypto";
+var SAME_CALL_FAILED = "Same call failed twice:";
+var MAX_SESSIONS2 = 256;
+var stable = (value) => JSON.stringify(value, (_key, entry) => entry && typeof entry === "object" && !Array.isArray(entry) ? Object.fromEntries(Object.entries(entry).toSorted(([a], [b]) => a.localeCompare(b))) : entry) ?? "null";
+var hashOf = (call) => createHash18("sha256").update(call).digest("hex").slice(0, 32);
+var record2 = (memo, sessionId, call, failed, next) => {
+  const previous = memo.get(sessionId);
+  memo.delete(sessionId);
+  if (!failed)
+    return null;
+  const hash = hashOf(call);
+  memo.set(sessionId, hash);
+  if (memo.size > MAX_SESSIONS2)
+    memo.delete(memo.keys().next().value);
+  return previous === hash && next ? `${SAME_CALL_FAILED} ${next}` : null;
+};
+var isFailure = (result) => result !== null && typeof result === "object" && result.ok === false && typeof result.error === "string";
+var correctedPayload = (tool, result) => {
+  const example = /Example: (\{.*\})\s*$/.exec(result.error)?.[1];
+  if (example)
+    return `${tool} ${example}`;
+  const guidance = result.details?.guidance;
+  return typeof guidance === "string" && guidance ? guidance : null;
+};
+var escalateToolFailure = (memo, sessionId, tool, input, result) => {
+  const failed = isFailure(result);
+  const line = record2(memo, sessionId, `tool\x00${tool}\x00${stable(input)}`, failed, failed ? correctedPayload(tool, result) : null);
+  return line && failed ? { ...result, error: `${result.error}
+${line}` } : result;
+};
+
 // packages/workit-pi/src/tools.ts
 var readOnlyActions = new Set(["list", "inspect", "preview", "explain", "export"]);
 var output = (result) => ({
@@ -24847,18 +24921,23 @@ var trustedForMutation = (ctx, action) => {
     return success(null, null, null);
   return failure2("permission_denied", "Pi project is not trusted for Workit mutations");
 };
+var failures = new Map;
 var executeFamily = async (family, input, ctx) => {
+  const result = runFamily(family, input, ctx);
+  return output(escalateToolFailure(failures, piContext(ctx).caller.actor, `workit_${family}`, input, result));
+};
+var runFamily = (family, input, ctx) => {
   const parsed = parseAdvertisedOperation(family, input, "pi");
   if (!parsed.ok)
-    return output(parsed);
+    return parsed;
   const trust = trustedForMutation(ctx, parsed.data.action);
   if (!trust.ok)
-    return output(trust);
+    return trust;
   const context = piContext(ctx);
   const core = new WorkitCore(new TaskStore(ctx.cwd), context);
   const run = core[family];
   const result = run.call(core, parsed.data);
-  return output(family === "task" && (context.workerId ?? null) !== null ? briefInspectResult(parsed.data, result) : result);
+  return family === "task" && (context.workerId ?? null) !== null ? briefInspectResult(parsed.data, result) : result;
 };
 var registerWorkitTools = (pi, options = {}) => {
   for (const family of OPERATION_FAMILIES)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brainervirus/workit-pi",
-  "version": "8.30.0",
+  "version": "8.31.1",
   "description": "Workit native extension for Pi — tools, method skills, and session continuity",
   "keywords": [
     "agentic-coding",