@nexface/agent 0.1.1-alpha.5 → 0.1.1-alpha.7

package/dist/request.d.ts

@@ -0,0 +1,99 @@
+import { type Message, type RunAgentInput } from "@ag-ui/core";
+export type { Message, RunAgentInput } from "@ag-ui/core";
+import type { AgentContextEntry, AgentToolDefinition } from "@nexface/tools";
+import type { AgentMessage, AgentModelToolCall, AgentRun, AgentRunResult, AgentRunInput } from "./types.js";
+export interface AgentRequestState {
+    readonly nexface: RequestContinuation;
+}
+export type InternalAgentRunResult = AgentRunResult;
+export type AgentResumeEntry = NonNullable<AgentRunInput["resume"]>[0] | {
+    readonly interruptId: string;
+    readonly status: "resolved";
+    readonly payload: {
+        readonly toolResultMessageId: string;
+        readonly confirmed?: boolean;
+    };
+};
+export interface BrowserToolResult {
+    readonly toolCallId: string;
+    readonly result?: unknown;
+    readonly error?: {
+        readonly code: string;
+        readonly message: string;
+    };
+    readonly confirmed?: boolean;
+}
+export interface InternalRequestInput {
+    readonly messages: readonly AgentMessage[];
+    readonly newMessages: readonly AgentMessage[];
+    readonly tools: readonly AgentToolDefinition<any, any>[];
+    readonly contexts: readonly AgentContextEntry[];
+    readonly continuation?: RequestContinuation;
+    readonly resume?: AgentResumeEntry;
+    readonly toolResult?: BrowserToolResult;
+    readonly receipts: readonly Message[];
+}
+export interface AgentBrowserAction {
+    readonly toolCallId: string;
+    readonly definition: AgentToolDefinition<any, any>;
+    readonly input: unknown;
+    readonly progressLabel?: string;
+}
+export interface RequestContinuation {
+    version: 2;
+    threadId: string;
+    timeline: Array<{
+        messageId: string;
+    } | {
+        internal: AgentMessage;
+    }>;
+    model: {
+        provider: string;
+        model: string;
+    };
+    loadedSkills: string[];
+    browserSkillLoaded: boolean;
+    contextRevision: number;
+    lastContextSerialized?: string;
+    replay?: unknown;
+    pending?: {
+        kind: "client-tool-execution";
+        interruptId: string;
+        calls: AgentModelToolCall[];
+        definition: AgentToolDefinition<any, any>;
+        step: number;
+        recoverableFailures: number;
+        unresolvedToolFailures: string[];
+        browserSkillAvailable: boolean;
+        loadBrowserSkill: boolean;
+    };
+}
+export declare const approvalResponseSchema: {
+    type: string;
+    properties: {
+        approved: {
+            type: string;
+        };
+    };
+    required: string[];
+    additionalProperties: boolean;
+};
+export declare const toolResultResponseSchema: {
+    type: string;
+    properties: {
+        toolResultMessageId: {
+            type: string;
+        };
+        confirmed: {
+            type: string;
+        };
+    };
+    required: string[];
+    additionalProperties: boolean;
+};
+export declare function parseResume(value: unknown, allowMetadata?: boolean): AgentResumeEntry;
+export declare function convertMessages(values: readonly Message[]): AgentMessage[];
+export declare function decodeRequest(value: RunAgentInput): InternalRequestInput;
+export declare function toProtocolMessages(messages: AgentMessage[]): Message[];
+export declare function runResponse(run: AgentRun): Response;
+export declare function mergeProtocolMessages(messages: Message[], previous: Message[]): Message[];

package/dist/request.js

@@ -0,0 +1,238 @@
+import { MessageSchema } from "@ag-ui/core";
+import { getToolResultError } from "./internal.js";
+export const approvalResponseSchema = {
+    type: "object", properties: { approved: { type: "boolean" } }, required: ["approved"], additionalProperties: false,
+};
+export const toolResultResponseSchema = {
+    type: "object", properties: { toolResultMessageId: { type: "string" }, confirmed: { type: "boolean" } }, required: ["toolResultMessageId"], additionalProperties: false,
+};
+export function parseResume(value, allowMetadata = false) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        throw new Error("Invalid resume entry.");
+    const entry = value;
+    const allowed = ["interruptId", "status", "payload", ...(allowMetadata ? ["metadata"] : [])];
+    if (Object.keys(entry).some((key) => !allowed.includes(key)) || typeof entry.interruptId !== "string" || !entry.interruptId)
+        throw new Error("Invalid resume entry.");
+    if (entry.status === "cancelled") {
+        if (entry.payload !== undefined)
+            throw new Error("A cancelled response cannot carry a payload.");
+        return { interruptId: entry.interruptId, status: "cancelled" };
+    }
+    const payload = entry.payload;
+    if (entry.status !== "resolved" || !payload || typeof payload !== "object" || Array.isArray(payload))
+        throw new Error("A resolved response requires a payload.");
+    if (typeof payload.approved === "boolean" && Object.keys(payload).every((key) => key === "approved")) {
+        return { interruptId: entry.interruptId, status: "resolved", payload: { approved: payload.approved } };
+    }
+    if (typeof payload.toolResultMessageId === "string" && payload.toolResultMessageId && (payload.confirmed === undefined || typeof payload.confirmed === "boolean") && Object.keys(payload).every((key) => key === "toolResultMessageId" || key === "confirmed")) {
+        return { interruptId: entry.interruptId, status: "resolved", payload: { toolResultMessageId: payload.toolResultMessageId, ...(payload.confirmed === undefined ? {} : { confirmed: payload.confirmed }) } };
+    }
+    throw new Error("Invalid resume payload.");
+}
+export function convertMessages(values) {
+    const ids = new Set();
+    const calls = new Map();
+    return values.flatMap((value) => {
+        const message = MessageSchema.parse(value);
+        if (ids.has(message.id))
+            throw new Error("Duplicate message ID.");
+        ids.add(message.id);
+        if (message.role === "activity" || message.role === "reasoning")
+            return [];
+        if (message.role === "assistant") {
+            for (const call of message.toolCalls ?? [])
+                calls.set(call.id, call.function.name);
+            return [{ id: message.id, role: "assistant", content: message.content ?? null, toolCalls: (message.toolCalls ?? []).map((call) => ({ id: call.id, ...call.function })) }];
+        }
+        if (message.role === "tool") {
+            const name = calls.get(message.toolCallId);
+            if (!name)
+                throw new Error("A tool result has no preceding tool call.");
+            const content = message.error !== undefined && getToolResultError(message.content) === undefined
+                ? JSON.stringify({ error: { code: "TOOL_ERROR", message: message.error }, content: message.content }) : message.content;
+            return [{ id: message.id, role: "tool", name, toolCallId: message.toolCallId, content }];
+        }
+        if (message.role === "user") {
+            if (Array.isArray(message.content) && message.content.some((part) => part.type !== "text" && part.type !== "image"))
+                throw new Error("This Agent supports text and image input only.");
+            const content = typeof message.content === "string" ? message.content.trim() : message.content;
+            if (!content.length)
+                throw new Error("Agent message content is required.");
+            return [{ id: message.id, role: "user", content: content }];
+        }
+        throw new Error(`Unsupported model history role: ${message.role}.`);
+    });
+}
+export function decodeRequest(value) {
+    const extension = value.forwardedProps?.nexface;
+    if (extension && (extension.version !== 2 || "checkpoint" in extension || "confirmedToolCallId" in extension))
+        throw new Error("Unsupported Nexface request version or recovery channel.");
+    const state = value.state;
+    if (state != null && (typeof state !== "object" || Array.isArray(state)))
+        throw new Error("Invalid Agent state.");
+    if (state && "nexface" in state && (!state.nexface || typeof state.nexface !== "object" || Array.isArray(state.nexface)))
+        throw new Error("Invalid Nexface state.");
+    const restored = state?.nexface;
+    if (restored && (restored.version !== 2 || restored.threadId !== value.threadId || !Array.isArray(restored.timeline)))
+        throw new Error("Agent state does not match this thread or version.");
+    const converted = new Map(convertMessages(value.messages).map((message) => [message.id, message]));
+    const source = new Map(value.messages.map((message) => [message.id, message]));
+    const used = new Set();
+    const messages = (restored?.timeline ?? []).flatMap((entry) => {
+        if ("internal" in entry) {
+            if (!entry.internal || (entry.internal.role !== "system" && entry.internal.role !== "application_context"))
+                throw new Error("Invalid internal history.");
+            return [structuredClone(entry.internal)];
+        }
+        const message = converted.get(entry.messageId);
+        if (!message || used.has(entry.messageId))
+            throw new Error("State message is missing or repeated.");
+        used.add(entry.messageId);
+        return [message];
+    });
+    const pending = restored?.pending;
+    if (value.resume && value.resume.length !== 1)
+        throw new Error("Exactly one resume entry is required.");
+    const resume = value.resume?.[0] ? parseResume(value.resume[0], true) : undefined;
+    const receipts = [];
+    let toolResult;
+    if (pending) {
+        if (!resume || resume.interruptId !== pending.interruptId || !Array.isArray(pending.calls) || !pending.calls.length)
+            throw new Error("Resume does not match the pending interrupt.");
+        if (pending.kind !== "client-tool-execution")
+            throw new Error("Invalid pending kind.");
+        if (resume.status === "resolved") {
+            if (!("toolResultMessageId" in resume.payload))
+                throw new Error("A client tool requires a result reference.");
+            const message = source.get(resume.payload.toolResultMessageId);
+            if (!message || used.has(message.id) || message.role !== "tool" || message.toolCallId !== pending.calls[0].id)
+                throw new Error("Resume result does not match the pending call.");
+            const owner = [...messages].reverse().find((item) => item.role === "assistant");
+            const ownerIndex = value.messages.findIndex((item) => item.id === owner?.id);
+            const receiptIndex = value.messages.indexOf(message);
+            if (ownerIndex < 0 || receiptIndex <= ownerIndex || value.messages.slice(ownerIndex + 1, receiptIndex).some((item) => item.role === "user" || (item.role === "assistant" && item.toolCalls?.length)))
+                throw new Error("The receipt does not belong to the pending assistant batch.");
+            let payload;
+            try {
+                payload = JSON.parse(message.content);
+            }
+            catch {
+                if (!message.error)
+                    throw new Error("Invalid tool result.");
+            }
+            if (message.error !== undefined)
+                payload = { error: { code: payload?.error?.code ?? "TOOL_ERROR", message: message.error } };
+            if (!payload || typeof payload !== "object" || (!("result" in payload) && !("error" in payload)))
+                throw new Error("Invalid tool result.");
+            if (payload.error && (typeof payload.error.code !== "string" || typeof payload.error.message !== "string"))
+                throw new Error("Invalid tool error.");
+            toolResult = { toolCallId: message.toolCallId, ...(payload.error ? { error: payload.error } : { result: payload.result }), ...(resume.payload.confirmed === undefined ? {} : { confirmed: resume.payload.confirmed }) };
+            receipts.push(message);
+        }
+        else {
+            const owner = [...messages].reverse().find((message) => message.role === "assistant");
+            const ownerIndex = value.messages.findIndex((message) => message.id === owner?.id);
+            for (const message of value.messages.slice(ownerIndex + 1)) {
+                if (message.role === "user")
+                    break;
+                if (used.has(message.id) || message.role !== "tool" || !pending.calls.some((call) => call.id === message.toolCallId))
+                    continue;
+                let payload;
+                try {
+                    payload = JSON.parse(message.content);
+                }
+                catch {
+                    throw new Error("Invalid cancellation receipt.");
+                }
+                const first = message.toolCallId === pending.calls[0].id;
+                if (!(first ? ["TOOL_CANCELLED", "TOOL_CONFIRMATION_INVALIDATED"] : ["TOOL_SKIPPED", "TOOL_CANCELLED"]).includes(payload?.error?.code))
+                    throw new Error("Cancellation cannot replace an execution result.");
+                if (receipts.some((receipt) => receipt.role === "tool" && receipt.toolCallId === message.toolCallId))
+                    throw new Error("Repeated cancellation receipt.");
+                receipts.push(message);
+            }
+        }
+    }
+    else if (resume)
+        throw new Error("Cannot resume without a pending interrupt.");
+    const receiptIds = new Set(receipts.map((message) => message.id));
+    const newMessages = value.messages.flatMap((message) => {
+        if (used.has(message.id) || receiptIds.has(message.id))
+            return [];
+        if (pending && message.role === "tool" && pending.calls.some((call) => call.id === message.toolCallId))
+            throw new Error("Repeated or unexpected pending result.");
+        const convertedMessage = converted.get(message.id);
+        if (pending && resume?.status === "resolved" && convertedMessage)
+            throw new Error("A resolved response cannot start a new task.");
+        return convertedMessage ? [convertedMessage] : [];
+    });
+    return {
+        messages, newMessages, receipts, ...(restored ? { continuation: structuredClone(restored) } : {}), ...(resume ? { resume } : {}), ...(toolResult ? { toolResult } : {}),
+        tools: value.tools.map((tool) => ({ name: tool.name, description: tool.description, inputSchema: tool.parameters, effect: extension?.toolMetadata?.[tool.name]?.effect ?? "action" })),
+        contexts: value.context.map((context, index) => {
+            let data = context.value;
+            try {
+                data = JSON.parse(context.value);
+            }
+            catch { /* Context values may be plain text. */ }
+            if (data && typeof data === "object" && "name" in data && "value" in data)
+                return data;
+            return { name: `context${index}`, description: context.description, value: data };
+        }),
+    };
+}
+export function toProtocolMessages(messages) {
+    return messages.flatMap((message) => {
+        message.id ??= globalThis.crypto.randomUUID();
+        if (message.role === "system" || message.role === "application_context")
+            return [];
+        if (message.role === "assistant")
+            return [{ id: message.id, role: "assistant", ...(message.content === null ? {} : { content: message.content }), toolCalls: message.toolCalls.map(({ id, name, arguments: args }) => ({ id, type: "function", function: { name, arguments: args } })) }];
+        if (message.role === "tool") {
+            const error = getToolResultError(message.content);
+            return [{ id: message.id, role: "tool", toolCallId: message.toolCallId, content: message.content, ...(error === undefined ? {} : { error }) }];
+        }
+        return [{ id: message.id, role: "user", content: message.content }];
+    });
+}
+export function runResponse(run) {
+    const encoder = new TextEncoder();
+    const iterator = run[Symbol.asyncIterator]();
+    void run.result.catch(() => undefined);
+    return new Response(new ReadableStream({
+        async pull(controller) {
+            try {
+                const next = await iterator.next();
+                if (next.done)
+                    controller.close();
+                else
+                    controller.enqueue(encoder.encode(`data: ${JSON.stringify(next.value)}\n\n`));
+            }
+            catch (error) {
+                controller.error(error);
+            }
+        },
+        async cancel() { run.cancel(); await iterator.return?.(); },
+    }), { headers: {
+            "Content-Type": "text/event-stream",
+            "Cache-Control": "no-cache, no-transform",
+            "X-Accel-Buffering": "no",
+        } });
+}
+export function mergeProtocolMessages(messages, previous) {
+    const remaining = new Map(messages.map((message) => [message.id, message]));
+    const mergedHistory = previous.flatMap((old) => {
+        const message = remaining.get(old.id);
+        if (!message)
+            return old.role === "activity" || old.role === "reasoning" ? [old] : [];
+        remaining.delete(old.id);
+        const merged = { ...old, ...message };
+        if (message.role === "tool" && old.role === "tool" && old.error !== undefined)
+            merged.content = old.content;
+        if (message.role === "assistant" && old.role === "assistant")
+            merged.toolCalls = message.toolCalls?.map((call) => ({ ...old.toolCalls?.find((item) => item.id === call.id), ...call }));
+        return [MessageSchema.parse(merged)];
+    });
+    return [...mergedHistory, ...remaining.values()];
+}
+//# sourceMappingURL=request.js.map

package/dist/request.js.map

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

package/dist/types.d.ts

@@ -1,10 +1,13 @@
+import type { RegisteredAgentTool } from "@nexface/tools";
+import type { RunAgentInput } from "./request.js";
 import type { ToolRuntime, AgentToolInputSchema } from "@nexface/tools";
 import type { AgentModelConfig, AgentModelInfo } from "./model/types.js";
-import type { ToolBridge } from "./tool-bridge.js";
-import type { TextInputContent, ImageInputContent, RunStartedEvent, RunFinishedEvent, RunErrorEvent, TextMessageStartEvent, TextMessageContentEvent, TextMessageEndEvent, ToolCallStartEvent, ToolCallArgsEvent, ToolCallEndEvent, ToolCallResultEvent } from "@ag-ui/core";
+import type { TextInputContent, ImageInputContent, RunStartedEvent, RunFinishedEvent, RunErrorEvent, TextMessageStartEvent, TextMessageContentEvent, TextMessageEndEvent, ToolCallStartEvent, ToolCallArgsEvent, ToolCallEndEvent, ToolCallResultEvent, CustomEvent, MessagesSnapshotEvent, StateSnapshotEvent, Message } from "@ag-ui/core";
 export type AgentInputContent = TextInputContent | ImageInputContent;
 export declare const agentBrand: unique symbol;
 export type AgentMessage = {
+    id?: string;
+} & ({
     role: "system";
     content: string;
 } | {
@@ -27,7 +30,7 @@ export type AgentMessage = {
     toolCallId: string;
     name: string;
     content: string;
-};
+});
 export interface AgentModelToolCall {
     id: string;
     name: string;
@@ -54,7 +57,7 @@ export interface AgentRunOptions {
     signal?: AbortSignal;
 }
 /**
- * @experimental Human-in-the-loop approval descriptor.
+ * @experimental Human-in-the-loop approval descriptor; ordinary completed Runs are not experimental.
  * @beta
  */
 export type ToolApprovalInterruptDescriptor = {
@@ -74,47 +77,43 @@ export type ToolApprovalInterruptDescriptor = {
     readonly mode: "page";
 });
 export type AgentRunResult = {
-    readonly status: "completed";
+    readonly outcome: Extract<NonNullable<RunFinishedEvent["outcome"]>, {
+        type: "success";
+    }>;
     readonly output: string;
 } | {
-    /**
-     * @experimental Human-in-the-loop interruption; ordinary completed Runs are not experimental.
-     * @beta
-     */
-    readonly status: "interrupted";
-    /**
-     * @experimental Human-in-the-loop approval descriptor.
-     * @beta
-     */
-    readonly interrupt: ToolApprovalInterruptDescriptor;
+    readonly outcome: Extract<NonNullable<RunFinishedEvent["outcome"]>, {
+        type: "interrupt";
+    }>;
+    readonly output?: never;
 };
-export type AgentRunEvent = RunStartedEvent | RunFinishedEvent | RunErrorEvent | TextMessageStartEvent | TextMessageContentEvent | TextMessageEndEvent | ToolCallStartEvent | ToolCallArgsEvent | ToolCallEndEvent | ToolCallResultEvent;
+export type AgentRunEvent = RunStartedEvent | RunFinishedEvent | RunErrorEvent | TextMessageStartEvent | TextMessageContentEvent | TextMessageEndEvent | ToolCallStartEvent | ToolCallArgsEvent | ToolCallEndEvent | ToolCallResultEvent | CustomEvent | MessagesSnapshotEvent | StateSnapshotEvent;
 export interface AgentRun extends AsyncIterable<AgentRunEvent> {
     readonly id: string;
     readonly result: Promise<AgentRunResult>;
     cancel(): void;
+    toResponse(): Response;
 }
 export type AgentRunInput = {
-    readonly message: {
-        readonly content: string | readonly AgentInputContent[];
-    };
-    readonly resume?: never;
-} | {
-    readonly message?: never;
+    readonly messages?: readonly Message[];
     /**
-     * @experimental Resumes a human-in-the-loop Chat approval.
+     * @experimental Responds to a pending tool interrupt.
      * @beta
      */
-    readonly resume: readonly [
+    readonly resume?: readonly [
         {
             readonly interruptId: string;
+        } & ({
             readonly status: "resolved";
             readonly payload: {
                 readonly approved: boolean;
             };
-            readonly metadata?: Readonly<Record<string, unknown>>;
-        }
+        } | {
+            readonly status: "cancelled";
+            readonly payload?: never;
+        })
     ];
+    readonly threadId?: never;
 };
 export interface AgentSkill {
     readonly name: string;
@@ -123,23 +122,20 @@ export interface AgentSkill {
 }
 export type CreateAgentOptions = {
     model: AgentModelConfig;
+    toolRuntime?: ToolRuntime;
+    tools?: readonly RegisteredAgentTool[];
     skills?: readonly AgentSkill[];
     maxSteps?: number;
     maxRetries?: number;
     applicationContext?: {
         maxSizeBytes?: number;
     };
-} & ({
-    toolRuntime: ToolRuntime;
-    toolBridge?: never;
-} | {
-    toolBridge: ToolBridge;
-    toolRuntime?: never;
-});
+};
 export interface Agent {
     readonly [agentBrand]: true;
     readonly id: string;
     readonly model: AgentModelInfo;
     switchModel(model: AgentModelConfig): Promise<void>;
     run(input: AgentRunInput, options?: AgentRunOptions): AgentRun;
+    runRequest(input: RunAgentInput, options?: AgentRunOptions): AgentRun;
 }

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAcA,MAAM,CAAC,MAAM,UAAU,GAAkB,MAAM,CAAC,gBAAgB,CAAC,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAeA,MAAM,CAAC,MAAM,UAAU,GAAkB,MAAM,CAAC,gBAAgB,CAAC,CAAC"}

package/package.json

@@ -1,11 +1,15 @@
 {
   "name": "@nexface/agent",
-  "version": "0.1.1-alpha.5",
+  "version": "0.1.1-alpha.7",
   "type": "module",
   "engines": {
     "node": ">=22.19.0"
   },
   "exports": {
+    "./internal": {
+      "types": "./dist/internal.d.ts",
+      "default": "./dist/internal.js"
+    },
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
@@ -34,7 +38,17 @@
   "dependencies": {
     "@ag-ui/core": "0.0.59"
   },
+  "devDependencies": {
+    "@earendil-works/pi-ai": "0.84.1",
+    "@rslib/core": "0.23.2",
+    "rspack-1-7": "npm:@rspack/core@1.7.12",
+    "@nexface/tools": "0.1.1-alpha.7"
+  },
   "peerDependencies": {
-    "@nexface/tools": "0.1.1-alpha.5"
+    "@nexface/tools": "0.1.1-alpha.7"
+  },
+  "scripts": {
+    "build": "node ../../scripts/generate-browser-tools-skill.mjs --check && node scripts/clean.mjs && tsc -p tsconfig.json && rslib build && node scripts/clean-model-output.mjs",
+    "typecheck": "node ../../scripts/generate-browser-tools-skill.mjs --check && tsc -p tsconfig.json --noEmit"
   }
-}
+}