@gguf/claw 2026.2.1 → 2026.2.2

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

@@ -1,33 +1,36 @@
+import { createAgentSession, estimateTokens, SessionManager, SettingsManager, } from "@mariozechner/pi-coding-agent";
 import fs from "node:fs/promises";
 import os from "node:os";
-import { createAgentSession, DefaultResourceLoader, estimateTokens, SessionManager, SettingsManager, } from "@mariozechner/pi-coding-agent";
 import { resolveHeartbeatPrompt } from "../../auto-reply/heartbeat.js";
-import { listChannelSupportedActions, resolveChannelMessageToolHints } from "../channel-tools.js";
 import { resolveChannelCapabilities } from "../../config/channel-capabilities.js";
 import { getMachineDisplayName } from "../../infra/machine-name.js";
+import { enqueueCommandInLane } from "../../process/command-queue.js";
+import { isSubagentSessionKey } from "../../routing/session-key.js";
+import { resolveSignalReactionLevel } from "../../signal/reaction-level.js";
 import { resolveTelegramInlineButtonsScope } from "../../telegram/inline-buttons.js";
 import { resolveTelegramReactionLevel } from "../../telegram/reaction-level.js";
-import { resolveSignalReactionLevel } from "../../signal/reaction-level.js";
-import { enqueueCommandInLane } from "../../process/command-queue.js";
+import { buildTtsSystemPromptHint } from "../../tts/tts.js";
+import { resolveUserPath } from "../../utils.js";
 import { normalizeMessageChannel } from "../../utils/message-channel.js";
-import { isSubagentSessionKey } from "../../routing/session-key.js";
 import { isReasoningTagProvider } from "../../utils/provider-utils.js";
-import { resolveUserPath } from "../../utils.js";
 import { resolveOpenClawAgentDir } from "../agent-paths.js";
 import { resolveSessionAgentIds } from "../agent-scope.js";
 import { makeBootstrapWarn, resolveBootstrapContextForRun } from "../bootstrap-files.js";
-import { resolveOpenClawDocsPath } from "../docs-path.js";
+import { listChannelSupportedActions, resolveChannelMessageToolHints } from "../channel-tools.js";
+import { formatUserTime, resolveUserTimeFormat, resolveUserTimezone } from "../date-time.js";
 import { DEFAULT_MODEL, DEFAULT_PROVIDER } from "../defaults.js";
+import { resolveOpenClawDocsPath } from "../docs-path.js";
 import { getApiKeyForModel, resolveModelAuthMode } from "../model-auth.js";
 import { ensureOpenClawModelsJson } from "../models-config.js";
 import { ensureSessionHeader, validateAnthropicTurns, validateGeminiTurns, } from "../pi-embedded-helpers.js";
 import { ensurePiCompactionReserveTokens, resolveCompactionReserveTokensFloor, } from "../pi-settings.js";
 import { createOpenClawCodingTools } from "../pi-tools.js";
 import { resolveSandboxContext } from "../sandbox.js";
+import { repairSessionFileIfNeeded } from "../session-file-repair.js";
 import { guardSessionManager } from "../session-tool-result-guard-wrapper.js";
-import { resolveTranscriptPolicy } from "../transcript-policy.js";
 import { acquireSessionWriteLock } from "../session-write-lock.js";
 import { applySkillEnvOverrides, applySkillEnvOverridesFromSnapshot, loadWorkspaceSkillEntries, resolveSkillsPromptForRun, } from "../skills.js";
+import { resolveTranscriptPolicy } from "../transcript-policy.js";
 import { buildEmbeddedExtensionPaths } from "./extensions.js";
 import { logToolSchemasForGoogle, sanitizeSessionHistory, sanitizeToolsForGoogle, } from "./google.js";
 import { getDmHistoryLimitFromSessionKey, limitHistoryTurns } from "./history.js";
@@ -36,11 +39,9 @@ import { log } from "./logger.js";
 import { buildModelAliasLines, resolveModel } from "./model.js";
 import { buildEmbeddedSandboxInfo } from "./sandbox-info.js";
 import { prewarmSessionFile, trackSessionManagerAccess } from "./session-manager-cache.js";
-import { buildEmbeddedSystemPrompt, createSystemPromptOverride } from "./system-prompt.js";
+import { applySystemPromptOverrideToSession, buildEmbeddedSystemPrompt, createSystemPromptOverride, } from "./system-prompt.js";
 import { splitSdkTools } from "./tool-split.js";
-import { formatUserTime, resolveUserTimeFormat, resolveUserTimezone } from "../date-time.js";
 import { describeUnknownError, mapThinkingLevel, resolveExecToolDefaults } from "./utils.js";
-import { buildTtsSystemPromptHint } from "../../tts/tts.js";
 /**
  * Core compaction logic without lane queueing.
  * Use this when already inside a session/global lane to avoid deadlocks.
@@ -273,11 +274,15 @@ export async function compactEmbeddedPiSessionDirect(params) {
             userTimeFormat,
             contextFiles,
         });
-        const systemPrompt = createSystemPromptOverride(appendPrompt);
+        const systemPromptOverride = createSystemPromptOverride(appendPrompt);
         const sessionLock = await acquireSessionWriteLock({
             sessionFile: params.sessionFile,
         });
         try {
+            await repairSessionFileIfNeeded({
+                sessionFile: params.sessionFile,
+                warn: (message) => log.warn(message),
+            });
             await prewarmSessionFile(params.sessionFile);
             const transcriptPolicy = resolveTranscriptPolicy({
                 modelApi: model.api,
@@ -295,7 +300,8 @@ export async function compactEmbeddedPiSessionDirect(params) {
                 settingsManager,
                 minReserveTokens: resolveCompactionReserveTokensFloor(params.config),
             });
-            const additionalExtensionPaths = buildEmbeddedExtensionPaths({
+            // Call for side effects (sets compaction/pruning runtime state)
+            buildEmbeddedExtensionPaths({
                 cfg: params.config,
                 sessionManager,
                 provider,
@@ -306,16 +312,6 @@ export async function compactEmbeddedPiSessionDirect(params) {
                 tools,
                 sandboxEnabled: !!sandbox?.enabled,
             });
-            const resourceLoader = new DefaultResourceLoader({
-                cwd: resolvedWorkspace,
-                agentDir,
-                settingsManager,
-                additionalExtensionPaths,
-                noSkills: true,
-                systemPromptOverride: systemPrompt,
-                agentsFilesOverride: () => ({ agentsFiles: [] }),
-            });
-            await resourceLoader.reload();
             const { session } = await createAgentSession({
                 cwd: resolvedWorkspace,
                 agentDir,
@@ -327,8 +323,8 @@ export async function compactEmbeddedPiSessionDirect(params) {
                 customTools,
                 sessionManager,
                 settingsManager,
-                resourceLoader,
             });
+            applySystemPromptOverrideToSession(session, systemPromptOverride());
             try {
                 const prior = await sanitizeSessionHistory({
                     messages: session.messages,

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

@@ -53,8 +53,16 @@ export function buildEmbeddedExtensionPaths(params) {
     const paths = [];
     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"));
     }

package/dist/agents/pi-embedded-runner/extra-params.d.ts

@@ -13,6 +13,7 @@ export declare function resolveExtraParams(params: {
 }): Record<string, unknown> | undefined;
 /**
  * Apply extra params (like temperature) to an agent's streamFn.
+ * Also adds OpenRouter app attribution headers when using the OpenRouter provider.
  *
  * @internal Exported for testing
  */

package/dist/agents/pi-embedded-runner/extra-params.js

@@ -1,5 +1,9 @@
 import { streamSimple } from "@mariozechner/pi-ai";
 import { log } from "./logger.js";
+const OPENROUTER_APP_HEADERS = {
+    "HTTP-Referer": "https://openclaw.ai",
+    "X-Title": "OpenClaw",
+};
 /**
  * Resolve provider-specific extra params from model config.
  * Used to pass through stream params like temperature/maxTokens.
@@ -11,20 +15,35 @@ export function resolveExtraParams(params) {
     const modelConfig = params.cfg?.agents?.defaults?.models?.[modelKey];
     return modelConfig?.params ? { ...modelConfig.params } : undefined;
 }
-function resolveCacheControlTtl(extraParams, provider, modelId) {
-    const raw = extraParams?.cacheControlTtl;
-    if (raw !== "5m" && raw !== "1h") {
+/**
+ * Resolve cacheRetention from extraParams, supporting both new `cacheRetention`
+ * and legacy `cacheControlTtl` values for backwards compatibility.
+ *
+ * Mapping: "5m" → "short", "1h" → "long"
+ *
+ * Only applies to Anthropic provider (OpenRouter uses openai-completions API
+ * with hardcoded cache_control, not the cacheRetention stream option).
+ */
+function resolveCacheRetention(extraParams, provider) {
+    if (provider !== "anthropic") {
         return undefined;
     }
-    if (provider === "anthropic") {
-        return raw;
+    // Prefer new cacheRetention if present
+    const newVal = extraParams?.cacheRetention;
+    if (newVal === "none" || newVal === "short" || newVal === "long") {
+        return newVal;
+    }
+    // Fall back to legacy cacheControlTtl with mapping
+    const legacy = extraParams?.cacheControlTtl;
+    if (legacy === "5m") {
+        return "short";
     }
-    if (provider === "openrouter" && modelId.startsWith("anthropic/")) {
-        return raw;
+    if (legacy === "1h") {
+        return "long";
     }
     return undefined;
 }
-function createStreamFnWithExtraParams(baseStreamFn, extraParams, provider, modelId) {
+function createStreamFnWithExtraParams(baseStreamFn, extraParams, provider) {
     if (!extraParams || Object.keys(extraParams).length === 0) {
         return undefined;
     }
@@ -35,9 +54,9 @@ function createStreamFnWithExtraParams(baseStreamFn, extraParams, provider, mode
     if (typeof extraParams.maxTokens === "number") {
         streamParams.maxTokens = extraParams.maxTokens;
     }
-    const cacheControlTtl = resolveCacheControlTtl(extraParams, provider, modelId);
-    if (cacheControlTtl) {
-        streamParams.cacheControlTtl = cacheControlTtl;
+    const cacheRetention = resolveCacheRetention(extraParams, provider);
+    if (cacheRetention) {
+        streamParams.cacheRetention = cacheRetention;
     }
     if (Object.keys(streamParams).length === 0) {
         return undefined;
@@ -50,8 +69,23 @@ function createStreamFnWithExtraParams(baseStreamFn, extraParams, provider, mode
     });
     return wrappedStreamFn;
 }
+/**
+ * Create a streamFn wrapper that adds OpenRouter app attribution headers.
+ * These headers allow OpenClaw to appear on OpenRouter's leaderboard.
+ */
+function createOpenRouterHeadersWrapper(baseStreamFn) {
+    const underlying = baseStreamFn ?? streamSimple;
+    return (model, context, options) => underlying(model, context, {
+        ...options,
+        headers: {
+            ...OPENROUTER_APP_HEADERS,
+            ...options?.headers,
+        },
+    });
+}
 /**
  * Apply extra params (like temperature) to an agent's streamFn.
+ * Also adds OpenRouter app attribution headers when using the OpenRouter provider.
  *
  * @internal Exported for testing
  */
@@ -65,9 +99,13 @@ export function applyExtraParamsToAgent(agent, cfg, provider, modelId, extraPara
         ? Object.fromEntries(Object.entries(extraParamsOverride).filter(([, value]) => value !== undefined))
         : undefined;
     const merged = Object.assign({}, extraParams, override);
-    const wrappedStreamFn = createStreamFnWithExtraParams(agent.streamFn, merged, provider, modelId);
+    const wrappedStreamFn = createStreamFnWithExtraParams(agent.streamFn, merged, provider);
     if (wrappedStreamFn) {
         log.debug(`applying extraParams to agent streamFn for ${provider}/${modelId}`);
         agent.streamFn = wrappedStreamFn;
     }
+    if (provider === "openrouter") {
+        log.debug(`applying OpenRouter app attribution headers for ${provider}/${modelId}`);
+        agent.streamFn = createOpenRouterHeadersWrapper(agent.streamFn);
+    }
 }

package/dist/agents/pi-embedded-runner/google.d.ts

@@ -1,6 +1,6 @@
 import type { AgentMessage, AgentTool } from "@mariozechner/pi-agent-core";
-import type { TSchema } from "@sinclair/typebox";
 import type { SessionManager } from "@mariozechner/pi-coding-agent";
+import type { TSchema } from "@sinclair/typebox";
 import type { TranscriptPolicy } from "../transcript-policy.js";
 export declare function sanitizeToolsForGoogle<TSchemaType extends TSchema = TSchema, TResult = unknown>(params: {
     tools: AgentTool<TSchemaType, TResult>[];

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

@@ -1,11 +1,11 @@
 import { EventEmitter } from "node:events";
 import { registerUnhandledRejectionHandler } from "../../infra/unhandled-rejections.js";
 import { downgradeOpenAIReasoningBlocks, isCompactionFailureError, isGoogleModelApi, sanitizeGoogleTurnOrdering, sanitizeSessionMessagesImages, } from "../pi-embedded-helpers.js";
-import { sanitizeToolUseResultPairing } from "../session-transcript-repair.js";
-import { log } from "./logger.js";
-import { describeUnknownError } from "./utils.js";
 import { cleanToolSchemaForGemini } from "../pi-tools.schema.js";
+import { sanitizeToolCallInputs, sanitizeToolUseResultPairing, } from "../session-transcript-repair.js";
 import { resolveTranscriptPolicy } from "../transcript-policy.js";
+import { log } from "./logger.js";
+import { describeUnknownError } from "./utils.js";
 const GOOGLE_TURN_ORDERING_CUSTOM_TYPE = "google-turn-ordering-bootstrap";
 const GOOGLE_SCHEMA_UNSUPPORTED_KEYWORDS = new Set([
     "patternProperties",
@@ -273,9 +273,10 @@ export async function sanitizeSessionHistory(params) {
     const sanitizedThinking = policy.normalizeAntigravityThinkingBlocks
         ? sanitizeAntigravityThinkingBlocks(sanitizedImages)
         : sanitizedImages;
+    const sanitizedToolCalls = sanitizeToolCallInputs(sanitizedThinking);
     const repairedTools = policy.repairToolUseResultPairing
-        ? sanitizeToolUseResultPairing(sanitizedThinking)
-        : sanitizedThinking;
+        ? sanitizeToolUseResultPairing(sanitizedToolCalls)
+        : sanitizedToolCalls;
     const isOpenAIResponsesApi = params.modelApi === "openai-responses" || params.modelApi === "openai-codex-responses";
     const hasSnapshot = Boolean(params.provider || params.modelApi || params.modelId);
     const priorSnapshot = hasSnapshot ? readLastModelSnapshot(params.sessionManager) : null;

package/dist/agents/pi-embedded-runner/model.d.ts

@@ -1,7 +1,7 @@
 import type { Api, Model } from "@mariozechner/pi-ai";
-import { type AuthStorage, type ModelRegistry } from "../pi-model-discovery.js";
 import type { OpenClawConfig } from "../../config/config.js";
 import type { ModelDefinitionConfig } from "../../config/types.js";
+import { type AuthStorage, type ModelRegistry } from "../pi-model-discovery.js";
 type InlineModelEntry = ModelDefinitionConfig & {
     provider: string;
     baseUrl?: string;

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

@@ -1,8 +1,8 @@
-import { discoverAuthStorage, discoverModels, } from "../pi-model-discovery.js";
 import { resolveOpenClawAgentDir } from "../agent-paths.js";
 import { DEFAULT_CONTEXT_TOKENS } from "../defaults.js";
 import { normalizeModelCompat } from "../model-compat.js";
 import { normalizeProviderId } from "../model-selection.js";
+import { discoverAuthStorage, discoverModels, } from "../pi-model-discovery.js";
 export function buildInlineProviderModels(providers) {
     return Object.entries(providers).flatMap(([providerId, entry]) => {
         const trimmed = providerId.trim();

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

@@ -1,41 +1,49 @@
+import { streamSimple } from "@mariozechner/pi-ai";
+import { createAgentSession, SessionManager, SettingsManager } from "@mariozechner/pi-coding-agent";
 import fs from "node:fs/promises";
 import os from "node:os";
-import { streamSimple } from "@mariozechner/pi-ai";
-import { createAgentSession, DefaultResourceLoader, SessionManager, SettingsManager, } from "@mariozechner/pi-coding-agent";
 import { resolveHeartbeatPrompt } from "../../../auto-reply/heartbeat.js";
-import { listChannelSupportedActions, resolveChannelMessageToolHints, } from "../../channel-tools.js";
 import { resolveChannelCapabilities } from "../../../config/channel-capabilities.js";
 import { getMachineDisplayName } from "../../../infra/machine-name.js";
+import { MAX_IMAGE_BYTES } from "../../../media/constants.js";
+import { getGlobalHookRunner } from "../../../plugins/hook-runner-global.js";
+import { isSubagentSessionKey } from "../../../routing/session-key.js";
+import { resolveSignalReactionLevel } from "../../../signal/reaction-level.js";
 import { resolveTelegramInlineButtonsScope } from "../../../telegram/inline-buttons.js";
 import { resolveTelegramReactionLevel } from "../../../telegram/reaction-level.js";
-import { resolveSignalReactionLevel } from "../../../signal/reaction-level.js";
+import { buildTtsSystemPromptHint } from "../../../tts/tts.js";
+import { resolveUserPath } from "../../../utils.js";
 import { normalizeMessageChannel } from "../../../utils/message-channel.js";
 import { isReasoningTagProvider } from "../../../utils/provider-utils.js";
-import { isSubagentSessionKey } from "../../../routing/session-key.js";
-import { resolveUserPath } from "../../../utils.js";
-import { createCacheTrace } from "../../cache-trace.js";
-import { createAnthropicPayloadLogger } from "../../anthropic-payload-log.js";
 import { resolveOpenClawAgentDir } from "../../agent-paths.js";
 import { resolveSessionAgentIds } from "../../agent-scope.js";
+import { createAnthropicPayloadLogger } from "../../anthropic-payload-log.js";
 import { makeBootstrapWarn, resolveBootstrapContextForRun } from "../../bootstrap-files.js";
+import { createCacheTrace } from "../../cache-trace.js";
+import { listChannelSupportedActions, resolveChannelMessageToolHints, } from "../../channel-tools.js";
 import { resolveOpenClawDocsPath } from "../../docs-path.js";
+import { isTimeoutError } from "../../failover-error.js";
 import { resolveModelAuthMode } from "../../model-auth.js";
+import { resolveDefaultModelForAgent } from "../../model-selection.js";
 import { isCloudCodeAssistFormatError, resolveBootstrapMaxChars, validateAnthropicTurns, validateGeminiTurns, } from "../../pi-embedded-helpers.js";
 import { subscribeEmbeddedPiSession } from "../../pi-embedded-subscribe.js";
 import { ensurePiCompactionReserveTokens, resolveCompactionReserveTokensFloor, } from "../../pi-settings.js";
+import { toClientToolDefinitions } from "../../pi-tool-definition-adapter.js";
 import { createOpenClawCodingTools } from "../../pi-tools.js";
 import { resolveSandboxContext } from "../../sandbox.js";
+import { resolveSandboxRuntimeStatus } from "../../sandbox/runtime-status.js";
+import { repairSessionFileIfNeeded } from "../../session-file-repair.js";
 import { guardSessionManager } from "../../session-tool-result-guard-wrapper.js";
-import { resolveTranscriptPolicy } from "../../transcript-policy.js";
 import { acquireSessionWriteLock } from "../../session-write-lock.js";
 import { applySkillEnvOverrides, applySkillEnvOverridesFromSnapshot, loadWorkspaceSkillEntries, resolveSkillsPromptForRun, } from "../../skills.js";
-import { DEFAULT_BOOTSTRAP_FILENAME } from "../../workspace.js";
+import { buildSystemPromptParams } from "../../system-prompt-params.js";
 import { buildSystemPromptReport } from "../../system-prompt-report.js";
-import { resolveDefaultModelForAgent } from "../../model-selection.js";
+import { resolveTranscriptPolicy } from "../../transcript-policy.js";
+import { DEFAULT_BOOTSTRAP_FILENAME } from "../../workspace.js";
 import { isAbortError } from "../abort.js";
+import { appendCacheTtlTimestamp, isCacheTtlEligibleProvider } from "../cache-ttl.js";
 import { buildEmbeddedExtensionPaths } from "../extensions.js";
 import { applyExtraParamsToAgent } from "../extra-params.js";
-import { appendCacheTtlTimestamp, isCacheTtlEligibleProvider } from "../cache-ttl.js";
 import { logToolSchemasForGoogle, sanitizeSessionHistory, sanitizeToolsForGoogle, } from "../google.js";
 import { getDmHistoryLimitFromSessionKey, limitHistoryTurns } from "../history.js";
 import { log } from "../logger.js";
@@ -44,16 +52,9 @@ import { clearActiveEmbeddedRun, setActiveEmbeddedRun, } from "../runs.js";
 import { buildEmbeddedSandboxInfo } from "../sandbox-info.js";
 import { prewarmSessionFile, trackSessionManagerAccess } from "../session-manager-cache.js";
 import { prepareSessionManagerForRun } from "../session-manager-init.js";
-import { buildEmbeddedSystemPrompt, createSystemPromptOverride } from "../system-prompt.js";
+import { applySystemPromptOverrideToSession, buildEmbeddedSystemPrompt, createSystemPromptOverride, } from "../system-prompt.js";
 import { splitSdkTools } from "../tool-split.js";
-import { toClientToolDefinitions } from "../../pi-tool-definition-adapter.js";
-import { buildSystemPromptParams } from "../../system-prompt-params.js";
 import { describeUnknownError, mapThinkingLevel } from "../utils.js";
-import { resolveSandboxRuntimeStatus } from "../../sandbox/runtime-status.js";
-import { buildTtsSystemPromptHint } from "../../../tts/tts.js";
-import { isTimeoutError } from "../../failover-error.js";
-import { getGlobalHookRunner } from "../../../plugins/hook-runner-global.js";
-import { MAX_IMAGE_BYTES } from "../../../media/constants.js";
 import { detectAndLoadPromptImages } from "./images.js";
 export function injectHistoryImagesIntoMessages(messages, historyImagesByIndex) {
     if (historyImagesByIndex.size === 0) {
@@ -325,13 +326,18 @@ export async function runEmbeddedAttempt(params) {
             skillsPrompt,
             tools,
         });
-        const systemPrompt = createSystemPromptOverride(appendPrompt);
+        const systemPromptOverride = createSystemPromptOverride(appendPrompt);
+        const systemPromptText = systemPromptOverride();
         const sessionLock = await acquireSessionWriteLock({
             sessionFile: params.sessionFile,
         });
         let sessionManager;
         let session;
         try {
+            await repairSessionFileIfNeeded({
+                sessionFile: params.sessionFile,
+                warn: (message) => log.warn(message),
+            });
             const hadSessionFile = await fs
                 .stat(params.sessionFile)
                 .then(() => true)
@@ -360,7 +366,8 @@ export async function runEmbeddedAttempt(params) {
                 settingsManager,
                 minReserveTokens: resolveCompactionReserveTokensFloor(params.config),
             });
-            const additionalExtensionPaths = buildEmbeddedExtensionPaths({
+            // Call for side effects (sets compaction/pruning runtime state)
+            buildEmbeddedExtensionPaths({
                 cfg: params.config,
                 sessionManager,
                 provider: params.provider,
@@ -376,19 +383,12 @@ export async function runEmbeddedAttempt(params) {
             const clientToolDefs = params.clientTools
                 ? toClientToolDefinitions(params.clientTools, (toolName, toolParams) => {
                     clientToolCallDetected = { name: toolName, params: toolParams };
+                }, {
+                    agentId: sessionAgentId,
+                    sessionKey: params.sessionKey,
                 })
                 : [];
             const allCustomTools = [...customTools, ...clientToolDefs];
-            const resourceLoader = new DefaultResourceLoader({
-                cwd: resolvedWorkspace,
-                agentDir,
-                settingsManager,
-                additionalExtensionPaths,
-                noSkills: true,
-                systemPromptOverride: systemPrompt,
-                agentsFilesOverride: () => ({ agentsFiles: [] }),
-            });
-            await resourceLoader.reload();
             ({ session } = await createAgentSession({
                 cwd: resolvedWorkspace,
                 agentDir,
@@ -400,8 +400,8 @@ export async function runEmbeddedAttempt(params) {
                 customTools: allCustomTools,
                 sessionManager,
                 settingsManager,
-                resourceLoader,
             }));
+            applySystemPromptOverrideToSession(session, systemPromptText);
             if (!session) {
                 throw new Error("Embedded agent session missing");
             }
@@ -433,7 +433,7 @@ export async function runEmbeddedAttempt(params) {
             if (cacheTrace) {
                 cacheTrace.recordStage("session:loaded", {
                     messages: activeSession.messages,
-                    system: systemPrompt,
+                    system: systemPromptText,
                     note: "after session create",
                 });
                 activeSession.agent.streamFn = cacheTrace.wrapStreamFn(activeSession.agent.streamFn);

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

@@ -1,11 +1,11 @@
 import fs from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { assertSandboxPath } from "../../sandbox-paths.js";
-import { sanitizeImageBlocks } from "../../tool-images.js";
 import { extractTextFromMessage } from "../../../tui/tui-formatters.js";
-import { loadWebMedia } from "../../../web/media.js";
 import { resolveUserPath } from "../../../utils.js";
+import { loadWebMedia } from "../../../web/media.js";
+import { assertSandboxPath } from "../../sandbox-paths.js";
+import { sanitizeImageBlocks } from "../../tool-images.js";
 import { log } from "../logger.js";
 /**
  * Common image file extensions for detection.

package/dist/agents/pi-embedded-runner/run/params.d.ts

@@ -1,7 +1,7 @@
 import type { ImageContent } from "@mariozechner/pi-ai";
 import type { ReasoningLevel, ThinkLevel, VerboseLevel } from "../../../auto-reply/thinking.js";
-import type { OpenClawConfig } from "../../../config/config.js";
 import type { AgentStreamParams } from "../../../commands/agent/types.js";
+import type { OpenClawConfig } from "../../../config/config.js";
 import type { enqueueCommand } from "../../../process/command-queue.js";
 import type { ExecElevatedDefaults, ExecToolDefaults } from "../../bash-tools.js";
 import type { BlockReplyChunking, ToolResultFormat } from "../../pi-embedded-subscribe.js";

package/dist/agents/pi-embedded-runner/run/types.d.ts

@@ -1,14 +1,14 @@
 import type { AgentMessage } from "@mariozechner/pi-agent-core";
 import type { Api, AssistantMessage, ImageContent, Model } from "@mariozechner/pi-ai";
-import type { AuthStorage, ModelRegistry } from "../../pi-model-discovery.js";
 import type { ReasoningLevel, ThinkLevel, VerboseLevel } from "../../../auto-reply/thinking.js";
-import type { OpenClawConfig } from "../../../config/config.js";
 import type { AgentStreamParams } from "../../../commands/agent/types.js";
+import type { OpenClawConfig } from "../../../config/config.js";
+import type { SessionSystemPromptReport } from "../../../config/sessions/types.js";
 import type { ExecElevatedDefaults, ExecToolDefaults } from "../../bash-tools.js";
 import type { MessagingToolSend } from "../../pi-embedded-messaging.js";
 import type { BlockReplyChunking, ToolResultFormat } from "../../pi-embedded-subscribe.js";
+import type { AuthStorage, ModelRegistry } from "../../pi-model-discovery.js";
 import type { SkillSnapshot } from "../../skills.js";
-import type { SessionSystemPromptReport } from "../../../config/sessions/types.js";
 import type { ClientToolDefinition } from "./params.js";
 export type EmbeddedRunAttemptParams = {
     sessionId: string;

package/dist/agents/pi-embedded-runner/system-prompt.d.ts

@@ -1,9 +1,10 @@
 import type { AgentTool } from "@mariozechner/pi-agent-core";
+import type { AgentSession } from "@mariozechner/pi-coding-agent";
 import type { ResolvedTimeFormat } from "../date-time.js";
 import type { EmbeddedContextFile } from "../pi-embedded-helpers.js";
-import { type PromptMode } from "../system-prompt.js";
 import type { EmbeddedSandboxInfo } from "./types.js";
 import type { ReasoningLevel, ThinkLevel } from "./utils.js";
+import { type PromptMode } from "../system-prompt.js";
 export declare function buildEmbeddedSystemPrompt(params: {
     workspaceDir: string;
     defaultThinkLevel?: ThinkLevel;
@@ -45,3 +46,4 @@ export declare function buildEmbeddedSystemPrompt(params: {
     contextFiles?: EmbeddedContextFile[];
 }): string;
 export declare function createSystemPromptOverride(systemPrompt: string): (defaultPrompt?: string) => string;
+export declare function applySystemPromptOverrideToSession(session: AgentSession, override: string | ((defaultPrompt?: string) => string)): void;

package/dist/agents/pi-embedded-runner/system-prompt.js

@@ -28,6 +28,13 @@ export function buildEmbeddedSystemPrompt(params) {
     });
 }
 export function createSystemPromptOverride(systemPrompt) {
-    const trimmed = systemPrompt.trim();
-    return () => trimmed;
+    const override = systemPrompt.trim();
+    return (_defaultPrompt) => override;
+}
+export function applySystemPromptOverrideToSession(session, override) {
+    const prompt = typeof override === "function" ? override() : override.trim();
+    session.agent.setSystemPrompt(prompt);
+    const mutableSession = session;
+    mutableSession._baseSystemPrompt = prompt;
+    mutableSession._rebuildSystemPrompt = () => prompt;
 }

package/dist/agents/pi-embedded-runner/types.d.ts

@@ -1,5 +1,5 @@
-import type { MessagingToolSend } from "../pi-embedded-messaging.js";
 import type { SessionSystemPromptReport } from "../../config/sessions/types.js";
+import type { MessagingToolSend } from "../pi-embedded-messaging.js";
 export type EmbeddedPiAgentMeta = {
     sessionId: string;
     provider: string;

package/dist/agents/pi-embedded-subscribe.handlers.messages.js

@@ -1,9 +1,9 @@
+import { parseReplyDirectives } from "../auto-reply/reply/reply-directives.js";
 import { emitAgentEvent } from "../infra/agent-events.js";
+import { createInlineCodeState } from "../markdown/code-spans.js";
 import { isMessagingToolDuplicateNormalized, normalizeTextForComparison, } from "./pi-embedded-helpers.js";
-import { parseReplyDirectives } from "../auto-reply/reply/reply-directives.js";
 import { appendRawStream } from "./pi-embedded-subscribe.raw-stream.js";
 import { extractAssistantText, extractAssistantThinking, extractThinkingFromTaggedStream, extractThinkingFromTaggedText, formatReasoningMessage, promoteThinkingTagsToBlocks, } from "./pi-embedded-utils.js";
-import { createInlineCodeState } from "../markdown/code-spans.js";
 const stripTrailingDirective = (text) => {
     const openIndex = text.lastIndexOf("[[");
     if (openIndex < 0) {

package/dist/agents/pi-embedded-subscribe.handlers.types.d.ts

@@ -1,6 +1,6 @@
 import type { AgentEvent, AgentMessage } from "@mariozechner/pi-agent-core";
-import type { ReasoningLevel } from "../auto-reply/thinking.js";
 import type { ReplyDirectiveParseResult } from "../auto-reply/reply/reply-directives.js";
+import type { ReasoningLevel } from "../auto-reply/thinking.js";
 import type { InlineCodeState } from "../markdown/code-spans.js";
 import type { EmbeddedBlockChunker } from "./pi-embedded-block-chunker.js";
 import type { MessagingToolSend } from "./pi-embedded-messaging.js";

package/dist/agents/pi-embedded-subscribe.tools.js

@@ -1,6 +1,6 @@
 import { getChannelPlugin, normalizeChannelId } from "../channels/plugins/index.js";
-import { truncateUtf16Safe } from "../utils.js";
 import { normalizeTargetForProvider } from "../infra/outbound/target-normalization.js";
+import { truncateUtf16Safe } from "../utils.js";
 const TOOL_RESULT_MAX_CHARS = 8000;
 const TOOL_ERROR_MAX_CHARS = 400;
 function truncateToolText(text) {

package/dist/agents/pi-extensions/compaction-safeguard-runtime.d.ts

@@ -1,5 +1,6 @@
 export type CompactionSafeguardRuntimeValue = {
     maxHistoryShare?: number;
+    contextWindowTokens?: number;
 };
 export declare function setCompactionSafeguardRuntime(sessionManager: unknown, value: CompactionSafeguardRuntimeValue | null): void;
 export declare function getCompactionSafeguardRuntime(sessionManager: unknown): CompactionSafeguardRuntimeValue | null;

package/dist/agents/pi-extensions/compaction-safeguard.js

@@ -145,10 +145,11 @@ export default function compactionSafeguardExtension(api) {
             };
         }
         try {
-            const contextWindowTokens = resolveContextWindowTokens(model);
+            const runtime = getCompactionSafeguardRuntime(ctx.sessionManager);
+            const modelContextWindow = resolveContextWindowTokens(model);
+            const contextWindowTokens = runtime?.contextWindowTokens ?? modelContextWindow;
             const turnPrefixMessages = preparation.turnPrefixMessages ?? [];
             let messagesToSummarize = preparation.messagesToSummarize;
-            const runtime = getCompactionSafeguardRuntime(ctx.sessionManager);
             const maxHistoryShare = runtime?.maxHistoryShare ?? 0.5;
             const tokensBefore = typeof preparation.tokensBefore === "number" && Number.isFinite(preparation.tokensBefore)
                 ? preparation.tokensBefore

package/dist/agents/pi-model-discovery.js

@@ -1,5 +1,5 @@
-import path from "node:path";
 import { AuthStorage, ModelRegistry } from "@mariozechner/pi-coding-agent";
+import path from "node:path";
 export { AuthStorage, ModelRegistry } from "@mariozechner/pi-coding-agent";
 // Compatibility helpers for pi-coding-agent 0.50+ (discover* helpers removed).
 export function discoverAuthStorage(agentDir) {

package/dist/agents/pi-tool-definition-adapter.d.ts

@@ -3,5 +3,8 @@ import type { ToolDefinition } from "@mariozechner/pi-coding-agent";
 import type { ClientToolDefinition } from "./pi-embedded-runner/run/params.js";
 type AnyAgentTool = AgentTool<any, unknown>;
 export declare function toToolDefinitions(tools: AnyAgentTool[]): ToolDefinition[];
-export declare function toClientToolDefinitions(tools: ClientToolDefinition[], onClientToolCall?: (toolName: string, params: Record<string, unknown>) => void): ToolDefinition[];
+export declare function toClientToolDefinitions(tools: ClientToolDefinition[], onClientToolCall?: (toolName: string, params: Record<string, unknown>) => void, hookContext?: {
+    agentId?: string;
+    sessionKey?: string;
+}): ToolDefinition[];
 export {};