@drawbridge/drawbridge-utils 0.0.170 → 0.0.172

package/dist/connections/index.d.ts

@@ -854,6 +854,13 @@ const row = ({ connection, data, manifest, row : described }) => ({
 
 const segmentRowWrites = ({ connection, data, manifest, row : described, segment }) => {
 
+	// NO ID, NO ROW. `String( undefined )` is the string 'undefined', which is a
+	// perfectly valid string as far as the api's schema is concerned — so a row
+	// built without a vendor id would store and then render as a live-looking
+	// link to an object that does not exist. The three hooks all guard before
+	// they get here; this is the guard that does not depend on them remembering.
+	if( described?.id === undefined || described?.id === null ) return [];
+
 	const built = row({ connection, data, manifest, row : described });
 
 	return [
@@ -1234,8 +1241,6 @@ var attentive = {
 				// status() already stops a connection reaching Active without a
 				// segment; this is the belt to that braces. A workflow saved before the
 				// segment was chosen must not silently write into nothing.
-				if( ! segment ) return { message : 'No Attentive segment is chosen for this connection.', skipped : true };
-
 				const email = lead?.canonical?.email?.value || lead?.email;
 
 				// E.164 OR NOTHING. Attentive requires it, and a national-format number
@@ -1243,9 +1248,22 @@ var attentive = {
 				// and the email carries the sync instead.
 				const phone = toE164( lead?.canonical?.phone?.value || lead?.phone );
 
+				// WHAT WENT TO THE VENDOR, so a sync run in the activity feed can
+				// answer what was actually sent. The three contact syncs were the only
+				// hook family carrying none, and a merchant opening one saw
+				// request : null. Attentive identifies on either channel, so both are
+				// recorded — which of the two carried the sync is the first question
+				// anyone debugging one of these asks.
+				const request = { email : email || null, phone : phone || null, segment : settings?.segment || null };
+
+				// status() already stops a connection reaching Active without a
+				// segment; this is the belt to that braces. A workflow saved before the
+				// segment was chosen must not silently write into nothing.
+				if( ! segment ) return { message : 'No Attentive segment is chosen for this connection.', request, skipped : true };
+
 				// Their `user` requires phone OR email. With neither there is nobody to
 				// subscribe, so this is a skip rather than a failure.
-				if( ! email && ! phone ) return { message : 'That lead has no email address or phone number to sync.', skipped : true };
+				if( ! email && ! phone ) return { message : 'That lead has no email address or phone number to sync.', request, skipped : true };
 
 				const user = {
 					...( email && { email }),
@@ -1285,6 +1303,7 @@ var attentive = {
 
 					return {
 						message : 'Attentive accepted an unsubscribe for this contact — they have opted out.',
+						request,
 						response : { accepted : true, unsubscribed : true }
 					};
 
@@ -1332,6 +1351,7 @@ var attentive = {
 					// queued them — a merchant who reads "synced" and looks for the person
 					// in Attentive a second later has been told the wrong thing.
 					message : 'Attentive accepted this contact for the segment. Attentive processes these asynchronously, so it appears there shortly.',
+					request,
 					response : {
 						accepted : true,
 						...( membership?.batchJobId && { batchJobId : membership.batchJobId })
@@ -3353,7 +3373,7 @@ var drawbridge = {
 					text : { max : 2000, type : 'string' }
 				},
 				triggers : [ 'schedule.day', 'schedule.week', 'schedule.month' ],
-				usage : { actions : 0 }
+				usage : { actions : channels.email.actionsPerSend }
 			}),
 
 			// To organization MEMBERS. Never suppressed — an entrant's opt-out must
@@ -3379,10 +3399,14 @@ var drawbridge = {
 					subject : { max : 150, type : 'string' }
 				},
 				triggers : [ 'lead.insert' ],
-				// Zero is a PRICE, and a deliberate one. Declared rather than omitted
-				// so "this is free" and "nobody decided" stay different statements;
-				// completeStep bills only when actions > 0.
-				usage : { actions : 0 }
+				// EVERY STEP IN A BILLABLE WORKFLOW COUNTS, team mail included. This
+				// leaves our SendGrid account and costs the same to send as any other
+				// email, so it carries the same weight. Whether anything is charged at
+				// all is the workflow's `billable` tag, not the step's audience — and
+				// this step triggers on lead.insert, so a merchant notifying
+				// themselves on every entry spends against their allowance twice per
+				// lead, once for the entry and once for the notification.
+				usage : { actions : channels.email.actionsPerSend }
 			}),
 
 			// To a LEAD. Suppression applies and the send is billed.
@@ -3514,7 +3538,30 @@ const api$1 = async ( path, { fetcher = fetch, method = 'GET', payload, token }
 
 // The segment's name at Klaviyo, spelled once. It is a LABEL — the definition
 // below keys on the id — so a rename never has to touch a profile.
-const segmentName = ( title ) => 'Drawbridge: ' + title;
+//
+// THE ID IS IN THE LABEL TOO, and that part is not cosmetic. Nothing makes a
+// THE ID IS IN THE NAME BECAUSE THE NAME IS NOT AN IDENTITY. Keyed on title
+// alone, a second segment called "VIP" found the first one's Klaviyo segment by
+// name and adopted it: both rows then pointed at one segment whose definition
+// computes the FIRST one's membership, so the merchant sent to the wrong people,
+// and deleting either segment deleted that object out from under the other with
+// nothing to repair it.
+//
+// The api now carries a unique index on (organization, title) and a 409 on both
+// create and rename, so that pair can no longer be created. The suffix stays
+// anyway: it is what makes the damage impossible rather than merely unlikely,
+// and it is the only part of this that holds if a title ever reaches Klaviyo
+// from somewhere that did not go through the route.
+//
+// KLAVIYO IS NOT DOING THIS FOR US. Create Segment describes `name` only as "A
+// helpful name to label the segment" and documents no uniqueness constraint and
+// no duplicate-name error (developers.klaviyo.com/en/reference/create_segment,
+// fetched 2026-09-12), so the search cannot lean on the vendor. What IS
+// documented is that filter comparisons are case-sensitive
+// (developers.klaviyo.com/en/docs/filtering_, same date), which is why the
+// find-by-name below re-checks with === and agrees with the vendor rather than
+// guessing.
+const segmentName = ( title, id ) => 'Drawbridge: ' + title + ' (' + String( id ).slice( -6 ) + ')';
 
 // THE GRANT THIS NEEDS. Klaviyo's scopes are set on the app and a token carries
 // only what the merchant consented to, so a connection made before segments were
@@ -3835,11 +3882,16 @@ var klaviyo = {
 				// incomplete() already stops a connection reaching Active without a
 				// list; this is the belt to that braces. A workflow saved before the
 				// list was chosen must not silently write into nothing.
-				if( ! list ) return { message : 'No Klaviyo list is chosen for this connection.', skipped : true };
+				// WHAT WENT TO THE VENDOR, so a sync run in the activity feed can answer
+				// what was actually sent. The three contact syncs were the only hook
+				// family that carried none, so a merchant opening one saw request : null.
+				const request = { email : lead?.canonical?.email?.value || lead?.email || null, list : settings?.list || null };
+
+				if( ! list ) return { message : 'No Klaviyo list is chosen for this connection.', request, skipped : true };
 
 				const email = lead?.canonical?.email?.value || lead?.email;
 
-				if( ! email ) return { message : 'That lead has no email address to sync.', skipped : true };
+				if( ! email ) return { message : 'That lead has no email address to sync.', request, skipped : true };
 
 				// A Klaviyo profile is keyed on an email, so IDENTITY comes from the
 				// lead. RANKING comes from the contact behind it, because only a
@@ -3934,7 +3986,7 @@ var klaviyo = {
 
 				const profileId = profile?.data?.id;
 
-				if( ! profileId ) return { message : 'Klaviyo returned no profile id.', skipped : true };
+				if( ! profileId ) return { message : 'Klaviyo returned no profile id.', request, skipped : true };
 
 				// SUPPRESSED PEOPLE ARE SYNCED AS UNSUBSCRIBED, NEVER OMITTED.
 				//
@@ -3977,6 +4029,7 @@ var klaviyo = {
 					message : suppressed
 						? 'Synced to Klaviyo as unsubscribed — this contact has opted out.'
 						: 'Synced to the Klaviyo list.',
+					request,
 					// Recorded on the run for support to read back, not a write
 					// instruction — the hook has already written what it needed to.
 					response : { klaviyoProfileId : profileId }
@@ -4024,7 +4077,7 @@ var klaviyo = {
 
 				}
 
-				const name = segmentName( segment.title );
+				const name = segmentName( segment.title, segment.id );
 				const existing = segmentRowFor({ connection, segment });
 
 				let id = null;
@@ -4634,13 +4687,29 @@ const subscriberHash = ( email ) => createHash( 'md5' )
 // server-side truncation is the worse outcome because register would then look
 // for a name Mailchimp had silently changed.
 //
-// ponytail: two segments whose first 88 characters match would share one tag.
-// The upgrade is to append a short hash of the segment id, which costs the name
-// its readability in the merchant's own audience — not worth it until somebody
-// actually collides.
+// THE SEGMENT ID IS IN THE NAME, and it has to be. Nothing makes a Drawbridge
+// segment title unique — no index on the collection, no check in the route, no
+// check in the form — so two segments called "VIP" are ordinary. Keyed on title
+// alone, the second one's register finds the first one's tag, adopts it, and
+// both rows point at one object: the merchant's two segments are one tag, and
+// deleting either segment deletes the tag out from under the other, leaving a
+// row pointing at an id that no longer exists and nothing to repair it.
+//
+// The last six characters of the id are enough to separate them and short
+// enough to leave the title readable in the merchant's own audience.
+//
+// A rename now changes the name and keeps the suffix, so register's find-by-name
+// still matches after one — and the truncation below cuts the TITLE rather than
+// the suffix for the same reason.
 const TAG_NAME_LIMIT = 100;
 
-const tagName = ( title ) => ( 'Drawbridge: ' + title ).slice( 0, TAG_NAME_LIMIT );
+const tagName = ( title, id ) => {
+
+	const suffix = ' (' + String( id ).slice( -6 ) + ')';
+
+	return ( 'Drawbridge: ' + title ).slice( 0, TAG_NAME_LIMIT - suffix.length ) + suffix;
+
+};
 
 // Mailchimp — contact sync, not a sender.
 var mailchimp = {
@@ -4797,16 +4866,24 @@ var mailchimp = {
 
 				const audience = settings?.audience;
 
+				// WHAT WENT TO THE VENDOR, recorded on the step so the activity feed
+				// can answer "what did we actually send". Every other hook family
+				// carries one; the three contact syncs did not, so a merchant opening
+				// a sync run saw `request : null` and learned nothing — which is
+				// exactly how it was reported. The audience and the address are the
+				// whole identity of this write.
+				const request = { audience : settings?.audience || null, email : lead?.canonical?.email?.value || lead?.email || null };
+
 				// status() already stops a connection reaching Active without an
 				// audience; this is the belt to that braces. A workflow saved before
 				// the audience was chosen must not silently write into nothing.
-				if( ! audience ) return { message : 'No Mailchimp audience is chosen for this connection.', skipped : true };
+				if( ! audience ) return { message : 'No Mailchimp audience is chosen for this connection.', request, skipped : true };
 
 				const email = lead?.canonical?.email?.value || lead?.email;
 
 				// A Mailchimp member IS an email address — there is no other identity
 				// to write, so a lead without one is skipped rather than failed.
-				if( ! email ) return { message : 'That lead has no email address to sync.', skipped : true };
+				if( ! email ) return { message : 'That lead has no email address to sync.', request, skipped : true };
 
 				const hash = subscriberHash( email );
 
@@ -4927,19 +5004,21 @@ var mailchimp = {
 								}
 							},
 							{
-								$project : { _id : 0, title : 1 }
+								// THE ID AS WELL AS THE TITLE, because the tag name carries it —
+							// see tagName. Without it every name here would end in the
+							// string 'undefined' and match nothing register wrote.
+							$project : { _id : 0, id : 1, title : 1 }
 							}
 						]
 					});
 
-					const joined = new Set( segments.map( ( entry ) => entry.title ) );
+					const joined = new Set( segments.map( ( entry ) => entry.id ) );
 
 					const tags = ( owned || [] )
-						.map( ( entry ) => entry.title )
-						.filter( Boolean )
-						.map( ( title ) => ({
-							name : tagName( title ),
-							status : joined.has( title ) ? 'active' : 'inactive'
+						.filter( ( entry ) => entry.id && entry.title )
+						.map( ( entry ) => ({
+							name : tagName( entry.title, entry.id ),
+							status : joined.has( entry.id ) ? 'active' : 'inactive'
 						}) );
 
 					if( tags.length > 0 ){
@@ -4962,6 +5041,7 @@ var mailchimp = {
 					message : suppressed
 						? 'Synced to Mailchimp as unsubscribed — this contact has opted out.'
 						: 'Synced to the Mailchimp audience.',
+					request,
 					// Recorded on the run for support to read back, not a write
 					// instruction — the hook has already written what it needed to.
 					response : { mailchimpMemberId : member?.id || hash }
@@ -5008,7 +5088,7 @@ var mailchimp = {
 
 				if( ! segment?.id || segment.system ) return { message : 'That segment is not one this connection publishes.', skipped : true };
 
-				const name = tagName( segment.title );
+				const name = tagName( segment.title, segment.id );
 				const existing = segmentRowFor({ connection, segment });
 
 				let id = null;
@@ -5736,23 +5816,33 @@ var shopify = {
 
 				const request = { email : context?.email || null, lead : context?.lead || null, shop : connection.shop };
 
+				// KEPT even though nothing below sends the address anywhere. A code
+				// that reaches nobody is a wasted action and a merchant's wasted
+				// allowance: issuing is only half a workflow, and the email step after
+				// it needs somewhere to send the code.
 				if( ! context?.email ) return { message : 'Lead email is missing.', request, response : { skipped : true }, skipped : true };
 				if( ! context?.lead ) return { message : 'Lead id is missing.', request, response : { skipped : true }, skipped : true };
 				if( ! discount?.id ) return { message : 'Discount is not configured on this step.', request, response : { skipped : true }, skipped : true };
 
 				const adminAccessToken = await adminToken();
 
-				// The customer must exist before a code is mapped to them. An earlier
-				// commerce.customer step usually did this and left the id on the
-				// context; when this step runs alone, it does it here.
-				if( ! context.shopifyCustomerId ){
-
-					const customer = await shopify.admin.getOrCreateCustomer({ adminAccessToken, domain : connection.shop, email : context.email });
-
-					if( ! customer?.id ) return { message : 'Shopify did not return a customer id — create/lookup failed.', request, response : { skipped : true }, skipped : true };
-
-				}
-
+				// NOTHING IS SENT TO SHOPIFY TO LINK THE CODE TO THE PERSON, because
+				// there is nothing to send: discountRedeemCodeBulkAdd takes a discount
+				// and a list of codes, and no customer
+				// (shopify.dev/docs/api/admin-graphql/2026-04/mutations/discountRedeemCodeBulkAdd).
+				// The link lives entirely on our side — `lead.shopifyDiscountCode`
+				// below — and attribution happens when the order comes back carrying
+				// the code, matched org-scoped against that field by commerce.order.
+				//
+				// This step used to call getOrCreateCustomer first, on the stated
+				// reasoning that "the customer must exist before a code is mapped to
+				// them". No code was ever mapped to them: the result was assigned and
+				// discarded, createDiscountCode never received it, and redemption
+				// attribution never consulted it. All it did was create a customer in
+				// the merchant's store as a side effect of issuing a discount — which
+				// QA reported as surprising, and was right to. A merchant who wants the
+				// buyer to exist at the store adds the Create customer step, which is
+				// what that step is for.
 				const discountCode = await shopify.admin.createDiscountCode({
 					adminAccessToken,
 					code : 'DB-' + generateDiscountCode(),
@@ -6413,7 +6503,7 @@ var shopify = {
 			//
 			// The shell has already refused a missing or inactive Shopify connection,
 			// so what is left is the two things only this hook can know are wrong.
-			product : async ( { connection, context, workflow }, { mintId } = {} ) => {
+			product : async ( { connection, context, workflow }, { mintId, read } = {} ) => {
 
 				const request = {
 					numericId : context?.id || null,
@@ -6429,11 +6519,30 @@ var shopify = {
 
 				const providerId = 'gid://shopify/Product/' + context.id;
 
-				// Minted so the enqueue can name the row this upsert makes — and the
-				// job carries the PROVIDER identity too, because under a concurrent
-				// redelivery this id may be the one that lost the upsert race. The
-				// worker falls back to provider + shop, which are stable either way.
-				const productId = mintId();
+				// THE ROW'S OWN ID WHEN IT ALREADY EXISTS, a fresh one only when it
+				// does not.
+				//
+				// The write below is an upsert whose `id` sits in $setOnInsert, so a
+				// product we have seen before keeps the id it was first given and a
+				// newly minted one is silently discarded. Minting unconditionally
+				// therefore published an id belonging to no row: the enqueue named a
+				// product the worker then had to fall back off, and the step's
+				// response showed QA a value that matched nothing they could look up
+				// — which is exactly how it was reported.
+				//
+				// Reading first costs one indexed lookup on the same key the upsert
+				// matches. A concurrent redelivery can still have both runs miss and
+				// mint, which is why the job carries the PROVIDER identity too and the
+				// worker falls back to provider + shop — stable either way.
+				const query = {
+					'provider.id' : providerId,
+					'provider.slug' : 'shopify',
+					'source.domain' : connection.shop
+				};
+
+				const existing = read?.get ? await read.get({ collection : 'product', query }) : null;
+
+				const productId = existing?.id || mintId();
 
 				return {
 					enqueues : [ {
@@ -6464,11 +6573,7 @@ var shopify = {
 						},
 						operation : 'update',
 						options : { upsert : true },
-						query : {
-							'provider.id' : providerId,
-							'provider.slug' : 'shopify',
-							'source.domain' : connection.shop
-						}
+						query
 					} ]
 				};
 
@@ -6941,10 +7046,10 @@ var shopify = {
 							queue : 'connection'
 						} ],
 						message : ( scopesMissing?.length
-							? 'Health check: ping ok, webhooks reconciled — connection errored, granted scopes are missing: ' + scopesMissing.join( ', ' ) + '.'
+							? 'Health check: ping ok, scopes reconciled — connection errored, granted scopes are missing: ' + scopesMissing.join( ', ' ) + '.'
 							: refreshTokenRotated
-								? 'Health check passed — refresh token rotated, ping ok, webhooks reconciled.'
-								: 'Health check passed — ping ok, webhooks reconciled.'
+								? 'Health check passed — refresh token rotated, ping ok, scopes reconciled.'
+								: 'Health check passed — ping ok, scopes reconciled.'
 						)
 							+ ( sourceRepaired ? ' Billing source repaired from the live shop.' : '' )
 							+ ( metered === null ? ' No usage line on the store\'s approved plan — order billing needs the merchant to approve the updated plan.' : '' ),

package/dist/connections/index.js

@@ -542,6 +542,7 @@ var row = ({ connection: connection2, data: data2, manifest, row: described }) =
   };
 };
 var segmentRowWrites = ({ connection: connection2, data: data2, manifest, row: described, segment }) => {
+  if ((described == null ? void 0 : described.id) === void 0 || (described == null ? void 0 : described.id) === null) return [];
   const built = row({ connection: connection2, data: data2, manifest, row: described });
   return [
     // PUSH IF ABSENT. The $ne guard is what makes a second concurrent register
@@ -789,10 +790,11 @@ var attentive_default2 = {
       sync: async ({ lead, settings, suppressed, token }, { fetcher } = {}) => {
         var _a, _b, _c, _d;
         const segment = settings == null ? void 0 : settings.segment;
-        if (!segment) return { message: "No Attentive segment is chosen for this connection.", skipped: true };
         const email = ((_b = (_a = lead == null ? void 0 : lead.canonical) == null ? void 0 : _a.email) == null ? void 0 : _b.value) || (lead == null ? void 0 : lead.email);
         const phone = toE164(((_d = (_c = lead == null ? void 0 : lead.canonical) == null ? void 0 : _c.phone) == null ? void 0 : _d.value) || (lead == null ? void 0 : lead.phone));
-        if (!email && !phone) return { message: "That lead has no email address or phone number to sync.", skipped: true };
+        const request2 = { email: email || null, phone: phone || null, segment: (settings == null ? void 0 : settings.segment) || null };
+        if (!segment) return { message: "No Attentive segment is chosen for this connection.", request: request2, skipped: true };
+        if (!email && !phone) return { message: "That lead has no email address or phone number to sync.", request: request2, skipped: true };
         const user = {
           ...email && { email },
           ...phone && { phone }
@@ -814,6 +816,7 @@ var attentive_default2 = {
           });
           return {
             message: "Attentive accepted an unsubscribe for this contact \u2014 they have opted out.",
+            request: request2,
             response: { accepted: true, unsubscribed: true }
           };
         }
@@ -854,6 +857,7 @@ var attentive_default2 = {
           // queued them — a merchant who reads "synced" and looks for the person
           // in Attentive a second later has been told the wrong thing.
           message: "Attentive accepted this contact for the segment. Attentive processes these asynchronously, so it appears there shortly.",
+          request: request2,
           response: {
             accepted: true,
             ...(membership == null ? void 0 : membership.batchJobId) && { batchJobId: membership.batchJobId }
@@ -2870,7 +2874,7 @@ var drawbridge_default2 = {
           text: { max: 2e3, type: "string" }
         },
         triggers: ["schedule.day", "schedule.week", "schedule.month"],
-        usage: { actions: 0 }
+        usage: { actions: channels.email.actionsPerSend }
       }),
       // To organization MEMBERS. Never suppressed — an entrant's opt-out must
       // not silence an alert to staff — and not billed.
@@ -2895,10 +2899,14 @@ var drawbridge_default2 = {
           subject: { max: 150, type: "string" }
         },
         triggers: ["lead.insert"],
-        // Zero is a PRICE, and a deliberate one. Declared rather than omitted
-        // so "this is free" and "nobody decided" stay different statements;
-        // completeStep bills only when actions > 0.
-        usage: { actions: 0 }
+        // EVERY STEP IN A BILLABLE WORKFLOW COUNTS, team mail included. This
+        // leaves our SendGrid account and costs the same to send as any other
+        // email, so it carries the same weight. Whether anything is charged at
+        // all is the workflow's `billable` tag, not the step's audience — and
+        // this step triggers on lead.insert, so a merchant notifying
+        // themselves on every entry spends against their allowance twice per
+        // lead, once for the entry and once for the notification.
+        usage: { actions: channels.email.actionsPerSend }
       }),
       // To a LEAD. Suppression applies and the send is billed.
       send: () => ({
@@ -3007,7 +3015,7 @@ var api2 = async (path, { fetcher = fetch, method = "GET", payload, token }) =>
   }
   return response.status === 204 ? null : response.json();
 };
-var segmentName = (title) => "Drawbridge: " + title;
+var segmentName = (title, id) => "Drawbridge: " + title + " (" + String(id).slice(-6) + ")";
 var canManageSegments = (settings) => String((settings == null ? void 0 : settings.scope) || "").split(/\s+/).includes("segments:write");
 var klaviyo_default2 = {
   // OAuth 2.1, and PKCE is REQUIRED rather than recommended: Klaviyo refuses an
@@ -3254,11 +3262,12 @@ var klaviyo_default2 = {
       // different thing from deleting the profile.
       remove: false,
       sync: async ({ context, lead, segments, settings, suppressed, token }, { fetcher } = {}) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const list = settings == null ? void 0 : settings.list;
-        if (!list) return { message: "No Klaviyo list is chosen for this connection.", skipped: true };
-        const email = ((_b = (_a = lead == null ? void 0 : lead.canonical) == null ? void 0 : _a.email) == null ? void 0 : _b.value) || (lead == null ? void 0 : lead.email);
-        if (!email) return { message: "That lead has no email address to sync.", skipped: true };
+        const request2 = { email: ((_b = (_a = lead == null ? void 0 : lead.canonical) == null ? void 0 : _a.email) == null ? void 0 : _b.value) || (lead == null ? void 0 : lead.email) || null, list: (settings == null ? void 0 : settings.list) || null };
+        if (!list) return { message: "No Klaviyo list is chosen for this connection.", request: request2, skipped: true };
+        const email = ((_d = (_c = lead == null ? void 0 : lead.canonical) == null ? void 0 : _c.email) == null ? void 0 : _d.value) || (lead == null ? void 0 : lead.email);
+        if (!email) return { message: "That lead has no email address to sync.", request: request2, skipped: true };
         const person = (context == null ? void 0 : context.contact) || null;
         const totals = (person == null ? void 0 : person.totals) || {};
         const count = (value) => typeof value === "number" ? value : (value == null ? void 0 : value.total) || 0;
@@ -3315,8 +3324,8 @@ var klaviyo_default2 = {
           },
           token
         });
-        const profileId = (_c = profile == null ? void 0 : profile.data) == null ? void 0 : _c.id;
-        if (!profileId) return { message: "Klaviyo returned no profile id.", skipped: true };
+        const profileId = (_e = profile == null ? void 0 : profile.data) == null ? void 0 : _e.id;
+        if (!profileId) return { message: "Klaviyo returned no profile id.", request: request2, skipped: true };
         await api2("/profile-subscription-bulk-create-jobs/", {
           fetcher,
           method: "POST",
@@ -3345,6 +3354,7 @@ var klaviyo_default2 = {
           // Merged into `context` for later steps in this run.
           context: { klaviyoProfileId: profileId },
           message: suppressed ? "Synced to Klaviyo as unsubscribed \u2014 this contact has opted out." : "Synced to the Klaviyo list.",
+          request: request2,
           // Recorded on the run for support to read back, not a write
           // instruction — the hook has already written what it needed to.
           response: { klaviyoProfileId: profileId }
@@ -3380,7 +3390,7 @@ var klaviyo_default2 = {
             skipped: true
           };
         }
-        const name = segmentName(segment.title);
+        const name = segmentName(segment.title, segment.id);
         const existing = segmentRowFor({ connection: connection2, segment });
         let id = null;
         if (existing == null ? void 0 : existing.id) {
@@ -3787,7 +3797,10 @@ var api3 = async (path, { dc, fetcher = fetch, method = "GET", payload, token })
 };
 var subscriberHash = (email) => createHash2("md5").update(String(email).trim().toLowerCase()).digest("hex");
 var TAG_NAME_LIMIT = 100;
-var tagName = (title) => ("Drawbridge: " + title).slice(0, TAG_NAME_LIMIT);
+var tagName = (title, id) => {
+  const suffix = " (" + String(id).slice(-6) + ")";
+  return ("Drawbridge: " + title).slice(0, TAG_NAME_LIMIT - suffix.length) + suffix;
+};
 var mailchimp_default2 = {
   // OAUTH 2, authorization code. Every url below is quoted from
   // mailchimp.com/developer/marketing/guides/access-user-data-oauth-2/ rather
@@ -3925,15 +3938,16 @@ var mailchimp_default2 = {
       // why there is no create-or-update branch here. Quoted from Mailchimp's
       // Marketing API reference for the list-members resource.
       sync: async ({ connection: connection2, lead, segments, settings, suppressed, token }, { fetcher, read } = {}) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const audience = settings == null ? void 0 : settings.audience;
-        if (!audience) return { message: "No Mailchimp audience is chosen for this connection.", skipped: true };
-        const email = ((_b = (_a = lead == null ? void 0 : lead.canonical) == null ? void 0 : _a.email) == null ? void 0 : _b.value) || (lead == null ? void 0 : lead.email);
-        if (!email) return { message: "That lead has no email address to sync.", skipped: true };
+        const request2 = { audience: (settings == null ? void 0 : settings.audience) || null, email: ((_b = (_a = lead == null ? void 0 : lead.canonical) == null ? void 0 : _a.email) == null ? void 0 : _b.value) || (lead == null ? void 0 : lead.email) || null };
+        if (!audience) return { message: "No Mailchimp audience is chosen for this connection.", request: request2, skipped: true };
+        const email = ((_d = (_c = lead == null ? void 0 : lead.canonical) == null ? void 0 : _c.email) == null ? void 0 : _d.value) || (lead == null ? void 0 : lead.email);
+        if (!email) return { message: "That lead has no email address to sync.", request: request2, skipped: true };
         const hash = subscriberHash(email);
         const [firstName, ...restOfName] = String((lead == null ? void 0 : lead.name) || "").trim().split(/\s+/).filter(Boolean);
         const lastName = restOfName.join(" ");
-        const phone = ((_c = lead == null ? void 0 : lead.phone) == null ? void 0 : _c.number) || null;
+        const phone = ((_e = lead == null ? void 0 : lead.phone) == null ? void 0 : _e.number) || null;
         const mergeFields = {
           ...firstName && { FNAME: firstName },
           ...lastName && { LNAME: lastName },
@@ -3967,14 +3981,17 @@ var mailchimp_default2 = {
                 }
               },
               {
-                $project: { _id: 0, title: 1 }
+                // THE ID AS WELL AS THE TITLE, because the tag name carries it —
+                // see tagName. Without it every name here would end in the
+                // string 'undefined' and match nothing register wrote.
+                $project: { _id: 0, id: 1, title: 1 }
               }
             ]
           });
-          const joined = new Set(segments.map((entry) => entry.title));
-          const tags = (owned || []).map((entry) => entry.title).filter(Boolean).map((title) => ({
-            name: tagName(title),
-            status: joined.has(title) ? "active" : "inactive"
+          const joined = new Set(segments.map((entry) => entry.id));
+          const tags = (owned || []).filter((entry) => entry.id && entry.title).map((entry) => ({
+            name: tagName(entry.title, entry.id),
+            status: joined.has(entry.id) ? "active" : "inactive"
           }));
           if (tags.length > 0) {
             await api3("/lists/" + audience + "/members/" + hash + "/tags", {
@@ -3990,6 +4007,7 @@ var mailchimp_default2 = {
           // Merged into `context` for later steps in this run.
           context: { mailchimpMemberId: (member == null ? void 0 : member.id) || hash },
           message: suppressed ? "Synced to Mailchimp as unsubscribed \u2014 this contact has opted out." : "Synced to the Mailchimp audience.",
+          request: request2,
           // Recorded on the run for support to read back, not a write
           // instruction — the hook has already written what it needed to.
           response: { mailchimpMemberId: (member == null ? void 0 : member.id) || hash }
@@ -4025,7 +4043,7 @@ var mailchimp_default2 = {
         if (!audience) return { message: "No Mailchimp audience is chosen for this connection.", skipped: true };
         const segment = await currentSegment({ read, segment: context == null ? void 0 : context.segment });
         if (!(segment == null ? void 0 : segment.id) || segment.system) return { message: "That segment is not one this connection publishes.", skipped: true };
-        const name = tagName(segment.title);
+        const name = tagName(segment.title, segment.id);
         const existing = segmentRowFor({ connection: connection2, segment });
         let id = null;
         if (existing == null ? void 0 : existing.id) {
@@ -4578,10 +4596,6 @@ var shopify_default2 = {
         if (!(context == null ? void 0 : context.lead)) return { message: "Lead id is missing.", request: request2, response: { skipped: true }, skipped: true };
         if (!(discount == null ? void 0 : discount.id)) return { message: "Discount is not configured on this step.", request: request2, response: { skipped: true }, skipped: true };
         const adminAccessToken = await adminToken();
-        if (!context.shopifyCustomerId) {
-          const customer = await shopify.admin.getOrCreateCustomer({ adminAccessToken, domain: connection2.shop, email: context.email });
-          if (!(customer == null ? void 0 : customer.id)) return { message: "Shopify did not return a customer id \u2014 create/lookup failed.", request: request2, response: { skipped: true }, skipped: true };
-        }
         const discountCode = await shopify.admin.createDiscountCode({
           adminAccessToken,
           code: "DB-" + generateDiscountCode(),
@@ -5025,7 +5039,7 @@ var shopify_default2 = {
       //
       // The shell has already refused a missing or inactive Shopify connection,
       // so what is left is the two things only this hook can know are wrong.
-      product: async ({ connection: connection2, context, workflow }, { mintId } = {}) => {
+      product: async ({ connection: connection2, context, workflow }, { mintId, read } = {}) => {
         const request2 = {
           numericId: (context == null ? void 0 : context.id) || null,
           organizationId: workflow.organization,
@@ -5034,7 +5048,13 @@ var shopify_default2 = {
         if (!(context == null ? void 0 : context.id)) return { message: "Skipped \u2014 product webhook payload had no id.", request: request2, response: { skipped: true }, skipped: true };
         if (!connection2.shop) return { message: "Skipped \u2014 Shopify connection is missing shop domain.", request: request2, response: { skipped: true }, skipped: true };
         const providerId = "gid://shopify/Product/" + context.id;
-        const productId = mintId();
+        const query = {
+          "provider.id": providerId,
+          "provider.slug": "shopify",
+          "source.domain": connection2.shop
+        };
+        const existing = (read == null ? void 0 : read.get) ? await read.get({ collection: "product", query }) : null;
+        const productId = (existing == null ? void 0 : existing.id) || mintId();
         return {
           enqueues: [{
             data: { product: productId, providerId, shop: connection2.shop },
@@ -5064,11 +5084,7 @@ var shopify_default2 = {
             },
             operation: "update",
             options: { upsert: true },
-            query: {
-              "provider.id": providerId,
-              "provider.slug": "shopify",
-              "source.domain": connection2.shop
-            }
+            query
           }]
         };
       }
@@ -5338,7 +5354,7 @@ var shopify_default2 = {
               options: { jobId: "connection.update.register." + workflow.connection + "." + randomUUID2() },
               queue: "connection"
             }],
-            message: ((scopesMissing == null ? void 0 : scopesMissing.length) ? "Health check: ping ok, webhooks reconciled \u2014 connection errored, granted scopes are missing: " + scopesMissing.join(", ") + "." : refreshTokenRotated ? "Health check passed \u2014 refresh token rotated, ping ok, webhooks reconciled." : "Health check passed \u2014 ping ok, webhooks reconciled.") + (sourceRepaired ? " Billing source repaired from the live shop." : "") + (metered === null ? " No usage line on the store's approved plan \u2014 order billing needs the merchant to approve the updated plan." : ""),
+            message: ((scopesMissing == null ? void 0 : scopesMissing.length) ? "Health check: ping ok, scopes reconciled \u2014 connection errored, granted scopes are missing: " + scopesMissing.join(", ") + "." : refreshTokenRotated ? "Health check passed \u2014 refresh token rotated, ping ok, scopes reconciled." : "Health check passed \u2014 ping ok, scopes reconciled.") + (sourceRepaired ? " Billing source repaired from the live shop." : "") + (metered === null ? " No usage line on the store's approved plan \u2014 order billing needs the merchant to approve the updated plan." : ""),
             request: request2,
             response: {
               billingProbeFailed,