chore: auto-commit before merge (2026-04-18 04:46)

globalcaos · globalcaos · commit 3fb871e20dbe · 2026-04-18T04:46:20.000+02:00
diff --git a/src/agents/pi-embedded-helpers/errors.ts b/src/agents/pi-embedded-helpers/errors.ts
@@ -717,6 +717,11 @@ function classifyFailoverClassificationFromMessage(
   if (isPeriodicUsageLimitErrorMessage(raw)) {
     return toReasonClassification(isBillingErrorMessage(raw) ? "billing" : "rate_limit");
   }
+  // FORK: Early billing check for Anthropic spending cap — must come BEFORE
+  // rateLimit because "usage limits" also matches rate_limit patterns.
+  if (/regain access/i.test(raw) || /specified.*usage limits/i.test(raw)) {
+    return toReasonClassification("billing");
+  }
   if (isRateLimitErrorMessage(raw)) {
     return toReasonClassification("rate_limit");
   }
diff --git a/src/agents/pi-embedded-runner/run/attempt.ts b/src/agents/pi-embedded-runner/run/attempt.ts
@@ -247,6 +247,8 @@ import {
   shouldPreemptivelyCompactBeforePrompt,
 } from "./preemptive-compaction.js";
 import type { EmbeddedRunAttemptParams, EmbeddedRunAttemptResult } from "./types.js";
+import { getRetrievalRuntime } from "../../pi-extensions/retrieval-runtime.js"; // FORK: still used inline for retrieval pack
+import * as _forkAttemptHooks from "../../../fork/attempt-hooks.js"; // FORK: single hook entry point
 
 export {
   appendAttemptCacheTtlIfNeeded,
@@ -2090,7 +2092,19 @@ export async function runEmbeddedAttempt(
               inFlightPrompt: effectivePrompt,
             });
 
-            // Only pass images option if there are actually images to pass
+                      // FORK: mid-context persona re-injection when SyncScore drops
+          {
+            const reinjectResult = _forkAttemptHooks.applyMidContextReinjectHook(
+              activeSession as unknown as import("@mariozechner/pi-coding-agent").SessionManager,
+              systemPromptText ?? "",
+              log,
+            );
+            if (reinjectResult.reinjected && systemPromptText != null) {
+              systemPromptText = reinjectResult.systemPromptText;
+            }
+          }
+
+// Only pass images option if there are actually images to pass
             // This avoids potential issues with models that don't expect the images parameter
             if (imageResult.images.length > 0) {
               await abortable(
@@ -2384,6 +2398,24 @@ export async function runEmbeddedAttempt(
               log.warn(`agent_end hook failed: ${err}`);
             });
         }
+
+        // FORK: text-tool-call interception for local providers (ollama/lmstudio/vllm)
+        if (!promptError && !aborted && tools.length > 0) {
+          const ttcResult = await _forkAttemptHooks.interceptTextToolCalls({
+            provider: params.provider,
+            activeSession: activeSession as never,
+            tools: tools as never,
+            toolMetas: toolMetas as never,
+            promptError,
+            aborted,
+            abortSignal: params.abortSignal,
+            abortable,
+            log,
+          });
+          if (ttcResult.promptError) {
+            promptError = ttcResult.promptError;
+          }
+        }
       } finally {
         clearTimeout(abortTimer);
         if (abortWarnTimer) {
diff --git a/src/agents/pi-embedded-subscribe.types.ts b/src/agents/pi-embedded-subscribe.types.ts
@@ -46,4 +46,10 @@ export type SubscribeEmbeddedPiSessionParams = {
    */
   builtinToolNames?: ReadonlySet<string>;
   internalEvents?: AgentInternalEvent[];
+  /** Auth profile ID for lifecycle event tracking. */
+  authProfileId?: string;
+  /** FORK: Model ID for lifecycle event tracking (e.g. "claude-sonnet-4-6"). */
+  modelId?: string;
+  /** FORK: Provider name for lifecycle event tracking (e.g. "anthropic"). */
+  modelProvider?: string;
 };
diff --git a/src/canvas-host/a2ui/.bundle.hash b/src/canvas-host/a2ui/.bundle.hash
@@ -1 +1 @@
-629b58884bd16319085c45d5d60249ed5fc50765038b347f20692e6f7a748d64
+36ffb6134ed280d655b687af8310d118e011f9b2fdd638ebbc99875ee7723c3d

Original file line number	Diff line number	Diff line change
`@@ -717,6 +717,11 @@ function classifyFailoverClassificationFromMessage(`
`717`	`717`	`if (isPeriodicUsageLimitErrorMessage(raw)) {`
`718`	`718`	`return toReasonClassification(isBillingErrorMessage(raw) ? "billing" : "rate_limit");`
`719`	`719`	`}`
	`720`	`+ // FORK: Early billing check for Anthropic spending cap — must come BEFORE`
	`721`	`+ // rateLimit because "usage limits" also matches rate_limit patterns.`
	`722`	`+ if (/regain access/i.test(raw) \|\| /specified.*usage limits/i.test(raw)) {`
	`723`	`+ return toReasonClassification("billing");`
	`724`	`+ }`
`720`	`725`	`if (isRateLimitErrorMessage(raw)) {`
`721`	`726`	`return toReasonClassification("rate_limit");`
`722`	`727`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-629b58884bd16319085c45d5d60249ed5fc50765038b347f20692e6f7a748d64`
	`1`	`+36ffb6134ed280d655b687af8310d118e011f9b2fdd638ebbc99875ee7723c3d`