@vellumai/assistant 0.6.2 → 0.6.4

package/src/oauth/seed-providers.ts

@@ -4,30 +4,37 @@ import { seedProviders } from "./oauth-store.js";
  * Protocol-level seed data for each well-known OAuth provider.
  *
  * These values are upserted into the `oauth_providers` SQLite table on
- * every startup. Only Vellum implementation fields (authUrl, tokenUrl,
- * tokenEndpointAuthMethod, userinfoUrl, extraParams,
- * pingUrl, pingMethod, pingHeaders, pingBody, managedServiceConfigKey,
+ * every startup. Only Vellum implementation fields (authorizeUrl, tokenExchangeUrl,
+ * refreshUrl, tokenEndpointAuthMethod, userinfoUrl, authorizeParams,
+ * pingUrl, pingMethod, pingHeaders, pingBody, revokeUrl, revokeBodyTemplate,
+ * managedServiceConfigKey,
  * loopbackPort, injectionTemplates, appType, setupNotes,
  * identityUrl, identityMethod, identityHeaders, identityBody,
- * identityResponsePaths, identityFormat, identityOkField, featureFlag)
- * and display metadata (displayName,
- * description, dashboardUrl, clientIdPlaceholder, requiresClientSecret)
+ * identityResponsePaths, identityFormat, identityOkField, featureFlag,
+ * scopeSeparator)
+ * and display metadata (displayLabel,
+ * description, dashboardUrl, clientIdPlaceholder, requiresClientSecret,
+ * logoUrl)
  * are overwritten on subsequent startups — user-customizable
  * fields (defaultScopes, scopePolicy) are only
  * written on initial insert and preserved across restarts.
  */
-const PROVIDER_SEED_DATA: Record<
+export const PROVIDER_SEED_DATA: Record<
   string,
   {
-    providerKey: string;
-    authUrl: string;
-    tokenUrl: string;
+    provider: string;
+    authorizeUrl: string;
+    tokenExchangeUrl: string;
+    refreshUrl?: string;
     tokenEndpointAuthMethod?: string;
+    tokenExchangeBodyFormat?: string;
     userinfoUrl?: string;
     pingUrl?: string;
     pingMethod?: string;
     pingHeaders?: Record<string, string>;
     pingBody?: unknown;
+    revokeUrl?: string;
+    revokeBodyTemplate?: Record<string, string>;
     baseUrl?: string;
     defaultScopes: string[];
     scopePolicy: {
@@ -35,9 +42,10 @@ const PROVIDER_SEED_DATA: Record<
       allowedOptionalScopes: string[];
       forbiddenScopes: string[];
     };
-    extraParams?: Record<string, string>;
+    scopeSeparator?: string;
+    authorizeParams?: Record<string, string>;
     managedServiceConfigKey?: string;
-    displayName: string;
+    displayLabel: string;
     description: string;
     dashboardUrl: string | null;
     clientIdPlaceholder: string | null;
@@ -59,23 +67,26 @@ const PROVIDER_SEED_DATA: Record<
     identityFormat?: string;
     identityOkField?: string;
     featureFlag?: string;
+    logoUrl?: string;
   }
 > = {
   google: {
-    providerKey: "google",
-    authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
-    tokenUrl: "https://oauth2.googleapis.com/token",
+    provider: "google",
+    authorizeUrl: "https://accounts.google.com/o/oauth2/v2/auth",
+    tokenExchangeUrl: "https://oauth2.googleapis.com/token",
     userinfoUrl: "https://www.googleapis.com/oauth2/v2/userinfo",
     pingUrl: "https://www.googleapis.com/oauth2/v2/userinfo",
     baseUrl: "https://gmail.googleapis.com/gmail/v1/users/me",
-    displayName: "Google",
+    displayLabel: "Google",
     description: "Gmail, Calendar, and Contacts",
     dashboardUrl: "https://console.cloud.google.com/apis/credentials",
     clientIdPlaceholder: "123456789.apps.googleusercontent.com",
+    logoUrl: "https://cdn.simpleicons.org/google",
     defaultScopes: [
       "https://www.googleapis.com/auth/gmail.readonly",
       "https://www.googleapis.com/auth/gmail.modify",
       "https://www.googleapis.com/auth/gmail.send",
+      "https://www.googleapis.com/auth/gmail.settings.basic",
       "https://www.googleapis.com/auth/calendar.readonly",
       "https://www.googleapis.com/auth/calendar.events",
       "https://www.googleapis.com/auth/userinfo.email",
@@ -89,7 +100,7 @@ const PROVIDER_SEED_DATA: Record<
       ],
       forbiddenScopes: [],
     },
-    extraParams: { access_type: "offline", prompt: "consent" },
+    authorizeParams: { access_type: "offline", prompt: "consent" },
     loopbackPort: 17321,
     managedServiceConfigKey: "google-oauth",
     injectionTemplates: [
@@ -112,22 +123,26 @@ const PROVIDER_SEED_DATA: Record<
         valuePrefix: "Bearer ",
       },
     ],
+    revokeUrl: "https://oauth2.googleapis.com/revoke",
+    revokeBodyTemplate: { token: "{access_token}" },
     appType: "Desktop app",
     identityUrl: "https://www.googleapis.com/oauth2/v2/userinfo",
     identityResponsePaths: ["email"],
   },
 
   slack: {
-    providerKey: "slack",
-    authUrl: "https://slack.com/oauth/v2/authorize",
-    tokenUrl: "https://slack.com/api/oauth.v2.access",
+    provider: "slack",
+    authorizeUrl: "https://slack.com/oauth/v2/authorize",
+    tokenExchangeUrl: "https://slack.com/api/oauth.v2.access",
     pingUrl: "https://slack.com/api/auth.test",
     baseUrl: "https://slack.com/api",
-    displayName: "Slack",
+    displayLabel: "Slack",
     description: "Workspace messaging",
     dashboardUrl: "https://api.slack.com/apps",
     clientIdPlaceholder: null,
+    logoUrl: "https://cdn.simpleicons.org/slack",
     defaultScopes: [
+      "channels:join",
       "channels:read",
       "channels:history",
       "groups:read",
@@ -147,7 +162,7 @@ const PROVIDER_SEED_DATA: Record<
       allowedOptionalScopes: [],
       forbiddenScopes: [],
     },
-    extraParams: {
+    authorizeParams: {
       user_scope:
         "channels:read,channels:history,groups:read,groups:history,im:read,im:history,im:write,mpim:read,mpim:history,users:read,chat:write,search:read,reactions:write",
     },
@@ -168,24 +183,27 @@ const PROVIDER_SEED_DATA: Record<
   },
 
   notion: {
-    providerKey: "notion",
-    authUrl: "https://api.notion.com/v1/oauth/authorize",
-    tokenUrl: "https://api.notion.com/v1/oauth/token",
+    provider: "notion",
+    authorizeUrl: "https://api.notion.com/v1/oauth/authorize",
+    tokenExchangeUrl: "https://api.notion.com/v1/oauth/token",
     pingUrl: "https://api.notion.com/v1/users/me",
     pingHeaders: { "Notion-Version": "2022-06-28" },
     baseUrl: "https://api.notion.com",
-    displayName: "Notion",
+    displayLabel: "Notion",
     description: "Pages and databases",
     dashboardUrl: "https://www.notion.so/my-integrations",
     clientIdPlaceholder: null,
+    logoUrl: "https://cdn.simpleicons.org/notion",
     defaultScopes: [],
     scopePolicy: {
       allowAdditionalScopes: false,
       allowedOptionalScopes: [],
       forbiddenScopes: [],
     },
-    extraParams: { owner: "user" },
+    authorizeParams: { owner: "user" },
     tokenEndpointAuthMethod: "client_secret_basic",
+    tokenExchangeBodyFormat: "json",
+    managedServiceConfigKey: "notion-oauth",
     loopbackPort: 17323,
     injectionTemplates: [
       {
@@ -202,15 +220,16 @@ const PROVIDER_SEED_DATA: Record<
   },
 
   twitter: {
-    providerKey: "twitter",
-    authUrl: "https://twitter.com/i/oauth2/authorize",
-    tokenUrl: "https://api.x.com/2/oauth2/token",
+    provider: "twitter",
+    authorizeUrl: "https://twitter.com/i/oauth2/authorize",
+    tokenExchangeUrl: "https://api.x.com/2/oauth2/token",
     pingUrl: "https://api.x.com/2/users/me",
     baseUrl: "https://api.x.com",
-    displayName: "Twitter",
+    displayLabel: "Twitter",
     description: "Posts and direct messages",
     dashboardUrl: "https://developer.twitter.com/en/portal/dashboard",
     clientIdPlaceholder: null,
+    logoUrl: "https://cdn.simpleicons.org/x",
     defaultScopes: [
       "tweet.read",
       "tweet.write",
@@ -224,6 +243,8 @@ const PROVIDER_SEED_DATA: Record<
     },
     tokenEndpointAuthMethod: "client_secret_basic",
     loopbackPort: 17335,
+    managedServiceConfigKey: "twitter-oauth",
+    featureFlag: "managed-x-oauth-integration",
     injectionTemplates: [
       {
         hostPattern: "api.x.com",
@@ -232,6 +253,12 @@ const PROVIDER_SEED_DATA: Record<
         valuePrefix: "Bearer ",
       },
     ],
+    revokeUrl: "https://api.x.com/2/oauth2/revoke",
+    revokeBodyTemplate: {
+      token: "{access_token}",
+      token_type_hint: "access_token",
+      client_id: "{client_id}",
+    },
     appType: "App",
     identityUrl: "https://api.x.com/2/users/me",
     identityResponsePaths: ["data.username"],
@@ -239,15 +266,16 @@ const PROVIDER_SEED_DATA: Record<
   },
 
   github: {
-    providerKey: "github",
-    authUrl: "https://github.com/login/oauth/authorize",
-    tokenUrl: "https://github.com/login/oauth/access_token",
+    provider: "github",
+    authorizeUrl: "https://github.com/login/oauth/authorize",
+    tokenExchangeUrl: "https://github.com/login/oauth/access_token",
     pingUrl: "https://api.github.com/user",
     baseUrl: "https://api.github.com",
-    displayName: "GitHub",
+    displayLabel: "GitHub",
     description: "Repositories and issues",
     dashboardUrl: "https://github.com/settings/developers",
     clientIdPlaceholder: null,
+    logoUrl: "https://cdn.simpleicons.org/github",
     defaultScopes: ["repo", "read:user", "notifications"],
     scopePolicy: {
       allowAdditionalScopes: true,
@@ -259,6 +287,7 @@ const PROVIDER_SEED_DATA: Record<
       ],
       forbiddenScopes: ["delete_repo", "admin:org"],
     },
+    managedServiceConfigKey: "github-oauth",
     loopbackPort: 17332,
     injectionTemplates: [
       {
@@ -275,25 +304,27 @@ const PROVIDER_SEED_DATA: Record<
   },
 
   linear: {
-    providerKey: "linear",
-    authUrl: "https://linear.app/oauth/authorize",
-    tokenUrl: "https://api.linear.app/oauth/token",
+    provider: "linear",
+    authorizeUrl: "https://linear.app/oauth/authorize",
+    tokenExchangeUrl: "https://api.linear.app/oauth/token",
     pingUrl: "https://api.linear.app/graphql",
     pingMethod: "POST",
     pingHeaders: { "Content-Type": "application/json" },
     pingBody: { query: "{ viewer { id name email } }" },
     baseUrl: "https://api.linear.app",
-    displayName: "Linear",
+    displayLabel: "Linear",
     description: "Issues and projects",
     dashboardUrl: "https://linear.app/settings/api",
     clientIdPlaceholder: null,
+    logoUrl: "https://cdn.simpleicons.org/linear",
     defaultScopes: ["read", "write", "issues:create"],
     scopePolicy: {
       allowAdditionalScopes: false,
       allowedOptionalScopes: [],
       forbiddenScopes: [],
     },
-    extraParams: { prompt: "consent" },
+    scopeSeparator: ",",
+    authorizeParams: { prompt: "consent" },
     loopbackPort: 17324,
     managedServiceConfigKey: "linear-oauth",
     injectionTemplates: [
@@ -304,6 +335,8 @@ const PROVIDER_SEED_DATA: Record<
         valuePrefix: "Bearer ",
       },
     ],
+    revokeUrl: "https://api.linear.app/oauth/revoke",
+    revokeBodyTemplate: { token: "{access_token}" },
     appType: "OAuth application",
     identityUrl: "https://api.linear.app/graphql",
     identityMethod: "POST",
@@ -313,15 +346,16 @@ const PROVIDER_SEED_DATA: Record<
   },
 
   spotify: {
-    providerKey: "spotify",
-    authUrl: "https://accounts.spotify.com/authorize",
-    tokenUrl: "https://accounts.spotify.com/api/token",
+    provider: "spotify",
+    authorizeUrl: "https://accounts.spotify.com/authorize",
+    tokenExchangeUrl: "https://accounts.spotify.com/api/token",
     pingUrl: "https://api.spotify.com/v1/me",
     baseUrl: "https://api.spotify.com/v1",
-    displayName: "Spotify",
+    displayLabel: "Spotify",
     description: "Music and playlists",
     dashboardUrl: "https://developer.spotify.com/dashboard",
     clientIdPlaceholder: null,
+    logoUrl: "https://cdn.simpleicons.org/spotify",
     defaultScopes: [
       "user-read-playback-state",
       "user-modify-playback-state",
@@ -354,15 +388,16 @@ const PROVIDER_SEED_DATA: Record<
   },
 
   todoist: {
-    providerKey: "todoist",
-    authUrl: "https://todoist.com/oauth/authorize",
-    tokenUrl: "https://todoist.com/oauth/access_token",
+    provider: "todoist",
+    authorizeUrl: "https://todoist.com/oauth/authorize",
+    tokenExchangeUrl: "https://todoist.com/oauth/access_token",
     pingUrl: "https://api.todoist.com/rest/v2/projects",
     baseUrl: "https://api.todoist.com/rest/v2",
-    displayName: "Todoist",
+    displayLabel: "Todoist",
     description: "Tasks and projects",
     dashboardUrl: "https://developer.todoist.com/appconsole.html",
     clientIdPlaceholder: null,
+    logoUrl: "https://cdn.simpleicons.org/todoist",
     defaultScopes: ["data:read_write"],
     scopePolicy: {
       allowAdditionalScopes: false,
@@ -387,15 +422,16 @@ const PROVIDER_SEED_DATA: Record<
   },
 
   discord: {
-    providerKey: "discord",
-    authUrl: "https://discord.com/oauth2/authorize",
-    tokenUrl: "https://discord.com/api/v10/oauth2/token",
+    provider: "discord",
+    authorizeUrl: "https://discord.com/oauth2/authorize",
+    tokenExchangeUrl: "https://discord.com/api/v10/oauth2/token",
     pingUrl: "https://discord.com/api/v10/users/@me",
     baseUrl: "https://discord.com/api/v10",
-    displayName: "Discord",
+    displayLabel: "Discord",
     description: "Servers and messages",
     dashboardUrl: "https://discord.com/developers/applications",
     clientIdPlaceholder: null,
+    logoUrl: "https://cdn.simpleicons.org/discord",
     defaultScopes: [
       "identify",
       "guilds",
@@ -422,16 +458,17 @@ const PROVIDER_SEED_DATA: Record<
   },
 
   dropbox: {
-    providerKey: "dropbox",
-    authUrl: "https://www.dropbox.com/oauth2/authorize",
-    tokenUrl: "https://api.dropboxapi.com/oauth2/token",
+    provider: "dropbox",
+    authorizeUrl: "https://www.dropbox.com/oauth2/authorize",
+    tokenExchangeUrl: "https://api.dropboxapi.com/oauth2/token",
     pingUrl: "https://api.dropboxapi.com/2/users/get_current_account",
     pingMethod: "POST",
     baseUrl: "https://api.dropboxapi.com/2",
-    displayName: "Dropbox",
+    displayLabel: "Dropbox",
     description: "Files and folders",
     dashboardUrl: "https://www.dropbox.com/developers/apps",
     clientIdPlaceholder: null,
+    logoUrl: "https://cdn.simpleicons.org/dropbox",
     defaultScopes: [
       "files.metadata.read",
       "files.content.read",
@@ -443,7 +480,7 @@ const PROVIDER_SEED_DATA: Record<
       allowedOptionalScopes: [],
       forbiddenScopes: [],
     },
-    extraParams: { token_access_type: "offline" },
+    authorizeParams: { token_access_type: "offline" },
     loopbackPort: 17327,
     injectionTemplates: [
       {
@@ -466,15 +503,16 @@ const PROVIDER_SEED_DATA: Record<
   },
 
   asana: {
-    providerKey: "asana",
-    authUrl: "https://app.asana.com/-/oauth_authorize",
-    tokenUrl: "https://app.asana.com/-/oauth_token",
+    provider: "asana",
+    authorizeUrl: "https://app.asana.com/-/oauth_authorize",
+    tokenExchangeUrl: "https://app.asana.com/-/oauth_token",
     pingUrl: "https://app.asana.com/api/1.0/users/me",
     baseUrl: "https://app.asana.com/api/1.0",
-    displayName: "Asana",
+    displayLabel: "Asana",
     description: "Tasks and projects",
     dashboardUrl: "https://app.asana.com/0/my-apps",
     clientIdPlaceholder: null,
+    logoUrl: "https://cdn.simpleicons.org/asana",
     defaultScopes: ["default"],
     scopePolicy: {
       allowAdditionalScopes: false,
@@ -496,15 +534,16 @@ const PROVIDER_SEED_DATA: Record<
   },
 
   airtable: {
-    providerKey: "airtable",
-    authUrl: "https://airtable.com/oauth2/v1/authorize",
-    tokenUrl: "https://airtable.com/oauth2/v1/token",
+    provider: "airtable",
+    authorizeUrl: "https://airtable.com/oauth2/v1/authorize",
+    tokenExchangeUrl: "https://airtable.com/oauth2/v1/token",
     pingUrl: "https://api.airtable.com/v0/meta/whoami",
     baseUrl: "https://api.airtable.com/v0",
-    displayName: "Airtable",
+    displayLabel: "Airtable",
     description: "Bases and records",
     dashboardUrl: "https://airtable.com/create/tokens",
     clientIdPlaceholder: null,
+    logoUrl: "https://cdn.simpleicons.org/airtable",
     defaultScopes: [
       "data.records:read",
       "data.records:write",
@@ -531,15 +570,16 @@ const PROVIDER_SEED_DATA: Record<
   },
 
   hubspot: {
-    providerKey: "hubspot",
-    authUrl: "https://app.hubspot.com/oauth/authorize",
-    tokenUrl: "https://api.hubapi.com/oauth/v1/token",
+    provider: "hubspot",
+    authorizeUrl: "https://app.hubspot.com/oauth/authorize",
+    tokenExchangeUrl: "https://api.hubapi.com/oauth/v1/token",
     pingUrl: "https://api.hubapi.com/crm/v3/objects/contacts?limit=1",
     baseUrl: "https://api.hubapi.com",
-    displayName: "HubSpot",
+    displayLabel: "HubSpot",
     description: "CRM contacts and deals",
     dashboardUrl: "https://developers.hubspot.com/",
     clientIdPlaceholder: null,
+    logoUrl: "https://cdn.simpleicons.org/hubspot",
     defaultScopes: [
       "crm.objects.contacts.read",
       "crm.objects.contacts.write",
@@ -570,15 +610,16 @@ const PROVIDER_SEED_DATA: Record<
   },
 
   figma: {
-    providerKey: "figma",
-    authUrl: "https://www.figma.com/oauth",
-    tokenUrl: "https://api.figma.com/v1/oauth/token",
+    provider: "figma",
+    authorizeUrl: "https://www.figma.com/oauth",
+    tokenExchangeUrl: "https://api.figma.com/v1/oauth/token",
     pingUrl: "https://api.figma.com/v1/me",
     baseUrl: "https://api.figma.com/v1",
-    displayName: "Figma",
+    displayLabel: "Figma",
     description: "Design files and comments",
     dashboardUrl: "https://www.figma.com/developers/apps",
     clientIdPlaceholder: null,
+    logoUrl: "https://cdn.simpleicons.org/figma",
     defaultScopes: ["files:read", "file_comments:write"],
     scopePolicy: {
       allowAdditionalScopes: false,
@@ -601,16 +642,19 @@ const PROVIDER_SEED_DATA: Record<
   },
 
   outlook: {
-    providerKey: "outlook",
-    authUrl: "https://login.microsoftonline.com/common/oauth2/v2.0/authorize",
-    tokenUrl: "https://login.microsoftonline.com/common/oauth2/v2.0/token",
+    provider: "outlook",
+    authorizeUrl:
+      "https://login.microsoftonline.com/common/oauth2/v2.0/authorize",
+    tokenExchangeUrl:
+      "https://login.microsoftonline.com/common/oauth2/v2.0/token",
     pingUrl: "https://graph.microsoft.com/v1.0/me",
     baseUrl: "https://graph.microsoft.com",
-    displayName: "Outlook / Microsoft",
+    displayLabel: "Outlook / Microsoft",
     description: "Email and calendar",
     dashboardUrl:
       "https://portal.azure.com/#blade/Microsoft_AAD_RegisteredApps/ApplicationsListBlade",
     clientIdPlaceholder: "Application (client) ID from Azure portal",
+    logoUrl: "https://cdn.simpleicons.org/microsoftoutlook",
     defaultScopes: [
       "openid",
       "profile",
@@ -628,7 +672,7 @@ const PROVIDER_SEED_DATA: Record<
       allowedOptionalScopes: ["Contacts.Read", "Files.Read", "Tasks.ReadWrite"],
       forbiddenScopes: [],
     },
-    extraParams: { prompt: "consent" },
+    authorizeParams: { prompt: "consent" },
     tokenEndpointAuthMethod: "client_secret_post",
     loopbackPort: 17334,
     managedServiceConfigKey: "outlook-oauth",
@@ -647,18 +691,19 @@ const PROVIDER_SEED_DATA: Record<
 
   // Manual-token providers: these don't use OAuth2 flows but need provider
   // rows so that oauth_app and oauth_connection FK chains can reference them.
-  // The authUrl/tokenUrl values are placeholders — never used at runtime.
+  // The authorizeUrl/tokenExchangeUrl values are placeholders — never used at runtime.
   slack_channel: {
-    providerKey: "slack_channel",
-    authUrl: "urn:manual-token",
-    tokenUrl: "urn:manual-token",
+    provider: "slack_channel",
+    authorizeUrl: "urn:manual-token",
+    tokenExchangeUrl: "urn:manual-token",
     pingUrl: "https://slack.com/api/auth.test",
     baseUrl: "https://slack.com/api",
-    displayName: "Slack Channel",
+    displayLabel: "Slack Channel",
     description: "Channel bot token",
     dashboardUrl: null,
     clientIdPlaceholder: null,
     requiresClientSecret: false,
+    logoUrl: "https://cdn.simpleicons.org/slack",
     defaultScopes: [],
     scopePolicy: {
       allowAdditionalScopes: false,
@@ -668,15 +713,16 @@ const PROVIDER_SEED_DATA: Record<
   },
 
   telegram: {
-    providerKey: "telegram",
-    authUrl: "urn:manual-token",
-    tokenUrl: "urn:manual-token",
+    provider: "telegram",
+    authorizeUrl: "urn:manual-token",
+    tokenExchangeUrl: "urn:manual-token",
     baseUrl: "https://api.telegram.org",
-    displayName: "Telegram",
+    displayLabel: "Telegram",
     description: "Bot messaging",
     dashboardUrl: null,
     clientIdPlaceholder: null,
     requiresClientSecret: false,
+    logoUrl: "https://cdn.simpleicons.org/telegram",
     defaultScopes: [],
     scopePolicy: {
       allowAdditionalScopes: false,

package/src/oauth/token-persistence.ts

@@ -188,7 +188,7 @@ export async function storeOAuth2Tokens(
   } else {
     const conn = createConnection({
       oauthAppId: app.id,
-      providerKey: service,
+      provider: service,
       accountInfo: resolvedAccountInfo,
       grantedScopes,
       expiresAt: expiresAt ?? undefined,

package/src/permissions/checker.ts

@@ -20,7 +20,11 @@ import {
   looksLikePathOnlyInput,
 } from "../tools/network/url-safety.js";
 import { getTool } from "../tools/registry.js";
-import { getDeprecatedDir, getWorkspaceHooksDir } from "../util/platform.js";
+import {
+  getDeprecatedDir,
+  getProtectedDir,
+  getWorkspaceHooksDir,
+} from "../util/platform.js";
 import {
   buildShellAllowlistOptions,
   buildShellCommandCandidates,
@@ -962,11 +966,17 @@ function isActorTokenSigningKeyPath(
   if (!filePath) return false;
   const cwd = workingDir ?? process.cwd();
   const resolvedPath = resolve(cwd, filePath);
-  const signingKeyPaths = [
-    join(homedir(), ".vellum", "protected", "actor-token-signing-key"),
-    join(getDeprecatedDir(), "actor-token-signing-key"),
-    resolve(cwd, "deprecated", "actor-token-signing-key"),
-  ];
+  // Include both the per-instance protected dir AND the legacy global
+  // ~/.vellum/protected path so upgraded machines with a host-wide signing
+  // key still classify reads as High risk.
+  const signingKeyPaths = Array.from(
+    new Set([
+      join(homedir(), ".vellum", "protected", "actor-token-signing-key"),
+      join(getProtectedDir(), "actor-token-signing-key"),
+      join(getDeprecatedDir(), "actor-token-signing-key"),
+      resolve(cwd, "deprecated", "actor-token-signing-key"),
+    ]),
+  );
   return signingKeyPaths.includes(resolvedPath);
 }