@ogment-ai/cli 0.9.1-next.0 → 0.9.1-next.2

package/dist/cli.js

@@ -8017,7 +8017,7 @@ const defaultRecoveryByCode = {
 	},
 	[ERROR_CODE.authRequired]: {
 		command: "ogment auth login",
-		reason: "Authentication is required before catalog or invoke commands can run.",
+		reason: "Authentication is required before catalog, search, or execute commands can run.",
 		title: "Authenticate",
 		when: "immediate"
 	},
@@ -8053,14 +8053,14 @@ const defaultRecoveryByCode = {
 	},
 	[ERROR_CODE.toolInputSchemaViolation]: {
 		command: "ogment catalog",
-		reason: "Tool contract did not validate; inspect available servers and tool metadata.",
+		reason: "Tool contract did not validate; inspect available servers before retrying search or execute.",
 		title: "Inspect catalog",
 		when: "immediate"
 	},
 	[ERROR_CODE.toolNotFound]: {
 		command: "ogment catalog",
-		reason: "Requested tool could not be found; rediscover servers and tools.",
-		title: "Rediscover tools",
+		reason: "Requested server or tool context could not be found; rediscover available servers.",
+		title: "Rediscover servers",
 		when: "immediate"
 	},
 	[ERROR_CODE.transportRequestFailed]: {
@@ -8363,7 +8363,7 @@ const parseJsonValue = (raw, context) => {
 		}
 	});
 };
-const isRecord$2 = (value) => {
+const isRecord$1 = (value) => {
 	return typeof value === "object" && value !== null;
 };
 
@@ -13738,8 +13738,11 @@ const cacheSchema = object({
 	latestVersion: string().optional()
 });
 const isPrereleaseVersion = (version) => {
-	const parsed = import_semver.default.parse(version);
-	return parsed?.prerelease.length !== void 0 && parsed.prerelease.length > 0;
+	return (import_semver.default.parse(version)?.prerelease.length ?? 0) > 0;
+};
+const normalizeLatestVersionCandidate = (version) => {
+	if (version === void 0 || isPrereleaseVersion(version)) return;
+	return version;
 };
 const isTruthyEnvValue = (value) => {
 	if (value === void 0) return false;
@@ -13807,18 +13810,19 @@ const maybeGetAvailableCliUpdate = async (options, deps = {}) => {
 		const cachePath = cachePathFromConfigDir(options.configDir ?? defaultConfigDir());
 		let latestVersion;
 		const existingCache = readCache(cachePath);
+		const cachedLatestVersion = normalizeLatestVersionCandidate(existingCache?.latestVersion);
 		const nowMs = now().getTime();
 		if (existingCache === void 0 || nowMs - existingCache.lastCheckedAtMs >= UPDATE_CHECK_INTERVAL_MS) {
 			try {
-				latestVersion = await fetchWithTimeout(options.packageName, fetchLatestVersion);
+				latestVersion = normalizeLatestVersionCandidate(await fetchWithTimeout(options.packageName, fetchLatestVersion)) ?? cachedLatestVersion;
 			} catch {
-				latestVersion = existingCache?.latestVersion;
+				latestVersion = cachedLatestVersion;
 			}
 			writeCache(cachePath, {
 				...latestVersion === void 0 ? {} : { latestVersion },
 				lastCheckedAtMs: nowMs
 			});
-		} else latestVersion = existingCache.latestVersion;
+		} else latestVersion = cachedLatestVersion;
 		if (latestVersion !== void 0 && isNewerVersion(latestVersion, options.currentVersion)) return {
 			currentVersion: options.currentVersion,
 			latestVersion,
@@ -13850,7 +13854,7 @@ const parseRemoteErrorDetails = (payload) => {
 		}
 		return { message: trimmed };
 	}
-	if (!isRecord$2(payload)) return {};
+	if (!isRecord$1(payload)) return {};
 	const directCode = payload["code"];
 	const directMessage = payload["message"];
 	if (typeof directCode === "number" || typeof directMessage === "string") return {
@@ -13859,7 +13863,7 @@ const parseRemoteErrorDetails = (payload) => {
 		...Object.hasOwn(payload, "data") ? { data: toJsonValue(payload["data"]) } : {}
 	};
 	const nestedError = payload["error"];
-	if (!isRecord$2(nestedError)) return {};
+	if (!isRecord$1(nestedError)) return {};
 	return {
 		...typeof nestedError["code"] === "number" ? { mcpCode: nestedError["code"] } : {},
 		...typeof nestedError["message"] === "string" ? { message: nestedError["message"] } : {},
@@ -13950,17 +13954,6 @@ const presentRuntimeErrorPayload = (error, options) => {
 		title: appErrorTitle(error)
 	};
 };
-const presentCatalogFailureError = (error, options) => {
-	const payload = presentRuntimeErrorPayload(error, options);
-	return {
-		code: payload.code,
-		detail: payload.detail,
-		diagnostics: payload.diagnostics,
-		...payload.related_codes === void 0 ? {} : { related_codes: payload.related_codes },
-		retryable: payload.retryable,
-		title: payload.title
-	};
-};
 
 //#endregion
 //#region src/output/envelope.ts
@@ -14224,12 +14217,13 @@ const cliCommandKindSchema = _enum([
 	"auth_login",
 	"auth_logout",
 	"auth_status",
+	"catalog_detail",
 	"catalog_summary",
-	"catalog_tool",
-	"catalog_tools",
-	"invoke",
+	"catalog_tool_detail",
+	"execute",
 	"parse_error",
 	"root",
+	"search",
 	"runtime_error",
 	"status"
 ]);
@@ -14396,6 +14390,16 @@ const runAuthLogoutCommand = async (context) => {
 
 //#endregion
 //#region src/commands/server-context.ts
+const commandNameForSelectorKind = (selectorKind) => {
+	return selectorKind;
+};
+const selectorRecoveryCommand = (selectorKind, selector, orgSlug, toolName) => {
+	switch (selectorKind) {
+		case "catalog": return toolName === void 0 ? `ogment catalog ${orgSlug}/${selector}` : `ogment catalog ${orgSlug}/${selector} ${toolName}`;
+		case "search": return `ogment search --org ${orgSlug} ${selector} --code 'return input'`;
+		case "execute": return `ogment execute --org ${orgSlug} ${selector} --code 'return input' --input '{}'`;
+	}
+};
 const formatCandidateSelectors = (profile, path) => {
 	return profile.orgs.flatMap((org) => {
 		return org.servers.filter((server) => server.path === path).map((server) => `${org.orgSlug}/${server.path}`);
@@ -14462,8 +14466,9 @@ const findServerByPath = (profile, selector, options) => {
 		const [firstCandidate] = sortedCandidates;
 		if (firstCandidate !== void 0) {
 			const firstCandidateParsed = parseQualifiedSelector(firstCandidate);
-			const message = options.selectorKind === "invoke" ? `Server "${selector}" is ambiguous across organizations (${sortedCandidates.join(", ")}). Re-run with --org <org-slug>.` : `Server "${selector}" is ambiguous across organizations (${sortedCandidates.join(", ")}). Use a qualified selector like "${firstCandidate}".`;
-			const recoveryCommand = options.selectorKind === "invoke" ? options.toolName === void 0 ? "ogment invoke --help" : firstCandidateParsed === null ? "ogment invoke --help" : `ogment invoke --org ${firstCandidateParsed.orgSlug} ${selector} ${options.toolName}` : `ogment catalog ${firstCandidate}`;
+			const commandName = commandNameForSelectorKind(options.selectorKind);
+			const message = `Server "${selector}" is ambiguous across organizations (${sortedCandidates.join(", ")}). Re-run \`ogment ${commandName}\` with --org <org-slug> or use a qualified selector like "${firstCandidate}".`;
+			const recoveryCommand = firstCandidateParsed === null ? `ogment ${commandName} --help` : selectorRecoveryCommand(options.selectorKind, selector, firstCandidateParsed.orgSlug, options.toolName);
 			return Result.err(new ValidationError({
 				message,
 				recovery: { command: recoveryCommand }
@@ -14483,96 +14488,75 @@ const findServerByPath = (profile, selector, options) => {
 
 //#endregion
 //#region src/commands/catalog.ts
-const toServerSummary = (target, toolCount) => {
+const toServerSummary = (target) => {
 	return {
 		capabilities: [],
 		description: target.server.description,
 		name: target.server.name,
 		orgSlug: target.orgSlug,
 		serverId: target.server.path,
-		toolCount,
 		version: null
 	};
 };
-const toToolSummaries = (tools) => {
-	return tools.map((tool) => {
-		return {
-			description: tool.description ?? null,
-			name: tool.name
-		};
-	});
-};
-const listServerTools = async (context, apiKey, server) => {
-	return context.services.mcp.listTools({
-		orgSlug: server.orgSlug,
-		serverPath: server.server.path
-	}, apiKey);
+const toToolSummary = (tool) => {
+	return {
+		description: tool.description ?? null,
+		name: tool.name
+	};
 };
-const TOOL_COUNT_CONCURRENCY = 4;
-const toCatalogServerFailure = (server, error, includeDebug) => {
+const toToolDetail = (tool) => {
 	return {
-		error: presentCatalogFailureError(error, { includeDebug }),
-		orgSlug: server.orgSlug,
-		serverId: server.server.path
+		description: tool.description ?? null,
+		inputSchema: toJsonValue(tool.inputSchema),
+		name: tool.name,
+		outputSchema: tool.outputSchema === void 0 ? null : toJsonValue(tool.outputSchema)
 	};
 };
-const mapWithConcurrency = async (items, concurrency, mapItem) => {
-	if (items.length === 0) return [];
-	const results = [];
-	results.length = items.length;
-	let nextIndex = 0;
-	const worker = async () => {
-		while (true) {
-			const currentIndex = nextIndex;
-			nextIndex += 1;
-			if (currentIndex >= items.length) return;
-			const item = items[currentIndex];
-			if (item === void 0) return;
-			results[currentIndex] = await mapItem(item, currentIndex);
-		}
-	};
-	const workerCount = Math.min(concurrency, items.length);
-	await Promise.all(Array.from({ length: workerCount }, async () => worker()));
-	return results;
+const detailCommandForServer = (serverId, orgSlug) => {
+	return `ogment catalog ${orgSlug === void 0 ? serverId : `${orgSlug}/${serverId}`}`;
+};
+const resolveCatalogServerTarget = async (context, options) => {
+	const stateResult = await resolveServerState(context);
+	if (Result.isError(stateResult)) return stateResult;
+	const serverResult = findServerByPath(stateResult.value.profile, options.serverId, {
+		...options.orgSlug === void 0 ? {} : { orgSlug: options.orgSlug },
+		selectorKind: "catalog",
+		..."toolName" in options ? { toolName: options.toolName } : {}
+	});
+	if (Result.isError(serverResult)) return serverResult;
+	return Result.ok({
+		apiKey: stateResult.value.apiKey,
+		target: {
+			orgSlug: serverResult.value.orgSlug,
+			server: {
+				description: serverResult.value.server.description,
+				name: serverResult.value.server.name,
+				path: serverResult.value.server.path
+			}
+		}
+	});
+};
+const listCodeModeTools = async (context, apiKey, target) => {
+	return context.services.codemode.listTools({
+		orgSlug: target.orgSlug,
+		serverPath: target.server.path
+	}, apiKey);
 };
 const runCatalogCommand = async (context, options) => {
 	const stateResult = await resolveServerState(context);
 	if (Result.isError(stateResult)) return stateResult;
-	let targetServers = stateResult.value.profile.orgs.flatMap((org) => {
-		return org.servers.map((server) => ({
+	const targetOrgs = options.orgSlug === void 0 ? stateResult.value.profile.orgs : stateResult.value.profile.orgs.filter((org) => org.orgSlug === options.orgSlug);
+	if (options.orgSlug !== void 0 && targetOrgs.length === 0) return Result.err(new ValidationError({
+		code: ERROR_CODE.validationInvalidInput,
+		message: `Organization "${options.orgSlug}" not found`,
+		recovery: { command: "ogment catalog" }
+	}));
+	const summaries = targetOrgs.flatMap((org) => {
+		return org.servers.map((server) => toServerSummary({
 			orgSlug: org.orgSlug,
 			server
 		}));
 	});
-	if (options.serverId !== void 0) {
-		const serverResult = findServerByPath(stateResult.value.profile, options.serverId, { selectorKind: "catalog" });
-		if (Result.isError(serverResult)) return serverResult;
-		targetServers = [{
-			orgSlug: serverResult.value.orgSlug,
-			server: serverResult.value.server
-		}];
-	}
-	const serverSummaries = await mapWithConcurrency(targetServers, TOOL_COUNT_CONCURRENCY, async (server) => {
-		return {
-			server,
-			toolsResult: await listServerTools(context, stateResult.value.apiKey, server)
-		};
-	});
-	const summaries = [];
-	const failures = [];
-	for (const serverSummary of serverSummaries) {
-		if (Result.isError(serverSummary.toolsResult)) {
-			if (options.serverId !== void 0) return serverSummary.toolsResult;
-			failures.push(toCatalogServerFailure(serverSummary.server, serverSummary.toolsResult.error, options.includeDebug === true));
-			continue;
-		}
-		summaries.push(toServerSummary(serverSummary.server, serverSummary.toolsResult.value.length));
-	}
-	if (options.serverId !== void 0) return Result.ok({
-		failures: [],
-		nextCursor: null,
-		servers: summaries
-	});
 	const limit = Math.max(1, options.limit ?? 20);
 	let startIndex = 0;
 	if (options.cursor !== void 0) {
@@ -14587,81 +14571,52 @@ const runCatalogCommand = async (context, options) => {
 	const servers = summaries.slice(startIndex, startIndex + limit);
 	const nextCursor = startIndex + limit < summaries.length ? servers.at(-1)?.serverId ?? null : null;
 	return Result.ok({
-		failures,
+		failures: [],
 		nextCursor,
 		servers
 	});
 };
-const runCatalogToolsCommand = async (context, options) => {
-	const stateResult = await resolveServerState(context);
-	if (Result.isError(stateResult)) return stateResult;
-	const serverResult = findServerByPath(stateResult.value.profile, options.serverId, { selectorKind: "catalog" });
-	if (Result.isError(serverResult)) return serverResult;
-	const targetServer = {
-		orgSlug: serverResult.value.orgSlug,
-		server: serverResult.value.server
-	};
-	const toolsResult = await listServerTools(context, stateResult.value.apiKey, targetServer);
+const runCatalogServerDetailCommand = async (context, options) => {
+	const targetResult = await resolveCatalogServerTarget(context, options);
+	if (Result.isError(targetResult)) return targetResult;
+	const toolsResult = await listCodeModeTools(context, targetResult.value.apiKey, targetResult.value.target);
 	if (Result.isError(toolsResult)) return toolsResult;
 	return Result.ok({
-		server: toServerSummary(targetServer, toolsResult.value.length),
-		tools: toToolSummaries(toolsResult.value)
+		server: toServerSummary(targetResult.value.target),
+		tools: toolsResult.value.map((tool) => toToolSummary(tool))
 	});
 };
-const runCatalogToolDetailsCommand = async (context, options) => {
-	const stateResult = await resolveServerState(context);
-	if (Result.isError(stateResult)) return stateResult;
-	const serverResult = findServerByPath(stateResult.value.profile, options.serverId, { selectorKind: "catalog" });
-	if (Result.isError(serverResult)) return serverResult;
-	const targetServer = {
-		orgSlug: serverResult.value.orgSlug,
-		server: serverResult.value.server
-	};
-	const toolsResult = await listServerTools(context, stateResult.value.apiKey, targetServer);
+const runCatalogToolDetailCommand = async (context, options) => {
+	const targetResult = await resolveCatalogServerTarget(context, options);
+	if (Result.isError(targetResult)) return targetResult;
+	const toolsResult = await listCodeModeTools(context, targetResult.value.apiKey, targetResult.value.target);
 	if (Result.isError(toolsResult)) return toolsResult;
-	const tool = toolsResult.value.find((item) => item.name === options.toolName);
+	const tool = toolsResult.value.find((candidate) => {
+		return candidate.name === options.toolName;
+	});
 	if (tool === void 0) return Result.err(new NotFoundError({
-		message: `Tool "${options.toolName}" not found`,
-		resource: options.toolName
+		message: `Codemode tool "${options.toolName}" not found on server "${options.serverId}"`,
+		recovery: { command: detailCommandForServer(targetResult.value.target.server.path, targetResult.value.target.orgSlug) },
+		resource: `${options.serverId}/${options.toolName}`
 	}));
 	return Result.ok({
-		description: tool.description ?? null,
-		inputSchema: tool.inputSchema,
-		name: tool.name,
-		outputSchema: tool.outputSchema ?? null,
-		server: toServerSummary(targetServer, toolsResult.value.length)
+		server: toServerSummary(targetResult.value.target),
+		tool: toToolDetail(tool)
 	});
 };
 
 //#endregion
-//#region src/commands/invoke.ts
-const mapInputFileReadError = (inputFile, cause) => {
+//#region src/commands/codemode.ts
+const mapSourceFileReadError = (inputFile, optionName, cause) => {
 	const code = cause instanceof Error && "code" in cause && typeof cause.code === "string" ? cause.code : void 0;
-	if (code === "ENOENT") return new ValidationError({ message: `Input file not found: ${inputFile}` });
-	if (code === "EACCES" || code === "EPERM") return new ValidationError({ message: `Input file is not readable: ${inputFile}` });
-	if (code === "EISDIR") return new ValidationError({ message: `Input path must be a file: ${inputFile}` });
+	if (code === "ENOENT") return new ValidationError({ message: `${optionName} file not found: ${inputFile}` });
+	if (code === "EACCES" || code === "EPERM") return new ValidationError({ message: `${optionName} file is not readable: ${inputFile}` });
+	if (code === "EISDIR") return new ValidationError({ message: `${optionName} path must be a file: ${inputFile}` });
 	return new UnexpectedError({
 		cause,
-		message: `Failed to read input file: ${inputFile}`
+		message: `Failed to read ${optionName} file: ${inputFile}`
 	});
 };
-const parseInputObject = (raw, context) => {
-	const parsed = parseJsonValue(raw, context);
-	if (Result.isError(parsed)) return parsed;
-	const parsedValue = parsed.value;
-	if (!isJsonObject(parsedValue)) return Result.err(new ValidationError({ message: "Invoke input must be a JSON object" }));
-	return Result.ok(parsedValue);
-};
-const toToolCallStructuredContent = (result) => {
-	if (result.structuredContent !== void 0) return toJsonValue(result.structuredContent);
-	const firstContent = (Array.isArray(result.content) ? result.content : [])[0];
-	if (firstContent !== void 0 && firstContent.type === "text" && typeof firstContent.text === "string") {
-		const parsedText = parseJsonValue(firstContent.text, "MCP text content");
-		if (Result.isError(parsedText)) return firstContent.text;
-		return parsedText.value;
-	}
-	return toJsonValue(result);
-};
 const readStdin = async () => {
 	return Result.tryPromise({
 		catch: (cause) => new UnexpectedError({
@@ -14685,73 +14640,111 @@ const readStdin = async () => {
 		}
 	});
 };
-const parseInvokeArgs = async (options, deps) => {
-	if (options.input === void 0) return Result.ok({});
-	if (options.input === "-") {
-		const stdinResult = await (deps.readStdin ?? readStdin)();
-		if (Result.isError(stdinResult)) return stdinResult;
-		return parseInputObject(stdinResult.value, "--input (-)");
-	}
-	if (options.input.startsWith("@")) {
-		const inputFile = options.input.slice(1);
+const readSourceValue = async (value, optionName, deps) => {
+	if (value === "-") return (deps.readStdin ?? readStdin)();
+	if (value.startsWith("@")) {
+		const inputFile = value.slice(1);
 		if (inputFile.length === 0) return Result.err(new ValidationError({
-			details: options.input,
-			message: "Invalid --input value. Use @<path>, -, or an inline JSON object."
+			details: value,
+			message: `Invalid ${optionName} value. Use @<path>, -, or an inline value.`
 		}));
-		const fileReadResult = await Result.tryPromise({
-			catch: (cause) => mapInputFileReadError(inputFile, cause),
+		return Result.tryPromise({
+			catch: (cause) => mapSourceFileReadError(inputFile, optionName, cause),
 			try: async () => readFile$1(inputFile, "utf8")
 		});
-		if (Result.isError(fileReadResult)) return fileReadResult;
-		return parseInputObject(fileReadResult.value, "--input (@file)");
 	}
-	return parseInputObject(options.input, "--input");
+	return Result.ok(value);
+};
+const parseInputObject = (raw, context) => {
+	const parsed = parseJsonValue(raw, context);
+	if (Result.isError(parsed)) return parsed;
+	if (!isJsonObject(parsed.value)) return Result.err(new ValidationError({ message: "Execute input must be a JSON object" }));
+	return Result.ok(parsed.value);
+};
+const parseExecuteInput = async (input, deps) => {
+	if (input === void 0) return Result.ok(void 0);
+	const sourceResult = await readSourceValue(input, "--input", deps);
+	if (Result.isError(sourceResult)) return sourceResult;
+	const sourceContext = input === "-" ? "--input (-)" : input.startsWith("@") ? "--input (@file)" : "--input";
+	return parseInputObject(sourceResult.value, sourceContext);
+};
+const toToolCallStructuredContent = (result) => {
+	if (result.structuredContent !== void 0) return toJsonValue(result.structuredContent);
+	const firstContent = (Array.isArray(result.content) ? result.content : [])[0];
+	if (firstContent !== void 0 && firstContent.type === "text" && typeof firstContent.text === "string") {
+		const parsedText = parseJsonValue(firstContent.text, "MCP text content");
+		if (Result.isError(parsedText)) return firstContent.text;
+		return parsedText.value;
+	}
+	return toJsonValue(result);
 };
-const runInvokeCommand = async (context, options, deps = {}) => {
-	const argsResult = await parseInvokeArgs(options, deps);
-	if (Result.isError(argsResult)) return argsResult;
+const resolveServerTarget = async (context, options, selectorKind) => {
 	const stateResult = await resolveServerState(context);
 	if (Result.isError(stateResult)) return stateResult;
 	const serverResult = findServerByPath(stateResult.value.profile, options.serverId, {
 		...options.orgSlug === void 0 ? {} : { orgSlug: options.orgSlug },
-		selectorKind: "invoke",
-		toolName: options.toolName
+		selectorKind
 	});
 	if (Result.isError(serverResult)) return serverResult;
-	const mcpTarget = {
+	return Result.ok({
+		apiKey: stateResult.value.apiKey,
 		orgSlug: serverResult.value.orgSlug,
 		serverPath: serverResult.value.server.path
-	};
-	const callResult = await context.services.mcp.callTool(mcpTarget, stateResult.value.apiKey, options.toolName, argsResult.value);
-	if (Result.isError(callResult)) {
-		if (callResult.error._tag === "RemoteRequestError") {
-			const toolsResult = await context.services.mcp.listTools(mcpTarget, stateResult.value.apiKey);
-			if (Result.isOk(toolsResult)) {
-				if (!toolsResult.value.some((tool) => tool.name === options.toolName)) return Result.err(new NotFoundError({
-					message: `Tool "${options.toolName}" not found`,
-					resource: options.toolName
-				}));
-			}
-		}
-		return callResult;
-	}
-	const structuredContent = toToolCallStructuredContent(callResult.value);
-	if (callResult.value.isError) {
-		const details = parseRemoteErrorDetails(structuredContent);
-		return Result.err(new RemoteRequestError({
-			...details.mcpCode === void 0 ? {} : { mcpCode: details.mcpCode },
-			...details.data === void 0 ? {} : { mcpData: details.data },
-			message: details.message ?? "MCP tool call returned an error result",
-			operation: "tools/call",
-			raw: structuredContent,
-			retryable: false,
-			source: "mcp_jsonrpc"
-		}));
-	}
+	});
+};
+const codemodeErrorFromToolResult = (result) => {
+	if (!result.isError) return null;
+	const structuredContent = toToolCallStructuredContent(result);
+	const details = parseRemoteErrorDetails(structuredContent);
+	return new RemoteRequestError({
+		...details.mcpCode === void 0 ? {} : { mcpCode: details.mcpCode },
+		...details.data === void 0 ? {} : { mcpData: details.data },
+		message: details.message ?? "Codemode tool call returned an error result",
+		operation: "tools/call",
+		raw: structuredContent,
+		retryable: false,
+		source: "mcp_jsonrpc"
+	});
+};
+const runSearchCommand = async (context, options, deps = {}) => {
+	const codeResult = await readSourceValue(options.code, "--code", deps);
+	if (Result.isError(codeResult)) return codeResult;
+	const targetResult = await resolveServerTarget(context, options, "search");
+	if (Result.isError(targetResult)) return targetResult;
+	const callResult = await context.services.codemode.callTool({
+		orgSlug: targetResult.value.orgSlug,
+		serverPath: targetResult.value.serverPath
+	}, targetResult.value.apiKey, "search", { code: codeResult.value });
+	if (Result.isError(callResult)) return callResult;
+	const toolError = codemodeErrorFromToolResult(callResult.value);
+	if (toolError !== null) return Result.err(toolError);
 	return Result.ok({
-		result: structuredContent,
-		serverId: options.serverId,
-		toolName: options.toolName
+		result: toToolCallStructuredContent(callResult.value),
+		serverId: options.serverId
+	});
+};
+const runExecuteCommand = async (context, options, deps = {}) => {
+	const [codeResult, inputResult, targetResult] = await Promise.all([
+		readSourceValue(options.code, "--code", deps),
+		parseExecuteInput(options.input, deps),
+		resolveServerTarget(context, options, "execute")
+	]);
+	if (Result.isError(codeResult)) return codeResult;
+	if (Result.isError(inputResult)) return inputResult;
+	if (Result.isError(targetResult)) return targetResult;
+	const callResult = await context.services.codemode.callTool({
+		orgSlug: targetResult.value.orgSlug,
+		serverPath: targetResult.value.serverPath
+	}, targetResult.value.apiKey, "execute", {
+		code: codeResult.value,
+		...inputResult.value === void 0 ? {} : { input: inputResult.value }
+	});
+	if (Result.isError(callResult)) return callResult;
+	const toolError = codemodeErrorFromToolResult(callResult.value);
+	if (toolError !== null) return Result.err(toolError);
+	return Result.ok({
+		result: toToolCallStructuredContent(callResult.value),
+		serverId: options.serverId
 	});
 };
 
@@ -14761,71 +14754,11 @@ const runStatusCommand = async (options, deps) => {
 	return deps.infoService.collect(options.apiKeyOverride, { includeDebug: options.debug });
 };
 
-//#endregion
-//#region src/shared/schema-example.ts
-const MAX_EXAMPLE_DEPTH = 6;
-const EXAMPLE_PLACEHOLDER = " ... ";
-const isRecord$1 = (value) => {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-};
-const asStringArray = (value) => {
-	if (!Array.isArray(value)) return [];
-	return value.filter((item) => typeof item === "string");
-};
-const firstKnown = (value) => {
-	if (Array.isArray(value) && value.length > 0) return value[0];
-};
-const deriveType = (schema) => {
-	const typeValue = schema["type"];
-	if (typeof typeValue === "string") return typeValue;
-	if (Array.isArray(typeValue)) return typeValue.find((entry) => typeof entry === "string");
-	if (isRecord$1(schema["properties"])) return "object";
-	if (schema["items"] !== void 0) return "array";
-};
-const baseScalarExample = (_typeName) => {
-	switch (_typeName) {
-		case "string": return EXAMPLE_PLACEHOLDER;
-		case "integer": return EXAMPLE_PLACEHOLDER;
-		case "number": return EXAMPLE_PLACEHOLDER;
-		case "boolean": return EXAMPLE_PLACEHOLDER;
-		case "null": return EXAMPLE_PLACEHOLDER;
-		default: return EXAMPLE_PLACEHOLDER;
-	}
-};
-const buildExample = (value, depth) => {
-	if (!isRecord$1(value)) return {};
-	if (depth > MAX_EXAMPLE_DEPTH) return {};
-	const oneOfCandidate = firstKnown(value["oneOf"]);
-	if (oneOfCandidate !== void 0) return buildExample(oneOfCandidate, depth + 1);
-	const anyOfCandidate = firstKnown(value["anyOf"]);
-	if (anyOfCandidate !== void 0) return buildExample(anyOfCandidate, depth + 1);
-	const allOfCandidate = firstKnown(value["allOf"]);
-	if (allOfCandidate !== void 0) return buildExample(allOfCandidate, depth + 1);
-	const typeName = deriveType(value);
-	if (typeName === "object") {
-		const result = {};
-		const properties = isRecord$1(value["properties"]) ? value["properties"] : {};
-		const required = asStringArray(value["required"]);
-		for (const propertyName of required) {
-			const propertySchema = properties[propertyName];
-			if (propertySchema !== void 0) result[propertyName] = buildExample(propertySchema, depth + 1);
-		}
-		if (required.length === 0 && isRecord$1(value["additionalProperties"])) result["example"] = buildExample(value["additionalProperties"], depth + 1);
-		return result;
-	}
-	if (typeName === "array") {
-		if (value["items"] === void 0) return [EXAMPLE_PLACEHOLDER];
-		return [buildExample(value["items"], depth + 1)];
-	}
-	if (typeName === void 0) return depth === 0 ? {} : EXAMPLE_PLACEHOLDER;
-	return baseScalarExample(typeName);
-};
-const buildJsonSchemaExample = (schema) => {
-	return buildExample(schema, 0);
-};
-
 //#endregion
 //#region src/cli/commands.ts
+const withOrg = (orgSlug) => {
+	return orgSlug === void 0 ? [] : [`--org ${orgSlug}`];
+};
 const cliCommands = {
 	auth: {
 		help: () => "ogment auth --help",
@@ -14835,58 +14768,62 @@ const cliCommands = {
 		status: () => "ogment auth status"
 	},
 	catalog: {
-		command: () => "ogment catalog",
-		server: (serverId) => `ogment catalog ${serverId}`,
+		command: (serverId, toolName, orgSlug) => [
+			"ogment catalog",
+			...withOrg(orgSlug),
+			...serverId === void 0 ? [] : [serverId],
+			...toolName === void 0 ? [] : [toolName]
+		].join(" "),
+		detail: (serverId, orgSlug) => [
+			"ogment catalog",
+			...withOrg(orgSlug),
+			serverId
+		].join(" "),
 		summary: (options) => {
 			return [
 				"ogment catalog",
+				...withOrg(options.orgSlug),
 				...options.cursor === void 0 ? [] : [`--cursor ${options.cursor}`],
 				...options.limit === void 0 ? [] : [`--limit ${options.limit}`]
 			].join(" ");
 		},
-		tool: (serverId, toolName, options) => {
-			return [
-				"ogment catalog",
-				serverId,
-				toolName,
-				...options.example ? ["--example"] : []
-			].join(" ");
-		}
-	},
-	helpForScope: (scope) => {
-		if (scope === null) return "ogment --help";
-		return `ogment ${scope} --help`;
-	},
-	invoke: {
-		command: (serverId, toolName, orgSlug) => [
-			"ogment invoke",
-			...orgSlug === void 0 ? [] : [`--org ${orgSlug}`],
+		toolDetail: (serverId, toolName, orgSlug) => [
+			"ogment catalog",
+			...withOrg(orgSlug),
 			serverId,
 			toolName
+		].join(" ")
+	},
+	execute: {
+		command: (serverId, orgSlug) => [
+			"ogment execute",
+			...withOrg(orgSlug),
+			serverId
 		].join(" "),
-		inlineJson: (serverId, toolName, orgSlug) => [
-			"ogment invoke",
-			...orgSlug === void 0 ? [] : [`--org ${orgSlug}`],
+		help: () => "ogment execute --help",
+		inlineCode: (serverId, orgSlug) => [
+			"ogment execute",
+			...withOrg(orgSlug),
 			serverId,
-			toolName,
-			"--input <json>"
+			"--code <javascript>"
 		].join(" "),
-		stdin: (serverId, toolName, orgSlug) => [
-			"ogment invoke",
-			...orgSlug === void 0 ? [] : [`--org ${orgSlug}`],
+		stdinCode: (serverId, orgSlug) => [
+			"ogment execute",
+			...withOrg(orgSlug),
 			serverId,
-			toolName,
-			"--input -"
+			"--code -"
 		].join(" "),
-		withInputValue: (serverId, toolName, value, orgSlug) => {
-			return [
-				"ogment invoke",
-				...orgSlug === void 0 ? [] : [`--org ${orgSlug}`],
-				serverId,
-				toolName,
-				`--input ${value}`
-			].join(" ");
-		}
+		withCodeAndInputValue: (serverId, code, input, orgSlug) => [
+			"ogment execute",
+			...withOrg(orgSlug),
+			serverId,
+			`--code ${code}`,
+			...input === void 0 ? [] : [`--input ${input}`]
+		].join(" ")
+	},
+	helpForScope: (scope) => {
+		if (scope === null) return "ogment --help";
+		return `ogment ${scope} --help`;
 	},
 	root: {
 		command: () => "ogment",
@@ -14896,14 +14833,39 @@ const cliCommands = {
 				"auth status",
 				"auth logout",
 				"catalog",
-				"catalog <server-id>",
-				"catalog <server-id> <tool-name>",
-				"invoke <server-id> <tool-name>",
+				"search <server-id>",
+				"execute <server-id>",
 				"status"
 			];
 		},
 		help: () => "ogment --help"
 	},
+	search: {
+		command: (serverId, orgSlug) => [
+			"ogment search",
+			...withOrg(orgSlug),
+			serverId
+		].join(" "),
+		help: () => "ogment search --help",
+		inspectAllTools: (serverId, orgSlug) => [
+			"ogment search",
+			...withOrg(orgSlug),
+			serverId,
+			"--code 'return input'"
+		].join(" "),
+		stdinCode: (serverId, orgSlug) => [
+			"ogment search",
+			...withOrg(orgSlug),
+			serverId,
+			"--code -"
+		].join(" "),
+		withCodeValue: (serverId, code, orgSlug) => [
+			"ogment search",
+			...withOrg(orgSlug),
+			serverId,
+			`--code ${code}`
+		].join(" ")
+	},
 	status: { command: () => "ogment status" }
 };
 
@@ -14954,34 +14916,45 @@ const nextActionsForAuthStatus = (payload) => {
 };
 const nextActionsForCatalogSummary = (payload, context) => {
 	const actions = [];
-	const targetServer = payload.servers.find((server) => server.toolCount > 0);
-	if (targetServer !== void 0) actions.push(nextAction("inspect_tools", "Inspect tools", cliCommands.catalog.server(targetServer.serverId), `${targetServer.serverId} has ${targetServer.toolCount} available tools.`, "if_tool_count_gt_0"));
+	const targetServer = payload.servers[0];
+	if (targetServer !== void 0) actions.push(nextAction("inspect_server", "Inspect server", cliCommands.catalog.detail(targetServer.serverId, targetServer.orgSlug), `Inspect Codemode tools exposed on ${targetServer.serverId}.`, "if_servers_available"));
 	if (context.nextCursor !== null) actions.push(nextAction("next_catalog_page", "Load next page", cliCommands.catalog.summary({
 		cursor: context.nextCursor,
-		...context.limit === null ? {} : { limit: context.limit }
+		...context.limit === null ? {} : { limit: context.limit },
+		...context.orgSlug === null ? {} : { orgSlug: context.orgSlug }
 	}), `More servers are available after cursor ${context.nextCursor}.`, "if_more_servers"));
 	return actions;
 };
-const nextActionsForCatalogTools = (payload) => {
-	const firstTool = payload.tools[0];
-	if (firstTool === void 0) return [];
-	return [nextAction("inspect_tool", "Inspect tool details", cliCommands.catalog.tool(payload.server.serverId, firstTool.name, { example: false }), `Inspect schema for ${payload.server.serverId}/${firstTool.name} before invoking.`, "if_tools_available")];
+const nextActionsForCatalogServerDetail = (payload) => {
+	const searchTool = payload.tools.find((tool) => tool.name === "search");
+	if (searchTool !== void 0) return [nextAction("inspect_tool", "Inspect tool details", cliCommands.catalog.toolDetail(payload.server.serverId, searchTool.name, payload.server.orgSlug), `Inspect schema for ${payload.server.serverId}/${searchTool.name} before invoking.`, "if_tools_available")];
+	return [];
 };
-const toInlineJsonTemplateArgument = (value) => {
-	const placeholderLiteral = JSON.stringify(EXAMPLE_PLACEHOLDER);
-	return `'${JSON.stringify(value).replaceAll(placeholderLiteral, " ... ").replaceAll("'", String.raw`'\''`)}'`;
+const nextActionsForCatalogToolDetail = (payload) => {
+	if (payload.tool.name === "search") return [nextAction("run_search", "Run search", cliCommands.search.inspectAllTools(payload.server.serverId, payload.server.orgSlug), `Use Codemode search on ${payload.server.serverId} after reviewing the tool contract.`, "after_tool_inspection")];
+	return [nextAction("run_execute", "Run execute", cliCommands.execute.inlineCode(payload.server.serverId, payload.server.orgSlug), `Use Codemode execute on ${payload.server.serverId} after reviewing the tool contract.`, "after_tool_inspection")];
 };
-const nextActionsForCatalogToolDetails = (payload, exampleInput) => {
-	const inputArgument = toInlineJsonTemplateArgument(exampleInput);
-	return [nextAction("invoke_tool", "Invoke this tool", cliCommands.invoke.withInputValue(payload.server.serverId, payload.name, inputArgument), `Replace every ... placeholder with real JSON values, then invoke ${payload.server.serverId} ${payload.name}.`, "after_tool_inspection")];
+const nextActionsForSearch = (payload) => {
+	return [nextAction("execute_help", "Inspect execute usage", cliCommands.execute.help(), `Run Codemode execute against ${payload.serverId} after choosing a workflow.`, "after_search")];
 };
-const nextActionsForInvoke = (payload) => {
-	return [nextAction("inspect_tool", "Inspect tool schema", cliCommands.catalog.tool(payload.serverId, payload.toolName, { example: false }), `Review ${payload.serverId}/${payload.toolName} schema for the next invocation.`, "after_invoke")];
+const nextActionsForExecute = (payload) => {
+	return [nextAction("search_tools", "Search tools again", cliCommands.search.inspectAllTools(payload.serverId), `Reinspect tool definitions on ${payload.serverId} before the next execution.`, "after_execute")];
 };
 const nextActionsForStatus = (payload) => {
 	if (!payload.auth.apiKeyPresent) return [nextAction("login", "Authenticate", cliCommands.auth.login(), "Status detected no API key; authenticate first.", "immediate")];
 	return [nextAction("discover_servers", "Discover servers", cliCommands.catalog.command(), `Connectivity is ${payload.summary.status}; discover available servers.`, "after_status")];
 };
+const codeSourceFromValue = (value) => {
+	if (value === "-") return "stdin";
+	if (value.startsWith("@")) return "file";
+	return "inline";
+};
+const inputSourceFromValue = (value) => {
+	if (value === void 0) return "none";
+	if (value === "-") return "stdin";
+	if (value.startsWith("@")) return "file";
+	return "inline_json";
+};
 const runLoginFlow = async (runtime, options) => {
 	const { commandOptions, invokedCommand, mode } = options.mode === "apiKey" ? {
 		commandOptions: options,
@@ -15063,175 +15036,149 @@ const executeAuthLogoutInvocation = async (runtime) => {
 			localCredentialsDeleted: data.localCredentialsDeleted,
 			revoked: data.revoked
 		},
-		nextActions: [nextAction("login", "Authenticate again", cliCommands.auth.login(), "Logout completed; authenticate again before further tool calls.", "after_logout")]
+		nextActions: [nextAction("login", "Authenticate again", cliCommands.auth.login(), "Logout completed; authenticate again before further Codemode commands.", "after_logout")]
 	});
 };
 const executeCatalogInvocation = async (runtime, invocation) => {
-	const formatPaginationDetails = () => {
-		return `${invocation.cursor === void 0 ? "" : `--cursor ${invocation.cursor} `}${invocation.limit === void 0 ? "" : `--limit ${invocation.limit}`}`.trim();
-	};
-	const toCatalogExecutionPlan = () => {
-		if (invocation.serverId === void 0) {
-			if (invocation.example) return Result.err(new ValidationError({
-				details: "--example without <server-id> <tool-name>",
-				message: "Invalid catalog options. --example requires <server-id> <tool-name>.",
-				recovery: { command: cliCommands.catalog.command() }
-			}));
-			return Result.ok({
-				cursor: invocation.cursor,
-				kind: "summary",
-				limit: invocation.limit
-			});
-		}
-		if (invocation.toolName === void 0) {
-			if (invocation.cursor !== void 0 || invocation.limit !== void 0) return Result.err(new ValidationError({
-				details: formatPaginationDetails(),
-				message: "Invalid catalog options. --cursor and --limit are only valid for `ogment catalog`.",
-				recovery: { command: cliCommands.catalog.command() }
-			}));
-			if (invocation.example) return Result.err(new ValidationError({
-				details: `--example without tool name for ${invocation.serverId}`,
-				message: "Invalid catalog options. --example requires <tool-name>.",
-				recovery: { command: cliCommands.catalog.server(invocation.serverId) }
-			}));
-			return Result.ok({
-				kind: "tools",
-				serverId: invocation.serverId
-			});
-		}
-		if (invocation.cursor !== void 0 || invocation.limit !== void 0) return Result.err(new ValidationError({
-			details: formatPaginationDetails(),
-			message: "Invalid catalog options. --cursor and --limit are only valid for `ogment catalog`.",
-			recovery: { command: cliCommands.catalog.tool(invocation.serverId, invocation.toolName, { example: invocation.example }) }
-		}));
-		return Result.ok({
-			example: invocation.example,
-			kind: "tool",
+	if (invocation.toolName !== void 0 && invocation.serverId !== void 0) {
+		const command = cliCommands.catalog.toolDetail(invocation.serverId, invocation.toolName, invocation.orgSlug);
+		const data = ensureSuccess(await runCatalogToolDetailCommand(runtime.context, {
+			includeDebug: runtime.output.debug,
+			...invocation.orgSlug === void 0 ? {} : { orgSlug: invocation.orgSlug },
 			serverId: invocation.serverId,
 			toolName: invocation.toolName
+		}), runtime, {
+			command,
+			entity: {
+				...invocation.orgSlug === void 0 ? {} : { orgSlug: invocation.orgSlug },
+				serverId: invocation.serverId,
+				toolName: invocation.toolName
+			}
 		});
-	};
-	const planResult = toCatalogExecutionPlan();
-	if (Result.isError(planResult)) throw planResult.error;
-	switch (planResult.value.kind) {
-		case "summary": {
-			const plan = planResult.value;
-			const command = cliCommands.catalog.summary({
-				...plan.cursor === void 0 ? {} : { cursor: plan.cursor },
-				...plan.limit === void 0 ? {} : { limit: plan.limit }
-			});
-			const data = ensureSuccess(await runCatalogCommand(runtime.context, {
-				...plan.cursor === void 0 ? {} : { cursor: plan.cursor },
-				includeDebug: runtime.output.debug,
-				...plan.limit === void 0 ? {} : { limit: plan.limit }
-			}), runtime, {
-				command,
-				entity: {
-					cursor: plan.cursor ?? null,
-					limit: plan.limit ?? null
-				}
-			});
-			const outputData = {
-				failures: data.failures,
-				servers: data.servers
-			};
-			runtime.output.success(outputData, {
-				command,
-				entity: {
-					cursor: plan.cursor ?? null,
-					failedServerCount: data.failures.length,
-					limit: plan.limit ?? null,
-					serverCount: data.servers.length
-				},
-				nextActions: nextActionsForCatalogSummary(outputData, {
-					limit: plan.limit ?? null,
-					nextCursor: data.nextCursor
-				}),
-				pagination: { nextCursor: data.nextCursor }
-			});
-			return;
-		}
-		case "tools": {
-			const command = cliCommands.catalog.server(planResult.value.serverId);
-			const data = ensureSuccess(await runCatalogToolsCommand(runtime.context, { serverId: planResult.value.serverId }), runtime, {
-				command,
-				entity: { serverId: planResult.value.serverId }
-			});
-			runtime.output.success(data, {
-				command,
-				entity: {
-					serverId: data.server.serverId,
-					toolCount: data.tools.length
-				},
-				nextActions: nextActionsForCatalogTools(data)
-			});
-			return;
+		runtime.output.success(data, {
+			command,
+			entity: {
+				orgSlug: data.server.orgSlug,
+				serverId: data.server.serverId,
+				toolName: data.tool.name
+			},
+			nextActions: nextActionsForCatalogToolDetail(data)
+		});
+		return;
+	}
+	if (invocation.serverId !== void 0) {
+		const command = cliCommands.catalog.detail(invocation.serverId, invocation.orgSlug);
+		const data = ensureSuccess(await runCatalogServerDetailCommand(runtime.context, {
+			includeDebug: runtime.output.debug,
+			...invocation.orgSlug === void 0 ? {} : { orgSlug: invocation.orgSlug },
+			serverId: invocation.serverId
+		}), runtime, {
+			command,
+			entity: {
+				...invocation.orgSlug === void 0 ? {} : { orgSlug: invocation.orgSlug },
+				serverId: invocation.serverId
+			}
+		});
+		runtime.output.success(data, {
+			command,
+			entity: {
+				orgSlug: data.server.orgSlug,
+				serverId: data.server.serverId
+			},
+			nextActions: nextActionsForCatalogServerDetail(data)
+		});
+		return;
+	}
+	const command = cliCommands.catalog.summary({
+		...invocation.cursor === void 0 ? {} : { cursor: invocation.cursor },
+		...invocation.limit === void 0 ? {} : { limit: invocation.limit },
+		...invocation.orgSlug === void 0 ? {} : { orgSlug: invocation.orgSlug }
+	});
+	const data = ensureSuccess(await runCatalogCommand(runtime.context, {
+		...invocation.cursor === void 0 ? {} : { cursor: invocation.cursor },
+		...invocation.limit === void 0 ? {} : { limit: invocation.limit },
+		...invocation.orgSlug === void 0 ? {} : { orgSlug: invocation.orgSlug }
+	}), runtime, {
+		command,
+		entity: {
+			cursor: invocation.cursor ?? null,
+			limit: invocation.limit ?? null,
+			orgSlug: invocation.orgSlug ?? null
 		}
-		case "tool": {
-			const command = cliCommands.catalog.tool(planResult.value.serverId, planResult.value.toolName, { example: planResult.value.example });
-			const data = ensureSuccess(await runCatalogToolDetailsCommand(runtime.context, {
-				serverId: planResult.value.serverId,
-				toolName: planResult.value.toolName
-			}), runtime, {
-				command,
-				entity: {
-					serverId: planResult.value.serverId,
-					toolName: planResult.value.toolName
-				}
-			});
-			const exampleInput = toJsonValue(buildJsonSchemaExample(data.inputSchema));
-			const outputData = planResult.value.example ? {
-				...data,
-				exampleInput
-			} : data;
-			runtime.output.success(outputData, {
-				command,
-				entity: {
-					serverId: data.server.serverId,
-					toolName: data.name
-				},
-				nextActions: nextActionsForCatalogToolDetails(data, exampleInput)
-			});
-			return;
+	});
+	const outputData = {
+		failures: data.failures,
+		servers: data.servers
+	};
+	runtime.output.success(outputData, {
+		command,
+		entity: {
+			cursor: invocation.cursor ?? null,
+			failedServerCount: data.failures.length,
+			limit: invocation.limit ?? null,
+			orgSlug: invocation.orgSlug ?? null,
+			serverCount: data.servers.length
+		},
+		nextActions: nextActionsForCatalogSummary(outputData, {
+			limit: invocation.limit ?? null,
+			nextCursor: data.nextCursor,
+			orgSlug: invocation.orgSlug ?? null
+		}),
+		pagination: { nextCursor: data.nextCursor }
+	});
+};
+const executeSearchInvocation = async (runtime, invocation) => {
+	const codeSource = codeSourceFromValue(invocation.code);
+	const command = codeSource === "stdin" ? cliCommands.search.stdinCode(invocation.serverId, invocation.orgSlug) : cliCommands.search.withCodeValue(invocation.serverId, invocation.code, invocation.orgSlug);
+	const data = ensureSuccess(await runSearchCommand(runtime.context, {
+		code: invocation.code,
+		...invocation.orgSlug === void 0 ? {} : { orgSlug: invocation.orgSlug },
+		serverId: invocation.serverId
+	}), runtime, {
+		command,
+		entity: {
+			codeSource,
+			...invocation.orgSlug === void 0 ? {} : { orgSlug: invocation.orgSlug },
+			serverId: invocation.serverId
 		}
-	}
+	});
+	runtime.output.success(data, {
+		command,
+		entity: {
+			codeSource,
+			...invocation.orgSlug === void 0 ? {} : { orgSlug: invocation.orgSlug },
+			serverId: data.serverId
+		},
+		nextActions: nextActionsForSearch(data)
+	});
 };
-const executeInvokeInvocation = async (runtime, invocation) => {
-	let inputSource = "none";
-	let command = cliCommands.invoke.command(invocation.serverId, invocation.toolName, invocation.orgSlug);
-	if (invocation.input !== void 0) if (invocation.input === "-") {
-		inputSource = "stdin";
-		command = cliCommands.invoke.stdin(invocation.serverId, invocation.toolName, invocation.orgSlug);
-	} else if (invocation.input.startsWith("@")) {
-		inputSource = "file";
-		command = cliCommands.invoke.withInputValue(invocation.serverId, invocation.toolName, invocation.input, invocation.orgSlug);
-	} else {
-		inputSource = "inline_json";
-		command = cliCommands.invoke.inlineJson(invocation.serverId, invocation.toolName, invocation.orgSlug);
-	}
-	const data = ensureSuccess(await runInvokeCommand(runtime.context, {
+const executeExecuteInvocation = async (runtime, invocation) => {
+	const codeSource = codeSourceFromValue(invocation.code);
+	const inputSource = inputSourceFromValue(invocation.input);
+	const command = codeSource === "stdin" ? cliCommands.execute.stdinCode(invocation.serverId, invocation.orgSlug) : cliCommands.execute.withCodeAndInputValue(invocation.serverId, invocation.code, invocation.input, invocation.orgSlug);
+	const data = ensureSuccess(await runExecuteCommand(runtime.context, {
+		code: invocation.code,
 		input: invocation.input,
 		...invocation.orgSlug === void 0 ? {} : { orgSlug: invocation.orgSlug },
-		serverId: invocation.serverId,
-		toolName: invocation.toolName
+		serverId: invocation.serverId
 	}), runtime, {
 		command,
 		entity: {
+			codeSource,
 			inputSource,
 			...invocation.orgSlug === void 0 ? {} : { orgSlug: invocation.orgSlug },
-			serverId: invocation.serverId,
-			toolName: invocation.toolName
+			serverId: invocation.serverId
 		}
 	});
 	runtime.output.success(data, {
 		command,
 		entity: {
+			codeSource,
 			inputSource,
 			...invocation.orgSlug === void 0 ? {} : { orgSlug: invocation.orgSlug },
-			serverId: data.serverId,
-			toolName: data.toolName
+			serverId: data.serverId
 		},
-		nextActions: nextActionsForInvoke(data)
+		nextActions: nextActionsForExecute(data)
 	});
 };
 const executeStatusInvocation = async (runtime) => {
@@ -15250,7 +15197,7 @@ const executeRootInvocation = (runtime) => {
 	runtime.output.success({ commands: cliCommands.root.commandsSurface() }, {
 		command: cliCommands.root.command(),
 		entity: null,
-		nextActions: [nextAction("login", "Authenticate", cliCommands.auth.login(), "Authenticate first so catalog and invoke commands can run.", "immediate"), nextAction("catalog", "Discover servers", cliCommands.catalog.command(), "List accessible servers and tool counts.", "after_auth")]
+		nextActions: [nextAction("login", "Authenticate", cliCommands.auth.login(), "Authenticate first so catalog, search, and execute commands can run.", "immediate"), nextAction("catalog", "Discover servers", cliCommands.catalog.command(), "List accessible servers before running Codemode search or execute.", "after_auth")]
 	});
 };
 const executeInvocation = async (runtime, invocation) => {
@@ -15267,12 +15214,15 @@ const executeInvocation = async (runtime, invocation) => {
 		case "catalog":
 			await executeCatalogInvocation(runtime, invocation);
 			return;
-		case "invoke":
-			await executeInvokeInvocation(runtime, invocation);
+		case "execute":
+			await executeExecuteInvocation(runtime, invocation);
 			return;
 		case "root":
 			executeRootInvocation(runtime);
 			return;
+		case "search":
+			await executeSearchInvocation(runtime, invocation);
+			return;
 		case "status":
 			await executeStatusInvocation(runtime);
 			return;
@@ -15355,15 +15305,22 @@ const parseActionsForScope = (scope, helpAction) => {
 	if (scope === "catalog") return [{
 		command: cliCommands.catalog.command(),
 		id: "catalog_summary",
-		reason: "List available servers and follow progressive discovery.",
+		reason: "List available servers before selecting a Codemode target.",
 		title: "Catalog servers",
 		when: "immediate"
 	}, helpAction];
-	if (scope === "invoke") return [{
+	if (scope === "search") return [{
+		command: cliCommands.catalog.command(),
+		id: "search_prepare",
+		reason: "Discover servers before running Codemode search.",
+		title: "Discover servers",
+		when: "immediate"
+	}, helpAction];
+	if (scope === "execute") return [{
 		command: cliCommands.catalog.command(),
-		id: "invoke_prepare",
-		reason: "Discover servers and tools before invoking a target command.",
-		title: "Discover tools",
+		id: "execute_prepare",
+		reason: "Discover servers before running Codemode execute.",
+		title: "Discover servers",
 		when: "immediate"
 	}, helpAction];
 	if (scope === null) return [helpAction];
@@ -61236,9 +61193,8 @@ const createInfoService = (deps) => {
 					"ogment status",
 					"ogment auth login",
 					"ogment catalog",
-					"ogment catalog <server-id>",
-					"ogment catalog <server-id> <tool-name>",
-					"ogment invoke <server-id> <tool-name> --input '{}'"
+					"ogment search <server-id> --code 'return input'",
+					"ogment execute <server-id> --code 'return input' --input '{}'"
 				]
 			},
 			generatedAt: new Date(now()).toISOString(),
@@ -71947,6 +71903,25 @@ const createRemoteRequestErrorFromMcpCause = (options) => {
 const MCP_CONNECT_TIMEOUT_MS = 1e4;
 const MCP_DISCOVERY_TIMEOUT_MS = 1e4;
 const MCP_INVOKE_TIMEOUT_MS = 45e3;
+const DEFAULT_PATH_PREFIX = "/api/v1/mcp";
+const normalizePathPrefix = (value) => {
+	const candidate = value?.trim() || DEFAULT_PATH_PREFIX;
+	if (candidate.startsWith("/")) return candidate;
+	return `/${candidate}`;
+};
+const isLocalhost = (hostname) => {
+	return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1" || hostname.startsWith("192.168.") || hostname.endsWith(".local");
+};
+const buildMcpEndpointUrl = (baseUrl, pathPrefix, target) => {
+	const base = new URL(baseUrl);
+	if (isLocalhost(base.hostname)) return new URL(`${pathPrefix}/${target.orgSlug}/${target.serverPath}`, `${base.origin}/`);
+	if (base.hostname.startsWith("dashboard.")) {
+		const rootDomain = base.hostname.slice(10);
+		const toolPath = pathPrefix === "/code" ? `/code/${target.serverPath}` : `/${target.serverPath}`;
+		return new URL(`${base.protocol}//${target.orgSlug}.mcp.${rootDomain}${toolPath}`);
+	}
+	return new URL(`${pathPrefix}/${target.orgSlug}/${target.serverPath}`, `${base.origin}/`);
+};
 const defaultCreateClient = (version) => {
 	return new Client({
 		name: APP_NAME,
@@ -71959,9 +71934,9 @@ const defaultCreateTransport = (url, apiKey) => {
 const createMcpService = (deps) => {
 	const createClient = deps.createClient ?? (() => defaultCreateClient(deps.version));
 	const createTransport = deps.createTransport ?? defaultCreateTransport;
+	const pathPrefix = normalizePathPrefix(deps.pathPrefix);
 	const withClient = async (target, apiKey, handler) => {
-		const endpoint = `${deps.baseUrl}/api/v1/mcp/${target.orgSlug}/${target.serverPath}`;
-		const transport = createTransport(new URL(endpoint), apiKey);
+		const transport = createTransport(buildMcpEndpointUrl(deps.baseUrl, pathPrefix, target), apiKey);
 		const client = createClient();
 		const connectResult = await Result.tryPromise({
 			catch: (cause) => createRemoteRequestErrorFromMcpCause({
@@ -72043,6 +72018,11 @@ const createRuntime = () => {
 			executionEnvironment,
 			httpClient
 		}),
+		codemode: createMcpService({
+			baseUrl: runtimeConfig.baseUrl,
+			pathPrefix: "/code",
+			version: runtimeConfig.version
+		}),
 		mcp: createMcpService({
 			baseUrl: runtimeConfig.baseUrl,
 			version: runtimeConfig.version
@@ -72149,8 +72129,11 @@ const createProgram = (runtime, parseState) => {
 			"",
 			"Examples:",
 			"  $ ogment auth login",
-			"  $ ogment catalog billing create_invoice --example",
-			"  $ ogment invoke billing create_invoice --input '{\"amount\":100}'",
+			"  $ ogment catalog",
+			"  $ ogment catalog billing",
+			"  $ ogment catalog billing execute",
+			"  $ ogment search billing --code 'return input'",
+			"  $ ogment execute billing --code 'return input' --input '{}'",
 			"",
 			"Run `ogment help <command>` for command-specific usage."
 		].join("\n");
@@ -72182,23 +72165,32 @@ const createProgram = (runtime, parseState) => {
 	authCommand.command("logout").summary("Delete local credentials and revoke token").description("Revoke token and delete local credentials").action(() => {
 		setInvocation({ kind: "auth_logout" });
 	});
-	program.command("catalog [serverId] [toolName]").summary("Discover servers and inspect tools").description("Discover servers and tools with progressive disclosure").helpGroup("Discovery Commands:").addOption(new Option("--cursor <cursor>", "Pagination cursor (catalog summary only)").conflicts("example")).addOption(new Option("--limit <limit>", "Maximum servers to return (catalog summary only)").argParser(parseCatalogLimitOption).conflicts("example")).addOption(new Option("--example", "Include a generated example input payload (tool details only)").conflicts(["cursor", "limit"])).action((serverId, toolName, options) => {
+	program.command("catalog").summary("Discover servers or inspect Codemode tools").description("Discover servers or inspect Codemode tools on a server").helpGroup("Discovery Commands:").argument("[serverId]", "Server id").argument("[toolName]", "Codemode tool name").addOption(new Option("--org <orgSlug>", "Organization slug").hideHelp()).addOption(new Option("--cursor <cursor>", "Pagination cursor for server discovery")).addOption(new Option("--limit <limit>", "Maximum servers to return").argParser(parseCatalogLimitOption)).action((serverId, toolName, options) => {
+		if (serverId !== void 0 && (options.cursor !== void 0 || options.limit !== void 0)) throw new InvalidArgumentError("--cursor and --limit are only supported for `ogment catalog`.");
 		setInvocation({
-			example: options.example === true,
 			kind: "catalog",
 			...options.cursor === void 0 ? {} : { cursor: options.cursor },
 			...options.limit === void 0 ? {} : { limit: options.limit },
+			...options.org === void 0 ? {} : { orgSlug: options.org },
 			...serverId === void 0 ? {} : { serverId },
 			...toolName === void 0 ? {} : { toolName }
 		});
 	});
-	program.command("invoke").summary("Invoke a tool by <server-id> <tool-name>").description("Invoke a tool using <server-id> <tool-name>").helpGroup("Execution Commands:").argument("<serverId>", "Server id").argument("<toolName>", "Tool name").addOption(new Option("--org <orgSlug>", "Organization slug").hideHelp()).option("--input <value>", "Input payload: inline JSON object, @path, or - for stdin").action((serverId, toolName, options) => {
+	program.command("search").summary("Search tools on a server via Codemode").description("Run Codemode search JavaScript against a server tool catalog").helpGroup("Execution Commands:").argument("<serverId>", "Server id").addOption(new Option("--org <orgSlug>", "Organization slug").hideHelp()).requiredOption("--code <value>", "JavaScript source: inline code, @path, or - for stdin").action((serverId, options) => {
 		setInvocation({
+			code: options.code,
+			kind: "search",
+			...options.org === void 0 ? {} : { orgSlug: options.org },
+			serverId
+		});
+	});
+	program.command("execute").summary("Execute Codemode JavaScript on a server").description("Run Codemode execute JavaScript with optional JSON input").helpGroup("Execution Commands:").argument("<serverId>", "Server id").addOption(new Option("--org <orgSlug>", "Organization slug").hideHelp()).requiredOption("--code <value>", "JavaScript source: inline code, @path, or - for stdin").option("--input <value>", "Input payload: inline JSON object, @path, or - for stdin").action((serverId, options) => {
+		setInvocation({
+			code: options.code,
+			kind: "execute",
 			input: options.input,
-			kind: "invoke",
 			...options.org === void 0 ? {} : { orgSlug: options.org },
-			serverId,
-			toolName
+			serverId
 		});
 	});
 	program.command("status").summary("Show runtime diagnostics").description("Show runtime configuration and connectivity diagnostics").helpGroup("Diagnostics Commands:").action(() => {
@@ -72230,7 +72222,8 @@ const CLI_PACKAGE_NAME = "@ogment-ai/cli";
 const PARSE_ERROR_SCOPE_COMMAND_PATHS = {
 	auth: "ogment auth <parse_error>",
 	catalog: "ogment catalog <parse_error>",
-	invoke: "ogment invoke <parse_error>"
+	execute: "ogment execute <parse_error>",
+	search: "ogment search <parse_error>"
 };
 const isParseErrorTelemetryScope = (value) => {
 	return value in PARSE_ERROR_SCOPE_COMMAND_PATHS;
@@ -72241,7 +72234,7 @@ const parseErrorCommandPath = (scope) => {
 	if (rootScope === void 0 || !isParseErrorTelemetryScope(rootScope)) return PARSE_ERROR_COMMAND_PATH;
 	return PARSE_ERROR_SCOPE_COMMAND_PATHS[rootScope];
 };
-const telemetryInputModeFromInvoke = (input) => {
+const telemetryInputModeFromExecute = (input) => {
 	if (input === void 0) return "none";
 	if (input === "-") return "stdin";
 	if (input.startsWith("@")) return "file";
@@ -72270,27 +72263,34 @@ const telemetryContextResolvers = {
 		};
 	},
 	catalog: (invocation) => {
-		if (invocation.serverId === void 0) return {
-			commandKind: "catalog_summary",
-			commandPath: "ogment catalog",
+		if (invocation.toolName !== void 0 && invocation.serverId !== void 0) return {
+			commandKind: "catalog_tool_detail",
+			commandPath: "ogment catalog <server-id> <tool-name>",
 			inputMode: null
 		};
-		if (invocation.toolName === void 0) return {
-			commandKind: "catalog_tools",
+		if (invocation.serverId !== void 0) return {
+			commandKind: "catalog_detail",
 			commandPath: "ogment catalog <server-id>",
 			inputMode: null
 		};
 		return {
-			commandKind: "catalog_tool",
-			commandPath: "ogment catalog <server-id> <tool-name>",
+			commandKind: "catalog_summary",
+			commandPath: "ogment catalog",
 			inputMode: null
 		};
 	},
-	invoke: (invocation) => {
+	execute: (invocation) => {
+		return {
+			commandKind: "execute",
+			commandPath: "ogment execute <server-id>",
+			inputMode: telemetryInputModeFromExecute(invocation.input)
+		};
+	},
+	search: (_) => {
 		return {
-			commandKind: "invoke",
-			commandPath: "ogment invoke <server-id> <tool-name>",
-			inputMode: telemetryInputModeFromInvoke(invocation.input)
+			commandKind: "search",
+			commandPath: "ogment search <server-id>",
+			inputMode: null
 		};
 	},
 	root: (_) => {
@@ -72314,8 +72314,9 @@ const telemetryContextFromInvocation = (invocation) => {
 		case "auth_logout": return telemetryContextResolvers.auth_logout(invocation);
 		case "auth_status": return telemetryContextResolvers.auth_status(invocation);
 		case "catalog": return telemetryContextResolvers.catalog(invocation);
-		case "invoke": return telemetryContextResolvers.invoke(invocation);
+		case "execute": return telemetryContextResolvers.execute(invocation);
 		case "root": return telemetryContextResolvers.root(invocation);
+		case "search": return telemetryContextResolvers.search(invocation);
 		case "status": return telemetryContextResolvers.status(invocation);
 	}
 };
@@ -72399,12 +72400,10 @@ const commandContextFromInvocation = (invocation, apiKeyOverride) => {
 		case "auth_login": return withBase("auth", "auth_login", "login");
 		case "auth_logout": return withBase("auth", "auth_logout", "logout");
 		case "auth_status": return withBase("auth", "auth_status", "status");
-		case "catalog":
-			if (invocation.toolName !== void 0) return withBase("catalog", "catalog", "tool");
-			if (invocation.serverId !== void 0) return withBase("catalog", "catalog", "server");
-			return withBase("catalog", "catalog", "summary");
-		case "invoke": return withBase("invoke", "invoke");
+		case "catalog": return withBase("catalog", "catalog", "summary");
+		case "execute": return withBase("execute", "execute");
 		case "root": return withBase("ogment", "root");
+		case "search": return withBase("search", "search");
 		case "status": return withBase("status", "status");
 		default: return assertNever(invocation);
 	}
@@ -72556,4 +72555,4 @@ if (shouldExecuteCli(import.meta.url, process.argv[1])) await executeCli();
 
 //#endregion
 export { executeCli, runCli, shouldExecuteCli };
-//# debugId=444cb93e-b899-4c52-9527-64988c3dbf06
+//# debugId=7f3c7b5c-dc65-451e-8bd3-f0541a4f4fdf