@agentapplicationprotocol/client 0.4.2 → 0.6.0

package/dist/src/client.d.ts

@@ -1,4 +1,4 @@
-import { AgentResponse, CreateSessionRequest, CreateSessionResponse, MetaResponse, SessionListResponse, SessionResponse, SessionTurnRequest, SSEEvent } from "@agentapplicationprotocol/core";
+import { AgentResponse, CreateSessionRequest, CreateSessionResponse, MetaResponse, SessionHistoryResponse, SessionListResponse, SessionResponse, SessionTurnRequest, SSEEvent } from "@agentapplicationprotocol/core";
 export interface ClientOptions {
     baseUrl: string;
     apiKey: string;
@@ -22,10 +22,12 @@ export declare class Client {
     listSessions(params?: {
         after?: string;
     }): Promise<SessionListResponse>;
-    /** Fetches all session IDs across all pages. */
-    listAllSessions(): Promise<string[]>;
+    /** Fetches all sessions across all pages. */
+    listAllSessions(): Promise<SessionResponse[]>;
     /** GET /session/:id */
-    getSession(sessionId: string, history?: "compacted" | "full"): Promise<SessionResponse>;
+    getSession(sessionId: string): Promise<SessionResponse>;
+    /** GET /session/:id/history */
+    getSessionHistory(sessionId: string, type: "compacted" | "full"): Promise<SessionHistoryResponse>;
     /** PUT /session — non-streaming */
     createSession(req: CreateSessionRequest & {
         stream?: "none";

package/dist/src/client.js

@@ -50,8 +50,12 @@ class Client {
         return parseSSE(res.body);
     }
     /** GET /meta */
-    getMeta() {
-        return this.request("GET", "/meta");
+    async getMeta() {
+        const meta = await this.request("GET", "/meta");
+        if (meta.version !== 2) {
+            throw new Error(`Protocol version mismatch: expected 2, got ${meta.version}`);
+        }
+        return meta;
     }
     /** GET /sessions */
     listSessions(params) {
@@ -61,7 +65,7 @@ class Client {
         }
         return this.request("GET", path);
     }
-    /** Fetches all session IDs across all pages. */
+    /** Fetches all sessions across all pages. */
     async listAllSessions() {
         const sessions = [];
         let after;
@@ -73,11 +77,12 @@ class Client {
         return sessions;
     }
     /** GET /session/:id */
-    getSession(sessionId, history) {
-        const path = history
-            ? `/session/${sessionId}?${new URLSearchParams({ history }).toString()}`
-            : `/session/${sessionId}`;
-        return this.request("GET", path);
+    getSession(sessionId) {
+        return this.request("GET", `/session/${sessionId}`);
+    }
+    /** GET /session/:id/history */
+    getSessionHistory(sessionId, type) {
+        return this.request("GET", `/session/${sessionId}/history?${new URLSearchParams({ type }).toString()}`);
     }
     createSession(req) {
         if (req.messages.at(-1)?.role !== "user")

package/dist/src/client.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/client.test.js

@@ -0,0 +1,193 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const client_1 = require("./client");
+const BASE_URL = "https://example.com";
+const API_KEY = "test-key";
+function mockFetch(body, status = 200) {
+    return vitest_1.vi.fn().mockResolvedValue({
+        ok: status >= 200 && status < 300,
+        status,
+        statusText: "OK",
+        json: () => Promise.resolve(body),
+        text: () => Promise.resolve(String(body)),
+        body: null,
+    });
+}
+function mockSSEFetch(events, status = 200) {
+    const chunks = events.map(({ event, ...data }) => new TextEncoder().encode(`event: ${event}\ndata: ${JSON.stringify(data)}\n\n`));
+    let i = 0;
+    const body = {
+        getReader: () => ({
+            read: async () => i < chunks.length ? { done: false, value: chunks[i++] } : { done: true, value: undefined },
+            releaseLock: vitest_1.vi.fn(),
+        }),
+    };
+    return vitest_1.vi.fn().mockResolvedValue({
+        ok: status >= 200 && status < 300,
+        status,
+        body,
+        text: () => Promise.resolve(""),
+    });
+}
+let client;
+(0, vitest_1.beforeEach)(() => {
+    client = new client_1.Client({ baseUrl: BASE_URL, apiKey: API_KEY });
+});
+(0, vitest_1.describe)("Client", () => {
+    (0, vitest_1.it)("strips trailing slash from baseUrl", () => {
+        const c = new client_1.Client({ baseUrl: BASE_URL + "/", apiKey: API_KEY });
+        const fetch = mockFetch({ version: 2, agents: [] });
+        vitest_1.vi.stubGlobal("fetch", fetch);
+        c.getMeta();
+        (0, vitest_1.expect)(fetch.mock.calls[0][0]).toBe(`${BASE_URL}/meta`);
+    });
+    (0, vitest_1.it)("sends Authorization header", async () => {
+        const fetch = mockFetch({ version: 2, agents: [] });
+        vitest_1.vi.stubGlobal("fetch", fetch);
+        await client.getMeta();
+        (0, vitest_1.expect)(fetch.mock.calls[0][1].headers["Authorization"]).toBe(`Bearer ${API_KEY}`);
+    });
+    (0, vitest_1.it)("getMeta: GET /meta", async () => {
+        const meta = { version: 2, agents: [] };
+        vitest_1.vi.stubGlobal("fetch", mockFetch(meta));
+        (0, vitest_1.expect)(await client.getMeta()).toEqual(meta);
+    });
+    (0, vitest_1.it)("getSession: GET /session/:id", async () => {
+        const session = { sessionId: "s1", agent: { name: "a" } };
+        vitest_1.vi.stubGlobal("fetch", mockFetch(session));
+        (0, vitest_1.expect)(await client.getSession("s1")).toEqual(session);
+    });
+    (0, vitest_1.it)("getSessionHistory: appends ?type=compacted", async () => {
+        const fetch = mockFetch({ history: { compacted: [] } });
+        vitest_1.vi.stubGlobal("fetch", fetch);
+        await client.getSessionHistory("s1", "compacted");
+        (0, vitest_1.expect)(fetch.mock.calls[0][0]).toBe(`${BASE_URL}/session/s1/history?type=compacted`);
+    });
+    (0, vitest_1.it)("getSessionHistory: appends ?type=full", async () => {
+        const fetch = mockFetch({ history: { full: [] } });
+        vitest_1.vi.stubGlobal("fetch", fetch);
+        await client.getSessionHistory("s1", "full");
+        (0, vitest_1.expect)(fetch.mock.calls[0][0]).toBe(`${BASE_URL}/session/s1/history?type=full`);
+    });
+    (0, vitest_1.it)("listSessions: GET /sessions without cursor", async () => {
+        const res = { sessions: [{ sessionId: "s1", agent: { name: "a" } }] };
+        const fetch = mockFetch(res);
+        vitest_1.vi.stubGlobal("fetch", fetch);
+        await client.listSessions();
+        (0, vitest_1.expect)(fetch.mock.calls[0][0]).toBe(`${BASE_URL}/sessions`);
+    });
+    (0, vitest_1.it)("listSessions: appends after param", async () => {
+        const fetch = mockFetch({ sessions: [] });
+        vitest_1.vi.stubGlobal("fetch", fetch);
+        await client.listSessions({ after: "cursor1" });
+        (0, vitest_1.expect)(fetch.mock.calls[0][0]).toBe(`${BASE_URL}/sessions?after=cursor1`);
+    });
+    (0, vitest_1.it)("listAllSessions: paginates until no next", async () => {
+        const s1 = { sessionId: "s1", agent: { name: "a" } };
+        const s2 = { sessionId: "s2", agent: { name: "a" } };
+        const fetch = vitest_1.vi
+            .fn()
+            .mockResolvedValueOnce({
+            ok: true,
+            status: 200,
+            json: () => Promise.resolve({ sessions: [s1], next: "c1" }),
+        })
+            .mockResolvedValueOnce({
+            ok: true,
+            status: 200,
+            json: () => Promise.resolve({ sessions: [s2] }),
+        });
+        vitest_1.vi.stubGlobal("fetch", fetch);
+        (0, vitest_1.expect)(await client.listAllSessions()).toEqual([s1, s2]);
+        (0, vitest_1.expect)(fetch).toHaveBeenCalledTimes(2);
+    });
+    (0, vitest_1.it)("deleteSession: DELETE /session/:id returns void on 204", async () => {
+        vitest_1.vi.stubGlobal("fetch", vitest_1.vi.fn().mockResolvedValue({ ok: true, status: 204 }));
+        await (0, vitest_1.expect)(client.deleteSession("s1")).resolves.toBeUndefined();
+    });
+    (0, vitest_1.it)("createSession: throws if last message is not a user message", () => {
+        vitest_1.vi.stubGlobal("fetch", mockFetch({}));
+        (0, vitest_1.expect)(() => client.createSession({
+            agent: { name: "a" },
+            messages: [{ role: "assistant", content: "hi" }],
+        })).toThrow("Last message must be a user message");
+    });
+    (0, vitest_1.it)("createSession: non-streaming returns AgentResponse", async () => {
+        const res = { sessionId: "s1", stopReason: "end_turn", messages: [] };
+        vitest_1.vi.stubGlobal("fetch", mockFetch(res, 201));
+        const result = await client.createSession({
+            agent: { name: "a" },
+            messages: [{ role: "user", content: "hi" }],
+        });
+        (0, vitest_1.expect)(result).toEqual(res);
+    });
+    (0, vitest_1.it)("createSession: streaming returns SSE events", async () => {
+        const events = [
+            { event: "session_start", sessionId: "s1" },
+            { event: "turn_start" },
+            { event: "turn_stop", stopReason: "end_turn" },
+        ];
+        vitest_1.vi.stubGlobal("fetch", mockSSEFetch(events));
+        const stream = await client.createSession({
+            agent: { name: "a" },
+            messages: [{ role: "user", content: "hi" }],
+            stream: "message",
+        });
+        const received = [];
+        for await (const e of stream)
+            received.push(e);
+        (0, vitest_1.expect)(received).toEqual(events);
+    });
+    (0, vitest_1.it)("sendTurn: non-streaming returns AgentResponse", async () => {
+        const res = { stopReason: "end_turn", messages: [] };
+        vitest_1.vi.stubGlobal("fetch", mockFetch(res));
+        const result = await client.sendTurn("s1", { messages: [{ role: "user", content: "hi" }] });
+        (0, vitest_1.expect)(result).toEqual(res);
+    });
+    (0, vitest_1.it)("sendTurn: streaming returns SSE events", async () => {
+        const events = [
+            { event: "turn_start" },
+            { event: "text", text: "hello" },
+            { event: "turn_stop", stopReason: "end_turn" },
+        ];
+        vitest_1.vi.stubGlobal("fetch", mockSSEFetch(events));
+        const stream = await client.sendTurn("s1", {
+            messages: [{ role: "user", content: "hi" }],
+            stream: "message",
+        });
+        const received = [];
+        for await (const e of stream)
+            received.push(e);
+        (0, vitest_1.expect)(received).toEqual(events);
+    });
+    (0, vitest_1.it)("streamRequest: throws ClientError on non-ok response", async () => {
+        vitest_1.vi.stubGlobal("fetch", vitest_1.vi.fn().mockResolvedValue({
+            ok: false,
+            status: 403,
+            body: null,
+            text: () => Promise.resolve("Forbidden"),
+        }));
+        await (0, vitest_1.expect)(client.createSession({
+            agent: { name: "a" },
+            messages: [{ role: "user", content: "hi" }],
+            stream: "delta",
+        })).rejects.toThrow(client_1.ClientError);
+    });
+    (0, vitest_1.it)("throws ClientError on non-ok response", async () => {
+        vitest_1.vi.stubGlobal("fetch", vitest_1.vi
+            .fn()
+            .mockResolvedValue({ ok: false, status: 401, text: () => Promise.resolve("Unauthorized") }));
+        await (0, vitest_1.expect)(client.getMeta()).rejects.toThrow(client_1.ClientError);
+    });
+    (0, vitest_1.it)("ClientError has correct properties", async () => {
+        vitest_1.vi.stubGlobal("fetch", vitest_1.vi
+            .fn()
+            .mockResolvedValue({ ok: false, status: 404, text: () => Promise.resolve("Not Found") }));
+        const err = await client.getSession("x").catch((e) => e);
+        (0, vitest_1.expect)(err).toBeInstanceOf(client_1.ClientError);
+        (0, vitest_1.expect)(err.status).toBe(404);
+        (0, vitest_1.expect)(err.method).toBe("GET");
+        (0, vitest_1.expect)(err.path).toBe("/session/x");
+    });
+});

package/dist/src/examples/basic/index.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/examples/basic/index.js

@@ -0,0 +1,88 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+const readline = __importStar(require("node:readline/promises"));
+const node_process_1 = require("node:process");
+const index_js_1 = require("../../index.js");
+const BASE_URL = process.env.BASE_URL ?? "http://localhost:3010";
+const API_KEY = process.env.API_KEY ?? "";
+function extractText(content) {
+    if (!content)
+        return "";
+    if (typeof content === "string")
+        return content;
+    if (Array.isArray(content))
+        return content
+            .filter((b) => b.type === "text")
+            .map((b) => b.text)
+            .join("");
+    return String(content);
+}
+const prompts = [
+    "What is the capital of France?",
+    "What is 12 * 8?",
+    "Summarize what we discussed.",
+];
+async function main() {
+    const client = new index_js_1.Client({ baseUrl: BASE_URL, apiKey: API_KEY });
+    const meta = await client.getMeta();
+    const agentInfo = meta.agents[0];
+    if (!agentInfo)
+        throw new Error("No agents available");
+    // Prompt for agent options
+    const options = {};
+    if (agentInfo.options?.length) {
+        const rl = readline.createInterface({ input: node_process_1.stdin, output: node_process_1.stdout });
+        for (const opt of agentInfo.options) {
+            const hint = opt.type === "secret" ? "(secret)" : `default: ${opt.default}`;
+            const answer = await rl.question(`${opt.title ?? opt.name} [${hint}]: `);
+            if (answer)
+                options[opt.name] = answer;
+        }
+        rl.close();
+    }
+    const { session } = await index_js_1.Session.create(client, {
+        agent: { name: agentInfo.name, options: Object.keys(options).length ? options : undefined },
+        messages: [{ role: "user", content: prompts[0] }],
+    }, agentInfo);
+    console.log(`\n[user] ${prompts[0]}`);
+    console.log(`[assistant] ${extractText(session.history.at(-1)?.content)}\n`);
+    for (const prompt of prompts.slice(1)) {
+        await session.send({ messages: [{ role: "user", content: prompt }] });
+        console.log(`[user] ${prompt}`);
+        console.log(`[assistant] ${extractText(session.history.at(-1)?.content)}\n`);
+    }
+}
+main().catch(console.error);

package/dist/src/examples/cli/index.d.ts

@@ -0,0 +1,16 @@
+#!/usr/bin/env node
+/**
+ * AAP CLI — interactive chat client
+ *
+ * Usage: BASE_URL=http://localhost:3010 API_KEY=secret tsx src/examples/cli/index.ts [agent-name]
+ *
+ * Slash commands:
+ *   /stream delta|message|none   — set streaming mode
+ *   /enable <tool>               — enable a server or client tool
+ *   /disable <tool>              — disable a server or client tool
+ *   /trust <tool>                — trust a tool (server: run inline; client: auto-execute without confirmation)
+ *   /set <option>=<value>        — set an agent option
+ *   /help                        — show this help
+ *   /quit                        — exit
+ */
+export {};

package/dist/src/examples/cli/index.js

@@ -0,0 +1,355 @@
+#!/usr/bin/env node
+"use strict";
+/**
+ * AAP CLI — interactive chat client
+ *
+ * Usage: BASE_URL=http://localhost:3010 API_KEY=secret tsx src/examples/cli/index.ts [agent-name]
+ *
+ * Slash commands:
+ *   /stream delta|message|none   — set streaming mode
+ *   /enable <tool>               — enable a server or client tool
+ *   /disable <tool>              — disable a server or client tool
+ *   /trust <tool>                — trust a tool (server: run inline; client: auto-execute without confirmation)
+ *   /set <option>=<value>        — set an agent option
+ *   /help                        — show this help
+ *   /quit                        — exit
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+const readline = __importStar(require("node:readline/promises"));
+const node_process_1 = require("node:process");
+const client_js_1 = require("../../client.js");
+const session_js_1 = require("../../session.js");
+const BASE_URL = process.env.BASE_URL ?? "http://localhost:3010";
+const API_KEY = process.env.API_KEY ?? "";
+const client = new client_js_1.Client({ baseUrl: BASE_URL, apiKey: API_KEY });
+// --- built-in client tools ---
+const CLIENT_TOOLS = {
+    calculate: {
+        spec: {
+            name: "calculate",
+            description: "Evaluate a mathematical expression",
+            inputSchema: {
+                type: "object",
+                properties: {
+                    expression: {
+                        type: "string",
+                        description: "Math expression to evaluate",
+                    },
+                },
+                required: ["expression"],
+            },
+        },
+        exec: (input) => {
+            const { expression } = input;
+            try {
+                if (!/^[\d\s+\-*/().%^]+$/.test(expression))
+                    return "Error: invalid expression";
+                return Function(`"use strict"; return (${expression})`)();
+            }
+            catch {
+                return "Error: could not evaluate expression";
+            }
+        },
+    },
+};
+// --- state ---
+let streamMode = "delta";
+const enabledTools = new Set(); // enabled server and client tools
+const trustedTools = new Set(); // trusted: server tools run inline; client tools auto-execute
+const agentOptions = {};
+let rl;
+function isClientTool(name) {
+    return name in CLIENT_TOOLS;
+}
+function printHelp(agent) {
+    console.log("Commands:");
+    console.log("  /stream delta|message|none");
+    console.log("  /enable <tool>   — enable a server or client tool");
+    console.log("  /disable <tool>  — disable a server or client tool");
+    console.log("  /trust <tool>    — trust a tool (server: inline; client: auto-execute)");
+    console.log("  /set <option>=<value>");
+    console.log("  /help  /quit");
+    if (agent.tools?.length)
+        console.log("Server tools:", agent.tools.map((t) => t.name).join(", "));
+    if (agent.options?.length)
+        console.log("Options:", agent.options.map((o) => `${o.name} (default: ${o.default})`).join(", "));
+    console.log("Client tools:", Object.keys(CLIENT_TOOLS).join(", "));
+}
+function handleCommand(line, agent) {
+    const [cmd, ...args] = line.slice(1).trim().split(/\s+/);
+    switch (cmd) {
+        case "stream": {
+            const mode = args[0];
+            if (!["delta", "message", "none"].includes(mode)) {
+                console.log("Usage: /stream delta|message|none");
+            }
+            else {
+                streamMode = mode;
+                console.log(`Stream mode: ${streamMode}`);
+            }
+            return true;
+        }
+        case "enable": {
+            const tool = args[0];
+            if (!tool) {
+                console.log("Usage: /enable <tool>");
+                return true;
+            }
+            enabledTools.add(tool);
+            console.log(`Enabled: ${tool}`);
+            return true;
+        }
+        case "disable": {
+            const tool = args[0];
+            if (!tool) {
+                console.log("Usage: /disable <tool>");
+                return true;
+            }
+            enabledTools.delete(tool);
+            console.log(`Disabled: ${tool}`);
+            return true;
+        }
+        case "trust": {
+            const tool = args[0];
+            if (!tool) {
+                console.log("Usage: /trust <tool>");
+                return true;
+            }
+            if (trustedTools.has(tool)) {
+                trustedTools.delete(tool);
+                console.log(`Untrusted: ${tool}`);
+            }
+            else {
+                trustedTools.add(tool);
+                console.log(`Trusted: ${tool}`);
+            }
+            return true;
+        }
+        case "set": {
+            const [key, ...rest] = args.join(" ").split("=");
+            const value = rest.join("=");
+            if (!key || value === undefined) {
+                console.log("Usage: /set <option>=<value>");
+                return true;
+            }
+            const name = key.trim();
+            if (!agent.options?.some((o) => o.name === name)) {
+                console.log(`Unknown option: ${name}`);
+                return true;
+            }
+            agentOptions[name] = value;
+            console.log(`Set ${name} = ${value}`);
+            return true;
+        }
+        case "help":
+            printHelp(agent);
+            return true;
+        case "quit":
+            process.exit(0);
+    }
+    return false;
+}
+let inDelta = false;
+function sseCallback(e) {
+    if (e.event === "text_delta") {
+        process.stdout.write(e.delta);
+        inDelta = true;
+    }
+    else if (e.event === "thinking_delta") {
+        process.stdout.write(`\x1b[2m${e.delta}\x1b[0m`);
+        inDelta = true;
+    }
+    else {
+        if (inDelta) {
+            process.stdout.write("\n");
+            inDelta = false;
+        }
+        if (e.event === "text")
+            console.log(e.text);
+        else if (e.event === "thinking")
+            console.log(`\x1b[2m${e.thinking}\x1b[0m`);
+        else if (e.event === "tool_call")
+            console.log(`[tool call: ${e.name}(${JSON.stringify(e.input)})]`);
+    }
+}
+function printLastAssistant(session) {
+    if (streamMode !== "none")
+        return;
+    const last = session.history.at(-1);
+    if (last?.role !== "assistant")
+        return;
+    const text = typeof last.content === "string"
+        ? last.content
+        : last.content
+            .filter((b) => b.type === "text")
+            .map((b) => b.text)
+            .join("");
+    if (text)
+        console.log(`Assistant: ${text}`);
+}
+async function confirm(prompt) {
+    const answer = await rl.question(prompt);
+    return answer.toLowerCase().startsWith("y");
+}
+/** Resolve pending tool calls, prompting for untrusted ones, looping until none remain. */
+async function resolvePending(session, pending) {
+    while (pending.client.length > 0 || pending.server.length > 0) {
+        const messages = [];
+        // client tools
+        for (const t of pending.client) {
+            const tool = CLIENT_TOOLS[t.name];
+            if (!tool) {
+                messages.push({
+                    role: "tool",
+                    toolCallId: t.toolCallId,
+                    content: `Unknown tool: ${t.name}`,
+                });
+                continue;
+            }
+            if (!trustedTools.has(t.name) &&
+                !(await confirm(`Allow ${t.name}(${JSON.stringify(t.input)})? [y/N] `))) {
+                messages.push({
+                    role: "tool",
+                    toolCallId: t.toolCallId,
+                    content: "Tool use denied by user",
+                });
+                continue;
+            }
+            const result = String(tool.exec(t.input));
+            console.log(`[${t.name} → ${result}]`);
+            messages.push({
+                role: "tool",
+                toolCallId: t.toolCallId,
+                content: result,
+            });
+        }
+        // untrusted server tools — prompt for permission
+        const permissions = [];
+        for (const t of pending.server) {
+            const granted = await confirm(`Allow server tool ${t.name}(${JSON.stringify(t.input)})? [y/N] `);
+            permissions.push({
+                role: "tool_permission",
+                toolCallId: t.toolCallId,
+                granted,
+                reason: granted ? undefined : "denied by user",
+            });
+        }
+        pending = await session.send({
+            messages: [...messages, ...permissions],
+            stream: streamMode === "none" ? undefined : streamMode,
+        }, sseCallback);
+        printLastAssistant(session);
+    }
+}
+function getServerTools(agentInfo) {
+    return agentInfo.tools
+        ?.filter((t) => enabledTools.has(t.name))
+        .map((t) => ({ name: t.name, trust: trustedTools.has(t.name) }));
+}
+function getClientTools() {
+    return Object.values(CLIENT_TOOLS)
+        .filter((t) => enabledTools.has(t.spec.name))
+        .map((t) => t.spec);
+}
+async function main() {
+    const meta = await client.getMeta();
+    const agentName = process.argv[2] ?? meta.agents[0]?.name;
+    const agentInfo = meta.agents.find((a) => a.name === agentName);
+    if (!agentInfo) {
+        console.error(`Agent "${agentName}" not found. Available: ${meta.agents.map((a) => a.name).join(", ")}`);
+        process.exit(1);
+    }
+    console.log(`Connected to ${agentInfo.title ?? agentInfo.name} (${agentInfo.version})`);
+    if (agentInfo.description)
+        console.log(agentInfo.description);
+    // enable all server and client tools by default
+    agentInfo.tools?.forEach((t) => enabledTools.add(t.name));
+    Object.keys(CLIENT_TOOLS).forEach((name) => enabledTools.add(name));
+    if (agentInfo.tools?.length)
+        console.log(`Server tools: ${agentInfo.tools.map((t) => t.name).join(", ")}`);
+    console.log(`Client tools: ${Object.keys(CLIENT_TOOLS).join(", ")}`);
+    if (agentInfo.options?.length)
+        console.log(`Options: ${agentInfo.options.map((o) => `${o.name}=${o.default}`).join(", ")}`);
+    console.log("Type /help for commands.\n");
+    rl = readline.createInterface({ input: node_process_1.stdin, output: node_process_1.stdout });
+    let firstInput;
+    while (true) {
+        firstInput = (await rl.question("You: ")).trim();
+        if (!firstInput)
+            continue;
+        if (firstInput.startsWith("/")) {
+            handleCommand(firstInput, agentInfo);
+            continue;
+        }
+        break;
+    }
+    const { session, pending } = await session_js_1.Session.create(client, {
+        agent: {
+            name: agentName,
+            tools: getServerTools(agentInfo),
+            options: Object.keys(agentOptions).length ? agentOptions : undefined,
+        },
+        tools: getClientTools(),
+        stream: streamMode === "none" ? undefined : streamMode,
+        messages: [{ role: "user", content: firstInput }],
+    }, agentInfo, sseCallback);
+    printLastAssistant(session);
+    await resolvePending(session, pending);
+    while (true) {
+        const input = (await rl.question("You: ")).trim();
+        if (!input)
+            continue;
+        if (input.startsWith("/")) {
+            handleCommand(input, agentInfo);
+            continue;
+        }
+        const turnPending = await session.send({
+            agent: {
+                tools: getServerTools(agentInfo),
+                options: Object.keys(agentOptions).length ? { ...agentOptions } : undefined,
+            },
+            tools: getClientTools(),
+            stream: streamMode === "none" ? undefined : streamMode,
+            messages: [{ role: "user", content: input }],
+        }, sseCallback);
+        printLastAssistant(session);
+        await resolvePending(session, turnPending);
+    }
+}
+main().catch((e) => {
+    console.error(e);
+    process.exit(1);
+});

package/dist/src/session.d.ts

@@ -1,4 +1,4 @@
-import { AgentConfig, AgentInfo, CreateSessionRequest, HistoryMessage, SessionTurnRequest, SSEEvent, ToolCallEvent, ToolSpec } from "@agentapplicationprotocol/core";
+import { AgentConfig, AgentInfo, CreateSessionRequest, HistoryMessage, SessionResponse, SessionTurnRequest, SSEEvent, ToolCallEvent, ToolSpec } from "@agentapplicationprotocol/core";
 import { Client } from "./client";
 /** Unresolved tool calls from a turn, split by origin. */
 export interface PendingToolUse {
@@ -31,9 +31,12 @@ export declare class Session {
     }>;
     /**
      * Loads an existing session and resolves any pending tool use.
+     * @param res - Session response from `client.getSession()`.
+     * @param agentInfo - Agent metadata matching the session's agent.
+     * @param history - If provided, fetches history of the given type.
      * @returns The loaded session and any pending tool calls.
      */
-    static load(client: Client, sessionId: string, agentInfo: AgentInfo, history?: "full" | "compacted"): Promise<{
+    static load(client: Client, res: SessionResponse, agentInfo: AgentInfo, history?: "full" | "compacted"): Promise<{
         session: Session;
         pending: PendingToolUse;
     }>;

package/dist/src/session.js

@@ -45,13 +45,18 @@ class Session {
     }
     /**
      * Loads an existing session and resolves any pending tool use.
+     * @param res - Session response from `client.getSession()`.
+     * @param agentInfo - Agent metadata matching the session's agent.
+     * @param history - If provided, fetches history of the given type.
      * @returns The loaded session and any pending tool calls.
      */
-    static async load(client, sessionId, agentInfo, history) {
-        const res = await client.getSession(sessionId, history);
-        const session = new Session(sessionId, client, agentInfo, res.agent, res.tools);
-        const h = history === "compacted" ? res.history?.compacted : res.history?.full;
-        session.history.push(...(h ?? []));
+    static async load(client, res, agentInfo, history) {
+        const session = new Session(res.sessionId, client, agentInfo, res.agent, res.tools);
+        if (history) {
+            const histRes = await client.getSessionHistory(res.sessionId, history);
+            const h = history === "compacted" ? histRes.history.compacted : histRes.history.full;
+            session.history.push(...(h ?? []));
+        }
         return { session, pending: (0, utils_1.resolvePendingToolUse)(session.history, session.tools) };
     }
     /**

package/dist/src/session.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/session.test.js

@@ -0,0 +1,198 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const client_1 = require("./client");
+const session_1 = require("./session");
+const BASE_URL = "https://example.com";
+const agentInfo = { name: "test-agent", version: "1.0.0" };
+function mockFetch(body, status = 200) {
+    return vitest_1.vi.fn().mockResolvedValue({
+        ok: status >= 200 && status < 300,
+        status,
+        json: () => Promise.resolve(body),
+        text: () => Promise.resolve(String(body)),
+        body: null,
+    });
+}
+function mockSSEFetch(events) {
+    const chunks = events.map(({ event, ...data }) => new TextEncoder().encode(`event: ${event}\ndata: ${JSON.stringify(data)}\n\n`));
+    let i = 0;
+    const body = {
+        getReader: () => ({
+            read: async () => i < chunks.length ? { done: false, value: chunks[i++] } : { done: true, value: undefined },
+            releaseLock: vitest_1.vi.fn(),
+        }),
+    };
+    return vitest_1.vi
+        .fn()
+        .mockResolvedValue({ ok: true, status: 200, body, text: () => Promise.resolve("") });
+}
+let client;
+(0, vitest_1.beforeEach)(() => {
+    client = new client_1.Client({ baseUrl: BASE_URL, apiKey: "key" });
+});
+(0, vitest_1.describe)("Session.load", () => {
+    const sessionRes = { sessionId: "s1", agent: { name: "test-agent" } };
+    (0, vitest_1.it)("returns session with correct sessionId and agentConfig", async () => {
+        const { session } = await session_1.Session.load(client, sessionRes, agentInfo);
+        (0, vitest_1.expect)(session.sessionId).toBe("s1");
+        (0, vitest_1.expect)(session.agentConfig).toEqual({ name: "test-agent" });
+        (0, vitest_1.expect)(session.agent).toBe(agentInfo);
+    });
+    (0, vitest_1.it)("populates history from full history", async () => {
+        const history = [{ role: "user", content: "hi" }];
+        vitest_1.vi.stubGlobal("fetch", mockFetch({ history: { full: history } }));
+        const { session } = await session_1.Session.load(client, sessionRes, agentInfo, "full");
+        (0, vitest_1.expect)(session.history).toEqual(history);
+    });
+    (0, vitest_1.it)("populates history from compacted history", async () => {
+        const history = [{ role: "user", content: "summary" }];
+        vitest_1.vi.stubGlobal("fetch", mockFetch({ history: { compacted: history } }));
+        const { session } = await session_1.Session.load(client, sessionRes, agentInfo, "compacted");
+        (0, vitest_1.expect)(session.history).toEqual(history);
+    });
+    (0, vitest_1.it)("returns empty history when no history in response", async () => {
+        vitest_1.vi.stubGlobal("fetch", mockFetch({ history: {} }));
+        const { session } = await session_1.Session.load(client, sessionRes, agentInfo, "full");
+        (0, vitest_1.expect)(session.history).toEqual([]);
+    });
+    (0, vitest_1.it)("resolves pending client tool use from history", async () => {
+        const tools = [
+            {
+                name: "myTool",
+                description: "d",
+                inputSchema: { type: "object", properties: {} },
+            },
+        ];
+        const history = [
+            { role: "user", content: "go" },
+            {
+                role: "assistant",
+                content: [{ type: "tool_use", toolCallId: "tc1", name: "myTool", input: {} }],
+            },
+        ];
+        vitest_1.vi.stubGlobal("fetch", mockFetch({ history: { full: history } }));
+        const res = { sessionId: "s1", agent: { name: "test-agent" }, tools };
+        const { pending } = await session_1.Session.load(client, res, agentInfo, "full");
+        (0, vitest_1.expect)(pending.client).toEqual([{ toolCallId: "tc1", name: "myTool", input: {} }]);
+        (0, vitest_1.expect)(pending.server).toEqual([]);
+    });
+    (0, vitest_1.it)("calls getSessionHistory with correct type param", async () => {
+        const fetch = mockFetch({ history: { compacted: [] } });
+        vitest_1.vi.stubGlobal("fetch", fetch);
+        await session_1.Session.load(client, sessionRes, agentInfo, "compacted");
+        (0, vitest_1.expect)(fetch.mock.calls[0][0]).toBe(`${BASE_URL}/session/s1/history?type=compacted`);
+    });
+    (0, vitest_1.it)("does not fetch when no history requested", async () => {
+        const fetch = vitest_1.vi.fn();
+        vitest_1.vi.stubGlobal("fetch", fetch);
+        await session_1.Session.load(client, sessionRes, agentInfo);
+        (0, vitest_1.expect)(fetch).not.toHaveBeenCalled();
+    });
+});
+(0, vitest_1.describe)("Session.create", () => {
+    (0, vitest_1.it)("non-streaming: builds session and history", async () => {
+        const res = {
+            sessionId: "s1",
+            stopReason: "end_turn",
+            messages: [{ role: "assistant", content: "hi" }],
+        };
+        vitest_1.vi.stubGlobal("fetch", mockFetch(res, 201));
+        const { session, pending } = await session_1.Session.create(client, { agent: { name: "test-agent" }, messages: [{ role: "user", content: "hello" }] }, agentInfo);
+        (0, vitest_1.expect)(session.sessionId).toBe("s1");
+        (0, vitest_1.expect)(session.history).toHaveLength(2);
+        (0, vitest_1.expect)(pending).toEqual({ client: [], server: [] });
+    });
+    (0, vitest_1.it)("streaming: builds session from SSE events and calls cb", async () => {
+        const events = [
+            { event: "session_start", sessionId: "s2" },
+            { event: "turn_start" },
+            { event: "text", text: "hey" },
+            { event: "turn_stop", stopReason: "end_turn" },
+        ];
+        vitest_1.vi.stubGlobal("fetch", mockSSEFetch(events));
+        const cb = vitest_1.vi.fn();
+        const { session } = await session_1.Session.create(client, {
+            agent: { name: "test-agent" },
+            messages: [{ role: "user", content: "hello" }],
+            stream: "message",
+        }, agentInfo, cb);
+        (0, vitest_1.expect)(session.sessionId).toBe("s2");
+        (0, vitest_1.expect)(cb).toHaveBeenCalledTimes(events.length);
+    });
+});
+(0, vitest_1.describe)("Session.send", () => {
+    async function makeSession() {
+        const res = { sessionId: "s1", stopReason: "end_turn", messages: [] };
+        vitest_1.vi.stubGlobal("fetch", mockFetch(res, 201));
+        const { session } = await session_1.Session.create(client, { agent: { name: "test-agent" }, messages: [{ role: "user", content: "hi" }] }, agentInfo);
+        return session;
+    }
+    (0, vitest_1.it)("non-streaming: appends messages and returns pending", async () => {
+        const session = await makeSession();
+        const turnRes = {
+            stopReason: "end_turn",
+            messages: [{ role: "assistant", content: "reply" }],
+        };
+        vitest_1.vi.stubGlobal("fetch", mockFetch(turnRes));
+        const pending = await session.send({ messages: [{ role: "user", content: "next" }] });
+        (0, vitest_1.expect)(session.history).toHaveLength(3);
+        (0, vitest_1.expect)(pending).toEqual({ client: [], server: [] });
+    });
+    (0, vitest_1.it)("streaming: appends messages and calls cb", async () => {
+        const session = await makeSession();
+        const events = [
+            { event: "turn_start" },
+            { event: "text", text: "streamed" },
+            { event: "turn_stop", stopReason: "end_turn" },
+        ];
+        vitest_1.vi.stubGlobal("fetch", mockSSEFetch(events));
+        const cb = vitest_1.vi.fn();
+        await session.send({ messages: [{ role: "user", content: "next" }], stream: "message" }, cb);
+        (0, vitest_1.expect)(cb).toHaveBeenCalledTimes(events.length);
+    });
+    (0, vitest_1.it)("strips unchanged tools from request", async () => {
+        const session = await makeSession();
+        const tools = [
+            { name: "t", description: "d", inputSchema: { type: "object", properties: {} } },
+        ];
+        session.tools = tools;
+        const fetch = mockFetch({ stopReason: "end_turn", messages: [] });
+        vitest_1.vi.stubGlobal("fetch", fetch);
+        await session.send({ messages: [{ role: "user", content: "hi" }], tools });
+        const body = JSON.parse(fetch.mock.calls[0][1].body);
+        (0, vitest_1.expect)(body.tools).toBeUndefined();
+    });
+    (0, vitest_1.it)("sends changed tools and updates session.tools", async () => {
+        const session = await makeSession();
+        const newTools = [
+            { name: "t2", description: "d", inputSchema: { type: "object", properties: {} } },
+        ];
+        const fetch = mockFetch({ stopReason: "end_turn", messages: [] });
+        vitest_1.vi.stubGlobal("fetch", fetch);
+        await session.send({ messages: [{ role: "user", content: "hi" }], tools: newTools });
+        const body = JSON.parse(fetch.mock.calls[0][1].body);
+        (0, vitest_1.expect)(body.tools).toEqual(newTools);
+        (0, vitest_1.expect)(session.tools).toEqual(newTools);
+    });
+    (0, vitest_1.it)("sends only changed agent options", async () => {
+        const session = await makeSession();
+        session.agentConfig = { name: "test-agent", options: { model: "gpt-4" } };
+        const fetch = mockFetch({ stopReason: "end_turn", messages: [] });
+        vitest_1.vi.stubGlobal("fetch", fetch);
+        await session.send({
+            messages: [{ role: "user", content: "hi" }],
+            agent: { options: { model: "gpt-4o", temperature: "0.5" } },
+        });
+        const body = JSON.parse(fetch.mock.calls[0][1].body);
+        (0, vitest_1.expect)(body.agent.options).toEqual({ model: "gpt-4o", temperature: "0.5" });
+    });
+    (0, vitest_1.it)("omits agent if nothing changed", async () => {
+        const session = await makeSession();
+        const fetch = mockFetch({ stopReason: "end_turn", messages: [] });
+        vitest_1.vi.stubGlobal("fetch", fetch);
+        await session.send({ messages: [{ role: "user", content: "hi" }] });
+        const body = JSON.parse(fetch.mock.calls[0][1].body);
+        (0, vitest_1.expect)(body.agent).toBeUndefined();
+    });
+});

package/dist/src/utils.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/utils.test.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const utils_1 = require("./utils");
+(0, vitest_1.describe)("resolvePendingToolUse", () => {
+    const clientTool = {
+        name: "client_tool",
+        description: "d",
+        inputSchema: { type: "object" },
+    };
+    (0, vitest_1.it)("classifies client and server tools", () => {
+        const messages = [
+            {
+                role: "assistant",
+                content: [
+                    { type: "tool_use", toolCallId: "c1", name: "client_tool", input: {} },
+                    { type: "tool_use", toolCallId: "s1", name: "server_tool", input: {} },
+                ],
+            },
+        ];
+        const { client, server } = (0, utils_1.resolvePendingToolUse)(messages, [clientTool]);
+        (0, vitest_1.expect)(client).toEqual([{ toolCallId: "c1", name: "client_tool", input: {} }]);
+        (0, vitest_1.expect)(server).toEqual([{ toolCallId: "s1", name: "server_tool", input: {} }]);
+    });
+    (0, vitest_1.it)("skips tool_use blocks already resolved by tool_result", () => {
+        const messages = [
+            {
+                role: "assistant",
+                content: [{ type: "tool_use", toolCallId: "c1", name: "client_tool", input: {} }],
+            },
+            { role: "tool", toolCallId: "c1", content: "done" },
+        ];
+        (0, vitest_1.expect)((0, utils_1.resolvePendingToolUse)(messages, [clientTool])).toEqual({ client: [], server: [] });
+    });
+    (0, vitest_1.it)("returns empty if last assistant message has string content", () => {
+        const messages = [{ role: "assistant", content: "plain" }];
+        (0, vitest_1.expect)((0, utils_1.resolvePendingToolUse)(messages)).toEqual({ client: [], server: [] });
+    });
+    (0, vitest_1.it)("returns empty if no assistant message in history", () => {
+        const messages = [{ role: "user", content: "hi" }];
+        (0, vitest_1.expect)((0, utils_1.resolvePendingToolUse)(messages)).toEqual({ client: [], server: [] });
+    });
+    (0, vitest_1.it)("finds last assistant message even if not the last message", () => {
+        const messages = [
+            {
+                role: "assistant",
+                content: [{ type: "tool_use", toolCallId: "c1", name: "client_tool", input: {} }],
+            },
+            { role: "tool", toolCallId: "c1", content: "done" },
+            { role: "user", content: "thanks" },
+        ];
+        (0, vitest_1.expect)((0, utils_1.resolvePendingToolUse)(messages, [clientTool])).toEqual({ client: [], server: [] });
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentapplicationprotocol/client",
-  "version": "0.4.2",
+  "version": "0.6.0",
   "description": "AAP client",
   "keywords": [
     "aap",
@@ -29,7 +29,7 @@
   "types": "dist/src/index.d.ts",
   "dependencies": {
     "eventsource-parser": "^3.0.6",
-    "@agentapplicationprotocol/core": "0.4.2"
+    "@agentapplicationprotocol/core": "0.6.0"
   },
   "scripts": {
     "build": "tsc",