fix: harden plugin and hook install paths

This commit is contained in:
Peter Steinberger
2026-02-02 02:04:50 -08:00
parent be9a2fb134
commit d03eca8450
9 changed files with 307 additions and 14 deletions

View File

@@ -400,7 +400,7 @@ export async function compactEmbeddedPiSessionDirect(
sessionManager,
settingsManager,
});
applySystemPromptOverrideToSession(session, systemPromptOverride);
applySystemPromptOverrideToSession(session, systemPromptOverride());
try {
const prior = await sanitizeSessionHistory({

View File

@@ -390,7 +390,7 @@ export async function runEmbeddedAttempt(
tools,
});
const systemPromptOverride = createSystemPromptOverride(appendPrompt);
const systemPromptText = systemPromptOverride;
const systemPromptText = systemPromptOverride();
const sessionLock = await acquireSessionWriteLock({
sessionFile: params.sessionFile,
@@ -475,7 +475,7 @@ export async function runEmbeddedAttempt(
sessionManager,
settingsManager,
}));
applySystemPromptOverrideToSession(session, systemPromptOverride);
applySystemPromptOverrideToSession(session, systemPromptText);
if (!session) {
throw new Error("Embedded agent session missing");
}

View File

@@ -78,8 +78,11 @@ export function createSystemPromptOverride(systemPrompt: string): string {
return systemPrompt.trim();
}
export function applySystemPromptOverrideToSession(session: AgentSession, override: string) {
const prompt = override.trim();
export function applySystemPromptOverrideToSession(
session: AgentSession,
override: string | ((defaultPrompt?: string) => string),
) {
const prompt = typeof override === "function" ? override() : override.trim();
session.agent.setSystemPrompt(prompt);
const mutableSession = session as unknown as {
_baseSystemPrompt?: string;