@friggframework/core 2.0.0--canary.622.fe9da2d.0 → 2.0.0--canary.623.ee3bde8.0

package/modules/module.js

@@ -147,15 +147,24 @@ class Module extends Delegate {
         } else if (delegateString === this.api.DLGT_TOKEN_DEAUTHORIZED) {
             await this.deauthorize();
         } else if (delegateString === this.api.DLGT_INVALID_AUTH) {
-            await this.markCredentialsInvalid();
+            await this.markCredentialsInvalid(object);
         }
     }
 
-    async markCredentialsInvalid() {
+    async markCredentialsInvalid(diagnosticInfo = null) {
         if (!this.credential) return;
 
         if (!this.credential.id) return;
 
+        if (diagnosticInfo) {
+            console.error(
+                `[Frigg] Module ${this.name} credentials rejected (status ${
+                    diagnosticInfo.statusCode ?? '?'
+                }):`,
+                diagnosticInfo.message ?? diagnosticInfo
+            );
+        }
+
         await this.credentialRepository.updateAuthenticationStatus(
             this.credential.id,
             false
@@ -181,6 +190,10 @@ class Module extends Delegate {
             await this.notify(this.DLGT_CREDENTIAL_INVALIDATED, {
                 credentialId: this.credential.id,
                 moduleName: this.name,
+                ...(diagnosticInfo && {
+                    reason: diagnosticInfo.message,
+                    statusCode: diagnosticInfo.statusCode,
+                }),
             });
         } catch (err) {
             console.error(

package/modules/requester/requester.js

@@ -2,7 +2,6 @@ const fetch = require('node-fetch');
 const { Delegate } = require('../../core');
 const { FetchError } = require('../../errors');
 const { get } = require('../../assertions');
-const { getTelemetry } = require('../../telemetry/telemetry-runtime');
 
 const DEFAULT_REQUEST_TIMEOUT_MS = 60_000;
 
@@ -12,6 +11,11 @@ class Requester extends Delegate {
         this.backOff = get(params, 'backOff', [1, 3, 10, 30, 60, 180]);
         this.isRefreshable = false;
         this.refreshCount = 0;
+        // Independent from the `i` backoff-attempt counter passed through
+        // _request's recursion — a 429/5xx retry earlier in the same call
+        // already advances `i`, and gating the 401 grace retry on `i === 0`
+        // would skip it whenever a 401 follows any prior backoff response.
+        this.authGraceRetryCount = 0;
         this.DLGT_INVALID_AUTH = 'INVALID_AUTH';
         this.delegateTypes.push(this.DLGT_INVALID_AUTH);
         this.agent = get(params, 'agent', null);
@@ -43,40 +47,6 @@ class Requester extends Delegate {
         // Allow passing in the fetch function
         // Instance methods can use this.fetch without differentiating
         this.fetch = get(params, 'fetch', fetch);
-
-        // Defaults to the process singleton. Pass an integration's bound
-        // `this.telemetry` to attribute out-of-band requests — setup/OAuth calls
-        // made before an integration context exists aren't rolled up otherwise.
-        this.telemetry = (params && params.telemetry) || getTelemetry();
-    }
-
-    /**
-     * Redact secrets/PII from a URL before it touches telemetry. Many API
-     * modules embed credentials in the query string (?api_key=, ?token=,
-     * presigned signatures) or in userinfo — those must never reach a span,
-     * the bus, or an exporter. Keep only protocol + host + path (enough for
-     * North Star endpoint matching).
-     */
-    _sanitizeUrl(url) {
-        const raw = String(url);
-        try {
-            const u = new URL(raw);
-            return `${u.protocol}//${u.host}${u.pathname}`;
-        } catch (_) {
-            // Relative/opaque URL: drop the query string at minimum.
-            return raw.split('?')[0];
-        }
-    }
-
-    /** Bounded module label for the apimodule.requests metric. */
-    _telemetryModuleLabel() {
-        return (
-            this.moduleName ||
-            this.delegate?.name ||
-            this.delegate?.constructor?.name ||
-            this.constructor?.name ||
-            'unknown'
-        );
     }
 
     parsedBody = async (resp) => {
@@ -93,66 +63,7 @@ class Requester extends Delegate {
         return resp.text();
     };
 
-    /**
-     * Instrumenting entry point. Wraps the whole logical request —
-     * including retry/refresh recursion — in a single span + one
-     * `frigg.apimodule.requests` counter, emitted on the `i === 0` boundary so
-     * retries are never double-counted. The full URL rides the span only; the
-     * metric carries bounded labels {module, method, status} — never endpoint.
-     */
-    async _request(url, options = {}, i = 0) {
-        if (i !== 0) {
-            return this._rawRequest(url, options, i);
-        }
-
-        const telemetry = this.telemetry;
-        if (!telemetry || typeof telemetry.span !== 'function') {
-            return this._rawRequest(url, options, 0);
-        }
-
-        const module = this._telemetryModuleLabel();
-        const method = (options.method || 'GET').toUpperCase();
-        const safeUrl = this._sanitizeUrl(url);
-
-        return telemetry.span('frigg.apimodule.request', async (span) => {
-            if (span && typeof span.setAttributes === 'function') {
-                span.setAttributes({
-                    'frigg.module': module,
-                    'http.request.method': method,
-                    // Redacted (no query/userinfo) — never emit raw URLs.
-                    'url.path': safeUrl,
-                });
-            }
-            // Redacted url (unbounded) rides the bus-only context for North Star
-            // derived-from-trace matching — never a metric label.
-            const busContext = { url: safeUrl };
-            try {
-                const result = await this._rawRequest(url, options, 0);
-                telemetry.count(
-                    'frigg.apimodule.requests',
-                    1,
-                    { module, method, status: 'ok' },
-                    busContext
-                );
-                return result;
-            } catch (err) {
-                const code = err?.status ?? err?.statusCode;
-                const status = code ? String(code) : 'error';
-                if (span && typeof span.setAttribute === 'function' && code) {
-                    span.setAttribute('http.response.status_code', code);
-                }
-                telemetry.count(
-                    'frigg.apimodule.requests',
-                    1,
-                    { module, method, status },
-                    busContext
-                );
-                throw err;
-            }
-        });
-    }
-
-    async _rawRequest(url, options, i = 0) {
+    async _request(url, options, i = 0) {
         let encodedUrl = encodeURI(url);
         if (options.query) {
             let queryBuild = '?';
@@ -214,7 +125,7 @@ class Requester extends Delegate {
                     clearRequestTimer();
                     const delay = this.backOff[i] * 1000;
                     await new Promise((resolve) => setTimeout(resolve, delay));
-                    return this._rawRequest(url, options, i + 1);
+                    return this._request(url, options, i + 1);
                 }
                 const fetchError = await FetchError.create({
                     resource: encodedUrl,
@@ -241,13 +152,36 @@ class Requester extends Delegate {
                 clearRequestTimer();
                 const delay = this.backOff[i] * 1000;
                 await new Promise((resolve) => setTimeout(resolve, delay));
-                return this._rawRequest(url, options, i + 1);
+                return this._request(url, options, i + 1);
             }
 
             if (status === 401) {
                 if (!this.isRefreshable) {
-                    await this.notify(this.DLGT_INVALID_AUTH);
-                    return;
+                    // A non-refreshable requester (ApiKeyRequester,
+                    // BasicAuthRequester) has no token to renew, but a single
+                    // 401 is not necessarily proof the credential itself is
+                    // bad — it may be a transient edge/gateway hiccup. Grant
+                    // one grace retry of the same request before concluding
+                    // the credential is truly invalid, mirroring the single
+                    // refresh attempt OAuth2Requester gets below. Gated on
+                    // authGraceRetryCount rather than `i` so an earlier
+                    // 429/5xx backoff on the same call doesn't consume the
+                    // grace retry before a 401 is even seen.
+                    if (this.authGraceRetryCount === 0) {
+                        this.authGraceRetryCount++;
+                        clearRequestTimer();
+                        const delay = this.backOff[0] * 1000;
+                        await new Promise((resolve) =>
+                            setTimeout(resolve, delay)
+                        );
+                        return this._request(url, options, i + 1);
+                    }
+
+                    throw await this._invalidateAuth(
+                        encodedUrl,
+                        options,
+                        response
+                    );
                 }
 
                 if (this.refreshCount === 0) {
@@ -255,11 +189,14 @@ class Requester extends Delegate {
                     const refreshSucceeded = await this.refreshAuth();
                     if (refreshSucceeded) {
                         clearRequestTimer();
-                        return this._rawRequest(url, options, i + 1);
+                        return this._request(url, options, i + 1);
                     }
 
-                    await this.notify(this.DLGT_INVALID_AUTH);
-                    return;
+                    throw await this._invalidateAuth(
+                        encodedUrl,
+                        options,
+                        response
+                    );
                 }
             }
 
@@ -278,10 +215,12 @@ class Requester extends Delegate {
                 );
             }
 
-            // Successful response: reset the per-instance refresh budget so
-            // a later 401 in the same Requester lifetime can attempt refresh
-            // again instead of silently falling through.
+            // Successful response: reset the per-instance refresh/grace
+            // budgets so a later 401 in the same Requester lifetime can
+            // attempt refresh (or another grace retry) again instead of
+            // silently falling through.
             this.refreshCount = 0;
+            this.authGraceRetryCount = 0;
 
             // parsedBody consumes the response body stream. If the server
             // stalls mid-stream the timer (still armed) aborts it.
@@ -298,6 +237,22 @@ class Requester extends Delegate {
         }
     }
 
+    // Builds a diagnostic FetchError from the failed 401 response, notifies
+    // delegates with it attached (so the credential-invalidation chain can
+    // log real detail instead of a bare "invalid credentials" with no
+    // evidence), and returns the error for the caller to throw. Notifying
+    // and throwing are split so notify() always fires even though `await`ing
+    // it happens before the throw.
+    async _invalidateAuth(encodedUrl, options, response) {
+        const fetchError = await FetchError.create({
+            resource: encodedUrl,
+            init: options,
+            response,
+        });
+        await this.notify(this.DLGT_INVALID_AUTH, fetchError);
+        return fetchError;
+    }
+
     _maybeFlagTimeoutDuringBodyRead(err, timeoutMs) {
         if (!err || typeof err !== 'object') return err;
         if (err.isTimeout) return err;

package/package.json

@@ -1,20 +1,13 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.622.fe9da2d.0",
+    "version": "2.0.0--canary.623.ee3bde8.0",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
         "@aws-sdk/client-lambda": "^3.714.0",
         "@aws-sdk/client-sqs": "^3.588.0",
         "@hapi/boom": "^10.0.1",
-        "@opentelemetry/api": "^1.9.1",
-        "@opentelemetry/context-async-hooks": "^2.9.0",
-        "@opentelemetry/exporter-metrics-otlp-http": "^0.220.0",
-        "@opentelemetry/exporter-trace-otlp-http": "^0.220.0",
-        "@opentelemetry/resources": "^2.9.0",
-        "@opentelemetry/sdk-metrics": "^2.9.0",
-        "@opentelemetry/sdk-trace-base": "^2.9.0",
         "bcryptjs": "^2.4.3",
         "body-parser": "^1.20.5",
         "bson": "^4.7.2",
@@ -45,9 +38,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.622.fe9da2d.0",
-        "@friggframework/prettier-config": "2.0.0--canary.622.fe9da2d.0",
-        "@friggframework/test": "2.0.0--canary.622.fe9da2d.0",
+        "@friggframework/eslint-config": "2.0.0--canary.623.ee3bde8.0",
+        "@friggframework/prettier-config": "2.0.0--canary.623.ee3bde8.0",
+        "@friggframework/test": "2.0.0--canary.623.ee3bde8.0",
         "@prisma/client": "^6.19.3",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -87,5 +80,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "fe9da2d26354e6118a6f14350cdf18394408b3a4"
+    "gitHead": "ee3bde8d1adc7e90a424a26429ce4b4d612ff52f"
 }

package/prisma-mongodb/schema.prisma

@@ -430,26 +430,3 @@ model ScriptSchedule {
   @@index([enabled])
   @@map("ScriptSchedule")
 }
-
-/// Durable usage counters, deliberately isolated: no userId and no foreign key
-/// to Integration, so a user-scoped query can never return a usage row and usage
-/// history survives integration deletion.
-model UsageCounter {
-  id String @id @default(auto()) @map("_id") @db.ObjectId
-
-  integrationId   String
-  integrationType String
-  metric          String
-  window          String // e.g. "day:2026-07-05" or "hour:2026-07-05T14"
-  value           BigInt @default(0) // BigInt: a busy day/hour counter can exceed 32-bit
-
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-
-  @@unique([integrationId, integrationType, metric, window])
-  // Covers totals() (metric + window prefix/range, no integrationType filter).
-  @@index([metric, window])
-  // Covers series() (metric + integrationType + window range).
-  @@index([metric, integrationType, window])
-  @@map("UsageCounter")
-}

package/prisma-postgresql/schema.prisma

@@ -412,25 +412,3 @@ model ScriptSchedule {
 
   @@index([enabled])
 }
-
-/// Durable usage counters, deliberately isolated: no userId and no foreign key
-/// to Integration, so a user-scoped query can never return a usage row and usage
-/// history survives integration deletion.
-model UsageCounter {
-  id Int @id @default(autoincrement())
-
-  integrationId   String
-  integrationType String
-  metric          String
-  window          String // e.g. "day:2026-07-05" or "hour:2026-07-05T14"
-  value           BigInt @default(0) // BigInt: a busy day/hour counter can exceed 32-bit
-
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-
-  @@unique([integrationId, integrationType, metric, window])
-  // Covers totals() (metric + window prefix/range, no integrationType filter).
-  @@index([metric, window])
-  // Covers series() (metric + integrationType + window range).
-  @@index([metric, integrationType, window])
-}

package/reporting/README.md

@@ -52,15 +52,8 @@ Optional query params (all strings): `status` (an `IntegrationStatus`), `type`
 - `filters` — echoes the applied filters (nulls when omitted).
 - `metrics.total` — count of integrations matching the filters.
 - `metrics.byStatus` — counts keyed by `IntegrationStatus` value.
-- `metrics.byType[]` — per `type` breakdown: `{ type, label, total, byStatus, usage? }`.
+- `metrics.byType[]` — per `type` breakdown: `{ type, label, total, byStatus }`.
   - `type` — the `config.type` slug. Integrations with no type bucket as `"unknown"`.
-  - `usage` — **additive** (ADR-011): present only when the deployment has the
-    usage store configured. A map of canonical counter → total for that type,
-    e.g. `{ "records.synced": 4200, "webhooks.received": 118, "api.requests": 9004 }`
-    (`0` when a type has no data). Read only from the Frigg usage store, never an
-    external APM; a usage-store read failure never fails the structural report.
-    Populated by the counters an integration opts into via `Definition.usage` —
-    see [`../telemetry/README.md`](../telemetry/README.md).
   - `label` — human-readable name from the integration class's
     `Definition.display.label`. Falls back to the `type` slug when no registered
     class supplies a label (e.g. an integration that was removed, or run on an

package/reporting/reporting-router.js

@@ -3,12 +3,7 @@ const catchAsyncError = require('express-async-handler');
 const {
     createReportingRepository,
 } = require('./repositories/reporting-repository-factory');
-const {
-    createUsageRepository,
-} = require('../usage/repositories/usage-repository-factory');
-const {
-    ListIntegrationsReport,
-} = require('./use-cases/list-integrations-report');
+const { ListIntegrationsReport } = require('./use-cases/list-integrations-report');
 const { loadAppDefinition } = require('../handlers/app-definition-loader');
 
 // IntegrationBase.Definition default — skip it so the slug is used instead.
@@ -40,10 +35,8 @@ function buildTypeLabels() {
 
 function createReportingRouter() {
     const reportingRepository = createReportingRepository();
-    const usageRepository = createUsageRepository();
     const listIntegrationsReport = new ListIntegrationsReport({
         reportingRepository,
-        usageRepository,
         typeLabels: buildTypeLabels(),
     });
 

package/reporting/use-cases/list-integrations-report.js

@@ -1,5 +1,4 @@
 const Boom = require('@hapi/boom');
-const { CANONICAL_COUNTERS } = require('../../telemetry/canonical-counters');
 
 const SCHEMA_VERSION = 1;
 const SERVICE = 'frigg-core-api';
@@ -17,19 +16,11 @@ const KNOWN_STATUSES = [
 ];
 
 class ListIntegrationsReport {
-    constructor({
-        reportingRepository,
-        usageRepository,
-        typeLabels = {},
-    } = {}) {
+    constructor({ reportingRepository, typeLabels = {} } = {}) {
         if (!reportingRepository) {
             throw new Error('reportingRepository is required');
         }
-        if (!usageRepository) {
-            throw new Error('usageRepository is required');
-        }
         this.reportingRepository = reportingRepository;
-        this.usageRepository = usageRepository;
         this.typeLabels = typeLabels;
     }
 
@@ -76,8 +67,7 @@ class ListIntegrationsReport {
             if (!byTypeMap.has(integration.type)) {
                 byTypeMap.set(integration.type, {
                     type: integration.type,
-                    label:
-                        this.typeLabels[integration.type] || integration.type,
+                    label: this.typeLabels[integration.type] || integration.type,
                     total: 0,
                     byStatus: emptyStatusCounts(),
                 });
@@ -87,8 +77,6 @@ class ListIntegrationsReport {
             bucket.byStatus[statusKey] = (bucket.byStatus[statusKey] ?? 0) + 1;
         }
 
-        await this._attachUsageColumns(byTypeMap);
-
         return {
             schemaVersion: SCHEMA_VERSION,
             service: SERVICE,
@@ -108,44 +96,9 @@ class ListIntegrationsReport {
         };
     }
 
-    async _attachUsageColumns(byTypeMap) {
-        const metrics = Object.keys(CANONICAL_COUNTERS);
-        try {
-            const totalsByMetric = await Promise.all(
-                metrics.map(async (metric) => {
-                    const totals = await this.usageRepository.getTotalsByDimension({
-                        metric,
-                        groupBy: 'integrationType',
-                    });
-                    const map = new Map(
-                        (totals || []).map((t) => [t.integrationType, t.value])
-                    );
-                    return [metric, map];
-                })
-            );
-
-            for (const bucket of byTypeMap.values()) {
-                bucket.usage = {};
-                for (const [metric, map] of totalsByMetric) {
-                    bucket.usage[metric] = map.get(bucket.type) ?? 0;
-                }
-            }
-        } catch (error) {
-            console.warn(
-                `[Frigg][reporting] usage columns unavailable: ${
-                    error && error.message
-                }`
-            );
-        }
-    }
-
     _validateQuery({ status, type, userId } = {}) {
         for (const [key, value] of Object.entries({ status, type, userId })) {
-            if (
-                value !== undefined &&
-                value !== null &&
-                typeof value !== 'string'
-            ) {
+            if (value !== undefined && value !== null && typeof value !== 'string') {
                 throw Boom.badRequest(
                     `Invalid query parameter '${key}': expected a string`
                 );
@@ -159,9 +112,9 @@ class ListIntegrationsReport {
         };
         if (normalized.status && !KNOWN_STATUSES.includes(normalized.status)) {
             throw Boom.badRequest(
-                `Invalid status '${
-                    normalized.status
-                }'. Expected one of: ${KNOWN_STATUSES.join(', ')}`
+                `Invalid status '${normalized.status}'. Expected one of: ${KNOWN_STATUSES.join(
+                    ', '
+                )}`
             );
         }
         return normalized;

package/application/commands/usage-commands.js

@@ -1,56 +0,0 @@
-// `frigg.usage.*` — the read/write surface over the durable usage store.
-const {
-    createUsageRepository,
-} = require('../../usage/repositories/usage-repository-factory');
-const { computeUsageWindows } = require('../../usage/usage-windows');
-const { resolveNorthStarEntry } = require('../../telemetry/north-star');
-
-function createUsageCommands({ usageRepository } = {}) {
-    const repository = usageRepository || createUsageRepository();
-
-    return {
-        // Increments both the day and hour window rows for `at`.
-        async recordUsageCounter({
-            integrationId,
-            integrationType,
-            metric,
-            value = 1,
-            at = new Date(),
-        }) {
-            const windows = computeUsageWindows(at);
-            for (const window of windows) {
-                await repository.increment({
-                    integrationId,
-                    integrationType,
-                    metric,
-                    window,
-                    value,
-                });
-            }
-        },
-
-        async getTotalsByDimension(args) {
-            return repository.getTotalsByDimension(args);
-        },
-
-        async getTimeSeries(args) {
-            return repository.getTimeSeries(args);
-        },
-
-        // Caller supplies the North Star config (Definition.telemetry.northStar);
-        // resolves the counter for the type (byType > default), null if none.
-        async getNorthStarTotals({ northStar, integrationType, since, groupBy = 'integrationType', bucket } = {}) {
-            const entry = resolveNorthStarEntry(northStar, integrationType);
-            if (!entry) return null;
-            const totals = await repository.getTotalsByDimension({
-                metric: entry.name,
-                groupBy,
-                since,
-                bucket,
-            });
-            return { metric: entry.name, totals };
-        },
-    };
-}
-
-module.exports = { createUsageCommands };

package/prisma-postgresql/migrations/20260705000000_create_usage_counter/migration.sql

@@ -1,26 +0,0 @@
--- CreateTable
--- Durable usage counters, isolated from the user/integration-scoped tables (no
--- userId, no FK to Integration) so usage history survives integration deletion
--- and can never surface in a user-scoped query. "window" is quoted throughout —
--- it is a reserved SQL keyword.
-CREATE TABLE "UsageCounter" (
-    "id" SERIAL NOT NULL,
-    "integrationId" TEXT NOT NULL,
-    "integrationType" TEXT NOT NULL,
-    "metric" TEXT NOT NULL,
-    "window" TEXT NOT NULL,
-    "value" BIGINT NOT NULL DEFAULT 0,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "UsageCounter_pkey" PRIMARY KEY ("id")
-);
-
--- CreateIndex
-CREATE UNIQUE INDEX "UsageCounter_integrationId_integrationType_metric_window_key" ON "UsageCounter"("integrationId", "integrationType", "metric", "window");
-
--- CreateIndex
-CREATE INDEX "UsageCounter_metric_window_idx" ON "UsageCounter"("metric", "window");
-
--- CreateIndex
-CREATE INDEX "UsageCounter_metric_integrationType_window_idx" ON "UsageCounter"("metric", "integrationType", "window");