fix(elasticsearch): per-service Cloud ID ports, date math, and three declared-shape defects

Cloud ID: every component of a decoded Cloud ID may carry its own port, and the
ES UUID's port overrides the parent DN's. We used parts[1] raw, so a Cloud ID
of that form produced https://uuid:9244.host:9243 -- an invalid URL that fetch
rejects with no actionable message. Elastic's own beats fixtures pin all three
directions, including that Kibana's port never affects the ES origin.

get_index: the target accepts wildcards and comma-separated lists, returning
one key per resolved index. Keeping Object.keys(data)[0] silently discarded
every other index. Now also emits the full keyed map and a matched count, so
data_stream and lifecycle survive too.

index names: rejecting a slash broke Elastic's documented date-math form
<logstash-{now/d}>. An index name cannot contain a literal slash, so the
rejection protected nothing -- and an encoded slash is inert, because the URL
parser does not treat %2F as a separator, unlike %2e which it decodes and
removes. A local helper drops only the separator check; documentId stays on the
strict shared guard.

esTimeout: the unit coercion lived only in the block, and Copilot calls
executeAppTool without ever running tools.config.params -- so a model sending
"30" hit ES with a unitless duration and got a 400. Normalization now lives in
the tool and the block calls the same helper.

aggregations was declared as an output on both tool and block but no aggs param
exists, so it could never be populated. Removed, and the size:0 rationale
corrected -- it asks for hits.total without materializing documents, which is
not the aggregations idiom.

Author: waleedlatif1

apps/sim/blocks/blocks/elasticsearch.ts

@@ -2,7 +2,7 @@ import { ElasticsearchIcon } from '@/components/icons'
 import type { BlockConfig, BlockMeta } from '@/blocks/types'
 import { AuthMode, IntegrationType } from '@/blocks/types'
 import type { ElasticsearchResponse } from '@/tools/elasticsearch/types'
-import { optionalNumber } from '@/tools/elasticsearch/utils'
+import { normalizeEsDuration, optionalNumber } from '@/tools/elasticsearch/utils'
 
 export const ElasticsearchBlock: BlockConfig<ElasticsearchResponse> = {
   type: 'elasticsearch',
@@ -557,13 +557,16 @@ Return ONLY valid JSON - no explanations, no markdown code blocks.`,
         const retryOnConflict = optionalNumber(params.retryOnConflict, 'retryOnConflict')
         if (retryOnConflict !== undefined) result.retryOnConflict = retryOnConflict
 
-        const rawTimeout = typeof params.timeout === 'string' ? params.timeout.trim() : ''
-        if (rawTimeout) {
-          /**
-           * Only a bare number is given the implied `s` unit. A previous
-           * `endsWith('s')` test rewrote "1m" to "1ms" — one millisecond.
-           */
-          result.esTimeout = /^\d+$/.test(rawTimeout) ? `${rawTimeout}s` : rawTimeout
+        /**
+         * The unit coercion itself lives in `normalizeEsDuration` on the tool,
+         * not here: Copilot calls `executeAppTool` directly and never runs this
+         * mapping, so a normalization owned by the block would apply to one
+         * calling surface only. This call keeps the subBlock's raw value from
+         * being forwarded under a different name than the tool expects.
+         */
+        const esTimeout = normalizeEsDuration(params.timeout)
+        if (esTimeout) {
+          result.esTimeout = esTimeout
         }
 
         return result
@@ -607,7 +610,6 @@ Return ONLY valid JSON - no explanations, no markdown code blocks.`,
     hits: { type: 'json', description: 'Search results' },
     took: { type: 'number', description: 'Time taken in milliseconds' },
     timed_out: { type: 'boolean', description: 'Whether the operation timed out' },
-    aggregations: { type: 'json', description: 'Aggregation results' },
     // Document outputs
     _index: { type: 'string', description: 'Index name' },
     _id: { type: 'string', description: 'Document ID' },
@@ -616,12 +618,12 @@ Return ONLY valid JSON - no explanations, no markdown code blocks.`,
     result: {
       type: 'string',
       description:
-        'Operation result (created, updated, deleted, or noop). A missing document fails the call with a 404 error rather than returning "not_found".',
+        'Operation result (created, updated, deleted, or noop). On the single-document operations a missing document fails the call with a 404 rather than returning "not_found"; Bulk Operations instead reports a per-item "not_found" inside a successful response, under items.',
     },
     found: {
       type: 'boolean',
       description:
-        'Always true. A missing document fails the call with a 404 error rather than returning found: false.',
+        'Always true on Get Document — a missing document fails the call with a 404 rather than returning found: false.',
     },
     // Bulk outputs
     errors: { type: 'boolean', description: 'Whether any errors occurred' },
@@ -631,14 +633,22 @@ Return ONLY valid JSON - no explanations, no markdown code blocks.`,
     // Index outputs
     acknowledged: { type: 'boolean', description: 'Whether operation was acknowledged' },
     index: { type: 'string', description: 'Index name' },
+    matchedCount: {
+      type: 'number',
+      description: 'How many indices a Get Index target matched',
+    },
     aliases: { type: 'json', description: 'Aliases defined on the index' },
     mappings: { type: 'json', description: 'Field mappings for the index' },
     settings: { type: 'json', description: 'Index settings' },
     // Cluster outputs
     cluster_name: { type: 'string', description: 'Cluster name' },
     status: { type: 'string', description: 'Cluster health status' },
     number_of_nodes: { type: 'number', description: 'Number of nodes' },
-    indices: { type: 'json', description: 'Index statistics' },
+    indices: {
+      type: 'json',
+      description:
+        'Every index the operation returned: the array of index rows from List Indices, the per-index map from Get Index (each entry carrying its aliases, mappings, settings, and any data_stream or lifecycle), or the cluster index statistics from Cluster Stats.',
+    },
     nodes: { type: 'json', description: 'Node statistics' },
   },
 }

apps/sim/tools/elasticsearch/block-params.test.ts

@@ -83,3 +83,22 @@ describe('elasticsearch block outputs', () => {
     }
   })
 })
+
+describe('elasticsearch block declares no unreachable aggregations', () => {
+  it('does not advertise an aggregations output, since no subBlock or input feeds one', () => {
+    expect(ElasticsearchBlock.outputs).not.toHaveProperty('aggregations')
+    expect(ElasticsearchBlock.inputs).not.toHaveProperty('aggs')
+    expect(ElasticsearchBlock.subBlocks.some((b) => b.id === 'aggs')).toBe(false)
+  })
+
+  it('declares the get_index multi-target outputs so a wildcard result is reachable', () => {
+    expect(ElasticsearchBlock.outputs.matchedCount?.type).toBe('number')
+    expect(ElasticsearchBlock.outputs.indices?.type).toBe('json')
+  })
+
+  it('still maps a bare timeout to seconds via the shared tool-side normalizer', () => {
+    expect(transform({ timeout: '30' }).esTimeout).toBe('30s')
+    expect(transform({ timeout: '1m' }).esTimeout).toBe('1m')
+    expect(transform({ timeout: '45s' }).esTimeout).toBe('45s')
+  })
+})

apps/sim/tools/elasticsearch/bulk.ts

@@ -2,9 +2,8 @@ import type {
   ElasticsearchBulkParams,
   ElasticsearchBulkResponse,
 } from '@/tools/elasticsearch/types'
-import { buildAuthHeaders, buildBaseUrl } from '@/tools/elasticsearch/utils'
+import { buildAuthHeaders, buildBaseUrl, safeIndexPathSegment } from '@/tools/elasticsearch/utils'
 import type { ToolConfig } from '@/tools/types'
-import { safeUrlPathSegment } from '@/tools/url-path'
 
 export const bulkTool: ToolConfig<ElasticsearchBulkParams, ElasticsearchBulkResponse> = {
   id: 'elasticsearch_bulk',
@@ -78,7 +77,7 @@ export const bulkTool: ToolConfig<ElasticsearchBulkParams, ElasticsearchBulkResp
     url: (params) => {
       const baseUrl = buildBaseUrl(params)
       let url = params.index
-        ? `${baseUrl}/${safeUrlPathSegment(params.index, 'index')}/_bulk`
+        ? `${baseUrl}/${safeIndexPathSegment(params.index, 'index')}/_bulk`
         : `${baseUrl}/_bulk`
 
       if (params.refresh) {

apps/sim/tools/elasticsearch/cluster_health.ts

@@ -2,7 +2,7 @@ import type {
   ElasticsearchClusterHealthParams,
   ElasticsearchClusterHealthResponse,
 } from '@/tools/elasticsearch/types'
-import { buildAuthHeaders, buildBaseUrl } from '@/tools/elasticsearch/utils'
+import { buildAuthHeaders, buildBaseUrl, normalizeEsDuration } from '@/tools/elasticsearch/utils'
 import type { ToolConfig } from '@/tools/types'
 
 export const clusterHealthTool: ToolConfig<
@@ -63,8 +63,9 @@ export const clusterHealthTool: ToolConfig<
     esTimeout: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description:
-        'Elasticsearch wait timeout as a duration string (e.g., 30s, 1m). Named esTimeout because the executor reserves "timeout" for the transport deadline in milliseconds.',
+        'Elasticsearch wait timeout as a duration string (e.g., 30s, 1m). A bare number is read as seconds. Named esTimeout because the executor reserves "timeout" for the transport deadline in milliseconds.',
     },
   },
 
@@ -77,8 +78,9 @@ export const clusterHealthTool: ToolConfig<
       if (params.waitForStatus) {
         queryParams.push(`wait_for_status=${encodeURIComponent(params.waitForStatus)}`)
       }
-      if (params.esTimeout) {
-        queryParams.push(`timeout=${encodeURIComponent(params.esTimeout)}`)
+      const esTimeout = normalizeEsDuration(params.esTimeout)
+      if (esTimeout) {
+        queryParams.push(`timeout=${encodeURIComponent(esTimeout)}`)
       }
       if (queryParams.length > 0) {
         url += `?${queryParams.join('&')}`

apps/sim/tools/elasticsearch/count.ts

@@ -2,9 +2,8 @@ import type {
   ElasticsearchCountParams,
   ElasticsearchCountResponse,
 } from '@/tools/elasticsearch/types'
-import { buildAuthHeaders, buildBaseUrl } from '@/tools/elasticsearch/utils'
+import { buildAuthHeaders, buildBaseUrl, safeIndexPathSegment } from '@/tools/elasticsearch/utils'
 import type { ToolConfig } from '@/tools/types'
-import { safeUrlPathSegment } from '@/tools/url-path'
 
 export const countTool: ToolConfig<ElasticsearchCountParams, ElasticsearchCountResponse> = {
   id: 'elasticsearch_count',
@@ -71,7 +70,7 @@ export const countTool: ToolConfig<ElasticsearchCountParams, ElasticsearchCountR
   request: {
     url: (params) => {
       const baseUrl = buildBaseUrl(params)
-      return `${baseUrl}/${safeUrlPathSegment(params.index, 'index')}/_count`
+      return `${baseUrl}/${safeIndexPathSegment(params.index, 'index')}/_count`
     },
     method: 'POST',
     headers: (params) => buildAuthHeaders(params),

apps/sim/tools/elasticsearch/create_index.ts

@@ -2,9 +2,8 @@ import type {
   ElasticsearchCreateIndexParams,
   ElasticsearchIndexResponse,
 } from '@/tools/elasticsearch/types'
-import { buildAuthHeaders, buildBaseUrl } from '@/tools/elasticsearch/utils'
+import { buildAuthHeaders, buildBaseUrl, safeIndexPathSegment } from '@/tools/elasticsearch/utils'
 import type { ToolConfig } from '@/tools/types'
-import { safeUrlPathSegment } from '@/tools/url-path'
 
 export const createIndexTool: ToolConfig<
   ElasticsearchCreateIndexParams,
@@ -77,7 +76,7 @@ export const createIndexTool: ToolConfig<
   request: {
     url: (params) => {
       const baseUrl = buildBaseUrl(params)
-      return `${baseUrl}/${safeUrlPathSegment(params.index, 'index')}`
+      return `${baseUrl}/${safeIndexPathSegment(params.index, 'index')}`
     },
     method: 'PUT',
     headers: (params) => buildAuthHeaders(params),

apps/sim/tools/elasticsearch/delete_document.ts

@@ -2,7 +2,7 @@ import type {
   ElasticsearchDeleteDocumentParams,
   ElasticsearchDocumentResponse,
 } from '@/tools/elasticsearch/types'
-import { buildAuthHeaders, buildBaseUrl } from '@/tools/elasticsearch/utils'
+import { buildAuthHeaders, buildBaseUrl, safeIndexPathSegment } from '@/tools/elasticsearch/utils'
 import type { ToolConfig } from '@/tools/types'
 import { safeUrlPathSegment } from '@/tools/url-path'
 
@@ -78,7 +78,7 @@ export const deleteDocumentTool: ToolConfig<
   request: {
     url: (params) => {
       const baseUrl = buildBaseUrl(params)
-      let url = `${baseUrl}/${safeUrlPathSegment(params.index, 'index')}/_doc/${safeUrlPathSegment(params.documentId, 'documentId')}`
+      let url = `${baseUrl}/${safeIndexPathSegment(params.index, 'index')}/_doc/${safeUrlPathSegment(params.documentId, 'documentId')}`
 
       if (params.refresh) {
         url += `?refresh=${encodeURIComponent(params.refresh)}`

apps/sim/tools/elasticsearch/delete_index.ts

@@ -2,9 +2,8 @@ import type {
   ElasticsearchDeleteIndexParams,
   ElasticsearchIndexResponse,
 } from '@/tools/elasticsearch/types'
-import { buildAuthHeaders, buildBaseUrl } from '@/tools/elasticsearch/utils'
+import { buildAuthHeaders, buildBaseUrl, safeIndexPathSegment } from '@/tools/elasticsearch/utils'
 import type { ToolConfig } from '@/tools/types'
-import { safeUrlPathSegment } from '@/tools/url-path'
 
 export const deleteIndexTool: ToolConfig<
   ElasticsearchDeleteIndexParams,
@@ -67,7 +66,7 @@ export const deleteIndexTool: ToolConfig<
   request: {
     url: (params) => {
       const baseUrl = buildBaseUrl(params)
-      return `${baseUrl}/${safeUrlPathSegment(params.index, 'index')}`
+      return `${baseUrl}/${safeIndexPathSegment(params.index, 'index')}`
     },
     method: 'DELETE',
     headers: (params) => buildAuthHeaders(params),

apps/sim/tools/elasticsearch/get_document.ts

@@ -2,7 +2,7 @@ import type {
   ElasticsearchDocumentResponse,
   ElasticsearchGetDocumentParams,
 } from '@/tools/elasticsearch/types'
-import { buildAuthHeaders, buildBaseUrl } from '@/tools/elasticsearch/utils'
+import { buildAuthHeaders, buildBaseUrl, safeIndexPathSegment } from '@/tools/elasticsearch/utils'
 import type { ToolConfig } from '@/tools/types'
 import { safeUrlPathSegment } from '@/tools/url-path'
 
@@ -83,7 +83,7 @@ export const getDocumentTool: ToolConfig<
   request: {
     url: (params) => {
       const baseUrl = buildBaseUrl(params)
-      let url = `${baseUrl}/${safeUrlPathSegment(params.index, 'index')}/_doc/${safeUrlPathSegment(params.documentId, 'documentId')}`
+      let url = `${baseUrl}/${safeIndexPathSegment(params.index, 'index')}/_doc/${safeUrlPathSegment(params.documentId, 'documentId')}`
 
       const queryParams: string[] = []
       if (params.sourceIncludes) {

apps/sim/tools/elasticsearch/get_index.ts

@@ -1,16 +1,17 @@
 import type {
   ElasticsearchGetIndexParams,
+  ElasticsearchIndexInfoMap,
   ElasticsearchIndexInfoResponse,
 } from '@/tools/elasticsearch/types'
-import { buildAuthHeaders, buildBaseUrl } from '@/tools/elasticsearch/utils'
+import { buildAuthHeaders, buildBaseUrl, safeIndexPathSegment } from '@/tools/elasticsearch/utils'
 import type { ToolConfig } from '@/tools/types'
-import { safeUrlPathSegment } from '@/tools/url-path'
 
 export const getIndexTool: ToolConfig<ElasticsearchGetIndexParams, ElasticsearchIndexInfoResponse> =
   {
     id: 'elasticsearch_get_index',
     name: 'Elasticsearch Get Index',
-    description: 'Retrieve index information including settings, mappings, and aliases.',
+    description:
+      'Retrieve index information including settings, mappings, and aliases. Accepts a comma-separated list of indices, data streams, and aliases, and supports wildcards.',
     version: '1.0.0',
 
     params: {
@@ -58,30 +59,38 @@ export const getIndexTool: ToolConfig<ElasticsearchGetIndexParams, Elasticsearch
         type: 'string',
         required: true,
         visibility: 'user-or-llm',
-        description: 'Index name to retrieve info for (e.g., "products", "logs-2024")',
+        description:
+          'Index, data stream, or alias to retrieve info for. Accepts a comma-separated list and wildcards (e.g., "products", "logs-2024", "logs-*", "a,b").',
       },
     },
 
     request: {
       url: (params) => {
         const baseUrl = buildBaseUrl(params)
-        return `${baseUrl}/${safeUrlPathSegment(params.index, 'index')}`
+        return `${baseUrl}/${safeIndexPathSegment(params.index, 'index')}`
       },
       method: 'GET',
       headers: (params) => buildAuthHeaders(params),
     },
 
+    /**
+     * Elasticsearch keys this response by resolved index name, one entry per
+     * matched target. A wildcard (`logs-*`) or comma-separated list (`a,b`)
+     * therefore returns several entries, so taking a single key would discard
+     * the rest with no error. Every entry is preserved under `indices`, and
+     * `matchedCount` makes a multi-target result visible without inspecting it.
+     *
+     * `index`/`aliases`/`mappings`/`settings` stay flattened from the first
+     * entry so the single-index shape the outputs declare is unchanged. That
+     * flattening is also lossy in a second way — an entry can carry
+     * `data_stream` and `lifecycle`, which have no flattened slot — and
+     * `indices` is where those survive intact.
+     */
     transformResponse: async (response: Response) => {
-      const data = (await response.json()) as Record<
-        string,
-        {
-          aliases?: Record<string, unknown>
-          mappings?: Record<string, unknown>
-          settings?: Record<string, unknown>
-        }
-      >
+      const data = (await response.json()) as ElasticsearchIndexInfoMap
 
-      const [indexName] = Object.keys(data)
+      const indexNames = Object.keys(data)
+      const [indexName] = indexNames
       const info = indexName ? data[indexName] : undefined
 
       return {
@@ -91,6 +100,8 @@ export const getIndexTool: ToolConfig<ElasticsearchGetIndexParams, Elasticsearch
           aliases: info?.aliases ?? {},
           mappings: info?.mappings ?? {},
           settings: info?.settings ?? {},
+          indices: data,
+          matchedCount: indexNames.length,
         },
       }
     },
@@ -112,5 +123,14 @@ export const getIndexTool: ToolConfig<ElasticsearchGetIndexParams, Elasticsearch
         type: 'json',
         description: 'Index settings',
       },
+      indices: {
+        type: 'json',
+        description:
+          'Every matched index keyed by its resolved name, each with its aliases, mappings, settings, and any data_stream or lifecycle. Populated for single- and multi-target requests alike.',
+      },
+      matchedCount: {
+        type: 'number',
+        description: 'How many indices, data streams, or aliases the target matched',
+      },
     },
   }