@agentapplicationprotocol/server 0.6.0 → 0.7.0

package/dist/src/agent.js

@@ -62,7 +62,7 @@ class Agent {
             name,
             title: options.title,
             description: options.description ?? "",
-            inputSchema: zod_1.default.toJSONSchema(options.inputSchema),
+            parameters: zod_1.default.toJSONSchema(options.inputSchema),
         });
         this.tools.set(name, async (input) => {
             const output = await exec(options.inputSchema.parse(JSON.parse(input)));

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

@@ -64,9 +64,9 @@ const handler = {
             apiKey: req.agent.options?.apiKey || undefined,
         });
         const model = new model_js_1.AiModelProvider(openai.chat(req.agent.options?.model ?? "gpt-4o"));
-        const session = new session_js_1.Session(sessionId, agent, model, req.agent, req.tools);
+        const session = new session_js_1.Session(sessionId, agent, model, req.agent, req.tools ?? [], req.messages ?? []);
         sessions.set(sessionId, session);
-        return session.runNewSession(req);
+        return Promise.resolve({ sessionId });
     },
     sendTurn(sessionId, req) {
         const session = sessions.get(sessionId);

package/dist/src/examples/compact-history/index.js

@@ -62,9 +62,9 @@ const handler = {
             apiKey: req.agent.options?.apiKey || undefined,
         });
         const model = new model_js_1.AiModelProvider(openai.chat(req.agent.options?.model ?? "gpt-4o"));
-        const session = new session_js_1.TruncatedHistorySession(sessionId, agent, model, req.agent, req.tools);
+        const session = new session_js_1.TruncatedHistorySession(sessionId, agent, model, req.agent, req.tools ?? [], req.messages ?? []);
         session_js_1.sessions.set(sessionId, session);
-        return session.runNewSession(req);
+        return Promise.resolve({ sessionId });
     },
     sendTurn(sessionId, req) {
         const session = session_js_1.sessions.get(sessionId);

package/dist/src/model.js

@@ -168,7 +168,7 @@ function toToolSet(tools) {
     for (const t of tools) {
         res[t.name] = (0, ai_1.tool)({
             description: t.description,
-            inputSchema: (0, ai_1.jsonSchema)(t.inputSchema),
+            inputSchema: (0, ai_1.jsonSchema)(t.parameters),
         });
     }
     return res;

package/dist/src/server.d.ts

@@ -7,8 +7,7 @@ export interface Handler {
     }): Promise<SessionListResponse>;
     getSession(sessionId: string): Promise<SessionResponse>;
     getSessionHistory(sessionId: string, type: "compacted" | "full"): Promise<HistoryMessage[]>;
-    /** The last message in `req.messages` is guaranteed to be a user message. */
-    createSession(req: CreateSessionRequest): Promise<CreateSessionResponse> | AsyncIterable<SSEEvent>;
+    createSession(req: CreateSessionRequest): Promise<CreateSessionResponse>;
     sendTurn(sessionId: string, req: SessionTurnRequest): Promise<AgentResponse> | AsyncIterable<SSEEvent>;
     deleteSession(sessionId: string): Promise<void>;
 }

package/dist/src/server.js

@@ -41,18 +41,13 @@ function redactSecretOptions(session, agents) {
  */
 function aap(handler) {
     const router = new hono_1.Hono();
-    router.get("/meta", (c) => c.json({ version: 2, ...handler.getMeta() }));
-    router.put("/session", async (c) => {
+    router.get("/meta", (c) => c.json({ version: 3, ...handler.getMeta() }));
+    router.post("/sessions", async (c) => {
         const req = await c.req.json();
-        if (req.messages.at(-1)?.role !== "user")
-            return c.json({ error: "Last message must be a user message" }, 400);
         const result = await handler.createSession(req);
-        if (req.stream === "delta" || req.stream === "message") {
-            return (0, streaming_1.streamSSE)(c, (stream) => writeSSEEvents(stream, result));
-        }
         return c.json(result, 201);
     });
-    router.post("/session/:id", async (c) => {
+    router.post("/sessions/:id/turns", async (c) => {
         const req = await c.req.json();
         const result = await handler.sendTurn(c.req.param("id"), req);
         if (req.stream === "delta" || req.stream === "message") {
@@ -60,12 +55,12 @@ function aap(handler) {
         }
         return c.json(result);
     });
-    router.get("/session/:id", async (c) => {
+    router.get("/sessions/:id", async (c) => {
         const session = await handler.getSession(c.req.param("id"));
         const { agents } = handler.getMeta();
         return c.json(redactSecretOptions(session, agents));
     });
-    router.get("/session/:id/history", async (c) => {
+    router.get("/sessions/:id/history", async (c) => {
         const typeParam = c.req.query("type");
         if (typeParam !== "compacted" && typeParam !== "full")
             return c.json({ error: 'type must be "compacted" or "full"' }, 400);
@@ -74,9 +69,14 @@ function aap(handler) {
     });
     router.get("/sessions", async (c) => {
         const after = c.req.query("after");
-        return c.json(await handler.listSessions({ after }));
+        const result = await handler.listSessions({ after });
+        const { agents } = handler.getMeta();
+        return c.json({
+            ...result,
+            sessions: result.sessions.map((s) => redactSecretOptions(s, agents)),
+        });
     });
-    router.delete("/session/:id", async (c) => {
+    router.delete("/sessions/:id", async (c) => {
         await handler.deleteSession(c.req.param("id"));
         return new Response(null, { status: 204 });
     });

package/dist/src/server.test.js

@@ -5,10 +5,10 @@ const hono_1 = require("hono");
 const bearer_auth_1 = require("hono/bearer-auth");
 const cors_1 = require("hono/cors");
 const server_1 = require("./server");
-const meta = { version: 2, agents: [] };
+const meta = { version: 3, agents: [] };
 const session = { sessionId: "s1", agent: { name: "a" } };
 const agentResponse = { stopReason: "end_turn", messages: [] };
-const createSessionResponse = { ...agentResponse, sessionId: "s1" };
+const createSessionResponse = { sessionId: "s1" };
 const sessionList = { sessions: [session] };
 async function* sseEvents() {
     yield { event: "turn_start" };
@@ -49,7 +49,7 @@ function req(method, path, body, headers) {
     });
     (0, vitest_1.it)("GET /session/:id returns session", async () => {
         const app = makeApp(makeHandler());
-        const res = await app.fetch(req("GET", "/session/s1"));
+        const res = await app.fetch(req("GET", "/sessions/s1"));
         (0, vitest_1.expect)(res.status).toBe(200);
         (0, vitest_1.expect)(await res.json()).toEqual(session);
     });
@@ -73,7 +73,7 @@ function req(method, path, body, headers) {
                 ],
             }),
         }));
-        const res = await app.fetch(req("GET", "/session/s1"));
+        const res = await app.fetch(req("GET", "/sessions/s1"));
         (0, vitest_1.expect)(res.status).toBe(200);
         (0, vitest_1.expect)(await res.json()).toEqual({
             ...secretSession,
@@ -88,45 +88,61 @@ function req(method, path, body, headers) {
         (0, vitest_1.expect)(await res.json()).toEqual(sessionList);
         (0, vitest_1.expect)(handler.listSessions).toHaveBeenCalledWith({ after: "cursor1" });
     });
-    (0, vitest_1.it)("PUT /session returns 400 if last message is not a user message", async () => {
-        const app = makeApp(makeHandler());
-        const res = await app.fetch(req("PUT", "/session", {
-            agent: { name: "a" },
-            messages: [{ role: "assistant", content: "hi" }],
+    (0, vitest_1.it)("GET /sessions redacts secret options in each session", async () => {
+        const secretSession = {
+            sessionId: "s1",
+            agent: { name: "a", options: { key: "mysecret", model: "gpt-4" } },
+        };
+        const app = makeApp(makeHandler({
+            listSessions: vitest_1.vi.fn().mockResolvedValue({ sessions: [secretSession] }),
+            getMeta: vitest_1.vi.fn().mockReturnValue({
+                agents: [
+                    {
+                        name: "a",
+                        version: "1.0.0",
+                        options: [
+                            { type: "secret", name: "key", default: "" },
+                            { type: "text", name: "model", default: "" },
+                        ],
+                    },
+                ],
+            }),
         }));
-        (0, vitest_1.expect)(res.status).toBe(400);
+        const res = await app.fetch(req("GET", "/sessions"));
+        (0, vitest_1.expect)(res.status).toBe(200);
+        (0, vitest_1.expect)(await res.json()).toEqual({
+            sessions: [
+                {
+                    ...secretSession,
+                    agent: { ...secretSession.agent, options: { key: "***", model: "gpt-4" } },
+                },
+            ],
+        });
     });
-    (0, vitest_1.it)("PUT /session returns 201 with AgentResponse", async () => {
+    (0, vitest_1.it)("POST /sessions returns 201 with sessionId", async () => {
         const app = makeApp(makeHandler());
-        const res = await app.fetch(req("PUT", "/session", { agent: { name: "a" }, messages: [{ role: "user", content: "hi" }] }));
+        const res = await app.fetch(req("POST", "/sessions", { agent: { name: "a" } }));
         (0, vitest_1.expect)(res.status).toBe(201);
         (0, vitest_1.expect)(await res.json()).toEqual(createSessionResponse);
     });
-    (0, vitest_1.it)("PUT /session with stream returns SSE", async () => {
-        const app = makeApp(makeHandler({ createSession: vitest_1.vi.fn().mockResolvedValue(sseEvents()) }));
-        const res = await app.fetch(req("PUT", "/session", {
-            agent: { name: "a" },
-            messages: [{ role: "user", content: "hi" }],
-            stream: "message",
-        }));
-        (0, vitest_1.expect)(res.status).toBe(200);
-        (0, vitest_1.expect)(res.headers.get("content-type")).toContain("text/event-stream");
-    });
-    (0, vitest_1.it)("POST /session/:id returns AgentResponse", async () => {
+    (0, vitest_1.it)("POST /sessions/:id/turns returns AgentResponse", async () => {
         const app = makeApp(makeHandler());
-        const res = await app.fetch(req("POST", "/session/s1", { messages: [{ role: "user", content: "hi" }] }));
+        const res = await app.fetch(req("POST", "/sessions/s1/turns", { messages: [{ role: "user", content: "hi" }] }));
         (0, vitest_1.expect)(res.status).toBe(200);
         (0, vitest_1.expect)(await res.json()).toEqual(agentResponse);
     });
-    (0, vitest_1.it)("POST /session/:id with stream returns SSE", async () => {
+    (0, vitest_1.it)("POST /sessions/:id/turns with stream returns SSE", async () => {
         const app = makeApp(makeHandler({ sendTurn: vitest_1.vi.fn().mockResolvedValue(sseEvents()) }));
-        const res = await app.fetch(req("POST", "/session/s1", { messages: [{ role: "user", content: "hi" }], stream: "delta" }));
+        const res = await app.fetch(req("POST", "/sessions/s1/turns", {
+            messages: [{ role: "user", content: "hi" }],
+            stream: "delta",
+        }));
         (0, vitest_1.expect)(res.status).toBe(200);
         (0, vitest_1.expect)(res.headers.get("content-type")).toContain("text/event-stream");
     });
     (0, vitest_1.it)("DELETE /session/:id returns 204", async () => {
         const app = makeApp(makeHandler());
-        const res = await app.fetch(req("DELETE", "/session/s1"));
+        const res = await app.fetch(req("DELETE", "/sessions/s1"));
         (0, vitest_1.expect)(res.status).toBe(204);
     });
     (0, vitest_1.it)("auth middleware: returns 401 when rejected", async () => {
@@ -159,7 +175,7 @@ function req(method, path, body, headers) {
             getSession: vitest_1.vi.fn().mockResolvedValue(sessionWithOptions),
             getMeta: vitest_1.vi.fn().mockReturnValue({ agents: [] }),
         }));
-        const res = await app.fetch(req("GET", "/session/s1"));
+        const res = await app.fetch(req("GET", "/sessions/s1"));
         (0, vitest_1.expect)(await res.json()).toEqual(sessionWithOptions);
     });
     (0, vitest_1.it)("GET /session/:id does not redact when agent has no secret options", async () => {
@@ -179,14 +195,14 @@ function req(method, path, body, headers) {
                 ],
             }),
         }));
-        const res = await app.fetch(req("GET", "/session/s1"));
+        const res = await app.fetch(req("GET", "/sessions/s1"));
         (0, vitest_1.expect)(await res.json()).toEqual(sessionWithOptions);
     });
     (0, vitest_1.it)("GET /session/:id/history?type=compacted calls getSessionHistory", async () => {
         const messages = [{ role: "user", content: "hi" }];
         const handler = makeHandler({ getSessionHistory: vitest_1.vi.fn().mockResolvedValue(messages) });
         const app = makeApp(handler);
-        const res = await app.fetch(req("GET", "/session/s1/history?type=compacted"));
+        const res = await app.fetch(req("GET", "/sessions/s1/history?type=compacted"));
         (0, vitest_1.expect)(res.status).toBe(200);
         (0, vitest_1.expect)(handler.getSessionHistory).toHaveBeenCalledWith("s1", "compacted");
         (0, vitest_1.expect)(await res.json()).toEqual({ history: { compacted: messages } });
@@ -195,14 +211,14 @@ function req(method, path, body, headers) {
         const messages = [{ role: "user", content: "hi" }];
         const handler = makeHandler({ getSessionHistory: vitest_1.vi.fn().mockResolvedValue(messages) });
         const app = makeApp(handler);
-        const res = await app.fetch(req("GET", "/session/s1/history?type=full"));
+        const res = await app.fetch(req("GET", "/sessions/s1/history?type=full"));
         (0, vitest_1.expect)(res.status).toBe(200);
         (0, vitest_1.expect)(handler.getSessionHistory).toHaveBeenCalledWith("s1", "full");
         (0, vitest_1.expect)(await res.json()).toEqual({ history: { full: messages } });
     });
     (0, vitest_1.it)("GET /session/:id/history without valid ?type returns 400", async () => {
         const app = makeApp(makeHandler());
-        const res = await app.fetch(req("GET", "/session/s1/history"));
+        const res = await app.fetch(req("GET", "/sessions/s1/history"));
         (0, vitest_1.expect)(res.status).toBe(400);
     });
 });

package/dist/src/session.d.ts

@@ -1,4 +1,4 @@
-import { HistoryMessage, ToolPermissionMessage, AgentConfig, ToolSpec, SSEEvent, AgentResponse, CreateSessionRequest, CreateSessionResponse, SessionTurnRequest, SessionResponse, DeltaSSEEvent } from "@agentapplicationprotocol/core";
+import { HistoryMessage, ToolPermissionMessage, AgentConfig, ToolSpec, SSEEvent, AgentResponse, SessionTurnRequest, SessionResponse, DeltaSSEEvent } from "@agentapplicationprotocol/core";
 import { ModelProvider } from "./model";
 import { Agent } from "./agent";
 /** Messages accepted as input to a turn: regular history messages or client-side tool permission responses. */
@@ -8,12 +8,12 @@ export declare class Session {
     sessionId: string;
     agent: Agent;
     agentConfig: AgentConfig;
-    /** Application-side tools declared for this session. */
+    /** Client-side tools declared for this session. */
     clientTools: ToolSpec[];
     /** Accumulated conversation history across all turns. */
     history: HistoryMessage[];
     model: ModelProvider;
-    constructor(sessionId: string, agent: Agent, model: ModelProvider, agentConfig: AgentConfig, clientTools?: ToolSpec[]);
+    constructor(sessionId: string, agent: Agent, model: ModelProvider, agentConfig: AgentConfig, clientTools: ToolSpec[], history: HistoryMessage[]);
     /** Resolves tool_permission messages into tool result messages by executing granted tools. */
     private resolvePermissions;
     /** Returns the set of trusted server tool names from agentConfig. */
@@ -54,8 +54,6 @@ export declare class Session {
      * Loops the LLM call as long as all tool calls are trusted and executed inline.
      */
     private runTurnNone;
-    /** Runs the first turn and wraps the result with `sessionId` for a `createSession` response. */
-    runNewSession(req: CreateSessionRequest): Promise<CreateSessionResponse> | AsyncIterable<SSEEvent>;
     /** Applies config overrides from the request that persist for the session lifetime: client tools, enabled/trusted agent tools, and agent options. */
     private applySessionOverrides;
     /** Routes to the appropriate turn runner based on the requested stream mode. */

package/dist/src/session.js

@@ -4,13 +4,13 @@ exports.Session = void 0;
 const core_1 = require("@agentapplicationprotocol/core");
 /** Manages a stateful conversation session, accumulating history across turns. */
 class Session {
-    constructor(sessionId, agent, model, agentConfig, clientTools = []) {
+    constructor(sessionId, agent, model, agentConfig, clientTools, history) {
         this.sessionId = sessionId;
         this.agent = agent;
         this.model = model;
         this.agentConfig = agentConfig;
         this.clientTools = clientTools;
-        this.history = [];
+        this.history = history;
     }
     /** Resolves tool_permission messages into tool result messages by executing granted tools. */
     async resolvePermissions(messages) {
@@ -210,18 +210,6 @@ class Session {
             newMessages.push(...next);
         }
     }
-    /** Runs the first turn and wraps the result with `sessionId` for a `createSession` response. */
-    runNewSession(req) {
-        const sessionId = this.sessionId;
-        const result = this.dispatchTurn(req.stream, req.messages);
-        if (result instanceof Promise) {
-            return result.then((res) => ({ ...res, sessionId }));
-        }
-        return (async function* () {
-            yield { event: "session_start", sessionId };
-            yield* result;
-        })();
-    }
     /** Applies config overrides from the request that persist for the session lifetime: client tools, enabled/trusted agent tools, and agent options. */
     applySessionOverrides(req) {
         // Override client-provided tools

package/dist/src/session.test.js

@@ -26,7 +26,7 @@ function makeAgent() {
     return agent;
 }
 function makeSession(agentConfig = { name: "test-agent" }, model = makeModel(), agent = makeAgent()) {
-    return new session_1.Session("sess-1", agent, model, agentConfig);
+    return new session_1.Session("sess-1", agent, model, agentConfig, [], []);
 }
 const userMsg = { role: "user", content: "hello" };
 (0, vitest_1.describe)("Session", () => {
@@ -45,7 +45,7 @@ const userMsg = { role: "user", content: "hello" };
     });
     (0, vitest_1.it)("toSessionResponse includes tools when clientTools is set", () => {
         const s = makeSession();
-        s.clientTools = [{ name: "t", description: "", inputSchema: {} }];
+        s.clientTools = [{ name: "t", description: "", parameters: {} }];
         (0, vitest_1.expect)(s.toSessionResponse().tools).toHaveLength(1);
     });
     (0, vitest_1.describe)("runTurn (none mode)", () => {
@@ -84,7 +84,7 @@ const userMsg = { role: "user", content: "hello" };
                     messages: [{ role: "assistant", content: "done" }],
                 }),
             });
-            const s = new session_1.Session("s", agent, model, agentConfig);
+            const s = new session_1.Session("s", agent, model, agentConfig, [], []);
             const res = await s.runTurn({ messages: [userMsg] });
             (0, vitest_1.expect)(res.stopReason).toBe("end_turn");
             (0, vitest_1.expect)(model.call).toHaveBeenCalledTimes(2);
@@ -106,7 +106,7 @@ const userMsg = { role: "user", content: "hello" };
                     ],
                 }),
             });
-            const s = new session_1.Session("s", agent, model, agentConfig);
+            const s = new session_1.Session("s", agent, model, agentConfig, [], []);
             const res = (await s.runTurn({ messages: [userMsg] }));
             (0, vitest_1.expect)(res.stopReason).toBe("tool_use");
             (0, vitest_1.expect)(model.call).toHaveBeenCalledTimes(1);
@@ -145,7 +145,7 @@ const userMsg = { role: "user", content: "hello" };
                     yield { event: "turn_stop", stopReason: "end_turn" };
                 }),
             });
-            const s = new session_1.Session("s", agent, model, agentConfig);
+            const s = new session_1.Session("s", agent, model, agentConfig, [], []);
             const events = [];
             for await (const e of s.runTurn({
                 messages: [userMsg],
@@ -210,7 +210,7 @@ const userMsg = { role: "user", content: "hello" };
                     messages: [{ role: "assistant", content: "done" }],
                 }),
             });
-            const s = new session_1.Session("s", agent, model, agentConfig);
+            const s = new session_1.Session("s", agent, model, agentConfig, [], []);
             const events = [];
             for await (const e of s.runTurn({
                 messages: [userMsg],
@@ -228,7 +228,7 @@ const userMsg = { role: "user", content: "hello" };
             const agentConfig = { name: "test-agent" };
             // Seed history with an assistant message containing a tool_use
             const model = makeModel();
-            const s = new session_1.Session("s", agent, model, agentConfig);
+            const s = new session_1.Session("s", agent, model, agentConfig, [], []);
             s.history = [
                 { role: "user", content: "hi" },
                 {
@@ -248,7 +248,7 @@ const userMsg = { role: "user", content: "hello" };
         (0, vitest_1.it)("resolves denied tool_permission with denial message", async () => {
             const agent = makeAgent();
             const model = makeModel();
-            const s = new session_1.Session("s", agent, model, { name: "test-agent" });
+            const s = new session_1.Session("s", agent, model, { name: "test-agent" }, [], []);
             s.history = [
                 {
                     role: "assistant",
@@ -266,7 +266,7 @@ const userMsg = { role: "user", content: "hello" };
     (0, vitest_1.describe)("applySessionOverrides via runTurn", () => {
         (0, vitest_1.it)("overrides clientTools when req.tools is provided", async () => {
             const s = makeSession();
-            const newTool = { name: "x", description: "", inputSchema: {} };
+            const newTool = { name: "x", description: "", parameters: {} };
             await s.runTurn({ messages: [userMsg], tools: [newTool] });
             (0, vitest_1.expect)(s.clientTools).toEqual([newTool]);
         });
@@ -281,23 +281,90 @@ const userMsg = { role: "user", content: "hello" };
             (0, vitest_1.expect)(s.agentConfig.options).toEqual({ model: "gpt-5" });
         });
     });
-    (0, vitest_1.describe)("runNewSession", () => {
-        (0, vitest_1.it)("returns CreateSessionResponse with sessionId (none mode)", async () => {
-            const s = makeSession();
-            const res = await s.runNewSession({ agent: { name: "test-agent" }, messages: [userMsg] });
-            (0, vitest_1.expect)(res.sessionId).toBe("sess-1");
-        });
-        (0, vitest_1.it)("yields session_start event first (delta mode)", async () => {
-            const s = makeSession();
-            const result = s.runNewSession({
-                agent: { name: "test-agent" },
+    (0, vitest_1.describe)("runTurn (delta mode) — untrusted tool stops loop", () => {
+        (0, vitest_1.it)("stops at untrusted tool in delta mode", async () => {
+            const agent = makeAgent();
+            const agentConfig = { name: "test-agent", tools: [] }; // echo not trusted
+            const model = makeModel({
+                stream: vitest_1.vi.fn().mockImplementationOnce(async function* () {
+                    yield {
+                        event: "tool_call",
+                        toolCallId: "c1",
+                        name: "echo",
+                        input: { msg: "hi" },
+                    };
+                    yield { event: "turn_stop", stopReason: "tool_use" };
+                }),
+            });
+            const s = new session_1.Session("s", agent, model, agentConfig, [], []);
+            const events = [];
+            for await (const e of s.runTurn({
                 messages: [userMsg],
                 stream: "delta",
+            }))
+                events.push(e);
+            (0, vitest_1.expect)(events.at(-1).event).toBe("turn_stop");
+            (0, vitest_1.expect)(model.stream).toHaveBeenCalledTimes(1);
+        });
+    });
+    (0, vitest_1.describe)("runTurn (message mode) — tool_use block and untrusted stop", () => {
+        (0, vitest_1.it)("yields tool_call event for tool_use blocks in message mode", async () => {
+            const model = makeModel({
+                call: vitest_1.vi.fn().mockResolvedValue({
+                    stopReason: "tool_use",
+                    messages: [
+                        {
+                            role: "assistant",
+                            content: [{ type: "tool_use", toolCallId: "c1", name: "echo", input: { msg: "hi" } }],
+                        },
+                    ],
+                }),
             });
+            const s = makeSession({ name: "test-agent" }, model);
             const events = [];
-            for await (const e of result)
+            for await (const e of s.runTurn({
+                messages: [userMsg],
+                stream: "message",
+            }))
+                events.push(e);
+            (0, vitest_1.expect)(events.some((e) => e.event === "tool_call")).toBe(true);
+        });
+        (0, vitest_1.it)("stops at untrusted tool in message mode", async () => {
+            const agent = makeAgent();
+            const agentConfig = { name: "test-agent", tools: [] };
+            const model = makeModel({
+                call: vitest_1.vi.fn().mockResolvedValue({
+                    stopReason: "tool_use",
+                    messages: [
+                        {
+                            role: "assistant",
+                            content: [{ type: "tool_use", toolCallId: "c1", name: "echo", input: { msg: "hi" } }],
+                        },
+                    ],
+                }),
+            });
+            const s = new session_1.Session("s", agent, model, agentConfig, [], []);
+            const events = [];
+            for await (const e of s.runTurn({
+                messages: [userMsg],
+                stream: "message",
+            }))
                 events.push(e);
-            (0, vitest_1.expect)(events[0]).toEqual({ event: "session_start", sessionId: "sess-1" });
+            (0, vitest_1.expect)(events.at(-1).event).toBe("turn_stop");
+            (0, vitest_1.expect)(model.call).toHaveBeenCalledTimes(1);
+        });
+    });
+    (0, vitest_1.describe)("lastToolUses", () => {
+        (0, vitest_1.it)("returns empty array when last assistant message has string content", async () => {
+            const s = makeSession();
+            s.history = [{ role: "assistant", content: "hello" }];
+            // runTurnNone will call lastToolUses; with string content it should return []
+            const model = makeModel({
+                call: vitest_1.vi.fn().mockResolvedValue({ stopReason: "end_turn", messages: [] }),
+            });
+            const s2 = new session_1.Session("s", makeAgent(), model, { name: "test-agent" }, [], [{ role: "assistant", content: "hello" }]);
+            const res = (await s2.runTurn({ messages: [userMsg] }));
+            (0, vitest_1.expect)(res.stopReason).toBe("end_turn");
         });
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentapplicationprotocol/server",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "AAP server",
   "keywords": [
     "aap",
@@ -31,7 +31,7 @@
     "ai": "^6.0.141",
     "hono": "^4.12.8",
     "zod": "^4.3.6",
-    "@agentapplicationprotocol/core": "0.6.0"
+    "@agentapplicationprotocol/core": "0.7.0"
   },
   "devDependencies": {
     "@ai-sdk/openai": "^3.0.48",