@se-studio/contentful-cms 3.4.3 → 3.4.5

package/dist/session/redis-session-store.js

@@ -1,5 +1,5 @@
 import { getRuntimeContext } from '../runtime/context.js';
-import { isSessionLoggingEnabled, sessionLog, sessionLogVerbose } from './log.js';
+import { sessionLog, sessionLogVerbose } from './log.js';
 import { buildSessionKey } from './session-store.js';
 const SESSION_TTL_SECONDS = 60 * 60 * 24 * 7; // 7 days
 /** Parses session JSON from Redis — Upstash may return a deserialized object. */
@@ -31,6 +31,17 @@ export function coerceActivePointerValue(raw) {
     }
     return null;
 }
+/**
+ * Space id for multi-tenant Redis isolation on shared cmsedit-sessions.
+ * Prefer explicit arg; fall back to host env (CONTENTFUL_SPACE_ID).
+ */
+export function resolveSessionSpaceId(explicit) {
+    const fromArg = explicit?.trim();
+    if (fromArg)
+        return fromArg;
+    const fromEnv = process.env['CONTENTFUL_SPACE_ID']?.trim();
+    return fromEnv || undefined;
+}
 export class RedisSessionStore {
     redis;
     keyPrefix;
@@ -41,11 +52,24 @@ export class RedisSessionStore {
     fullKey(sessionKey) {
         return `${this.keyPrefix}${sessionKey}`;
     }
-    activePointerKey(userId, sessionName) {
+    /**
+     * Active pointer is space-scoped so shared Redis across hosts does not
+     * cross-load sessions for the same Contentful user.
+     * - default: cms-edit:session:{userId}:active:{spaceId}
+     * - named:   cms-edit:session:{userId}:active:{spaceId}:{sessionName}
+     */
+    activePointerKey(userId, spaceId, sessionName) {
         if (sessionName) {
-            return `${this.keyPrefix}${userId}:active:${sessionName}`;
+            return `${this.keyPrefix}${userId}:active:${spaceId}:${sessionName}`;
         }
-        return `${this.keyPrefix}${userId}:active`;
+        return `${this.keyPrefix}${userId}:active:${spaceId}`;
+    }
+    /**
+     * SET of full Redis keys (session blobs + pointers) for this user+space.
+     * Enables clearAll without KEYS scans on shared Upstash.
+     */
+    spaceIndexKey(userId, spaceId) {
+        return `${this.keyPrefix}${userId}:index:${spaceId}`;
     }
     getUserId() {
         const userId = getRuntimeContext()?.user?.userId;
@@ -58,38 +82,53 @@ export class RedisSessionStore {
         const userId = this.getUserId();
         if (spaceId && rootEntryId) {
             const sessionKey = buildSessionKey(userId, spaceId, rootEntryId, sessionName);
-            sessionLogVerbose('redis load by id', { userId, sessionName, sessionKey });
+            sessionLogVerbose('redis load by id', { userId, sessionName, sessionKey, spaceId });
             const state = await this.readSession(sessionKey);
             sessionLog(state ? 'redis load hit' : 'redis load miss', {
                 userId,
                 sessionName,
                 sessionKey,
+                spaceId,
                 lookup: 'explicit',
             });
             return state;
         }
-        const pointerKey = this.activePointerKey(userId, sessionName);
-        const resolvedKey = await this.resolveActiveSessionKey(userId, sessionName);
+        const resolvedSpaceId = resolveSessionSpaceId(spaceId);
+        if (!resolvedSpaceId) {
+            sessionLog('redis load miss', {
+                userId,
+                sessionName,
+                lookup: 'active',
+                reason: 'missing_space_id',
+            });
+            return null;
+        }
+        // Active load is pointer-only — no KEYS scan / "latest session" guessing.
+        const pointerKey = this.activePointerKey(userId, resolvedSpaceId, sessionName);
+        const activeKey = coerceActivePointerValue(await this.redis.get(pointerKey));
         sessionLogVerbose('redis load active', {
             userId,
             sessionName,
+            spaceId: resolvedSpaceId,
             pointerKey,
-            resolvedKey,
+            resolvedKey: activeKey,
         });
-        if (!resolvedKey) {
+        if (!activeKey) {
             sessionLog('redis load miss', {
                 userId,
                 sessionName,
+                spaceId: resolvedSpaceId,
                 pointerKey,
                 lookup: 'active',
             });
             return null;
         }
-        const state = await this.readSession(resolvedKey);
+        const state = await this.readSession(activeKey);
         sessionLog(state ? 'redis load hit' : 'redis load miss', {
             userId,
             sessionName,
-            sessionKey: resolvedKey,
+            spaceId: resolvedSpaceId,
+            sessionKey: activeKey,
             pointerKey,
             lookup: 'active',
         });
@@ -98,10 +137,14 @@ export class RedisSessionStore {
     async save(state, sessionName) {
         const userId = this.getUserId();
         const sessionKey = buildSessionKey(userId, state.spaceId, state.rootEntryId, sessionName);
-        const pointerKey = this.activePointerKey(userId, sessionName);
+        const blobKey = this.fullKey(sessionKey);
+        const pointerKey = this.activePointerKey(userId, state.spaceId, sessionName);
+        const indexKey = this.spaceIndexKey(userId, state.spaceId);
         const ttl = { ex: SESSION_TTL_SECONDS };
-        await this.redis.set(this.fullKey(sessionKey), JSON.stringify(state), ttl);
+        await this.redis.set(blobKey, JSON.stringify(state), ttl);
         await this.redis.set(pointerKey, sessionKey, ttl);
+        await this.redis.sadd(indexKey, blobKey, pointerKey);
+        await this.redis.expire(indexKey, SESSION_TTL_SECONDS);
         sessionLog('redis save ok', {
             userId,
             sessionName,
@@ -115,78 +158,42 @@ export class RedisSessionStore {
     async clear(spaceId, rootEntryId, sessionName) {
         const userId = this.getUserId();
         const sessionKey = buildSessionKey(userId, spaceId, rootEntryId, sessionName);
-        await this.redis.del(this.fullKey(sessionKey));
-        const pointerKey = this.activePointerKey(userId, sessionName);
+        const blobKey = this.fullKey(sessionKey);
+        const pointerKey = this.activePointerKey(userId, spaceId, sessionName);
+        const indexKey = this.spaceIndexKey(userId, spaceId);
+        await this.redis.del(blobKey);
         const activeKey = coerceActivePointerValue(await this.redis.get(pointerKey));
         if (activeKey === sessionKey) {
             await this.redis.del(pointerKey);
+            await this.redis.srem(indexKey, pointerKey);
         }
+        await this.redis.srem(indexKey, blobKey);
     }
+    /**
+     * Clears sessions for this host's space only (CONTENTFUL_SPACE_ID / multi-tenant safe).
+     * Uses the per-user+space SET index — no KEYS scan.
+     */
     async clearAll() {
         const userId = this.getUserId();
-        const keys = await this.redis.keys(`${this.keyPrefix}${userId}:*`);
-        await Promise.all(keys.map((key) => this.redis.del(key)));
-    }
-    async readSession(sessionKey) {
-        const raw = await this.redis.get(this.fullKey(sessionKey));
-        return parseSessionValue(raw);
-    }
-    async resolveActiveSessionKey(userId, sessionName) {
-        const pointerKey = this.activePointerKey(userId, sessionName);
-        const activeKey = coerceActivePointerValue(await this.redis.get(pointerKey));
-        if (activeKey) {
-            sessionLogVerbose('redis active pointer hit', { userId, sessionName, pointerKey, activeKey });
-            return activeKey;
+        const spaceId = resolveSessionSpaceId();
+        if (!spaceId) {
+            sessionLog('redis clearAll skipped', { userId, reason: 'missing_space_id' });
+            return;
         }
-        sessionLogVerbose('redis active pointer miss, scanning keys', {
+        const indexKey = this.spaceIndexKey(userId, spaceId);
+        const members = await this.redis.smembers(indexKey);
+        sessionLog('redis clearAll', {
             userId,
-            sessionName,
-            pointerKey,
-        });
-        const fallback = await this.findLatestSessionKeyFallback(userId, sessionName);
-        sessionLogVerbose('redis fallback result', {
-            userId,
-            sessionName,
-            resolvedKey: fallback,
+            spaceId,
+            indexKey,
+            memberCount: members.length,
         });
-        return fallback;
+        await Promise.all(members.map((key) => this.redis.del(key)));
+        await this.redis.del(indexKey);
     }
-    /** Legacy lookup for sessions saved before active pointers existed. */
-    async findLatestSessionKeyFallback(userId, sessionName) {
-        const keys = await this.redis.keys(`${this.keyPrefix}${userId}:*`);
-        const activeSuffix = sessionName ? `:active:${sessionName}` : ':active';
-        const suffix = sessionName ? `-${sessionName}` : undefined;
-        const candidates = keys.filter((key) => {
-            if (key.endsWith(activeSuffix))
-                return false;
-            if (suffix)
-                return key.endsWith(suffix);
-            return !key.includes(':active');
-        });
-        if (candidates.length === 0)
-            return null;
-        sessionLogVerbose('redis fallback candidates', {
-            userId,
-            sessionName,
-            count: candidates.length,
-            keys: isSessionLoggingEnabled() ? candidates : undefined,
-        });
-        let latestKey = null;
-        let latestFetchedAt = '';
-        for (const fullKey of candidates) {
-            const raw = await this.redis.get(fullKey);
-            const state = parseSessionValue(raw);
-            if (!state)
-                continue;
-            const fetchedAt = state.fetchedAt ?? '';
-            if (!latestKey || fetchedAt > latestFetchedAt) {
-                latestKey = fullKey;
-                latestFetchedAt = fetchedAt;
-            }
-        }
-        if (!latestKey)
-            return null;
-        return latestKey.slice(this.keyPrefix.length);
+    async readSession(sessionKey) {
+        const raw = await this.redis.get(this.fullKey(sessionKey));
+        return parseSessionValue(raw);
     }
 }
 //# sourceMappingURL=redis-session-store.js.map

package/dist/session/redis-session-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis-session-store.js","sourceRoot":"","sources":["../../src/session/redis-session-store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"redis-session-store.js","sourceRoot":"","sources":["../../src/session/redis-session-store.ts"],"names":[],"mappings":"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"}

package/dist/session/session-store.d.ts

@@ -13,9 +13,14 @@ export interface RedisClient {
         nx?: boolean;
     }): Promise<boolean | void>;
     del(key: string): Promise<void>;
+    /** Prefer not to use for multi-tenant session isolation — prefer explicit keys / SETs. */
     keys(pattern: string): Promise<string[]>;
     incr(key: string): Promise<number>;
     expire(key: string, seconds: number): Promise<void>;
+    /** Set members — used for per-user+space session index (clearAll without KEYS). */
+    sadd(key: string, ...members: string[]): Promise<number>;
+    srem(key: string, ...members: string[]): Promise<number>;
+    smembers(key: string): Promise<string[]>;
 }
 export declare function buildSessionKey(userId: string | undefined, spaceId: string, rootEntryId: string, sessionName?: string): string;
 export declare function buildSessionNameSuffix(sessionName: string): string;

package/dist/session/session-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../src/session/session-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,WAAW,YAAY;IAC3B,IAAI,CACF,OAAO,CAAC,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,EACpB,WAAW,CAAC,EAAE,MAAM,GACnB,YAAY,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;IACtD,IAAI,CAAC,KAAK,EAAE,YAAY,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxF,QAAQ,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,WAAW;IAC1B,uFAAuF;IACvF,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACnC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAClG,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrD;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,CAIR;AAED,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAElE"}
+{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../src/session/session-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,WAAW,YAAY;IAC3B,IAAI,CACF,OAAO,CAAC,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,EACpB,WAAW,CAAC,EAAE,MAAM,GACnB,YAAY,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;IACtD,IAAI,CAAC,KAAK,EAAE,YAAY,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxF,QAAQ,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,WAAW;IAC1B,uFAAuF;IACvF,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACnC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAClG,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,0FAA0F;IAC1F,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,mFAAmF;IACnF,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACzD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACzD,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CAC1C;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,CAIR;AAED,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAElE"}

package/dist/session/session-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../src/session/session-store.ts"],"names":[],"mappings":"AAuBA,MAAM,UAAU,eAAe,CAC7B,MAA0B,EAC1B,OAAe,EACf,WAAmB,EACnB,WAAoB;IAEpB,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACpD,MAAM,IAAI,GAAG,GAAG,OAAO,IAAI,WAAW,GAAG,MAAM,EAAE,CAAC;IAClD,OAAO,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,WAAmB;IACxD,OAAO,IAAI,WAAW,EAAE,CAAC;AAC3B,CAAC"}
+{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../src/session/session-store.ts"],"names":[],"mappings":"AA4BA,MAAM,UAAU,eAAe,CAC7B,MAA0B,EAC1B,OAAe,EACf,WAAmB,EACnB,WAAoB;IAEpB,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACpD,MAAM,IAAI,GAAG,GAAG,OAAO,IAAI,WAAW,GAAG,MAAM,EAAE,CAAC;IAClD,OAAO,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,WAAmB;IACxD,OAAO,IAAI,WAAW,EAAE,CAAC;AAC3B,CAAC"}

package/docs/editor-tasks/create-from-document.md

@@ -31,8 +31,9 @@
 
 1. If the package includes a **folder of images/videos** (typical case study): run **`task-media-pipeline-prepare`** **before** building blocks.
 2. Prefer pipeline **ready public URLs** + reuse-first import over mid-build staged upload of oversized masters.
-3. Keep the `sourceName → assetId` map for Phase 2 field linking.
-4. Skip this phase only when every needed visual is already in the Contentful library (confirmed via `asset search`).
+3. On import: use **`onlyWithOverrides` or `sourceNames`** so only beat-sheet assets land in Contentful; **dryRun first**; use unique `fileName` overrides when you must not reuse prior lab assets.
+4. Keep the `sourceName → assetId` / `mediaId` map for Phase 2 field linking. Singular component visuals: `set @cN visual <mediaId> --link` (never `add --target visual`).
+5. Skip this phase only when every needed visual is already in the Contentful library (confirmed via `asset search`).
 
 ### Phase 2 — Plan and create
 

package/docs/editor-tasks/media-pipeline-prepare.md

@@ -25,7 +25,8 @@ Normalize a **folder of designer masters** into short-lived **public HTTPS URLs*
   - `MEDIA_PIPELINE_TENANT` (e.g. `se`, not the cms-edit projectKey)
 - Drive folder shared **Viewer** with pipeline service account  
   `media-pipeline-reader@se-media-pipeline.iam.gserviceaccount.com`  
-  (or “anyone with the link” if using API-key Drive mode on the pipeline)
+  (or “anyone with the link” if using API-key Drive mode on the pipeline).  
+  **If prepare/status reports `drive_inaccessible` or `drive_empty_or_unshared`:** fix the share first, then re-prepare **once**. Do not treat “no media files” as a wrong folder path until share is confirmed.
 - Profile default: `case-study-v1`
 
 ## When to use
@@ -106,26 +107,44 @@ Each asset includes:
 
 After drafting titles/alts from **previewUrl** / **posterUrl**:
 
+**Prefer filtering** so unused files in a shared Drive folder are not uploaded:
+
+| Param | Use |
+|-------|-----|
+| `sourceNames` | Exact catalog `sourceName` allowlist (Drive file names) |
+| `excludeSourceNames` | Skip specific files |
+| `onlyWithOverrides` | Import only assets that have an `overrides` row (typical case-study path) |
+
 ```json
 {
   "action": "import",
   "jobId": "<jobId>",
   "withMedia": true,
+  "onlyWithOverrides": true,
   "overrides": [
-    { "sourceName": "OM1_Hero.jpg", "title": "OM1 hero", "alt": "…" }
-  ]
+    { "sourceName": "OM1_Hero.jpg", "title": "OM1 hero", "alt": "…", "fileName": "se-om1-hero-v3.jpg" }
+  ],
+  "dryRun": true
 }
 ```
 
-Optional: `"dryRun": true` to preview the map without writing.
+1. Always **`dryRun: true` first** — check `existing: true/false` per asset (reuse is by **fileName**).
+2. When you need **new** assets instead of reusing prior runs, set `overrides[].fileName` to unique names.
+3. Then import without `dryRun`.
 
-CLI: `cms-edit media import --job <id> [--dry-run] [--with-media] [--overrides-json '[…]']`
+CLI:  
+`cms-edit media import --job <id> [--dry-run] [--with-media] [--only-with-overrides] [--source-names a.jpg,b.jpg] [--exclude-source-names x.jpg] [--overrides-json '[…]']`
 
 Import:
 
-1. Searches existing assets by fileName  
-2. Else uploads from `readyUrl` as the authenticated Contentful user  
-3. Returns `map: { sourceName → { assetId, mediaId?, … } }` for page build  
+1. Filters catalog (allowlist / exclude / onlyWithOverrides)  
+2. Searches existing assets by fileName  
+3. Else uploads from `readyUrl` as the authenticated Contentful user  
+4. Returns `map`, `skipped[]`, and `counts` for page build  
+
+**Linking Media to components:** use singular Entry links with  
+`cms_edit ["set", "@cN", "visual", "<mediaId>", "--link"]`  
+— **never** `add … --target visual` (`add` only supports content **arrays**).
 
 Manual `asset upload --url` remains available for one-offs.
 
@@ -135,3 +154,4 @@ Manual `asset upload --url` remains available for one-offs.
 - Rate limits apply (prepares/hour, concurrent jobs).  
 - Never document or request `MEDIA_PIPELINE_API_KEY` or Blob tokens in chat.
 - `provisioning` is **not** a real pipeline phase; do not treat it as “still encoding” for many minutes.
+- If the MCP client times out (~180s) on `set`/`rtf`/`import`, **read / catalog / diff before retrying** — the server may already have applied the change.

package/docs/editor-tasks/media-reuse-and-upload.md

@@ -23,8 +23,12 @@
    - `cms_edit ["asset", "search", "--filename-match", "<partial-name>"]`
    - `cms_edit ["list", "--type", "media", "--asset-filename-match", "<partial>"]`
 3. If match found — link by asset ID or filename in `set` / `create from-json` (`featuredImageAssetFilename`, `visualAssetFilename`, etc.)
-4. For **`visuals`** (Media entry array): prefer an **existing Media entry** — `cms_edit ["list", "--type", "media", "--asset-id", "<assetId>"]` — then `set @root visuals <mediaEntryId> --links`. Do **not** `create media` or use `asset upload --with-media` when a wrapper already exists.
-5. `create media` only when no Media entry wraps that asset (RTF embeds, or first article in a new composite batch — then **reuse that media ID** on sibling entries)
+4. For **`visuals`** (Media entry **array** on page/article): prefer an **existing Media entry** — `cms_edit ["list", "--type", "media", "--asset-id", "<assetId>"]` — then `set @root visuals <mediaEntryId> --links`. Do **not** `create media` or use `asset upload --with-media` when a wrapper already exists.
+5. For **singular** component fields (e.g. `visual` on a component):  
+   `cms_edit ["set", "@cN", "visual", "<mediaEntryId>", "--link"]`  
+   **Never** `add media --parent @cN --target visual` — `add --target` only works for Entry-link **arrays** (`content`, `contents`, …). Bad `add --target` is rejected; it used to orphan Media drafts.
+6. `create media` only when no Media entry wraps that asset (RTF embeds, or first article in a new composite batch — then **reuse that media ID** on sibling entries)
+7. Bare Contentful entry IDs work with `set` (no `@` required) for mid-session Media field tweaks (width/autoplay/loop) after import — `set <mediaEntryId> width 75`.
 
 ## Upload only when no match
 
@@ -89,7 +93,13 @@ cms_edit ["diff"]
 cms_edit ["save"]
 ```
 
-**Component visual / article featured image:** same pattern — `asset set <ref> <field> <asset-id>` (or `set … --asset`).
+**Component `visual` (Media Entry link, singular):**
+
+```
+cms_edit ["set", "@cN", "visual", "<media-entry-id>", "--link"]
+```
+
+**Article featured image / asset fields:** `asset set <ref> <field> <asset-id>` (or `set … --asset`) when the field is an Asset link.
 
 Always `diff` → `save`. Verify with `preview urls` on the public path.
 

package/docs/editor-tasks/preview-verify.md

@@ -23,11 +23,11 @@ After saving a draft, agents should return **all applicable URLs** and explain w
 
 | Target | Label | When to use |
 |--------|-------|-------------|
-| **contentfulLivePreview** | Live preview (publish here) | **Primary for editors.** Opens `app.contentful.com/.../entries/.../preview/...` — in-app preview with inspector. User clicks the green **Publish** button at the top to go live. |
-| **staging** | Preview (staging site) | Full-page check on staging, e.g. `{devBaseUrl}/resources/news/{tag}/{slug}/` (includes Vercel bypass params when configured). |
+| **contentfulLivePreview** | Live preview (publish here) | **Primary for editors when `url` is present.** Opens `app.contentful.com/.../entries/.../preview/...` — in-app preview with inspector. User clicks the green **Publish** button at the top to go live. If `url` is `null`, read `unavailableReason` / `notes` — do not invent a Live Preview link; use **staging** + **contentfulEntry** instead. |
+| **staging** | Preview (staging site) | Full-page check on staging, e.g. `{devBaseUrl}/resources/news/{tag}/{slug}/` (includes Vercel bypass params when configured). Always valid for draft visibility when staging is configured. |
 | **siteLivePreview** | Preview redirect | `{devBaseUrl}/preview?id={entryId}` — entry-aware redirect to the staging path. |
 | **production** | Production site | Published content only — compare after publish. |
-| **contentfulEntry** | Contentful entry editor | Classic entry form. Prefer **Live preview** for review and publish. |
+| **contentfulEntry** | Contentful entry editor | Classic entry form. Prefer **Live preview** when available; otherwise this is the publish path. |
 
 ## Steps
 
@@ -41,9 +41,10 @@ After saving a draft, agents should return **all applicable URLs** and explain w
    ```
    Use `--json` for machine-readable output.
 
-2. **Hand off to the editor with both links:**
-   - **Live preview** — for reviewing the draft and publishing (green Publish button in Contentful).
-   - **Preview (staging site)** — for a full-screen check on the staging deployment.
+2. **Hand off to the editor:**
+   - **Live preview** — when `url` is non-null: reviewing the draft and publishing (green Publish button in Contentful).
+   - **Preview (staging site)** — full-screen check on the staging deployment (always offer when available).
+   - If Live Preview is unavailable, say so briefly using `unavailableReason` and point at staging + classic entry editor.
 
 3. Summarize what to check before publish handoff — use the checklist below (add multi-block items when relevant).
 

package/docs/mcp/hosted-guide.md

@@ -148,6 +148,17 @@ Hosted connectors have **no server filesystem** and **reject `asset upload --bas
 
 Full workflow: `cms-edit://customer/task-media-reuse-and-upload`.
 
+### Common pitfalls (agents)
+
+| Issue | Do this |
+|-------|---------|
+| Singular Media on a component (`visual`) | `set @cN visual <mediaId> --link` — **not** `add … --target visual` |
+| Shared Drive folder has extra files | Import with `sourceNames` or `onlyWithOverrides` after catalog |
+| Prepare says no media / empty folder | Share folder **Viewer** with `media-pipeline-reader@se-media-pipeline.iam.gserviceaccount.com`, then re-prepare once |
+| MCP tool times out ~180s | `read` / `diff` / re-`catalog` before retrying the same write — server may already have saved |
+| `preview urls` has no Live Preview URL | Use staging + classic entry editor; row includes `unavailableReason` when CMA preview fails |
+| Reuse-first import matches old fileNames | dry-run first; set `overrides[].fileName` for unique names when duplication is required |
+
 ### Staged upload
 
 Keeps binary **out of MCP tool args**. The agent uploads via `curl`, then passes only a short `uploadId`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@se-studio/contentful-cms",
-  "version": "3.4.3",
+  "version": "3.4.5",
   "description": "CLI tool for AI agents to read and edit Contentful draft content without publish permissions",
   "repository": {
     "type": "git",