@the-open-engine/zeroshot 6.35.2 → 6.36.0

package/src/target/discovery-validation.ts

@@ -1,11 +1,4 @@
 import { TargetDiscoveryError } from './discovery-errors.js';
-import { routeTemplate, type RouteTemplate } from './route-template.js';
-
-export interface CredentialInstallDescriptor {
-  readonly kind: 'openengine.capsule-credential-install/v1';
-  readonly install: { readonly routeTemplate: RouteTemplate; readonly method: 'PUT' };
-  readonly maxBodyBytes: number;
-}
 
 export function record(value: unknown, field: string): Record<string, unknown> {
   if (value === null || typeof value !== 'object' || Array.isArray(value)) {
@@ -17,7 +10,7 @@ export function record(value: unknown, field: string): Record<string, unknown> {
 export function closedRecord(
   value: unknown,
   field: string,
-  fields: readonly string[],
+  fields: readonly string[]
 ): Record<string, unknown> {
   const result = record(value, field);
   const unknown = Object.keys(result).find((key) => !fields.includes(key));
@@ -25,11 +18,7 @@ export function closedRecord(
   return result;
 }
 
-export function stringField(
-  source: Record<string, unknown>,
-  field: string,
-  parent = '',
-): string {
+export function stringField(source: Record<string, unknown>, field: string, parent = ''): string {
   const value = source[field];
   if (typeof value !== 'string' || value.length === 0) {
     throw new TargetDiscoveryError(`${parent}${field} must be a non-empty string`);
@@ -45,7 +34,7 @@ export function integer(
   value: unknown,
   field: string,
   min: number,
-  max = Number.MAX_SAFE_INTEGER,
+  max = Number.MAX_SAFE_INTEGER
 ): number {
   if (!Number.isSafeInteger(value) || (value as number) < min || (value as number) > max) {
     throw new TargetDiscoveryError(`${field} is outside the supported bounds`);
@@ -56,36 +45,37 @@ export function integer(
 export function exactStringSet(
   value: unknown,
   field: string,
-  expected: readonly string[],
+  expected: readonly string[]
 ): readonly string[] {
   if (!Array.isArray(value) || value.some((item) => typeof item !== 'string')) {
     throw new TargetDiscoveryError(`${field} must be an array of strings`);
   }
-  if (value.length !== expected.length || new Set(value).size !== value.length ||
-      expected.some((item) => !value.includes(item))) {
+  if (
+    value.length !== expected.length ||
+    new Set(value).size !== value.length ||
+    expected.some((item) => !value.includes(item))
+  ) {
     throw new TargetDiscoveryError(`${field} does not match the supported contract`);
   }
   return Object.freeze([...value]) as readonly string[];
 }
 
-function hasForbiddenUrlComponent(
-  url: URL,
-  value: string,
-  protocols: readonly string[],
-): boolean {
-  return !protocols.includes(url.protocol) ||
+function hasForbiddenUrlComponent(url: URL, value: string, protocols: readonly string[]): boolean {
+  return (
+    !protocols.includes(url.protocol) ||
     url.username !== '' ||
     url.password !== '' ||
     url.search !== '' ||
     url.hash !== '' ||
-    url.href !== value;
+    url.href !== value
+  );
 }
 
 export function sameOriginUrl(
   value: unknown,
   field: string,
   origin: string,
-  protocols: readonly string[] = ['https:', 'http:'],
+  protocols: readonly string[] = ['https:', 'http:']
 ): string {
   if (typeof value !== 'string' || /[\u0000-\u0020\u007f]|\s/u.test(value)) {
     throw new TargetDiscoveryError(`${field} must be a canonical absolute URL`);
@@ -104,39 +94,3 @@ export function sameOriginUrl(
   }
   return url.href;
 }
-
-export function parseCredentialInstall(value: unknown): CredentialInstallDescriptor | null {
-  if (value === undefined || value === null) return null;
-  const extension = closedRecord(value, 'extensions.credential_install', [
-    'kind',
-    'install',
-    'max_body_bytes',
-  ]);
-  exact(
-    extension.kind,
-    'openengine.capsule-credential-install/v1',
-    'extensions.credential_install.kind'
-  );
-  const install = closedRecord(extension.install, 'extensions.credential_install.install', [
-    'route_template',
-    'method',
-  ]);
-  exact(install.method, 'PUT', 'extensions.credential_install.install.method');
-  return Object.freeze({
-    kind: 'openengine.capsule-credential-install/v1' as const,
-    install: Object.freeze({
-      routeTemplate: routeTemplate(
-        install.route_template,
-        'extensions.credential_install.install.route_template',
-        ['capsule_id']
-      ),
-      method: 'PUT' as const,
-    }),
-    maxBodyBytes: integer(
-      extension.max_body_bytes,
-      'extensions.credential_install.max_body_bytes',
-      1,
-      4 * 1024 * 1024
-    ),
-  });
-}

package/src/target/discovery.ts

@@ -2,12 +2,7 @@ import type { HttpTransport } from './device-flow.js';
 import { readBoundedResponseJson } from './bounded-response.js';
 import { TargetDiscoveryError } from './discovery-errors.js';
 import type { RouteTemplate } from './route-template.js';
-import {
-  exact,
-  exactStringSet,
-  record,
-  type CredentialInstallDescriptor,
-} from './discovery-validation.js';
+import { exact, exactStringSet, record } from './discovery-validation.js';
 import type { RunIntentDescriptor } from './run-intent-discovery.js';
 import {
   parseAdapter,
@@ -20,7 +15,6 @@ import {
   parseTransport,
   validateOAuthMetadata,
 } from './discovery-sections.js';
-export type { CredentialInstallDescriptor } from './discovery-validation.js';
 export type { RunIntentDescriptor } from './run-intent-discovery.js';
 export { TargetDiscoveryError } from './discovery-errors.js';
 export { expandRoute, type RouteTemplate } from './route-template.js';
@@ -85,7 +79,6 @@ export interface TargetDiscoveryDescriptor {
     readonly closeCodes: { readonly expired: 4401; readonly revoked: 4403 };
   };
   readonly capabilityFlags: readonly string[];
-  readonly credentialInstall: CredentialInstallDescriptor | null;
   readonly runIntent: RunIntentDescriptor | null;
   readonly additional: Readonly<Record<string, unknown>>;
 }
@@ -147,7 +140,6 @@ function parseDiscoveryDocument(
     capsule,
     transport,
     capabilityFlags,
-    credentialInstall: extensions.credentialInstall,
     runIntent: extensions.runIntent,
     additional,
   });

package/src/target/index.ts

@@ -52,7 +52,6 @@ export {
   discoverTargetSessionEndpoints,
   expandRoute,
   TargetDiscoveryError,
-  type CredentialInstallDescriptor,
   type RunIntentDescriptor,
   type RouteTemplate,
   type TargetDiscoveryDescriptor,

package/src/target/run-intent-discovery.ts

@@ -1,6 +1,6 @@
 import type { RouteTemplate } from './route-template.js';
 import { routeTemplate } from './route-template.js';
-import { closedRecord, exact, sameOriginUrl } from './discovery-validation.js';
+import { closedRecord, record, sameOriginUrl } from './discovery-validation.js';
 
 export interface RunIntentDescriptor {
   readonly kind: 'zeroshot.run-intent/v2';
@@ -14,12 +14,13 @@ export interface RunIntentDescriptor {
 
 export function parseRunIntent(value: unknown, origin: string): RunIntentDescriptor | null {
   if (value === undefined || value === null) return null;
+  const advertised = record(value, 'extensions.run_intent');
+  if (advertised.kind !== 'zeroshot.run-intent/v2') return null;
   const extension = closedRecord(value, 'extensions.run_intent', [
     'kind',
     'base_url',
     'route_templates',
   ]);
-  exact(extension.kind, 'zeroshot.run-intent/v2', 'extensions.run_intent.kind');
   const routes = closedRecord(extension.route_templates, 'extensions.run_intent.route_templates', [
     'submit',
     'status',

package/lib/hosted-target/runtime-install.cjs

@@ -1,45 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.installRuntime = installRuntime;
-const bounded_response_js_1 = require("../target/bounded-response.cjs");
-const bounds_js_1 = require("./bounds.cjs");
-const errors_js_1 = require("./errors.cjs");
-const response_status_js_1 = require("./response-status.cjs");
-const retry_executor_js_1 = require("./retry-executor.cjs");
-function validOpaque(value, field) {
-    if (value.length === 0 || value.length > 1024) {
-        throw new errors_js_1.TargetProtocolError(`${field} is invalid`);
-    }
-}
-function runtimeBody(runtime, maximum) {
-    let body;
-    try {
-        body = JSON.stringify(runtime);
-    }
-    catch {
-        throw new errors_js_1.TargetProtocolError('Runtime bundle is not serializable');
-    }
-    if (body === undefined || Buffer.byteLength(body) > maximum) {
-        throw new errors_js_1.TargetProtocolError('Runtime bundle exceeds the advertised size bound');
-    }
-    return body;
-}
-async function installRuntime(options) {
-    validOpaque(options.capsuleId, 'capsule id');
-    validOpaque(options.accessToken, 'capsule access token');
-    let path;
-    try {
-        path = options.descriptor.install.routeTemplate.expand({
-            capsule_id: options.capsuleId,
-        });
-    }
-    catch {
-        throw new errors_js_1.TargetProtocolError('Runtime install route expansion is unsafe');
-    }
-    const body = runtimeBody(options.runtime, options.descriptor.maxBodyBytes);
-    await (0, retry_executor_js_1.withTargetRetry)('installRuntime', async () => {
-        const response = await options.request(options.descriptor.install.method, path, options.signal, body, options.accessToken);
-        await (0, response_status_js_1.assertCapsuleResponseStatus)(response, 204, (errorResponse) => (0, bounded_response_js_1.readBoundedResponseJson)(errorResponse, bounds_js_1.MAX_RESPONSE_BYTES, () => new errors_js_1.TargetProtocolError('Capsule error response is malformed')), options.clock);
-        await response.body?.cancel().catch(() => undefined);
-    }, options.signal, { clock: options.clock, policy: options.retryPolicy });
-}

package/lib/hosted-target/runtime-install.d.cts

@@ -1,14 +0,0 @@
-import type { CredentialInstallDescriptor } from '../target/discovery.js';
-import type { Clock, RetryPolicy } from './types.js';
-type RuntimeInstallOptions = {
-    readonly capsuleId: string;
-    readonly runtime: unknown;
-    readonly accessToken: string;
-    readonly descriptor: CredentialInstallDescriptor;
-    readonly signal?: AbortSignal;
-    readonly clock: Clock;
-    readonly retryPolicy: RetryPolicy;
-    readonly request: (method: string, path: string, signal: AbortSignal | undefined, body: string, accessToken: string) => Promise<Response>;
-};
-export declare function installRuntime(options: RuntimeInstallOptions): Promise<void>;
-export {};

package/lib/hosted-target/runtime-install.d.mts

@@ -1,14 +0,0 @@
-import type { CredentialInstallDescriptor } from '../target/discovery.js';
-import type { Clock, RetryPolicy } from './types.js';
-type RuntimeInstallOptions = {
-    readonly capsuleId: string;
-    readonly runtime: unknown;
-    readonly accessToken: string;
-    readonly descriptor: CredentialInstallDescriptor;
-    readonly signal?: AbortSignal;
-    readonly clock: Clock;
-    readonly retryPolicy: RetryPolicy;
-    readonly request: (method: string, path: string, signal: AbortSignal | undefined, body: string, accessToken: string) => Promise<Response>;
-};
-export declare function installRuntime(options: RuntimeInstallOptions): Promise<void>;
-export {};

package/lib/hosted-target/runtime-install.d.ts

@@ -1,14 +0,0 @@
-import type { CredentialInstallDescriptor } from '../target/discovery.js';
-import type { Clock, RetryPolicy } from './types.js';
-type RuntimeInstallOptions = {
-    readonly capsuleId: string;
-    readonly runtime: unknown;
-    readonly accessToken: string;
-    readonly descriptor: CredentialInstallDescriptor;
-    readonly signal?: AbortSignal;
-    readonly clock: Clock;
-    readonly retryPolicy: RetryPolicy;
-    readonly request: (method: string, path: string, signal: AbortSignal | undefined, body: string, accessToken: string) => Promise<Response>;
-};
-export declare function installRuntime(options: RuntimeInstallOptions): Promise<void>;
-export {};

package/lib/hosted-target/runtime-install.mjs

@@ -1,42 +0,0 @@
-import { readBoundedResponseJson } from '../target/bounded-response.mjs';
-import { MAX_RESPONSE_BYTES } from './bounds.mjs';
-import { TargetProtocolError } from './errors.mjs';
-import { assertCapsuleResponseStatus } from './response-status.mjs';
-import { withTargetRetry } from './retry-executor.mjs';
-function validOpaque(value, field) {
-    if (value.length === 0 || value.length > 1024) {
-        throw new TargetProtocolError(`${field} is invalid`);
-    }
-}
-function runtimeBody(runtime, maximum) {
-    let body;
-    try {
-        body = JSON.stringify(runtime);
-    }
-    catch {
-        throw new TargetProtocolError('Runtime bundle is not serializable');
-    }
-    if (body === undefined || Buffer.byteLength(body) > maximum) {
-        throw new TargetProtocolError('Runtime bundle exceeds the advertised size bound');
-    }
-    return body;
-}
-export async function installRuntime(options) {
-    validOpaque(options.capsuleId, 'capsule id');
-    validOpaque(options.accessToken, 'capsule access token');
-    let path;
-    try {
-        path = options.descriptor.install.routeTemplate.expand({
-            capsule_id: options.capsuleId,
-        });
-    }
-    catch {
-        throw new TargetProtocolError('Runtime install route expansion is unsafe');
-    }
-    const body = runtimeBody(options.runtime, options.descriptor.maxBodyBytes);
-    await withTargetRetry('installRuntime', async () => {
-        const response = await options.request(options.descriptor.install.method, path, options.signal, body, options.accessToken);
-        await assertCapsuleResponseStatus(response, 204, (errorResponse) => readBoundedResponseJson(errorResponse, MAX_RESPONSE_BYTES, () => new TargetProtocolError('Capsule error response is malformed')), options.clock);
-        await response.body?.cancel().catch(() => undefined);
-    }, options.signal, { clock: options.clock, policy: options.retryPolicy });
-}

package/src/hosted-target/runtime-install.ts

@@ -1,83 +0,0 @@
-import type { CredentialInstallDescriptor } from '../target/discovery.js';
-import { readBoundedResponseJson } from '../target/bounded-response.js';
-import { MAX_RESPONSE_BYTES } from './bounds.js';
-import { TargetProtocolError } from './errors.js';
-import { assertCapsuleResponseStatus } from './response-status.js';
-import { withTargetRetry } from './retry-executor.js';
-import type { Clock, RetryPolicy } from './types.js';
-
-type RuntimeInstallOptions = {
-  readonly capsuleId: string;
-  readonly runtime: unknown;
-  readonly accessToken: string;
-  readonly descriptor: CredentialInstallDescriptor;
-  readonly signal?: AbortSignal;
-  readonly clock: Clock;
-  readonly retryPolicy: RetryPolicy;
-  readonly request: (
-    method: string,
-    path: string,
-    signal: AbortSignal | undefined,
-    body: string,
-    accessToken: string
-  ) => Promise<Response>;
-};
-
-function validOpaque(value: string, field: string): void {
-  if (value.length === 0 || value.length > 1024) {
-    throw new TargetProtocolError(`${field} is invalid`);
-  }
-}
-
-function runtimeBody(runtime: unknown, maximum: number): string {
-  let body: string | undefined;
-  try {
-    body = JSON.stringify(runtime);
-  } catch {
-    throw new TargetProtocolError('Runtime bundle is not serializable');
-  }
-  if (body === undefined || Buffer.byteLength(body) > maximum) {
-    throw new TargetProtocolError('Runtime bundle exceeds the advertised size bound');
-  }
-  return body;
-}
-
-export async function installRuntime(options: RuntimeInstallOptions): Promise<void> {
-  validOpaque(options.capsuleId, 'capsule id');
-  validOpaque(options.accessToken, 'capsule access token');
-  let path: string;
-  try {
-    path = options.descriptor.install.routeTemplate.expand({
-      capsule_id: options.capsuleId,
-    });
-  } catch {
-    throw new TargetProtocolError('Runtime install route expansion is unsafe');
-  }
-  const body = runtimeBody(options.runtime, options.descriptor.maxBodyBytes);
-  await withTargetRetry(
-    'installRuntime',
-    async () => {
-      const response = await options.request(
-        options.descriptor.install.method,
-        path,
-        options.signal,
-        body,
-        options.accessToken
-      );
-      await assertCapsuleResponseStatus(
-        response,
-        204,
-        (errorResponse) =>
-          readBoundedResponseJson(
-            errorResponse,
-            MAX_RESPONSE_BYTES,
-            () => new TargetProtocolError('Capsule error response is malformed')
-          ),
-        options.clock
-      );
-      await response.body?.cancel().catch(() => undefined);
-    },
-    options.signal,
-    { clock: options.clock, policy: options.retryPolicy }
-  );
-}