node-autotask 0.12.0 → 0.13.0

package/dist/{chunk-MY7ZSXY3.js → chunk-Y6O5VVQ4.js}

@@ -33,10 +33,10 @@ import {
   unwrapItem,
   unwrapItems,
   unwrapOperation
-} from "./chunk-GD4JRPYF.js";
+} from "./chunk-IKJLIDK3.js";
 import {
   CAPABILITIES
-} from "./chunk-4A6XLQHE.js";
+} from "./chunk-OZD5FQM4.js";
 
 // src/resources/appointments.ts
 var AppointmentsResource = class extends BaseResource {
@@ -4549,7 +4549,8 @@ var PROFITABILITY_OPT_KEYS = [
   "groupByActivity",
   "staleAfterDays",
   "maxTicketsForJoin",
-  "limit"
+  "limit",
+  "includeRows"
 ];
 var LABOUR_METHOD_SET = [
   "billing_item_our_cost",
@@ -4561,7 +4562,15 @@ var PROFITABILITY_MAX_WINDOW_MONTHS = 36;
 var RECURRING_DRIFT_EPSILON = 5e-3;
 var ESTIMATE_DEVIATION_THRESHOLD_PCT = 10;
 var CLOSED_STATUS_LABEL_RE = /resolved|completed|cancelled|canceled|closed|deleted/i;
-var PROFITABILITY_WIRE_BUDGET = 18;
+var PROFITABILITY_WIRE_BUDGET = 21;
+var BLOCK_HOURS_LABEL_RE = /block\s*hours?/i;
+var TIME_AND_MATERIALS_LABEL_RE = /time.*materials?/i;
+var NOT_ACTIVE_LABEL_RE = /cancel|inactive/i;
+var SUBSCRIPTION_NOT_ACTIVE_STATUS_IDS = /* @__PURE__ */ new Set([2, 3]);
+var PERIOD_TYPE_MONTHLY_FACTOR = { 2: 1, 3: 1 / 3, 4: 1 / 6, 5: 1 / 12 };
+var PERIOD_TYPE_ONE_TIME = 1;
+var SERVICE_LINE_FKS = ["contractServiceID", "contractServiceBundleID", "contractServicePeriodID", "contractServiceBundlePeriodID", "contractServiceAdjustmentID", "contractServiceBundleAdjustmentID"];
+var CHARGE_LINE_FKS = ["contractChargeID", "ticketChargeID", "projectChargeID"];
 var DATE_RE2 = /^\d{4}-\d{2}-\d{2}$/;
 function num2(v) {
   return typeof v === "number" && Number.isFinite(v) ? v : 0;
@@ -4597,17 +4606,81 @@ function monthsBetween(dateFrom, dateTo) {
   }
   return out;
 }
+function dayAfter(date) {
+  return new Date(Date.parse(date) + 864e5).toISOString().slice(0, 10);
+}
 function monthBounds(month, dateFrom, dateTo) {
   const y = Number(month.slice(0, 4));
   const m = Number(month.slice(5, 7));
   const first = `${month}-01`;
-  const lastOfMonth = new Date(Date.UTC(y, m, 0)).getUTCDate();
-  const rawEnd = `${month}-${String(lastOfMonth).padStart(2, "0")}`;
+  const nextFirst = new Date(Date.UTC(y, m, 1)).toISOString().slice(0, 10);
+  const toExcl = dayAfter(dateTo);
   return {
     start: first > dateFrom ? first : dateFrom,
-    end: rawEnd < dateTo ? rawEnd : dateTo
+    endExclusive: nextFirst < toExcl ? nextFirst : toExcl
   };
 }
+function chargeCost(charge) {
+  const ext = charge["extendedCost"];
+  const fromUnits = num2(charge["unitCost"]) * num2(charge["unitQuantity"]);
+  if (typeof ext === "number" && Number.isFinite(ext) && !(ext === 0 && fromUnits !== 0)) return ext;
+  return fromUnits;
+}
+function isOneTimePeriod(periodType, label) {
+  return label !== void 0 ? /one[\s-]*time/i.test(label) : periodType === PERIOD_TYPE_ONE_TIME;
+}
+function periodMonthlyFactor(periodType, label) {
+  if (label !== void 0) {
+    if (/semi/i.test(label)) return 1 / 6;
+    if (/quarter/i.test(label)) return 1 / 3;
+    if (/annual|year/i.test(label)) return 1 / 12;
+    if (/month/i.test(label)) return 1;
+    return null;
+  }
+  return typeof periodType === "number" ? PERIOD_TYPE_MONTHLY_FACTOR[periodType] ?? null : null;
+}
+var BILLING_ITEM_TYPE_KIND = {
+  1: "labour",
+  2: "labour",
+  3: "charges",
+  4: "expenses",
+  5: "other",
+  6: "recurring",
+  7: "charges",
+  8: "other"
+};
+function billingLineType(item) {
+  const byType = BILLING_ITEM_TYPE_KIND[num2(item["billingItemType"])];
+  if (byType !== void 0) return byType;
+  if (num2(item["timeEntryID"]) > 0) return "labour";
+  if (num2(item["expenseItemID"]) > 0) return "expenses";
+  if (CHARGE_LINE_FKS.some((k) => num2(item[k]) > 0)) return "charges";
+  if (SERVICE_LINE_FKS.some((k) => num2(item[k]) > 0)) return "recurring";
+  return "other";
+}
+function internalAmount(row, internalKey, localKey) {
+  const v = row[internalKey];
+  return typeof v === "number" && Number.isFinite(v) ? v : num2(row[localKey]);
+}
+function cents(v) {
+  return v === null ? null : Math.round(v * 100) / 100;
+}
+async function readPicklists(http, entityPath, operation) {
+  const res = await http.request({ method: "GET", path: `${entityPath}/entityInformation/fields`, operation });
+  const body = typeof res === "object" && res !== null ? res : {};
+  const fields = Array.isArray(body["fields"]) ? body["fields"] : [];
+  const out = /* @__PURE__ */ new Map();
+  for (const f of fields) {
+    if (f["isPickList"] !== true || typeof f["name"] !== "string" || !Array.isArray(f["picklistValues"])) continue;
+    const values = /* @__PURE__ */ new Map();
+    for (const p of f["picklistValues"]) {
+      const id = typeof p["value"] === "string" ? Number.parseInt(p["value"], 10) : Number.NaN;
+      if (Number.isFinite(id)) values.set(id, String(p["label"] ?? ""));
+    }
+    out.set(f["name"], values);
+  }
+  return out;
+}
 function dateToDay(v) {
   if (typeof v !== "string" || v.length < 10) return null;
   const d = Date.parse(v.slice(0, 10));
@@ -4616,7 +4689,7 @@ function dateToDay(v) {
 function validateProfitabilityOptions(contractId, opts) {
   if (opts === void 0 || (typeof opts !== "object" || opts === null || Array.isArray(opts))) {
     throw new AutotaskConfigError(
-      `profitability: opts must be the options object (got ${opts === void 0 ? "undefined" : Array.isArray(opts) ? "an array" : typeof opts})`,
+      `profitability: opts is required \u2014 the options object with dateFrom and dateTo (YYYY-MM-DD) (got ${opts === void 0 ? "undefined" : Array.isArray(opts) ? "an array" : typeof opts})`,
       { operation: "contracts.profitability" }
     );
   }
@@ -4656,7 +4729,7 @@ function validateProfitabilityOptions(contractId, opts) {
   if (method === "provided" && rate === null) {
     problems.push(`labourRatePerHour is required (finite number >= 0) when labourCostMethod is "provided" (got ${String(opts.labourRatePerHour)})`);
   }
-  for (const key of ["includeRecurringCosts", "includeUnbilledRevenue", "groupByActivity"]) {
+  for (const key of ["includeRecurringCosts", "includeUnbilledRevenue", "groupByActivity", "includeRows"]) {
     const v = opts[key];
     if (v !== void 0 && typeof v !== "boolean") problems.push(`${key} must be a boolean (got ${String(v)})`);
   }
@@ -4714,7 +4787,8 @@ function validateProfitabilityOptions(contractId, opts) {
     groupByActivity: opts.groupByActivity ?? true,
     staleAfterDays: stale,
     maxTicketsForJoin: mtj,
-    limit
+    limit,
+    includeRows: opts.includeRows ?? false
   };
 }
 async function boundedPart2(http, path, conditions, limit, operation, includeFields) {
@@ -4873,7 +4947,7 @@ async function expandByMonth(http, path, fullWindowCond, limit, operation, field
     const cond = [
       ...fullWindowCond.filter((c) => c.field !== dateField),
       { field: dateField, op: "gte", value: b.start },
-      { field: dateField, op: "lte", value: b.end }
+      { field: dateField, op: "lt", value: b.endExclusive }
     ];
     const page = await boundedPart2(http, path, cond, limit, operation, fields);
     wires.issued += 1;
@@ -4888,7 +4962,15 @@ async function expandByMonth(http, path, fullWindowCond, limit, operation, field
   }
   const partNote = `per-month windowing fired: ${months.length} month read(s) added after the full-window page carried a live cursor (no cursor walk \u2014 the single-page house rule)` + (fullMonths.length > 0 ? ` | month ${fullMonths.join(", ")} hit the limit of ${limit} \u2014 figures cover the returned rows only; widen with a narrower window or higher limit` : "");
   wires.note = (wires.note ? wires.note + " | " : "") + partNote;
-  return { items: all, capped: cappedMonths.length > 0, hasMore: fullMonths.length > 0, note: partNote, status: "ok" };
+  return { items: all, capped: cappedMonths.length > 0, hasMore: fullMonths.length > 0, note: partNote, status: "ok", truncatedMonths: fullMonths };
+}
+async function degradable(read) {
+  try {
+    return await read();
+  } catch (err) {
+    if (!(err instanceof AutotaskError)) throw err;
+    return { items: [], capped: false, hasMore: false, absent: err.code, absentMessage: err.message };
+  }
 }
 function fmtHours(h) {
   const r = Math.round(h * 100) / 100;
@@ -4904,16 +4986,29 @@ function pctOrNa(r) {
 function dedupeSortCap(ids, limit) {
   return [...new Set(ids)].sort((a, b) => Number(a) - Number(b)).slice(0, limit);
 }
-async function profitability(resource, contractId, opts, http) {
-  const v = validateProfitabilityOptions(contractId, opts ?? {});
+async function profitability(resource, contractId, opts, rawHttp) {
+  const v = validateProfitabilityOptions(contractId, opts);
   const OP2 = "contracts.profitability";
   const id = parseIdentifier(contractId, "contractId");
   const idNum = typeof id === "number" ? id : Number(id);
-  const wires = { issued: 0, budget: PROFITABILITY_WIRE_BUDGET };
+  const wires = { issued: 0, requests: 0, budget: PROFITABILITY_WIRE_BUDGET };
   const asOf = (/* @__PURE__ */ new Date()).toISOString();
   const asOfMs = Date.parse(asOf);
+  const toExcl = dayAfter(v.dateTo);
+  const windowOn = (field) => [{ field, op: "gte", value: v.dateFrom }, { field, op: "lt", value: toExcl }];
+  const http = { request: (o) => {
+    wires.requests += 1;
+    return rawHttp.request(o);
+  } };
+  const readPart = (path, conditions, fields) => {
+    wires.issued += 1;
+    return degradable(() => boundedPart2(http, path, conditions, v.limit, OP2, fields));
+  };
   const skipPart = (note) => ({ items: [], capped: false, hasMore: false, status: "skipped", note });
   const stampPart = (key, raw, conditions, extraNotes) => {
+    if (raw.absent !== void 0) {
+      return { items: [], capped: false, hasMore: false, status: "absent", absent: raw.absent, note: `absent: the read failed (${raw.absent}: ${raw.absentMessage ?? ""}) \u2014 the monthly figures it feeds carry it in coverage_gaps` };
+    }
     const st = unbilledWorkPartStatus(key, conditions, raw.items);
     return {
       items: raw.items,
@@ -4925,12 +5020,26 @@ async function profitability(resource, contractId, opts, http) {
       emptyReason: raw.items.length === 0 && st.status === "ok" ? EMPTY_REASON_STAMPS[key]?.query : void 0
     };
   };
+  const truncatedMonths = {};
+  const windowedPart = async (name, key, path, cond, fields, dateField) => {
+    const first = await readPart(path, cond, fields);
+    if (first.absent !== void 0 || !first.hasMore) return { part: stampPart(key, first, cond), rows: first.items };
+    const wp = await degradable(() => expandByMonth(http, path, cond, v.limit, OP2, fields, dateField, v.dateFrom, v.dateTo, wires));
+    if (!("truncatedMonths" in wp)) return { part: stampPart(key, wp, cond), rows: [] };
+    const { truncatedMonths: tm, ...part } = wp;
+    truncatedMonths[name] = tm;
+    return { part, rows: wp.items };
+  };
+  const contractCached = rawHttp.readCache?.get(`/V1.0/Contracts/${id}`) !== void 0;
   const contract = await resource.get(id);
   wires.issued += 1;
+  if (!contractCached) wires.requests += 1;
   const contractRow = contract;
   const companyID = num2(contractRow["companyID"]);
+  const contractType = num2(contractRow["contractType"]);
   let customer = null;
   let customerStatus = "skipped";
+  let customerAbsent;
   if (companyID > 0) {
     try {
       const res = await http.request({
@@ -4942,49 +5051,61 @@ async function profitability(resource, contractId, opts, http) {
       customer = item ?? null;
       customerStatus = "ok";
     } catch (err) {
-      if (!(err instanceof NotFoundError)) throw err;
+      if (!(err instanceof AutotaskError)) throw err;
+      if (!(err instanceof NotFoundError)) {
+        customerStatus = "absent";
+        customerAbsent = err.code;
+      }
     }
     wires.issued += 1;
   }
+  let contractTypeLabel = null;
+  if (contractType > 0) {
+    wires.issued += 1;
+    try {
+      contractTypeLabel = (await readPicklists(http, "/V1.0/Contracts", OP2)).get("contractType")?.get(contractType) ?? null;
+    } catch (err) {
+      if (!(err instanceof AutotaskError)) throw err;
+    }
+  }
+  const contractTypeKnown = contractTypeLabel !== null;
+  const isBlockHours = contractTypeKnown && BLOCK_HOURS_LABEL_RE.test(contractTypeLabel);
+  const isTimeAndMaterials = contractTypeKnown && TIME_AND_MATERIALS_LABEL_RE.test(contractTypeLabel);
   const servicesCond = [{ field: "contractID", op: "eq", value: id }];
-  const servicesRaw = await boundedPart2(http, "/V1.0/ContractServices/query", servicesCond, v.limit, OP2, ["id", "serviceID", "unitPrice", "unitCost", "internalCurrencyUnitPrice", "internalDescription"]);
-  wires.issued += 1;
-  const unitsCond = [{ field: "contractID", op: "eq", value: id }];
-  const unitsRaw = await boundedPart2(http, "/V1.0/ContractServiceUnits/query", unitsCond, v.limit, OP2, ["id", "contractServiceID", "serviceID", "units", "price", "cost", "internalCurrencyPrice", "startDate", "endDate", "approveAndPostDate"]);
-  wires.issued += 1;
+  const servicesRaw = await readPart("/V1.0/ContractServices/query", servicesCond, ["id", "serviceID", "unitPrice", "unitCost", "internalCurrencyUnitPrice", "internalDescription"]);
+  const unitsCond = [{ field: "contractID", op: "eq", value: id }, ...windowOn("startDate")];
+  const units = await windowedPart("contractServiceUnits", "contract_service_units", "/V1.0/ContractServiceUnits/query", unitsCond, ["id", "contractServiceID", "serviceID", "units", "price", "cost", "internalCurrencyPrice", "startDate", "endDate", "approveAndPostDate"], "startDate");
+  const unitRows = units.rows;
   let chargesPart;
   let charges = [];
   let chargesCond = [];
   if (v.includeRecurringCosts) {
-    chargesCond = [{ field: "contractID", op: "eq", value: id }, { field: "datePurchased", op: "gte", value: v.dateFrom }, { field: "datePurchased", op: "lte", value: v.dateTo }];
-    const raw = await boundedPart2(http, "/V1.0/ContractCharges/query", chargesCond, v.limit, OP2, ["id", "chargeType", "billableAmount", "extendedCost", "unitCost", "unitPrice", "unitQuantity", "datePurchased", "isBilled", "status", "contractServiceID"]);
-    wires.issued += 1;
+    chargesCond = [{ field: "contractID", op: "eq", value: id }, ...windowOn("datePurchased")];
+    const raw = await readPart("/V1.0/ContractCharges/query", chargesCond, ["id", "chargeType", "billableAmount", "extendedCost", "unitCost", "unitPrice", "unitQuantity", "datePurchased", "isBilled", "status", "contractServiceID"]);
     charges = raw.items;
     chargesPart = stampPart("contract_charges", raw, chargesCond);
   } else {
     chargesPart = skipPart("skipped: includeRecurringCosts is false (zero wire)");
   }
   const roleCostsCond = [{ field: "contractID", op: "eq", value: id }];
-  const roleCostsRaw = await boundedPart2(http, "/V1.0/ContractRoleCosts/query", roleCostsCond, v.limit, OP2, ["id", "rate", "resourceID", "roleID"]);
-  wires.issued += 1;
+  const roleCostsRaw = await readPart("/V1.0/ContractRoleCosts/query", roleCostsCond, ["id", "rate", "resourceID", "roleID"]);
   const ratesCond = [{ field: "contractID", op: "eq", value: id }];
-  const ratesRaw = await boundedPart2(http, "/V1.0/ContractRates/query", ratesCond, v.limit, OP2, ["id", "roleID", "contractHourlyRate", "internalCurrencyContractHourlyRate"]);
-  wires.issued += 1;
-  const billingCond = () => [{ field: "contractID", op: "eq", value: id }, { field: "itemDate", op: "gte", value: v.dateFrom }, { field: "itemDate", op: "lte", value: v.dateTo }];
-  const billingFields = ["id", "invoiceID", "timeEntryID", "ticketID", "ourCost", "quantity", "rate", "extendedPrice", "itemDate", "postedDate", "nonBillable", "billingCodeID", "billingItemType"];
-  const billingFirst = await boundedPart2(http, "/V1.0/BillingItems/query", billingCond(), v.limit, OP2, billingFields);
-  wires.issued += 1;
-  let billingItems;
-  let billingRows = [];
-  if (!billingFirst.hasMore) {
-    const st = unbilledWorkPartStatus("billing_items", billingCond(), billingFirst.items);
-    billingRows = billingFirst.items;
-    billingItems = { items: billingFirst.items, capped: billingFirst.capped, hasMore: false, status: st.status, blindSurface: st.blindSurface, note: st.note, emptyReason: billingFirst.items.length === 0 && st.status === "ok" ? EMPTY_REASON_STAMPS.billing_items?.query : void 0 };
+  const ratesRaw = await readPart("/V1.0/ContractRates/query", ratesCond, ["id", "roleID", "contractHourlyRate", "internalCurrencyContractHourlyRate"]);
+  let blocksPart;
+  if (!isBlockHours) {
+    blocksPart = skipPart(
+      contractTypeKnown ? `skipped: not a Block Hours contract (contractType ${contractType} "${contractTypeLabel}") \u2014 included hours apply to hour blocks only (zero wire)` : `skipped: the contract type is unknown (contractType ${contractType || "absent"}; label unresolved) \u2014 included hours are not evaluable (zero wire)`
+    );
   } else {
-    const wp = await expandByMonth(http, "/V1.0/BillingItems/query", billingCond(), v.limit, OP2, billingFields, "itemDate", v.dateFrom, v.dateTo, wires);
-    billingRows = wp.items;
-    billingItems = { ...wp, items: wp.items, note: wp.note };
-  }
+    const blocksCond = [{ field: "contractID", op: "eq", value: id }];
+    const raw = await readPart("/V1.0/ContractBlocks/query", blocksCond, ["id", "datePurchased", "startDate", "endDate", "hours", "hoursApproved", "status", "isPaid"]);
+    blocksPart = stampPart("contract_blocks", raw, blocksCond);
+  }
+  const billingCond = [{ field: "contractID", op: "eq", value: id }, ...windowOn("itemDate")];
+  const billingFields = ["id", "invoiceID", "timeEntryID", "ticketID", "ourCost", "quantity", "rate", "extendedPrice", "internalCurrencyExtendedPrice", "itemDate", "postedDate", "nonBillable", "billingCodeID", "billingItemType", "expenseItemID", ...SERVICE_LINE_FKS, ...CHARGE_LINE_FKS];
+  const billing = await windowedPart("billingItems", "billing_items", "/V1.0/BillingItems/query", billingCond, billingFields, "itemDate");
+  const billingItems = billing.part;
+  const billingRows = billing.rows;
   const invoiceIds = [...new Set(billingRows.map((b) => num2(b["invoiceID"])).filter((n) => n > 0))];
   let invoicesPart;
   let invoices = [];
@@ -4998,38 +5119,25 @@ async function profitability(resource, contractId, opts, http) {
     invoices = fb.items;
     invoicesPart = { items: fb.items, capped: capped.truncated, hasMore: capped.truncated, status: "ok", note: fb.notes.join(" | ") || void 0 };
   }
-  const timeCond = () => [{ field: "contractID", op: "eq", value: id }, { field: "dateWorked", op: "gte", value: v.dateFrom }, { field: "dateWorked", op: "lte", value: v.dateTo }];
+  const timeCond = [{ field: "contractID", op: "eq", value: id }, ...windowOn("dateWorked")];
   const timeFields = ["id", "ticketID", "taskID", "resourceID", "roleID", "hoursWorked", "hoursToBill", "dateWorked", "startDateTime", "endDateTime", "isNonBillable", "timeEntryType", "billingCodeID", "createDateTime"];
-  const timeFirst = await boundedPart2(http, "/V1.0/TimeEntries/query", timeCond(), v.limit, OP2, timeFields);
-  wires.issued += 1;
-  let timeEntries;
-  let entries = [];
-  if (!timeFirst.hasMore) {
-    const st = unbilledWorkPartStatus("time_entries", timeCond(), timeFirst.items);
-    entries = timeFirst.items;
-    timeEntries = { items: timeFirst.items, capped: timeFirst.capped, hasMore: false, status: st.status, blindSurface: st.blindSurface, note: st.note, emptyReason: timeFirst.items.length === 0 && st.status === "ok" ? EMPTY_REASON_STAMPS.time_entries?.query : void 0 };
-  } else {
-    const wp = await expandByMonth(http, "/V1.0/TimeEntries/query", timeCond(), v.limit, OP2, timeFields, "dateWorked", v.dateFrom, v.dateTo, wires);
-    entries = wp.items;
-    timeEntries = { ...wp, items: wp.items, note: wp.note };
-  }
+  const time = await windowedPart("timeEntries", "time_entries", "/V1.0/TimeEntries/query", timeCond, timeFields, "dateWorked");
+  const timeEntries = time.part;
+  const entries = time.rows;
   const ticketFields = ["id", "ticketNumber", "title", "status", "ticketCategory", "contractID", "createDate", "resolvedDateTime", "completedDate", "lastActivityDate", "dueDateTime"];
-  const ticketsActCond = [{ field: "contractID", op: "eq", value: id }, { field: "createDate", op: "gte", value: v.dateFrom }, { field: "createDate", op: "lte", value: v.dateTo }];
-  const ticketsActRaw = await boundedPart2(http, "/V1.0/Tickets/query", ticketsActCond, v.limit, OP2, ticketFields);
-  wires.issued += 1;
+  const createdInWindow = [{ field: "contractID", op: "eq", value: id }, ...windowOn("createDate")];
+  const refTicketIds = capJoinSet2(entries.map((e) => num2(e["ticketID"])).filter((n) => n > 0), v.maxTicketsForJoin);
+  const ticketsActCond = refTicketIds.ids.length === 0 ? createdInWindow : [{ op: "or", items: [{ op: "and", items: createdInWindow }, { field: "id", op: "in", value: refTicketIds.ids }] }];
+  const ticketsActRaw = await readPart("/V1.0/Tickets/query", ticketsActCond, ticketFields);
   let openStatusSet = null;
   let statusNote;
+  wires.issued += 1;
   try {
-    const res = await http.request({ method: "GET", path: "/V1.0/Tickets/entityInformation/fields", operation: OP2 });
-    wires.issued += 1;
-    const body = typeof res === "object" && res !== null ? res : {};
-    const fields = Array.isArray(body["fields"]) ? body["fields"] : [];
-    const statusRow = fields.find((f) => f["name"] === "status" && f["isPickList"] === true);
-    const values = statusRow && Array.isArray(statusRow["picklistValues"]) ? statusRow["picklistValues"] : [];
-    if (values.length === 0) {
+    const values = (await readPicklists(http, "/V1.0/Tickets", OP2)).get("status");
+    if (values === void 0 || values.size === 0) {
       statusNote = "the tickets.status picklist is not exposed to this API user \u2014 the open-status labels are unavailable";
     } else {
-      const open = values.filter((p) => typeof p["value"] === "string" && !CLOSED_STATUS_LABEL_RE.test(String(p["label"] ?? ""))).map((p) => Number.parseInt(String(p["value"]), 10)).filter((n) => Number.isFinite(n));
+      const open = [...values].filter(([, label]) => !CLOSED_STATUS_LABEL_RE.test(label)).map(([v2]) => v2);
       if (open.length === 0) {
         statusNote = "every tickets.status picklist label is closed-class \u2014 no open statuses exist in this tenant";
       } else {
@@ -5037,7 +5145,6 @@ async function profitability(resource, contractId, opts, http) {
       }
     }
   } catch (err) {
-    wires.issued += 1;
     statusNote = `the tickets.status field catalog read failed (${err instanceof AutotaskError ? err.code : "SERVER_ERROR"}: ${err instanceof Error ? err.message : String(err)}) \u2014 the open-status labels are unavailable`;
   }
   let ticketsOpenPart;
@@ -5046,8 +5153,7 @@ async function profitability(resource, contractId, opts, http) {
     ticketsOpenPart = skipPart(`skipped: ${statusNote} (zero wire)`);
   } else {
     const openCond = [{ field: "contractID", op: "eq", value: id }, { field: "status", op: "in", value: [...openStatusSet] }];
-    const raw = await boundedPart2(http, "/V1.0/Tickets/query", openCond, v.limit, OP2, ticketFields);
-    wires.issued += 1;
+    const raw = await readPart("/V1.0/Tickets/query", openCond, ticketFields);
     openTickets = raw.items;
     ticketsOpenPart = stampPart("tickets", raw, openCond, ["openStatusHeuristic: true (the open set is the tenant picklist minus the closed-class labels)"]);
   }
@@ -5071,16 +5177,16 @@ async function profitability(resource, contractId, opts, http) {
     const k = num2(t["id"]);
     if (k > 0 && !fetchedTickets.has(k)) fetchedTickets.set(k, t);
   }
-  const ticketJoin = capJoinSet2([...fetchedTickets.keys()], v.maxTicketsForJoin);
+  const contractTickets = [...fetchedTickets.values()].filter((t) => num2(t["contractID"]) === idNum);
+  const ticketJoin = capJoinSet2(contractTickets.map((t) => num2(t["id"])), v.maxTicketsForJoin);
   const joinNote = ticketJoin.truncated ? `the ticket join set is capped at ${v.maxTicketsForJoin} of ${ticketJoin.total} ids \u2014 the expenses + the miscoding probe cover the returned join set only` : void 0;
   let expensesPart;
   let expenses = [];
   if (ticketJoin.ids.length === 0) {
     expensesPart = skipPart("skipped: the contract has no fetched tickets to join against (an empty join set is NOT evidence of no expenses \u2014 zero wire)");
   } else {
-    const expCond = [{ field: "ticketID", op: "in", value: ticketJoin.ids }, { field: "expenseDate", op: "gte", value: v.dateFrom }, { field: "expenseDate", op: "lte", value: v.dateTo }];
-    const raw = await boundedPart2(http, "/V1.0/ExpenseItems/query", expCond, v.limit, OP2, ["id", "expenseDate", "expenseCategory", "paymentType", "expenseCurrencyExpenseAmount", "internalCurrencyExpenseAmount", "ticketID"]);
-    wires.issued += 1;
+    const expCond = [{ field: "ticketID", op: "in", value: ticketJoin.ids }, ...windowOn("expenseDate")];
+    const raw = await readPart("/V1.0/ExpenseItems/query", expCond, ["id", "expenseDate", "expenseCategory", "paymentType", "expenseCurrencyExpenseAmount", "internalCurrencyExpenseAmount", "ticketID"]);
     expenses = raw.items;
     expensesPart = stampPart("expense_items", raw, expCond, joinNote === void 0 ? void 0 : [joinNote]);
   }
@@ -5092,45 +5198,69 @@ async function profitability(resource, contractId, opts, http) {
     const probeCond = [
       { field: "ticketID", op: "in", value: ticketJoin.ids },
       { op: "or", items: [{ field: "contractID", op: "noteq", value: id }, { field: "contractID", op: "notExist" }] },
-      { field: "dateWorked", op: "gte", value: v.dateFrom },
-      { field: "dateWorked", op: "lte", value: v.dateTo }
+      ...windowOn("dateWorked")
     ];
-    const raw = await boundedPart2(http, "/V1.0/TimeEntries/query", probeCond, v.limit, OP2, ["id", "ticketID", "contractID", "resourceID", "hoursWorked", "dateWorked"]);
-    wires.issued += 1;
+    const raw = await readPart("/V1.0/TimeEntries/query", probeCond, ["id", "ticketID", "contractID", "resourceID", "hoursWorked", "dateWorked"]);
     probeRows = raw.items;
     probePart = stampPart("time_entries", raw, probeCond, joinNote === void 0 ? void 0 : [joinNote]);
   }
   let configurationItemsPart;
   let cis = [];
-  let ciCond = [];
   if (!v.includeRecurringCosts) {
     configurationItemsPart = skipPart("skipped: includeRecurringCosts is false (zero wire)");
-  } else if (companyID <= 0) {
-    configurationItemsPart = skipPart("skipped: the contract carries no companyID \u2014 the CI join has no root (zero wire)");
   } else {
-    ciCond = [{ field: "companyID", op: "eq", value: companyID }];
-    const raw = await boundedPart2(http, "/V1.0/ConfigurationItems/query", ciCond, v.limit, OP2, ["id", "configurationItemName", "status"]);
-    wires.issued += 1;
+    const ciCond = [{ field: "contractID", op: "eq", value: id }];
+    const raw = await readPart("/V1.0/ConfigurationItems/query", ciCond, ["id", "configurationItemName", "status", "contractID"]);
     cis = raw.items;
     configurationItemsPart = stampPart("configuration_items", raw, ciCond);
   }
   let subscriptionsPart;
   let subscriptions = [];
+  const subFactor = /* @__PURE__ */ new Map();
+  const oneTimeSubs = /* @__PURE__ */ new Set();
+  const cancelledSubs = /* @__PURE__ */ new Set();
   if (cis.length === 0) {
     subscriptionsPart = skipPart("skipped: the CI join found no configuration items \u2014 the subscriptions part is not evaluable (zero wire)");
   } else {
     const ciIds = capJoinSet2(cis.map((c) => num2(c["id"])).filter((n) => n > 0), FETCH_BY_IDS_MAX_ITEMS);
     const subCond = [{ field: "configurationItemID", op: "in", value: ciIds.ids }];
-    const raw = await boundedPart2(http, "/V1.0/Subscriptions/query", subCond, v.limit, OP2, ["id", "subscriptionName", "configurationItemID", "periodCost", "periodPrice", "periodType", "effectiveDate", "expirationDate", "status", "totalCost"]);
-    wires.issued += 1;
+    const raw = await readPart("/V1.0/Subscriptions/query", subCond, ["id", "subscriptionName", "configurationItemID", "periodCost", "periodPrice", "periodType", "effectiveDate", "expirationDate", "status", "totalCost"]);
     subscriptions = raw.items;
-    subscriptionsPart = stampPart("subscriptions", raw, subCond);
+    let labels = null;
+    if (subscriptions.length > 0) {
+      wires.issued += 1;
+      try {
+        labels = await readPicklists(http, "/V1.0/Subscriptions", OP2);
+      } catch (err) {
+        if (!(err instanceof AutotaskError)) throw err;
+      }
+    }
+    for (const x of subscriptions) {
+      const sid = num2(x["id"]);
+      const periodLabel = labels?.get("periodType")?.get(num2(x["periodType"]));
+      subFactor.set(sid, periodMonthlyFactor(x["periodType"], periodLabel));
+      if (isOneTimePeriod(x["periodType"], periodLabel)) oneTimeSubs.add(sid);
+      const statusLabel = labels?.get("status")?.get(num2(x["status"]));
+      const notActive = statusLabel !== void 0 ? NOT_ACTIVE_LABEL_RE.test(statusLabel) : labels === null && SUBSCRIPTION_NOT_ACTIVE_STATUS_IDS.has(num2(x["status"]));
+      if (notActive) cancelledSubs.add(sid);
+    }
+    const unknownPeriods = [...new Set(subscriptions.filter((x) => subFactor.get(num2(x["id"])) === null && !oneTimeSubs.has(num2(x["id"]))).map((x) => String(x["periodType"] ?? "absent")))];
+    subscriptionsPart = stampPart("subscriptions", raw, subCond, [
+      "scope: the subscriptions on the CIs this contract covers \u2014 periodCost prorated to a month by periodType into tooling_cost.vendor, REPORTED but NOT folded into total_cost/profit/margin (subscriptions bill outside the contract)",
+      ...subscriptions.length > 0 && labels === null ? ["the Subscriptions field catalog read failed \u2014 the verified id maps apply (periodType 1 One-Time, 2 Monthly, 3 Quarterly, 4 Semi-Annual, 5 Yearly; status 2 Cancelled / 3 Inactive excluded)"] : [],
+      ...cancelledSubs.size > 0 ? [`${cancelledSubs.size} not-active (cancelled/inactive) subscription(s) excluded from tooling_cost.vendor`] : [],
+      ...oneTimeSubs.size > 0 ? [`${oneTimeSubs.size} one-time subscription(s): periodCost booked whole in the effectiveDate month, never prorated`] : [],
+      ...unknownPeriods.length > 0 ? [`unrecognised periodType ${unknownPeriods.join(", ")} \u2014 those subscriptions are excluded from tooling_cost.vendor (not prorated)`] : []
+    ]);
   }
   const servicesPart = stampPart("contract_services", servicesRaw, servicesCond);
-  const unitsPart = stampPart("contract_service_units", unitsRaw, unitsCond);
+  const unitsPart = units.part;
   const roleCostsPart = stampPart("contract_role_costs", roleCostsRaw, roleCostsCond);
   const ratesPart = stampPart("contract_rates", ratesRaw, ratesCond);
-  const ticketsActivityPart = stampPart("tickets", ticketsActRaw, ticketsActCond, ticketsActRaw.hasMore ? [`${fetchedTickets.size} ticket(s) returned of possibly more \u2014 the checks cover the returned set only`] : void 0);
+  const ticketsActivityPart = stampPart("tickets", ticketsActRaw, ticketsActCond, [
+    ...ticketsActRaw.hasMore ? [`${fetchedTickets.size} ticket(s) returned of possibly more \u2014 the checks cover the returned set only`] : [],
+    ...refTicketIds.truncated ? [`the time-referenced ticket ids are capped at ${v.maxTicketsForJoin} of ${refTicketIds.total} \u2014 the rest read as ticket_not_in_fetched_set`] : []
+  ]);
   const billedByEntryId = /* @__PURE__ */ new Map();
   for (const b of billingRows) {
     const te = num2(b["timeEntryID"]);
@@ -5171,56 +5301,92 @@ async function profitability(resource, contractId, opts, http) {
     bucket.hours += hoursOf(e);
     bucket.cost += r.cost ?? 0;
   }
+  for (const b of Object.values(sources)) b.cost = cents(b.cost);
   const unresolvedHours = sources.missing.hours;
   if (unresolvedHours > 0) resolutionNotes.push(`${fmtHours(unresolvedHours)} hours unresolved (missing rate) \u2014 total_cost is a lower bound`);
   const costRateResolution = { method: v.method, sources, unresolvedHours, notes: resolutionNotes };
   const months = monthsBetween(v.dateFrom, v.dateTo);
   const monthOf = (date) => typeof date === "string" && DATE_RE2.test(`${date}`.slice(0, 10)) ? date.slice(0, 7) : null;
   const inMonth = (date, m) => monthOf(date) === m;
-  const unitEffectiveIn = (unit, m) => {
-    const s = monthOf(unit["startDate"]);
-    const e = monthOf(unit["endDate"]);
-    return (s === null || s <= m) && (e === null || e >= m);
-  };
-  const serviceById = new Map(servicesRaw.items.map((s) => [num2(s["id"]), s]));
-  const expectedBasis = servicesRaw.items.length > 0 || unitsRaw.items.length > 0;
-  const expectedIn = (m) => {
-    let total = 0;
-    for (const u of unitsRaw.items) {
-      if (!unitEffectiveIn(u, m)) continue;
-      const svc = serviceById.get(num2(u["contractServiceID"]));
-      if (svc === void 0) continue;
-      total += num2(svc["unitPrice"]) * num2(u["units"]);
-    }
-    return total;
-  };
+  const unitIn = (unit, m) => inMonth(unit["startDate"], m);
+  const lineRevenue = (b) => internalAmount(b, "internalCurrencyExtendedPrice", "extendedPrice");
+  const expectedBasis = unitsPart.status !== "absent" && (servicesRaw.items.length > 0 || unitRows.length > 0);
+  const expectedIn = (m) => unitRows.filter((u) => unitIn(u, m)).reduce((a, u) => a + internalAmount(u, "internalCurrencyPrice", "price"), 0);
   const recurringIn = (m) => {
     if (!v.includeRecurringCosts) return 0;
     let total = 0;
-    for (const c of charges) if (inMonth(c["datePurchased"], m)) total += num2(c["billableAmount"]);
-    for (const u of unitsRaw.items) if (unitEffectiveIn(u, m)) total += num2(u["cost"]);
+    for (const c of charges) if (inMonth(c["datePurchased"], m)) total += chargeCost(c);
+    for (const u of unitRows) if (unitIn(u, m)) total += num2(u["cost"]);
     return total;
   };
   const invoicesById = new Map(invoices.map((i) => [num2(i["id"]), i]));
+  const billedServiceIn = (m) => {
+    let billed = 0;
+    const ids = [];
+    for (const b of billingRows) {
+      if (!inMonth(b["itemDate"], m) || billingLineType(b) !== "recurring") continue;
+      const invId = num2(b["invoiceID"]);
+      const inv = invId > 0 ? invoicesById.get(invId) : void 0;
+      if (inv === void 0 || inv["isVoided"] === true) continue;
+      billed += lineRevenue(b);
+      ids.push(num2(b["id"]));
+    }
+    return { billed, ids };
+  };
+  const contractRateByRole = /* @__PURE__ */ new Map();
+  for (const r of ratesRaw.items) {
+    const rate = typeof r["internalCurrencyContractHourlyRate"] === "number" ? r["internalCurrencyContractHourlyRate"] : r["contractHourlyRate"];
+    if (num2(r["roleID"]) > 0 && typeof rate === "number" && Number.isFinite(rate)) contractRateByRole.set(num2(r["roleID"]), rate);
+  }
+  const monthlyParts = [
+    ["contractServiceUnits", unitsPart],
+    ["contractCharges", chargesPart],
+    ["contractRoleCosts", roleCostsPart],
+    ["billingItems", billingItems],
+    ["timeEntries", timeEntries],
+    ["expenses", expensesPart],
+    ["subscriptions", subscriptionsPart]
+  ];
+  const coverageGaps = (m) => {
+    const gaps = [];
+    for (const [name, p] of monthlyParts) {
+      if (p.status === "absent") gaps.push(`${name}: absent (${p.absent})`);
+      else if (truncatedMonths[name] !== void 0) {
+        if (truncatedMonths[name].includes(m)) gaps.push(`${name}: truncated at limit ${v.limit}`);
+      } else if (p.hasMore) gaps.push(`${name}: capped at limit ${v.limit}`);
+    }
+    return gaps;
+  };
   const monthly = [];
   for (let mi = 0; mi < months.length; mi++) {
     const m = months[mi];
     const mBilling = billingRows.filter((b) => inMonth(b["itemDate"], m));
     let revenueInvoiced = 0;
     let revenueVoided = 0;
-    const billedItemIds = [];
+    let postedUninvoiced = 0;
+    const byType = { recurring: 0, labour: 0, charges: 0, expenses: 0, other: 0 };
+    let unresolvedInvoice = 0;
+    let unresolvedLines = 0;
     for (const b of mBilling) {
       const invId = num2(b["invoiceID"]);
-      const inv = invId > 0 ? invoicesById.get(invId) : void 0;
-      if (inv === void 0) continue;
-      if (inv["isVoided"] === true) revenueVoided += num2(b["extendedPrice"]);
+      if (invId <= 0) {
+        postedUninvoiced += lineRevenue(b);
+        continue;
+      }
+      const inv = invoicesById.get(invId);
+      if (inv === void 0) {
+        unresolvedInvoice += lineRevenue(b);
+        unresolvedLines += 1;
+        continue;
+      }
+      if (inv["isVoided"] === true) revenueVoided += lineRevenue(b);
       else {
-        revenueInvoiced += num2(b["extendedPrice"]);
-        billedItemIds.push(num2(b["id"]));
+        revenueInvoiced += lineRevenue(b);
+        byType[billingLineType(b)] += lineRevenue(b);
       }
     }
     const expected = v.includeUnbilledRevenue && expectedBasis ? expectedIn(m) : null;
-    const expectedUnbilled = expected === null ? 0 : Math.max(0, expected - revenueInvoiced);
+    const expectedUnbilled = expected === null ? 0 : Math.max(0, expected - billedServiceIn(m).billed);
     const mEntries = entries.filter((e) => inMonth(e["dateWorked"], m));
     let labourHours = 0;
     let labourTotal = 0;
@@ -5230,7 +5396,7 @@ async function profitability(resource, contractId, opts, http) {
     rateSources.missing = { entries: 0, hours: 0, cost: 0 };
     for (const e of mEntries) {
       const r = entryResolution.get(num2(e["id"]));
-      labourHours += num2(e["hoursWorked"]);
+      labourHours += hoursOf(e);
       const bucket = rateSources[r.source];
       bucket.entries += 1;
       bucket.hours += hoursOf(e);
@@ -5238,39 +5404,71 @@ async function profitability(resource, contractId, opts, http) {
       if (r.source === "missing") unresolved += hoursOf(e);
       else labourTotal += r.cost ?? 0;
     }
-    let toolingVendor = subscriptionsPart.status === "skipped" ? null : 0;
+    const unposted = mEntries.filter((e) => e["isNonBillable"] !== true && !billedByEntryId.has(num2(e["id"])));
+    const hoursMissing = unposted.some((e) => typeof e["hoursToBill"] !== "number" || !Number.isFinite(e["hoursToBill"]));
+    const hoursPart = hoursMissing ? { entries: unposted.length, hours: null, hoursAbsent: "HOURS_TO_BILL_MISSING" } : { entries: unposted.length, hours: unposted.reduce((a, e) => a + Math.max(0, num2(e["hoursToBill"])), 0) };
+    let unpostedTime;
+    if (!contractTypeKnown) {
+      unpostedTime = { ...hoursPart, value: null, absent: "CONTRACT_TYPE_UNKNOWN" };
+    } else if (!isTimeAndMaterials) {
+      unpostedTime = { ...hoursPart, value: null, absent: "NOT_TIME_AND_MATERIALS_CONTRACT" };
+    } else if (unposted.some((e) => !contractRateByRole.has(num2(e["roleID"])))) {
+      unpostedTime = { ...hoursPart, value: null, absent: "NO_CONTRACT_RATE" };
+    } else if (hoursMissing) {
+      unpostedTime = { ...hoursPart, value: null, absent: "HOURS_TO_BILL_MISSING" };
+    } else {
+      const value = unposted.reduce((a, e) => a + Math.max(0, num2(e["hoursToBill"])) * contractRateByRole.get(num2(e["roleID"])), 0);
+      unpostedTime = { ...hoursPart, value };
+    }
+    let toolingVendor = subscriptionsPart.status === "skipped" || subscriptionsPart.status === "absent" ? null : 0;
     if (toolingVendor !== null) {
       for (const s of subscriptions) {
         const eff = monthOf(s["effectiveDate"]) ?? "0000-00";
         const exp = monthOf(s["expirationDate"]) ?? "9999-99";
-        if (eff <= m && m <= exp) toolingVendor += num2(s["periodCost"]);
+        const sid = num2(s["id"]);
+        if (cancelledSubs.has(sid)) continue;
+        if (oneTimeSubs.has(sid)) {
+          if (eff === m) toolingVendor += num2(s["periodCost"]);
+          continue;
+        }
+        const factor = subFactor.get(sid) ?? null;
+        if (factor !== null && eff <= m && m <= exp) toolingVendor += num2(s["periodCost"]) * factor;
       }
     }
     const callerSupplied = v.externalMonthlyCosts[mi] ?? 0;
     const recurring = recurringIn(m);
     let expenseCost = 0;
-    for (const x of expenses) if (inMonth(x["expenseDate"], m)) expenseCost += num2(x["expenseCurrencyExpenseAmount"]);
-    const totalCost = labourTotal + (toolingVendor ?? 0) + callerSupplied + recurring + expenseCost;
+    for (const x of expenses) if (inMonth(x["expenseDate"], m)) expenseCost += num2(x["internalCurrencyExpenseAmount"]);
+    const totalCost = labourTotal + callerSupplied + recurring + expenseCost;
     const profit = revenueInvoiced - totalCost;
     const margin = revenueInvoiced > 0 ? profit / revenueInvoiced : null;
-    const fixed = totalCost - labourTotal;
+    const nonLabour = totalCost - labourTotal;
     const resolvedHours = mEntries.filter((e) => entryResolution.get(num2(e["id"])).source !== "missing").reduce((a, e) => a + hoursOf(e), 0);
-    const breakEven = resolvedHours > 0 ? fixed <= 0 ? 0 : fixed / (labourTotal / resolvedHours) : null;
+    const avgRate = resolvedHours > 0 ? labourTotal / resolvedHours : 0;
+    const breakEven = avgRate > 0 ? Math.max(0, (revenueInvoiced - nonLabour) / avgRate) : null;
+    for (const b of Object.values(rateSources)) b.cost = cents(b.cost);
+    const gaps = coverageGaps(m);
+    if (unresolvedLines > 0) gaps.push(`invoices: ${unresolvedLines} line(s) on unresolved invoices`);
     monthly.push({
       month: m,
-      revenue_invoiced: revenueInvoiced,
-      revenue_voided_excluded: revenueVoided,
-      revenue_expected: expected,
-      revenue_expected_unbilled: expectedUnbilled,
+      revenue_invoiced: cents(revenueInvoiced),
+      revenue_by_type: { recurring: cents(byType.recurring), labour: cents(byType.labour), charges: cents(byType.charges), expenses: cents(byType.expenses), other: cents(byType.other) },
+      revenue_voided_excluded: cents(revenueVoided),
+      revenue_posted_uninvoiced: cents(postedUninvoiced),
+      revenue_unresolved_invoice: cents(unresolvedInvoice),
+      revenue_expected: cents(expected),
+      revenue_expected_unbilled: cents(expectedUnbilled),
+      unposted_time: { ...unpostedTime, value: cents(unpostedTime.value) },
       labour_hours: labourHours,
-      labour_cost: { total: labourTotal, unresolvedHours: unresolved, rateSources },
-      tooling_cost: { vendor: toolingVendor, caller_supplied: callerSupplied },
-      recurring_cost: recurring,
-      expense_cost: expenseCost,
-      total_cost: totalCost,
-      profit,
+      labour_cost: { total: cents(labourTotal), unresolvedHours: unresolved, rateSources },
+      tooling_cost: { vendor: cents(toolingVendor), caller_supplied: cents(callerSupplied) },
+      recurring_cost: cents(recurring),
+      expense_cost: cents(expenseCost),
+      total_cost: cents(totalCost),
+      profit: cents(profit),
       margin,
-      break_even_hours: breakEven
+      break_even_hours: breakEven,
+      coverage_gaps: gaps
     });
   }
   const warnings = [];
@@ -5334,13 +5532,13 @@ async function profitability(resource, contractId, opts, http) {
       const mA = months[i - 1];
       const mB = months[i];
       for (const c of charges) {
-        const cA = inMonth(c["datePurchased"], mA) ? num2(c["billableAmount"]) : 0;
-        const cB = inMonth(c["datePurchased"], mB) ? num2(c["billableAmount"]) : 0;
+        const cA = inMonth(c["datePurchased"], mA) ? chargeCost(c) : 0;
+        const cB = inMonth(c["datePurchased"], mB) ? chargeCost(c) : 0;
         if (Math.abs(cB - cA) > 0) driftIds.add(num2(c["id"]));
       }
-      for (const u of unitsRaw.items) {
-        const cA = unitEffectiveIn(u, mA) ? num2(u["cost"]) : 0;
-        const cB = unitEffectiveIn(u, mB) ? num2(u["cost"]) : 0;
+      for (const u of unitRows) {
+        const cA = unitIn(u, mA) ? num2(u["cost"]) : 0;
+        const cB = unitIn(u, mB) ? num2(u["cost"]) : 0;
         if (Math.abs(cB - cA) > 0) driftIds.add(num2(u["id"]));
       }
     }
@@ -5348,22 +5546,10 @@ async function profitability(resource, contractId, opts, http) {
   warnings.push({ code: "recurring_cost_drift", count: driftCount, sample_ids: dedupeSortCap([...driftIds], v.limit) });
   let expectedUnbilledCount = 0;
   const expectedUnbilledSamples = [];
-  if (v.includeUnbilledRevenue) {
-    for (let mi = 0; mi < months.length; mi++) {
-      const m = months[mi];
-      const expected = expectedBasis ? expectedIn(m) : null;
-      if (expected === null) continue;
-      const mBilling = billingRows.filter((b) => inMonth(b["itemDate"], m));
-      let billed = 0;
-      const ids = [];
-      for (const b of mBilling) {
-        const invId = num2(b["invoiceID"]);
-        const inv = invId > 0 ? invoicesById.get(invId) : void 0;
-        if (inv === void 0 || inv["isVoided"] === true) continue;
-        billed += num2(b["extendedPrice"]);
-        ids.push(num2(b["id"]));
-      }
-      if (expected > billed + 5e-3) {
+  if (v.includeUnbilledRevenue && expectedBasis) {
+    for (const m of months) {
+      const { billed, ids } = billedServiceIn(m);
+      if (expectedIn(m) > billed + 5e-3) {
         expectedUnbilledCount += 1;
         for (const i of ids) expectedUnbilledSamples.push(i);
       }
@@ -5379,7 +5565,7 @@ async function profitability(resource, contractId, opts, http) {
   });
   const stale = [];
   if (openStatusSet !== null) {
-    for (const t of fetchedTickets.values()) {
+    for (const t of contractTickets) {
       const status = t["status"];
       if (typeof status !== "number" || !openStatusSet.has(status)) continue;
       const lastDay = dateToDay(t["lastActivityDate"]);
@@ -5431,7 +5617,7 @@ async function profitability(resource, contractId, opts, http) {
   for (const x of expenses) {
     const t = num2(x["ticketID"]);
     if (t <= 0) continue;
-    expenseByTicket.set(t, (expenseByTicket.get(t) ?? 0) + num2(x["expenseCurrencyExpenseAmount"]));
+    expenseByTicket.set(t, (expenseByTicket.get(t) ?? 0) + num2(x["internalCurrencyExpenseAmount"]));
   }
   const ticketCost = (t) => {
     const tid = num2(t["id"]);
@@ -5440,7 +5626,7 @@ async function profitability(resource, contractId, opts, http) {
     for (const e of es) cost += entryResolution.get(num2(e["id"])).cost ?? 0;
     return cost;
   };
-  const ticketHours = (t) => (entriesByTicket.get(num2(t["id"])) ?? []).reduce((a, e) => a + num2(e["hoursWorked"]), 0);
+  const ticketHours = (t) => (entriesByTicket.get(num2(t["id"])) ?? []).reduce((a, e) => a + hoursOf(e), 0);
   const allTickets = [...fetchedTickets.values()];
   const activityCategories = [];
   if (v.groupByActivity) {
@@ -5458,7 +5644,7 @@ async function profitability(resource, contractId, opts, http) {
       for (const t of tickets) {
         const es = entriesByTicket.get(num2(t["id"])) ?? [];
         entryCount += es.length;
-        hours += es.reduce((a, e) => a + num2(e["hoursWorked"]), 0);
+        hours += es.reduce((a, e) => a + hoursOf(e), 0);
         cost += ticketCost(t);
       }
       activityCategories.push({
@@ -5466,7 +5652,7 @@ async function profitability(resource, contractId, opts, http) {
         ticketCount: tickets.length,
         entryCount,
         hours,
-        cost,
+        cost: cents(cost),
         sample_ticketNumbers: dedupeSortCap(tickets.map((t) => num2(t["ticketNumber"])).filter((n) => n > 0), v.limit)
       });
     }
@@ -5478,7 +5664,7 @@ async function profitability(resource, contractId, opts, http) {
     title: typeof t["title"] === "string" ? t["title"] : "",
     status: typeof t["status"] === "number" ? t["status"] : null,
     hours: ticketHours(t),
-    cost: ticketCost(t),
+    cost: cents(ticketCost(t)),
     lastActivityDate: typeof t["lastActivityDate"] === "string" ? t["lastActivityDate"] : null
   })).sort((a, b) => b.cost - a.cost || a.ticketId - b.ticketId).slice(0, v.limit);
   const miscoding = /* @__PURE__ */ new Map();
@@ -5494,7 +5680,7 @@ async function profitability(resource, contractId, opts, http) {
   const possibleMiscoding = [...miscoding.values()].sort((a, b) => a.entryId - b.entryId).slice(0, v.limit);
   const openRenewal = [];
   if (openStatusSet !== null) {
-    for (const t of allTickets) {
+    for (const t of contractTickets) {
       const status = t["status"];
       if (typeof status !== "number" || !openStatusSet.has(status)) continue;
       const last = t["lastActivityDate"];
@@ -5515,7 +5701,7 @@ async function profitability(resource, contractId, opts, http) {
       id: num2(s["id"]),
       label: typeof s["subscriptionName"] === "string" && s["subscriptionName"] !== "" ? s["subscriptionName"] : `subscription ${num2(s["id"])}`,
       date: typeof s["expirationDate"] === "string" ? s["expirationDate"].slice(0, 10) : null,
-      detail: `periodType: ${typeof s["periodType"] === "string" && s["periodType"] !== "" ? s["periodType"] : "unknown"} (period cost ${fmtNum(num2(s["periodCost"]))})`
+      detail: `periodType: ${typeof s["periodType"] === "number" ? s["periodType"] : "unknown"} (period cost ${fmtNum(num2(s["periodCost"]))}${cancelledSubs.has(num2(s["id"])) ? " \u2014 not active, not in tooling_cost.vendor" : oneTimeSubs.has(num2(s["id"])) ? " \u2014 one-time, booked in its effective month" : subFactor.get(num2(s["id"])) == null ? " \u2014 unrecognised period, not in tooling_cost.vendor" : `, ${fmtNum(num2(s["periodCost"]) * subFactor.get(num2(s["id"])))}/month`})`
     });
   }
   const contractEndDay = dateToDay(contractRow["endDate"]);
@@ -5528,31 +5714,37 @@ async function profitability(resource, contractId, opts, http) {
       detail: `the contract ends ${String(contractRow["endDate"]).slice(0, 10)}`
     });
   }
-  for (let mi = 0; mi < months.length; mi++) {
-    const m = months[mi];
-    let included = 0;
-    for (const u of unitsRaw.items) if (unitEffectiveIn(u, m)) included += num2(u["units"]);
-    const worked = monthly[mi].labour_hours;
-    if (included === 0 && worked === 0) continue;
-    const left = included - worked;
-    const my = Number(m.slice(0, 4));
-    const mm = Number(m.slice(5, 7));
-    const lastDay = new Date(Date.UTC(my, mm, 0)).getUTCDate();
+  const blocks = blocksPart.items;
+  for (const b of blocks) {
+    const purchased = num2(b["hours"]);
+    const approved = num2(b["hoursApproved"]);
+    const left = purchased - approved;
     openRenewal.push({
       kind: "included_hours_burn",
-      id: null,
-      label: `included hours ${m}`,
-      date: `${m}-${String(lastDay).padStart(2, "0")}`,
-      detail: `${fmtHours(worked)} h worked vs ${fmtHours(included)} h included (${left >= 0 ? `${fmtHours(left)} h left` : `${fmtHours(Math.abs(left))} h over`})`
+      id: num2(b["id"]),
+      label: `hour block ${num2(b["id"])}`,
+      date: typeof b["endDate"] === "string" ? b["endDate"].slice(0, 10) : null,
+      detail: `${fmtHours(approved)} h approved of ${fmtHours(purchased)} h purchased (${left >= 0 ? `${fmtHours(left)} h left` : `${fmtHours(Math.abs(left))} h over`})`
     });
   }
+  const purchasedHours = blocks.reduce((a, b) => a + num2(b["hours"]), 0);
+  const approvedHours = blocks.reduce((a, b) => a + num2(b["hoursApproved"]), 0);
+  const includedHours = !contractTypeKnown ? { value: null, absent: "CONTRACT_TYPE_UNKNOWN" } : !isBlockHours ? { value: null, absent: "NOT_BLOCK_HOURS_CONTRACT" } : blocksPart.status === "absent" ? { value: null, absent: blocksPart.absent } : { value: { purchased: purchasedHours, approved: approvedHours, remaining: purchasedHours - approvedHours } };
+  const rows = (part) => {
+    if (v.includeRows) return part;
+    const { items, ...stamps } = part;
+    return { ...stamps, rows_fetched: items.length };
+  };
   return {
     contract,
     customer,
+    ...customerAbsent !== void 0 ? { customerAbsent } : {},
+    contract_type: contractTypeKnown ? { id: contractType, label: contractTypeLabel } : { id: contractType > 0 ? contractType : null, label: null, absent: "CONTRACT_TYPE_UNKNOWN" },
+    included_hours: includedHours,
     period: { dateFrom: v.dateFrom, dateTo: v.dateTo, months, asOf },
     currency: {
       companyCurrencyID: customer && typeof customer["currencyID"] === "number" ? customer["currencyID"] : null,
-      note: "amounts are the vendor LOCAL-currency fields (the customer company currency is the context stamp); the internalCurrency* variants are NOT mixed in (v1 \u2014 a cross-currency tenant needs a follow-up op or bag key)"
+      note: "single-currency P&L in the INTERNAL currency: revenue is billing items internalCurrencyExtendedPrice and service units internalCurrencyPrice (each falling back to the local field when absent), unposted value the internalCurrencyContractHourlyRate; costs are internal (ourCost/role cost/internalCost, charge extendedCost, unit cost, internalCurrencyExpenseAmount). companyCurrencyID is the customer context stamp only"
     },
     monthly,
     activity_categories: activityCategories,
@@ -5569,6 +5761,7 @@ async function profitability(resource, contractId, opts, http) {
       contractCharges: chargesPart.status,
       contractRoleCosts: roleCostsPart.status,
       contractRates: ratesPart.status,
+      contractBlocks: blocksPart.status,
       billingItems: billingItems.status,
       invoices: invoicesPart.status,
       timeEntries: timeEntries.status,
@@ -5580,22 +5773,23 @@ async function profitability(resource, contractId, opts, http) {
       configurationItems: configurationItemsPart.status,
       subscriptions: subscriptionsPart.status
     },
-    contractServices: servicesPart,
-    contractServiceUnits: unitsPart,
-    contractCharges: chargesPart,
-    contractRoleCosts: roleCostsPart,
-    contractRates: ratesPart,
-    billingItems,
-    invoices: invoicesPart,
-    timeEntries,
-    ticketsActivity: ticketsActivityPart,
-    ticketsOpen: ticketsOpenPart,
-    resources: resourcesPart,
-    expenses: expensesPart,
-    miscodingProbe: probePart,
-    configurationItems: configurationItemsPart,
-    subscriptions: subscriptionsPart,
-    wires: { issued: wires.issued, budget: wires.budget, note: wires.note }
+    contractServices: rows(servicesPart),
+    contractServiceUnits: rows(unitsPart),
+    contractCharges: rows(chargesPart),
+    contractRoleCosts: rows(roleCostsPart),
+    contractRates: rows(ratesPart),
+    contractBlocks: rows(blocksPart),
+    billingItems: rows(billingItems),
+    invoices: rows(invoicesPart),
+    timeEntries: rows(timeEntries),
+    ticketsActivity: rows(ticketsActivityPart),
+    ticketsOpen: rows(ticketsOpenPart),
+    resources: rows(resourcesPart),
+    expenses: rows(expensesPart),
+    miscodingProbe: rows(probePart),
+    configurationItems: rows(configurationItemsPart),
+    subscriptions: rows(subscriptionsPart),
+    wires: { issued: wires.issued, requests: wires.requests, budget: wires.budget, note: wires.note }
   };
 }