@drawbridge/drawbridge-utils 0.0.142 → 0.0.143

package/dist/connections/index.cjs

@@ -4112,7 +4112,7 @@ var shopify_default2 = {
       // against the ones the app now needs, and queues a webhook
       // reconciliation.
       health: async ({ connection: connection2, workflow }, { adminToken, logger: logger2, read, reconcileScopes, resolveSettings, rotateToken, shopify } = {}) => {
-        var _a, _b;
+        var _a, _b, _c;
         const request2 = {
           connectionId: workflow.connection,
           organizationId: workflow.organization,
@@ -4134,7 +4134,7 @@ var shopify_default2 = {
           const writes = [];
           let source = connection2.source || null;
           let sourceRepaired = false;
-          let metered = (source == null ? void 0 : source.metered) ?? null;
+          let metered;
           let shopCurrency = null;
           let billingProbeFailed = false;
           try {
@@ -4153,21 +4153,21 @@ var shopify_default2 = {
               domain: connection2.shop
             });
             if (subscriptions.length && subscriptions.every((subscription) => typeof subscription.metered === "boolean")) {
-              metered = subscriptions.some((subscription) => subscription.metered);
+              metered = ((_a = subscriptions.find((subscription) => subscription.usageLineItemId)) == null ? void 0 : _a.usageLineItemId) || null;
             }
           } catch (probeError) {
             billingProbeFailed = true;
-            (_a = logger2 == null ? void 0 : logger2.warn) == null ? void 0 : _a.call(logger2, "shopify.health.billing.probe.failed", {
+            (_b = logger2 == null ? void 0 : logger2.warn) == null ? void 0 : _b.call(logger2, "shopify.health.billing.probe.failed", {
               connectionId: connection2.id,
               message: probeError == null ? void 0 : probeError.message,
               shop: connection2.shop
             });
           }
-          if (sourceRepaired || metered !== null && metered !== (((_b = connection2.source) == null ? void 0 : _b.metered) ?? null)) {
+          if (sourceRepaired || metered !== void 0 && metered !== (((_c = connection2.source) == null ? void 0 : _c.metered) ?? void 0)) {
             writes.push({
               collection: "connection",
               data: {
-                $set: sourceRepaired ? { source: { ...source, ...metered !== null && { metered } } } : { "source.metered": metered }
+                $set: sourceRepaired ? { source: { ...source, ...metered !== void 0 && { metered } } } : { "source.metered": metered }
               },
               operation: "update",
               query: { id: connection2.id }
@@ -4187,11 +4187,12 @@ var shopify_default2 = {
               options: { jobId: "connection.update.register." + workflow.connection + "." + (0, import_node_crypto5.randomUUID)() },
               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 === false ? " 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, 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." : ""),
             request: request2,
             response: {
               billingProbeFailed,
-              metered,
+              metered: metered ?? null,
+              meterProbed: metered !== void 0,
               pingedAt: /* @__PURE__ */ new Date(),
               refreshTokenExpiresAt: refreshTokenExpiresAt || null,
               refreshTokenRotated,
@@ -4483,11 +4484,13 @@ var shopify_default2 = {
         }
       ] : [],
       // The store's ACTIVE approval carries no usage component — stamped by
-      // the daily health check and the approval webhook (`source.metered`).
-      // Approved pricing is never retroactive, so the fix is a fresh approval.
-      // Gated on an EXPLICIT false — a connection the probe hasn't reached
-      // (or couldn't read) shows nothing rather than nagging on silence.
-      ...(data2 == null ? void 0 : data2.status) === "active" && ((_a = data2 == null ? void 0 : data2.source) == null ? void 0 : _a.metered) === false ? [
+      // the daily health check and the approval webhook (`source.metered`:
+      // the usage line's id when present, null when probed-and-absent).
+      // Approved pricing is never retroactive, so the fix is a fresh
+      // approval. Gated on an EXPLICIT null — a connection the probe hasn't
+      // reached (or couldn't read) has no key and shows nothing rather than
+      // nagging on silence.
+      ...(data2 == null ? void 0 : data2.status) === "active" && ((_a = data2 == null ? void 0 : data2.source) == null ? void 0 : _a.metered) === null ? [
         {
           action: "billing",
           message: "Order billing isn't set up for this store, so campaign-attributed orders aren't being charged. Approve the updated plan to fix it \u2014 one click here, one confirmation on Shopify.",

package/dist/connections/index.d.cts

@@ -4866,14 +4866,18 @@ var shopify = {
 					// holds a live admin token, so a missing source is one lookup away
 					// from fixed.
 					//
-					// `metered` rides on the same pass: whether the merchant's ACTIVE
-					// approval carries a usage line item. A meter added to the app's
-					// pricing config is never retroactive — it bills only from the
-					// moment the merchant approves the plan version that carries it —
-					// so an approval with no usage line means every order's usage event
-					// is 202-accepted and silently never billed. Stamped on the
-					// connection so tasks() can tell the merchant to re-approve, and
-					// probed every run so a re-approval clears the card within a day.
+					// `metered` rides on the same pass: the usage LINE ITEM ID from the
+					// merchant's ACTIVE approval — an id is proof of WHICH approval
+					// carries the meter, where a boolean was only an assertion. Three
+					// states: a gid string (probed, usage line present), null (probed
+					// and absent — the unbillable state tasks() nags on), or no key at
+					// all (never probed — silence, never treated as evidence). A meter
+					// added to the app's pricing config is never retroactive — it
+					// bills only from the moment the merchant approves the plan
+					// version that carries it — so a null here means every order's
+					// usage event is 202-accepted and silently never billed. Probed
+					// every run, so a re-approval both clears the card within a day
+					// and refreshes the id it re-minted.
 					//
 					// Best-effort by design: the ping above already proved access, so a
 					// blip in either lookup must not error a healthy connection — the
@@ -4886,7 +4890,9 @@ var shopify = {
 
 					let source = connection.source || null;
 					let sourceRepaired = false;
-					let metered = source?.metered ?? null;
+					// undefined = no verdict this run; a string/null verdict comes
+					// only from a successful probe of an ACTIVE approval.
+					let metered;
 					let shopCurrency = null;
 					let billingProbeFailed = false;
 
@@ -4913,14 +4919,16 @@ var shopify = {
 
 						// Only an ACTIVE approval says anything about metering — no
 						// subscriptions (mid-install, plan pending) leaves the stamp
-						// untouched rather than asserting false from silence. The
+						// untouched rather than asserting null from silence. The
 						// every-boolean guard is version skew insurance: an older
-						// @drawbridge/shopify returns subscriptions without the flag,
-						// and reading that silence as false would nag every healthy
-						// merchant to re-approve a plan that is fine.
+						// @drawbridge/shopify returns subscriptions without the flag
+						// (and without usageLineItemId), and reading that silence as
+						// unmetered would nag every healthy merchant to re-approve a
+						// plan that is fine — the flag being boolean proves an SDK
+						// that also reports the line id.
 						if( subscriptions.length && subscriptions.every( ( subscription ) => typeof subscription.metered === 'boolean' ) ){
 
-							metered = subscriptions.some( ( subscription ) => subscription.metered );
+							metered = subscriptions.find( ( subscription ) => subscription.usageLineItemId )?.usageLineItemId || null;
 
 						}
 
@@ -4936,13 +4944,16 @@ var shopify = {
 
 					}
 
-					if( sourceRepaired || ( metered !== null && metered !== ( connection.source?.metered ?? null ) ) ){
+					// A verdict writes only when it CHANGES the stored one — the daily
+					// run stays idempotent, and undefined (no verdict) never touches
+					// the stamp.
+					if( sourceRepaired || ( metered !== undefined && metered !== ( connection.source?.metered ?? undefined ) ) ){
 
 						writes.push({
 							collection : 'connection',
 							data : {
 								$set : sourceRepaired
-									? { source : { ...source, ...( metered !== null && { metered }) } }
+									? { source : { ...source, ...( metered !== undefined && { metered }) } }
 									: { 'source.metered' : metered }
 							},
 							operation : 'update',
@@ -4972,11 +4983,12 @@ var shopify = {
 								: 'Health check passed — ping ok, webhooks reconciled.'
 						)
 							+ ( sourceRepaired ? ' Billing source repaired from the live shop.' : '' )
-							+ ( metered === false ? ' No usage line on the store\'s approved plan — order billing needs the merchant to approve the updated plan.' : '' ),
+							+ ( metered === null ? ' No usage line on the store\'s approved plan — order billing needs the merchant to approve the updated plan.' : '' ),
 						request,
 						response : {
 							billingProbeFailed,
-							metered,
+							metered : metered ?? null,
+							meterProbed : metered !== undefined,
 							pingedAt : new Date(),
 							refreshTokenExpiresAt : refreshTokenExpiresAt || null,
 							refreshTokenRotated,
@@ -5321,11 +5333,13 @@ var shopify = {
 			: []
 		),
 		// The store's ACTIVE approval carries no usage component — stamped by
-		// the daily health check and the approval webhook (`source.metered`).
-		// Approved pricing is never retroactive, so the fix is a fresh approval.
-		// Gated on an EXPLICIT false — a connection the probe hasn't reached
-		// (or couldn't read) shows nothing rather than nagging on silence.
-		...( data?.status === 'active' && data?.source?.metered === false
+		// the daily health check and the approval webhook (`source.metered`:
+		// the usage line's id when present, null when probed-and-absent).
+		// Approved pricing is never retroactive, so the fix is a fresh
+		// approval. Gated on an EXPLICIT null — a connection the probe hasn't
+		// reached (or couldn't read) has no key and shows nothing rather than
+		// nagging on silence.
+		...( data?.status === 'active' && data?.source?.metered === null
 			? [
 				{
 					action : 'billing',

package/dist/connections/index.d.ts

@@ -4866,14 +4866,18 @@ var shopify = {
 					// holds a live admin token, so a missing source is one lookup away
 					// from fixed.
 					//
-					// `metered` rides on the same pass: whether the merchant's ACTIVE
-					// approval carries a usage line item. A meter added to the app's
-					// pricing config is never retroactive — it bills only from the
-					// moment the merchant approves the plan version that carries it —
-					// so an approval with no usage line means every order's usage event
-					// is 202-accepted and silently never billed. Stamped on the
-					// connection so tasks() can tell the merchant to re-approve, and
-					// probed every run so a re-approval clears the card within a day.
+					// `metered` rides on the same pass: the usage LINE ITEM ID from the
+					// merchant's ACTIVE approval — an id is proof of WHICH approval
+					// carries the meter, where a boolean was only an assertion. Three
+					// states: a gid string (probed, usage line present), null (probed
+					// and absent — the unbillable state tasks() nags on), or no key at
+					// all (never probed — silence, never treated as evidence). A meter
+					// added to the app's pricing config is never retroactive — it
+					// bills only from the moment the merchant approves the plan
+					// version that carries it — so a null here means every order's
+					// usage event is 202-accepted and silently never billed. Probed
+					// every run, so a re-approval both clears the card within a day
+					// and refreshes the id it re-minted.
 					//
 					// Best-effort by design: the ping above already proved access, so a
 					// blip in either lookup must not error a healthy connection — the
@@ -4886,7 +4890,9 @@ var shopify = {
 
 					let source = connection.source || null;
 					let sourceRepaired = false;
-					let metered = source?.metered ?? null;
+					// undefined = no verdict this run; a string/null verdict comes
+					// only from a successful probe of an ACTIVE approval.
+					let metered;
 					let shopCurrency = null;
 					let billingProbeFailed = false;
 
@@ -4913,14 +4919,16 @@ var shopify = {
 
 						// Only an ACTIVE approval says anything about metering — no
 						// subscriptions (mid-install, plan pending) leaves the stamp
-						// untouched rather than asserting false from silence. The
+						// untouched rather than asserting null from silence. The
 						// every-boolean guard is version skew insurance: an older
-						// @drawbridge/shopify returns subscriptions without the flag,
-						// and reading that silence as false would nag every healthy
-						// merchant to re-approve a plan that is fine.
+						// @drawbridge/shopify returns subscriptions without the flag
+						// (and without usageLineItemId), and reading that silence as
+						// unmetered would nag every healthy merchant to re-approve a
+						// plan that is fine — the flag being boolean proves an SDK
+						// that also reports the line id.
 						if( subscriptions.length && subscriptions.every( ( subscription ) => typeof subscription.metered === 'boolean' ) ){
 
-							metered = subscriptions.some( ( subscription ) => subscription.metered );
+							metered = subscriptions.find( ( subscription ) => subscription.usageLineItemId )?.usageLineItemId || null;
 
 						}
 
@@ -4936,13 +4944,16 @@ var shopify = {
 
 					}
 
-					if( sourceRepaired || ( metered !== null && metered !== ( connection.source?.metered ?? null ) ) ){
+					// A verdict writes only when it CHANGES the stored one — the daily
+					// run stays idempotent, and undefined (no verdict) never touches
+					// the stamp.
+					if( sourceRepaired || ( metered !== undefined && metered !== ( connection.source?.metered ?? undefined ) ) ){
 
 						writes.push({
 							collection : 'connection',
 							data : {
 								$set : sourceRepaired
-									? { source : { ...source, ...( metered !== null && { metered }) } }
+									? { source : { ...source, ...( metered !== undefined && { metered }) } }
 									: { 'source.metered' : metered }
 							},
 							operation : 'update',
@@ -4972,11 +4983,12 @@ var shopify = {
 								: 'Health check passed — ping ok, webhooks reconciled.'
 						)
 							+ ( sourceRepaired ? ' Billing source repaired from the live shop.' : '' )
-							+ ( metered === false ? ' No usage line on the store\'s approved plan — order billing needs the merchant to approve the updated plan.' : '' ),
+							+ ( metered === null ? ' No usage line on the store\'s approved plan — order billing needs the merchant to approve the updated plan.' : '' ),
 						request,
 						response : {
 							billingProbeFailed,
-							metered,
+							metered : metered ?? null,
+							meterProbed : metered !== undefined,
 							pingedAt : new Date(),
 							refreshTokenExpiresAt : refreshTokenExpiresAt || null,
 							refreshTokenRotated,
@@ -5321,11 +5333,13 @@ var shopify = {
 			: []
 		),
 		// The store's ACTIVE approval carries no usage component — stamped by
-		// the daily health check and the approval webhook (`source.metered`).
-		// Approved pricing is never retroactive, so the fix is a fresh approval.
-		// Gated on an EXPLICIT false — a connection the probe hasn't reached
-		// (or couldn't read) shows nothing rather than nagging on silence.
-		...( data?.status === 'active' && data?.source?.metered === false
+		// the daily health check and the approval webhook (`source.metered`:
+		// the usage line's id when present, null when probed-and-absent).
+		// Approved pricing is never retroactive, so the fix is a fresh
+		// approval. Gated on an EXPLICIT null — a connection the probe hasn't
+		// reached (or couldn't read) has no key and shows nothing rather than
+		// nagging on silence.
+		...( data?.status === 'active' && data?.source?.metered === null
 			? [
 				{
 					action : 'billing',

package/dist/connections/index.js

@@ -4038,7 +4038,7 @@ var shopify_default2 = {
       // against the ones the app now needs, and queues a webhook
       // reconciliation.
       health: async ({ connection: connection2, workflow }, { adminToken, logger: logger2, read, reconcileScopes, resolveSettings, rotateToken, shopify } = {}) => {
-        var _a, _b;
+        var _a, _b, _c;
         const request2 = {
           connectionId: workflow.connection,
           organizationId: workflow.organization,
@@ -4060,7 +4060,7 @@ var shopify_default2 = {
           const writes = [];
           let source = connection2.source || null;
           let sourceRepaired = false;
-          let metered = (source == null ? void 0 : source.metered) ?? null;
+          let metered;
           let shopCurrency = null;
           let billingProbeFailed = false;
           try {
@@ -4079,21 +4079,21 @@ var shopify_default2 = {
               domain: connection2.shop
             });
             if (subscriptions.length && subscriptions.every((subscription) => typeof subscription.metered === "boolean")) {
-              metered = subscriptions.some((subscription) => subscription.metered);
+              metered = ((_a = subscriptions.find((subscription) => subscription.usageLineItemId)) == null ? void 0 : _a.usageLineItemId) || null;
             }
           } catch (probeError) {
             billingProbeFailed = true;
-            (_a = logger2 == null ? void 0 : logger2.warn) == null ? void 0 : _a.call(logger2, "shopify.health.billing.probe.failed", {
+            (_b = logger2 == null ? void 0 : logger2.warn) == null ? void 0 : _b.call(logger2, "shopify.health.billing.probe.failed", {
               connectionId: connection2.id,
               message: probeError == null ? void 0 : probeError.message,
               shop: connection2.shop
             });
           }
-          if (sourceRepaired || metered !== null && metered !== (((_b = connection2.source) == null ? void 0 : _b.metered) ?? null)) {
+          if (sourceRepaired || metered !== void 0 && metered !== (((_c = connection2.source) == null ? void 0 : _c.metered) ?? void 0)) {
             writes.push({
               collection: "connection",
               data: {
-                $set: sourceRepaired ? { source: { ...source, ...metered !== null && { metered } } } : { "source.metered": metered }
+                $set: sourceRepaired ? { source: { ...source, ...metered !== void 0 && { metered } } } : { "source.metered": metered }
               },
               operation: "update",
               query: { id: connection2.id }
@@ -4113,11 +4113,12 @@ var shopify_default2 = {
               options: { jobId: "connection.update.register." + workflow.connection + "." + randomUUID() },
               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 === false ? " 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, 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." : ""),
             request: request2,
             response: {
               billingProbeFailed,
-              metered,
+              metered: metered ?? null,
+              meterProbed: metered !== void 0,
               pingedAt: /* @__PURE__ */ new Date(),
               refreshTokenExpiresAt: refreshTokenExpiresAt || null,
               refreshTokenRotated,
@@ -4409,11 +4410,13 @@ var shopify_default2 = {
         }
       ] : [],
       // The store's ACTIVE approval carries no usage component — stamped by
-      // the daily health check and the approval webhook (`source.metered`).
-      // Approved pricing is never retroactive, so the fix is a fresh approval.
-      // Gated on an EXPLICIT false — a connection the probe hasn't reached
-      // (or couldn't read) shows nothing rather than nagging on silence.
-      ...(data2 == null ? void 0 : data2.status) === "active" && ((_a = data2 == null ? void 0 : data2.source) == null ? void 0 : _a.metered) === false ? [
+      // the daily health check and the approval webhook (`source.metered`:
+      // the usage line's id when present, null when probed-and-absent).
+      // Approved pricing is never retroactive, so the fix is a fresh
+      // approval. Gated on an EXPLICIT null — a connection the probe hasn't
+      // reached (or couldn't read) has no key and shows nothing rather than
+      // nagging on silence.
+      ...(data2 == null ? void 0 : data2.status) === "active" && ((_a = data2 == null ? void 0 : data2.source) == null ? void 0 : _a.metered) === null ? [
         {
           action: "billing",
           message: "Order billing isn't set up for this store, so campaign-attributed orders aren't being charged. Approve the updated plan to fix it \u2014 one click here, one confirmation on Shopify.",

package/dist/providers.cjs

@@ -4018,7 +4018,7 @@ var shopify_default2 = {
       // against the ones the app now needs, and queues a webhook
       // reconciliation.
       health: async ({ connection: connection2, workflow }, { adminToken, logger: logger2, read, reconcileScopes, resolveSettings, rotateToken, shopify } = {}) => {
-        var _a, _b;
+        var _a, _b, _c;
         const request2 = {
           connectionId: workflow.connection,
           organizationId: workflow.organization,
@@ -4040,7 +4040,7 @@ var shopify_default2 = {
           const writes = [];
           let source = connection2.source || null;
           let sourceRepaired = false;
-          let metered = (source == null ? void 0 : source.metered) ?? null;
+          let metered;
           let shopCurrency = null;
           let billingProbeFailed = false;
           try {
@@ -4059,21 +4059,21 @@ var shopify_default2 = {
               domain: connection2.shop
             });
             if (subscriptions.length && subscriptions.every((subscription) => typeof subscription.metered === "boolean")) {
-              metered = subscriptions.some((subscription) => subscription.metered);
+              metered = ((_a = subscriptions.find((subscription) => subscription.usageLineItemId)) == null ? void 0 : _a.usageLineItemId) || null;
             }
           } catch (probeError) {
             billingProbeFailed = true;
-            (_a = logger2 == null ? void 0 : logger2.warn) == null ? void 0 : _a.call(logger2, "shopify.health.billing.probe.failed", {
+            (_b = logger2 == null ? void 0 : logger2.warn) == null ? void 0 : _b.call(logger2, "shopify.health.billing.probe.failed", {
               connectionId: connection2.id,
               message: probeError == null ? void 0 : probeError.message,
               shop: connection2.shop
             });
           }
-          if (sourceRepaired || metered !== null && metered !== (((_b = connection2.source) == null ? void 0 : _b.metered) ?? null)) {
+          if (sourceRepaired || metered !== void 0 && metered !== (((_c = connection2.source) == null ? void 0 : _c.metered) ?? void 0)) {
             writes.push({
               collection: "connection",
               data: {
-                $set: sourceRepaired ? { source: { ...source, ...metered !== null && { metered } } } : { "source.metered": metered }
+                $set: sourceRepaired ? { source: { ...source, ...metered !== void 0 && { metered } } } : { "source.metered": metered }
               },
               operation: "update",
               query: { id: connection2.id }
@@ -4093,11 +4093,12 @@ var shopify_default2 = {
               options: { jobId: "connection.update.register." + workflow.connection + "." + (0, import_node_crypto5.randomUUID)() },
               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 === false ? " 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, 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." : ""),
             request: request2,
             response: {
               billingProbeFailed,
-              metered,
+              metered: metered ?? null,
+              meterProbed: metered !== void 0,
               pingedAt: /* @__PURE__ */ new Date(),
               refreshTokenExpiresAt: refreshTokenExpiresAt || null,
               refreshTokenRotated,
@@ -4389,11 +4390,13 @@ var shopify_default2 = {
         }
       ] : [],
       // The store's ACTIVE approval carries no usage component — stamped by
-      // the daily health check and the approval webhook (`source.metered`).
-      // Approved pricing is never retroactive, so the fix is a fresh approval.
-      // Gated on an EXPLICIT false — a connection the probe hasn't reached
-      // (or couldn't read) shows nothing rather than nagging on silence.
-      ...(data2 == null ? void 0 : data2.status) === "active" && ((_a = data2 == null ? void 0 : data2.source) == null ? void 0 : _a.metered) === false ? [
+      // the daily health check and the approval webhook (`source.metered`:
+      // the usage line's id when present, null when probed-and-absent).
+      // Approved pricing is never retroactive, so the fix is a fresh
+      // approval. Gated on an EXPLICIT null — a connection the probe hasn't
+      // reached (or couldn't read) has no key and shows nothing rather than
+      // nagging on silence.
+      ...(data2 == null ? void 0 : data2.status) === "active" && ((_a = data2 == null ? void 0 : data2.source) == null ? void 0 : _a.metered) === null ? [
         {
           action: "billing",
           message: "Order billing isn't set up for this store, so campaign-attributed orders aren't being charged. Approve the updated plan to fix it \u2014 one click here, one confirmation on Shopify.",

package/dist/providers.js

@@ -3974,7 +3974,7 @@ var shopify_default2 = {
       // against the ones the app now needs, and queues a webhook
       // reconciliation.
       health: async ({ connection: connection2, workflow }, { adminToken, logger: logger2, read, reconcileScopes, resolveSettings, rotateToken, shopify } = {}) => {
-        var _a, _b;
+        var _a, _b, _c;
         const request2 = {
           connectionId: workflow.connection,
           organizationId: workflow.organization,
@@ -3996,7 +3996,7 @@ var shopify_default2 = {
           const writes = [];
           let source = connection2.source || null;
           let sourceRepaired = false;
-          let metered = (source == null ? void 0 : source.metered) ?? null;
+          let metered;
           let shopCurrency = null;
           let billingProbeFailed = false;
           try {
@@ -4015,21 +4015,21 @@ var shopify_default2 = {
               domain: connection2.shop
             });
             if (subscriptions.length && subscriptions.every((subscription) => typeof subscription.metered === "boolean")) {
-              metered = subscriptions.some((subscription) => subscription.metered);
+              metered = ((_a = subscriptions.find((subscription) => subscription.usageLineItemId)) == null ? void 0 : _a.usageLineItemId) || null;
             }
           } catch (probeError) {
             billingProbeFailed = true;
-            (_a = logger2 == null ? void 0 : logger2.warn) == null ? void 0 : _a.call(logger2, "shopify.health.billing.probe.failed", {
+            (_b = logger2 == null ? void 0 : logger2.warn) == null ? void 0 : _b.call(logger2, "shopify.health.billing.probe.failed", {
               connectionId: connection2.id,
               message: probeError == null ? void 0 : probeError.message,
               shop: connection2.shop
             });
           }
-          if (sourceRepaired || metered !== null && metered !== (((_b = connection2.source) == null ? void 0 : _b.metered) ?? null)) {
+          if (sourceRepaired || metered !== void 0 && metered !== (((_c = connection2.source) == null ? void 0 : _c.metered) ?? void 0)) {
             writes.push({
               collection: "connection",
               data: {
-                $set: sourceRepaired ? { source: { ...source, ...metered !== null && { metered } } } : { "source.metered": metered }
+                $set: sourceRepaired ? { source: { ...source, ...metered !== void 0 && { metered } } } : { "source.metered": metered }
               },
               operation: "update",
               query: { id: connection2.id }
@@ -4049,11 +4049,12 @@ var shopify_default2 = {
               options: { jobId: "connection.update.register." + workflow.connection + "." + randomUUID() },
               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 === false ? " 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, 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." : ""),
             request: request2,
             response: {
               billingProbeFailed,
-              metered,
+              metered: metered ?? null,
+              meterProbed: metered !== void 0,
               pingedAt: /* @__PURE__ */ new Date(),
               refreshTokenExpiresAt: refreshTokenExpiresAt || null,
               refreshTokenRotated,
@@ -4345,11 +4346,13 @@ var shopify_default2 = {
         }
       ] : [],
       // The store's ACTIVE approval carries no usage component — stamped by
-      // the daily health check and the approval webhook (`source.metered`).
-      // Approved pricing is never retroactive, so the fix is a fresh approval.
-      // Gated on an EXPLICIT false — a connection the probe hasn't reached
-      // (or couldn't read) shows nothing rather than nagging on silence.
-      ...(data2 == null ? void 0 : data2.status) === "active" && ((_a = data2 == null ? void 0 : data2.source) == null ? void 0 : _a.metered) === false ? [
+      // the daily health check and the approval webhook (`source.metered`:
+      // the usage line's id when present, null when probed-and-absent).
+      // Approved pricing is never retroactive, so the fix is a fresh
+      // approval. Gated on an EXPLICIT null — a connection the probe hasn't
+      // reached (or couldn't read) has no key and shows nothing rather than
+      // nagging on silence.
+      ...(data2 == null ? void 0 : data2.status) === "active" && ((_a = data2 == null ? void 0 : data2.source) == null ? void 0 : _a.metered) === null ? [
         {
           action: "billing",
           message: "Order billing isn't set up for this store, so campaign-attributed orders aren't being charged. Approve the updated plan to fix it \u2014 one click here, one confirmation on Shopify.",

package/package.json

@@ -216,5 +216,5 @@
     "prepublishOnly": ". \"$HOME/.nvm/nvm.sh\" && nvm use && tsup && node --test"
   },
   "types": "dist/index.d.ts",
-  "version": "0.0.142"
+  "version": "0.0.143"
 }