@the-open-engine/zeroshot 6.45.0 → 6.46.0

package/lib/cluster/generated/protocol.d.cts

@@ -144,6 +144,9 @@ export type DataSelector = {
     readonly "path": ReadonlyArray<string>;
     readonly "source": "item";
 };
+export type DeclaredConnections = {
+    readonly [key: string]: DeclaredEnvironment;
+};
 export type DeclaredEnvironment = ReadonlyArray<string>;
 export type DeleteParams = {
     readonly "idempotencyKey": string;
@@ -663,13 +666,13 @@ export type NodeOutputSelector = {
     readonly "path": ReadonlyArray<string>;
 };
 export type NodeRuntimeBinding = ({
+    readonly "connections"?: DeclaredConnections;
     readonly "effort"?: ReasoningEffort | null;
-    readonly "env"?: DeclaredEnvironment;
     readonly "kind": "agent";
     readonly "model": string;
     readonly "sessionScope"?: SessionScope;
 }) | {
-    readonly "env"?: DeclaredEnvironment;
+    readonly "connections"?: DeclaredConnections;
     readonly "kind": "git_delivery";
 };
 export type NonEmptyVec_of_ChoiceBranch = ReadonlyArray<ChoiceBranch>;
@@ -812,7 +815,7 @@ export type RunLogsResult = {
 export type RunMetadata = {
     readonly "tokenUsage"?: TokenUsage | null;
 };
-export type RunSize = "tiny" | "small" | "standard" | "large";
+export type RunSize = "small" | "medium" | "large";
 export type RunStatus = {
     readonly "phase": "admitted";
 } | {

package/lib/cluster/generated/protocol.d.mts

@@ -144,6 +144,9 @@ export type DataSelector = {
     readonly "path": ReadonlyArray<string>;
     readonly "source": "item";
 };
+export type DeclaredConnections = {
+    readonly [key: string]: DeclaredEnvironment;
+};
 export type DeclaredEnvironment = ReadonlyArray<string>;
 export type DeleteParams = {
     readonly "idempotencyKey": string;
@@ -663,13 +666,13 @@ export type NodeOutputSelector = {
     readonly "path": ReadonlyArray<string>;
 };
 export type NodeRuntimeBinding = ({
+    readonly "connections"?: DeclaredConnections;
     readonly "effort"?: ReasoningEffort | null;
-    readonly "env"?: DeclaredEnvironment;
     readonly "kind": "agent";
     readonly "model": string;
     readonly "sessionScope"?: SessionScope;
 }) | {
-    readonly "env"?: DeclaredEnvironment;
+    readonly "connections"?: DeclaredConnections;
     readonly "kind": "git_delivery";
 };
 export type NonEmptyVec_of_ChoiceBranch = ReadonlyArray<ChoiceBranch>;
@@ -812,7 +815,7 @@ export type RunLogsResult = {
 export type RunMetadata = {
     readonly "tokenUsage"?: TokenUsage | null;
 };
-export type RunSize = "tiny" | "small" | "standard" | "large";
+export type RunSize = "small" | "medium" | "large";
 export type RunStatus = {
     readonly "phase": "admitted";
 } | {

package/lib/cluster/generated/protocol.d.ts

@@ -144,6 +144,9 @@ export type DataSelector = {
     readonly "path": ReadonlyArray<string>;
     readonly "source": "item";
 };
+export type DeclaredConnections = {
+    readonly [key: string]: DeclaredEnvironment;
+};
 export type DeclaredEnvironment = ReadonlyArray<string>;
 export type DeleteParams = {
     readonly "idempotencyKey": string;
@@ -663,13 +666,13 @@ export type NodeOutputSelector = {
     readonly "path": ReadonlyArray<string>;
 };
 export type NodeRuntimeBinding = ({
+    readonly "connections"?: DeclaredConnections;
     readonly "effort"?: ReasoningEffort | null;
-    readonly "env"?: DeclaredEnvironment;
     readonly "kind": "agent";
     readonly "model": string;
     readonly "sessionScope"?: SessionScope;
 }) | {
-    readonly "env"?: DeclaredEnvironment;
+    readonly "connections"?: DeclaredConnections;
     readonly "kind": "git_delivery";
 };
 export type NonEmptyVec_of_ChoiceBranch = ReadonlyArray<ChoiceBranch>;
@@ -812,7 +815,7 @@ export type RunLogsResult = {
 export type RunMetadata = {
     readonly "tokenUsage"?: TokenUsage | null;
 };
-export type RunSize = "tiny" | "small" | "standard" | "large";
+export type RunSize = "small" | "medium" | "large";
 export type RunStatus = {
     readonly "phase": "admitted";
 } | {

package/lib/cluster/validators.cjs

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeInboundSubscriptionFrame = normalizeInboundSubscriptionFrame;
 exports.assertDefinition = assertDefinition;
 exports.assertMethodResult = assertMethodResult;
 exports.assertGraphSpec = assertGraphSpec;
@@ -9,6 +10,7 @@ const _2020_js_1 = require("ajv/dist/2020.js");
 const protocol_js_1 = require("./generated/protocol.cjs");
 const protocol_schema_js_1 = require("./generated/protocol-schema.cjs");
 const errors_js_1 = require("./errors.cjs");
+const frames_js_1 = require("./frames.cjs");
 const ajv = new _2020_js_1.default({
     allErrors: true,
     strict: false,
@@ -26,6 +28,38 @@ function validatorFor(definition) {
     validators.set(definition, validator);
     return validator;
 }
+const RUN_PROJECTION_DEFINITIONS = new Set([
+    'RunForceResult',
+    'RunStatusResult',
+    'RunWatchEventNotification',
+]);
+function normalizeRunProjection(value) {
+    if (!(0, frames_js_1.isRecord)(value))
+        return value;
+    const size = value.size === 'tiny'
+        ? 'small'
+        : value.size === 'standard'
+            ? 'medium'
+            : value.size;
+    return size === value.size ? value : { ...value, size };
+}
+/** Normalize deserialize-only aliases before validating an inbound protocol value. */
+function normalizeInboundDefinition(definition, value) {
+    if (RUN_PROJECTION_DEFINITIONS.has(definition))
+        return normalizeRunProjection(value);
+    if (definition !== 'RunListResult' || !(0, frames_js_1.isRecord)(value))
+        return value;
+    const existingRuns = value.runs;
+    if (!Array.isArray(existingRuns))
+        return value;
+    const runs = existingRuns.map(normalizeRunProjection);
+    return runs.some((run, index) => run !== existingRuns[index]) ? { ...value, runs } : value;
+}
+function normalizeInboundSubscriptionFrame(kind, method, frame) {
+    if (kind !== 'run/watch' || method !== 'event' || !(0, frames_js_1.isRecord)(frame.params))
+        return frame;
+    return { ...frame, params: normalizeInboundDefinition('RunWatchEventNotification', frame.params) };
+}
 function assertDefinition(definition, value) {
     const validate = validatorFor(definition);
     if (validate(value))
@@ -35,7 +69,10 @@ function assertDefinition(definition, value) {
 }
 function assertMethodResult(method, value) {
     try {
-        assertDefinition(protocol_js_1.METHOD_RESULT_DEFINITIONS[method], value);
+        const definition = protocol_js_1.METHOD_RESULT_DEFINITIONS[method];
+        const normalized = normalizeInboundDefinition(definition, value);
+        assertDefinition(definition, normalized);
+        return normalized;
     }
     catch (error) {
         const receivedVersion = method === 'initialize' && value !== null && typeof value === 'object'

package/lib/cluster/validators.d.cts

@@ -1,6 +1,8 @@
 import type { ClusterMethod, GraphProfile, GraphSpec, ServerCapabilities } from './generated/protocol.js';
+import type { FrameRecord } from './frames.js';
+export declare function normalizeInboundSubscriptionFrame(kind: string, method: string, frame: FrameRecord): FrameRecord;
 export declare function assertDefinition(definition: string, value: unknown): void;
-export declare function assertMethodResult(method: ClusterMethod, value: unknown): void;
+export declare function assertMethodResult(method: ClusterMethod, value: unknown): unknown;
 /** Validate an execution graph against the frozen cluster protocol schema. */
 export declare function assertGraphSpec(value: unknown): asserts value is GraphSpec;
 export declare function assertGraphProfile(value: unknown): asserts value is GraphProfile;

package/lib/cluster/validators.d.mts

@@ -1,6 +1,8 @@
 import type { ClusterMethod, GraphProfile, GraphSpec, ServerCapabilities } from './generated/protocol.js';
+import type { FrameRecord } from './frames.js';
+export declare function normalizeInboundSubscriptionFrame(kind: string, method: string, frame: FrameRecord): FrameRecord;
 export declare function assertDefinition(definition: string, value: unknown): void;
-export declare function assertMethodResult(method: ClusterMethod, value: unknown): void;
+export declare function assertMethodResult(method: ClusterMethod, value: unknown): unknown;
 /** Validate an execution graph against the frozen cluster protocol schema. */
 export declare function assertGraphSpec(value: unknown): asserts value is GraphSpec;
 export declare function assertGraphProfile(value: unknown): asserts value is GraphProfile;

package/lib/cluster/validators.d.ts

@@ -1,6 +1,8 @@
 import type { ClusterMethod, GraphProfile, GraphSpec, ServerCapabilities } from './generated/protocol.js';
+import type { FrameRecord } from './frames.js';
+export declare function normalizeInboundSubscriptionFrame(kind: string, method: string, frame: FrameRecord): FrameRecord;
 export declare function assertDefinition(definition: string, value: unknown): void;
-export declare function assertMethodResult(method: ClusterMethod, value: unknown): void;
+export declare function assertMethodResult(method: ClusterMethod, value: unknown): unknown;
 /** Validate an execution graph against the frozen cluster protocol schema. */
 export declare function assertGraphSpec(value: unknown): asserts value is GraphSpec;
 export declare function assertGraphProfile(value: unknown): asserts value is GraphProfile;

package/lib/cluster/validators.mjs

@@ -2,6 +2,7 @@ import Ajv2020 from 'ajv/dist/2020.js';
 import { METHOD_RESULT_DEFINITIONS, PROTOCOL_VERSION, } from './generated/protocol.mjs';
 import { CLUSTER_PROTOCOL_SCHEMA } from './generated/protocol-schema.mjs';
 import { ClusterProtocolError, ClusterRequestError } from './errors.mjs';
+import { isRecord } from './frames.mjs';
 const ajv = new Ajv2020({
     allErrors: true,
     strict: false,
@@ -19,6 +20,38 @@ function validatorFor(definition) {
     validators.set(definition, validator);
     return validator;
 }
+const RUN_PROJECTION_DEFINITIONS = new Set([
+    'RunForceResult',
+    'RunStatusResult',
+    'RunWatchEventNotification',
+]);
+function normalizeRunProjection(value) {
+    if (!isRecord(value))
+        return value;
+    const size = value.size === 'tiny'
+        ? 'small'
+        : value.size === 'standard'
+            ? 'medium'
+            : value.size;
+    return size === value.size ? value : { ...value, size };
+}
+/** Normalize deserialize-only aliases before validating an inbound protocol value. */
+function normalizeInboundDefinition(definition, value) {
+    if (RUN_PROJECTION_DEFINITIONS.has(definition))
+        return normalizeRunProjection(value);
+    if (definition !== 'RunListResult' || !isRecord(value))
+        return value;
+    const existingRuns = value.runs;
+    if (!Array.isArray(existingRuns))
+        return value;
+    const runs = existingRuns.map(normalizeRunProjection);
+    return runs.some((run, index) => run !== existingRuns[index]) ? { ...value, runs } : value;
+}
+export function normalizeInboundSubscriptionFrame(kind, method, frame) {
+    if (kind !== 'run/watch' || method !== 'event' || !isRecord(frame.params))
+        return frame;
+    return { ...frame, params: normalizeInboundDefinition('RunWatchEventNotification', frame.params) };
+}
 export function assertDefinition(definition, value) {
     const validate = validatorFor(definition);
     if (validate(value))
@@ -28,7 +61,10 @@ export function assertDefinition(definition, value) {
 }
 export function assertMethodResult(method, value) {
     try {
-        assertDefinition(METHOD_RESULT_DEFINITIONS[method], value);
+        const definition = METHOD_RESULT_DEFINITIONS[method];
+        const normalized = normalizeInboundDefinition(definition, value);
+        assertDefinition(definition, normalized);
+        return normalized;
     }
     catch (error) {
         const receivedVersion = method === 'initialize' && value !== null && typeof value === 'object'

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@the-open-engine/zeroshot",
-  "version": "6.45.0",
+  "version": "6.46.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@the-open-engine/zeroshot",
-      "version": "6.45.0",
+      "version": "6.46.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@the-open-engine/zeroshot",
-  "version": "6.45.0",
+  "version": "6.46.0",
   "description": "Independent executor–verifier orchestration for software changes.",
   "main": "src/orchestrator.js",
   "bin": {

package/scripts/generate-cluster-types.js

@@ -117,6 +117,23 @@ function parenthesize(value) {
   return value.includes(' | ') || value.includes(' & ') ? `(${value})` : value;
 }
 
+function renderAlias(name, definition) {
+  const inline = `export type ${name} = ${schemaType(definition)};`;
+  if (Buffer.byteLength(inline) <= 120) return inline;
+  const multiline = schemaType(definition).replaceAll('; ', ';\n  ').replaceAll(' | ', '\n  | ');
+  return `export type ${name} =\n  ${multiline};`;
+}
+
+function renderSchemaModule(schema) {
+  const encoded = JSON.stringify(schema);
+  const chunks = encoded.match(/[\s\S]{1,72}/g) ?? [];
+  const expression = chunks.map((chunk) => `  ${JSON.stringify(chunk)}`).join(' +\n');
+  return (
+    '// Generated from protocol/openengine-cluster/v1/schema.json. Do not edit.\n' +
+    `export const CLUSTER_PROTOCOL_SCHEMA: unknown = JSON.parse(\n${expression}\n);\n`
+  );
+}
+
 function generate() {
   const openrpc = readJson(OPENRPC_PATH);
   const schema = readJson(SCHEMA_PATH);
@@ -137,7 +154,7 @@ function generate() {
     openrpc.methods.map((method) => [method.name, method.result.schema.$ref.split('/').at(-1)])
   );
   const aliases = Object.entries(schema.$defs)
-    .map(([name, definition]) => `export type ${name} = ${schemaType(definition)};`)
+    .map(([name, definition]) => renderAlias(name, definition))
     .join('\n');
 
   return (
@@ -194,7 +211,7 @@ function generate() {
 }
 
 const expected = generate();
-const schemaExpected = `// Generated from protocol/openengine-cluster/v1/schema.json. Do not edit.\nexport const CLUSTER_PROTOCOL_SCHEMA: unknown = ${JSON.stringify(readJson(SCHEMA_PATH))};\n`;
+const schemaExpected = renderSchemaModule(readJson(SCHEMA_PATH));
 const check = process.argv.includes('--check');
 const outputs = [
   [OUTPUT_PATH, expected],

package/src/cluster/connection.ts

@@ -12,7 +12,7 @@ import type { FrameRecord } from './frames.js';
 import { BoundedQueue } from './queue.js';
 import { addSocketListener } from './socket.js';
 import type { WebSocketLike } from './socket.js';
-import { assertDefinition, assertMethodResult } from './validators.js';
+import { assertDefinition, assertMethodResult, normalizeInboundSubscriptionFrame } from './validators.js';
 import {
   CONNECTION_TRANSITIONS,
   PROTOCOL_DIAGNOSTIC_CAPACITY,
@@ -193,7 +193,7 @@ export class Connection {
     if (!('result' in frame)) {
       entry.reject(new ClusterProtocolError('response has neither result nor error', 'INVALID_RESPONSE')); return;
     }
-    try { assertMethodResult(entry.method, frame.result); }
+    let validatedResult: unknown; try { validatedResult = assertMethodResult(entry.method, frame.result); }
     catch (error) {
       if (entry.subscriptionKind && isRecord(frame.result) && typeof frame.result.subscriptionId === 'string') {
         void this.#sendNotification('subscription/cancel', { subscriptionId: frame.result.subscriptionId })
@@ -201,8 +201,8 @@ export class Connection {
       }
       entry.reject(error); return;
     }
-    if (!entry.subscriptionKind) { entry.resolve(frame.result); return; }
-    const result = frame.result as ClusterMethodResults[SubscriptionMethod];
+    if (!entry.subscriptionKind) { entry.resolve(validatedResult); return; }
+    const result = validatedResult as ClusterMethodResults[SubscriptionMethod];
     const registration: SubscriptionRegistration = {
       id: result.subscriptionId, kind: entry.subscriptionKind,
       queue: new BoundedQueue<FrameRecord>(), overflowed: false, cancelSent: false,
@@ -232,14 +232,14 @@ export class Connection {
     if (registration.abortSignal && registration.abortHandler) {
       registration.abortSignal.removeEventListener('abort', registration.abortHandler);
     }
-    delete registration.abortSignal;
-    delete registration.abortHandler;
+    delete registration.abortSignal; delete registration.abortHandler;
   }
   #routeNotification(method: string, params: FrameRecord, frame: FrameRecord, bytes: number): void {
     const subscriptionId = params.subscriptionId;
     if (typeof subscriptionId !== 'string') { this.#recordProtocolError('subscription notification has no subscriptionId'); return; }
     const registration = this.#subscriptions.get(subscriptionId); if (!registration) return;
-    const terminal = method === 'subscription/closed'; const outcome = registration.queue.push(frame, bytes);
+    const routedFrame = normalizeInboundSubscriptionFrame(registration.kind, method, frame);
+    const terminal = method === 'subscription/closed'; const outcome = registration.queue.push(routedFrame, bytes);
     if (outcome === 'overflow') {
       registration.overflowed = true; this.unregisterSubscription(subscriptionId, registration); registration.queue.endRetainingBuffer();
       if (!terminal) void this.cancelSubscription(registration).catch((error: unknown) => this.recordDiagnostic(error));