@tea-agent/loop-agent 0.26.2 → 0.26.4

package/dist/executors/pi-sdk-executor.js

@@ -1,7 +1,7 @@
-import { appendFile, mkdir } from 'node:fs/promises';
-import path from 'node:path';
-import { BoundedTextPreview, classifyPiFailure, createPiJsonlStreamCollector, DEFAULT_ABORT_GRACE_MS, DEFAULT_STALL_TIMEOUT_MS, DEFAULT_TIMEOUT_MS, extractAssistantTextFromPiJson, } from './pi-executor.js';
-import { serializeSessionEvent } from './pi-event-serializer.js';
+import { appendFile, mkdir } from "node:fs/promises";
+import path from "node:path";
+import { BoundedTextPreview, classifyPiFailure, createPiJsonlStreamCollector, DEFAULT_ABORT_GRACE_MS, DEFAULT_STALL_TIMEOUT_MS, DEFAULT_TIMEOUT_MS, extractAssistantTextFromPiJson, } from "./pi-executor.js";
+import { serializeSessionEvent } from "./pi-event-serializer.js";
 let sdkSessionFactoryOverride;
 let sdkImportOverrideForTests;
 let sdkModuleOverrideForTests;
@@ -54,7 +54,7 @@ export function setPiSdkModuleOverrideForTests(fn) {
 /** Check whether the Pi SDK optional dependency satisfies the 0.80.10 runtime contract. */
 export async function checkPiSdkAvailability(_repoRoot) {
     if (sdkSessionFactoryOverride) {
-        return { ok: true, detail: 'pi SDK session factory override active' };
+        return { ok: true, detail: "pi SDK session factory override active" };
     }
     try {
         const imported = sdkImportOverrideForTests
@@ -62,15 +62,15 @@ export async function checkPiSdkAvailability(_repoRoot) {
             : await loadPiSdkModule();
         const sdk = imported;
         const ModelRuntime = sdk.ModelRuntime;
-        if (typeof sdk.createAgentSession !== 'function'
-            || typeof sdk.getAgentDir !== 'function'
-            || typeof ModelRuntime?.create !== 'function') {
+        if (typeof sdk.createAgentSession !== "function" ||
+            typeof sdk.getAgentDir !== "function" ||
+            typeof ModelRuntime?.create !== "function") {
             return {
                 ok: false,
-                detail: 'pi SDK incompatible: requires createAgentSession, getAgentDir, and ModelRuntime.create (0.80.10 contract)',
+                detail: "pi SDK incompatible: requires createAgentSession, getAgentDir, and ModelRuntime.create (0.80.10 contract)",
             };
         }
-        return { ok: true, detail: 'pi SDK 0.80.10 contract available' };
+        return { ok: true, detail: "pi SDK 0.80.10 contract available" };
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
@@ -82,7 +82,7 @@ async function resolveModel(modelRuntime, provider, modelId) {
     if (fromRuntime)
         return fromRuntime;
     try {
-        const piAi = await import('@earendil-works/pi-ai/compat');
+        const piAi = (await import("@earendil-works/pi-ai/compat"));
         return piAi.getModel?.(provider, modelId);
     }
     catch {
@@ -93,7 +93,7 @@ async function loadPiSdkModule() {
     if (sdkModuleOverrideForTests) {
         return sdkModuleOverrideForTests();
     }
-    return await import('@earendil-works/pi-coding-agent');
+    return (await import("@earendil-works/pi-coding-agent"));
 }
 async function getOrCreateSharedResources(state) {
     if (state.resources)
@@ -101,13 +101,13 @@ async function getOrCreateSharedResources(state) {
     const sdk = await loadPiSdkModule();
     const getAgentDir = sdk.getAgentDir;
     const ModelRuntime = sdk.ModelRuntime;
-    if (typeof ModelRuntime?.create !== 'function') {
-        throw new Error('incompatible pi SDK: ModelRuntime.create is unavailable');
+    if (typeof ModelRuntime?.create !== "function") {
+        throw new Error("incompatible pi SDK: ModelRuntime.create is unavailable");
     }
     const agentDir = getAgentDir();
     const modelRuntime = await ModelRuntime.create({
-        authPath: path.join(agentDir, 'auth.json'),
-        modelsPath: path.join(agentDir, 'models.json'),
+        authPath: path.join(agentDir, "auth.json"),
+        modelsPath: path.join(agentDir, "models.json"),
     });
     state.resources = { agentDir, modelRuntime };
     return state.resources;
@@ -119,13 +119,14 @@ async function createSdkSession(sdk, input, shared) {
     const getAgentDir = sdk.getAgentDir;
     const ModelRuntime = sdk.ModelRuntime;
     const agentDir = shared?.agentDir ?? getAgentDir();
-    if (!shared && typeof ModelRuntime?.create !== 'function') {
-        throw new Error('incompatible pi SDK: ModelRuntime.create is unavailable');
+    if (!shared && typeof ModelRuntime?.create !== "function") {
+        throw new Error("incompatible pi SDK: ModelRuntime.create is unavailable");
     }
-    const modelRuntime = shared?.modelRuntime ?? await ModelRuntime.create({
-        authPath: path.join(agentDir, 'auth.json'),
-        modelsPath: path.join(agentDir, 'models.json'),
-    });
+    const modelRuntime = shared?.modelRuntime ??
+        (await ModelRuntime.create({
+            authPath: path.join(agentDir, "auth.json"),
+            modelsPath: path.join(agentDir, "models.json"),
+        }));
     const model = input.provider && input.model
         ? await resolveModel(modelRuntime, input.provider, input.model)
         : undefined;
@@ -134,9 +135,18 @@ async function createSdkSession(sdk, input, shared) {
         agentDir,
         noContextFiles: true,
         noSkills: true,
-        appendSystemPromptOverride: (base) => [...base, input.appendSystemPrompt],
+        noExtensions: true,
+        appendSystemPromptOverride: (base) => [
+            ...base,
+            input.appendSystemPrompt,
+        ],
     });
     await loader.reload();
+    if (input.requireWriterCustomTools) {
+        if (!Array.isArray(input.customTools) || input.customTools.length === 0) {
+            throw new Error("pi writer tool policy missing customTools; refusing to create uncontrolled writer session");
+        }
+    }
     const created = await createAgentSession({
         cwd: input.cwd,
         sessionManager: SessionManager.inMemory(input.cwd),
@@ -145,6 +155,9 @@ async function createSdkSession(sdk, input, shared) {
         modelRuntime,
         ...(model ? { model } : {}),
         ...(input.thinking ? { thinkingLevel: input.thinking } : {}),
+        ...(Array.isArray(input.customTools) && input.customTools.length > 0
+            ? { customTools: input.customTools }
+            : {}),
     });
     return created.session;
 }
@@ -154,35 +167,41 @@ async function createSdkSession(sdk, input, shared) {
  * Skips thinking_delta and message_update token floods.
  */
 export function shouldPersistSessionEvent(event) {
-    const type = typeof event.type === 'string' ? event.type : '';
-    if (type === 'tool_start' || type === 'tool_end'
-        || type === 'tool_execution_start' || type === 'tool_execution_end'
-        || type === 'turn_end' || type === 'agent_end'
-        || type === 'assistant_message' || type === 'message_end') {
+    const type = typeof event.type === "string" ? event.type : "";
+    if (type === "tool_start" ||
+        type === "tool_end" ||
+        type === "tool_execution_start" ||
+        type === "tool_execution_end" ||
+        type === "turn_end" ||
+        type === "agent_end" ||
+        type === "assistant_message" ||
+        type === "message_end") {
         return true;
     }
-    if (type === 'thinking_delta' || type === 'message_update') {
+    if (type === "thinking_delta" || type === "message_update") {
         return false;
     }
-    if (type.includes('error') || event.isError === true) {
+    if (type.includes("error") || event.isError === true) {
         return true;
     }
     return true;
 }
 function classifySdkActivityKind(event) {
-    if (!event || typeof event !== 'object')
-        return 'provider';
-    const type = typeof event.type === 'string'
+    if (!event || typeof event !== "object")
+        return "provider";
+    const type = typeof event.type === "string"
         ? String(event.type)
-        : '';
-    if (type === 'tool_start' || type === 'tool_end'
-        || type === 'tool_execution_start' || type === 'tool_execution_end') {
-        return 'tool';
+        : "";
+    if (type === "tool_start" ||
+        type === "tool_end" ||
+        type === "tool_execution_start" ||
+        type === "tool_execution_end") {
+        return "tool";
     }
-    if (type === 'thinking_delta' || type === 'message_update') {
+    if (type === "thinking_delta" || type === "message_update") {
         return null;
     }
-    return 'provider';
+    return "provider";
 }
 function createSessionEventAppender(filePath, onSessionEvent) {
     let chain = Promise.resolve();
@@ -195,7 +214,7 @@ function createSessionEventAppender(filePath, onSessionEvent) {
                         await mkdir(path.dirname(filePath), { recursive: true });
                         dirEnsured = true;
                     }
-                    await appendFile(filePath, `${line}\n`, 'utf-8');
+                    await appendFile(filePath, `${line}\n`, "utf-8");
                     // Only after successful persistence: surface the persisted session event.
                     // Transport activity is reported synchronously by the subscription so
                     // filtered deltas and slow disk writes cannot trip the stall watchdog.
@@ -216,17 +235,19 @@ async function resolveSdkSessionFactory(reuseScope) {
         return sdkSessionFactoryOverride;
     const sdk = await loadPiSdkModule();
     return async (input) => {
-        const shared = reuseScope ? await reuseScope.getOrCreateResources() : undefined;
+        const shared = reuseScope
+            ? await reuseScope.getOrCreateResources()
+            : undefined;
         return createSdkSession(sdk, input, shared);
     };
 }
 function isRecord(value) {
-    return typeof value === 'object' && value !== null;
+    return typeof value === "object" && value !== null;
 }
 function readUsageNumber(record, keys) {
     for (const key of keys) {
         const value = record[key];
-        if (typeof value === 'number' && Number.isFinite(value) && value >= 0) {
+        if (typeof value === "number" && Number.isFinite(value) && value >= 0) {
             return Math.trunc(value);
         }
     }
@@ -239,9 +260,19 @@ function extractSdkUsageSample(event) {
     for (const candidate of usageCandidates) {
         if (!isRecord(candidate))
             continue;
-        const input = readUsageNumber(candidate, ['input_tokens', 'inputTokens', 'prompt_tokens', 'promptTokens']);
-        const output = readUsageNumber(candidate, ['output_tokens', 'outputTokens', 'completion_tokens', 'completionTokens']);
-        const total = readUsageNumber(candidate, ['total_tokens', 'totalTokens']);
+        const input = readUsageNumber(candidate, [
+            "input_tokens",
+            "inputTokens",
+            "prompt_tokens",
+            "promptTokens",
+        ]);
+        const output = readUsageNumber(candidate, [
+            "output_tokens",
+            "outputTokens",
+            "completion_tokens",
+            "completionTokens",
+        ]);
+        const total = readUsageNumber(candidate, ["total_tokens", "totalTokens"]);
         if (input !== undefined && output !== undefined) {
             tokens = input + output;
             break;
@@ -259,7 +290,7 @@ function extractSdkUsageSample(event) {
         message?.responseId,
         message?.id,
     ];
-    const responseKey = responseKeyCandidates.find((value) => typeof value === 'string' && value.length > 0);
+    const responseKey = responseKeyCandidates.find((value) => typeof value === "string" && value.length > 0);
     return responseKey ? { responseKey, tokens } : { tokens };
 }
 function aggregateSdkTokenUsage(samples) {
@@ -275,7 +306,8 @@ function aggregateSdkTokenUsage(samples) {
             anonymousMaximum = Math.max(anonymousMaximum, sample.tokens);
         }
     }
-    return anonymousMaximum + Array.from(identified.values()).reduce((sum, tokens) => sum + tokens, 0);
+    return (anonymousMaximum +
+        Array.from(identified.values()).reduce((sum, tokens) => sum + tokens, 0));
 }
 /**
  * Execute a single Pi step via the SDK.
@@ -287,24 +319,28 @@ export async function executeSingleSdkAttempt(options) {
     const modelConfig = options.modelConfig;
     const modelDisplay = modelConfig.provider && modelConfig.model
         ? `${modelConfig.provider}/${modelConfig.model}`
-        : modelConfig.model ?? 'default';
+        : (modelConfig.model ?? "default");
     const timeoutMs = options.timeoutMs ?? modelConfig.timeoutMs ?? DEFAULT_TIMEOUT_MS;
     const stallTimeoutMs = options.stallTimeoutMs ?? DEFAULT_STALL_TIMEOUT_MS;
     const abortGraceMs = options.abortGraceMs ?? DEFAULT_ABORT_GRACE_MS;
     const piSdkArgs = [
-        '--provider', modelConfig.provider ?? '(default)',
-        '--model', modelConfig.model ?? '(default)',
-        ...(modelConfig.thinking ? ['--thinking', modelConfig.thinking] : []),
-        '--tools', options.toolNames.join(','),
-        '--append-system-prompt', '<in-memory-system-prompt>',
+        "--provider",
+        modelConfig.provider ?? "(default)",
+        "--model",
+        modelConfig.model ?? "(default)",
+        ...(modelConfig.thinking ? ["--thinking", modelConfig.thinking] : []),
+        "--tools",
+        options.toolNames.join(","),
+        "--append-system-prompt",
+        "<in-memory-system-prompt>",
         ...options.attachedFiles.map((file) => `@${file}`),
         options.userMessage,
     ];
     const startedAt = Date.now();
     let timedOut = false;
     let terminationConfirmed = true;
-    let stderr = '';
-    const stdoutPreview = new BoundedTextPreview('stdout');
+    let stderr = "";
+    const stdoutPreview = new BoundedTextPreview("stdout");
     const stdoutCollector = createPiJsonlStreamCollector();
     const usageSamples = [];
     let session;
@@ -333,17 +369,25 @@ export async function executeSingleSdkAttempt(options) {
             clearTimeout(graceHandle);
         if (outcome.ok)
             return true;
-        if ('timedOut' in outcome) {
+        if ("timedOut" in outcome) {
             appendStderr(`pi SDK ${label} was not confirmed within ${abortGraceMs}ms`);
         }
         else {
-            const message = outcome.error instanceof Error ? outcome.error.message : String(outcome.error);
+            const message = outcome.error instanceof Error
+                ? outcome.error.message
+                : String(outcome.error);
             appendStderr(`pi SDK ${label} failed: ${message}`);
         }
         return false;
     };
     try {
         const createSession = await resolveSdkSessionFactory(options.reuseScope);
+        const writerCustomTools = options.writerToolPolicy?.customTools;
+        const requireWriterCustomTools = options.writerToolPolicy?.requireSdk === true;
+        if (requireWriterCustomTools &&
+            (!Array.isArray(writerCustomTools) || writerCustomTools.length === 0)) {
+            throw new Error("pi writer tool policy missing customTools; refusing to create uncontrolled writer session");
+        }
         session = await createSession({
             cwd: options.repoRoot,
             toolNames: options.toolNames,
@@ -351,6 +395,10 @@ export async function executeSingleSdkAttempt(options) {
             provider: modelConfig.provider,
             model: modelConfig.model,
             thinking: modelConfig.thinking,
+            ...(Array.isArray(writerCustomTools) && writerCustomTools.length > 0
+                ? { customTools: writerCustomTools }
+                : {}),
+            ...(requireWriterCustomTools ? { requireWriterCustomTools: true } : {}),
         });
         let resolveStall;
         const stallPromise = stallTimeoutMs > 0
@@ -363,7 +411,7 @@ export async function executeSingleSdkAttempt(options) {
                 return;
             if (stallHandle)
                 clearTimeout(stallHandle);
-            stallHandle = setTimeout(() => resolveStall?.('stall'), stallTimeoutMs);
+            stallHandle = setTimeout(() => resolveStall?.("stall"), stallTimeoutMs);
         };
         unsubscribe = session.subscribe((event) => {
             // Every real SDK event proves transport activity, including noisy deltas
@@ -372,7 +420,10 @@ export async function executeSingleSdkAttempt(options) {
             const activityKind = classifySdkActivityKind(event);
             if (activityKind) {
                 try {
-                    options.onActivity?.({ kind: activityKind, at: new Date().toISOString() });
+                    options.onActivity?.({
+                        kind: activityKind,
+                        at: new Date().toISOString(),
+                    });
                 }
                 catch {
                     // best-effort: activity must never change Pi result
@@ -388,7 +439,9 @@ export async function executeSingleSdkAttempt(options) {
             stdoutCollector.append(`${line}\n`);
             sessionEventAppender?.append(line, event);
         });
-        const filePrefix = options.attachedFiles.map((file) => `@${file}`).join(' ');
+        const filePrefix = options.attachedFiles
+            .map((file) => `@${file}`)
+            .join(" ");
         const promptMessage = filePrefix
             ? `${filePrefix}\n${options.userMessage}`
             : options.userMessage;
@@ -397,23 +450,23 @@ export async function executeSingleSdkAttempt(options) {
         const timeoutPromise = timeoutMs > 0
             ? new Promise((resolve) => {
                 timeoutHandle = setTimeout(() => {
-                    resolve('absolute-timeout');
+                    resolve("absolute-timeout");
                 }, timeoutMs);
             })
             : null;
         const raced = await Promise.race([
-            promptPromise.then(() => 'done'),
+            promptPromise.then(() => "done"),
             ...(timeoutPromise ? [timeoutPromise] : []),
             ...(stallPromise ? [stallPromise] : []),
         ]);
-        if (raced !== 'done') {
+        if (raced !== "done") {
             timedOut = true;
-            appendStderr(raced === 'stall'
+            appendStderr(raced === "stall"
                 ? `pi SDK step stalled after ${stallTimeoutMs}ms with no provider activity`
                 : `pi SDK step timed out after ${timeoutMs}ms`);
-            const abortConfirmed = await runSessionActionWithGrace('abort', () => session.abort());
+            const abortConfirmed = await runSessionActionWithGrace("abort", () => session.abort());
             disposeAttempted = true;
-            const disposeConfirmed = await runSessionActionWithGrace('dispose', () => session.dispose());
+            const disposeConfirmed = await runSessionActionWithGrace("dispose", () => session.dispose());
             terminationConfirmed = abortConfirmed && disposeConfirmed;
         }
     }
@@ -429,7 +482,7 @@ export async function executeSingleSdkAttempt(options) {
         unsubscribe?.();
         if (session && !disposeAttempted) {
             disposeAttempted = true;
-            const disposeConfirmed = await runSessionActionWithGrace('dispose', () => session.dispose());
+            const disposeConfirmed = await runSessionActionWithGrace("dispose", () => session.dispose());
             terminationConfirmed = terminationConfirmed && disposeConfirmed;
         }
         if (sessionEventAppender) {
@@ -449,28 +502,34 @@ export async function executeSingleSdkAttempt(options) {
         : extractAssistantTextFromPiJson(stdout);
     const assistantText = collected.parsedEvents > 0
         ? collected.assistantText
-        : fallbackParsed?.assistantText ?? '';
+        : (fallbackParsed?.assistantText ?? "");
     const parsedEvents = collected.parsedEvents > 0
         ? collected.parsedEvents
-        : fallbackParsed?.parsedEvents ?? 0;
+        : (fallbackParsed?.parsedEvents ?? 0);
     const tokensUsed = aggregateSdkTokenUsage(usageSamples);
-    const failureCategory = terminationConfirmed ? classifyPiFailure({
-        assistantText,
-        exitCode: timedOut ? 1 : stderr ? 1 : 0,
-        outputTooLarge: collected.outputTooLarge,
-        stderr,
-        stdout,
-        timedOut,
-    }) : 'termination-unconfirmed';
+    const failureCategory = terminationConfirmed
+        ? classifyPiFailure({
+            assistantText,
+            exitCode: timedOut ? 1 : stderr ? 1 : 0,
+            outputTooLarge: collected.outputTooLarge,
+            stderr,
+            stdout,
+            timedOut,
+        })
+        : "termination-unconfirmed";
     return {
         assistantText,
-        backend: 'sdk',
-        command: ['pi-sdk', ...piSdkArgs],
+        backend: "sdk",
+        command: ["pi-sdk", ...piSdkArgs],
         durationMs,
         exitCode: timedOut || stderr ? 1 : 0,
         failureCategory,
         modelDisplay,
-        ok: terminationConfirmed && !timedOut && !stderr && assistantText.length > 0 && !collected.outputTooLarge,
+        ok: terminationConfirmed &&
+            !timedOut &&
+            !stderr &&
+            assistantText.length > 0 &&
+            !collected.outputTooLarge,
         parsedEvents,
         stderr,
         stdout,