webstudio 0.292.0 → 0.293.0

package/lib/cli.js

@@ -749,7 +749,7 @@ const baseAsset = {
   createdAt: z$4.string(),
   updatedAt: z$4.string().optional()
 };
-const assetType = z$4.enum(["font", "image", "file"]);
+const assetType = z$4.enum(["font", "image", "video", "file"]);
 const fontAsset = z$4.object({
   ...baseAsset,
   format: fontFormat,
@@ -760,6 +760,10 @@ const imageMeta = z$4.object({
   width: z$4.number(),
   height: z$4.number()
 });
+const videoMeta = z$4.object({
+  width: z$4.number(),
+  height: z$4.number()
+});
 const assetMetaUpdate = z$4.union([
   fontMetaUpdate,
   imageMeta.partial().strict(),
@@ -771,15 +775,22 @@ const imageAsset = z$4.object({
   meta: imageMeta,
   type: z$4.literal(assetType.enum.image)
 });
+const videoAsset = z$4.object({
+  ...baseAsset,
+  format: z$4.string(),
+  meta: videoMeta,
+  type: z$4.literal(assetType.enum.video)
+});
 const fileAsset = z$4.object({
   ...baseAsset,
   format: z$4.string(),
   meta: z$4.object({}),
   type: z$4.literal(assetType.enum.file)
 });
-const asset$1 = z$4.union([fontAsset, imageAsset, fileAsset]);
+const asset$1 = z$4.union([fontAsset, imageAsset, videoAsset, fileAsset]);
 const assetMetaSchemas = {
   image: imageMeta,
+  video: videoMeta,
   file: z$4.object({})
 };
 const mergeAssetMeta = (type2, current4, override) => {
@@ -8142,7 +8153,8 @@ const contentArtifactV1 = strictObject({
       strictObject({
         path: array(string$5().min(1).or(number$3().int().nonnegative())).min(1),
         assetId: string$5().min(1),
-        suffix: string$5().min(1).optional()
+        suffix: string$5().min(1).optional(),
+        structured: literal$2(true).optional()
       })
     )
   ).optional(),
@@ -9174,6 +9186,17 @@ const normalizeAssetFileDocument = ({
     ...metadataError === void 0 ? {} : { metadataError }
   });
 };
+const isJsonObject$1 = (value2) => typeof value2 === "object" && value2 !== null && Array.isArray(value2) === false;
+const getJsonReferenceMarkerValue = (value2) => {
+  if (isJsonObject$1(value2) === false) {
+    return;
+  }
+  const keys2 = Object.keys(value2);
+  if (keys2.length !== 1 || keys2[0] !== "$ref") {
+    return;
+  }
+  return value2.$ref;
+};
 const selectAssetDocumentFields = ({
   document: document2,
   includes
@@ -9187,64 +9210,42 @@ const selectAssetDocumentFields = ({
   }
   return selected;
 };
-const selectPropertyPath = ({
-  source,
-  target,
-  path: path2
-}) => {
-  const [key2, ...rest] = path2;
-  if (key2 === void 0 || Object.hasOwn(source, key2) === false) {
-    return;
+const missing = Symbol("missing property selection");
+const selectValuePaths = (value2, paths) => {
+  if (paths.some((path2) => path2.length === 0) || typeof getJsonReferenceMarkerValue(value2) === "string") {
+    return value2;
   }
-  const value2 = source[key2];
-  if (rest.length === 0) {
-    Object.defineProperty(target, key2, {
-      value: value2,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-    return;
+  if (Array.isArray(value2)) {
+    const childPaths = paths.filter(([segment]) => segment === "*").map((path2) => path2.slice(1));
+    if (childPaths.length === 0) {
+      return missing;
+    }
+    const selected2 = value2.map((item) => selectValuePaths(item, childPaths));
+    return selected2.some((item) => item !== missing) ? selected2.map((item) => item === missing ? null : item) : missing;
   }
-  if (typeof value2 !== "object" || value2 === null || Array.isArray(value2)) {
-    return;
+  if (typeof value2 !== "object" || value2 === null) {
+    return missing;
   }
   const selected = {};
-  selectPropertyPath({
-    source: value2,
-    target: selected,
-    path: rest
-  });
-  if (Object.keys(selected).length === 0) {
-    return;
+  for (const [key2, item] of Object.entries(value2)) {
+    const childPaths = paths.filter(([segment]) => segment === key2).map((path2) => path2.slice(1));
+    if (childPaths.length === 0) {
+      continue;
+    }
+    const child = selectValuePaths(item, childPaths);
+    if (child !== missing) {
+      selected[key2] = child;
+    }
   }
-  const existing = target[key2];
-  Object.defineProperty(target, key2, {
-    value: {
-      ...typeof existing === "object" && existing !== null && Array.isArray(existing) === false ? existing : {},
-      ...selected
-    },
-    enumerable: true,
-    configurable: true,
-    writable: true
-  });
+  return Object.keys(selected).length === 0 ? missing : selected;
 };
 const selectAssetProperties = ({
   properties: properties2,
   fields
 }) => {
-  const selected = {};
-  for (const field of fields) {
-    if (field[0] !== "properties") {
-      continue;
-    }
-    selectPropertyPath({
-      source: properties2,
-      target: selected,
-      path: field.slice(1)
-    });
-  }
-  return selected;
+  const paths = fields.filter(([root2]) => root2 === "properties").map((field) => field.slice(1));
+  const selected = selectValuePaths(properties2, paths);
+  return selected === missing ? {} : selected;
 };
 const createUniqueAssetIdsByPath = (assets) => {
   const ambiguousPaths = /* @__PURE__ */ new Set();
@@ -9355,7 +9356,8 @@ const getUrlSuffix = (value2) => {
 const discoverAssetValueReferences = ({
   properties: properties2,
   sourcePath,
-  assetIdsByPath
+  assetIdsByPath,
+  structuredAssetIds
 }) => {
   const resolveAssetId = createAssetIdResolver(assetIdsByPath, sourcePath);
   const references = [];
@@ -9372,6 +9374,20 @@ const discoverAssetValueReferences = ({
       }
       return;
     }
+    const marker = getJsonReferenceMarkerValue(value2);
+    if (typeof marker === "string") {
+      const assetId2 = resolveAssetId(marker);
+      if (assetId2 !== void 0 && structuredAssetIds?.has(assetId2)) {
+        const suffix = getUrlSuffix(marker);
+        references.push({
+          path: path2,
+          assetId: assetId2,
+          ...suffix === void 0 ? {} : { suffix },
+          structured: true
+        });
+      }
+      return;
+    }
     if (Array.isArray(value2)) {
       for (const [index2, item] of value2.entries()) {
         visit2(item, [...path2, index2]);
@@ -9445,21 +9461,34 @@ const replaceValueAtPath = ({
     })
   };
 };
+const toStructuredAssetValue = ({
+  reference,
+  runtimeAsset
+}) => {
+  const { url: url2, contentRef: _contentRef, ...asset2 } = runtimeAsset;
+  return {
+    ...asset2,
+    id: reference.assetId,
+    src: mergeAssetUrlSuffix(url2, reference.suffix)
+  };
+};
 const resolveAssetValueReferences = ({
   value: value2,
   references,
+  runtimeAssets = {},
   assetUrls
 }) => {
   let resolved = value2;
   for (const reference of references ?? []) {
-    const assetUrl = assetUrls[reference.assetId];
-    if (assetUrl === void 0) {
+    const assetUrl = assetUrls?.[reference.assetId];
+    const runtimeAsset = runtimeAssets[reference.assetId] ?? (assetUrl === void 0 ? void 0 : { url: assetUrl });
+    if (runtimeAsset === void 0) {
       continue;
     }
     resolved = replaceValueAtPath({
       value: resolved,
       path: reference.path,
-      replacement: mergeAssetUrlSuffix(assetUrl, reference.suffix)
+      replacement: reference.structured === true ? toStructuredAssetValue({ reference, runtimeAsset }) : mergeAssetUrlSuffix(runtimeAsset.url, reference.suffix)
     });
   }
   return resolved;
@@ -9915,14 +9944,13 @@ const executeAssetQueries = async ({
     });
     return requireSettledAssetQueryResults(results);
   }
-  const assetUrls = getRuntimeAssetUrls(runtimeAssets);
   let resolvedDocuments;
   try {
     resolvedDocuments = documents.map(
       (document2) => resolveAssetValueReferences({
         value: document2,
         references: assetValueReferences?.[document2._id],
-        assetUrls
+        runtimeAssets: runtimeAssets ?? {}
       })
     );
   } catch (error) {
@@ -9941,6 +9969,7 @@ const executeAssetQueries = async ({
     results,
     runtimeAssets
   });
+  const assetUrls = getRuntimeAssetUrls(runtimeAssets);
   await finalizeAssetQueries({
     preparedQueries,
     results,
@@ -9963,17 +9992,6 @@ async function executeAssetQuery({
   }
   return result2.value;
 }
-const isJsonObject$1 = (value2) => typeof value2 === "object" && value2 !== null && Array.isArray(value2) === false;
-const getJsonReferenceMarkerValue = (value2) => {
-  if (isJsonObject$1(value2) === false) {
-    return;
-  }
-  const keys2 = Object.keys(value2);
-  if (keys2.length !== 1 || keys2[0] !== "$ref") {
-    return;
-  }
-  return value2.$ref;
-};
 const compareContentEntryPriority = (left, right) => {
   const leftCreatedAt = left.document.createdAt === void 0 ? void 0 : Date.parse(left.document.createdAt);
   const rightCreatedAt = right.document.createdAt === void 0 ? void 0 : Date.parse(right.document.createdAt);
@@ -17094,6 +17112,7 @@ const compileDocumentSourceGraph = async ({
   rootIds,
   concurrency = contentEngineLimits.concurrentContentReads,
   maximumBytes = contentEngineLimits.hydratedFileBytes,
+  ignoredReferenceUrls,
   signal
 }) => {
   assertActive(signal);
@@ -17147,8 +17166,11 @@ const compileDocumentSourceGraph = async ({
       analyzedIds.add(document2.id);
     }
     for (const result2 of analyzed) {
-      references.push(...result2.references);
       for (const occurrence of result2.references) {
+        if (ignoredReferenceUrls?.has(occurrence.reference.documentUrl)) {
+          continue;
+        }
+        references.push(occurrence);
         const target = documentsByUrl.get(occurrence.reference.documentUrl);
         if (target !== void 0 && analyzedIds.has(target.id) === false) {
           pendingIds.add(target.id);
@@ -24520,7 +24542,9 @@ const resource$1 = z$4.object({
   ...common,
   control: z$4.literal("resource"),
   type: z$4.literal("resource"),
-  defaultValue: z$4.string().optional()
+  defaultValue: z$4.string().optional(),
+  // Safe resource fields copied to same-named props in generated components.
+  generatedProps: z$4.array(z$4.enum(["method"])).optional()
 });
 const code$3 = z$4.object({
   ...common,
@@ -24911,6 +24935,24 @@ const getMimeTypeByFilename = (fileName) => {
   return getMimeTypeByExtension(extension2) ?? "application/octet-stream";
 };
 const isResizableImageFileName = (fileName) => RESIZABLE_IMAGE_MIME_TYPES.includes(getMimeTypeByFilename(fileName));
+const getAssetMime = ({
+  type: type2,
+  format: format2
+}) => {
+  const lowerFormat = format2.toLowerCase();
+  const mime = `${type2}/${lowerFormat}`;
+  if (mimeTypes.has(mime)) {
+    return mime;
+  }
+  const mime2 = extensionToMime.get(`.${lowerFormat}`);
+  if (mime2 === void 0) {
+    warnOnce$1(
+      true,
+      `Couldn't determine mime type of asset: ${type2}, ${format2}.`
+    );
+  }
+  return mime2;
+};
 const getAssetUrl = (asset2, origin) => {
   const path2 = isResizableImageFileName(asset2.name) ? `/cgi/image/${asset2.name}?format=raw` : `/cgi/asset/${asset2.name}?format=raw`;
   return new URL(path2, origin);
@@ -24939,12 +24981,24 @@ const extractFontMetadata = (asset2) => {
   }
   return metadata;
 };
+const extractVideoMetadata = (asset2) => {
+  if (asset2.type !== "video") {
+    return;
+  }
+  if (asset2.meta.width && asset2.meta.height) {
+    return {
+      width: asset2.meta.width,
+      height: asset2.meta.height
+    };
+  }
+};
 const extractFileMetadata = (_asset) => {
   return;
 };
 const metadataExtractors = {
   image: extractImageMetadata,
   font: extractFontMetadata,
+  video: extractVideoMetadata,
   file: extractFileMetadata
 };
 const toRuntimeAsset = (asset2, origin) => {
@@ -24957,6 +25011,15 @@ const toRuntimeAsset = (asset2, origin) => {
     ...metadata
   };
 };
+const toAssetReferenceRuntimeData = (asset2, origin) => {
+  const name2 = formatAssetName(asset2);
+  return {
+    ...asset2,
+    ...toRuntimeAsset(asset2, origin),
+    name: name2,
+    mimeType: getAssetMime(asset2) ?? getMimeTypeByFilename(name2)
+  };
+};
 const createJsonStringifyProxy = (target) => {
   return new Proxy(target, {
     get(target2, prop2, receiver) {
@@ -31023,6 +31086,72 @@ const runtimeOperationContractData = [
                               "type"
                             ]
                           },
+                          {
+                            type: "object",
+                            properties: {
+                              id: {
+                                type: "string"
+                              },
+                              size: {
+                                type: "number"
+                              },
+                              name: {
+                                type: "string"
+                              },
+                              filename: {
+                                type: "string"
+                              },
+                              description: {
+                                anyOf: [
+                                  {
+                                    type: "string"
+                                  },
+                                  {
+                                    type: "null"
+                                  }
+                                ]
+                              },
+                              folderId: {
+                                type: "string",
+                                minLength: 1,
+                                maxLength: 256
+                              },
+                              createdAt: {
+                                type: "string"
+                              },
+                              updatedAt: {
+                                type: "string"
+                              },
+                              format: {
+                                type: "string"
+                              },
+                              meta: {
+                                type: "object",
+                                properties: {
+                                  width: {
+                                    type: "number"
+                                  },
+                                  height: {
+                                    type: "number"
+                                  }
+                                },
+                                required: ["width", "height"]
+                              },
+                              type: {
+                                type: "string",
+                                const: "video"
+                              }
+                            },
+                            required: [
+                              "id",
+                              "size",
+                              "name",
+                              "createdAt",
+                              "format",
+                              "meta",
+                              "type"
+                            ]
+                          },
                           {
                             type: "object",
                             properties: {
@@ -34115,6 +34244,72 @@ const runtimeOperationContractData = [
                               "type"
                             ]
                           },
+                          {
+                            type: "object",
+                            properties: {
+                              id: {
+                                type: "string"
+                              },
+                              size: {
+                                type: "number"
+                              },
+                              name: {
+                                type: "string"
+                              },
+                              filename: {
+                                type: "string"
+                              },
+                              description: {
+                                anyOf: [
+                                  {
+                                    type: "string"
+                                  },
+                                  {
+                                    type: "null"
+                                  }
+                                ]
+                              },
+                              folderId: {
+                                type: "string",
+                                minLength: 1,
+                                maxLength: 256
+                              },
+                              createdAt: {
+                                type: "string"
+                              },
+                              updatedAt: {
+                                type: "string"
+                              },
+                              format: {
+                                type: "string"
+                              },
+                              meta: {
+                                type: "object",
+                                properties: {
+                                  width: {
+                                    type: "number"
+                                  },
+                                  height: {
+                                    type: "number"
+                                  }
+                                },
+                                required: ["width", "height"]
+                              },
+                              type: {
+                                type: "string",
+                                const: "video"
+                              }
+                            },
+                            required: [
+                              "id",
+                              "size",
+                              "name",
+                              "createdAt",
+                              "format",
+                              "meta",
+                              "type"
+                            ]
+                          },
                           {
                             type: "object",
                             properties: {
@@ -37218,6 +37413,72 @@ const runtimeOperationContractData = [
                               "type"
                             ]
                           },
+                          {
+                            type: "object",
+                            properties: {
+                              id: {
+                                type: "string"
+                              },
+                              size: {
+                                type: "number"
+                              },
+                              name: {
+                                type: "string"
+                              },
+                              filename: {
+                                type: "string"
+                              },
+                              description: {
+                                anyOf: [
+                                  {
+                                    type: "string"
+                                  },
+                                  {
+                                    type: "null"
+                                  }
+                                ]
+                              },
+                              folderId: {
+                                type: "string",
+                                minLength: 1,
+                                maxLength: 256
+                              },
+                              createdAt: {
+                                type: "string"
+                              },
+                              updatedAt: {
+                                type: "string"
+                              },
+                              format: {
+                                type: "string"
+                              },
+                              meta: {
+                                type: "object",
+                                properties: {
+                                  width: {
+                                    type: "number"
+                                  },
+                                  height: {
+                                    type: "number"
+                                  }
+                                },
+                                required: ["width", "height"]
+                              },
+                              type: {
+                                type: "string",
+                                const: "video"
+                              }
+                            },
+                            required: [
+                              "id",
+                              "size",
+                              "name",
+                              "createdAt",
+                              "format",
+                              "meta",
+                              "type"
+                            ]
+                          },
                           {
                             type: "object",
                             properties: {
@@ -40310,6 +40571,72 @@ const runtimeOperationContractData = [
                               "type"
                             ]
                           },
+                          {
+                            type: "object",
+                            properties: {
+                              id: {
+                                type: "string"
+                              },
+                              size: {
+                                type: "number"
+                              },
+                              name: {
+                                type: "string"
+                              },
+                              filename: {
+                                type: "string"
+                              },
+                              description: {
+                                anyOf: [
+                                  {
+                                    type: "string"
+                                  },
+                                  {
+                                    type: "null"
+                                  }
+                                ]
+                              },
+                              folderId: {
+                                type: "string",
+                                minLength: 1,
+                                maxLength: 256
+                              },
+                              createdAt: {
+                                type: "string"
+                              },
+                              updatedAt: {
+                                type: "string"
+                              },
+                              format: {
+                                type: "string"
+                              },
+                              meta: {
+                                type: "object",
+                                properties: {
+                                  width: {
+                                    type: "number"
+                                  },
+                                  height: {
+                                    type: "number"
+                                  }
+                                },
+                                required: ["width", "height"]
+                              },
+                              type: {
+                                type: "string",
+                                const: "video"
+                              }
+                            },
+                            required: [
+                              "id",
+                              "size",
+                              "name",
+                              "createdAt",
+                              "format",
+                              "meta",
+                              "type"
+                            ]
+                          },
                           {
                             type: "object",
                             properties: {
@@ -46114,6 +46441,72 @@ const runtimeOperationContractData = [
                                     "type"
                                   ]
                                 },
+                                {
+                                  type: "object",
+                                  properties: {
+                                    id: {
+                                      type: "string"
+                                    },
+                                    size: {
+                                      type: "number"
+                                    },
+                                    name: {
+                                      type: "string"
+                                    },
+                                    filename: {
+                                      type: "string"
+                                    },
+                                    description: {
+                                      anyOf: [
+                                        {
+                                          type: "string"
+                                        },
+                                        {
+                                          type: "null"
+                                        }
+                                      ]
+                                    },
+                                    folderId: {
+                                      type: "string",
+                                      minLength: 1,
+                                      maxLength: 256
+                                    },
+                                    createdAt: {
+                                      type: "string"
+                                    },
+                                    updatedAt: {
+                                      type: "string"
+                                    },
+                                    format: {
+                                      type: "string"
+                                    },
+                                    meta: {
+                                      type: "object",
+                                      properties: {
+                                        width: {
+                                          type: "number"
+                                        },
+                                        height: {
+                                          type: "number"
+                                        }
+                                      },
+                                      required: ["width", "height"]
+                                    },
+                                    type: {
+                                      type: "string",
+                                      const: "video"
+                                    }
+                                  },
+                                  required: [
+                                    "id",
+                                    "size",
+                                    "name",
+                                    "createdAt",
+                                    "format",
+                                    "meta",
+                                    "type"
+                                  ]
+                                },
                                 {
                                   type: "object",
                                   properties: {
@@ -49251,6 +49644,72 @@ const runtimeOperationContractData = [
                                     "type"
                                   ]
                                 },
+                                {
+                                  type: "object",
+                                  properties: {
+                                    id: {
+                                      type: "string"
+                                    },
+                                    size: {
+                                      type: "number"
+                                    },
+                                    name: {
+                                      type: "string"
+                                    },
+                                    filename: {
+                                      type: "string"
+                                    },
+                                    description: {
+                                      anyOf: [
+                                        {
+                                          type: "string"
+                                        },
+                                        {
+                                          type: "null"
+                                        }
+                                      ]
+                                    },
+                                    folderId: {
+                                      type: "string",
+                                      minLength: 1,
+                                      maxLength: 256
+                                    },
+                                    createdAt: {
+                                      type: "string"
+                                    },
+                                    updatedAt: {
+                                      type: "string"
+                                    },
+                                    format: {
+                                      type: "string"
+                                    },
+                                    meta: {
+                                      type: "object",
+                                      properties: {
+                                        width: {
+                                          type: "number"
+                                        },
+                                        height: {
+                                          type: "number"
+                                        }
+                                      },
+                                      required: ["width", "height"]
+                                    },
+                                    type: {
+                                      type: "string",
+                                      const: "video"
+                                    }
+                                  },
+                                  required: [
+                                    "id",
+                                    "size",
+                                    "name",
+                                    "createdAt",
+                                    "format",
+                                    "meta",
+                                    "type"
+                                  ]
+                                },
                                 {
                                   type: "object",
                                   properties: {
@@ -63606,6 +64065,72 @@ const runtimeOperationContractData = [
                               "type"
                             ]
                           },
+                          {
+                            type: "object",
+                            properties: {
+                              id: {
+                                type: "string"
+                              },
+                              size: {
+                                type: "number"
+                              },
+                              name: {
+                                type: "string"
+                              },
+                              filename: {
+                                type: "string"
+                              },
+                              description: {
+                                anyOf: [
+                                  {
+                                    type: "string"
+                                  },
+                                  {
+                                    type: "null"
+                                  }
+                                ]
+                              },
+                              folderId: {
+                                type: "string",
+                                minLength: 1,
+                                maxLength: 256
+                              },
+                              createdAt: {
+                                type: "string"
+                              },
+                              updatedAt: {
+                                type: "string"
+                              },
+                              format: {
+                                type: "string"
+                              },
+                              meta: {
+                                type: "object",
+                                properties: {
+                                  width: {
+                                    type: "number"
+                                  },
+                                  height: {
+                                    type: "number"
+                                  }
+                                },
+                                required: ["width", "height"]
+                              },
+                              type: {
+                                type: "string",
+                                const: "video"
+                              }
+                            },
+                            required: [
+                              "id",
+                              "size",
+                              "name",
+                              "createdAt",
+                              "format",
+                              "meta",
+                              "type"
+                            ]
+                          },
                           {
                             type: "object",
                             properties: {
@@ -66772,6 +67297,72 @@ const runtimeOperationContractData = [
                               "type"
                             ]
                           },
+                          {
+                            type: "object",
+                            properties: {
+                              id: {
+                                type: "string"
+                              },
+                              size: {
+                                type: "number"
+                              },
+                              name: {
+                                type: "string"
+                              },
+                              filename: {
+                                type: "string"
+                              },
+                              description: {
+                                anyOf: [
+                                  {
+                                    type: "string"
+                                  },
+                                  {
+                                    type: "null"
+                                  }
+                                ]
+                              },
+                              folderId: {
+                                type: "string",
+                                minLength: 1,
+                                maxLength: 256
+                              },
+                              createdAt: {
+                                type: "string"
+                              },
+                              updatedAt: {
+                                type: "string"
+                              },
+                              format: {
+                                type: "string"
+                              },
+                              meta: {
+                                type: "object",
+                                properties: {
+                                  width: {
+                                    type: "number"
+                                  },
+                                  height: {
+                                    type: "number"
+                                  }
+                                },
+                                required: ["width", "height"]
+                              },
+                              type: {
+                                type: "string",
+                                const: "video"
+                              }
+                            },
+                            required: [
+                              "id",
+                              "size",
+                              "name",
+                              "createdAt",
+                              "format",
+                              "meta",
+                              "type"
+                            ]
+                          },
                           {
                             type: "object",
                             properties: {
@@ -73039,6 +73630,72 @@ const runtimeOperationContractData = [
                       "type"
                     ]
                   },
+                  {
+                    type: "object",
+                    properties: {
+                      id: {
+                        type: "string"
+                      },
+                      size: {
+                        type: "number"
+                      },
+                      name: {
+                        type: "string"
+                      },
+                      filename: {
+                        type: "string"
+                      },
+                      description: {
+                        anyOf: [
+                          {
+                            type: "string"
+                          },
+                          {
+                            type: "null"
+                          }
+                        ]
+                      },
+                      folderId: {
+                        type: "string",
+                        minLength: 1,
+                        maxLength: 256
+                      },
+                      createdAt: {
+                        type: "string"
+                      },
+                      updatedAt: {
+                        type: "string"
+                      },
+                      format: {
+                        type: "string"
+                      },
+                      meta: {
+                        type: "object",
+                        properties: {
+                          width: {
+                            type: "number"
+                          },
+                          height: {
+                            type: "number"
+                          }
+                        },
+                        required: ["width", "height"]
+                      },
+                      type: {
+                        type: "string",
+                        const: "video"
+                      }
+                    },
+                    required: [
+                      "id",
+                      "size",
+                      "name",
+                      "createdAt",
+                      "format",
+                      "meta",
+                      "type"
+                    ]
+                  },
                   {
                     type: "object",
                     properties: {
@@ -78848,6 +79505,72 @@ const runtimeOperationContractData = [
                       "type"
                     ]
                   },
+                  {
+                    type: "object",
+                    properties: {
+                      id: {
+                        type: "string"
+                      },
+                      size: {
+                        type: "number"
+                      },
+                      name: {
+                        type: "string"
+                      },
+                      filename: {
+                        type: "string"
+                      },
+                      description: {
+                        anyOf: [
+                          {
+                            type: "string"
+                          },
+                          {
+                            type: "null"
+                          }
+                        ]
+                      },
+                      folderId: {
+                        type: "string",
+                        minLength: 1,
+                        maxLength: 256
+                      },
+                      createdAt: {
+                        type: "string"
+                      },
+                      updatedAt: {
+                        type: "string"
+                      },
+                      format: {
+                        type: "string"
+                      },
+                      meta: {
+                        type: "object",
+                        properties: {
+                          width: {
+                            type: "number"
+                          },
+                          height: {
+                            type: "number"
+                          }
+                        },
+                        required: ["width", "height"]
+                      },
+                      type: {
+                        type: "string",
+                        const: "video"
+                      }
+                    },
+                    required: [
+                      "id",
+                      "size",
+                      "name",
+                      "createdAt",
+                      "format",
+                      "meta",
+                      "type"
+                    ]
+                  },
                   {
                     type: "object",
                     properties: {
@@ -96766,7 +97489,7 @@ const runtimeOperationContractData = [
       properties: {
         type: {
           type: "string",
-          enum: ["font", "image", "file"]
+          enum: ["font", "image", "video", "file"]
         },
         sort: {
           type: "string",
@@ -96812,7 +97535,7 @@ const runtimeOperationContractData = [
               },
               type: {
                 type: "string",
-                enum: ["font", "image", "file"]
+                enum: ["font", "image", "video", "file"]
               },
               size: {
                 type: "number"
@@ -96855,7 +97578,7 @@ const runtimeOperationContractData = [
                   },
                   type: {
                     type: "string",
-                    enum: ["font", "image", "file"]
+                    enum: ["font", "image", "video", "file"]
                   },
                   size: {
                     type: "number"
@@ -96993,7 +97716,7 @@ const runtimeOperationContractData = [
             },
             type: {
               type: "string",
-              enum: ["font", "image", "file"]
+              enum: ["font", "image", "video", "file"]
             },
             size: {
               type: "number"
@@ -97439,7 +98162,7 @@ const runtimeOperationContractData = [
                   required: []
                 }
               ],
-              description: "Type-specific metadata: family and style plus weight for static fonts or variationAxes for variable fonts, width/height for images, and no fields for generic files."
+              description: "Type-specific metadata: family and style plus weight for static fonts or variationAxes for variable fonts, width/height for images and videos, and no fields for generic files."
             }
           },
           required: []
@@ -97750,6 +98473,72 @@ const runtimeOperationContractData = [
                 "type"
               ]
             },
+            {
+              type: "object",
+              properties: {
+                id: {
+                  type: "string"
+                },
+                size: {
+                  type: "number"
+                },
+                name: {
+                  type: "string"
+                },
+                filename: {
+                  type: "string"
+                },
+                description: {
+                  anyOf: [
+                    {
+                      type: "string"
+                    },
+                    {
+                      type: "null"
+                    }
+                  ]
+                },
+                folderId: {
+                  type: "string",
+                  minLength: 1,
+                  maxLength: 256
+                },
+                createdAt: {
+                  type: "string"
+                },
+                updatedAt: {
+                  type: "string"
+                },
+                format: {
+                  type: "string"
+                },
+                meta: {
+                  type: "object",
+                  properties: {
+                    width: {
+                      type: "number"
+                    },
+                    height: {
+                      type: "number"
+                    }
+                  },
+                  required: ["width", "height"]
+                },
+                type: {
+                  type: "string",
+                  const: "video"
+                }
+              },
+              required: [
+                "id",
+                "size",
+                "name",
+                "createdAt",
+                "format",
+                "meta",
+                "type"
+              ]
+            },
             {
               type: "object",
               properties: {
@@ -99353,7 +100142,7 @@ const assetUpdateInput = z$4.object({
     description: z$4.union([z$4.string(), z$4.null()]).optional(),
     folderId: z$4.union([z$4.string().min(1), z$4.null()]).optional(),
     meta: assetMetaUpdate.describe(
-      "Type-specific metadata: family and style plus weight for static fonts or variationAxes for variable fonts, width/height for images, and no fields for generic files."
+      "Type-specific metadata: family and style plus weight for static fonts or variationAxes for variable fonts, width/height for images and videos, and no fields for generic files."
     ).optional()
   }).refine(
     (values) => Object.keys(values).length > 0,
@@ -99402,6 +100191,7 @@ const imageDescriptionsSetInput = z$4.object({
 const addableAsset = z$4.union([
   fontAsset.omit({ projectId: true }),
   imageAsset.omit({ projectId: true }),
+  videoAsset.omit({ projectId: true }),
   fileAsset.omit({ projectId: true })
 ]);
 const assetAddInput = z$4.object({ asset: addableAsset });
@@ -139611,7 +140401,7 @@ const getRequiredProps = (state) => {
   return state.props;
 };
 const getRequiredBuildData = (state) => {
-  const missing = [
+  const missing2 = [
     "pages",
     "instances",
     "props",
@@ -139622,10 +140412,10 @@ const getRequiredBuildData = (state) => {
     "styleSourceSelections",
     "styles"
   ].find((namespace2) => state[namespace2] === void 0);
-  if (missing !== void 0) {
+  if (missing2 !== void 0) {
     return throwBuilderRuntimeError(
       "BAD_REQUEST",
-      `${missing} namespace is missing`
+      `${missing2} namespace is missing`
     );
   }
   return {
@@ -143085,7 +143875,8 @@ const meta$Q = {
       type: "resource",
       control: "resource",
       description: "The URI of a program that processes the information submitted via the form.",
-      required: false
+      required: false,
+      generatedProps: ["method"]
     }
   }
 };
@@ -157328,6 +158119,7 @@ const generateJsxElement = ({
   tagsOverrides,
   instance: instance2,
   props: props2,
+  resources,
   dataSources,
   usedDataSources,
   indexesWithinAncestors,
@@ -157354,10 +158146,18 @@ ${tagProperty}=${JSON.stringify(instance2.tag)}`;
   let collectionItemValue;
   let collectionItemKeyValue;
   let classNameValue;
-  for (const prop2 of props2.values()) {
-    if (prop2.instanceId !== instance2.id) {
-      continue;
+  const instanceProps = Array.from(props2.values()).filter(
+    (prop2) => prop2.instanceId === instance2.id
+  );
+  const instancePropNames = new Set(instanceProps.map((prop2) => prop2.name));
+  const projectedResourceProps = /* @__PURE__ */ new Map();
+  const getGeneratedPropName = (name2) => {
+    if (hasTags && !meta2?.props?.[name2]) {
+      return standardAttributesToReactProps[name2] ?? name2;
     }
+    return name2;
+  };
+  for (const prop2 of instanceProps) {
     const propValue = generatePropValue({
       scope: scope2,
       prop: prop2,
@@ -157367,10 +158167,18 @@ ${tagProperty}=${JSON.stringify(instance2.tag)}`;
     if (isAttributeNameSafe(prop2.name) === false) {
       continue;
     }
-    let name2 = prop2.name;
-    if (hasTags && !meta2?.props?.[prop2.name]) {
-      name2 = standardAttributesToReactProps[prop2.name] ?? prop2.name;
+    if (prop2.type === "resource") {
+      const propMeta2 = meta2?.props?.[prop2.name];
+      const resource2 = resources?.get(prop2.value);
+      if (propMeta2?.type === "resource" && resource2 !== void 0) {
+        for (const name22 of propMeta2.generatedProps ?? []) {
+          if (instancePropNames.has(name22) === false && isAttributeNameSafe(name22)) {
+            projectedResourceProps.set(name22, resource2[name22]);
+          }
+        }
+      }
     }
+    const name2 = getGeneratedPropName(prop2.name);
     if (prop2.name === showAttribute) {
       if (propValue === "true") {
         continue;
@@ -157402,6 +158210,11 @@ ${tagProperty}=${JSON.stringify(instance2.tag)}`;
 ${name2}={${propValue}}`;
     }
   }
+  for (const [propName, value2] of projectedResourceProps) {
+    const name2 = getGeneratedPropName(propName);
+    generatedProps += `
+${name2}={${JSON.stringify(value2)}}`;
+  }
   const classMapArray = classesMap?.get(instance2.id);
   if (classMapArray || classNameValue) {
     let classNameTemplate = classMapArray ? classMapArray.join(" ") : "";
@@ -157496,6 +158309,7 @@ const generateJsxChildren = ({
   children,
   instances,
   props: props2,
+  resources,
   dataSources,
   usedDataSources,
   indexesWithinAncestors,
@@ -157537,6 +158351,7 @@ const generateJsxChildren = ({
         tagsOverrides,
         instance: instance2,
         props: props2,
+        resources,
         dataSources,
         usedDataSources,
         indexesWithinAncestors,
@@ -157549,6 +158364,7 @@ const generateJsxChildren = ({
           children: instance2.children,
           instances,
           props: props2,
+          resources,
           dataSources,
           usedDataSources,
           indexesWithinAncestors,
@@ -157567,6 +158383,7 @@ const generateWebstudioComponent = ({
   parameters,
   instances,
   props: props2,
+  resources,
   dataSources,
   metas,
   tagsOverrides,
@@ -157586,6 +158403,7 @@ const generateWebstudioComponent = ({
       tagsOverrides,
       instance: instance2,
       props: props2,
+      resources,
       dataSources,
       usedDataSources,
       indexesWithinAncestors,
@@ -157597,6 +158415,7 @@ const generateWebstudioComponent = ({
         children: instance2.children,
         instances,
         props: props2,
+        resources,
         dataSources,
         usedDataSources,
         indexesWithinAncestors,
@@ -259083,11 +259902,11 @@ class ProjectSession {
   }
   async ensureNamespaces(namespaces) {
     const snapshot = await this.#loadLocalSnapshot();
-    const missing = getNamespacesNeedingRemote(snapshot, namespaces);
-    if (missing.length === 0 && snapshot !== void 0) {
+    const missing2 = getNamespacesNeedingRemote(snapshot, namespaces);
+    if (missing2.length === 0 && snapshot !== void 0) {
       return snapshot;
     }
-    return await this.fetchAndSave(missing.length === 0 ? namespaces : missing);
+    return await this.fetchAndSave(missing2.length === 0 ? namespaces : missing2);
   }
   async fetchAndSave(namespaces, options = {}) {
     const current4 = await this.#loadLocalSnapshot();
@@ -271997,7 +272816,7 @@ const getComponentCoverageStatus = async ({
   const covered = availableEntries.filter(
     (entry2) => presentComponents.has(entry2.component)
   );
-  const missing = availableEntries.filter(
+  const missing2 = availableEntries.filter(
     (entry2) => presentComponents.has(entry2.component) === false
   );
   const toCoverageEntry = ({
@@ -272019,11 +272838,11 @@ const getComponentCoverageStatus = async ({
     documentType,
     total: availableEntries.length,
     coveredCount: covered.length,
-    missingCount: missing.length,
+    missingCount: missing2.length,
     covered: covered.map(toCoverageEntry),
-    missing: missing.map(toCoverageEntry),
-    missingRoots: missing.filter((entry2) => entry2.standaloneInsertable).map(toCoverageEntry),
-    missingParts: missing.filter((entry2) => entry2.standaloneInsertable === false).map(toCoverageEntry),
+    missing: missing2.map(toCoverageEntry),
+    missingRoots: missing2.filter((entry2) => entry2.standaloneInsertable).map(toCoverageEntry),
+    missingParts: missing2.filter((entry2) => entry2.standaloneInsertable === false).map(toCoverageEntry),
     session: serializeProjectSessionMeta(envelope)
   };
 };
@@ -276526,7 +277345,7 @@ const serverOnlyRouterOperationMetadata = {
 };
 const assetUploadDescriptor = z$4.object({
   name: z$4.string(),
-  type: z$4.enum(["image", "font", "file"]),
+  type: assetType,
   format: z$4.string().optional(),
   description: z$4.string().optional(),
   folderId: z$4.string().min(1).optional(),
@@ -278151,7 +278970,7 @@ const getAssetUploadUrl = ({
   if (asset2.folderId !== void 0) {
     url2.searchParams.set("folderId", asset2.folderId);
   }
-  if (asset2.type === "image") {
+  if (asset2.type === "image" || asset2.type === "video") {
     url2.searchParams.set("width", String(asset2.meta.width));
     url2.searchParams.set("height", String(asset2.meta.height));
   }
@@ -278271,17 +279090,17 @@ const toUploadAsset = ({
     size: 0,
     createdAt: (/* @__PURE__ */ new Date()).toISOString()
   };
-  if (descriptor.type === "image") {
+  if (descriptor.type === "image" || descriptor.type === "video") {
     const width2 = descriptor.meta?.width;
     const height2 = descriptor.meta?.height;
     if (typeof width2 !== "number" || typeof height2 !== "number" || descriptor.format === void 0) {
       throw new Error(
-        `Image asset "${descriptor.name}" requires format, meta.width, and meta.height.`
+        `${descriptor.type === "image" ? "Image" : "Video"} asset "${descriptor.name}" requires format, meta.width, and meta.height.`
       );
     }
     return {
       ...base2,
-      type: "image",
+      type: descriptor.type,
       format: descriptor.format,
       meta: { width: width2, height: height2 }
     };
@@ -279178,7 +279997,7 @@ class HandledCliError extends Error {
 }
 const isHandledCliError = (error) => error instanceof HandledCliError;
 const name = "webstudio";
-const version$1 = "0.292.0";
+const version$1 = "0.293.0";
 const description = "Webstudio CLI";
 const author = "Webstudio <github@webstudio.is>";
 const homepage = "https://webstudio.is";
@@ -291671,6 +292490,7 @@ Please check webstudio --help for more details`
       ],
       instances,
       props: props2,
+      resources,
       dataSources,
       classesMap: classes,
       metas: usedMetas,
@@ -291837,7 +292657,10 @@ Please check webstudio --help for more details`
   );
   const assetsById = Object.fromEntries(
     siteData.assets.map((asset2) => {
-      const runtimeAsset = toRuntimeAsset(asset2, "https://placeholder.local");
+      const runtimeAsset = toAssetReferenceRuntimeData(
+        asset2,
+        "https://placeholder.local"
+      );
       return [
         asset2.id,
         {
@@ -292387,6 +293210,35 @@ const renderContentEngineReferenceMarkdown = ({
     "",
     `Choose \`fields\` and disable \`includeMetadata\` when the page needs only selected values. Fields used only for static filtering or sorting do not need to be returned. When enabled, \`includeMetadata\` adds ${assetQueryMetadataFields.filter((field) => field !== "id").map((field) => `\`${field}\``).join(", ")}. Every result includes \`id\`.`,
     "",
+    heading(1, "Asset reference metadata"),
+    "",
+    "A plain local asset path in Markdown frontmatter or JSON properties keeps the backward-compatible URL string result. Wrap the path in an exact `$ref` object only when consumers need structured Asset Manager metadata:",
+    "",
+    "```yaml",
+    "featureImage:",
+    "  $ref: ./assets/hero.png",
+    "```",
+    "",
+    "The reference declares only the relationship. The query decides which metadata enters its result and published database. A complete `properties.featureImage` selection returns the Asset Manager asset metadata together with its resolved `src`. This includes fields such as `id`, `name`, `description`, `mimeType`, `width`, and `height`; new asset metadata becomes available to references without changing the document. Select only the nested fields the page uses:",
+    "",
+    "```json",
+    "{",
+    '  "output": {',
+    '    "mode": "fields",',
+    '    "includeMetadata": false,',
+    '    "fields": [',
+    '      ["properties", "title"],',
+    '      ["properties", "featureImage", "src"],',
+    '      ["properties", "featureImage", "description"]',
+    "    ]",
+    "  }",
+    "}",
+    "```",
+    "",
+    "The selected value becomes an object. Bind an Image source to `post.properties.featureImage.src` and its alternative text to `post.properties.featureImage.description ?? post.properties.title`. A missing description therefore falls back to the article title without duplicating text in frontmatter.",
+    "",
+    "External URLs remain ordinary strings. Existing local path strings also keep their URL string shape, so adopting structured references does not change existing queries or bindings.",
+    "",
     heading(1, "Content modes"),
     "",
     renderRows(contentRows),
@@ -299003,6 +299855,7 @@ const discoverMarkdownAssetReferenceRanges = ({
     return [{ start, end, assetId: assetId2, ...suffix === "" ? {} : { suffix } }];
   });
 };
+const isDocumentFile = ({ contentType }) => getDocumentFormatByContentType(contentType) !== void 0;
 const measureContentSourcePerformance = async ({
   phase,
   operation,
@@ -299111,6 +299964,9 @@ const discoverSnapshotAssetValueReferences = ({
   entries
 }) => {
   const assetIdsByPath = createUniqueAssetIdsByPath(snapshot.files);
+  const structuredAssetIds = new Set(
+    snapshot.files.filter((file2) => isDocumentFile(file2) === false).map(({ id: id2 }) => id2)
+  );
   const references = {};
   for (const entry2 of [...entries].sort(
     (left, right) => compareStrings(left.assetId, right.assetId)
@@ -299118,7 +299974,8 @@ const discoverSnapshotAssetValueReferences = ({
     const discovered = discoverAssetValueReferences({
       properties: entry2.document.properties ?? {},
       sourcePath: entry2.document.path,
-      assetIdsByPath
+      assetIdsByPath,
+      structuredAssetIds
     });
     if (discovered.length > 0) {
       references[entry2.assetId] = discovered;
@@ -299156,8 +300013,9 @@ const discoverSnapshotDocumentGraph = async (snapshot, entries, plan) => {
     }
     sourcesById.set(document2.id, document2.source);
   }
-  const supportedFiles = snapshot.files.filter(
-    (file2) => getDocumentFormatByContentType(file2.contentType) !== void 0
+  const supportedFiles = snapshot.files.filter(isDocumentFile);
+  const ignoredReferenceUrls = new Set(
+    snapshot.files.filter((file2) => isDocumentFile(file2) === false).map((file2) => getDocumentUrl(file2.path))
   );
   if (supportedFiles.some((file2) => sourcesById.has(file2.id) === false)) {
     throw new Error("Content source omitted a supported document source");
@@ -299178,6 +300036,7 @@ const discoverSnapshotDocumentGraph = async (snapshot, entries, plan) => {
         source
       };
     }),
+    ignoredReferenceUrls,
     ...plan === void 0 ? {} : {
       rootIds: entries.flatMap(
         ({ assetId: assetId2 }) => sourcesById.has(assetId2) ? [assetId2] : []
@@ -300025,13 +300884,13 @@ const loadCliProjectSessionAssetIndex = async (snapshot, connection, assetsDirec
   return artifact;
 };
 const createLocalProjectBundleFromSessionSnapshot = (snapshot, options = {}) => {
-  const missing = getMissingBuilderStateNamespaces(
+  const missing2 = getMissingBuilderStateNamespaces(
     snapshot.state,
     webstudioDataNamespaces
   );
-  if (missing.length > 0) {
+  if (missing2.length > 0) {
     throw new Error(
-      `Project session is missing preview data: ${missing.join(", ")}`
+      `Project session is missing preview data: ${missing2.join(", ")}`
     );
   }
   const pages2 = snapshot.state.pages;
@@ -306836,6 +307695,36 @@ const createMcpRunErrorPayload = ({
     elapsedMs
   }
 });
+const reportMcpSingleOpCallTermination = ({
+  termination,
+  tool,
+  elapsedMs,
+  writeStatus = (message) => stderr.write(`${message}
+`),
+  writeResult = printJson,
+  setExitCode = (code2) => {
+    process.exitCode = code2;
+  }
+}) => {
+  const error = {
+    code: "MCP_CALL_TERMINATED",
+    message: `MCP single-op-call ${tool} terminated before returning a result.`
+  };
+  const payload = createMcpSingleOpCallErrorPayload({ error, elapsedMs });
+  writeStatus(
+    formatMcpStatusLine(`single-op-call ${tool} terminated: ${error.message}`)
+  );
+  writeResult({
+    ...payload,
+    meta: {
+      ...payload.meta,
+      termination
+    }
+  });
+  if (termination.type === "beforeExit") {
+    setExitCode(1);
+  }
+};
 const mcpRunTerminationCleanupTimeout = 5e3;
 const reportMcpRunTermination = ({
   termination,
@@ -306928,14 +307817,16 @@ const installMcpRunTerminationHandlers = ({
   totalCalls,
   results,
   startedAt,
-  disposeHost
+  disposeHost,
+  reportTermination = reportMcpRunTermination
 }) => {
   const controller = createMcpRunTerminationController({
     getActiveCall,
     totalCalls,
     results,
     startedAt,
-    disposeHost
+    disposeHost,
+    reportTermination
   });
   const terminationSignals = ["SIGHUP", "SIGINT", "SIGTERM"];
   const signalHandlers = /* @__PURE__ */ new Map();
@@ -307329,30 +308220,71 @@ const mcpSingleOpCall = async (options) => {
     )}
 `
   );
+  let activeCall = { number: 1, tool };
+  let didTerminate = false;
+  let disposeHost = async () => void 0;
+  const disposeTerminationHandlers = installMcpRunTerminationHandlers({
+    getActiveCall: () => activeCall,
+    totalCalls: 1,
+    results: [],
+    startedAt,
+    disposeHost: () => disposeHost(),
+    reportTermination: ({ termination, activeCall: activeCall2, elapsedMs }) => {
+      didTerminate = true;
+      reportMcpSingleOpCallTermination({
+        termination,
+        tool: activeCall2.tool,
+        elapsedMs
+      });
+    }
+  });
   try {
     assertSingleOpCallToolSupported(tool);
     const input2 = await parseMcpSingleOpCallInput(options);
     validateSingleOpCallInput(tool, input2);
+    if (didTerminate) {
+      throw new HandledCliError();
+    }
     await withMcpHost(
-      () => createCliMcpHost({ projectId: options.project }),
+      async () => {
+        const mcpHost = await createCliMcpHost({ projectId: options.project });
+        disposeHost = mcpHost.dispose;
+        if (didTerminate) {
+          throw new HandledCliError();
+        }
+        return mcpHost;
+      },
       async ({ host, apiContract, scope: scope2 }) => {
         assertMcpToolServerSupport(tool, apiContract);
         const core2 = createCliMcpCore(host);
         const persistedCheckpoint = tool === "checkpoint.ack" ? await readPersistedMcpCheckpoint(scope2) : void 0;
+        if (didTerminate) {
+          throw new HandledCliError();
+        }
         await assertPersistedMcpCheckpointAcknowledged(
           tool,
           core2.listTools(),
           scope2
         );
+        if (didTerminate) {
+          throw new HandledCliError();
+        }
         if (options.refresh === true && tool !== "refresh") {
           await core2.callTool({ name: "refresh" });
+          if (didTerminate) {
+            throw new HandledCliError();
+          }
         }
         const result2 = await core2.callTool({
           name: tool,
           input: input2,
           dryRun: options.dryRun
         });
+        if (didTerminate) {
+          throw new HandledCliError();
+        }
         if (isMcpToolCallFailure(result2)) {
+          activeCall = void 0;
           stderr.write(
             `${formatMcpStatusLine(
               `single-op-call ${tool} failed in ${Date.now() - startedAt}ms`
@@ -307370,8 +308302,12 @@ const mcpSingleOpCall = async (options) => {
           structuredContent: result2.structuredContent,
           scope: scope2
         });
+        if (didTerminate) {
+          throw new HandledCliError();
+        }
         const session = result2.structuredContent.meta.session;
         const committed = session === void 0 ? "" : `; committed=${session.committed}`;
+        activeCall = void 0;
         stderr.write(
           `${formatMcpStatusLine(
             `single-op-call ${tool} succeeded in ${Date.now() - startedAt}ms${committed}`
@@ -307386,6 +308322,10 @@ const mcpSingleOpCall = async (options) => {
       }
     );
   } catch (error) {
+    activeCall = void 0;
+    if (didTerminate) {
+      throw new HandledCliError();
+    }
     if (isHandledCliError(error)) {
       throw error;
     }
@@ -307401,6 +308341,9 @@ const mcpSingleOpCall = async (options) => {
     );
     printJson(payload);
     throw new HandledCliError();
+  } finally {
+    activeCall = void 0;
+    disposeTerminationHandlers();
   }
 };
 class McpRunCheckpointStop extends Error {
@@ -307776,6 +308719,7 @@ const __testing__ = {
     meta: { elapsedMs }
   }),
   createMcpRunErrorPayload,
+  reportMcpSingleOpCallTermination,
   reportMcpRunTermination,
   createMcpRunTerminationController,
   createMcpRunCheckpointStopPayload,