chore: update deps and pi model discovery

This commit is contained in:
Peter Steinberger
2026-01-31 06:40:45 +01:00
parent 85dd070dea
commit 08ed62852a
32 changed files with 1424 additions and 1419 deletions

View File

@@ -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,

View File

@@ -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";

View File

@@ -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 ?? {};

View File

@@ -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,

View File

@@ -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";

View File

@@ -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;
}