try prevent extra responses

Author: Ankcorn

apps/workers-observability/src/index.ts

@@ -60,6 +60,20 @@ export class ObservabilityMCP extends McpAgent<Env, State, Props> {
 				version: this.env.MCP_SERVER_VERSION,
 			},
 			sentry: initSentryWithUser(env, this.ctx, this.props.user.id),
+			options: { instructions: `# Cloudflare Workers Observability Tool
+
+This tool provides powerful capabilities to analyze and troubleshoot your Cloudflare Workers through logs and metrics. Here's how to use it effectively:
+
+## IMPORTANT: Query Discipline
+
+**STOP after the first successful query if it answers the user's question.** Do not run multiple queries unless absolutely necessary. The first query often contains the answer - review it thoroughly before running additional queries.
+
+### When to STOP Querying
+- STOP after presenting meaningful results from the first query
+- STOP when you've answered the user's specific question
+- STOP when the user hasn't requested additional exploration
+- Only continue if explicitly directed with "EXPLORE" or similar instruction
+` },
 		})
 
 		registerAccountTools(this)

apps/workers-observability/src/tools/observability.ts

@@ -23,6 +23,17 @@ export function registerObservabilityTools(agent: ObservabilityMCP) {
 		'query_worker_observability',
 		`Query the Workers Observability API to analyze logs and metrics from your Cloudflare Workers.
 
+The resulting information should answer the users query. STOP HERE and show them the answer to there question.
+If you can't answer the question ask for a follow up.
+
+## Output handling
+
+Once you have ran this query you must IMMEDIATELY present the user with this information.
+
+- **Events**: Display as a table with key fields. For detailed inspection, show full JSON of individual events.
+- **Calculations**: Use appropriate charts based on the data (bar charts for comparisons, line charts for time series)
+- **Invocations**: Show full request/response details with syntax highlighting for important fields
+
 ## When to Use This tool
 
 - Investigate errors or performance issues in your Cloudflare Workers
@@ -43,17 +54,9 @@ This tool provides three primary views of your Worker data:
 - Before applying filters, use the observability_keys and observability_values tools to confirm available filter fields and the correct filter value to add unless you have the data in a response from a previous query.
 - Common filter fields:  $metadata.service, $metadata.trigger, $metadata.message, $metadata.level, $metadata.requestId,
 
-## Output handling
-Once you have ran this query you must IMMEDIATELY present the user with this information.
-
-- **Events**: Display as a table with key fields. For detailed inspection, show full JSON of individual events.
-- **Calculations**: Use appropriate charts based on the data (bar charts for comparisons, line charts for time series)
-- **Invocations**: Show full request/response details with syntax highlighting for important fields
-
 ## Troubleshooting
 - If no results are returned, suggest broadening the time range or relaxing filters
 - For errors about invalid fields, recommend using observability_keys to see available options
-- Handle rate limiting by suggesting query optimization
 `,
 
 		{

packages/mcp-common/src/types/workers-logs-schemas.ts

@@ -312,13 +312,13 @@ export const zQueryRunRequest = z.object({
 		filters: z.array(zQueryFilter).optional(),
 		filterCombination: zFilterCombination.optional(),
 		calculations: z.array(zQueryCalculation).optional(),
-		groupBys: z.array(zQueryGroupBy).optional(),
+		groupBys: z.array(zQueryGroupBy).optional().describe(`Only valid when doing a Calculation`),
 		orderBy: z
 			.object({
-				value: z.string(),
+				value: z.string().describe("This must be the alias of a calculation"),
 				order: z.enum(['asc', 'desc']).optional(),
 			})
-			.optional(),
+			.optional().describe("Order By only workers when a group by is present"),
 		limit: z
 			.number()
 			.int()