@the-open-engine/zeroshot 6.23.0 → 6.25.0

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

@@ -2,13 +2,22 @@ import { createAcpAdapter } from './adapters/acp';
 import { claudeAdapter } from './adapters/claude';
 import { codexAdapter } from './adapters/codex';
 import { copilotAdapter } from './adapters/copilot';
-import { gatewayAdapter, gatewaySettingsDefaults, validateGatewaySettings } from './adapters/gateway';
+import {
+  gatewayAdapter,
+  gatewaySettingsDefaults,
+  validateGatewaySettings,
+} from './adapters/gateway';
 import { geminiAdapter } from './adapters/gemini';
 import { opencodeAdapter } from './adapters/opencode';
 import { ompAdapter } from './adapters/omp';
 import { piAdapter } from './adapters/pi';
 import { resolveClaudeCommand } from './claude-command';
-import { OMP_AUTH_INSTRUCTIONS, OMP_INSTALL_COMMAND } from './omp-release';
+import {
+  OMP_AUTH_INSTRUCTIONS,
+  OMP_DOCKER_INSTALL_COMMAND,
+  OMP_DOCKER_PLATFORM,
+  OMP_INSTALL_COMMAND,
+} from './omp-release';
 import type { ModelLevel, ProviderAdapter, StructuredOutputRecoveryAdapter } from './types';
 
 export type ProviderCapabilityState = boolean | 'experimental';
@@ -67,8 +76,24 @@ export interface ProviderDockerMountPreset {
   readonly readonly: boolean;
 }
 
+export interface ProviderDockerEnvAuth {
+  // At least one of these env vars must carry a usable (non-empty, non-whitespace) value for the
+  // effective container plan to be considered automatically authenticated. This is the AUTOMATIC
+  // allowlist only; a registry-known credential outside it is accepted when — and only when — the
+  // user explicitly opted it in (dockerEnvPassthrough / --mount).
+  // Providers with no `mount` (env-only) fail closed when nothing is satisfied.
+  readonly requireOneOf: readonly string[];
+  // Each inner group must be all-set-or-all-unset (e.g. a broker URL + token pair); a partial
+  // group is treated as malformed auth, not "missing".
+  readonly requireTogether?: readonly (readonly string[])[];
+  // Env vars whose value must parse as an absolute http(s) URL to count as set. A non-URL value
+  // is malformed auth, not "missing".
+  readonly requireUrl?: readonly string[];
+}
+
 export interface ProviderDockerMetadata {
-  readonly mount: ProviderDockerMountPreset;
+  // Omitted for env-only providers with zero automatic credential mounts (e.g. omp).
+  readonly mount?: ProviderDockerMountPreset;
   readonly envPassthrough: readonly string[];
   // False when the mounted dir doesn't hold the secret (auth is via an envPassthrough token).
   readonly credentialInMount?: boolean;
@@ -76,6 +101,14 @@ export interface ProviderDockerMetadata {
   // a docker-cached build layer for the per-provider image variant. Omit for providers already
   // baked into the base image (e.g. Claude) or not installable via a single command.
   readonly install?: string;
+  // Docker platform (e.g. 'linux/amd64') passed to both image build and container run. Omitted
+  // providers keep today's unset (host-native) behavior.
+  readonly platform?: string;
+  // $HOME-placeholder directories created owner-only inside the container for this provider's
+  // config/session state (never mounted/copied from the host).
+  readonly configRoots?: readonly string[];
+  // Fail-closed env/broker auth requirement, checked against the effective container env plan.
+  readonly envAuth?: ProviderDockerEnvAuth;
 }
 
 interface ProviderRegistryEntryBase {
@@ -405,8 +438,7 @@ export const providerRegistry = [
     binary: 'pi',
     command: { kind: 'fixed', command: 'pi', args: [] },
     invoke: SPAWN_INVOKE,
-    installInstructions:
-      'npm install -g --ignore-scripts @earendil-works/pi-coding-agent@0.80.3',
+    installInstructions: 'npm install -g --ignore-scripts @earendil-works/pi-coding-agent@0.80.3',
     authInstructions: 'pi\n/login',
     credentialPaths: ['~/.pi'],
     credentialEnvKeys: piAdapter.credentialEnvKeys,
@@ -452,16 +484,23 @@ export const providerRegistry = [
     settingsFields: [],
     availabilityProbe: 'help-or-version',
     // Written out explicitly rather than spread from STANDARD_CAPABILITIES, which defaults
-    // dockerIsolation to true; OMP stays worktree-only until Subissue 6 flips dockerIsolation.
+    // dockerIsolation to true; OMP's Docker path is env/broker-only and sessionless (see
+    // AGENTS.md OMP Docker section) rather than the standard credential-mount + resume shape.
+    // sessionResume is true as of issue #866: verified UUID partitions, two-phase file
+    // verification, and the owner-fenced ownership FSM (task-lib/omp-session-ownership.js) are
+    // live end to end for host, worktree, detached cluster-agent, and standalone manual resume.
+    // The two are independent: an isolated (Docker) OMP task allocates no session partition at all
+    // and launches `--no-session`, so `sessionResume: true` never implies a resumable container
+    // turn (task-lib/runner.js#resolveOmpSessionPlan, OMP_SESSIONLESS_ENV).
     capabilities: {
-      dockerIsolation: false,
+      dockerIsolation: true,
       worktreeIsolation: true,
       mcpServers: false,
       jsonSchema: false,
       streamJson: true,
       thinkingMode: true,
       reasoningEffort: true,
-      sessionResume: false,
+      sessionResume: true,
       webSearch: false,
     },
     docs: {
@@ -469,12 +508,49 @@ export const providerRegistry = [
       setupHeading: 'OMP Setup',
     },
     docker: {
-      mount: {
-        host: '~/.omp',
-        container: '$HOME/.omp',
-        readonly: true,
+      // No `mount`: OMP's Docker credential surface is env/broker-only with zero automatic
+      // mounts. `~/.omp`, agent.db, WAL/SHM files, and host refresh tokens are never mounted or
+      // copied into the container.
+      //
+      // envPassthrough is deliberately narrower than `credentialEnvKeys` above (the full adapter
+      // credential inventory, used for host inspection/redaction). Exact 5-name automatic
+      // allowlist per the maintainer's authoritative clarification (verified verbatim via
+      // `gh api repos/the-open-engine/zeroshot/issues/comments/5160272623`): "the exact automatic
+      // OMP Docker environment allowlist is only ANTHROPIC_API_KEY, OPENAI_API_KEY,
+      // GEMINI_API_KEY, OMP_AUTH_BROKER_URL, and OMP_AUTH_BROKER_TOKEN ... ANTHROPIC_OAUTH_TOKEN,
+      // ANTHROPIC_FOUNDRY_API_KEY, GOOGLE_API_KEY, OPENROUTER_API_KEY, and every other
+      // credential/path require explicit dockerEnvPassthrough/mount opt-in; OAuth users should
+      // prefer the auth broker so host refresh/access tokens do not cross automatically." This
+      // supersedes PLAN_READY step 2's nine-name list. Any validator flagging this as missing the
+      // four excluded names is checking stale plan text against a clarification it never read.
+      platform: OMP_DOCKER_PLATFORM,
+      install: OMP_DOCKER_INSTALL_COMMAND,
+      configRoots: ['$HOME/.omp'],
+      credentialInMount: false,
+      envPassthrough: [
+        'ANTHROPIC_API_KEY',
+        'GEMINI_API_KEY',
+        'OMP_AUTH_BROKER_TOKEN',
+        'OMP_AUTH_BROKER_URL',
+        'OPENAI_API_KEY',
+      ],
+      envAuth: {
+        // The four automatic *credential* names (the fifth allowlist entry, OMP_AUTH_BROKER_URL,
+        // is a locator, not a credential — it authenticates nothing on its own). Any other
+        // registry-known OMP credential (ANTHROPIC_OAUTH_TOKEN, OPENROUTER_API_KEY, …) is usable
+        // only via explicit dockerEnvPassthrough/--mount opt-in, never automatic forwarding.
+        requireOneOf: [
+          'ANTHROPIC_API_KEY',
+          'GEMINI_API_KEY',
+          'OMP_AUTH_BROKER_TOKEN',
+          'OPENAI_API_KEY',
+        ],
+        requireTogether: [['OMP_AUTH_BROKER_URL', 'OMP_AUTH_BROKER_TOKEN']],
+        // Per OMP v17.2.1 docs/environment-variables.md, OMP_AUTH_BROKER_URL is the broker's base
+        // URL (e.g. https://broker.tailnet:8765); anything that is not an http(s) URL is
+        // malformed broker config, and OMP hard-errors on a broker URL with no resolvable token.
+        requireUrl: ['OMP_AUTH_BROKER_URL'],
       },
-      envPassthrough: [],
     },
     defaultLevels: {
       min: ompAdapter.defaultMinLevel,
@@ -578,12 +654,16 @@ function validateWebSearchSettings(
 type RegistryProviderId = (typeof providerRegistry)[number]['id'];
 type RegistryProviderAlias = (typeof providerRegistry)[number]['aliases'][number];
 
-export const providerIds = providerRegistry.map((entry) => entry.id) as readonly RegistryProviderId[];
-export const providerAliases = providerRegistry.flatMap((entry) => entry.aliases) as readonly RegistryProviderAlias[];
-export const knownProviderNames = providerRegistry.flatMap((entry) => [entry.id, ...entry.aliases]) as readonly (
-  | RegistryProviderId
-  | RegistryProviderAlias
-)[];
+export const providerIds = providerRegistry.map(
+  (entry) => entry.id
+) as readonly RegistryProviderId[];
+export const providerAliases = providerRegistry.flatMap(
+  (entry) => entry.aliases
+) as readonly RegistryProviderAlias[];
+export const knownProviderNames = providerRegistry.flatMap((entry) => [
+  entry.id,
+  ...entry.aliases,
+]) as readonly (RegistryProviderId | RegistryProviderAlias)[];
 
 export const providerAliasMap: Readonly<Record<string, RegistryProviderId>> = Object.freeze(
   providerRegistry.reduce<Record<string, RegistryProviderId>>((result, entry) => {
@@ -621,7 +701,9 @@ export function listProviderRegistryEntries(): readonly ProviderRegistryEntry[]
   return providerRegistry;
 }
 
-export function findProviderRegistryEntry(name: string | null | undefined): ProviderRegistryEntry | undefined {
+export function findProviderRegistryEntry(
+  name: string | null | undefined
+): ProviderRegistryEntry | undefined {
   if (!name) return undefined;
   const normalized = normalizeProviderName(name);
   return providerRegistry.find((entry) => entry.id === normalized);

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

@@ -12,6 +12,7 @@ import type {
   StructuredOutputProviderRegistryEntry,
   UnstructuredOutputProviderRegistryEntry,
 } from './provider-registry';
+import type { OmpSessionLaunch } from './omp-rpc-session';
 
 export type ProviderId = (typeof providerIds)[number];
 export type ProviderAlias = (typeof providerAliases)[number];
@@ -329,6 +330,9 @@ export interface BuildProviderCommandOptions {
   readonly autoApprove?: boolean;
   readonly resumeSessionId?: string;
   readonly continueSession?: boolean;
+  // OMP-only: a verified session launch (none/fresh/resume) built from a checked partition —
+  // never a raw session id string. See src/agent-cli-provider/omp-rpc-session.ts.
+  readonly ompSession?: OmpSessionLaunch;
   readonly webSearch?: boolean;
   readonly claudeSettingsFile?: string;
   readonly cliFeatures?: CliFeatureOverrides;