@griffin-app/griffin-cli 1.0.23 → 1.0.25

package/dist/commands/hub/integrations.d.ts

@@ -1,4 +1,4 @@
-import type { IntegrationCategory, Provider } from "@griffin-app/griffin-ts/types";
+import type { IntegrationCategory, Provider } from "@griffin-app/griffin-core/types";
 import type { IntegrationConfig, ProviderDefinition } from "@griffin-app/griffin-hub-sdk";
 export interface IntegrationsListOptions {
     category?: IntegrationCategory;

package/dist/core/apply.js

@@ -32,6 +32,7 @@ export async function applyDiff(diff, sdk, options) {
             }
         }
         catch (error) {
+            console.log(error);
             terminal.error(error.message);
             errors.push({
                 action,
@@ -77,12 +78,13 @@ async function applyUpdate(action, sdk, applied) {
     //const variables = await loadVariables(environment);
     //const resolvedMonitor = resolveMonitor(monitor, projectId, environment, variables);
     // Use the remote monitor's ID for the update
-    await sdk.putMonitorById({
+    const result = await sdk.putMonitorById({
         path: {
             id: action.remoteMonitor.id,
         },
         body: resolvedMonitor,
     });
+    console.log(JSON.stringify(result.data, null, 2));
     applied.push({
         type: "update",
         monitorName: action.remoteMonitor.name,

package/dist/core/diff.js

@@ -196,12 +196,7 @@ function formatFieldValue(value) {
         if ("every" in value && "unit" in value) {
             return `every ${value.every} ${value.unit.toLowerCase()}`;
         }
-        // For other objects, show a compact representation
-        const keys = Object.keys(value);
-        if (keys.length <= 2) {
-            return JSON.stringify(value);
-        }
-        return `{${keys.length} fields}`;
+        return JSON.stringify(value);
     }
     return String(value);
 }

package/dist/core/discovery.d.ts

@@ -1,5 +1,5 @@
 import "tsx";
-import type { MonitorDSL } from "@griffin-app/griffin-ts/types";
+import type { MonitorDSL } from "@griffin-app/griffin-core/types";
 export interface DiscoveredMonitor {
     monitor: MonitorDSL;
     filePath: string;

package/dist/core/discovery.js

@@ -2,7 +2,7 @@ import "tsx";
 import { glob } from "glob";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
-import { MonitorDSLSchema } from "@griffin-app/griffin-ts/schema";
+import { MonitorDSLSchema } from "@griffin-app/griffin-core/schema";
 import { Value } from "typebox/value";
 /**
  * Discover and load test monitor files from the filesystem

package/dist/core/monitor-diff.js

@@ -1,5 +1,5 @@
 import objectHash from "object-hash";
-import { NodeType } from "@griffin-app/griffin-ts/schema";
+import { NodeType } from "@griffin-app/griffin-core/schema";
 /**
  * Compare two test monitors and return granular changes.
  * Local monitor should be resolved (variables replaced with actual values).
@@ -214,6 +214,66 @@ function compareEdges(localEdges, remoteEdges) {
     }
     return changes;
 }
+/** Pattern for hub-assigned platform integration names (e.g. platform-email). */
+const PLATFORM_INTEGRATION_PREFIX = "platform-";
+/**
+ * Normalize notifications for diff: treat hub-assigned platform integration
+ * names (platform-${channelType}) as equivalent to missing integration so the
+ * DSL need not specify them.
+ */
+function normalizeNotificationsForDiff(notifications) {
+    if (!notifications || notifications.length === 0)
+        return undefined;
+    return notifications.map((n) => {
+        const integration = n.integration;
+        if (integration && integration.startsWith(PLATFORM_INTEGRATION_PREFIX)) {
+            const channelType = n.routing?.channelType;
+            const platformName = PLATFORM_INTEGRATION_PREFIX + (channelType ?? "");
+            if (integration === platformName) {
+                const copy = { ...n };
+                delete copy.integration;
+                return copy;
+            }
+        }
+        return n;
+    });
+}
+/** Sort key from trigger + routing only so matching entries line up when comparing. */
+function notificationSortKey(n) {
+    return objectHash({ trigger: n.trigger, routing: n.routing });
+}
+/**
+ * Sort notifications by (trigger, routing) so comparison is order-independent
+ * and matching entries align. Uses only trigger+routing so integration doesn't affect order.
+ */
+function sortNotificationsForDiff(notifications) {
+    if (!notifications || notifications.length === 0)
+        return undefined;
+    return [...notifications].sort((a, b) => {
+        const ka = notificationSortKey(a);
+        const kb = notificationSortKey(b);
+        return ka < kb ? -1 : ka > kb ? 1 : 0;
+    });
+}
+/**
+ * Semantic equality for notification arrays: same set of (trigger, routing), and
+ * when local omits integration we treat remote's integration as a match (hub may assign a name).
+ */
+function notificationsEqual(local, remote) {
+    if (!local && !remote)
+        return true;
+    if (!local || !remote || local.length !== remote.length)
+        return false;
+    for (let i = 0; i < local.length; i++) {
+        const a = local[i];
+        const b = remote[i];
+        if (!deepEqual(a.trigger, b.trigger) || !deepEqual(a.routing, b.routing))
+            return false;
+        if (a.integration !== undefined && a.integration !== b.integration)
+            return false;
+    }
+    return true;
+}
 /**
  * Compare top-level fields: frequency, version, locations
  */
@@ -247,14 +307,17 @@ function compareTopLevel(local, remote) {
             newValue: localLocations,
         });
     }
-    // Compare notifications (normalize empty array to undefined)
-    const localNotifications = local.notifications && local.notifications.length > 0
+    // Compare notifications (normalize empty array to undefined).
+    // Ignore hub-assigned platform integration names (platform-${channelType}) so they
+    // don't cause a diff when the DSL omits integration.
+    // Sort so order is irrelevant — the backend does not impose ordering.
+    const localNotifications = sortNotificationsForDiff(normalizeNotificationsForDiff(local.notifications && local.notifications.length > 0
         ? local.notifications
-        : undefined;
-    const remoteNotifications = remote.notifications && remote.notifications.length > 0
+        : undefined));
+    const remoteNotifications = sortNotificationsForDiff(normalizeNotificationsForDiff(remote.notifications && remote.notifications.length > 0
         ? remote.notifications
-        : undefined;
-    if (!deepEqual(localNotifications, remoteNotifications)) {
+        : undefined));
+    if (!notificationsEqual(localNotifications, remoteNotifications)) {
         changes.push({
             field: "notifications",
             oldValue: remoteNotifications,

package/dist/core/monitor-helpers.d.ts

@@ -1,6 +1,7 @@
 import type { GriffinHubSdk, MonitorV1 } from "@griffin-app/griffin-hub-sdk";
 import type { StateFile } from "../schemas/state.js";
 import { type DiscoveryResult } from "./discovery.js";
+import { MonitorDSL } from "@griffin-app/griffin-core/types";
 /**
  * Discover local monitors using state-configured patterns.
  * Shows spinner, handles errors, and returns the discovery result.
@@ -15,5 +16,5 @@ export declare function fetchRemoteMonitors(sdk: GriffinHubSdk, projectId: strin
  * Load variables and resolve local monitors for a given project and environment.
  */
 export declare function resolveLocalMonitors(monitors: {
-    monitor: import("@griffin-app/griffin-ts/types").MonitorDSL;
+    monitor: MonitorDSL;
 }[], projectId: string, envName: string): Promise<Omit<MonitorV1, "id">[]>;

package/dist/core/secrets.d.ts

@@ -2,7 +2,7 @@
  * Secrets configuration for CLI local runs.
  * Reads configuration from environment variables to construct a secret provider.
  */
-import { type SecretProvider, type SecretProviderConfig } from "@griffin-app/griffin-plan-executor";
+import { type SecretProvider, type SecretProviderConfig } from "@griffin-app/griffin-executor";
 /**
  * Read secrets provider configuration from environment variables.
  *

package/dist/core/secrets.js

@@ -2,7 +2,7 @@
  * Secrets configuration for CLI local runs.
  * Reads configuration from environment variables to construct a secret provider.
  */
-import { createSecretProvider, } from "@griffin-app/griffin-plan-executor";
+import { createSecretProvider, } from "@griffin-app/griffin-executor";
 /**
  * Environment variable prefixes for secrets configuration.
  */

package/dist/monitor-runner.d.ts

@@ -1,5 +1,5 @@
 import "tsx";
-import { ExecutionResult } from "@griffin-app/griffin-plan-executor";
+import { ExecutionResult } from "@griffin-app/griffin-executor";
 /**
  * Runs a TypeScript test file and executes the resulting JSON monitor.
  */

package/dist/monitor-runner.js

@@ -1,7 +1,7 @@
 import "tsx";
 import { Value } from "typebox/value";
-import { executeMonitorV1, AxiosAdapter, } from "@griffin-app/griffin-plan-executor";
-import { MonitorDSLSchema } from "@griffin-app/griffin-ts/schema";
+import { executeMonitorV1, AxiosAdapter, } from "@griffin-app/griffin-executor";
+import { MonitorDSLSchema } from "@griffin-app/griffin-core/schema";
 import { randomUUID } from "crypto";
 import { loadVariables } from "./core/variables.js";
 import { getProjectId } from "./core/state.js";

package/dist/resolve.d.ts

@@ -1,3 +1,3 @@
 import { MonitorV1 } from "@griffin-app/griffin-hub-sdk";
-import { MonitorDSL } from "@griffin-app/griffin-ts";
+import { MonitorDSL } from "@griffin-app/griffin-core";
 export declare function resolveMonitor(monitor: MonitorDSL, projectId: string, envName: string, variables: Record<string, string>): Omit<MonitorV1, "id">;

package/dist/resolve.js

@@ -1,4 +1,4 @@
-import { migrateToLatest, CURRENT_MONITOR_VERSION, } from "@griffin-app/griffin-ts";
+import { migrateToLatest, CURRENT_MONITOR_VERSION, } from "@griffin-app/griffin-core";
 import { resolveVariablesInMonitor } from "./core/variables.js";
 export function resolveMonitor(monitor, projectId, envName, variables) {
     // Migrate DSL monitor to latest version before resolving

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@griffin-app/griffin-cli",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "description": "CLI tool for running and managing griffin API tests",
   "type": "module",
   "main": "dist/index.js",
@@ -25,8 +25,8 @@
   "license": "MIT",
   "dependencies": {
     "@griffin-app/griffin-hub-sdk": "1.0.25",
-    "@griffin-app/griffin-plan-executor": "0.1.29",
-    "@griffin-app/griffin-ts": "0.1.27",
+    "@griffin-app/griffin-executor": "0.1.0",
+    "@griffin-app/griffin-core": "0.1.0",
     "better-auth": "^1.4.17",
     "cli-table3": "^0.6.5",
     "commander": "^12.1.0",