@cloudinary/asset-management-mcp 0.9.0-rc.0 → 0.9.1

package/src/funcs/moderationsListResourcesByModerationKindAndStatus.ts

@@ -10,7 +10,7 @@ import { safeParse } from "../lib/schemas.js";
 import { RequestOptions } from "../lib/sdks.js";
 import { extractSecurity, resolveGlobalSecurity } from "../lib/security.js";
 import { pathToFunc } from "../lib/url.js";
-import { Direction } from "../models/direction.js";
+import { DirectionEnum } from "../models/directionenum.js";
 import { APIError } from "../models/errors/apierror.js";
 import {
   ConnectionError,
@@ -20,13 +20,13 @@ import {
   UnexpectedClientError,
 } from "../models/errors/httpclienterrors.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
-import { FieldsSpec } from "../models/fieldsspec.js";
+import { Fields } from "../models/fields.js";
 import {
-  ListResourcesByModerationKindAndStatusModerationStatus,
   ListResourcesByModerationKindAndStatusRequest,
   ListResourcesByModerationKindAndStatusRequest$zodSchema,
-  ModerationKind,
 } from "../models/listresourcesbymoderationkindandstatusop.js";
+import { ModerationKind } from "../models/moderationkind.js";
+import { ModerationStatusParameter } from "../models/moderationstatusparameter.js";
 import { ResourceType } from "../models/resourcetype.js";
 import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
@@ -41,11 +41,11 @@ export function moderationsListResourcesByModerationKindAndStatus(
   client$: CloudinaryAssetMgmtCore,
   resource_type: ResourceType,
   moderation_kind: ModerationKind,
-  moderation_status: ListResourcesByModerationKindAndStatusModerationStatus,
-  fields?: Array<FieldsSpec> | undefined,
+  moderation_status: ModerationStatusParameter,
+  fields?: Fields | undefined,
   next_cursor?: string | undefined,
   max_results?: number | undefined,
-  direction?: Direction | undefined,
+  direction?: DirectionEnum | undefined,
   options?: RequestOptions,
 ): APIPromise<
   Result<
@@ -76,11 +76,11 @@ async function $do(
   client$: CloudinaryAssetMgmtCore,
   resource_type: ResourceType,
   moderation_kind: ModerationKind,
-  moderation_status: ListResourcesByModerationKindAndStatusModerationStatus,
-  fields?: Array<FieldsSpec> | undefined,
+  moderation_status: ModerationStatusParameter,
+  fields?: Fields | undefined,
   next_cursor?: string | undefined,
   max_results?: number | undefined,
-  direction?: Direction | undefined,
+  direction?: DirectionEnum | undefined,
   options?: RequestOptions,
 ): Promise<
   [

package/src/funcs/peopleListPeople.ts

@@ -10,6 +10,7 @@ import { safeParse } from "../lib/schemas.js";
 import { RequestOptions } from "../lib/sdks.js";
 import { extractSecurity, resolveGlobalSecurity } from "../lib/security.js";
 import { pathToFunc } from "../lib/url.js";
+import { DirectionEnum } from "../models/directionenum.js";
 import { APIError } from "../models/errors/apierror.js";
 import {
   ConnectionError,
@@ -25,7 +26,6 @@ import {
   ListPeopleSortBy,
   NameStatus,
 } from "../models/listpeopleop.js";
-import { ParametersDirection } from "../models/parametersdirection.js";
 import { PersonStatus } from "../models/personstatus.js";
 import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
@@ -45,7 +45,7 @@ export function peopleListPeople(
   name_prefix?: string | undefined,
   status?: PersonStatus | undefined,
   sort_by?: ListPeopleSortBy | undefined,
-  direction?: ParametersDirection | undefined,
+  direction?: DirectionEnum | undefined,
   options?: RequestOptions,
 ): APIPromise<
   Result<
@@ -80,7 +80,7 @@ async function $do(
   name_prefix?: string | undefined,
   status?: PersonStatus | undefined,
   sort_by?: ListPeopleSortBy | undefined,
-  direction?: ParametersDirection | undefined,
+  direction?: DirectionEnum | undefined,
   options?: RequestOptions,
 ): Promise<
   [

package/src/funcs/peopleUpdatePerson.ts

@@ -20,10 +20,10 @@ import {
 } from "../models/errors/httpclienterrors.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
 import {
-  UpdatePersonRequest,
-  UpdatePersonRequest$zodSchema,
-  UpdatePersonRequestBody,
+  UpdatePersonRequestRequest,
+  UpdatePersonRequestRequest$zodSchema,
 } from "../models/updatepersonop.js";
+import { UpdatePersonRequest } from "../models/updatepersonrequest.js";
 import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
 
@@ -38,7 +38,7 @@ import { Result } from "../types/fp.js";
 export function peopleUpdatePerson(
   client$: CloudinaryAssetMgmtCore,
   person_id: string,
-  RequestBody: UpdatePersonRequestBody,
+  update_person_request: UpdatePersonRequest,
   options?: RequestOptions,
 ): APIPromise<
   Result<
@@ -55,7 +55,7 @@ export function peopleUpdatePerson(
   return new APIPromise($do(
     client$,
     person_id,
-    RequestBody,
+    update_person_request,
     options,
   ));
 }
@@ -63,7 +63,7 @@ export function peopleUpdatePerson(
 async function $do(
   client$: CloudinaryAssetMgmtCore,
   person_id: string,
-  RequestBody: UpdatePersonRequestBody,
+  update_person_request: UpdatePersonRequest,
   options?: RequestOptions,
 ): Promise<
   [
@@ -80,21 +80,23 @@ async function $do(
     APICall,
   ]
 > {
-  const input$: UpdatePersonRequest = {
+  const input$: UpdatePersonRequestRequest = {
     person_id: person_id,
-    RequestBody: RequestBody,
+    update_person_request: update_person_request,
   };
 
   const parsed$ = safeParse(
     input$,
-    (value$) => UpdatePersonRequest$zodSchema.parse(value$),
+    (value$) => UpdatePersonRequestRequest$zodSchema.parse(value$),
     "Input validation failed",
   );
   if (!parsed$.ok) {
     return [parsed$, { status: "invalid" }];
   }
   const payload$ = parsed$.value;
-  const body$ = encodeJSON("body", payload$.RequestBody, { explode: true });
+  const body$ = encodeJSON("body", payload$.update_person_request, {
+    explode: true,
+  });
 
   const pathParams$ = {
     cloud_name: encodeSimple("cloud_name", client$._options.cloud_name, {

package/src/funcs/searchSearchAssets.ts

@@ -32,9 +32,53 @@ import { Result } from "../types/fp.js";
  * @remarks
  * Returns a list of resources matching the specified search criteria.
  *
- * Uses Lucene-like query language to search by descriptive attributes (public_id, filename, folder, tags, context), file details (resource_type, format, bytes, width, height), embedded data (image_metadata), and analyzed data (face_count, colors, quality_score). Supports aggregate counts and complex Boolean expressions.
+ * Uses a Lucene-like query language to filter assets by descriptive attributes (`public_id`, `asset_id`, `filename`, `display_name`, `folder` / `asset_folder`, `tags`, `context.<key>`), file details (`resource_type`, `type`, `format`, `bytes`, `width`, `height`, `duration`, `pages`, `aspect_ratio`, `transparent`, `grayscale`), lifecycle dates (`uploaded_at`, `created_at`, `taken_at`, `updated_at`, `last_updated.<kind>`), moderation and lifecycle state (`status`, `moderation_status`, `moderation_kind`), embedded data (`image_metadata.*`), structured metadata (`metadata.<external_id>`), and analysis fields (`face_count`, `colors`, `quality_score`, `illustration_score`, `accessibility_analysis.*`). Supports sorting, aggregate counts, and complex boolean expressions. See the `expression` parameter for the full field reference.
  *
- * Examples: tags:shirt AND uploaded_at>1d, resource_type:image AND bytes>1mb, folder:products OR context.category:electronics
+ * ## Expression syntax
+ *
+ * - **Match**: `field:value` (token match) or `field=value` (exact match). Examples: `tags:shirt`, `tags=cotton`.
+ * - **Comparisons**: `>`, `<`, `>=`, `<=` for numbers and dates. Example: `bytes>10000000`.
+ * - **Ranges**: `field:[from TO to]` inclusive, `field:{from TO to}` exclusive. Example: `width:{200 TO 1028}`.
+ * - **Booleans**: `AND`, `OR`, `NOT` (uppercase), or `+` (must), `-` (must not). `NOT` must appear between clauses — a bare leading `NOT` is a parse error; use `-field:value` to negate the first clause. Group with parentheses: `(shirt OR pants) AND clothes`.
+ * - **Wildcards**: trailing `*` only, for prefix match (`public_id:shoes_*`, `format:jp*`, `tags:shirt*`). Not supported on `folder`, `asset_folder`, `resource_type`, or `type`. Leading `*`, middle `*`, `?`, and bare `*` (`folder:*`, `context.alt:*`) are all parse errors — wildcards cannot be used as a "field is present" probe.
+ * - **Tokenized vs exact fields**: `tags`, `filename`, `display_name`, `context.<key>`, and `metadata.<id>` match on tokens split by whitespace and punctuation — `tags:analysis` matches the tag `full-analysis`. `public_id`, `folder`, `asset_folder`, and `format` match the whole value — `public_id:dog` will not match `dog_pldcwy`; use `public_id="dog_pldcwy"` (exact) or `public_id:dog*` (prefix). These exact-match fields still accept a trailing `*` for prefix match (except `folder` / `asset_folder`, where wildcards are ignored).
+ * - **Dates**: ISO-8601 in quotes (`uploaded_at>"2024-01-15"`) or relative shorthand `Nh`, `Nd`, `Nw`, `Nm`, `Ny` (`uploaded_at>1d`, `created_at:[4w TO 1w]`). Send raw `<`/`>`, never HTML-escaped.
+ * - **Quoting**: wrap any value containing a space, colon, or other reserved character (`! ( ) { } [ ] ^ ~ ?  \ = & < > |`) in double quotes, or escape each character with `\`. Examples: `tags:"service:mantels"`, `aspect_ratio:"16:9"`, `folder:"My Folder"`.
+ *
+ * ## Common mistakes
+ *
+ * - Use `folder:` or `asset_folder:` (singular); `folders:`, `asset_folder_id:`, and other invented variants are not valid fields. Pass the exact folder name — wildcards do not apply here.
+ * - There is no "has any value" / presence probe. `folder:*`, `metadata.alt:*`, `context.key:*`, `tags:*`, and `-tags:*` are all parse errors. See *"Which assets have any value for `metadata.<id>`?"* under **Common tasks** for workarounds.
+ * - `NOT foo AND bar` is a parse error. Write it as `bar AND NOT foo` or `-foo AND bar`, and keep every `NOT` between two clauses (`a AND NOT b AND NOT c` is fine; `NOT b AND NOT c …` is not).
+ * - `public_id:dog` will not match `dog_pldcwy`. Use `public_id="dog_pldcwy"` (exact) or `public_id:dog*` (prefix).
+ * - `tags=service:mantels` fails because the unquoted colon is parsed as a field separator. Use `tags="service:mantels"` or `tags=service\:mantels`.
+ * - Do not HTML-escape operators. Send `uploaded_at<1h`, not `uploaded_at&lt;1h`.
+ * - Do not leave an operand empty (e.g. `tags: AND -tags:foo`). Omit the empty clause entirely.
+ *
+ * ## Tips
+ *
+ * - Set `max_results: 0` to return only `total_count` and `aggregations` without any resource payload — useful for counts and aggregation-only queries.
+ * - `total_count` is always present in the response; prefer it over running an aggregation just to get a count.
+ * - `aggregate` (both simple and range variants) and the `metadata`, `image_metadata`, `image_analysis` values of `with_field` require a Tier 2 search plan.
+ * - Range aggregations require each range to include a `key` label (1–20 chars, `[a-zA-Z0-9_-]+`) and at least one of `from` / `to`.
+ *
+ * ## Common tasks
+ *
+ * - **Count matching assets** — put the filter in `expression` with `max_results: 0` and read `total_count` from the response. Works on every tier; no `aggregate` needed.
+ * - **Preview one matching asset** — set `max_results: 1`; add `with_field: ["tags", "context"]` (or `metadata`, Tier 2) to inspect values. Prefer this over fetching and scanning a full page.
+ * - **Distribution of values for a field** — Tier 2: `aggregate: [format|resource_type|type]` for enum counts, or range aggregations on `bytes`, `image_pixels`, `video_pixels`, or `duration`. Tier 1 fallback: run N small queries with `max_results: 0`, one per candidate value, and read `total_count` from each.
+ * - **"Which assets have any value for `metadata.<id>`?"** — not expressible directly (`metadata.X:*` is a parse error; there is no presence probe). Workarounds: (a) if the field has a known value set, enumerate — `metadata.region:(apac OR emea OR amer)`; (b) query broadly with `with_field: ["metadata"]` (Tier 2) and filter client-side for entries where the field is set; (c) at ingest time, attach a sentinel tag whenever the field is set, then search by that tag.
+ * - **Newest / largest N** — keep the filter in `expression` and sort explicitly: `sort_by: [{uploaded_at: "desc"}]` with `max_results: 10`.
+ * - **Filter by folder** — both `asset_folder:"parent/child"` and `folder:"parent/child"` match an exact folder path; there is no wildcard or "contains". To query across multiple folders, enumerate: `asset_folder:("campaigns/2024" OR "campaigns/2025")`.
+ * - **Filter by metadata when you only know the label** — first call `list-metadata-fields` to resolve the label to an `external_id`, then query `metadata.<external_id>:value`.
+ * - **Multiple independent filters in one turn** — prefer one `expression` with `OR` / parentheses over firing many parallel calls: `metadata.region:apac OR metadata.region:emea` in a single request is faster and more reliable than two parallel requests.
+ *
+ * ## Examples
+ *
+ * - `tags:shirt AND uploaded_at>1d`
+ * - `resource_type:image AND bytes>1000000 AND (format:png OR format:jpg)`
+ * - `folder:products AND context.category:electronics`
+ * - `tags:"service:mantels" AND -tags:discontinued`
  */
 export function searchSearchAssets(
   client$: CloudinaryAssetMgmtCore,

package/src/funcs/searchVisualSearchAssets.ts

@@ -32,7 +32,7 @@ import { Result } from "../types/fp.js";
  * @remarks
  * Returns a list of resources that are visually similar to a specified image. You can provide the source image for comparison in one of three ways:
  * - Provide a URL of an image
- * - Specify the public ID or asset ID of an existing image
+ * - Specify the asset ID of an existing image
  * - Provide a textual description
  */
 export function searchVisualSearchAssets(

package/src/funcs/uploadDestroyAsset.ts

@@ -4,7 +4,7 @@
  */
 
 import { CloudinaryAssetMgmtCore } from "../core.js";
-import { encodeFormQuery, encodeSimple } from "../lib/encodings.js";
+import { encodeJSON, encodeSimple } from "../lib/encodings.js";
 import { compactMap } from "../lib/primitives.js";
 import { safeParse } from "../lib/schemas.js";
 import { RequestOptions } from "../lib/sdks.js";
@@ -13,6 +13,7 @@ import { pathToFunc } from "../lib/url.js";
 import {
   DestroyAssetRequest,
   DestroyAssetRequest$zodSchema,
+  DestroyAssetRequestBody,
 } from "../models/destroyassetop.js";
 import { APIError } from "../models/errors/apierror.js";
 import {
@@ -33,8 +34,7 @@ import { Result } from "../types/fp.js";
 export function uploadDestroyAsset(
   client$: CloudinaryAssetMgmtCore,
   resource_type: ResourceType,
-  public_id: string,
-  invalidate?: boolean | undefined,
+  RequestBody: DestroyAssetRequestBody,
   options?: RequestOptions,
 ): APIPromise<
   Result<
@@ -51,8 +51,7 @@ export function uploadDestroyAsset(
   return new APIPromise($do(
     client$,
     resource_type,
-    public_id,
-    invalidate,
+    RequestBody,
     options,
   ));
 }
@@ -60,8 +59,7 @@ export function uploadDestroyAsset(
 async function $do(
   client$: CloudinaryAssetMgmtCore,
   resource_type: ResourceType,
-  public_id: string,
-  invalidate?: boolean | undefined,
+  RequestBody: DestroyAssetRequestBody,
   options?: RequestOptions,
 ): Promise<
   [
@@ -80,8 +78,7 @@ async function $do(
 > {
   const input$: DestroyAssetRequest = {
     resource_type: resource_type,
-    public_id: public_id,
-    invalidate: invalidate,
+    RequestBody: RequestBody,
   };
 
   const parsed$ = safeParse(
@@ -93,7 +90,7 @@ async function $do(
     return [parsed$, { status: "invalid" }];
   }
   const payload$ = parsed$.value;
-  const body$ = null;
+  const body$ = encodeJSON("body", payload$.RequestBody, { explode: true });
 
   const pathParams$ = {
     cloud_name: encodeSimple("cloud_name", client$._options.cloud_name, {
@@ -108,12 +105,9 @@ async function $do(
   const path$ = pathToFunc("/v1_1/{cloud_name}/{resource_type}/destroy")(
     pathParams$,
   );
-  const query$ = encodeFormQuery({
-    "invalidate": payload$.invalidate,
-    "public_id": payload$.public_id,
-  });
 
   const headers$ = new Headers(compactMap({
+    "Content-Type": "application/json",
     Accept: "application/json",
   }));
   const securityInput = await extractSecurity(client$._options.security);
@@ -144,7 +138,6 @@ async function $do(
     baseURL: options?.serverURL,
     path: path$,
     headers: headers$,
-    query: query$,
     body: body$,
     userAgent: client$._options.userAgent,
     timeoutMs: options?.timeoutMs || client$._options.timeoutMs

package/src/funcs/uploadText.ts

@@ -20,11 +20,11 @@ import {
 } from "../models/errors/httpclienterrors.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
 import {
-  TextRequest,
-  TextRequest$zodSchema,
-  TextRequestBody,
+  TextRequestRequest,
+  TextRequestRequest$zodSchema,
   TextResourceType,
 } from "../models/textop.js";
+import { TextRequest } from "../models/textrequest.js";
 import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
 
@@ -37,7 +37,7 @@ import { Result } from "../types/fp.js";
 export function uploadText(
   client$: CloudinaryAssetMgmtCore,
   resource_type: TextResourceType,
-  RequestBody: TextRequestBody,
+  text_request: TextRequest,
   options?: RequestOptions,
 ): APIPromise<
   Result<
@@ -54,7 +54,7 @@ export function uploadText(
   return new APIPromise($do(
     client$,
     resource_type,
-    RequestBody,
+    text_request,
     options,
   ));
 }
@@ -62,7 +62,7 @@ export function uploadText(
 async function $do(
   client$: CloudinaryAssetMgmtCore,
   resource_type: TextResourceType,
-  RequestBody: TextRequestBody,
+  text_request: TextRequest,
   options?: RequestOptions,
 ): Promise<
   [
@@ -79,21 +79,21 @@ async function $do(
     APICall,
   ]
 > {
-  const input$: TextRequest = {
+  const input$: TextRequestRequest = {
     resource_type: resource_type,
-    RequestBody: RequestBody,
+    text_request: text_request,
   };
 
   const parsed$ = safeParse(
     input$,
-    (value$) => TextRequest$zodSchema.parse(value$),
+    (value$) => TextRequestRequest$zodSchema.parse(value$),
     "Input validation failed",
   );
   if (!parsed$.ok) {
     return [parsed$, { status: "invalid" }];
   }
   const payload$ = parsed$.value;
-  const body$ = encodeJSON("body", payload$.RequestBody, { explode: true });
+  const body$ = encodeJSON("body", payload$.text_request, { explode: true });
 
   const pathParams$ = {
     cloud_name: encodeSimple("cloud_name", client$._options.cloud_name, {

package/src/landing-page.ts

@@ -933,7 +933,7 @@ http_headers = { "api-key" = "YOUR_API_KEY", "api-secret" = "YOUR_API_SECRET", "
         <h1>Instructions</h1>
         <p>One-click installation for Claude Desktop users</p>
         <div class="instruction-item">
-          <a href="https://github.com/cloudinary/asset-management-mcp/releases/download/v0.9.0-rc.0/mcp-server.mcpb" download="mcp-server.mcpb" class="action-button header-action" style="display: inline-flex; margin-bottom: 16px;">
+          <a href="https://github.com/cloudinary/asset-management-mcp/releases/download/v0.9.1/mcp-server.mcpb" download="mcp-server.mcpb" class="action-button header-action" style="display: inline-flex; margin-bottom: 16px;">
             📥 Download MCP Bundle
           </a>
         </div>

package/src/lib/config.ts

@@ -112,9 +112,9 @@ export function serverURLFromOptions(options: SDKOptions): URL | null {
 
 export const SDK_METADATA = {
   language: "typescript",
-  openapiDocVersion: "0.4.0",
-  sdkVersion: "0.9.0-rc.0",
-  genVersion: "2.879.11",
+  openapiDocVersion: "0.5.1",
+  sdkVersion: "0.9.1",
+  genVersion: "2.881.4",
   userAgent:
-    "speakeasy-sdk/mcp-typescript 0.9.0-rc.0 2.879.11 0.4.0 @cloudinary/asset-management-mcp",
+    "speakeasy-sdk/mcp-typescript 0.9.1 2.881.4 0.5.1 @cloudinary/asset-management-mcp",
 } as const;

package/src/lib/sdks.ts

@@ -384,8 +384,6 @@ async function logResponse(
       break;
     case matchContentType(res, "application/jsonl")
       || jsonlLikeContentTypeRE.test(ct):
-      logger.log(await res.clone().text());
-      break;
     case matchContentType(res, "text/event-stream"):
       logger.log(`<${contentType}>`);
       break;

package/src/mcp-server/{widgets/widget-shared.ts → apps/app-shared.ts}

@@ -1,7 +1,7 @@
 /*
- * Shared building blocks for MCP App widgets (gallery + details).
+ * Shared building blocks for MCP Apps (gallery + details).
  * Each export is a raw string fragment to be interpolated into the
- * final HTML template literal of each widget.
+ * final HTML template literal of each app.
  */
 
 import { toJSONSchema } from "zod";
@@ -380,7 +380,7 @@ details.detail-section > summary.detail-section-title::-webkit-details-marker {
 .media-modal-audio-wrap audio { width: 100%; max-width: 480px; }
 .thumb-overlay.playable { pointer-events: auto; cursor: pointer; }
 
-/* Upload widget */
+/* Upload app */
 .upload-zone {
   border: 2px dashed var(--cld-border2); border-radius: var(--cld-radius);
   padding: 40px 24px; text-align: center; cursor: pointer;

package/src/mcp-server/{widgets/asset-details-widget.ts → apps/asset-details-app.ts}

@@ -1,9 +1,9 @@
 /*
- * Standalone MCP App widget for displaying a single Cloudinary asset
+ * Standalone MCP App for displaying a single Cloudinary asset
  * in a rich detail view. Attached to the get-asset-details tool.
  *
  * Shares CLDS tokens, MCPApp client, helpers, and detail renderers
- * with the gallery widget via widget-shared.ts.
+ * with the gallery app via app-shared.ts.
  */
 
 import {
@@ -15,12 +15,11 @@ import {
   SHARED_JS_MODAL,
   SHARED_JS_DETAIL_RENDERERS,
   SHARED_JS_HOST_CONTEXT,
-} from "./widget-shared.js";
+} from "./app-shared.js";
+import { injectToolName } from "./uri.js";
 
-export const ASSET_DETAILS_RESOURCE_URI = "ui://cloudinary/asset-details.html";
-
-export function getAssetDetailsHtml(): string {
-  return ASSET_DETAILS_HTML;
+export function getAssetDetailsHtml(toolName?: string): string {
+  return injectToolName(ASSET_DETAILS_HTML, toolName);
 }
 
 const ASSET_DETAILS_CSS = /* css */ `

package/src/mcp-server/{widgets/asset-gallery-widget.ts → apps/asset-gallery-app.ts}

@@ -1,10 +1,10 @@
 /*
- * MCP App widget for displaying Cloudinary assets in an interactive
+ * MCP App for displaying Cloudinary assets in an interactive
  * gallery. Attached to list-images, list-videos, list-files, and
  * search-assets tools.
  *
  * Shares CLDS tokens, MCPApp client, helpers, and detail renderers
- * with the details widget via widget-shared.ts.
+ * with the details app via app-shared.ts.
  */
 
 import {
@@ -16,13 +16,11 @@ import {
   SHARED_JS_MODAL,
   SHARED_JS_DETAIL_RENDERERS,
   SHARED_JS_HOST_CONTEXT,
-} from "./widget-shared.js";
+} from "./app-shared.js";
+import { injectToolName } from "./uri.js";
 
-export const ASSET_GALLERY_RESOURCE_URI = "ui://cloudinary/asset-gallery.html";
-export const MCP_APP_MIME_TYPE = "text/html;profile=mcp-app";
-
-export function getAssetGalleryHtml(): string {
-  return ASSET_GALLERY_HTML;
+export function getAssetGalleryHtml(toolName?: string): string {
+  return injectToolName(ASSET_GALLERY_HTML, toolName);
 }
 
 const GALLERY_CSS = /* css */ `
@@ -303,7 +301,10 @@ var LOG_PREFIX = "[gallery]";
 var MIN_HEIGHT = 120;
 var allResources = [];
 var lastCursor = null;
-var pendingCall = { name: null, args: null };
+var pendingCall = {
+  name: (typeof window.__MCP_TOOL_NAME__ === "string" && window.__MCP_TOOL_NAME__) || null,
+  args: null,
+};
 var selected = new Set();
 var filterQuery = "";
 var aspectFilter = "";
@@ -915,23 +916,23 @@ app.ontoolcancelled = function(params) {
   showCancelledPrompt(pendingCall, fetchDirect);
 };
 
-function inferToolName(data) {
-  if (data.total_count !== undefined) return "search-assets";
-  var resources = data.resources;
-  if (!resources || !resources.length) return null;
-  var rt = resources[0].resource_type;
-  if (rt === "video") return "list-videos";
-  if (rt === "raw") return "list-files";
-  return "list-images";
+function resolveToolName(result) {
+  if (typeof window.__MCP_TOOL_NAME__ === "string" && window.__MCP_TOOL_NAME__) {
+    return window.__MCP_TOOL_NAME__;
+  }
+  var fromMeta = result && result._meta && result._meta["cloudinary/toolName"];
+  if (fromMeta) return fromMeta;
+  return pendingCall.name;
 }
 
 app.ontoolresult = function(result) {
   var data = ingestResult(result);
+  var name = resolveToolName(result);
+  if (name) pendingCall.name = name;
   if (data && data.resources) {
     console.log(LOG_PREFIX, "host result:", data.resources.length, "resources");
     allResources = data.resources;
     lastCursor = data.next_cursor || null;
-    pendingCall.name = inferToolName(data) || pendingCall.name;
     render(); attachEvents();
     return;
   }
@@ -952,7 +953,11 @@ app.ontoolresult = function(result) {
 };
 
 function showFetchPrompt() {
-  var name = pendingCall.name || "list-images";
+  var name = pendingCall.name;
+  if (!name) {
+    showPersistentError("Unknown Tool", "Could not determine which tool produced this result. Please retry from the host.");
+    return;
+  }
   var root = document.getElementById("app");
   var h = '<div class="prompt">';
   h += '<div class="prompt-icon">\\u{1F4E6}</div>';
@@ -975,7 +980,11 @@ function jsonArgs(src) {
 }
 
 async function fetchDirect() {
-  var name = pendingCall.name || "list-images";
+  var name = pendingCall.name;
+  if (!name) {
+    showPersistentError("Unknown Tool", "Could not determine which tool to call. Please retry from the host.");
+    return;
+  }
   var args = jsonArgs(pendingCall.args || {});
   console.log(LOG_PREFIX, "fetchDirect ->", name);
 
@@ -1000,7 +1009,11 @@ async function fetchDirect() {
 
 async function loadMore() {
   if (!lastCursor) return;
-  var name = pendingCall.name || "list-images";
+  var name = pendingCall.name;
+  if (!name) {
+    showError("Unknown Tool", "Could not determine which tool to call for pagination.");
+    return;
+  }
   var args = name === "search-assets"
     ? { request: { next_cursor: lastCursor } }
     : { next_cursor: lastCursor };

package/src/mcp-server/{widgets/asset-upload-widget.ts → apps/asset-upload-app.ts}

@@ -1,5 +1,5 @@
 /*
- * MCP App widget for uploading assets to Cloudinary.
+ * MCP App for uploading assets to Cloudinary.
  * Attached to the upload-asset tool.
  *
  * Features:
@@ -11,7 +11,7 @@
  *  - Folder picker: combobox with search-folders tool for autocomplete.
  *
  * Shares CLDS tokens, MCPApp client, helpers, and detail renderers
- * with the gallery/details widgets via widget-shared.ts.
+ * with the gallery/details apps via app-shared.ts.
  */
 
 import { toJSONSchema } from "zod";
@@ -24,14 +24,13 @@ import {
   SHARED_JS_MODAL,
   SHARED_JS_DETAIL_RENDERERS,
   SHARED_JS_HOST_CONTEXT,
-} from "./widget-shared.js";
+} from "./app-shared.js";
 import { UploadRequest$zodSchema } from "../../models/uploadrequest.js";
 import { UploadResourceType$zodSchema } from "../../models/uploadresourcetype.js";
+import { injectToolName } from "./uri.js";
 
-export const ASSET_UPLOAD_RESOURCE_URI = "ui://cloudinary/asset-upload.html";
-
-export function getAssetUploadHtml(): string {
-  return ASSET_UPLOAD_HTML;
+export function getAssetUploadHtml(toolName?: string): string {
+  return injectToolName(ASSET_UPLOAD_HTML, toolName);
 }
 
 // ── Build-time schema generation ────────────────────────────────────
@@ -711,7 +710,7 @@ function renderUploadError(title, msg) {
     var safeMsg = esc(msg).replace(/\\n/g, "<br>");
     var h = '<div class="upload-error-msg">' + safeMsg + "</div>";
     h += '<div class="upload-another" style="margin-top:14px">';
-    h += '<button class="prompt-btn prompt-btn-primary" id="retry-upload-btn">Try from Widget</button>';
+    h += '<button class="prompt-btn prompt-btn-primary" id="retry-upload-btn">Try from App</button>';
     h += "</div>";
     wrap.innerHTML = h;
   } else {
@@ -723,7 +722,7 @@ function renderUploadError(title, msg) {
     h += "</div>";
     h += '<div class="upload-error-msg">' + safeMsg + "</div>";
     h += '<div class="upload-another" style="margin-top:14px;text-align:center">';
-    h += '<button class="prompt-btn prompt-btn-primary" id="retry-upload-btn">Try from Widget</button>';
+    h += '<button class="prompt-btn prompt-btn-primary" id="retry-upload-btn">Try from App</button>';
     h += "</div>";
     root.innerHTML = h;
   }
@@ -861,7 +860,7 @@ async function doUpload(fileData, displayHint) {
       if (uploadOrigin === "host") {
         try {
           app._rpc("ui/updateModelContext", {
-            content: [{ type: "text", text: "File uploaded successfully via widget. public_id: " + data.public_id + ", secure_url: " + (data.secure_url || data.url || "") }]
+            content: [{ type: "text", text: "File uploaded successfully via app. public_id: " + data.public_id + ", secure_url: " + (data.secure_url || data.url || "") }]
           });
         } catch (e) { console.warn(LOG_PREFIX, "updateModelContext failed:", e); }
       }
@@ -1028,7 +1027,7 @@ app.ontoolcancelled = function(params) {
   h += '<div style="font-size:14px;font-weight:600;color:var(--cld-text);margin-bottom:4px">Upload Cancelled</div>';
   h += renderParamsList(pendingCall.args);
   h += '<div class="prompt-actions" style="margin-top:14px">';
-  h += '<button class="prompt-btn prompt-btn-primary" id="cancelled-retry-btn">Upload from Widget</button>';
+  h += '<button class="prompt-btn prompt-btn-primary" id="cancelled-retry-btn">Upload from App</button>';
   h += '</div>';
   h += '</div>';
   root.innerHTML = h;