@m6d/cortex-cli 0.16.0 → 0.17.0

package/README.md

@@ -135,7 +135,7 @@ after; without it the command says so and names the command. Fields the API
 marks live (`x-live-fields`) take effect without a publish, from agents'
 next turn, and the command names them: a trigger's
 `credentialName`, `fireCredentialName` and model, say, or a dataset host's
-`url`, `credentials` and `timeoutMs`. `cortex datasetHosts sync <id>` reads a host's manifest, and a
+`url`, `headers` and `timeoutMs`. `cortex datasetHosts sync <id>` reads a host's manifest, and a
 draft host publishes only after `datasetHosts test` reached it once.
 
 A procedure the API marks destructive (`x-destructive`: delete, publish, rotate, toggle and the
@@ -200,7 +200,7 @@ openapi: [
     {
         name: "shop",
         url: "https://shop.example.com/openapi.json",
-        credentials: [{ header: "Authorization", prefix: "Bearer ", credential: null }],
+        headers: [{ header: "Authorization", prefix: "Bearer ", from: { kind: "runToken" } }],
         // For an API that wraps every answer: where each one keeps its result.
         // resultPath: "/data",
         pinned: ["findOrder"],
@@ -211,10 +211,11 @@ openapi: [
 ],
 ```
 
-Every apply reads the document first, without the source's credentials. An
+Every apply reads the document first, without the source's headers. An
 operation it adds is created, a changed one updated, and a dropped one
-deleted. A source with credentials is read only over https, or from a host
-the deployment allows, since the document says where they go. A source needs the `tools` write permission even when nothing
+deleted. A source whose headers carry a credential or the run token is read
+only over https, or from a host the deployment allows, since the document
+says where they go. A source needs the `tools` write permission even when nothing
 changes. Each tool is named after its `operationId`, made an identifier of at
 most 64 characters; an operation Cortex cannot import is left
 out. Two operations that come out with one name are told apart by a number
@@ -240,7 +241,7 @@ question, and is required with no terminal to ask on. `--dry-run` never asks.
 References between entries (mentions, service scopes, which role a
 credential or secret plays) are judged on the state the apply leaves, so
 the order the manifest lists them in does not matter. A dataset host's
-credentials are the exception: its catalog is read with them before the
+headers are the exception: its catalog is read with them before the
 apply, so they are judged on the deployment as it stands. A credential a
 trigger fires with cannot go to a host in the same apply that drops
 it; drop it first, then apply again.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@m6d/cortex-cli",
-    "version": "0.16.0",
+    "version": "0.17.0",
     "description": "Scaffold Cortex projects and manage a Cortex deployment",
     "license": "MIT",
     "type": "module",

package/src/commands/setup.ts

@@ -12,7 +12,7 @@ import {
     normalizeHost,
     scrubCredentialStrings,
 } from "@cortex/contracts/egress-policy";
-import { MODEL_PROVIDER_LIMITS, NAME_MAX_LENGTH } from "@cortex/contracts/manifest";
+import { MODEL_PROVIDER_LIMITS, NAME_MAX_LENGTH, SETTING_BOUNDS } from "@cortex/contracts/manifest";
 import { z } from "zod";
 
 import {
@@ -91,6 +91,8 @@ const serverSchema = namedSchema.extend({
     modelProvider: z.string().nullable(),
     modelName: z.string().nullable(),
     modelEffort: z.string().nullable(),
+    signInChecksPerMinute: z.number(),
+    triggerChecksPerMinute: z.number(),
 });
 const chatSchema = z.object({ choices: z.array(z.object({ message: z.object({}) })).min(1) });
 const embeddingsSchema = z.object({
@@ -388,6 +390,8 @@ async function ensureServer(
                 url,
                 keySecretName,
                 ...model,
+                signInChecksPerMinute: SETTING_BOUNDS.server.signInChecksPerMinute.default,
+                triggerChecksPerMinute: SETTING_BOUNDS.server.triggerChecksPerMinute.default,
             }),
         );
         report.input("Server", `${name} · created`);
@@ -413,6 +417,8 @@ async function ensureServer(
                       modelName: server.modelName,
                       modelEffort: server.modelEffort,
                   }),
+            signInChecksPerMinute: server.signInChecksPerMinute,
+            triggerChecksPerMinute: server.triggerChecksPerMinute,
         }),
     );
     report.input("Server", `${name} · updated`);

package/src/contracts/manifest/index.ts

@@ -70,13 +70,6 @@ export const SETTING_BOUNDS = {
     tool: {
         timeoutMs: { min: 100, max: 120_000, default: 30_000 },
         maxResponseBytes: { min: 1_024, max: 1_048_576, default: 262_144 },
-        rateLimitRequests: { min: 1, max: 10_000, default: 60 },
-        rateLimitWindowSeconds: { min: 1, max: 86_400, default: 60 },
-    },
-    agent: {
-        rateLimitRequests: { min: 1, max: 10_000, default: 60 },
-        rateLimitWindowSeconds: { min: 1, max: 86_400, default: 60 },
-        dailyExecutionQuota: { min: 1, max: 1_000_000, default: 10_000 },
     },
     /** How much of the conversation the agent's model sees. */
     agentContext: {
@@ -95,6 +88,18 @@ export const SETTING_BOUNDS = {
     trigger: { disableAfterFailures: { min: 1, max: 1_000, default: 5 } },
     datasetHost: { timeoutMs: { min: 100, max: 120_000, default: 30_000 } },
     webhook: { timeoutMs: { min: 1_000, max: 30_000, default: 10_000 } },
+    /** The score, a fraction, a new visitor of an anonymous agent needs to get an id. */
+    recaptcha: { minScore: { min: 0.1, max: 0.9, default: 0.5 } },
+    /**
+     * How often Cortex checks a caller for the server, per minute: a sign-in
+     * (a new end-user token it asks the server to verify, or a visitor one
+     * of its anonymous agents gives an id), or a trigger's secret. Anyone
+     * can try either, so each bounds what strangers cost it.
+     */
+    server: {
+        signInChecksPerMinute: { min: 1, max: 100_000, default: 600 },
+        triggerChecksPerMinute: { min: 1, max: 10_000, default: 60 },
+    },
 } as const satisfies Record<string, Record<string, Bounds>>;
 
 /** An integer within `bounds`, their default when left out. */
@@ -112,14 +117,68 @@ export function settingDefaults<TBounds extends Record<string, Bounds>>(bounds:
     ) as SettingValues<TBounds>;
 }
 
+type RateLimitBounds = { max: number; allUsers: number | null; perUser: number | null };
+
+/**
+ * Every rate limit an author sets, in the console and in a manifest alike,
+ * per minute except an agent's tokens, per UTC day. Each holds for all of an
+ * entry's users together and for each user alone, from 1 to `max`, or not
+ * at all (null); a manifest that leaves one out gets the default.
+ */
+export const RATE_LIMITS = {
+    agent: {
+        messagesPerMinute: { max: 10_000, allUsers: 600, perUser: 20 },
+        tokensPerDay: { max: 1_000_000_000_000, allUsers: null, perUser: 1_000_000 },
+    },
+    tool: { callsPerMinute: { max: 10_000, allUsers: 60, perUser: 20 } },
+    datasetHost: { queriesPerMinute: { max: 10_000, allUsers: 60, perUser: 20 } },
+} as const satisfies Record<string, Record<string, RateLimitBounds>>;
+
+/** Whom a rate limit holds for: all of an entry's users together, or each user alone. */
+export const RATE_LIMIT_USERS = ["allUsers", "perUser"] as const;
+export type RateLimitUsers = (typeof RATE_LIMIT_USERS)[number];
+
+/** A group of `RATE_LIMITS`, one value per limit for all users and for each user. */
+export function mapRateLimits<TBounds extends Record<string, RateLimitBounds>, TValue>(
+    bounds: TBounds,
+    value: (bound: RateLimitBounds, users: RateLimitUsers) => TValue,
+) {
+    return Object.fromEntries(
+        RATE_LIMIT_USERS.map((users) => [
+            users,
+            Object.fromEntries(
+                Object.entries(bounds).map(([name, bound]) => [name, value(bound, users)]),
+            ),
+        ]),
+    ) as Record<RateLimitUsers, { [Name in keyof TBounds]: TValue }>;
+}
+
+/** An entry's rate limits as its row holds them; null lifts one. */
+export type RateLimits<TBounds> = Record<
+    RateLimitUsers,
+    { [Name in keyof TBounds]: number | null }
+>;
+
+/** Every limit of a group at its default, as a row that sets none stores them. */
+export function rateLimitDefaults<TBounds extends Record<string, RateLimitBounds>>(
+    bounds: TBounds,
+) {
+    return mapRateLimits(bounds, (bound, users) => bound[users]) satisfies RateLimits<TBounds>;
+}
+
+/** One rate limit as a manifest writes it: null lifts it, and left out it takes its default. */
+function rateLimit(bound: RateLimitBounds, users: RateLimitUsers) {
+    return z.number().int().min(1).max(bound.max).nullable().default(bound[users]);
+}
+
 /**
  * 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.
+ * audience, 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
@@ -359,19 +418,25 @@ export function confinesEndpointParams(url: string) {
 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.
+ * The headers a call carries: a header name and the prefix before the value
+ * in characters, and how many headers at most. The console caps its header
+ * rows at the same.
  */
-export const CREDENTIAL_LIMITS = { headerLength: 120, prefixLength: 40, presentations: 8 } as const;
+export const HEADER_LIMITS = { headerLength: 120, prefixLength: 40, headers: 8 } as const;
 
 /** An HTTP header field name (RFC 9110 token). */
 export const HEADER_NAME_PATTERN = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/;
+
+/**
+ * A header value fetch sends: visible ASCII, tab, space and obs-text.
+ * Control characters, and any character past one byte, make fetch throw.
+ */
+export const HEADER_VALUE_PATTERN = /^[\t\x20-\x7e\x80-\xff]*$/;
 const headerNameSchema = z
     .string()
     .trim()
     .min(1)
-    .max(CREDENTIAL_LIMITS.headerLength)
+    .max(HEADER_LIMITS.headerLength)
     .regex(HEADER_NAME_PATTERN);
 
 /** Headers Cortex or fetch fills on every request. Lower-cased. */
@@ -388,20 +453,20 @@ export const transportForbiddenHeaders = [
     "proxy-authorization",
 ] as const;
 
-/** Headers the MCP transport sets on its own requests: no MCP server's credential travels under one. Lower-cased. */
+/** Headers the MCP transport sets on its own requests: no header an MCP server's entry declares travels under one. Lower-cased. */
 export const mcpTransportHeaders = new Set<string>([
     "mcp-session-id",
     "mcp-protocol-version",
     "last-event-id",
 ]);
 
-/** Headers no credential or field may travel under; test lower-cased names. */
+/** Headers no declared header or field may travel under; test lower-cased names. */
 export const transportOwnedHeaders = new Set<string>([
     ...transportSetHeaders,
     ...transportForbiddenHeaders,
 ]);
 
-/** The index of each entry presenting a header an earlier entry already presents, compared case-insensitively. */
+/** The index of each entry declaring a header an earlier entry already declares, compared case-insensitively. */
 function repeatedHeaders(entries: ReadonlyArray<{ header: string }>) {
     const seen = new Set<string>();
     return entries.flatMap((entry, index) => {
@@ -423,18 +488,18 @@ 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, as `entry` validates
- * it, at most `CREDENTIAL_LIMITS.presentations` of them. A header is
- * presented once; `repeated` words the refusal of a later one.
+ * The headers every call carries: each entry a header, what precedes the
+ * value in it (`"Bearer "`, say), and where the value comes from, as `entry`
+ * validates it, at most `HEADER_LIMITS.headers` of them. A header is
+ * declared once; `repeated` words the refusal of a later one.
  */
-export function presentationsSchema<TEntry extends z.ZodType<{ header: string }>>(
+export function headerListSchema<TEntry extends z.ZodType<{ header: string }>>(
     entry: TEntry,
     repeated: () => string,
 ) {
     return z
         .array(entry)
-        .max(CREDENTIAL_LIMITS.presentations)
+        .max(HEADER_LIMITS.headers)
         .superRefine((entries, context) => {
             for (const index of repeatedHeaders(entries)) {
                 context.addIssue({
@@ -446,23 +511,71 @@ export function presentationsSchema<TEntry extends z.ZodType<{ header: string }>
         });
 }
 
-/** The presentations a manifest entry declares: no unknown key, an omitted prefix or list empty. */
-function declaredPresentationsSchema<TCredential extends string | null>(
+/** A variable by name: one the agent's server declares, or a built-in (`timezone`, `locale`, `utcTime`). */
+const variableSourceSchema = z.object({
+    kind: z.literal("variable"),
+    name: z.string().trim().min(1).max(64),
+});
+
+/** A credential Cortex holds or acquires, by name. */
+const credentialSourceSchema = z.object({ kind: z.literal("credential"), name: nameSchema });
+
+/** A value written as is. */
+const constantHeaderSourceSchema = z.object({
+    kind: z.literal("constant"),
+    value: z.string().max(4_000),
+});
+
+/**
+ * Where a header's value comes from: a credential, the run's own token (the
+ * end user's in a chat, the trigger's in a firing), a variable, or a
+ * constant. A run token or a variable needs a run; a call without one (a
+ * webhook delivery, a catalog read) presents only credentials and constants.
+ */
+export const headerSourceSchema = z.discriminatedUnion("kind", [
+    credentialSourceSchema,
+    z.object({ kind: z.literal("runToken") }),
+    variableSourceSchema,
+    constantHeaderSourceSchema,
+]);
+export type HeaderSource = z.infer<typeof headerSourceSchema>;
+
+/** The sources a call without a run can present. */
+export const runlessHeaderSourceSchema = z.discriminatedUnion("kind", [
+    credentialSourceSchema,
+    constantHeaderSourceSchema,
+]);
+
+/**
+ * The headers a manifest entry declares: no unknown key, an omitted prefix
+ * or list empty, and a prefix or constant only of what a header can carry
+ * (`HEADER_VALUE_PATTERN`).
+ */
+function declaredHeadersSchema<TSource extends HeaderSource>(
     header: z.ZodString,
-    credential: z.ZodType<TCredential, TCredential>,
+    from: z.ZodType<TSource, TSource>,
 ) {
-    return presentationsSchema(
-        z.strictObject({
-            header,
-            prefix: z.string().max(CREDENTIAL_LIMITS.prefixLength).default(""),
-            credential,
-        }),
-        () => "a header presented twice",
+    return headerListSchema(
+        z
+            .strictObject({
+                header,
+                prefix: z
+                    .string()
+                    .max(HEADER_LIMITS.prefixLength)
+                    .regex(HEADER_VALUE_PATTERN, "a prefix a header cannot carry")
+                    .default(""),
+                from,
+            })
+            .refine(
+                (entry) =>
+                    entry.from.kind !== "constant" || HEADER_VALUE_PATTERN.test(entry.from.value),
+                { path: ["from", "value"], message: "a value a header cannot carry" },
+            ),
+        () => "a header declared 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 = declaredPresentationsSchema(presentedHeaderSchema, nameSchema.nullable());
+const headersSchema = declaredHeadersSchema(presentedHeaderSchema, headerSourceSchema);
 
 /**
  * Where Cortex fills a top-level scalar input field from, out of the model's
@@ -470,7 +583,7 @@ const credentialsSchema = declaredPresentationsSchema(presentedHeaderSchema, nam
  * a constant, or the end user's bearer.
  */
 export const fieldSourceSchema = z.discriminatedUnion("kind", [
-    z.object({ kind: z.literal("variable"), name: z.string().trim().min(1).max(64) }),
+    variableSourceSchema,
     z.object({ kind: z.literal("secret"), name: nameSchema }),
     z.object({
         kind: z.literal("constant"),
@@ -806,6 +919,7 @@ const localizedTextSchema = z.record(
 );
 
 const { tool: toolBounds } = SETTING_BOUNDS;
+const { tool: toolRateLimits, datasetHost: datasetHostRateLimits } = RATE_LIMITS;
 
 /** 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]) {
@@ -816,30 +930,47 @@ function toolInputSchemaOf(type: (typeof TOOL_TYPE_NAMES)[number]) {
     ]).default(EMPTY_OBJECT);
 }
 
-/** Shared by every tool type; a tool that calls nothing (`client`) has no endpoint, credentials, approval or bound fields. */
+/** What a live write may change on a manifest's tool, and keep through the next apply. */
+const TOOL_OVERRIDABLES = [
+    "description",
+    "timeoutMs",
+    "maxResponseBytes",
+    "rateLimits",
+    "pinned",
+    "tags",
+] as const;
+
+/** The same for a tool that calls an endpoint, whose headers are its own. */
+const CALLED_TOOL_OVERRIDABLES = [...TOOL_OVERRIDABLES, "headers"] as const;
+
+/** Shared by every tool type; a tool that calls nothing (`client`) has no endpoint, headers, approval or bound fields. */
 const toolBaseSchema = z.strictObject({
     ...serverToolSchema.pick({ name: true, description: true }).shape,
     inputSchema: toolInputSchemaOf("client"),
     outputSchema: objectSchema.default(EMPTY_OBJECT),
     timeoutMs: setting(toolBounds.timeoutMs),
     maxResponseBytes: setting(toolBounds.maxResponseBytes),
-    rateLimitRequests: setting(toolBounds.rateLimitRequests),
-    rateLimitWindowSeconds: setting(toolBounds.rateLimitWindowSeconds),
+    rateLimits: z
+        .strictObject({
+            allUsers: z
+                .strictObject({
+                    callsPerMinute: rateLimit(toolRateLimits.callsPerMinute, "allUsers"),
+                })
+                .prefault({}),
+            perUser: z
+                .strictObject({
+                    callsPerMinute: rateLimit(toolRateLimits.callsPerMinute, "perUser"),
+                })
+                .prefault({}),
+        })
+        .prefault({}),
     /** Trims the upstream's answer to what the output schema declares. */
     projectOutput: z.boolean().default(false),
     /** Listed in every turn of every agent the tool reaches, whatever the question. */
     pinned: z.boolean().default(false),
     tags: toolTagsSchema.default([]),
     audience: audienceSchema,
-    overridable: overridable([
-        "description",
-        "timeoutMs",
-        "maxResponseBytes",
-        "rateLimitRequests",
-        "rateLimitWindowSeconds",
-        "pinned",
-        "tags",
-    ]),
+    overridable: overridable(TOOL_OVERRIDABLES),
 });
 
 /** A tool that calls an endpoint; with `requiresApproval`, every call waits for the end user to approve it. */
@@ -848,8 +979,9 @@ const calledToolSchema = toolBaseSchema.extend({
         confinesEndpointParams,
         "a {parameter} outside the path or query",
     ),
-    credentials: credentialsSchema,
+    headers: headersSchema,
     requiresApproval: z.boolean().default(false),
+    overridable: overridable(CALLED_TOOL_OVERRIDABLES),
 });
 
 const manifestToolSchema = z
@@ -891,16 +1023,16 @@ const toolNamesSchema = z.array(serverToolSchema.shape.name).max(500).default([]
  * An OpenAPI document whose operations become HTTP tools this manifest owns.
  * Each apply reads it, imports every operation Cortex supports, keeps those
  * tools in step with the document and deletes the ones it no longer has.
- * Every tool presents `credentials`. A GET call runs at once; any other
+ * Every tool carries the source's `headers`. A GET call runs at once; any other
  * method waits for the end user's approval, unless `approval` names the
  * tool the other way.
  */
 const manifestOpenApiSchema = z.strictObject({
     /** Names the source in what an apply reports. */
     name: nameSchema,
-    /** Where the document is read, with no credentials: OpenAPI 3 or Swagger 2, JSON or YAML. */
+    /** Where the document is read, with no headers: OpenAPI 3 or Swagger 2, JSON or YAML. */
     url: upstreamUrlSchema,
-    credentials: credentialsSchema,
+    headers: headersSchema,
     /** 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. */
@@ -913,6 +1045,8 @@ const manifestOpenApiSchema = z.strictObject({
             "a tool both never and always needs approval",
         ),
     audience: audienceSchema,
+    /** What a live write may change on each of the source's tools, and keep through the next apply. */
+    overridable: overridable(CALLED_TOOL_OVERRIDABLES),
 });
 export type ManifestOpenApi = z.input<typeof manifestOpenApiSchema>;
 
@@ -1014,14 +1148,34 @@ const manifestDatasetHostSchema = z
     .strictObject({
         name: datasetIdentifierSchema,
         url: upstreamUrlSchema,
-        credentials: credentialsSchema,
+        headers: headersSchema,
         timeoutMs: setting(SETTING_BOUNDS.datasetHost.timeoutMs),
+        rateLimits: z
+            .strictObject({
+                allUsers: z
+                    .strictObject({
+                        queriesPerMinute: rateLimit(
+                            datasetHostRateLimits.queriesPerMinute,
+                            "allUsers",
+                        ),
+                    })
+                    .prefault({}),
+                perUser: z
+                    .strictObject({
+                        queriesPerMinute: rateLimit(
+                            datasetHostRateLimits.queriesPerMinute,
+                            "perUser",
+                        ),
+                    })
+                    .prefault({}),
+            })
+            .prefault({}),
         /** The datasets the host serves that agents may query. */
         expose: z.array(datasetIdentifierSchema).min(1).max(500),
         /** Among those, the ones listed in every turn, whatever the question. */
         pinned: z.array(datasetIdentifierSchema).max(50).default([]),
         audience: audienceSchema,
-        overridable: overridable(["timeoutMs"]),
+        overridable: overridable(["timeoutMs", "rateLimits", "headers"]),
     })
     .superRefine((host, context) => {
         const unexposed = unexposedPins(host);
@@ -1051,41 +1205,41 @@ const manifestMcpServerSchema = z.strictObject({
     /** Prefixes every tool the server contributes: scripts call `tools.<name>_<tool>()`. */
     name: identifierSchema,
     url: upstreamUrlSchema,
-    credentials: declaredPresentationsSchema(
+    headers: declaredHeadersSchema(
         presentedHeaderSchema.refine(
             (name) => !mcpTransportHeaders.has(name.toLowerCase()),
             "a header the MCP transport sets",
         ),
-        nameSchema.nullable(),
+        headerSourceSchema,
     ),
     /** The server's own tool names to offer; empty offers every tool. */
     include: mcpToolNamesSchema.default([]),
     exclude: mcpToolNamesSchema.default([]),
     audience: audienceSchema,
-    overridable: overridable(["include", "exclude"]),
+    overridable: overridable(["include", "exclude", "headers"]),
 });
 export type ManifestMcpServer = z.input<typeof manifestMcpServerSchema>;
 
 /**
  * Delivers its event to a receiver while it is declared. A delivery carries
- * no run, so every credential it presents is named, and none under the
- * header that names the event.
+ * no run, so its headers come from credentials and constants, and none
+ * travels under the header that names the event.
  */
 const manifestWebhookSchema = z.strictObject({
     name: slugSchema,
     description: z.string().trim().max(500).default(""),
     event: z.enum(SERVER_EVENTS),
     url: upstreamUrlSchema,
-    credentials: declaredPresentationsSchema(
+    headers: declaredHeadersSchema(
         presentedHeaderSchema.refine(
             (name) => name.toLowerCase() !== EVENT_HEADER.toLowerCase(),
             "the header that names the event",
         ),
-        nameSchema,
+        runlessHeaderSourceSchema,
     ),
     timeoutMs: setting(SETTING_BOUNDS.webhook.timeoutMs),
     audience: audienceSchema,
-    overridable: overridable(["description", "timeoutMs"]),
+    overridable: overridable(["description", "timeoutMs", "headers"]),
 });
 export type ManifestWebhook = z.input<typeof manifestWebhookSchema>;
 
@@ -1131,11 +1285,32 @@ export const agentAuthSchema = z.discriminatedUnion("kind", [
         issuer: issuerSchema,
         audience: tokenAudienceSchema,
     }),
-    z.strictObject({ kind: z.literal("anonymous") }),
+    /**
+     * Each visitor gets an id of their own from Cortex, kept in their
+     * browser. With `recaptcha`, reCAPTCHA Enterprise scores each new
+     * visitor first, and one below `minScore` gets none.
+     */
+    z.strictObject({
+        kind: z.literal("anonymous"),
+        recaptcha: z
+            .strictObject({
+                siteKey: z.string().trim().min(1).max(200),
+                projectId: z.string().trim().min(1).max(200),
+                /** The secret holding a Google Cloud API key allowed to create assessments. */
+                secret: nameSchema,
+                minScore: z
+                    .number()
+                    .min(SETTING_BOUNDS.recaptcha.minScore.min)
+                    .max(SETTING_BOUNDS.recaptcha.minScore.max)
+                    .default(SETTING_BOUNDS.recaptcha.minScore.default),
+            })
+            .optional(),
+    }),
     z.strictObject({ kind: z.literal("server") }),
 ]);
 
-const { agent: agentBounds, agentContext, agentLimits } = SETTING_BOUNDS;
+const { agentContext, agentLimits } = SETTING_BOUNDS;
+const { agent: agentRateLimits } = RATE_LIMITS;
 
 /**
  * How the agent runs; every setting left out keeps its default. The
@@ -1160,9 +1335,22 @@ export const agentSettingsSchema = z.strictObject({
     /** Off, end users cannot message the agent: only its triggers reach it. */
     messageTrigger: z.boolean().default(true),
     defaultLocale: localeSchema.default(BASE_LOCALE),
-    rateLimitRequests: setting(agentBounds.rateLimitRequests),
-    rateLimitWindowSeconds: setting(agentBounds.rateLimitWindowSeconds),
-    dailyExecutionQuota: setting(agentBounds.dailyExecutionQuota),
+    rateLimits: z
+        .strictObject({
+            allUsers: z
+                .strictObject({
+                    messagesPerMinute: rateLimit(agentRateLimits.messagesPerMinute, "allUsers"),
+                    tokensPerDay: rateLimit(agentRateLimits.tokensPerDay, "allUsers"),
+                })
+                .prefault({}),
+            perUser: z
+                .strictObject({
+                    messagesPerMinute: rateLimit(agentRateLimits.messagesPerMinute, "perUser"),
+                    tokensPerDay: rateLimit(agentRateLimits.tokensPerDay, "perUser"),
+                })
+                .prefault({}),
+        })
+        .prefault({}),
     context: z
         .strictObject({
             maxContextTokens: setting(agentContext.maxContextTokens),

package/src/contracts/wire/index.ts

@@ -85,8 +85,31 @@ export type AttachmentSummary = {
     description: string | null;
 };
 
-/** The user id every caller shares on an agent that verifies no end user. */
-export const ANONYMOUS_USER_ID = "00000000-0000-0000-0000-000000000000";
+/**
+ * How an anonymous agent's visitors' user ids begin: Cortex issues each
+ * visitor an id of its own, which their browser keeps. No issuer ever mints
+ * a subject shaped like this.
+ */
+export const VISITOR_USER_PREFIX = "visitor:";
+
+/** The reCAPTCHA action a visitor's sign-in runs, which Cortex checks the token was made for. */
+export const VISITOR_RECAPTCHA_ACTION = "cortex_visitor";
+
+/** `POST /visitors`: a visitor's sign-in to an anonymous agent, with a reCAPTCHA token when the agent checks visitors. */
+export type VisitorRequest = { recaptcha?: string };
+
+/** A visitor's token, the bearer of every request after the sign-in. */
+export type VisitorToken = { token: string };
+
+/**
+ * Why a sign-in got no token: the agent checks visitors with reCAPTCHA and
+ * the request carried no token, or one that failed. `siteKey` is the key the
+ * widget runs reCAPTCHA with.
+ */
+export type VisitorRefusal = {
+    error: "recaptcha_required" | "recaptcha_failed";
+    siteKey: string;
+};
 
 export type ThreadSummary = {
     id: string;
@@ -139,8 +162,6 @@ export type ClientToolBinding = {
     toolId: string;
     surface: ToolSurface;
     embedOrigin: string;
-    /** Variables the initiate call's input reads. */
-    variables: string[];
 };
 
 /**

package/src/scaffold/files.ts

@@ -29,7 +29,7 @@ import { applyPorts, type Ports } from "@/scaffold/ports";
  * `@m6d/cortex` range below are stamped by scripts/sync-package-versions.ts
  * before the CLI publishes, so a scaffold pins what was current then.
  */
-const CORTEX_VERSION = "0.16.0";
+const CORTEX_VERSION = "0.17.0";
 
 /** This machine as Cortex's containers name it: the one private host the stack's egress policy admits. */
 export const DOCKER_HOST = "host.docker.internal";
@@ -150,7 +150,7 @@ function packageJson({ name, datasets, setup }: Project) {
                 verify: "bun run format:check && bun run lint && bun run spellcheck && bun run check && bun run audit",
             },
             dependencies: {
-                "@m6d/cortex": "~0.4.0",
+                "@m6d/cortex": "~0.5.0",
                 // drizzle 1.0 is in beta; this is the build `@m6d/cortex/drizzle` is tested against.
                 ...(datasets ? { "drizzle-orm": "1.0.0-beta.15-859cf75" } : {}),
                 hono: "^4.12.3",
@@ -198,7 +198,7 @@ if (!server) throw new Error("Apply from this project: its .env names the server
         {
             name: "store",
             url: \`\${serverUrl}/datasets\`,
-            credentials: [],
+            headers: [],
             expose: ["orders"],
             pinned: ["orders"],
             audience: { server },
@@ -223,7 +223,7 @@ export default defineManifest({
             name: "Helper",
             server,
             prompt: "You are a helpful assistant. Address the user as {{userName}}.",
-            // No identity provider yet: every caller is one shared identity.
+            // No identity provider yet: each browser is a visitor of its own.
             auth: { kind: "anonymous" },
         },
     ],${datasets ? datasetHosts : ""}