@vellumai/assistant 0.8.5 → 0.8.7-dev.202606052118.34cd356

package/src/runtime/routes/migration-routes.ts

@@ -38,12 +38,10 @@ import {
   upsertCredentialMetadata,
 } from "../../tools/credentials/metadata-store.js";
 import { getLogger } from "../../util/logger.js";
-import {
-  getWorkspaceDir,
-  getWorkspaceHooksDir,
-} from "../../util/platform.js";
+import { getWorkspaceDir, getWorkspaceHooksDir } from "../../util/platform.js";
 import { APP_VERSION } from "../../version.js";
 import { DAEMON_INTERNAL_ASSISTANT_ID } from "../assistant-scope.js";
+import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import {
   validateGcsSignedUrl,
   type ValidateGcsSignedUrlOptions,
@@ -358,11 +356,19 @@ export async function handleMigrationExport(
       checkpoint: async () => {
         // Dispatch through `runAsyncSqlite` so the WAL checkpoint runs
         // in a sqlite3 subprocess on hosts where it's available. A WAL
-        // truncate on a multi-GB WAL file can otherwise stall the
-        // daemon's event loop for the full duration of the flush.
-        const result = await runAsyncSqlite(
-          "PRAGMA wal_checkpoint(TRUNCATE)",
-        );
+        // flush on a multi-GB WAL file can otherwise stall the daemon's
+        // event loop for the full duration of the flush.
+        //
+        // FULL (not TRUNCATE): TRUNCATE has a side effect where, if the
+        // WAL is empty after the checkpoint, SQLite unlinks the WAL file
+        // from the directory. When the daemon's in-process connection
+        // still holds the original WAL fd, the unlink orphans that fd
+        // into a "ghost WAL" only the daemon can reach, and subsequent
+        // connections create a fresh WAL on disk — split-brain. FULL
+        // gives us the same flush-completion guarantee without the
+        // unlink side effect. See assistant/AGENTS.md "SQLite WAL
+        // checkpointing".
+        const result = await runAsyncSqlite("PRAGMA wal_checkpoint(FULL)");
         if (!result.ok) {
           // Best-effort: if the DB can't be checkpointed (e.g. not a valid
           // SQLite file, missing WAL, etc.) we still proceed with the export
@@ -583,11 +589,13 @@ export async function handleMigrationExportToGcs({ body }: RouteHandlerArgs) {
           checkpoint: async () => {
             // Dispatch through `runAsyncSqlite` so the WAL checkpoint runs
             // in a sqlite3 subprocess on hosts where it's available. A
-            // WAL truncate on a multi-GB WAL file can otherwise stall the
+            // WAL flush on a multi-GB WAL file can otherwise stall the
             // daemon's event loop for the full duration of the flush.
-            const result = await runAsyncSqlite(
-              "PRAGMA wal_checkpoint(TRUNCATE)",
-            );
+            //
+            // FULL (not TRUNCATE): see the disk-export checkpoint above
+            // for rationale. assistant/AGENTS.md "SQLite WAL
+            // checkpointing".
+            const result = await runAsyncSqlite("PRAGMA wal_checkpoint(FULL)");
             if (!result.ok) {
               log.warn(
                 { error: result.error, backend: result.backend },
@@ -1845,6 +1853,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "migrations_validate_post",
     endpoint: "migrations/validate",
     method: "POST",
+    policy: {
+      requiredScopes: ["settings.read"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Validate a .vbundle archive",
     description:
       "Upload a .vbundle archive for validation. Accepts raw binary or multipart form data.",
@@ -1860,6 +1872,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "migrations_export_post",
     endpoint: "migrations/export",
     method: "POST",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Export a .vbundle archive",
     description:
       "Generate and download a .vbundle archive of the assistant's data. Optional JSON body for metadata.",
@@ -1873,6 +1889,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "migrations_importpreflight_post",
     endpoint: "migrations/import-preflight",
     method: "POST",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Dry-run import analysis",
     description:
       "Validate a .vbundle archive and return a report of what would change on import without modifying data.",
@@ -1890,6 +1910,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "migrations_import_post",
     endpoint: "migrations/import",
     method: "POST",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Import a .vbundle archive",
     description:
       "Commit a .vbundle archive import to disk — destructive. Accepts the bundle as raw bytes (application/octet-stream), multipart/form-data, or a JSON body with `{ url }` carrying a signed URL the daemon fetches.",
@@ -1920,6 +1944,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "migrations_exporttogcs_post",
     endpoint: "migrations/export-to-gcs",
     method: "POST",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Start an async export streamed to a GCS signed URL",
     description:
       "Kick off a background export job that PUTs a freshly-built .vbundle archive to the supplied GCS signed URL. Returns 202 with a job_id the caller can poll via the job-status endpoint. Fails fast with 409 if another export job is already pending or running.",
@@ -1946,6 +1974,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "migrations_importfromgcs_post",
     endpoint: "migrations/import-from-gcs",
     method: "POST",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Start an async .vbundle import from a signed GCS URL",
     description:
       "Schedule a background import job that fetches the bundle at `bundle_url` and streams it through the importer. Returns 202 with a `job_id`; poll `GET /v1/migrations/jobs/{job_id}` for status. 409 if another import is already in flight.",
@@ -1970,6 +2002,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "migrations_jobs_by_job_id_get",
     endpoint: "migrations/jobs/:job_id",
     method: "GET",
+    policy: {
+      requiredScopes: ["settings.read"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Get migration job status",
     description:
       "Return the current status of an async migration job (export or import). The response discriminates on `status`: `processing` (pending or running), `complete` (with `result`), or `failed` (with `error`, `error_code`, optional `upstream_status`).",

package/src/runtime/routes/notification-routes.ts

@@ -8,10 +8,12 @@ import { z } from "zod";
 import { getDb } from "../../memory/db-connection.js";
 import { notificationDeliveries } from "../../memory/schema.js";
 import { bufferIfDeferred } from "../../notifications/deferred-emit.js";
+import { editNotification } from "../../notifications/edit-notification.js";
 import { emitNotificationSignal } from "../../notifications/emit-signal.js";
 import { listEvents } from "../../notifications/events-store.js";
 import type { AttentionHints } from "../../notifications/signal.js";
-import { BadRequestError } from "./errors.js";
+import { ACTOR_PRINCIPALS, LOCAL_PRINCIPALS } from "../auth/route-policy.js";
+import { BadRequestError, NotFoundError } from "./errors.js";
 import type { RouteDefinition, RouteHandlerArgs } from "./types.js";
 
 function handleNotificationIntentResult({ body = {} }: RouteHandlerArgs) {
@@ -89,6 +91,26 @@ const ListNotificationEventsParams = z.object({
   sourceEventName: z.string().optional(),
 });
 
+const EditNotificationParams = z
+  .object({
+    id: z.string().min(1).describe("Feed item id (notif:<uuid>) or bare uuid"),
+    title: z.string().optional(),
+    body: z.string().optional(),
+    urgency: z.enum(["low", "medium", "high", "critical"]).optional(),
+    status: z.enum(["new", "seen", "acted_on", "dismissed"]).optional(),
+  })
+  .refine(
+    (v) =>
+      v.title !== undefined ||
+      v.body !== undefined ||
+      v.urgency !== undefined ||
+      v.status !== undefined,
+    {
+      message:
+        "At least one of `title`, `body`, `urgency`, or `status` must be supplied",
+    },
+  );
+
 // ── Notification pipeline handlers ───────────────────────────────────
 
 async function handleEmitSignal({ body = {} }: RouteHandlerArgs) {
@@ -125,6 +147,19 @@ async function handleEmitSignal({ body = {} }: RouteHandlerArgs) {
   };
 }
 
+async function handleEditNotification({ body = {} }: RouteHandlerArgs) {
+  const validated = EditNotificationParams.parse(body);
+  const result = await editNotification(validated);
+  if (!result) {
+    throw new NotFoundError(`No notification found for id ${validated.id}`);
+  }
+  return {
+    ok: true,
+    feedItem: result.feedItem,
+    channels: result.channels,
+  };
+}
+
 function handleListEvents({ body = {} }: RouteHandlerArgs) {
   const validated = ListNotificationEventsParams.parse(body);
   const rows = listEvents({
@@ -162,6 +197,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "emit_notification_signal",
     endpoint: "notifications/emit",
     method: "POST",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: LOCAL_PRINCIPALS,
+    },
     handler: handleEmitSignal,
     summary: "Emit a notification signal",
     description:
@@ -175,10 +214,46 @@ export const ROUTES: RouteDefinition[] = [
       reason: z.string(),
     }),
   },
+  {
+    operationId: "edit_notification",
+    endpoint: "notifications/edit",
+    method: "POST",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: LOCAL_PRINCIPALS,
+    },
+    handler: handleEditNotification,
+    summary: "Edit an already-sent notification",
+    description:
+      "Patch the home-feed entry for a notification and, where supported (Slack today), update the delivered message in place.",
+    tags: ["notifications"],
+    requestBody: EditNotificationParams,
+    responseBody: z.object({
+      ok: z.boolean(),
+      feedItem: z.record(z.string(), z.unknown()),
+      channels: z.array(
+        z.object({
+          channel: z.string(),
+          deliveryId: z.string(),
+          outcome: z.enum(["updated", "unsupported", "skipped", "failed"]),
+          reason: z.string().optional(),
+        }),
+      ),
+    }),
+    additionalResponses: {
+      "404": {
+        description: "No notification found for the supplied id",
+      },
+    },
+  },
   {
     operationId: "list_notification_events",
     endpoint: "notifications/events",
     method: "POST",
+    policy: {
+      requiredScopes: ["settings.read"],
+      allowedPrincipalTypes: LOCAL_PRINCIPALS,
+    },
     handler: handleListEvents,
     summary: "List notification events",
     description:
@@ -201,11 +276,14 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "notificationintentresult_post",
     endpoint: "notification-intent-result",
     method: "POST",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Report notification delivery result",
     description:
       "Client acknowledgment for local notification delivery outcome.",
     tags: ["notifications"],
-    requirePolicyEnforcement: true,
     handler: handleNotificationIntentResult,
     requestBody: z.object({
       deliveryId: z.string().describe("Notification delivery ID"),

package/src/runtime/routes/oauth-apps.ts

@@ -6,6 +6,8 @@
  * bearer-token authenticated via the standard runtime auth middleware.
  */
 
+import { z } from "zod";
+
 import { orchestrateOAuthConnect } from "../../oauth/connect-orchestrator.js";
 import {
   deleteApp,
@@ -21,11 +23,9 @@ import {
   upsertApp,
 } from "../../oauth/oauth-store.js";
 import { serializeProviderSummary } from "../../oauth/provider-serializer.js";
-import {
-  BadRequestError,
-  InternalError,
-  NotFoundError,
-} from "./errors.js";
+import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
+import { BadRequestError, InternalError, NotFoundError } from "./errors.js";
+import { oauthProviderSummarySchema } from "./oauth-providers.js";
 import type { RouteDefinition, RouteHandlerArgs } from "./types.js";
 
 function parseGrantedScopes(
@@ -130,17 +130,14 @@ async function handleUpsertApp({ body = {} }: RouteHandlerArgs) {
   const clientId = b.client_id as string | undefined;
 
   if (!providerKey || !clientId) {
-    throw new BadRequestError(
-      "provider_key and client_id are required",
-    );
+    throw new BadRequestError("provider_key and client_id are required");
   }
 
   const clientSecretOpts = b.client_secret
     ? { clientSecretValue: b.client_secret as string }
     : b.client_secret_credential_path
       ? {
-          clientSecretCredentialPath:
-            b.client_secret_credential_path as string,
+          clientSecretCredentialPath: b.client_secret_credential_path as string,
         }
       : undefined;
 
@@ -296,6 +293,38 @@ async function handleConnectApp({ pathParams = {}, body }: RouteHandlerArgs) {
   return { ok: true };
 }
 
+// ---------------------------------------------------------------------------
+// Schemas
+// ---------------------------------------------------------------------------
+
+/** Custom OAuth app registration (snake_case wire shape from `formatAppRow`). */
+const oauthAppSchema = z.object({
+  id: z.string(),
+  provider_key: z.string(),
+  client_id: z.string(),
+  created_at: z.number(),
+  updated_at: z.number(),
+});
+
+/** OAuth connection linked to a custom OAuth app. */
+const oauthAppConnectionSchema = z.object({
+  id: z.string(),
+  provider_key: z.string(),
+  account_info: z.string().nullable(),
+  granted_scopes: z.array(z.string()),
+  status: z.string(),
+  has_refresh_token: z.boolean(),
+  expires_at: z.number().nullable(),
+  created_at: z.number(),
+  updated_at: z.number(),
+});
+
+const oauthAppCredentialsSchema = z.object({
+  provider_key: z.string(),
+  client_id: z.string(),
+  client_secret: z.string(),
+});
+
 // ---------------------------------------------------------------------------
 // Route definitions
 // ---------------------------------------------------------------------------
@@ -305,10 +334,13 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "oauth_apps_get",
     endpoint: "oauth/apps",
     method: "GET",
+    policy: {
+      requiredScopes: ["settings.read"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "List OAuth apps",
     description: "List OAuth apps filtered by provider_key.",
     tags: ["oauth"],
-    requirePolicyEnforcement: true,
     queryParams: [
       {
         name: "provider_key",
@@ -317,17 +349,24 @@ export const ROUTES: RouteDefinition[] = [
         description: "OAuth provider key to filter by",
       },
     ],
+    responseBody: z.object({
+      provider: oauthProviderSummarySchema.nullable(),
+      apps: z.array(oauthAppSchema),
+    }),
     handler: handleListApps,
   },
   {
     operationId: "oauth_apps_by_query_get",
     endpoint: "oauth/apps/lookup",
     method: "GET",
+    policy: {
+      requiredScopes: ["settings.read"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Get OAuth app",
     description:
       "Look up a single OAuth app by ID, provider + client_id, or provider (most recent).",
     tags: ["oauth"],
-    requirePolicyEnforcement: true,
     queryParams: [
       {
         name: "id",
@@ -345,29 +384,43 @@ export const ROUTES: RouteDefinition[] = [
         description: "OAuth client ID (requires provider)",
       },
     ],
+    responseBody: z.object({ app: oauthAppSchema }),
     handler: handleGetApp,
   },
   {
     operationId: "oauth_apps_upsert",
     endpoint: "oauth/apps/upsert",
     method: "POST",
-    policyKey: "oauth/apps.upsert",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Upsert OAuth app",
     description:
       "Create or return an existing OAuth app registration. Updates client secret if provided.",
     tags: ["oauth"],
-    requirePolicyEnforcement: true,
+    requestBody: z.object({
+      provider_key: z.string(),
+      client_id: z.string(),
+      client_secret: z.string().optional(),
+      client_secret_credential_path: z.string().optional(),
+    }),
+    responseBody: z.object({ app: oauthAppSchema }),
     handler: handleUpsertApp,
   },
   {
     operationId: "oauth_apps_post",
     endpoint: "oauth/apps",
     method: "POST",
-    policyKey: "oauth/apps.create",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Create OAuth app",
     description: "Register a new OAuth app with client credentials.",
     tags: ["oauth"],
-    requirePolicyEnforcement: true,
+    requestBody: oauthAppCredentialsSchema,
+    responseBody: z.object({ app: oauthAppSchema }),
     responseStatus: "201",
     handler: handleCreateApp,
   },
@@ -375,42 +428,65 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "oauth_apps_delete",
     endpoint: "oauth/apps/:id",
     method: "DELETE",
-    policyKey: "oauth/apps.delete",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Delete OAuth app",
-    description:
-      "Delete an OAuth app and disconnect all its connections.",
+    description: "Delete an OAuth app and disconnect all its connections.",
     tags: ["oauth"],
-    requirePolicyEnforcement: true,
+    responseBody: z.object({ ok: z.boolean() }),
     handler: handleDeleteApp,
   },
   {
     operationId: "oauth_apps_connections_get",
     endpoint: "oauth/apps/:appId/connections",
     method: "GET",
+    policy: {
+      requiredScopes: ["settings.read"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "List OAuth connections",
     description: "List connections for an OAuth app.",
     tags: ["oauth"],
-    requirePolicyEnforcement: true,
+    responseBody: z.object({
+      connections: z.array(oauthAppConnectionSchema),
+    }),
     handler: handleListConnections,
   },
   {
     operationId: "oauth_connections_delete",
     endpoint: "oauth/connections/:id",
     method: "DELETE",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Disconnect OAuth connection",
     description: "Disconnect a single OAuth connection.",
     tags: ["oauth"],
-    requirePolicyEnforcement: true,
+    responseBody: z.object({ ok: z.boolean() }),
     handler: handleDeleteConnection,
   },
   {
     operationId: "oauth_apps_connect_post",
     endpoint: "oauth/apps/:appId/connect",
     method: "POST",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Start OAuth connect",
     description: "Start an OAuth connect flow for an app.",
     tags: ["oauth"],
-    requirePolicyEnforcement: true,
+    requestBody: z.object({
+      scopes: z.array(z.string()).optional(),
+      callback_transport: z.enum(["loopback", "gateway"]).optional(),
+    }),
+    responseBody: z.union([
+      z.object({ auth_url: z.string(), state: z.string() }),
+      z.object({ ok: z.literal(true) }),
+    ]),
     handler: handleConnectApp,
   },
 ];

package/src/runtime/routes/oauth-commands-routes.ts

@@ -23,6 +23,7 @@ import {
   resolveOAuthConnection,
   type ResolveOAuthConnectionOptions,
 } from "../../oauth/connection-resolver.js";
+import { syncManualTokenConnection } from "../../oauth/manual-token-connection.js";
 import {
   disconnectOAuthProvider,
   getActiveConnection,
@@ -37,6 +38,7 @@ import { VellumPlatformClient } from "../../platform/client.js";
 import { withValidToken } from "../../security/token-manager.js";
 import { matchHostPattern } from "../../tools/credentials/host-pattern-match.js";
 import { getLogger } from "../../util/logger.js";
+import { LOCAL_PRINCIPALS } from "../auth/route-policy.js";
 import { BadRequestError, InternalError, NotFoundError } from "./errors.js";
 import type { RouteDefinition, RouteHandlerArgs } from "./types.js";
 
@@ -516,6 +518,10 @@ async function handleStatus({ queryParams = {} }: RouteHandlerArgs) {
   }
 
   // BYO path
+  if (providerRow.authorizeUrl === "urn:manual-token") {
+    await syncManualTokenConnection(provider);
+  }
+
   const allConnections = listConnections(provider);
   const activeRows = allConnections.filter((r) => r.status === "active");
 
@@ -914,7 +920,7 @@ async function handleManagedConnect({ body = {} }: RouteHandlerArgs) {
     reqBody.requested_scopes = b.scopes;
   }
   reqBody.redirect_after_connect =
-    b.redirect_after_connect ?? "/account/oauth/desktop-complete";
+    b.redirect_after_connect ?? "/account/oauth/complete";
 
   const response = await client.fetch(startPath, {
     method: "POST",
@@ -972,23 +978,28 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "oauth_disconnect",
     endpoint: "oauth/disconnect",
     method: "POST",
-    policyKey: "oauth/disconnect",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: LOCAL_PRINCIPALS,
+    },
     summary: "Disconnect OAuth provider",
     description:
       "Disconnect an OAuth provider and remove associated credentials (BYO or managed).",
     tags: ["oauth"],
-    requirePolicyEnforcement: true,
     handler: handleDisconnect,
   },
   {
     operationId: "oauth_mode_get",
     endpoint: "oauth/mode",
     method: "GET",
+    policy: {
+      requiredScopes: ["settings.read"],
+      allowedPrincipalTypes: LOCAL_PRINCIPALS,
+    },
     summary: "Get OAuth mode",
     description:
       "Get the current OAuth mode (managed or your-own) for a provider.",
     tags: ["oauth"],
-    requirePolicyEnforcement: true,
     queryParams: [
       {
         name: "provider",
@@ -1003,22 +1014,27 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "oauth_mode_set",
     endpoint: "oauth/mode",
     method: "POST",
-    policyKey: "oauth/mode.set",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: LOCAL_PRINCIPALS,
+    },
     summary: "Set OAuth mode",
     description: "Set the OAuth mode (managed or your-own) for a provider.",
     tags: ["oauth"],
-    requirePolicyEnforcement: true,
     handler: handleModeSet,
   },
   {
     operationId: "oauth_status",
     endpoint: "oauth/status",
     method: "GET",
+    policy: {
+      requiredScopes: ["settings.read"],
+      allowedPrincipalTypes: LOCAL_PRINCIPALS,
+    },
     summary: "Get OAuth status",
     description:
       "Show OAuth connection status for a specified provider (BYO or managed).",
     tags: ["oauth"],
-    requirePolicyEnforcement: true,
     queryParams: [
       {
         name: "provider",
@@ -1033,57 +1049,69 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "oauth_ping",
     endpoint: "oauth/ping",
     method: "POST",
+    policy: {
+      requiredScopes: ["settings.read"],
+      allowedPrincipalTypes: LOCAL_PRINCIPALS,
+    },
     summary: "Ping OAuth provider",
     description:
       "Verify an OAuth token is valid by hitting the provider's configured health-check endpoint.",
     tags: ["oauth"],
-    requirePolicyEnforcement: true,
     handler: handlePing,
   },
   {
     operationId: "oauth_token",
     endpoint: "oauth/token",
     method: "POST",
-    policyKey: "oauth/token",
+    policy: {
+      requiredScopes: ["settings.read"],
+      allowedPrincipalTypes: LOCAL_PRINCIPALS,
+    },
     summary: "Get OAuth token",
     description: "Retrieve a valid OAuth access token for a BYO-mode provider.",
     tags: ["oauth"],
-    requirePolicyEnforcement: true,
     handler: handleToken,
   },
   {
     operationId: "oauth_request",
     endpoint: "oauth/request",
     method: "POST",
-    policyKey: "oauth/request",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: LOCAL_PRINCIPALS,
+    },
     summary: "Make authenticated OAuth request",
     description:
       "Make an authenticated HTTP request through an OAuth connection (supports curl-like interface).",
     tags: ["oauth"],
-    requirePolicyEnforcement: true,
     handler: handleRequest,
   },
   {
     operationId: "oauth_managed_connect_start",
     endpoint: "oauth/managed-connect/start",
     method: "POST",
-    policyKey: "oauth/managed-connect.start",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: LOCAL_PRINCIPALS,
+    },
     summary: "Start managed OAuth connect",
     description:
       "Start a managed (platform) OAuth connect flow and return the connect URL.",
     tags: ["oauth"],
-    requirePolicyEnforcement: true,
     handler: handleManagedConnect,
   },
   {
     operationId: "oauth_managed_connect_poll",
     endpoint: "oauth/managed-connect/poll",
     method: "GET",
+    policy: {
+      requiredScopes: ["settings.read"],
+      allowedPrincipalTypes: LOCAL_PRINCIPALS,
+    },
     summary: "Poll managed OAuth connections",
     description:
       "Fetch active platform connections for a provider (used to detect new connections after managed connect).",
     tags: ["oauth"],
-    requirePolicyEnforcement: true,
     queryParams: [
       {
         name: "provider",