@poolzin/pool-bot 2026.2.25 → 2026.2.26

package/dist/agents/pi-embedded-runner/compact.js

@@ -1,6 +1,6 @@
 import fs from "node:fs/promises";
 import os from "node:os";
-import { createAgentSession, estimateTokens, SessionManager, SettingsManager, } from "@mariozechner/pi-coding-agent";
+import { createAgentSession, DefaultResourceLoader, estimateTokens, SessionManager, SettingsManager, } from "@mariozechner/pi-coding-agent";
 import { resolveHeartbeatPrompt } from "../../auto-reply/heartbeat.js";
 import { resolveChannelCapabilities } from "../../config/channel-capabilities.js";
 import { getMachineDisplayName } from "../../infra/machine-name.js";
@@ -24,7 +24,7 @@ import { resolvePoolbotDocsPath } from "../docs-path.js";
 import { getApiKeyForModel, resolveModelAuthMode } from "../model-auth.js";
 import { ensurePoolbotModelsJson } from "../models-config.js";
 import { ensureSessionHeader, validateAnthropicTurns, validateGeminiTurns, } from "../pi-embedded-helpers.js";
-import { ensurePiCompactionReserveTokens, resolveCompactionReserveTokensFloor, } from "../pi-settings.js";
+import { applyPiCompactionSettingsFromConfig } from "../pi-settings.js";
 import { createPoolbotCodingTools } from "../pi-tools.js";
 import { resolveSandboxContext } from "../sandbox.js";
 import { repairSessionFileIfNeeded } from "../session-file-repair.js";
@@ -35,7 +35,7 @@ import { detectRuntimeShell } from "../shell-utils.js";
 import { applySkillEnvOverrides, applySkillEnvOverridesFromSnapshot, loadWorkspaceSkillEntries, resolveSkillsPromptForRun, } from "../skills.js";
 import { resolveTranscriptPolicy } from "../transcript-policy.js";
 import { compactWithSafetyTimeout, EMBEDDED_COMPACTION_TIMEOUT_MS, } from "./compaction-safety-timeout.js";
-import { buildEmbeddedExtensionPaths } from "./extensions.js";
+import { buildEmbeddedExtensionFactories } from "./extensions.js";
 import { logToolSchemasForGoogle, sanitizeSessionHistory, sanitizeToolsForGoogle, } from "./google.js";
 import { getDmHistoryLimitFromSessionKey, limitHistoryTurns } from "./history.js";
 import { resolveGlobalLane, resolveSessionLane } from "./lanes.js";
@@ -44,6 +44,7 @@ import { buildModelAliasLines, resolveModel } from "./model.js";
 import { buildEmbeddedSandboxInfo } from "./sandbox-info.js";
 import { prewarmSessionFile, trackSessionManagerAccess } from "./session-manager-cache.js";
 import { applySystemPromptOverrideToSession, buildEmbeddedSystemPrompt, createSystemPromptOverride, } from "./system-prompt.js";
+import { collectAllowedToolNames } from "./tool-name-allowlist.js";
 import { splitSdkTools } from "./tool-split.js";
 import { describeUnknownError, mapThinkingLevel } from "./utils.js";
 import { flushPendingToolResultsAfterIdle } from "./wait-for-idle-before-flush.js";
@@ -276,6 +277,7 @@ export async function compactEmbeddedPiSessionDirect(params) {
             modelAuthMode: resolveModelAuthMode(model.provider, params.config),
         });
         const tools = sanitizeToolsForGoogle({ tools: toolsRaw, provider });
+        const allowedToolNames = collectAllowedToolNames({ tools });
         logToolSchemasForGoogle({ tools, provider });
         const machineName = await getMachineDisplayName();
         const runtimeChannel = normalizeMessageChannel(params.messageChannel ?? params.messageProvider);
@@ -372,6 +374,10 @@ export async function compactEmbeddedPiSessionDirect(params) {
             reasoningLevel: params.reasoningLevel ?? "off",
             extraSystemPrompt: params.extraSystemPrompt,
             ownerNumbers: params.ownerNumbers,
+            ownerDisplay: params.config?.commands?.ownerDisplay,
+            ownerDisplaySecret: params.config?.commands?.ownerDisplaySecret ??
+                params.config?.gateway?.auth?.token ??
+                params.config?.gateway?.remote?.token,
             reasoningTagHint,
             heartbeatPrompt: isDefaultAgent
                 ? resolveHeartbeatPrompt(params.config?.agents?.defaults?.heartbeat?.prompt)
@@ -414,21 +420,35 @@ export async function compactEmbeddedPiSessionDirect(params) {
                 agentId: sessionAgentId,
                 sessionKey: params.sessionKey,
                 allowSyntheticToolResults: transcriptPolicy.allowSyntheticToolResults,
+                allowedToolNames,
             });
             trackSessionManagerAccess(params.sessionFile);
             const settingsManager = SettingsManager.create(effectiveWorkspace, agentDir);
-            ensurePiCompactionReserveTokens({
+            applyPiCompactionSettingsFromConfig({
                 settingsManager,
-                minReserveTokens: resolveCompactionReserveTokensFloor(params.config),
+                cfg: params.config,
             });
-            // Call for side effects (sets compaction/pruning runtime state)
-            buildEmbeddedExtensionPaths({
+            // Sets compaction/pruning runtime state and returns extension factories
+            // that must be passed to the resource loader for the safeguard to be active.
+            const extensionFactories = buildEmbeddedExtensionFactories({
                 cfg: params.config,
                 sessionManager,
                 provider,
                 modelId,
                 model,
             });
+            // Only create an explicit resource loader when there are extension factories
+            // to register; otherwise let createAgentSession use its built-in default.
+            let resourceLoader;
+            if (extensionFactories.length > 0) {
+                resourceLoader = new DefaultResourceLoader({
+                    cwd: resolvedWorkspace,
+                    agentDir,
+                    settingsManager,
+                    extensionFactories,
+                });
+                await resourceLoader.reload();
+            }
             const { builtInTools, customTools } = splitSdkTools({
                 tools,
                 sandboxEnabled: !!sandbox?.enabled,
@@ -444,6 +464,7 @@ export async function compactEmbeddedPiSessionDirect(params) {
                 customTools,
                 sessionManager,
                 settingsManager,
+                resourceLoader,
             });
             applySystemPromptOverrideToSession(session, systemPromptOverride());
             try {
@@ -452,6 +473,7 @@ export async function compactEmbeddedPiSessionDirect(params) {
                     modelApi: model.api,
                     modelId,
                     provider,
+                    allowedToolNames,
                     config: params.config,
                     sessionManager,
                     sessionId: params.sessionId,

package/dist/agents/pi-embedded-runner/extensions.js

@@ -1,20 +1,13 @@
-import path from "node:path";
-import { fileURLToPath } from "node:url";
 import { resolveContextWindowInfo } from "../context-window-guard.js";
 import { DEFAULT_CONTEXT_TOKENS } from "../defaults.js";
 import { setCompactionSafeguardRuntime } from "../pi-extensions/compaction-safeguard-runtime.js";
+import compactionSafeguardExtension from "../pi-extensions/compaction-safeguard.js";
+import contextPruningExtension from "../pi-extensions/context-pruning.js";
 import { setContextPruningRuntime } from "../pi-extensions/context-pruning/runtime.js";
 import { computeEffectiveSettings } from "../pi-extensions/context-pruning/settings.js";
 import { makeToolPrunablePredicate } from "../pi-extensions/context-pruning/tools.js";
 import { ensurePiCompactionReserveTokens } from "../pi-settings.js";
 import { isCacheTtlEligibleProvider, readLastCacheTtlTimestamp } from "./cache-ttl.js";
-function resolvePiExtensionPath(id) {
-    const self = fileURLToPath(import.meta.url);
-    const dir = path.dirname(self);
-    // In dev this file is `.ts` (tsx), in production it's `.js`.
-    const ext = path.extname(self) === ".ts" ? "ts" : "js";
-    return path.join(dir, "..", "pi-extensions", `${id}.${ext}`);
-}
 function resolveContextWindowTokens(params) {
     return resolveContextWindowInfo({
         cfg: params.cfg,
@@ -24,41 +17,50 @@ function resolveContextWindowTokens(params) {
         defaultTokens: DEFAULT_CONTEXT_TOKENS,
     }).tokens;
 }
-function buildContextPruningExtension(params) {
+function buildContextPruningFactory(params) {
     const raw = params.cfg?.agents?.defaults?.contextPruning;
-    if (raw?.mode !== "cache-ttl")
-        return {};
-    if (!isCacheTtlEligibleProvider(params.provider, params.modelId))
-        return {};
+    if (raw?.mode !== "cache-ttl") {
+        return undefined;
+    }
+    if (!isCacheTtlEligibleProvider(params.provider, params.modelId)) {
+        return undefined;
+    }
     const settings = computeEffectiveSettings(raw);
-    if (!settings)
-        return {};
+    if (!settings) {
+        return undefined;
+    }
     setContextPruningRuntime(params.sessionManager, {
         settings,
         contextWindowTokens: resolveContextWindowTokens(params),
         isToolPrunable: makeToolPrunablePredicate(settings.tools),
         lastCacheTouchAt: readLastCacheTtlTimestamp(params.sessionManager),
     });
-    return {
-        additionalExtensionPaths: [resolvePiExtensionPath("context-pruning")],
-    };
+    return contextPruningExtension;
 }
 function resolveCompactionMode(cfg) {
     return cfg?.agents?.defaults?.compaction?.mode === "safeguard" ? "safeguard" : "default";
 }
-export function buildEmbeddedExtensionPaths(params) {
-    const paths = [];
+export function buildEmbeddedExtensionFactories(params) {
+    const factories = [];
     if (resolveCompactionMode(params.cfg) === "safeguard") {
         const compactionCfg = params.cfg?.agents?.defaults?.compaction;
+        const contextWindowInfo = resolveContextWindowInfo({
+            cfg: params.cfg,
+            provider: params.provider,
+            modelId: params.modelId,
+            modelContextWindow: params.model?.contextWindow,
+            defaultTokens: DEFAULT_CONTEXT_TOKENS,
+        });
         setCompactionSafeguardRuntime(params.sessionManager, {
             maxHistoryShare: compactionCfg?.maxHistoryShare,
+            contextWindowTokens: contextWindowInfo.tokens,
         });
-        paths.push(resolvePiExtensionPath("compaction-safeguard"));
+        factories.push(compactionSafeguardExtension);
     }
-    const pruning = buildContextPruningExtension(params);
-    if (pruning.additionalExtensionPaths) {
-        paths.push(...pruning.additionalExtensionPaths);
+    const pruningFactory = buildContextPruningFactory(params);
+    if (pruningFactory) {
+        factories.push(pruningFactory);
     }
-    return paths;
+    return factories;
 }
 export { ensurePiCompactionReserveTokens };

package/dist/agents/pi-embedded-runner/google.js

@@ -7,6 +7,7 @@ import { cleanToolSchemaForGemini } from "../pi-tools.schema.js";
 import { sanitizeToolCallInputs, stripToolResultDetails, sanitizeToolUseResultPairing, } from "../session-transcript-repair.js";
 import { resolveTranscriptPolicy } from "../transcript-policy.js";
 import { log } from "./logger.js";
+import { dropThinkingBlocks } from "./thinking.js";
 import { describeUnknownError } from "./utils.js";
 const GOOGLE_TURN_ORDERING_CUSTOM_TYPE = "google-turn-ordering-bootstrap";
 const GOOGLE_SCHEMA_UNSUPPORTED_KEYWORDS = new Set([
@@ -71,6 +72,12 @@ export function sanitizeAntigravityThinkingBlocks(messages) {
             const rec = block;
             const candidate = rec.thinkingSignature ?? rec.signature ?? rec.thought_signature ?? rec.thoughtSignature;
             if (!isValidAntigravitySignature(candidate)) {
+                // Preserve reasoning content as plain text when signatures are invalid/missing.
+                // Antigravity Claude rejects unsigned thinking blocks, but dropping them loses context.
+                const thinkingText = block.thinking;
+                if (typeof thinkingText === "string" && thinkingText.trim()) {
+                    nextContent.push({ type: "text", text: thinkingText });
+                }
                 contentChanged = true;
                 continue;
             }
@@ -199,11 +206,11 @@ function findUnsupportedSchemaKeywords(schema, path) {
     return violations;
 }
 export function sanitizeToolsForGoogle(params) {
-    // google-antigravity serves Anthropic models (e.g. claude-opus-4-6-thinking),
-    // NOT Gemini. Applying Gemini schema cleaning strips JSON Schema keywords
-    // (minimum, maximum, format, etc.) that Anthropic's API requires for
-    // draft 2020-12 compliance. Only clean for actual Gemini providers.
-    if (params.provider !== "google-gemini-cli") {
+    // Cloud Code Assist uses the OpenAPI 3.03 `parameters` field for both Gemini
+    // AND Claude models.  This field does not support JSON Schema keywords such as
+    // patternProperties, additionalProperties, $ref, etc.  We must clean schemas
+    // for every provider that routes through this path.
+    if (params.provider !== "google-gemini-cli" && params.provider !== "google-antigravity") {
         return params.tools;
     }
     return params.tools.map((tool) => {
@@ -350,10 +357,15 @@ export async function sanitizeSessionHistory(params) {
         sanitizeThoughtSignatures: policy.sanitizeThoughtSignatures,
         ...resolveImageSanitizationLimits(params.config),
     });
-    const sanitizedThinking = policy.normalizeAntigravityThinkingBlocks
-        ? sanitizeAntigravityThinkingBlocks(sanitizedImages)
+    const droppedThinking = policy.dropThinkingBlocks
+        ? dropThinkingBlocks(sanitizedImages)
         : sanitizedImages;
-    const sanitizedToolCalls = sanitizeToolCallInputs(sanitizedThinking);
+    const sanitizedThinking = policy.sanitizeThinkingSignatures
+        ? sanitizeAntigravityThinkingBlocks(droppedThinking)
+        : droppedThinking;
+    const sanitizedToolCalls = sanitizeToolCallInputs(sanitizedThinking, {
+        allowedToolNames: params.allowedToolNames,
+    });
     const repairedTools = policy.repairToolUseResultPairing
         ? sanitizeToolUseResultPairing(sanitizedToolCalls)
         : sanitizedToolCalls;

package/dist/agents/pi-embedded-runner/run/attempt.js

@@ -1,7 +1,7 @@
 import fs from "node:fs/promises";
 import os from "node:os";
 import { streamSimple } from "@mariozechner/pi-ai";
-import { createAgentSession, SessionManager, SettingsManager } from "@mariozechner/pi-coding-agent";
+import { createAgentSession, DefaultResourceLoader, SessionManager, SettingsManager, } from "@mariozechner/pi-coding-agent";
 import { resolveHeartbeatPrompt } from "../../../auto-reply/heartbeat.js";
 import { resolveChannelCapabilities } from "../../../config/channel-capabilities.js";
 import { getMachineDisplayName } from "../../../infra/machine-name.js";
@@ -30,7 +30,7 @@ import { resolveDefaultModelForAgent } from "../../model-selection.js";
 import { createOllamaStreamFn, OLLAMA_NATIVE_BASE_URL } from "../../ollama-stream.js";
 import { isCloudCodeAssistFormatError, resolveBootstrapMaxChars, resolveBootstrapTotalMaxChars, validateAnthropicTurns, validateGeminiTurns, } from "../../pi-embedded-helpers.js";
 import { subscribeEmbeddedPiSession } from "../../pi-embedded-subscribe.js";
-import { ensurePiCompactionReserveTokens, resolveCompactionReserveTokensFloor, } from "../../pi-settings.js";
+import { applyPiCompactionSettingsFromConfig } from "../../pi-settings.js";
 import { toClientToolDefinitions } from "../../pi-tool-definition-adapter.js";
 import { createPoolbotCodingTools, resolveToolLoopDetectionConfig } from "../../pi-tools.js";
 import { resolveSandboxContext } from "../../sandbox.js";
@@ -47,7 +47,7 @@ import { resolveTranscriptPolicy } from "../../transcript-policy.js";
 import { DEFAULT_BOOTSTRAP_FILENAME } from "../../workspace.js";
 import { isRunnerAbortError } from "../abort.js";
 import { appendCacheTtlTimestamp, isCacheTtlEligibleProvider } from "../cache-ttl.js";
-import { buildEmbeddedExtensionPaths } from "../extensions.js";
+import { buildEmbeddedExtensionFactories } from "../extensions.js";
 import { applyExtraParamsToAgent } from "../extra-params.js";
 import { logToolSchemasForGoogle, sanitizeAntigravityThinkingBlocks, sanitizeSessionHistory, sanitizeToolsForGoogle, } from "../google.js";
 import { getDmHistoryLimitFromSessionKey, limitHistoryTurns } from "../history.js";
@@ -58,6 +58,8 @@ import { buildEmbeddedSandboxInfo } from "../sandbox-info.js";
 import { prewarmSessionFile, trackSessionManagerAccess } from "../session-manager-cache.js";
 import { prepareSessionManagerForRun } from "../session-manager-init.js";
 import { applySystemPromptOverrideToSession, buildEmbeddedSystemPrompt, createSystemPromptOverride, } from "../system-prompt.js";
+import { dropThinkingBlocks } from "../thinking.js";
+import { collectAllowedToolNames } from "../tool-name-allowlist.js";
 import { installToolResultContextGuard } from "../tool-result-context-guard.js";
 import { splitSdkTools } from "../tool-split.js";
 import { describeUnknownError, mapThinkingLevel } from "../utils.js";
@@ -101,6 +103,37 @@ export function injectHistoryImagesIntoMessages(messages, historyImagesByIndex)
     }
     return didMutate;
 }
+export async function resolvePromptBuildHookResult(params) {
+    const promptBuildResult = params.hookRunner?.hasHooks("before_prompt_build")
+        ? await params.hookRunner
+            .runBeforePromptBuild({
+            prompt: params.prompt,
+            messages: params.messages,
+        }, params.hookCtx)
+            .catch((hookErr) => {
+            log.warn(`before_prompt_build hook failed: ${String(hookErr)}`);
+            return undefined;
+        })
+        : undefined;
+    const legacyResult = params.legacyBeforeAgentStartResult ??
+        (params.hookRunner?.hasHooks("before_agent_start")
+            ? await params.hookRunner
+                .runBeforeAgentStart({
+                prompt: params.prompt,
+                messages: params.messages,
+            }, params.hookCtx)
+                .catch((hookErr) => {
+                log.warn(`before_agent_start hook (legacy prompt build path) failed: ${String(hookErr)}`);
+                return undefined;
+            })
+            : undefined);
+    return {
+        systemPrompt: promptBuildResult?.systemPrompt ?? legacyResult?.systemPrompt,
+        prependContext: [promptBuildResult?.prependContext, legacyResult?.prependContext]
+            .filter((value) => Boolean(value))
+            .join("\n\n"),
+    };
+}
 function summarizeMessagePayload(msg) {
     const content = msg.content;
     if (typeof content === "string") {
@@ -244,6 +277,10 @@ export async function runEmbeddedAttempt(params) {
                 disableMessageTool: params.disableMessageTool,
             });
         const tools = sanitizeToolsForGoogle({ tools: toolsRaw, provider: params.provider });
+        const allowedToolNames = collectAllowedToolNames({
+            tools,
+            clientTools: params.clientTools,
+        });
         logToolSchemasForGoogle({ tools, provider: params.provider });
         const machineName = await getMachineDisplayName();
         const runtimeChannel = normalizeMessageChannel(params.messageChannel ?? params.messageProvider);
@@ -349,6 +386,10 @@ export async function runEmbeddedAttempt(params) {
             reasoningLevel: params.reasoningLevel ?? "off",
             extraSystemPrompt: params.extraSystemPrompt,
             ownerNumbers: params.ownerNumbers,
+            ownerDisplay: params.config?.commands?.ownerDisplay,
+            ownerDisplaySecret: params.config?.commands?.ownerDisplaySecret ??
+                params.config?.gateway?.auth?.token ??
+                params.config?.gateway?.remote?.token,
             reasoningTagHint,
             heartbeatPrompt: isDefaultAgent
                 ? resolveHeartbeatPrompt(params.config?.agents?.defaults?.heartbeat?.prompt)
@@ -424,6 +465,7 @@ export async function runEmbeddedAttempt(params) {
                 sessionKey: params.sessionKey,
                 inputProvenance: params.inputProvenance,
                 allowSyntheticToolResults: transcriptPolicy.allowSyntheticToolResults,
+                allowedToolNames,
             });
             trackSessionManagerAccess(params.sessionFile);
             await prepareSessionManagerForRun({
@@ -434,18 +476,31 @@ export async function runEmbeddedAttempt(params) {
                 cwd: effectiveWorkspace,
             });
             const settingsManager = SettingsManager.create(effectiveWorkspace, agentDir);
-            ensurePiCompactionReserveTokens({
+            applyPiCompactionSettingsFromConfig({
                 settingsManager,
-                minReserveTokens: resolveCompactionReserveTokensFloor(params.config),
+                cfg: params.config,
             });
-            // Call for side effects (sets compaction/pruning runtime state)
-            buildEmbeddedExtensionPaths({
+            // Sets compaction/pruning runtime state and returns extension factories
+            // that must be passed to the resource loader for the safeguard to be active.
+            const extensionFactories = buildEmbeddedExtensionFactories({
                 cfg: params.config,
                 sessionManager,
                 provider: params.provider,
                 modelId: params.modelId,
                 model: params.model,
             });
+            // Only create an explicit resource loader when there are extension factories
+            // to register; otherwise let createAgentSession use its built-in default.
+            let resourceLoader;
+            if (extensionFactories.length > 0) {
+                resourceLoader = new DefaultResourceLoader({
+                    cwd: resolvedWorkspace,
+                    agentDir,
+                    settingsManager,
+                    extensionFactories,
+                });
+                await resourceLoader.reload();
+            }
             // Get hook runner early so it's available when creating tools
             const hookRunner = getGlobalHookRunner();
             const { builtInTools, customTools } = splitSdkTools({
@@ -479,6 +534,7 @@ export async function runEmbeddedAttempt(params) {
                 customTools: allCustomTools,
                 sessionManager,
                 settingsManager,
+                resourceLoader,
             }));
             applySystemPromptOverrideToSession(session, systemPromptText);
             if (!session) {
@@ -533,6 +589,28 @@ export async function runEmbeddedAttempt(params) {
                 });
                 activeSession.agent.streamFn = cacheTrace.wrapStreamFn(activeSession.agent.streamFn);
             }
+            // Copilot/Claude can reject persisted `thinking` blocks (e.g. thinkingSignature:"reasoning_text")
+            // on *any* follow-up provider call (including tool continuations). Wrap the stream function
+            // so every outbound request sees sanitized messages.
+            if (transcriptPolicy.dropThinkingBlocks) {
+                const inner = activeSession.agent.streamFn;
+                activeSession.agent.streamFn = (model, context, options) => {
+                    const ctx = context;
+                    const messages = ctx?.messages;
+                    if (!Array.isArray(messages)) {
+                        return inner(model, context, options);
+                    }
+                    const sanitized = dropThinkingBlocks(messages);
+                    if (sanitized === messages) {
+                        return inner(model, context, options);
+                    }
+                    const nextContext = {
+                        ...context,
+                        messages: sanitized,
+                    };
+                    return inner(model, nextContext, options);
+                };
+            }
             if (anthropicPayloadLogger) {
                 activeSession.agent.streamFn = anthropicPayloadLogger.wrapStreamFn(activeSession.agent.streamFn);
             }
@@ -542,6 +620,7 @@ export async function runEmbeddedAttempt(params) {
                     modelApi: params.model.api,
                     modelId: params.modelId,
                     provider: params.provider,
+                    allowedToolNames,
                     config: params.config,
                     sessionManager,
                     sessionId: params.sessionId,
@@ -725,34 +804,13 @@ export async function runEmbeddedAttempt(params) {
                     workspaceDir: params.workspaceDir,
                     messageProvider: params.messageProvider ?? undefined,
                 };
-                const promptBuildResult = hookRunner?.hasHooks("before_prompt_build")
-                    ? await hookRunner
-                        .runBeforePromptBuild({
-                        prompt: params.prompt,
-                        messages: activeSession.messages,
-                    }, hookCtx)
-                        .catch((hookErr) => {
-                        log.warn(`before_prompt_build hook failed: ${String(hookErr)}`);
-                        return undefined;
-                    })
-                    : undefined;
-                const legacyResult = hookRunner?.hasHooks("before_agent_start")
-                    ? await hookRunner
-                        .runBeforeAgentStart({
-                        prompt: params.prompt,
-                        messages: activeSession.messages,
-                    }, hookCtx)
-                        .catch((hookErr) => {
-                        log.warn(`before_agent_start hook (legacy prompt build path) failed: ${String(hookErr)}`);
-                        return undefined;
-                    })
-                    : undefined;
-                const hookResult = {
-                    systemPrompt: promptBuildResult?.systemPrompt ?? legacyResult?.systemPrompt,
-                    prependContext: [promptBuildResult?.prependContext, legacyResult?.prependContext]
-                        .filter((value) => Boolean(value))
-                        .join("\n\n"),
-                };
+                const hookResult = await resolvePromptBuildHookResult({
+                    prompt: params.prompt,
+                    messages: activeSession.messages,
+                    hookCtx,
+                    hookRunner,
+                    legacyBeforeAgentStartResult: params.legacyBeforeAgentStartResult,
+                });
                 {
                     if (hookResult?.prependContext) {
                         effectivePrompt = `${hookResult.prependContext}\n\n${params.prompt}`;
@@ -774,7 +832,8 @@ export async function runEmbeddedAttempt(params) {
                         sessionManager.resetLeaf();
                     }
                     const sessionContext = sessionManager.buildSessionContext();
-                    const sanitizedOrphan = transcriptPolicy.normalizeAntigravityThinkingBlocks
+                    const sanitizedOrphan = transcriptPolicy.sanitizeThinkingSignatures ||
+                        transcriptPolicy.normalizeAntigravityThinkingBlocks
                         ? sanitizeAntigravityThinkingBlocks(sessionContext.messages)
                         : sessionContext.messages;
                     activeSession.agent.replaceMessages(sanitizedOrphan);