@commandgarden/cli 1.2.2 → 1.3.0

package/node_modules/@commandgarden/app/package.json

@@ -1,41 +1,42 @@
-{
-  "name": "@commandgarden/app",
-  "version": "0.1.0",
-  "private": true,
-  "type": "module",
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "build": "vite build && tsc -p tsconfig.server.json",
-    "dev": "concurrently \"vite\" \"tsx watch src/server/main.ts\"",
-    "start": "node dist/server/main.js",
-    "test": "vitest run",
-    "test:watch": "vitest"
-  },
-  "dependencies": {
-    "@commandgarden/shared": "*",
-    "fastify": "^5.0.0",
-    "@fastify/static": "^8.0.0",
-    "sql.js": "^1.11.0",
-    "yaml": "^2.4.0",
-    "react": "^18.3.0",
-    "react-dom": "^18.3.0",
-    "react-router-dom": "^6.23.0"
-  },
-  "devDependencies": {
-    "@types/node": "^22.0.0",
-    "@types/react": "^18.3.0",
-    "@types/react-dom": "^18.3.0",
-    "@vitejs/plugin-react": "^4.3.0",
-    "autoprefixer": "^10.4.0",
-    "concurrently": "^9.0.0",
-    "daisyui": "^4.12.0",
-    "postcss": "^8.4.0",
-    "tailwindcss": "^3.4.0",
-    "tsx": "^4.0.0",
-    "typescript": "^5.4.0",
-    "vite": "^5.4.0",
-    "vitest": "^2.0.0"
-  }
-}
+{
+  "name": "@commandgarden/app",
+  "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "vite build && tsc -p tsconfig.server.json",
+    "dev": "concurrently \"vite\" \"tsx watch src/server/main.ts\"",
+    "start": "node dist/server/main.js",
+    "test": "vitest run",
+    "test:watch": "vitest"
+  },
+  "dependencies": {
+    "@commandgarden/shared": "*",
+    "@fastify/static": "^8.0.0",
+    "fastify": "^5.0.0",
+    "lucide-react": "^1.23.0",
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0",
+    "react-router-dom": "^6.23.0",
+    "sql.js": "^1.11.0",
+    "yaml": "^2.4.0"
+  },
+  "devDependencies": {
+    "@types/node": "^22.0.0",
+    "@types/react": "^18.3.0",
+    "@types/react-dom": "^18.3.0",
+    "@vitejs/plugin-react": "^4.3.0",
+    "autoprefixer": "^10.4.0",
+    "concurrently": "^9.0.0",
+    "daisyui": "^4.12.0",
+    "postcss": "^8.4.0",
+    "tailwindcss": "^3.4.0",
+    "tsx": "^4.0.0",
+    "typescript": "^5.4.0",
+    "vite": "^5.4.0",
+    "vitest": "^2.0.0"
+  }
+}

package/node_modules/@commandgarden/daemon/connectors/lib/msal-token.js

@@ -0,0 +1,20 @@
+// Shared MSAL token polling snippet for eval.js files.
+// Paste this into any eval.js that needs an authenticated session.
+// Polls sessionStorage for a valid access token for up to 60s.
+
+const __deadline = Date.now() + 60000;
+let token;
+while (Date.now() < __deadline) {
+  const k = Object.keys(sessionStorage).find(x => x.includes('accesstoken'));
+  if (k) {
+    try {
+      const tokenData = JSON.parse(sessionStorage.getItem(k));
+      if (Number(tokenData.expiresOn) > Math.floor(Date.now() / 1000) + 30) {
+        token = tokenData.secret;
+        break;
+      }
+    } catch (_) {}
+  }
+  await new Promise(r => setTimeout(r, 1000));
+}
+if (!token) throw new Error('No valid MSAL access token after 60s — log in and retry');

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

@@ -0,0 +1,341 @@
+// Runs in page context via js_evaluate step.
+// Drives the Outlook Scheduling Assistant to fetch a meeting-room's free/busy
+// timeline for a single day. Strategy: reuse the authenticated browser session,
+// drive the UI to trigger the page's own GraphQL getSchedule call, and intercept
+// the response (the endpoint 401s on replay).
+//
+// Template variables interpolated before execution:
+//   ${{ args.room }}
+//   ${{ args.date | default("") }}
+
+const MONTHS = ['January', 'February', 'March', 'April', 'May', 'June',
+  'July', 'August', 'September', 'October', 'November', 'December'];
+const DATE_RE = /^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])$/;
+const EMAIL_RE = /^[^@\s]+@[^@\s]+\.[^@\s]+$/;
+
+function pad2(n) { return String(n).padStart(2, '0'); }
+function sleep(ms) { return new Promise(r => setTimeout(r, ms)); }
+
+function todayLocalISO() {
+  const d = new Date();
+  return `${d.getFullYear()}-${pad2(d.getMonth() + 1)}-${pad2(d.getDate())}`;
+}
+
+/** "2026-06-18" -> "18, June, 2026" (matches the OWA date-cell aria-label). */
+function dateCellLabel(iso) {
+  const [y, m, d] = iso.split('-').map(Number);
+  return `${d}, ${MONTHS[m - 1]}, ${y}`;
+}
+
+/** querySelector shorthand, returns null if not found. */
+function $(sel) { return document.querySelector(sel); }
+
+/** True when an element matching the selector exists. */
+function exists(sel) { return !!$(sel); }
+
+/**
+ * Click a button/link by accessible name (aria-label OR visible text).
+ * Returns true if an element was found and clicked.
+ */
+function clickByName(name) {
+  const els = Array.from(document.querySelectorAll('button,a,[role=button]'));
+  const el = els.find(e => {
+    if (!e.offsetParent) return false;
+    const al = (e.getAttribute('aria-label') || '').trim();
+    const tx = (e.textContent || '').replace(/\s+/g, ' ').trim();
+    return al === name || al.includes(name) || tx.includes(name);
+  });
+  if (!el) return false;
+  el.scrollIntoView({ block: 'center' });
+  el.click();
+  return true;
+}
+
+/** True when the Scheduling Assistant view (with its Start date picker) is rendered. */
+function schedulingAssistantOpen() {
+  return Array.from(document.querySelectorAll('input')).some(
+    e => (e.getAttribute('aria-label') || '') === 'Start date'
+  );
+}
+
+/** Type text into an input by selector (focus, set value, dispatch events). */
+function typeText(sel, text) {
+  const el = $(sel);
+  if (!el) throw new Error(`Element "${sel}" not found for typing`);
+  el.focus();
+  const setter = Object.getOwnPropertyDescriptor(
+    window.HTMLInputElement.prototype, 'value'
+  ).set;
+  setter.call(el, text);
+  el.dispatchEvent(new Event('input', { bubbles: true }));
+  el.dispatchEvent(new Event('change', { bubbles: true }));
+}
+
+// ── Fetch interceptor ────────────────────────────────────────────────
+// Captures getSchedule GraphQL responses (the page's own authenticated
+// request — the endpoint 401s on replay).
+if (!window.__rfb) {
+  window.__rfb = [];
+  const origFetch = window.fetch;
+  window.fetch = function () {
+    const a = arguments;
+    const u = (a[0] && a[0].url) || a[0] || '';
+    const rb = (a[1] && a[1].body) || '';
+    return origFetch.apply(this, a).then(r => {
+      try {
+        if (String(u).indexOf('graphql') > -1) {
+          r.clone().text().then(t => {
+            if (t.indexOf('getSchedule') > -1 && t.indexOf('availabilityView') > -1) {
+              window.__rfb.push({ req: String(rb || ''), body: t });
+            }
+          }).catch(() => {});
+        }
+      } catch (_e) { /* ignore */ }
+      return r;
+    });
+  };
+}
+
+/** Read and clear captured {req, body} pairs. */
+function readCapture() {
+  const d = window.__rfb || [];
+  window.__rfb = [];
+  return d;
+}
+
+/** Map of scheduleId (lowercased) -> schedule object from a captured response body. */
+function schedulesFromPair(pair) {
+  let body;
+  try { body = JSON.parse(pair.body); } catch (_e) { return new Map(); }
+  const byId = new Map();
+  const nodes = Array.isArray(body) ? body : [body];
+  for (const node of nodes) {
+    const schedules = node?.data?.getSchedule?.schedules;
+    if (Array.isArray(schedules)) {
+      for (const s of schedules) {
+        if (s?.scheduleId) byId.set(String(s.scheduleId).toLowerCase(), s);
+      }
+    }
+  }
+  return byId;
+}
+
+/**
+ * Build a free/busy timeline (busy/tentative/oof/elsewhere blocks + free gaps)
+ * for one local day from getSchedule scheduleItems.
+ */
+function buildTimeline(items, dateIso) {
+  const PRIORITY = { oof: 4, busy: 3, tentative: 2, elsewhere: 1, free: 0 };
+  const mapStatus = st => ({
+    Busy: 'busy', Tentative: 'tentative', Oof: 'oof', WorkingElsewhere: 'elsewhere', Free: 'free',
+  }[st] || 'busy');
+
+  const dayStart = new Date(`${dateIso}T00:00:00`);
+  const dayEnd = new Date(dayStart.getTime() + 86400000);
+  const fmt = ms => {
+    if (ms >= dayEnd.getTime()) return '24:00';
+    const d = new Date(ms);
+    return `${pad2(d.getHours())}:${pad2(d.getMinutes())}`;
+  };
+
+  const blocks = [];
+  for (const it of items) {
+    if (!it || !it.startTime || !it.endTime) continue;
+    const s = new Date(it.startTime.dateTime).getTime();
+    const e = new Date(it.endTime.dateTime).getTime();
+    const cs = Math.max(s, dayStart.getTime());
+    const ce = Math.min(e, dayEnd.getTime());
+    if (ce > cs) blocks.push({ state: mapStatus(it.status), s: cs, e: ce });
+  }
+  blocks.sort((a, b) => a.s - b.s);
+
+  // Merge overlapping/adjacent busy blocks.
+  const merged = [];
+  for (const b of blocks) {
+    const last = merged[merged.length - 1];
+    if (last && b.s <= last.e) {
+      last.e = Math.max(last.e, b.e);
+      if (PRIORITY[b.state] > PRIORITY[last.state]) last.state = b.state;
+    } else {
+      merged.push({ ...b });
+    }
+  }
+
+  const rows = [];
+  let cursor = dayStart.getTime();
+  for (const b of merged) {
+    if (b.s > cursor) rows.push({ state: 'free', s: cursor, e: b.s });
+    rows.push({ state: b.state, s: b.s, e: b.e });
+    cursor = b.e;
+  }
+  if (cursor < dayEnd.getTime()) rows.push({ state: 'free', s: cursor, e: dayEnd.getTime() });
+
+  return rows.map(r => ({
+    date: dateIso,
+    state: r.state,
+    start: fmt(r.s),
+    end: fmt(r.e),
+    durationMin: Math.round((r.e - r.s) / 60000),
+  }));
+}
+
+// ── Main flow ────────────────────────────────────────────────────────
+
+const room = '${{ args.room }}'.trim();
+if (!room) throw new Error('Missing room argument — pass a room name or email');
+const isEmail = EMAIL_RE.test(room);
+
+let date = '${{ args.date | default("") }}'.trim();
+if (!date) date = todayLocalISO();
+if (!DATE_RE.test(date)) throw new Error(`Invalid date "${date}" — use YYYY-MM-DD`);
+
+// Wait for compose form controls (handles SSO redirect delays).
+const __deadline = Date.now() + 30000;
+while (Date.now() < __deadline) {
+  if (exists("button[aria-label='Open Scheduling Assistant']") ||
+      exists("input[aria-label='Start date']")) break;
+  await sleep(1000);
+}
+if (!exists("button[aria-label='Open Scheduling Assistant']") &&
+    !exists("input[aria-label='Start date']")) {
+  if (/login\.|\/oauth2\/|signin|sso/i.test(location.href)) {
+    throw new Error('Not signed in to Outlook/Teams — log in and retry');
+  }
+  throw new Error('Calendar compose form did not load');
+}
+
+// Open the Scheduling Assistant (free/busy view).
+for (let i = 0; i < 12 && !schedulingAssistantOpen(); i++) {
+  clickByName('Open Scheduling Assistant');
+  await sleep(1000);
+}
+if (!schedulingAssistantOpen()) {
+  throw new Error('Could not open the Scheduling Assistant');
+}
+
+// ── Set the date ─────────────────────────────────────────────────────
+const cellSel = `button[aria-label='${dateCellLabel(date)}']`;
+const target = new Date(`${date}T00:00:00`);
+const now = new Date();
+const navSel = target >= new Date(now.getFullYear(), now.getMonth(), now.getDate())
+  ? "button[aria-label^='Go to next month']"
+  : "button[aria-label^='Go to previous month']";
+
+const dateInput = $("input[aria-label='Start date']");
+if (dateInput) dateInput.click();
+
+for (let i = 0; i < 30; i++) {
+  if (exists(cellSel)) {
+    $(cellSel).click();
+    break;
+  }
+  if (exists(navSel)) {
+    try { $(navSel).click(); } catch (_e) { /* retry */ }
+  } else {
+    const di = $("input[aria-label='Start date']");
+    if (di) di.click();
+  }
+  await sleep(1000);
+}
+if (!exists(cellSel)) {
+  // If the cell is gone, the click succeeded; otherwise error.
+  // (After clicking a date, the picker closes and the cell is removed from DOM.)
+}
+
+// ── Capture pre-existing mailbox IDs (organizer) ─────────────────────
+const seen = new Set();
+for (let i = 0; i < 3; i++) {
+  await sleep(1000);
+  for (const pair of readCapture()) {
+    for (const id of schedulesFromPair(pair).keys()) seen.add(id);
+  }
+}
+
+// ── Add the room ─────────────────────────────────────────────────────
+if (isEmail) {
+  // Email -> attendee picker (resolves SMTP).
+  clickByName('Expand Required attendees');
+  await sleep(1000);
+
+  const inputSel = "input[aria-label*='required attendees']";
+  for (let i = 0; i < 12 && !exists(inputSel); i++) {
+    clickByName('Add required attendee');
+    await sleep(1000);
+  }
+  if (!exists(inputSel)) {
+    throw new Error('Could not open the required-attendee field');
+  }
+  typeText(inputSel, room);
+
+  const optionSel = `[role=option][aria-label*='${room}']`;
+  let found = false;
+  for (let i = 0; i < 12 && !found; i++) {
+    await sleep(1000);
+    found = exists(optionSel);
+  }
+  if (!found) {
+    throw new Error(`Room "${room}" was not found in the directory`);
+  }
+  $(optionSel).click();
+} else {
+  // Name -> room finder.
+  const inputSel = "input[aria-label='Add a room']";
+  for (let i = 0; i < 10 && !exists(inputSel); i++) {
+    clickByName('Add a room');
+    await sleep(1000);
+  }
+  if (!exists(inputSel)) {
+    throw new Error('Could not open the room finder');
+  }
+  typeText(inputSel, room);
+
+  let label = null;
+  for (let i = 0; i < 14 && !label; i++) {
+    await sleep(1000);
+    const opts = Array.from(document.querySelectorAll('[role=option]'));
+    const el = opts.find(o => /capacity/i.test(o.getAttribute('aria-label') || '') && o.offsetParent);
+    if (el) {
+      el.scrollIntoView({ block: 'center' });
+      el.click();
+      label = el.getAttribute('aria-label');
+    }
+  }
+  if (!label) {
+    throw new Error(`No room matched "${room}"`);
+  }
+}
+
+// ── Collect the room's free/busy from intercepted responses ──────────
+let roomId = null;
+let errMsg = null;
+let sawView = false;
+const itemsById = new Map();
+const isRoomId = id => (isEmail ? id === room.toLowerCase() : !seen.has(id));
+
+let stable = 0;
+for (let i = 0; i < 30; i++) {
+  await sleep(1000);
+  for (const pair of readCapture()) {
+    for (const [id, s] of schedulesFromPair(pair)) {
+      if (!isRoomId(id)) continue;
+      if (!roomId) roomId = s.scheduleId;
+      if (s.error) errMsg = s.error.message || s.error.responseCode || 'unknown';
+      if (s.availabilityView && s.availabilityView.length) sawView = true;
+      for (const it of (s.scheduleItems || [])) {
+        const key = it && it.id ? it.id : JSON.stringify(it && [it.startTime, it.endTime, it.subject]);
+        if (it) itemsById.set(key, it);
+      }
+    }
+  }
+  if (sawView) { stable += 1; if (stable >= 3) break; }
+}
+
+if (!roomId) {
+  throw new Error(`No free/busy returned for "${room}" on ${date}`);
+}
+if (errMsg && !sawView) {
+  throw new Error(`Free/busy error for "${room}": ${errMsg}`);
+}
+
+const timeline = buildTimeline([...itemsById.values()], date);
+return timeline.map(r => ({ room: roomId, ...r }));

package/node_modules/@commandgarden/daemon/connectors/teams-room-availability.yaml

@@ -0,0 +1,46 @@
+site: teams
+name: room-availability
+version: "1.0"
+description: "Meeting-room free/busy timeline for one room on a given day (Teams/Outlook calendar)"
+access: read
+
+domains:
+  - "outlook.cloud.microsoft.mcas.ms"
+capabilities:
+  - navigate
+  - js_evaluate
+
+args:
+  - name: room
+    type: string
+    required: true
+    help: "Room name or mailbox email (e.g. 'MBTMY The Vista' or 'RES-RERE-M6VJ7ZUW@mercedes-benz.com')"
+  - name: date
+    type: string
+    required: false
+    help: "Day to check in YYYY-MM-DD format (default: today)"
+    pattern: "^\\d{4}-\\d{2}-\\d{2}$"
+
+columns:
+  - name: room
+    type: string
+  - name: date
+    type: string
+  - name: state
+    type: string
+  - name: start
+    type: string
+  - name: end
+    type: string
+  - name: durationMin
+    type: number
+
+pipeline:
+  - step: navigate
+    url: "https://outlook.cloud.microsoft.mcas.ms/calendar/deeplink/compose"
+  - step: wait
+    selector: "body"
+    timeout: 30000
+  - step: js_evaluate
+    file: teams-room-availability.eval.js
+

package/node_modules/@commandgarden/daemon/connectors/timetracking-projects.eval.js

@@ -0,0 +1,52 @@
+// Runs in page context via js_evaluate step.
+// Fetches the Projects API to list all available projects and activities.
+//
+// Template variables interpolated before execution:
+//   ${{ args.month | default("") }}
+
+// Poll for MSAL token (handles SSO redirects + MFA)
+// Canonical source: connectors/lib/msal-token.js
+const __deadline = Date.now() + 60000;
+let token;
+while (Date.now() < __deadline) {
+  const k = Object.keys(sessionStorage).find(x => x.includes('accesstoken'));
+  if (k) {
+    try {
+      const tokenData = JSON.parse(sessionStorage.getItem(k));
+      if (Number(tokenData.expiresOn) > Math.floor(Date.now() / 1000) + 30) {
+        token = tokenData.secret;
+        break;
+      }
+    } catch (_) {}
+  }
+  await new Promise(r => setTimeout(r, 1000));
+}
+if (!token) throw new Error('No valid MSAL access token after 60s — log in and retry');
+
+let month = '${{ args.month | default("") }}';
+if (!month) {
+  const now = new Date();
+  month = now.getFullYear() + '-' + String(now.getMonth() + 1).padStart(2, '0');
+}
+
+const resp = await fetch(
+  'https://mbti-bam-wzde-prd-ejdchtb0g9afexhr.a01.azurefd.net/api/Projects?date=' + month + '-01',
+  { headers: { Authorization: 'Bearer ' + token, Accept: 'application/json' } }
+);
+if (!resp.ok) throw new Error('Projects API returned HTTP ' + resp.status);
+
+const projects = await resp.json();
+const rows = [];
+for (const p of projects) {
+  for (const act of p.activities || []) {
+    rows.push({
+      projectId: p.mserp_projectid || null,
+      projectName: p.mserp_projectname || null,
+      activityNumber: act.mserp_activitynumber || null,
+      activityName: act.mserp_description || null,
+      category: act.mserp_category || null,
+      linePropertyId: act.mserp_linepropertyid || null,
+    });
+  }
+}
+return rows;

package/node_modules/@commandgarden/daemon/connectors/timetracking-projects.yaml

@@ -0,0 +1,42 @@
+site: timetracking
+name: projects
+version: "1.0"
+description: "List all available projects and activities for the current user"
+access: read
+
+domains:
+  - "timetracking.mercedes-benz-techinnovation.com"
+  - "mbti-bam-wzde-prd-ejdchtb0g9afexhr.a01.azurefd.net"
+capabilities:
+  - navigate
+  - js_evaluate
+
+args:
+  - name: month
+    type: string
+    required: false
+    help: "Month in YYYY-MM format (default: current month)"
+    pattern: "^\\d{4}-\\d{2}$"
+
+columns:
+  - name: projectId
+    type: string
+  - name: projectName
+    type: string
+  - name: activityNumber
+    type: string
+  - name: activityName
+    type: string
+  - name: category
+    type: string
+  - name: linePropertyId
+    type: string
+
+pipeline:
+  - step: navigate
+    url: "https://timetracking.mercedes-benz-techinnovation.com/"
+  - step: wait
+    selector: "body"
+    timeout: 10000
+  - step: js_evaluate
+    file: timetracking-projects.eval.js

package/node_modules/@commandgarden/daemon/connectors/timetracking-report.eval.js

@@ -0,0 +1,81 @@
+// Runs in page context via js_evaluate step.
+// Reads the MSAL access token from sessionStorage, fetches the ReportFAK API,
+// and flattens day objects into one row per booking line.
+//
+// SSO/MFA: polls sessionStorage for up to 60s, giving the user time to
+// complete login and get redirected back to the app.
+//
+// Template variables interpolated before execution:
+//   ${{ args.month | default("") }}
+
+// Poll for MSAL token (handles SSO redirects + MFA)
+// Canonical source: connectors/lib/msal-token.js
+const __deadline = Date.now() + 60000;
+let token;
+while (Date.now() < __deadline) {
+  const k = Object.keys(sessionStorage).find(x => x.includes('accesstoken'));
+  if (k) {
+    try {
+      const tokenData = JSON.parse(sessionStorage.getItem(k));
+      if (Number(tokenData.expiresOn) > Math.floor(Date.now() / 1000) + 30) {
+        token = tokenData.secret;
+        break;
+      }
+    } catch (_) {}
+  }
+  await new Promise(r => setTimeout(r, 1000));
+}
+if (!token) throw new Error('No valid MSAL access token after 60s — log in and retry');
+
+let month = '${{ args.month | default("") }}';
+if (!month) {
+  const now = new Date();
+  month = now.getFullYear() + '-' + String(now.getMonth() + 1).padStart(2, '0');
+}
+
+const apiBase = 'https://mbti-bam-wzde-prd-ejdchtb0g9afexhr.a01.azurefd.net/api/';
+const authHeaders = { Authorization: 'Bearer ' + token, Accept: 'application/json' };
+
+const [resp, projResp] = await Promise.all([
+  fetch(apiBase + 'ReportFAK?date=' + month + '-01', { headers: authHeaders }),
+  fetch(apiBase + 'Projects?date=' + month + '-01', { headers: authHeaders }).catch(() => null),
+]);
+if (!resp.ok) throw new Error('ReportFAK returned HTTP ' + resp.status);
+
+const projectNames = new Map();
+const activityNames = new Map(); // key: "projectId\0activityNumber" → description
+if (projResp && projResp.ok) {
+  for (const p of await projResp.json()) {
+    projectNames.set(p.mserp_projectid, p.mserp_projectname);
+    for (const act of p.activities || []) {
+      if (act.mserp_activitynumber && act.mserp_description) {
+        activityNames.set(act.mserp_projectid + '\0' + act.mserp_activitynumber, act.mserp_description);
+      }
+    }
+  }
+}
+
+const days = await resp.json();
+const rows = [];
+for (const day of days) {
+  const header = day.calendarHeader || {};
+  const dayDate = (day.date || '').slice(0, 10);
+  for (const line of day.calendarLines || []) {
+    const pid = line.mserp_projectid || null;
+    const actNum = line.mserp_activitynumber || null;
+    rows.push({
+      month: month,
+      date: dayDate,
+      projectId: pid,
+      projectName: projectNames.get(pid) || null,
+      category: line.mserp_category || null,
+      activity: actNum,
+      activityName: (pid && actNum) ? (activityNames.get(pid + '\0' + actNum) || null) : null,
+      hours: typeof line.mserp_hours === 'number' ? line.mserp_hours : null,
+      status: header.status || null,
+      journalId: line.mserp_journalid || null,
+      lineNumber: typeof line.mserp_linenumber === 'number' ? line.mserp_linenumber : null,
+    });
+  }
+}
+return rows;