workerd 1.20260415.1 → 1.20260416.2

package/bin/workerd

@@ -122,7 +122,7 @@ by workerd to install the correct binary executable for your current platform.`)
       "node_modules",
       ".cache",
       "workerd",
-      `pnpapi-${pkg.replace("/", "-")}-${"1.20260415.1"}-${import_path.default.basename(subpath)}`
+      `pnpapi-${pkg.replace("/", "-")}-${"1.20260416.2"}-${import_path.default.basename(subpath)}`
     );
     if (!import_fs.default.existsSync(binTargetPath)) {
       import_fs.default.mkdirSync(import_path.default.dirname(binTargetPath), { recursive: true });

package/install.js

@@ -94,10 +94,10 @@ operating system, or missing some shared libraries.`;
     console.error(msg);
     return;
   }
-  if (stdout !== `workerd ${"2026-04-15"}`) {
+  if (stdout !== `workerd ${"2026-04-16"}`) {
     throw new Error(
       `Expected ${JSON.stringify(
-        "2026-04-15"
+        "2026-04-16"
       )} but got ${JSON.stringify(stdout)}`
     );
   }
@@ -152,7 +152,7 @@ function installUsingNPM(pkg, subpath, binPath) {
   try {
     import_fs.default.writeFileSync(import_path2.default.join(installDir, "package.json"), "{}");
     import_child_process.default.execSync(
-      `npm install --loglevel=error --prefer-offline --no-audit --progress=false ${pkg}@${"1.20260415.1"}`,
+      `npm install --loglevel=error --prefer-offline --no-audit --progress=false ${pkg}@${"1.20260416.2"}`,
       { cwd: installDir, stdio: "pipe", env }
     );
     const installedBinPath = import_path2.default.join(
@@ -197,7 +197,7 @@ function maybeOptimizePackage(binPath) {
 }
 async function downloadDirectlyFromNPM(pkg, subpath, binPath) {
   const unscopedPkg = pkg.substring(pkg.indexOf("/") + 1);
-  const url = `https://registry.npmjs.org/${pkg}/-/${unscopedPkg}-${"1.20260415.1"}.tgz`;
+  const url = `https://registry.npmjs.org/${pkg}/-/${unscopedPkg}-${"1.20260416.2"}.tgz`;
   console.error(`[workerd] Trying to download ${JSON.stringify(url)}`);
   try {
     import_fs.default.writeFileSync(

package/lib/main.js

@@ -136,7 +136,7 @@ by workerd to install the correct binary executable for your current platform.`)
       "node_modules",
       ".cache",
       "workerd",
-      `pnpapi-${pkg.replace("/", "-")}-${"1.20260415.1"}-${import_path.default.basename(subpath)}`
+      `pnpapi-${pkg.replace("/", "-")}-${"1.20260416.2"}-${import_path.default.basename(subpath)}`
     );
     if (!import_fs.default.existsSync(binTargetPath)) {
       import_fs.default.mkdirSync(import_path.default.dirname(binTargetPath), { recursive: true });
@@ -151,8 +151,8 @@ by workerd to install the correct binary executable for your current platform.`)
 // npm/lib/node-path.ts
 var { binPath } = generateBinPath();
 var node_path_default = binPath;
-var compatibilityDate = "2026-04-15";
-var version = "1.20260415.1";
+var compatibilityDate = "2026-04-16";
+var version = "1.20260416.2";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   compatibilityDate,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workerd",
-  "version": "1.20260415.1",
+  "version": "1.20260416.2",
   "description": "👷 workerd, Cloudflare's JavaScript/Wasm Runtime",
   "repository": "https://github.com/cloudflare/workerd",
   "scripts": {
@@ -14,11 +14,11 @@
     "workerd": "bin/workerd"
   },
   "optionalDependencies": {
-    "@cloudflare/workerd-darwin-arm64": "1.20260415.1",
-    "@cloudflare/workerd-darwin-64": "1.20260415.1",
-    "@cloudflare/workerd-linux-arm64": "1.20260415.1",
-    "@cloudflare/workerd-linux-64": "1.20260415.1",
-    "@cloudflare/workerd-windows-64": "1.20260415.1"
+    "@cloudflare/workerd-darwin-arm64": "1.20260416.2",
+    "@cloudflare/workerd-darwin-64": "1.20260416.2",
+    "@cloudflare/workerd-linux-arm64": "1.20260416.2",
+    "@cloudflare/workerd-linux-64": "1.20260416.2",
+    "@cloudflare/workerd-windows-64": "1.20260416.2"
   },
   "license": "Apache-2.0"
 }

package/worker.mjs

@@ -445,76 +445,159 @@ Segment #${me}
 export interface AiSearchInternalError extends Error {}
 export interface AiSearchNotFoundError extends Error {}
 
-// ============ AI Search Request Types ============
+// ============ AI Search Common Types ============
 
-export type AiSearchSearchRequest = {
-  messages: Array<{
-    role: 'system' | 'developer' | 'user' | 'assistant' | 'tool';
-    content: string | null;
-  }>;
-  ai_search_options?: {
-    retrieval?: {
-      retrieval_type?: 'vector' | 'keyword' | 'hybrid';
-      /** Match threshold (0-1, default 0.4) */
-      match_threshold?: number;
-      /** Maximum number of results (1-50, default 10) */
-      max_num_results?: number;
-      filters?: VectorizeVectorMetadataFilter;
-      /** Context expansion (0-3, default 0) */
-      context_expansion?: number;
-      [key: string]: unknown;
-    };
-    query_rewrite?: {
-      enabled?: boolean;
-      model?: string;
-      rewrite_prompt?: string;
-      [key: string]: unknown;
-    };
-    reranking?: {
-      enabled?: boolean;
-      model?: '@cf/baai/bge-reranker-base' | string;
-      /** Match threshold (0-1, default 0.4) */
-      match_threshold?: number;
-      [key: string]: unknown;
-    };
+/** A single message in a conversation-style search or chat request. */
+export type AiSearchMessage = {
+  role: 'system' | 'developer' | 'user' | 'assistant' | 'tool';
+  content: string | null;
+};
+
+/**
+ * Common shape for \`ai_search_options\` used by both single-instance and multi-instance requests.
+ * Contains retrieval, query rewrite, reranking, and cache sub-options.
+ */
+export type AiSearchOptions = {
+  retrieval?: {
+    /** Which retrieval backend to use. Defaults to the instance's configured index_method. */
+    retrieval_type?: 'vector' | 'keyword' | 'hybrid';
+    /** Fusion method for combining vector + keyword results. */
+    fusion_method?: 'max' | 'rrf';
+    /** How keyword terms are combined: "and" = all terms must match, "or" = any term matches. */
+    keyword_match_mode?: 'and' | 'or';
+    /** Minimum similarity score (0-1) for a result to be included. Default 0.4. */
+    match_threshold?: number;
+    /** Maximum number of results to return (1-50). Default 10. */
+    max_num_results?: number;
+    /** Vectorize metadata filters applied to the search. */
+    filters?: VectorizeVectorMetadataFilter;
+    /** Number of surrounding chunks to include for context (0-3). Default 0. */
+    context_expansion?: number;
+    /** If true, return only item metadata without chunk text. */
+    metadata_only?: boolean;
+    /** If true (default), return empty results on retrieval failure instead of throwing. */
+    return_on_failure?: boolean;
+    /** Boost results by metadata field values. Max 3 entries. */
+    boost_by?: Array<{
+      field: string;
+      direction?: 'asc' | 'desc' | 'exists' | 'not_exists';
+    }>;
+    [key: string]: unknown;
+  };
+  query_rewrite?: {
+    enabled?: boolean;
+    model?: string;
+    rewrite_prompt?: string;
+    [key: string]: unknown;
+  };
+  reranking?: {
+    enabled?: boolean;
+    model?: string;
+    /** Match threshold (0-1, default 0.4) */
+    match_threshold?: number;
     [key: string]: unknown;
   };
+  cache?: {
+    enabled?: boolean;
+    cache_threshold?:
+      | 'super_strict_match'
+      | 'close_enough'
+      | 'flexible_friend'
+      | 'anything_goes';
+  };
+  [key: string]: unknown;
 };
 
+// ============ AI Search Request Types ============
+
+/**
+ * Request body for single-instance search.
+ * Exactly one of \`query\` or \`messages\` must be provided.
+ */
+export type AiSearchSearchRequest =
+  | {
+      /** Simple query string. */
+      query: string;
+      messages?: never;
+      ai_search_options?: AiSearchOptions;
+    }
+  | {
+      query?: never;
+      /** Conversation-style input. At least one user message with non-empty content is required. */
+      messages: AiSearchMessage[];
+      ai_search_options?: AiSearchOptions;
+    };
+
 export type AiSearchChatCompletionsRequest = {
-  messages: Array<{
-    role: 'system' | 'developer' | 'user' | 'assistant' | 'tool';
-    content: string | null;
-    [key: string]: unknown;
-  }>;
+  messages: AiSearchMessage[];
   model?: string;
   stream?: boolean;
-  ai_search_options?: {
-    retrieval?: {
-      retrieval_type?: 'vector' | 'keyword' | 'hybrid';
-      match_threshold?: number;
-      max_num_results?: number;
-      filters?: VectorizeVectorMetadataFilter;
-      context_expansion?: number;
-      [key: string]: unknown;
-    };
-    query_rewrite?: {
-      enabled?: boolean;
-      model?: string;
-      rewrite_prompt?: string;
-      [key: string]: unknown;
-    };
-    reranking?: {
-      enabled?: boolean;
-      model?: '@cf/baai/bge-reranker-base' | string;
-      match_threshold?: number;
-      [key: string]: unknown;
+  ai_search_options?: AiSearchOptions;
+  [key: string]: unknown;
+};
+
+// ============ AI Search Multi-Instance Types (Namespace-Scoped) ============
+
+/** \`ai_search_options\` shape for multi-instance requests \u2014 requires \`instance_ids\`. */
+export type AiSearchMultiSearchOptions = AiSearchOptions & {
+  /** Instance IDs to search across (1-10). */
+  instance_ids: string[];
+};
+
+/**
+ * Request for searching across multiple instances within a namespace.
+ * \`ai_search_options\` is required and must include \`instance_ids\`.
+ * Exactly one of \`query\` or \`messages\` must be provided.
+ */
+export type AiSearchMultiSearchRequest =
+  | {
+      /** Simple query string. */
+      query: string;
+      messages?: never;
+      ai_search_options: AiSearchMultiSearchOptions;
+    }
+  | {
+      query?: never;
+      /** Conversation-style input. */
+      messages: AiSearchMessage[];
+      ai_search_options: AiSearchMultiSearchOptions;
     };
-    [key: string]: unknown;
+
+/** A search result chunk tagged with the instance it originated from. */
+export type AiSearchMultiSearchChunk =
+  AiSearchSearchResponse['chunks'][number] & {
+    instance_id: string;
   };
-  [key: string]: unknown;
+
+/** Describes a per-instance error during a multi-instance operation. */
+export type AiSearchMultiSearchError = {
+  instance_id: string;
+  message: string;
+};
+
+/** Response from a multi-instance search, with chunks tagged by instance and optional partial-failure errors. */
+export type AiSearchMultiSearchResponse = {
+  search_query: string;
+  chunks: AiSearchMultiSearchChunk[];
+  errors?: AiSearchMultiSearchError[];
 };
 
+/** Request for chat completions across multiple instances within a namespace. \`ai_search_options\` is required and must include \`instance_ids\`. */
+export type AiSearchMultiChatCompletionsRequest = Omit<
+  AiSearchChatCompletionsRequest,
+  'ai_search_options'
+> & {
+  ai_search_options: AiSearchMultiSearchOptions;
+};
+
+/** Response from multi-instance chat completions, with chunks tagged by instance and optional partial-failure errors. */
+export type AiSearchMultiChatCompletionsResponse = Omit<
+  AiSearchChatCompletionsResponse,
+  'chunks'
+> & {
+  chunks: AiSearchMultiSearchChunk[];
+  errors?: AiSearchMultiSearchError[];
+};
 
 // ============ AI Search Response Types ============
 
@@ -536,6 +619,14 @@ export type AiSearchSearchResponse = {
       keyword_score?: number;
       /** Vector similarity score (0-1) */
       vector_score?: number;
+      /** Keyword rank position */
+      keyword_rank?: number;
+      /** Vector rank position */
+      vector_rank?: number;
+      /** Reranking model score */
+      reranking_score?: number;
+      /** Fusion method used to combine results */
+      fusion_method?: 'rrf' | 'max';
       [key: string]: unknown;
     };
   }>;
@@ -566,6 +657,18 @@ export type AiSearchStatsResponse = {
   skipped?: number;
   outdated?: number;
   last_activity?: string;
+  /** Storage engine statistics. */
+  engine?: {
+    vectorize?: {
+      vectorsCount: number;
+      dimensions: number;
+    };
+    r2?: {
+      payloadSizeBytes: number;
+      metadataSizeBytes: number;
+      objectCount: number;
+    };
+  };
 };
 
 // ============ AI Search Instance Info Types ============
@@ -574,14 +677,67 @@ export type AiSearchInstanceInfo = {
   id: string;
   type?: 'r2' | 'web-crawler' | string;
   source?: string;
+  source_params?: unknown;
   paused?: boolean;
   status?: string;
   namespace?: string;
   created_at?: string;
   modified_at?: string;
+  token_id?: string;
+  ai_gateway_id?: string;
+  rewrite_query?: boolean;
+  reranking?: boolean;
+  embedding_model?: string;
+  ai_search_model?: string;
+  rewrite_model?: string;
+  reranking_model?: string;
+  /** @deprecated Use index_method instead. */
+  hybrid_search_enabled?: boolean;
+  /** Controls which storage backends are active. */
+  index_method?: { vector?: boolean; keyword?: boolean };
+  /** Fusion method for combining vector and keyword results. */
+  fusion_method?: 'max' | 'rrf';
+  indexing_options?: { keyword_tokenizer?: 'porter' | 'trigram' } | null;
+  retrieval_options?: {
+    keyword_match_mode?: 'and' | 'or';
+    boost_by?: Array<{
+      field: string;
+      direction?: 'asc' | 'desc' | 'exists' | 'not_exists';
+    }>;
+  } | null;
+  chunk?: boolean;
+  chunk_size?: number;
+  chunk_overlap?: number;
+  score_threshold?: number;
+  max_num_results?: number;
+  cache?: boolean;
+  cache_threshold?:
+    | 'super_strict_match'
+    | 'close_enough'
+    | 'flexible_friend'
+    | 'anything_goes';
+  custom_metadata?: Array<{
+    field_name: string;
+    data_type: 'text' | 'number' | 'boolean' | 'datetime';
+  }>;
+  /** Sync interval in seconds. */
+  sync_interval?: 3600 | 7200 | 14400 | 21600 | 43200 | 86400;
+  metadata?: Record<string, unknown>;
   [key: string]: unknown;
 };
 
+/** Pagination, search, and ordering parameters for listing instances within a namespace. */
+export type AiSearchListInstancesParams = {
+  page?: number;
+  per_page?: number;
+  /** Search instances by ID. */
+  search?: string;
+  /** Field to sort by. */
+  order_by?: 'created_at';
+  /** Sort direction. */
+  order_by_direction?: 'asc' | 'desc';
+};
+
 export type AiSearchListResponse = {
   result: AiSearchInstanceInfo[];
   result_info?: {
@@ -611,6 +767,43 @@ export type AiSearchConfig = {
   reranking?: boolean;
   embedding_model?: string;
   ai_search_model?: string;
+  rewrite_model?: string;
+  reranking_model?: string;
+  /** @deprecated Use index_method instead. */
+  hybrid_search_enabled?: boolean;
+  /** Controls which storage backends are used during indexing. Defaults to vector-only. */
+  index_method?: { vector?: boolean; keyword?: boolean };
+  /** Fusion method for combining vector and keyword results. "rrf" = reciprocal rank fusion (default), "max" = maximum score. */
+  fusion_method?: 'max' | 'rrf';
+  indexing_options?: { keyword_tokenizer?: 'porter' | 'trigram' } | null;
+  retrieval_options?: {
+    keyword_match_mode?: 'and' | 'or';
+    boost_by?: Array<{
+      field: string;
+      direction?: 'asc' | 'desc' | 'exists' | 'not_exists';
+    }>;
+  } | null;
+  chunk?: boolean;
+  chunk_size?: number;
+  chunk_overlap?: number;
+  /** Minimum similarity score (0-1) for a result to be included. */
+  score_threshold?: number;
+  max_num_results?: number;
+  cache?: boolean;
+  /** Similarity threshold for cache hits. Stricter = fewer cache hits but higher relevance. */
+  cache_threshold?:
+    | 'super_strict_match'
+    | 'close_enough'
+    | 'flexible_friend'
+    | 'anything_goes';
+  custom_metadata?: Array<{
+    field_name: string;
+    data_type: 'text' | 'number' | 'boolean' | 'datetime';
+  }>;
+  namespace?: string;
+  /** Sync interval in seconds. 3600=1h, 7200=2h, 14400=4h, 21600=6h, 43200=12h, 86400=24h. */
+  sync_interval?: 3600 | 7200 | 14400 | 21600 | 43200 | 86400;
+  metadata?: Record<string, unknown>;
   [key: string]: unknown;
 };
 
@@ -619,7 +812,16 @@ export type AiSearchConfig = {
 export type AiSearchItemInfo = {
   id: string;
   key: string;
-  status: 'completed' | 'error' | 'skipped' | 'queued' | 'processing' | 'outdated';
+  status: 'completed' | 'error' | 'skipped' | 'queued' | 'running' | 'outdated';
+  next_action?: 'INDEX' | 'DELETE' | null;
+  error?: string;
+  checksum?: string;
+  namespace?: string;
+  chunks_count?: number | null;
+  file_size?: number | null;
+  source_id?: string | null;
+  last_seen_at?: string;
+  created_at?: string;
   metadata?: Record<string, unknown>;
   [key: string]: unknown;
 };
@@ -638,6 +840,22 @@ export type AiSearchUploadItemOptions = {
 export type AiSearchListItemsParams = {
   page?: number;
   per_page?: number;
+  /** Search items by key name. */
+  search?: string;
+  /** Sort order for results. */
+  sort_by?: 'status' | 'modified_at';
+  /** Filter items by processing status. */
+  status?:
+    | 'queued'
+    | 'running'
+    | 'completed'
+    | 'error'
+    | 'skipped'
+    | 'outdated';
+  /** Filter items by source (e.g. "builtin" or "web-crawler:https://example.com"). */
+  source?: string;
+  /** JSON-encoded Vectorize filter for metadata filtering. */
+  metadata_filter?: string;
 };
 
 export type AiSearchListItemsResponse = {
@@ -650,6 +868,69 @@ export type AiSearchListItemsResponse = {
   };
 };
 
+// ============ AI Search Item Logs Types ============
+
+export type AiSearchItemLogsParams = {
+  /** Maximum number of log entries to return (1-100, default 50). */
+  limit?: number;
+  /** Opaque cursor for pagination. Pass the \`cursor\` value from a previous response. */
+  cursor?: string;
+};
+
+export type AiSearchItemLog = {
+  timestamp: string;
+  action: string;
+  message: string;
+  fileKey?: string;
+  chunkCount?: number;
+  processingTimeMs?: number;
+  errorType?: string;
+};
+
+/** Paginated response for item processing logs (cursor-based). */
+export type AiSearchItemLogsResponse = {
+  result: AiSearchItemLog[];
+  result_info: {
+    count: number;
+    per_page: number;
+    cursor: string | null;
+    truncated: boolean;
+  };
+};
+
+// ============ AI Search Item Chunks Types ============
+
+export type AiSearchItemChunksParams = {
+  /** Maximum number of chunks to return (1-100, default 20). */
+  limit?: number;
+  /** Offset into the chunks list (default 0). */
+  offset?: number;
+};
+
+/** A single indexed chunk belonging to an item, including its text content and byte range. */
+export type AiSearchItemChunk = {
+  id: string;
+  text: string;
+  start_byte: number;
+  end_byte: number;
+  item?: {
+    timestamp?: number;
+    key: string;
+    metadata?: Record<string, unknown>;
+  };
+};
+
+/** Paginated response for item chunks (offset-based). */
+export type AiSearchItemChunksResponse = {
+  result: AiSearchItemChunk[];
+  result_info: {
+    count: number;
+    total: number;
+    limit: number;
+    offset: number;
+  };
+};
+
 // ============ AI Search Job Types ============
 
 export type AiSearchJobInfo = {
@@ -707,7 +988,7 @@ export type AiSearchJobLogsResponse = {
 
 /**
  * Single item service for an AI Search instance.
- * Provides info, delete, and download operations on a specific item.
+ * Provides info, download, sync, logs, and chunks operations on a specific item.
  */
 export declare abstract class AiSearchItem {
   /** Get metadata about this item. */
@@ -718,6 +999,28 @@ export declare abstract class AiSearchItem {
    * @returns Object with body stream, content type, filename, and size.
    */
   download(): Promise<AiSearchItemContentResult>;
+
+  /**
+   * Trigger re-indexing of this item.
+   * @returns The updated item info.
+   */
+  sync(): Promise<AiSearchItemInfo>;
+
+  /**
+   * Retrieve processing logs for this item (cursor-based pagination).
+   * @param params Optional pagination parameters (limit, cursor).
+   * @returns Paginated log entries for this item.
+   */
+  logs(params?: AiSearchItemLogsParams): Promise<AiSearchItemLogsResponse>;
+
+  /**
+   * List indexed chunks for this item (offset-based pagination).
+   * @param params Optional pagination parameters (limit, offset).
+   * @returns Paginated chunk entries for this item.
+   */
+  chunks(
+    params?: AiSearchItemChunksParams
+  ): Promise<AiSearchItemChunksResponse>;
 }
 
 /**
@@ -729,39 +1032,48 @@ export declare abstract class AiSearchItems {
   list(params?: AiSearchListItemsParams): Promise<AiSearchListItemsResponse>;
 
   /**
-   * Upload a file as an item.
+   * Upload a file as an item. Behaves as an upsert: if an item with the same
+   * filename already exists, it is overwritten and re-indexed.
    * @param name Filename for the uploaded item.
-   * @param content File content as a ReadableStream, ArrayBuffer, or string.
+   * @param content File content as a ReadableStream, Blob, or string.
    * @param options Optional metadata to attach to the item.
    * @returns The created item info.
    */
   upload(
     name: string,
-    content: ReadableStream | ArrayBuffer | string,
+    content: ReadableStream | Blob | string,
     options?: AiSearchUploadItemOptions
   ): Promise<AiSearchItemInfo>;
 
   /**
    * Upload a file and poll until processing completes.
+   * Behaves as an upsert: if an item with the same filename already exists,
+   * it is overwritten and re-indexed.
    * @param name Filename for the uploaded item.
-   * @param content File content as a ReadableStream, ArrayBuffer, or string.
-   * @param options Optional metadata to attach to the item.
+   * @param content File content as a ReadableStream, Blob, or string.
+   * @param options Optional metadata and polling configuration.
    * @returns The item info after processing completes (or timeout).
    */
   uploadAndPoll(
     name: string,
-    content: ReadableStream | ArrayBuffer | string,
-    options?: AiSearchUploadItemOptions
+    content: ReadableStream | Blob | string,
+    options?: AiSearchUploadItemOptions & {
+      /** Polling interval in milliseconds (default 1000). */
+      pollIntervalMs?: number;
+      /** Maximum time to wait in milliseconds (default 30000). */
+      timeoutMs?: number;
+    }
   ): Promise<AiSearchItemInfo>;
 
   /**
    * Get an item by ID.
    * @param itemId The item identifier.
-   * @returns Item service for info, delete, and download operations.
+   * @returns Item service for info, download, sync, logs, and chunks operations.
    */
   get(itemId: string): AiSearchItem;
 
-  /** Delete this item from the instance.
+  /**
+   * Delete an item from the instance.
    * @param itemId The item identifier.
    */
   delete(itemId: string): Promise<void>;
@@ -769,7 +1081,7 @@ export declare abstract class AiSearchItems {
 
 /**
  * Single job service for an AI Search instance.
- * Provides info and logs for a specific job.
+ * Provides info, logs, and cancel operations for a specific job.
  */
 export declare abstract class AiSearchJob {
   /** Get metadata about this job. */
@@ -777,6 +1089,13 @@ export declare abstract class AiSearchJob {
 
   /** Get logs for this job. */
   logs(params?: AiSearchJobLogsParams): Promise<AiSearchJobLogsResponse>;
+
+  /**
+   * Cancel a running job.
+   * @returns The updated job info.
+   * @throws AiSearchNotFoundError if the job does not exist.
+   */
+  cancel(): Promise<AiSearchJobInfo>;
 }
 
 /**
@@ -797,7 +1116,7 @@ export declare abstract class AiSearchJobs {
   /**
    * Get a job by ID.
    * @param jobId The job identifier.
-   * @returns Job service for info and logs operations.
+   * @returns Job service for info, logs, and cancel operations.
    */
   get(jobId: string): AiSearchJob;
 }
@@ -818,7 +1137,7 @@ export declare abstract class AiSearchJobs {
  * // Via namespace binding
  * const instance = env.AI_SEARCH.get("blog");
  * const results = await instance.search({
- *   messages: [{ role: "user", content: "How does caching work?" }],
+ *   query: "How does caching work?",
  * });
  *
  * // Via single instance binding
@@ -830,7 +1149,7 @@ export declare abstract class AiSearchJobs {
 export declare abstract class AiSearchInstance {
   /**
    * Search the AI Search instance for relevant chunks.
-   * @param params Search request with messages and optional AI search options.
+   * @param params Search request with query or messages and optional AI search options.
    * @returns Search response with matching chunks and search query.
    */
   search(params: AiSearchSearchRequest): Promise<AiSearchSearchResponse>;
@@ -865,7 +1184,7 @@ export declare abstract class AiSearchInstance {
 
   /**
    * Get instance statistics (item count, indexing status, etc.).
-   * @returns Statistics with counts per status and last activity time.
+   * @returns Statistics with counts per status, last activity time, and engine details.
    */
   stats(): Promise<AiSearchStatsResponse>;
 
@@ -880,27 +1199,30 @@ export declare abstract class AiSearchInstance {
  * Namespace-level AI Search service.
  *
  * Used as the type of \`env.AI_SEARCH\` (namespace binding via \`ai_search_namespaces\`).
- * Scoped to a single namespace. Provides dynamic instance access, creation, and deletion.
+ * Scoped to a single namespace. Provides dynamic instance access, creation, deletion,
+ * and multi-instance search/chat operations.
  *
  * @example
  * \`\`\`ts
  * // Access an instance within the namespace
  * const blog = env.AI_SEARCH.get("blog");
- * const results = await blog.search({
- *   messages: [{ role: "user", content: "How does caching work?" }],
- * });
+ * const results = await blog.search({ query: "How does caching work?" });
  *
  * // List all instances in the namespace
  * const instances = await env.AI_SEARCH.list();
  *
  * // Create a new instance with built-in storage
- * const tenant = await env.AI_SEARCH.create({
- *   id: "tenant-123",
- * });
+ * const tenant = await env.AI_SEARCH.create({ id: "tenant-123" });
  *
  * // Upload items into the instance
  * await tenant.items.upload("doc.pdf", fileContent);
  *
+ * // Search across multiple instances
+ * const multi = await env.AI_SEARCH.search({
+ *   query: "caching",
+ *   ai_search_options: { instance_ids: ["blog", "docs"] },
+ * });
+ *
  * // Delete an instance
  * await env.AI_SEARCH.delete("tenant-123");
  * \`\`\`
@@ -914,10 +1236,11 @@ export declare abstract class AiSearchNamespace {
   get(name: string): AiSearchInstance;
 
   /**
-   * List all instances in the bound namespace.
-   * @returns Array of instance metadata.
+   * List instances in the bound namespace.
+   * @param params Optional pagination, search, and ordering parameters.
+   * @returns Array of instance metadata with pagination info.
    */
-  list(): Promise<AiSearchListResponse>;
+  list(params?: AiSearchListInstancesParams): Promise<AiSearchListResponse>;
 
   /**
    * Create a new instance within the bound namespace.
@@ -944,6 +1267,36 @@ export declare abstract class AiSearchNamespace {
    * @param name Instance name to delete.
    */
   delete(name: string): Promise<void>;
+
+  /**
+   * Search across multiple instances within the bound namespace.
+   * Fans out to the specified instance_ids and merges results.
+   * @param params Search request with required \`ai_search_options.instance_ids\`.
+   * @returns Search response with chunks tagged by instance_id and optional partial-failure errors.
+   */
+  search(
+    params: AiSearchMultiSearchRequest
+  ): Promise<AiSearchMultiSearchResponse>;
+
+  /**
+   * Generate chat completions across multiple instances within the bound namespace (streaming).
+   * Fans out to the specified instance_ids, merges context, and generates a response.
+   * @param params Chat completions request with stream: true and required \`ai_search_options.instance_ids\`.
+   * @returns ReadableStream of server-sent events.
+   */
+  chatCompletions(
+    params: AiSearchMultiChatCompletionsRequest & { stream: true }
+  ): Promise<ReadableStream>;
+
+  /**
+   * Generate chat completions across multiple instances within the bound namespace.
+   * Fans out to the specified instance_ids, merges context, and generates a response.
+   * @param params Chat completions request with required \`ai_search_options.instance_ids\`.
+   * @returns Chat completion response with choices, chunks tagged by instance_id, and optional partial-failure errors.
+   */
+  chatCompletions(
+    params: AiSearchMultiChatCompletionsRequest
+  ): Promise<AiSearchMultiChatCompletionsResponse>;
 }
 
 export type AiImageClassificationInput = {
@@ -8594,9 +8947,12 @@ declare module "cloudflare:email" {
  * Evaluation context for targeting rules.
  * Keys are attribute names (e.g. "userId", "country"), values are the attribute values.
  */
-export type EvaluationContext = Record<string, string | number | boolean>;
+export type FlagshipEvaluationContext = Record<
+  string,
+  string | number | boolean
+>;
 
-export interface EvaluationDetails<T> {
+export interface FlagshipEvaluationDetails<T> {
   flagKey: string;
   value: T;
   variant?: string | undefined;
@@ -8605,7 +8961,7 @@ export interface EvaluationDetails<T> {
   errorMessage?: string | undefined;
 }
 
-export interface FlagEvaluationError extends Error {}
+export interface FlagshipEvaluationError extends Error {}
 
 /**
  * Feature flags binding for evaluating feature flags from a Cloudflare Workers script.
@@ -8626,7 +8982,7 @@ export interface FlagEvaluationError extends Error {}
  * console.log(details.variant, details.reason);
  * \`\`\`
  */
-export declare abstract class Flags {
+export declare abstract class Flagship {
   /**
    * Get a flag value without type checking.
    * @param flagKey The key of the flag to evaluate.
@@ -8636,7 +8992,7 @@ export declare abstract class Flags {
   get(
     flagKey: string,
     defaultValue?: unknown,
-    context?: EvaluationContext
+    context?: FlagshipEvaluationContext
   ): Promise<unknown>;
 
   /**
@@ -8648,7 +9004,7 @@ export declare abstract class Flags {
   getBooleanValue(
     flagKey: string,
     defaultValue: boolean,
-    context?: EvaluationContext
+    context?: FlagshipEvaluationContext
   ): Promise<boolean>;
 
   /**
@@ -8660,7 +9016,7 @@ export declare abstract class Flags {
   getStringValue(
     flagKey: string,
     defaultValue: string,
-    context?: EvaluationContext
+    context?: FlagshipEvaluationContext
   ): Promise<string>;
 
   /**
@@ -8672,7 +9028,7 @@ export declare abstract class Flags {
   getNumberValue(
     flagKey: string,
     defaultValue: number,
-    context?: EvaluationContext
+    context?: FlagshipEvaluationContext
   ): Promise<number>;
 
   /**
@@ -8684,7 +9040,7 @@ export declare abstract class Flags {
   getObjectValue<T extends object>(
     flagKey: string,
     defaultValue: T,
-    context?: EvaluationContext
+    context?: FlagshipEvaluationContext
   ): Promise<T>;
 
   /**
@@ -8696,8 +9052,8 @@ export declare abstract class Flags {
   getBooleanDetails(
     flagKey: string,
     defaultValue: boolean,
-    context?: EvaluationContext
-  ): Promise<EvaluationDetails<boolean>>;
+    context?: FlagshipEvaluationContext
+  ): Promise<FlagshipEvaluationDetails<boolean>>;
 
   /**
    * Get a string flag value with full evaluation details.
@@ -8708,8 +9064,8 @@ export declare abstract class Flags {
   getStringDetails(
     flagKey: string,
     defaultValue: string,
-    context?: EvaluationContext
-  ): Promise<EvaluationDetails<string>>;
+    context?: FlagshipEvaluationContext
+  ): Promise<FlagshipEvaluationDetails<string>>;
 
   /**
    * Get a number flag value with full evaluation details.
@@ -8720,8 +9076,8 @@ export declare abstract class Flags {
   getNumberDetails(
     flagKey: string,
     defaultValue: number,
-    context?: EvaluationContext
-  ): Promise<EvaluationDetails<number>>;
+    context?: FlagshipEvaluationContext
+  ): Promise<FlagshipEvaluationDetails<number>>;
 
   /**
    * Get an object flag value with full evaluation details.
@@ -8732,8 +9088,8 @@ export declare abstract class Flags {
   getObjectDetails<T extends object>(
     flagKey: string,
     defaultValue: T,
-    context?: EvaluationContext
-  ): Promise<EvaluationDetails<T>>;
+    context?: FlagshipEvaluationContext
+  ): Promise<FlagshipEvaluationDetails<T>>;
 }
 
 /**