@larkup/marketplace 0.1.4 → 0.1.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @larkup/marketplace
 
+## 0.1.5
+
+### Patch Changes
+
+- 19767f8: Fix isolated Marketplace tool loading in Docker, improve Video & Audio setup guidance, and reliably index PDF images.
+
 ## 0.1.4
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@larkup/marketplace",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "publishConfig": {
     "access": "public"
   },

package/src/tool-installer.ts

@@ -147,8 +147,15 @@ export async function checkSystemDeps(toolId: string): Promise<string[]> {
   const descriptor = await getToolById(toolId);
   if (!descriptor?.systemDeps?.length) return [];
 
+  const target = detectDeploymentTarget();
+
   const missing: string[] = [];
   for (const dep of descriptor.systemDeps) {
+    // A container cannot normally talk to the host Docker daemon. Do not block
+    // installation of tools that use Docker only for optional capabilities
+    // (for example DOCX/PPTX editing); those capabilities report their own
+    // actionable error when actually used.
+    if (target === 'docker' && dep === 'docker') continue;
     try {
       await execAsync(`which ${dep}`);
     } catch {
@@ -492,6 +499,8 @@ export async function uninstallTool(toolId: string): Promise<void> {
 
   // Refresh registry cache
   invalidateRegistryCache();
+  const { unloadTool } = await import('./tool-loader');
+  unloadTool(toolId);
 }
 
 export async function updateToolConfig(toolId: string, config: Record<string, any>): Promise<void> {

package/src/tool-loader.ts

@@ -1,4 +1,6 @@
+import { promises as fs } from 'node:fs';
 import path from 'node:path';
+import { pathToFileURL } from 'node:url';
 import type { InstalledTool } from './types';
 import { getInstalledTool } from './tool-installer';
 
@@ -37,7 +39,7 @@ export async function loadTool<T = any>(toolId: string): Promise<T | null> {
 
   try {
     // Determine what to import
-    const importPath = resolveImportPath(installed);
+    const importPath = await resolveImportPath(installed);
     const mod = await import(/* webpackIgnore: true */ importPath);
     moduleCache.set(toolId, mod);
     return mod as T;
@@ -54,7 +56,7 @@ export async function loadTool<T = any>(toolId: string): Promise<T | null> {
  * - `registry` (npm): import from the isolated node_modules via absolute path
  * - `sandbox`: import from the sandbox tool path
  */
-function resolveImportPath(installed: InstalledTool): string {
+async function resolveImportPath(installed: InstalledTool): Promise<string> {
   switch (installed.source) {
     case 'local':
       // In monorepo, the package name resolves via pnpm workspace linking
@@ -62,8 +64,10 @@ function resolveImportPath(installed: InstalledTool): string {
 
     case 'registry':
     case 'sandbox':
-      // Use the absolute resolved path from the isolated install
-      return installed.resolvedPath;
+      // Node ESM cannot import a package directory by absolute path. Resolve
+      // the package's declared ESM entry so isolated marketplace installs work
+      // the same way as a normal package-name import.
+      return resolvePackageEntry(installed.resolvedPath);
 
     default:
       // Fallback: try package name (backwards compat)
@@ -71,6 +75,22 @@ function resolveImportPath(installed: InstalledTool): string {
   }
 }
 
+async function resolvePackageEntry(packageDir: string): Promise<string> {
+  const manifestPath = path.join(packageDir, 'package.json');
+  const manifest = JSON.parse(await fs.readFile(manifestPath, 'utf8')) as {
+    exports?: string | { '.': string | { import?: string; default?: string } };
+    main?: string;
+  };
+  const rootExport =
+    typeof manifest.exports === 'object' ? manifest.exports['.'] : manifest.exports;
+  const entry =
+    (typeof rootExport === 'object' ? rootExport.import ?? rootExport.default : rootExport) ??
+    manifest.main ??
+    'index.js';
+
+  return pathToFileURL(path.resolve(packageDir, entry)).href;
+}
+
 /**
  * Check if a tool is loaded and available for use.
  */