@canonry/canonry 5.30.1 → 5.32.0

package/dist/{chunk-LLVE7B3V.js → chunk-6UO23AKO.js}

@@ -26,7 +26,7 @@ import {
   persistSiteCrawlGraphLayout,
   prepareSiteCrawlGraphLayout,
   recordedSharePct
-} from "./chunk-TWYIUHJU.js";
+} from "./chunk-YVWYQBXW.js";
 import {
   CanonryMcpToolNames,
   CliError,
@@ -214,7 +214,7 @@ import {
   siteLivenessState,
   toAlertView,
   usageCounters
-} from "./chunk-TPJ4MMZ6.js";
+} from "./chunk-7YS62CJ4.js";
 import {
   AGENT_MEMORY_VALUE_MAX_BYTES,
   AGENT_NONE,
@@ -7830,7 +7830,7 @@ function nonBlank(value) {
   return trimmed ? trimmed : void 0;
 }
 function resolveBuildCommit(env = process.env) {
-  const embedded = true ? "b528a187897c1efc97f0211c8824961fefac800e" : void 0;
+  const embedded = true ? "b5129303a169ae8903dbf5febfcb10067f0507a1" : void 0;
   return nonBlank(embedded) ?? nonBlank(env.CANONRY_COMMIT);
 }
 function resolveInstanceIdentity(env = process.env) {
@@ -9655,9 +9655,9 @@ var JobRunner = class {
       const parent = txDb.select({ projectId: runs.projectId, createdAt: runs.createdAt, error: runs.error }).from(runs).where(eq3(runs.id, input.runId)).get();
       const superseded = input.superseded || parent !== void 0 && newerFullSweep(txDb, { id: input.runId, projectId: parent.projectId, createdAt: parent.createdAt }) !== void 0;
       const state = measurementRunSlotState(txDb, input.runId);
-      const complete3 = state.planned && state.readable && state.missing.length === 0 && !state.hasUnboundSnapshot;
+      const complete = state.planned && state.readable && state.missing.length === 0 && !state.hasUnboundSnapshot;
       let justCompleted = false;
-      if (complete3) {
+      if (complete) {
         justCompleted = txDb.update(runs).set({ status: "completed", error: null }).where(and3(eq3(runs.id, input.runId), eq3(runs.status, "partial"))).run().changes === 1;
         if (justCompleted && parent) recordSentimentCompletion(tx, { projectId: parent.projectId, runId: input.runId, completionKey: input.fillId, completedAt: finishedAt, fillOrigin: input.fillId });
       } else if (state.readable && !input.fatal) {
@@ -9671,9 +9671,9 @@ var JobRunner = class {
         }
         txDb.update(runs).set({ error: serializeRunError({ providers }) }).where(and3(eq3(runs.id, input.runId), eq3(runs.status, "partial"))).run();
       }
-      const status = complete3 ? "completed" : input.filled > 0 ? "partial" : "failed";
+      const status = complete ? "completed" : input.filled > 0 ? "partial" : "failed";
       const reason = input.fatal ?? (superseded ? "Stopped because a newer sweep started; no answers were added behind it." : null) ?? (input.providerErrors.size > 0 ? formatRunErrorOneLine(buildRunErrorFromMessages(input.providerErrors)) : null);
-      txDb.update(runFills).set({ status, filled: input.filled, error: complete3 ? null : reason, finishedAt }).where(eq3(runFills.id, input.fillId)).run();
+      txDb.update(runFills).set({ status, filled: input.filled, error: complete ? null : reason, finishedAt }).where(eq3(runFills.id, input.fillId)).run();
       return { justCompleted, superseded };
     });
   }
@@ -14452,7 +14452,7 @@ function readStoredGroundingSources(rawResponse) {
   return result2;
 }
 async function backfillInsightsCommand(project, opts) {
-  const { IntelligenceService: IntelligenceService2 } = await import("./intelligence-service-SUFG6ICC.js");
+  const { IntelligenceService: IntelligenceService2 } = await import("./intelligence-service-PULUYOPR.js");
   const config = loadConfig();
   const db = createClient(config.database);
   migrate(db);
@@ -16679,14 +16679,45 @@ import { eq as eq24 } from "drizzle-orm";
 // src/agent/session.ts
 import fs8 from "fs";
 import path7 from "path";
-import { Agent } from "@mariozechner/pi-agent-core";
-import { registerBuiltInApiProviders } from "@mariozechner/pi-ai";
+import { Agent } from "@earendil-works/pi-agent-core";
 
 // src/agent/providers.ts
+import "@earendil-works/pi-ai";
+
+// src/agent/pi-models.ts
 import {
-  getEnvApiKey,
-  getModel
-} from "@mariozechner/pi-ai";
+  createProvider,
+  envApiKeyAuth
+} from "@earendil-works/pi-ai";
+import { builtinModels } from "@earendil-works/pi-ai/providers/all";
+import { openAICompletionsApi } from "@earendil-works/pi-ai/api/openai-completions.lazy";
+var aeroModels = builtinModels();
+aeroModels.setProvider(createProvider({
+  id: "deepinfra",
+  auth: { apiKey: envApiKeyAuth("DeepInfra", ["DEEPINFRA_TOKEN"]) },
+  models: [],
+  api: openAICompletionsApi()
+}));
+var DEFAULT_MAX_RETRIES = 2;
+var DEFAULT_MAX_OUTPUT_TOKENS = 32e3;
+var CANONRY_USER_AGENT = "canonry";
+function outputCap(model) {
+  return Math.min(model.maxTokens, DEFAULT_MAX_OUTPUT_TOKENS);
+}
+function canonryDefaults(model, options) {
+  return {
+    ...options,
+    maxRetries: options?.maxRetries ?? DEFAULT_MAX_RETRIES,
+    maxTokens: options?.maxTokens ?? outputCap(model),
+    headers: { "User-Agent": CANONRY_USER_AGENT, ...options?.headers }
+  };
+}
+var aeroStreamFn = (model, context, options) => aeroModels.streamSimple(model, context, canonryDefaults(model, options));
+function completeOnce(model, context, options = {}) {
+  return aeroModels.complete(model, context, canonryDefaults(model, options));
+}
+
+// src/agent/providers.ts
 var PROVIDER_MODELS = {
   [AgentProviderIds.claude]: {
     [LlmCapabilities.agent]: "claude-opus-4-7",
@@ -16707,9 +16738,10 @@ var PROVIDER_MODELS = {
     [LlmCapabilities.classify]: "gemini-2.5-flash-lite"
   },
   [AgentProviderIds.zai]: {
-    // GLM lineage: 5.1 is the latest agent-class model; 5-turbo is the
-    // cheaper tier good for structured tasks and classification.
-    [LlmCapabilities.agent]: "glm-5.1",
+    // GLM lineage: 5.2 replaced 5.1, which pi-ai 0.87 dropped from its
+    // catalog; 5-turbo is the cheaper tier good for structured tasks and
+    // classification.
+    [LlmCapabilities.agent]: "glm-5.2",
     [LlmCapabilities.analyze]: "glm-5-turbo",
     [LlmCapabilities.classify]: "glm-5-turbo"
   },
@@ -16811,9 +16843,10 @@ var AGENT_PROVIDERS = {
       },
       // Fallback for arbitrary `--model` slugs we don't ship as tiers. cost is
       // 0, so an unknown slug isn't cost-tracked by pi-ai's `calculateCost`;
-      // contextWindow stays conservative since we can't know the slug's window.
+      // contextWindow is 0 (unknown) because a guessed window would clamp a long
+      // turn's output cap toward 1 token; the host enforces its real window.
       defaultModelMeta: {
-        contextWindow: 131072,
+        contextWindow: 0,
         maxTokens: 32768,
         reasoning: false,
         cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }
@@ -16844,10 +16877,10 @@ function resolveModelForCapability(provider, capability, modelIdOverride) {
     const suppressThinking = capability !== LlmCapabilities.agent;
     return buildOpenAiCompatibleModel(entry, id, suppressThinking);
   }
-  const model = getModel(entry.piAiProvider, id);
+  const model = aeroModels.getModel(entry.piAiProvider, id);
   if (!model) {
     throw new Error(
-      `Model '${id}' not found for pi-ai provider '${entry.piAiProvider}'. Verify PROVIDER_MODELS[${provider}][${capability}] against the installed @mariozechner/pi-ai catalog.`
+      `Model '${id}' not found for pi-ai provider '${entry.piAiProvider}'. Verify PROVIDER_MODELS[${provider}][${capability}] against the installed @earendil-works/pi-ai catalog.`
     );
   }
   if (provider === AgentProviderIds.gemini && process.env.GEMINI_BASE_URL) {
@@ -16864,7 +16897,7 @@ function buildOpenAiCompatibleModel(entry, id, suppressThinking = false) {
   }
   const meta = host.knownModels[id] ?? host.defaultModelMeta;
   const baseUrl = (host.baseUrlEnvVar ? process.env[host.baseUrlEnvVar] : void 0) || host.baseUrl;
-  const compat = suppressThinking ? { ...host.compat, thinkingFormat: "qwen-chat-template" } : host.compat;
+  const compat = suppressThinking ? { ...host.compat, thinkingFormat: "chat-template", chatTemplateKwargs: { enable_thinking: { $var: "thinking.enabled" } } } : host.compat;
   return {
     id,
     name: id,
@@ -16879,6 +16912,10 @@ function buildOpenAiCompatibleModel(entry, id, suppressThinking = false) {
     ...compat ? { compat } : {}
   };
 }
+function isAgentModelAvailable(provider, id) {
+  const entry = AGENT_PROVIDERS[provider];
+  return !!entry.openaiCompatible || !!aeroModels.getModel(entry.piAiProvider, id);
+}
 function validateAgentProviderRegistry() {
   for (const provider of listAgentProviders()) {
     for (const capability of LLM_CAPABILITIES) {
@@ -16899,16 +16936,26 @@ function resolveApiKeyFor(providerOrPiAi, config) {
 function resolveApiKeySource(providerOrPiAi, config) {
   const id = resolveAgentId(providerOrPiAi);
   if (!id) return void 0;
-  const entry = AGENT_PROVIDERS[id];
   const fromConfig = config.providers?.[id]?.apiKey;
   if (fromConfig) return { key: fromConfig, source: "config" };
-  const fromEnv = entry.openaiCompatible ? process.env[entry.openaiCompatible.apiKeyEnvVar] : getEnvApiKey(entry.piAiProvider);
+  const fromEnv = agentProviderApiKeyEnvVars(id).map((name) => process.env[name]).find((value) => !!value);
   if (fromEnv) return { key: fromEnv, source: "env" };
   return void 0;
 }
-function agentProviderApiKeyEnvVar(id) {
+var CATALOG_API_KEY_ENV_VARS = {
+  anthropic: ["ANTHROPIC_OAUTH_TOKEN", "ANTHROPIC_API_KEY"],
+  openai: ["OPENAI_API_KEY"],
+  google: ["GEMINI_API_KEY"],
+  zai: ["ZAI_API_KEY"]
+};
+function agentProviderApiKeyEnvVars(id) {
   const entry = AGENT_PROVIDERS[id];
-  return entry.openaiCompatible ? entry.openaiCompatible.apiKeyEnvVar : `${entry.piAiProvider.toUpperCase()}_API_KEY`;
+  if (entry.openaiCompatible) return [entry.openaiCompatible.apiKeyEnvVar];
+  return CATALOG_API_KEY_ENV_VARS[entry.piAiProvider] ?? [`${entry.piAiProvider.toUpperCase()}_API_KEY`];
+}
+function agentProviderApiKeyEnvVar(id) {
+  const names = agentProviderApiKeyEnvVars(id);
+  return names[names.length - 1];
 }
 function resolveAgentId(providerOrPiAi) {
   if (isAgentProviderId(providerOrPiAi)) return providerOrPiAi;
@@ -16959,7 +17006,7 @@ function resolveAeroSkillDir(pkgDir) {
 // src/agent/skill-tools.ts
 import fs7 from "fs";
 import path6 from "path";
-import { Type } from "@sinclair/typebox";
+import { Type } from "@earendil-works/pi-ai";
 var MAX_DOC_CHARS = 2e4;
 function textResult(details) {
   return {
@@ -17050,10 +17097,10 @@ function buildSkillDocTools() {
 }
 
 // src/agent/tools.ts
-import { Type as Type3 } from "@sinclair/typebox";
+import { Type as Type3 } from "@earendil-works/pi-ai";
 
 // src/agent/mcp-to-agent-tool.ts
-import { Type as Type2 } from "@sinclair/typebox";
+import { Type as Type2 } from "@earendil-works/pi-ai";
 import { randomUUID as randomUUID2 } from "crypto";
 
 // src/agent/tool-result-units.ts
@@ -18076,7 +18123,12 @@ function splitAeroAnthropicSystemCachePayload(payload, model) {
 
 // src/agent/runtime.ts
 import { z } from "zod";
-import { Type as Type4 } from "@sinclair/typebox";
+import {
+  Type as Type4,
+  createInitialSystemMessage,
+  getCurrentTools,
+  toToolDeclaration
+} from "@earendil-works/pi-ai";
 var DISCOVER = "aero_list_toolkits";
 var MAX_VISIBLE_TOOLS = 128;
 var LOAD = "aero_load_toolkit";
@@ -18209,20 +18261,23 @@ function configureAeroRuntime(agent, allowed, limits, progressive = true, pinned
     runtime = { allowed, loaded: /* @__PURE__ */ new Set(), limits: agentTurnLimitsSchema.parse(limits ?? {}), calls: 0, rounds: 0, startedAt: 0, reason: "completed", progressive, pinned: new Set(pinned), corrected: /* @__PURE__ */ new Map() };
     runtimes.set(agent, runtime);
     const state = runtime;
-    const stream = agent.streamFn;
-    agent.streamFn = (model, context, options) => {
+    const stream = agent.streamFunction;
+    agent.streamFunction = (model, context, options) => {
       options?.signal?.throwIfAborted();
       state.rounds++;
-      const visible = new Set((context.tools ?? []).map((tool) => tool.name));
+      const visible = new Set(getCurrentTools(context.messages).map((tool) => tool.name));
       const response = stream(model, context, options);
       return response instanceof Promise ? response.then((ready) => withCorrectedToolNames(state, ready, visible)) : withCorrectedToolNames(state, response, visible);
     };
     const before = agent.beforeToolCall;
     const after = agent.afterToolCall;
+    const overLimit = /* @__PURE__ */ new Set();
     agent.beforeToolCall = async (event, signal) => {
-      if (signal?.aborted) return { block: true, reason: "Turn stopped." };
+      if (signal?.aborted || overLimit.has(event.toolCall.id)) return { block: true, reason: "Turn stopped." };
       return before?.(event, signal);
     };
+    const finish = agent.finishTurn;
+    agent.finishTurn = (turn, signal) => state.reason === "tool-limit" ? { action: "end" } : finish?.(turn, signal);
     agent.afterToolCall = async (event, signal) => {
       const override = await after?.(event, signal);
       if (event.toolCall.name === LOAD && !event.isError) {
@@ -18233,31 +18288,39 @@ function configureAeroRuntime(agent, allowed, limits, progressive = true, pinned
       return override;
     };
     const toolStarts = /* @__PURE__ */ new Map();
+    const toolDurations = /* @__PURE__ */ new Map();
     agent.subscribe((event) => {
       if (event.type === "tool_execution_start") {
         if (state.calls >= state.limits.maxToolCalls) {
           state.reason = "tool-limit";
-          agent.abort();
+          overLimit.add(event.toolCallId);
         } else if (!agent.signal?.aborted) {
           state.calls++;
-          toolStarts.set(event.toolCallId, Date.now());
         }
+        toolStarts.set(event.toolCallId, Date.now());
+      }
+      if (event.type === "tool_execution_end") {
+        const startedAt = toolStarts.get(event.toolCallId);
+        if (startedAt !== void 0) toolDurations.set(event.toolCallId, Date.now() - startedAt);
+        toolStarts.delete(event.toolCallId);
       }
       if (event.type === "message_end" && event.message.role === "toolResult") {
         const message = event.message;
         explainMissingTool(state, message);
-        const startedAt = toolStarts.get(message.toolCallId);
+        const durationMs = toolDurations.get(message.toolCallId);
         const requested = state.corrected.get(message.toolCallId);
         Object.assign(message, {
           aeroToolLabel: state.allowed.find((tool) => tool.name === message.toolName)?.label,
-          ...startedAt === void 0 ? {} : { aeroDurationMs: Date.now() - startedAt },
+          ...durationMs === void 0 ? {} : { aeroDurationMs: durationMs },
           ...requested === void 0 ? {} : { aeroRequestedToolName: requested }
         });
-        toolStarts.delete(event.message.toolCallId);
+        toolDurations.delete(message.toolCallId);
         state.corrected.delete(message.toolCallId);
       }
       if (event.type === "agent_start") {
         toolStarts.clear();
+        toolDurations.clear();
+        overLimit.clear();
         state.corrected.clear();
         state.calls = 0;
         state.rounds = 0;
@@ -18283,6 +18346,22 @@ function configureAeroRuntime(agent, allowed, limits, progressive = true, pinned
   runtime.progressive = progressive;
   runtime.pinned = new Set(pinned);
   agent.state.tools = visibleTools(runtime);
+  setAeroSystemPrompt(agent);
+}
+function isSystemMessage(message) {
+  return !!message && typeof message === "object" && message.role === "system";
+}
+function isRunFailureMessage(message) {
+  if (!message || typeof message !== "object") return false;
+  const m = message;
+  if (m.role !== "assistant" || m.stopReason !== "aborted" && m.stopReason !== "error" || m.responseId) return false;
+  const content = Array.isArray(m.content) ? m.content : [];
+  return content.length === 1 && content[0].type === "text" && content[0].text === "" && m.usage?.totalTokens === 0;
+}
+function setAeroSystemPrompt(agent, prompt = agent.state.systemPrompt) {
+  const system = createInitialSystemMessage(prompt, agent.state.tools.map(toToolDeclaration));
+  const rest = agent.state.messages.filter((message) => message.role !== "system");
+  agent.state.messages = system ? [system, ...rest] : rest;
 }
 function aeroTurnStatus(agent) {
   const runtime = runtimes.get(agent);
@@ -18296,7 +18375,7 @@ function aeroTurnStatus(agent) {
 }
 
 // src/agent/view-context.ts
-import { Type as Type5 } from "@sinclair/typebox";
+import { Type as Type5 } from "@earendil-works/pi-ai";
 async function readAeroViewEvidence(options) {
   const { client, projectName, context } = options;
   if (context?.unavailableReason) throw validationError(context.unavailableReason);
@@ -18424,7 +18503,6 @@ function recordAgentToolEvent(args) {
 var builtinsRegistered = false;
 function ensureBuiltinsRegistered() {
   if (!builtinsRegistered) {
-    registerBuiltInApiProviders();
     validateAgentProviderRegistry();
     builtinsRegistered = true;
   }
@@ -18528,7 +18606,7 @@ function createAeroSession(opts) {
       tools,
       ...opts.initialMessages ? { messages: opts.initialMessages } : {}
     },
-    streamFn: opts.streamFn,
+    streamFn: opts.streamFn ?? aeroStreamFn,
     sessionId: buildAeroProviderSessionId(opts),
     onPayload: splitAeroAnthropicSystemCachePayload,
     ...toolUsageHooks,
@@ -18540,6 +18618,7 @@ function createAeroSession(opts) {
     agent.subscribe((event) => {
       if (event.type !== "turn_end") return;
       if (event.message.role !== "assistant") return;
+      if (isRunFailureMessage(event.message)) return;
       recordLlmUsageEvent({
         db: telemetryDb,
         projectId: opts.projectId,
@@ -18564,7 +18643,7 @@ function resolveSessionProviderAndModel(config, opts) {
 }
 
 // src/agent/remote-mcp.ts
-import { Type as Type6 } from "@sinclair/typebox";
+import { Type as Type6 } from "@earendil-works/pi-ai";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 var log21 = createLogger("RemoteMcp");
@@ -18821,9 +18900,6 @@ Project shape: a Simple project with ${tracked} tracked queries and no measureme
   }
 }
 
-// src/agent/compaction.ts
-import { complete } from "@mariozechner/pi-ai";
-
 // src/agent/compaction-config.ts
 var COMPACTION_TOKEN_THRESHOLD = 6e4;
 var COMPACTION_TARGET_RATIO = 0.5;
@@ -18875,8 +18951,12 @@ function estimateTranscriptTokens(messages) {
 
 // src/agent/compaction.ts
 function shouldCompact(messages) {
-  if (messages.length >= COMPACTION_MAX_MESSAGES) return true;
-  return estimateTranscriptTokens(messages) >= COMPACTION_TOKEN_THRESHOLD;
+  const turns = conversationMessages(messages);
+  if (turns.length >= COMPACTION_MAX_MESSAGES) return true;
+  return estimateTranscriptTokens(turns) >= COMPACTION_TOKEN_THRESHOLD;
+}
+function conversationMessages(messages) {
+  return messages.filter((message) => message.role !== "system");
 }
 function findSafeSplit(messages, targetIndex) {
   const maxSplit = messages.length - COMPACTION_PRESERVE_TAIL_MESSAGES;
@@ -18922,18 +19002,19 @@ async function runSummaryLlm(args) {
     messages: toLlmMessages(args.chunk)
   };
   const apiKey = args.getApiKey?.(args.model.provider);
-  const resp = await complete(args.model, context, apiKey ? { apiKey } : {});
+  const resp = await completeOnce(args.model, context, apiKey ? { apiKey } : {});
   const parts = resp.content.filter((p) => p.type === "text");
   const text = parts.map((p) => p.text).join("\n").trim();
   if (!text) throw new Error("summary LLM returned no text content");
   return text;
 }
 async function compactMessages(args) {
-  const target = Math.floor(args.messages.length * COMPACTION_TARGET_RATIO);
-  const split = findSafeSplit(args.messages, target);
+  const messages = conversationMessages(args.messages);
+  const target = Math.floor(messages.length * COMPACTION_TARGET_RATIO);
+  const split = findSafeSplit(messages, target);
   if (split === 0) return null;
-  const chunk = args.messages.slice(0, split);
-  const suffix = args.messages.slice(split);
+  const chunk = messages.slice(0, split);
+  const suffix = messages.slice(split);
   const summarize = args.summarize ?? runSummaryLlm;
   const rawSummary = await summarize({ model: args.model, chunk, getApiKey: args.getApiKey });
   const summary = truncateToByteLimit(rawSummary, AGENT_MEMORY_VALUE_MAX_BYTES);
@@ -18954,7 +19035,7 @@ function escapeMemoryFragment(value) {
   return value.replace(/<(\/?)memory>/gi, "<$1\u200Cmemory>");
 }
 function withoutPersistedToolDetails(messages) {
-  return messages.map((message) => {
+  return messages.filter((message) => !isSystemMessage(message)).map((message) => {
     if (!message || typeof message !== "object") return message;
     const row = message;
     if (row.role !== "toolResult" || !("details" in row)) return message;
@@ -19182,7 +19263,8 @@ ${lines.join("\n")}
     if (!projectId) return;
     const row = this.loadRow(projectId);
     if (!row) return;
-    agent.state.systemPrompt = this.buildHydratedSystemPrompt(projectId, row.systemPrompt);
+    if (agent.state.isStreaming) return;
+    setAeroSystemPrompt(agent, this.buildHydratedSystemPrompt(projectId, row.systemPrompt));
   }
   /**
    * Acquire the Agent for an upcoming prompt/turn.
@@ -19214,10 +19296,7 @@ ${lines.join("\n")}
       const projectId = this.resolveProjectId(projectName);
       const row = this.loadRow(projectId);
       const systemPrompt = loadAeroSystemPrompt();
-      if (row && row.systemPrompt !== systemPrompt) {
-        this.persistPromptSnapshot(projectId, systemPrompt);
-        agent.state.systemPrompt = this.buildHydratedSystemPrompt(projectId, systemPrompt);
-      }
+      if (row && row.systemPrompt !== systemPrompt) this.persistPromptSnapshot(projectId, systemPrompt);
       this.alignToolSurface(projectName, agent, {
         scope: preferences?.toolScope ?? AeroToolScopes.all,
         profile: preferences?.toolProfile ?? AeroToolProfiles.default
@@ -19232,7 +19311,7 @@ ${lines.join("\n")}
       preferences?.signal?.throwIfAborted();
       const progressive = (preferences?.toolProfile ?? AeroToolProfiles.default) === AeroToolProfiles.default;
       const shape = aeroProjectShape(this.opts.db, projectId);
-      agent.state.systemPrompt = this.buildHydratedSystemPrompt(projectId, systemPrompt) + shape.prompt + aeroViewPrompt(preferences?.context);
+      setAeroSystemPrompt(agent, this.buildHydratedSystemPrompt(projectId, systemPrompt) + shape.prompt + aeroViewPrompt(preferences?.context));
       configureAeroRuntime(agent, [...agent.state.tools, ...progressive ? [buildAeroViewTool(view, evidence)] : []], preferences?.limits, progressive, shape.pinned);
       return agent;
     } finally {
@@ -19280,7 +19359,7 @@ ${lines.join("\n")}
       });
       if (!result2) return;
       agent.state.messages = result2.messages;
-      agent.state.systemPrompt = this.buildHydratedSystemPrompt(projectId, row.systemPrompt);
+      setAeroSystemPrompt(agent, this.buildHydratedSystemPrompt(projectId, row.systemPrompt));
       this.save(projectName);
       log22.info("compaction.completed", {
         projectName,
@@ -19340,7 +19419,7 @@ ${lines.join("\n")}
   resolveTurnModel(preferences, current) {
     const pinned = resolveConfiguredAgentProvider(this.opts.config);
     const provider = preferences?.provider ?? pinned ?? current.provider ?? AgentProviderIds.claude;
-    const carried = !preferences?.provider && !pinned && provider === current.provider ? current.modelId ?? void 0 : void 0;
+    const carried = !preferences?.provider && !pinned && provider === current.provider && current.modelId && isAgentModelAvailable(provider, current.modelId) ? current.modelId : void 0;
     const pinnedModelId = provider === pinned ? this.opts.config.agent?.model ?? void 0 : void 0;
     const modelId = preferences?.modelId ?? pinnedModelId ?? carried ?? getAgentProvider(provider).defaultModel;
     return { provider, modelId };
@@ -19692,12 +19771,12 @@ var ViewerAeroSessions = class {
     try {
       const client = new ApiClient(this.opts.selfApiUrl, minted.raw, { skipProbe: true, surface: "aero" });
       const agent = this.sessions.get(key)?.agent ?? this.createAgent(project, client);
-      agent.state.messages = trimViewerTranscript(agent.state.messages);
+      agent.state.messages = trimViewerTranscript(agent.state.messages.filter((message) => message.role !== "system"));
       const view = { client, projectName: project.name, basePath: this.opts.config.basePath, context: preferences.context };
       const evidence = preferences.context ? await readAeroViewEvidence(view) : void 0;
       preferences.signal?.throwIfAborted();
       const shape = aeroProjectShape(this.opts.db, project.id);
-      agent.state.systemPrompt = loadAeroSystemPrompt(void 0, { extras: false }) + VIEWER_AERO_PROMPT + shape.prompt + aeroViewPrompt(preferences.context);
+      setAeroSystemPrompt(agent, loadAeroSystemPrompt(void 0, { extras: false }) + VIEWER_AERO_PROMPT + shape.prompt + aeroViewPrompt(preferences.context));
       configureAeroRuntime(agent, [...buildViewerAeroTools(client, project.name, this.opts.managedSweeps), buildAeroViewTool(view, evidence)], void 0, true, shape.pinned);
       this.sessions.set(key, { agent, lastUsedAt: this.now(), updatedAt: this.sessions.get(key)?.updatedAt ?? null });
       this.turnsToday.set(key, { date: today, count: count3 + 1 });
@@ -19988,7 +20067,7 @@ function viewerAeroCaller(request, opts) {
   const principal = request.principal;
   return principal?.kind === "user" && principal.role === UserRoles.viewer ? principal.id : null;
 }
-var VIEWER_HIDDEN_ASSISTANT_KEYS = ["api", "provider", "model", "responseId", "usage"];
+var VIEWER_HIDDEN_ASSISTANT_KEYS = ["api", "provider", "model", "responseId", "usage", "responseModel", "diagnostics", "providerThinkingLevel", "rawStopReason"];
 var VIEWER_ERROR_MESSAGE = "Aero could not finish this answer. Try again, or ask an administrator if it keeps happening.";
 function viewerRedact(_key, value) {
   if (!value || typeof value !== "object" || value.role !== "assistant") return value;
@@ -20043,6 +20122,11 @@ async function streamAgentTurn(reply, agent, turn) {
   };
   write({ type: "stream_open" });
   const unsubscribe = agent.subscribe((event) => {
+    if ("message" in event && (isSystemMessage(event.message) || isRunFailureMessage(event.message))) return;
+    if (event.type === "agent_end") {
+      write({ ...event, messages: event.messages.filter((message) => !isSystemMessage(message)) });
+      return;
+    }
     if (event.type === "tool_execution_start") {
       const labelled = { ...event, label: agent.state.tools.find((tool) => tool.name === event.toolName)?.label };
       write(labelled);
@@ -20281,7 +20365,6 @@ function registerAgentRoutes(app, opts) {
 }
 
 // src/agent/recommendation-explainer.ts
-import { complete as complete2 } from "@mariozechner/pi-ai";
 var RECOMMENDATION_EXPLAIN_PROMPT_VERSION = "v1";
 var SYSTEM_PROMPT = `You are an AEO (Answer Engine Optimization) analyst explaining why a specific content recommendation matters for a website. Your audience is the site owner or their agency \u2014 practical, time-poor, allergic to jargon.
 
@@ -20388,7 +20471,7 @@ function createRecommendationExplainer(opts) {
       ]
     };
     const apiKey = resolveApiKeyFor(provider, opts.config);
-    const resp = await complete2(model, context, apiKey ? { apiKey } : {});
+    const resp = await completeOnce(model, context, apiKey ? { apiKey } : {});
     const parts = resp.content.filter((p) => p.type === "text");
     const text = parts.map((p) => p.text).join("\n").trim();
     if (!text) {
@@ -20466,7 +20549,7 @@ Your previous reply was not valid JSON. Return ONLY a JSON object with exactly t
         systemPrompt: BRIEF_SYSTEM_PROMPT,
         messages: [{ role: "user", content: userContent, timestamp: Date.now() }]
       };
-      const resp = await complete2(model, context, apiKey ? { apiKey } : {});
+      const resp = await completeOnce(model, context, apiKey ? { apiKey } : {});
       totalCostDollars += Number.isFinite(resp.usage.cost.total) ? resp.usage.cost.total : 0;
       const parts = resp.content.filter((p) => p.type === "text");
       const text = parts.map((p) => p.text).join("\n").trim();