@mercury-fw/channel-http 0.8.2 → 0.8.4

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @mercury-fw/channel-http
 
+## 0.8.4
+
+### Patch Changes
+
+- 62bb3a3: - `persona.name` is the assistant's name, Mercury when left out. A name that's blank, longer than 40 characters or on more than one line stops the app at startup.
+  - Every text the model reads refers to the name as `{{assistant}}`, and the core puts the persona's name there: the persona's identity and tone, the system prompt, plugin fragments, skills and tool descriptions. The model no longer takes "Mercury" for its own name when the app calls its assistant something else.
+  - Where the one acting is the system around the model, the texts say "the system" or "this instance" instead of Mercury: the wiki tools, the cli-engine's errors, the jira skill and its issue lists.
+  - Plugins get `assistantName` in their `build()` context, and channels in their runtime context, for texts they build while running. The login messages, the linking reply and the HTTP login page name the assistant that way.
+  - The tools a person runs as the assistant itself are `<tool>AsSelf`, previously `<tool>AsMercury`. The `mercury.act-as-self` roles are unchanged.
+  - `mfw create` writes the assistant's name as `persona.name`, with `persona/identity.md` and `persona/tone.md` referring to it. An existing app keeps working as it is: to rename its assistant everywhere, add `name` to its persona and write `{{assistant}}` in its persona files.
+
+## 0.8.3
+
+### Patch Changes
+
+- 3d73e59: - `auth` in `mercury.config.ts` takes a list of providers as well as one: they're tried in order and the first that recognizes the caller decides who they are. One that fails to load, or fails on a request, is logged and the others still serve; a name taken twice is refused.
+  - `createOidcAuth({ name })` is an OIDC provider of its own (`oidc-<name>`), configured by `OIDC_<NAME>_ISSUER` and `OIDC_<NAME>_AUDIENCE`, so an instance can accept several issuers. `oidcAuth` is unchanged.
+  - A principal's provider can be `oidc-<name>`; each provider's people keep their own keys.
+  - `zitadelDirectory` takes `ZITADEL_AUTH_PROVIDER`, the auth provider whose subjects are its users (default `oidc`).
+
 ## 0.8.2
 
 ### Patch Changes

package/README.md

@@ -14,7 +14,7 @@ channels: [httpChannel],
 auth: oidcAuth,
 ```
 
-It needs an auth provider next to it: [`@mercury-fw/auth-oidc`](../../auth/auth-oidc) for real users, [`@mercury-fw/auth-static`](../../auth/auth-static) for the test bed and e2e tests. Without one, or with one that fails to load, the channel doesn't start and the log says why.
+It needs an auth provider next to it, or several (`auth: [a, b]`, tried in order): [`@mercury-fw/auth-oidc`](../../auth/auth-oidc) for real users, [`@mercury-fw/auth-static`](../../auth/auth-static) for the test bed and e2e tests. Without one, or when none of them loads, the channel doesn't start and the log says why.
 
 | Variable | |
 |---|---|
@@ -27,7 +27,7 @@ It needs an auth provider next to it: [`@mercury-fw/auth-oidc`](../../auth/auth-
 
 It's active whenever it's declared in `mercury.config.ts`'s `channels` with an auth provider; remove it there to turn the surface off. It listens on `HTTP_SURFACE_PORT` (default `4100`). Base URL `http://<host>:<port>`.
 
-**Authentication.** Every route except `GET /openapi.yaml`, `GET /login/callback` and the `OPTIONS` preflights needs `Authorization: Bearer <token>`, and the auth provider decides who the token belongs to. A missing or refused token gets `401` with `WWW-Authenticate: Bearer` before anything runs. Then the core decides whether it talks to that person at all: someone the app's directory doesn't know gets `403` (unless the app lets unknown people in), and `503` when the directory can't be reached, both with `{ ok: false, error, reason }`, where `error` is what to tell them.
+**Authentication.** Every route except `GET /openapi.yaml`, `GET /login/callback` and the `OPTIONS` preflights needs `Authorization: Bearer <token>`, and the auth providers decide who the token belongs to: the first that recognizes it. A missing or refused token gets `401` with `WWW-Authenticate: Bearer` before anything runs. Then the core decides whether it talks to that person at all: someone the app's directory doesn't know gets `403` (unless the app lets unknown people in), and `503` when the directory can't be reached, both with `{ ok: false, error, reason }`, where `error` is what to tell them.
 
 **Conversations belong to whoever opened them.** The session key is `<caller id>:<conversationId>`, so the same `conversationId` sent by someone else is a conversation of their own, and a confirmation token staged in your conversation can't be confirmed from theirs. Each authenticated caller also gets their own episodic memory and wiki area, as on Google Chat.
 

package/dist/http-provider.d.ts

@@ -36,6 +36,8 @@ export type HttpProviderDeps = {
     linking?: ChannelLinking;
     /** The surface's budget for a reopened conversation (`HTTP_SURFACE_RESUME_MAX_CHARS`). */
     resumeMaxChars?: number;
+    /** What the pages people read call the assistant. */
+    assistantName?: string;
 };
 export declare function createHttpProvider(deps: HttpProviderDeps): Provider & {
     stop(): Promise<void>;

package/dist/http-server.d.ts

@@ -102,10 +102,12 @@ export type CompleteLoginFn = (state: string, code: string) => Promise<LoginOutc
  * in, with `code` and `state` (or `error`, when they refused). Public: the
  * person's browser carries no token here, and the single-use `state` the core
  * issued for them is what ties the request to their login. Answers with a
- * plain page telling them how it went.
+ * plain page telling them how it went, naming the assistant as the app does
+ * (`Mercury` from an older core that doesn't say).
  */
 export declare function handleLoginCallback(req: Request, deps: {
     complete: CompleteLoginFn;
+    assistantName?: string;
 }): Promise<Response>;
 /** A single read route: its `GET` handler plus the shared `OPTIONS` preflight. */
 type ReadRoute = {
@@ -133,6 +135,8 @@ export type HttpServerDeps = TurnRequestDeps & {
     completeLogin?: CompleteLoginFn;
     /** Linking another account to the caller; `/link` is mounted only with it. */
     linking?: ChannelLinking;
+    /** What the pages people read call the assistant. */
+    assistantName?: string;
 };
 /** Starts the HTTP surface: `POST /turn` (4a) plus the read-only routes (4b)
  * when `reads` is supplied. */

package/http-provider.ts

@@ -33,6 +33,8 @@ export type HttpProviderDeps = {
   linking?: ChannelLinking;
   /** The surface's budget for a reopened conversation (`HTTP_SURFACE_RESUME_MAX_CHARS`). */
   resumeMaxChars?: number;
+  /** What the pages people read call the assistant. */
+  assistantName?: string;
 };
 
 export function createHttpProvider(deps: HttpProviderDeps): Provider & { stop(): Promise<void> } {
@@ -51,6 +53,7 @@ export function createHttpProvider(deps: HttpProviderDeps): Provider & { stop():
         completeLogin: deps.logins?.complete,
         ...(deps.linking === undefined ? {} : { linking: deps.linking }),
         ...(deps.resumeMaxChars === undefined ? {} : { resumeMaxChars: deps.resumeMaxChars }),
+        ...(deps.assistantName === undefined ? {} : { assistantName: deps.assistantName }),
       });
       deps.logins?.accept(deps.logins.callbackUrl);
     },

package/http-server.ts

@@ -352,18 +352,23 @@ function loginPage(text: string, status: number): Response {
  * in, with `code` and `state` (or `error`, when they refused). Public: the
  * person's browser carries no token here, and the single-use `state` the core
  * issued for them is what ties the request to their login. Answers with a
- * plain page telling them how it went.
+ * plain page telling them how it went, naming the assistant as the app does
+ * (`Mercury` from an older core that doesn't say).
  */
-export async function handleLoginCallback(req: Request, deps: { complete: CompleteLoginFn }): Promise<Response> {
+export async function handleLoginCallback(
+  req: Request,
+  deps: { complete: CompleteLoginFn; assistantName?: string },
+): Promise<Response> {
+  const assistant = deps.assistantName ?? "Mercury";
   const params = new URL(req.url).searchParams;
   const error = params.get("error");
   if (error !== null) {
     const reason = error.replace(/[^A-Za-z0-9_.-]/g, "").slice(0, 64);
-    return loginPage(`The login didn't happen (${reason}). Ask Mercury again for a new link.`, 400);
+    return loginPage(`The login didn't happen (${reason}). Ask ${assistant} again for a new link.`, 400);
   }
   const code = params.get("code");
   const state = params.get("state");
-  if (!code || !state) return loginPage("The login link came back without a code or a state. Ask Mercury again for a new link.", 400);
+  if (!code || !state) return loginPage(`The login link came back without a code or a state. Ask ${assistant} again for a new link.`, 400);
   const outcome = await deps.complete(state, code);
   return outcome.ok
     ? loginPage(`You're logged in to ${outcome.service}. Go back to the conversation and ask again.`, 200)
@@ -371,8 +376,15 @@ export async function handleLoginCallback(req: Request, deps: { complete: Comple
 }
 
 /** The login callback route, mounted when the server can complete logins. */
-function loginRoutes(complete: CompleteLoginFn): Record<string, { GET: (req: Request) => Promise<Response> }> {
-  return { "/login/callback": { GET: (req) => handleLoginCallback(req, { complete }) } };
+function loginRoutes(
+  complete: CompleteLoginFn,
+  assistantName: string | undefined,
+): Record<string, { GET: (req: Request) => Promise<Response> }> {
+  return {
+    "/login/callback": {
+      GET: (req) => handleLoginCallback(req, { complete, ...(assistantName === undefined ? {} : { assistantName }) }),
+    },
+  };
 }
 
 /** A single read route: its `GET` handler plus the shared `OPTIONS` preflight. */
@@ -471,6 +483,8 @@ export type HttpServerDeps = TurnRequestDeps & {
   completeLogin?: CompleteLoginFn;
   /** Linking another account to the caller; `/link` is mounted only with it. */
   linking?: ChannelLinking;
+  /** What the pages people read call the assistant. */
+  assistantName?: string;
 };
 
 /** Starts the HTTP surface: `POST /turn` (4a) plus the read-only routes (4b)
@@ -502,7 +516,7 @@ export function startHttpServer(deps: HttpServerDeps): ReturnType<typeof Bun.ser
       },
       "/openapi.yaml": { GET: () => openApiResponse(origin), OPTIONS: () => preflight(origin) },
       ...(deps.reads ? readRoutes(deps.reads, deps.authenticate, origin, deps.admit) : {}),
-      ...(deps.completeLogin ? loginRoutes(deps.completeLogin) : {}),
+      ...(deps.completeLogin ? loginRoutes(deps.completeLogin, deps.assistantName) : {}),
       ...(deps.linking ? linkRoutes({ ...deps, start: deps.linking.start, corsOrigin: origin }) : {}),
     },
     error: (err) =>

package/index.ts

@@ -46,6 +46,7 @@ export const httpChannel: ChannelPlugin = {
       admit: ctx.admit,
       ...(ctx.linking === undefined ? {} : { linking: ctx.linking }),
       ...(resumeMaxChars === undefined ? {} : { resumeMaxChars }),
+      ...(ctx.assistantName === undefined ? {} : { assistantName: ctx.assistantName }),
       ...(logins ? { logins: { callbackUrl: `${publicUrl}/login/callback`, accept: logins.accept, complete: logins.complete } } : {}),
     });
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mercury-fw/channel-http",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -21,8 +21,8 @@
     "@mercury-fw/channel-types": ">=0.45.0 <1.0.0"
   },
   "devDependencies": {
-    "@mercury-fw/channel-types": "0.46.1",
-    "@mercury-fw/plugin-types": "0.46.1",
+    "@mercury-fw/channel-types": "0.48.0",
+    "@mercury-fw/plugin-types": "0.48.0",
     "@mercury-fw/typescript-config": "*",
     "@types/bun": "^1.4.2",
     "typescript": "^6.0.3"