@happyvertical/smrt-core 0.40.59 → 0.40.61

package/dist/generated-client-runtime.d.ts

@@ -9,10 +9,11 @@
  * failures were therefore invisible to callers — an optimistic-update layer
  * (e.g. TanStack DB `onInsert`) could never observe the failure and roll back.
  *
- * `SmrtClientError` carries the HTTP `status` and the parsed error `body` (when
- * the response was JSON), so callers can branch on status and surface server
- * messages. Both helpers are emitted with a `__smrt` prefix so they cannot
- * collide with a collection key in the generated module.
+ * `SmrtClientError` carries the HTTP `status` and, for non-5xx responses, the
+ * parsed error `body`, so callers can branch on status and surface safe server
+ * messages. Server-side failures stay opaque. Both helpers are emitted with a
+ * `__smrt` prefix so they cannot collide with a collection key in the generated
+ * module.
  *
  * WIRE-SHAPE POLICY (#1797, ADR 0001): the server returns BARE JSON — a bare
  * array for list, a bare object for get/create/update — with snake_case field
@@ -22,5 +23,5 @@
  * (vite-plugin + prebuild) are written to match this shape. This same
  * snake_case wire feeds the mobile DTO codegen; do not change the wire here.
  */
-export declare const CLIENT_FETCH_RUNTIME = "class SmrtClientError extends Error {\n  constructor(message, status, body) {\n    super(message);\n    this.name = 'SmrtClientError';\n    this.status = status;\n    this.body = body;\n  }\n}\n\nasync function __smrtParseBody(response) {\n  const contentType = response.headers.get('content-type') || '';\n  if (contentType.includes('application/json')) {\n    try {\n      return await response.json();\n    } catch {\n      return undefined;\n    }\n  }\n  try {\n    return await response.text();\n  } catch {\n    return undefined;\n  }\n}\n\n// Rejects on !response.ok with a typed SmrtClientError; otherwise resolves the\n// parsed JSON body exactly as the server sent it (bare array/object, snake_case\n// fields).\nasync function __smrtFetchJson(url, init) {\n  const response = await fetch(url, init);\n  const body = await __smrtParseBody(response);\n  if (!response.ok) {\n    const detail =\n      body && typeof body === 'object' && body.error ? ': ' + body.error : '';\n    throw new SmrtClientError(\n      'Request failed with status ' + response.status + detail,\n      response.status,\n      body,\n    );\n  }\n  return body;\n}\n\n// DELETE variant: rejects on !response.ok (so a failed delete is observable),\n// otherwise resolves true.\nasync function __smrtFetchOk(url, init) {\n  const response = await fetch(url, init);\n  if (!response.ok) {\n    const body = await __smrtParseBody(response);\n    const detail =\n      body && typeof body === 'object' && body.error ? ': ' + body.error : '';\n    throw new SmrtClientError(\n      'Request failed with status ' + response.status + detail,\n      response.status,\n      body,\n    );\n  }\n  return true;\n}";
+export declare const CLIENT_FETCH_RUNTIME = "class SmrtClientError extends Error {\n  constructor(message, status, body, code) {\n    super(message);\n    this.name = 'SmrtClientError';\n    this.status = status;\n    if (body !== undefined) this.body = body;\n    if (code) this.code = code;\n  }\n}\n\nasync function __smrtParseBody(response) {\n  const contentType = response.headers.get('content-type') || '';\n  if (contentType.includes('application/json')) {\n    try {\n      return await response.json();\n    } catch {\n      return undefined;\n    }\n  }\n  try {\n    return await response.text();\n  } catch {\n    return undefined;\n  }\n}\n\n// Generated REST routes retain the legacy { error: string } form while custom\n// action failures use { error: { ok: false, code, message, status? } }. Keep\n// the nested message human-readable and retain its machine-readable code.\nfunction __smrtErrorDetail(body) {\n  if (!body || typeof body !== 'object') return {};\n  const error = body.error;\n  if (typeof error === 'string') return { message: error };\n  if (error && typeof error === 'object') {\n    return {\n      message: typeof error.message === 'string' ? error.message : undefined,\n      code: typeof error.code === 'string' ? error.code : undefined,\n    };\n  }\n  return typeof body.message === 'string' ? { message: body.message } : {};\n}\n\n// Rejects on !response.ok with a typed SmrtClientError; otherwise resolves the\n// parsed JSON body exactly as the server sent it (bare array/object, snake_case\n// fields).\nasync function __smrtFetchJson(url, init) {\n  const response = await fetch(url, init);\n  if (!response.ok) {\n    // Server-side failures may carry stack traces or upstream payloads. Do not\n    // parse, interpolate, or expose them to browser callers.\n    if (response.status >= 500) {\n      throw new SmrtClientError(\n        'Request failed with status ' + response.status,\n        response.status,\n      );\n    }\n    const body = await __smrtParseBody(response);\n    const detail = __smrtErrorDetail(body);\n    throw new SmrtClientError(\n      'Request failed with status ' + response.status +\n        (detail.message ? ': ' + detail.message : ''),\n      response.status,\n      body,\n      detail.code,\n    );\n  }\n  return __smrtParseBody(response);\n}\n\n// DELETE variant: rejects on !response.ok (so a failed delete is observable),\n// otherwise resolves true.\nasync function __smrtFetchOk(url, init) {\n  const response = await fetch(url, init);\n  if (!response.ok) {\n    // Keep 5xx failures opaque for the same reason as __smrtFetchJson.\n    if (response.status >= 500) {\n      throw new SmrtClientError(\n        'Request failed with status ' + response.status,\n        response.status,\n      );\n    }\n    const body = await __smrtParseBody(response);\n    const detail = __smrtErrorDetail(body);\n    throw new SmrtClientError(\n      'Request failed with status ' + response.status +\n        (detail.message ? ': ' + detail.message : ''),\n      response.status,\n      body,\n      detail.code,\n    );\n  }\n  return true;\n}";
 //# sourceMappingURL=generated-client-runtime.d.ts.map

package/dist/generated-client-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generated-client-runtime.d.ts","sourceRoot":"","sources":["../src/generated-client-runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,oBAAoB,4pDA0D/B,CAAC"}
+{"version":3,"file":"generated-client-runtime.d.ts","sourceRoot":"","sources":["../src/generated-client-runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,oBAAoB,sgGA4F/B,CAAC"}

package/dist/generated-client-runtime.js

@@ -10,10 +10,11 @@
 * failures were therefore invisible to callers — an optimistic-update layer
 * (e.g. TanStack DB `onInsert`) could never observe the failure and roll back.
 *
-* `SmrtClientError` carries the HTTP `status` and the parsed error `body` (when
-* the response was JSON), so callers can branch on status and surface server
-* messages. Both helpers are emitted with a `__smrt` prefix so they cannot
-* collide with a collection key in the generated module.
+* `SmrtClientError` carries the HTTP `status` and, for non-5xx responses, the
+* parsed error `body`, so callers can branch on status and surface safe server
+* messages. Server-side failures stay opaque. Both helpers are emitted with a
+* `__smrt` prefix so they cannot collide with a collection key in the generated
+* module.
 *
 * WIRE-SHAPE POLICY (#1797, ADR 0001): the server returns BARE JSON — a bare
 * array for list, a bare object for get/create/update — with snake_case field
@@ -24,11 +25,12 @@
 * snake_case wire feeds the mobile DTO codegen; do not change the wire here.
 */
 var CLIENT_FETCH_RUNTIME = `class SmrtClientError extends Error {
-  constructor(message, status, body) {
+  constructor(message, status, body, code) {
     super(message);
     this.name = 'SmrtClientError';
     this.status = status;
-    this.body = body;
+    if (body !== undefined) this.body = body;
+    if (code) this.code = code;
   }
 }
 
@@ -48,22 +50,47 @@ async function __smrtParseBody(response) {
   }
 }
 
+// Generated REST routes retain the legacy { error: string } form while custom
+// action failures use { error: { ok: false, code, message, status? } }. Keep
+// the nested message human-readable and retain its machine-readable code.
+function __smrtErrorDetail(body) {
+  if (!body || typeof body !== 'object') return {};
+  const error = body.error;
+  if (typeof error === 'string') return { message: error };
+  if (error && typeof error === 'object') {
+    return {
+      message: typeof error.message === 'string' ? error.message : undefined,
+      code: typeof error.code === 'string' ? error.code : undefined,
+    };
+  }
+  return typeof body.message === 'string' ? { message: body.message } : {};
+}
+
 // Rejects on !response.ok with a typed SmrtClientError; otherwise resolves the
 // parsed JSON body exactly as the server sent it (bare array/object, snake_case
 // fields).
 async function __smrtFetchJson(url, init) {
   const response = await fetch(url, init);
-  const body = await __smrtParseBody(response);
   if (!response.ok) {
-    const detail =
-      body && typeof body === 'object' && body.error ? ': ' + body.error : '';
+    // Server-side failures may carry stack traces or upstream payloads. Do not
+    // parse, interpolate, or expose them to browser callers.
+    if (response.status >= 500) {
+      throw new SmrtClientError(
+        'Request failed with status ' + response.status,
+        response.status,
+      );
+    }
+    const body = await __smrtParseBody(response);
+    const detail = __smrtErrorDetail(body);
     throw new SmrtClientError(
-      'Request failed with status ' + response.status + detail,
+      'Request failed with status ' + response.status +
+        (detail.message ? ': ' + detail.message : ''),
       response.status,
       body,
+      detail.code,
     );
   }
-  return body;
+  return __smrtParseBody(response);
 }
 
 // DELETE variant: rejects on !response.ok (so a failed delete is observable),
@@ -71,13 +98,21 @@ async function __smrtFetchJson(url, init) {
 async function __smrtFetchOk(url, init) {
   const response = await fetch(url, init);
   if (!response.ok) {
+    // Keep 5xx failures opaque for the same reason as __smrtFetchJson.
+    if (response.status >= 500) {
+      throw new SmrtClientError(
+        'Request failed with status ' + response.status,
+        response.status,
+      );
+    }
     const body = await __smrtParseBody(response);
-    const detail =
-      body && typeof body === 'object' && body.error ? ': ' + body.error : '';
+    const detail = __smrtErrorDetail(body);
     throw new SmrtClientError(
-      'Request failed with status ' + response.status + detail,
+      'Request failed with status ' + response.status +
+        (detail.message ? ': ' + detail.message : ''),
       response.status,
       body,
+      detail.code,
     );
   }
   return true;

package/dist/generated-client-runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"generated-client-runtime.js","names":[],"sources":["../src/generated-client-runtime.ts"],"sourcesContent":["/**\n * Shared runtime source injected into every generated API client\n * (`smrtPlugin`'s `@happyvertical/smrt-virt-client` and `smrtConsumer`'s\n * `@smrt/client` fallback).\n *\n * The generated fetchers MUST reject on `!response.ok` (#1796): before this,\n * every fetcher resolved `r.json()` regardless of HTTP status, so a 500 (or any\n * error response) resolved successfully with the error payload. Mutation\n * failures were therefore invisible to callers — an optimistic-update layer\n * (e.g. TanStack DB `onInsert`) could never observe the failure and roll back.\n *\n * `SmrtClientError` carries the HTTP `status` and the parsed error `body` (when\n * the response was JSON), so callers can branch on status and surface server\n * messages. Both helpers are emitted with a `__smrt` prefix so they cannot\n * collide with a collection key in the generated module.\n *\n * WIRE-SHAPE POLICY (#1797, ADR 0001): the server returns BARE JSON — a bare\n * array for list, a bare object for get/create/update — with snake_case field\n * names (`created_at`, `updated_at`) exactly as `SmrtObject.toJSON()` emits\n * them. These helpers pass that JSON through unchanged; they do NOT wrap it in\n * an envelope or camelCase the keys. The generated `.d.ts` declarations\n * (vite-plugin + prebuild) are written to match this shape. This same\n * snake_case wire feeds the mobile DTO codegen; do not change the wire here.\n */\nexport const CLIENT_FETCH_RUNTIME = `class SmrtClientError extends Error {\n  constructor(message, status, body) {\n    super(message);\n    this.name = 'SmrtClientError';\n    this.status = status;\n    this.body = body;\n  }\n}\n\nasync function __smrtParseBody(response) {\n  const contentType = response.headers.get('content-type') || '';\n  if (contentType.includes('application/json')) {\n    try {\n      return await response.json();\n    } catch {\n      return undefined;\n    }\n  }\n  try {\n    return await response.text();\n  } catch {\n    return undefined;\n  }\n}\n\n// Rejects on !response.ok with a typed SmrtClientError; otherwise resolves the\n// parsed JSON body exactly as the server sent it (bare array/object, snake_case\n// fields).\nasync function __smrtFetchJson(url, init) {\n  const response = await fetch(url, init);\n  const body = await __smrtParseBody(response);\n  if (!response.ok) {\n    const detail =\n      body && typeof body === 'object' && body.error ? ': ' + body.error : '';\n    throw new SmrtClientError(\n      'Request failed with status ' + response.status + detail,\n      response.status,\n      body,\n    );\n  }\n  return body;\n}\n\n// DELETE variant: rejects on !response.ok (so a failed delete is observable),\n// otherwise resolves true.\nasync function __smrtFetchOk(url, init) {\n  const response = await fetch(url, init);\n  if (!response.ok) {\n    const body = await __smrtParseBody(response);\n    const detail =\n      body && typeof body === 'object' && body.error ? ': ' + body.error : '';\n    throw new SmrtClientError(\n      'Request failed with status ' + response.status + detail,\n      response.status,\n      body,\n    );\n  }\n  return true;\n}`;\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAwBA,IAAa,uBAAuB"}
+{"version":3,"file":"generated-client-runtime.js","names":[],"sources":["../src/generated-client-runtime.ts"],"sourcesContent":["/**\n * Shared runtime source injected into every generated API client\n * (`smrtPlugin`'s `@happyvertical/smrt-virt-client` and `smrtConsumer`'s\n * `@smrt/client` fallback).\n *\n * The generated fetchers MUST reject on `!response.ok` (#1796): before this,\n * every fetcher resolved `r.json()` regardless of HTTP status, so a 500 (or any\n * error response) resolved successfully with the error payload. Mutation\n * failures were therefore invisible to callers — an optimistic-update layer\n * (e.g. TanStack DB `onInsert`) could never observe the failure and roll back.\n *\n * `SmrtClientError` carries the HTTP `status` and, for non-5xx responses, the\n * parsed error `body`, so callers can branch on status and surface safe server\n * messages. Server-side failures stay opaque. Both helpers are emitted with a\n * `__smrt` prefix so they cannot collide with a collection key in the generated\n * module.\n *\n * WIRE-SHAPE POLICY (#1797, ADR 0001): the server returns BARE JSON — a bare\n * array for list, a bare object for get/create/update — with snake_case field\n * names (`created_at`, `updated_at`) exactly as `SmrtObject.toJSON()` emits\n * them. These helpers pass that JSON through unchanged; they do NOT wrap it in\n * an envelope or camelCase the keys. The generated `.d.ts` declarations\n * (vite-plugin + prebuild) are written to match this shape. This same\n * snake_case wire feeds the mobile DTO codegen; do not change the wire here.\n */\nexport const CLIENT_FETCH_RUNTIME = `class SmrtClientError extends Error {\n  constructor(message, status, body, code) {\n    super(message);\n    this.name = 'SmrtClientError';\n    this.status = status;\n    if (body !== undefined) this.body = body;\n    if (code) this.code = code;\n  }\n}\n\nasync function __smrtParseBody(response) {\n  const contentType = response.headers.get('content-type') || '';\n  if (contentType.includes('application/json')) {\n    try {\n      return await response.json();\n    } catch {\n      return undefined;\n    }\n  }\n  try {\n    return await response.text();\n  } catch {\n    return undefined;\n  }\n}\n\n// Generated REST routes retain the legacy { error: string } form while custom\n// action failures use { error: { ok: false, code, message, status? } }. Keep\n// the nested message human-readable and retain its machine-readable code.\nfunction __smrtErrorDetail(body) {\n  if (!body || typeof body !== 'object') return {};\n  const error = body.error;\n  if (typeof error === 'string') return { message: error };\n  if (error && typeof error === 'object') {\n    return {\n      message: typeof error.message === 'string' ? error.message : undefined,\n      code: typeof error.code === 'string' ? error.code : undefined,\n    };\n  }\n  return typeof body.message === 'string' ? { message: body.message } : {};\n}\n\n// Rejects on !response.ok with a typed SmrtClientError; otherwise resolves the\n// parsed JSON body exactly as the server sent it (bare array/object, snake_case\n// fields).\nasync function __smrtFetchJson(url, init) {\n  const response = await fetch(url, init);\n  if (!response.ok) {\n    // Server-side failures may carry stack traces or upstream payloads. Do not\n    // parse, interpolate, or expose them to browser callers.\n    if (response.status >= 500) {\n      throw new SmrtClientError(\n        'Request failed with status ' + response.status,\n        response.status,\n      );\n    }\n    const body = await __smrtParseBody(response);\n    const detail = __smrtErrorDetail(body);\n    throw new SmrtClientError(\n      'Request failed with status ' + response.status +\n        (detail.message ? ': ' + detail.message : ''),\n      response.status,\n      body,\n      detail.code,\n    );\n  }\n  return __smrtParseBody(response);\n}\n\n// DELETE variant: rejects on !response.ok (so a failed delete is observable),\n// otherwise resolves true.\nasync function __smrtFetchOk(url, init) {\n  const response = await fetch(url, init);\n  if (!response.ok) {\n    // Keep 5xx failures opaque for the same reason as __smrtFetchJson.\n    if (response.status >= 500) {\n      throw new SmrtClientError(\n        'Request failed with status ' + response.status,\n        response.status,\n      );\n    }\n    const body = await __smrtParseBody(response);\n    const detail = __smrtErrorDetail(body);\n    throw new SmrtClientError(\n      'Request failed with status ' + response.status +\n        (detail.message ? ': ' + detail.message : ''),\n      response.status,\n      body,\n      detail.code,\n    );\n  }\n  return true;\n}`;\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAyBA,IAAa,uBAAuB"}

package/dist/generators/index.d.ts

@@ -6,11 +6,12 @@ export { CLIGenerator, getCLIHandler, setupCLI } from './cli';
 export { canonicalReadRepresentation, computeBodyEtag, computeTableVersionEtag, conditionalJsonResponse, ifNoneMatchHasConcreteMatch, ifNoneMatchSatisfied, PRIVATE_READ_CACHE_CONTROL, type ReadCacheControlOptions, resolveReadCacheControl, resolveTenantEtagDiscriminator, versionConditionalResponse, warnIfSharedCacheNeutralized, } from './conditional-get';
 export { buildCustomActionInputSchema, buildCustomActionInvocationArgs, type CustomActionFailure, type CustomActionMetadata, type CustomActionScope, customActionParameterInputName, normalizeCustomActionFailure, type ResolveCustomActionMetadataOptions, resolveCustomActionMetadata, SMRT_CUSTOM_ACTION_ERROR_METADATA_KEY, } from './custom-action';
 export { buildChangeEventStream, type ChangeEventStreamOptions, changeEventSubscribersAtCapacity, DEFAULT_EVENTS_HEARTBEAT_MS, DEFAULT_EVENTS_MAX_SUBSCRIBERS, DEFAULT_EVENTS_RETRY_AFTER_SECONDS, eventStreamCapacityExceededResponse, normalizeEventsMaxSubscribers, signalVisibleToTenant, tryReserveChangeEventSubscriberSlot, } from './events-route';
-export type { MCPConfig, MCPContext, MCPRequest, MCPResponse, MCPTool, } from './mcp';
-export { MCPGenerator } from './mcp';
+export type { MCPConfig, MCPContext, MCPRequest, MCPResponse, MCPTool, MCPToolListCacheHint, MCPToolListCacheOptions, } from './mcp';
+export { MCP_STABLE_CATALOG_TTL_MS, MCPGenerator, resolveMCPToolListCacheHint, sortMCPTools, } from './mcp';
 export type { APIConfig, APIContext, RestServerConfig } from './rest';
 export { APIGenerator, computeRuntimeWebManifestHash, createRestServer, startRestServer, } from './rest';
 export type { OpenAPIConfig } from './swagger';
 export { generateOpenAPISpec, setupSwaggerUI, } from './swagger';
 export { runWithTenantGate, setTenantEntryPointRunner, type TenantEntryPointRunner, type TenantGateOptions, } from './tenant-gate';
+export { normalizeTypedHttpError, type TypedHttpFailure, } from './typed-http-error';
 //# sourceMappingURL=index.d.ts.map

package/dist/generators/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/generators/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAG9D,OAAO,EACL,2BAA2B,EAC3B,eAAe,EACf,uBAAuB,EACvB,uBAAuB,EACvB,2BAA2B,EAC3B,oBAAoB,EACpB,0BAA0B,EAC1B,KAAK,uBAAuB,EAC5B,uBAAuB,EACvB,8BAA8B,EAC9B,0BAA0B,EAC1B,4BAA4B,GAC7B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,4BAA4B,EAC5B,+BAA+B,EAC/B,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EACtB,8BAA8B,EAC9B,4BAA4B,EAC5B,KAAK,kCAAkC,EACvC,2BAA2B,EAC3B,qCAAqC,GACtC,MAAM,iBAAiB,CAAC;AAKzB,OAAO,EACL,sBAAsB,EACtB,KAAK,wBAAwB,EAC7B,gCAAgC,EAChC,2BAA2B,EAC3B,8BAA8B,EAC9B,kCAAkC,EAClC,mCAAmC,EACnC,6BAA6B,EAC7B,qBAAqB,EACrB,mCAAmC,GACpC,MAAM,gBAAgB,CAAC;AACxB,YAAY,EACV,SAAS,EACT,UAAU,EACV,UAAU,EACV,WAAW,EACX,OAAO,GACR,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AACrC,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAEtE,OAAO,EACL,YAAY,EACZ,6BAA6B,EAC7B,gBAAgB,EAChB,eAAe,GAChB,MAAM,QAAQ,CAAC;AAChB,YAAY,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE/C,OAAO,EACL,mBAAmB,EACnB,cAAc,GACf,MAAM,WAAW,CAAC;AAEnB,OAAO,EACL,iBAAiB,EACjB,yBAAyB,EACzB,KAAK,sBAAsB,EAC3B,KAAK,iBAAiB,GACvB,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/generators/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAG9D,OAAO,EACL,2BAA2B,EAC3B,eAAe,EACf,uBAAuB,EACvB,uBAAuB,EACvB,2BAA2B,EAC3B,oBAAoB,EACpB,0BAA0B,EAC1B,KAAK,uBAAuB,EAC5B,uBAAuB,EACvB,8BAA8B,EAC9B,0BAA0B,EAC1B,4BAA4B,GAC7B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,4BAA4B,EAC5B,+BAA+B,EAC/B,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EACtB,8BAA8B,EAC9B,4BAA4B,EAC5B,KAAK,kCAAkC,EACvC,2BAA2B,EAC3B,qCAAqC,GACtC,MAAM,iBAAiB,CAAC;AAKzB,OAAO,EACL,sBAAsB,EACtB,KAAK,wBAAwB,EAC7B,gCAAgC,EAChC,2BAA2B,EAC3B,8BAA8B,EAC9B,kCAAkC,EAClC,mCAAmC,EACnC,6BAA6B,EAC7B,qBAAqB,EACrB,mCAAmC,GACpC,MAAM,gBAAgB,CAAC;AACxB,YAAY,EACV,SAAS,EACT,UAAU,EACV,UAAU,EACV,WAAW,EACX,OAAO,EACP,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,OAAO,CAAC;AAEf,OAAO,EACL,yBAAyB,EACzB,YAAY,EACZ,2BAA2B,EAC3B,YAAY,GACb,MAAM,OAAO,CAAC;AACf,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAEtE,OAAO,EACL,YAAY,EACZ,6BAA6B,EAC7B,gBAAgB,EAChB,eAAe,GAChB,MAAM,QAAQ,CAAC;AAChB,YAAY,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE/C,OAAO,EACL,mBAAmB,EACnB,cAAc,GACf,MAAM,WAAW,CAAC;AAEnB,OAAO,EACL,iBAAiB,EACjB,yBAAyB,EACzB,KAAK,sBAAsB,EAC3B,KAAK,iBAAiB,GACvB,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,uBAAuB,EACvB,KAAK,gBAAgB,GACtB,MAAM,oBAAoB,CAAC"}

package/dist/generators/index.js

@@ -3,7 +3,8 @@ import { runWithTenantGate, setTenantEntryPointRunner } from "./tenant-gate.js";
 import { CLIGenerator, getCLIHandler, setupCLI } from "./cli.js";
 import { PRIVATE_READ_CACHE_CONTROL, canonicalReadRepresentation, computeBodyEtag, computeTableVersionEtag, conditionalJsonResponse, ifNoneMatchHasConcreteMatch, ifNoneMatchSatisfied, resolveReadCacheControl, resolveTenantEtagDiscriminator, versionConditionalResponse, warnIfSharedCacheNeutralized } from "./conditional-get.js";
 import { DEFAULT_EVENTS_HEARTBEAT_MS, DEFAULT_EVENTS_MAX_SUBSCRIBERS, DEFAULT_EVENTS_RETRY_AFTER_SECONDS, buildChangeEventStream, changeEventSubscribersAtCapacity, eventStreamCapacityExceededResponse, normalizeEventsMaxSubscribers, signalVisibleToTenant, tryReserveChangeEventSubscriberSlot } from "./events-route.js";
-import { MCPGenerator } from "./mcp.js";
+import { MCPGenerator, MCP_STABLE_CATALOG_TTL_MS, resolveMCPToolListCacheHint, sortMCPTools } from "./mcp.js";
+import { normalizeTypedHttpError } from "./typed-http-error.js";
 import { APIGenerator, computeRuntimeWebManifestHash, createRestServer, startRestServer } from "./rest.js";
 import { generateOpenAPISpec, setupSwaggerUI } from "./swagger.js";
-export { APIGenerator, CLIGenerator, DEFAULT_EVENTS_HEARTBEAT_MS, DEFAULT_EVENTS_MAX_SUBSCRIBERS, DEFAULT_EVENTS_RETRY_AFTER_SECONDS, MCPGenerator, PRIVATE_READ_CACHE_CONTROL, SMRT_CUSTOM_ACTION_ERROR_METADATA_KEY, buildChangeEventStream, buildCustomActionInputSchema, buildCustomActionInvocationArgs, canonicalReadRepresentation, changeEventSubscribersAtCapacity, computeBodyEtag, computeRuntimeWebManifestHash, computeTableVersionEtag, conditionalJsonResponse, createRestServer, customActionParameterInputName, eventStreamCapacityExceededResponse, generateOpenAPISpec, getCLIHandler, ifNoneMatchHasConcreteMatch, ifNoneMatchSatisfied, normalizeCustomActionFailure, normalizeEventsMaxSubscribers, resolveCustomActionMetadata, resolveReadCacheControl, resolveTenantEtagDiscriminator, runWithTenantGate, setTenantEntryPointRunner, setupCLI, setupSwaggerUI, signalVisibleToTenant, startRestServer, tryReserveChangeEventSubscriberSlot, versionConditionalResponse, warnIfSharedCacheNeutralized };
+export { APIGenerator, CLIGenerator, DEFAULT_EVENTS_HEARTBEAT_MS, DEFAULT_EVENTS_MAX_SUBSCRIBERS, DEFAULT_EVENTS_RETRY_AFTER_SECONDS, MCPGenerator, MCP_STABLE_CATALOG_TTL_MS, PRIVATE_READ_CACHE_CONTROL, SMRT_CUSTOM_ACTION_ERROR_METADATA_KEY, buildChangeEventStream, buildCustomActionInputSchema, buildCustomActionInvocationArgs, canonicalReadRepresentation, changeEventSubscribersAtCapacity, computeBodyEtag, computeRuntimeWebManifestHash, computeTableVersionEtag, conditionalJsonResponse, createRestServer, customActionParameterInputName, eventStreamCapacityExceededResponse, generateOpenAPISpec, getCLIHandler, ifNoneMatchHasConcreteMatch, ifNoneMatchSatisfied, normalizeCustomActionFailure, normalizeEventsMaxSubscribers, normalizeTypedHttpError, resolveCustomActionMetadata, resolveMCPToolListCacheHint, resolveReadCacheControl, resolveTenantEtagDiscriminator, runWithTenantGate, setTenantEntryPointRunner, setupCLI, setupSwaggerUI, signalVisibleToTenant, sortMCPTools, startRestServer, tryReserveChangeEventSubscriberSlot, versionConditionalResponse, warnIfSharedCacheNeutralized };

package/dist/generators/mcp-runtime-template.d.ts

@@ -18,7 +18,13 @@ export interface RuntimeOptions {
         name: string;
         description: string;
         inputSchema: Record<string, unknown>;
+        outputSchema?: Record<string, unknown>;
     }>;
+    /** Cache hint emitted for deploy-static tools/list results. */
+    toolListCacheHint?: {
+        ttlMs: number;
+        cacheScope: 'private' | 'public';
+    };
     /** Internal invocation metadata; never exposed by the MCP tools/list result. */
     customActions?: Record<string, {
         scope: CustomActionScope;
@@ -37,6 +43,13 @@ export interface RuntimeOptions {
      * `SMRT_MCP_ALLOW_CROSS_TENANT` env vars (this server has no auth principal).
      */
     tenantScopedObjects?: string[];
+    /**
+     * Build-time approved STI discriminators, keyed by the lowercased MCP object
+     * prefix. The generated runtime uses this instead of searching an initially
+     * empty registry, then loads the approved qualified type through the public
+     * collection API.
+     */
+    stiTargets?: Record<string, Record<string, string>>;
 }
 /**
  * Generate runtime bootstrap code for MCP server

package/dist/generators/mcp-runtime-template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-runtime-template.d.ts","sourceRoot":"","sources":["../../src/generators/mcp-runtime-template.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAStD,MAAM,WAAW,cAAc;IAC7B,6CAA6C;IAC7C,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,mDAAmD;IACnD,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,yBAAyB;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,kCAAkC;IAClC,MAAM,CAAC,EAAE,SAAS,CAAC;IAEnB,8CAA8C;IAC9C,OAAO,CAAC,EAAE,UAAU,CAAC;IAErB,2BAA2B;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,wDAAwD;IACxD,KAAK,CAAC,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACtC,CAAC,CAAC;IACH,gFAAgF;IAChF,aAAa,CAAC,EAAE,MAAM,CACpB,MAAM,EACN;QACE,KAAK,EAAE,iBAAiB,CAAC;QACzB,QAAQ,EAAE,OAAO,CAAC;QAClB,sEAAsE;QACtE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;QAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,aAAa,EAAE,OAAO,CAAC;KACxB,CACF,CAAC;IAEF;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,GAAE,cAAmB,GAAG,MAAM,CAib7E;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,GAAE,MAA6B,GACxC,MAAM,CAER;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,MAAM,CASR;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,MAAM,CA0GR"}
+{"version":3,"file":"mcp-runtime-template.d.ts","sourceRoot":"","sources":["../../src/generators/mcp-runtime-template.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAStD,MAAM,WAAW,cAAc;IAC7B,6CAA6C;IAC7C,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,mDAAmD;IACnD,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,yBAAyB;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,kCAAkC;IAClC,MAAM,CAAC,EAAE,SAAS,CAAC;IAEnB,8CAA8C;IAC9C,OAAO,CAAC,EAAE,UAAU,CAAC;IAErB,2BAA2B;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,wDAAwD;IACxD,KAAK,CAAC,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACrC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACxC,CAAC,CAAC;IACH,+DAA+D;IAC/D,iBAAiB,CAAC,EAAE;QAClB,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE,SAAS,GAAG,QAAQ,CAAC;KAClC,CAAC;IACF,gFAAgF;IAChF,aAAa,CAAC,EAAE,MAAM,CACpB,MAAM,EACN;QACE,KAAK,EAAE,iBAAiB,CAAC;QACzB,QAAQ,EAAE,OAAO,CAAC;QAClB,sEAAsE;QACtE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;QAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,aAAa,EAAE,OAAO,CAAC;KACxB,CACF,CAAC;IAEF;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE/B;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACrD;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,GAAE,cAAmB,GAAG,MAAM,CAme7E;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,GAAE,MAA6B,GACxC,MAAM,CAER;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,MAAM,CASR;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,MAAM,CA0GR"}

package/dist/generators/mcp-runtime-template.js

@@ -12,7 +12,10 @@ function capitalize(str) {
 * @returns TypeScript code for server entry point
 */
 function generateRuntimeBootstrap(options = {}) {
-	const { name = "smrt-mcp-server", version = "1.0.0", description = "Auto-generated MCP server from SMRT objects", debug = false, tools = [], customActions = {}, tenantScopedObjects = [] } = options;
+	const { name = "smrt-mcp-server", version = "1.0.0", description = "Auto-generated MCP server from SMRT objects", debug = false, tools = [], customActions = {}, tenantScopedObjects = [], stiTargets = {}, toolListCacheHint = {
+		ttlMs: 864e5,
+		cacheScope: "private"
+	} } = options;
 	const toolsCode = tools.length > 0 ? JSON.stringify(tools, null, 2) : "[]";
 	const tenantScopedSet = Array.from(new Set(tenantScopedObjects.map((n) => n.toLowerCase())));
 	const hasTenantScoped = tenantScopedSet.length > 0;
@@ -28,13 +31,17 @@ ${indent}  const offset = args.offset ?? 0;
 ${indent}  const where = args.where ?? {};
 
 ${indent}  const collection = await ObjectRegistry.getCollection('${capitalize(objectName)}', {
-${indent}    persistence: { type: 'sql', url: process.env.DATABASE_URL || ':memory:' },
+${indent}    persistence: { type: process.env.DATABASE_TYPE || 'sqlite', url: process.env.DATABASE_URL || ':memory:' },
 ${indent}    ai: aiConfig
 ${indent}  });
 
 ${indent}  const items = await collection.list({ where, limit, offset });
 ${indent}  const itemsPublic = items.map((item) => item.toPublicJSON(PUBLIC_JSON_OPTIONS));
-${indent}  return { content: [{ type: 'text', text: JSON.stringify(itemsPublic) }] };
+${indent}  const structuredContent = {
+${indent}    data: itemsPublic,
+${indent}    meta: { total: await collection.count({ where }), limit, offset, count: items.length },
+${indent}  };
+${indent}  return successResult(structuredContent, JSON.stringify(itemsPublic));
 ${indent}}`;
 				case "get": return `${indent}case '${tool.name}': {
 ${indent}  if (!args.id && !args.slug) {
@@ -42,7 +49,7 @@ ${indent}    throw new Error('Either id or slug is required');
 ${indent}  }
 
 ${indent}  const collection = await ObjectRegistry.getCollection('${capitalize(objectName)}', {
-${indent}    persistence: { type: 'sql', url: process.env.DATABASE_URL || ':memory:' },
+${indent}    persistence: { type: process.env.DATABASE_TYPE || 'sqlite', url: process.env.DATABASE_URL || ':memory:' },
 ${indent}    ai: aiConfig
 ${indent}  });
 
@@ -53,18 +60,15 @@ ${indent}  if (!item) {
 ${indent}    throw new Error('Object not found');
 ${indent}  }
 
-${indent}  return { content: [{ type: 'text', text: JSON.stringify(item.toPublicJSON(PUBLIC_JSON_OPTIONS)) }] };
+${indent}  return successResult(item.toPublicJSON(PUBLIC_JSON_OPTIONS));
 ${indent}}`;
 				case "create": return `${indent}case '${tool.name}': {
-${indent}  const collection = await ObjectRegistry.getCollection('${capitalize(objectName)}', {
-${indent}    persistence: { type: 'sql', url: process.env.DATABASE_URL || ':memory:' },
-${indent}    ai: aiConfig
-${indent}  });
+${indent}  const { collection, objectName: targetObjectName } = await resolveCreateTarget('${objectName}', args, aiConfig);
 
-${indent}  const newItem = await collection.create(applyWritablePolicy('${capitalize(objectName)}', args));
+${indent}  const newItem = await collection.create(applyWritablePolicy(targetObjectName, args));
 ${indent}  await newItem.save();
 
-${indent}  return { content: [{ type: 'text', text: JSON.stringify(newItem.toPublicJSON(PUBLIC_JSON_OPTIONS)) }] };
+${indent}  return successResult(newItem.toPublicJSON(PUBLIC_JSON_OPTIONS));
 ${indent}}`;
 				case "update": return `${indent}case '${tool.name}': {
 ${indent}  const { id, ...updateData } = args;
@@ -73,7 +77,7 @@ ${indent}    throw new Error('ID is required for update');
 ${indent}  }
 
 ${indent}  const collection = await ObjectRegistry.getCollection('${capitalize(objectName)}', {
-${indent}    persistence: { type: 'sql', url: process.env.DATABASE_URL || ':memory:' },
+${indent}    persistence: { type: process.env.DATABASE_TYPE || 'sqlite', url: process.env.DATABASE_URL || ':memory:' },
 ${indent}    ai: aiConfig
 ${indent}  });
 
@@ -85,7 +89,7 @@ ${indent}  }
 ${indent}  Object.assign(existing, applyWritablePolicy('${capitalize(objectName)}', updateData));
 ${indent}  await existing.save();
 
-${indent}  return { content: [{ type: 'text', text: JSON.stringify(existing.toPublicJSON(PUBLIC_JSON_OPTIONS)) }] };
+${indent}  return successResult(existing.toPublicJSON(PUBLIC_JSON_OPTIONS));
 ${indent}}`;
 				case "delete": return `${indent}case '${tool.name}': {
 ${indent}  if (!args.id) {
@@ -93,7 +97,7 @@ ${indent}    throw new Error('ID is required for delete');
 ${indent}  }
 
 ${indent}  const collection = await ObjectRegistry.getCollection('${capitalize(objectName)}', {
-${indent}    persistence: { type: 'sql', url: process.env.DATABASE_URL || ':memory:' },
+${indent}    persistence: { type: process.env.DATABASE_TYPE || 'sqlite', url: process.env.DATABASE_URL || ':memory:' },
 ${indent}    ai: aiConfig
 ${indent}  });
 
@@ -104,7 +108,7 @@ ${indent}  }
 
 ${indent}  await toDelete.delete();
 
-${indent}  return { content: [{ type: 'text', text: JSON.stringify({ success: true, message: 'Object deleted successfully' }) }] };
+${indent}  return successResult({ success: true, message: 'Object deleted successfully' });
 ${indent}}`;
 				default: return `${indent}case '${tool.name}': {
 ${indent}  const actionMeta = CUSTOM_ACTIONS['${tool.name}'] || { scope: 'item', isStatic: false, legacyOptions: true };
@@ -118,7 +122,7 @@ ${indent}    throw new Error('Custom action ${action} is collection-scoped and d
 ${indent}  }
 
 ${indent}  const collection = await ObjectRegistry.getCollection('${capitalize(objectName)}', {
-${indent}    persistence: { type: 'sql', url: process.env.DATABASE_URL || ':memory:' },
+${indent}    persistence: { type: process.env.DATABASE_TYPE || 'sqlite', url: process.env.DATABASE_URL || ':memory:' },
 ${indent}    ai: aiConfig
 ${indent}  });
 
@@ -147,14 +151,15 @@ ${indent}        ]);
 ${indent}  const result = await actionMethod.call(target, ...methodArgs);
 ${indent}  const failure = normalizeCustomActionFailure(result);
 ${indent}  if (failure) {
-${indent}    return {
-${indent}      content: [{ type: 'text', text: JSON.stringify({ error: failure }) }],
-${indent}      isError: true,
-${indent}      _meta: { [SMRT_CUSTOM_ACTION_ERROR_METADATA_KEY]: failure },
-${indent}    };
+${indent}    return errorResult(
+${indent}      { error: failure },
+${indent}      JSON.stringify({ error: failure }),
+${indent}      { [SMRT_CUSTOM_ACTION_ERROR_METADATA_KEY]: failure },
+${indent}    );
 ${indent}  }
 
-${indent}  return { content: [{ type: 'text', text: JSON.stringify(toPublicResult(result)) }] };
+${indent}  const publicResult = toPublicResult(result);
+${indent}  return successResult({ data: publicResult }, JSON.stringify(publicResult));
 ${indent}}`;
 			}
 		}).join("\n\n");
@@ -180,6 +185,8 @@ import {
   Server,
 } from '@modelcontextprotocol/server';
 import { serveStdio } from '@modelcontextprotocol/server/stdio';
+import { existsSync } from 'node:fs';
+import { resolve } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { ObjectRegistry } from '@happyvertical/smrt-core';
 import { normalizeCustomActionFailure, SMRT_CUSTOM_ACTION_ERROR_METADATA_KEY } from '@happyvertical/smrt-core';
@@ -193,7 +200,9 @@ const DEBUG = ${debug};
 
 // Static tool definitions (generated at build time)
 const TOOLS = ${toolsCode};
+const TOOL_LIST_CACHE_HINT = ${JSON.stringify(toolListCacheHint)};
 const CUSTOM_ACTIONS = ${JSON.stringify(customActions)};
+const STI_TARGETS: Record<string, Record<string, string>> = ${JSON.stringify(stiTargets)};
 ${hasTenantScoped ? `
 // Fail-closed tenant context (#1554): tenant-scoped objects must run inside a
 // tenant. This stdio server has no auth principal, so the tenant is taken from
@@ -243,6 +252,23 @@ function applyWritablePolicy(objectName: string, data: any): Record<string, any>
   return result;
 }
 
+/** Resolve an advertised STI discriminator to its registered subtype collection. */
+async function resolveCreateTarget(baseObjectName: string, args: Record<string, any>, aiConfig: any) {
+  let objectName = baseObjectName;
+  const discriminator = args._meta_type;
+  const targets = STI_TARGETS[baseObjectName];
+  if (typeof discriminator === 'string' && targets) {
+    const target = targets[discriminator];
+    if (!target) throw new Error('Unknown STI discriminator: ' + discriminator);
+    objectName = target;
+  }
+  const collection = await ObjectRegistry.getCollection(objectName, {
+    persistence: { type: process.env.DATABASE_TYPE || 'sqlite', url: process.env.DATABASE_URL || ':memory:' },
+    ai: aiConfig,
+  });
+  return { collection, objectName };
+}
+
 /**
  * Sensitive-field-safe serialization for custom-action results (#1540).
  * Recurses through arrays and plain objects so nested SmrtObjects are stripped
@@ -267,6 +293,22 @@ function toPublicResult(value: any, seen: WeakSet<object> = new WeakSet()): any
   return out;
 }
 
+function successResult(structuredContent: any, text = JSON.stringify(structuredContent)) {
+  return {
+    content: [{ type: 'text', text }],
+    structuredContent,
+  };
+}
+
+function errorResult(structuredContent: any, text: string, _meta?: Record<string, any>) {
+  return {
+    content: [{ type: 'text', text }],
+    isError: true,
+    structuredContent,
+    ...(_meta ? { _meta } : {}),
+  };
+}
+
 /**
  * Main server startup function
  */
@@ -282,6 +324,17 @@ ${hasTenantScoped ? `
     // with no interceptor to enforce it.
     enableTenancy();
 ` : ""}
+    // Register the application package manifest before resolving generated
+    // object names. Generated servers are commonly run from the application
+    // package itself, which is not a node_modules dependency of its process.
+    const localManifestPaths = [
+      resolve(process.cwd(), 'dist', 'manifest.json'),
+      resolve(process.cwd(), '.smrt', 'manifest.json'),
+    ].filter(existsSync);
+    if (localManifestPaths.length > 0) {
+      ObjectRegistry.loadAllManifests({ manifestPaths: localManifestPaths });
+    }
+
     // Load configuration from environment and .smrt.config files
     const appConfig = await loadConfig();
     const aiConfig = appConfig?.ai || {};
@@ -301,6 +354,9 @@ ${hasTenantScoped ? `
         capabilities: {
           tools: {},
         },
+        cacheHints: {
+          'tools/list': TOOL_LIST_CACHE_HINT,
+        },
       }
     );
 
@@ -311,7 +367,7 @@ ${hasTenantScoped ? `
       }
 
       return {
-        tools: TOOLS,
+        tools: [...TOOLS].sort((left, right) => left.name < right.name ? -1 : left.name > right.name ? 1 : 0),
       };
     });
 
@@ -355,15 +411,10 @@ ${hasTenantScoped ? `
         const errorMessage = error instanceof Error ? error.message : 'Unknown error';
         console.error(\`[MCP] Tool execution failed: \${toolName}\`, error);
 
-        return {
-          content: [
-            {
-              type: 'text',
-              text: \`Error executing tool \${toolName}: \${errorMessage}\`,
-            },
-          ],
-          isError: true,
-        };
+        return errorResult(
+          { error: { message: errorMessage } },
+          \`Error executing tool \${toolName}: \${errorMessage}\`,
+        );
       }
     });