@larkup/marketplace 0.1.3 → 0.1.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @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
+
+- c769d08: Retry marketplace installs against the latest published package when a stale catalog version is unavailable, and improve server and analytics UI behavior.
+
 ## 0.1.3
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@larkup/marketplace",
-  "version": "0.1.3",
+  "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 {
@@ -226,7 +233,7 @@ async function execInstall(
   version: string,
   target: DeploymentTarget,
   onProgress?: (message: string) => void,
-): Promise<string> {
+): Promise<{ resolvedPath: string; version: string }> {
   const toolsDir = getToolsDir();
 
   switch (target) {
@@ -235,22 +242,39 @@ async function execInstall(
       // Initialize the isolated tools directory
       await ensureToolsPackageJson();
 
-      const installCmd = `npm install ${packageName}@${version} --prefix "${toolsDir}" --save --no-audit --no-fund`;
-      onProgress?.(`Running: npm install ${packageName}@${version}`);
-
-      try {
-        const { stdout, stderr } = await execAsync(installCmd, {
+      const install = async (specifier: string) => {
+        const installCmd = `npm install ${specifier} --prefix "${toolsDir}" --save --no-audit --no-fund`;
+        onProgress?.(`Running: npm install ${specifier}`);
+        const { stderr } = await execAsync(installCmd, {
           cwd: toolsDir,
           timeout: 120_000, // 2 minute timeout
           env: { ...process.env, NODE_ENV: 'production' },
         });
-
         if (stderr && !stderr.includes('npm warn')) {
           console.warn(`[marketplace] Install stderr: ${stderr}`);
         }
+      };
+
+      try {
+        await install(`${packageName}@${version}`);
       } catch (err) {
         const message = err instanceof Error ? err.message : 'Install command failed';
-        throw new Error(`Failed to install ${packageName}: ${message}`);
+        if (!message.includes('ETARGET') && !message.includes('No matching version found')) {
+          throw new Error(`Failed to install ${packageName}: ${message}`);
+        }
+
+        // Hub entries can be cached longer than npm releases. Recover from an
+        // obsolete catalog version rather than leaving the marketplace unusable.
+        onProgress?.(
+          `Catalog version ${version} is unavailable; installing the latest published version…`,
+        );
+        try {
+          await install(`${packageName}@latest`);
+        } catch (latestErr) {
+          const latestMessage =
+            latestErr instanceof Error ? latestErr.message : 'Install command failed';
+          throw new Error(`Failed to install ${packageName}: ${latestMessage}`);
+        }
       }
 
       // Resolve the actual module path
@@ -263,7 +287,10 @@ async function execInstall(
         );
       }
 
-      return resolvedPath;
+      const packageJson = JSON.parse(
+        await fs.readFile(path.join(resolvedPath, 'package.json'), 'utf8'),
+      ) as { version?: string };
+      return { resolvedPath, version: packageJson.version ?? version };
     }
 
     case 'serverless': {
@@ -282,7 +309,7 @@ async function execInstall(
       await fs.writeFile(pendingPath, JSON.stringify(pending, null, 2), 'utf8');
 
       // Return the expected path (will be available after redeploy)
-      return path.join(toolsDir, 'node_modules', packageName);
+      return { resolvedPath: path.join(toolsDir, 'node_modules', packageName), version };
     }
 
     case 'sandbox': {
@@ -291,7 +318,7 @@ async function execInstall(
       await ensureToolsPackageJson();
       const installCmd = `npm install ${packageName}@${version} --prefix "${toolsDir}" --save --no-audit --no-fund`;
       await execAsync(installCmd, { cwd: toolsDir, timeout: 120_000 });
-      return path.join(toolsDir, 'node_modules', packageName);
+      return { resolvedPath: path.join(toolsDir, 'node_modules', packageName), version };
     }
 
     default:
@@ -374,6 +401,7 @@ export async function installTool(
     const isWorkspace = await isWorkspaceTool(descriptor.packageName);
     const target = detectDeploymentTarget();
     let resolvedPath: string;
+    let installedVersion = descriptor.version;
     let source: ToolSource;
 
     if (isWorkspace) {
@@ -394,9 +422,14 @@ export async function installTool(
     } else {
       // Remote install — download from npm into isolated directory
       report('downloading', 30, `Downloading ${descriptor.packageName}@${descriptor.version}…`);
-      resolvedPath = await execInstall(descriptor.packageName, descriptor.version, target, (msg) =>
-        report('downloading', 50, msg),
+      const installed = await execInstall(
+        descriptor.packageName,
+        descriptor.version,
+        target,
+        (msg) => report('downloading', 50, msg),
       );
+      resolvedPath = installed.resolvedPath;
+      installedVersion = installed.version;
       source = target === 'sandbox' ? 'sandbox' : 'registry';
       report('installing', 70, 'Package installed.');
     }
@@ -409,7 +442,7 @@ export async function installTool(
 
     const entry: InstalledTool = {
       id: toolId,
-      version: descriptor.version,
+      version: installedVersion,
       installedAt: new Date().toISOString(),
       packageName: descriptor.packageName,
       resolvedPath,
@@ -466,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.
  */

package/src/tool-registry.ts

@@ -143,7 +143,7 @@ const FALLBACK_REGISTRY: Record<string, ToolDescriptor> = {
     name: 'Video & Audio',
     description: 'Index video and audio files with transcription and frame analysis.',
     category: 'media',
-    version: '0.2.0',
+    version: '0.2.1',
     pricing: 'free',
     emoji: '🎬',
     icon: 'Film',
@@ -226,7 +226,7 @@ const FALLBACK_REGISTRY: Record<string, ToolDescriptor> = {
     name: 'Document Editor',
     description: 'AI-powered form filling and document editing with Canvas-style live preview.',
     category: 'utility',
-    version: '0.2.1',
+    version: '0.2.3',
     pricing: 'free',
     emoji: '📝',
     icon: 'FileEdit',