orchajs 0.21.0 → 0.22.0

package/dist/amarsia/analytics.d.ts

@@ -0,0 +1,21 @@
+import type { AmarsiaTelemetryRunV1, CompiledAgentManifest, SessionStore } from "../types.js";
+export type AmarsiaRunFact = AmarsiaTelemetryRunV1;
+export declare class AmarsiaTelemetryClient {
+    #private;
+    constructor(options: {
+        key: string;
+        endpoint?: string;
+    });
+    enqueue(fact: AmarsiaRunFact): void;
+    drain(options?: {
+        timeoutMs?: number;
+    }): Promise<void>;
+    close(options?: {
+        timeoutMs?: number;
+    }): Promise<void>;
+}
+export declare function withAmarsiaTelemetry(options: {
+    store: SessionStore;
+    manifest: CompiledAgentManifest;
+    client: AmarsiaTelemetryClient;
+}): SessionStore;

package/dist/amarsia/analytics.js

@@ -0,0 +1,457 @@
+import { resolveAmarsiaEndpoint } from "./endpoint.js";
+const RELEVANT_EVENTS = new Set([
+    "run.started",
+    "run.completed",
+    "run.failed",
+    "run.paused",
+    "evaluation.completed",
+    "evaluation.failed",
+]);
+const MAX_BATCH_RUNS = 100;
+const MAX_KEEPALIVE_BYTES = 48 * 1024;
+const HEARTBEAT_INTERVAL_MS = 30_000;
+export class AmarsiaTelemetryClient {
+    #key;
+    #baseUrl;
+    #queue = new Map();
+    #activeRuns = new Map();
+    #timer;
+    #heartbeatTimer;
+    #attempt = 0;
+    #flushPromise;
+    constructor(options) {
+        this.#key = options.key;
+        this.#baseUrl = resolveAmarsiaEndpoint(options.endpoint);
+    }
+    enqueue(fact) {
+        this.#queue.set(fact.event_id, fact);
+        if (fact.status === "running") {
+            this.#activeRuns.set(fact.event_id, fact);
+            this.#scheduleHeartbeat();
+        }
+        else {
+            this.#activeRuns.delete(fact.event_id);
+            if (this.#activeRuns.size === 0 && this.#heartbeatTimer) {
+                clearTimeout(this.#heartbeatTimer);
+                this.#heartbeatTimer = undefined;
+            }
+        }
+        if (fact.status !== "running") {
+            this.#scheduleTerminal();
+            return;
+        }
+        if (this.#queue.size >= 20) {
+            void this.#flush();
+            return;
+        }
+        this.#schedule(250);
+    }
+    #schedule(delay) {
+        if (this.#timer)
+            return;
+        this.#timer = setTimeout(() => {
+            this.#timer = undefined;
+            void this.#flush();
+        }, delay);
+        const timer = this.#timer;
+        timer.unref?.();
+    }
+    #scheduleTerminal() {
+        if (this.#timer)
+            clearTimeout(this.#timer);
+        this.#timer = setTimeout(() => {
+            this.#timer = undefined;
+            void this.#flush();
+        }, 0);
+    }
+    #scheduleHeartbeat() {
+        if (this.#heartbeatTimer || this.#activeRuns.size === 0)
+            return;
+        this.#heartbeatTimer = setTimeout(() => {
+            this.#heartbeatTimer = undefined;
+            for (const fact of this.#activeRuns.values()) {
+                this.#queue.set(fact.event_id, fact);
+            }
+            void this.#flush();
+            this.#scheduleHeartbeat();
+        }, HEARTBEAT_INTERVAL_MS);
+        const timer = this.#heartbeatTimer;
+        timer.unref?.();
+    }
+    async drain(options = {}) {
+        const timeoutMs = Math.max(0, options.timeoutMs ?? 2_000);
+        const deadline = Date.now() + timeoutMs;
+        if (this.#timer) {
+            clearTimeout(this.#timer);
+            this.#timer = undefined;
+        }
+        while (this.#queue.size > 0 || this.#flushPromise) {
+            const remaining = deadline - Date.now();
+            if (remaining <= 0)
+                return;
+            await Promise.race([
+                this.#flush(),
+                new Promise((resolve) => setTimeout(resolve, remaining)),
+            ]);
+        }
+    }
+    async close(options = {}) {
+        if (this.#heartbeatTimer) {
+            clearTimeout(this.#heartbeatTimer);
+            this.#heartbeatTimer = undefined;
+        }
+        this.#activeRuns.clear();
+        await this.drain(options);
+    }
+    async #flush() {
+        if (this.#flushPromise)
+            return this.#flushPromise;
+        if (this.#queue.size === 0)
+            return;
+        this.#flushPromise = this.#performFlush();
+        try {
+            await this.#flushPromise;
+        }
+        finally {
+            this.#flushPromise = undefined;
+            if (this.#queue.size > 0 && !this.#timer) {
+                const hasTerminalFact = [...this.#queue.values()].some((fact) => fact.status !== "running");
+                if (hasTerminalFact) {
+                    void this.#flush();
+                }
+                else {
+                    this.#schedule(250);
+                }
+            }
+        }
+    }
+    async #performFlush() {
+        const batch = takeBatch(this.#queue);
+        if (batch.length === 0)
+            return;
+        const body = JSON.stringify({
+            schema_version: 1,
+            runs: batch,
+        });
+        for (const fact of batch)
+            this.#queue.delete(fact.event_id);
+        try {
+            const response = await fetch(`${this.#baseUrl}/v3/project-analytics/runs/batch`, {
+                method: "POST",
+                headers: {
+                    "content-type": "application/json",
+                    "x-amarsia-project-key": this.#key,
+                },
+                keepalive: utf8ByteLength(body) <= MAX_KEEPALIVE_BYTES,
+                body,
+            });
+            if (!response.ok) {
+                throw new Error(`HTTP ${response.status}`);
+            }
+            this.#attempt = 0;
+        }
+        catch {
+            this.#attempt += 1;
+            if (this.#attempt <= 6) {
+                for (const fact of batch) {
+                    if (!this.#queue.has(fact.event_id)) {
+                        this.#queue.set(fact.event_id, fact);
+                    }
+                }
+                this.#schedule(Math.min(30_000, 500 * 2 ** this.#attempt));
+            }
+            else {
+                this.#attempt = 0;
+                console.warn(`Amarsia telemetry delivery failed after 6 retries; dropping ${batch.length} run update(s).`);
+            }
+        }
+    }
+}
+export function withAmarsiaTelemetry(options) {
+    const { store, manifest, client } = options;
+    const projections = new Map();
+    const pending = new Map();
+    return {
+        read: (sessionId) => store.read(sessionId),
+        listSessionIds: () => store.listSessionIds(),
+        describeLocation: store.describeLocation?.bind(store),
+        subscribe: store.subscribe?.bind(store),
+        subscribeAll: store.subscribeAll?.bind(store),
+        async append(sessionId, events) {
+            await store.append(sessionId, events);
+            const runs = relevantRuns(events);
+            if (runs.size === 0 &&
+                !projections.has(sessionId) &&
+                !pending.has(sessionId)) {
+                return;
+            }
+            const previous = pending.get(sessionId) ?? Promise.resolve();
+            const processing = previous
+                .then(async () => {
+                let projection = projections.get(sessionId);
+                if (!projection) {
+                    projection = createProjection(await store.read(sessionId));
+                    projections.set(sessionId, projection);
+                }
+                else {
+                    appendToProjection(projection, events);
+                }
+                if (projection.isTest)
+                    return;
+                for (const run of runs) {
+                    const fact = projectRunFact(manifest, sessionId, run, projection);
+                    if (fact)
+                        client.enqueue(fact);
+                }
+            })
+                .catch(() => undefined);
+            pending.set(sessionId, processing);
+            void processing.finally(() => {
+                if (pending.get(sessionId) === processing) {
+                    pending.delete(sessionId);
+                }
+            });
+        },
+    };
+}
+function createProjection(events) {
+    const projection = {
+        seenSequences: new Set(),
+        runs: new Map(),
+        isTest: false,
+    };
+    appendToProjection(projection, events);
+    return projection;
+}
+function appendToProjection(projection, events) {
+    for (const event of events) {
+        if (projection.seenSequences.has(event.sequence))
+            continue;
+        projection.seenSequences.add(event.sequence);
+        if (event.type === "session.created") {
+            projection.sessionCreated = event;
+            const metadata = asRecord(event.data.metadata);
+            projection.isTest = metadata?.orchaTest === true;
+        }
+        if (typeof event.run !== "number")
+            continue;
+        const runEvents = projection.runs.get(event.run);
+        if (runEvents) {
+            runEvents.push(event);
+        }
+        else {
+            projection.runs.set(event.run, [event]);
+        }
+    }
+}
+function relevantRuns(events) {
+    const runs = new Set();
+    for (const event of events) {
+        if (typeof event.run === "number" && RELEVANT_EVENTS.has(event.type)) {
+            runs.add(event.run);
+        }
+    }
+    return runs;
+}
+function projectRunFact(manifest, sessionId, run, projection) {
+    const runEvents = projection.runs.get(run);
+    if (!runEvents)
+        return undefined;
+    const started = runEvents.find((event) => event.type === "run.started");
+    if (!started)
+        return undefined;
+    const terminal = [...runEvents]
+        .reverse()
+        .find((event) => ["run.completed", "run.failed", "run.paused"].includes(event.type));
+    const lineage = asRecord(projection.sessionCreated?.data.lineage);
+    const assistants = runEvents.filter((event) => event.type === "message.created" && event.data.role === "assistant");
+    const usage = normalizeUsage(terminal?.data.usage, assistants);
+    const completedActions = runEvents.filter((event) => event.type === "action.completed");
+    const failedActions = runEvents.filter((event) => event.type === "action.failed");
+    const evaluations = runEvents.filter((event) => event.type === "evaluation.completed" ||
+        event.type === "evaluation.failed");
+    const error = asRecord(terminal?.data.error);
+    const lastAssistant = assistants.at(-1);
+    const status = terminal?.type === "run.completed"
+        ? "completed"
+        : terminal?.type === "run.failed"
+            ? "failed"
+            : terminal?.type === "run.paused"
+                ? "paused"
+                : "running";
+    return {
+        event_id: `${manifest.key}:${sessionId}:${run}`,
+        agent_external_id: manifest.key,
+        session_id: sessionId,
+        run_number: run,
+        ...(typeof lineage?.parentAgent === "string"
+            ? { parent_agent_external_id: lineage.parentAgent }
+            : {}),
+        ...(typeof lineage?.parentSessionId === "string"
+            ? { parent_session_id: lineage.parentSessionId }
+            : {}),
+        status,
+        provider: typeof started.data.provider === "string"
+            ? started.data.provider
+            : manifest.provider,
+        model: typeof started.data.model === "string"
+            ? started.data.model
+            : manifest.model,
+        ...(typeof started.data.region === "string"
+            ? { region: started.data.region }
+            : {}),
+        ...(typeof started.data.outputType === "string"
+            ? { output_type: started.data.outputType }
+            : {}),
+        ...(typeof lastAssistant?.data.stopReason === "string"
+            ? { stop_reason: lastAssistant.data.stopReason }
+            : {}),
+        started_at: started.timestamp,
+        ...(terminal ? { ended_at: terminal.timestamp } : {}),
+        ...(typeof terminal?.data.durationMs === "number"
+            ? { duration_ms: terminal.data.durationMs }
+            : {}),
+        model_duration_ms: sumNumber(assistants, "durationMs"),
+        action_duration_ms: sumNumber([...completedActions, ...failedActions], "durationMs"),
+        ...usage,
+        user_message_count: runEvents.filter((event) => event.type === "message.created" && event.data.role === "user").length,
+        assistant_message_count: assistants.length,
+        action_count: runEvents.filter((event) => event.type === "action.requested").length,
+        action_success_count: completedActions.length,
+        action_failure_count: failedActions.length,
+        subagent_count: runEvents.filter((event) => event.type === "subagent.initiated").length,
+        actions: projectActionLogs(runEvents),
+        evaluation_count: evaluations.length,
+        evaluation_pass_count: evaluations.filter((event) => event.type === "evaluation.completed" &&
+            event.data.status === "passed").length,
+        ...(typeof error?.code === "string" ? { error_code: error.code } : {}),
+        ...(typeof error?.message === "string"
+            ? { error_message: sanitizeErrorMessage(error.message) }
+            : {}),
+        ...(typeof error?.retryable === "boolean"
+            ? { error_retryable: error.retryable }
+            : {}),
+    };
+}
+function normalizeUsage(terminalUsage, assistants) {
+    const direct = asRecord(terminalUsage);
+    if (direct) {
+        return usageFields(direct);
+    }
+    const total = {
+        inputTokens: 0,
+        outputTokens: 0,
+        reasoningTokens: 0,
+        cacheReadTokens: 0,
+        cacheWriteTokens: 0,
+    };
+    for (const event of assistants) {
+        const usage = asRecord(event.data.usage);
+        if (!usage)
+            continue;
+        total.inputTokens += numberValue(usage.inputTokens);
+        total.outputTokens += numberValue(usage.outputTokens);
+        total.reasoningTokens =
+            (total.reasoningTokens ?? 0) + numberValue(usage.reasoningTokens);
+        total.cacheReadTokens += numberValue(usage.cacheReadTokens);
+        total.cacheWriteTokens += numberValue(usage.cacheWriteTokens);
+    }
+    return usageFields(total);
+}
+function usageFields(usage) {
+    const reasoning = numberValue(usage.reasoningTokens);
+    return {
+        input_tokens: numberValue(usage.inputTokens),
+        output_tokens: numberValue(usage.outputTokens),
+        ...(reasoning > 0 ? { reasoning_tokens: reasoning } : {}),
+        cache_read_tokens: numberValue(usage.cacheReadTokens),
+        cache_write_tokens: numberValue(usage.cacheWriteTokens),
+    };
+}
+function sumNumber(events, key) {
+    return events.reduce((sum, event) => sum + numberValue(event.data[key]), 0);
+}
+function projectActionLogs(events) {
+    const requestedByCallId = new Map();
+    for (const event of events) {
+        if (event.type === "action.requested" &&
+            typeof event.data.callId === "string") {
+            requestedByCallId.set(event.data.callId, event);
+        }
+    }
+    return events
+        .filter((event) => event.type === "action.completed" || event.type === "action.failed")
+        .slice(0, 100)
+        .map((event) => {
+        const error = asRecord(event.data.error);
+        const requested = typeof event.data.callId === "string"
+            ? requestedByCallId.get(event.data.callId)
+            : undefined;
+        return {
+            call_id: typeof event.data.callId === "string"
+                ? event.data.callId
+                : `action-${event.sequence}`,
+            name: typeof event.data.name === "string" ? event.data.name : "unknown",
+            status: event.type === "action.completed"
+                ? "completed"
+                : "failed",
+            started_at: requested?.timestamp ?? event.timestamp,
+            ended_at: event.timestamp,
+            duration_ms: numberValue(event.data.durationMs),
+            ...(typeof error?.code === "string" ? { error_code: error.code } : {}),
+            ...(typeof error?.message === "string"
+                ? { error_message: sanitizeErrorMessage(error.message) }
+                : {}),
+        };
+    });
+}
+function takeBatch(queue) {
+    const batch = [];
+    let bytes = utf8ByteLength('{"schema_version":1,"runs":[]}');
+    for (const fact of queue.values()) {
+        const factBytes = utf8ByteLength(JSON.stringify(fact)) + 1;
+        if (batch.length > 0 &&
+            (batch.length >= MAX_BATCH_RUNS ||
+                bytes + factBytes > MAX_KEEPALIVE_BYTES)) {
+            break;
+        }
+        batch.push(fact);
+        bytes += factBytes;
+    }
+    return batch;
+}
+function utf8ByteLength(value) {
+    if (typeof TextEncoder !== "undefined") {
+        return new TextEncoder().encode(value).byteLength;
+    }
+    let bytes = 0;
+    for (let index = 0; index < value.length; index += 1) {
+        const code = value.charCodeAt(index);
+        if (code < 0x80)
+            bytes += 1;
+        else if (code < 0x800)
+            bytes += 2;
+        else if (code >= 0xd800 && code <= 0xdbff) {
+            bytes += 4;
+            index += 1;
+        }
+        else
+            bytes += 3;
+    }
+    return bytes;
+}
+function numberValue(value) {
+    return typeof value === "number" && Number.isFinite(value) ? value : 0;
+}
+function asRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value)
+        ? value
+        : undefined;
+}
+function sanitizeErrorMessage(value) {
+    return value
+        .replace(/\bBearer\s+[A-Za-z0-9._~+/-]+=*/gi, "Bearer [redacted]")
+        .replace(/\b(authorization|api[-_ ]?key|token|secret|password)\b\s*[:=]\s*[^\s,;]+/gi, "$1=[redacted]")
+        .replace(/\b(?:sk|pk|amarsia)_[A-Za-z0-9_-]{12,}\b/gi, "[redacted]")
+        .slice(0, 8000);
+}

package/dist/amarsia/endpoint.d.ts

@@ -0,0 +1 @@
+export declare function resolveAmarsiaEndpoint(endpoint: string | undefined): string;

package/dist/amarsia/endpoint.js

@@ -0,0 +1,8 @@
+const DEFAULT_AMARSIA_API_URL = "https://api.amarsia.com";
+export function resolveAmarsiaEndpoint(endpoint) {
+    return (endpoint?.trim() ||
+        (typeof process !== "undefined"
+            ? process.env?.AMARSIA_API_URL
+            : undefined) ||
+        DEFAULT_AMARSIA_API_URL).replace(/\/$/, "");
+}

package/dist/amarsia/sync.js

@@ -1,5 +1,5 @@
 import { createAmarsiaProjectMetadata, } from "./metadata.js";
-const DEFAULT_AMARSIA_API_URL = "https://api.amarsia.com";
+import { resolveAmarsiaEndpoint } from "./endpoint.js";
 const syncedHashes = new Map();
 export function syncAmarsiaProject(options) {
     const metadata = createAmarsiaProjectMetadata(options.bundle, options.projectRoot);
@@ -19,9 +19,6 @@ export function syncAmarsiaProject(options) {
         console.warn(`[orcha] Amarsia project sync failed: ${message}`);
     });
 }
-function resolveAmarsiaEndpoint(endpoint) {
-    return (endpoint?.trim() || process.env.AMARSIA_API_URL || DEFAULT_AMARSIA_API_URL).replace(/\/$/, "");
-}
 async function postProjectMetadata(options) {
     const response = await fetch(`${options.baseUrl}/v3/project-sync`, {
         method: "PUT",

package/dist/errors.d.ts

@@ -9,3 +9,8 @@ export declare class OrchaError extends Error {
         cause?: unknown;
     });
 }
+export declare function describeProviderError(error: unknown): {
+    message: string;
+    details?: Record<string, unknown>;
+};
+export declare function isRetryableProviderConnectionError(error: unknown): boolean;

package/dist/errors.js

@@ -10,3 +10,105 @@ export class OrchaError extends Error {
         this.details = options.details;
     }
 }
+export function describeProviderError(error) {
+    const rootMessage = errorMessage(error);
+    const cause = deepestUsefulCause(error);
+    if (!cause) {
+        return { message: rootMessage };
+    }
+    const causeMessage = errorMessage(cause);
+    const causeCode = stringOrNumberField(cause, "code");
+    const syscall = stringField(cause, "syscall");
+    const hostname = stringField(cause, "hostname");
+    const explanation = causeMessage !== rootMessage
+        ? causeMessage
+        : causeCode
+            ? String(causeCode)
+            : undefined;
+    const details = {
+        ...(causeCode !== undefined ? { causeCode } : {}),
+        ...(syscall ? { syscall } : {}),
+        ...(hostname ? { hostname } : {}),
+        ...(explanation ? { causeMessage: explanation } : {}),
+    };
+    return {
+        message: explanation ? `${rootMessage}: ${explanation}` : rootMessage,
+        ...(Object.keys(details).length > 0 ? { details } : {}),
+    };
+}
+export function isRetryableProviderConnectionError(error) {
+    const retryableCodes = new Set([
+        "UND_ERR_CONNECT_TIMEOUT",
+        "EAI_AGAIN",
+        "ENETUNREACH",
+        "EHOSTUNREACH",
+        "ECONNREFUSED",
+    ]);
+    const pending = [error];
+    const visited = new Set();
+    while (pending.length > 0 && visited.size < 8) {
+        const current = pending.shift();
+        if (typeof current !== "object" ||
+            current === null ||
+            visited.has(current)) {
+            continue;
+        }
+        visited.add(current);
+        const record = current;
+        if (typeof record.code === "string" &&
+            retryableCodes.has(record.code)) {
+            return true;
+        }
+        if (record.cause !== undefined)
+            pending.push(record.cause);
+        if (Array.isArray(record.errors))
+            pending.push(...record.errors);
+    }
+    return false;
+}
+function deepestUsefulCause(error) {
+    let current = error;
+    let useful;
+    const visited = new Set();
+    for (let depth = 0; depth < 5; depth += 1) {
+        if ((typeof current !== "object" || current === null) ||
+            visited.has(current)) {
+            break;
+        }
+        visited.add(current);
+        const record = current;
+        const next = record.cause ??
+            (Array.isArray(record.errors) ? record.errors[0] : undefined);
+        if (next === undefined)
+            break;
+        useful = next;
+        current = next;
+    }
+    return useful;
+}
+function errorMessage(error) {
+    if (error instanceof Error && error.message.trim()) {
+        return error.message.trim();
+    }
+    if (typeof error === "object" && error !== null) {
+        const message = error.message;
+        if (typeof message === "string" && message.trim()) {
+            return message.trim();
+        }
+    }
+    return String(error);
+}
+function stringField(value, key) {
+    if (typeof value !== "object" || value === null)
+        return undefined;
+    const field = value[key];
+    return typeof field === "string" && field.trim() ? field : undefined;
+}
+function stringOrNumberField(value, key) {
+    if (typeof value !== "object" || value === null)
+        return undefined;
+    const field = value[key];
+    return typeof field === "string" || typeof field === "number"
+        ? field
+        : undefined;
+}

package/dist/runtime/agent.js

@@ -1,4 +1,4 @@
-import { OrchaError } from "../errors.js";
+import { describeProviderError, isRetryableProviderConnectionError, OrchaError, } from "../errors.js";
 import { normalizeLocalFile, normalizeUrlContent, } from "../file-content.js";
 import { messagesFromEvents, normalizePersistedToolResults, SessionEventWriter, } from "./session-events.js";
 import { validateStructuredValue } from "./structured-output.js";
@@ -620,7 +620,8 @@ export class RuntimeAgent {
             }
             providerTools.push(...this.#subagentToolDefinitions());
             try {
-                response = await this.#generateProviderResponse(this.#manifest.provider, provider, {
+                const signal = this.#sessionControls.get(sessionId)?.controller.signal;
+                response = await withProviderConnectionRetry(() => this.#generateProviderResponse(this.#manifest.provider, provider, {
                     model: this.#manifest.model,
                     region: this.#manifest.region,
                     maxTokens: this.#manifest.maxTokens,
@@ -634,8 +635,8 @@ export class RuntimeAgent {
                         streamedOutput = output;
                         publishOutput?.(output);
                     },
-                    signal: this.#sessionControls.get(sessionId)?.controller.signal,
-                });
+                    signal,
+                }), signal);
             }
             catch (error) {
                 if (this.#sessionControls.get(sessionId)?.pauseRequested) {
@@ -665,7 +666,16 @@ export class RuntimeAgent {
                 if (error instanceof OrchaError) {
                     throw error;
                 }
-                throw new OrchaError("provider_error", error instanceof Error ? error.message : String(error), { retryable: true, cause: error });
+                const providerError = describeProviderError(error);
+                throw new OrchaError("provider_error", providerError.message, {
+                    retryable: true,
+                    cause: error,
+                    details: {
+                        provider: this.#manifest.provider,
+                        model: this.#manifest.model,
+                        ...providerError.details,
+                    },
+                });
             }
             const modelDurationMs = Math.round(performance.now() - modelStartedAt);
             const usage = aggregateUsage(previousEvents, writer.run, response.usage);
@@ -2609,6 +2619,21 @@ function findLast(events, predicate) {
     }
     return undefined;
 }
+async function withProviderConnectionRetry(operation, signal) {
+    try {
+        return await operation();
+    }
+    catch (error) {
+        if (signal?.aborted ||
+            !isRetryableProviderConnectionError(error)) {
+            throw error;
+        }
+        await new Promise((resolve) => setTimeout(resolve, 250));
+        if (signal?.aborted)
+            throw error;
+        return operation();
+    }
+}
 function failure(sessionId, code, message, options = {}) {
     const retryable = options.retryable ??
         (code === "session_busy" ||