opkg 0.7.2 → 0.7.4

package/dist/commands/add.js

@@ -2,12 +2,59 @@ import { withErrorHandling } from '../utils/errors.js';
 import { runAddToSourcePipeline } from '../core/add/add-to-source-pipeline.js';
 import { readWorkspaceIndex } from '../utils/workspace-index-yml.js';
 import { formatPathForDisplay } from '../utils/formatters.js';
+/**
+ * Display add operation results in install-style format
+ */
+function displayAddResults(data, options) {
+    const cwd = process.cwd();
+    const { filesAdded, sourcePath, sourceType, packageName: resolvedName, addedFilePaths } = data;
+    // Determine if this is a workspace root add
+    const displayPath = formatPathForDisplay(sourcePath, cwd);
+    const isWorkspaceRoot = displayPath.includes('.openpackage') && !displayPath.includes('.openpackage/packages');
+    // Main success message
+    if (isWorkspaceRoot) {
+        console.log(`✓ Added to workspace package`);
+    }
+    else {
+        console.log(`✓ Added to ${resolvedName}`);
+    }
+    // Display added files in install-style format
+    if (addedFilePaths && addedFilePaths.length > 0) {
+        console.log(`✓ Added files: ${addedFilePaths.length}`);
+        const sortedFiles = [...addedFilePaths].sort((a, b) => a.localeCompare(b));
+        for (const file of sortedFiles) {
+            console.log(`   ├── ${formatPathForDisplay(file, cwd)}`);
+        }
+    }
+    else {
+        console.log(`✓ Added files: ${filesAdded}`);
+    }
+    // Show hints only for non-workspace-root adds
+    if (!options.apply && !isWorkspaceRoot) {
+        // Check if package is installed in workspace
+        readWorkspaceIndex(cwd).then(workspaceIndexRecord => {
+            const isInstalled = !!workspaceIndexRecord.index.packages[resolvedName];
+            if (isInstalled) {
+                console.log(`\n💡 Changes not synced to workspace.`);
+                console.log(`   To sync changes, run:`);
+                console.log(`     opkg apply ${resolvedName}`);
+            }
+            else {
+                console.log(`\n💡 Package not installed in workspace.`);
+                console.log(`   To install and sync, run:`);
+                console.log(`     opkg install ${resolvedName}`);
+            }
+        }).catch(() => {
+            // Ignore errors reading workspace index
+        });
+    }
+}
 export function setupAddCommand(program) {
     program
         .command('add')
-        .argument('<package-name>', 'package name')
-        .argument('<path>', 'file or directory to add')
-        .description('Add files to a mutable package source')
+        .argument('[package-name]', 'package name (optional - defaults to workspace package)')
+        .argument('[path]', 'file or directory to add')
+        .description('Add files to a mutable package source or workspace package')
         .option('--platform-specific', 'Save platform-specific variants for platform subdir inputs')
         .option('--apply', 'Apply changes to workspace immediately (requires package to be installed)')
         .action(withErrorHandling(async (packageName, pathArg, options) => {
@@ -15,30 +62,9 @@ export function setupAddCommand(program) {
         if (!result.success) {
             throw new Error(result.error || 'Add operation failed');
         }
-        // Provide helpful feedback
+        // Display results
         if (result.data) {
-            const cwd = process.cwd();
-            const { filesAdded, sourcePath, sourceType, packageName: resolvedName } = result.data;
-            // Format the path for display using unified formatter
-            const displayPath = formatPathForDisplay(sourcePath, cwd);
-            console.log(`\n✓ Added ${filesAdded} file${filesAdded !== 1 ? 's' : ''} to ${resolvedName}`);
-            console.log(`  Path: ${displayPath}`);
-            console.log(`  Type: ${sourceType} package`);
-            if (!options.apply) {
-                // Check if package is installed in workspace
-                const workspaceIndexRecord = await readWorkspaceIndex(cwd);
-                const isInstalled = !!workspaceIndexRecord.index.packages[resolvedName];
-                if (isInstalled) {
-                    console.log(`\n💡 Changes not synced to workspace.`);
-                    console.log(`   To sync changes, run:`);
-                    console.log(`     opkg apply ${resolvedName}`);
-                }
-                else {
-                    console.log(`\n💡 Package not installed in workspace.`);
-                    console.log(`   To install and sync, run:`);
-                    console.log(`     opkg install ${resolvedName}`);
-                }
-            }
+            displayAddResults(result.data, options);
         }
     }));
 }

package/dist/commands/add.js.map

@@ -1 +1 @@
-{"version":3,"file":"add.js","sourceRoot":"","sources":["../../src/commands/add.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAA2B,MAAM,uCAAuC,CAAC;AACxG,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,UAAU,eAAe,CAAC,OAAgB;IAC9C,OAAO;SACJ,OAAO,CAAC,KAAK,CAAC;SACd,QAAQ,CAAC,gBAAgB,EAAE,cAAc,CAAC;SAC1C,QAAQ,CAAC,QAAQ,EAAE,0BAA0B,CAAC;SAC9C,WAAW,CAAC,uCAAuC,CAAC;SACpD,MAAM,CAAC,qBAAqB,EAAE,4DAA4D,CAAC;SAC3F,MAAM,CAAC,SAAS,EAAE,2EAA2E,CAAC;SAC9F,MAAM,CACL,iBAAiB,CAAC,KAAK,EAAE,WAA+B,EAAE,OAA2B,EAAE,OAA2B,EAAE,EAAE;QACpH,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAC3E,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,sBAAsB,CAAC,CAAC;QAC1D,CAAC;QAED,2BAA2B;QAC3B,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;YAC1B,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;YAEtF,sDAAsD;YACtD,MAAM,WAAW,GAAG,oBAAoB,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YAE1D,OAAO,CAAC,GAAG,CAAC,aAAa,UAAU,QAAQ,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,YAAY,EAAE,CAAC,CAAC;YAC7F,OAAO,CAAC,GAAG,CAAC,WAAW,WAAW,EAAE,CAAC,CAAC;YACtC,OAAO,CAAC,GAAG,CAAC,WAAW,UAAU,UAAU,CAAC,CAAC;YAE7C,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBACnB,6CAA6C;gBAC7C,MAAM,oBAAoB,GAAG,MAAM,kBAAkB,CAAC,GAAG,CAAC,CAAC;gBAC3D,MAAM,WAAW,GAAG,CAAC,CAAC,oBAAoB,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;gBAExE,IAAI,WAAW,EAAE,CAAC;oBAChB,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;oBACrD,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;oBACxC,OAAO,CAAC,GAAG,CAAC,mBAAmB,YAAY,EAAE,CAAC,CAAC;gBACjD,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;oBACxD,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;oBAC5C,OAAO,CAAC,GAAG,CAAC,qBAAqB,YAAY,EAAE,CAAC,CAAC;gBACnD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CACH,CAAC;AACN,CAAC"}
+{"version":3,"file":"add.js","sourceRoot":"","sources":["../../src/commands/add.ts"],"names":[],"mappings":"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"}

package/dist/commands/apply.js

@@ -1,16 +1,55 @@
 import { withErrorHandling } from '../utils/errors.js';
-import { runApplyPipeline } from '../core/apply/apply-pipeline.js';
+import { buildApplyContext } from '../core/install/unified/context-builders.js';
+import { runUnifiedInstallPipeline } from '../core/install/unified/pipeline.js';
+/**
+ * Main apply command handler
+ */
+async function applyCommand(packageName, options) {
+    const cwd = process.cwd();
+    // Handle bulk apply when no package name specified
+    if (!packageName) {
+        const contexts = await buildApplyContext(cwd, undefined, options);
+        return await applyBulk(contexts);
+    }
+    // Apply single package
+    const ctx = await buildApplyContext(cwd, packageName, options);
+    return await runUnifiedInstallPipeline(ctx);
+}
+/**
+ * Apply multiple packages (workspace root + all installed packages)
+ */
+async function applyBulk(contexts) {
+    if (contexts.length === 0) {
+        return {
+            success: false,
+            error: `No packages installed in this workspace.\n` +
+                `Run 'opkg install <package-name>' to install a package first.`
+        };
+    }
+    console.log(`✓ Applying ${contexts.length} package${contexts.length === 1 ? '' : 's'}\n`);
+    for (const ctx of contexts) {
+        const result = await runUnifiedInstallPipeline(ctx);
+        if (!result.success) {
+            return result; // Stop on first failure
+        }
+    }
+    return { success: true };
+}
+/**
+ * Setup apply command
+ */
 export function setupApplyCommand(program) {
     program
         .command('apply')
         .description('Apply/sync package across platforms')
-        .argument('[package-name]', 'package name to apply (defaults to current/root package)')
+        .argument('[package-name]', 'package name to apply (optional - applies workspace-level files and all installed packages if not specified)')
         .option('-f, --force', 'overwrite existing files without prompting')
         .option('--dry-run', 'plan apply without writing files')
         .action(withErrorHandling(async (packageName, options) => {
-        const result = await runApplyPipeline(packageName, options ?? {});
-        if (!result.success)
+        const result = await applyCommand(packageName, options);
+        if (!result.success) {
             throw new Error(result.error || 'Apply operation failed');
+        }
     }));
 }
 //# sourceMappingURL=apply.js.map

package/dist/commands/apply.js.map

@@ -1 +1 @@
-{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../src/commands/apply.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAA6B,MAAM,iCAAiC,CAAC;AAE9F,MAAM,UAAU,iBAAiB,CAAC,OAAgB;IAChD,OAAO;SACJ,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,qCAAqC,CAAC;SAClD,QAAQ,CAAC,gBAAgB,EAAE,0DAA0D,CAAC;SACtF,MAAM,CAAC,aAAa,EAAE,4CAA4C,CAAC;SACnE,MAAM,CAAC,WAAW,EAAE,kCAAkC,CAAC;SACvD,MAAM,CACL,iBAAiB,CAAC,KAAK,EAAE,WAA+B,EAAE,OAA6B,EAAE,EAAE;QACzF,MAAM,MAAM,GAAkB,MAAM,gBAAgB,CAAC,WAAW,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC;QACjF,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,wBAAwB,CAAC,CAAC;IACjF,CAAC,CAAC,CACH,CAAC;AACN,CAAC"}
+{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../src/commands/apply.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAEhF;;GAEG;AACH,KAAK,UAAU,YAAY,CACzB,WAA+B,EAC/B,OAA8C;IAE9C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE1B,mDAAmD;IACnD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAClE,OAAO,MAAM,SAAS,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAED,uBAAuB;IACvB,MAAM,GAAG,GAAG,MAAM,iBAAiB,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAC/D,OAAO,MAAM,yBAAyB,CAAC,GAAG,CAAC,CAAC;AAC9C,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,SAAS,CAAC,QAA+B;IACtD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EACH,4CAA4C;gBAC5C,+DAA+D;SAClE,CAAC;IACJ,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,cAAc,QAAQ,CAAC,MAAM,WAAW,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAE1F,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,GAAG,CAAC,CAAC;QAEpD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,MAAM,CAAC,CAAC,wBAAwB;QACzC,CAAC;IACH,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AAC3B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAgB;IAChD,OAAO;SACJ,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,qCAAqC,CAAC;SAClD,QAAQ,CACP,gBAAgB,EAChB,8GAA8G,CAC/G;SACA,MAAM,CAAC,aAAa,EAAE,4CAA4C,CAAC;SACnE,MAAM,CAAC,WAAW,EAAE,kCAAkC,CAAC;SACvD,MAAM,CACL,iBAAiB,CAAC,KAAK,EAAE,WAA+B,EAAE,OAAY,EAAE,EAAE;QACxE,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAExD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,wBAAwB,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC,CAAC,CACH,CAAC;AACN,CAAC"}

package/dist/commands/install.js

@@ -1,19 +1,14 @@
-import { resolve } from 'path';
-import { formatPathForDisplay } from '../utils/formatters.js';
-import { DIR_PATTERNS, PACKAGE_PATHS } from '../constants/index.js';
-import { runBulkInstallPipeline } from '../core/install/bulk-install-pipeline.js';
-import { runInstallPipeline, determineResolutionMode } from '../core/install/install-pipeline.js';
-import { runPathInstallPipeline } from '../core/install/path-install-pipeline.js';
-import { loadPackageFromGit } from '../core/install/git-package-loader.js';
-import { inferSourceType } from '../core/install/path-package-loader.js';
-import { detectPluginType } from '../core/install/plugin-detector.js';
-import { parseMarketplace, promptPluginSelection, installMarketplacePlugins } from '../core/install/marketplace-handler.js';
-import { withErrorHandling, ValidationError } from '../utils/errors.js';
+import { withErrorHandling } from '../utils/errors.js';
 import { normalizePlatforms } from '../utils/platform-mapper.js';
-import { classifyPackageInput } from '../utils/package-input.js';
-import { findExistingPathOrGitSource } from '../utils/install-helpers.js';
-import { logger } from '../utils/logger.js';
+import { buildInstallContext } from '../core/install/unified/context-builders.js';
+import { runUnifiedInstallPipeline } from '../core/install/unified/pipeline.js';
+import { determineResolutionMode } from '../utils/resolution-mode.js';
+import { DIR_PATTERNS, PACKAGE_PATHS } from '../constants/index.js';
 import { normalizePathForProcessing } from '../utils/path-normalization.js';
+import { getLoaderForSource } from '../core/install/sources/loader-factory.js';
+/**
+ * Validate that target directory is not inside .openpackage metadata
+ */
 function assertTargetDirOutsideMetadata(targetDir) {
     const normalized = normalizePathForProcessing(targetDir ?? '.');
     if (!normalized || normalized === '.') {
@@ -21,204 +16,150 @@ function assertTargetDirOutsideMetadata(targetDir) {
     }
     if (normalized === DIR_PATTERNS.OPENPACKAGE ||
         normalized.startsWith(`${DIR_PATTERNS.OPENPACKAGE}/`)) {
-        throw new Error(`Installation target '${targetDir}' cannot point inside ${DIR_PATTERNS.OPENPACKAGE} (reserved for metadata like ${PACKAGE_PATHS.INDEX_RELATIVE}). Choose a workspace path outside metadata.`);
+        throw new Error(`Installation target '${targetDir}' cannot point inside ${DIR_PATTERNS.OPENPACKAGE} ` +
+            `(reserved for metadata like ${PACKAGE_PATHS.INDEX_RELATIVE}). ` +
+            `Choose a workspace path outside metadata.`);
     }
 }
+/**
+ * Validate resolution flags
+ */
 export function validateResolutionFlags(options) {
     if (options.remote && options.local) {
         throw new Error('--remote and --local cannot be used together. Choose one resolution mode.');
     }
 }
+/**
+ * Main install command handler
+ */
 async function installCommand(packageInput, options) {
-    const targetDir = '.';
     const cwd = process.cwd();
+    const targetDir = '.';
+    // Validate inputs
     assertTargetDirOutsideMetadata(targetDir);
+    validateResolutionFlags(options);
+    // Set resolution mode
     options.resolutionMode = determineResolutionMode(options);
-    logger.debug('Install resolution mode selected', { mode: options.resolutionMode });
-    if (!packageInput) {
-        return await runBulkInstallPipeline(options);
+    // Build context(s)
+    const contexts = await buildInstallContext(cwd, packageInput, options);
+    // Handle bulk install (multiple contexts)
+    if (Array.isArray(contexts)) {
+        return await runBulkInstall(contexts);
     }
-    // Classify the input to determine if it's a registry name, directory, or tarball
-    const classification = await classifyPackageInput(packageInput, cwd);
-    // For registry-type inputs (package names), check if it's actually a path/git dependency in openpackage.yml
-    // This ensures we respect the manifest's declared source type on subsequent installs
-    if (classification.type === 'registry' && classification.name) {
-        const existingSource = await findExistingPathOrGitSource(cwd, classification.name);
-        if (existingSource) {
-            if (existingSource.type === 'git') {
-                const subdirPart = existingSource.subdirectory ? `&subdirectory=${existingSource.subdirectory}` : '';
-                logger.info(`Using git source from openpackage.yml for '${classification.name}': ${existingSource.url}`);
-                console.log(`✓ Using git source from openpackage.yml: ${existingSource.url}${existingSource.ref ? `#${existingSource.ref}` : ''}${subdirPart}`);
-                const result = await loadPackageFromGit({
-                    url: existingSource.url,
-                    ref: existingSource.ref,
-                    subdirectory: existingSource.subdirectory
-                });
-                if (result.isMarketplace) {
-                    throw new ValidationError(`Package '${classification.name}' is declared as a git source in openpackage.yml, ` +
-                        `but the repository is a Claude Code plugin marketplace. ` +
-                        `Marketplaces cannot be used as dependencies via openpackage.yml.`);
-                }
-                return await runPathInstallPipeline({
-                    ...options,
-                    sourcePath: result.sourcePath,
-                    sourceType: 'directory',
-                    targetDir,
-                    gitUrl: existingSource.url,
-                    gitRef: existingSource.ref,
-                    gitSubdirectory: existingSource.subdirectory
-                });
-            }
-            else if (existingSource.type === 'path') {
-                logger.info(`Using path source from openpackage.yml for '${classification.name}': ${existingSource.path}`);
-                const displayPath = formatPathForDisplay(existingSource.path, cwd);
-                console.log(`✓ Using path source from openpackage.yml: ${displayPath}`);
-                const resolvedPath = resolve(cwd, existingSource.path);
-                const sourceType = inferSourceType(existingSource.path);
-                return await runPathInstallPipeline({
-                    ...options,
-                    sourcePath: resolvedPath,
-                    sourceType,
-                    targetDir
-                });
-            }
-        }
-    }
-    if (classification.type === 'git') {
-        const result = await loadPackageFromGit({
-            url: classification.gitUrl,
-            ref: classification.gitRef,
-            subdirectory: classification.gitSubdirectory
-        });
-        // Check if this is a marketplace
-        if (result.isMarketplace) {
-            logger.info('Detected Claude Code marketplace, prompting for plugin selection', {
-                url: classification.gitUrl
-            });
-            const pluginDetection = await detectPluginType(result.sourcePath);
-            if (!pluginDetection.manifestPath) {
-                throw new ValidationError('Marketplace manifest not found');
-            }
-            // Parse marketplace and prompt for selection (pass context for fallback naming)
-            const marketplace = await parseMarketplace(pluginDetection.manifestPath, {
-                gitUrl: classification.gitUrl,
-                repoPath: result.repoPath
-            });
-            const selectedPlugins = await promptPluginSelection(marketplace);
-            if (selectedPlugins.length === 0) {
-                console.log('No plugins selected. Installation cancelled.');
-                return { success: true };
-            }
-            // Install selected plugins
-            return await installMarketplacePlugins(result.repoPath, marketplace, selectedPlugins, classification.gitUrl, classification.gitRef, options);
+    // For git sources, we need to load the package first to detect if it's a marketplace
+    // Marketplaces are detected during loadPackagePhase, so we need to check after loading
+    if (contexts.source.type === 'git') {
+        // Load package to detect marketplace
+        const loader = getLoaderForSource(contexts.source);
+        const loaded = await loader.load(contexts.source, options, cwd);
+        // Update context with loaded info
+        contexts.source.packageName = loaded.packageName;
+        contexts.source.version = loaded.version;
+        contexts.source.contentRoot = loaded.contentRoot;
+        contexts.source.pluginMetadata = loaded.pluginMetadata;
+        // Check if marketplace - handle at command level
+        if (contexts.source.pluginMetadata?.pluginType === 'marketplace') {
+            return await handleMarketplaceInstallation(contexts, options, cwd);
         }
-        // Not a marketplace, install as regular package/plugin
-        return await runPathInstallPipeline({
-            ...options,
-            sourcePath: result.sourcePath,
-            sourceType: 'directory',
-            targetDir,
-            gitUrl: classification.gitUrl,
-            gitRef: classification.gitRef,
-            gitSubdirectory: classification.gitSubdirectory
-        });
+        // Not a marketplace, continue with normal pipeline
+        // Create resolved package for the loaded package
+        contexts.resolvedPackages = [{
+                name: loaded.packageName,
+                version: loaded.version,
+                pkg: { metadata: loaded.metadata, files: [], _format: undefined },
+                isRoot: true,
+                source: 'git',
+                contentRoot: loaded.contentRoot
+            }];
     }
-    if (classification.type === 'directory' || classification.type === 'tarball') {
-        // Display source comparison info if available
-        if (classification.sourceComparisonInfo) {
-            displayPackageSourceResolution(classification.sourceComparisonInfo);
-        }
-        // Check if this is a marketplace (only for directories, not tarballs)
-        if (classification.type === 'directory') {
-            const pluginDetection = await detectPluginType(classification.resolvedPath);
-            if (pluginDetection.isPlugin && pluginDetection.type === 'marketplace') {
-                logger.info('Detected Claude Code marketplace from local path, prompting for plugin selection', {
-                    path: classification.resolvedPath
-                });
-                // Parse marketplace and prompt for selection (pass context for fallback naming)
-                const marketplace = await parseMarketplace(pluginDetection.manifestPath, {
-                    repoPath: classification.resolvedPath
-                });
-                const selectedPlugins = await promptPluginSelection(marketplace);
-                if (selectedPlugins.length === 0) {
-                    console.log('No plugins selected. Installation cancelled.');
-                    return { success: true };
-                }
-                // Install selected plugins (no git URL for local paths)
-                return await installMarketplacePlugins(classification.resolvedPath, marketplace, selectedPlugins, classification.resolvedPath, // Use path as "url" for tracking
-                undefined, // No git ref for local paths
-                options);
-            }
-        }
-        return await runPathInstallPipeline({
-            ...options,
-            sourcePath: classification.resolvedPath,
-            sourceType: classification.type,
-            targetDir
-        });
+    // Single package install
+    return await runUnifiedInstallPipeline(contexts);
+}
+/**
+ * Handle marketplace installation with plugin selection
+ */
+async function handleMarketplaceInstallation(context, options, cwd) {
+    const { parseMarketplace, promptPluginSelection, installMarketplacePlugins } = await import('../core/install/marketplace-handler.js');
+    const { Spinner } = await import('../utils/spinner.js');
+    // Load the marketplace package (already loaded, use context data)
+    if (!context.source.pluginMetadata?.manifestPath) {
+        throw new Error('Marketplace manifest not found');
     }
-    // Registry-based install (existing flow)
-    const { name, version, registryPath } = classification;
-    return await runInstallPipeline({
-        ...options,
-        packageName: name,
-        version,
-        registryPath,
-        targetDir
+    const spinner = new Spinner('Loading marketplace');
+    spinner.start();
+    // Parse marketplace manifest
+    const marketplace = await parseMarketplace(context.source.pluginMetadata.manifestPath, {
+        repoPath: context.source.contentRoot
     });
+    spinner.stop();
+    // Prompt user to select plugins
+    const selectedPlugins = await promptPluginSelection(marketplace);
+    if (selectedPlugins.length === 0) {
+        console.log('No plugins selected. Installation cancelled.');
+        return { success: true, data: { installed: 0, skipped: 0 } };
+    }
+    // Install selected plugins using marketplace handler
+    // At this point we know it's a git source with a gitUrl
+    if (context.source.type !== 'git' || !context.source.gitUrl) {
+        throw new Error('Marketplace must be from a git source');
+    }
+    return await installMarketplacePlugins(context.source.contentRoot, marketplace, selectedPlugins, context.source.gitUrl, context.source.gitRef, options, cwd);
 }
 /**
- * Display user-friendly information about package source resolution
+ * Run bulk installation for multiple packages
  */
-function displayPackageSourceResolution(info) {
-    const { candidates, selected, reason } = info;
-    // Workspace override - simple message
-    if (reason === 'workspace-override') {
-        console.log(`✓ Found ${selected.packageName} in workspace packages`);
-        console.log(`💡 Workspace packages always override global/registry`);
-        return;
-    }
-    // Single source - simple message
-    if (reason === 'only-source' && candidates.length === 1) {
-        const sourceType = selected.type === 'global' ? 'global packages' :
-            selected.type === 'registry' ? 'registry' : 'workspace packages';
-        console.log(`✓ Found ${selected.packageName} in ${sourceType}`);
-        return;
+async function runBulkInstall(contexts) {
+    if (contexts.length === 0) {
+        console.log('⚠️  No packages found in openpackage.yml');
+        console.log('\n💡 Tips:');
+        console.log('  • Add packages to the "packages" array in openpackage.yml');
+        console.log('  • Add development packages to the "dev-packages" array');
+        console.log('  • Use "opkg install <package-name>" to install a specific package');
+        return { success: true, data: { installed: 0, skipped: 0 } };
     }
-    // Multiple sources - show comparison
-    if (candidates.length > 1) {
-        console.log(`Resolving ${selected.packageName}...`);
-        for (const candidate of candidates) {
-            const label = candidate.type === 'global' ? 'Global packages' : 'Registry';
-            const suffix = candidate.type === 'global' ? ' (mutable)' : ' (stable)';
-            console.log(`  • ${label}: ${candidate.version}${suffix}`);
-        }
-        const sourceLabel = selected.type === 'global' ? 'global packages' : 'registry';
-        if (reason === 'newer-version') {
-            console.log(`✓ Using ${selected.packageName}@${selected.version} from ${sourceLabel} (newer version)`);
-            // Warn about outdated global if registry was selected
-            if (selected.type === 'registry') {
-                const global = candidates.find((c) => c.type === 'global');
-                if (global) {
-                    console.log(`⚠️  Global packages has older version (${global.version})`);
-                    console.log(`💡 To update global: cd ~/.openpackage/packages/${selected.packageName} && opkg pack`);
-                }
+    console.log(`\n✓ Installing ${contexts.length} package${contexts.length === 1 ? '' : 's'} from openpackage.yml\n`);
+    let totalInstalled = 0;
+    let totalSkipped = 0;
+    const results = [];
+    for (const ctx of contexts) {
+        try {
+            const result = await runUnifiedInstallPipeline(ctx);
+            if (result.success) {
+                totalInstalled++;
+                results.push({ name: ctx.source.packageName, success: true });
+                console.log(`✓ ${ctx.source.packageName}`);
+            }
+            else {
+                totalSkipped++;
+                results.push({ name: ctx.source.packageName, success: false, error: result.error });
+                console.log(`❌ ${ctx.source.packageName}: ${result.error}`);
             }
         }
-        else if (reason === 'same-version-prefer-mutable') {
-            console.log(`✓ Using ${selected.packageName}@${selected.version} from ${sourceLabel} (same version, prefer mutable)`);
-        }
-        else {
-            console.log(`✓ Using ${selected.packageName}@${selected.version} from ${sourceLabel}`);
+        catch (error) {
+            totalSkipped++;
+            results.push({ name: ctx.source.packageName, success: false, error: String(error) });
+            console.log(`❌ ${ctx.source.packageName}: ${error}`);
         }
     }
+    // Display summary
+    console.log(`\n✓ Installation complete: ${totalInstalled} installed${totalSkipped > 0 ? `, ${totalSkipped} failed` : ''}`);
+    const allSuccessful = totalSkipped === 0;
+    return {
+        success: allSuccessful,
+        data: { installed: totalInstalled, skipped: totalSkipped, results },
+        error: allSuccessful ? undefined : `${totalSkipped} packages failed to install`
+    };
 }
+/**
+ * Setup install command
+ */
 export function setupInstallCommand(program) {
     program
         .command('install')
         .alias('i')
         .description('Install packages to workspace')
-        .argument('[package-name]', 'name of the package to install (optional - installs all from openpackage.yml if not specified). Supports package@version syntax.')
+        .argument('[package-name]', 'name of the package to install (optional - installs workspace-level files and all packages from openpackage.yml if not specified). ' +
+        'Supports package@version syntax.')
         .option('--dry-run', 'preview changes without applying them')
         .option('--force', 'overwrite existing files')
         .option('--conflicts <strategy>', 'conflict handling strategy: keep-both, overwrite, skip, or ask')
@@ -229,23 +170,27 @@ export function setupInstallCommand(program) {
         .option('--profile <profile>', 'profile to use for authentication')
         .option('--api-key <key>', 'API key for authentication (overrides profile)')
         .action(withErrorHandling(async (packageName, options) => {
+        // Normalize platforms
         options.platforms = normalizePlatforms(options.platforms);
+        // Normalize conflict strategy
         const commandOptions = options;
         const rawConflictStrategy = commandOptions.conflicts ?? options.conflictStrategy;
         if (rawConflictStrategy) {
             const normalizedStrategy = rawConflictStrategy.toLowerCase();
-            const allowedStrategies = ['keep-both', 'overwrite', 'skip', 'ask'];
+            const allowedStrategies = [
+                'keep-both', 'overwrite', 'skip', 'ask'
+            ];
             if (!allowedStrategies.includes(normalizedStrategy)) {
-                throw new Error(`Invalid --conflicts value '${rawConflictStrategy}'. Use one of: keep-both, overwrite, skip, ask.`);
+                throw new Error(`Invalid --conflicts value '${rawConflictStrategy}'. ` +
+                    `Use one of: keep-both, overwrite, skip, ask.`);
             }
             options.conflictStrategy = normalizedStrategy;
         }
-        validateResolutionFlags(options);
-        options.resolutionMode = determineResolutionMode(options);
+        // Execute install
         const result = await installCommand(packageName, options);
         if (!result.success) {
             if (result.error === 'Package not found') {
-                return;
+                return; // Already displayed message
             }
             throw new Error(result.error || 'Installation operation failed');
         }