@agent-native/toolkit 0.198.6 → 0.198.7

package/src/composer/ComposerContextPicker.spec.tsx

@@ -71,6 +71,8 @@ async function open() {
     container.querySelector('button[aria-label="Add context"]')!,
     "ArrowDown",
   );
+  await click("Add context");
+  await click("Category");
   await click("Source");
 }
 async function search(value: string, placeholder = "Search source") {
@@ -167,7 +169,7 @@ describe("declarative context picker", () => {
     expect(select).not.toHaveBeenCalled();
     await click("Clear selection");
     expect(clear).toHaveBeenCalledOnce();
-    expect(menus()).toHaveLength(2);
+    expect(menus()).toHaveLength(4);
   });
   it("retries a failed selection and closes only on success", async () => {
     const onSelect = vi
@@ -192,7 +194,7 @@ describe("declarative context picker", () => {
     await render({ ...config, scopeKey: "account-b" });
     expect(onSelect.mock.calls[0][1].signal.aborted).toBe(true);
     await act(async () => pending.resolve());
-    expect(menus()).toHaveLength(2);
+    expect(menus()).toHaveLength(4);
   });
   it("keeps link, search and page on sync refresh, and aborts a dismissed load", async () => {
     const pending = deferred<{ items: { id: string; title: string }[] }>();
@@ -231,16 +233,16 @@ describe("declarative context picker", () => {
     await act(async () =>
       pending.resolve({ items: [{ id: "late", title: "Late" }] }),
     );
-    expect(menus()).toHaveLength(1);
+    expect(menus()).toHaveLength(3);
     expect(document.body.textContent).not.toContain("Late");
   });
   it("keeps connected panels, integrated headers and source search autofocus", async () => {
     await render(local());
     await open();
-    expect(menus()).toHaveLength(2);
+    expect(menus()).toHaveLength(4);
     expect(menus().at(-1)?.classList.contains("w-64")).toBe(true);
     const searches = document.querySelectorAll('input[role="searchbox"]');
-    expect(searches).toHaveLength(2);
+    expect(searches).toHaveLength(1);
     expect(document.querySelector('[role="combobox"]')).toBeNull();
     for (const input of searches)
       expect(input.hasAttribute("aria-controls")).toBe(false);
@@ -270,7 +272,7 @@ describe("declarative context picker", () => {
         signal: expect.any(AbortSignal),
       }),
     );
-    expect(menus()).toHaveLength(2);
+    expect(menus()).toHaveLength(4);
   });
   it("routes typing and arrows through the root item and picker submenu", async () => {
     await render(local());
@@ -285,10 +287,10 @@ describe("declarative context picker", () => {
     await key(row("One"), "ArrowDown");
     expect(document.activeElement).toBe(row("Two"));
     await key(row("Two"), "ArrowLeft");
-    expect(menus()).toHaveLength(1);
+    expect(menus()).toHaveLength(3);
     expect(document.activeElement).toBe(row("Source"));
     await key(row("Source"), "Escape");
-    expect(menus()).toHaveLength(0);
+    expect(menus()).toHaveLength(2);
   });
   it("loads pages with cursor history and preserves location on refresh without descriptor loops", async () => {
     const load = vi
@@ -388,7 +390,7 @@ describe("declarative context picker", () => {
     expect(signal.aborted).toBe(true);
     await click("Source");
     await act(async () => pending.resolve());
-    expect(menus()).toHaveLength(2);
+    expect(menus()).toHaveLength(4);
   });
   it("validates links before reading, searches results, and returns to the populated link stage", async () => {
     const load = vi
@@ -433,19 +435,19 @@ describe("declarative context picker", () => {
         'input[placeholder="Source URL"]',
       )?.value,
     ).toBe("https://example.com/source");
-    expect(menus()).toHaveLength(2);
+    expect(menus()).toHaveLength(4);
     await key(
       document.querySelector('input[placeholder="Source URL"]')!,
       "ArrowLeft",
     );
-    expect(menus()).toHaveLength(2);
+    expect(menus()).toHaveLength(4);
     await key(
       document.querySelector('input[placeholder="Source URL"]')!,
       "ArrowRight",
     );
-    expect(menus()).toHaveLength(2);
+    expect(menus()).toHaveLength(4);
     await key(row("Read link"), "ArrowLeft");
-    expect(menus()).toHaveLength(1);
+    expect(menus()).toHaveLength(3);
   });
   it("keeps a genuine link footer present in empty and populated states", async () => {
     const config = {
@@ -512,6 +514,6 @@ describe("declarative context picker", () => {
     await click("Retry");
     expect(footer).toHaveBeenCalledTimes(2);
     expect(load).not.toHaveBeenCalled();
-    expect(menus()).toHaveLength(2);
+    expect(menus()).toHaveLength(4);
   });
 });

package/src/composer/ComposerContextPickerDialog.spec.tsx

@@ -118,6 +118,8 @@ async function open() {
       new KeyboardEvent("keydown", { key: "ArrowDown", bubbles: true }),
     ),
   );
+  await act(async () => row("Add context").click());
+  await act(async () => row("Design").click());
   expect(row("Attach source").hasAttribute("aria-haspopup")).toBe(false);
   await act(async () => row("Attach source").click());
   await tick();
@@ -205,7 +207,7 @@ describe("shared context URL dialog", () => {
       onAttach.mock.calls[0][0].map((item: { id: string }) => item.id),
     ).toEqual(["two"]);
   });
-  it("flattens categories and opens a single-select picker from the root", async () => {
+  it("keeps a searchable single-select picker under the Design category", async () => {
     const onSelect = vi.fn().mockResolvedValue(undefined);
     const config = {
       presentation: { type: "dialog" as const, mode: "single" as const },
@@ -223,11 +225,11 @@ describe("shared context URL dialog", () => {
         new KeyboardEvent("keydown", { key: "ArrowDown", bubbles: true }),
       ),
     );
-    expect(
-      Array.from(document.querySelectorAll('[role="menuitem"]')).some(
-        (item) => item.textContent === "Design",
-      ),
-    ).toBe(false);
+    expect(document.querySelector('[role="searchbox"]')).toBeNull();
+    expect(row("Add context")).toBeDefined();
+    await act(async () => row("Add context").click());
+    expect(row("Design")).toBeDefined();
+    await act(async () => row("Design").click());
     expect(row("Attach source").querySelector("svg")).toBeNull();
     await act(async () => row("Attach source").click());
     await tick();

package/src/composer/ComposerPlusMenu.parity.spec.tsx

@@ -6,7 +6,6 @@ import { createRoot, type Root } from "react-dom/client";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import { TooltipProvider } from "../ui/tooltip.js";
-import { ASSET_PICKER_HANDOFF_PARAM } from "./asset-picker-url.js";
 import { mergeComposerMenuItems } from "./ComposerPlusMenu.js";
 import { PromptComposer, type PromptComposerProps } from "./PromptComposer.js";
 import type { PromptComposerSubmitOptions } from "./PromptComposer.js";
@@ -97,7 +96,7 @@ async function mount(props: Partial<PromptComposerProps> = {}) {
   });
   return { composerRef, onSubmit };
 }
-async function open(trigger: "+" | "@") {
+async function open(trigger: "+" | "@", enterAddContext = false) {
   const target =
     trigger === "+"
       ? container.querySelector<HTMLElement>('button[aria-label="Add context"]')
@@ -114,6 +113,8 @@ async function open(trigger: "+" | "@") {
     );
     await settle();
   });
+  if (enterAddContext && labels().includes("Add context"))
+    await choose("Add context");
 }
 function item(label: string) {
   const row = Array.from(
@@ -210,12 +211,11 @@ describe("shared default action preservation", () => {
             expect(document.querySelector('[role="menu"]')).toBeNull();
           }
         } else {
-          await open(trigger);
+          await open(trigger, false);
           const expected =
             mode === "full"
               ? [
                   "Upload File",
-                  "Generate Image",
                   "Schedule Task",
                   "Create Automation",
                   "Integrations",
@@ -255,8 +255,8 @@ describe("shared default action preservation", () => {
           ],
           extensionTools: true,
         });
-        await open(trigger);
-        expect(labels()).toContain("Host source");
+        await open(trigger, false);
+        expect(labels()).not.toContain("Host source");
         if (action === "Create new skill") await choose("Create Skill");
         await choose(action);
         expect(
@@ -283,7 +283,7 @@ describe("shared default action preservation", () => {
 
     it(`${trigger} clears automation mode through its accessible Cancel button`, async () => {
       const { composerRef, onSubmit } = await mount();
-      await open(trigger);
+      await open(trigger, false);
       await choose("Create Automation");
       const cancel = container.querySelector<HTMLButtonElement>(
         '[data-agent-composer-slot="mode-row"] button[aria-label="Cancel"]',
@@ -325,12 +325,11 @@ describe("shared default action preservation", () => {
           },
         ],
       });
-      await open(trigger);
-      expect(
-        document
-          .querySelector('[role="menu"]')
-          ?.textContent?.match(/Integrations/g),
-      ).toHaveLength(1);
+      await open(trigger, false);
+      expect(labels().filter((label) => label === "Integrations")).toHaveLength(
+        1,
+      );
+      await choose("Integrations");
       await choose("Connect / Manage");
       expect(configure).toHaveBeenCalledOnce();
       expect(document.querySelector('[role="dialog"]')).toBeNull();
@@ -339,7 +338,7 @@ describe("shared default action preservation", () => {
     it(`${trigger} preserves native upload and storage-setup handoff`, async () => {
       const onAttachmentRequest = vi.fn();
       await mount({ attachmentsEnabled: false, onAttachmentRequest });
-      await open(trigger);
+      await open(trigger, false);
       expect(onAttachmentRequest).not.toHaveBeenCalled();
       await choose("Upload File");
       await act(async () => {
@@ -347,7 +346,7 @@ describe("shared default action preservation", () => {
       });
       expect(onAttachmentRequest).toHaveBeenCalledOnce();
       await mount({ attachmentsEnabled: false });
-      await open(trigger);
+      await open(trigger, false);
       expect(labels()).not.toContain("Upload File");
       await close();
       await mount();
@@ -355,7 +354,7 @@ describe("shared default action preservation", () => {
         'input[type="file"][multiple]',
       )!;
       const click = vi.spyOn(input, "click").mockImplementation(() => {});
-      await open(trigger);
+      await open(trigger, false);
       await choose("Upload File");
       expect(click).toHaveBeenCalledOnce();
     });
@@ -367,7 +366,7 @@ describe("shared default action preservation", () => {
         plusMenuMode: "terminal",
         terminalModeControl: { enabled: false, onChange, onNewTerminal },
       });
-      await open(trigger);
+      await open(trigger, false);
       await choose("New terminal");
       expect(onChange).toHaveBeenCalledExactlyOnceWith(true);
       expect(onNewTerminal).not.toHaveBeenCalled();
@@ -375,13 +374,13 @@ describe("shared default action preservation", () => {
         plusMenuMode: "terminal",
         terminalModeControl: { enabled: true, onChange, onNewTerminal },
       });
-      await open(trigger);
+      await open(trigger, false);
       expect(item("CLI terminal mode").getAttribute("aria-checked")).toBe(
         "true",
       );
       await choose("New terminal");
       expect(onNewTerminal).toHaveBeenCalledOnce();
-      await open(trigger);
+      await open(trigger, false);
       await choose("CLI terminal mode");
       expect(onChange).toHaveBeenLastCalledWith(false);
       expect(useOrg).not.toHaveBeenCalled();
@@ -397,7 +396,7 @@ describe("shared default action preservation", () => {
       );
       vi.stubGlobal("fetch", fetch);
       await mount();
-      await open(trigger);
+      await open(trigger, false);
       const form = await uploadSkill();
       expect(form).not.toBeNull();
       expect(form.textContent).toContain(
@@ -445,8 +444,8 @@ describe("shared default action preservation", () => {
       plusMenuMode: "hidden",
       contextMenuItems: [{ id: "host", label: "Host source", onSelect }],
     });
-    await open("@");
-    expect(labels()).toEqual(["Upload File", "Host source"]);
+    await open("@", true);
+    expect(labels()).toEqual(["Upload File", "Add context", "Host source"]);
     await choose("Host source");
     expect(onSelect).toHaveBeenCalledOnce();
     expect(useOrg).not.toHaveBeenCalled();
@@ -573,7 +572,7 @@ describe("shared default action preservation", () => {
         root.render(<Host />);
         await settle();
       });
-      await open("@");
+      await open("@", true);
       await choose("Attach integration");
       await open("+");
       await choose("Schedule Task");
@@ -671,58 +670,21 @@ describe("shared default action preservation", () => {
     );
   });
 
-  it("preserves the Assets window handoff and rejects mismatched messages", async () => {
-    const pickerWindow = {} as Window;
-    const windowOpen = vi.spyOn(window, "open").mockReturnValue(pickerWindow);
-    await mount();
-    await open("@");
-    await choose("Generate Image");
-    const link =
-      document.querySelector<HTMLAnchorElement>('[role="dialog"] a')!;
-    expect(link).not.toBeNull();
-    const url = new URL(link.href);
-    const handoffId = url.searchParams.get(ASSET_PICKER_HANDOFF_PARAM);
-    expect(handoffId).toBeTruthy();
-    await act(async () => {
-      link.click();
-      await settle();
-    });
-    expect(windowOpen).toHaveBeenCalledExactlyOnceWith(
-      url.toString(),
-      "_blank",
-    );
-    const message = (id: string | null) =>
-      new MessageEvent("message", {
-        origin: url.origin,
-        source: pickerWindow,
-        data: {
-          protocol: "agent-native.embed",
-          version: 1,
-          type: "message",
-          name: "chooseAsset",
-          payload: {
-            handoffId: id,
-            assetId: "test-image",
-            url: "https://assets.example.test/image.png",
-            title: "Test image",
-          },
-        },
-      });
-    await act(async () => {
-      window.dispatchEvent(message("wrong-handoff"));
-      await settle();
-    });
-    expect(setContextItem).not.toHaveBeenCalled();
-    await act(async () => {
-      window.dispatchEvent(message(handoffId));
-      await settle();
-    });
-    expect(setContextItem).toHaveBeenCalledExactlyOnceWith({
-      key: "asset-image:test-image",
-      title: "Image: Test image",
-      context:
-        "Image URL: https://assets.example.test/image.png\nAsset ID: test-image",
+  it("keeps chat actions at the root, nests context sources, and omits Generate Image", async () => {
+    await mount({
+      contextMenuItems: [
+        { id: "host-source", label: "Host source", onSelect: vi.fn() },
+      ],
     });
+    await open("+");
+    expect(labels()).toContain("Schedule Task");
+    expect(labels()).toContain("Create Automation");
+    expect(labels()).toContain("Create Skill");
+    expect(labels()).not.toContain("Generate Image");
+    expect(labels()).not.toContain("Host source");
+    await choose("Add context");
+    expect(labels()).toContain("Host source");
+    expect(labels()).toContain("Schedule Task");
   });
 
   it("cancels a skill save when its submenu closes and retains retry after errors", async () => {
@@ -738,7 +700,7 @@ describe("shared default action preservation", () => {
       );
     vi.stubGlobal("fetch", fetch);
     await mount();
-    await open("+");
+    await open("+", false);
     const form = await uploadSkill();
     await act(async () => {
       form.dispatchEvent(