@elytracms/studio 0.0.88 → 0.0.90

package/dist/lib/ai/vite.js

@@ -19,6 +19,7 @@
  * `@elytracms/studio/lib/ai` directly.
  */
 import { loadEnv } from 'vite';
+import { parseBackendMode } from '@elytracms/core/export-sync/deployment-ready';
 import { INSECURE_ANONYMOUS_SESSION_ENV_VALUE, INSECURE_ANONYMOUS_SESSION_ENV_VAR, } from './convex-session.js';
 import { toNodeHandler } from './node-handler.js';
 import { DEFAULT_AI_ENDPOINT } from './route-provider.js';
@@ -28,14 +29,21 @@ export const DEFAULT_AI_DEV_ENV_KEYS = [
     'VITE_CONVEX_SITE_URL',
     'VITE_CONVEX_URL',
 ];
-/** Resolve the anonymous-bypass opt-in against the loaded env (pure; unit-pinned). */
+/**
+ * Resolve the anonymous-bypass opt-in against the loaded env (pure; unit-pinned).
+ * `'playground-mode'` asks the SAME question the studio asks of the same env — core's
+ * `parseBackendMode` (EC-603) — so a padded flag the studio boots as playground opens
+ * the bypass too, and a misspelled one (the studio's boot error) keeps it shut.
+ */
 export function resolveInsecureAnonymousOptIn(optIn, env) {
     if (optIn === true)
         return true;
     if (optIn === 'playground-mode')
-        return env.VITE_ELYTRA_MODE === 'playground';
+        return parseBackendMode(env).kind === 'playground';
     return false;
 }
+/** The plugin's `name` — how `elytra doctor` finds the AI route in a studio's Vite config. */
+export const AI_ROUTE_PLUGIN_NAME = 'elytra-ai-route';
 function jsonError(code, status) {
     return new Response(JSON.stringify({ error: code }), {
         status,
@@ -53,8 +61,9 @@ export function createAiDevPlugin(options = {}) {
     const exportName = options.exportName ?? 'aiRouteHandler';
     let env = {};
     return {
-        name: 'elytra-ai-route',
+        name: AI_ROUTE_PLUGIN_NAME,
         apply: 'serve',
+        api: { elytraAiRoute: { route, handlerModulePath, exportName } },
         configResolved(config) {
             env = loadEnv(config.mode, config.root, '');
             for (const key of [...DEFAULT_AI_DEV_ENV_KEYS, ...(options.envKeys ?? [])]) {

package/dist/lib/ai/vite.js.map

@@ -1 +1 @@
-{"version":3,"file":"vite.js","sourceRoot":"","sources":["../../../src/lib/ai/vite.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * `@elytracms/studio/lib/ai/vite` — `createAiDevPlugin`, the DEV half of the AI\n * route mounting kit (EC-371; closes EC-369 finding #2). A studio app is a client\n * SPA with no server build, so in dev the host route lives as a Vite dev-server\n * middleware: this plugin loads the framework-agnostic `Request → Response` handler\n * module through Vite's SSR pipeline (so its `@elytracms/*` imports resolve like the\n * rest of the app) and bridges Node req/res via the shared {@link toNodeHandler}.\n *\n * It also owns the env bridge the resolver needs (the piece the template had\n * drifted on): `loadEnv` surfaces `ANTHROPIC_API_KEY` / `VITE_CONVEX_SITE_URL` /\n * `VITE_CONVEX_URL` from `.env`/`.env.local` into `process.env` for the SSR-loaded\n * handler — Vite only exposes `VITE_`-prefixed vars via `import.meta.env`, and a\n * `VITE_` prefix on the provider key would leak it into the client bundle.\n *\n * SEPARATE ENTRY on purpose: this module statically imports `vite`, which is a\n * dev-only tool. It is NOT re-exported from the `lib/ai` barrel (pinned in\n * `bundle.test.ts`), and the plugin is `apply: 'serve'` — no production build or\n * serverless mount ever includes it. Production mounts use `toNodeHandler` from\n * `@elytracms/studio/lib/ai` directly.\n */\nimport { loadEnv } from 'vite'\nimport type { Plugin, ViteDevServer } from 'vite'\nimport {\n  INSECURE_ANONYMOUS_SESSION_ENV_VALUE,\n  INSECURE_ANONYMOUS_SESSION_ENV_VAR,\n} from './convex-session'\nimport { toNodeHandler } from './node-handler'\nimport { DEFAULT_AI_ENDPOINT } from './route-provider'\nimport type { AiRouteHandler } from './types'\n\n/** Env keys the plugin surfaces from `.env*` files into `process.env` for the handler. */\nexport const DEFAULT_AI_DEV_ENV_KEYS = [\n  'ANTHROPIC_API_KEY',\n  'VITE_CONVEX_SITE_URL',\n  'VITE_CONVEX_URL',\n] as const\n\nexport interface AiDevPluginOptions {\n  /** The handler module (Vite root-relative), default `/src/server/ai-handler.ts`. */\n  handlerModulePath?: string\n  /** The mounted route path (default {@link DEFAULT_AI_ENDPOINT}, `/api/ai`). */\n  route?: string\n  /** The handler module's export name (default `aiRouteHandler`). */\n  exportName?: string\n  /** Extra env keys to surface into `process.env` (merged over the defaults). */\n  envKeys?: readonly string[]\n  /**\n   * INSECURE, dev-only: let requests presenting NO credential pass the session gate.\n   * A playground studio has no Convex session, so without this the assistant panel\n   * answers 401 there. `'playground-mode'` scopes the bypass to dev servers booted\n   * with `VITE_ELYTRA_MODE=playground` (the recommended setting); `true` applies it\n   * to every dev boot. Defaults OFF. It cannot reach production: the plugin is\n   * `apply: 'serve'`, the handshake env var is set only in `configureServer`, and\n   * the resolver additionally refuses it under `NODE_ENV=production`. A PRESENTED\n   * token must still verify for real — the bypass never masks a bad credential.\n   */\n  insecureAllowAnonymousSessions?: boolean | 'playground-mode'\n}\n\n/** Resolve the anonymous-bypass opt-in against the loaded env (pure; unit-pinned). */\nexport function resolveInsecureAnonymousOptIn(\n  optIn: boolean | 'playground-mode' | undefined,\n  env: Record<string, string | undefined>,\n): boolean {\n  if (optIn === true) return true\n  if (optIn === 'playground-mode') return env.VITE_ELYTRA_MODE === 'playground'\n  return false\n}\n\nfunction jsonError(code: string, status: number): Response {\n  return new Response(JSON.stringify({ error: code }), {\n    status,\n    headers: { 'content-type': 'application/json' },\n  })\n}\n\n/**\n * Mount the AI route in the Vite dev server. Dev-only by construction\n * (`apply: 'serve'`); a production deploy mounts the same handler module via\n * `toNodeHandler` in its serverless entry instead.\n */\nexport function createAiDevPlugin(options: AiDevPluginOptions = {}): Plugin {\n  const handlerModulePath = options.handlerModulePath ?? '/src/server/ai-handler.ts'\n  const route = options.route ?? DEFAULT_AI_ENDPOINT\n  const exportName = options.exportName ?? 'aiRouteHandler'\n  let env: Record<string, string | undefined> = {}\n\n  return {\n    name: 'elytra-ai-route',\n    apply: 'serve',\n    configResolved(config) {\n      env = loadEnv(config.mode, config.root, '')\n      for (const key of [...DEFAULT_AI_DEV_ENV_KEYS, ...(options.envKeys ?? [])]) {\n        if (env[key] && !process.env[key]) process.env[key] = env[key]\n      }\n    },\n    configureServer(server: ViteDevServer) {\n      if (resolveInsecureAnonymousOptIn(options.insecureAllowAnonymousSessions, env)) {\n        process.env[INSECURE_ANONYMOUS_SESSION_ENV_VAR] = INSECURE_ANONYMOUS_SESSION_ENV_VALUE\n        server.config.logger.warn(\n          `[elytra-ai] insecureAllowAnonymousSessions is ON for this dev server: ${route} ` +\n            'accepts requests without a session token (requests presenting a token are still verified).',\n        )\n      }\n\n      // Per request: SSR-load the handler (picks up its @elytracms/* imports through\n      // Vite) and run it; a load/handler failure is a structured 500, never a crash.\n      const bridge = toNodeHandler(async (request: Request): Promise<Response> => {\n        try {\n          const mod = (await server.ssrLoadModule(handlerModulePath)) as Record<string, unknown>\n          const handler = mod[exportName]\n          if (typeof handler !== 'function') return jsonError('route-handler-missing', 500)\n          return await (handler as AiRouteHandler)(request)\n        } catch {\n          return jsonError('route-error', 500)\n        }\n      })\n\n      server.middlewares.use((req, res, next) => {\n        if (!req.url || !req.url.startsWith(route)) return next()\n        void bridge(req, res).catch(() => {\n          if (!res.headersSent) res.statusCode = 500\n          res.end()\n        })\n      })\n    },\n  }\n}\n"]}
+{"version":3,"file":"vite.js","sourceRoot":"","sources":["../../../src/lib/ai/vite.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * `@elytracms/studio/lib/ai/vite` — `createAiDevPlugin`, the DEV half of the AI\n * route mounting kit (EC-371; closes EC-369 finding #2). A studio app is a client\n * SPA with no server build, so in dev the host route lives as a Vite dev-server\n * middleware: this plugin loads the framework-agnostic `Request → Response` handler\n * module through Vite's SSR pipeline (so its `@elytracms/*` imports resolve like the\n * rest of the app) and bridges Node req/res via the shared {@link toNodeHandler}.\n *\n * It also owns the env bridge the resolver needs (the piece the template had\n * drifted on): `loadEnv` surfaces `ANTHROPIC_API_KEY` / `VITE_CONVEX_SITE_URL` /\n * `VITE_CONVEX_URL` from `.env`/`.env.local` into `process.env` for the SSR-loaded\n * handler — Vite only exposes `VITE_`-prefixed vars via `import.meta.env`, and a\n * `VITE_` prefix on the provider key would leak it into the client bundle.\n *\n * SEPARATE ENTRY on purpose: this module statically imports `vite`, which is a\n * dev-only tool. It is NOT re-exported from the `lib/ai` barrel (pinned in\n * `bundle.test.ts`), and the plugin is `apply: 'serve'` — no production build or\n * serverless mount ever includes it. Production mounts use `toNodeHandler` from\n * `@elytracms/studio/lib/ai` directly.\n */\nimport { loadEnv } from 'vite'\nimport type { Plugin, ViteDevServer } from 'vite'\nimport { parseBackendMode } from '@elytracms/core/export-sync/deployment-ready'\nimport {\n  INSECURE_ANONYMOUS_SESSION_ENV_VALUE,\n  INSECURE_ANONYMOUS_SESSION_ENV_VAR,\n} from './convex-session'\nimport { toNodeHandler } from './node-handler'\nimport { DEFAULT_AI_ENDPOINT } from './route-provider'\nimport type { AiRouteHandler } from './types'\n\n/** Env keys the plugin surfaces from `.env*` files into `process.env` for the handler. */\nexport const DEFAULT_AI_DEV_ENV_KEYS = [\n  'ANTHROPIC_API_KEY',\n  'VITE_CONVEX_SITE_URL',\n  'VITE_CONVEX_URL',\n] as const\n\nexport interface AiDevPluginOptions {\n  /** The handler module (Vite root-relative), default `/src/server/ai-handler.ts`. */\n  handlerModulePath?: string\n  /** The mounted route path (default {@link DEFAULT_AI_ENDPOINT}, `/api/ai`). */\n  route?: string\n  /** The handler module's export name (default `aiRouteHandler`). */\n  exportName?: string\n  /** Extra env keys to surface into `process.env` (merged over the defaults). */\n  envKeys?: readonly string[]\n  /**\n   * INSECURE, dev-only: let requests presenting NO credential pass the session gate.\n   * A playground studio has no Convex session, so without this the assistant panel\n   * answers 401 there. `'playground-mode'` scopes the bypass to dev servers booted\n   * with `VITE_ELYTRA_MODE=playground` (the recommended setting); `true` applies it\n   * to every dev boot. Defaults OFF. It cannot reach production: the plugin is\n   * `apply: 'serve'`, the handshake env var is set only in `configureServer`, and\n   * the resolver additionally refuses it under `NODE_ENV=production`. A PRESENTED\n   * token must still verify for real — the bypass never masks a bad credential.\n   */\n  insecureAllowAnonymousSessions?: boolean | 'playground-mode'\n}\n\n/**\n * Resolve the anonymous-bypass opt-in against the loaded env (pure; unit-pinned).\n * `'playground-mode'` asks the SAME question the studio asks of the same env — core's\n * `parseBackendMode` (EC-603) — so a padded flag the studio boots as playground opens\n * the bypass too, and a misspelled one (the studio's boot error) keeps it shut.\n */\nexport function resolveInsecureAnonymousOptIn(\n  optIn: boolean | 'playground-mode' | undefined,\n  env: Record<string, string | undefined>,\n): boolean {\n  if (optIn === true) return true\n  if (optIn === 'playground-mode') return parseBackendMode(env).kind === 'playground'\n  return false\n}\n\n/** The plugin's `name` — how `elytra doctor` finds the AI route in a studio's Vite config. */\nexport const AI_ROUTE_PLUGIN_NAME = 'elytra-ai-route'\n\n/**\n * What the plugin mounts, exposed on its `api` (Vite's inter-plugin channel) so a tool\n * that loads the studio's Vite config can read the AI route from that config instead of\n * guessing a file path (EC-603: `elytra doctor` reads it to decide whether an AI\n * provider key is expected, and checks the handler module exists).\n */\nexport interface AiDevPluginApi {\n  elytraAiRoute: { route: string; handlerModulePath: string; exportName: string }\n}\n\nfunction jsonError(code: string, status: number): Response {\n  return new Response(JSON.stringify({ error: code }), {\n    status,\n    headers: { 'content-type': 'application/json' },\n  })\n}\n\n/**\n * Mount the AI route in the Vite dev server. Dev-only by construction\n * (`apply: 'serve'`); a production deploy mounts the same handler module via\n * `toNodeHandler` in its serverless entry instead.\n */\nexport function createAiDevPlugin(options: AiDevPluginOptions = {}): Plugin<AiDevPluginApi> {\n  const handlerModulePath = options.handlerModulePath ?? '/src/server/ai-handler.ts'\n  const route = options.route ?? DEFAULT_AI_ENDPOINT\n  const exportName = options.exportName ?? 'aiRouteHandler'\n  let env: Record<string, string | undefined> = {}\n\n  return {\n    name: AI_ROUTE_PLUGIN_NAME,\n    apply: 'serve',\n    api: { elytraAiRoute: { route, handlerModulePath, exportName } },\n    configResolved(config) {\n      env = loadEnv(config.mode, config.root, '')\n      for (const key of [...DEFAULT_AI_DEV_ENV_KEYS, ...(options.envKeys ?? [])]) {\n        if (env[key] && !process.env[key]) process.env[key] = env[key]\n      }\n    },\n    configureServer(server: ViteDevServer) {\n      if (resolveInsecureAnonymousOptIn(options.insecureAllowAnonymousSessions, env)) {\n        process.env[INSECURE_ANONYMOUS_SESSION_ENV_VAR] = INSECURE_ANONYMOUS_SESSION_ENV_VALUE\n        server.config.logger.warn(\n          `[elytra-ai] insecureAllowAnonymousSessions is ON for this dev server: ${route} ` +\n            'accepts requests without a session token (requests presenting a token are still verified).',\n        )\n      }\n\n      // Per request: SSR-load the handler (picks up its @elytracms/* imports through\n      // Vite) and run it; a load/handler failure is a structured 500, never a crash.\n      const bridge = toNodeHandler(async (request: Request): Promise<Response> => {\n        try {\n          const mod = (await server.ssrLoadModule(handlerModulePath)) as Record<string, unknown>\n          const handler = mod[exportName]\n          if (typeof handler !== 'function') return jsonError('route-handler-missing', 500)\n          return await (handler as AiRouteHandler)(request)\n        } catch {\n          return jsonError('route-error', 500)\n        }\n      })\n\n      server.middlewares.use((req, res, next) => {\n        if (!req.url || !req.url.startsWith(route)) return next()\n        void bridge(req, res).catch(() => {\n          if (!res.headersSent) res.statusCode = 500\n          res.end()\n        })\n      })\n    },\n  }\n}\n"]}

package/dist/lib/cms/published-documents.d.ts

@@ -10,15 +10,26 @@ import type { OperationsClient } from '../operations/index.js';
  * URL from these ancestors yields the URL the live site actually resolves.
  *
  * EC-308/AD-17: loaded + kept fresh through the one `useOperationQuery` cache
- * seam — invalidated only when a publish/unpublish/restore/delete command
- * succeeds (NOT on every autosave upsert — a draft edit doesn't change what's
- * published). Cost: ONE bulk `documents.listPublished` read (EC-307).
+ * seam — invalidated only when a command that moves a live pin succeeds (NOT on
+ * every autosave upsert — a draft edit doesn't change what's published). Cost: ONE
+ * bulk `documents.listPublished` read (EC-307).
  */
 export interface PublishedDocuments {
     /** Pinned published snapshot per published document id. Empty while loading. */
     byId: ReadonlyMap<string, CmsDocument>;
     status: 'loading' | 'ready';
 }
+/**
+ * Commands that change which version is pinned live (and thus the pool).
+ *
+ * EC-579 (RESIDUE-2c): `documents.pinVersion` moves the pin too — it is how a
+ * changeset revert restores a prior live version — and was missing, so a revert left
+ * the live URLs on the old pool until a reload. `documents.restore` was here and
+ * moves nothing: it writes the DRAFT from a recorded version (`cms.upsertDocument`),
+ * never the pin. The same answer the Convex trigger gives server-side: only a pin
+ * move or the delete of a pinned row changes published output.
+ */
+export declare const PUBLISHED_RELOAD_OPS: readonly ["documents.publish", "documents.unpublish", "documents.pinVersion", "documents.delete", "documents.clear"];
 /**
  * Build the published pool of a collection (pure over the operations client): the
  * pinned published snapshot of every currently-published document, keyed by id.

package/dist/lib/cms/published-documents.js

@@ -1,9 +1,18 @@
 import { useOperationQuery } from '@elytracms/studio/lib/query';
-/** Commands that change which version is pinned live (and thus the pool). */
-const PUBLISHED_RELOAD_OPS = [
+/**
+ * Commands that change which version is pinned live (and thus the pool).
+ *
+ * EC-579 (RESIDUE-2c): `documents.pinVersion` moves the pin too — it is how a
+ * changeset revert restores a prior live version — and was missing, so a revert left
+ * the live URLs on the old pool until a reload. `documents.restore` was here and
+ * moves nothing: it writes the DRAFT from a recorded version (`cms.upsertDocument`),
+ * never the pin. The same answer the Convex trigger gives server-side: only a pin
+ * move or the delete of a pinned row changes published output.
+ */
+export const PUBLISHED_RELOAD_OPS = [
     'documents.publish',
     'documents.unpublish',
-    'documents.restore',
+    'documents.pinVersion',
     'documents.delete',
     'documents.clear',
 ];

package/dist/lib/cms/published-documents.js.map

@@ -1 +1 @@
-{"version":3,"file":"published-documents.js","sourceRoot":"","sources":["../../../src/lib/cms/published-documents.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAsB/D,6EAA6E;AAC7E,MAAM,oBAAoB,GAAG;IAC3B,mBAAmB;IACnB,qBAAqB;IACrB,mBAAmB;IACnB,kBAAkB;IAClB,iBAAiB;CACT,CAAA;AAEV,MAAM,UAAU,GAAqC,IAAI,GAAG,EAAE,CAAA;AAE9D;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,UAA4B,EAC5B,SAAiB,EACjB,YAAoB;IAEpB,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAA;IAChG,IAAI,CAAC,MAAM,CAAC,EAAE;QAAE,OAAO,IAAI,GAAG,EAAE,CAAA;IAChC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAuB,CAAA;IAC3C,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,KAAK;QAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAA;IACpE,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,SAA6B,EAC7B,YAAoB;IAEpB,MAAM,KAAK,GAAG,iBAAiB,CAA2B;QACxD,4EAA4E;QAC5E,QAAQ,EAAE,CAAC,oBAAoB,EAAE,SAAS,IAAI,GAAG,EAAE,YAAY,CAAC;QAChE,MAAM,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,sBAAsB,CAAC,UAAU,EAAE,SAAmB,EAAE,YAAY,CAAC;QAC7F,YAAY,EAAE,oBAAoB;QAClC,OAAO,EAAE,SAAS,KAAK,SAAS;KACjC,CAAC,CAAA;IACF,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,CAAA;IACzE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,EAAE,CAAA;AAC1F,CAAC","sourcesContent":["import type { CmsDocument } from '@elytracms/core/cms-core'\nimport type { OperationsClient } from '../operations'\nimport { useOperationQuery } from '@elytracms/studio/lib/query'\n\n/**\n * The PUBLISHED-perspective documents of a collection (EC-205, \"live = published\")\n * — the pinned published snapshot of each currently-published document, keyed by\n * id. Live surfaces (a document's live URL + \"View live\", EC-216) MUST derive\n * from this, never from the draft rows the studio edits: an unpublished document,\n * or an unpublished `slug`/`parent` edit, must never leak into a \"live\" URL. The\n * pool is exactly the set the live site would serve, so composing a nested page's\n * URL from these ancestors yields the URL the live site actually resolves.\n *\n * EC-308/AD-17: loaded + kept fresh through the one `useOperationQuery` cache\n * seam — invalidated only when a publish/unpublish/restore/delete command\n * succeeds (NOT on every autosave upsert — a draft edit doesn't change what's\n * published). Cost: ONE bulk `documents.listPublished` read (EC-307).\n */\nexport interface PublishedDocuments {\n  /** Pinned published snapshot per published document id. Empty while loading. */\n  byId: ReadonlyMap<string, CmsDocument>\n  status: 'loading' | 'ready'\n}\n\n/** Commands that change which version is pinned live (and thus the pool). */\nconst PUBLISHED_RELOAD_OPS = [\n  'documents.publish',\n  'documents.unpublish',\n  'documents.restore',\n  'documents.delete',\n  'documents.clear',\n] as const\n\nconst EMPTY_POOL: ReadonlyMap<string, CmsDocument> = new Map()\n\n/**\n * Build the published pool of a collection (pure over the operations client): the\n * pinned published snapshot of every currently-published document, keyed by id.\n * EC-307: one bulk `documents.listPublished` read — the backend resolves each\n * `publishedVersion` pointer to its recorded snapshot — instead of a `list` plus a\n * per-document `listVersions` fan-out. Read failures degrade to an empty pool.\n */\nexport async function loadPublishedDocuments(\n  operations: OperationsClient,\n  projectId: string,\n  collectionId: string,\n): Promise<Map<string, CmsDocument>> {\n  const result = await operations.documents.listPublished({ projectId, collection: collectionId })\n  if (!result.ok) return new Map()\n  const byId = new Map<string, CmsDocument>()\n  for (const snapshot of result.value) byId.set(snapshot.id, snapshot)\n  return byId\n}\n\nexport function usePublishedDocuments(\n  projectId: string | undefined,\n  collectionId: string,\n): PublishedDocuments {\n  const query = useOperationQuery<Map<string, CmsDocument>>({\n    // Playground/fixture mode (no backend) is `enabled: false` → never queried.\n    queryKey: ['publishedDocuments', projectId ?? '∅', collectionId],\n    loader: (operations) => loadPublishedDocuments(operations, projectId as string, collectionId),\n    invalidateOn: PUBLISHED_RELOAD_OPS,\n    enabled: projectId !== undefined,\n  })\n  if (projectId === undefined) return { byId: EMPTY_POOL, status: 'ready' }\n  return { byId: query.data ?? EMPTY_POOL, status: query.isPending ? 'loading' : 'ready' }\n}\n"]}
+{"version":3,"file":"published-documents.js","sourceRoot":"","sources":["../../../src/lib/cms/published-documents.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAsB/D;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,mBAAmB;IACnB,qBAAqB;IACrB,sBAAsB;IACtB,kBAAkB;IAClB,iBAAiB;CACT,CAAA;AAEV,MAAM,UAAU,GAAqC,IAAI,GAAG,EAAE,CAAA;AAE9D;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,UAA4B,EAC5B,SAAiB,EACjB,YAAoB;IAEpB,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAA;IAChG,IAAI,CAAC,MAAM,CAAC,EAAE;QAAE,OAAO,IAAI,GAAG,EAAE,CAAA;IAChC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAuB,CAAA;IAC3C,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,KAAK;QAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAA;IACpE,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,SAA6B,EAC7B,YAAoB;IAEpB,MAAM,KAAK,GAAG,iBAAiB,CAA2B;QACxD,4EAA4E;QAC5E,QAAQ,EAAE,CAAC,oBAAoB,EAAE,SAAS,IAAI,GAAG,EAAE,YAAY,CAAC;QAChE,MAAM,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,sBAAsB,CAAC,UAAU,EAAE,SAAmB,EAAE,YAAY,CAAC;QAC7F,YAAY,EAAE,oBAAoB;QAClC,OAAO,EAAE,SAAS,KAAK,SAAS;KACjC,CAAC,CAAA;IACF,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,CAAA;IACzE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,EAAE,CAAA;AAC1F,CAAC","sourcesContent":["import type { CmsDocument } from '@elytracms/core/cms-core'\nimport type { OperationsClient } from '../operations'\nimport { useOperationQuery } from '@elytracms/studio/lib/query'\n\n/**\n * The PUBLISHED-perspective documents of a collection (EC-205, \"live = published\")\n * — the pinned published snapshot of each currently-published document, keyed by\n * id. Live surfaces (a document's live URL + \"View live\", EC-216) MUST derive\n * from this, never from the draft rows the studio edits: an unpublished document,\n * or an unpublished `slug`/`parent` edit, must never leak into a \"live\" URL. The\n * pool is exactly the set the live site would serve, so composing a nested page's\n * URL from these ancestors yields the URL the live site actually resolves.\n *\n * EC-308/AD-17: loaded + kept fresh through the one `useOperationQuery` cache\n * seam — invalidated only when a command that moves a live pin succeeds (NOT on\n * every autosave upsert — a draft edit doesn't change what's published). Cost: ONE\n * bulk `documents.listPublished` read (EC-307).\n */\nexport interface PublishedDocuments {\n  /** Pinned published snapshot per published document id. Empty while loading. */\n  byId: ReadonlyMap<string, CmsDocument>\n  status: 'loading' | 'ready'\n}\n\n/**\n * Commands that change which version is pinned live (and thus the pool).\n *\n * EC-579 (RESIDUE-2c): `documents.pinVersion` moves the pin too — it is how a\n * changeset revert restores a prior live version — and was missing, so a revert left\n * the live URLs on the old pool until a reload. `documents.restore` was here and\n * moves nothing: it writes the DRAFT from a recorded version (`cms.upsertDocument`),\n * never the pin. The same answer the Convex trigger gives server-side: only a pin\n * move or the delete of a pinned row changes published output.\n */\nexport const PUBLISHED_RELOAD_OPS = [\n  'documents.publish',\n  'documents.unpublish',\n  'documents.pinVersion',\n  'documents.delete',\n  'documents.clear',\n] as const\n\nconst EMPTY_POOL: ReadonlyMap<string, CmsDocument> = new Map()\n\n/**\n * Build the published pool of a collection (pure over the operations client): the\n * pinned published snapshot of every currently-published document, keyed by id.\n * EC-307: one bulk `documents.listPublished` read — the backend resolves each\n * `publishedVersion` pointer to its recorded snapshot — instead of a `list` plus a\n * per-document `listVersions` fan-out. Read failures degrade to an empty pool.\n */\nexport async function loadPublishedDocuments(\n  operations: OperationsClient,\n  projectId: string,\n  collectionId: string,\n): Promise<Map<string, CmsDocument>> {\n  const result = await operations.documents.listPublished({ projectId, collection: collectionId })\n  if (!result.ok) return new Map()\n  const byId = new Map<string, CmsDocument>()\n  for (const snapshot of result.value) byId.set(snapshot.id, snapshot)\n  return byId\n}\n\nexport function usePublishedDocuments(\n  projectId: string | undefined,\n  collectionId: string,\n): PublishedDocuments {\n  const query = useOperationQuery<Map<string, CmsDocument>>({\n    // Playground/fixture mode (no backend) is `enabled: false` → never queried.\n    queryKey: ['publishedDocuments', projectId ?? '∅', collectionId],\n    loader: (operations) => loadPublishedDocuments(operations, projectId as string, collectionId),\n    invalidateOn: PUBLISHED_RELOAD_OPS,\n    enabled: projectId !== undefined,\n  })\n  if (projectId === undefined) return { byId: EMPTY_POOL, status: 'ready' }\n  return { byId: query.data ?? EMPTY_POOL, status: query.isPending ? 'loading' : 'ready' }\n}\n"]}

package/dist/lib/cms-views/view-model.d.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import type { CmsDocument, CollectionDef, FieldDef, LocaleConfig, LocalizedString } from '@elytracms/core/cms-core';
+import type { CmsDocument, CollectionDef, FieldDef, Locale, LocaleConfig, LocalizedString } from '@elytracms/core/cms-core';
 import type { FilterOperator, FilterScalar } from '@elytracms/core/content';
 /**
  * The pure table-view model for the CMS collection table (EC-169).
@@ -239,14 +239,14 @@ export type IsPublished = (doc: CmsDocument) => boolean;
  * `matchesFieldValue` over the RAW field value (so `contains`/`empty`/multiple-
  * relation membership all behave the same on the table as on the live site).
  */
-export declare function clauseMatches(collection: CollectionDef, doc: CmsDocument, localeConfig: LocaleConfig, clause: FilterClause, isPublished?: IsPublished): boolean;
+export declare function clauseMatches(collection: CollectionDef, doc: CmsDocument, localeConfig: LocaleConfig, locale: Locale, clause: FilterClause, isPublished?: IsPublished): boolean;
 /**
  * Sort documents by one column in the canonical deterministic order
  * (`compareListEntries`: typed value order, id-ascending tiebreak). Unlike the
  * content accessors, the *table* may sort any rendered column — sorting is a
  * presentation concern here; the `filterable` flag governs filters.
  */
-export declare function sortViewDocuments(collection: CollectionDef, docs: readonly CmsDocument[], localeConfig: LocaleConfig, sort: ViewSort | null, isPublished?: IsPublished, meta?: PseudoColumnMeta): CmsDocument[];
+export declare function sortViewDocuments(collection: CollectionDef, docs: readonly CmsDocument[], localeConfig: LocaleConfig, locale: Locale, sort: ViewSort | null, isPublished?: IsPublished, meta?: PseudoColumnMeta): CmsDocument[];
 /** The filtered + sorted documents of a view, plus any clause issues. */
 export interface AppliedViewState {
     docs: CmsDocument[];
@@ -258,7 +258,7 @@ export interface AppliedViewState {
  * ones, sort. Invalid clauses never filter silently — they come back as
  * issues for the UI to surface.
  */
-export declare function applyViewState(collection: CollectionDef, docs: readonly CmsDocument[], localeConfig: LocaleConfig, state: TableViewState, isPublished?: IsPublished, meta?: PseudoColumnMeta): AppliedViewState;
+export declare function applyViewState(collection: CollectionDef, docs: readonly CmsDocument[], localeConfig: LocaleConfig, locale: Locale, state: TableViewState, isPublished?: IsPublished, meta?: PseudoColumnMeta): AppliedViewState;
 /** The id of the synthesized built-in "All entries" baseline view (EC-444). */
 export declare const ALL_VIEW_ID = "all";
 export declare function defaultViewState(collection: CollectionDef, pseudo?: readonly string[]): TableViewState;

package/dist/lib/cms-views/view-model.js

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { documentDefaultLocale, localizedStringSchema, resolveField, resolveLabel, titleFieldOf, } from '@elytracms/core/cms-core';
+import { localizedStringSchema, resolveField, resolveLabel, titleFieldOf, } from '@elytracms/core/cms-core';
 import { localizedLabel, translate } from '@elytracms/studio/lib/i18n';
 import { contentQueryErrorMessage } from '@elytracms/studio/lib/persona/labels';
 import { FILTER_OPERATORS, compareListEntries, filterScalarOf, filterableFields, matchesFieldValue, validateWhere, } from '@elytracms/core/content';
@@ -340,17 +340,21 @@ const defaultIsPublished = () => false;
  * otherwise. Matching runs on this (via `matchesFieldValue`) so it agrees with the
  * delivery/listing path exactly: array-contains for `multiple` relations (EC-255)
  * and whole-value `empty` semantics (EC-345). Sorting keeps its own scalar reduction.
+ *
+ * EC-580: read in the DISPLAYED view of the table's active locale (`resolveField`,
+ * the per-field form of `valuesInLocale`) — what the row shows is what it sorts and
+ * filters by, as delivery does in the request locale. It used to read a
+ * per-document default locale, so a `de` table sorted by English values.
  */
-function rawValueOf(collection, doc, field, localeConfig, isPublished) {
+function rawValueOf(collection, doc, field, localeConfig, locale, isPublished) {
     if (field === STATE_FIELD)
         return isPublished(doc) ? 'published' : 'draft';
     if (!collection.fields.some((f) => f.name === field))
         return undefined;
-    const locale = documentDefaultLocale(doc, localeConfig);
     return resolveField(collection, doc, field, locale, localeConfig).value;
 }
-/** The scalar a document exposes for a SORT field, locale-resolved. */
-function scalarOf(collection, doc, field, localeConfig, isPublished, meta = {}) {
+/** The scalar a document exposes for a SORT field, in the active locale's view. */
+function scalarOf(collection, doc, field, localeConfig, locale, isPublished, meta = {}) {
     if (field === STATE_FIELD)
         return isPublished(doc) ? 'published' : 'draft';
     // EC-445: the pseudo-DATE columns sort by the source's materialized ISO timestamp
@@ -363,7 +367,6 @@ function scalarOf(collection, doc, field, localeConfig, isPublished, meta = {})
         return null;
     if (!collection.fields.some((f) => f.name === field))
         return null;
-    const locale = documentDefaultLocale(doc, localeConfig);
     return filterScalarOf(resolveField(collection, doc, field, locale, localeConfig).value);
 }
 /**
@@ -372,8 +375,8 @@ function scalarOf(collection, doc, field, localeConfig, isPublished, meta = {})
  * `matchesFieldValue` over the RAW field value (so `contains`/`empty`/multiple-
  * relation membership all behave the same on the table as on the live site).
  */
-export function clauseMatches(collection, doc, localeConfig, clause, isPublished = defaultIsPublished) {
-    const value = rawValueOf(collection, doc, clause.field, localeConfig, isPublished);
+export function clauseMatches(collection, doc, localeConfig, locale, clause, isPublished = defaultIsPublished) {
+    const value = rawValueOf(collection, doc, clause.field, localeConfig, locale, isPublished);
     const condition = { [clause.op]: clause.value };
     return matchesFieldValue(value, condition);
 }
@@ -383,12 +386,12 @@ export function clauseMatches(collection, doc, localeConfig, clause, isPublished
  * content accessors, the *table* may sort any rendered column — sorting is a
  * presentation concern here; the `filterable` flag governs filters.
  */
-export function sortViewDocuments(collection, docs, localeConfig, sort, isPublished = defaultIsPublished, meta = {}) {
+export function sortViewDocuments(collection, docs, localeConfig, locale, sort, isPublished = defaultIsPublished, meta = {}) {
     if (sort === null)
         return [...docs];
     const positions = new Map(docs.map((doc) => [
         doc.id,
-        scalarOf(collection, doc, sort.field, localeConfig, isPublished, meta),
+        scalarOf(collection, doc, sort.field, localeConfig, locale, isPublished, meta),
     ]));
     return [...docs].sort((a, b) => compareListEntries({ id: a.id, sortValue: positions.get(a.id) ?? null }, { id: b.id, sortValue: positions.get(b.id) ?? null }, sort.dir));
 }
@@ -397,13 +400,13 @@ export function sortViewDocuments(collection, docs, localeConfig, sort, isPublis
  * ones, sort. Invalid clauses never filter silently — they come back as
  * issues for the UI to surface.
  */
-export function applyViewState(collection, docs, localeConfig, state, isPublished = defaultIsPublished, meta = {}) {
+export function applyViewState(collection, docs, localeConfig, locale, state, isPublished = defaultIsPublished, meta = {}) {
     const issues = validateClauses(collection, state.filters);
     const invalid = new Set(issues.map((issue) => issue.index));
     const active = state.filters.filter((_, index) => !invalid.has(index));
-    const matched = docs.filter((doc) => active.every((clause) => clauseMatches(collection, doc, localeConfig, clause, isPublished)));
+    const matched = docs.filter((doc) => active.every((clause) => clauseMatches(collection, doc, localeConfig, locale, clause, isPublished)));
     return {
-        docs: sortViewDocuments(collection, matched, localeConfig, state.sort, isPublished, meta),
+        docs: sortViewDocuments(collection, matched, localeConfig, locale, state.sort, isPublished, meta),
         issues,
     };
 }