@ponderbot/cli 0.1.0-alpha.21 → 0.1.0-alpha.22

package/dist/main.js

@@ -29,7 +29,7 @@ const resolveProject = async () => {
 		projectDefinition: await loadProjectDefinition(resolve(project, "config"))
 	};
 };
-const resolveConfig = async (envName) => requireExecutionSpace(await resolveEnvironmentConfig(envName));
+const resolveConfig = async (envName, spaceId) => requireExecutionSpace(await resolveEnvironmentConfig(envName), spaceId);
 const resolveProjectReleaseConfig = async (envName) => resolveEnvironmentConfig(envName, { resolveApplicationOrigin: true });
 const resolveDevConfig = async (envName) => requireExecutionSpace(await resolveEnvironmentConfig(envName ?? "development", {
 	requireDevAllowed: true,
@@ -70,11 +70,12 @@ const resolveEnvironmentConfig = async (envName, options = {}) => {
 		applicationOrigin
 	};
 };
-const requireExecutionSpace = (config) => {
-	if (config.spaceId === void 0 || config.spaceId.length === 0) return exitConfig(`set spaceId for environment "${config.environment}" in ponderbot/config.ts or PONDERBOT_SPACE_ID for this command`);
+const requireExecutionSpace = (config, spaceId) => {
+	const resolvedSpaceId = spaceId !== void 0 && spaceId.length > 0 ? spaceId : config.spaceId;
+	if (resolvedSpaceId === void 0 || resolvedSpaceId.length === 0) return exitConfig(`set the execution Space with --space, PONDERBOT_SPACE_ID, or spaceId for environment "${config.environment}" in ponderbot/config.ts`);
 	return {
 		...config,
-		spaceId: config.spaceId
+		spaceId: resolvedSpaceId
 	};
 };
 const resolveProjectApplicationOrigin = (projectDefinition) => {
@@ -348,6 +349,7 @@ const formatError = (error) => {
 	return String(error);
 };
 const lines = (data) => {
+	if (isRecord$1(data) && isRecord$1(data.release) && isRecord$1(data.resources)) return releaseCatalogLines(data.release, data.resources);
 	if (isStartedDevStack(data)) return [
 		"Ponderbot dev stack ready.",
 		`  PONDERBOT_URL=${data.dev_environment.url}`,
@@ -361,14 +363,14 @@ const lines = (data) => {
 		...recordLines(data.registered)
 	];
 	if (isRecord$1(data) && data.ok === true && isRecord$1(data.counts)) return ["manifest valid", ...recordLines(data.counts)];
-	if (isRecord$1(data) && Array.isArray(data.spaces)) return ["id name status", ...data.spaces.map((space) => spaceLine(space))];
+	if (isRecord$1(data) && Array.isArray(data.spaces)) return ["id name status", ...data.spaces.map((space) => columns(space, spaceKeys))];
 	if (isRecord$1(data) && isRecord$1(data.space)) {
 		if (isRecord$1(data.budget) && isRecord$1(data.usage)) return spaceShowLines(data.space, data.budget, data.usage);
-		return [spaceLine(data.space)];
+		return [columns(data.space, spaceKeys)];
 	}
 	if (isRecord$1(data) && isRecord$1(data.budget)) return recordLines(data.budget);
-	if (isRecord$1(data) && Array.isArray(data.models)) return ["ref provider model", ...data.models.map((model) => modelLine(model))];
-	if (isRecord$1(data) && isRecord$1(data.model)) return [modelLine(data.model)];
+	if (isRecord$1(data) && Array.isArray(data.models)) return ["ref provider model", ...data.models.map((model) => columns(model, modelKeys))];
+	if (isRecord$1(data) && isRecord$1(data.model)) return [columns(data.model, modelKeys)];
 	if (isRecord$1(data) && isRecord$1(data.agent_model_refs)) return ["agent model", ...Object.entries(data.agent_model_refs).map(([agentRef, modelRef]) => `${agentRef} ${String(modelRef)}`)];
 	if (isRecord$1(data) && isRecord$1(data.run)) return lines(data.run);
 	if (isRecord$1(data) && data.type === "provider_auth" && typeof data.provider === "string" && typeof data.method === "string" && typeof data.space_id === "string") {
@@ -421,7 +423,7 @@ const recordLines = (data) => {
 };
 function spaceShowLines(space, budget, usage) {
 	return [
-		spaceLine(space),
+		columns(space, spaceKeys),
 		"budget",
 		...recordLines(budget),
 		...spaceUsageLines(usage)
@@ -443,22 +445,53 @@ function spaceUsageLines(usage) {
 const limitValue = (value) => {
 	return value === null ? "unlimited" : String(value);
 };
-const spaceLine = (space) => {
-	if (!isRecord$1(space)) return String(space);
-	return [
-		field(space, "id"),
-		field(space, "name"),
-		field(space, "status")
-	].filter((value) => value !== void 0).join(" ");
-};
-const modelLine = (model) => {
-	if (!isRecord$1(model)) return String(model);
-	return [
-		field(model, "ref"),
-		field(model, "provider"),
-		field(model, "model")
-	].filter((value) => value !== void 0).join(" ");
-};
+const spaceKeys = [
+	"id",
+	"name",
+	"status"
+];
+const modelKeys = [
+	"ref",
+	"provider",
+	"model"
+];
+const releaseKeys = [
+	"id",
+	"manifest_name",
+	"environment",
+	"version",
+	"status"
+];
+const catalogKeys = {
+	agents: ["ref", "name"],
+	mcp_servers: [
+		"ref",
+		"url",
+		"tool_count"
+	],
+	actions: ["ref", "kind"],
+	skills: ["ref", "name"],
+	workflows: ["ref", "name"],
+	schedules: [
+		"ref",
+		"target_type",
+		"target_ref",
+		"mode",
+		"enabled",
+		"next_run_at"
+	],
+	webhooks: [
+		"ref",
+		"target_type",
+		"target_ref"
+	],
+	agent_groups: ["ref", "strategy"]
+};
+const columns = (record, keys) => {
+	if (!isRecord$1(record)) return String(record);
+	return keys.map((key) => record[key]).filter((value) => value !== void 0 && value !== null).map((value) => String(value)).join(" ");
+};
+const releaseCatalogLines = (release, resources) => [`release ${columns(release, releaseKeys)}`, ...Object.entries(resources).flatMap(([kind, entries]) => Array.isArray(entries) && entries.length > 0 ? [`${kind} (${entries.length})`, ...entries.map((entry) => `  ${columns(entry, catalogKeys[kind] ?? ["ref", "name"])}`)] : [])];
 function recordSummary(record) {
 	const fields = [
 		field(record, "type") ?? field(record, "run_type") ?? field(record, "target_type"),
@@ -545,23 +578,21 @@ const createDevActionRunner = (client, config, options = {}) => {
 		try {
 			let { run } = await client.runs.show("action", actionRunId, spaceId);
 			if (state.stopped || run.runner !== "dev" || run.status !== "running") return;
-			if (typeof run.dev_runner?.secret_grant === "string" && run.dev_runner.secret_grant.length > 0) {
-				try {
-					await client.dev.actionRuns.claim(actionRunId, spaceId);
-				} catch (claimError) {
-					if (!(isPonderbotError(claimError) && claimError.status === 409)) throw claimError;
-					({run} = await client.runs.show("action", actionRunId, spaceId));
-					if (state.stopped || run.runner !== "dev" || run.status !== "running") return;
-					blockClaim(state, {
-						actionRunId,
-						spaceId
-					});
-					console.error(formatError(claimError));
-					return;
-				}
+			try {
+				await client.dev.actionRuns.claim(actionRunId, spaceId);
+			} catch (claimError) {
+				if (!(isPonderbotError(claimError) && claimError.status === 409)) throw claimError;
 				({run} = await client.runs.show("action", actionRunId, spaceId));
 				if (state.stopped || run.runner !== "dev" || run.status !== "running") return;
+				blockClaim(state, {
+					actionRunId,
+					spaceId
+				});
+				console.error(formatError(claimError));
+				return;
 			}
+			({run} = await client.runs.show("action", actionRunId, spaceId));
+			if (state.stopped || run.runner !== "dev" || run.status !== "running") return;
 			const context = devCallContext(run, spaceId);
 			const actionExecution = devActionExecution(run);
 			const activeCallback = {
@@ -1723,8 +1754,8 @@ const modelProvider = (provider) => {
 //#endregion
 //#region src/provider-auth.ts
 const providerAuth = async (options) => {
-	const config = await resolveConfig(options.env);
-	const spaceId = options.space ?? config.spaceId;
+	const config = await resolveConfig(options.env, options.space);
+	const spaceId = config.spaceId;
 	const client = clientFor(config);
 	const registry = await client.modelProviders.list(spaceId);
 	const provider = await resolveProvider(options.provider, registry.providers);
@@ -2399,36 +2430,38 @@ program.command("provider").description("configure model provider credentials").
 });
 const model = program.command("model").description("manage Space model policy");
 model.command("add <modelRef>").requiredOption("--provider <name>", "anthropic | fake | mistral | openai").requiredOption("--model <name>", "provider model name").option("--capability <name...>", "declared model capabilities").option("--fallback <modelRef...>", "ordered fallback model refs").option("--space <spaceId>", "target space (defaults to the configured space)").option("--env <name>", "environment").description("add or update a model in the Space catalog").action(async (modelRef, options) => {
-	const config = await resolveConfig(options.env);
-	const spaceId = options.space ?? config.spaceId;
-	await runSpacesCommand("spaces:write", spaceId, async () => {
-		print(await clientFor(config).models.upsert(modelRef, modelDefinitionInput(options), spaceId), program.opts());
+	const config = await resolveConfig(options.env, options.space);
+	await runSpacesCommand("spaces:write", config.spaceId, async () => {
+		print(await clientFor(config).models.upsert(modelRef, modelDefinitionInput(options)), program.opts());
 	});
 });
 model.command("list").option("--space <spaceId>", "target space (defaults to the configured space)").option("--env <name>", "environment").description("list models in the Space catalog").action(async (options) => {
-	const config = await resolveConfig(options.env);
-	const spaceId = options.space ?? config.spaceId;
-	await runSpacesCommand("spaces:read", spaceId, async () => {
-		print(await clientFor(config).models.list(spaceId), program.opts());
+	const config = await resolveConfig(options.env, options.space);
+	await runSpacesCommand("spaces:read", config.spaceId, async () => {
+		print(await clientFor(config).models.list(), program.opts());
 	});
 });
 model.command("assign <agentRef> <modelRef>").option("--space <spaceId>", "target space (defaults to the configured space)").option("--env <name>", "environment").description("assign a Space catalog model to an exact Agent ref").action(async (agentRef, modelRef, options) => {
-	const config = await resolveConfig(options.env);
-	const spaceId = options.space ?? config.spaceId;
-	await runSpacesCommand("spaces:write", spaceId, async () => {
-		print(await clientFor(config).models.assign(agentRef, modelRef, spaceId), program.opts());
+	const config = await resolveConfig(options.env, options.space);
+	await runSpacesCommand("spaces:write", config.spaceId, async () => {
+		print(await clientFor(config).models.assign(agentRef, modelRef), program.opts());
 	});
 });
 model.command("assignments").option("--space <spaceId>", "target space (defaults to the configured space)").option("--env <name>", "environment").description("list exact Agent model assignments for a Space").action(async (options) => {
-	const config = await resolveConfig(options.env);
-	const spaceId = options.space ?? config.spaceId;
-	await runSpacesCommand("spaces:read", spaceId, async () => {
-		print(await clientFor(config).models.assignments(spaceId), program.opts());
+	const config = await resolveConfig(options.env, options.space);
+	await runSpacesCommand("spaces:read", config.spaceId, async () => {
+		print(await clientFor(config).models.assignments(), program.opts());
 	});
 });
-program.command("releases").option("--env <name>", "environment").description("list releases").action(async (options) => {
+const releases = program.command("releases").description("inspect manifest releases");
+releases.command("list", { isDefault: true }).option("--env <name>", "environment").description("list releases").action(async (options) => {
 	print(await clientFor(await resolveConfig(options.env)).releases.list(), program.opts());
 });
+releases.command("catalog [releaseId]").option("--space <spaceId>", "target space (defaults to the configured space)").option("--env <name>", "environment").description("show the deployed resources of one release (defaults to the active release)").action(async (releaseId, options) => {
+	const client = clientFor(await resolveConfig(options.env, options.space));
+	const resolvedReleaseId = releaseId ?? activeReleaseId(await client.releases.list());
+	print(await client.releases.catalog(resolvedReleaseId), program.opts());
+});
 program.command("rollback <releaseId>").option("--env <name>", "environment").description("roll back to a release").action(async (releaseId, options) => {
 	print(await clientFor(await resolveConfig(options.env)).releases.rollback(releaseId), program.opts());
 });
@@ -2444,14 +2477,14 @@ program.command("cancel <type> <id>").option("--env <name>", "environment").desc
 	const runType = parseRunType(type);
 	print(await clientFor(await resolveConfig(options.env)).runs.cancel(runType, id), program.opts());
 });
-program.command("action").command("run <ref>").option("--input <json>", "input payload", "{}").option("--env <name>", "environment").option("--release-id <id>", "pinned release id").option("--manifest-name <name>", "current release selector").description("start an Action Run").action(async (ref, options) => {
-	print(await clientFor(await resolveConfig(options.env)).actions.run(ref, JSON.parse(options.input), {
+program.command("action").command("run <ref>").option("--input <json>", "input payload", "{}").option("--space <spaceId>", "target space (defaults to the configured space)").option("--env <name>", "environment").option("--release-id <id>", "pinned release id").option("--manifest-name <name>", "current release selector").description("start an Action Run").action(async (ref, options) => {
+	print(await clientFor(await resolveConfig(options.env, options.space)).actions.run(ref, JSON.parse(options.input), {
 		releaseId: options.releaseId,
 		manifestName: options.manifestName
 	}), program.opts());
 });
-program.command("workflow").command("trigger <ref>").option("--input <json>", "input payload", "{}").option("--env <name>", "environment").option("--release-id <id>", "pinned release id").option("--manifest-name <name>", "current release selector").description("start a Workflow Run").action(async (ref, options) => {
-	print(await clientFor(await resolveConfig(options.env)).workflows.trigger(ref, JSON.parse(options.input), {
+program.command("workflow").command("trigger <ref>").option("--input <json>", "input payload", "{}").option("--space <spaceId>", "target space (defaults to the configured space)").option("--env <name>", "environment").option("--release-id <id>", "pinned release id").option("--manifest-name <name>", "current release selector").description("start a Workflow Run").action(async (ref, options) => {
+	print(await clientFor(await resolveConfig(options.env, options.space)).workflows.trigger(ref, JSON.parse(options.input), {
 		releaseId: options.releaseId,
 		manifestName: options.manifestName
 	}), program.opts());
@@ -2527,6 +2560,11 @@ const spaceCreateError = (error, spaceId) => {
 	if (isPonderbotError(error) && error.status === 409) return /* @__PURE__ */ new Error(`space "${spaceId}" already exists`);
 	return error;
 };
+const activeReleaseId = ({ releases }) => {
+	const newest = releases.filter((release) => release.status === "active").sort((left, right) => (right.deployed_at ?? "").localeCompare(left.deployed_at ?? ""))[0];
+	if (newest === void 0) return fail(/* @__PURE__ */ new Error("no active release in this space - deploy one, or name a release id"), 2);
+	return newest.id;
+};
 //#endregion
 export {};