fix: restore cloudwatch/cloudformation files from staging

These files were accidentally regressed during rebase conflict resolution,
reverting changes from #4027. Restoring to staging versions.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: waleedlatif1

apps/docs/content/docs/en/tools/cloudwatch.mdx

@@ -11,20 +11,20 @@ import { BlockInfoCard } from "@/components/ui/block-info-card"
 />
 
 {/* MANUAL-CONTENT-START:intro */}
-[Amazon CloudWatch](https://aws.amazon.com/cloudwatch/) is a monitoring and observability service that collects and tracks metrics, collects and monitors log files, and sets alarms for your AWS resources. CloudWatch provides a unified view of operational health across your AWS infrastructure and applications.
+[AWS CloudWatch](https://aws.amazon.com/cloudwatch/) is a monitoring and observability service that provides data and actionable insights for AWS resources, applications, and services. CloudWatch collects monitoring and operational data in the form of logs, metrics, and events, giving you a unified view of your AWS environment.
 
 With the CloudWatch integration, you can:
 
-- **Query Logs (Insights)**: Run powerful CloudWatch Log Insights queries across one or more log groups to search, analyze, and visualize your log data
-- **Describe Log Groups**: List available log groups in your account with metadata like stored bytes, retention settings, and creation time
-- **Get Log Events**: Retrieve individual log events from a specific log stream with optional time range filtering
-- **Describe Log Streams**: List log streams within a log group, sorted by last event time or filtered by name prefix
-- **List Metrics**: Browse available CloudWatch metrics, filtered by namespace or metric name, with support for recently active metrics
-- **Get Metric Statistics**: Retrieve statistical data (average, sum, min, max, sample count) for a metric over a specified time range and period
-- **Publish Metric**: Publish custom metric data points to CloudWatch with optional units and dimensions
-- **Describe Alarms**: List and filter CloudWatch alarms by name prefix, state (OK, ALARM, INSUFFICIENT_DATA), or type (Metric, Composite)
+- **Query Logs (Insights)**: Run CloudWatch Log Insights queries against one or more log groups to analyze log data with a powerful query language
+- **Describe Log Groups**: List available CloudWatch log groups in your account, optionally filtered by name prefix
+- **Get Log Events**: Retrieve log events from a specific log stream within a log group
+- **Describe Log Streams**: List log streams within a log group, ordered by last event time or filtered by name prefix
+- **List Metrics**: Browse available CloudWatch metrics, optionally filtered by namespace, metric name, or recent activity
+- **Get Metric Statistics**: Retrieve statistical data for a metric over a specified time range with configurable granularity
+- **Publish Metric**: Publish custom metric data points to CloudWatch for your own application monitoring
+- **Describe Alarms**: List and filter CloudWatch alarms by name prefix, state, or alarm type
 
-In Sim, the CloudWatch integration enables your agents to monitor application health, analyze logs for errors, track custom business metrics, and respond to alarm states as part of automated observability and incident response workflows. This pairs well with CloudFormation for infrastructure monitoring and SNS for alerting.
+In Sim, the CloudWatch integration enables your agents to monitor AWS infrastructure, analyze application logs, track custom metrics, and respond to alarm states as part of automated DevOps and SRE workflows. This is especially powerful when combined with other AWS integrations like CloudFormation and SNS for end-to-end infrastructure management.
 {/* MANUAL-CONTENT-END */}
 
 

apps/sim/blocks/blocks/cloudwatch.ts

@@ -27,9 +27,9 @@ export const CloudWatchBlock: BlockConfig<
   description: 'Query and monitor AWS CloudWatch logs, metrics, and alarms',
   longDescription:
     'Integrate AWS CloudWatch into workflows. Run Log Insights queries, list log groups, retrieve log events, list and get metrics, and monitor alarms. Requires AWS access key and secret access key.',
-  docsLink: 'https://docs.sim.ai/tools/cloudwatch',
   category: 'tools',
   integrationType: IntegrationType.Analytics,
+  docsLink: 'https://docs.sim.ai/tools/cloudwatch',
   tags: ['cloud', 'monitoring'],
   bgColor: 'linear-gradient(45deg, #B0084D 0%, #FF4F8B 100%)',
   icon: CloudWatchIcon,
@@ -73,7 +73,6 @@ export const CloudWatchBlock: BlockConfig<
       password: true,
       required: true,
     },
-    // Query Logs fields
     {
       id: 'logGroupSelector',
       title: 'Log Group',
@@ -130,9 +129,10 @@ Return ONLY the query — no explanations, no markdown code blocks.`,
       required: { field: 'operation', value: ['query_logs', 'get_metric_statistics'] },
       wandConfig: {
         enabled: true,
-        prompt:
-          'Generate a Unix epoch timestamp in seconds for the described start time. Return ONLY the numeric timestamp - no explanations, no extra text.',
-        placeholder: 'Describe the start time (e.g., "1 hour ago", "start of today")...',
+        prompt: `Generate a Unix epoch timestamp (in seconds) based on the user's description of a point in time.
+
+Return ONLY the numeric timestamp - no explanations, no quotes, no extra text.`,
+        placeholder: 'Describe the start time (e.g., "1 hour ago", "beginning of today")...',
         generationType: 'timestamp',
       },
     },
@@ -148,21 +148,20 @@ Return ONLY the query — no explanations, no markdown code blocks.`,
       required: { field: 'operation', value: ['query_logs', 'get_metric_statistics'] },
       wandConfig: {
         enabled: true,
-        prompt:
-          'Generate a Unix epoch timestamp in seconds for the described end time. Return ONLY the numeric timestamp - no explanations, no extra text.',
-        placeholder: 'Describe the end time (e.g., "now", "end of today")...',
+        prompt: `Generate a Unix epoch timestamp (in seconds) based on the user's description of a point in time.
+
+Return ONLY the numeric timestamp - no explanations, no quotes, no extra text.`,
+        placeholder: 'Describe the end time (e.g., "now", "end of yesterday")...',
         generationType: 'timestamp',
       },
     },
-    // Describe Log Groups fields
     {
       id: 'prefix',
       title: 'Log Group Name Prefix',
       type: 'short-input',
       placeholder: '/aws/lambda/',
       condition: { field: 'operation', value: 'describe_log_groups' },
     },
-    // Get Log Events / Describe Log Streams — shared log group selector
     {
       id: 'logGroupNameSelector',
       title: 'Log Group',
@@ -185,15 +184,13 @@ Return ONLY the query — no explanations, no markdown code blocks.`,
       required: { field: 'operation', value: ['get_log_events', 'describe_log_streams'] },
       mode: 'advanced',
     },
-    // Describe Log Streams — stream prefix filter
     {
       id: 'streamPrefix',
       title: 'Stream Name Prefix',
       type: 'short-input',
       placeholder: '2024/03/31/',
       condition: { field: 'operation', value: 'describe_log_streams' },
     },
-    // Get Log Events — log stream selector (cascading: depends on log group)
     {
       id: 'logStreamNameSelector',
       title: 'Log Stream',
@@ -216,7 +213,6 @@ Return ONLY the query — no explanations, no markdown code blocks.`,
       required: { field: 'operation', value: 'get_log_events' },
       mode: 'advanced',
     },
-    // List Metrics fields
     {
       id: 'metricNamespace',
       title: 'Namespace',
@@ -252,7 +248,6 @@ Return ONLY the query — no explanations, no markdown code blocks.`,
       condition: { field: 'operation', value: 'list_metrics' },
       mode: 'advanced',
     },
-    // Publish Metric fields
     {
       id: 'metricValue',
       title: 'Value',
@@ -276,8 +271,22 @@ Return ONLY the query — no explanations, no markdown code blocks.`,
         { label: 'Kilobytes', id: 'Kilobytes' },
         { label: 'Megabytes', id: 'Megabytes' },
         { label: 'Gigabytes', id: 'Gigabytes' },
+        { label: 'Terabytes', id: 'Terabytes' },
         { label: 'Bits', id: 'Bits' },
+        { label: 'Kilobits', id: 'Kilobits' },
+        { label: 'Megabits', id: 'Megabits' },
+        { label: 'Gigabits', id: 'Gigabits' },
+        { label: 'Terabits', id: 'Terabits' },
         { label: 'Bytes/Second', id: 'Bytes/Second' },
+        { label: 'Kilobytes/Second', id: 'Kilobytes/Second' },
+        { label: 'Megabytes/Second', id: 'Megabytes/Second' },
+        { label: 'Gigabytes/Second', id: 'Gigabytes/Second' },
+        { label: 'Terabytes/Second', id: 'Terabytes/Second' },
+        { label: 'Bits/Second', id: 'Bits/Second' },
+        { label: 'Kilobits/Second', id: 'Kilobits/Second' },
+        { label: 'Megabits/Second', id: 'Megabits/Second' },
+        { label: 'Gigabits/Second', id: 'Gigabits/Second' },
+        { label: 'Terabits/Second', id: 'Terabits/Second' },
         { label: 'Count/Second', id: 'Count/Second' },
       ],
       value: () => 'None',
@@ -290,7 +299,6 @@ Return ONLY the query — no explanations, no markdown code blocks.`,
       columns: ['name', 'value'],
       condition: { field: 'operation', value: 'put_metric_data' },
     },
-    // Get Metric Statistics fields
     {
       id: 'metricPeriod',
       title: 'Period (seconds)',
@@ -320,7 +328,6 @@ Return ONLY the query — no explanations, no markdown code blocks.`,
       columns: ['name', 'value'],
       condition: { field: 'operation', value: 'get_metric_statistics' },
     },
-    // Describe Alarms fields
     {
       id: 'alarmNamePrefix',
       title: 'Alarm Name Prefix',
@@ -353,7 +360,6 @@ Return ONLY the query — no explanations, no markdown code blocks.`,
       value: () => '',
       condition: { field: 'operation', value: 'describe_alarms' },
     },
-    // Shared limit field
     {
       id: 'limit',
       title: 'Limit',
@@ -564,14 +570,18 @@ Return ONLY the query — no explanations, no markdown code blocks.`,
             if (rest.metricValue === undefined || rest.metricValue === '') {
               throw new Error('Metric value is required')
             }
+            const numericValue = Number(rest.metricValue)
+            if (!Number.isFinite(numericValue)) {
+              throw new Error('Metric value must be a finite number')
+            }
 
             return {
               awsRegion,
               awsAccessKeyId,
               awsSecretAccessKey,
               namespace: rest.metricNamespace,
               metricName: rest.metricName,
-              value: Number(rest.metricValue),
+              value: numericValue,
               ...(rest.metricUnit && rest.metricUnit !== 'None' && { unit: rest.metricUnit }),
               ...(rest.publishDimensions && {
                 dimensions: (() => {
@@ -686,6 +696,26 @@ Return ONLY the query — no explanations, no markdown code blocks.`,
       type: 'array',
       description: 'CloudWatch alarms with state and configuration',
     },
+    success: {
+      type: 'boolean',
+      description: 'Whether the published metric was successful',
+    },
+    namespace: {
+      type: 'string',
+      description: 'Metric namespace',
+    },
+    metricName: {
+      type: 'string',
+      description: 'Metric name',
+    },
+    value: {
+      type: 'number',
+      description: 'Published metric value',
+    },
+    unit: {
+      type: 'string',
+      description: 'Metric unit',
+    },
     timestamp: {
       type: 'string',
       description: 'Timestamp when metric was published',

apps/sim/tools/cloudformation/index.ts

@@ -8,8 +8,6 @@ import { getTemplateTool } from '@/tools/cloudformation/get_template'
 import { listStackResourcesTool } from '@/tools/cloudformation/list_stack_resources'
 import { validateTemplateTool } from '@/tools/cloudformation/validate_template'
 
-export * from './types'
-
 export const cloudformationDescribeStacksTool = describeStacksTool
 export const cloudformationListStackResourcesTool = listStackResourcesTool
 export const cloudformationDetectStackDriftTool = detectStackDriftTool

apps/sim/tools/cloudwatch/index.ts

@@ -17,5 +17,3 @@ export const cloudwatchGetMetricStatisticsTool = getMetricStatisticsTool
 export const cloudwatchListMetricsTool = listMetricsTool
 export const cloudwatchPutMetricDataTool = putMetricDataTool
 export const cloudwatchQueryLogsTool = queryLogsTool
-
-export * from './types'

apps/sim/tools/registry.ts

@@ -163,6 +163,16 @@ import {
   ashbySearchCandidatesTool,
   ashbyUpdateCandidateTool,
 } from '@/tools/ashby'
+import {
+  athenaCreateNamedQueryTool,
+  athenaGetNamedQueryTool,
+  athenaGetQueryExecutionTool,
+  athenaGetQueryResultsTool,
+  athenaListNamedQueriesTool,
+  athenaListQueryExecutionsTool,
+  athenaStartQueryTool,
+  athenaStopQueryTool,
+} from '@/tools/athena'
 import {
   attioAssertRecordTool,
   attioCreateCommentTool,
@@ -356,6 +366,11 @@ import {
   confluenceUpdateTool,
   confluenceUploadAttachmentTool,
 } from '@/tools/confluence'
+import {
+  crowdstrikeGetSensorAggregatesTool,
+  crowdstrikeGetSensorDetailsTool,
+  crowdstrikeQuerySensorsTool,
+} from '@/tools/crowdstrike'
 import {
   cursorAddFollowupTool,
   cursorAddFollowupV2Tool,
@@ -376,6 +391,22 @@ import {
   cursorStopAgentTool,
   cursorStopAgentV2Tool,
 } from '@/tools/cursor'
+import {
+  dagsterDeleteRunTool,
+  dagsterGetRunLogsTool,
+  dagsterGetRunTool,
+  dagsterLaunchRunTool,
+  dagsterListJobsTool,
+  dagsterListRunsTool,
+  dagsterListSchedulesTool,
+  dagsterListSensorsTool,
+  dagsterReexecuteRunTool,
+  dagsterStartScheduleTool,
+  dagsterStartSensorTool,
+  dagsterStopScheduleTool,
+  dagsterStopSensorTool,
+  dagsterTerminateRunTool,
+} from '@/tools/dagster'
 import {
   databricksCancelRunTool,
   databricksExecuteSqlTool,
@@ -1280,6 +1311,9 @@ import {
   jsmGetApprovalsTool,
   jsmGetCommentsTool,
   jsmGetCustomersTool,
+  jsmGetFormStructureTool,
+  jsmGetFormTemplatesTool,
+  jsmGetIssueFormsTool,
   jsmGetOrganizationsTool,
   jsmGetParticipantsTool,
   jsmGetQueuesTool,
@@ -2212,6 +2246,12 @@ import {
   similarwebVisitDurationTool,
   similarwebWebsiteOverviewTool,
 } from '@/tools/similarweb'
+import {
+  sixtyfourEnrichCompanyTool,
+  sixtyfourEnrichLeadTool,
+  sixtyfourFindEmailTool,
+  sixtyfourFindPhoneTool,
+} from '@/tools/sixtyfour'
 import {
   slackAddReactionTool,
   slackCanvasTool,
@@ -2835,6 +2875,14 @@ export const tools: Record<string, ToolConfig> = {
   ashby_remove_candidate_tag: ashbyRemoveCandidateTagTool,
   ashby_search_candidates: ashbySearchCandidatesTool,
   ashby_update_candidate: ashbyUpdateCandidateTool,
+  athena_create_named_query: athenaCreateNamedQueryTool,
+  athena_get_named_query: athenaGetNamedQueryTool,
+  athena_get_query_execution: athenaGetQueryExecutionTool,
+  athena_get_query_results: athenaGetQueryResultsTool,
+  athena_list_named_queries: athenaListNamedQueriesTool,
+  athena_list_query_executions: athenaListQueryExecutionsTool,
+  athena_start_query: athenaStartQueryTool,
+  athena_stop_query: athenaStopQueryTool,
   brandfetch_get_brand: brandfetchGetBrandTool,
   brandfetch_search: brandfetchSearchTool,
   box_copy_file: boxCopyFileTool,
@@ -3079,6 +3127,9 @@ export const tools: Record<string, ToolConfig> = {
   jsm_add_participants: jsmAddParticipantsTool,
   jsm_get_approvals: jsmGetApprovalsTool,
   jsm_answer_approval: jsmAnswerApprovalTool,
+  jsm_get_form_templates: jsmGetFormTemplatesTool,
+  jsm_get_form_structure: jsmGetFormStructureTool,
+  jsm_get_issue_forms: jsmGetIssueFormsTool,
   kalshi_get_markets: kalshiGetMarketsTool,
   kalshi_get_markets_v2: kalshiGetMarketsV2Tool,
   kalshi_get_market: kalshiGetMarketTool,
@@ -3172,6 +3223,10 @@ export const tools: Record<string, ToolConfig> = {
   servicenow_read_record: servicenowReadRecordTool,
   servicenow_update_record: servicenowUpdateRecordTool,
   servicenow_delete_record: servicenowDeleteRecordTool,
+  sixtyfour_find_phone: sixtyfourFindPhoneTool,
+  sixtyfour_find_email: sixtyfourFindEmailTool,
+  sixtyfour_enrich_lead: sixtyfourEnrichLeadTool,
+  sixtyfour_enrich_company: sixtyfourEnrichCompanyTool,
   tavily_search: tavilySearchTool,
   tavily_extract: tavilyExtractTool,
   tavily_crawl: tavilyCrawlTool,
@@ -3441,6 +3496,9 @@ export const tools: Record<string, ToolConfig> = {
   cloudwatch_list_metrics: cloudwatchListMetricsTool,
   cloudwatch_put_metric_data: cloudwatchPutMetricDataTool,
   cloudwatch_query_logs: cloudwatchQueryLogsTool,
+  crowdstrike_get_sensor_aggregates: crowdstrikeGetSensorAggregatesTool,
+  crowdstrike_get_sensor_details: crowdstrikeGetSensorDetailsTool,
+  crowdstrike_query_sensors: crowdstrikeQuerySensorsTool,
   dynamodb_get: dynamodbGetTool,
   dynamodb_put: dynamodbPutTool,
   dynamodb_query: dynamodbQueryTool,
@@ -3462,6 +3520,20 @@ export const tools: Record<string, ToolConfig> = {
   devin_get_session: devinGetSessionTool,
   devin_list_sessions: devinListSessionsTool,
   devin_send_message: devinSendMessageTool,
+  dagster_delete_run: dagsterDeleteRunTool,
+  dagster_get_run: dagsterGetRunTool,
+  dagster_get_run_logs: dagsterGetRunLogsTool,
+  dagster_launch_run: dagsterLaunchRunTool,
+  dagster_list_jobs: dagsterListJobsTool,
+  dagster_list_runs: dagsterListRunsTool,
+  dagster_list_schedules: dagsterListSchedulesTool,
+  dagster_list_sensors: dagsterListSensorsTool,
+  dagster_reexecute_run: dagsterReexecuteRunTool,
+  dagster_start_schedule: dagsterStartScheduleTool,
+  dagster_start_sensor: dagsterStartSensorTool,
+  dagster_stop_schedule: dagsterStopScheduleTool,
+  dagster_stop_sensor: dagsterStopSensorTool,
+  dagster_terminate_run: dagsterTerminateRunTool,
   databricks_cancel_run: databricksCancelRunTool,
   databricks_execute_sql: databricksExecuteSqlTool,
   databricks_get_run: databricksGetRunTool,