@inneropen/marvin-sdk 3.1.0 → 3.2.0-next.10

package/dist/index.cjs

@@ -397,7 +397,7 @@ var init_HttpClient = __esm({
         const timeoutId = setTimeout(() => controller.abort(), this.timeout);
         const startTime = Date.now();
         if (this.debug) {
-          this.logger.log(`[Marvin] ${method} ${url}`);
+          this.logger.log(`[Marvin SDK] ${method} ${url}`);
         }
         try {
           const response = await fetch(url, {
@@ -411,7 +411,7 @@ var init_HttpClient = __esm({
           const duration = Date.now() - startTime;
           if (this.debug) {
             this.logger.log(
-              `[Marvin] ${response.status} ${response.statusText} (${duration}ms)`
+              `[Marvin SDK] ${response.status} ${response.statusText} (${duration}ms)`
             );
           }
           if (response.status === 401 && this.auth.handleUnauthorized) {
@@ -421,7 +421,7 @@ var init_HttpClient = __esm({
             const errorText = await response.text().catch(() => "");
             if (this.debug) {
               this.logger.error(
-                `[Marvin] Error response: ${response.status} ${response.statusText}`,
+                `[Marvin SDK] Error response: ${response.status} ${response.statusText}`,
                 errorText ? `Body: ${errorText}` : ""
               );
             }
@@ -431,7 +431,7 @@ var init_HttpClient = __esm({
               const delay = this.calculateRetryDelay(retryAttempt);
               if (this.debug) {
                 this.logger.warn(
-                  `[Marvin] Retry ${retryAttempt + 1}/${this.retryConfig.maxRetries} after ${delay}ms (status: ${response.status})`
+                  `[Marvin SDK] Retry ${retryAttempt + 1}/${this.retryConfig.maxRetries} after ${delay}ms (status: ${response.status})`
                 );
               }
               await this.sleep(delay);
@@ -470,7 +470,7 @@ var init_HttpClient = __esm({
           const data = await response.json();
           if (this.debug) {
             const sanitized = this.sanitizeForLogging(data);
-            this.logger.log("[Marvin] Response:", JSON.stringify(sanitized, null, 2));
+            this.logger.log("[Marvin SDK] Response:", JSON.stringify(sanitized, null, 2));
           }
           return data;
         } catch (error) {
@@ -484,7 +484,7 @@ var init_HttpClient = __esm({
               const delay = this.calculateRetryDelay(retryAttempt);
               if (this.debug) {
                 this.logger.warn(
-                  `[Marvin] Retry ${retryAttempt + 1}/${this.retryConfig.maxRetries} after ${delay}ms (network error)`
+                  `[Marvin SDK] Retry ${retryAttempt + 1}/${this.retryConfig.maxRetries} after ${delay}ms (network error)`
                 );
               }
               await this.sleep(delay);
@@ -901,25 +901,22 @@ var init_entry = __esm({
         return this.raw.order;
       }
       get assets() {
-        return this.raw.assets;
+        return (this.raw.assets ?? []).map(({ asset, role, position, metadataJson }) => ({
+          ...asset,
+          entryMetadata: { role: role ?? null, position, metadataJson: metadataJson ?? null }
+        }));
       }
       get collections() {
-        return this.raw.collections;
+        return (this.raw.collections ?? []).map(({ collection, role, position, metadataJson }) => ({
+          collection,
+          entryMetadata: { role: role ?? null, position, metadataJson: metadataJson ?? null }
+        }));
       }
       get resources() {
-        return this.raw.resources;
-      }
-      asset(role) {
-        return this.raw.assets.find((a) => a.role === role);
-      }
-      assetsByRole(role) {
-        return this.raw.assets.filter((a) => a.role === role);
-      }
-      resource(role) {
-        return this.raw.resources.find((r) => r.role === role);
-      }
-      resourcesByRole(role) {
-        return this.raw.resources.filter((r) => r.role === role);
+        return (this.raw.resources ?? []).map(({ resource, role, position, metadataJson }) => ({
+          ...resource,
+          entryMetadata: { role: role ?? null, position, metadataJson: metadataJson ?? null }
+        }));
       }
       field(key) {
         return this.raw.data[key];
@@ -935,6 +932,16 @@ var init_entry = __esm({
 });
 
 // src/entries/entries.ts
+function toListEntry(raw) {
+  const { collections, ...rest } = raw;
+  return {
+    ...rest,
+    collections: (collections ?? []).map(({ collection, role, position, metadataJson }) => ({
+      collection,
+      entryMetadata: { role: role ?? null, position, metadataJson: metadataJson ?? null }
+    }))
+  };
+}
 var EntriesModule;
 var init_entries = __esm({
   "src/entries/entries.ts"() {
@@ -960,7 +967,7 @@ var init_entries = __esm({
         });
         const endpoint = `/api/publish/${this.workspaceSlug}/entries${queryString}`;
         const response = await this.http.fetch(endpoint);
-        return response.data || [];
+        return (response.data || []).map(toListEntry);
       }
       /**
        * Get a single entry by slug
@@ -1031,8 +1038,33 @@ var init_collection = __esm({
       get entryCount() {
         return this.data.entryCount;
       }
+      /**
+       * Entries with junction context for this collection surfaced directly.
+       * - role, position, junctionMetadata: from this collection's junction record
+       * - collections: slugs of other collections the entry belongs to
+       */
       get entries() {
-        return this.data.entries;
+        return this.data.entries.map((entry) => {
+          const { collections, ...rest } = entry;
+          const junction = collections.find((ec) => ec.collection.slug === this.data.slug);
+          const entryMetadata = {
+            role: junction?.role ?? null,
+            position: junction?.position ?? 0,
+            metadataJson: junction?.metadataJson ?? null
+          };
+          const collection = {
+            slug: this.data.slug,
+            name: this.data.name,
+            description: this.data.description,
+            metadataJson: this.data.metadataJson,
+            entryMetadata
+          };
+          return {
+            ...rest,
+            collection,
+            collectionSlugs: collections.map((ec) => ec.collection.slug)
+          };
+        });
       }
       toJSON() {
         return this.data;
@@ -1064,8 +1096,8 @@ var init_collections = __esm({
         return response.data || [];
       }
       /**
-       * Get a single collection by slug
-       * Returns null if collection is not found (404)
+       * Get a single collection by slug.
+       * Returns an empty array if the collection is not found (404).
        */
       async get(slug) {
         try {
@@ -1074,32 +1106,34 @@ var init_collections = __esm({
           return new Collection(data);
         } catch (error) {
           if (error instanceof MarvinNotFoundError) {
-            return null;
+            return [];
           }
           throw error;
         }
       }
       /**
-       * Get entries in a collection
-       * Returns empty array if collection is not found
+       * Get entries in a collection with junction context surfaced directly.
+       * Each entry has role/position/junctionMetadata from this collection's junction,
+       * and collections reduced to slugs of other memberships.
+       * Returns empty array if collection is not found.
        */
       async entries(slug) {
         const collection = await this.get(slug);
-        if (!collection) {
-          return [];
+        if (Array.isArray(collection)) {
+          return collection;
         }
         return collection.entries;
       }
       /**
-       * Try multiple collection slugs in fallback order
-       * Returns the first collection that exists and has entries
+       * Try multiple collection slugs in fallback order.
+       * Returns entries from the first collection that exists and has entries.
        */
       async fallback(slugs, options = {}) {
         const { requireEntries = true } = options;
         for (const slug of slugs) {
           try {
             const collection = await this.get(slug);
-            if (!collection) {
+            if (Array.isArray(collection)) {
               continue;
             }
             const entries = collection.entries;
@@ -1270,7 +1304,8 @@ var init_renderers = __esm({
       workspaceSlug;
       async list() {
         const endpoint = `/api/publish/${this.workspaceSlug}/entry-types`;
-        return this.http.fetch(endpoint);
+        const all = await this.http.fetch(endpoint);
+        return all.filter((et) => et.isRendered);
       }
     };
   }
@@ -1511,7 +1546,7 @@ var init_marvin = __esm({
        */
       async getCollection(slug) {
         const collection = await this.workspace.collections.get(slug);
-        if (!collection) {
+        if (Array.isArray(collection)) {
           return null;
         }
         return collection.toJSON();

package/dist/index.d.cts

@@ -1,9 +1,9 @@
-import { M as MarvinConfig, a as MarvinClient } from './marvin-BhI__9Cj.cjs';
-export { C as Collection, E as Entry, b as MarvinApiError, c as MarvinAuthError, d as MarvinCache, e as MarvinConfigError, f as MarvinError, g as MarvinNetworkError, h as MarvinNotFoundError, i as MarvinServerError, j as MarvinValidationError, P as PaginatedResponse, k as PaginationMeta, l as PaginationParams, R as Resource, W as Workspace, m as createConfigFromEnv, n as createPaginatedResponse, o as extractData, p as isPaginatedResponse, q as offsetToPage, r as pageToOffset } from './marvin-BhI__9Cj.cjs';
+import { M as MarvinConfig, a as MarvinClient } from './marvin-RZZj02LS.cjs';
+export { C as Collection, E as Entry, b as MarvinApiError, c as MarvinAuthError, d as MarvinCache, e as MarvinConfigError, f as MarvinError, g as MarvinNetworkError, h as MarvinNotFoundError, i as MarvinServerError, j as MarvinValidationError, P as PaginatedResponse, k as PaginationMeta, l as PaginationParams, R as Resource, W as Workspace, m as createConfigFromEnv, n as createPaginatedResponse, o as extractData, p as isPaginatedResponse, q as offsetToPage, r as pageToOffset } from './marvin-RZZj02LS.cjs';
 import { H as HttpClient } from './HttpClient-CdF3IHM1.cjs';
 export { A as AuthStrategy, B as BearerTokenAuth, a as HttpClientConfig, N as NoAuth, S as SessionAuth } from './HttpClient-CdF3IHM1.cjs';
-import { A as AuthToken$1 } from './index-BLIrbIHf.cjs';
-export { G as GetAssetsOptions, a as GetEntriesOptions, b as GetResourcesOptions, M as MarvinAsset, c as MarvinCollection, d as MarvinEntry, e as MarvinEntryListItem, f as MarvinEntryType, g as MarvinPublishResponse, h as MarvinResource, i as MarvinSite, P as PublishedAssetRead, j as PublishedCollectionSummary, k as PublishedEntryAsset, l as PublishedEntryResource, m as PublishedEntryType, S as SiteConfiguration, W as WorkspaceInfo } from './index-BLIrbIHf.cjs';
+import { A as AuthToken$1 } from './index-BVm5dIcw.cjs';
+export { C as CollectionContext, a as CollectionEntry, b as CollectionEntryMetadata, E as EntryAsset, c as EntryCollectionContext, d as EntryResource, G as GetAssetsOptions, e as GetEntriesOptions, f as GetResourcesOptions, L as ListEntry, M as MarvinAsset, g as MarvinCollection, h as MarvinEntry, i as MarvinEntryListItem, j as MarvinEntryType, k as MarvinPublishResponse, l as MarvinResource, m as MarvinSite, P as PublishedAssetRead, n as PublishedCollectionSummary, o as PublishedEntryAsset, p as PublishedEntryResource, q as PublishedEntryType, S as SiteConfiguration, W as WorkspaceInfo } from './index-BVm5dIcw.cjs';
 
 /**
  * Authentication & User Registration

package/dist/index.d.ts

@@ -1,9 +1,9 @@
-import { M as MarvinConfig, a as MarvinClient } from './marvin-C_TihjE2.js';
-export { C as Collection, E as Entry, b as MarvinApiError, c as MarvinAuthError, d as MarvinCache, e as MarvinConfigError, f as MarvinError, g as MarvinNetworkError, h as MarvinNotFoundError, i as MarvinServerError, j as MarvinValidationError, P as PaginatedResponse, k as PaginationMeta, l as PaginationParams, R as Resource, W as Workspace, m as createConfigFromEnv, n as createPaginatedResponse, o as extractData, p as isPaginatedResponse, q as offsetToPage, r as pageToOffset } from './marvin-C_TihjE2.js';
+import { M as MarvinConfig, a as MarvinClient } from './marvin-BZ4meaB-.js';
+export { C as Collection, E as Entry, b as MarvinApiError, c as MarvinAuthError, d as MarvinCache, e as MarvinConfigError, f as MarvinError, g as MarvinNetworkError, h as MarvinNotFoundError, i as MarvinServerError, j as MarvinValidationError, P as PaginatedResponse, k as PaginationMeta, l as PaginationParams, R as Resource, W as Workspace, m as createConfigFromEnv, n as createPaginatedResponse, o as extractData, p as isPaginatedResponse, q as offsetToPage, r as pageToOffset } from './marvin-BZ4meaB-.js';
 import { H as HttpClient } from './HttpClient-CdF3IHM1.js';
 export { A as AuthStrategy, B as BearerTokenAuth, a as HttpClientConfig, N as NoAuth, S as SessionAuth } from './HttpClient-CdF3IHM1.js';
-import { A as AuthToken$1 } from './index-BLIrbIHf.js';
-export { G as GetAssetsOptions, a as GetEntriesOptions, b as GetResourcesOptions, M as MarvinAsset, c as MarvinCollection, d as MarvinEntry, e as MarvinEntryListItem, f as MarvinEntryType, g as MarvinPublishResponse, h as MarvinResource, i as MarvinSite, P as PublishedAssetRead, j as PublishedCollectionSummary, k as PublishedEntryAsset, l as PublishedEntryResource, m as PublishedEntryType, S as SiteConfiguration, W as WorkspaceInfo } from './index-BLIrbIHf.js';
+import { A as AuthToken$1 } from './index-BVm5dIcw.js';
+export { C as CollectionContext, a as CollectionEntry, b as CollectionEntryMetadata, E as EntryAsset, c as EntryCollectionContext, d as EntryResource, G as GetAssetsOptions, e as GetEntriesOptions, f as GetResourcesOptions, L as ListEntry, M as MarvinAsset, g as MarvinCollection, h as MarvinEntry, i as MarvinEntryListItem, j as MarvinEntryType, k as MarvinPublishResponse, l as MarvinResource, m as MarvinSite, P as PublishedAssetRead, n as PublishedCollectionSummary, o as PublishedEntryAsset, p as PublishedEntryResource, q as PublishedEntryType, S as SiteConfiguration, W as WorkspaceInfo } from './index-BVm5dIcw.js';
 
 /**
  * Authentication & User Registration

package/dist/index.js

@@ -13,7 +13,7 @@ import {
   init_resource,
   init_workspace,
   marvin_exports
-} from "./chunk-L4LJWRA7.js";
+} from "./chunk-YHBF2SB3.js";
 import {
   BearerTokenAuth,
   HttpClient,
@@ -36,7 +36,7 @@ import {
   offsetToPage,
   pageToOffset,
   validateEmail
-} from "./chunk-WJC4X7TB.js";
+} from "./chunk-SVH7AMMY.js";
 
 // src/index.ts
 init_marvin();

package/dist/{marvin-C_TihjE2.d.ts → marvin-BZ4meaB-.d.ts}

@@ -1,4 +1,4 @@
-import { m as PublishedEntryType, h as MarvinResource, M as MarvinAsset, c as MarvinCollection, e as MarvinEntryListItem, j as PublishedCollectionSummary, d as MarvinEntry, k as PublishedEntryAsset, l as PublishedEntryResource, i as MarvinSite, n as components, b as GetResourcesOptions$1 } from './index-BLIrbIHf.js';
+import { q as PublishedEntryType, l as MarvinResource, M as MarvinAsset, g as MarvinCollection, a as CollectionEntry, n as PublishedCollectionSummary, h as MarvinEntry, E as EntryAsset, c as EntryCollectionContext, d as EntryResource, L as ListEntry, m as MarvinSite, f as GetResourcesOptions$1 } from './index-BVm5dIcw.js';
 import { H as HttpClient } from './HttpClient-CdF3IHM1.js';
 
 /**
@@ -306,7 +306,12 @@ declare class Collection {
         [key: string]: unknown;
     } | null | undefined;
     get entryCount(): number;
-    get entries(): MarvinEntryListItem[];
+    /**
+     * Entries with junction context for this collection surfaced directly.
+     * - role, position, junctionMetadata: from this collection's junction record
+     * - collections: slugs of other collections the entry belongs to
+     */
+    get entries(): CollectionEntry[];
     toJSON(): MarvinCollection;
 }
 
@@ -323,22 +328,24 @@ declare class CollectionsModule {
      */
     list(): Promise<PublishedCollectionSummary[]>;
     /**
-     * Get a single collection by slug
-     * Returns null if collection is not found (404)
+     * Get a single collection by slug.
+     * Returns an empty array if the collection is not found (404).
      */
-    get(slug: string): Promise<Collection | null>;
+    get(slug: string): Promise<Collection | []>;
     /**
-     * Get entries in a collection
-     * Returns empty array if collection is not found
+     * Get entries in a collection with junction context surfaced directly.
+     * Each entry has role/position/junctionMetadata from this collection's junction,
+     * and collections reduced to slugs of other memberships.
+     * Returns empty array if collection is not found.
      */
-    entries(slug: string): Promise<MarvinEntryListItem[]>;
+    entries(slug: string): Promise<CollectionEntry[]>;
     /**
-     * Try multiple collection slugs in fallback order
-     * Returns the first collection that exists and has entries
+     * Try multiple collection slugs in fallback order.
+     * Returns entries from the first collection that exists and has entries.
      */
     fallback(slugs: string[], options?: {
         requireEntries?: boolean;
-    }): Promise<MarvinEntryListItem[]>;
+    }): Promise<CollectionEntry[]>;
 }
 
 /**
@@ -372,13 +379,9 @@ declare class Entry {
     } | null | undefined;
     get publishedAt(): string | null | undefined;
     get order(): number | null | undefined;
-    get assets(): PublishedEntryAsset[];
-    get collections(): PublishedCollectionSummary[];
-    get resources(): PublishedEntryResource[];
-    asset(role: string): PublishedEntryAsset | undefined;
-    assetsByRole(role: string): PublishedEntryAsset[];
-    resource(role: string): PublishedEntryResource | undefined;
-    resourcesByRole(role: string): PublishedEntryResource[];
+    get assets(): EntryAsset[];
+    get collections(): EntryCollectionContext[];
+    get resources(): EntryResource[];
     field<T = unknown>(key: string): T | undefined;
     get fields(): Record<string, unknown>;
     toJSON(): MarvinEntry;
@@ -402,7 +405,7 @@ declare class EntriesModule {
     /**
      * Get all published entries
      */
-    list(options?: GetEntriesOptions): Promise<MarvinEntryListItem[]>;
+    list(options?: GetEntriesOptions): Promise<ListEntry[]>;
     /**
      * Get a single entry by slug
      * Returns null if entry is not found (404)
@@ -411,15 +414,15 @@ declare class EntriesModule {
     /**
      * Convenience: Get all pages
      */
-    pages(options?: Omit<GetEntriesOptions, 'entryType'>): Promise<MarvinEntryListItem[]>;
+    pages(options?: Omit<GetEntriesOptions, 'entryType'>): Promise<ListEntry[]>;
     /**
      * Convenience: Get all blog posts
      */
-    posts(options?: Omit<GetEntriesOptions, 'entryType'>): Promise<MarvinEntryListItem[]>;
+    posts(options?: Omit<GetEntriesOptions, 'entryType'>): Promise<ListEntry[]>;
     /**
      * Convenience: Get all projects
      */
-    projects(options?: Omit<GetEntriesOptions, 'entryType'>): Promise<MarvinEntryListItem[]>;
+    projects(options?: Omit<GetEntriesOptions, 'entryType'>): Promise<ListEntry[]>;
 }
 
 /**
@@ -510,67 +513,19 @@ declare class MarvinClient {
     /**
      * Get a single collection by slug
      */
-    collection(slug: string): Promise<Collection | null>;
+    collection(slug: string): Promise<[] | Collection>;
     /**
      * Get all pages
      */
-    pages(options?: GetEntriesOptions): Promise<{
-        slug: string;
-        title: string;
-        entryType: string;
-        entryTypeInfo?: components["schemas"]["PublishedEntryTypeInfo"] | null;
-        summary?: string | null;
-        publishedAt?: string | null;
-        status: string;
-        collections: string[];
-        assetSlugs: string[];
-        resourceSlugs: string[];
-        metadataJson?: {
-            [key: string]: unknown;
-        } | null;
-        featuredAsset?: components["schemas"]["PublishedAssetRead"] | null;
-        order?: number | null;
-    }[]>;
+    pages(options?: GetEntriesOptions): Promise<ListEntry[]>;
     /**
      * Get all blog posts
      */
-    posts(options?: GetEntriesOptions): Promise<{
-        slug: string;
-        title: string;
-        entryType: string;
-        entryTypeInfo?: components["schemas"]["PublishedEntryTypeInfo"] | null;
-        summary?: string | null;
-        publishedAt?: string | null;
-        status: string;
-        collections: string[];
-        assetSlugs: string[];
-        resourceSlugs: string[];
-        metadataJson?: {
-            [key: string]: unknown;
-        } | null;
-        featuredAsset?: components["schemas"]["PublishedAssetRead"] | null;
-        order?: number | null;
-    }[]>;
+    posts(options?: GetEntriesOptions): Promise<ListEntry[]>;
     /**
      * Get all projects
      */
-    projects(options?: GetEntriesOptions): Promise<{
-        slug: string;
-        title: string;
-        entryType: string;
-        entryTypeInfo?: components["schemas"]["PublishedEntryTypeInfo"] | null;
-        summary?: string | null;
-        publishedAt?: string | null;
-        status: string;
-        collections: string[];
-        assetSlugs: string[];
-        resourceSlugs: string[];
-        metadataJson?: {
-            [key: string]: unknown;
-        } | null;
-        featuredAsset?: components["schemas"]["PublishedAssetRead"] | null;
-        order?: number | null;
-    }[]>;
+    projects(options?: GetEntriesOptions): Promise<ListEntry[]>;
     /**
      * Get a single resource by slug
      */
@@ -581,7 +536,7 @@ declare class MarvinClient {
      */
     collectionFallback(slugs: string[], options?: {
         requireEntries?: boolean;
-    }): Promise<MarvinEntryListItem[]>;
+    }): Promise<CollectionEntry[]>;
     /**
      * @deprecated Use workspace.site or marvin.site instead
      */
@@ -589,7 +544,7 @@ declare class MarvinClient {
     /**
      * @deprecated Use workspace.entries.list() instead
      */
-    getEntries(options?: GetEntriesOptions): Promise<MarvinEntryListItem[]>;
+    getEntries(options?: GetEntriesOptions): Promise<ListEntry[]>;
     /**
      * @deprecated Use workspace.entries.get() instead
      */
@@ -605,7 +560,7 @@ declare class MarvinClient {
     /**
      * @deprecated Use workspace.collections.entries() instead
      */
-    getCollectionEntries(slug: string): Promise<MarvinEntryListItem[]>;
+    getCollectionEntries(slug: string): Promise<CollectionEntry[]>;
     /**
      * @deprecated Use workspace.assets.list() instead
      */

package/dist/{marvin-BhI__9Cj.d.cts → marvin-RZZj02LS.d.cts}

@@ -1,4 +1,4 @@
-import { m as PublishedEntryType, h as MarvinResource, M as MarvinAsset, c as MarvinCollection, e as MarvinEntryListItem, j as PublishedCollectionSummary, d as MarvinEntry, k as PublishedEntryAsset, l as PublishedEntryResource, i as MarvinSite, n as components, b as GetResourcesOptions$1 } from './index-BLIrbIHf.cjs';
+import { q as PublishedEntryType, l as MarvinResource, M as MarvinAsset, g as MarvinCollection, a as CollectionEntry, n as PublishedCollectionSummary, h as MarvinEntry, E as EntryAsset, c as EntryCollectionContext, d as EntryResource, L as ListEntry, m as MarvinSite, f as GetResourcesOptions$1 } from './index-BVm5dIcw.cjs';
 import { H as HttpClient } from './HttpClient-CdF3IHM1.cjs';
 
 /**
@@ -306,7 +306,12 @@ declare class Collection {
         [key: string]: unknown;
     } | null | undefined;
     get entryCount(): number;
-    get entries(): MarvinEntryListItem[];
+    /**
+     * Entries with junction context for this collection surfaced directly.
+     * - role, position, junctionMetadata: from this collection's junction record
+     * - collections: slugs of other collections the entry belongs to
+     */
+    get entries(): CollectionEntry[];
     toJSON(): MarvinCollection;
 }
 
@@ -323,22 +328,24 @@ declare class CollectionsModule {
      */
     list(): Promise<PublishedCollectionSummary[]>;
     /**
-     * Get a single collection by slug
-     * Returns null if collection is not found (404)
+     * Get a single collection by slug.
+     * Returns an empty array if the collection is not found (404).
      */
-    get(slug: string): Promise<Collection | null>;
+    get(slug: string): Promise<Collection | []>;
     /**
-     * Get entries in a collection
-     * Returns empty array if collection is not found
+     * Get entries in a collection with junction context surfaced directly.
+     * Each entry has role/position/junctionMetadata from this collection's junction,
+     * and collections reduced to slugs of other memberships.
+     * Returns empty array if collection is not found.
      */
-    entries(slug: string): Promise<MarvinEntryListItem[]>;
+    entries(slug: string): Promise<CollectionEntry[]>;
     /**
-     * Try multiple collection slugs in fallback order
-     * Returns the first collection that exists and has entries
+     * Try multiple collection slugs in fallback order.
+     * Returns entries from the first collection that exists and has entries.
      */
     fallback(slugs: string[], options?: {
         requireEntries?: boolean;
-    }): Promise<MarvinEntryListItem[]>;
+    }): Promise<CollectionEntry[]>;
 }
 
 /**
@@ -372,13 +379,9 @@ declare class Entry {
     } | null | undefined;
     get publishedAt(): string | null | undefined;
     get order(): number | null | undefined;
-    get assets(): PublishedEntryAsset[];
-    get collections(): PublishedCollectionSummary[];
-    get resources(): PublishedEntryResource[];
-    asset(role: string): PublishedEntryAsset | undefined;
-    assetsByRole(role: string): PublishedEntryAsset[];
-    resource(role: string): PublishedEntryResource | undefined;
-    resourcesByRole(role: string): PublishedEntryResource[];
+    get assets(): EntryAsset[];
+    get collections(): EntryCollectionContext[];
+    get resources(): EntryResource[];
     field<T = unknown>(key: string): T | undefined;
     get fields(): Record<string, unknown>;
     toJSON(): MarvinEntry;
@@ -402,7 +405,7 @@ declare class EntriesModule {
     /**
      * Get all published entries
      */
-    list(options?: GetEntriesOptions): Promise<MarvinEntryListItem[]>;
+    list(options?: GetEntriesOptions): Promise<ListEntry[]>;
     /**
      * Get a single entry by slug
      * Returns null if entry is not found (404)
@@ -411,15 +414,15 @@ declare class EntriesModule {
     /**
      * Convenience: Get all pages
      */
-    pages(options?: Omit<GetEntriesOptions, 'entryType'>): Promise<MarvinEntryListItem[]>;
+    pages(options?: Omit<GetEntriesOptions, 'entryType'>): Promise<ListEntry[]>;
     /**
      * Convenience: Get all blog posts
      */
-    posts(options?: Omit<GetEntriesOptions, 'entryType'>): Promise<MarvinEntryListItem[]>;
+    posts(options?: Omit<GetEntriesOptions, 'entryType'>): Promise<ListEntry[]>;
     /**
      * Convenience: Get all projects
      */
-    projects(options?: Omit<GetEntriesOptions, 'entryType'>): Promise<MarvinEntryListItem[]>;
+    projects(options?: Omit<GetEntriesOptions, 'entryType'>): Promise<ListEntry[]>;
 }
 
 /**
@@ -510,67 +513,19 @@ declare class MarvinClient {
     /**
      * Get a single collection by slug
      */
-    collection(slug: string): Promise<Collection | null>;
+    collection(slug: string): Promise<[] | Collection>;
     /**
      * Get all pages
      */
-    pages(options?: GetEntriesOptions): Promise<{
-        slug: string;
-        title: string;
-        entryType: string;
-        entryTypeInfo?: components["schemas"]["PublishedEntryTypeInfo"] | null;
-        summary?: string | null;
-        publishedAt?: string | null;
-        status: string;
-        collections: string[];
-        assetSlugs: string[];
-        resourceSlugs: string[];
-        metadataJson?: {
-            [key: string]: unknown;
-        } | null;
-        featuredAsset?: components["schemas"]["PublishedAssetRead"] | null;
-        order?: number | null;
-    }[]>;
+    pages(options?: GetEntriesOptions): Promise<ListEntry[]>;
     /**
      * Get all blog posts
      */
-    posts(options?: GetEntriesOptions): Promise<{
-        slug: string;
-        title: string;
-        entryType: string;
-        entryTypeInfo?: components["schemas"]["PublishedEntryTypeInfo"] | null;
-        summary?: string | null;
-        publishedAt?: string | null;
-        status: string;
-        collections: string[];
-        assetSlugs: string[];
-        resourceSlugs: string[];
-        metadataJson?: {
-            [key: string]: unknown;
-        } | null;
-        featuredAsset?: components["schemas"]["PublishedAssetRead"] | null;
-        order?: number | null;
-    }[]>;
+    posts(options?: GetEntriesOptions): Promise<ListEntry[]>;
     /**
      * Get all projects
      */
-    projects(options?: GetEntriesOptions): Promise<{
-        slug: string;
-        title: string;
-        entryType: string;
-        entryTypeInfo?: components["schemas"]["PublishedEntryTypeInfo"] | null;
-        summary?: string | null;
-        publishedAt?: string | null;
-        status: string;
-        collections: string[];
-        assetSlugs: string[];
-        resourceSlugs: string[];
-        metadataJson?: {
-            [key: string]: unknown;
-        } | null;
-        featuredAsset?: components["schemas"]["PublishedAssetRead"] | null;
-        order?: number | null;
-    }[]>;
+    projects(options?: GetEntriesOptions): Promise<ListEntry[]>;
     /**
      * Get a single resource by slug
      */
@@ -581,7 +536,7 @@ declare class MarvinClient {
      */
     collectionFallback(slugs: string[], options?: {
         requireEntries?: boolean;
-    }): Promise<MarvinEntryListItem[]>;
+    }): Promise<CollectionEntry[]>;
     /**
      * @deprecated Use workspace.site or marvin.site instead
      */
@@ -589,7 +544,7 @@ declare class MarvinClient {
     /**
      * @deprecated Use workspace.entries.list() instead
      */
-    getEntries(options?: GetEntriesOptions): Promise<MarvinEntryListItem[]>;
+    getEntries(options?: GetEntriesOptions): Promise<ListEntry[]>;
     /**
      * @deprecated Use workspace.entries.get() instead
      */
@@ -605,7 +560,7 @@ declare class MarvinClient {
     /**
      * @deprecated Use workspace.collections.entries() instead
      */
-    getCollectionEntries(slug: string): Promise<MarvinEntryListItem[]>;
+    getCollectionEntries(slug: string): Promise<CollectionEntry[]>;
     /**
      * @deprecated Use workspace.assets.list() instead
      */