@pentoshi/clai 4.11.15 → 4.11.17

package/dist/agent/subagents/model-chain.js

@@ -0,0 +1,146 @@
+import { buildKeyAttemptPlan, isKeyCircleStopError, isKeyRotatableError } from "../../llm/key-rotation.js";
+import { isModelNotFoundError, isRateLimited, isRetriableError } from "../../llm/routing/error-classification.js";
+import { streamEmittedBytes } from "../../llm/stream-progress.js";
+import { getConfig } from "../../store/config/endpoints.js";
+import { sanitizeSubagentModelChain } from "../../store/config/subagent-models.js";
+const ROUTE_FAILURE = Symbol.for("clai.subagent.routeFailure");
+export function markSubagentRouteFailure(error) {
+    if (typeof error === "object" && error !== null) {
+        try {
+            Object.defineProperty(error, ROUTE_FAILURE, {
+                value: true,
+                enumerable: false,
+                configurable: true,
+                writable: true,
+            });
+        }
+        catch {
+        }
+    }
+    return error;
+}
+export function isSubagentRouteFailure(error) {
+    return typeof error === "object" && error !== null && ROUTE_FAILURE in error;
+}
+export async function runSubagentModelRotation({ candidates, signal, stream, startIndex = 0, attemptsPerCandidate = 2, shouldRotate = (error) => isSubagentRouteFailure(error) ||
+    isKeyRotatableError(error, isRetriableError) ||
+    isRateLimited(error) ||
+    isModelNotFoundError(error) ||
+    isKeyCircleStopError(error), onRoute, onSwitch, }) {
+    if (!candidates.length)
+        throw new Error("No subagent model candidates configured");
+    const total = candidates.length;
+    const first = Math.min(Math.max(Math.trunc(startIndex), 0), total - 1);
+    const attempts = Math.max(1, Math.trunc(attemptsPerCandidate));
+    let lastError;
+    for (let step = 0; step < total; step += 1) {
+        const index = (first + step) % total;
+        const route = candidates[index];
+        onRoute?.(route, index);
+        for (let attempt = 0; attempt < attempts; attempt += 1) {
+            signal.throwIfAborted();
+            try {
+                const result = await stream(route, attempt);
+                signal.throwIfAborted();
+                return { value: result.value, route, index };
+            }
+            catch (error) {
+                signal.throwIfAborted();
+                if (streamEmittedBytes(error) > 0 || !shouldRotate(error))
+                    throw error;
+                lastError = error;
+                if (attempt + 1 < attempts)
+                    continue;
+                if (step + 1 >= total)
+                    throw error;
+                const next = (index + 1) % total;
+                onSwitch?.(error, candidates[next], next);
+            }
+        }
+    }
+    throw lastError ?? new Error("All subagent model candidates failed");
+}
+function toolCallText(call) {
+    return `\`\`\`tool\n${JSON.stringify({ name: call.name, args: call.args })}\n\`\`\``;
+}
+function nativeToFenced(messages) {
+    return messages.map((message) => {
+        if (message.role === "tool") {
+            return {
+                role: "user",
+                content: `Untrusted tool result for ${message.name ?? "tool"}:\n${message.content}`,
+            };
+        }
+        if (message.role !== "assistant" || !message.toolCalls?.length)
+            return { ...message };
+        const suffix = message.toolCalls.map((call) => toolCallText(call)).join("\n");
+        return {
+            ...message,
+            content: message.content ? `${message.content}\n${suffix}` : suffix,
+            toolCalls: undefined,
+        };
+    });
+}
+function parseFencedCalls(content, nextId) {
+    const calls = [];
+    const text = content.replace(/```tool\s*\n?([\s\S]*?)```/gi, (block, raw) => {
+        try {
+            const parsed = JSON.parse(raw);
+            if (typeof parsed.name !== "string" || typeof parsed.args !== "object" || parsed.args === null || Array.isArray(parsed.args))
+                return block;
+            calls.push({ id: nextId(), name: parsed.name, args: parsed.args });
+            return "";
+        }
+        catch {
+            return block;
+        }
+    }).trim();
+    return { text, calls };
+}
+function fencedToNative(messages) {
+    let callSequence = 0;
+    let pending = [];
+    return messages.map((message) => {
+        if (message.role === "assistant") {
+            const parsed = parseFencedCalls(message.content, () => `subagent-tool-${(callSequence += 1)}`);
+            pending = [...parsed.calls];
+            return {
+                ...message,
+                content: parsed.text,
+                ...(parsed.calls.length ? { toolCalls: parsed.calls } : {}),
+            };
+        }
+        if (message.role !== "user")
+            return { ...message };
+        const result = message.content.match(/^Untrusted tool result for ([^:\n]+):\n([\s\S]*)$/);
+        if (!result)
+            return { ...message };
+        const name = result[1].trim();
+        const call = pending.shift();
+        return {
+            role: "tool",
+            name,
+            content: result[2],
+            ...(call ? { toolCallId: call.id } : {}),
+        };
+    });
+}
+export function adaptSubagentHistory(messages, fromNative, toNative) {
+    if (fromNative === toNative)
+        return messages.map((message) => ({ ...message }));
+    return toNative ? fencedToNative(messages) : nativeToFenced(messages);
+}
+export function resolveSubagentModelChain(config = getConfig()) {
+    const chain = sanitizeSubagentModelChain(config.subagentModels, config.customProviders);
+    if (!chain)
+        return [];
+    return buildKeyAttemptPlan(chain.entries.length, chain.activeIndex)
+        .map((index) => chain.entries[index])
+        .filter((entry) => entry.disabled !== true)
+        .map((entry) => ({ provider: entry.provider, model: entry.model }));
+}
+export function subagentModelChainBlocked(config = getConfig()) {
+    const chain = sanitizeSubagentModelChain(config.subagentModels, config.customProviders);
+    return Boolean(chain) && !resolveSubagentModelChain(config).length;
+}
+//# sourceMappingURL=model-chain.js.map

package/dist/agent/subagents/model-chain.js.map

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

package/dist/agent/subagents/read-only-tools.d.ts

@@ -0,0 +1,9 @@
+import type { ToolRunOptions } from "../../tools/tool-types.js";
+import type { ToolCall, ToolDefinition, ToolResult } from "../../types.js";
+export declare const TOOL_OUTPUT_LIMIT = 12000;
+export declare const READ_ONLY_TOOLS: ToolDefinition[];
+export declare function boundedOutput(text: string): string;
+export declare function confinedPath(root: string, value?: unknown): Promise<string>;
+export declare function prepareReadOnlyCall(root: string, call: ToolCall): Promise<ToolCall>;
+export type ReadOnlyRegistry = (call: ToolCall, options: ToolRunOptions) => Promise<ToolResult>;
+export declare function executeReadOnlyCall(root: string, call: ToolCall, execute: ReadOnlyRegistry, options: ToolRunOptions): Promise<ToolResult>;