@m6d/cortex-cli 0.14.0 → 0.16.0

package/src/contracts/manifest/index.ts

@@ -4,7 +4,7 @@ import { canCarrySecret } from "../egress-policy/index";
 import {
     agentSlugSchema,
     EVENT_HEADER,
-    IDENTIFIER_PATTERN,
+    identifierSchema,
     localeSchema,
     SERVER_EVENTS,
     refuseBlockedApprovalTitle,
@@ -12,6 +12,8 @@ import {
 } from "../server/index";
 import { MESSAGE_TRIGGER_NAME } from "../triggers/index";
 import {
+    BASE_LOCALE,
+    byLocale,
     DEFAULT_MEDIA_FORMS,
     MEDIA_FORMS,
     TOOL_SURFACES,
@@ -46,14 +48,23 @@ export const TOOL_METHODS = ["GET", "POST", "PUT", "PATCH", "DELETE"] as const;
  */
 export const RESPONSE_WRAPS = ["items", "value"] as const;
 
+/** How OpenAPI serializes a query parameter: `form` (the default), `spaceDelimited`, `pipeDelimited` or `deepObject`. */
+export const QUERY_STYLES = ["form", "spaceDelimited", "pipeDelimited", "deepObject"] as const;
+/** How OpenAPI serializes a path parameter: `simple` (the default), `label` or `matrix`. */
+export const PATH_STYLES = ["simple", "label", "matrix"] as const;
+
 export const SOAP_VERSIONS = ["1.1", "1.2"] as const;
 
+/** An RFC 6901 pointer into a JSON document, naming a member: `/extra`, `/data/items`. */
+const jsonPointerSchema = z.string().regex(/^\//).max(256);
+
 type Bounds = { min: number; max: number; default: number };
 
 /**
  * The range of every number an author sets, in the console and in a
- * manifest alike, and the value a manifest that leaves one out gets. The
- * console builds its form schemas, with its own messages, from these.
+ * manifest alike, and the value a manifest that leaves one out gets, which
+ * a new row's column holds too. The console builds its form schemas, with
+ * its own messages, from these.
  */
 export const SETTING_BOUNDS = {
     tool: {
@@ -91,9 +102,36 @@ function setting({ min, max, default: fallback }: Bounds) {
     return z.number().int().min(min).max(max).default(fallback);
 }
 
+/** One number per setting a group of `SETTING_BOUNDS` names. */
+export type SettingValues<TBounds> = { [Name in keyof TBounds]: number };
+
+/** Every setting of a group at its default, as a row that sets none stores them. */
+export function settingDefaults<TBounds extends Record<string, Bounds>>(bounds: TBounds) {
+    return Object.fromEntries(
+        Object.entries(bounds).map(([name, bound]) => [name, bound.default]),
+    ) as SettingValues<TBounds>;
+}
+
+/**
+ * The fields of an entry users may change in Cortex after an apply, each
+ * once, from the ones `fields` allows; none when left out. Every other field
+ * is the manifest's alone. An apply keeps a live change to a listed field
+ * unless the manifest changed that field too (a conflict, see
+ * `manifestApplyInputSchema`). Identity, what is fixed at creation, the
+ * audience, credentials, and whatever an apply checks against the
+ * manifest's own value are never offered.
+ */
+function overridable<const TField extends string>(fields: readonly [TField, ...TField[]]) {
+    return z
+        .array(z.enum(fields))
+        .refine((listed) => new Set(listed).size === listed.length, "a field repeats")
+        .default([]);
+}
+
 /** Consumer-facing slugs: the manifest id, service keys, skill names and trigger names share it. */
 export const SLUG_PATTERN = /^[a-z0-9]+(-[a-z0-9]+)*$/;
-const slugSchema = z.string().regex(SLUG_PATTERN).max(64);
+export const SLUG_MAX_LENGTH = 64;
+const slugSchema = z.string().regex(SLUG_PATTERN).max(SLUG_MAX_LENGTH);
 
 /** A DNS host name in lower case, the way `URL` reports one: dot-separated labels of letters, digits and inner hyphens. */
 export const HOSTNAME_PATTERN =
@@ -175,6 +213,16 @@ export const soapActionSchema = z.string().regex(/^[^"\\\u0000-\u001f\u007f]*$/)
 /** An envelope template: XML, so never only whitespace. */
 const envelopeTemplateSchema = z.string().refine((template) => template.trim().length > 0);
 
+/**
+ * The media types a request body may be sent in besides JSON, the default.
+ * Each body field is written as its target says.
+ */
+export const FORM_MEDIA_TYPES = [
+    "application/x-www-form-urlencoded",
+    "multipart/form-data",
+] as const;
+export type FormMediaType = (typeof FORM_MEDIA_TYPES)[number];
+
 /**
  * The per-type payload a tool stores and publishes. Soap: the envelope
  * template is the full request XML with `{{field}}` placeholders bound to
@@ -182,7 +230,12 @@ const envelopeTemplateSchema = z.string().refine((template) => template.trim().l
  * acquires once per request.
  */
 export const toolConfigByType = {
-    http: z.object({ responseWrap: z.enum(RESPONSE_WRAPS).optional() }),
+    http: z.object({
+        responseWrap: z.enum(RESPONSE_WRAPS).optional(),
+        requestMediaType: z.enum(FORM_MEDIA_TYPES).optional(),
+        /** Where a successful response keeps the result, for an API that wraps every answer (`{ success, extra }`); read before `responseWrap`. */
+        resultPath: jsonPointerSchema.optional(),
+    }),
     embedded: z.object({ embedOrigin: embedOriginSchema, surface: z.enum(TOOL_SURFACES) }),
     soap: z.object({
         soapVersion: z.enum(SOAP_VERSIONS),
@@ -201,6 +254,92 @@ export const toolConfigByType = {
     client: z.object({}),
 };
 
+/** Every tool type, in the order the database enum lists them; see `TOOL_TYPES`. */
+export const TOOL_TYPE_NAMES = ["http", "embedded", "soap", "native", "client"] as const;
+
+/**
+ * What each tool type is, so no reader restates it: who answers its calls
+ * (`kind`: Cortex for a server tool, the browser for a client one), whether
+ * it calls an endpoint, whether a call may wait for the end user's
+ * approval, whether an input field may be filled from a source Cortex holds
+ * (`x-source`) or name its place in the request (`x-target`), whether an
+ * author creates one, and the `method` or `readOnly` the type pins whatever
+ * the author says. An embedded tool's initiate is never read-only, so a
+ * widget reload rejoins its session, and asks no approval, since the widget
+ * answers it. SOAP and native tools are POSTed, and a native tool comes from
+ * its server's manifest alone, with no field Cortex fills or places. A
+ * client tool calls nothing: the client answers it.
+ */
+export const TOOL_TYPES = {
+    http: {
+        kind: "server",
+        calls: true,
+        approval: true,
+        sources: true,
+        targets: true,
+        creatable: true,
+    },
+    embedded: {
+        kind: "client",
+        calls: true,
+        approval: false,
+        sources: true,
+        targets: false,
+        creatable: true,
+        readOnly: false,
+    },
+    soap: {
+        kind: "server",
+        calls: true,
+        approval: true,
+        sources: true,
+        targets: true,
+        creatable: true,
+        method: "POST",
+    },
+    native: {
+        kind: "server",
+        calls: true,
+        approval: true,
+        sources: false,
+        targets: false,
+        creatable: false,
+        method: "POST",
+    },
+    client: {
+        kind: "client",
+        calls: false,
+        approval: false,
+        sources: false,
+        targets: false,
+        creatable: true,
+        readOnly: true,
+    },
+} as const satisfies Record<
+    (typeof TOOL_TYPE_NAMES)[number],
+    {
+        kind: "server" | "client";
+        calls: boolean;
+        approval: boolean;
+        sources: boolean;
+        targets: boolean;
+        creatable: boolean;
+        method?: (typeof TOOL_METHODS)[number];
+        readOnly?: boolean;
+    }
+>;
+
+type CreatableToolType = {
+    [TType in keyof typeof TOOL_TYPES]: (typeof TOOL_TYPES)[TType]["creatable"] extends true
+        ? TType
+        : never;
+}[keyof typeof TOOL_TYPES];
+
+/** The types an author creates a tool as, in `TOOL_TYPE_NAMES` order; a native tool comes from its server's manifest. */
+export const CREATABLE_TOOL_TYPES = TOOL_TYPE_NAMES.filter(
+    (type): type is CreatableToolType => TOOL_TYPES[type].creatable,
+);
+
 /** A `{name}` parameter in a tool's endpoint URL, filled from the input on each call. */
 export const ENDPOINT_PARAM_PATTERN = /\{([^{}]+)\}/g;
 
@@ -219,9 +358,21 @@ export function confinesEndpointParams(url: string) {
 /** An upstream Cortex calls: http or https. */
 const upstreamUrlSchema = z.url({ protocol: /^https?$/ });
 
+/**
+ * What a call presents: a header name and the prefix before the value in
+ * characters, and how many headers at most (a real upstream wants one or
+ * two). The console caps its credential rows at the same.
+ */
+export const CREDENTIAL_LIMITS = { headerLength: 120, prefixLength: 40, presentations: 8 } as const;
+
 /** An HTTP header field name (RFC 9110 token). */
 export const HEADER_NAME_PATTERN = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/;
-const headerNameSchema = z.string().trim().min(1).max(120).regex(HEADER_NAME_PATTERN);
+const headerNameSchema = z
+    .string()
+    .trim()
+    .min(1)
+    .max(CREDENTIAL_LIMITS.headerLength)
+    .regex(HEADER_NAME_PATTERN);
 
 /** Headers Cortex or fetch fills on every request. Lower-cased. */
 export const transportSetHeaders = ["accept", "content-type", "content-length", "host"] as const;
@@ -250,11 +401,8 @@ export const transportOwnedHeaders = new Set<string>([
     ...transportForbiddenHeaders,
 ]);
 
-/** At most this many headers a call presents; a real upstream wants one or two. */
-export const CREDENTIAL_PRESENTATION_LIMIT = 8;
-
 /** The index of each entry presenting a header an earlier entry already presents, compared case-insensitively. */
-export function repeatedHeaders(entries: ReadonlyArray<{ header: string }>) {
+function repeatedHeaders(entries: ReadonlyArray<{ header: string }>) {
     const seen = new Set<string>();
     return entries.flatMap((entry, index) => {
         const name = entry.header.toLowerCase();
@@ -264,8 +412,10 @@ export function repeatedHeaders(entries: ReadonlyArray<{ header: string }>) {
     });
 }
 
+/** The longest name Cortex holds a server, model provider, credential or secret under. */
+export const NAME_MAX_LENGTH = 120;
 /** A server, model provider, credential or secret, by the name Cortex holds it under. */
-const nameSchema = z.string().trim().min(1).max(120);
+const nameSchema = z.string().trim().min(1).max(NAME_MAX_LENGTH);
 
 const presentedHeaderSchema = headerNameSchema.refine(
     (name) => !transportOwnedHeaders.has(name.toLowerCase()),
@@ -274,30 +424,45 @@ const presentedHeaderSchema = headerNameSchema.refine(
 
 /**
  * What every call carries: each entry a header, what precedes the value in
- * it (`"Bearer "`, say), and the credential by name. A header is presented
- * once.
+ * it (`"Bearer "`, say), and the credential by name, as `entry` validates
+ * it, at most `CREDENTIAL_LIMITS.presentations` of them. A header is
+ * presented once; `repeated` words the refusal of a later one.
  */
-function presentationsSchema<TCredential extends string | null>(
-    header: z.ZodString,
-    credential: z.ZodType<TCredential, TCredential>,
+export function presentationsSchema<TEntry extends z.ZodType<{ header: string }>>(
+    entry: TEntry,
+    repeated: () => string,
 ) {
     return z
-        .array(z.strictObject({ header, prefix: z.string().max(40).default(""), credential }))
-        .max(CREDENTIAL_PRESENTATION_LIMIT)
+        .array(entry)
+        .max(CREDENTIAL_LIMITS.presentations)
         .superRefine((entries, context) => {
             for (const index of repeatedHeaders(entries)) {
                 context.addIssue({
                     code: "custom",
                     path: [index, "header"],
-                    message: "a header presented twice",
+                    message: repeated(),
                 });
             }
-        })
-        .default([]);
+        });
+}
+
+/** The presentations a manifest entry declares: no unknown key, an omitted prefix or list empty. */
+function declaredPresentationsSchema<TCredential extends string | null>(
+    header: z.ZodString,
+    credential: z.ZodType<TCredential, TCredential>,
+) {
+    return presentationsSchema(
+        z.strictObject({
+            header,
+            prefix: z.string().max(CREDENTIAL_LIMITS.prefixLength).default(""),
+            credential,
+        }),
+        () => "a header presented twice",
+    ).default([]);
 }
 
 /** A credential, or `null` for the run's own token (the end user's in a chat, the trigger's in a firing). */
-const credentialsSchema = presentationsSchema(presentedHeaderSchema, nameSchema.nullable());
+const credentialsSchema = declaredPresentationsSchema(presentedHeaderSchema, nameSchema.nullable());
 
 /**
  * Where Cortex fills a top-level scalar input field from, out of the model's
@@ -306,7 +471,7 @@ const credentialsSchema = presentationsSchema(presentedHeaderSchema, nameSchema.
  */
 export const fieldSourceSchema = z.discriminatedUnion("kind", [
     z.object({ kind: z.literal("variable"), name: z.string().trim().min(1).max(64) }),
-    z.object({ kind: z.literal("secret"), name: z.string().trim().min(1).max(120) }),
+    z.object({ kind: z.literal("secret"), name: nameSchema }),
     z.object({
         kind: z.literal("constant"),
         value: z.union([z.string().max(4_000), z.number(), z.boolean()]),
@@ -321,7 +486,7 @@ export type FieldSource = z.infer<typeof fieldSourceSchema>;
  * string only, and a constant must be a value of the field's type. Whether a
  * variable is declared is the agent's server's to say.
  */
-export function sourceFits(
+function sourceFits(
     source: FieldSource,
     field: { type: unknown; enum?: ReadonlyArray<string | null> },
 ) {
@@ -343,30 +508,67 @@ export function sourceFits(
 }
 
 /**
- * Where a top-level scalar input field travels in the upstream request;
- * absent, path placeholders by name, then the query string on GET and the
- * body otherwise. `name` renames a query parameter, header or cookie on the
- * wire.
+ * Where a top-level input field travels in the upstream request; absent,
+ * path placeholders by name, then the query string on GET and the body
+ * otherwise. `name` renames a query parameter, header or cookie on the wire,
+ * and is the name `matrix` style writes into a path.
+ * `style` and `explode` write an array or object value as an OpenAPI
+ * parameter declares; left out, OpenAPI's defaults hold (`form` exploded for
+ * a query, `simple` unexploded for a path and a header). A cookie joins items
+ * with commas. In a form body (the tool's `requestMediaType`), a JSON
+ * `contentType` sends the value as JSON text, and `style` and `explode`
+ * write it as in a query; a multipart body repeats an array's items as
+ * parts, typing an object JSON unless `contentType` says text. A JSON body
+ * reads none of them.
  */
 export const fieldTargetSchema = z.discriminatedUnion("kind", [
-    z.object({ kind: z.literal("body") }),
-    z.object({ kind: z.literal("query"), name: z.string().trim().min(1).max(120).optional() }),
-    z.object({ kind: z.literal("path") }),
-    z.object({ kind: z.literal("header"), name: headerNameSchema.optional() }),
-    z.object({ kind: z.literal("cookie"), name: headerNameSchema.optional() }),
+    z.strictObject({
+        kind: z.literal("body"),
+        contentType: z.enum(["application/json", "text/plain"]).optional(),
+        style: z.enum(QUERY_STYLES).optional(),
+        explode: z.boolean().optional(),
+    }),
+    z.strictObject({
+        kind: z.literal("query"),
+        name: z.string().trim().min(1).max(120).optional(),
+        style: z.enum(QUERY_STYLES).optional(),
+        explode: z.boolean().optional(),
+    }),
+    z.strictObject({
+        kind: z.literal("path"),
+        name: z.string().trim().min(1).max(120).optional(),
+        style: z.enum(PATH_STYLES).optional(),
+        explode: z.boolean().optional(),
+    }),
+    z.strictObject({
+        kind: z.literal("header"),
+        name: headerNameSchema.optional(),
+        explode: z.boolean().optional(),
+    }),
+    z.strictObject({ kind: z.literal("cookie"), name: headerNameSchema.optional() }),
 ]);
 export type FieldTarget = z.infer<typeof fieldTargetSchema>;
 
-const SCALAR_TYPES = ["string", "number", "integer", "boolean"] as const;
+/** The types a field holds one value of. */
+export const SCALAR_TYPES = ["string", "number", "integer", "boolean"] as const;
 const schemaTypeSchema = z.enum([...SCALAR_TYPES, "object", "array"]);
 
+/** A field's name and description in characters, and the values its enum lists. The console caps its field rows at the same. */
+export const FIELD_LIMITS = { nameLength: 120, descriptionLength: 500, enumValues: 50 } as const;
+
 /** Untrimmed: two names that differ only in surrounding spaces would collapse into one. */
 const propertyNameSchema = z
     .string()
     .min(1)
-    .max(120)
+    .max(FIELD_LIMITS.nameLength)
     .refine((name) => name === name.trim(), "no surrounding spaces");
 
+/** The order an object's properties are shown in, each named once. */
+const propertyOrderSchema = z
+    .array(z.string())
+    .refine((names) => new Set(names).size === names.length, "a name repeats")
+    .optional();
+
 /** What an array holds: a scalar, or an object with properties of its own. */
 const itemsSchema = z.strictObject({
     type: z.enum([...SCALAR_TYPES, "object"]),
@@ -374,29 +576,32 @@ const itemsSchema = z.strictObject({
         return z.record(propertyNameSchema, schemaPropertySchema).optional();
     },
     required: z.array(z.string()).optional(),
+    "x-order": propertyOrderSchema,
 });
 
 /**
  * A JSON Schema property, in the part of JSON Schema a field editor holds:
  * a type (with `"null"` beside it when the value may be null), an `enum` of
- * strings for a string, an object's `properties` and `required`, an
- * array's `items`, a `description`, and the extensions `x-sensitive`
- * (redacted from logs), `x-source` and `x-target` (top-level scalar fields
- * of a tool's input only).
+ * strings for a string, an object's `properties`, `required` and the
+ * `x-order` they are shown in, an array's `items`, a `description`, and
+ * the extensions `x-sensitive` (redacted from logs), `x-source` (top-level
+ * scalar fields of a tool's input only) and `x-target` (top-level fields of
+ * a tool's input only).
  */
 const schemaPropertySchema = z.strictObject({
     type: z.union([schemaTypeSchema, z.tuple([schemaTypeSchema, z.literal("null")])]),
-    description: z.string().trim().max(500).optional(),
+    description: z.string().trim().max(FIELD_LIMITS.descriptionLength).optional(),
     /** A nullable enum lists `null` beside its values, as the console stores one. */
     enum: z
         .array(z.union([z.string().trim().min(1), z.null()]))
         .min(1)
-        .max(51)
+        .max(FIELD_LIMITS.enumValues + 1)
         .optional(),
     get properties() {
         return z.record(propertyNameSchema, schemaPropertySchema).optional();
     },
     required: z.array(z.string()).optional(),
+    "x-order": propertyOrderSchema,
     get items() {
         return itemsSchema.optional();
     },
@@ -414,24 +619,30 @@ function typeOf(node: { type: SchemaProperty["type"] }) {
 /** A refusal below a node: where, relative to it, and why. */
 type RowIssue = { at: Array<string | number>; message: string };
 
-/** What a node's own keywords break: `properties` or `required` off an object, or `required` naming no property. */
-function nodeIssues(node: {
+/** A node holding properties: a property, an array's items, or an input or output schema. */
+type ObjectNode = {
     type: SchemaProperty["type"];
     properties?: Record<string, SchemaProperty>;
     required?: string[];
-}) {
+    "x-order"?: string[];
+};
+
+/** What a node's own keywords break: `properties`, `required` or `x-order` off an object, or the last two naming no property. */
+function nodeIssues(node: ObjectNode) {
     const issues = new Array<RowIssue>();
     const object = typeOf(node) === "object";
-    for (const keyword of ["properties", "required"] as const) {
+    for (const keyword of ["properties", "required", "x-order"] as const) {
         if (!object && node[keyword] !== undefined) {
             issues.push({ at: [keyword], message: "only an object has it" });
         }
     }
-    node.required?.forEach((name, index) => {
-        if (!Object.hasOwn(node.properties ?? {}, name)) {
-            issues.push({ at: ["required", index], message: "names no property" });
-        }
-    });
+    for (const keyword of ["required", "x-order"] as const) {
+        node[keyword]?.forEach((name, index) => {
+            if (!Object.hasOwn(node.properties ?? {}, name)) {
+                issues.push({ at: [keyword, index], message: "names no property" });
+            }
+        });
+    }
     return issues;
 }
 
@@ -444,20 +655,24 @@ function enumIssueOf(property: SchemaProperty, type: string | undefined) {
     if (property.enum === undefined) return undefined;
     if (type !== "string") return "an enum lists a string's values";
     const values = property.enum.filter((value) => value !== null);
-    if (values.length === 0 || values.length > 50) return "an enum lists 1 to 50 values";
+    if (values.length === 0 || values.length > FIELD_LIMITS.enumValues) {
+        return `an enum lists 1 to ${FIELD_LIMITS.enumValues} values`;
+    }
     const nullable = Array.isArray(property.type);
     if (nullable === property.enum.includes(null)) return undefined;
     return nullable ? "a nullable enum lists null" : "only a nullable enum lists null";
 }
 
+/** The extensions a tool's input binds a field with: a source filling it, a place in the request. */
+type Binding = "x-source" | "x-target";
+
 /**
  * What one property breaks of itself: an `enum` off a string, with no value,
  * or listing `null` when the type does not allow it or the other way round;
- * `items` off an array or an array without them; and `x-source` or
- * `x-target` off a scalar of a `bindable` node, or a source that does not
- * fit the field.
+ * `items` off an array or an array without them; and what its bindings
+ * break (`bindingIssues`).
  */
-function propertyIssues(property: SchemaProperty, bindable: boolean) {
+function propertyIssues(property: SchemaProperty, bindings: ReadonlyArray<Binding> | undefined) {
     const issues = new Array<RowIssue>();
     const type = typeOf(property);
     const enumIssue = enumIssueOf(property, type);
@@ -468,17 +683,41 @@ function propertyIssues(property: SchemaProperty, bindable: boolean) {
             message: type === "array" ? "an array declares its items" : "only an array has it",
         });
     }
-    const binds = bindable && SCALAR_TYPES.some((scalar) => scalar === type);
+    return [...issues, ...bindingIssues(property, type, bindings)];
+}
+
+/**
+ * What a property's bindings break: one other than `bindings` directly under
+ * a tool's input (none anywhere else), an `x-source` off a scalar, or a
+ * source that does not fit the field.
+ */
+function bindingIssues(
+    property: SchemaProperty,
+    type: string | undefined,
+    bindings: ReadonlyArray<Binding> | undefined,
+) {
+    const issues = new Array<RowIssue>();
+    const scalar = SCALAR_TYPES.some((scalar) => scalar === type);
+    // A source fills a scalar; a target places a field of any type.
+    const fields = { "x-source": "a top-level scalar field", "x-target": "a top-level field" };
     for (const binding of ["x-source", "x-target"] as const) {
-        if (property[binding] !== undefined && !binds) {
-            issues.push({
-                at: [binding],
-                message: "only a top-level scalar field of a tool's input has it",
-            });
-        }
+        if (property[binding] === undefined) continue;
+        const reaches = bindings !== undefined && (binding === "x-target" || scalar);
+        if (reaches && bindings.includes(binding)) continue;
+        issues.push({
+            at: [binding],
+            message: reaches
+                ? "this type of tool takes none"
+                : `only ${fields[binding]} of a tool's input has it`,
+        });
     }
     const source = property["x-source"];
-    if (binds && source && !sourceFits(source, { type, enum: property.enum })) {
+    if (
+        scalar &&
+        bindings?.includes("x-source") &&
+        source &&
+        !sourceFits(source, { type, enum: property.enum })
+    ) {
         issues.push({ at: ["x-source"], message: "the source does not fit the field's type" });
     }
     return issues;
@@ -487,18 +726,15 @@ function propertyIssues(property: SchemaProperty, bindable: boolean) {
 /**
  * Refuses, at every depth below `path`, what the console's field rows cannot
  * hold, since it stores a schema as rows and would drop or change it in
- * silence (`nodeIssues`, `propertyIssues`); `x-source` and `x-target` only
- * on a scalar directly under a node where `bindable`.
+ * silence (`nodeIssues`, `propertyIssues`); a binding only one of
+ * `bindings`, directly under the node they are given for, and `x-source`
+ * only on a scalar.
  */
 function heldByRows(
-    node: {
-        type: SchemaProperty["type"];
-        properties?: Record<string, SchemaProperty>;
-        required?: string[];
-    },
+    node: ObjectNode,
     context: z.RefinementCtx,
     path: Array<string | number>,
-    bindable: boolean,
+    bindings: ReadonlyArray<Binding> | undefined,
 ) {
     const report = (under: Array<string | number>, issues: ReadonlyArray<RowIssue>) => {
         for (const { at, message } of issues) {
@@ -508,27 +744,29 @@ function heldByRows(
     report(path, nodeIssues(node));
     for (const [name, property] of Object.entries(node.properties ?? {})) {
         const at = [...path, "properties", name];
-        report(at, propertyIssues(property, bindable));
-        heldByRows(property, context, at, false);
-        if (property.items) heldByRows(property.items, context, [...at, "items"], false);
+        report(at, propertyIssues(property, bindings));
+        heldByRows(property, context, at, undefined);
+        if (property.items) heldByRows(property.items, context, [...at, "items"], undefined);
     }
 }
 
 /**
  * An object's JSON Schema, the shape of a tool's or trigger's input and
- * output. `bindable` admits `x-source` and `x-target` on its top-level
- * scalar fields, as a tool's input has them.
+ * output, and of what the console's field rows write. `bindings`, given for
+ * a tool's input, are the extensions its top-level fields may carry:
+ * `x-source` on a scalar, `x-target` on any field.
  */
-function objectSchemaOf(bindable: boolean) {
+export function objectJsonSchemaOf(bindings?: ReadonlyArray<Binding>) {
     return z
         .strictObject({
             type: z.literal("object"),
             properties: z.record(propertyNameSchema, schemaPropertySchema).optional(),
             required: z.array(z.string()).optional(),
+            "x-order": propertyOrderSchema,
         })
-        .superRefine((schema, context) => heldByRows(schema, context, [], bindable));
+        .superRefine((schema, context) => heldByRows(schema, context, [], bindings));
 }
-const objectSchema = objectSchemaOf(false);
+const objectSchema = objectJsonSchemaOf();
 
 const EMPTY_OBJECT = { type: "object" } as const satisfies z.input<typeof objectSchema>;
 
@@ -544,23 +782,44 @@ const audienceSchema = z.union([
     }),
 ]);
 
+/** A model provider's base URL and each model it lists in characters, and how many it lists. The console caps a provider at the same. */
+export const MODEL_PROVIDER_LIMITS = { urlLength: 2_048, modelLength: 200, models: 100 } as const;
+
 /** A model a provider lists, and the reasoning effort sent with it. */
 const modelSchema = z.strictObject({
     provider: nameSchema,
-    model: z.string().trim().min(1).max(200),
+    model: z.string().trim().min(1).max(MODEL_PROVIDER_LIMITS.modelLength),
     effort: z.string().trim().min(1).max(64).optional(),
 });
 
+/** A service's name and description, in characters per locale. The console caps its editor at the same lengths. */
+export const SERVICE_LIMITS = { nameLength: 120, descriptionLength: 4_000 } as const;
+
 /** One line per locale, trimmed. */
-const localizedLineSchema = z.record(localeSchema, z.string().trim().min(1).max(120));
-const localizedTextSchema = z.record(localeSchema, z.string().trim().min(1).max(4_000));
+const localizedLineSchema = z.record(
+    localeSchema,
+    z.string().trim().min(1).max(SERVICE_LIMITS.nameLength),
+);
+const localizedTextSchema = z.record(
+    localeSchema,
+    z.string().trim().min(1).max(SERVICE_LIMITS.descriptionLength),
+);
 
 const { tool: toolBounds } = SETTING_BOUNDS;
 
+/** A `type` tool's input schema, its fields bound only as `TOOL_TYPES` lets the type: filled from a source, placed in the request. */
+function toolInputSchemaOf(type: (typeof TOOL_TYPE_NAMES)[number]) {
+    const { sources, targets } = TOOL_TYPES[type];
+    return objectJsonSchemaOf([
+        ...(sources ? ["x-source" as const] : []),
+        ...(targets ? ["x-target" as const] : []),
+    ]).default(EMPTY_OBJECT);
+}
+
 /** Shared by every tool type; a tool that calls nothing (`client`) has no endpoint, credentials, approval or bound fields. */
 const toolBaseSchema = z.strictObject({
     ...serverToolSchema.pick({ name: true, description: true }).shape,
-    inputSchema: objectSchema.default(EMPTY_OBJECT),
+    inputSchema: toolInputSchemaOf("client"),
     outputSchema: objectSchema.default(EMPTY_OBJECT),
     timeoutMs: setting(toolBounds.timeoutMs),
     maxResponseBytes: setting(toolBounds.maxResponseBytes),
@@ -572,11 +831,19 @@ const toolBaseSchema = z.strictObject({
     pinned: z.boolean().default(false),
     tags: toolTagsSchema.default([]),
     audience: audienceSchema,
+    overridable: overridable([
+        "description",
+        "timeoutMs",
+        "maxResponseBytes",
+        "rateLimitRequests",
+        "rateLimitWindowSeconds",
+        "pinned",
+        "tags",
+    ]),
 });
 
 /** A tool that calls an endpoint; with `requiresApproval`, every call waits for the end user to approve it. */
 const calledToolSchema = toolBaseSchema.extend({
-    inputSchema: objectSchemaOf(true).default(EMPTY_OBJECT),
     url: upstreamUrlSchema.refine(
         confinesEndpointParams,
         "a {parameter} outside the path or query",
@@ -589,28 +856,33 @@ const manifestToolSchema = z
     .discriminatedUnion("type", [
         calledToolSchema.extend({
             type: z.literal("http"),
+            inputSchema: toolInputSchemaOf("http"),
             method: z.enum(TOOL_METHODS),
             readOnly: z.boolean(),
             ...toolConfigByType.http.shape,
         }),
-        /** The endpoint is the initiate call that opens the page; never read-only, so a reload rejoins it. */
-        calledToolSchema.extend({
+        /**
+         * The endpoint is the initiate call that opens the page; never read-only, so a reload rejoins it.
+         * No `requiresApproval`: the widget answers the call, so nothing would ask for it. No field
+         * names its place in the request (`x-target`).
+         */
+        calledToolSchema.omit({ requiresApproval: true }).extend({
             type: z.literal("embedded"),
+            inputSchema: toolInputSchemaOf("embedded"),
             method: z.enum(TOOL_METHODS),
             ...toolConfigByType.embedded.shape,
         }),
         /** Always POSTed. */
         calledToolSchema.extend({
             type: z.literal("soap"),
+            inputSchema: toolInputSchemaOf("soap"),
             readOnly: z.boolean(),
             ...toolConfigByType.soap.shape,
         }),
         /** Answered by your app: the model calls it and the widget hands the call over. */
         toolBaseSchema.extend({ type: z.literal("client") }),
     ])
-    .superRefine((tool, context) => {
-        if (tool.type !== "client") refuseBlockedApprovalTitle(tool, context, []);
-    });
+    .superRefine((tool, context) => refuseBlockedApprovalTitle(tool, context, []));
 export type ManifestTool = z.input<typeof manifestToolSchema>;
 
 const toolNamesSchema = z.array(serverToolSchema.shape.name).max(500).default([]);
@@ -629,6 +901,8 @@ const manifestOpenApiSchema = z.strictObject({
     /** Where the document is read, with no credentials: OpenAPI 3 or Swagger 2, JSON or YAML. */
     url: upstreamUrlSchema,
     credentials: credentialsSchema,
+    /** Where every operation's successful response keeps its result, when the API wraps each answer. */
+    resultPath: jsonPointerSchema.optional(),
     /** Tools listed in every turn of every agent they reach, whatever the question. */
     pinned: toolNamesSchema,
     approval: z
@@ -650,17 +924,22 @@ const manifestServiceSchema = z.strictObject({
     /** Rich text: it may mention tools and skills. */
     description: localizedTextSchema,
     audience: audienceSchema,
+    overridable: overridable(["description"]),
 });
 export type ManifestService = z.input<typeof manifestServiceSchema>;
 
+/** A skill's description in characters. The console caps its editor at the same. */
+export const SKILL_LIMITS = { descriptionLength: 500 } as const;
+
 const manifestSkillSchema = z.strictObject({
     name: slugSchema,
-    description: z.string().trim().min(1).max(500),
+    description: z.string().trim().min(1).max(SKILL_LIMITS.descriptionLength),
     /** Rich text: it may mention tools, skills and datasets, and read `{{variables}}`. */
     body: z.string().trim().min(1),
     /** The key of the service the skill renders inside; fixed once created. */
     service: slugSchema.optional(),
     audience: audienceSchema,
+    overridable: overridable(["description", "body"]),
 });
 export type ManifestSkill = z.input<typeof manifestSkillSchema>;
 
@@ -677,15 +956,18 @@ export const triggerThreadPolicySchema = z.discriminatedUnion("policy", [
     z.object({ policy: z.literal("single") }),
     z.object({ policy: z.literal("per-firing") }),
     z.object({ policy: z.literal("ephemeral") }),
-    z.object({ policy: z.literal("keyed"), key: z.string().regex(/^\//).max(256) }),
+    z.object({ policy: z.literal("keyed"), key: jsonPointerSchema }),
 ]);
 export type TriggerThreadPolicy = z.infer<typeof triggerThreadPolicySchema>;
 
+/** A trigger's description and instructions in characters. The console caps its editor at the same. */
+export const TRIGGER_LIMITS = { descriptionLength: 500, instructionsLength: 20_000 } as const;
+
 /** Fired with its secret, which the apply that creates it answers once and no manifest holds. */
 const manifestTriggerSchema = z.strictObject({
     /** `message` is the built-in trigger every agent has. */
     name: slugSchema.refine((name) => name !== MESSAGE_TRIGGER_NAME, "the built-in trigger's name"),
-    description: z.string().trim().min(1).max(500),
+    description: z.string().trim().min(1).max(TRIGGER_LIMITS.descriptionLength),
     inputSchema: objectSchema.default(EMPTY_OBJECT),
     /** The shape the run answers in; absent, the run answers in free text. */
     outputSchema: objectSchema
@@ -695,7 +977,7 @@ const manifestTriggerSchema = z.strictObject({
         )
         .optional(),
     /** Rich text: it may mention tools, skills and datasets, and read `{{variables}}` and `{{/payload/pointer}}`s. */
-    instructions: z.string().trim().min(1).max(20_000),
+    instructions: z.string().trim().min(1).max(TRIGGER_LIMITS.instructionsLength),
     threadPolicy: triggerThreadPolicySchema.default({ policy: "single" }),
     /** Firings a day per agent; absent, no limit. */
     budgetPerDay: z.number().int().positive().optional(),
@@ -708,6 +990,14 @@ const manifestTriggerSchema = z.strictObject({
     /** The model its runs talk to, over each agent's. */
     model: modelSchema.optional(),
     audience: audienceSchema,
+    overridable: overridable([
+        "description",
+        "instructions",
+        "threadPolicy",
+        "budgetPerDay",
+        "disableAfterFailures",
+        "model",
+    ]),
 });
 export type ManifestTrigger = z.input<typeof manifestTriggerSchema>;
 
@@ -731,6 +1021,7 @@ const manifestDatasetHostSchema = z
         /** Among those, the ones listed in every turn, whatever the question. */
         pinned: z.array(datasetIdentifierSchema).max(50).default([]),
         audience: audienceSchema,
+        overridable: overridable(["timeoutMs"]),
     })
     .superRefine((host, context) => {
         const unexposed = unexposedPins(host);
@@ -758,9 +1049,9 @@ export const mcpToolNamesSchema = z
 
 const manifestMcpServerSchema = z.strictObject({
     /** Prefixes every tool the server contributes: scripts call `tools.<name>_<tool>()`. */
-    name: z.string().regex(IDENTIFIER_PATTERN).max(64),
+    name: identifierSchema,
     url: upstreamUrlSchema,
-    credentials: presentationsSchema(
+    credentials: declaredPresentationsSchema(
         presentedHeaderSchema.refine(
             (name) => !mcpTransportHeaders.has(name.toLowerCase()),
             "a header the MCP transport sets",
@@ -771,6 +1062,7 @@ const manifestMcpServerSchema = z.strictObject({
     include: mcpToolNamesSchema.default([]),
     exclude: mcpToolNamesSchema.default([]),
     audience: audienceSchema,
+    overridable: overridable(["include", "exclude"]),
 });
 export type ManifestMcpServer = z.input<typeof manifestMcpServerSchema>;
 
@@ -784,7 +1076,7 @@ const manifestWebhookSchema = z.strictObject({
     description: z.string().trim().max(500).default(""),
     event: z.enum(SERVER_EVENTS),
     url: upstreamUrlSchema,
-    credentials: presentationsSchema(
+    credentials: declaredPresentationsSchema(
         presentedHeaderSchema.refine(
             (name) => name.toLowerCase() !== EVENT_HEADER.toLowerCase(),
             "the header that names the event",
@@ -793,16 +1085,23 @@ const manifestWebhookSchema = z.strictObject({
     ),
     timeoutMs: setting(SETTING_BOUNDS.webhook.timeoutMs),
     audience: audienceSchema,
+    overridable: overridable(["description", "timeoutMs"]),
 });
 export type ManifestWebhook = z.input<typeof manifestWebhookSchema>;
 
+/** A collection's name and description in characters. The console caps its editor at the same. */
+export const COLLECTION_LIMITS = { nameLength: 80, descriptionLength: 2_000 } as const;
+
 /** Holds documents, which are uploaded to it apart from the manifest. */
 const manifestCollectionSchema = z.strictObject({
-    name: z.string().trim().min(1).max(80),
-    description: z.string().trim().max(2_000).default(""),
+    name: z.string().trim().min(1).max(COLLECTION_LIMITS.nameLength),
+    description: z.string().trim().max(COLLECTION_LIMITS.descriptionLength).default(""),
     /** The key of the service every document in the collection belongs to. */
     service: slugSchema.optional(),
+    /** Whether answers may name its documents; false keeps their names, sections and pages from the model. */
+    citable: z.boolean().default(true),
     audience: audienceSchema,
+    overridable: overridable(["description"]),
 });
 export type ManifestCollection = z.input<typeof manifestCollectionSchema>;
 
@@ -816,9 +1115,9 @@ const tokenAudienceSchema = z.string().trim().min(1).max(2048).optional();
  * How the agent verifies end-user tokens: against the keys its issuer
  * publishes at a JWKS URI, with a shared secret named in Cortex's secret
  * store and the one algorithm tokens are signed with, through its server's
- * `/verify`, or not at all.
+ * `/verify`, or not at all. Cortex stores it on the agent as written here.
  */
-const agentAuthSchema = z.discriminatedUnion("kind", [
+export const agentAuthSchema = z.discriminatedUnion("kind", [
     z.strictObject({
         kind: z.literal("jwks"),
         jwksUri: tlsUrlSchema,
@@ -838,12 +1137,16 @@ const agentAuthSchema = z.discriminatedUnion("kind", [
 
 const { agent: agentBounds, agentContext, agentLimits } = SETTING_BOUNDS;
 
-/** How the agent runs; every setting left out keeps its default. */
-const agentSettingsSchema = z.strictObject({
-    /** Offers `searchKnowledge` over the collections the agent sees. */
+/**
+ * How the agent runs; every setting left out keeps its default. The
+ * console's settings input requires each of them.
+ */
+export const agentSettingsSchema = z.strictObject({
+    /** Lets `searchRegistries` search the knowledge in the collections the agent sees. */
     ragEnabled: z.boolean().default(false),
-    /** Offers `searchTools` over the tools the agent sees, beyond the pinned and mentioned ones. */
+    /** Lets `searchRegistries` search the tools the agent sees, beyond the pinned and mentioned ones. */
     toolRegistryEnabled: z.boolean().default(false),
+    /** Lets `searchRegistries` search the services the agent sees. */
     serviceRegistryEnabled: z.boolean().default(false),
     attachmentsEnabled: z.boolean().default(true),
     /** Hosts the built-in `fetchImage` tool may pull images from; none, no such tool. */
@@ -856,7 +1159,7 @@ const agentSettingsSchema = z.strictObject({
     media: z.array(z.enum(MEDIA_FORMS)).default([...DEFAULT_MEDIA_FORMS]),
     /** Off, end users cannot message the agent: only its triggers reach it. */
     messageTrigger: z.boolean().default(true),
-    defaultLocale: localeSchema.default("en"),
+    defaultLocale: localeSchema.default(BASE_LOCALE),
     rateLimitRequests: setting(agentBounds.rateLimitRequests),
     rateLimitWindowSeconds: setting(agentBounds.rateLimitWindowSeconds),
     dailyExecutionQuota: setting(agentBounds.dailyExecutionQuota),
@@ -881,9 +1184,12 @@ const agentSettingsSchema = z.strictObject({
         .prefault({}),
 });
 
+/** An agent's name in characters. The console caps its editor at the same. */
+export const AGENT_LIMITS = { nameLength: 120 } as const;
+
 const manifestAgentSchema = z.strictObject({
     slug: agentSlugSchema,
-    name: z.string().trim().min(1).max(120),
+    name: z.string().trim().min(1).max(AGENT_LIMITS.nameLength),
     /** The server it belongs to, by name; a manifest never creates one. */
     server: nameSchema,
     /** Rich text: it may mention tools and skills, and read `{{variables}}`. */
@@ -901,55 +1207,95 @@ const manifestAgentSchema = z.strictObject({
         })
         .default({}),
     settings: agentSettingsSchema.prefault({}),
-    suggestions: suggestionsSchema.default({ en: [], ar: [] }),
-    greeting: greetingSchema.default({ en: "", ar: "" }),
+    suggestions: suggestionsSchema.default(() => byLocale(() => [])),
+    greeting: greetingSchema.default(() => byLocale(() => "")),
+    overridable: overridable(["name", "prompt", "models", "settings", "suggestions", "greeting"]),
 });
 export type ManifestAgent = z.input<typeof manifestAgentSchema>;
 
-/** Every name in a list once, so one entry means one row. */
-function uniqueBy<TEntry>(key: (entry: TEntry) => string) {
-    return (entries: ReadonlyArray<TEntry>) => new Set(entries.map(key)).size === entries.length;
-}
+/**
+ * Every kind of entry a manifest owns a row for, in the order an apply
+ * reports a name another row holds and a kind its actor may not write. An
+ * OpenAPI source is none: its operations become `tools` entries.
+ */
+export const MANIFEST_KINDS = [
+    "agents",
+    "services",
+    "tools",
+    "skills",
+    "triggers",
+    "datasetHosts",
+    "mcpServers",
+    "webhooks",
+    "collections",
+] as const;
+export type ManifestKind = (typeof MANIFEST_KINDS)[number];
 
-function listOf<TEntry extends z.ZodType>(entry: TEntry, key: (value: z.output<TEntry>) => string) {
-    return z.array(entry).refine(uniqueBy(key), "a name repeats").default([]);
+/**
+ * The field each kind's entries go by, which its row's name holds: an
+ * agent's slug, a service's key, any other entry's name. A list holds each
+ * once, so one entry means one row.
+ */
+export const MANIFEST_NAME_FIELDS = {
+    agents: "slug",
+    tools: "name",
+    services: "key",
+    skills: "name",
+    triggers: "name",
+    datasetHosts: "name",
+    mcpServers: "name",
+    webhooks: "name",
+    collections: "name",
+} as const satisfies Record<ManifestKind, string>;
+
+/** A list of entries named by their `field`, refusing a name they repeat. */
+function listOf<TField extends string, TEntry extends z.ZodType<Record<TField, string>>>(
+    field: TField,
+    entry: TEntry,
+) {
+    return z
+        .array(entry)
+        .refine(
+            (entries) => new Set(entries.map((value) => value[field])).size === entries.length,
+            "a name repeats",
+        )
+        .default([]);
 }
 
-const byName = (entry: { name: string }) => entry.name;
-
 /** The id of Cortex's own manifest, which only Cortex applies: the management API refuses any other under it. */
 export const CORTEX_MANIFEST_ID = "cortex";
 
 /**
  * A deployment's agents and components, owned by the manifest `id`: an apply
  * of it creates what is new, updates what changed, and deletes what it no
- * longer lists, touching nothing it did not create.
+ * longer lists, touching nothing it did not create. What an entry lists as
+ * `overridable` may then change in Cortex too, and an apply keeps that
+ * change unless the manifest changed the same field.
  */
 export const manifestSchema = z.strictObject({
     /** Fixed for the deployment it describes: the rows an apply owns carry it. */
     id: slugSchema,
-    agents: listOf(manifestAgentSchema, (agent) => agent.slug),
-    tools: listOf(manifestToolSchema, byName),
-    openapi: listOf(manifestOpenApiSchema, byName),
-    services: listOf(manifestServiceSchema, (service) => service.key),
-    skills: listOf(manifestSkillSchema, byName),
-    triggers: listOf(manifestTriggerSchema, byName),
-    datasetHosts: listOf(manifestDatasetHostSchema, byName),
-    mcpServers: listOf(manifestMcpServerSchema, byName),
-    webhooks: listOf(manifestWebhookSchema, byName),
-    collections: listOf(manifestCollectionSchema, byName),
-});
+    agents: listOf(MANIFEST_NAME_FIELDS.agents, manifestAgentSchema),
+    tools: listOf(MANIFEST_NAME_FIELDS.tools, manifestToolSchema),
+    openapi: listOf("name", manifestOpenApiSchema),
+    services: listOf(MANIFEST_NAME_FIELDS.services, manifestServiceSchema),
+    skills: listOf(MANIFEST_NAME_FIELDS.skills, manifestSkillSchema),
+    triggers: listOf(MANIFEST_NAME_FIELDS.triggers, manifestTriggerSchema),
+    datasetHosts: listOf(MANIFEST_NAME_FIELDS.datasetHosts, manifestDatasetHostSchema),
+    mcpServers: listOf(MANIFEST_NAME_FIELDS.mcpServers, manifestMcpServerSchema),
+    webhooks: listOf(MANIFEST_NAME_FIELDS.webhooks, manifestWebhookSchema),
+    collections: listOf(MANIFEST_NAME_FIELDS.collections, manifestCollectionSchema),
+} satisfies Record<ManifestKind | "id" | "openapi", z.ZodType>);
 /** A manifest as written: every field with a default may be left out. */
 export type Manifest = z.input<typeof manifestSchema>;
 
+const manifestKindSchema = z.enum(MANIFEST_KINDS);
+
 /**
- * Entry names per kind: agents by slug, services by key, everything else by
- * name. An OpenAPI source's operations are counted among `tools`.
+ * Entry names per kind, each by its `MANIFEST_NAME_FIELDS` field. An OpenAPI
+ * source's operations are counted among `tools`.
  */
-const namesByKindSchema = z.record(
-    manifestSchema.keyof().exclude(["id", "openapi"]),
-    z.array(z.string()),
-);
+const namesByKindSchema = z.record(manifestKindSchema, z.array(z.string()));
 
 /** What an apply creates, updates and deletes, kind by kind; a preview answers the same without doing it. */
 export const manifestChangesSchema = z.object({
@@ -958,6 +1304,32 @@ export const manifestChangesSchema = z.object({
     delete: namesByKindSchema,
 });
 
+/** A field of one entry that both the manifest and a live write changed since the last apply. */
+const manifestConflictSchema = z.strictObject({
+    kind: manifestKindSchema,
+    name: z.string(),
+    field: z.string(),
+});
+
+/** Which value a conflict keeps: the one changed live in Cortex, or the manifest's. */
+const conflictSideSchema = z.enum(["live", "manifest"]);
+
+/**
+ * What preview and sync take: the manifest, and how its conflicts resolve.
+ * A conflict takes its own entry in `resolutions`, else `prefer`; a sync
+ * left with one neither answers is refused as `unresolved_conflicts`,
+ * naming them. A resolution for a field that no longer conflicts is ignored.
+ */
+export const manifestApplyInputSchema = manifestSchema.extend({
+    prefer: conflictSideSchema.optional(),
+    resolutions: z.array(manifestConflictSchema.extend({ keep: conflictSideSchema })).default([]),
+});
+
+/** What a preview answers: the changes, and the conflicts nothing resolved. */
+export const manifestPreviewSchema = manifestChangesSchema.extend({
+    conflicts: z.array(manifestConflictSchema),
+});
+
 /**
  * An apply's changes, and a fire secret, shown this once, for each trigger
  * it left with none anyone holds: one it created, or one whose