@kikimoradev/kcloud 0.11.2 → 0.12.0

package/dist/main.js

@@ -593,6 +593,34 @@ const agentEventSchema = z.discriminatedUnion("event", [
 		...roleEnvelope("monitor.authBlocked"),
 		reason: z.string()
 	}),
+	z.looseObject({
+		...roleEnvelope("monitor.admissionWait"),
+		ticket: z.string(),
+		since: instantSchema$2,
+		seq: countSchema
+	}),
+	z.looseObject({
+		...roleEnvelope("executor.admissionWait"),
+		ticket: z.string(),
+		since: instantSchema$2,
+		seq: countSchema,
+		taskId: z.string()
+	}),
+	z.looseObject({
+		...roleEnvelope("admission.granted"),
+		ticket: z.string(),
+		seq: countSchema
+	}),
+	z.looseObject({
+		...roleEnvelope("admission.released"),
+		ticket: z.string(),
+		seq: countSchema
+	}),
+	z.looseObject({
+		...roleEnvelope("admission.cancelled"),
+		ticket: z.string(),
+		seq: countSchema
+	}),
 	z.looseObject({
 		...roleEnvelope("task.started"),
 		taskId: z.string(),
@@ -935,7 +963,6 @@ const errorCodes = Object.keys({
 	"agent.context_too_long": "rule_violation",
 	"agent.docker_unavailable": "rule_violation",
 	"agent.storage_exhausted": "rule_violation",
-	"agent.capacity_exhausted": "rule_violation",
 	"agent.invalid_transition": "rule_violation",
 	"agent.busy": "conflict",
 	"agent.settings_rejected": "rule_violation",
@@ -1486,6 +1513,7 @@ const auditActionSchema = z.enum([
 	"agent.deleted",
 	"agent.action",
 	"platform.settings_updated",
+	"runtime.sessions_updated",
 	"platform.upgrade_requested",
 	"platform.upgraded",
 	"backup.requested",
@@ -1586,6 +1614,43 @@ z.object({
 	id: idSchema,
 	userId: idSchema
 });
+z.enum(["monitor", "executor"]);
+const sessionSlotCountSchema = z.int().min(1).max(64);
+const sessionQueueEntrySchema = z.object({
+	agentId: idSchema,
+	agentName: z.string().nullable(),
+	projectId: idSchema.nullable(),
+	projectName: z.string().nullable(),
+	position: z.int().positive(),
+	since: z.iso.datetime(),
+	taskId: z.string().nullable()
+}).meta({ id: "SessionQueueEntry" });
+const sessionPoolSchema = z.object({
+	slots: sessionSlotCountSchema.nullable(),
+	effective: z.int().nonnegative(),
+	inUse: z.int().nonnegative(),
+	waiting: z.array(sessionQueueEntrySchema)
+}).meta({ id: "SessionPool" });
+z.object({
+	version: z.int().nonnegative(),
+	ready: z.boolean(),
+	monitor: sessionPoolSchema,
+	executor: sessionPoolSchema
+}).meta({ id: "SessionSlots" });
+z.object({
+	version: z.int().nonnegative(),
+	monitor: sessionSlotCountSchema.nullable(),
+	executor: sessionSlotCountSchema.nullable()
+}).meta({ id: "UpdateSessionSlotsBody" });
+const agentAdmissionStateSchema = z.discriminatedUnion("state", [z.object({
+	state: z.literal("waiting"),
+	since: z.iso.datetime(),
+	position: z.int().positive()
+}), z.object({ state: z.literal("holding") })]).meta({ id: "AgentAdmissionState" });
+const agentAdmissionSchema = z.object({
+	monitor: agentAdmissionStateSchema.nullable(),
+	executor: agentAdmissionStateSchema.nullable()
+}).meta({ id: "AgentAdmission" });
 //#endregion
 //#region ../../packages/contracts/src/releases.ts
 const kikimoraVersionSchema = z.string().regex(versionTagPattern);
@@ -1978,7 +2043,8 @@ const agentRuntimeSchema = z.object({
 	crashLooping: z.boolean(),
 	provision: agentProvisionSchema.nullable(),
 	stopMode: agentStopModeSchema.nullable(),
-	stopDeadlineAt: z.iso.datetime().nullable()
+	stopDeadlineAt: z.iso.datetime().nullable(),
+	admission: agentAdmissionSchema.nullable()
 }).meta({ id: "AgentRuntime" });
 const agentListItemSchema = z.object({
 	id: idSchema,
@@ -2144,11 +2210,6 @@ const hostOperationStatusSchema = z.enum([
 	"lost"
 ]);
 const providerUnavailableReasons = ["not_configured", "provider_error"];
-const capacityLimits = [
-	"memory",
-	"cpu",
-	"disk"
-];
 const backupPartNames = ["database.dump.enc", "agents.tar.enc"];
 const archiveSkipReasons = [
 	"symlink",
@@ -2287,13 +2348,7 @@ const nodeSizesSchema = z.discriminatedUnion("source", [z.object({
 	source: z.literal("ok"),
 	items: z.array(dropletSizeSchema)
 }), unavailableBecause(providerUnavailableReasons)]).meta({ id: "NodeSizes" });
-const capacityForecastSchema = z.object({
-	byMemory: z.int().nonnegative().nullable(),
-	byCpu: z.int().nonnegative().nullable(),
-	byDisk: z.int().nonnegative().nullable(),
-	agentsThatFit: z.int().nonnegative().nullable(),
-	limiting: z.enum(capacityLimits).nullable()
-}).meta({ id: "CapacityForecast" });
+const capacityForecastSchema = z.object({ byDisk: z.int().nonnegative().nullable() }).meta({ id: "CapacityForecast" });
 z.object({
 	droplet: nodeDropletSchema,
 	volumes: nodeVolumesSchema,
@@ -3510,6 +3565,14 @@ const configCommands = (adaptersOf) => [
 		}
 	})
 ];
+const slotOf = (state) => {
+	if (state === null) return "-";
+	return state.state === "holding" ? "holding a slot" : `place ${String(state.position)} in the queue since ${state.since}`;
+};
+const admissionRowsOf = (agent) => {
+	const { admission } = agent.runtime;
+	return admission === null ? [] : [["monitor slot", slotOf(admission.monitor)], ["executor slot", slotOf(admission.executor)]];
+};
 const detailsOf = (agent) => [
 	renderTable([{ header: "FIELD" }, { header: "VALUE" }], [
 		["name", agent.name],
@@ -3524,6 +3587,7 @@ const detailsOf = (agent) => [
 		["browser", agent.machine.browser ? "yes" : "no"],
 		["container", agent.runtime.containerId ?? "none"],
 		["health", agent.runtime.health],
+		...admissionRowsOf(agent),
 		["pending", agent.restartRequired ? agent.restartReasons.join(", ") : "-"],
 		["actions", agent.availableActions.join(", ")],
 		["version", String(agent.version)],

package/package.json

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