@agent-native/toolkit 0.218.0 → 0.220.0-nightly-20261023183804

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (59) hide show
  1. package/dist/app/agentkit/react/styles.css +13 -6
  2. package/dist/app/chat/AgentKitAssistantChat.d.ts +2 -0
  3. package/dist/app/chat/AgentKitAssistantChat.d.ts.map +1 -1
  4. package/dist/app/chat/AgentKitAssistantChat.js +11 -3
  5. package/dist/app/chat/AgentKitAssistantChat.js.map +1 -1
  6. package/dist/app/chat/AgentPanel.js +6 -6
  7. package/dist/app/chat/AgentPanel.js.map +1 -1
  8. package/dist/app/chat/MultiTabAssistantChat.d.ts.map +1 -1
  9. package/dist/app/chat/MultiTabAssistantChat.js +5 -3
  10. package/dist/app/chat/MultiTabAssistantChat.js.map +1 -1
  11. package/dist/app/chat/agentkit-chat/action-widget.d.ts.map +1 -1
  12. package/dist/app/chat/agentkit-chat/action-widget.js +1 -0
  13. package/dist/app/chat/agentkit-chat/action-widget.js.map +1 -1
  14. package/dist/app/chat/chat/surface-types.d.ts +2 -0
  15. package/dist/app/chat/chat/surface-types.d.ts.map +1 -1
  16. package/dist/app/chat/chat/surface-types.js.map +1 -1
  17. package/dist/app/chat/chat/tool-call-display.d.ts +3 -1
  18. package/dist/app/chat/chat/tool-call-display.d.ts.map +1 -1
  19. package/dist/app/chat/chat/tool-call-display.js +5 -4
  20. package/dist/app/chat/chat/tool-call-display.js.map +1 -1
  21. package/dist/app/chat/chat/tool-render-registry.d.ts +2 -0
  22. package/dist/app/chat/chat/tool-render-registry.d.ts.map +1 -1
  23. package/dist/app/chat/chat/tool-render-registry.js.map +1 -1
  24. package/dist/app/chat/conversation/AgentConversation.d.ts.map +1 -1
  25. package/dist/app/chat/conversation/AgentConversation.js +6 -1
  26. package/dist/app/chat/conversation/AgentConversation.js.map +1 -1
  27. package/dist/app/shared/CommandMenu.d.ts +2 -0
  28. package/dist/app/shared/CommandMenu.d.ts.map +1 -1
  29. package/dist/app/shared/CommandMenu.js +11 -6
  30. package/dist/app/shared/CommandMenu.js.map +1 -1
  31. package/dist/composer/ComposerContextMenu.d.ts.map +1 -1
  32. package/dist/composer/ComposerContextMenu.js +27 -2
  33. package/dist/composer/ComposerContextMenu.js.map +1 -1
  34. package/dist/composer/ComposerPlusMenu.d.ts.map +1 -1
  35. package/dist/composer/ComposerPlusMenu.js +50 -4
  36. package/dist/composer/ComposerPlusMenu.js.map +1 -1
  37. package/dist/composer/TiptapComposer.js +1 -1
  38. package/dist/composer/TiptapComposer.js.map +1 -1
  39. package/package.json +4 -4
  40. package/src/app/agentkit/react/components.spec.tsx +7 -5
  41. package/src/app/agentkit/react/styles.css +13 -6
  42. package/src/app/chat/AgentKitAssistantChat.spec.tsx +258 -27
  43. package/src/app/chat/AgentKitAssistantChat.tsx +15 -2
  44. package/src/app/chat/AgentPanel.tsx +8 -8
  45. package/src/app/chat/MultiTabAssistantChat.spec.tsx +17 -0
  46. package/src/app/chat/MultiTabAssistantChat.tsx +7 -2
  47. package/src/app/chat/agentkit-chat/action-widget.spec.tsx +62 -0
  48. package/src/app/chat/agentkit-chat/action-widget.tsx +1 -0
  49. package/src/app/chat/chat/surface-types.ts +2 -0
  50. package/src/app/chat/chat/tool-call-display.tsx +10 -1
  51. package/src/app/chat/chat/tool-render-registry.tsx +2 -0
  52. package/src/app/chat/conversation/AgentConversation.spec.tsx +51 -1
  53. package/src/app/chat/conversation/AgentConversation.tsx +11 -2
  54. package/src/app/shared/CommandMenu.spec.tsx +175 -6
  55. package/src/app/shared/CommandMenu.tsx +24 -7
  56. package/src/composer/ComposerContextMenu.tsx +32 -3
  57. package/src/composer/ComposerPlusMenu.parity.spec.tsx +96 -2
  58. package/src/composer/ComposerPlusMenu.tsx +48 -4
  59. package/src/composer/TiptapComposer.tsx +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@agent-native/toolkit",
3
- "version": "0.218.0",
3
+ "version": "0.220.0-nightly-20261023183804",
4
4
  "description": "Reusable app-building UI and helpers for Agent-Native apps.",
5
5
  "homepage": "https://github.com/BuilderIO/agent-native#readme",
6
6
  "bugs": {
@@ -685,7 +685,7 @@
685
685
  "y-protocols": "^1.0.7",
686
686
  "yjs": "^13.6.33",
687
687
  "zod": "^4.3.6",
688
- "@agent-native/agentkit": "^0.218.0"
688
+ "@agent-native/agentkit": "^0.220.0-nightly-20261023183804"
689
689
  },
690
690
  "devDependencies": {
691
691
  "@excalidraw/excalidraw": "0.18.1",
@@ -709,10 +709,10 @@
709
709
  "typescript-7": "npm:typescript@^7.0.2",
710
710
  "vite": "8.1.0",
711
711
  "vitest": "^4.1.5",
712
- "@agent-native/core": "^0.218.0"
712
+ "@agent-native/core": "^0.220.0-nightly-20261023183804"
713
713
  },
714
714
  "peerDependencies": {
715
- "@agent-native/core": ">=0.205.1",
715
+ "@agent-native/core": "0.220.0-nightly-20261023183804",
716
716
  "@excalidraw/excalidraw": ">=0.18",
717
717
  "@excalidraw/mermaid-to-excalidraw": ">=2",
718
718
  "@tanstack/react-query": "^5.99.2",
@@ -503,17 +503,19 @@ describe("AgentKitChat", () => {
503
503
  expect(styles).toMatch(
504
504
  /@media \(max-width: 40rem\)[\s\S]*\[data-agent-composer-slot="area"\][\s\S]*padding-inline: 0;/,
505
505
  );
506
- expect(styles).toMatch(
507
- /\[data-agent-composer-slot="model-button"\] \{[\s\S]*max-inline-size: 11rem;/,
508
- );
506
+ const modelButtonRule = styles.match(
507
+ /\.agentkit-composer \[data-agent-composer-slot="model-button"\] \{([^}]*)\}/,
508
+ )?.[1];
509
+ expect(modelButtonRule).toContain("max-inline-size: 11rem;");
510
+ expect(modelButtonRule).toContain("flex: 0 1 auto;");
509
511
  expect(styles).toMatch(
510
512
  /\[data-agent-composer-slot="mode-button"\] \{[\s\S]*min-inline-size: 3\.5rem;/,
511
513
  );
512
514
  expect(styles).toMatch(
513
- /@media \(max-width: 40rem\)[\s\S]*\[data-agent-composer-slot="model-button"\][\s\S]*max-inline-size: 7\.5rem;/,
515
+ /@container \(max-width: 24rem\)[\s\S]*\[data-agent-composer-slot="model-button"\][\s\S]*max-inline-size: 7\.5rem;/,
514
516
  );
515
517
  expect(styles).toMatch(
516
- /@media \(max-width: 40rem\)[\s\S]*\.agent-composer-model-effort[\s\S]*display: none;/,
518
+ /@container \(max-width: 24rem\)[\s\S]*\.agent-composer-model-effort[\s\S]*display: none;/,
517
519
  );
518
520
  const composerPopoverRule = styles.match(
519
521
  /\[data-agent-native-composer-popover="true"\] \{([^}]*)\}/,
@@ -104,6 +104,7 @@
104
104
  var(--agent-kit-composer-surface, var(--agentkit-surface))
105
105
  );
106
106
  box-shadow: var(--agentkit-elevation);
107
+ container-type: inline-size;
107
108
  }
108
109
 
109
110
  .agentkit-composer[data-agent-composer-slot="root"]:focus-within {
@@ -161,9 +162,11 @@
161
162
  flex: 1;
162
163
  }
163
164
 
165
+ /* Only the model picker shrinks, so narrow composers never push out send. */
164
166
  .agentkit-composer [data-agent-composer-slot="model-button"] {
165
- flex: none;
167
+ flex: 0 1 auto;
166
168
  max-inline-size: 11rem;
169
+ overflow: hidden;
167
170
  }
168
171
 
169
172
  .agentkit-composer [data-agent-composer-slot="mode-button"] {
@@ -2169,9 +2172,16 @@ button.agentkit-object {
2169
2172
  padding-inline: 0;
2170
2173
  }
2171
2174
 
2175
+ .agentkit-message[data-role="user"] .agentkit-message-content {
2176
+ max-inline-size: min(94%, var(--agentkit-user-bubble-max-width, 38rem));
2177
+ }
2178
+ }
2179
+
2180
+ /* Composer width, not viewport: desktop side panels are as narrow as phones. */
2181
+ @container (max-width: 24rem) {
2172
2182
  .agentkit-composer [data-agent-composer-slot="toolbar"] {
2173
2183
  gap: 0.125rem;
2174
- padding-inline: 0.5rem;
2184
+ padding-inline: 0.375rem;
2175
2185
  }
2176
2186
 
2177
2187
  .agentkit-composer [data-agent-composer-slot="model-button"] {
@@ -2180,14 +2190,11 @@ button.agentkit-object {
2180
2190
  }
2181
2191
 
2182
2192
  .agentkit-composer [data-agent-composer-slot="mode-button"] {
2193
+ min-inline-size: 0;
2183
2194
  padding-inline: 0.375rem;
2184
2195
  }
2185
2196
 
2186
2197
  .agentkit-composer .agent-composer-model-effort {
2187
2198
  display: none;
2188
2199
  }
2189
-
2190
- .agentkit-message[data-role="user"] .agentkit-message-content {
2191
- max-inline-size: min(94%, var(--agentkit-user-bubble-max-width, 38rem));
2192
- }
2193
2200
  }
@@ -10,6 +10,7 @@ import {
10
10
  } from "@agent-native/agentkit/protocol";
11
11
  import type {
12
12
  AgentInteraction,
13
+ AgentToolCall,
13
14
  FilePart,
14
15
  AgentMessage,
15
16
  AgentTransport,
@@ -24,6 +25,10 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
24
25
  import { AgentSuggestionBar } from "../../composer/AgentSuggestionBar.js";
25
26
  import { AgentInteractionItem } from "../agentkit/react/components.js";
26
27
  import { AgentKitProvider } from "../agentkit/react/context.js";
28
+ import {
29
+ clearToolRenderersForTests,
30
+ registerToolRenderer,
31
+ } from "./chat/tool-render-registry.js";
27
32
 
28
33
  function largePngBytes(
29
34
  width = 2560,
@@ -106,6 +111,7 @@ const chatMocks = vi.hoisted(() => ({
106
111
  runtimeOptions: null as any,
107
112
  inBuilder: false,
108
113
  useRealRoot: false,
114
+ renderRealToolCalls: false,
109
115
  realComposerController: null as AgentKitClient | null,
110
116
  useRealChat: false,
111
117
  routeControllerPersistenceThroughTransport: false,
@@ -675,29 +681,33 @@ vi.mock("@agent-native/core/client/agent-chat", async (importOriginal) => {
675
681
  };
676
682
  });
677
683
 
678
- vi.mock("./chat/run-recovery.js", async (importOriginal) => ({
679
- isMissingLlmProviderRunError: (
680
- await importOriginal<typeof import("./chat/run-recovery.js")>()
681
- ).isMissingLlmProviderRunError,
682
- RunErrorRecoveryCard: (props: unknown) => {
683
- chatMocks.failureProps = props;
684
- chatMocks.failurePropsHistory.push(props);
685
- return React.createElement("div", {
686
- "data-testid": "run-error-recovery-card",
687
- });
688
- },
689
- BuilderSetupCard: (props: unknown) => {
690
- chatMocks.setupCardProps = props;
691
- chatMocks.setupCardPropsHistory.push(props);
692
- return React.createElement("div", { "data-testid": "builder-setup-card" });
693
- },
694
- LoopLimitContinueCard: (props: unknown) => {
695
- chatMocks.loopLimitProps = props;
696
- return null;
697
- },
698
- PlanModeCallout: () => null,
699
- getRequestModeMetadata: () => undefined,
700
- }));
684
+ vi.mock("./chat/run-recovery.js", async (importOriginal) => {
685
+ const actual =
686
+ await importOriginal<typeof import("./chat/run-recovery.js")>();
687
+ return {
688
+ ...actual,
689
+ RunErrorRecoveryCard: (props: unknown) => {
690
+ chatMocks.failureProps = props;
691
+ chatMocks.failurePropsHistory.push(props);
692
+ return React.createElement("div", {
693
+ "data-testid": "run-error-recovery-card",
694
+ });
695
+ },
696
+ BuilderSetupCard: (props: unknown) => {
697
+ chatMocks.setupCardProps = props;
698
+ chatMocks.setupCardPropsHistory.push(props);
699
+ return React.createElement("div", {
700
+ "data-testid": "builder-setup-card",
701
+ });
702
+ },
703
+ LoopLimitContinueCard: (props: unknown) => {
704
+ chatMocks.loopLimitProps = props;
705
+ return null;
706
+ },
707
+ PlanModeCallout: () => null,
708
+ getRequestModeMetadata: () => undefined,
709
+ };
710
+ });
701
711
 
702
712
  vi.mock("./FileStorageSetupPopover.js", async () => {
703
713
  const React = await import("react");
@@ -771,12 +781,17 @@ vi.mock("@agent-native/core/client/use-session", () => ({
771
781
  useSession: () => ({ session: chatMocks.session, status: "authenticated" }),
772
782
  }));
773
783
 
774
- vi.mock("./chat/tool-call-display.js", async () => {
784
+ vi.mock("./chat/tool-call-display.js", async (importOriginal) => {
775
785
  const React = await import("react");
786
+ const actual =
787
+ await importOriginal<typeof import("./chat/tool-call-display.js")>();
776
788
  return {
777
- ChatRunningContext: React.createContext(false),
778
- SuppressInlineOpenAppContext: React.createContext(false),
779
- ToolCallDisplay: () => null,
789
+ ChatRunningContext: actual.ChatRunningContext,
790
+ SuppressInlineOpenAppContext: actual.SuppressInlineOpenAppContext,
791
+ ToolCallDisplay: (props: any) =>
792
+ chatMocks.renderRealToolCalls
793
+ ? React.createElement(actual.ToolCallDisplay, props)
794
+ : null,
780
795
  AgentApprovalCard: (props: any) => {
781
796
  chatMocks.approvalCardProps = props;
782
797
  return React.createElement(
@@ -1000,6 +1015,7 @@ beforeEach(() => {
1000
1015
  chatMocks.transportOptions = null;
1001
1016
  chatMocks.inBuilder = false;
1002
1017
  chatMocks.useRealRoot = false;
1018
+ chatMocks.renderRealToolCalls = false;
1003
1019
  chatMocks.realComposerController = null;
1004
1020
  chatMocks.useRealChat = false;
1005
1021
  chatMocks.routeControllerPersistenceThroughTransport = false;
@@ -1035,6 +1051,7 @@ afterEach(async () => {
1035
1051
  await unmount();
1036
1052
  chatMocks.realComposerController?.dispose();
1037
1053
  window.sessionStorage.clear();
1054
+ clearToolRenderersForTests();
1038
1055
  });
1039
1056
 
1040
1057
  describe("AgentKitAssistantChat host behavior", () => {
@@ -1331,6 +1348,161 @@ describe("AgentKitAssistantChat host behavior", () => {
1331
1348
  expect(chatMocks.rootProps.slots.widget).toBe(AgentKitActionWidget);
1332
1349
  });
1333
1350
 
1351
+ it("shows failed tools through the shared fallback without an app renderer", async () => {
1352
+ const at = "2026-09-28T00:00:00.000Z";
1353
+ const failedTool: AgentToolCall = {
1354
+ id: "query-1",
1355
+ name: "query-analytics",
1356
+ input: {},
1357
+ output: "Query execution failed.",
1358
+ error: { code: "query_failed", message: "Query execution failed." },
1359
+ status: "failed",
1360
+ runId: "run-1",
1361
+ messageId: "assistant-1",
1362
+ metadata: { chatUI: { renderer: "analytics.query-result.v1" } },
1363
+ };
1364
+ chatMocks.useRealChat = true;
1365
+ chatMocks.useRealRoot = true;
1366
+ chatMocks.renderRealToolCalls = true;
1367
+ chatMocks.thread.messages = [
1368
+ {
1369
+ id: "assistant-1",
1370
+ role: "assistant",
1371
+ status: "complete",
1372
+ parts: [{ type: "text", text: "The query could not be completed." }],
1373
+ },
1374
+ ];
1375
+ chatMocks.thread.tools = { [failedTool.id]: failedTool };
1376
+ chatMocks.thread.runs = {
1377
+ "run-1": { id: "run-1", status: "failed", lastSequence: 3 },
1378
+ };
1379
+ chatMocks.thread.events = [
1380
+ {
1381
+ id: "tool-started",
1382
+ threadId: chatMocks.threadId,
1383
+ runId: "run-1",
1384
+ sequence: 1,
1385
+ occurredAt: at,
1386
+ type: "tool.started",
1387
+ toolCall: { ...failedTool, status: "running" },
1388
+ },
1389
+ {
1390
+ id: "tool-failed",
1391
+ threadId: chatMocks.threadId,
1392
+ runId: "run-1",
1393
+ sequence: 2,
1394
+ occurredAt: at,
1395
+ type: "tool.updated",
1396
+ toolCall: failedTool,
1397
+ },
1398
+ {
1399
+ id: "run-failed",
1400
+ threadId: chatMocks.threadId,
1401
+ runId: "run-1",
1402
+ sequence: 3,
1403
+ occurredAt: at,
1404
+ type: "run.failed",
1405
+ error: { code: "query_failed", message: "Query execution failed." },
1406
+ },
1407
+ ];
1408
+
1409
+ await useRealComposer();
1410
+ await mount(baseProps({ isNewThread: false }));
1411
+
1412
+ const toolRow = container.querySelector<HTMLButtonElement>(
1413
+ "button[aria-expanded]",
1414
+ );
1415
+ expect(toolRow?.textContent).toContain("query analytics");
1416
+ expect(toolRow?.getAttribute("aria-expanded")).toBe("false");
1417
+ expect(container.textContent).not.toContain("Query execution failed.");
1418
+
1419
+ await act(async () => {
1420
+ toolRow?.click();
1421
+ });
1422
+
1423
+ expect(toolRow?.getAttribute("aria-expanded")).toBe("true");
1424
+ expect(container.textContent).toContain("Query execution failed.");
1425
+ });
1426
+
1427
+ it.each(["completed", "cancelled"] as const)(
1428
+ "passes %s status to custom renderers in the regular transcript",
1429
+ async (status) => {
1430
+ const at = "2026-09-28T00:00:00.000Z";
1431
+ const tool: AgentToolCall = {
1432
+ id: "status-tool-1",
1433
+ name: "example-status-tool",
1434
+ input: {},
1435
+ output: "Finished.",
1436
+ status,
1437
+ runId: "status-run-1",
1438
+ messageId: "status-assistant-1",
1439
+ };
1440
+ registerToolRenderer({
1441
+ id: "example-status-renderer",
1442
+ match: "example-status-tool",
1443
+ Component: ({ context }) => (
1444
+ <div data-testid="custom-tool-status" data-status={context.status} />
1445
+ ),
1446
+ });
1447
+ chatMocks.useRealChat = true;
1448
+ chatMocks.useRealRoot = true;
1449
+ chatMocks.renderRealToolCalls = true;
1450
+ chatMocks.thread.messages = [
1451
+ {
1452
+ id: "status-assistant-1",
1453
+ role: "assistant",
1454
+ status: "complete",
1455
+ parts: [{ type: "text", text: "The tool finished." }],
1456
+ },
1457
+ ];
1458
+ chatMocks.thread.tools = { [tool.id]: tool };
1459
+ chatMocks.thread.runs = {
1460
+ "status-run-1": {
1461
+ id: "status-run-1",
1462
+ status,
1463
+ lastSequence: 3,
1464
+ },
1465
+ };
1466
+ chatMocks.thread.events = [
1467
+ {
1468
+ id: "status-tool-started",
1469
+ threadId: chatMocks.threadId,
1470
+ runId: "status-run-1",
1471
+ sequence: 1,
1472
+ occurredAt: at,
1473
+ type: "tool.started",
1474
+ toolCall: { ...tool, status: "running" },
1475
+ },
1476
+ {
1477
+ id: "status-tool-updated",
1478
+ threadId: chatMocks.threadId,
1479
+ runId: "status-run-1",
1480
+ sequence: 2,
1481
+ occurredAt: at,
1482
+ type: "tool.updated",
1483
+ toolCall: tool,
1484
+ },
1485
+ {
1486
+ id: "status-run-ended",
1487
+ threadId: chatMocks.threadId,
1488
+ runId: "status-run-1",
1489
+ sequence: 3,
1490
+ occurredAt: at,
1491
+ type: status === "completed" ? "run.completed" : "run.cancelled",
1492
+ },
1493
+ ];
1494
+
1495
+ await useRealComposer();
1496
+ await mount(baseProps({ isNewThread: false }));
1497
+
1498
+ expect(
1499
+ container
1500
+ .querySelector('[data-testid="custom-tool-status"]')
1501
+ ?.getAttribute("data-status"),
1502
+ ).toBe(status);
1503
+ },
1504
+ );
1505
+
1334
1506
  it("checks readiness on the configured chat API server", async () => {
1335
1507
  await mount(
1336
1508
  baseProps({
@@ -1863,12 +2035,14 @@ describe("AgentKitAssistantChat host behavior", () => {
1863
2035
  createdAt: at,
1864
2036
  updatedAt: at,
1865
2037
  messages: chatMocks.thread.messages,
2038
+ events: chatMocks.thread.events,
1866
2039
  runs: Object.values(chatMocks.thread.runs).map((run) => ({
1867
2040
  ...run,
1868
2041
  threadId,
1869
2042
  startedAt: at,
1870
2043
  completedAt: at,
1871
2044
  })),
2045
+ toolCalls: Object.values(chatMocks.thread.tools),
1872
2046
  suggestions: chatMocks.thread.suggestions,
1873
2047
  }),
1874
2048
  startRun,
@@ -4656,6 +4830,26 @@ describe("AgentKitAssistantChat host behavior", () => {
4656
4830
  ).toBe(true);
4657
4831
  });
4658
4832
 
4833
+ it.each([
4834
+ ["an app send", { submitMessageId: "submit-app-deferred" }, true],
4835
+ ["a typed send", undefined, false],
4836
+ ] as const)(
4837
+ "remembers whether a deferred submission was %s",
4838
+ async (_label, options, fromApp) => {
4839
+ chatMocks.history = { isRestoring: true };
4840
+ const ref = createRef<AssistantChatHandle>();
4841
+ await mount(baseProps(), ref);
4842
+
4843
+ await act(async () => {
4844
+ await ref.current?.sendMessage("Queue this", undefined, options);
4845
+ });
4846
+
4847
+ const stored = JSON.stringify([...chatMocks.appState.values()]);
4848
+ expect(stored).toContain("Queue this");
4849
+ expect(stored.includes('"deferredFromApp":true')).toBe(fromApp);
4850
+ },
4851
+ );
4852
+
4659
4853
  it("uploads inline images before storing a deferred submission", async () => {
4660
4854
  chatMocks.history = { isRestoring: true };
4661
4855
  const submissionExpiresAt = Date.now() + 20_000;
@@ -5769,6 +5963,43 @@ describe("AgentKitAssistantChat host behavior", () => {
5769
5963
  });
5770
5964
  });
5771
5965
 
5966
+ it("tells the turn which surface and sender it came from, and sends it once", async () => {
5967
+ const ref = createRef<AssistantChatHandle>();
5968
+ await mount(baseProps(), ref);
5969
+
5970
+ await act(async () => {
5971
+ await chatMocks.composerProps.onSubmit("Typed by the user", [], [], {
5972
+ intent: "immediate",
5973
+ });
5974
+ });
5975
+ await act(async () => {
5976
+ await ref.current!.sendMessage("Sent by the app", undefined, {
5977
+ submitMessageId: "submit-app",
5978
+ surface: "deck-outline",
5979
+ });
5980
+ });
5981
+ await act(async () => {
5982
+ root.render(
5983
+ <AgentKitAssistantChat
5984
+ {...baseProps()}
5985
+ ref={ref}
5986
+ placeholder="Re-rendered"
5987
+ />,
5988
+ );
5989
+ });
5990
+
5991
+ const metadata = chatMocks.control.sendMessage.mock.calls.map(
5992
+ ([input]) => (input as { metadata: Record<string, unknown> }).metadata,
5993
+ );
5994
+ expect(metadata).toHaveLength(2);
5995
+ expect(metadata[0]).not.toHaveProperty("submitMessageId");
5996
+ expect(metadata[0]).not.toHaveProperty("agentNativeSurface");
5997
+ expect(metadata[1]).toMatchObject({
5998
+ submitMessageId: "submit-app",
5999
+ agentNativeSurface: "deck-outline",
6000
+ });
6001
+ });
6002
+
5772
6003
  it("acknowledges accepted sends after transport acceptance", async () => {
5773
6004
  const ref = createRef<AssistantChatHandle>();
5774
6005
  let resolveSend!: () => void;
@@ -54,7 +54,10 @@ import {
54
54
  readAssistantChatComposerDraft,
55
55
  writeAssistantChatComposerDraft,
56
56
  } from "@agent-native/core/client/agent-chat";
57
- import { createAgentNativeChatRuntime } from "@agent-native/core/client/agent-chat";
57
+ import {
58
+ createAgentNativeChatRuntime,
59
+ trackTurnSubmitted,
60
+ } from "@agent-native/core/client/agent-chat";
58
61
  import type { CreateAgentNativeChatRuntimeOptions } from "@agent-native/core/client/agent-chat";
59
62
  import { useAgentDynamicSuggestionsResult } from "@agent-native/core/client/agent-chat";
60
63
  import {
@@ -645,6 +648,8 @@ type AgentKitInternalSendOptions = AssistantChatSendOptions & {
645
648
  deferredAgentId?: string | null;
646
649
  deferredContextScope?: AgentKitAssistantChatProps["contextScope"] | null;
647
650
  deferredSubmissionId?: string;
651
+ /** The deferred send came from app code, whose id the deferral drops. */
652
+ deferredFromApp?: boolean;
648
653
  };
649
654
 
650
655
  function isSubmissionExpired(submissionExpiresAt: number | undefined): boolean {
@@ -2003,7 +2008,9 @@ export const AgentKitAssistantChat = forwardRef<
2003
2008
  apiUrl: props.apiUrl ?? agentNativePath("/_agent-native/agent-chat"),
2004
2009
  runtime:
2005
2010
  injectedRuntimeRef.current ??
2006
- createAgentNativeChatRuntime(runtimeOptions),
2011
+ createAgentNativeChatRuntime(runtimeOptions, {
2012
+ onTurnSubmitted: trackTurnSubmitted,
2013
+ }),
2007
2014
  browserTabId: props.browserTabId,
2008
2015
  get threadId() {
2009
2016
  return transportThreadIdRef.current;
@@ -3589,6 +3596,9 @@ const AgentKitAssistantChatBody = forwardRef<
3589
3596
  agentNativeDeferredSubmissionId: options.deferredSubmissionId,
3590
3597
  }
3591
3598
  : {}),
3599
+ ...(options.deferredFromApp
3600
+ ? { agentNativeDeferredFromApp: true }
3601
+ : {}),
3592
3602
  ...(retryRequestAttachments.length
3593
3603
  ? { agentNativeRetryRequestAttachments: retryRequestAttachments }
3594
3604
  : {}),
@@ -3604,6 +3614,7 @@ const AgentKitAssistantChatBody = forwardRef<
3604
3614
  ? { submitMessageId: options.submitMessageId }
3605
3615
  : {}),
3606
3616
  ...(options.usageLabel ? { usageLabel: options.usageLabel } : {}),
3617
+ ...(options.surface ? { agentNativeSurface: options.surface } : {}),
3607
3618
  ...(options.trackInRunsTray ? { trackInRunsTray: true } : {}),
3608
3619
  ...(skipAmbientSelectionContext
3609
3620
  ? { agentNativeSkipPendingSelectionContext: true }
@@ -3851,6 +3862,7 @@ const AgentKitAssistantChatBody = forwardRef<
3851
3862
  deferredOptions.skipAmbientSelectionContext = true;
3852
3863
  }
3853
3864
  delete deferredOptions.submitMessageId;
3865
+ if (submitMessageId) deferredOptions.deferredFromApp = true;
3854
3866
  delete deferredOptions.attachments;
3855
3867
  deferredOptions.contextAlreadyIncluded = true;
3856
3868
  deferredOptions.deferredRequestAttachments = requestAttachments;
@@ -6467,6 +6479,7 @@ function AgentKitTool({ value, active }: AgentKitRenderProps<AgentToolCall>) {
6467
6479
  args={input}
6468
6480
  argsText={JSON.stringify(input)}
6469
6481
  result={output}
6482
+ status={value.status}
6470
6483
  isError={value.status === "failed"}
6471
6484
  isRunning={value.status === "running"}
6472
6485
  structuredMeta={metadata}
@@ -1965,7 +1965,7 @@ function AgentPanelInner({
1965
1965
  return (
1966
1966
  <div
1967
1967
  key={tab.id}
1968
- className="agent-tab-group relative flex shrink-0 items-center"
1968
+ className="agent-tab-group relative flex min-w-[56px] max-w-[150px] shrink items-center"
1969
1969
  >
1970
1970
  <div
1971
1971
  role="tab"
@@ -1981,7 +1981,7 @@ function AgentPanelInner({
1981
1981
  switchMode("chat");
1982
1982
  })}
1983
1983
  className={cn(
1984
- "agent-tab relative flex shrink-0 items-center gap-1 rounded-md px-2.5 py-1.5 text-[11px] font-medium cursor-pointer min-w-[56px] max-w-[150px]",
1984
+ "agent-tab relative flex w-full min-w-0 items-center gap-1 rounded-md px-2.5 py-1.5 text-[11px] font-medium cursor-pointer",
1985
1985
  isActive
1986
1986
  ? "bg-accent text-foreground"
1987
1987
  : "text-muted-foreground hover:bg-accent hover:text-foreground",
@@ -2104,7 +2104,7 @@ function AgentPanelInner({
2104
2104
  return (
2105
2105
  <div
2106
2106
  key={tab.id}
2107
- className="agent-tab-group relative shrink-0"
2107
+ className="agent-tab-group relative min-w-[56px] max-w-[150px] shrink"
2108
2108
  >
2109
2109
  <div
2110
2110
  role="button"
@@ -2115,7 +2115,7 @@ function AgentPanelInner({
2115
2115
  setActiveTabId(tab.id),
2116
2116
  )}
2117
2117
  className={cn(
2118
- "agent-tab relative flex shrink-0 items-center gap-1 rounded-md px-2.5 py-1.5 text-[11px] font-medium cursor-pointer min-w-[56px] max-w-[150px]",
2118
+ "agent-tab relative flex w-full min-w-0 items-center gap-1 rounded-md px-2.5 py-1.5 text-[11px] font-medium cursor-pointer",
2119
2119
  isActive
2120
2120
  ? "bg-accent text-foreground"
2121
2121
  : "text-muted-foreground hover:bg-accent hover:text-foreground",
@@ -2208,7 +2208,7 @@ function AgentPanelInner({
2208
2208
  return (
2209
2209
  <div
2210
2210
  key={tab.id}
2211
- className="agent-tab-group relative shrink-0"
2211
+ className="agent-tab-group relative min-w-[56px] max-w-[150px] shrink"
2212
2212
  >
2213
2213
  <div
2214
2214
  role="button"
@@ -2219,7 +2219,7 @@ function AgentPanelInner({
2219
2219
  setActiveTabId(tab.id),
2220
2220
  )}
2221
2221
  className={cn(
2222
- "agent-tab relative flex shrink-0 items-center gap-1 rounded-md px-2.5 py-1.5 text-[11px] font-medium cursor-pointer min-w-[56px] max-w-[150px]",
2222
+ "agent-tab relative flex w-full min-w-0 items-center gap-1 rounded-md px-2.5 py-1.5 text-[11px] font-medium cursor-pointer",
2223
2223
  isActive
2224
2224
  ? "bg-accent text-foreground"
2225
2225
  : "text-muted-foreground hover:bg-accent hover:text-foreground",
@@ -2338,7 +2338,7 @@ function AgentPanelInner({
2338
2338
  {childTabs.map((tab) => (
2339
2339
  <div
2340
2340
  key={tab.id}
2341
- className="agent-tab-group relative shrink-0"
2341
+ className="agent-tab-group relative min-w-[48px] max-w-[140px] shrink"
2342
2342
  >
2343
2343
  <div
2344
2344
  role="button"
@@ -2353,7 +2353,7 @@ function AgentPanelInner({
2353
2353
  setActiveTabId(tab.id),
2354
2354
  )}
2355
2355
  className={cn(
2356
- "agent-tab relative flex shrink-0 items-center gap-1 rounded-md px-2 py-1 text-[10px] font-medium cursor-pointer min-w-[48px] max-w-[140px]",
2356
+ "agent-tab relative flex w-full min-w-0 items-center gap-1 rounded-md px-2 py-1 text-[10px] font-medium cursor-pointer",
2357
2357
  tab.id === activeTabId
2358
2358
  ? "bg-accent text-foreground"
2359
2359
  : "text-muted-foreground hover:bg-accent hover:text-foreground",
@@ -5270,6 +5270,23 @@ describe("MultiTabAssistantChat postMessage bridge", () => {
5270
5270
  );
5271
5271
  });
5272
5272
 
5273
+ it("forwards the sender's preset as the send's surface", () => {
5274
+ act(() => {
5275
+ dispatchSubmitChat({
5276
+ message: "Outline the deck",
5277
+ preset: "deck-outline",
5278
+ submitMessageId: "submit-preset",
5279
+ });
5280
+ });
5281
+
5282
+ expect(chatHandleMocks.sendMessage).toHaveBeenCalledOnce();
5283
+ expect(chatHandleMocks.sendMessage).toHaveBeenCalledWith(
5284
+ "Outline the deck",
5285
+ undefined,
5286
+ { submitMessageId: "submit-preset", surface: "deck-outline" },
5287
+ );
5288
+ });
5289
+
5273
5290
  it("implements the latest plan when /act is selected", () => {
5274
5291
  chatHandleMocks.implementPlan.mockImplementationOnce(() => true);
5275
5292