@zhijiewang/openharness 0.9.3 → 0.11.0

package/dist/query/errors.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/query/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAExC,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,KAAK,GAAG,OAAO,CAGpD;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,KAAK,GAAG,OAAO,CAGnD;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,KAAK,GAAG,OAAO,CAGxD;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,KAAK,GAAG,OAAO,CAGlD"}

package/dist/query/errors.js

@@ -0,0 +1,22 @@
+/**
+ * Error classification and recovery helpers for the query loop.
+ */
+export const MAX_CONSECUTIVE_ERRORS = 3;
+export const MAX_RATE_LIMIT_RETRIES = 3;
+export function isRateLimitError(err) {
+    const msg = err.message.toLowerCase();
+    return msg.includes("429") || msg.includes("rate limit") || msg.includes("too many requests");
+}
+export function isOverloadError(err) {
+    const msg = err.message.toLowerCase();
+    return msg.includes("503") || msg.includes("overloaded") || msg.includes("service unavailable") || msg.includes("529");
+}
+export function isPromptTooLongError(err) {
+    const msg = err.message.toLowerCase();
+    return msg.includes("prompt") && msg.includes("long");
+}
+export function isNetworkError(err) {
+    const msg = err.message.toLowerCase();
+    return msg.includes("network") || msg.includes("fetch") || msg.includes("econnrefused");
+}
+//# sourceMappingURL=errors.js.map

package/dist/query/errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/query/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AACxC,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAExC,MAAM,UAAU,gBAAgB,CAAC,GAAU;IACzC,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IACtC,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;AAChG,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,GAAU;IACxC,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IACtC,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,qBAAqB,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACzH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAU;IAC7C,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IACtC,OAAO,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,GAAU;IACvC,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IACtC,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AAC1F,CAAC"}

package/dist/query/index.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Agent loop — the core LLM-to-Tool orchestration cycle.
+ *
+ * This is the coordinator that delegates to sub-modules:
+ * - compress.ts — message compression strategies
+ * - tools.ts — tool execution, permission checking, batching
+ * - errors.ts — error classification and recovery
+ * - types.ts — shared types
+ */
+import type { StreamEvent } from "../types/events.js";
+import type { QueryConfig } from "./types.js";
+export type { QueryConfig, QueryLoopState } from "./types.js";
+export { compressMessages } from "./compress.js";
+export declare function query(userMessage: string, config: QueryConfig, existingMessages?: import("../types/message.js").Message[]): AsyncGenerator<StreamEvent, void>;
+//# sourceMappingURL=index.d.ts.map

package/dist/query/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/query/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAOtD,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,YAAY,CAAC;AAM9D,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAIjD,wBAAuB,KAAK,CAC1B,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,WAAW,EACnB,gBAAgB,GAAE,OAAO,qBAAqB,EAAE,OAAO,EAAO,GAC7D,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,CAiNnC"}

package/dist/query/index.js

@@ -0,0 +1,199 @@
+/**
+ * Agent loop — the core LLM-to-Tool orchestration cycle.
+ *
+ * This is the coordinator that delegates to sub-modules:
+ * - compress.ts — message compression strategies
+ * - tools.ts — tool execution, permission checking, batching
+ * - errors.ts — error classification and recovery
+ * - types.ts — shared types
+ */
+import { toolToAPIFormat } from "../Tool.js";
+import { createAssistantMessage, createUserMessage } from "../types/message.js";
+import { StreamingToolExecutor } from "../services/StreamingToolExecutor.js";
+import { getContextWindow } from "../harness/cost.js";
+import { createToolResultMessage } from "../types/message.js";
+import { makeTokenEstimator, estimateMessagesTokens, compressMessages, summarizeConversation } from "./compress.js";
+import { executeToolCalls } from "./tools.js";
+import { isRateLimitError, isOverloadError, isPromptTooLongError, isNetworkError, MAX_CONSECUTIVE_ERRORS, MAX_RATE_LIMIT_RETRIES } from "./errors.js";
+export { compressMessages } from "./compress.js";
+const DEFAULT_MAX_TURNS = 50;
+export async function* query(userMessage, config, existingMessages = []) {
+    const maxTurns = config.maxTurns ?? DEFAULT_MAX_TURNS;
+    const toolContext = {
+        workingDir: process.cwd(),
+        abortSignal: config.abortSignal,
+        provider: config.provider,
+        model: config.model,
+        tools: config.tools,
+        systemPrompt: config.systemPrompt,
+        permissionMode: config.permissionMode,
+        askUserQuestion: config.askUserQuestion,
+    };
+    const estimateTokens = makeTokenEstimator(config.provider);
+    // Check provider capabilities
+    const modelInfo = config.provider.getModelInfo?.(config.model ?? '');
+    const toolsSupported = !modelInfo || modelInfo.supportsTools;
+    const apiTools = toolsSupported ? config.tools.map(toolToAPIFormat) : undefined;
+    const toolPrompts = toolsSupported
+        ? config.tools.map((t) => t.prompt()).join("\n\n")
+        : "";
+    const fullSystemPrompt = toolPrompts
+        ? config.systemPrompt + "\n\n# Available Tools\n\n" + toolPrompts
+        : config.systemPrompt;
+    const state = {
+        messages: [...existingMessages, createUserMessage(userMessage)],
+        turn: 0,
+        totalCost: 0,
+        totalInputTokens: 0,
+        totalOutputTokens: 0,
+        consecutiveErrors: 0,
+    };
+    // ── Main loop ──
+    while (state.turn < maxTurns) {
+        state.turn++;
+        if (config.abortSignal?.aborted) {
+            yield { type: "turn_complete", reason: "aborted" };
+            return;
+        }
+        if (config.maxCost && config.maxCost > 0 && state.totalCost >= config.maxCost) {
+            yield { type: "error", message: `Budget exceeded: $${state.totalCost.toFixed(4)}` };
+            yield { type: "turn_complete", reason: "budget_exceeded" };
+            return;
+        }
+        // Context window management
+        const contextWindow = getContextWindow(config.model);
+        const estimatedTokens = estimateMessagesTokens(state.messages, estimateTokens);
+        if (estimatedTokens > contextWindow * 0.8) {
+            state.messages = compressMessages(state.messages, Math.floor(contextWindow * 0.6));
+            const afterBasic = estimateMessagesTokens(state.messages, estimateTokens);
+            if (afterBasic > contextWindow * 0.7 && state.messages.length > 4) {
+                try {
+                    state.messages = await summarizeConversation(config.provider, state.messages, config.model, Math.floor(contextWindow * 0.5));
+                    yield { type: "error", message: "Context compressed with LLM summarization." };
+                }
+                catch { /* continue with basic compression */ }
+            }
+        }
+        // ── LLM call with streaming ──
+        let assistantContent = "";
+        const toolCalls = [];
+        let streamError = null;
+        const streamingExecutor = new StreamingToolExecutor(config.tools, toolContext, config.permissionMode, config.askUser, config.abortSignal);
+        try {
+            for await (const event of config.provider.stream(state.messages, fullSystemPrompt, apiTools, config.model)) {
+                if (config.abortSignal?.aborted)
+                    break;
+                switch (event.type) {
+                    case "text_delta":
+                        assistantContent += event.content;
+                        yield event;
+                        break;
+                    case "tool_call_start":
+                        toolCalls.push({ id: event.callId, toolName: event.toolName, arguments: {} });
+                        yield event;
+                        break;
+                    case "tool_call_complete": {
+                        const tc = toolCalls.find((t) => t.id === event.callId);
+                        if (tc) {
+                            const idx = toolCalls.indexOf(tc);
+                            toolCalls[idx] = { ...tc, arguments: event.arguments };
+                        }
+                        if (streamingExecutor) {
+                            streamingExecutor.addTool({ id: event.callId, toolName: event.toolName, arguments: event.arguments });
+                        }
+                        break;
+                    }
+                    case "cost_update":
+                        state.totalCost += event.cost;
+                        state.totalInputTokens += event.inputTokens;
+                        state.totalOutputTokens += event.outputTokens;
+                        yield event;
+                        break;
+                    case "error":
+                        yield event;
+                        break;
+                }
+            }
+            state.consecutiveErrors = 0;
+        }
+        catch (err) {
+            streamError = err instanceof Error ? err : new Error(String(err));
+            state.consecutiveErrors++;
+            // Circuit breaker
+            if (state.consecutiveErrors >= MAX_CONSECUTIVE_ERRORS) {
+                yield { type: "error", message: `Too many consecutive errors (${state.consecutiveErrors}): ${streamError.message}` };
+                yield { type: "turn_complete", reason: "error" };
+                return;
+            }
+            // Error recovery cascade
+            if (isRateLimitError(streamError) || isOverloadError(streamError)) {
+                const attempt = state.consecutiveErrors;
+                const isOverload = isOverloadError(streamError);
+                if (attempt <= MAX_RATE_LIMIT_RETRIES) {
+                    const baseRetry = Math.pow(2, attempt) * (isOverload ? 2 : 1);
+                    const retryIn = baseRetry * (0.5 + Math.random());
+                    yield { type: "rate_limited", retryIn: Math.round(retryIn), attempt };
+                    await new Promise((r) => setTimeout(r, retryIn * 1000));
+                    continue;
+                }
+                yield { type: "error", message: `${isOverload ? "Server overloaded" : "Rate limit exceeded"} after ${MAX_RATE_LIMIT_RETRIES} retries.` };
+                yield { type: "turn_complete", reason: "error" };
+                return;
+            }
+            if (isPromptTooLongError(streamError)) {
+                state.promptTooLongRetries = (state.promptTooLongRetries ?? 0) + 1;
+                if (state.promptTooLongRetries > 2) {
+                    yield { type: "error", message: "Context still too long after 2 compression attempts." };
+                    yield { type: "turn_complete", reason: "error" };
+                    return;
+                }
+                state.messages = compressMessages(state.messages, Math.floor(contextWindow * 0.5));
+                state.transition = "retry_prompt_too_long";
+                yield { type: "error", message: "Context too long, compressing history..." };
+                continue;
+            }
+            if (isNetworkError(streamError)) {
+                state.transition = "retry_network";
+                const delay = 1000 * Math.pow(2, state.consecutiveErrors - 1);
+                yield { type: "error", message: `Network error, retrying in ${delay / 1000}s...` };
+                await new Promise((r) => setTimeout(r, delay));
+                continue;
+            }
+            yield { type: "error", message: streamError.message };
+            yield { type: "turn_complete", reason: "error" };
+            return;
+        }
+        if (config.abortSignal?.aborted) {
+            yield { type: "turn_complete", reason: "aborted" };
+            return;
+        }
+        if (assistantContent === "" && toolCalls.length === 0) {
+            yield { type: "error", message: "No response received. Check that your model server is running and the model name is correct." };
+            return;
+        }
+        state.messages.push(createAssistantMessage(assistantContent, toolCalls.length > 0 ? toolCalls : undefined));
+        if (toolCalls.length === 0) {
+            yield { type: "turn_complete", reason: "completed" };
+            return;
+        }
+        // Collect streaming tool results
+        await streamingExecutor.waitForAll();
+        const completedResults = [...streamingExecutor.getCompletedResults()];
+        const executedIds = new Set(completedResults.map(r => r.toolCall.id));
+        for (const { callId, chunk } of streamingExecutor.outputChunks) {
+            yield { type: 'tool_output_delta', callId, chunk };
+        }
+        for (const { toolCall: tc, result } of completedResults) {
+            yield { type: "tool_call_end", callId: tc.id, output: result.output, isError: result.isError };
+            state.messages.push(createToolResultMessage({ callId: tc.id, output: result.output, isError: result.isError }));
+        }
+        // Execute remaining tools not started during streaming
+        const remaining = toolCalls.filter(tc => !executedIds.has(tc.id));
+        if (remaining.length > 0) {
+            yield* executeToolCalls(remaining, config.tools, toolContext, config.permissionMode, config.askUser, state);
+        }
+        state.transition = "next_turn";
+    }
+    yield { type: "turn_complete", reason: "max_turns" };
+}
+//# sourceMappingURL=index.js.map

package/dist/query/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query/index.ts"],"names":[],"mappings":"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"}

package/dist/query/tools.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Tool execution — permission checking, batching, output capping.
+ */
+import type { ToolContext, ToolResult, Tools } from "../Tool.js";
+import type { StreamEvent } from "../types/events.js";
+import type { ToolCall } from "../types/message.js";
+import type { AskUserFn, PermissionMode } from "../types/permissions.js";
+import type { QueryLoopState } from "./types.js";
+type Batch = {
+    concurrent: boolean;
+    calls: ToolCall[];
+};
+export declare function partitionToolCalls(toolCalls: ToolCall[], tools: Tools): Batch[];
+export declare function executeSingleTool(toolCall: ToolCall, tools: Tools, context: ToolContext, permissionMode: PermissionMode, askUser?: AskUserFn): Promise<ToolResult>;
+export declare function executeToolCalls(toolCalls: ToolCall[], tools: Tools, context: ToolContext, permissionMode: PermissionMode, askUser?: AskUserFn, state?: QueryLoopState): AsyncGenerator<StreamEvent, void>;
+export {};
+//# sourceMappingURL=tools.d.ts.map

package/dist/query/tools.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/query/tools.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAQ,WAAW,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAIzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAKjD,KAAK,KAAK,GAAG;IAAE,UAAU,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,QAAQ,EAAE,CAAA;CAAE,CAAC;AAExD,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,EAAE,CAqB/E;AAED,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,WAAW,EACpB,cAAc,EAAE,cAAc,EAC9B,OAAO,CAAC,EAAE,SAAS,GAClB,OAAO,CAAC,UAAU,CAAC,CAuErB;AAED,wBAAuB,gBAAgB,CACrC,SAAS,EAAE,QAAQ,EAAE,EACrB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,WAAW,EACpB,cAAc,EAAE,cAAc,EAC9B,OAAO,CAAC,EAAE,SAAS,EACnB,KAAK,CAAC,EAAE,cAAc,GACrB,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,CA4BnC"}

package/dist/query/tools.js

@@ -0,0 +1,129 @@
+/**
+ * Tool execution — permission checking, batching, output capping.
+ */
+import { findToolByName } from "../Tool.js";
+import { createToolResultMessage } from "../types/message.js";
+import { checkPermission } from "../types/permissions.js";
+import { emitHook } from "../harness/hooks.js";
+import { createCheckpoint, getAffectedFiles } from "../harness/checkpoints.js";
+const MAX_TOOL_RESULT_CHARS = 100_000;
+const TOOL_TIMEOUT_MS = 120_000;
+export function partitionToolCalls(toolCalls, tools) {
+    const batches = [];
+    let currentConcurrent = [];
+    for (const tc of toolCalls) {
+        const tool = findToolByName(tools, tc.toolName);
+        const isSafe = tool ? tool.isConcurrencySafe(tc.arguments) : false;
+        if (isSafe) {
+            currentConcurrent.push(tc);
+        }
+        else {
+            if (currentConcurrent.length > 0) {
+                batches.push({ concurrent: true, calls: currentConcurrent });
+                currentConcurrent = [];
+            }
+            batches.push({ concurrent: false, calls: [tc] });
+        }
+    }
+    if (currentConcurrent.length > 0) {
+        batches.push({ concurrent: true, calls: currentConcurrent });
+    }
+    return batches;
+}
+export async function executeSingleTool(toolCall, tools, context, permissionMode, askUser) {
+    const tool = findToolByName(tools, toolCall.toolName);
+    if (!tool) {
+        return { output: `Error: Unknown tool '${toolCall.toolName}'`, isError: true };
+    }
+    const parsed = tool.inputSchema.safeParse(toolCall.arguments);
+    if (!parsed.success) {
+        return { output: `Validation error: ${parsed.error.message}`, isError: true };
+    }
+    // Permission check
+    const perm = checkPermission(permissionMode, tool.riskLevel, tool.isReadOnly(parsed.data), tool.name, parsed.data);
+    if (!perm.allowed) {
+        if (perm.reason === "needs-approval" && askUser) {
+            const { formatToolArgs } = await import("../utils/tool-summary.js");
+            const description = formatToolArgs(tool.name, toolCall.arguments);
+            const allowed = await askUser(tool.name, description, tool.riskLevel);
+            if (!allowed) {
+                return { output: "Permission denied by user.", isError: true };
+            }
+        }
+        else {
+            return { output: `Permission denied: ${perm.reason}`, isError: true };
+        }
+    }
+    // Checkpoint: save affected files before modification
+    if (!tool.isReadOnly(parsed.data)) {
+        const affected = getAffectedFiles(tool.name, parsed.data);
+        if (affected.length > 0) {
+            createCheckpoint(0, affected, `${tool.name} ${affected[0]}`);
+        }
+    }
+    // Hook: preToolUse
+    const hookAllowed = emitHook("preToolUse", {
+        toolName: tool.name,
+        toolArgs: JSON.stringify(toolCall.arguments).slice(0, 1000),
+    });
+    if (!hookAllowed) {
+        return { output: "Blocked by preToolUse hook.", isError: true };
+    }
+    // Execute with timeout and result budgeting
+    try {
+        const toolAbort = AbortSignal.timeout(TOOL_TIMEOUT_MS);
+        const contextWithTimeout = { ...context, abortSignal: context.abortSignal ?? toolAbort };
+        const result = await Promise.race([
+            tool.call(parsed.data, contextWithTimeout),
+            new Promise((_, reject) => {
+                toolAbort.addEventListener("abort", () => reject(new Error(`Tool '${tool.name}' timed out after ${TOOL_TIMEOUT_MS / 1000}s`)));
+            }),
+        ]);
+        // Hook: postToolUse
+        emitHook("postToolUse", {
+            toolName: tool.name,
+            toolArgs: JSON.stringify(toolCall.arguments).slice(0, 1000),
+            toolOutput: result.output.slice(0, 1000),
+        });
+        // Strip ANSI and cap output
+        let output = result.output.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "");
+        if (output.length > MAX_TOOL_RESULT_CHARS) {
+            output = output.slice(0, MAX_TOOL_RESULT_CHARS)
+                + `\n\n[TRUNCATED: output was ${result.output.length.toLocaleString()} chars, showing first ${MAX_TOOL_RESULT_CHARS.toLocaleString()}]`;
+        }
+        return { output, isError: result.isError };
+    }
+    catch (err) {
+        return { output: `Tool error: ${err instanceof Error ? err.message : String(err)}`, isError: true };
+    }
+}
+export async function* executeToolCalls(toolCalls, tools, context, permissionMode, askUser, state) {
+    const batches = partitionToolCalls(toolCalls, tools);
+    const outputChunks = [];
+    const onOutputChunk = (callId, chunk) => {
+        outputChunks.push({ type: 'tool_output_delta', callId, chunk });
+    };
+    for (const batch of batches) {
+        if (batch.concurrent) {
+            const results = await Promise.all(batch.calls.map((tc) => executeSingleTool(tc, tools, { ...context, callId: tc.id, onOutputChunk }, permissionMode, askUser)));
+            for (const chunk of outputChunks.splice(0))
+                yield chunk;
+            for (let i = 0; i < batch.calls.length; i++) {
+                const tc = batch.calls[i];
+                const result = results[i];
+                yield { type: "tool_call_end", callId: tc.id, output: result.output, isError: result.isError };
+                state?.messages.push(createToolResultMessage({ callId: tc.id, output: result.output, isError: result.isError }));
+            }
+        }
+        else {
+            for (const tc of batch.calls) {
+                const result = await executeSingleTool(tc, tools, { ...context, callId: tc.id, onOutputChunk }, permissionMode, askUser);
+                for (const chunk of outputChunks.splice(0))
+                    yield chunk;
+                yield { type: "tool_call_end", callId: tc.id, output: result.output, isError: result.isError };
+                state?.messages.push(createToolResultMessage({ callId: tc.id, output: result.output, isError: result.isError }));
+            }
+        }
+    }
+}
+//# sourceMappingURL=tools.js.map

package/dist/query/tools.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/query/tools.ts"],"names":[],"mappings":"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"}

package/dist/query/types.d.ts

@@ -0,0 +1,31 @@
+/**
+ * Shared types for the query loop sub-modules.
+ */
+import type { Message } from "../types/message.js";
+import type { Provider } from "../providers/base.js";
+import type { Tools } from "../Tool.js";
+import type { AskUserFn, PermissionMode } from "../types/permissions.js";
+export type QueryConfig = {
+    provider: Provider;
+    tools: Tools;
+    systemPrompt: string;
+    permissionMode: PermissionMode;
+    askUser?: AskUserFn;
+    askUserQuestion?: (question: string, options?: string[]) => Promise<string>;
+    maxTurns?: number;
+    maxCost?: number;
+    model?: string;
+    abortSignal?: AbortSignal;
+};
+export type TransitionReason = "next_turn" | "retry_network" | "retry_prompt_too_long" | "retry_max_output_tokens";
+export type QueryLoopState = {
+    messages: Message[];
+    turn: number;
+    totalCost: number;
+    totalInputTokens: number;
+    totalOutputTokens: number;
+    consecutiveErrors: number;
+    transition?: TransitionReason;
+    promptTooLongRetries?: number;
+};
+//# sourceMappingURL=types.d.ts.map

package/dist/query/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/query/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzE,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GACxB,WAAW,GACX,eAAe,GACf,uBAAuB,GACvB,yBAAyB,CAAC;AAE9B,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC"}

package/dist/query/types.js

@@ -0,0 +1,5 @@
+/**
+ * Shared types for the query loop sub-modules.
+ */
+export {};
+//# sourceMappingURL=types.js.map

package/dist/query/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/query/types.ts"],"names":[],"mappings":"AAAA;;GAEG"}

package/dist/query.d.ts

@@ -1,41 +1,11 @@
 /**
- * Agent loop — the core LLM-to-Tool orchestration cycle.
- *
- * Core agent loop architecture:
- * - while(true) state machine with explicit transitions
- * - Error recovery with ordered fallbacks and circuit breaker
- * - Context window management with message compression
- * - Tool result budgeting (cap large outputs)
- * - Permission blocking (awaits user approval before tool execution)
+ * Re-export from query/index.ts — the agent loop has been split into sub-modules:
+ * - query/index.ts — main orchestration loop
+ * - query/compress.ts — message compression strategies
+ * - query/tools.ts — tool execution, permission checking, batching
+ * - query/errors.ts — error classification and recovery
+ * - query/types.ts — shared types
  */
-import type { Tools } from "./Tool.js";
-import type { StreamEvent } from "./types/events.js";
-import type { Message } from "./types/message.js";
-import type { AskUserFn, PermissionMode } from "./types/permissions.js";
-import type { Provider } from "./providers/base.js";
-export type QueryConfig = {
-    provider: Provider;
-    tools: Tools;
-    systemPrompt: string;
-    permissionMode: PermissionMode;
-    askUser?: AskUserFn;
-    askUserQuestion?: (question: string, options?: string[]) => Promise<string>;
-    maxTurns?: number;
-    maxCost?: number;
-    model?: string;
-    abortSignal?: AbortSignal;
-};
-type TransitionReason = "next_turn" | "retry_network" | "retry_prompt_too_long" | "retry_max_output_tokens";
-type QueryLoopState = {
-    messages: Message[];
-    turn: number;
-    totalCost: number;
-    totalInputTokens: number;
-    totalOutputTokens: number;
-    consecutiveErrors: number;
-    transition?: TransitionReason;
-};
-export declare function query(userMessage: string, config: QueryConfig, existingMessages?: Message[]): AsyncGenerator<StreamEvent, void>;
-export declare function compressMessages(messages: Message[], targetTokens: number): Message[];
-export type { QueryLoopState };
+export { query, compressMessages } from "./query/index.js";
+export type { QueryConfig, QueryLoopState } from "./query/index.js";
 //# sourceMappingURL=query.d.ts.map

package/dist/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAiC,KAAK,EAAE,MAAM,WAAW,CAAC;AAEtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,OAAO,EAAY,MAAM,oBAAoB,CAAC;AAM5D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAQpD,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAC;AAIF,KAAK,gBAAgB,GACjB,WAAW,GACX,eAAe,GACf,uBAAuB,GACvB,yBAAyB,CAAC;AAE9B,KAAK,cAAc,GAAG;IACpB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,gBAAgB,CAAC;CAC/B,CAAC;AAcF,wBAAuB,KAAK,CAC1B,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,WAAW,EACnB,gBAAgB,GAAE,OAAO,EAAO,GAC/B,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,CA+OnC;AAkKD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,EAAE,CAqDrF;AAuDD,YAAY,EAAE,cAAc,EAAE,CAAC"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC"}