@frockbot/cloudflare 0.7.294 → 0.7.296

package/deployment-config/README.md

@@ -121,9 +121,13 @@ the local Worker, and every generated config overrides it from the profile.
 
 Some fields keep a placeholder rather than nothing: wrangler's validator refuses a `services` entry with no target and a `vectorize` entry with no index even in a config it never deploys, so the app Worker's two services and its Vectorize binding, and the admin portal's one service, all say `named-by-deployment-config`. Nothing reads those values — `wrangler dev --env development` and the `e2e` harness resolve their own environments, and the generator writes the deployment's own names. A bucket or database name is left out entirely, because wrangler does not ask for one.
 
-`adminEmails` is in the schema and in no generated config. It is the
-`FROCKBOT_ADMIN_EMAILS` secret the installer sets; the hosted deployment already
-carries it as a repository secret, which is why `hosted.json` omits it.
+`adminEmails` and `adminUserIds` are in the schema and in no generated config.
+They are the `FROCKBOT_ADMIN_EMAILS` and `FROCKBOT_ADMIN_USER_IDS` secrets the
+installer sets; the hosted deployment already carries the first as a repository
+secret, which is why `hosted.json` omits it. An email makes an admin only once
+the auth Package's provider verified it, so a deployment whose people have no
+email names its admins by User id; `frockbot-deployment-config secrets` carries
+`FROCKBOT_ADMIN_USER_IDS` like any other optional secret.
 
 ## Brand
 

package/deployment-config/profile-schema.generated.ts

@@ -181,13 +181,23 @@ export const DEPLOYMENT_PROFILE_SCHEMA_V1 = {
     },
     adminEmails: {
       description:
-        "The deployment's admins: they bypass admission, and a debug Turn may act as one of them. The debug surface itself is gated on `DEBUG_TOKEN`. The installer sets it as the Worker secret `FROCKBOT_ADMIN_EMAILS`; no generated config carries it, which is why the hosted profile leaves it to the repository secret it already has.",
+        "The deployment's admins: they bypass admission, and a debug Turn may act as one of them. The debug surface itself is gated on `DEBUG_TOKEN`. Only a verified email counts. The installer sets it as the Worker secret `FROCKBOT_ADMIN_EMAILS`; no generated config carries it, which is why the hosted profile leaves it to the repository secret it already has.",
       type: "array",
       minItems: 1,
       items: {
         $ref: "#/$defs/email",
       },
     },
+    adminUserIds: {
+      description:
+        "Admins by User id, beside `adminEmails`, for a deployment whose people have no verified email: an id here is an admin exactly as a verified email on `adminEmails` is. The installer sets it as the Worker secret `FROCKBOT_ADMIN_USER_IDS`; no generated config carries it.",
+      type: "array",
+      minItems: 1,
+      items: {
+        type: "string",
+        pattern: "^[^,\\s]+$",
+      },
+    },
     d1DatabaseId: {
       description:
         "The `AUTH_DB` database. Required by the `better-auth` Package unless the deploy supplies it with `--d1-database-id`, which is how a disposable stage names a database it creates in the same job.",

package/deployment-config/profile.schema.json

@@ -164,13 +164,22 @@
       }
     },
     "adminEmails": {
-      "description": "The deployment's admins: they bypass admission, and a debug Turn may act as one of them. The debug surface itself is gated on `DEBUG_TOKEN`. The installer sets it as the Worker secret `FROCKBOT_ADMIN_EMAILS`; no generated config carries it, which is why the hosted profile leaves it to the repository secret it already has.",
+      "description": "The deployment's admins: they bypass admission, and a debug Turn may act as one of them. The debug surface itself is gated on `DEBUG_TOKEN`. Only a verified email counts. The installer sets it as the Worker secret `FROCKBOT_ADMIN_EMAILS`; no generated config carries it, which is why the hosted profile leaves it to the repository secret it already has.",
       "type": "array",
       "minItems": 1,
       "items": {
         "$ref": "#/$defs/email"
       }
     },
+    "adminUserIds": {
+      "description": "Admins by User id, beside `adminEmails`, for a deployment whose people have no verified email: an id here is an admin exactly as a verified email on `adminEmails` is. The installer sets it as the Worker secret `FROCKBOT_ADMIN_USER_IDS`; no generated config carries it.",
+      "type": "array",
+      "minItems": 1,
+      "items": {
+        "type": "string",
+        "pattern": "^[^,\\s]+$"
+      }
+    },
     "d1DatabaseId": {
       "description": "The `AUTH_DB` database. Required by the `better-auth` Package unless the deploy supplies it with `--d1-database-id`, which is how a disposable stage names a database it creates in the same job.",
       "type": "string",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frockbot/cloudflare",
-  "version": "0.7.294",
+  "version": "0.7.296",
   "private": false,
   "license": "MIT",
   "type": "module",
@@ -23,12 +23,12 @@
     "typecheck": "tsc --noEmit -p tsconfig.json && tsc --noEmit -p tsconfig.access.json && tsc --noEmit -p test/tsconfig.json && tsc --noEmit -p e2e/tsconfig.json"
   },
   "dependencies": {
-    "@frockbot/app": "0.7.294",
-    "@frockbot/applets": "0.7.294",
-    "@frockbot/computer": "0.7.294",
-    "@frockbot/core": "0.7.294",
-    "@frockbot/frock-compose": "0.7.294",
-    "@frockbot/providers": "0.7.294",
+    "@frockbot/app": "0.7.296",
+    "@frockbot/applets": "0.7.296",
+    "@frockbot/computer": "0.7.296",
+    "@frockbot/core": "0.7.296",
+    "@frockbot/frock-compose": "0.7.296",
+    "@frockbot/providers": "0.7.296",
     "@rive-app/flutter-native-wasm": "44.0.0",
     "agents": "0.24.0",
     "ai": "^7.0.107",

package/src/admin-identities.ts

@@ -13,14 +13,38 @@ export interface GatewayIdentityV1 {
   mode: "better-auth" | "development";
 }
 
+/**
+ * The deployment's administrators by User id, as `FROCKBOT_ADMIN_USER_IDS`
+ * spells them: comma-separated and trimmed. A User id is opaque, so it is
+ * compared exactly. It is how a deployment whose people have no email names
+ * an admin.
+ */
+export function adminUserIdsV1(value: string | undefined): ReadonlySet<string> {
+  return new Set(
+    (value ?? "")
+      .split(",")
+      .map((id) => id.trim())
+      .filter((id) => id.length > 0),
+  );
+}
+
+/** The two allowlists, as the deployment's secrets carry them. */
+export interface DeploymentAdminsV1 {
+  emails?: string;
+  userIds?: string;
+}
+
 export function isDeploymentAdminV1(
   identity: GatewayIdentityV1,
-  configuredEmails: string | undefined,
+  configured: DeploymentAdminsV1,
 ): boolean {
   if (identity.mode === "development" && identity.id === DEVELOPMENT_USER_ID) {
     return true;
   }
-  const emails = adminEmailsV1(configuredEmails);
+  const userIds = adminUserIdsV1(configured.userIds);
+  // A development id is whatever `?as_user=` said, so only a signed-in one counts.
+  if (identity.mode === "better-auth" && userIds.has(identity.id)) return true;
+  const emails = adminEmailsV1(configured.emails);
   if (
     identity.emailVerified === true &&
     identity.email &&
@@ -28,5 +52,7 @@ export function isDeploymentAdminV1(
   ) {
     return true;
   }
-  return identity.mode === "development" && emails.size === 0;
+  return (
+    identity.mode === "development" && emails.size === 0 && userIds.size === 0
+  );
 }

package/src/bot-state.ts

@@ -231,6 +231,7 @@ import {
   type ClientRunLookupQueryV1,
   type ClientRunStopCommandV1,
 } from "@frockbot/app/shell/run-protocol";
+import { decodeWorkLogQueryV1 } from "@frockbot/app/shell/work-log";
 import {
   decodeBotUnreadCommandV1,
   type BotUnreadCommandV1,
@@ -3806,6 +3807,22 @@ export class BotState
     return shell.listRuns(request.query as ClientRunListQueryV1);
   }
 
+  /** The Work log: a page of this Bot's Turns, every step of each. */
+  async workLog(input: unknown) {
+    const request = decodeRpcEnvelopeV1(input, {
+      userId: rpcIdentifier,
+      botId: rpcBotId,
+      query: rpcDecoded(decodeWorkLogQueryV1),
+    });
+    const identity = {
+      userId: request.userId as string,
+      botId: request.botId as string,
+    };
+    const { shell } = await this.materialized(identity);
+    await shell.validateIdentity(identity);
+    return shell.workLog(request.query);
+  }
+
   /**
    * The operator snapshot behind `/api/debug`. Bot-scoped like every other
    * Bot RPC — the debug token authorizes the *caller*, it does not widen what

package/src/contracts.ts

@@ -20,6 +20,7 @@ import type {
   SettingsFrame,
   ConnectionsFrame,
   SettingsChangeCommand,
+  WorkLogPage,
 } from "@frockbot/core/protocol-schemas";
 import {
   type AuthPackageV1,
@@ -28,6 +29,7 @@ import {
   type SessionEvent,
 } from "@frockbot/core/contracts";
 import type { MachineResultDeliveryV1 } from "@frockbot/app/machine/delivery";
+import type { WorkLogQueryV1 } from "@frockbot/app/shell/work-log";
 import type { DebugGatewaySurface } from "./debug.js";
 import type { BotTurnCommandRequestV1 } from "./durable-rpc.js";
 import type {
@@ -275,6 +277,12 @@ export interface UserBotStateBinding {
     botId: string;
     query: ClientRunListQueryV1;
   }): Promise<ClientRunListV1>;
+  /** Everything the Bot did, a page of Turns at a time. */
+  workLog(input: {
+    schemaVersion: 1;
+    botId: string;
+    query: WorkLogQueryV1;
+  }): Promise<WorkLogPage>;
   lookupRun(input: {
     schemaVersion: 1;
     botId: string;
@@ -785,8 +793,9 @@ export interface GatewayDependencies {
   admitAccount(
     identity: AdmissionIdentityV1,
   ): Promise<AccountAdmissionDecisionV1>;
-  /** Raw deployment secret; only the derived `isAdmin` boolean reaches clients. */
+  /** Raw deployment secrets; only the derived `isAdmin` boolean reaches clients. */
   adminEmails?: string;
+  adminUserIds?: string;
   applicationHashFor(userId: string): Promise<string>;
   botStateFor(userId: string): UserBotStateBinding;
   userConfigurationFor(userId: string): UserConfigurationBinding;

package/src/gateway.ts

@@ -435,7 +435,10 @@ async function identifyRequest(
         emailVerified: session?.user.emailVerified === true,
         mode: development.userId ? "development" : "better-auth",
       },
-      dependencies.adminEmails,
+      {
+        emails: dependencies.adminEmails,
+        userIds: dependencies.adminUserIds,
+      },
     );
   // Every authenticated request asks, so pausing an account takes effect on
   // its next request rather than at its next sign-in. An admin is never

package/src/index.ts

@@ -59,6 +59,11 @@ import {
   type ClientRunStopCommandV1,
   type ClientRunStopReceiptV1,
 } from "@frockbot/app/shell/run-protocol";
+import {
+  decodeWorkLogQueryV1,
+  type WorkLogQueryV1,
+} from "@frockbot/app/shell/work-log";
+import type { WorkLogPage } from "@frockbot/core/protocol-schemas";
 import {
   decodeBotNotificationDirectoryViewV1,
   decodeBotUnreadDirectoryViewV1,
@@ -163,6 +168,7 @@ import {
 import {
   DEVELOPMENT_USER_ID,
   isDeploymentAdminV1,
+  type DeploymentAdminsV1,
 } from "./admin-identities.js";
 import type { DebugGatewaySurface } from "./debug.js";
 import type { BotDebugQueryV1 } from "@frockbot/app/shell/debug-protocol";
@@ -369,6 +375,8 @@ interface Env {
   MACHINE_TOKEN_SECRET?: string;
   ALLOW_DEVELOPMENT_AUTH?: string;
   FROCKBOT_ADMIN_EMAILS?: string;
+  /** Admins by User id, for a deployment whose people have no email. */
+  FROCKBOT_ADMIN_USER_IDS?: string;
   ALLOWED_CLIENT_ORIGINS?: string;
   /** Authorizes `/api/debug/*`. Absent disables the surface entirely. */
   DEBUG_TOKEN?: string;
@@ -432,7 +440,7 @@ function debugSurface(env: Env): DebugGatewaySurface {
       (await getAgentByName(env.VOICE_ASSISTANTS, userId)).debugSnapshot(),
     isAdminUser: async (userId) => {
       // The auth Package's store is the durable identity source. The path's
-      // User id is never trusted on its own: it must resolve to a stored email,
+      // User id is never trusted on its own: it must resolve to a stored identity,
       // and that identity is evaluated by the same allowlist policy as the
       // signed-in gateway. A Package that stores nothing resolves nothing, so
       // the one write on this surface is refused rather than granted on the
@@ -447,7 +455,7 @@ function debugSurface(env: Env): DebugGatewaySurface {
             emailVerified: identity.emailVerified,
             mode: "better-auth",
           },
-          env.FROCKBOT_ADMIN_EMAILS,
+          deploymentAdmins(env),
         )
       );
     },
@@ -501,6 +509,7 @@ interface BotStateRpc extends BotConfigurationBinding {
     command: BotTurnCommandRequestV1<OwnedBotTurnCommand>,
   ): Promise<{ schemaVersion: 1; runId: string }>;
   listRuns(query: ClientRunListQueryV1): Promise<ClientRunListV1>;
+  workLog(query: WorkLogQueryV1): Promise<WorkLogPage>;
   debugSnapshot(query: BotDebugQueryV1): Promise<unknown>;
   lookupRun(query: ClientRunLookupQueryV1): Promise<ClientRunLookupV1>;
   runQuestions(query: ClientRunLookupQueryV1): Promise<ClientRunQuestionsV1>;
@@ -688,6 +697,7 @@ function botStateStub(env: Env, userId: string, botId: string): BotStateRpc {
     admitRun: (command) => rpc.admitRun(botTurnRpcV1(command)),
     listRuns: (query) =>
       rpc.listRuns({ schemaVersion: 1, userId, botId, query }),
+    workLog: (query) => rpc.workLog({ schemaVersion: 1, userId, botId, query }),
     debugSnapshot: (query) =>
       rpc.debugSnapshot({ schemaVersion: 1, userId, botId, query }),
     lookupRun: (query) =>
@@ -841,6 +851,13 @@ async function admitAccount(
   );
 }
 
+function deploymentAdmins(env: Env): DeploymentAdminsV1 {
+  return {
+    emails: env.FROCKBOT_ADMIN_EMAILS,
+    userIds: env.FROCKBOT_ADMIN_USER_IDS,
+  };
+}
+
 async function storedAdmissionIdentity(
   env: Env,
   userId: string,
@@ -860,7 +877,7 @@ async function storedAdmissionIdentity(
         emailVerified: identity.emailVerified,
         mode: "better-auth",
       },
-      env.FROCKBOT_ADMIN_EMAILS,
+      deploymentAdmins(env),
     ),
   };
 }
@@ -930,7 +947,8 @@ async function mayCreateIdentity(
         emailVerified: candidate.emailVerified,
         mode: "better-auth",
       },
-      env.FROCKBOT_ADMIN_EMAILS,
+      // No User exists yet, so only the email list can name one.
+      { emails: env.FROCKBOT_ADMIN_EMAILS },
     )
   ) {
     return true;
@@ -1285,6 +1303,18 @@ export class UserBotState extends WorkerEntrypoint<Env, UserScopedProps> {
     ).listRuns(request.query as ClientRunListQueryV1);
   }
 
+  async workLog(input: unknown): Promise<WorkLogPage> {
+    const request = decodeRpcEnvelopeV1(input, {
+      botId: rpcBotId,
+      query: rpcDecoded(decodeWorkLogQueryV1),
+    });
+    return botStateStub(
+      this.env,
+      this.ctx.props.userId,
+      request.botId as string,
+    ).workLog(request.query as WorkLogQueryV1);
+  }
+
   async lookupRun(input: unknown): Promise<ClientRunLookupV1> {
     const request = decodeUserBotRunLookupRpcV1(input);
     return botStateStub(
@@ -2754,6 +2784,9 @@ export default {
           ...(env.FROCKBOT_ADMIN_EMAILS
             ? { adminEmails: env.FROCKBOT_ADMIN_EMAILS }
             : {}),
+          ...(env.FROCKBOT_ADMIN_USER_IDS
+            ? { adminUserIds: env.FROCKBOT_ADMIN_USER_IDS }
+            : {}),
           applicationHashFor: async () => env.DEFAULT_APPLICATION_HASH,
           botStateFor: (userId) =>
             runtimeExports.UserBotState({ props: { userId } }),

package/src/production-secrets.ts

@@ -221,6 +221,12 @@ export const OPTIONAL_PRODUCTION_SECRETS_V1: readonly OptionalProductionSecretV1
       degraded:
         "nobody can administer beta access, so admission stays closed and only accounts already granted access can sign in",
     },
+    {
+      name: "FROCKBOT_ADMIN_USER_IDS",
+      why: "Admins by User id, beside `FROCKBOT_ADMIN_EMAILS`, for a deployment whose people have no verified email.",
+      degraded:
+        "only a verified email on `FROCKBOT_ADMIN_EMAILS` makes an admin",
+    },
     {
       name: "DEBUG_TOKEN",
       why: "Authorizes the read-only `/api/debug` operator surface.",

package/src/user-application.ts

@@ -29,6 +29,10 @@ import {
   type ClientTurnRefusalV1,
 } from "@frockbot/app/shell/run-protocol";
 import { decodeApprovalDecisionCommandV1 } from "@frockbot/app/shell/approvals";
+import {
+  decodeWorkLogQueryV1,
+  type WorkLogQueryV1,
+} from "@frockbot/app/shell/work-log";
 import {
   decodeSecretSubmitCommandV1,
   isSecretRequestIdV1,
@@ -726,6 +730,7 @@ function createUserApplicationRoute() {
     }
 
     const skillsMatch = url.pathname.match(/^\/api\/bots\/([^/]+)\/skills$/);
+    const workLogMatch = url.pathname.match(/^\/api\/bots\/([^/]+)\/work-log$/);
     const workspaceFileMatch = url.pathname.match(
       /^\/api\/bots\/([^/]+)\/workspace\/file$/,
     );
@@ -744,6 +749,7 @@ function createUserApplicationRoute() {
     );
     if (
       !skillsMatch &&
+      !workLogMatch &&
       !workspaceFileMatch &&
       !turnMatch &&
       !lookupMatch &&
@@ -757,6 +763,7 @@ function createUserApplicationRoute() {
     try {
       const matched =
         skillsMatch ??
+        workLogMatch ??
         workspaceFileMatch ??
         turnMatch ??
         lookupMatch ??
@@ -776,7 +783,7 @@ function createUserApplicationRoute() {
       env,
       botId,
       request.method === "GET" &&
-        Boolean(turnMatch || lookupMatch || questionsMatch),
+        Boolean(turnMatch || lookupMatch || questionsMatch || workLogMatch),
     );
     if (missingBot) return missingBot;
     // An installed client older than protocol 3 refuses a Run it does not
@@ -800,6 +807,37 @@ function createUserApplicationRoute() {
       }
     }
 
+    if (workLogMatch) {
+      if (request.method !== "GET") return jsonError(405, "method not allowed");
+      let query: WorkLogQueryV1;
+      try {
+        const keys = [...url.searchParams.keys()];
+        if (
+          keys.some((key) => key !== "before") ||
+          url.searchParams.getAll("before").length > 1
+        ) {
+          throw new Error("work log query is invalid");
+        }
+        const before = url.searchParams.get("before");
+        query = decodeWorkLogQueryV1({
+          schemaVersion: 1,
+          ...(before === null ? {} : { before }),
+        });
+      } catch (error) {
+        return jsonError(
+          400,
+          error instanceof Error ? error.message : "invalid work log page",
+        );
+      }
+      try {
+        return Response.json(
+          await env.BOT_STATE.workLog({ schemaVersion: 1, botId, query }),
+        );
+      } catch (error) {
+        return botFailure(error, "work log failed");
+      }
+    }
+
     if (workspaceFileMatch) {
       // Read-only, and the durable root and path arrive as one encoded
       // `WorkspacePathV1` so the route cannot assemble a root the decoder