fix: align embedded runner with pi-coding-agent API
This commit is contained in:
@@ -15,10 +15,15 @@ import { ensureAuthStoreFile, resolveAuthStorePath } from "./paths.js";
|
||||
import { suggestOAuthProfileIdForLegacyDefault } from "./repair.js";
|
||||
import { ensureAuthProfileStore, saveAuthProfileStore } from "./store.js";
|
||||
|
||||
const OAUTH_PROVIDER_IDS = new Set(getOAuthProviders().map((provider) => provider.id));
|
||||
const OAUTH_PROVIDER_IDS = new Set<OAuthProvider>(
|
||||
getOAuthProviders().map((provider) => provider.id as OAuthProvider),
|
||||
);
|
||||
|
||||
const isOAuthProvider = (provider: string): provider is OAuthProvider =>
|
||||
OAUTH_PROVIDER_IDS.has(provider as OAuthProvider);
|
||||
|
||||
const resolveOAuthProvider = (provider: string): OAuthProvider | null =>
|
||||
OAUTH_PROVIDER_IDS.has(provider) ? provider : null;
|
||||
isOAuthProvider(provider) ? provider : null;
|
||||
|
||||
function buildOAuthApiKey(provider: string, credentials: OAuthCredentials): string {
|
||||
const needsProjectId = provider === "google-gemini-cli" || provider === "google-antigravity";
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import {
|
||||
createAgentSession,
|
||||
estimateTokens,
|
||||
DefaultResourceLoader,
|
||||
SessionManager,
|
||||
SettingsManager,
|
||||
} from "@mariozechner/pi-coding-agent";
|
||||
@@ -388,13 +387,6 @@ export async function compactEmbeddedPiSessionDirect(
|
||||
sandboxEnabled: !!sandbox?.enabled,
|
||||
});
|
||||
|
||||
const resourceLoader = new DefaultResourceLoader({
|
||||
cwd: resolvedWorkspace,
|
||||
agentDir,
|
||||
settingsManager,
|
||||
additionalExtensionPaths,
|
||||
});
|
||||
await resourceLoader.reload();
|
||||
const { session } = await createAgentSession({
|
||||
cwd: resolvedWorkspace,
|
||||
agentDir,
|
||||
@@ -404,9 +396,9 @@ export async function compactEmbeddedPiSessionDirect(
|
||||
thinkingLevel: mapThinkingLevel(params.thinkLevel),
|
||||
tools: builtInTools,
|
||||
customTools,
|
||||
additionalExtensionPaths,
|
||||
sessionManager,
|
||||
settingsManager,
|
||||
resourceLoader,
|
||||
});
|
||||
applySystemPromptOverrideToSession(session, systemPromptOverride);
|
||||
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
import type { AgentMessage } from "@mariozechner/pi-agent-core";
|
||||
import type { ImageContent } from "@mariozechner/pi-ai";
|
||||
import { streamSimple } from "@mariozechner/pi-ai";
|
||||
import {
|
||||
createAgentSession,
|
||||
DefaultResourceLoader,
|
||||
SessionManager,
|
||||
SettingsManager,
|
||||
} from "@mariozechner/pi-coding-agent";
|
||||
import { createAgentSession, SessionManager, SettingsManager } from "@mariozechner/pi-coding-agent";
|
||||
import fs from "node:fs/promises";
|
||||
import os from "node:os";
|
||||
import type { EmbeddedRunAttemptParams, EmbeddedRunAttemptResult } from "./types.js";
|
||||
@@ -467,13 +462,6 @@ export async function runEmbeddedAttempt(
|
||||
|
||||
const allCustomTools = [...customTools, ...clientToolDefs];
|
||||
|
||||
const resourceLoader = new DefaultResourceLoader({
|
||||
cwd: resolvedWorkspace,
|
||||
agentDir,
|
||||
settingsManager,
|
||||
additionalExtensionPaths,
|
||||
});
|
||||
await resourceLoader.reload();
|
||||
({ session } = await createAgentSession({
|
||||
cwd: resolvedWorkspace,
|
||||
agentDir,
|
||||
@@ -483,9 +471,9 @@ export async function runEmbeddedAttempt(
|
||||
thinkingLevel: mapThinkingLevel(params.thinkLevel),
|
||||
tools: builtInTools,
|
||||
customTools: allCustomTools,
|
||||
additionalExtensionPaths,
|
||||
sessionManager,
|
||||
settingsManager,
|
||||
resourceLoader,
|
||||
}));
|
||||
applySystemPromptOverrideToSession(session, systemPromptOverride);
|
||||
if (!session) {
|
||||
|
||||
Reference in New Issue
Block a user