@go-labs-sg/bb 3.2.0 → 3.3.0

package/README.md

@@ -61,7 +61,7 @@ Roll out the API and maintained CLI together: `suppliers`/`pageCount` and offset
 
 **Error-log read shapes:** `bb error recent list` / `bb get-recent-errors` items now carry only the table columns: `id, severity, status, message, errorName, errorType, component, route, action, createdAt` and `user { id, name, email }`. Stack, cause, request details, metadata, tags, AI summary and resolution moved to the new `bb error get <errorId>` / `bb get-error <errorId>` (`errorLog.getErrorById`), which no longer returns alert-group bookkeeping or the raw `userId`/`resolvedById` columns (use `user`/`resolvedByUser`).
 
-**Company read shapes:** `company.getCompanyById` / `bb get-company` now return the company's own fields (`id, name, website, active, quickbooksId, createdById, createdAt, updatedAt`) without the embedded full `projects` array; use `bb list-projects --companyId <id>` for its projects. `bb list-companies` rows carry only `id, name, website, active, createdById, createdAt, updatedAt`, `createdBy { id, name, email, image }` and `_count`; use `bb get-company` for `quickbooksId`. Recent companies and the company QuickBooks sync status read only the fields they use; their outputs are unchanged.
+**Company read shapes:** `company.getCompanyById` / `bb get-company` now return the company's own fields (`id, name, website, billingEmails, active, quickbooksId, createdById, createdAt, updatedAt`) without the embedded full `projects` array; use `bb list-projects --companyId <id>` for its projects. `bb list-companies` rows carry only `id, name, website, billingEmails, active, createdById, createdAt, updatedAt`, `createdBy { id, name, email, image }` and `_count`; use `bb get-company` for `quickbooksId`. Recent companies and the company QuickBooks sync status read only the fields they use; their outputs are unchanged.
 
 **Customer-invoice readiness and quotation list loading:** `customerInvoice.getInvoiceReadiness`, `getInvoiceAmountPreview`, `getEligibleBudgets` and `getProjectInvoiceReadiness` read the budget through one selected shape (only the budget, project, contact, invoice-settings, discount and item fields the readiness and amount helpers use) with Prisma's default join instead of forced per-relation queries. The quotation list page and metrics reads also use the default join. Their outputs are unchanged.
 
@@ -134,6 +134,14 @@ Cursors are opaque and scoped to the active account, filters, sort, and page wid
 
 Deploy the matching API before publishing the CLI. Cursor browsing is not a frozen export snapshot; restart without the cursor when the API reports an expired or mismatched boundary.
 
+## Company billing/AP invoice copies
+
+Company detail and list reads include `billingEmails`. Set them for a new company with `bb company create --name "Example Co" --website "https://example.com" --billingEmails '["ap@example.com"]'`; existing companies reused by create retain their saved defaults. Use `bb company update --payload` with the current `id`, `name`, `website` and optional `billingEmails` to edit an existing company. Omit the field to preserve it or supply `[]` to clear it. The API validates up to 50 addresses, trims/lowercases and de-duplicates them. These state-changing commands retain their existing confirmation and external-write gates; billing emails themselves stay in BB.
+
+`bb customer-invoice email-context get <batchId>` returns removable `billingCcEmails` separately from mandatory `requiredCcEmails`. When sending with `bb customer-invoice send --payload`, omit `cc` to use company defaults; an explicit list replaces those defaults and `[]` opts out. Required internal copies are still added. The queued outgoing-email record freezes the selected recipients for delivery/retry. Quotes/estimates and the primary To selection are unchanged; QuickBooks customer emails are not imported.
+
+Apply the additive company schema before deploying the matching API/web and publishing this CLI. Production JTP Holdings acceptance remains pending the approved release; see the [billing/AP rollout and acceptance runbook](../../../docs/runbooks/budget-builder-company-billing-emails.md).
+
 ## Company discovery and reuse
 
 `bb company search --query "a star" [--page 2]` searches stored BB companies and QuickBooks company customers, including inactive records. Results identify `bb`, `qbo`, or `both`; punctuation/spacing normalization is for suggestions only. Search does not write to either system.
@@ -698,7 +706,7 @@ Admin/Lead users can run `bb supplier approve <supplierId>` to directly re-appro
 | **Budgets** | `list-budgets` (full payload by default; `--summary` or `--includeDetails false` for slim list), `get-budget`, `get-budget-items`, `get-budget-details`, `get-budget-categories` (forward cursor pages of active categories, name A–Z: `--q` / `--limit` / `--cursor`; returns `{ items, pageInfo }`), `get-budget-versions`, `rename-budget-version`, `restore-budget-version`, `update-budget-status` (`ESTIMATE_ACCEPTED` requires win proof, auto-marks `PITCH` or `LOST` projects `WON`, and auto-creates an Asana Event Ops section from Prompt 5 tasks when enabled; Prompt 5 skips quantity-zero items, combines matching non-GO-internal suppliers, keeps each GO internal item separate, removes generated work that repeats another line item or group, adds 5 mandatory supplier subtasks ending in "Get bill and upload to Budget Builder", and sets no subtask due dates; `--projectStatusOnCommercialRejection PITCH\|LOST` is required when rejecting the only accepted/closed budget on a commercial project), `mark-budget-won` (`<budgetId>` + proof file path; `PITCH` or `LOST` projects become `WON` automatically), `create-budget` / `update-budget` (`--payload`; cloned unavailable lines require `unavailableItemReviewAcknowledged: true`), `delete-budget`, `create-budget-approval` (also sends approval request emails), `create-estimate`, `send-estimate-to-contact-person` (same contact-person email workflow as web), `add-budget-items`, `update-budget-item`, `replace-budget-item`, `approve-unavailable-item-exception` (Lead/Admin), `remove-budget-item`, `reorder-budget-items`, `update-budget-item-supplier`, `mark-budget-items-not-utilized`, `restore-budget-item`, `create-placeholder-bill` (admin recovery), `create-budget-category`, `update-budget-category`, `delete-budget-category`, `update-budget-commission`, `delete-budget-commission`, `update-budget-discount`, `delete-budget-discount` (`--payload` where noted), `upload-budget-attachment` (`<budgetId>` + local file path; uses `attachment.requestBudgetAttachmentUpload` + PUT + `attachment.confirmBudgetAttachment`) |
 | **Bills / claims** | `list-bills` (`--isClaimable false` for bills, `--isClaimable true` for claims, omit for both), `list-claims` (claims only), `validate-bill-selection` (`--payload`, plus `--quotationIds q1,q2` or legacy `--quotationId q1`; validates the approved supplier and quotation coverage), `link-bill-quotations` (`<billId> --quotationIds q1,q2`; Admin source-link repair for eligible supplier bills), `stage-bill-attachment` (securely uploads invoice/payment-proof files before creation and returns attachment JSON; ownership and one-hour expiry are enforced by a server-side staged-upload record rather than encoded in the object key), `cleanup-staged-bill-attachments`, `create-bill` (`--payload`; set `isClaimable=false` for a bill and provide approved `quotationIds`, or use `--quotation-exempt` for an eligible server-validated exemption; set `isClaimable=true` for a claim without quotations; supplier bills require positive **before-GST** `extractedAmount` (full invoice subtotal) and `amount` (portion billed), with `amount <= extractedAmount`; line and quotation allocation amounts also exclude GST; an already-paid supplier bill sets `alreadyPaid=true` and requires `paymentReference` plus a staged PDF in `paymentProofAttachments`; admin creation automatically queues QBO finalization while other roles remain pending approval), `update-bill` (`--payload`), `update-bill-payment-evidence` (`--payload`; replaces the payment reference and payment-proof PDFs for an already-paid bill), `delete-bill`, `create-bill-approval` (also sends approval request emails), `update-bill-status` (`PAID` requires `--paymentReference`; pass `--paymentProof <receipt.pdf>` to stage and submit a PDF up to 20MB atomically, or omit it only when BB already has payment proof; moving to `PAID` runs the server's paid-bill notification workflow), `patch-bill-payment` (PAID bills: `--paymentTrackingUrl`, `--paymentReference`, `--quickbooksBillId`, `--paymentDate` ISO; clearing a paid bill's QuickBooks link is not allowed), `patch-bill-invoice-number`, `get-bill-attachments` (newest-first cursor pages: `--limit` 1–50, `--cursor`; returns `{ items, pageInfo }`), `upload-bill-attachment` (`<billId>` + local path), `get-bill-details` (the web bill summary: status, amounts, people, payment, line totals), `get-bill-line-items` / `get-bill-approvals` (newest-first cursor pages: `--limit`, `--cursor`; `{ items, pageInfo }`), `get-bill-payment` (payment status, reference, date, tracking URL, QuickBooks link, external payment) |
 | **Quotations** | `list-quotations` (project, budget, supplier, status, requester and text-search filters; newest-first cursor pages via `--limit` / `--cursor` / `--direction` returning `{ items, pageInfo }`; `--page` / `--perPage` / `--pageSize` are rejected), `count-quotations` (`quotation.getCounts`: filters only, returns `totalCount`, status facets that ignore their own status filter, and `--includeMetrics true` amount metrics), `get-quotation` (web quotation shape), `get-quotation-line-items` (`<quotationId>`; newest-first cursor pages, `--limit 1-100`, `--cursor`), `upload-quotation-attachment` (`<projectId>` + PDF/JPEG/PNG path up to 20MB; returns attachment JSON for payload use), `cleanup-staged-quotation-attachments`, `create-quotation` (`--payload` for `quotation.createDraft`; include `amountWithoutGst`, `gstAmount`, and `lineAmounts` entries `{ budgetItemId, amount }` for multiple selected items), `update-quotation` (`--payload`; updates a `DRAFT` or `REJECTED` quotation), `delete-quotation`, `submit-quotation`, `approve-quotation`, `reject-quotation`, `download-quotation-pdf` (`original`, `staff`, or `final`) |
-| **Customer invoices** | `check-customer-invoice-readiness`, `list-eligible-customer-invoice-budgets`, `preview-customer-invoice-amount`, `list-available-qbo-customer-invoices`, `list-customer-invoices` (global/project/budget filters; cursor pages via `--limit` / `--cursor` / `--direction` returning `{ items, pageInfo }`, `--page` / `--perPage` rejected; `--sortBy totalInvoiceAmount` sorts provider-confirmed totals including GST, with unknown amounts last), `count-customer-invoices` (`customerInvoice.getCounts`: filters only; `totalCount`, lifecycle status facets that ignore their own status filter, and amount metrics), `get-customer-invoice` (web-shaped batch), `get-customer-invoice-invoices`, `get-customer-invoice-lines`, `get-customer-invoice-approvals`, `get-customer-invoice-history`, `get-customer-invoice-email-context`, `preview-qbo-customer-invoice`, `import-qbo-customer-invoice` (BB-only link with reviewed token), `create-customer-invoice`, `discard-customer-invoice`, `delete-customer-invoice`, `void-customer-invoice`, `approve-customer-invoice` (admin), `reject-customer-invoice` (admin), `send-customer-invoice-to-contact-person`, `download-customer-invoice-pdf` (non-admins cannot download while approval is pending), `sync-customer-invoice` |
+| **Customer invoices** | `check-customer-invoice-readiness`, `list-eligible-customer-invoice-budgets`, `preview-customer-invoice-amount`, `list-available-qbo-customer-invoices`, `list-customer-invoices` (global/project/budget filters; cursor pages via `--limit` / `--cursor` / `--direction` returning `{ items, pageInfo }`, `--page` / `--perPage` rejected; `--sortBy totalInvoiceAmount` sorts provider-confirmed totals including GST, with unknown amounts last), `count-customer-invoices` (`customerInvoice.getCounts`: filters only; `totalCount`, lifecycle status facets that ignore their own status filter, and amount metrics), `get-customer-invoice` (web-shaped batch), `get-customer-invoice-invoices`, `get-customer-invoice-lines`, `get-customer-invoice-approvals`, `get-customer-invoice-history`, `get-customer-invoice-email-context`, `preview-qbo-customer-invoice`, `import-qbo-customer-invoice` (BB-only link with reviewed token), `create-customer-invoice`, `resubmit-customer-invoice` (original requester only; one replacement after confirmed expiry voiding; repeated calls return the same replacement), `discard-customer-invoice`, `delete-customer-invoice`, `void-customer-invoice`, `approve-customer-invoice` (admin), `reject-customer-invoice` (admin), `send-customer-invoice-to-contact-person`, `download-customer-invoice-pdf` (non-admins cannot download while approval is pending), `sync-customer-invoice` |
 | **Approvals** | `list-approvals` / `get-pending-approvals` (`--type budget\|supplier\|bill\|quotation\|customer_invoice\|all`), `approve-bill` / `reject-bill` (send reply email), `approve-budget` / `reject-budget` (send reply email), `approve-supplier` / `reject-supplier` (send reply email), `approve-quotation` / `reject-quotation`, `approve-customer-invoice` / `reject-customer-invoice` |
 | **Companies & projects** | `list-companies`, `get-company`, `create-company`, `update-company` (`--payload`), `delete-company`, `list-projects`, `get-project` (its budget overview returns `totalRevenue`, calculated only from Estimate Accepted and Estimate Closed budgets), `get-project-hub-status`, `setup-project-hub`, `sync-project-hub-commercial-documents`, `create-project` (required: `--name`, `--companyId`, `--contactPersonId`, `--insideSalesId`, `--businessDevelopmentId`, `--venue`, `--startDate` as ISO datetime for project/window start; when `--asanaTaskId` is omitted, the CLI searches open Asana lead tasks in the Deals project, prompts for one of the top five matches, and resolves Slack channel fields from the selected deal card; optional `--asanaSearch`, `--pax`, `--endDate`, `--description`, `--projectManagerId`; always requests QBO project import like the web app), `update-project` (`--payload` with `dateRange.from` / `dateRange.to` for the project window; optional `projectManagerId` and `requestQboAccountantNotification` in JSON), `delete-project`, `check-project-reconciliation <id>` (runs the web app's live checks without changing status), `reconcile-project <id>` (reruns checks transactionally and marks an eligible project `RECONCILED`), `complete-project <id>` (reruns validation, marks a reconciled project `COMPLETED`, and queues QuickBooks placeholder cleanup), `import-qbo-project`, `update-project-status` (`<id>` `<status>`: `PITCH` \| `WON` \| `COMPLETED` \| `RECONCILED` \| `LOST`; close-out follows `WON` → `RECONCILED` → `COMPLETED`, and reconciliation requires every accepted/closed budget line to have an Approved/Paid bill or claim or be explicitly Not Utilized; marking `COMPLETED` queues deletion of every remaining project placeholder bill from QuickBooks; for `PITCH` → `WON` also pass a Budget Builder user `--projectManagerId` or `--projectManagerEmail`; when marking `WON` without an accepted/closed budget or proof, pass `--wonOverrideReason`) |
 | **Contacts** | `list-contacts`, `create-contact-person` (`--payload`), `update-contact-person` (`--payload`) |
@@ -710,6 +718,12 @@ Admin/Lead users can run `bb supplier approve <supplierId>` to directly re-appro
 
 The CLI intentionally wraps low-level upload-request/confirm procedures into file-based commands and omits browser-only helpers such as navigation counts, combobox/facet data, recent-page bookkeeping, and live UI subscriptions. Operational workflows for bills, claims, quotations, customer invoices, project reconciliation/completion, and integration recovery are available directly.
 
+## Customer invoice approval expiry
+
+New requests allow 72 elapsed hours and schedule one approver reminder four hours before the stored deadline. Older deadlines remain unchanged. Invoice lifecycle outputs/`--status` distinguish `EXPIRED` (approval elapsed, void not yet confirmed) from `EXPIRED_VOIDED`.
+
+Use `bb customer-invoice resubmit <batchId>` (`resubmit-customer-invoice`) as the original requester after confirmed voiding. The normal financial/external-write/email confirmation gates apply. It queues one replacement from the current eligible estimate using the original percentage, due date and details; retries reuse the same replacement. The API rechecks readiness/coverage and does not send to the customer. Deploy the compatible API before this CLI. Legacy multi-invoice batches require manual creation.
+
 ## Output
 
 - **Canonical stdout:** a pretty-printed `{ "ok": true, "data": ..., "meta": ... }` JSON envelope

package/command-manifest.json

@@ -4937,6 +4937,56 @@
 		"effects": ["state-change", "email", "external-write", "financial-write"],
 		"legacyTarget": "create-customer-invoice"
 	},
+	{
+		"path": ["customer-invoice", "resubmit"],
+		"legacyAliases": ["resubmit-customer-invoice", "resubmit_customer_invoice"],
+		"summary": "Resubmit a confirmed expired-and-voided BB invoice as its original requester. Argument: <batchId>. Queues one replacement using the current estimate, original percentage, due date and details; retries return the same replacement. No customer email.",
+		"globalOptions": [
+			{
+				"name": "--help",
+				"description": "Show help for this command."
+			},
+			{
+				"name": "--quiet",
+				"description": "Suppress non-error diagnostics."
+			},
+			{
+				"name": "--debug",
+				"description": "Emit sanitized diagnostic traces."
+			},
+			{
+				"name": "--api-url",
+				"description": "Override the Budget Builder API base URL."
+			},
+			{
+				"name": "--no-browser",
+				"description": "Print the authorization URL without opening a browser."
+			},
+			{
+				"name": "--allow-state-change",
+				"description": "Allow a Budget Builder state change in non-interactive use."
+			},
+			{
+				"name": "--allow-email",
+				"description": "Allow sending email in non-interactive use."
+			},
+			{
+				"name": "--allow-external-write",
+				"description": "Allow writes to external systems in non-interactive use."
+			},
+			{
+				"name": "--allow-delete",
+				"description": "Allow deleting data in non-interactive use."
+			},
+			{
+				"name": "--allow-financial-write",
+				"description": "Allow financial-record changes in non-interactive use."
+			}
+		],
+		"argumentMode": "legacy-passthrough",
+		"effects": ["state-change", "external-write", "financial-write", "email"],
+		"legacyTarget": "resubmit-customer-invoice"
+	},
 	{
 		"path": ["customer-invoice", "discard"],
 		"legacyAliases": ["discard-customer-invoice", "discard_customer_invoice"],
@@ -5193,7 +5243,7 @@
 			"send-customer-invoice-to-contact-person",
 			"send_customer_invoice_to_contact_person"
 		],
-		"summary": "Send a customer invoice and update the project billing email.",
+		"summary": "Send a customer invoice and update the project billing email. Omit payload cc to use company billing defaults; an explicit list replaces them and [] removes them. Required internal Cc still applies.",
 		"globalOptions": [
 			{
 				"name": "--help",
@@ -6081,7 +6131,7 @@
 	{
 		"path": ["company", "create"],
 		"legacyAliases": ["create-company", "create_company"],
-		"summary": "Create or reuse a company in BB and QuickBooks. --name <name> --website <url>. Similar names require --confirmDistinct true; inactive companies are never reactivated.",
+		"summary": "Create or reuse a company in BB and QuickBooks. --name <name> --website <url> [--billingEmails '<json-array>'] (up to 50 invoice Cc defaults, stored in BB only for new companies; reused company defaults are preserved). Similar names require --confirmDistinct true; inactive companies are never reactivated.",
 		"globalOptions": [
 			{
 				"name": "--help",
@@ -6123,6 +6173,10 @@
 				"name": "--allow-financial-write",
 				"description": "Allow financial-record changes in non-interactive use."
 			},
+			{
+				"name": "--billingEmails",
+				"description": "JSON email array (max 50) for new company invoice Cc defaults; reused companies keep their saved defaults."
+			},
 			{
 				"name": "--confirmDistinct",
 				"description": "Set true to confirm a separate legal entity despite similar names."
@@ -6135,7 +6189,7 @@
 	{
 		"path": ["company", "update"],
 		"legacyAliases": ["update-company", "update_company"],
-		"summary": "Save company fields in BB and queue independent QuickBooks name/website synchronization; returns operation ID, not provider completion.",
+		"summary": "Save company fields in BB and queue independent QuickBooks name/website synchronization; returns operation ID, not provider completion. Optional payload billingEmails: email string array (max 50), omit to preserve defaults or [] to clear. Billing emails stay in BB; estimates are unchanged.",
 		"globalOptions": [
 			{
 				"name": "--help",

package/command-reference.md

@@ -826,6 +826,14 @@ Payload fields (--payload JSON)
   Optional: requestId: UUID string (recommended); invoiceDate: ISO date; details: {billingAddress: string, customerMemo: string}; isCustomPercentage: boolean
   Example: bb create-customer-invoice --payload '{"budgetId":"<budget-id>","splits":[{"label":"Deposit","percentage":50,"dueDate":"2026-10-15"}],"details":{"billingAddress":"1 Example St","customerMemo":"Thanks"}}'
 
+## `bb customer-invoice resubmit`
+
+Resubmit a confirmed expired-and-voided BB invoice as its original requester. Argument: <batchId>. Queues one replacement using the current estimate, original percentage, due date and details; retries return the same replacement. No customer email.
+
+Legacy aliases: `resubmit-customer-invoice`, `resubmit_customer_invoice`.
+
+Effects: state-change, external-write, financial-write, email.
+
 ## `bb customer-invoice discard`
 
 Discard Customer Invoice.
@@ -868,15 +876,15 @@ Effects: state-change, email, external-write, financial-write.
 
 ## `bb customer-invoice send`
 
-Send a customer invoice and update the project billing email.
+Send a customer invoice and update the project billing email. Omit payload cc to use company billing defaults; an explicit list replaces them and [] removes them. Required internal Cc still applies.
 
 Legacy aliases: `send-customer-invoice-to-contact-person`, `send_customer_invoice_to_contact_person`.
 
 Effects: state-change, email.
 
 Payload fields (--payload JSON)
-  Required: invoiceId: string; to: email; cc: email[]; replyTo: email; subject: string; content: HTML string; signature: HTML string
-  Optional: none
+  Required: invoiceId: string; to: email; replyTo: email; subject: string; content: HTML string; signature: HTML string
+  Optional: cc: email[] (max 50; omit to use company billing defaults, explicit list replaces defaults, [] removes defaults; required internal Cc still applies)
   Example: bb send-customer-invoice-to-contact-person --payload '{"invoiceId":"<invoice-id>","to":"client@example.com","cc":[],"replyTo":"team@example.com","subject":"Invoice","content":"<p>Attached invoice</p>","signature":"<p>Team</p>"}'
 
 ## `bb customer-invoice pdf download`
@@ -1001,7 +1009,7 @@ Effects: state-change, external-write.
 
 ## `bb company create`
 
-Create or reuse a company in BB and QuickBooks. --name <name> --website <url>. Similar names require --confirmDistinct true; inactive companies are never reactivated.
+Create or reuse a company in BB and QuickBooks. --name <name> --website <url> [--billingEmails '<json-array>'] (up to 50 invoice Cc defaults, stored in BB only for new companies; reused company defaults are preserved). Similar names require --confirmDistinct true; inactive companies are never reactivated.
 
 Legacy aliases: `create-company`, `create_company`.
 
@@ -1009,7 +1017,7 @@ Effects: state-change, external-write.
 
 ## `bb company update`
 
-Save company fields in BB and queue independent QuickBooks name/website synchronization; returns operation ID, not provider completion.
+Save company fields in BB and queue independent QuickBooks name/website synchronization; returns operation ID, not provider completion. Optional payload billingEmails: email string array (max 50), omit to preserve defaults or [] to clear. Billing emails stay in BB; estimates are unchanged.
 
 Legacy aliases: `update-company`, `update_company`.
 
@@ -1017,8 +1025,8 @@ Effects: state-change, external-write.
 
 Payload fields (--payload JSON)
   Required: id: string; name: string; website: URL string
-  Optional: confirmDistinct: boolean
-  Example: bb update-company --payload '{"id":"<company-id>","name":"Example Co","website":"https://example.com"}'
+  Optional: confirmDistinct: boolean; billingEmails: email string[] (max 50; omit to preserve, [] to clear; trimmed, lowercased and deduplicated by the API)
+  Example: bb update-company --payload '{"id":"<company-id>","name":"Example Co","website":"https://example.com","billingEmails":["ap@example.com","finance@example.com"]}'
 
 ## `bb company sync status`
 

package/dist/index.js

@@ -7337,8 +7337,13 @@ var invoiceSplitSetupNextAction = (budgetId) => ({
   createCommand: "bb customer-invoice create --payload '<budgetId-requestId-invoiceDate-details-and-splits-json>'"
 });
 
+// ../utils/src/customer-invoice-approval-policy.ts
+var CUSTOMER_INVOICE_APPROVAL_WINDOW_MS = 72 * 60 * 60 * 1000;
+var CUSTOMER_INVOICE_APPROVAL_REMINDER_LEAD_MS = 4 * 60 * 60 * 1000;
+
 // ../utils/src/customer-invoice-lifecycle.ts
 var customerInvoiceLifecycleStatuses = [
+  "EXPIRED",
   ...Object.values(CustomerInvoiceBatchStatus),
   "PARTIALLY_SENT",
   CustomerInvoiceStatus.SENT,
@@ -7870,8 +7875,10 @@ var parseSendEstimateToContactPersonPayload = (raw) => {
 };
 var parseSendCustomerInvoiceToContactPersonPayload = (raw) => {
   const input = requireObject(raw, "send-customer-invoice-to-contact-person payload");
+  const { cc, ...email } = parseContactPersonEmailPayload({ ...input, cc: input.cc === undefined ? [] : input.cc }, "send-customer-invoice-to-contact-person");
   return {
-    ...parseContactPersonEmailPayload(input, "send-customer-invoice-to-contact-person"),
+    ...email,
+    ...input.cc === undefined ? {} : { cc },
     invoiceId: requiredString(input.invoiceId, "send-customer-invoice-to-contact-person payload.invoiceId")
   };
 };
@@ -8369,9 +8376,32 @@ function parseContactUpdatePayload(raw) {
   return raw;
 }
 function parseCompanyUpdatePayload(raw) {
-  requireObject(raw, "update-company payload");
-  return raw;
+  const input = requireObject(raw, "update-company payload");
+  const billingEmails = parseCompanyBillingEmails(input.billingEmails);
+  if (input.confirmDistinct !== undefined && typeof input.confirmDistinct !== "boolean") {
+    throw validationError("confirmDistinct must be a boolean.");
+  }
+  return {
+    id: requiredString(input.id, "id"),
+    name: requiredString(input.name, "name"),
+    website: requiredString(input.website, "website"),
+    ...input.confirmDistinct === undefined ? {} : { confirmDistinct: input.confirmDistinct },
+    ...billingEmails === undefined ? {} : { billingEmails }
+  };
 }
+var parseCompanyBillingEmails = (raw) => {
+  if (raw === undefined)
+    return;
+  if (!Array.isArray(raw) || raw.length > 50) {
+    throw validationError("billingEmails must be a JSON array of up to 50 email strings.");
+  }
+  return raw.map((email) => {
+    if (typeof email !== "string") {
+      throw validationError("billingEmails must contain only email strings.");
+    }
+    return email;
+  });
+};
 
 // src/runtime/confirmation.ts
 var effectLabels = {
@@ -10031,6 +10061,14 @@ var createCustomerInvoice = async (raw) => {
   const result = await api2.customerInvoice.createInvoiceBatch.mutate(input);
   out(result);
 };
+var resubmitCustomerInvoice = async (batchId) => {
+  await assertSensitiveWorkflowConfirmed({
+    action: "Resubmit expired customer invoice",
+    entity: `invoice batch ${batchId}`,
+    details: "queues one replacement QuickBooks invoice after confirmed expiry voiding, using the current estimate and the original percentage, due date and details; only the original requester may resubmit; no customer email is sent"
+  });
+  out(await api2.customerInvoice.resubmitInvoiceBatch.mutate({ batchId }));
+};
 var discardCreatingCustomerInvoice = async (batchId) => {
   await assertSensitiveWorkflowConfirmed({
     action: "Discard unfinished customer invoice",
@@ -10108,7 +10146,7 @@ var syncCustomerInvoice = async (invoiceId) => {
   });
   out(result);
 };
-var describeCustomerInvoiceEmailConfirmation = (input) => `emails the QBO invoice PDF to ${input.to} and saves that address as the project's billing email; requested CC ${input.cc.length > 0 ? input.cc.join(", ") : "none"}; reply-to ${input.replyTo}; subject "${input.subject}"; server-required admin, creator, business-development, and inside-sales CC recipients are added; success marks the invoice SENT; do not retry blindly after an ambiguous delivery failure`;
+var describeCustomerInvoiceEmailConfirmation = (input) => `emails the QBO invoice PDF to ${input.to} and saves that address as the project's billing email; requested CC ${input.cc === undefined ? "company billing defaults" : input.cc.length > 0 ? input.cc.join(", ") : "none (company billing defaults removed)"}; reply-to ${input.replyTo}; subject "${input.subject}"; server-required admin, creator, business-development, and inside-sales CC recipients are added; success marks the invoice SENT; do not retry blindly after an ambiguous delivery failure`;
 var sendCustomerInvoiceToContactPersonFromPayload = async (raw) => {
   const input = parseSendCustomerInvoiceToContactPersonPayload(raw);
   await assertSensitiveWorkflowConfirmed({
@@ -11071,8 +11109,8 @@ var payloadHelp = {
   },
   "update-company": {
     required: "id: string; name: string; website: URL string",
-    optional: "confirmDistinct: boolean",
-    example: '{"id":"<company-id>","name":"Example Co","website":"https://example.com"}'
+    optional: "confirmDistinct: boolean; billingEmails: email string[] (max 50; omit to preserve, [] to clear; trimmed, lowercased and deduplicated by the API)",
+    example: '{"id":"<company-id>","name":"Example Co","website":"https://example.com","billingEmails":["ap@example.com","finance@example.com"]}'
   },
   "update-project": {
     required: "id: string; name: string; companyId: string; contactPersonId: string; asanaTaskId: string; insideSalesId: string; businessDevelopmentId: string; venue: string; dateRange: {from: ISO date}",
@@ -11145,8 +11183,8 @@ var payloadHelp = {
     example: '{"budgetId":"<budget-id>","splits":[{"label":"Deposit","percentage":50,"dueDate":"2026-10-15"}],"details":{"billingAddress":"1 Example St","customerMemo":"Thanks"}}'
   },
   "send-customer-invoice-to-contact-person": {
-    required: "invoiceId: string; to: email; cc: email[]; replyTo: email; subject: string; content: HTML string; signature: HTML string",
-    optional: "none",
+    required: "invoiceId: string; to: email; replyTo: email; subject: string; content: HTML string; signature: HTML string",
+    optional: "cc: email[] (max 50; omit to use company billing defaults, explicit list replaces defaults, [] removes defaults; required internal Cc still applies)",
     example: '{"invoiceId":"<invoice-id>","to":"client@example.com","cc":[],"replyTo":"team@example.com","subject":"Invoice","content":"<p>Attached invoice</p>","signature":"<p>Team</p>"}'
   },
   "save-inbound-mapping": {
@@ -11354,6 +11392,12 @@ var deleteTargets = new Set([
   "update-project-status"
 ]);
 var explicitEffects = {
+  "resubmit-customer-invoice": [
+    "state-change",
+    "external-write",
+    "financial-write",
+    "email"
+  ],
   "rotate-webhook-secret": ["state-change"],
   "replay-webhook-delivery": ["state-change", "external-write"]
 };
@@ -11445,7 +11489,7 @@ var summaryFor = (legacyTarget) => {
   if (legacyTarget === "use-existing-company")
     return "Reuse a company in BB and QuickBooks, creating only its missing counterpart. Supply --companyId <bbId> and/or --quickbooksId <qboId>; both explicitly connect records with different names. --website <url> fills a missing QBO import website only. --confirmDistinct true confirms no similar record represents this entity.";
   if (legacyTarget === "create-company")
-    return "Create or reuse a company in BB and QuickBooks. --name <name> --website <url>. Similar names require --confirmDistinct true; inactive companies are never reactivated.";
+    return "Create or reuse a company in BB and QuickBooks. --name <name> --website <url> [--billingEmails '<json-array>'] (up to 50 invoice Cc defaults, stored in BB only for new companies; reused company defaults are preserved). Similar names require --confirmDistinct true; inactive companies are never reactivated.";
   if (legacyTarget === "create-project")
     return "Create a project linked to an existing Asana Deals lead task. Supply --asanaTaskId in non-interactive use; interactive use searches for and selects a lead task (optionally --asanaSearch). The Slack channel is resolved from the selected Asana task unless all three Slack channel flags are supplied. For a new direct client, create the lead task using the website form first.";
   if (legacyTarget === "create-supplier")
@@ -11457,6 +11501,8 @@ var summaryFor = (legacyTarget) => {
     return "Preview amount before GST, GST, and total for a percentage of an accepted estimate. Arguments: <budgetId> <percentage-of-estimate>.";
   if (legacyTarget === "list-available-qbo-customer-invoices")
     return "List unlinked QuickBooks invoices available for an accepted or closed estimate. Argument: <budgetId>.";
+  if (legacyTarget === "resubmit-customer-invoice")
+    return "Resubmit a confirmed expired-and-voided BB invoice as its original requester. Argument: <batchId>. Queues one replacement using the current estimate, original percentage, due date and details; retries return the same replacement. No customer email.";
   if (legacyTarget === "create-customer-invoice")
     return "Create one invoice from an eligible budget using --payload JSON with invoice date, due date, billing address, customer memo, and a percentage of the original estimate that does not exceed its remaining coverage.";
   if (legacyTarget === "import-qbo-customer-invoice") {
@@ -11517,10 +11563,10 @@ var summaryFor = (legacyTarget) => {
     return "Download a customer invoice PDF when permitted.";
   }
   if (legacyTarget === "send-customer-invoice-to-contact-person") {
-    return "Send a customer invoice and update the project billing email.";
+    return "Send a customer invoice and update the project billing email. Omit payload cc to use company billing defaults; an explicit list replaces them and [] removes them. Required internal Cc still applies.";
   }
   if (legacyTarget === "update-company")
-    return "Save company fields in BB and queue independent QuickBooks name/website synchronization; returns operation ID, not provider completion.";
+    return "Save company fields in BB and queue independent QuickBooks name/website synchronization; returns operation ID, not provider completion. Optional payload billingEmails: email string array (max 50), omit to preserve defaults or [] to clear. Billing emails stay in BB; estimates are unchanged.";
   if (legacyTarget === "get-company-quickbooks-sync-status")
     return "Read saved company synchronization status without provider calls or polling; use companyId.";
   if (legacyTarget === "get-item-quickbooks-sync-status")
@@ -11983,6 +12029,7 @@ var registry2 = [
     "import-qbo"
   ]),
   legacyCommand("create-customer-invoice", ["customer-invoice", "create"]),
+  legacyCommand("resubmit-customer-invoice", ["customer-invoice", "resubmit"]),
   legacyCommand("discard-customer-invoice", ["customer-invoice", "discard"]),
   legacyCommand("delete-customer-invoice", ["customer-invoice", "delete"]),
   legacyCommand("void-customer-invoice", ["customer-invoice", "void"]),
@@ -12096,6 +12143,10 @@ var registry2 = [
     }
   ]),
   legacyCommand("create-company", ["company", "create"], [], [
+    {
+      name: "--billingEmails",
+      description: "JSON email array (max 50) for new company invoice Cc defaults; reused companies keep their saved defaults."
+    },
     {
       name: "--confirmDistinct",
       description: "Set true to confirm a separate legal entity despite similar names."
@@ -13442,6 +13493,7 @@ Customer invoices
   discard-customer-invoice <batchId>           Discard a reserved CREATING batch with no created QBO invoices.
   delete-customer-invoice <batchId>            Delete QBO invoices and the local batch.
   void-customer-invoice <batchId>              Void the invoice batch in QuickBooks.
+  resubmit-customer-invoice <batchId>          Original requester only. Queues one replacement after confirmed expiry voiding; retries return the same replacement. Never sends to the customer.
   approve-customer-invoice <batchId>           Admin approval; rejects voided invoices, notifies the creator, and closes the estimate at cumulative 100% coverage.
   reject-customer-invoice <batchId> --reason <text>   Admin rejection; voids QBO invoices and notifies the creator.
   send-customer-invoice-to-contact-person --payload '<json>'   Queues same composer workflow as web; requires invoiceId, to, cc, replyTo, subject, HTML content, and HTML signature.
@@ -13467,9 +13519,9 @@ Companies & projects
   use-existing-company      --companyId <bbId> and/or --quickbooksId <qboId> [--website <url>] [--confirmDistinct true]
     Supply both IDs to explicitly connect existing records with different names.
     Reuses both records, creating only the missing counterpart. Website is needed only for a QBO import without one.
-  create-company             --name --website <url> [--confirmDistinct true]
+  create-company             --name --website <url> [--confirmDistinct true] [--billingEmails '<json-array>']
     Exact existing companies are reused. Similar names require explicit separate-entity confirmation.
-  update-company             --payload '<json>'  (saves BB fields; returns queued QBO operation ID, not completion)
+  update-company             --payload '<json>'  (optional billingEmails: omit to preserve, [] to clear; returns queued QBO operation ID, not completion)
   get-company-quickbooks-sync-status <companyId>  (saved status only; no provider call or polling)
   delete-company <id>
   list-projects              [--companyId] [--name] [--status|--statuses CSV] [--active true|false] [--wonFrom ISO] [--wonTo ISO] [--wonWithinDays N] [--limit 1-100] [--cursor] [--direction forward|backward] [--sortBy name|createdAt|status|companyName|wonAt] [--sortDir asc|desc]
@@ -14938,6 +14990,13 @@ Waiting for approval\u2026
         await createCustomerInvoice(parseJsonFlag(String(payloadRaw), "--payload"));
         break;
       }
+      case "resubmit-customer-invoice": {
+        const batchId = positional[0];
+        if (!batchId)
+          throw new Error("resubmit-customer-invoice requires <batchId>");
+        await resubmitCustomerInvoice(batchId);
+        break;
+      }
       case "discard-customer-invoice": {
         const batchId = positional[0];
         if (!batchId) {
@@ -15082,6 +15141,9 @@ Waiting for approval\u2026
         break;
       }
       case "create-company": {
+        rejectBareFlag(flags, "billingEmails");
+        const billingEmailsRaw = getFlag(flags, "billingEmails");
+        const billingEmails = billingEmailsRaw === undefined ? undefined : parseCompanyBillingEmails(parseJsonFlag(billingEmailsRaw, "--billingEmails"));
         const name = getFlag(flags, "name");
         const website = getFlag(flags, "website");
         if (!name || !website) {
@@ -15090,6 +15152,7 @@ Waiting for approval\u2026
         await createCompany({
           name,
           website,
+          ...billingEmails === undefined ? {} : { billingEmails },
           confirmDistinct: parseOptionalBoolFlag(flags, "confirmDistinct")
         });
         break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@go-labs-sg/bb",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "Budget Builder CLI for AI agents — manage budgets, bills, claims, quotations, and customer invoices with explicit workflow previews for sensitive changes.",
   "type": "module",
   "main": "./dist/index.js",