[pull] master from botpress:master

integrations/attio/package.json

@@ -13,8 +13,6 @@
   },
   "devDependencies": {
     "@botpress/cli": "workspace:*",
-    "@botpress/sdk": "workspace:*",
-    "@types/node": "^22.16.4",
-    "typescript": "^5.6.3"
+    "@botpress/sdk": "workspace:*"
   }
 }

integrations/bamboohr/package.json

@@ -18,8 +18,6 @@
     "@botpress/common": "workspace:*",
     "@botpress/sdk": "workspace:*",
     "@types/jsonwebtoken": "^9.0.3",
-    "@types/lodash": "^4.14.191",
-    "@types/node": "^22.16.4",
-    "typescript": "^5.6.3"
+    "@types/lodash": "^4.14.191"
   }
 }

integrations/feature-base/package.json

@@ -14,8 +14,6 @@
   },
   "devDependencies": {
     "@botpress/cli": "workspace:*",
-    "@botpress/sdk": "workspace:*",
-    "@types/node": "^22.16.4",
-    "typescript": "^5.6.3"
+    "@botpress/sdk": "workspace:*"
   }
 }

integrations/grafana/definitions/dashboard-schemas.ts

@@ -1,5 +1,4 @@
 import { z } from '@botpress/sdk'
-import type { TextPanel, TimeSeriesPanel } from '../src/gen/types/GrafanaDashboard'
 
 export const gridPosSchema = z.object({
   h: z.number().optional().title('Height').describe('Panel height in grid units'),
@@ -20,7 +19,7 @@ export const textPanelSchema = z.object({
     .describe('Rendering mode for the content'),
   id: z.number().optional().title('ID').describe('Numeric panel ID (assigned by Grafana)'),
   gridPos: gridPosSchema.optional().title('Grid Position').describe('Position and size of the panel in the grid'),
-}) satisfies z.ZodType<Partial<TextPanel>>
+})
 
 export const datasourceSchema = z.object({
   type: z.string().title('Type').describe('Datasource type (e.g. "prometheus")'),
@@ -47,7 +46,7 @@ export const timeSeriesPanelSchema = z.object({
     .describe('Query targets for this panel'),
   fieldConfig: z.any().optional().title('Field Config').describe('Field display configuration'),
   options: z.any().optional().title('Options').describe('Panel display options'),
-}) satisfies z.ZodType<Partial<TimeSeriesPanel>>
+})
 
 export const panelSchema = z.discriminatedUnion('type', [textPanelSchema, timeSeriesPanelSchema])
 

integrations/grafana/src/gen/specs/README.md → integrations/grafana/grafana-api/README.md

@@ -23,6 +23,7 @@ Grafana's Kubernetes-style API (`/apis/...`). These must be fetched from a live
     "https://your-stack.grafana.net/openapi/v3" | python3 -m json.tool | grep "grafana.app"
   ```
 - **Re-fetch**:
+
   ```sh
   TOKEN="your-grafana-service-account-token"
   BASE="https://your-stack.grafana.net"

integrations/grafana/package.json

@@ -5,8 +5,8 @@
     "check:type": "tsc --noEmit",
     "check:bplint": "bp lint",
     "test": "vitest --run",
-    "generate:k8s": "openapi-ts -i ./src/gen/specs/grafana-dashboard-k8s.json ./src/gen/specs/grafana-folder-k8s.json -o ./src/gen/grafana-k8s-client -c @hey-api/client-fetch",
-    "generate:legacy": "openapi-ts -i ./src/gen/specs/grafana-legacy.json -o ./src/gen/grafana-legacy-client -c @hey-api/client-fetch",
+    "generate:k8s": "openapi-ts -i ./grafana-api/grafana-dashboard-k8s.json ./grafana-api/grafana-folder-k8s.json -o ./src/gen/grafana-k8s-client -c @hey-api/client-fetch",
+    "generate:legacy": "openapi-ts -i ./grafana-api/grafana-legacy.json -o ./src/gen/grafana-legacy-client -c @hey-api/client-fetch",
     "generate": "pnpm run generate:k8s && pnpm run generate:legacy"
   },
   "private": true,
@@ -16,8 +16,6 @@
   "devDependencies": {
     "@botpress/cli": "workspace:*",
     "@hey-api/client-fetch": "^0.13.1",
-    "@hey-api/openapi-ts": "^0.97.1",
-    "@types/node": "^22.16.4",
-    "typescript": "^5.6.3"
+    "@hey-api/openapi-ts": "^0.97.1"
   }
 }

integrations/grafana/src/client.ts

@@ -31,7 +31,6 @@ import {
   createClient as createLegacyClient,
   createConfig as createLegacyConfig,
 } from './gen/grafana-legacy-client/client'
-import type { Panel } from './gen/types/GrafanaDashboard'
 
 export type GrafanaConfig = {
   grafanaUsername: string
@@ -43,6 +42,48 @@ type CreateFolderInput = z.infer<typeof createFolderSchema>
 type PolicyMatcher = z.infer<typeof matcherSchema>
 type NotificationPolicyInput = z.infer<typeof notificationPolicySchema>
 
+type Datasource = {
+  type: string
+  uid: string
+}
+
+type Target = {
+  refId: string
+  datasource?: Datasource
+  expr?: string
+}
+
+type GridPos = {
+  h?: number
+  w?: number
+  x?: number
+  y?: number
+}
+
+type TextPanel = {
+  type: 'text'
+  title: string
+  description?: string
+  content?: string
+  mode?: 'markdown' | 'html' | 'code'
+  gridPos?: GridPos
+  id?: number
+}
+
+type TimeSeriesPanel = {
+  type: 'timeseries'
+  title: string
+  description?: string
+  datasource?: Datasource
+  gridPos?: GridPos
+  id?: number
+  targets?: Target[]
+  fieldConfig?: any
+  options?: any
+}
+
+type Panel = TextPanel | TimeSeriesPanel
+
 type CreateDashboardInput = {
   uid: string
   title: string