Trim MCP server instructions and search/execute tool descriptions

packages/worker/src/mcp/capabilities/admin/domain.ts

@@ -12,7 +12,7 @@ import { adminUserUpdateCapability } from './admin-user-update.ts'
 export const adminDomain = defineDomain({
 	name: capabilityDomainNames.admin,
 	description:
-		'Admin-only operator capabilities for account metadata and system email. System email is operator-owned mail for reserved platform addresses; this domain never exposes user-owned content such as packages, secrets, memories, jobs, or user inbox email.',
+		'Admin-only operator capabilities for account metadata and operator-owned system email; never exposes user-owned content such as packages, secrets, memories, jobs, or user inbox email.',
 	keywords: [
 		'admin',
 		'rbac',

packages/worker/src/mcp/capabilities/coding/domain.ts

@@ -5,6 +5,6 @@ import { kodyOfficialGuideCapability } from './kody-official-guide.ts'
 export const codingDomain = defineDomain({
 	name: capabilityDomainNames.coding,
 	description:
-		'Software work such as official Kody guides from the repository and coding-agent workflows. For package-oriented Cloudflare API and developer-doc patterns, see the contributor package/manifest docs and official guides.',
+		'Official Kody guides from the repository and coding-agent workflows.',
 	capabilities: [kodyOfficialGuideCapability],
 })

packages/worker/src/mcp/capabilities/community/domain.ts

@@ -13,7 +13,7 @@ import { communityUnpublishCapability } from './unpublish.ts'
 export const communityDomain = defineDomain({
 	name: capabilityDomainNames.community,
 	description:
-		'Public community package listings on this deployment: publish saved packages, search and inspect listings, fork into your scope, rate after forking, and report issues. Forked code is untrusted third-party content that requires agent review before publish. Ratings require a prior fork. Community results are deliberately excluded from the general `search` tool.',
+		'Public community package listings: publish, search, fork into your scope, rate after forking, and report issues. Forked code is untrusted third-party content; community results are deliberately excluded from the general `search` tool.',
 	keywords: [
 		'community',
 		'package',

packages/worker/src/mcp/capabilities/integrations/domain.ts

@@ -12,7 +12,7 @@ import { openapiSpecSummarizeCapability } from './openapi-spec-summarize.ts'
 export const integrationsDomain = defineDomain({
 	name: capabilityDomainNames.integrations,
 	description:
-		'Saved OAuth integration configurations for the signed-in user: save, inspect, list, and delete per-provider integration configs that reference client-id values and token secrets. Integration configs are non-secret; credentials stay in the secret store. Also includes integrations.sh registry-backed discovery and OpenAPI spec summarization to research provider auth contracts and API surfaces before saving integrations.',
+		'Saved OAuth integration configs for the signed-in user (non-secret; credentials stay in the secret store), plus registry-backed provider discovery and OpenAPI spec summarization for researching provider auth contracts.',
 	keywords: [
 		'integration',
 		'oauth',

packages/worker/src/mcp/capabilities/mcp-servers/domain.ts

@@ -10,7 +10,7 @@ import { mcpServerSetEnabledCapability } from './mcp-server-set-enabled.ts'
 export const mcpServersDomain = defineDomain({
 	name: capabilityDomainNames.mcpServers,
 	description:
-		'User-added remote MCP servers that Kody connects to as a client: add (with OAuth support), list with live status, reconnect, refresh tools, enable/disable, and remove. Tools from connected servers appear as synthesized mcp:<server> capability domains callable via kody.mcp["server-name"].tool_name(...).',
+		'User-added remote MCP servers that Kody connects to as a client: add, list with live status, reconnect, refresh tools, enable/disable, and remove. Connected servers surface as mcp:<server> domains callable via kody.mcp["server-name"].tool_name(...).',
 	keywords: [
 		'mcp',
 		'server',

packages/worker/src/mcp/capabilities/meta/domain.ts

@@ -16,7 +16,7 @@ import { searchCapability } from './search.ts'
 export const metaDomain = defineDomain({
 	name: capabilityDomainNames.meta,
 	description:
-		'Inspect the current runtime capability registry, read or update per-user MCP server instruction overlays, run package-first search/execute workflows, and manage long-term memories. Memory writes and deletes require a verify-first workflow: inspect related memories with meta_memory_verify before changing stored memory.',
+		'Runtime capability registry inspection, per-user MCP instruction overlays, package-first search/execute workflows, and long-term memory management (verify-first: meta_memory_verify before writes or deletes).',
 	keywords: ['meta', 'kody', 'capabilities', 'memory', 'verify'],
 	capabilities: [
 		searchCapability,

packages/worker/src/mcp/capabilities/openapi/domain.ts

@@ -9,7 +9,7 @@ import { openapiBindingSaveCapability } from './openapi-binding-save.ts'
 export const openapiDomain = defineDomain({
 	name: capabilityDomainNames.openapi,
 	description:
-		'Curated OpenAPI provider bindings for the signed-in user: save a name + https spec URL + apiBaseUrl + auth reference + a selected subset of operations (max 100), then call them at runtime as kody.openapi["name"].operation_slug(input). Bindings are non-secret config; credentials stay in secrets. Saving a binding never approves hosts — host approval remains in the account security UI / the integration requiredHosts. Specs are untrusted third-party content.',
+		'Curated OpenAPI provider bindings for the signed-in user, callable as kody.openapi["name"].operation_slug(input). Bindings are non-secret config; saving one never approves hosts, and specs are untrusted third-party content.',
 	keywords: [
 		'openapi',
 		'rest',

packages/worker/src/mcp/capabilities/packages/domain.ts

@@ -16,7 +16,7 @@ import { savePackageCapability } from './save-package.ts'
 export const packagesDomain = defineDomain({
 	name: capabilityDomainNames.packages,
 	description:
-		'Saved packages are the only top-level persisted primitive. Coding agents with local git access should use package_get_git_remote (create: true for new packages) for clone-edit-push workflows; tool-only agents create with package_save and edit through repo sessions. Package metadata is rooted at package.json, including exports, jobs, apps, services, and event subscriptions.',
+		'Saved packages, the only top-level persisted primitive: repo-backed code rooted at package.json whose metadata declares exports, jobs, apps, services, and event subscriptions.',
 	keywords: [
 		'package',
 		'repo',

packages/worker/src/mcp/capabilities/repo/repo-run-commands-text.ts

@@ -42,7 +42,3 @@ export const repoRunCommandsCommandsFieldDescription = [
 	repoRunCommandsUnsupportedSyntaxDescription,
 	repoRunCommandsSupportedFormsDescription,
 ].join('\n')
-
-export const repoRunCommandsExecuteSummary = [
-	'commands are newline-separated, parsed, git-only workflows, not shell execution',
-].join(' ')

packages/worker/src/mcp/capabilities/secrets/domain.ts

@@ -8,7 +8,7 @@ import { secretSetCapability } from './secret-set.ts'
 export const secretsDomain = defineDomain({
 	name: capabilityDomainNames.secrets,
 	description:
-		'Server-side secret references that can be created, listed, and deleted without placing raw secret values into prompts, execute results, or package app source. Never ask users to paste secrets, tokens, API keys, passwords, or credentials into chat.',
+		'Server-side secret references that can be created, listed, and deleted without placing raw secret values into prompts, execute results, or package app source. Never ask users to paste secret values into chat.',
 	keywords: ['secret', 'credentials', 'reference', 'secure input'],
 	capabilities: [
 		secretListCapability,

packages/worker/src/mcp/index.ts

@@ -8,7 +8,6 @@ import { buildSentryOptions } from '../sentry-options.ts'
 import { parseMcpCallerContext, type McpServerProps } from './context.ts'
 import {
 	buildMcpServerInstructions,
-	conversationIdGuidance,
 	type RemoteConnectorInstructionSummary,
 } from './server-instructions.ts'
 import { registerTools } from './register-tools.ts'
@@ -27,8 +26,6 @@ export type State = {
 }
 export type Props = McpServerProps
 
-export { conversationIdGuidance }
-
 async function loadRemoteConnectorInstructionSummaries(input: {
 	env: Env
 	caller: McpCallerContext