@the-open-engine/zeroshot 6.30.2 → 6.31.1

package/src/agent-cli-provider/process-runner.ts

@@ -1,4 +1,4 @@
-import { spawn } from 'node:child_process';
+import { spawn, type ChildProcess } from 'node:child_process';
 import { omitProcessControlEnv, omitUnsafeProviderEnv } from './env-safety';
 import type { CommandSpec } from './types';
 
@@ -8,6 +8,7 @@ const PROVIDER_STDIO: ['ignore', 'pipe', 'pipe'] = ['ignore', 'pipe', 'pipe'];
 export interface ProcessRunnerOptions {
   readonly timeoutMs?: number;
   readonly timeoutKillGraceMs?: number;
+  readonly signal?: AbortSignal;
 }
 
 export interface ProcessResult {
@@ -29,26 +30,39 @@ interface TimeoutState {
   timedOut: boolean;
   timeout?: NodeJS.Timeout;
   timeoutKill?: NodeJS.Timeout;
+  removeAbortListener?: () => void;
 }
 
 function clearTimeoutState(state: TimeoutState): void {
   if (state.timeout !== undefined) clearTimeout(state.timeout);
   if (state.timeoutKill !== undefined) clearTimeout(state.timeoutKill);
+  state.removeAbortListener?.();
 }
 
-function armTimeout(
-  child: ReturnType<typeof spawn>,
+function armTermination(
+  child: ChildProcess,
   options: ProcessRunnerOptions,
   state: TimeoutState,
   isSettled: () => boolean
 ): void {
-  if (options.timeoutMs === undefined) return;
-  state.timeout = setTimeout(() => {
-    state.timedOut = true;
+  const terminate = (): void => {
     child.kill('SIGTERM');
+    if (state.timeoutKill !== undefined) return;
     state.timeoutKill = setTimeout(() => {
       if (!isSettled()) child.kill('SIGKILL');
     }, options.timeoutKillGraceMs ?? DEFAULT_TIMEOUT_KILL_GRACE_MS);
+  };
+
+  if (options.signal !== undefined) {
+    const abort = (): void => terminate();
+    options.signal.addEventListener('abort', abort, { once: true });
+    state.removeAbortListener = (): void => options.signal?.removeEventListener('abort', abort);
+    if (options.signal.aborted) terminate();
+  }
+  if (options.timeoutMs === undefined) return;
+  state.timeout = setTimeout(() => {
+    state.timedOut = true;
+    terminate();
   }, options.timeoutMs);
 }
 
@@ -95,7 +109,7 @@ function spawnOptions(commandSpec: CommandSpec): {
 }
 
 function attachOutputCollectors(
-  child: ReturnType<typeof spawn>,
+  child: ChildProcess,
   stdout: Buffer[],
   stderr: Buffer[]
 ): void {
@@ -140,6 +154,6 @@ export function spawnProcessRunner(): ProcessRunner {
         }
       });
 
-      armTimeout(child, options, timeoutState, () => settled);
+      armTermination(child, options, timeoutState, () => settled);
     });
 }

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

@@ -13,11 +13,12 @@ import { ompAdapter } from './adapters/omp';
 import { piAdapter } from './adapters/pi';
 import { resolveClaudeCommand } from './claude-command';
 import {
-  OMP_AUTH_INSTRUCTIONS,
   OMP_DOCKER_INSTALL_COMMAND,
   OMP_DOCKER_PLATFORM,
   OMP_INSTALL_COMMAND,
-} from './omp-release';
+} from './omp/release';
+import { OMP_SDK_SETTINGS_DEFAULTS, validateOmpSdkSettings } from './omp/sdk-settings';
+import type { OmpSettingsValidationContext } from './omp/sdk-settings';
 import type { ModelLevel, ProviderAdapter, StructuredOutputRecoveryAdapter } from './types';
 
 export type ProviderCapabilityState = boolean | 'experimental';
@@ -125,7 +126,10 @@ interface ProviderRegistryEntryBase {
   readonly credentialEnvKeys: readonly string[];
   readonly settingsFields: readonly string[];
   readonly settingsDefaults?: Readonly<Record<string, unknown>>;
-  readonly settingsValidator?: (settings: Record<string, unknown>) => string | null;
+  readonly settingsValidator?: (
+    settings: Record<string, unknown>,
+    context?: OmpSettingsValidationContext
+  ) => string | null;
   readonly availabilityProbe?: 'command' | 'help-or-version';
   readonly docs: ProviderDocsMetadata;
   readonly docker: ProviderDockerMetadata;
@@ -258,7 +262,7 @@ export const providerRegistry = [
       default: claudeAdapter.defaultLevel,
       max: claudeAdapter.defaultMaxLevel,
     },
-    adapter: claudeAdapter,
+    adapter: claudeAdapter as StructuredOutputRecoveryAdapter,
   },
   {
     id: 'codex',
@@ -300,7 +304,7 @@ export const providerRegistry = [
       default: codexAdapter.defaultLevel,
       max: codexAdapter.defaultMaxLevel,
     },
-    adapter: codexAdapter,
+    adapter: codexAdapter as StructuredOutputRecoveryAdapter,
   },
   {
     id: 'gateway',
@@ -387,7 +391,7 @@ export const providerRegistry = [
       default: geminiAdapter.defaultLevel,
       max: geminiAdapter.defaultMaxLevel,
     },
-    adapter: geminiAdapter,
+    adapter: geminiAdapter as StructuredOutputRecoveryAdapter,
   },
   {
     id: 'opencode',
@@ -428,7 +432,7 @@ export const providerRegistry = [
       default: opencodeAdapter.defaultLevel,
       max: opencodeAdapter.defaultMaxLevel,
     },
-    adapter: opencodeAdapter,
+    adapter: opencodeAdapter as StructuredOutputRecoveryAdapter,
   },
   {
     id: 'pi',
@@ -478,10 +482,25 @@ export const providerRegistry = [
     command: { kind: 'fixed', command: 'omp', args: [] },
     invoke: RPC_STDIO_INVOKE,
     installInstructions: OMP_INSTALL_COMMAND,
-    authInstructions: OMP_AUTH_INSTRUCTIONS,
+    authInstructions:
+      'Manually edit providerSettings.omp in ZEROSHOT_SETTINGS_FILE or $HOME/.zeroshot/settings.json (file 0600, parent directory 0700). Use declared environment or broker variables, an explicit host-only OMP agent directory containing agent.db, or keyless mode; Zeroshot never logs in or stores credential values.',
     credentialPaths: ['~/.omp'],
     credentialEnvKeys: ompAdapter.credentialEnvKeys,
-    settingsFields: [],
+    settingsFields: [
+      'transport',
+      'minLevel',
+      'defaultLevel',
+      'maxLevel',
+      'levelOverrides',
+      'modelsConfig',
+      'auth',
+      'tools',
+      'nestedAgents',
+      'mcp',
+    ],
+    settingsDefaults: { ...OMP_SDK_SETTINGS_DEFAULTS },
+    settingsValidator: (settings, context): string | null =>
+      settings.transport === 'rpc' ? null : validateOmpSdkSettings(settings, context),
     availabilityProbe: 'help-or-version',
     // Written out explicitly rather than spread from STANDARD_CAPABILITIES, which defaults
     // dockerIsolation to true; OMP's Docker path is env/broker-only and sessionless (see
@@ -505,7 +524,7 @@ export const providerRegistry = [
     },
     docs: {
       label: 'OMP',
-      setupHeading: 'OMP Setup',
+      setupHeading: 'OMP Manual Configuration',
     },
     docker: {
       // No `mount`: OMP's Docker credential surface is env/broker-only with zero automatic