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