@patimweb/pi-zep 1.0.1 → 1.0.2

package/README.md

@@ -107,17 +107,17 @@ Other message texts observed:
 ```
 zep_setup  name=work userid=patrick.weppelmann password=… mandant=zepneoimpulse
 zep_status probe=true
-zep_projects projekt=Julabo
+zep_projects projekt=Contoso
 zep_week
-zep_book   datum=2026-09-17 von=08:00 bis=12:00 projekt=413 vorgang=90-01 taetigkeit=co bemerkung="3447 Ladeanzeige nach Pick"
+zep_book   datum=2026-09-17 von=08:00 bis=12:00 projekt=413 vorgang=90-01 taetigkeit=co bemerkung="4711 Beispiel-Ticket"
 zep_book   datum=2026-09-17 entries=[{von:"08:00",bis:"12:00",bemerkung:"…"},{von:"13:00",bis:"17:00",bemerkung:"…"}]
 ```
 
 `projekt` and `vorgang` accept either an id (`413`, `3284`) or part of the label
-(`Julabo`, `90-01`). A full example, `dryRun` first:
+(`Contoso`, `90-01`). A full example, `dryRun` first:
 
 ```
-zep_book projekt=Julabo vorgang=90-01 datum=2026-09-17 von=08:00 bis=12:00 dryRun=true
+zep_book projekt=Contoso vorgang=90-01 datum=2026-09-17 von=08:00 bis=12:00 dryRun=true
 ```
 
 ## Important behaviour

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patimweb/pi-zep",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "ZEP time-tracking for pi coding agent — book project times (Projektzeiten) on zep-online.de over plain HTTP, without the paid ZEP API",
   "keywords": [
     "pi-package",

package/src/clients/zep-client.ts

@@ -491,8 +491,8 @@ export class ZepClient {
       letzterReiseOrt: "D-Office",
       ortProjektrelevant: "1",
       reise: "0",
-      startort: "Gottmadingen Im Brühl 1",
-      zielort: "Ismaningen Neoimpulse",
+      startort: "Beispielweg 1",
+      zielort: "Beispielort",
       fahrzeug: "Firmenwagen",
       km: "285",
       mitfahrer: "1",

package/src/clients/zep-parse.ts

@@ -297,13 +297,51 @@ function resolveDayDate(dayLabel: string, kwDate: string): string | null {
   return monday.toISOString().slice(0, 10);
 }
 
+/**
+ * Label of a day row: `Do 17.09.`.
+ *
+ * The label cell also carries the meals/breaks icons, whose text content is
+ * literally `restaurant` / `local_cafe`; taking the plain text of the cell
+ * would render as `Do 17.09. restaurant`. Prefer the dedicated weekday and
+ * day/month divs and only fall back to text surgery.
+ */
+function dayRowLabel(cellHtml: string, joined: string): string {
+  const weekday = /class="modimidofrsaso"[^>]*>\s*([A-Za-z]{2})\s*</.exec(cellHtml)?.[1];
+  const dayMonth = /class="tag_monat"[^>]*>\s*([0-9]{2}\.[0-9]{2}\.)\s*</.exec(cellHtml)?.[1];
+  if (weekday && dayMonth) return `${weekday} ${dayMonth}`;
+
+  return joined
+    .split(/\s{2,}/)[0]!
+    .replace(/\s*(restaurant|local_cafe)\b.*$/i, "")
+    .trim();
+}
+
+/**
+ * Place of work of a booking row, or null when ZEP does not render it.
+ *
+ * The Ort cell is the row's last column (`von` + 9) and, unlike the other
+ * metadata columns, it carries no `data-columnid` of its own. ZEP only emits
+ * it when there is something to report, so an absent cell means the booking
+ * sits on the default place of work (`NULL`). A trailing `*` marks a
+ * deviation from that default and is not part of the value.
+ */
+function bookingOrt(flat: ReadonlyArray<string>, from: number): string | null {
+  return (flat[from + 9] ?? "").replace(/[\s*]+$/, "").trim() || null;
+}
+
 /**
  * Parse the week table rendered into `#ProjektzeitTableDiv`.
  *
- * Row shapes observed on the live system:
- *   day row      `["Do 17.09. restaurant", ...]`   (icons = meals/breaks)
- *   booking row  `["editdelete", von, bis, Dauer, "", Projekt, Vorgang, Taet, "payments", Bemerkung]`
- *   sum row      `["Summe", "8,00", "payments 8,00"]`
+ * Row shapes observed on the live system (2026-09-17, ZEP v7.13.88):
+ *
+ *   day, no bookings   `["Do 17.09. restaurant", ""]`
+ *   day, with bookings `["Do 17.09. restaurant", "", "editdelete", von, bis, Dauer, "", Projekt, Vorgang, Taet, fakturierbar, Bemerkung, Ort]`
+ *   further bookings   `["editdelete", von, bis, Dauer, "", Projekt, Vorgang, Taet, "payments", Bemerkung, Ort]`
+ *   sum row            `["Summe", "4,00", ...]`
+ *
+ * The day's FIRST booking is rendered inside the day row itself (the label
+ * cell then has `rowspan=N`), which is why the booking columns must be read
+ * relative to the first `HH:MM` cell rather than at a fixed offset.
  */
 export function parseWeek(tableHtml: string, kwDate: string): ZepWeek {
   const days: ZepWeekDay[] = [];
@@ -341,19 +379,22 @@ export function parseWeek(tableHtml: string, kwDate: string): ZepWeek {
     // --- day header -------------------------------------------------------
     const joined = flat.join(" ").trim();
     const dayMatch = DAY_RE.exec(joined);
-    if (dayMatch && cells.length <= 3) {
+    // A day row is identified by its `id="day_YYYY-MM-DD"` cell; the label
+    // text is only used as a fallback so that a markup change in the label
+    // cannot silently re-attach a day's bookings to the previous day.
+    const dayId =
+      /id="day_(\d{4}-\d{2}-\d{2})"/.exec(row.html) ??
+      /openMahlzeiten\s*\(\s*this\s*,\s*'(\d{4}-\d{2}-\d{2})'/.exec(row.html);
+    if (dayId || (dayMatch && cells.length <= 3)) {
       flush();
-      const iso =
-        /id="day_(\d{4}-\d{2}-\d{2})"/.exec(row.html) ??
-        /openMahlzeiten\s*\(\s*this\s*,\s*'(\d{4}-\d{2}-\d{2})'/.exec(row.html);
-      const label = joined.split(/\s{2,}/)[0] ?? joined;
+      const label = dayRowLabel(cells[0] ?? "", joined) || joined;
       current = {
         label,
-        date: iso?.[1] ?? resolveDayDate(label, kwDate),
+        date: dayId?.[1] ?? resolveDayDate(label, kwDate),
         bookings: [],
         classes: row.classes,
       };
-      continue;
+      // deliberately no `continue`: this row may carry the day's first booking
     }
 
     if (!current) continue;
@@ -368,22 +409,26 @@ export function parseWeek(tableHtml: string, kwDate: string): ZepWeek {
     }
 
     // --- booking row ------------------------------------------------------
-    const from = /^\d{2}:\d{2}$/.test(flat[1] ?? "");
-    if (!from) continue;
+    // Anchor on the `von` cell: cell 1 in a standalone booking row, cell 3
+    // behind the label in a day row that carries its first booking.
+    const from = flat.findIndex((c, index) => index > 0 && /^\d{2}:\d{2}$/.test(c));
+    if (from === -1) continue;
 
-    const objectId = /objectId=(\d+)/.exec(row.html)?.[1] ?? null;
+    const objectId =
+      /objectId=?(\d+)/.exec(row.html)?.[1] ?? null;
     current.bookings.push({
       objectId,
       dayLabel: current.label,
       date: current.date,
-      from: flat[1] ?? "",
-      to: flat[2] ?? "",
-      duration: flat[3] ?? "",
-      project: flat[5] ?? "",
-      vorgang: flat[6] ?? "",
-      taetigkeit: flat[7] ?? "",
-      billable: /payments/i.test(flat[8] ?? "") || /payments/i.test(row.html),
-      comment: flat[9] ?? "",
+      from: flat[from] ?? "",
+      to: flat[from + 1] ?? "",
+      duration: flat[from + 2] ?? "",
+      project: flat[from + 4] ?? "",
+      vorgang: flat[from + 5] ?? "",
+      taetigkeit: flat[from + 6] ?? "",
+      billable: /payments/i.test(flat[from + 7] ?? "") || /payments/i.test(row.html),
+      comment: flat[from + 8] ?? "",
+      ort: bookingOrt(flat, from),
     });
   }
 

package/src/formatting/formatters.ts

@@ -65,7 +65,8 @@ export function formatWeek(week: ZepWeek): string {
       lines.push(
         `    #${booking.objectId ?? "?"}  ${booking.from}-${booking.to} (${booking.duration})  ` +
           `${booking.project} / ${booking.vorgang} / ${booking.taetigkeit}` +
-          `${booking.billable ? " [billable]" : ""}`,
+          `${booking.billable ? " [billable]" : ""}` +
+          `${booking.ort ? `  @ ${booking.ort}` : ""}`,
       );
       if (booking.comment) lines.push(`        ${booking.comment}`);
     }

package/src/tools/zep-book.ts

@@ -64,13 +64,13 @@ export const ZepBookTool = {
     bemerkung: Type.Optional(
       Type.String({
         description:
-          "Comment. Convention: include the ticket/story numbers (e.g. '3447 Ladeanzeige nach Pick, 3455 Fach-HU-Nummer').",
+          "Comment. Convention: include the ticket/story numbers (e.g. '4711 Ladeanzeige, 4712 Fach-HU-Nummer').",
       }),
     ),
     projekt: Type.Optional(
       Type.String({
         description:
-          "Project id (e.g. '413' for Julabo) or part of its label (e.g. 'Julabo'). Falls back to the project ZEP has selected for this user.",
+          "Project id (e.g. '413' for Contoso) or part of its label (e.g. 'Contoso'). Falls back to the project ZEP has selected for this user.",
       }),
     ),
     vorgang: Type.Optional(
@@ -85,7 +85,10 @@ export const ZepBookTool = {
       }),
     ),
     ort: Type.Optional(
-      Type.String({ description: "Location code, e.g. 'D-Office' or 'D'. Defaults to 'NULL' (first place of work)." }),
+      Type.String({
+        description:
+          "Location code, e.g. 'D-Office' (office), 'D' (inland away) or 'D-3M'. The default 'NULL' is the first place of work (Erste Tätigkeitsstätte).",
+      }),
     ),
     entries: Type.Optional(
       Type.Array(
@@ -228,6 +231,10 @@ export const ZepBookTool = {
         const comment = entry.bemerkung ?? params.bemerkung ?? "";
 
         const vorgangLabel = scope.vorgaenge.find((v) => v.id === vorgangId)?.label;
+        // Always state the place of work that goes onto the wire: 'NULL' is
+        // the default (Erste Tätigkeitsstätte) and is exactly what a booking
+        // without an explicit ort gets, so it must not be invisible here.
+        const ortLabel = form.orte.find((o) => o.id === ort)?.label;
 
         planned.push({
           request: {
@@ -245,7 +252,8 @@ export const ZepBookTool = {
             `${date}  ${from}-${to}  (${duration})\n` +
             `         project ${projectId}${scope.project ? ` "${scope.project.label}"` : ""}\n` +
             `         Vorgang ${vorgangId}${vorgangLabel ? ` "${vorgangLabel}"` : ""}\n` +
-            `         Tätigkeit ${taetigkeit}${ort === "NULL" ? "" : `, Ort ${ort}`}` +
+            `         Tätigkeit ${taetigkeit}, Ort ${ort}` +
+            `${ortLabel && ortLabel !== ort ? ` (${ortLabel})` : ""}` +
             `${comment ? `\n         "${comment}"` : ""}`,
         });
       }

package/src/types.ts

@@ -94,6 +94,13 @@ export interface ZepBooking {
   readonly taetigkeit: string;
   readonly billable: boolean;
   readonly comment: string;
+  /**
+   * Place of work as the table renders it, e.g. `D-Office`.
+   *
+   * ZEP only draws this cell when there is something to say, so `null` means
+   * "no cell rendered" and therefore the default place of work (`NULL`).
+   */
+  readonly ort: string | null;
 }
 
 export interface ZepWeekDay {