chore: update deps and pi model discovery

src/agents/anthropic.setup-token.live.test.ts

@@ -4,7 +4,7 @@ import os from "node:os";
 import path from "node:path";
 
 import { type Api, completeSimple, type Model } from "@mariozechner/pi-ai";
-import { discoverAuthStorage, discoverModels } from "@mariozechner/pi-coding-agent";
+import { discoverAuthStorage, discoverModels } from "./pi-model-discovery.js";
 import { describe, expect, it } from "vitest";
 import { isTruthyEnvValue } from "../infra/env.js";
 import {

src/agents/context.ts

@@ -1,8 +1,6 @@
 // Lazy-load pi-coding-agent model metadata so we can infer context windows when
 // the agent reports a model id. This includes custom models.json entries.
 
-import { join } from "node:path";
-
 import { loadConfig } from "../config/config.js";
 import { resolveOpenClawAgentDir } from "./agent-paths.js";
 import { ensureOpenClawModelsJson } from "./models-config.js";
@@ -12,12 +10,12 @@ type ModelEntry = { id: string; contextWindow?: number };
 const MODEL_CACHE = new Map<string, number>();
 const loadPromise = (async () => {
   try {
-    const { AuthStorage, ModelRegistry } = await import("@mariozechner/pi-coding-agent");
+    const { discoverAuthStorage, discoverModels } = await import("./pi-model-discovery.js");
     const cfg = loadConfig();
     await ensureOpenClawModelsJson(cfg);
     const agentDir = resolveOpenClawAgentDir();
-    const authStorage = new AuthStorage(join(agentDir, "auth.json"));
-    const modelRegistry = new ModelRegistry(authStorage, join(agentDir, "models.json"));
+    const authStorage = discoverAuthStorage(agentDir);
+    const modelRegistry = discoverModels(authStorage, agentDir);
     const models = modelRegistry.getAll() as ModelEntry[];
     for (const m of models) {
       if (!m?.id) continue;

src/agents/model-catalog.test.ts

@@ -7,7 +7,7 @@ import {
   resetModelCatalogCacheForTest,
 } from "./model-catalog.js";
 
-type PiSdkModule = typeof import("@mariozechner/pi-coding-agent");
+type PiSdkModule = typeof import("./pi-model-discovery.js");
 
 vi.mock("./models-config.js", () => ({
   ensureOpenClawModelsJson: vi.fn().mockResolvedValue({ agentDir: "/tmp", wrote: false }),

src/agents/model-catalog.ts

@@ -20,11 +20,11 @@ type DiscoveredModel = {
   input?: Array<"text" | "image">;
 };
 
-type PiSdkModule = typeof import("@mariozechner/pi-coding-agent");
+type PiSdkModule = typeof import("./pi-model-discovery.js");
 
 let modelCatalogPromise: Promise<ModelCatalogEntry[]> | null = null;
 let hasLoggedModelCatalogError = false;
-const defaultImportPiSdk = () => import("@mariozechner/pi-coding-agent");
+const defaultImportPiSdk = () => import("./pi-model-discovery.js");
 let importPiSdk = defaultImportPiSdk;
 
 export function resetModelCatalogCacheForTest() {

src/agents/models.profiles.live.test.ts

@@ -1,5 +1,5 @@
 import { type Api, completeSimple, type Model } from "@mariozechner/pi-ai";
-import { discoverAuthStorage, discoverModels } from "@mariozechner/pi-coding-agent";
+import { discoverAuthStorage, discoverModels } from "./pi-model-discovery.js";
 import { Type } from "@sinclair/typebox";
 import { describe, expect, it } from "vitest";
 import { loadConfig } from "../config/config.js";

src/agents/pi-embedded-runner/compact.ts

@@ -396,6 +396,17 @@ export async function compactEmbeddedPiSessionDirect(
       await resourceLoader.reload();
 
       let session: Awaited<ReturnType<typeof createAgentSession>>["session"];
+      const resourceLoader = new DefaultResourceLoader({
+        cwd: resolvedWorkspace,
+        agentDir,
+        settingsManager,
+        additionalExtensionPaths,
+        systemPromptOverride: systemPrompt,
+        skillsOverride: () => ({ skills: [], diagnostics: [] }),
+        agentsFilesOverride: () => ({ agentsFiles: [] }),
+      });
+      await resourceLoader.reload();
+
       ({ session } = await createAgentSession({
         cwd: resolvedWorkspace,
         agentDir,

src/agents/pi-embedded-runner/model.test.ts

@@ -1,14 +1,8 @@
 import { describe, expect, it, vi } from "vitest";
 
-vi.mock("@mariozechner/pi-coding-agent", () => ({
-  AuthStorage: class {
-    mocked = true;
-  },
-  ModelRegistry: class {
-    find() {
-      return null;
-    }
-  },
+vi.mock("../pi-model-discovery.js", () => ({
+  discoverAuthStorage: vi.fn(() => ({ mocked: true })),
+  discoverModels: vi.fn(() => ({ find: vi.fn(() => null) })),
 }));
 
 import type { OpenClawConfig } from "../../config/config.js";

src/agents/pi-embedded-runner/model.ts

@@ -1,7 +1,10 @@
-import { join } from "node:path";
-
 import type { Api, Model } from "@mariozechner/pi-ai";
-import { AuthStorage, ModelRegistry } from "@mariozechner/pi-coding-agent";
+import {
+  discoverAuthStorage,
+  discoverModels,
+  type AuthStorage,
+  type ModelRegistry,
+} from "../pi-model-discovery.js";
 
 import type { OpenClawConfig } from "../../config/config.js";
 import type { ModelDefinitionConfig } from "../../config/types.js";
@@ -59,8 +62,8 @@ export function resolveModel(
   modelRegistry: ModelRegistry;
 } {
   const resolvedAgentDir = agentDir ?? resolveOpenClawAgentDir();
-  const authStorage = new AuthStorage(join(resolvedAgentDir, "auth.json"));
-  const modelRegistry = new ModelRegistry(authStorage, join(resolvedAgentDir, "models.json"));
+  const authStorage = discoverAuthStorage(resolvedAgentDir);
+  const modelRegistry = discoverModels(authStorage, resolvedAgentDir);
   const model = modelRegistry.find(provider, modelId) as Model<Api> | null;
   if (!model) {
     const providers = cfg?.models?.providers ?? {};

src/agents/pi-embedded-runner/run/attempt.ts

@@ -458,11 +458,10 @@ export async function runEmbeddedAttempt(
         settingsManager,
         additionalExtensionPaths,
         noSkills: true,
-        systemPromptOverride: () => systemPrompt(""),
+        systemPromptOverride: systemPrompt,
         agentsFilesOverride: () => ({ agentsFiles: [] }),
       });
       await resourceLoader.reload();
-
       ({ session } = await createAgentSession({
         cwd: resolvedWorkspace,
         agentDir,

src/agents/pi-embedded-runner/run/types.ts

@@ -1,6 +1,6 @@
 import type { AgentMessage } from "@mariozechner/pi-agent-core";
 import type { Api, AssistantMessage, ImageContent, Model } from "@mariozechner/pi-ai";
-import type { AuthStorage, ModelRegistry } from "@mariozechner/pi-coding-agent";
+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";

src/agents/pi-embedded-runner/system-prompt.ts

@@ -75,7 +75,7 @@ export function buildEmbeddedSystemPrompt(params: {
 
 export function createSystemPromptOverride(
   systemPrompt: string,
-): (defaultPrompt: string) => string {
+): (defaultPrompt?: string) => string {
   const trimmed = systemPrompt.trim();
   return () => trimmed;
 }

src/agents/pi-model-discovery.ts

@@ -0,0 +1,14 @@
+import path from "node:path";
+
+import { AuthStorage, ModelRegistry } from "@mariozechner/pi-coding-agent";
+
+// Compatibility helpers for pi-coding-agent 0.50+ (discover* helpers removed).
+export function discoverAuthStorage(agentDir: string): AuthStorage {
+  return new AuthStorage(path.join(agentDir, "auth.json"));
+}
+
+export function discoverModels(authStorage: AuthStorage, agentDir: string): ModelRegistry {
+  return new ModelRegistry(authStorage, path.join(agentDir, "models.json"));
+}
+
+export type { AuthStorage, ModelRegistry };

src/agents/tools/image-tool.ts

@@ -8,7 +8,7 @@ import {
   complete,
   type Model,
 } from "@mariozechner/pi-ai";
-import { AuthStorage, ModelRegistry } from "@mariozechner/pi-coding-agent";
+import { discoverAuthStorage, discoverModels } from "../pi-model-discovery.js";
 import { Type } from "@sinclair/typebox";
 
 import type { OpenClawConfig } from "../../config/config.js";
@@ -233,8 +233,8 @@ async function runImagePrompt(params: {
     : undefined;
 
   await ensureOpenClawModelsJson(effectiveCfg, params.agentDir);
-  const authStorage = new AuthStorage(path.join(params.agentDir, "auth.json"));
-  const modelRegistry = new ModelRegistry(authStorage, path.join(params.agentDir, "models.json"));
+  const authStorage = discoverAuthStorage(params.agentDir);
+  const modelRegistry = discoverModels(authStorage, params.agentDir);
 
   const result = await runWithImageModelFallback({
     cfg: effectiveCfg,