@churchapps/content-provider-helper 0.0.3 → 0.0.4

package/dist/index.js

@@ -18,11 +18,11 @@ function detectMediaType(url, explicitType) {
   const videoPatterns = [".mp4", ".webm", ".m3u8", ".mov", "stream.mux.com"];
   return videoPatterns.some((p) => url.includes(p)) ? "video" : "image";
 }
-function createFolder(id, title, path, image, providerData, isLeaf) {
-  return { type: "folder", id, title, path, image, isLeaf, providerData };
+function createFolder(id, title, path, image, isLeaf) {
+  return { type: "folder", id, title, path, image, isLeaf };
 }
 function createFile(id, title, url, options) {
-  return { type: "file", id, title, url, mediaType: options?.mediaType ?? detectMediaType(url), image: options?.image, muxPlaybackId: options?.muxPlaybackId, providerData: options?.providerData };
+  return { type: "file", id, title, url, mediaType: options?.mediaType ?? detectMediaType(url), image: options?.image, muxPlaybackId: options?.muxPlaybackId, seconds: options?.seconds, loop: options?.loop, loopVideo: options?.loopVideo, streamUrl: options?.streamUrl };
 }
 
 // src/pathUtils.ts
@@ -49,10 +49,61 @@ function appendToPath(basePath, segment) {
   return cleanBase + "/" + segment;
 }
 
+// src/instructionPathUtils.ts
+function navigateToPath(instructions, path) {
+  if (!path || !instructions?.items) return null;
+  const indices = path.split(".").map(Number);
+  if (indices.some(isNaN)) return null;
+  let current = instructions.items[indices[0]] || null;
+  for (let i = 1; i < indices.length && current; i++) {
+    current = current.children?.[indices[i]] || null;
+  }
+  return current;
+}
+function generatePath(indices) {
+  return indices.join(".");
+}
+
+// src/durationUtils.ts
+var DEFAULT_DURATION_CONFIG = {
+  secondsPerImage: 15,
+  wordsPerMinute: 150
+};
+function countWords(text) {
+  if (!text || !text.trim()) return 0;
+  return text.trim().split(/\s+/).length;
+}
+function estimateImageDuration(config = {}) {
+  return config.secondsPerImage ?? DEFAULT_DURATION_CONFIG.secondsPerImage;
+}
+function estimateTextDuration(text, config = {}) {
+  const words = countWords(text);
+  const wpm = config.wordsPerMinute ?? DEFAULT_DURATION_CONFIG.wordsPerMinute;
+  return Math.ceil(words / wpm * 60);
+}
+function estimateDuration(mediaType, options) {
+  const config = options?.config ?? {};
+  switch (mediaType) {
+    case "image":
+      return estimateImageDuration(config);
+    case "text":
+      if (options?.wordCount) {
+        const wpm = config.wordsPerMinute ?? DEFAULT_DURATION_CONFIG.wordsPerMinute;
+        return Math.ceil(options.wordCount / wpm * 60);
+      }
+      if (options?.text) {
+        return estimateTextDuration(options.text, config);
+      }
+      return 0;
+    case "video":
+    default:
+      return 0;
+  }
+}
+
 // src/FormatConverters.ts
 var FormatConverters_exports = {};
 __export(FormatConverters_exports, {
-  collapseInstructions: () => collapseInstructions,
   expandedInstructionsToPlaylist: () => expandedInstructionsToPlaylist,
   expandedInstructionsToPresentations: () => expandedInstructionsToPresentations,
   instructionsToPlaylist: () => instructionsToPlaylist,
@@ -61,7 +112,6 @@ __export(FormatConverters_exports, {
   playlistToInstructions: () => playlistToInstructions,
   playlistToPresentations: () => playlistToPresentations,
   presentationsToExpandedInstructions: () => presentationsToExpandedInstructions,
-  presentationsToInstructions: () => presentationsToInstructions,
   presentationsToPlaylist: () => presentationsToPlaylist
 });
 function generateId() {
@@ -105,21 +155,15 @@ function presentationsToPlaylist(plan) {
   }
   return files;
 }
-function presentationsToInstructions(plan) {
-  return { venueName: plan.name, items: plan.sections.map((section) => ({ id: section.id, itemType: "section", label: section.name, children: section.presentations.map((pres) => {
-    const totalSeconds = pres.files.reduce((sum, f) => sum + (f.providerData?.seconds || 0), 0);
-    return { id: pres.id, itemType: mapActionTypeToItemType(pres.actionType), label: pres.name, seconds: totalSeconds || void 0, embedUrl: pres.files[0]?.embedUrl || pres.files[0]?.url };
-  }) })) };
-}
 function presentationsToExpandedInstructions(plan) {
-  return { venueName: plan.name, items: plan.sections.map((section) => ({ id: section.id, itemType: "section", label: section.name, children: section.presentations.map((pres) => ({ id: pres.id, itemType: mapActionTypeToItemType(pres.actionType), label: pres.name, description: pres.actionType !== "other" ? pres.actionType : void 0, seconds: pres.files.reduce((sum, f) => sum + (f.providerData?.seconds || 0), 0) || void 0, children: pres.files.map((f) => ({ id: f.id, itemType: "file", label: f.title, seconds: f.providerData?.seconds || void 0, embedUrl: f.embedUrl || f.url })) })) })) };
+  return { venueName: plan.name, items: plan.sections.map((section) => ({ id: section.id, itemType: "section", label: section.name, children: section.presentations.map((pres) => ({ id: pres.id, itemType: mapActionTypeToItemType(pres.actionType), label: pres.name, description: pres.actionType !== "other" ? pres.actionType : void 0, seconds: pres.files.reduce((sum, f) => sum + (f.seconds || 0), 0) || void 0, children: pres.files.map((f) => ({ id: f.id, itemType: "file", label: f.title, seconds: f.seconds, embedUrl: f.embedUrl || f.url })) })) })) };
 }
 function instructionsToPlaylist(instructions) {
   const files = [];
   function extractFiles(items) {
     for (const item of items) {
       if (item.embedUrl && (item.itemType === "file" || !item.children?.length)) {
-        files.push({ type: "file", id: item.id || item.relatedId || generateId(), title: item.label || "Untitled", mediaType: detectMediaType(item.embedUrl), url: item.embedUrl, embedUrl: item.embedUrl, providerData: item.seconds ? { seconds: item.seconds } : void 0 });
+        files.push({ type: "file", id: item.id || item.relatedId || generateId(), title: item.label || "Untitled", mediaType: detectMediaType(item.embedUrl), url: item.embedUrl, embedUrl: item.embedUrl, seconds: item.seconds });
       }
       if (item.children) {
         extractFiles(item.children);
@@ -138,14 +182,14 @@ function instructionsToPresentations(instructions, planId) {
       if (presItem.children && presItem.children.length > 0) {
         for (const child of presItem.children) {
           if (child.embedUrl) {
-            const file = { type: "file", id: child.id || child.relatedId || generateId(), title: child.label || "Untitled", mediaType: detectMediaType(child.embedUrl), url: child.embedUrl, embedUrl: child.embedUrl, providerData: child.seconds ? { seconds: child.seconds } : void 0 };
+            const file = { type: "file", id: child.id || child.relatedId || generateId(), title: child.label || "Untitled", mediaType: detectMediaType(child.embedUrl), url: child.embedUrl, embedUrl: child.embedUrl, seconds: child.seconds };
             allFiles.push(file);
             files.push(file);
           }
         }
       }
       if (files.length === 0 && presItem.embedUrl) {
-        const file = { type: "file", id: presItem.id || presItem.relatedId || generateId(), title: presItem.label || "Untitled", mediaType: detectMediaType(presItem.embedUrl), url: presItem.embedUrl, embedUrl: presItem.embedUrl, providerData: presItem.seconds ? { seconds: presItem.seconds } : void 0 };
+        const file = { type: "file", id: presItem.id || presItem.relatedId || generateId(), title: presItem.label || "Untitled", mediaType: detectMediaType(presItem.embedUrl), url: presItem.embedUrl, embedUrl: presItem.embedUrl, seconds: presItem.seconds };
         allFiles.push(file);
         files.push(file);
       }
@@ -156,40 +200,12 @@ function instructionsToPresentations(instructions, planId) {
   return { id: planId || generateId(), name: instructions.venueName || "Plan", sections, allFiles };
 }
 var expandedInstructionsToPresentations = instructionsToPresentations;
-function collapseInstructions(instructions, maxDepth = 2) {
-  function collapseItem(item, currentDepth) {
-    if (currentDepth >= maxDepth || !item.children || item.children.length === 0) {
-      const { children, ...rest } = item;
-      if (children && children.length > 0) {
-        const totalSeconds = children.reduce((sum, c) => sum + (c.seconds || 0), 0);
-        if (totalSeconds > 0) {
-          rest.seconds = totalSeconds;
-        }
-        if (!rest.embedUrl) {
-          const firstWithUrl = children.find((c) => c.embedUrl);
-          if (firstWithUrl) {
-            rest.embedUrl = firstWithUrl.embedUrl;
-          }
-        }
-      }
-      return rest;
-    }
-    return {
-      ...item,
-      children: item.children.map((child) => collapseItem(child, currentDepth + 1))
-    };
-  }
-  return {
-    venueName: instructions.venueName,
-    items: instructions.items.map((item) => collapseItem(item, 0))
-  };
-}
 function playlistToPresentations(files, planName = "Playlist", sectionName = "Content") {
   const presentations = files.map((file, index) => ({ id: `pres-${index}-${file.id}`, name: file.title, actionType: "play", files: [file] }));
   return { id: "playlist-plan-" + generateId(), name: planName, sections: [{ id: "main-section", name: sectionName, presentations }], allFiles: [...files] };
 }
 function playlistToInstructions(files, venueName = "Playlist") {
-  return { venueName, items: [{ id: "main-section", itemType: "section", label: "Content", children: files.map((file, index) => ({ id: file.id || `item-${index}`, itemType: "file", label: file.title, seconds: file.providerData?.seconds || void 0, embedUrl: file.embedUrl || file.url })) }] };
+  return { venueName, items: [{ id: "main-section", itemType: "section", label: "Content", children: files.map((file, index) => ({ id: file.id || `item-${index}`, itemType: "file", label: file.title, seconds: file.seconds, embedUrl: file.embedUrl || file.url })) }] };
 }
 var playlistToExpandedInstructions = playlistToInstructions;
 
@@ -217,14 +233,10 @@ var FormatResolver = class {
       const plan = await this.provider.getPresentations(path, auth);
       if (plan) return presentationsToPlaylist(plan);
     }
-    if (caps.expandedInstructions && this.provider.getExpandedInstructions) {
-      const expanded = await this.provider.getExpandedInstructions(path, auth);
+    if (caps.instructions && this.provider.getInstructions) {
+      const expanded = await this.provider.getInstructions(path, auth);
       if (expanded) return instructionsToPlaylist(expanded);
     }
-    if (this.options.allowLossy && caps.instructions && this.provider.getInstructions) {
-      const instructions = await this.provider.getInstructions(path, auth);
-      if (instructions) return instructionsToPlaylist(instructions);
-    }
     return null;
   }
   async getPlaylistWithMeta(path, auth) {
@@ -239,13 +251,9 @@ var FormatResolver = class {
       const plan = await this.provider.getPresentations(path, auth);
       if (plan) return { data: presentationsToPlaylist(plan), meta: { isNative: false, sourceFormat: "presentations", isLossy: false } };
     }
-    if (caps.expandedInstructions && this.provider.getExpandedInstructions) {
-      const expanded = await this.provider.getExpandedInstructions(path, auth);
-      if (expanded) return { data: instructionsToPlaylist(expanded), meta: { isNative: false, sourceFormat: "expandedInstructions", isLossy: false } };
-    }
-    if (this.options.allowLossy && caps.instructions && this.provider.getInstructions) {
-      const instructions = await this.provider.getInstructions(path, auth);
-      if (instructions) return { data: instructionsToPlaylist(instructions), meta: { isNative: false, sourceFormat: "instructions", isLossy: true } };
+    if (caps.instructions && this.provider.getInstructions) {
+      const expanded = await this.provider.getInstructions(path, auth);
+      if (expanded) return { data: instructionsToPlaylist(expanded), meta: { isNative: false, sourceFormat: "instructions", isLossy: false } };
     }
     return { data: null, meta: { isNative: false, isLossy: false } };
   }
@@ -256,13 +264,9 @@ var FormatResolver = class {
       const result = await this.provider.getPresentations(path, auth);
       if (result) return result;
     }
-    if (caps.expandedInstructions && this.provider.getExpandedInstructions) {
-      const expanded = await this.provider.getExpandedInstructions(path, auth);
-      if (expanded) return instructionsToPresentations(expanded, fallbackId);
-    }
     if (caps.instructions && this.provider.getInstructions) {
-      const instructions = await this.provider.getInstructions(path, auth);
-      if (instructions) return instructionsToPresentations(instructions, fallbackId);
+      const expanded = await this.provider.getInstructions(path, auth);
+      if (expanded) return instructionsToPresentations(expanded, fallbackId);
     }
     if (this.options.allowLossy && caps.playlist && this.provider.getPlaylist) {
       const playlist = await this.provider.getPlaylist(path, auth);
@@ -281,13 +285,9 @@ var FormatResolver = class {
         return { data: result, meta: { isNative: true, isLossy: false } };
       }
     }
-    if (caps.expandedInstructions && this.provider.getExpandedInstructions) {
-      const expanded = await this.provider.getExpandedInstructions(path, auth);
-      if (expanded) return { data: instructionsToPresentations(expanded, fallbackId), meta: { isNative: false, sourceFormat: "expandedInstructions", isLossy: false } };
-    }
     if (caps.instructions && this.provider.getInstructions) {
-      const instructions = await this.provider.getInstructions(path, auth);
-      if (instructions) return { data: instructionsToPresentations(instructions, fallbackId), meta: { isNative: false, sourceFormat: "instructions", isLossy: true } };
+      const expanded = await this.provider.getInstructions(path, auth);
+      if (expanded) return { data: instructionsToPresentations(expanded, fallbackId), meta: { isNative: false, sourceFormat: "instructions", isLossy: false } };
     }
     if (this.options.allowLossy && caps.playlist && this.provider.getPlaylist) {
       const playlist = await this.provider.getPlaylist(path, auth);
@@ -302,13 +302,9 @@ var FormatResolver = class {
       const result = await this.provider.getInstructions(path, auth);
       if (result) return result;
     }
-    if (caps.expandedInstructions && this.provider.getExpandedInstructions) {
-      const expanded = await this.provider.getExpandedInstructions(path, auth);
-      if (expanded) return collapseInstructions(expanded);
-    }
     if (caps.presentations) {
       const plan = await this.provider.getPresentations(path, auth);
-      if (plan) return presentationsToInstructions(plan);
+      if (plan) return presentationsToExpandedInstructions(plan);
     }
     if (this.options.allowLossy && caps.playlist && this.provider.getPlaylist) {
       const playlist = await this.provider.getPlaylist(path, auth);
@@ -327,60 +323,10 @@ var FormatResolver = class {
         return { data: result, meta: { isNative: true, isLossy: false } };
       }
     }
-    if (caps.expandedInstructions && this.provider.getExpandedInstructions) {
-      const expanded = await this.provider.getExpandedInstructions(path, auth);
-      if (expanded) return { data: collapseInstructions(expanded), meta: { isNative: false, sourceFormat: "expandedInstructions", isLossy: true } };
-    }
-    if (caps.presentations) {
-      const plan = await this.provider.getPresentations(path, auth);
-      if (plan) return { data: presentationsToInstructions(plan), meta: { isNative: false, sourceFormat: "presentations", isLossy: false } };
-    }
-    if (this.options.allowLossy && caps.playlist && this.provider.getPlaylist) {
-      const playlist = await this.provider.getPlaylist(path, auth);
-      if (playlist && playlist.length > 0) return { data: playlistToInstructions(playlist, fallbackTitle), meta: { isNative: false, sourceFormat: "playlist", isLossy: true } };
-    }
-    return { data: null, meta: { isNative: false, isLossy: false } };
-  }
-  async getExpandedInstructions(path, auth) {
-    const caps = this.provider.capabilities;
-    const fallbackTitle = this.getIdFromPath(path);
-    if (caps.expandedInstructions && this.provider.getExpandedInstructions) {
-      const result = await this.provider.getExpandedInstructions(path, auth);
-      if (result) return result;
-    }
-    if (caps.presentations) {
-      const plan = await this.provider.getPresentations(path, auth);
-      if (plan) return presentationsToExpandedInstructions(plan);
-    }
-    if (caps.instructions && this.provider.getInstructions) {
-      const instructions = await this.provider.getInstructions(path, auth);
-      if (instructions) return instructions;
-    }
-    if (this.options.allowLossy && caps.playlist && this.provider.getPlaylist) {
-      const playlist = await this.provider.getPlaylist(path, auth);
-      if (playlist && playlist.length > 0) {
-        return playlistToInstructions(playlist, fallbackTitle);
-      }
-    }
-    return null;
-  }
-  async getExpandedInstructionsWithMeta(path, auth) {
-    const caps = this.provider.capabilities;
-    const fallbackTitle = this.getIdFromPath(path);
-    if (caps.expandedInstructions && this.provider.getExpandedInstructions) {
-      const result = await this.provider.getExpandedInstructions(path, auth);
-      if (result) {
-        return { data: result, meta: { isNative: true, isLossy: false } };
-      }
-    }
     if (caps.presentations) {
       const plan = await this.provider.getPresentations(path, auth);
       if (plan) return { data: presentationsToExpandedInstructions(plan), meta: { isNative: false, sourceFormat: "presentations", isLossy: false } };
     }
-    if (caps.instructions && this.provider.getInstructions) {
-      const instructions = await this.provider.getInstructions(path, auth);
-      if (instructions) return { data: instructions, meta: { isNative: false, sourceFormat: "instructions", isLossy: true } };
-    }
     if (this.options.allowLossy && caps.playlist && this.provider.getPlaylist) {
       const playlist = await this.provider.getPlaylist(path, auth);
       if (playlist && playlist.length > 0) return { data: playlistToInstructions(playlist, fallbackTitle), meta: { isNative: false, sourceFormat: "playlist", isLossy: true } };
@@ -437,22 +383,13 @@ var OAuthHelper = class {
         code_verifier: codeVerifier
       });
       const tokenUrl = `${config.oauthBase}/token`;
-      console.log(`${providerId} token exchange request to: ${tokenUrl}`);
-      console.log(`  - client_id: ${config.clientId}`);
-      console.log(`  - redirect_uri: ${redirectUri}`);
-      console.log(`  - code: ${code.substring(0, 10)}...`);
       const response = await fetch(tokenUrl, { method: "POST", headers: { "Content-Type": "application/x-www-form-urlencoded" }, body: params.toString() });
-      console.log(`${providerId} token response status: ${response.status}`);
       if (!response.ok) {
-        const errorText = await response.text();
-        console.error(`${providerId} token exchange failed: ${response.status} - ${errorText}`);
         return null;
       }
       const data = await response.json();
-      console.log(`${providerId} token exchange successful, got access_token: ${!!data.access_token}`);
       return { access_token: data.access_token, refresh_token: data.refresh_token, token_type: data.token_type || "Bearer", created_at: Math.floor(Date.now() / 1e3), expires_in: data.expires_in, scope: data.scope || config.scopes.join(" ") };
-    } catch (error) {
-      console.error(`${providerId} token exchange error:`, error);
+    } catch {
       return null;
     }
   }
@@ -537,25 +474,19 @@ var ApiHelper = class {
     if (!auth) return null;
     return { Authorization: `Bearer ${auth.access_token}`, Accept: "application/json" };
   }
-  async apiRequest(config, providerId, path, auth, method = "GET", body) {
+  async apiRequest(config, _providerId, path, auth, method = "GET", body) {
     try {
       const url = `${config.apiBase}${path}`;
       const headers = { Accept: "application/json" };
       if (auth) headers["Authorization"] = `Bearer ${auth.access_token}`;
       if (body) headers["Content-Type"] = "application/json";
-      console.log(`${providerId} API request: ${method} ${url}`);
-      console.log(`${providerId} API auth present: ${!!auth}`);
       const options = { method, headers, ...body ? { body: JSON.stringify(body) } : {} };
       const response = await fetch(url, options);
-      console.log(`${providerId} API response status: ${response.status}`);
       if (!response.ok) {
-        const errorText = await response.text();
-        console.error(`${providerId} API request failed: ${response.status} - ${errorText}`);
         return null;
       }
       return await response.json();
-    } catch (error) {
-      console.error(`${providerId} API request error:`, error);
+    } catch {
       return null;
     }
   }
@@ -578,18 +509,6 @@ var ContentProvider = class {
     return null;
   }
   async getInstructions(path, auth) {
-    const caps = this.getCapabilities();
-    if (caps.expandedInstructions) {
-      const expanded = await this.getExpandedInstructions(path, auth);
-      if (expanded) return collapseInstructions(expanded);
-    }
-    if (caps.presentations) {
-      const plan = await this.getPresentations(path, auth);
-      if (plan) return presentationsToInstructions(plan);
-    }
-    return null;
-  }
-  async getExpandedInstructions(path, auth) {
     const caps = this.getCapabilities();
     if (caps.presentations) {
       const plan = await this.getPresentations(path, auth);
@@ -601,7 +520,7 @@ var ContentProvider = class {
     return !!this.config.clientId;
   }
   getCapabilities() {
-    return { browse: true, presentations: false, playlist: false, instructions: false, expandedInstructions: false, mediaLicensing: false };
+    return { browse: true, presentations: false, playlist: false, instructions: false, mediaLicensing: false };
   }
   checkMediaLicense(_mediaId, _auth) {
     return Promise.resolve(null);
@@ -656,11 +575,11 @@ var ContentProvider = class {
     return this.apiHelper.apiRequest(this.config, this.id, path, auth, method, body);
   }
   // Content factories
-  createFolder(id, title, path, image, providerData, isLeaf) {
-    return { type: "folder", id, title, path, image, isLeaf, providerData };
+  createFolder(id, title, path, image, isLeaf) {
+    return { type: "folder", id, title, path, image, isLeaf };
   }
   createFile(id, title, url, options) {
-    return { type: "file", id, title, url, mediaType: options?.mediaType ?? detectMediaType(url), image: options?.image, muxPlaybackId: options?.muxPlaybackId, providerData: options?.providerData };
+    return { type: "file", id, title, url, mediaType: options?.mediaType ?? detectMediaType(url), image: options?.image, muxPlaybackId: options?.muxPlaybackId, seconds: options?.seconds, loop: options?.loop, loopVideo: options?.loopVideo, streamUrl: options?.streamUrl };
   }
 };
 
@@ -674,14 +593,13 @@ var APlayProvider = class {
     this.config = { id: "aplay", name: "APlay", apiBase: "https://api-prod.amazingkids.app", oauthBase: "https://api.joinamazing.com/prod/aims/oauth", clientId: "xFJFq7yNYuXXXMx0YBiQ", scopes: ["openid", "profile", "email"], endpoints: { modules: "/prod/curriculum/modules", productLibraries: (productId) => `/prod/curriculum/modules/products/${productId}/libraries`, libraryMedia: (libraryId) => `/prod/creators/libraries/${libraryId}/media` } };
     this.requiresAuth = true;
     this.authTypes = ["oauth_pkce"];
-    this.capabilities = { browse: true, presentations: true, playlist: false, instructions: false, expandedInstructions: false, mediaLicensing: true };
+    this.capabilities = { browse: true, presentations: true, playlist: true, instructions: true, mediaLicensing: true };
   }
   async apiRequest(path, auth) {
     return this.apiHelper.apiRequest(this.config, this.id, path, auth);
   }
   async browse(path, auth) {
     const { segments, depth } = parsePath(path);
-    console.log("APlay browse called with path:", path, "depth:", depth);
     if (depth === 0) {
       return [{
         type: "folder",
@@ -714,12 +632,9 @@ var APlayProvider = class {
     return [];
   }
   async getModules(auth) {
-    console.log(`APlay fetching modules from: ${this.config.endpoints.modules}`);
     const response = await this.apiRequest(this.config.endpoints.modules, auth);
-    console.log("APlay modules response:", response ? "received" : "null");
     if (!response) return [];
     const modules = response.data || response.modules || response;
-    console.log("APlay modules count:", Array.isArray(modules) ? modules.length : "not an array");
     if (!Array.isArray(modules)) return [];
     const items = [];
     for (const m of modules) {
@@ -727,77 +642,46 @@ var APlayProvider = class {
       const moduleId = m.id || m.moduleId;
       const moduleTitle = m.title || m.name;
       const moduleImage = m.image;
-      const allProducts = m.products || [];
-      const products = allProducts.filter((p) => !p.isHidden);
-      if (products.length === 0) {
-        items.push({
-          type: "folder",
-          id: moduleId,
-          title: moduleTitle,
-          image: moduleImage,
-          path: `/modules/${moduleId}`,
-          providerData: { productCount: 0 }
-        });
-      } else if (products.length === 1) {
-        const product = products[0];
-        items.push({
-          type: "folder",
-          id: product.productId || product.id,
-          title: moduleTitle,
-          image: moduleImage || product.image,
-          path: `/modules/${moduleId}`,
-          providerData: { productCount: 1, productId: product.productId || product.id }
-        });
-      } else {
-        items.push({
-          type: "folder",
-          id: moduleId,
-          title: moduleTitle,
-          image: moduleImage,
-          path: `/modules/${moduleId}`,
-          providerData: {
-            productCount: products.length,
-            products: products.map((p) => ({
-              id: p.productId || p.id,
-              title: p.title || p.name,
-              image: p.image
-            }))
-          }
-        });
-      }
+      items.push({
+        type: "folder",
+        id: moduleId,
+        title: moduleTitle,
+        image: moduleImage,
+        path: `/modules/${moduleId}`
+      });
     }
     return items;
   }
   async getModuleContent(moduleId, currentPath, auth) {
-    const modules = await this.getModules(auth);
-    const module = modules.find((m) => m.id === moduleId || m.providerData?.productId === moduleId);
+    const response = await this.apiRequest(this.config.endpoints.modules, auth);
+    if (!response) return [];
+    const modules = response.data || response.modules || response;
+    if (!Array.isArray(modules)) return [];
+    const module = modules.find((m) => (m.id || m.moduleId) === moduleId);
     if (!module) return [];
-    const providerData = module.providerData;
-    const productCount = providerData?.productCount || 0;
-    if (productCount === 0 || productCount === 1) {
-      const productId = providerData?.productId || moduleId;
+    const allProducts = module.products || [];
+    const products = allProducts.filter((p) => !p.isHidden);
+    if (products.length === 0) {
+      return this.getLibraryFolders(moduleId, `${currentPath}/libraries`, auth);
+    } else if (products.length === 1) {
+      const productId = products[0].productId || products[0].id;
       return this.getLibraryFolders(productId, `${currentPath}/libraries`, auth);
     } else {
-      const products = providerData?.products || [];
       return products.map((p) => ({
         type: "folder",
-        id: p.id,
-        title: p.title,
+        id: p.productId || p.id,
+        title: p.title || p.name,
         image: p.image,
-        path: `${currentPath}/products/${p.id}`
+        path: `${currentPath}/products/${p.productId || p.id}`
       }));
     }
   }
   async getLibraryFolders(productId, currentPath, auth) {
-    console.log("APlay getLibraryFolders called with productId:", productId);
     const pathFn = this.config.endpoints.productLibraries;
     const apiPath = pathFn(productId);
-    console.log(`APlay fetching libraries from: ${apiPath}`);
     const response = await this.apiRequest(apiPath, auth);
-    console.log("APlay libraries response:", response ? "received" : "null");
     if (!response) return [];
     const libraries = response.data || response.libraries || response;
-    console.log("APlay libraries count:", Array.isArray(libraries) ? libraries.length : "not an array");
     if (!Array.isArray(libraries)) return [];
     return libraries.map((l) => ({
       type: "folder",
@@ -809,12 +693,9 @@ var APlayProvider = class {
     }));
   }
   async getMediaFiles(libraryId, auth) {
-    console.log("APlay getMediaFiles called with libraryId:", libraryId);
     const pathFn = this.config.endpoints.libraryMedia;
     const apiPath = pathFn(libraryId);
-    console.log(`APlay fetching media from: ${apiPath}`);
     const response = await this.apiRequest(apiPath, auth);
-    console.log("APlay media response:", response ? "received" : "null");
     if (!response) return [];
     const mediaItems = response.data || response.media || response;
     if (!Array.isArray(mediaItems)) return [];
@@ -865,6 +746,49 @@ var APlayProvider = class {
     const presentations = files.map((f) => ({ id: f.id, name: f.title, actionType: "play", files: [f] }));
     return { id: libraryId, name: title, sections: [{ id: `section-${libraryId}`, name: title, presentations }], allFiles: files };
   }
+  async getPlaylist(path, auth, _resolution) {
+    const { segments, depth } = parsePath(path);
+    if (depth < 4 || segments[0] !== "modules") return null;
+    let libraryId;
+    if (segments[2] === "products" && depth === 5) {
+      libraryId = segments[4];
+    } else if (segments[2] === "libraries" && depth === 4) {
+      libraryId = segments[3];
+    } else {
+      return null;
+    }
+    const files = await this.getMediaFiles(libraryId, auth);
+    return files.length > 0 ? files : null;
+  }
+  async getInstructions(path, auth) {
+    const { segments, depth } = parsePath(path);
+    if (depth < 4 || segments[0] !== "modules") return null;
+    let libraryId;
+    if (segments[2] === "products" && depth === 5) {
+      libraryId = segments[4];
+    } else if (segments[2] === "libraries" && depth === 4) {
+      libraryId = segments[3];
+    } else {
+      return null;
+    }
+    const files = await this.getMediaFiles(libraryId, auth);
+    if (files.length === 0) return null;
+    const fileItems = files.map((file) => ({
+      id: file.id,
+      itemType: "file",
+      label: file.title,
+      embedUrl: file.url
+    }));
+    return {
+      venueName: "Library",
+      items: [{
+        id: `section-${libraryId}`,
+        itemType: "section",
+        label: "Content",
+        children: fileItems
+      }]
+    };
+  }
   async checkMediaLicense(mediaId, auth) {
     if (!auth) return null;
     try {
@@ -894,7 +818,7 @@ var SignPresenterProvider = class {
     this.config = { id: "signpresenter", name: "SignPresenter", apiBase: "https://api.signpresenter.com", oauthBase: "https://api.signpresenter.com/oauth", clientId: "lessonsscreen-tv", scopes: ["openid", "profile", "content"], supportsDeviceFlow: true, deviceAuthEndpoint: "/device/authorize", endpoints: { playlists: "/content/playlists", messages: (playlistId) => `/content/playlists/${playlistId}/messages` } };
     this.requiresAuth = true;
     this.authTypes = ["oauth_pkce", "device_flow"];
-    this.capabilities = { browse: true, presentations: true, playlist: false, instructions: false, expandedInstructions: false, mediaLicensing: false };
+    this.capabilities = { browse: true, presentations: true, playlist: true, instructions: true, mediaLicensing: false };
   }
   async apiRequest(path, auth) {
     return this.apiHelper.apiRequest(this.config, this.id, path, auth);
@@ -945,7 +869,7 @@ var SignPresenterProvider = class {
       if (!msg.url) continue;
       const url = msg.url;
       const seconds = msg.seconds;
-      files.push({ type: "file", id: msg.id, title: msg.name, mediaType: detectMediaType(url, msg.mediaType), image: msg.thumbnail || msg.image, url, embedUrl: url, providerData: seconds !== void 0 ? { seconds } : void 0 });
+      files.push({ type: "file", id: msg.id, title: msg.name, mediaType: detectMediaType(url, msg.mediaType), image: msg.thumbnail || msg.image, url, embedUrl: url, seconds });
     }
     return files;
   }
@@ -962,6 +886,39 @@ var SignPresenterProvider = class {
     const presentations = files.map((f) => ({ id: f.id, name: f.title, actionType: "play", files: [f] }));
     return { id: playlistId, name: title, image, sections: [{ id: `section-${playlistId}`, name: title, presentations }], allFiles: files };
   }
+  async getPlaylist(path, auth, _resolution) {
+    const { segments, depth } = parsePath(path);
+    if (depth < 2 || segments[0] !== "playlists") return null;
+    const playlistId = segments[1];
+    const files = await this.getMessages(playlistId, auth);
+    return files.length > 0 ? files : null;
+  }
+  async getInstructions(path, auth) {
+    const { segments, depth } = parsePath(path);
+    if (depth < 2 || segments[0] !== "playlists") return null;
+    const playlistId = segments[1];
+    const files = await this.getMessages(playlistId, auth);
+    if (files.length === 0) return null;
+    const playlists = await this.getPlaylists(auth);
+    const playlist = playlists.find((p) => p.id === playlistId);
+    const title = playlist?.title || "Playlist";
+    const fileItems = files.map((file) => ({
+      id: file.id,
+      itemType: "file",
+      label: file.title,
+      seconds: file.seconds,
+      embedUrl: file.embedUrl || file.url
+    }));
+    return {
+      venueName: title,
+      items: [{
+        id: `section-${playlistId}`,
+        itemType: "section",
+        label: title,
+        children: fileItems
+      }]
+    };
+  }
 };
 
 // src/providers/lessonsChurch/LessonsChurchProvider.ts
@@ -973,7 +930,7 @@ var LessonsChurchProvider = class {
     this.config = { id: "lessonschurch", name: "Lessons.church", apiBase: "https://api.lessons.church", oauthBase: "", clientId: "", scopes: [], endpoints: { programs: "/programs/public", studies: (programId) => `/studies/public/program/${programId}`, lessons: (studyId) => `/lessons/public/study/${studyId}`, venues: (lessonId) => `/venues/public/lesson/${lessonId}`, playlist: (venueId) => `/venues/playlist/${venueId}`, feed: (venueId) => `/venues/public/feed/${venueId}`, addOns: "/addOns/public", addOnDetail: (id) => `/addOns/public/${id}` } };
     this.requiresAuth = false;
     this.authTypes = ["none"];
-    this.capabilities = { browse: true, presentations: true, playlist: true, instructions: true, expandedInstructions: true, mediaLicensing: false };
+    this.capabilities = { browse: true, presentations: true, playlist: true, instructions: true, mediaLicensing: false };
   }
   async getPlaylist(path, _auth, resolution) {
     const venueId = getSegment(path, 4);
@@ -992,7 +949,7 @@ var LessonsChurchProvider = class {
         if (!f.url) continue;
         const url = f.url;
         const fileId = f.id || `playlist-${fileIndex++}`;
-        files.push({ type: "file", id: fileId, title: f.name || msg.name, mediaType: detectMediaType(url, f.fileType), image: response.lessonImage, url, providerData: { seconds: f.seconds, loop: f.loop, loopVideo: f.loopVideo } });
+        files.push({ type: "file", id: fileId, title: f.name || msg.name, mediaType: detectMediaType(url, f.fileType), image: response.lessonImage, url, seconds: f.seconds, loop: f.loop, loopVideo: f.loopVideo });
       }
     }
     return files;
@@ -1009,7 +966,6 @@ var LessonsChurchProvider = class {
   }
   async browse(path, _auth) {
     const { segments, depth } = parsePath(path);
-    console.log("[LessonsChurchProvider.browse] path:", path, "depth:", depth, "segments:", segments);
     if (depth === 0) {
       return [
         { type: "folder", id: "lessons-root", title: "Lessons", path: "/lessons" },
@@ -1066,9 +1022,7 @@ var LessonsChurchProvider = class {
       id: l.id,
       title: l.name || l.title,
       image: l.image,
-      path: `${currentPath}/${l.id}`,
-      providerData: { lessonImage: l.image }
-      // Keep for display on venues
+      path: `${currentPath}/${l.id}`
     }));
   }
   async getVenues(lessonId, currentPath) {
@@ -1078,7 +1032,7 @@ var LessonsChurchProvider = class {
     const lessonResponse = await this.apiRequest(`/lessons/public/${lessonId}`);
     const lessonImage = lessonResponse?.image;
     const venues = Array.isArray(response) ? response : [];
-    const result = venues.map((v) => ({
+    return venues.map((v) => ({
       type: "folder",
       id: v.id,
       title: v.name,
@@ -1086,8 +1040,6 @@ var LessonsChurchProvider = class {
       isLeaf: true,
       path: `${currentPath}/${v.id}`
     }));
-    console.log("[LessonsChurchProvider.getVenues] returning:", result.map((r) => ({ id: r.id, title: r.title, isLeaf: r.isLeaf })));
-    return result;
   }
   async getPlaylistFiles(venueId) {
     const files = await this.getPlaylist(`/lessons/_/_/_/${venueId}`, null);
@@ -1146,7 +1098,7 @@ var LessonsChurchProvider = class {
     } else {
       return null;
     }
-    return { type: "file", id: addOn.id, title: addOn.name, mediaType, image: addOn.image, url, embedUrl: `https://lessons.church/embed/addon/${addOn.id}`, providerData: { seconds, loopVideo: video?.loopVideo || false } };
+    return { type: "file", id: addOn.id, title: addOn.name, mediaType, image: addOn.image, url, embedUrl: `https://lessons.church/embed/addon/${addOn.id}`, seconds, loopVideo: video?.loopVideo || false };
   }
   async getPresentations(path, _auth) {
     const venueId = getSegment(path, 4);
@@ -1157,18 +1109,6 @@ var LessonsChurchProvider = class {
     return this.convertVenueToPlan(venueData);
   }
   async getInstructions(path, _auth) {
-    const venueId = getSegment(path, 4);
-    if (!venueId) return null;
-    const response = await this.apiRequest(`/venues/public/planItems/${venueId}`);
-    if (!response) return null;
-    const processItem = (item) => {
-      const itemType = this.normalizeItemType(item.itemType);
-      const relatedId = item.relatedId;
-      return { id: item.id, itemType, relatedId, label: item.label, description: item.description, seconds: item.seconds, children: item.children?.map(processItem), embedUrl: this.getEmbedUrl(itemType, relatedId) };
-    };
-    return { venueName: response.venueName, items: (response.items || []).map(processItem) };
-  }
-  async getExpandedInstructions(path, _auth) {
     const venueId = getSegment(path, 4);
     if (!venueId) return null;
     const [planItemsResponse, actionsResponse] = await Promise.all([
@@ -1182,7 +1122,8 @@ var LessonsChurchProvider = class {
         if (section.id && section.actions) {
           sectionActionsMap.set(section.id, section.actions.map((action) => {
             const embedUrl = this.getEmbedUrl("action", action.id);
-            return { id: action.id, itemType: "action", relatedId: action.id, label: action.name, description: action.actionType, seconds: action.seconds, children: [{ id: action.id + "-file", itemType: "file", label: action.name, seconds: action.seconds, embedUrl }] };
+            const seconds = action.seconds ?? estimateImageDuration();
+            return { id: action.id, itemType: "action", relatedId: action.id, label: action.name, description: action.actionType, seconds, children: [{ id: action.id + "-file", itemType: "file", label: action.name, seconds, embedUrl }] };
           }));
         }
       }
@@ -1238,7 +1179,7 @@ var LessonsChurchProvider = class {
         for (const file of action.files || []) {
           if (!file.url) continue;
           const embedUrl = action.id ? `https://lessons.church/embed/action/${action.id}` : void 0;
-          const contentFile = { type: "file", id: file.id || "", title: file.name || "", mediaType: detectMediaType(file.url, file.fileType), image: venue.lessonImage, url: file.url, embedUrl, providerData: { seconds: file.seconds, streamUrl: file.streamUrl } };
+          const contentFile = { type: "file", id: file.id || "", title: file.name || "", mediaType: detectMediaType(file.url, file.fileType), image: venue.lessonImage, url: file.url, embedUrl, seconds: file.seconds, streamUrl: file.streamUrl };
           files.push(contentFile);
           allFiles.push(contentFile);
         }
@@ -1285,22 +1226,13 @@ async function exchangeCodeForTokensWithPKCE(config, code, redirectUri, codeVeri
   try {
     const params = { grant_type: "authorization_code", code, client_id: config.clientId, code_verifier: codeVerifier, redirect_uri: redirectUri };
     const tokenUrl = `${config.oauthBase}/token`;
-    console.log(`B1Church PKCE token exchange request to: ${tokenUrl}`);
-    console.log(`  - client_id: ${config.clientId}`);
-    console.log(`  - redirect_uri: ${redirectUri}`);
-    console.log(`  - code: ${code.substring(0, 10)}...`);
     const response = await fetch(tokenUrl, { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(params) });
-    console.log(`B1Church token response status: ${response.status}`);
     if (!response.ok) {
-      const errorText = await response.text();
-      console.error(`B1Church token exchange failed: ${response.status} - ${errorText}`);
       return null;
     }
     const data = await response.json();
-    console.log(`B1Church token exchange successful, got access_token: ${!!data.access_token}`);
     return { access_token: data.access_token, refresh_token: data.refresh_token, token_type: data.token_type || "Bearer", created_at: Math.floor(Date.now() / 1e3), expires_in: data.expires_in, scope: data.scope || config.scopes.join(" ") };
-  } catch (error) {
-    console.error("B1Church token exchange error:", error);
+  } catch {
     return null;
   }
 }
@@ -1308,22 +1240,13 @@ async function exchangeCodeForTokensWithSecret(config, code, redirectUri, client
   try {
     const params = { grant_type: "authorization_code", code, client_id: config.clientId, client_secret: clientSecret, redirect_uri: redirectUri };
     const tokenUrl = `${config.oauthBase}/token`;
-    console.log(`B1Church token exchange request to: ${tokenUrl}`);
-    console.log(`  - client_id: ${config.clientId}`);
-    console.log(`  - redirect_uri: ${redirectUri}`);
-    console.log(`  - code: ${code.substring(0, 10)}...`);
     const response = await fetch(tokenUrl, { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(params) });
-    console.log(`B1Church token response status: ${response.status}`);
     if (!response.ok) {
-      const errorText = await response.text();
-      console.error(`B1Church token exchange failed: ${response.status} - ${errorText}`);
       return null;
     }
     const data = await response.json();
-    console.log(`B1Church token exchange successful, got access_token: ${!!data.access_token}`);
     return { access_token: data.access_token, refresh_token: data.refresh_token, token_type: data.token_type || "Bearer", created_at: Math.floor(Date.now() / 1e3), expires_in: data.expires_in, scope: data.scope || config.scopes.join(" ") };
-  } catch (error) {
-    console.error("B1Church token exchange error:", error);
+  } catch {
     return null;
   }
 }
@@ -1344,13 +1267,10 @@ async function initiateDeviceFlow(config) {
   try {
     const response = await fetch(`${config.oauthBase}${config.deviceAuthEndpoint}`, { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ client_id: config.clientId, scope: config.scopes.join(" ") }) });
     if (!response.ok) {
-      const errorText = await response.text();
-      console.error(`B1Church device authorize failed: ${response.status} - ${errorText}`);
       return null;
     }
     return await response.json();
-  } catch (error) {
-    console.error("B1Church device flow initiation error:", error);
+  } catch {
     return null;
   }
 }
@@ -1454,13 +1374,13 @@ async function fetchFromProviderProxy(method, ministryId, providerId, path, auth
 
 // src/providers/b1Church/converters.ts
 function ministryToFolder(ministry) {
-  return { type: "folder", id: ministry.id, title: ministry.name, path: "", image: ministry.photoUrl, providerData: { level: "ministry", ministryId: ministry.id, churchId: ministry.churchId } };
+  return { type: "folder", id: ministry.id, title: ministry.name, path: "", image: ministry.photoUrl };
 }
-function planTypeToFolder(planType, ministryId) {
-  return { type: "folder", id: planType.id, title: planType.name, path: "", providerData: { level: "planType", planTypeId: planType.id, ministryId, churchId: planType.churchId } };
+function planTypeToFolder(planType) {
+  return { type: "folder", id: planType.id, title: planType.name, path: "" };
 }
 function planToFolder(plan) {
-  return { type: "folder", id: plan.id, title: plan.name, path: "", isLeaf: true, providerData: { level: "plan", planId: plan.id, planTypeId: plan.planTypeId, ministryId: plan.ministryId, churchId: plan.churchId, serviceDate: plan.serviceDate, contentType: plan.contentType, contentId: plan.contentId } };
+  return { type: "folder", id: plan.id, title: plan.name, path: "", isLeaf: true };
 }
 async function planItemToPresentation(item, venueFeed) {
   const itemType = item.itemType;
@@ -1509,7 +1429,7 @@ function getFilesFromVenueFeed(venueFeed, itemType, relatedId) {
   return files;
 }
 function convertFeedFiles(feedFiles, thumbnailImage) {
-  return feedFiles.filter((f) => f.url).map((f) => ({ type: "file", id: f.id || "", title: f.name || "", mediaType: detectMediaType(f.url || "", f.fileType), image: thumbnailImage, url: f.url || "", providerData: { seconds: f.seconds, streamUrl: f.streamUrl } }));
+  return feedFiles.filter((f) => f.url).map((f) => ({ type: "file", id: f.id || "", title: f.name || "", mediaType: detectMediaType(f.url || "", f.fileType), image: thumbnailImage, url: f.url || "", seconds: f.seconds, streamUrl: f.streamUrl }));
 }
 function planItemToInstruction(item) {
   let itemType = item.itemType;
@@ -1528,9 +1448,9 @@ function planItemToInstruction(item) {
 }
 
 // src/providers/b1Church/B1ChurchProvider.ts
-var INTERNAL_PROVIDERS = ["b1church", "lessonschurch"];
 function isExternalProviderItem(item) {
-  if (!item.providerId || INTERNAL_PROVIDERS.includes(item.providerId)) return false;
+  if (!item.providerId || item.providerId === "b1church") return false;
+  if (item.providerPath) return true;
   const itemType = item.itemType || "";
   return itemType.startsWith("provider");
 }
@@ -1540,11 +1460,11 @@ var B1ChurchProvider = class {
     this.id = "b1church";
     this.name = "B1.Church";
     this.logos = { light: "https://b1.church/b1-church-logo.png", dark: "https://b1.church/b1-church-logo.png" };
-    this.config = { id: "b1church", name: "B1.Church", apiBase: `${API_BASE}/doing`, oauthBase: `${API_BASE}/membership/oauth`, clientId: "nsowldn58dk", scopes: ["plans"], supportsDeviceFlow: true, deviceAuthEndpoint: "/device/authorize", endpoints: { planItems: (churchId, planId) => `/planItems/presenter/${churchId}/${planId}` } };
+    this.config = { id: "b1church", name: "B1.Church", apiBase: `${API_BASE}/doing`, oauthBase: `${API_BASE}/membership/oauth`, clientId: "nsowldn58dk", scopes: ["plans"], supportsDeviceFlow: true, deviceAuthEndpoint: "/device/authorize", endpoints: { planItems: (churchId, planId) => `/planFeed/presenter/${churchId}/${planId}` } };
     this.appBase = "https://admin.b1.church";
     this.requiresAuth = true;
     this.authTypes = ["oauth_pkce", "device_flow"];
-    this.capabilities = { browse: true, presentations: true, playlist: true, instructions: true, expandedInstructions: true, mediaLicensing: false };
+    this.capabilities = { browse: true, presentations: true, playlist: true, instructions: true, mediaLicensing: false };
   }
   async apiRequest(path, authData) {
     return this.apiHelper.apiRequest(this.config, this.id, path, authData);
@@ -1583,17 +1503,15 @@ var B1ChurchProvider = class {
       const ministries = await fetchMinistries(authData);
       return ministries.map((m) => {
         const folder = ministryToFolder(m);
-        const ministryId = folder.providerData?.ministryId || folder.id;
-        return { ...folder, path: `/ministries/${ministryId}` };
+        return { ...folder, path: `/ministries/${m.id}` };
       });
     }
     if (depth === 2) {
       const ministryId = segments[1];
       const planTypes = await fetchPlanTypes(ministryId, authData);
       return planTypes.map((pt) => {
-        const folder = planTypeToFolder(pt, ministryId);
-        const planTypeId = folder.providerData?.planTypeId || folder.id;
-        return { ...folder, path: `/ministries/${ministryId}/${planTypeId}` };
+        const folder = planTypeToFolder(pt);
+        return { ...folder, path: `/ministries/${ministryId}/${pt.id}` };
       });
     }
     if (depth === 3) {
@@ -1602,11 +1520,10 @@ var B1ChurchProvider = class {
       const plans = await fetchPlans(planTypeId, authData);
       return plans.map((p) => {
         const folder = planToFolder(p);
-        const planId = folder.providerData?.planId || folder.id;
         return {
           ...folder,
           isLeaf: true,
-          path: `/ministries/${ministryId}/${planTypeId}/${planId}`
+          path: `/ministries/${ministryId}/${planTypeId}/${p.id}`
         };
       });
     }
@@ -1619,19 +1536,26 @@ var B1ChurchProvider = class {
     const planId = segments[3];
     const planTypeId = segments[2];
     const plans = await fetchPlans(planTypeId, authData);
-    const planFolder = plans.find((p) => {
-      const folder2 = planToFolder(p);
-      return folder2.providerData?.planId === planId || folder2.id === planId;
-    });
+    const planFolder = plans.find((p) => p.id === planId);
     if (!planFolder) return null;
-    const folder = planToFolder(planFolder);
-    const providerData = folder.providerData;
-    const churchId = providerData?.churchId;
-    const venueId = providerData?.contentId;
-    const planTitle = folder.title || "Plan";
+    const churchId = planFolder.churchId;
+    const venueId = planFolder.contentId;
+    const planTitle = planFolder.name || "Plan";
     if (!churchId) return null;
     const pathFn = this.config.endpoints.planItems;
     const planItems = await this.apiRequest(pathFn(churchId, planId), authData);
+    if ((!planItems || planItems.length === 0) && planFolder.providerId && planFolder.providerPlanId) {
+      const externalPlan = await fetchFromProviderProxy(
+        "getPresentations",
+        ministryId,
+        planFolder.providerId,
+        planFolder.providerPlanId,
+        authData
+      );
+      if (externalPlan) {
+        return { id: planId, name: planTitle, sections: externalPlan.sections, allFiles: externalPlan.allFiles };
+      }
+    }
     if (!planItems || !Array.isArray(planItems)) return null;
     const venueFeed = venueId ? await fetchVenueFeed(venueId) : null;
     const sections = [];
@@ -1648,10 +1572,25 @@ var B1ChurchProvider = class {
             authData
           );
           if (externalPlan) {
-            for (const section of externalPlan.sections) {
-              presentations.push(...section.presentations);
+            if (child.providerContentPath) {
+              const externalInstructions = await fetchFromProviderProxy(
+                "getInstructions",
+                ministryId,
+                child.providerId,
+                child.providerPath,
+                authData
+              );
+              const matchingPresentation = this.findPresentationByPath(externalPlan, externalInstructions, child.providerContentPath);
+              if (matchingPresentation) {
+                presentations.push(matchingPresentation);
+                allFiles.push(...matchingPresentation.files);
+              }
+            } else {
+              for (const section of externalPlan.sections) {
+                presentations.push(...section.presentations);
+              }
+              allFiles.push(...externalPlan.allFiles);
             }
-            allFiles.push(...externalPlan.allFiles);
           }
         } else {
           const presentation = await planItemToPresentation(child, venueFeed);
@@ -1674,49 +1613,74 @@ var B1ChurchProvider = class {
     const planId = segments[3];
     const planTypeId = segments[2];
     const plans = await fetchPlans(planTypeId, authData);
-    const planFolder = plans.find((p) => {
-      const folder2 = planToFolder(p);
-      return folder2.providerData?.planId === planId || folder2.id === planId;
-    });
+    const planFolder = plans.find((p) => p.id === planId);
     if (!planFolder) return null;
-    const folder = planToFolder(planFolder);
-    const providerData = folder.providerData;
-    const churchId = providerData?.churchId;
-    const planTitle = folder.title || "Plan";
+    const churchId = planFolder.churchId;
+    const planTitle = planFolder.name || "Plan";
     if (!churchId) return null;
     const pathFn = this.config.endpoints.planItems;
     const planItems = await this.apiRequest(pathFn(churchId, planId), authData);
+    if ((!planItems || planItems.length === 0) && planFolder.providerId && planFolder.providerPlanId) {
+      const externalInstructions = await fetchFromProviderProxy(
+        "getInstructions",
+        ministryId,
+        planFolder.providerId,
+        planFolder.providerPlanId,
+        authData
+      );
+      if (externalInstructions) {
+        return { venueName: planTitle, items: externalInstructions.items };
+      }
+    }
     if (!planItems || !Array.isArray(planItems)) return null;
     const processedItems = await this.processInstructionItems(planItems, ministryId, authData);
     return { venueName: planTitle, items: processedItems };
   }
-  async getExpandedInstructions(path, authData) {
-    return this.getInstructions(path, authData);
-  }
   async processInstructionItems(items, ministryId, authData) {
     const result = [];
     for (const item of items) {
+      const instructionItem = planItemToInstruction(item);
       if (isExternalProviderItem(item) && item.providerId && item.providerPath) {
         const externalInstructions = await fetchFromProviderProxy(
-          "getExpandedInstructions",
+          "getInstructions",
           ministryId,
           item.providerId,
           item.providerPath,
           authData
         );
         if (externalInstructions) {
-          result.push(...externalInstructions.items);
-        }
-      } else {
-        const instructionItem = planItemToInstruction(item);
-        if (item.children && item.children.length > 0) {
-          instructionItem.children = await this.processInstructionItems(item.children, ministryId, authData);
+          if (item.providerContentPath) {
+            const matchingItem = this.findItemByPath(externalInstructions, item.providerContentPath);
+            if (matchingItem?.children) {
+              instructionItem.children = matchingItem.children;
+            }
+          } else {
+            instructionItem.children = externalInstructions.items;
+          }
         }
-        result.push(instructionItem);
+      } else if (item.children && item.children.length > 0) {
+        instructionItem.children = await this.processInstructionItems(item.children, ministryId, authData);
       }
+      result.push(instructionItem);
     }
     return result;
   }
+  findItemByPath(instructions, path) {
+    if (!path || !instructions) return null;
+    return navigateToPath(instructions, path);
+  }
+  findPresentationByPath(plan, instructions, path) {
+    if (!path || !instructions) return null;
+    const item = navigateToPath(instructions, path);
+    if (!item?.relatedId && !item?.id) return null;
+    const presentationId = item.relatedId || item.id;
+    for (const section of plan.sections) {
+      for (const presentation of section.presentations) {
+        if (presentation.id === presentationId) return presentation;
+      }
+    }
+    return null;
+  }
   async getPlaylist(path, authData, resolution) {
     const { segments, depth } = parsePath(path);
     if (depth < 4 || segments[0] !== "ministries") return [];
@@ -1724,34 +1688,63 @@ var B1ChurchProvider = class {
     const planId = segments[3];
     const planTypeId = segments[2];
     const plans = await fetchPlans(planTypeId, authData);
-    const planFolder = plans.find((p) => {
-      const folder2 = planToFolder(p);
-      return folder2.providerData?.planId === planId || folder2.id === planId;
-    });
+    const planFolder = plans.find((p) => p.id === planId);
     if (!planFolder) return [];
-    const folder = planToFolder(planFolder);
-    const providerData = folder.providerData;
-    const churchId = providerData?.churchId;
-    const venueId = providerData?.contentId;
+    const churchId = planFolder.churchId;
+    const venueId = planFolder.contentId;
     if (!churchId) return [];
     const pathFn = this.config.endpoints.planItems;
     const planItems = await this.apiRequest(pathFn(churchId, planId), authData);
+    if ((!planItems || planItems.length === 0) && planFolder.providerId && planFolder.providerPlanId) {
+      const externalFiles = await fetchFromProviderProxy(
+        "getPlaylist",
+        ministryId,
+        planFolder.providerId,
+        planFolder.providerPlanId,
+        authData,
+        resolution
+      );
+      return externalFiles || [];
+    }
     if (!planItems || !Array.isArray(planItems)) return [];
     const venueFeed = venueId ? await fetchVenueFeed(venueId) : null;
     const files = [];
     for (const sectionItem of planItems) {
       for (const child of sectionItem.children || []) {
         if (isExternalProviderItem(child) && child.providerId && child.providerPath) {
-          const externalFiles = await fetchFromProviderProxy(
-            "getPlaylist",
-            ministryId,
-            child.providerId,
-            child.providerPath,
-            authData,
-            resolution
-          );
-          if (externalFiles) {
-            files.push(...externalFiles);
+          if (child.providerContentPath) {
+            const externalPlan = await fetchFromProviderProxy(
+              "getPresentations",
+              ministryId,
+              child.providerId,
+              child.providerPath,
+              authData
+            );
+            const externalInstructions = await fetchFromProviderProxy(
+              "getInstructions",
+              ministryId,
+              child.providerId,
+              child.providerPath,
+              authData
+            );
+            if (externalPlan) {
+              const matchingPresentation = this.findPresentationByPath(externalPlan, externalInstructions, child.providerContentPath);
+              if (matchingPresentation) {
+                files.push(...matchingPresentation.files);
+              }
+            }
+          } else {
+            const externalFiles = await fetchFromProviderProxy(
+              "getPlaylist",
+              ministryId,
+              child.providerId,
+              child.providerPath,
+              authData,
+              resolution
+            );
+            if (externalFiles) {
+              files.push(...externalFiles);
+            }
           }
         } else {
           const itemType = child.itemType;
@@ -1777,7 +1770,7 @@ var PlanningCenterProvider = class {
     this.ONE_WEEK_MS = 6048e5;
     this.requiresAuth = true;
     this.authTypes = ["oauth_pkce"];
-    this.capabilities = { browse: true, presentations: true, playlist: false, instructions: false, expandedInstructions: false, mediaLicensing: false };
+    this.capabilities = { browse: true, presentations: true, playlist: true, instructions: true, mediaLicensing: false };
   }
   async apiRequest(path, auth) {
     return this.apiHelper.apiRequest(this.config, this.id, path, auth);
@@ -1839,8 +1832,7 @@ var PlanningCenterProvider = class {
       id: plan.id,
       title: plan.attributes.title || this.formatDate(plan.attributes.sort_date),
       isLeaf: true,
-      path: `${currentPath}/${plan.id}`,
-      providerData: { sortDate: plan.attributes.sort_date }
+      path: `${currentPath}/${plan.id}`
     }));
   }
   async getPlanItems(serviceTypeId, planId, auth) {
@@ -1850,7 +1842,7 @@ var PlanningCenterProvider = class {
       auth
     );
     if (!response?.data) return [];
-    return response.data.map((item) => ({ type: "file", id: item.id, title: item.attributes.title || "", mediaType: "image", url: "", providerData: { itemType: item.attributes.item_type, description: item.attributes.description, length: item.attributes.length, songId: item.relationships?.song?.data?.id, arrangementId: item.relationships?.arrangement?.data?.id } }));
+    return response.data.map((item) => ({ type: "file", id: item.id, title: item.attributes.title || "", mediaType: "image", url: "" }));
   }
   async getPresentations(path, auth) {
     const { segments, depth } = parsePath(path);
@@ -1958,6 +1950,43 @@ var PlanningCenterProvider = class {
     const date = new Date(dateString);
     return date.toISOString().slice(0, 10);
   }
+  async getPlaylist(path, auth, _resolution) {
+    const plan = await this.getPresentations(path, auth);
+    if (!plan) return null;
+    return plan.allFiles.length > 0 ? plan.allFiles : null;
+  }
+  async getInstructions(path, auth) {
+    const plan = await this.getPresentations(path, auth);
+    if (!plan) return null;
+    const sectionItems = plan.sections.map((section) => {
+      const actionItems = section.presentations.map((pres) => {
+        const fileItems = pres.files.map((file) => ({
+          id: file.id,
+          itemType: "file",
+          label: file.title,
+          embedUrl: file.url
+        }));
+        return {
+          id: pres.id,
+          itemType: "action",
+          relatedId: pres.id,
+          label: pres.name,
+          description: pres.actionType,
+          children: fileItems.length > 0 ? fileItems : void 0
+        };
+      });
+      return {
+        id: section.id,
+        itemType: "section",
+        label: section.name,
+        children: actionItems
+      };
+    });
+    return {
+      venueName: plan.name,
+      items: sectionItems
+    };
+  }
 };
 
 // src/providers/bibleProject/data.json
@@ -4095,8 +4124,7 @@ var BibleProjectProvider = class {
       browse: true,
       presentations: true,
       playlist: true,
-      instructions: false,
-      expandedInstructions: false,
+      instructions: true,
       mediaLicensing: false
     };
   }
@@ -4134,8 +4162,7 @@ var BibleProjectProvider = class {
       title: video.title,
       image: video.thumbnailUrl,
       isLeaf: true,
-      path: `${currentPath}/${video.id}`,
-      providerData: { videoData: video }
+      path: `${currentPath}/${video.id}`
     }));
   }
   getVideoFile(collectionSlug, videoId) {
@@ -4186,6 +4213,50 @@ var BibleProjectProvider = class {
     }
     return null;
   }
+  async getInstructions(path, _auth) {
+    const { segments, depth } = parsePath(path);
+    if (depth < 1) return null;
+    const collectionSlug = segments[0];
+    const collection = this.data.collections.find((c) => this.slugify(c.name) === collectionSlug);
+    if (!collection) return null;
+    if (depth === 1) {
+      const fileItems = collection.videos.map((video) => ({
+        id: video.id,
+        itemType: "file",
+        label: video.title,
+        embedUrl: video.videoUrl
+      }));
+      return {
+        venueName: collection.name,
+        items: [{
+          id: this.slugify(collection.name),
+          itemType: "section",
+          label: "Videos",
+          children: fileItems
+        }]
+      };
+    }
+    if (depth === 2) {
+      const videoId = segments[1];
+      const video = collection.videos.find((v) => v.id === videoId);
+      if (!video) return null;
+      return {
+        venueName: video.title,
+        items: [{
+          id: "main",
+          itemType: "section",
+          label: "Content",
+          children: [{
+            id: video.id,
+            itemType: "file",
+            label: video.title,
+            embedUrl: video.videoUrl
+          }]
+        }]
+      };
+    }
+    return null;
+  }
   slugify(text) {
     return text.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
   }
@@ -11722,8 +11793,7 @@ var HighVoltageKidsProvider = class {
       browse: true,
       presentations: true,
       playlist: true,
-      instructions: false,
-      expandedInstructions: true,
+      instructions: true,
       mediaLicensing: false
     };
   }
@@ -11765,8 +11835,7 @@ var HighVoltageKidsProvider = class {
       id: study.id,
       title: study.name,
       image: study.image || void 0,
-      path: `${currentPath}/${study.id}`,
-      providerData: { studyData: study }
+      path: `${currentPath}/${study.id}`
     }));
   }
   getLessonFolders(collectionSlug, studyId, currentPath) {
@@ -11780,8 +11849,7 @@ var HighVoltageKidsProvider = class {
       title: lesson.name,
       image: lesson.image || void 0,
       isLeaf: true,
-      path: `${currentPath}/${lesson.id}`,
-      providerData: { lessonData: lesson, studyName: study.name }
+      path: `${currentPath}/${lesson.id}`
     }));
   }
   getLessonFiles(collectionSlug, studyId, lessonId) {
@@ -11851,7 +11919,7 @@ var HighVoltageKidsProvider = class {
     }
     return null;
   }
-  async getExpandedInstructions(path, _auth) {
+  async getInstructions(path, _auth) {
     const { segments, depth } = parsePath(path);
     if (depth < 2) return null;
     const collectionSlug = segments[0];
@@ -11862,7 +11930,10 @@ var HighVoltageKidsProvider = class {
     if (!study) return null;
     if (depth === 2) {
       const lessonItems = study.lessons.map((lesson) => {
-        const fileItems = lesson.files.map((file) => ({ id: file.id, itemType: "file", label: file.title, embedUrl: file.url }));
+        const fileItems = lesson.files.map((file) => {
+          const seconds = estimateDuration(file.mediaType);
+          return { id: file.id, itemType: "file", label: file.title, seconds, embedUrl: file.url };
+        });
         return { id: lesson.id, itemType: "action", label: lesson.name, description: "play", children: fileItems };
       });
       return { venueName: study.name, items: [{ id: study.id, itemType: "header", label: study.name, children: [{ id: "main", itemType: "section", label: "Content", children: lessonItems }] }] };
@@ -11886,12 +11957,16 @@ var HighVoltageKidsProvider = class {
     let currentBaseName = null;
     const flushGroup = () => {
       if (currentGroup.length === 0) return;
-      const children = currentGroup.map((file) => ({
-        id: file.id,
-        itemType: "file",
-        label: file.title,
-        embedUrl: file.url
-      }));
+      const children = currentGroup.map((file) => {
+        const seconds = estimateDuration(file.mediaType);
+        return {
+          id: file.id,
+          itemType: "file",
+          label: file.title,
+          seconds,
+          embedUrl: file.url
+        };
+      });
       const label = currentGroup.length > 1 && currentBaseName ? currentBaseName : currentGroup[0].title;
       actionItems.push({
         id: currentGroup[0].id + "-action",
@@ -12022,7 +12097,7 @@ function getAvailableProviders(ids) {
     implemented: false,
     requiresAuth: false,
     authTypes: [],
-    capabilities: { browse: false, presentations: false, playlist: false, instructions: false, expandedInstructions: false, mediaLicensing: false }
+    capabilities: { browse: false, presentations: false, playlist: false, instructions: false, mediaLicensing: false }
   }));
   const all = [...implemented, ...comingSoon];
   if (ids && ids.length > 0) {
@@ -12033,13 +12108,14 @@ function getAvailableProviders(ids) {
 }
 
 // src/index.ts
-var VERSION = "0.0.1";
+var VERSION = "0.0.4";
 export {
   APlayProvider,
   ApiHelper,
   B1ChurchProvider,
   BibleProjectProvider,
   ContentProvider,
+  DEFAULT_DURATION_CONFIG,
   DeviceFlowHelper,
   FormatConverters_exports as FormatConverters,
   FormatResolver,
@@ -12052,12 +12128,16 @@ export {
   VERSION,
   appendToPath,
   buildPath,
-  collapseInstructions,
+  countWords,
   createFile,
   createFolder,
   detectMediaType,
+  estimateDuration,
+  estimateImageDuration,
+  estimateTextDuration,
   expandedInstructionsToPlaylist,
   expandedInstructionsToPresentations,
+  generatePath,
   getAllProviders,
   getAvailableProviders,
   getProvider,
@@ -12067,12 +12147,12 @@ export {
   instructionsToPresentations,
   isContentFile,
   isContentFolder,
+  navigateToPath,
   parsePath,
   playlistToExpandedInstructions,
   playlistToInstructions,
   playlistToPresentations,
   presentationsToExpandedInstructions,
-  presentationsToInstructions,
   presentationsToPlaylist,
   registerProvider
 };