@kikimoradev/kcloud 1.5.2 → 1.5.4

package/dist/main.js

@@ -839,6 +839,7 @@ const errorCodes = Object.keys({
 	"infrastructure.provider_error": "internal",
 	"infrastructure.operation_in_progress": "conflict",
 	"infrastructure.host_ops_disabled": "rule_violation",
+	"platform.isolated": "rule_violation",
 	"backup.not_found": "not_found",
 	"backup.in_progress": "conflict",
 	"backup.unavailable": "rule_violation",
@@ -1130,7 +1131,9 @@ const agentProvisionSchema = z.object({
 			"ok",
 			"fetch_failed",
 			"clone_failed"
-		])
+		]),
+		brokenCloneMovedTo: z.string().optional(),
+		locksKeptForSandbox: z.array(z.string()).optional()
 	})),
 	docker: z.enum([
 		"ready",
@@ -1151,6 +1154,10 @@ const agentProgressSchema = z.object({
 	layersTotal: z.int().nonnegative().nullable(),
 	updatedAt: z.iso.datetime()
 }).meta({ id: "AgentProgress" });
+const agentClaudeCodeSchema = z.object({
+	version: z.string().nullable(),
+	source: z.enum(["release", "host"])
+}).meta({ id: "AgentClaudeCode" });
 const storageStates = [
 	"ok",
 	"warning",
@@ -1593,10 +1600,17 @@ z.object({
 	monitor: sessionSlotCountSchema.nullable(),
 	executor: sessionSlotCountSchema.nullable()
 }).meta({ id: "UpdateSessionSlotsBody" });
+const admissionWaitReasonSchema = z.enum([
+	"slot",
+	"pool",
+	"earlier_run",
+	"renewal"
+]);
 const agentAdmissionStateSchema = z.discriminatedUnion("state", [z.object({
 	state: z.literal("waiting"),
 	since: z.iso.datetime(),
-	position: z.int().positive()
+	position: z.int().positive(),
+	reason: admissionWaitReasonSchema
 }), z.object({ state: z.literal("holding") })]).meta({ id: "AgentAdmissionState" });
 const agentAdmissionSchema = z.object({
 	monitor: agentAdmissionStateSchema.nullable(),
@@ -1816,6 +1830,8 @@ const nodeAgentSchema = z.object({
 	projectId: idSchema,
 	projectName: z.string(),
 	state: agentStateSchema,
+	failureReason: z.string().nullable(),
+	retryAt: z.iso.datetime().nullable(),
 	poolLimit: poolLimitSchema.nullable()
 }).meta({ id: "NodeAgent" });
 const nodeRuntimeSchema = z.object({
@@ -2131,7 +2147,10 @@ const cliTokenReadySchema = z.object({
 	user: meSchema
 }).meta({ id: "CliTokenReady" });
 z.discriminatedUnion("status", [cliTokenWaitingSchema, cliTokenReadySchema]).meta({ id: "ClaimedCliToken" });
-z.object({ version: z.string() }).meta({ id: "PlatformVersion" });
+z.object({
+	version: z.string(),
+	isolated: z.boolean()
+}).meta({ id: "PlatformVersion" });
 const auditActionSchema = z.enum([
 	"platform.bootstrapped",
 	"organization.created",
@@ -2695,7 +2714,8 @@ const agentRuntimeSchema = z.object({
 	stopDeadlineAt: z.iso.datetime().nullable(),
 	admission: agentAdmissionSchema.nullable(),
 	admissionHold: admissionHoldSchema.nullable(),
-	poolLimit: poolLimitSchema.nullable()
+	poolLimit: poolLimitSchema.nullable(),
+	claudeCode: agentClaudeCodeSchema.nullable()
 }).meta({ id: "AgentRuntime" });
 const agentListItemSchema = z.object({
 	id: idSchema,
@@ -3053,6 +3073,14 @@ pageSchema(z.object({
 }).meta({ id: "Backup" })).meta({ id: "BackupPage" });
 z.object({ id: idSchema });
 z.object({ confirm: z.string().min(1).max(512) }).meta({ id: "RestoreBackupBody" });
+const syncedBackupCountSchema = z.int().nonnegative();
+z.object({
+	discovered: syncedBackupCountSchema,
+	vanished: syncedBackupCountSchema,
+	reappeared: syncedBackupCountSchema,
+	finished: syncedBackupCountSchema,
+	abandoned: syncedBackupCountSchema
+}).meta({ id: "BackupSync" });
 const backupPartSchema = z.object({
 	name: z.enum(backupPartNames),
 	bytes: byteCountSchema$1,
@@ -3956,12 +3984,14 @@ const createVersionCommand = (adaptersOf, cliVersion) => defineCommand({
 				kcloud: cliVersion,
 				instance: platform.version,
 				origin: session.origin,
-				matched
+				matched,
+				isolated: platform.isolated
 			});
 			return exitCodes.ok;
 		}
 		context.terminal.line(renderTable([{ header: "WHAT" }, { header: "VERSION" }], [["kcloud", cliVersion], [session.origin, platform.version]]));
 		if (!matched) context.terminal.error(context.terminal.errorStyles.warning(`warning kcloud ${cliVersion} is talking to an instance on ${platform.version}.`));
+		if (platform.isolated) context.terminal.error(context.terminal.errorStyles.warning(`warning ${session.origin} is isolated: it reaches no outside service and admits no node.`));
 		return exitCodes.ok;
 	}
 });
@@ -4047,7 +4077,7 @@ const providerHints = {
 	"provider.token_unauthorized": "DigitalOcean refused the token. Create a new one under API, Tokens in its control panel.",
 	"concurrency.conflict": "Someone changed the account meanwhile; run the command again."
 };
-const reasonOf$1 = (error) => {
+const reasonOf$2 = (error) => {
 	const reason = error.details.reason;
 	return typeof reason === "string" && reason !== "" ? `: ${reason}` : "";
 };
@@ -4063,7 +4093,7 @@ const explained = (error) => {
 	const failure = apiErrorOf$1(error);
 	switch (failure?.code) {
 		case "provider.token_scopes_missing": return new CliError(failure.message, `The token lacks ${missingScopesOf(failure)}. kcloud providers add --help lists every scope it needs.`, { cause: failure });
-		case "provider.unavailable": return new CliError(failure.message, `DigitalOcean did not answer as expected${reasonOf$1(failure)}. Try again in a moment.`, { cause: failure });
+		case "provider.unavailable": return new CliError(failure.message, `DigitalOcean did not answer as expected${reasonOf$2(failure)}. Try again in a moment.`, { cause: failure });
 		default: return error;
 	}
 };
@@ -4713,6 +4743,11 @@ const agentsOf = async (scope, project) => {
 	}
 	return listed;
 };
+const changeTakingActions = ["start", "update"];
+const changeTakerOf = ({ availableActions }) => {
+	const takers = changeTakingActions.filter((action) => availableActions.includes(action)).map((action) => `kcloud agents ${action}`);
+	return takers.length === 0 ? "a restart" : takers.join(" or ");
+};
 const changedAgent = async (api, agentId, document) => {
 	const current = dataOf("describe the agent", await api.GET("/agents/{id}", { params: { path: { id: agentId } } }), agentHints);
 	const change = typeof document === "object" && document !== null && "version" in document ? document : {
@@ -4804,7 +4839,7 @@ const configCommands = (adaptersOf) => [
 			const file = invocation.values.file;
 			if (file === void 0) throw new UsageError("agents set needs --file <path>.", "The file holds the sections to change; kcloud agents show <agent> --json shows the current ones.");
 			const agent = await changedAgent(run.api, agentId, agentChangeWithoutLimits(run, await documentOf(run, file)));
-			return printed(run, agent, (changed) => changed.restartRequired ? `Changed ${changed.name}; it needs kcloud agents update to take the change.` : `Changed ${changed.name}.`);
+			return printed(run, agent, (changed) => changed.restartRequired ? `Changed ${changed.name}; it needs ${changeTakerOf(changed)} to take the change.` : `Changed ${changed.name}.`);
 		}
 	}),
 	defineCommand({
@@ -4848,9 +4883,25 @@ const admissionRowsOf = (agent) => {
 	const { admission } = agent.runtime;
 	return admission === null ? [] : [["monitor slot", slotOf(admission.monitor)], ["executor slot", slotOf(admission.executor)]];
 };
-const admissionHoldRowsOf = ({ runtime }) => {
-	const hold = runtime.admissionHold;
-	if (hold == null) return [];
+const waitTexts = {
+	slot: "waits for a slot",
+	pool: "held by the pool of the node",
+	earlier_run: "held until the node restarts its run of an earlier task run",
+	renewal: "held while the node restarts the run"
+};
+const reasonOf$1 = ({ reason }) => reason ?? "slot";
+const waitRowsOf = ({ runtime }) => {
+	const { admission } = runtime;
+	if (admission === null) return [];
+	const waits = ["monitor", "executor"].flatMap((role) => {
+		const state = admission[role];
+		return state?.state === "waiting" ? [`${role} ${waitTexts[reasonOf$1(state)]}`] : [];
+	});
+	return waits.length === 0 ? [] : [["admissions", waits.join("; ")]];
+};
+const admissionHoldRowsOf = (agent) => {
+	const hold = agent.runtime.admissionHold;
+	if (hold == null) return waitRowsOf(agent);
 	if (hold.updating || hold.awaits === "start") return [["admissions", `held while the node updates to ${hold.target ?? "-"}`]];
 	const all = hold.pools.includes("monitor");
 	const noun = all ? "session" : "executor session";
@@ -4858,6 +4909,15 @@ const admissionHoldRowsOf = ({ runtime }) => {
 	return [["admissions", `${all ? "held" : "executor held"} for the node update to ${hold.target ?? "-"}, waiting for ${waits}`]];
 };
 const poolLimitRowsOf = ({ runtime }) => runtime.poolLimit === null ? [] : [["pool limit", poolLimitText(runtime.poolLimit)]];
+const claudeCodeOf = ({ runtime, release }) => {
+	const running = runtime.claudeCode ?? null;
+	if (running?.source === "host") return "host";
+	return running?.version ?? release?.claudeCodeVersion ?? "unknown";
+};
+const failureRowsOf = ({ failureReason, retryAt }) => {
+	if (failureReason === null) return [];
+	return [["failure", retryAt === null ? failureReason : `${failureReason}, retry at ${retryAt}`]];
+};
 const detailsOf = (agent) => [
 	renderTable([{ header: "FIELD" }, { header: "VALUE" }], [
 		["name", agent.name],
@@ -4866,6 +4926,7 @@ const detailsOf = (agent) => [
 		["wanted", agent.desiredState],
 		["observed", agent.observedState],
 		["release", agent.kikimoraVersion],
+		["claude code", claudeCodeOf(agent)],
 		["node", agent.node === null ? "none" : `${agent.node.name} (${agent.node.state})`],
 		["requires", agent.requiredCapabilities.length === 0 ? "nothing" : agent.requiredCapabilities.join(", ")],
 		["timezone", agent.timezone],
@@ -4874,6 +4935,7 @@ const detailsOf = (agent) => [
 		["browser", agent.machine.browser ? "yes" : "no"],
 		["container", agent.runtime.containerId ?? "none"],
 		["health", agent.runtime.health],
+		...failureRowsOf(agent),
 		...admissionRowsOf(agent),
 		...admissionHoldRowsOf(agent),
 		...poolLimitRowsOf(agent),
@@ -6695,7 +6757,7 @@ const agentTools = [
 	defineTool({
 		name: "agent_update",
 		title: "Change an agent",
-		description: "Change sections of an agent. Without version the change applies to the version read just before it. When restartRequired comes back true, agent_action update applies the change.",
+		description: "Change sections of an agent. Without version the change applies to the version read just before it. When restartRequired comes back true, agent_action start or update applies the change, whichever availableActions offers.",
 		operations: ["updateAgent"],
 		safety: "write",
 		input: z.object({
@@ -6733,7 +6795,7 @@ const agentTools = [
 	defineTool({
 		name: "agent_action",
 		title: "Start, pause, resume, restart or update an agent",
-		description: "start lets the agent work, pause holds it between sessions, resume lets a paused agent work again, restart restarts its container, update replaces the container to apply pending changes. The agent returns with the actions it takes next.",
+		description: "start lets the agent work and applies pending changes, pause holds it between sessions, resume lets a paused agent work again, restart restarts its container, update replaces the container to apply pending changes. The agent returns with the actions it takes next.",
 		operations: ["runAgentAction"],
 		safety: "write",
 		input: z.object({
@@ -9957,6 +10019,10 @@ const lastUpdateOf = ({ update }) => {
 	const outcome = `${last.outcome} ${last.version ?? "-"} at ${last.at}`;
 	return last.reason === null ? outcome : `${outcome}: ${last.reason}`;
 };
+const agentFailuresOf = ({ agents }) => agents.flatMap(({ slug, failureReason, retryAt }) => {
+	if (failureReason === null) return [];
+	return [`${slug} failure: ${retryAt === null ? failureReason : `${failureReason}, retry at ${retryAt}`}`];
+});
 const nodeDetailsText = (node) => [
 	renderTable([{ header: "FIELD" }, { header: "VALUE" }], [
 		["name", node.name],
@@ -9995,6 +10061,7 @@ const nodeDetailsText = (node) => [
 		poolLimitText(agent.poolLimit),
 		agent.id
 	])),
+	...agentFailuresOf(node),
 	"",
 	...node.runtime === null ? ["The node has reported no runtime yet."] : [
 		renderTable([{ header: "RUNTIME" }, { header: "VALUE" }], runtimeRowsOf(node.runtime, node.engine)),

package/package.json

@@ -15,7 +15,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.2",
+  "version": "1.5.4",
   "dependencies": {
     "@clack/prompts": "1.8.1",
     "@modelcontextprotocol/server": "2.1.0",