@the-open-engine/zeroshot 6.29.1 → 6.30.0

package/lib/cluster-worker/runtime-support.js

@@ -1,25 +1,12 @@
 'use strict';
 
-const { randomUUID } = require('crypto');
 const { validateArtifactRef, validateWorkerOutcome } = require('./contracts');
-const { createCurrentEngineAdapter } = require('./engine-adapter');
 const { cloneJson, deepFreeze } = require('./object-utils');
-const { createDeploymentProfileRegistry } = require('./profiles');
 const { resolveRunPlan } = require('../run-plan');
+const { resolveRuntimeDependencies: resolveDependencies } = require('./runtime-dependencies');
 
 const CANCELLED = Symbol('cancelled');
 
-const DEPENDENCY_KEYS = new Set([
-  'profileRegistry',
-  'artifactResolver',
-  'artifactReceiptSink',
-  'engineAdapter',
-  'clock',
-  'timers',
-  'idFactory',
-  'cleanupFailureReporter',
-]);
-
 async function stageArtifacts(resolver, artifacts, context) {
   if (artifacts.length === 0) return deepFreeze({ artifacts: [] });
   if (context.signal?.aborted) return CANCELLED;
@@ -200,26 +187,7 @@ async function stopEngineWithinBound({ engineAdapter, timers, shutdownMs }) {
 }
 
 function resolveRuntimeDependencies(dependencies) {
-  const unknownDependencies = Object.keys(dependencies).filter((key) => !DEPENDENCY_KEYS.has(key));
-  if (unknownDependencies.length > 0) {
-    throw new Error(`Unsupported worker dependencies: ${unknownDependencies.join(', ')}`);
-  }
-  if (
-    dependencies.cleanupFailureReporter !== undefined &&
-    typeof dependencies.cleanupFailureReporter !== 'function'
-  ) {
-    throw new Error('cleanupFailureReporter must be a function');
-  }
-  return {
-    profileRegistry: dependencies.profileRegistry || createDeploymentProfileRegistry(),
-    artifactResolver: dependencies.artifactResolver || null,
-    artifactReceiptSink: dependencies.artifactReceiptSink || null,
-    engineAdapter: dependencies.engineAdapter || createCurrentEngineAdapter(),
-    clock: dependencies.clock || (() => Date.now()),
-    timers: dependencies.timers || { setTimeout, clearTimeout },
-    idFactory: dependencies.idFactory || (() => `legacy-worker-${randomUUID()}`),
-    cleanupFailureReporter: dependencies.cleanupFailureReporter || defaultCleanupFailureReporter,
-  };
+  return resolveDependencies(dependencies, defaultCleanupFailureReporter);
 }
 
 function assertProfilePlan(profile) {

package/lib/cluster-worker/terminal-normalizer.js

@@ -5,17 +5,16 @@ const { cloneJson, deepFreeze } = require('./object-utils');
 const { collectReceipts } = require('./runtime-support');
 
 async function resultFromEvent(event, options) {
-  let summary;
-  let status = 'succeeded';
-  let declaredArtifacts = event.artifacts;
+  let result;
+  let declaredArtifacts;
   if (Object.prototype.hasOwnProperty.call(event, 'result')) {
     validateLegacyShipResult(event.result);
-    summary = event.result.summary;
-    status = event.result.status;
+    result = event.result;
     declaredArtifacts = event.result.artifacts;
   } else {
-    summary = event.summary;
-    validateLegacyShipResult({ summary, status, artifacts: [] });
+    result = { summary: event.summary, status: 'succeeded', artifacts: [] };
+    validateLegacyShipResult(result);
+    declaredArtifacts = [];
   }
   const artifacts = await collectReceipts(options.artifactReceiptSink, declaredArtifacts, {
     clusterId: options.machine.clusterId,
@@ -24,9 +23,9 @@ async function resultFromEvent(event, options) {
     reportCleanupFailure: options.cleanupFailureReporter,
   });
   if (artifacts === options.cancelled) return options.cancelled;
-  const result = { summary, status, artifacts };
-  validateLegacyShipResult(result);
-  return result;
+  const normalized = { ...result, artifacts };
+  validateLegacyShipResult(normalized);
+  return normalized;
 }
 
 function createTerminalNormalizer(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@the-open-engine/zeroshot",
-  "version": "6.29.1",
+  "version": "6.30.0",
   "description": "Multi-agent orchestration engine for Claude, Codex, and Gemini",
   "main": "src/orchestrator.js",
   "bin": {
@@ -77,6 +77,7 @@
     "protocol:generate": "node scripts/generate-cluster-types.js",
     "protocol:check": "cargo run -p openengine-cluster-testkit --bin generate-cluster-protocol -- --check && node scripts/generate-cluster-types.js --check",
     "rust:distribution:check": "node scripts/rust-distribution.js check-repository",
+    "hosted-oecp:image:check": "node scripts/hosted-oecp-image.js check",
     "rust:check": "cargo fmt --all -- --check && cargo clippy --workspace --all-targets -- -D warnings && cargo test --workspace",
     "deadcode": "ts-prune --skip node_modules",
     "deadcode:files": "unimported",
@@ -163,7 +164,16 @@
     "cluster-templates/",
     "cluster-hooks/",
     "docker/",
+    "!docker/zeroshot-oecp/",
     "scripts/",
+    "!scripts/hosted-oecp-image.js",
+    "!scripts/hosted-oecp-image-commands.js",
+    "!scripts/hosted-oecp-image-smoke.js",
+    "!scripts/hosted-oecp-manifest.js",
+    "!scripts/hosted-oecp-smoke-capability.js",
+    "!scripts/hosted-oecp-smoke-client.js",
+    "!scripts/hosted-oecp-smoke-codex.mjs",
+    "!scripts/hosted-oecp-smoke-fixture.js",
     "protocol/openengine-cluster/v1/worker.schema.json",
     "docs/openengine-cluster-protocol/v1/legacy-worker.md",
     "README.md",

package/protocol/openengine-cluster/v1/worker.schema.json

@@ -246,15 +246,32 @@
             "null"
           ]
         },
+        "modelLevel": {
+          "enum": [
+            "level1",
+            "level2",
+            "level3"
+          ]
+        },
         "prompt": {
           "type": [
             "string",
             "null"
           ]
         },
+        "provider": {
+          "minLength": 1,
+          "pattern": "\\S",
+          "type": "string"
+        },
         "providerProfile": {
           "$ref": "#/$defs/CredentialHandle"
         },
+        "repository": {
+          "minLength": 1,
+          "pattern": "\\S",
+          "type": "string"
+        },
         "source": {
           "enum": [
             "issue",
@@ -267,13 +284,89 @@
         "source",
         "artifacts",
         "isolationProfile",
-        "providerProfile"
+        "providerProfile",
+        "repository",
+        "provider",
+        "modelLevel"
       ],
       "title": "LegacyShipRequest",
       "type": "object"
     },
     "LegacyShipResult": {
       "additionalProperties": false,
+      "oneOf": [
+        {
+          "properties": {
+            "branch": {
+              "minLength": 1,
+              "pattern": "\\S",
+              "type": "string"
+            },
+            "headRevision": {
+              "minLength": 1,
+              "pattern": "\\S",
+              "type": "string"
+            },
+            "pullRequestUrl": {
+              "minLength": 1,
+              "pattern": "\\S",
+              "type": "string"
+            },
+            "repository": {
+              "minLength": 1,
+              "pattern": "\\S",
+              "type": "string"
+            },
+            "status": {
+              "const": "succeeded"
+            }
+          },
+          "required": [
+            "repository",
+            "branch",
+            "headRevision",
+            "pullRequestUrl"
+          ]
+        },
+        {
+          "properties": {
+            "branch": {
+              "type": "null"
+            },
+            "headRevision": {
+              "type": "null"
+            },
+            "pullRequestUrl": {
+              "type": "null"
+            },
+            "repository": {
+              "type": "null"
+            },
+            "status": {
+              "const": "succeeded"
+            }
+          }
+        },
+        {
+          "properties": {
+            "branch": {
+              "type": "null"
+            },
+            "headRevision": {
+              "type": "null"
+            },
+            "pullRequestUrl": {
+              "type": "null"
+            },
+            "repository": {
+              "type": "null"
+            },
+            "status": {
+              "const": "failed"
+            }
+          }
+        }
+      ],
       "properties": {
         "artifacts": {
           "items": {
@@ -281,10 +374,39 @@
           },
           "type": "array"
         },
+        "branch": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "headRevision": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "pullRequestUrl": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "repository": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
         "status": {
-          "$ref": "#/$defs/LegacyShipStatus"
+          "enum": [
+            "succeeded",
+            "failed"
+          ]
         },
         "summary": {
+          "minLength": 1,
+          "pattern": "\\S",
           "type": "string"
         }
       },
@@ -296,13 +418,6 @@
       "title": "LegacyShipResult",
       "type": "object"
     },
-    "LegacyShipStatus": {
-      "enum": [
-        "succeeded",
-        "failed"
-      ],
-      "type": "string"
-    },
     "PayloadType": {
       "oneOf": [
         {
@@ -985,18 +1100,41 @@
                           "kind": "string"
                         }
                       },
+                      "modelLevel": {
+                        "required": true,
+                        "type": {
+                          "kind": "enum",
+                          "values": [
+                            "level1",
+                            "level2",
+                            "level3"
+                          ]
+                        }
+                      },
                       "prompt": {
                         "required": false,
                         "type": {
                           "kind": "string"
                         }
                       },
+                      "provider": {
+                        "required": true,
+                        "type": {
+                          "kind": "string"
+                        }
+                      },
                       "providerProfile": {
                         "required": true,
                         "type": {
                           "kind": "string"
                         }
                       },
+                      "repository": {
+                        "required": true,
+                        "type": {
+                          "kind": "string"
+                        }
+                      },
                       "source": {
                         "required": true,
                         "type": {
@@ -1114,6 +1252,30 @@
                           "kind": "array"
                         }
                       },
+                      "branch": {
+                        "required": false,
+                        "type": {
+                          "kind": "string"
+                        }
+                      },
+                      "headRevision": {
+                        "required": false,
+                        "type": {
+                          "kind": "string"
+                        }
+                      },
+                      "pullRequestUrl": {
+                        "required": false,
+                        "type": {
+                          "kind": "string"
+                        }
+                      },
+                      "repository": {
+                        "required": false,
+                        "type": {
+                          "kind": "string"
+                        }
+                      },
                       "status": {
                         "required": true,
                         "type": {

package/src/agent-cli-provider/contract-actions.ts

@@ -21,8 +21,11 @@ import { getString, isRecord, unknownToMessage } from './json';
 import type { ErrorClassification } from './types';
 import type { ProcessRunner } from './process-runner';
 
-function runBuildCommand(request: RequestData): ContractEnvelope {
-  const { adapter, commandSpec, options } = buildCommandSpec(request);
+function runBuildCommand(
+  request: RequestData,
+  runtimeSettings?: Record<string, unknown>
+): ContractEnvelope {
+  const { adapter, commandSpec, options } = buildCommandSpec(request, runtimeSettings);
   const webSearch = {
     requested: options.webSearch === true,
     effective: options.webSearch === true && options.cliFeatures?.supportsWebSearch === true,
@@ -134,19 +137,20 @@ function runClassifyError(request: RequestData): ContractEnvelope {
 
 export function dispatchRequest(
   request: RequestData,
-  runner: ProcessRunner
+  runner: ProcessRunner,
+  runtimeSettings?: Record<string, unknown>
 ): ContractEnvelope | Promise<ContractEnvelope> {
   switch (request.command) {
     case 'probe':
       return runProbe(request);
     case 'build-command':
-      return runBuildCommand(request);
+      return runBuildCommand(request, runtimeSettings);
     case 'parse-output':
       return runParseOutput(request);
     case 'classify-error':
       return runClassifyError(request);
     case 'invoke':
-      return runInvoke(request, runner);
+      return runInvoke(request, runner, runtimeSettings);
     default:
       throw contractError({
         code: 'unknown-command',

package/src/agent-cli-provider/contract-invoke.ts

@@ -120,9 +120,10 @@ async function runOmpRpcContractPrompt(
 
 export async function runInvoke(
   request: RequestData,
-  runner: ProcessRunner
+  runner: ProcessRunner,
+  runtimeSettings?: Record<string, unknown>
 ): Promise<ContractEnvelope> {
-  const { adapter, commandSpec, context, options } = buildCommandSpec(request);
+  const { adapter, commandSpec, context, options } = buildCommandSpec(request, runtimeSettings);
   const timeoutMs = optionalNumber(request.raw, 'timeoutMs');
   const runnerOptions = timeoutMs === undefined ? {} : { timeoutMs };
   const invokeSpec = getProviderRegistryEntry(adapter.id).invoke;

package/src/agent-cli-provider/contract-support.ts

@@ -94,7 +94,10 @@ function buildOptions(request: RequestData): BuildProviderCommandOptions {
   return { ...options, cwd };
 }
 
-export function buildCommandSpec(request: RequestData): {
+export function buildCommandSpec(
+  request: RequestData,
+  runtimeSettings?: Record<string, unknown>
+): {
   readonly adapter: ProviderAdapter;
   readonly commandSpec: CommandSpec;
   readonly options: BuildProviderCommandOptions;
@@ -103,11 +106,14 @@ export function buildCommandSpec(request: RequestData): {
   const adapter = adapterForProvider(request.provider);
   const context = requiredString(request.raw, 'context');
   const options = buildOptions(request);
-  const prepared = prepareSingleAgentProviderCommand({
-    provider: adapter.id,
-    context,
-    options,
-  });
+  const prepared = prepareSingleAgentProviderCommand(
+    {
+      provider: adapter.id,
+      context,
+      options,
+    },
+    runtimeSettings
+  );
   return {
     adapter: prepared.adapter,
     context,

package/src/agent-cli-provider/contract.ts

@@ -32,6 +32,7 @@ export interface ProviderExecutableResponse {
 
 export interface ProviderExecutableOptions {
   readonly runner?: ProcessRunner;
+  readonly runtimeSettings?: Record<string, unknown>;
 }
 
 export async function runProviderExecutable(
@@ -41,7 +42,11 @@ export async function runProviderExecutable(
   const fallback = requestEnvelopeData(input);
   try {
     const request = validateRequest(input, providerExecutableSchemaVersion);
-    const envelope = await dispatchRequest(request, options.runner ?? spawnProcessRunner());
+    const envelope = await dispatchRequest(
+      request,
+      options.runner ?? spawnProcessRunner(),
+      options.runtimeSettings
+    );
     return {
       envelope: finalizeEnvelope(envelope, request.env),
       exitCode: 0,

package/src/agent-cli-provider/index.ts

@@ -55,6 +55,7 @@ export {
   type SingleAgentProviderCommandInput,
 } from './single-agent-runtime';
 export {
+  credentialEnvKeysForProvider,
   findProviderRegistryEntry,
   getProviderRegistryEntry,
   knownProviderNames,

package/src/agent-cli-provider/provider-registry.ts

@@ -715,6 +715,10 @@ export function getProviderRegistryEntry(name: string): ProviderRegistryEntry {
   throw new Error(`Unknown provider: ${name}. Valid: ${providerIds.join(', ')}`);
 }
 
+export function credentialEnvKeysForProvider(providerId: string): readonly string[] {
+  return getProviderRegistryEntry(providerId).credentialEnvKeys;
+}
+
 export function resolveProviderCommand(name: string): {
   readonly command: string;
   readonly args: readonly string[];