@yalehwang/cloudpit 2.0.0 → 3.0.0

package/dist-server/server/modules/websocket/tests/chat-stop-task.test.js

@@ -538,16 +538,26 @@ test('the per-run runtime places stopTask on the live instance and does not end
     const tempDirectory = await mkdtemp(path.join(os.tmpdir(), 'chat-stop-task-per-run-'));
     const savedHome = process.env.HOME;
     const savedConfigDir = process.env.CLAUDE_CONFIG_DIR;
+    const savedDatabasePath = process.env.DATABASE_PATH;
     const savedFactory = claudeQueryFactory.current;
     const fixture = createPerRunFixture();
     try {
+        // The run's wind-down reads its session row through the notifications path,
+        // so this leg needs a migrated database of its own: the ambient one may
+        // predate the latest added column, and a run must not depend on that.
+        closeConnection();
+        process.env.DATABASE_PATH = path.join(tempDirectory, 'auth.db');
         process.env.HOME = tempDirectory;
         process.env.CLAUDE_CONFIG_DIR = tempDirectory;
+        await initializeDatabase();
+        // A real user row, so the run's own wind-down can read its notification
+        // preferences without an FK failure (the SQLite foreign key is on user_id).
+        const user = userDb.createUser('stop-task-per-run', 'unused-hash');
         claudeQueryFactory.current = (() => fixture.factory());
         const appSessionId = PER_RUN_SESSION_ID;
         // The run is driven for real and left pending: its query's stream never ends,
         // which is what keeps the session registered in `activeSessions`.
-        void queryClaudeSDK('hold', { sessionId: appSessionId }, createWriter(), {
+        void queryClaudeSDK('hold', { sessionId: appSessionId }, { send: () => undefined, setSessionId: () => undefined, userId: Number(user.id) }, {
             resolveProviderSessionId: () => null,
             resolveResumeModel: async () => undefined,
             getProviderModels: async () => CLAUDE_PREDEFINED_MODELS,
@@ -581,6 +591,13 @@ test('the per-run runtime places stopTask on the live instance and does not end
         if (getActiveClaudeSDKSessions().includes(PER_RUN_SESSION_ID)) {
             await abortClaudeSDKSession(PER_RUN_SESSION_ID);
         }
+        if (savedDatabasePath === undefined) {
+            delete process.env.DATABASE_PATH;
+        }
+        else {
+            process.env.DATABASE_PATH = savedDatabasePath;
+        }
+        closeConnection();
         await rm(tempDirectory, { recursive: true, force: true });
     }
 });

package/dist-server/server/modules/websocket/tests/chat-stop-task.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"chat-stop-task.test.js","sourceRoot":"","sources":["../../../../../server/modules/websocket/tests/chat-stop-task.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chat-stop-task.test.js","sourceRoot":"","sources":["../../../../../server/modules/websocket/tests/chat-stop-task.test.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/worktrees/services/worktree-list.service.js

@@ -50,7 +50,7 @@ async function readLastCommit(worktreePath, runGit) {
 /**
  * Builds the full Worktrees panel payload for the repository containing
  * `projectPath`: every worktree with dirty count, ahead/behind vs the base
- * branch, last commit info, and the linked CloudCLI project (when registered).
+ * branch, last commit info, and the linked Cloudpit project (when registered).
  */
 export async function listWorktrees(input, dependencies) {
     const { runGit, getProjectByPath } = dependencies;

package/dist-server/server/modules/worktrees/services/worktree-open.service.js

@@ -13,7 +13,7 @@ function mapRowToProjectView(row) {
     };
 }
 /**
- * Ensures a CloudCLI project exists (and is active) for a worktree directory
+ * Ensures a Cloudpit project exists (and is active) for a worktree directory
  * and returns it, so the caller can switch the UI into that worktree.
  *
  * The path is only accepted when it is a registered worktree of the repository

package/dist-server/server/modules/worktrees/services/worktree-remove.service.js

@@ -2,7 +2,7 @@ import { AppError } from '../../../shared/utils.js';
 import { countChangedFiles, findWorktreeEntryByPath, listWorktreePorcelainEntries, } from '../../../modules/worktrees/services/worktree-git.service.js';
 /**
  * Removes a linked worktree (never the main one), optionally deletes its
- * branch, and archives the CloudCLI project registered for the directory so it
+ * branch, and archives the Cloudpit project registered for the directory so it
  * disappears from the sidebar while its chat history stays recoverable.
  */
 export async function removeWorktree(input, dependencies) {

package/dist-server/server/shared/brand.js

@@ -1,20 +1,27 @@
 /**
- * Brand-owned environment variables, read under the new Cloudpit names with a
- * fallback to the legacy CloudCLI names.
+ * Brand-owned environment variables, read under the Cloudpit spelling only.
  *
- * This module is deliberately unwired: GOAL-053 builds the reader so a later
- * task can point the CLI, database, settings and Electron paths at it without
- * changing any default in this change. Because no production module imports it
- * yet, the only consumer is `tests/cloudpit-brand-env.test.ts`.
+ * v3.0 RETIREMENT. Up to 2.x this reader also accepted the legacy `CLOUDCLI_<NAME>`
+ * spelling and emitted one deprecation warning per legacy key. The runtime fallback is
+ * gone: a process that exports only `CLOUDCLI_<NAME>` reads as absent, so the caller's
+ * shipped default applies. Setting the legacy name is not an error and produces no
+ * warning — it is simply not consulted.
+ *
+ * There is no `warn` dependency any more: every reading is either the canonical key's
+ * value or absent, so the reader has nothing to report. Callers that still pass a
+ * warning sink would be compiling against the retired API, hence the narrower shape.
+ *
+ * The production wiring points (Electron main/localServer/serverInstaller, the
+ * browser-use service and its MCP entry) all read through this module, and
+ * `electron/brandEnv.js` carries the same semantics for the Electron runtime.
  */
 /**
  * Build a brand environment reader.
  *
- * The warned-key set lives in this factory's closure, not at module scope: the
- * state belongs to the reader instance, and two readers never share it.
+ * The reader holds no state: the canonical spelling either supplies a non-empty value
+ * or the reading is absent. A legacy `CLOUDCLI_<NAME>` is never consulted.
  */
-export function createBrandEnvReader({ env, warn }) {
-    const warnedLegacyKeys = new Set();
+export function createBrandEnvReader({ env }) {
     return {
         read(name) {
             const canonicalKey = `CLOUDPIT_${name}`;
@@ -22,16 +29,7 @@ export function createBrandEnvReader({ env, warn }) {
             if (canonical !== undefined && canonical !== '') {
                 return { value: canonical, source: 'new', key: canonicalKey };
             }
-            const legacyKey = `CLOUDCLI_${name}`;
-            const legacy = env[legacyKey];
-            if (legacy === undefined || legacy === '') {
-                return { value: undefined, source: 'absent', key: canonicalKey };
-            }
-            if (!warnedLegacyKeys.has(legacyKey)) {
-                warnedLegacyKeys.add(legacyKey);
-                warn(`${legacyKey} is deprecated; set ${canonicalKey} instead.`);
-            }
-            return { value: legacy, source: 'legacy', key: legacyKey };
+            return { value: undefined, source: 'absent', key: canonicalKey };
         },
     };
 }

package/dist-server/server/shared/brand.js.map

@@ -1 +1 @@
-{"version":3,"file":"brand.js","sourceRoot":"","sources":["../../../server/shared/brand.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAwCH;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAAC,EAAE,GAAG,EAAE,IAAI,EAAsB;IACpE,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE3C,OAAO;QACL,IAAI,CAAC,IAAI;YACP,MAAM,YAAY,GAAG,YAAY,IAAI,EAAE,CAAC;YACxC,MAAM,SAAS,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC;YACpC,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,EAAE,EAAE,CAAC;gBAChD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC;YAChE,CAAC;YAED,MAAM,SAAS,GAAG,YAAY,IAAI,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC;YAC9B,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;gBAC1C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC;YACnE,CAAC;YAED,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBACrC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBAChC,IAAI,CAAC,GAAG,SAAS,uBAAuB,YAAY,WAAW,CAAC,CAAC;YACnE,CAAC;YACD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;QAC7D,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"brand.js","sourceRoot":"","sources":["../../../server/shared/brand.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AA+BH;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAAC,EAAE,GAAG,EAAsB;IAC9D,OAAO;QACL,IAAI,CAAC,IAAI;YACP,MAAM,YAAY,GAAG,YAAY,IAAI,EAAE,CAAC;YACxC,MAAM,SAAS,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC;YACpC,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,EAAE,EAAE,CAAC;gBAChD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC;YAChE,CAAC;YACD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC;QACnE,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist-server/server/shared/data-root-migration.js

@@ -1,5 +1,5 @@
 /**
- * Copies a legacy CloudCLI data root into an explicitly requested Cloudpit data
+ * Copies a legacy Cloudpit data root into an explicitly requested Cloudpit data
  * root.
  *
  * WHY THIS FINISHES BEFORE THE MARKER. A half-copied data root must never read
@@ -7,7 +7,8 @@
  * presence is the single fact that means "every earlier step succeeded". The
  * legacy root is only ever read — it is never renamed, unlinked, checkpointed
  * or written to, so a failed attempt (including an occupied SQLite database)
- * leaves it exactly as it was and the caller can fall back to it.
+ * leaves it exactly as it was. v3.0 does NOT fall back to it at runtime: the
+ * caller reports the thrown failure instead.
  *
  * ROLLBACK ON FAILURE. Every file and directory this module creates is recorded
  * before it is written and removed in reverse order when any step throws. The

package/dist-server/server/shared/data-root-migration.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-root-migration.js","sourceRoot":"","sources":["../../../server/shared/data-root-migration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data-root-migration.js","sourceRoot":"","sources":["../../../server/shared/data-root-migration.ts"],"names":[],"mappings":"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"}

package/dist-server/server/shared/data-root.js

@@ -1,19 +1,23 @@
 /**
  * Resolve where the server's data lives, and migrate a legacy layout when the
- * caller asks for the Cloudpit default (or names an explicit root).
+ * Cloudpit default (or an explicit root) is selected.
  *
- * TWO DEFAULT MODES. `defaultRoot: 'legacy'` (the default when the option is
- * omitted) keeps the historical behaviour: with neither `CLOUDPIT_HOME` nor
- * `CLOUDCLI_HOME` set, the active root stays `<home>/.cloudcli` and nothing is
- * copied or created. `defaultRoot: 'cloudpit'` is what the server bootstrap now
- * asks for: with no explicit environment root it selects `<home>/.cloudpit`,
- * copies the legacy layout into it once, and falls back to the legacy root when
- * the copy fails. An explicitly requested root always takes the migration path.
+ * v3.0 RETIREMENT. Up to 2.x the resolver had two default modes: `defaultRoot:
+ * 'legacy'` kept the historical `~/.cloudcli` layout, and any migration failure
+ * fell back to that layout so the server always kept running. Both runtime
+ * compatibilities are gone:
  *
- * The legacy root is only ever read: a failed attempt is rolled back by
- * `data-root-migration.ts` and the fallback keeps the server running on the old
- * layout. Callers that must not migrate keep passing `'legacy'` (AC-449's
- * criterion does exactly that).
+ *  - there is ONE default root, `<home>/.cloudpit`, selected when neither
+ *    `CLOUDPIT_HOME` nor an explicit caller root is set;
+ *  - the one-time migration still runs when a legacy `~/.cloudcli` layout exists
+ *    (a machine upgrading straight from 1.x is copied into `~/.cloudpit`), but a
+ *    failed migration is REPORTED, never silently swallowed by reverting to the
+ *    old root. `resolveDataRoots` returns `reason: 'migration-failed'` and a
+ *    `migrationError` message; the caller logs it and keeps the Cloudpit root.
+ *
+ * The legacy root is only ever READ: `data-root-migration.ts` rolls back every
+ * file it created, so a failed attempt leaves `~/.cloudcli` byte-identical and
+ * never deletes it. An explicitly requested root always takes the migration path.
  */
 import os from 'node:os';
 import path from 'node:path';
@@ -56,19 +60,30 @@ function expandTildePrefix(value, homeDir) {
         return path.join(homeDir, value.slice(2));
     return value;
 }
-/** The first non-empty explicit-root environment value, with `~` expanded. */
+/**
+ * Format a migration failure without importing `shared/utils.ts`: that module
+ * reads environment defaults during evaluation, before `load-env.ts` has loaded
+ * `.env`, which is exactly the ordering this bootstrap module must not disturb.
+ */
+function describeFailure(failure) {
+    return failure instanceof Error ? failure.message : String(failure);
+}
+/**
+ * The explicit-root environment value, with `~` expanded.
+ *
+ * v3.0: only `CLOUDPIT_HOME` is consulted. The legacy `CLOUDCLI_HOME` spelling no
+ * longer selects a root, so a process exporting only that name migrates into the
+ * default `~/.cloudpit` instead of writing to the old location.
+ */
 function readExplicitRoot(env, homeDir) {
-    // SPEC §4.1: the Cloudpit spelling wins, the legacy spelling is the fallback.
-    for (const variableName of ['CLOUDPIT_HOME', 'CLOUDCLI_HOME']) {
-        const rawValue = env[variableName];
-        if (typeof rawValue === 'string' && rawValue.trim() !== '') {
-            return expandTildePrefix(rawValue.trim(), homeDir);
-        }
+    const rawValue = env.CLOUDPIT_HOME;
+    if (typeof rawValue === 'string' && rawValue.trim() !== '') {
+        return expandTildePrefix(rawValue.trim(), homeDir);
     }
     return null;
 }
 /** Build the full path set for one active root and settings file. */
-function buildResolvedRoots(activeRoot, settingsPath, legacySettingsPath, reason, migrated) {
+function buildResolvedRoots(activeRoot, settingsPath, legacySettingsPath, reason, migrated, migrationError = null) {
     return {
         activeRoot,
         authDatabasePath: path.join(activeRoot, 'auth.db'),
@@ -79,6 +94,7 @@ function buildResolvedRoots(activeRoot, settingsPath, legacySettingsPath, reason
         legacySettingsPath,
         reason,
         migrated,
+        migrationError,
     };
 }
 /** Map the migration module's outcome onto this module's public reasons. */
@@ -108,52 +124,31 @@ function defaultReason(outcome) {
     }
 }
 /**
- * Resolve the active data root and, for an explicit root or the Cloudpit
- * default, migrate the legacy layout into it when it is safe to do so.
+ * Resolve the active data root and migrate the legacy layout into it when it is
+ * safe to do so.
  *
- * The settings location follows the mode, not the data root: the legacy default
- * and every fallback arm keep `<home>/.config/claudecodeui/server.settings.json`,
- * while explicit-root and Cloudpit-default arms use
- * `<home>/.config/cloudpit/server.settings.json`.
+ * The active root is `CLOUDPIT_HOME` when it names one, else `<home>/.cloudpit`.
+ * The settings location is always `<home>/.config/cloudpit/server.settings.json`
+ * (the legacy settings file is only a migration source).
+ *
+ * A failed migration does not change the active root: the resolver returns
+ * `reason: 'migration-failed'` with the thrown message in `migrationError`. The
+ * legacy root is left byte-identical by the migration module's rollback.
  */
 export function resolveDataRoots(options = {}) {
     const env = options.env ?? process.env;
     const homeDir = options.homeDir ?? os.homedir();
-    const mode = options.defaultRoot ?? 'legacy';
     const legacyRoot = path.join(homeDir, LEGACY_ROOT_DIRECTORY_NAME);
     const legacySettingsPath = path.join(homeDir, CONFIG_DIRECTORY_NAME, LEGACY_CONFIG_DIRECTORY_NAME, SETTINGS_FILE_NAME);
     const explicitSettingsPath = path.join(homeDir, CONFIG_DIRECTORY_NAME, EXPLICIT_CONFIG_DIRECTORY_NAME, SETTINGS_FILE_NAME);
     const requestedRoot = readExplicitRoot(env, homeDir);
-    if (requestedRoot === null) {
-        if (mode === 'legacy') {
-            return buildResolvedRoots(legacyRoot, legacySettingsPath, legacySettingsPath, 'default-legacy', false);
-        }
-        // The Cloudpit default: migrate into `<home>/.cloudpit` exactly as an
-        // explicitly requested root would, with reasons that name this mode.
-        const cloudpitRoot = path.join(homeDir, CLOUDPIT_ROOT_DIRECTORY_NAME);
-        try {
-            const outcome = migrateLegacyDataRoot({
-                legacyRoot,
-                newRoot: cloudpitRoot,
-                legacySettingsPath,
-                newSettingsPath: explicitSettingsPath,
-                version: options.version ?? 'unknown',
-                fs: options.fs,
-                backupDatabase: options.backupDatabase,
-                now: options.now,
-            });
-            return buildResolvedRoots(cloudpitRoot, explicitSettingsPath, legacySettingsPath, defaultReason(outcome), outcome.migrated);
-        }
-        catch {
-            // The migration module rolled back everything it created; the legacy root
-            // was only ever read, so keeping it active is the safe outcome.
-            return buildResolvedRoots(legacyRoot, legacySettingsPath, legacySettingsPath, 'fallback-after-failure', false);
-        }
-    }
+    const explicit = requestedRoot !== null;
+    const activeRoot = requestedRoot ?? path.join(homeDir, CLOUDPIT_ROOT_DIRECTORY_NAME);
+    const reasonOf = explicit ? explicitReason : defaultReason;
     try {
         const outcome = migrateLegacyDataRoot({
             legacyRoot,
-            newRoot: requestedRoot,
+            newRoot: activeRoot,
             legacySettingsPath,
             newSettingsPath: explicitSettingsPath,
             version: options.version ?? 'unknown',
@@ -161,12 +156,12 @@ export function resolveDataRoots(options = {}) {
             backupDatabase: options.backupDatabase,
             now: options.now,
         });
-        return buildResolvedRoots(requestedRoot, explicitSettingsPath, legacySettingsPath, explicitReason(outcome), outcome.migrated);
+        return buildResolvedRoots(activeRoot, explicitSettingsPath, legacySettingsPath, reasonOf(outcome), outcome.migrated);
     }
-    catch {
-        // The migration module has already rolled back everything it created; the
-        // legacy root was only ever read, so it is safe to keep using.
-        return buildResolvedRoots(legacyRoot, legacySettingsPath, legacySettingsPath, 'fallback-after-failure', false);
+    catch (failure) {
+        // v3.0: no fallback to the legacy root. The migration module rolled back every
+        // file it created, so the Cloudpit root is clean; the caller sees the failure.
+        return buildResolvedRoots(activeRoot, explicitSettingsPath, legacySettingsPath, 'migration-failed', false, describeFailure(failure));
     }
 }
 //# sourceMappingURL=data-root.js.map

package/dist-server/server/shared/data-root.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-root.js","sourceRoot":"","sources":["../../../server/shared/data-root.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data-root.js","sourceRoot":"","sources":["../../../server/shared/data-root.ts"],"names":[],"mappings":"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"}

package/dist-server/server/shared/mcp-contract/types.js

@@ -10,9 +10,13 @@
  */
 // --------------------------- the authorization vocabulary ---------------------------
 /**
- * The complete vocabulary of scopes a personal access token may be issued with,
- * per mcp-gateway-SPEC. `cloudcli:admin` is deliberately absent: it is reserved
- * and cannot be minted.
+ * The CANONICAL scope names: the stable internal vocabulary every stored grant,
+ * tool `requiredScope` and principal comparison uses. Since 3.0 it is no longer
+ * the wire vocabulary — a client issues `cloudpit:*` (see
+ * {@link CLOUDPIT_ACCESS_TOKEN_SCOPES} and {@link ACCEPTED_ACCESS_TOKEN_SCOPES})
+ * and {@link canonicalScope} maps it onto this table.
+ *
+ * `cloudcli:admin` is deliberately absent: it is reserved and cannot be minted.
  *
  * Re-homed verbatim from `server/modules/oauth/access-tokens.service.ts`
  * (proposal `docs/proposals/mcp-gateway-tool-architecture.md` stage 1) so a
@@ -53,23 +57,24 @@ export const ACCESS_TOKEN_SCOPES = [
     'cloudcli:cockpit:act',
 ];
 /**
- * The Cloudpit spellings of the same eight scopes. Nothing migrates stored tokens:
- * both vocabularies are accepted on issue, and every comparison goes through
- * {@link canonicalScope} so an old `requiredScopes` literal keeps matching a new
- * `cloudpit:*` token (and vice versa).
+ * The Cloudpit spellings of the same eight scopes: the wire vocabulary a client
+ * asks for, the AS metadata advertises and the consent screen offers.
+ *
+ * Stored tokens are NOT migrated: an old token carries the canonical
+ * `cloudcli:*` strings in its row and still verifies, which is the 3.0 policy
+ * stated in the release notes. Only the INPUT vocabulary narrowed — a request
+ * naming a legacy spelling is refused.
  */
 export const CLOUDPIT_SCOPE_PREFIX = 'cloudpit:';
 const CLOUDCLI_SCOPE_PREFIX = 'cloudcli:';
 export const CLOUDPIT_ACCESS_TOKEN_SCOPES = ACCESS_TOKEN_SCOPES.map((scope) => `${CLOUDPIT_SCOPE_PREFIX}${scope.slice(CLOUDCLI_SCOPE_PREFIX.length)}`);
-/** Every accepted spelling: the eight legacy names followed by the eight Cloudpit names. */
-export const ACCEPTED_ACCESS_TOKEN_SCOPES = [
-    ...ACCESS_TOKEN_SCOPES,
-    ...CLOUDPIT_ACCESS_TOKEN_SCOPES,
-];
+/** The one accepted spelling at issue time: the eight Cloudpit names. */
+export const ACCEPTED_ACCESS_TOKEN_SCOPES = [...CLOUDPIT_ACCESS_TOKEN_SCOPES];
 /**
- * Maps either spelling onto the legacy canonical one. The stored/compared value stays
- * `cloudcli:*` because it is the key existing grants, tool `requiredScopes` and the
- * observation/DB rows already use; only the accepted INPUT vocabulary widened.
+ * Maps the wire spelling onto the canonical one. The stored/compared value
+ * stays `cloudcli:*` because it is the key existing grants, tool `requiredScopes`
+ * and the observation/DB rows already use. A canonical value passes through
+ * unchanged, so an old token still matches a required scope.
  */
 export function canonicalScope(scope) {
     return scope.startsWith(CLOUDPIT_SCOPE_PREFIX)

package/dist-server/server/shared/mcp-contract/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../server/shared/mcp-contract/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AA6CH,uFAAuF;AAEvF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,eAAe;IACf,uBAAuB;IACvB,yBAAyB;IACzB,0BAA0B;IAC1B,kBAAkB;IAClB,2EAA2E;IAC3E,4EAA4E;IAC5E,qDAAqD;IACrD,mBAAmB;IACnB,gFAAgF;IAChF,6EAA6E;IAC7E,6EAA6E;IAC7E,kEAAkE;IAClE,oBAAoB;IACpB,8EAA8E;IAC9E,4EAA4E;IAC5E,6EAA6E;IAC7E,6EAA6E;IAC7E,8EAA8E;IAC9E,6DAA6D;IAC7D,sBAAsB;CACd,CAAC;AAEX;;;;;GAKG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,WAAW,CAAC;AACjD,MAAM,qBAAqB,GAAG,WAAW,CAAC;AAE1C,MAAM,CAAC,MAAM,4BAA4B,GAAsB,mBAAmB,CAAC,GAAG,CACpF,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,qBAAqB,GAAG,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAClF,CAAC;AAEF,4FAA4F;AAC5F,MAAM,CAAC,MAAM,4BAA4B,GAAsB;IAC7D,GAAG,mBAAmB;IACtB,GAAG,4BAA4B;CAChC,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,KAAa;IAC1C,OAAO,KAAK,CAAC,UAAU,CAAC,qBAAqB,CAAC;QAC5C,CAAC,CAAC,GAAG,qBAAqB,GAAG,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE;QACxE,CAAC,CAAC,KAAK,CAAC;AACZ,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../server/shared/mcp-contract/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AA6CH,uFAAuF;AAEvF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,eAAe;IACf,uBAAuB;IACvB,yBAAyB;IACzB,0BAA0B;IAC1B,kBAAkB;IAClB,2EAA2E;IAC3E,4EAA4E;IAC5E,qDAAqD;IACrD,mBAAmB;IACnB,gFAAgF;IAChF,6EAA6E;IAC7E,6EAA6E;IAC7E,kEAAkE;IAClE,oBAAoB;IACpB,8EAA8E;IAC9E,4EAA4E;IAC5E,6EAA6E;IAC7E,6EAA6E;IAC7E,8EAA8E;IAC9E,6DAA6D;IAC7D,sBAAsB;CACd,CAAC;AAEX;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,WAAW,CAAC;AACjD,MAAM,qBAAqB,GAAG,WAAW,CAAC;AAE1C,MAAM,CAAC,MAAM,4BAA4B,GAAsB,mBAAmB,CAAC,GAAG,CACpF,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,qBAAqB,GAAG,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAClF,CAAC;AAEF,yEAAyE;AACzE,MAAM,CAAC,MAAM,4BAA4B,GAAsB,CAAC,GAAG,4BAA4B,CAAC,CAAC;AAEjG;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,KAAa;IAC1C,OAAO,KAAK,CAAC,UAAU,CAAC,qBAAqB,CAAC;QAC5C,CAAC,CAAC,GAAG,qBAAqB,GAAG,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE;QACxE,CAAC,CAAC,KAAK,CAAC;AACZ,CAAC"}