npm - @commandgarden/cli - Versions diffs - 2.4.0 → 2.5.1 - Mend

@commandgarden/cli 2.4.0 → 2.5.1

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 (6) hide show

package/node_modules/@commandgarden/app/dist/client/index.html CHANGED Viewed

@@ -10,7 +10,7 @@
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
   <link href="https://fonts.googleapis.com/css2?family=Space+Grotesk:wght@400;500;600;700&family=JetBrains+Mono:wght@400;500;600&display=swap" rel="stylesheet" />
   <title>commandGarden</title>
-  <script type="module" crossorigin src="/assets/index--IDuJWmP.js"></script>
+  <script type="module" crossorigin src="/assets/index-DCptfmmK.js"></script>
   <link rel="stylesheet" crossorigin href="/assets/index-qunCIeG9.css">
 </head>
 <body>

package/node_modules/@commandgarden/daemon/connectors/teams-room-availability.eval.js CHANGED Viewed

@@ -289,6 +289,7 @@ if (isEmail) {
     throw new Error('Could not open the room finder');
   }
   typeText(inputSel, room);
+  await sleep(1000);
   let label = null;
   for (let i = 0; i < 25 && !label; i++) {

package/node_modules/@commandgarden/daemon/connectors/teams-rooms-availability.eval.js CHANGED Viewed

@@ -191,8 +191,25 @@ function buildTimeline(items, dateIso) {
 const rawRooms = '${{ args.rooms }}'.trim();
 if (!rawRooms) throw new Error('Missing rooms argument — pass comma-separated room names or emails');
-const rooms = rawRooms.split(',').map(r => r.trim()).filter(r => r.length > 0);
-if (rooms.length === 0) throw new Error('No rooms provided after parsing');
+const roomTokens = rawRooms.split(',').map(r => r.trim()).filter(r => r.length > 0);
+if (roomTokens.length === 0) throw new Error('No rooms provided after parsing');
+const parsedRooms = roomTokens.map(r => {
+  const colonIdx = r.lastIndexOf(':');
+  if (colonIdx > 0) {
+    const name = r.substring(0, colonIdx).trim();
+    const email = r.substring(colonIdx + 1).trim();
+    if (EMAIL_RE.test(email)) {
+      return { name, email: email.toLowerCase(), mode: 'pair' };
+    }
+  }
+  if (EMAIL_RE.test(r)) {
+    return { name: r, email: r.toLowerCase(), mode: 'email' };
+  }
+  return { name: r, email: null, mode: 'name' };
+});
+const canBatch = parsedRooms.every(r => r.mode === 'pair');
 let date = '${{ args.date | default("") }}'.trim();
 if (!date) date = todayLocalISO();
@@ -309,6 +326,8 @@ async function addRoomByName(name) {
       throw new Error('Could not open the room finder');
     }
     typeText(inputSel, name);
+    // Wait for OWA to process the search and refresh suggestions.
+    await sleep(1500);
   }
   let label = null;
@@ -375,65 +394,154 @@ async function captureNewSchedule(knownIds) {
   return { newId, schedule, sawView, errMsg, items: [...itemsById.values()] };
 }
-// ── Sequential room processing ───────────────────────────────────────
+/**
+ * Batch capture: wait for getSchedule responses covering all expected emails.
+ * Returns a Map of email (lowercased) -> { schedule, items, sawView, errMsg }.
+ */
+async function captureBatchSchedules(expectedEmails, knownIds) {
+  const byEmail = new Map();
+  for (let i = 0; i < 80; i++) {
+    await sleep(100);
+    for (const pair of readCapture()) {
+      for (const [id, s] of schedulesFromPair(pair)) {
+        if (knownIds.has(id)) continue;
+        const idLower = id.toLowerCase();
+        if (!expectedEmails.has(idLower)) continue;
+        const items = (s.scheduleItems || []).filter(Boolean);
+        byEmail.set(idLower, {
+          schedule: s,
+          items,
+          sawView: !!(s.availabilityView && s.availabilityView.length),
+          errMsg: s.error ? (s.error.message || s.error.responseCode || 'unknown') : null,
+        });
+      }
+    }
+    if (expectedEmails.size > 0 && [...expectedEmails].every(e => byEmail.has(e))) break;
+  }
+  return byEmail;
+}
+// ── Room processing ──────────────────────────────────────────────────
 const allRows = [];
 const knownIds = new Set(seen);
-for (const room of rooms) {
-  const isEmail = EMAIL_RE.test(room);
+if (canBatch) {
+  // ── Batch mode: add all rooms via room finder, single capture ──────
+  const emailToName = new Map();
+  const expectedEmails = new Set();
+  for (const r of parsedRooms) {
+    emailToName.set(r.email, r.name);
+    expectedEmails.add(r.email);
+  }
-  // Clear any pending captures before adding this room.
+  // Clear stale captures, then add all rooms without dismissing.
   readCapture();
-  try {
-    if (isEmail) {
-      await addRoomByEmail(room);
-    } else {
-      await addRoomByName(room);
+  for (const r of parsedRooms) {
+    try {
+      await addRoomByName(r.name);
+      await sleep(300);
+    } catch (addErr) {
+      allRows.push({
+        roomName: r.name, roomEmail: r.email, date,
+        state: 'error', start: addErr.message, end: '', durationMin: 0,
+      });
+      expectedEmails.delete(r.email);
     }
-  } catch (addErr) {
-    allRows.push({
-      roomName: room, roomEmail: '', date,
-      state: 'error', start: addErr.message, end: '', durationMin: 0,
-    });
-    continue;
   }
-  // Capture the getSchedule response immediately after adding (before dismiss).
-  const result = await captureNewSchedule(knownIds);
-  // Remove the room so "Add a room" reappears for the next room.
-  await dismissRoom();
+  // Single batch capture for all successfully added rooms.
+  if (expectedEmails.size > 0) {
+    const results = await captureBatchSchedules(expectedEmails, knownIds);
+    for (const [email, data] of results) {
+      const name = emailToName.get(email);
+      knownIds.add(email);
+      if (data.errMsg && !data.sawView) {
+        allRows.push({
+          roomName: name, roomEmail: email, date,
+          state: 'error', start: `Free/busy error: ${data.errMsg}`,
+          end: '', durationMin: 0,
+        });
+      } else {
+        const timeline = buildTimeline(data.items, date);
+        for (const row of timeline) {
+          allRows.push({ roomName: name, roomEmail: email, ...row });
+        }
+      }
+    }
-  if (!result.newId) {
-    allRows.push({
-      roomName: room, roomEmail: '', date,
-      state: 'error', start: `No free/busy returned for "${room}" on ${date}`,
-      end: '', durationMin: 0,
-    });
-    continue;
+    // Report rooms not found in any captured response.
+    for (const email of expectedEmails) {
+      if (!results.has(email)) {
+        allRows.push({
+          roomName: emailToName.get(email), roomEmail: email, date,
+          state: 'error', start: `No free/busy returned for "${emailToName.get(email)}" on ${date}`,
+          end: '', durationMin: 0,
+        });
+      }
+    }
   }
+} else {
+  // ── Sequential mode (original behavior) ────────────────────────────
+  for (const r of parsedRooms) {
+    const isEmail = r.mode === 'email';
+    // Clear any pending captures before adding this room.
+    readCapture();
+    try {
+      if (isEmail) {
+        await addRoomByEmail(r.name);
+      } else {
+        await addRoomByName(r.name);
+      }
+    } catch (addErr) {
+      allRows.push({
+        roomName: r.name, roomEmail: r.email || '', date,
+        state: 'error', start: addErr.message, end: '', durationMin: 0,
+      });
+      continue;
+    }
-  knownIds.add(result.newId);
+    // Capture the getSchedule response immediately after adding (before dismiss).
+    const result = await captureNewSchedule(knownIds);
-  if (result.errMsg && !result.sawView) {
-    allRows.push({
-      roomName: room, roomEmail: result.newId, date,
-      state: 'error', start: `Free/busy error: ${result.errMsg}`,
-      end: '', durationMin: 0,
-    });
-    continue;
-  }
+    // Remove the room so "Add a room" reappears for the next room.
+    await dismissRoom();
+    if (!result.newId) {
+      allRows.push({
+        roomName: r.name, roomEmail: r.email || '', date,
+        state: 'error', start: `No free/busy returned for "${r.name}" on ${date}`,
+        end: '', durationMin: 0,
+      });
+      continue;
+    }
-  const timeline = buildTimeline(result.items, date);
-  for (const r of timeline) {
-    allRows.push({ roomName: room, roomEmail: result.newId, ...r });
+    knownIds.add(result.newId);
+    if (result.errMsg && !result.sawView) {
+      allRows.push({
+        roomName: r.name, roomEmail: result.newId, date,
+        state: 'error', start: `Free/busy error: ${result.errMsg}`,
+        end: '', durationMin: 0,
+      });
+      continue;
+    }
+    const timeline = buildTimeline(result.items, date);
+    for (const row of timeline) {
+      allRows.push({ roomName: r.name, roomEmail: result.newId, ...row });
+    }
   }
 }
 if (allRows.length === 0) {
-  throw new Error(`No results for any of the ${rooms.length} room(s) on ${date}`);
+  throw new Error(`No results for any of the ${parsedRooms.length} room(s) on ${date}`);
 }
 return allRows;

package/node_modules/@commandgarden/daemon/connectors/teams-rooms-availability.yaml CHANGED Viewed

@@ -15,7 +15,7 @@ args:
   - name: rooms
     type: string
     required: true
-    help: "Comma-separated room names or emails (e.g. 'MBTMY The Vista,MBTMY The Cliffside' or 'RES-A@mb.com,RES-B@mb.com')"
+    help: "Comma-separated room names, emails, or name:email pairs (e.g. 'MBTMY The Vista:RES-RERE-M6VJ7ZUW@mercedes-benz.com,MBTMY The Cliffside:res-rere-m6vjl2tw@mercedes-benz.com' for batch mode, or 'MBTMY The Vista,res-rere-m6vj7zuw@mercedes-benz.com' for sequential)"
   - name: date
     type: string
     required: false

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@commandgarden/cli",
-  "version": "2.4.0",
+  "version": "2.5.1",
   "description": "Enterprise browser automation CLI",
   "type": "module",
   "license": "MIT",