@swmansion/argent 0.15.1-next.2 → 0.15.1-next.3

package/dist/tool-server.cjs

@@ -126784,10 +126784,11 @@ async function typeSimulatorServer(registry2, device, params) {
     }
     keysPressed++;
   };
+  let namedKeyCode;
   if (params.key) {
     const lower = params.key.toLowerCase();
-    const code = Object.hasOwn(NAMED_KEYS, lower) ? NAMED_KEYS[lower] : void 0;
-    if (code == null) {
+    namedKeyCode = Object.hasOwn(NAMED_KEYS, lower) ? NAMED_KEYS[lower] : void 0;
+    if (namedKeyCode == null) {
       throw new InvalidToolInputError(
         `Unknown key "${params.key}". Supported: ${Object.keys(NAMED_KEYS).join(", ")}`,
         {
@@ -126797,7 +126798,6 @@ async function typeSimulatorServer(registry2, device, params) {
         }
       );
     }
-    await pressKeyCode(code);
   }
   if (params.text) {
     for (const char of params.text) {
@@ -126812,6 +126812,9 @@ async function typeSimulatorServer(registry2, device, params) {
       await sleep8(delay2);
     }
   }
+  if (namedKeyCode != null) {
+    await pressKeyCode(namedKeyCode);
+  }
   return { typed: params.text ?? params.key ?? "", keys: keysPressed };
 }
 
@@ -126955,9 +126958,10 @@ var sleep9 = (ms) => new Promise((r) => setTimeout(r, ms));
 async function runChromium(api, params) {
   const delay2 = params.delayMs ?? 50;
   let keysPressed = 0;
+  let named;
   if (params.key) {
     const lower = params.key.toLowerCase();
-    const named = Object.hasOwn(CHROMIUM_NAMED_KEYS, lower) ? CHROMIUM_NAMED_KEYS[lower] : void 0;
+    named = Object.hasOwn(CHROMIUM_NAMED_KEYS, lower) ? CHROMIUM_NAMED_KEYS[lower] : void 0;
     if (!named) {
       throw new InvalidToolInputError(
         `Unknown key "${params.key}". Supported: ${Object.keys(CHROMIUM_NAMED_KEYS).join(", ")}`,
@@ -126968,20 +126972,6 @@ async function runChromium(api, params) {
         }
       );
     }
-    await api.dispatchKeyEvent({
-      type: "keyDown",
-      key: named.key,
-      code: named.code,
-      windowsVirtualKeyCode: named.windowsVirtualKeyCode
-    });
-    await sleep9(delay2);
-    await api.dispatchKeyEvent({
-      type: "keyUp",
-      key: named.key,
-      code: named.code,
-      windowsVirtualKeyCode: named.windowsVirtualKeyCode
-    });
-    keysPressed++;
   }
   if (params.text) {
     for (const char of params.text) {
@@ -127010,6 +127000,22 @@ async function runChromium(api, params) {
       await sleep9(delay2);
     }
   }
+  if (named) {
+    await api.dispatchKeyEvent({
+      type: "keyDown",
+      key: named.key,
+      code: named.code,
+      windowsVirtualKeyCode: named.windowsVirtualKeyCode
+    });
+    await sleep9(delay2);
+    await api.dispatchKeyEvent({
+      type: "keyUp",
+      key: named.key,
+      code: named.code,
+      windowsVirtualKeyCode: named.windowsVirtualKeyCode
+    });
+    keysPressed++;
+  }
   return { typed: params.text ?? params.key ?? "", keys: keysPressed };
 }
 function makeChromiumImpl(registry2) {
@@ -127093,7 +127099,7 @@ async function injectViaInputd(subcommands) {
 async function injectVegaButtons(buttons) {
   await injectViaInputd(remoteButtonsToKeycodes(buttons).map((code) => `button_press ${code}`));
 }
-async function injectVegaNamedKey(name) {
+function resolveVegaNamedKeycode(name) {
   const lower = name.toLowerCase();
   const code = Object.hasOwn(NAMED_KEYCODES, lower) ? NAMED_KEYCODES[lower] : void 0;
   if (!code) {
@@ -127106,7 +127112,10 @@ async function injectVegaNamedKey(name) {
       }
     );
   }
-  await injectViaInputd([`button_press ${code}`]);
+  return code;
+}
+async function injectVegaNamedKey(name) {
+  await injectViaInputd([`button_press ${resolveVegaNamedKeycode(name)}`]);
 }
 async function injectVegaText(text) {
   if (/[\n\r]/.test(text)) {
@@ -127122,14 +127131,15 @@ async function injectVegaText(text) {
 // ../tool-server/src/tools/keyboard/platforms/vega.ts
 async function runVega2(params) {
   let keysPressed = 0;
-  if (params.key) {
-    await injectVegaNamedKey(params.key);
-    keysPressed++;
-  }
+  if (params.key) resolveVegaNamedKeycode(params.key);
   if (params.text) {
     await injectVegaText(params.text);
     keysPressed += [...params.text].length;
   }
+  if (params.key) {
+    await injectVegaNamedKey(params.key);
+    keysPressed++;
+  }
   return { typed: params.text ?? params.key ?? "", keys: keysPressed };
 }
 var vegaImpl4 = {
@@ -127144,7 +127154,7 @@ var zodSchema24 = external_exports.object({
   ),
   text: external_exports.string().optional().describe("Text to type character by character. Handles uppercase and common punctuation."),
   key: external_exports.string().optional().describe(
-    "Named key to press: enter, escape, backspace, tab, space, arrow-up, arrow-down, arrow-left, arrow-right, f1\u2013f12. Not supported on TV targets \u2014 move focus with `tv-remote` (up/down/left/right) instead."
+    "Named key to press: enter, escape, backspace, tab, space, arrow-up, arrow-down, arrow-left, arrow-right, f1\u2013f12. When combined with `text`, the key is pressed AFTER the text is typed (so text + enter types and submits). Not supported on TV targets \u2014 move focus with `tv-remote` (up/down/left/right) instead."
   ),
   delayMs: external_exports.number().optional().describe(
     "Delay in ms between key presses (default 50). Ignored on Android phones/tablets (typed via `adb input text`, which has no per-key cadence), on Vega (text/keys injected in a single shot), and on TV targets (Apple TV / Android TV type the whole string at the daemon's own cadence)."
@@ -127166,7 +127176,7 @@ Returns { typed: string, keys: number }. Fails if an unsupported key name is pro
 - text: types a string (supports uppercase, digits, common punctuation)
 - key: presses a single named key (enter, escape, backspace, tab, arrow-up/down/left/right, f1\u2013f12) \u2014 NOT supported on TV targets; move focus with \`tv-remote\` instead.
 On a TV target (runtimeKind 'tv') only \`text\` applies \u2014 focus a text field first (with \`tv-remote\`), then type into it (injected HID keyboard on Apple TV, \`adb input text\` on Android TV).
-Provide text, key, or both.`,
+Provide text, key, or both \u2014 when both are given, the text is typed first and the key is pressed after it (text + key:"enter" types and submits).`,
     zodSchema: zodSchema24,
     capability: capability16,
     searchHint: "type text keyboard input named key enter escape arrow tv vega fire tv search field hid leanback",
@@ -133565,7 +133575,7 @@ Allowed tools and their args (udid is auto-injected, do NOT include it in args):
   gesture-pinch:  { centerX: number, centerY: number, startDistance: number, endDistance: number, angle?: number, durationMs?: number }              [ios only]
   gesture-rotate: { centerX: number, centerY: number, radius: number, startAngle: number, endAngle: number, durationMs?: number }                    [ios only]
   button:         { button: "home"|"back"|"power"|"volumeUp"|"volumeDown"|"appSwitch"|"actionButton" }                  [ios/android]
-  keyboard:       { text?: string, key?: string, delayMs?: number }  (TV: text only)                                    [ios/android/chromium/vega/tv]
+  keyboard:       { text?: string, key?: string, delayMs?: number }  (key pressed after text; TV: text only)            [ios/android/chromium/vega/tv]
   rotate:         { orientation: "Portrait"|"LandscapeLeft"|"LandscapeRight"|"PortraitUpsideDown" }                     [ios/android]
   tv-remote:      { button: <remote button | array of them>, repeat?: number }                                          [apple tv/android tv/vega]
                   buttons: up/down/left/right/select/back/home/menu/playPause (+ rewind/fastForward/next/previous/volumeUp/volumeDown/mute \u2014 work on Android TV and Vega; rejected on the Apple TV simulator)
@@ -133578,10 +133588,9 @@ Example \u2014 scroll down three times (use gesture-scroll with positive deltaY
     { "tool": "gesture-swipe", "args": { "fromX": 0.5, "fromY": 0.7, "toX": 0.5, "toY": 0.3 } }
   ]}
 
-Example \u2014 type text and submit:
+Example \u2014 type text and submit (one step: the key is pressed after the text is typed):
   { "udid": "<UDID>", "steps": [
-    { "tool": "keyboard", "args": { "text": "hello world" } },
-    { "tool": "keyboard", "args": { "key": "enter" } }
+    { "tool": "keyboard", "args": { "text": "hello world", "key": "enter" } }
   ]}
 
 Example \u2014 TV: move focus right twice then activate (one tv-remote step with a path is cheaper):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/argent",
-  "version": "0.15.1-next.2",
+  "version": "0.15.1-next.3",
   "description": "MCP server for iOS Simulator and Android Emulator control",
   "license": "Apache-2.0",
   "repository": {