@hailer/mcp 1.2.1 → 2.0.0-beta.10

package/dist/mcp/tools/app-marketplace.js

@@ -1,234 +1,370 @@
 "use strict";
 /**
- * App Tools - Marketplace & Templates
+ * App Tools - Marketplace (v2 tool surface)
  *
- * App marketplace and template management tools:
- * - List, create, get, and install templates
- * - Publish templates to marketplace
- * - Publish apps to marketplace
- * - Install marketplace apps
- * - Get product info and manifests
+ * Three merged marketplace tools:
+ * - browse_marketplace: list products / product detail (+ manifest)
+ * - install_marketplace: install app or template products (type auto-detected)
+ * - publish_marketplace: publish/update app or template listings
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.appMarketplaceTools = exports.installMarketplaceAppTool = exports.publishAppTool = exports.getProductManifestTool = exports.getProductTool = exports.publishTemplateTool = exports.getTemplateTool = exports.installTemplateTool = exports.createTemplateTool = exports.listTemplatesTool = void 0;
+exports.appMarketplaceTools = exports.publishMarketplaceTool = exports.installMarketplaceTool = exports.browseMarketplaceTool = void 0;
 const zod_1 = require("zod");
 const tool_registry_1 = require("../tool-registry");
 const UserContextCache_1 = require("../UserContextCache");
 const logger_1 = require("../../lib/logger");
 const request_logger_1 = require("../../lib/request-logger");
 const tool_helpers_1 = require("../utils/tool-helpers");
+const workspace_admin_store_1 = require("../workspace-admin-store");
 const logger = (0, logger_1.createLogger)({ component: 'app-marketplace' });
-const listTemplatesDescription = `List marketplace templates`;
-exports.listTemplatesTool = {
-    name: 'list_templates',
-    group: tool_registry_1.ToolGroup.PLAYGROUND,
-    description: listTemplatesDescription,
-    schema: zod_1.z.object({
-        workspaceId: zod_1.z
-            .string()
-            .optional()
-            .describe("Optional workspace ID - defaults to current workspace"),
-        publicOnly: zod_1.z
-            .boolean()
-            .optional()
-            .default(false)
-            .describe("If true, show only public marketplace templates. If false (default), show private/workspace templates."),
-    }),
-    async execute(args, context) {
-        const showPublic = args.publicOnly ?? false;
-        logger.debug('Listing marketplace templates', {
-            workspaceId: args.workspaceId,
-            publicOnly: showPublic,
-            apiKey: context.apiKey.substring(0, 8) + '...'
-        });
-        try {
-            const workspaceId = (0, tool_helpers_1.getResolvedWorkspaceId)(args, context);
-            if (!workspaceId) {
-                return (0, tool_helpers_1.missingWorkspaceCacheResponse)();
-            }
-            logger.debug('Calling v3.product.list', { workspaceId, public: showPublic });
-            // v3.product.list endpoint with public flag
-            const result = await context.hailer.request('v3.product.list', [
-                { cid: workspaceId, public: showPublic },
-                {} // pagination options
-            ]);
-            logger.debug('Template list response', {
-                result: JSON.stringify(result)
-            });
-            const templateType = showPublic ? 'Public Marketplace' : 'Private/Workspace';
-            let responseText = `✅ **${templateType} Templates**\n\n`;
-            responseText += `**Workspace:** ${workspaceId}\n`;
-            responseText += `**Filter:** ${showPublic ? 'Public only' : 'Private/workspace'}\n\n`;
-            // Handle response: {products: [], totalCount: 0}
-            const products = result?.products || [];
-            const totalCount = result?.totalCount || 0;
-            if (products.length === 0) {
-                responseText += `**No ${showPublic ? 'public' : 'private'} templates found.**\n\n`;
-                if (showPublic) {
-                    responseText += `💡 Try \`list_templates()\` without \`publicOnly: true\` to see private workspace templates.\n`;
-                }
-                else {
-                    responseText += `💡 Use \`create_template\` to create a new template.\n`;
-                }
-                return {
-                    content: [{
-                            type: "text",
-                            text: responseText,
-                        }],
-                };
-            }
-            const templates = products;
-            responseText += `**Total Templates:** ${templates.length}\n\n`;
-            templates.forEach((template, index) => {
-                responseText += `### ${index + 1}. ${template.name || 'Unnamed Template'}\n`;
-                responseText += `- **ID:** \`${template._id || template.id || 'N/A'}\`\n`;
-                if (template.description) {
-                    responseText += `- **Description:** ${template.description}\n`;
-                }
-                if (template.creator) {
-                    responseText += `- **Creator:** ${template.creator}\n`;
-                }
-                if (template.version) {
-                    responseText += `- **Version:** ${template.version}\n`;
-                }
-                if (template.icon) {
-                    responseText += `- **Icon:** \`${template.icon}\`\n`;
-                }
-                if (template.images && template.images.length > 0) {
-                    responseText += `- **Images:** ${template.images.map((img) => `\`${img}\``).join(', ')}\n`;
-                }
-                responseText += `\n`;
-            });
-            responseText += `💡 **Next Steps:**\n`;
-            responseText += `- Use \`install_template\` to install a template\n`;
-            responseText += `- Use \`get_template\` to see template details`;
-            return {
-                content: [{
-                        type: "text",
-                        text: responseText,
-                    }],
-            };
-        }
-        catch (error) {
-            if (!request_logger_1.RequestLogger.getCurrent())
-                logger.error("Error listing templates", error);
-            const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
-            return {
-                content: [{
-                        type: "text",
-                        text: `❌ **Error listing templates**\n\n**Error:** ${errorMessage}\n\n**Common Issues:**\n- API endpoint not available\n- Permission issues`,
-                    }],
-            };
+function textResponse(text) {
+    return {
+        content: [{
+                type: 'text',
+                text,
+            }],
+    };
+}
+async function fetchProductDetail(productId, context) {
+    try {
+        logger.debug('Calling v3.app.product.get', { productId });
+        const result = await context.hailer.request('v3.app.product.get', [productId]);
+        if (result) {
+            return { product: result, source: 'v3' };
         }
     }
-};
+    catch (v3Error) {
+        logger.debug('v3 product get failed, falling back to v2 template lookup', {
+            productId,
+            error: v3Error instanceof Error ? v3Error.message : String(v3Error)
+        });
+    }
+    logger.debug('Calling v2.network.product.get', { productId });
+    const legacyResult = await context.hailer.request('v2.network.product.get', [productId]);
+    return { product: legacyResult?.product || legacyResult, source: 'v2' };
+}
+async function fetchProductManifest(productId, source, context) {
+    if (source === 'v3') {
+        logger.debug('Calling v3.app.product.getManifest', { productId });
+        return context.hailer.request('v3.app.product.getManifest', [productId]);
+    }
+    logger.debug('Calling v2.network.product.getManifest', { productId });
+    return context.hailer.request('v2.network.product.getManifest', [productId]);
+}
+function resolveProductType(source, product) {
+    if (source === 'v2') {
+        return 'template';
+    }
+    if (product?.type === 'template') {
+        return 'template';
+    }
+    return 'app';
+}
 // ============================================================================
-// CREATE TEMPLATE TOOL (MARKETPLACE)
+// BROWSE MARKETPLACE — list products / product detail (+ manifest)
 // ============================================================================
-const createTemplateDescription = `Create marketplace template`;
-exports.createTemplateTool = {
-    name: 'create_template',
-    group: tool_registry_1.ToolGroup.PLAYGROUND,
-    description: createTemplateDescription,
-    schema: zod_1.z.object({
-        name: zod_1.z
-            .string()
-            .min(1)
-            .describe("Template name (required)"),
-        description: zod_1.z
-            .string()
-            .optional()
-            .describe("Template description"),
-        workflowId: zod_1.z
-            .string()
-            .optional()
-            .describe("Source workflow ID to create template from"),
-    }),
-    async execute(args, context) {
-        logger.debug('Creating marketplace template', {
-            name: args.name,
-            hasWorkflowId: !!args.workflowId,
-            apiKey: context.apiKey.substring(0, 8) + '...'
+const browseMarketplaceDescription = `Browse the Hailer marketplace. Marketplace products come in two types — apps (installable web-apps) and ` +
+    `templates (packaged workspace configurations: workflows, phases, fields) — both distributed via the ` +
+    `marketplace.\n\n` +
+    `Without productId: lists products. publicOnly: true shows the public marketplace; default shows ` +
+    `private/workspace products. With productId: full details for one product (legacy v2 template IDs are ` +
+    `resolved via automatic fallback). Set includeManifest: true to also fetch the product manifest — its ` +
+    `versions and contained workflows — which you need before installing a specific version or ` +
+    `editing/publishing a new one.`;
+const browseMarketplaceSchema = zod_1.z.object({
+    productId: zod_1.z
+        .string()
+        .min(1)
+        .optional()
+        .describe('Product ID for a detail view. Omit to list products.'),
+    includeManifest: zod_1.z
+        .boolean()
+        .optional()
+        .default(false)
+        .describe('Detail view only: also fetch the product manifest (versions + contained workflows)'),
+    publicOnly: zod_1.z
+        .boolean()
+        .optional()
+        .default(false)
+        .describe('List view only: true = public marketplace products, false (default) = private/workspace products'),
+    workspaceId: zod_1.z
+        .string()
+        .optional()
+        .describe('Optional workspace ID - defaults to current workspace'),
+});
+async function executeListProducts(args, context) {
+    const showPublic = args.publicOnly ?? false;
+    logger.debug('Listing marketplace products', {
+        workspaceId: args.workspaceId,
+        publicOnly: showPublic,
+        apiKey: context.apiKey.substring(0, 8) + '...'
+    });
+    try {
+        const workspaceId = (0, tool_helpers_1.getResolvedWorkspaceId)(args, context);
+        if (!workspaceId) {
+            return (0, tool_helpers_1.missingWorkspaceCacheResponse)();
+        }
+        logger.debug('Calling v3.product.list', { workspaceId, public: showPublic });
+        // v3.product.list endpoint with public flag
+        const result = await context.hailer.request('v3.product.list', [
+            { cid: workspaceId, public: showPublic },
+            {} // pagination options
+        ]);
+        logger.debug('Product list response', {
+            result: JSON.stringify(result)
         });
-        try {
-            const workspaceId = (0, tool_helpers_1.getResolvedWorkspaceId)({}, context);
-            if (!workspaceId) {
-                return (0, tool_helpers_1.missingWorkspaceCacheResponse)();
+        const listingType = showPublic ? 'Public Marketplace' : 'Private/Workspace';
+        let responseText = `✅ **${listingType} Products**\n\n`;
+        responseText += `**Workspace:** ${workspaceId}\n`;
+        responseText += `**Filter:** ${showPublic ? 'Public only' : 'Private/workspace'}\n\n`;
+        // Handle response: {products: [], totalCount: 0}
+        const products = result?.products || [];
+        if (products.length === 0) {
+            responseText += `**No ${showPublic ? 'public' : 'private'} products found.**\n\n`;
+            if (showPublic) {
+                responseText += `💡 Try \`browse_marketplace()\` without \`publicOnly: true\` to see private workspace products.\n`;
+            }
+            if (!showPublic) {
+                responseText += `💡 Use \`publish_marketplace\` to publish an app or template.\n`;
+            }
+            return textResponse(responseText);
+        }
+        responseText += `**Total Products:** ${products.length}\n\n`;
+        products.forEach((product, index) => {
+            responseText += `### ${index + 1}. ${product.name || 'Unnamed Product'}\n`;
+            responseText += `- **ID:** \`${product._id || product.id || 'N/A'}\`\n`;
+            if (product.type) {
+                responseText += `- **Type:** ${product.type}\n`;
             }
-            // v2.network.product.create - creates a product entry (only accepts name)
-            const templateData = {
-                name: args.name
-            };
-            logger.debug('Calling v2.network.product.create', {
-                workspaceId,
-                templateData
-            });
-            const result = await context.hailer.request('v2.network.product.create', [templateData]);
-            logger.debug('Template creation response', {
-                result: JSON.stringify(result)
-            });
-            const templateId = result?.productId || result?._id || result?.id;
-            let responseText = `✅ **Template Created Successfully**\n\n`;
-            responseText += `**Template Name:** ${args.name}\n`;
-            responseText += `**Template ID:** \`${templateId || 'See response'}\`\n`;
-            responseText += `**Workspace:** ${workspaceId}\n`;
-            responseText += `\n💡 **Next Steps:**\n`;
-            responseText += `- Use Hailer marketplace UI to add workflows and description\n`;
-            responseText += `- Share the template ID with others to install\n`;
-            if (args.description || args.workflowId) {
-                responseText += `\n⚠️ **Note:** The \`v3.app.product.create\` API only accepts \`name\`.\n`;
-                responseText += `Description and workflow attachment must be done via Hailer UI.\n`;
+            if (product.description) {
+                responseText += `- **Description:** ${product.description}\n`;
             }
-            return {
-                content: [{
-                        type: "text",
-                        text: responseText,
-                    }],
-            };
-        }
-        catch (error) {
-            if (!request_logger_1.RequestLogger.getCurrent())
-                logger.error("Error creating template", error);
-            const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
-            if (errorMessage.toLowerCase().includes('permission')) {
-                return {
-                    content: [{
-                            type: "text",
-                            text: `❌ **Permission Denied**\n\nYou don't have permission to create templates. Only workspace administrators can create templates.\n\n**Error:** ${errorMessage}`,
-                        }],
-                };
+            if (product.creator) {
+                responseText += `- **Creator:** ${product.creator}\n`;
             }
-            return {
-                content: [{
-                        type: "text",
-                        text: `❌ **Error creating template**\n\n**Error:** ${errorMessage}\n\n**Common Issues:**\n- User must be workspace administrator\n- Invalid workflow ID`,
-                    }],
-            };
+            if (product.version) {
+                responseText += `- **Version:** ${product.version}\n`;
+            }
+            if (product.icon) {
+                responseText += `- **Icon:** \`${product.icon}\`\n`;
+            }
+            if (product.images && product.images.length > 0) {
+                responseText += `- **Images:** ${product.images.map((img) => `\`${img}\``).join(', ')}\n`;
+            }
+            responseText += `\n`;
+        });
+        responseText += `💡 **Next Steps:**\n`;
+        responseText += `- Use \`browse_marketplace({ productId })\` to see product details\n`;
+        responseText += `- Use \`install_marketplace({ productId })\` to install a product`;
+        return textResponse(responseText);
+    }
+    catch (error) {
+        if (!request_logger_1.RequestLogger.getCurrent()) {
+            logger.error('Error listing marketplace products', error);
+        }
+        const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
+        return textResponse(`❌ **Error listing marketplace products**\n\n**Error:** ${errorMessage}\n\n` +
+            `**Common Issues:**\n- API endpoint not available\n- Permission issues`);
+    }
+}
+async function buildManifestSection(productId, source, context) {
+    try {
+        const manifest = await fetchProductManifest(productId, source, context);
+        logger.debug('Product manifest response', { manifest: JSON.stringify(manifest) });
+        if (!manifest) {
+            return '';
+        }
+        return `\n**Manifest:**\n\`\`\`json\n${JSON.stringify(manifest, null, 2)}\n\`\`\`\n`;
+    }
+    catch (manifestError) {
+        logger.debug('Could not fetch manifest', { error: manifestError });
+        return `\n⚠️ Manifest could not be fetched for this product.\n`;
+    }
+}
+async function checkTemplateInstalled(productId, context) {
+    if (!context.workspaceCache) {
+        return null;
+    }
+    try {
+        const workspaceId = context.workspaceCache.currentWorkspace._id;
+        const installed = await context.hailer.request('v2.network.product.isProductInstalled', [
+            productId,
+            workspaceId
+        ]);
+        logger.debug('Template installation check', { installed: JSON.stringify(installed) });
+        return installed || null;
+    }
+    catch (installCheckError) {
+        logger.debug('Could not check installation status', { error: installCheckError });
+        return null;
+    }
+}
+function buildInstalledSection(installedInfo) {
+    if (!installedInfo) {
+        return '';
+    }
+    if (!installedInfo.installed) {
+        return `\n⚪ **Status:** Not installed in current workspace\n`;
+    }
+    if (installedInfo.appId) {
+        return `\n✅ **Status:** Installed in current workspace\n**App ID:** \`${installedInfo.appId}\`\n`;
+    }
+    return `\n✅ **Status:** Installed in current workspace\n`;
+}
+async function executeProductDetail(args, context) {
+    const productId = args.productId;
+    logger.debug('Getting marketplace product details', {
+        productId,
+        includeManifest: args.includeManifest,
+        apiKey: context.apiKey.substring(0, 8) + '...'
+    });
+    try {
+        const detail = await fetchProductDetail(productId, context);
+        const product = detail.product;
+        logger.debug('Product detail response', {
+            source: detail.source,
+            result: JSON.stringify(product)
+        });
+        let responseText = `✅ **Product Details**\n\n`;
+        responseText += `**Product ID:** \`${productId}\`\n`;
+        if (product?.name) {
+            responseText += `**Name:** ${product.name}\n`;
+        }
+        if (product?.description) {
+            responseText += `**Description:** ${product.description}\n`;
+        }
+        if (product?.type) {
+            responseText += `**Type:** ${product.type}\n`;
+        }
+        if (product?.version) {
+            responseText += `**Version:** ${product.version}\n`;
+        }
+        if (product?.versions?.length) {
+            responseText += `**Versions:** ${product.versions.length}\n`;
+        }
+        if (detail.source === 'v2') {
+            responseText += `**Source:** Legacy template (v2)\n`;
+        }
+        if (args.includeManifest) {
+            responseText += await buildManifestSection(productId, detail.source, context);
+        }
+        if (detail.source === 'v2') {
+            responseText += buildInstalledSection(await checkTemplateInstalled(productId, context));
+        }
+        responseText += `\n💡 **Next Steps:**\n`;
+        responseText += `- Use \`install_marketplace({ productId: "${productId}" })\` to install this product\n`;
+        responseText += `- Use \`browse_marketplace()\` to see other products`;
+        return textResponse(responseText);
+    }
+    catch (error) {
+        if (!request_logger_1.RequestLogger.getCurrent()) {
+            logger.error('Error getting marketplace product', error);
+        }
+        const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
+        if (errorMessage.toLowerCase().includes('not found')) {
+            return textResponse(`❌ **Product Not Found**\n\nProduct ID \`${productId}\` not found in marketplace.\n\n` +
+                `**Check:**\n- Product ID is correct\n- Product exists and is published\n\n` +
+                `💡 Use \`browse_marketplace()\` to see available products.`);
         }
+        return textResponse(`❌ **Error getting product**\n\n**Error:** ${errorMessage}\n\n` +
+            `**Common Issues:**\n- Invalid product ID\n- Product not found`);
+    }
+}
+exports.browseMarketplaceTool = {
+    name: 'browse_marketplace',
+    group: tool_registry_1.ToolGroup.PLAYGROUND,
+    description: browseMarketplaceDescription,
+    schema: browseMarketplaceSchema,
+    async execute(args, context) {
+        if (!args.productId) {
+            return executeListProducts(args, context);
+        }
+        return executeProductDetail(args, context);
     }
 };
 // ============================================================================
-// INSTALL TEMPLATE TOOL (MARKETPLACE)
+// INSTALL MARKETPLACE — install app or template products
 // ============================================================================
-const installTemplateDescription = `Install marketplace template to workspace`;
-exports.installTemplateTool = {
-    name: 'install_template',
+const installMarketplaceDescription = `Install a marketplace product into a workspace. Handles both product types automatically: apps are installed ` +
+    `via the v3 app install; templates (packaged workflows) via the v2 template install, which adds the ` +
+    `template's workflows to the workspace. The product type is detected from the marketplace entry — legacy v2 ` +
+    `template IDs route to the template path. Already-installed products are reported instead of reinstalled.`;
+async function persistInstallAdminCredentials(productId, workspaceId, context) {
+    try {
+        const identity = await (0, workspace_admin_store_1.resolveAdminIdentity)(context.hailer.getClient());
+        // Only persist the admin key for a verified admin — an unverified
+        // admin's key triggers the bot-invite doom loop downstream.
+        if (!identity.emailVerified) {
+            logger.warn('Marketplace install: admin email not verified — not persisting admin credentials', {
+                workspaceId,
+                adminUid: identity.uid
+            });
+            return;
+        }
+        (0, workspace_admin_store_1.persistAdminCredentials)(workspaceId, context.apiKey, identity);
+    }
+    catch (persistError) {
+        // Install already succeeded — surface the failure with enough context to trace
+        // popup-auth breakage back to this install instead of swallowing it.
+        logger.warn('Marketplace install: failed to persist admin credentials — popup auth may need admin re-authorization', {
+            workspaceId,
+            productId,
+            error: persistError instanceof Error ? persistError.message : String(persistError)
+        });
+    }
+}
+async function findExistingInstall(productId, workspaceId, context) {
+    logger.debug('Checking if product is already installed', { productId, workspaceId });
+    try {
+        const isInstalledResult = await context.hailer.request('v3.app.product.isProductInstalled', [
+            productId,
+            workspaceId
+        ]);
+        return isInstalledResult || null;
+    }
+    catch (checkError) {
+        // Ignore check errors and proceed with installation
+        logger.debug('Could not check installation status, proceeding', {
+            error: checkError instanceof Error ? checkError.message : String(checkError)
+        });
+        return null;
+    }
+}
+async function installTemplateProduct(productId, workspaceId, context) {
+    logger.debug('Calling v2.network.product.install', { productId, workspaceId });
+    const result = await context.hailer.request('v2.network.product.install', [productId, workspaceId]);
+    logger.debug('Template installation response', { result: JSON.stringify(result) });
+    // Invalidate user context cache so subsequent workflow listings get fresh data
+    UserContextCache_1.UserContextCache.clearContext(context.apiKey);
+    logger.debug('Cleared user context cache after template install', {
+        apiKey: context.apiKey.substring(0, 8) + '...'
+    });
+    return result;
+}
+async function installAppProduct(productId, workspaceId, context) {
+    logger.debug('Calling v3.app.product.install', { productId, workspaceId });
+    const installResult = await context.hailer.request('v3.app.product.install', [productId, workspaceId]);
+    logger.debug('Install result', { result: JSON.stringify(installResult) });
+    await persistInstallAdminCredentials(productId, workspaceId, context);
+    return installResult;
+}
+exports.installMarketplaceTool = {
+    name: 'install_marketplace',
     group: tool_registry_1.ToolGroup.PLAYGROUND,
-    description: installTemplateDescription,
+    description: installMarketplaceDescription,
     schema: zod_1.z.object({
-        templateId: zod_1.z
+        productId: zod_1.z
             .string()
             .min(1)
-            .describe("Template/Product ID to install"),
+            .describe('Marketplace product ID to install'),
         workspaceId: zod_1.z
             .string()
             .optional()
-            .describe("Target workspace ID (defaults to current)"),
+            .describe('Target workspace ID (defaults to current)'),
     }),
     async execute(args, context) {
-        logger.debug('Installing marketplace template', {
-            templateId: args.templateId,
-            workspaceId: args.workspaceId,
+        logger.debug('Installing marketplace product', {
+            productId: args.productId,
             apiKey: context.apiKey.substring(0, 8) + '...'
         });
         try {
@@ -236,242 +372,205 @@ exports.installTemplateTool = {
             if (!workspaceId) {
                 return (0, tool_helpers_1.missingWorkspaceCacheResponse)();
             }
-            logger.debug('Calling v2.network.product.install', {
-                templateId: args.templateId,
-                workspaceId
-            });
-            const result = await context.hailer.request('v2.network.product.install', [
-                args.templateId,
-                workspaceId
-            ]);
-            logger.debug('Template installation response', {
-                result: JSON.stringify(result)
-            });
-            // Invalidate user context cache so subsequent list_workflows calls get fresh data
-            UserContextCache_1.UserContextCache.clearContext(context.apiKey);
-            logger.debug('Cleared user context cache after template install', {
-                apiKey: context.apiKey.substring(0, 8) + '...'
-            });
-            const appId = result?.appId || result?._id;
-            let responseText = `✅ **Template Installed Successfully**\n\n`;
-            responseText += `**Template ID:** \`${args.templateId}\`\n`;
-            responseText += `**Workspace:** ${workspaceId}\n`;
-            if (appId) {
-                responseText += `**App ID:** \`${appId}\`\n`;
+            const existing = await findExistingInstall(args.productId, workspaceId, context);
+            if (existing?.installed) {
+                return textResponse(`ℹ️ **Product Already Installed**\n\nThis product is already installed in your workspace.\n\n` +
+                    `**App ID:** \`${existing.appId || 'unknown'}\`\n\n**Tips:**\n- Use \`list_apps()\` to see installed apps\n` +
+                    `- Use \`browse_marketplace({ productId: "${args.productId}" })\` to view product details`);
             }
-            responseText += `\n💡 **Next Steps:**\n`;
-            responseText += `- Use \`list_workflows\` to see new workflow(s)\n`;
-            responseText += `- Use \`list_apps\` to see new app(s)\n`;
-            return {
-                content: [{
-                        type: "text",
-                        text: responseText,
-                    }],
-            };
-        }
-        catch (error) {
-            if (!request_logger_1.RequestLogger.getCurrent())
-                logger.error("Error installing template", error);
-            const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
-            if (errorMessage.toLowerCase().includes('not found')) {
-                return {
-                    content: [{
-                            type: "text",
-                            text: `❌ **Template Not Found**\n\nTemplate ID \`${args.templateId}\` not found in marketplace.\n\n**Check:**\n- Template ID is correct\n- Template is published and available\n\n💡 Use \`list_templates\` to see available templates.`,
-                        }],
-                };
-            }
-            if (errorMessage.toLowerCase().includes('permission')) {
-                return {
-                    content: [{
-                            type: "text",
-                            text: `❌ **Permission Denied**\n\nYou don't have permission to install templates. Only workspace administrators can install templates.\n\n**Error:** ${errorMessage}`,
-                        }],
-                };
-            }
-            if (errorMessage.toLowerCase().includes('already installed')) {
-                return {
-                    content: [{
-                            type: "text",
-                            text: `⚠️ **Template Already Installed**\n\nThis template is already installed in the workspace.\n\n**Template ID:** \`${args.templateId}\`\n\n💡 Use \`list_apps\` to see installed apps.`,
-                        }],
-                };
-            }
-            // Include debug info for troubleshooting
-            const debugInfo = {
-                endpoint: 'v2.network.product.install',
-                requestData: [args.templateId, args.workspaceId || 'current-workspace']
-            };
-            return {
-                content: [{
-                        type: "text",
-                        text: `❌ **Error installing template**\n\n**Error:** ${errorMessage}\n\n**Debug Info:**\n\`\`\`json\n${JSON.stringify(debugInfo, null, 2)}\n\`\`\`\n\n**Common Issues:**\n- Invalid template ID\n- Template not found\n- Permission denied\n- Already installed`,
-                    }],
-            };
-        }
-    }
-};
-// ============================================================================
-// GET TEMPLATE TOOL (MARKETPLACE)
-// ============================================================================
-const getTemplateDescription = `Get template details from marketplace`;
-exports.getTemplateTool = {
-    name: 'get_template',
-    group: tool_registry_1.ToolGroup.PLAYGROUND,
-    description: getTemplateDescription,
-    schema: zod_1.z.object({
-        templateId: zod_1.z
-            .string()
-            .min(1)
-            .describe("Template/Product ID to get details for"),
-    }),
-    async execute(args, context) {
-        logger.debug('Getting marketplace template', {
-            templateId: args.templateId,
-            apiKey: context.apiKey.substring(0, 8) + '...'
-        });
-        try {
-            logger.debug('Calling v2.network.product.get', {
-                templateId: args.templateId
-            });
-            const result = await context.hailer.request('v2.network.product.get', [args.templateId]);
-            logger.debug('Template get response', {
-                result: JSON.stringify(result)
-            });
-            const product = result?.product || result;
-            let responseText = `✅ **Template Details**\n\n`;
-            responseText += `**Template ID:** \`${args.templateId}\`\n`;
-            if (product?.name) {
-                responseText += `**Name:** ${product.name}\n`;
-            }
-            if (product?.description) {
-                responseText += `**Description:** ${product.description}\n`;
-            }
-            if (product?.version) {
-                responseText += `**Version:** ${product.version}\n`;
-            }
-            // Also try to get manifest
+            // Detect product type to route v2 template install vs v3 app install
+            let productName = 'Unknown';
+            let productType = 'app';
             try {
-                const manifest = await context.hailer.request('v2.network.product.getManifest', [args.templateId]);
-                logger.debug('Template manifest response', {
-                    manifest: JSON.stringify(manifest)
-                });
-                if (manifest) {
-                    responseText += `\n**Manifest:**\n\`\`\`json\n${JSON.stringify(manifest, null, 2)}\n\`\`\`\n`;
-                }
-            }
-            catch (manifestError) {
-                logger.debug('Could not fetch manifest', { error: manifestError });
+                const detail = await fetchProductDetail(args.productId, context);
+                productName = detail.product?.name || detail.product?.title || 'Unknown';
+                productType = resolveProductType(detail.source, detail.product);
             }
-            // Check if installed (needs productId and workspaceId)
-            try {
-                if (context.workspaceCache) {
-                    const workspaceId = context.workspaceCache.currentWorkspace._id;
-                    const installed = await context.hailer.request('v2.network.product.isProductInstalled', [
-                        args.templateId,
-                        workspaceId
-                    ]);
-                    logger.debug('Template installation check', {
-                        installed: JSON.stringify(installed)
-                    });
-                    if (installed?.installed) {
-                        responseText += `\n✅ **Status:** Installed in current workspace\n`;
-                        if (installed.appId) {
-                            responseText += `**App ID:** \`${installed.appId}\`\n`;
-                        }
-                    }
-                    else {
-                        responseText += `\n⚪ **Status:** Not installed in current workspace\n`;
-                    }
-                }
+            catch (productError) {
+                logger.debug('Could not fetch product details, defaulting to app install', {
+                    error: productError instanceof Error ? productError.message : String(productError)
+                });
             }
-            catch (installCheckError) {
-                logger.debug('Could not check installation status', { error: installCheckError });
+            const installResult = productType === 'template'
+                ? await installTemplateProduct(args.productId, workspaceId, context)
+                : await installAppProduct(args.productId, workspaceId, context);
+            const installedAppId = installResult?.appId || installResult?.details?.appId || installResult?._id;
+            let responseText = `✅ **${productType === 'template' ? 'Template' : 'App'} Installed Successfully**\n\n`;
+            responseText += `**Product:** ${productName}\n`;
+            responseText += `**Product ID:** \`${args.productId}\`\n`;
+            if (installedAppId) {
+                responseText += `**Installed App ID:** \`${installedAppId}\`\n`;
             }
+            responseText += `**Workspace:** \`${workspaceId}\`\n`;
             responseText += `\n💡 **Next Steps:**\n`;
-            responseText += `- Use \`install_template\` to install this template\n`;
-            responseText += `- Use \`list_templates\` to see other templates`;
-            return {
-                content: [{
-                        type: "text",
-                        text: responseText,
-                    }],
-            };
+            if (productType === 'template') {
+                responseText += `- Use \`list_workflows\` to see new workflow(s)\n`;
+            }
+            responseText += `- Use \`list_apps()\` to see installed app(s)\n`;
+            responseText += `- Use \`manage_app\` with action 'add_member' to share with workspace members\n`;
+            return textResponse(responseText);
         }
         catch (error) {
-            if (!request_logger_1.RequestLogger.getCurrent())
-                logger.error("Error getting template", error);
+            if (!request_logger_1.RequestLogger.getCurrent()) {
+                logger.error('Error installing marketplace product', error);
+            }
             const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
+            if (errorMessage.toLowerCase().includes('permission')) {
+                return textResponse(`❌ **Permission Denied**\n\nYou don't have permission to install marketplace products. ` +
+                    `Only workspace administrators can install.\n\n**Error:** ${errorMessage}`);
+            }
             if (errorMessage.toLowerCase().includes('not found')) {
-                return {
-                    content: [{
-                            type: "text",
-                            text: `❌ **Template Not Found**\n\nTemplate ID \`${args.templateId}\` not found in marketplace.\n\n**Check:**\n- Template ID is correct\n- Template exists and is published\n\n💡 Use \`list_templates\` to see available templates.`,
-                        }],
-                };
+                return textResponse(`❌ **Product Not Found**\n\nThe marketplace product \`${args.productId}\` was not found.\n\n` +
+                    `**Tips:**\n- Verify the product ID is correct\n` +
+                    `- Use \`browse_marketplace({ productId: "${args.productId}" })\` to check if the product exists\n\n` +
+                    `**Error:** ${errorMessage}`);
             }
-            return {
-                content: [{
-                        type: "text",
-                        text: `❌ **Error getting template**\n\n**Error:** ${errorMessage}\n\n**Common Issues:**\n- Invalid template ID\n- Template not found`,
-                    }],
-            };
+            if (errorMessage.toLowerCase().includes('already installed')) {
+                return textResponse(`⚠️ **Product Already Installed**\n\nThis product is already installed in the workspace.\n\n` +
+                    `**Product ID:** \`${args.productId}\`\n\n💡 Use \`list_apps\` to see installed apps.`);
+            }
+            return textResponse(`❌ **Error installing marketplace product**\n\n**Error:** ${errorMessage}\n\n` +
+                `**Common Issues:**\n- Invalid product ID\n- Product not found in marketplace\n- Insufficient permissions`);
         }
     }
 };
 // ============================================================================
-// PUBLISH TEMPLATE TOOL (MARKETPLACE)
+// PUBLISH MARKETPLACE — publish/update app or template listings
 // ============================================================================
-const publishTemplateDescription = `Publish workspace as marketplace template`;
-exports.publishTemplateTool = {
-    name: 'publish_template',
+const publishMarketplaceDescription = `Publish an app or workspace template to the Hailer marketplace, or update an existing listing.\n\n` +
+    `type 'app': requires the appId of a production app (empty url — dev/localhost apps are rejected). Creating ` +
+    `a NEW app listing also requires versionId — the targetId written to public/manifest.json by ` +
+    `\`npm run publish-production -- --market\`. type 'template': packages the current workspace as an installable template (step 1 ` +
+    `creates the v2 template manifest, step 2 the marketplace listing).\n\n` +
+    `Pass productId to UPDATE an existing listing's metadata (name, description, publisher, icon, images, ` +
+    `externalUrl) — no version bump needed. Omit productId to CREATE a new listing. Upload iconFileId / ` +
+    `imageFileIds via \`upload_files\` first.`;
+const publishMarketplaceSchema = zod_1.z.object({
+    type: zod_1.z
+        .enum(['app', 'template'])
+        .describe("What to publish: 'app' (requires appId; new listings also need versionId) or 'template' (packages the current workspace)"),
+    appId: zod_1.z
+        .string()
+        .length(24)
+        .optional()
+        .describe("App ID to publish (24 chars). Required when type is 'app'"),
+    productId: zod_1.z
+        .string()
+        .length(24)
+        .optional()
+        .describe('Existing marketplace product ID to UPDATE (omit to create a new listing)'),
+    versionId: zod_1.z
+        .string()
+        .length(24)
+        .optional()
+        .describe('App version ID used as the listing targetId — written to public/manifest.json by ' +
+        '`npm run publish-production -- --market`. Required for NEW app listings'),
+    title: zod_1.z
+        .string()
+        .min(1)
+        .max(64)
+        .describe('Marketplace listing name (max 64 chars)'),
+    description: zod_1.z
+        .string()
+        .min(1)
+        .max(4096)
+        .describe('Full listing description (max 4096 chars)'),
+    version: zod_1.z
+        .string()
+        .min(1)
+        .describe("Version string (e.g. '1.0.0')"),
+    versionDescription: zod_1.z
+        .string()
+        .min(1)
+        .describe('Release notes for this version'),
+    publisher: zod_1.z
+        .string()
+        .min(1)
+        .describe('Publishing company or person name'),
+    iconFileId: zod_1.z
+        .string()
+        .length(24)
+        .describe('Icon file ID (24 chars). Upload with upload_files first'),
+    imageFileIds: zod_1.z
+        .array(zod_1.z.string().length(24))
+        .optional()
+        .describe('Optional array of preview image file IDs'),
+    externalUrl: zod_1.z
+        .string()
+        .url()
+        .optional()
+        .describe('Optional external website/documentation URL'),
+    workflowId: zod_1.z
+        .string()
+        .optional()
+        .describe('Template creation only: source workflow ID. Note: the API manifests the whole workspace; ' +
+        'workflow attachment is finalized in the Hailer UI'),
+});
+async function verifyPublishableApp(appId, context) {
+    logger.debug('Fetching app details', { appId });
+    const appResult = await context.hailer.request('v3.app.list', [{}]);
+    const apps = appResult?.apps || appResult?.details?.apps || (Array.isArray(appResult) ? appResult : []);
+    const app = Array.isArray(apps) ? apps.find((entry) => entry._id === appId) : null;
+    if (!app) {
+        return {
+            errorResponse: textResponse(`❌ **App Not Found**\n\nApp ID \`${appId}\` was not found in the current workspace.\n\n` +
+                `**Tips:**\n- Use \`list_apps()\` to see available apps\n- Ensure the app exists and you have access`)
+        };
+    }
+    // Dev apps (localhost URL) can't be listed on the marketplace
+    if (app.url && app.url.includes('localhost')) {
+        return {
+            errorResponse: textResponse(`⚠️ **Cannot Publish Development App**\n\nApp "${app.name}" is a development app (URL: ${app.url}).\n\n` +
+                `**To publish to marketplace:**\n1. First publish the app code: \`npm run publish-production -- --market\`\n` +
+                `2. Or create a production app with empty URL\n3. Then call \`publish_marketplace\` again`)
+        };
+    }
+    return { appName: app.name };
+}
+async function createTemplateManifest(args, workspaceId, context) {
+    // Note: versionDescription is required and cannot be empty
+    const publishData = {
+        workspaceId,
+        version: args.version,
+        versionDescription: args.versionDescription,
+        title: args.title,
+        description: args.description
+    };
+    logger.debug('Calling v2.network.product.publishTemplate', { publishData });
+    const publishResult = await context.hailer.request('v2.network.product.publishTemplate', [publishData]);
+    logger.debug('Publish template response', { result: JSON.stringify(publishResult) });
+    const targetId = publishResult?.productId || publishResult?._id || publishResult?.id;
+    if (!targetId) {
+        return {
+            errorResponse: textResponse(`❌ **Error**: publishTemplate succeeded but no product ID returned.\n\n` +
+                `**Response:**\n\`\`\`json\n${JSON.stringify(publishResult, null, 2)}\n\`\`\``)
+        };
+    }
+    return { targetId };
+}
+function buildListingData(args) {
+    const productData = {
+        name: args.title,
+        description: args.description,
+        publisher: args.publisher,
+        icon: args.iconFileId,
+        images: args.imageFileIds || [args.iconFileId]
+    };
+    if (args.externalUrl) {
+        productData.externalUrl = args.externalUrl;
+    }
+    return productData;
+}
+exports.publishMarketplaceTool = {
+    name: 'publish_marketplace',
     group: tool_registry_1.ToolGroup.PLAYGROUND,
-    description: publishTemplateDescription,
-    schema: zod_1.z.object({
-        productId: zod_1.z
-            .string()
-            .length(24)
-            .optional()
-            .describe("Existing product ID to UPDATE (omit to create new template)"),
-        title: zod_1.z
-            .string()
-            .min(1)
-            .max(64)
-            .describe("Template name (max 64 chars)"),
-        description: zod_1.z
-            .string()
-            .min(1)
-            .max(4096)
-            .describe("Template description (max 4096 chars)"),
-        version: zod_1.z
-            .string()
-            .min(1)
-            .describe("Version string (e.g. '1.0.0')"),
-        versionDescription: zod_1.z
-            .string()
-            .min(1)
-            .describe("Release notes for this version"),
-        publisher: zod_1.z
-            .string()
-            .min(1)
-            .describe("Publishing company or person name"),
-        iconFileId: zod_1.z
-            .string()
-            .length(24)
-            .describe("Icon file ID (24 chars). Upload with upload_files first"),
-        imageFileIds: zod_1.z
-            .array(zod_1.z.string().length(24))
-            .optional()
-            .describe("Optional array of preview image file IDs"),
-        externalUrl: zod_1.z
-            .string()
-            .url()
-            .optional()
-            .describe("Optional external website URL"),
-    }),
+    description: publishMarketplaceDescription,
+    schema: publishMarketplaceSchema,
     async execute(args, context) {
         const isUpdate = !!args.productId;
-        logger.debug(`${isUpdate ? 'Updating' : 'Publishing'} template to marketplace`, {
+        logger.debug(`${isUpdate ? 'Updating' : 'Publishing'} marketplace listing`, {
+            type: args.type,
+            appId: args.appId,
             title: args.title,
             version: args.version,
             productId: args.productId,
@@ -482,558 +581,133 @@ exports.publishTemplateTool = {
             if (!workspaceId) {
                 return (0, tool_helpers_1.missingWorkspaceCacheResponse)();
             }
-            let productId = args.productId;
-            // Only create new manifest if not updating existing template
-            if (!isUpdate) {
-                // Note: versionDescription is required and cannot be empty
-                const publishData = {
-                    workspaceId,
-                    version: args.version,
-                    versionDescription: args.versionDescription,
-                    title: args.title,
-                    description: args.description
-                };
-                logger.debug('Calling v2.network.product.publishTemplate', {
-                    publishData
-                });
-                // Step 1: Create the template manifest
-                const publishResult = await context.hailer.request('v2.network.product.publishTemplate', [publishData]);
-                logger.debug('Publish template response', {
-                    result: JSON.stringify(publishResult)
-                });
-                productId = publishResult?.productId || publishResult?._id || publishResult?.id;
-                if (!productId) {
-                    return {
-                        content: [{
-                                type: "text",
-                                text: `❌ **Error**: publishTemplate succeeded but no product ID returned.\n\n**Response:**\n\`\`\`json\n${JSON.stringify(publishResult, null, 2)}\n\`\`\``,
-                            }],
-                    };
+            if (args.type === 'app' && !args.appId) {
+                return textResponse(`❌ **Missing appId**\n\n\`appId\` is required when \`type\` is 'app'.`);
+            }
+            let appName = '';
+            if (args.type === 'app') {
+                const appCheck = await verifyPublishableApp(args.appId, context);
+                if (appCheck.errorResponse) {
+                    return appCheck.errorResponse;
+                }
+                appName = appCheck.appName || '';
+            }
+            // For new app listings we need the targetId from a --market publish
+            if (args.type === 'app' && !isUpdate && !args.versionId) {
+                return textResponse(`❌ **Error**: Missing required IDs.\n\n**To create a new app marketplace listing:**\n` +
+                    `1. Run \`npm run publish-production -- --market\` — the targetId is saved to public/manifest.json\n` +
+                    `2. Then run \`publish_marketplace\` with \`type: 'app'\` and the \`versionId\` (targetId)\n\n` +
+                    `**To update existing listing metadata (icon, name, etc.):**\n` +
+                    `Include the \`productId\` parameter - no version bump needed.`);
+            }
+            // Step 1 (template create only): manifest the current workspace via v2
+            let targetId = args.versionId;
+            if (args.type === 'template' && !isUpdate) {
+                const stepOne = await createTemplateManifest(args, workspaceId, context);
+                if (stepOne.errorResponse) {
+                    return stepOne.errorResponse;
                 }
+                targetId = stepOne.targetId;
             }
-            // Step 2: Create or Update the product in marketplace
-            let productData;
-            let apiMethod;
-            let apiArgs;
+            // Step 2: create or update the marketplace listing via v3
+            const productData = buildListingData(args);
+            let apiMethod = 'v3.product.create';
+            let apiArgs = [{ cid: workspaceId, targetId, type: args.type, ...productData }];
             if (isUpdate) {
-                // Update only allows specific fields
-                productData = {
-                    name: args.title,
-                    description: args.description,
-                    publisher: args.publisher,
-                    icon: args.iconFileId,
-                    images: args.imageFileIds || [args.iconFileId]
-                };
-                if (args.externalUrl) {
-                    productData.externalUrl = args.externalUrl;
-                }
                 apiMethod = 'v3.product.update';
-                apiArgs = [productId, productData];
+                apiArgs = [args.productId, productData];
             }
-            else {
-                // Create requires full data
-                productData = {
-                    cid: workspaceId,
-                    targetId: productId,
-                    name: args.title,
-                    description: args.description,
-                    type: 'template',
-                    publisher: args.publisher,
-                    icon: args.iconFileId,
-                    images: args.imageFileIds || [args.iconFileId]
-                };
-                if (args.externalUrl) {
-                    productData.externalUrl = args.externalUrl;
+            logger.debug(`Calling ${apiMethod}`, {
+                productId: args.productId,
+                workspaceId,
+                appId: args.appId,
+                targetId,
+                iconFileId: args.iconFileId
+            });
+            let apiResult;
+            try {
+                apiResult = await context.hailer.request(apiMethod, apiArgs);
+            }
+            catch (stepTwoError) {
+                const stepTwoMessage = (0, tool_helpers_1.extractErrorMessage)(stepTwoError);
+                // Fail-safe for the two-step template publish: step 1 (v2 manifest) succeeded,
+                // step 2 (v3 listing) failed — report the orphan instead of hiding it.
+                if (args.type === 'template' && !isUpdate) {
+                    logger.error('publish_marketplace: v3 listing creation failed after v2 template manifest was created', {
+                        orphanedV2ProductId: targetId,
+                        workspaceId,
+                        error: stepTwoMessage
+                    });
+                    return textResponse(`❌ **Marketplace listing creation failed after the template manifest was created**\n\n` +
+                        `Step 1 (v2 template manifest) succeeded, but step 2 (v3 marketplace listing) failed.\n\n` +
+                        `**Orphaned v2 product ID:** \`${targetId}\`\n` +
+                        `**Step 2 error:** ${stepTwoMessage}\n\n` +
+                        `**What to do:**\n` +
+                        `- Fix the cause above, then re-run \`publish_marketplace\` — it will create a fresh manifest\n` +
+                        `- The orphaned manifest \`${targetId}\` never appears in the marketplace; it is harmless ` +
+                        `but can be cleaned up via the Hailer UI or support`);
                 }
-                apiMethod = 'v3.product.create';
-                apiArgs = [productData];
+                throw stepTwoError;
             }
-            logger.debug(`Calling ${apiMethod}`, { productId, workspaceId, iconFileId: args.iconFileId });
-            const apiResult = await context.hailer.request(apiMethod, apiArgs);
             logger.debug(`${apiMethod} response`, {
                 result: JSON.stringify(apiResult)
             });
-            // Get the final product ID from the v3 API response (this is the correct marketplace ID)
-            const finalProductId = apiResult?._id || apiResult?.id || productId;
-            let responseText = `✅ **Template ${isUpdate ? 'Updated' : 'Published'} Successfully**\n\n`;
+            // Get the final product ID from the v3 API response (this is the marketplace ID)
+            const finalProductId = apiResult?._id || apiResult?.id || args.productId || targetId;
+            const typeLabel = args.type === 'app' ? 'App' : 'Template';
+            let responseText = `✅ **${typeLabel} ${isUpdate ? 'Updated' : 'Published'} Successfully**\n\n`;
+            if (args.type === 'app') {
+                responseText += `**App:** ${appName} (\`${args.appId}\`)\n`;
+            }
             responseText += `**Title:** ${args.title}\n`;
             responseText += `**Publisher:** ${args.publisher}\n`;
             responseText += `**Version:** ${args.version}\n`;
             responseText += `**Workspace:** ${workspaceId}\n`;
             responseText += `**Product ID:** \`${finalProductId}\`\n`;
             responseText += `**Release Notes:** ${args.versionDescription}\n`;
+            if (args.type === 'template' && args.workflowId) {
+                responseText += `\n⚠️ **Note:** The publish API manifests the whole workspace — ` +
+                    `attaching a specific workflow must be done via the Hailer UI.\n`;
+            }
             responseText += `\n💡 **Next Steps:**\n`;
-            responseText += `- Use \`list_templates()\` to see it in the marketplace\n`;
+            responseText += `- Use \`browse_marketplace()\` to see it in the marketplace\n`;
             responseText += `- Share the product ID with other workspaces\n`;
-            responseText += `- They can install with \`install_template({ templateId: "${finalProductId}" })\`\n`;
-            return {
-                content: [{
-                        type: "text",
-                        text: responseText,
-                    }],
-            };
+            responseText += `- They can install with \`install_marketplace({ productId: "${finalProductId}" })\`\n`;
+            responseText += `- To update this listing, include \`productId: "${finalProductId}"\` in the next publish\n`;
+            return textResponse(responseText);
         }
         catch (error) {
-            if (!request_logger_1.RequestLogger.getCurrent())
-                logger.error("Error publishing template", error);
+            if (!request_logger_1.RequestLogger.getCurrent()) {
+                logger.error('Error publishing to marketplace', error);
+            }
             const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
             if (errorMessage.toLowerCase().includes('permission')) {
-                return {
-                    content: [{
-                            type: "text",
-                            text: `❌ **Permission Denied**\n\nYou don't have permission to publish templates. Only workspace administrators can publish.\n\n**Error:** ${errorMessage}`,
-                        }],
-                };
+                return textResponse(`❌ **Permission Denied**\n\nYou don't have permission to publish to the marketplace. ` +
+                    `Only workspace administrators can publish.\n\n**Error:** ${errorMessage}`);
             }
             // Always include debug info for troubleshooting
-            const debugWorkspaceId = context.workspaceCache?.currentWorkspace._id || 'unknown';
             const debugInfo = {
-                endpoint: 'v2.network.product.publishTemplate',
+                type: args.type,
+                isUpdate,
                 requestData: {
-                    workspaceId: debugWorkspaceId,
+                    workspaceId: context.workspaceCache?.currentWorkspace._id || 'unknown',
                     version: args.version,
                     versionDescription: args.versionDescription,
                     title: args.title,
                     description: args.description
                 }
             };
-            return {
-                content: [{
-                        type: "text",
-                        text: `❌ **Error publishing template**\n\n**Error:** ${errorMessage}\n\n**Debug Info:**\n\`\`\`json\n${JSON.stringify(debugInfo, null, 2)}\n\`\`\`\n\n**Common Issues:**\n- Product may need to exist first (use create_template)\n- Version format may be incorrect\n- Workflow may not be attached to product`,
-                    }],
-            };
-        }
-    }
-};
-// =============================================================================
-// GET PRODUCT (v3) TOOL
-// =============================================================================
-const getProductDescription = `Get product details from marketplace`;
-exports.getProductTool = {
-    name: 'get_product',
-    group: tool_registry_1.ToolGroup.PLAYGROUND,
-    description: getProductDescription,
-    schema: zod_1.z.object({
-        productId: zod_1.z
-            .string()
-            .length(24)
-            .describe("Product ID to get details for (24 characters)"),
-    }),
-    async execute(args, context) {
-        logger.debug('Getting product details (v3)', {
-            productId: args.productId,
-            apiKey: context.apiKey.substring(0, 8) + '...'
-        });
-        try {
-            logger.debug('Calling v3.app.product.get', {
-                productId: args.productId
-            });
-            const result = await context.hailer.request('v3.app.product.get', [args.productId]);
-            logger.debug('Product get response', {
-                result: JSON.stringify(result)
-            });
-            const product = result;
-            let responseText = `✅ **Product Details (v3)**\n\n`;
-            responseText += `**Product ID:** \`${args.productId}\`\n`;
-            if (product?.name) {
-                responseText += `**Name:** ${product.name}\n`;
-            }
-            if (product?.description) {
-                responseText += `**Description:** ${product.description}\n`;
-            }
-            if (product?.type) {
-                responseText += `**Type:** ${product.type}\n`;
-            }
-            if (product?.versions?.length) {
-                responseText += `**Versions:** ${product.versions.length}\n`;
-            }
-            return {
-                content: [{
-                        type: "text",
-                        text: responseText,
-                    }],
-            };
-        }
-        catch (error) {
-            if (!request_logger_1.RequestLogger.getCurrent())
-                logger.error("Error getting product", error);
-            const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
-            return {
-                content: [{
-                        type: "text",
-                        text: `❌ **Error getting product**\n\n**Error:** ${errorMessage}`,
-                    }],
-            };
-        }
-    }
-};
-// =============================================================================
-// GET PRODUCT MANIFEST (v3) TOOL
-// =============================================================================
-const getProductManifestDescription = `Get product manifest from marketplace`;
-exports.getProductManifestTool = {
-    name: 'get_product_manifest',
-    group: tool_registry_1.ToolGroup.PLAYGROUND,
-    description: getProductManifestDescription,
-    schema: zod_1.z.object({
-        productId: zod_1.z
-            .string()
-            .length(24)
-            .describe("Product ID to get manifest for (24 characters)"),
-    }),
-    async execute(args, context) {
-        logger.debug('Getting product manifest (v3)', {
-            productId: args.productId,
-            apiKey: context.apiKey.substring(0, 8) + '...'
-        });
-        try {
-            logger.debug('Calling v3.app.product.getManifest', {
-                productId: args.productId
-            });
-            const result = await context.hailer.request('v3.app.product.getManifest', [args.productId]);
-            logger.debug('Product manifest response', {
-                result: JSON.stringify(result)
-            });
-            const manifest = result;
-            let responseText = `✅ **Product Manifest (v3)**\n\n`;
-            responseText += `**Product ID:** \`${args.productId}\`\n`;
-            if (manifest?.version) {
-                responseText += `**Version:** ${manifest.version}\n`;
-            }
-            if (manifest?.workflows?.length) {
-                responseText += `**Workflows:** ${manifest.workflows.length}\n`;
-            }
-            return {
-                content: [{
-                        type: "text",
-                        text: responseText,
-                    }],
-            };
-        }
-        catch (error) {
-            if (!request_logger_1.RequestLogger.getCurrent())
-                logger.error("Error getting product manifest", error);
-            const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
-            return {
-                content: [{
-                        type: "text",
-                        text: `❌ **Error getting product manifest**\n\n**Error:** ${errorMessage}`,
-                    }],
-            };
-        }
-    }
-};
-// =============================================================================
-// PUBLISH APP TO MARKETPLACE TOOL
-// =============================================================================
-const publishAppDescription = `Publish app to Hailer marketplace`;
-exports.publishAppTool = {
-    name: 'publish_app',
-    group: tool_registry_1.ToolGroup.PLAYGROUND,
-    description: publishAppDescription,
-    schema: zod_1.z.object({
-        appId: zod_1.z
-            .string()
-            .length(24)
-            .describe("App ID to publish (24 characters)"),
-        versionId: zod_1.z
-            .string()
-            .length(24)
-            .optional()
-            .describe("Optional version ID. If not provided, uses appId as targetId."),
-        productId: zod_1.z
-            .string()
-            .length(24)
-            .optional()
-            .describe("Existing product ID to UPDATE (omit to create new listing)"),
-        title: zod_1.z
-            .string()
-            .min(1)
-            .max(64)
-            .describe("Marketplace listing name (max 64 chars)"),
-        description: zod_1.z
-            .string()
-            .min(1)
-            .max(4096)
-            .describe("Full description (max 4096 chars)"),
-        version: zod_1.z
-            .string()
-            .min(1)
-            .describe("Version string (e.g. '1.0.0')"),
-        versionDescription: zod_1.z
-            .string()
-            .min(1)
-            .describe("Release notes for this version"),
-        publisher: zod_1.z
-            .string()
-            .min(1)
-            .describe("Publishing company or person name"),
-        iconFileId: zod_1.z
-            .string()
-            .length(24)
-            .describe("Icon file ID (24 chars). Upload with upload_files first"),
-        imageFileIds: zod_1.z
-            .array(zod_1.z.string().length(24))
-            .optional()
-            .describe("Optional array of preview image file IDs"),
-        externalUrl: zod_1.z
-            .string()
-            .url()
-            .optional()
-            .describe("Optional external documentation URL"),
-    }),
-    async execute(args, context) {
-        const isUpdate = !!args.productId;
-        logger.debug(`${isUpdate ? 'Updating' : 'Publishing'} app to marketplace`, {
-            appId: args.appId,
-            title: args.title,
-            version: args.version,
-            productId: args.productId,
-            apiKey: context.apiKey.substring(0, 8) + '...'
-        });
-        try {
-            const workspaceId = (0, tool_helpers_1.getResolvedWorkspaceId)({}, context);
-            if (!workspaceId) {
-                return (0, tool_helpers_1.missingWorkspaceCacheResponse)();
-            }
-            // Verify app exists and get details
-            logger.debug('Fetching app details', { appId: args.appId });
-            const appResult = await context.hailer.request('v3.app.list', [{}]);
-            const apps = appResult?.apps || appResult?.details?.apps || (Array.isArray(appResult) ? appResult : []);
-            const app = Array.isArray(apps) ? apps.find((a) => a._id === args.appId) : null;
-            if (!app) {
-                return {
-                    content: [{
-                            type: "text",
-                            text: `❌ **App Not Found**\n\nApp ID \`${args.appId}\` was not found in the current workspace.\n\n**Tips:**\n- Use \`list_apps()\` to see available apps\n- Ensure the app exists and you have access`,
-                        }],
-                };
-            }
-            // Warn if app is a dev app (has localhost URL)
-            if (app.url && app.url.includes('localhost')) {
-                return {
-                    content: [{
-                            type: "text",
-                            text: `⚠️ **Cannot Publish Development App**\n\nApp "${app.name}" is a development app (URL: ${app.url}).\n\n**To publish to marketplace:**\n1. First publish the app code with \`publish_hailer_app\`\n2. Or create a production app with empty URL\n3. Then call \`publish_app\` again`,
-                        }],
-                };
-            }
-            let productId = args.productId;
-            const targetId = args.versionId;
-            // For new listings, we need both targetId (from publish_hailer_app) to create the product
-            if (!productId && !targetId) {
-                return {
-                    content: [{
-                            type: "text",
-                            text: `❌ **Error**: Missing required IDs.\n\n**To create a new marketplace listing:**\n1. Run \`publish_hailer_app\` with \`publishToMarket: true\` to get a targetId\n2. Then run \`publish_app\` with the \`versionId\` (targetId)\n\n**To update existing listing metadata (icon, name, etc.):**\nInclude the \`productId\` parameter - no version bump needed.`,
-                        }],
-                };
-            }
-            // Step 2: Create or Update the product in marketplace
-            let productData;
-            let apiMethod;
-            let apiArgs;
-            if (isUpdate && productId) {
-                // Update only allows specific fields
-                productData = {
-                    name: args.title,
-                    description: args.description,
-                    publisher: args.publisher,
-                    icon: args.iconFileId,
-                    images: args.imageFileIds || [args.iconFileId]
-                };
-                if (args.externalUrl) {
-                    productData.externalUrl = args.externalUrl;
-                }
-                apiMethod = 'v3.product.update';
-                apiArgs = [productId, productData];
-            }
-            else {
-                // Create requires full data - targetId comes from versionId param or publishAppVersion call
-                productData = {
-                    cid: workspaceId,
-                    targetId, // Version ID from publishAppVersion or provided versionId
-                    name: args.title,
-                    description: args.description,
-                    type: 'app',
-                    publisher: args.publisher,
-                    icon: args.iconFileId,
-                    images: args.imageFileIds || [args.iconFileId]
-                };
-                if (args.externalUrl) {
-                    productData.externalUrl = args.externalUrl;
-                }
-                apiMethod = 'v3.product.create';
-                apiArgs = [productData];
-            }
-            logger.debug(`Calling ${apiMethod}`, { productId, workspaceId, appId: args.appId, targetId, productData });
-            const apiResult = await context.hailer.request(apiMethod, apiArgs);
-            logger.debug(`${apiMethod} response`, {
-                result: JSON.stringify(apiResult)
-            });
-            // Get the final product ID from the v3 API response
-            const finalProductId = apiResult?._id || apiResult?.id || productId;
-            let responseText = `✅ **App ${isUpdate ? 'Updated' : 'Published'} to Marketplace**\n\n`;
-            responseText += `**App:** ${app.name} (\`${args.appId}\`)\n`;
-            responseText += `**Title:** ${args.title}\n`;
-            responseText += `**Publisher:** ${args.publisher}\n`;
-            responseText += `**Version:** ${args.version}\n`;
-            responseText += `**Product ID:** \`${finalProductId}\`\n`;
-            responseText += `**Release Notes:** ${args.versionDescription}\n`;
-            responseText += `\n💡 **Next Steps:**\n`;
-            responseText += `- Share the product ID with other workspaces\n`;
-            responseText += `- They can install with \`install_marketplace_app({ productId: "${finalProductId}" })\`\n`;
-            responseText += `- To update, include \`productId: "${finalProductId}"\` in next publish\n`;
-            return {
-                content: [{
-                        type: "text",
-                        text: responseText,
-                    }],
-            };
-        }
-        catch (error) {
-            if (!request_logger_1.RequestLogger.getCurrent())
-                logger.error("Error publishing app to marketplace", error);
-            const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
-            if (errorMessage.toLowerCase().includes('permission')) {
-                return {
-                    content: [{
-                            type: "text",
-                            text: `❌ **Permission Denied**\n\nYou don't have permission to publish apps to marketplace. Only workspace administrators can publish.\n\n**Error:** ${errorMessage}`,
-                        }],
-                };
-            }
-            return {
-                content: [{
-                        type: "text",
-                        text: `❌ **Error publishing app to marketplace**\n\n**Error:** ${errorMessage}\n\n**Common Issues:**\n- App must be a production app (not dev/localhost)\n- Must be workspace administrator\n- Icon file must be uploaded first\n- Invalid version format`,
-                    }],
-            };
-        }
-    }
-};
-// =============================================================================
-// INSTALL MARKETPLACE APP TOOL
-// =============================================================================
-const installMarketplaceAppDescription = `Install app from marketplace`;
-exports.installMarketplaceAppTool = {
-    name: 'install_marketplace_app',
-    group: tool_registry_1.ToolGroup.PLAYGROUND,
-    description: installMarketplaceAppDescription,
-    schema: zod_1.z.object({
-        productId: zod_1.z
-            .string()
-            .length(24)
-            .describe("Marketplace product ID to install (24 characters)"),
-        workspaceId: zod_1.z
-            .string()
-            .optional()
-            .describe("Target workspace ID (defaults to current)"),
-    }),
-    async execute(args, context) {
-        logger.debug('Installing marketplace app', {
-            productId: args.productId,
-            apiKey: context.apiKey.substring(0, 8) + '...'
-        });
-        try {
-            const workspaceId = (0, tool_helpers_1.getResolvedWorkspaceId)(args, context);
-            if (!workspaceId) {
-                return (0, tool_helpers_1.missingWorkspaceCacheResponse)();
-            }
-            // Check if already installed
-            logger.debug('Checking if product is already installed', { productId: args.productId, workspaceId });
-            try {
-                const isInstalledResult = await context.hailer.request('v3.app.product.isProductInstalled', [args.productId, workspaceId]);
-                if (isInstalledResult?.installed) {
-                    return {
-                        content: [{
-                                type: "text",
-                                text: `ℹ️ **App Already Installed**\n\nThis app is already installed in your workspace.\n\n**App ID:** \`${isInstalledResult.appId || 'unknown'}\`\n\n**Tips:**\n- Use \`list_apps()\` to see installed apps\n- Use \`get_product({ productId: "${args.productId}" })\` to view product details`,
-                            }],
-                    };
-                }
-            }
-            catch (checkError) {
-                // Ignore check errors and proceed with installation
-                logger.debug('Could not check installation status, proceeding', {
-                    error: checkError instanceof Error ? checkError.message : String(checkError)
-                });
-            }
-            // Get product details first
-            logger.debug('Fetching product details', { productId: args.productId });
-            let productName = 'Unknown';
-            try {
-                const productResult = await context.hailer.request('v3.app.product.get', [args.productId]);
-                productName = productResult?.name || productResult?.title || 'Unknown';
-            }
-            catch (productError) {
-                logger.debug('Could not fetch product details', {
-                    error: productError instanceof Error ? productError.message : String(productError)
-                });
-            }
-            // Install the app
-            logger.debug('Calling v3.app.product.install', { productId: args.productId, workspaceId });
-            const installResult = await context.hailer.request('v3.app.product.install', [args.productId, workspaceId]);
-            logger.debug('Install result', { result: JSON.stringify(installResult) });
-            const installedAppId = installResult?.appId || installResult?.details?.appId || installResult?._id;
-            let responseText = `✅ **App Installed Successfully**\n\n`;
-            responseText += `**Product:** ${productName}\n`;
-            responseText += `**Product ID:** \`${args.productId}\`\n`;
-            if (installedAppId) {
-                responseText += `**Installed App ID:** \`${installedAppId}\`\n`;
-            }
-            responseText += `**Workspace:** \`${workspaceId}\`\n`;
-            responseText += `\n💡 **Next Steps:**\n`;
-            responseText += `- Use \`list_apps()\` to see the installed app\n`;
-            responseText += `- Use \`add_app_member\` to share with workspace members\n`;
-            responseText += `- Open the app from Hailer workspace menu\n`;
-            return {
-                content: [{
-                        type: "text",
-                        text: responseText,
-                    }],
-            };
-        }
-        catch (error) {
-            if (!request_logger_1.RequestLogger.getCurrent())
-                logger.error("Error installing marketplace app", error);
-            const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
-            if (errorMessage.toLowerCase().includes('permission')) {
-                return {
-                    content: [{
-                            type: "text",
-                            text: `❌ **Permission Denied**\n\nYou don't have permission to install apps. Only workspace administrators can install marketplace apps.\n\n**Error:** ${errorMessage}`,
-                        }],
-                };
-            }
-            if (errorMessage.toLowerCase().includes('not found')) {
-                return {
-                    content: [{
-                            type: "text",
-                            text: `❌ **Product Not Found**\n\nThe marketplace product \`${args.productId}\` was not found.\n\n**Tips:**\n- Verify the product ID is correct\n- Use \`get_product\` to check if the product exists\n\n**Error:** ${errorMessage}`,
-                        }],
-                };
-            }
-            return {
-                content: [{
-                        type: "text",
-                        text: `❌ **Error installing marketplace app**\n\n**Error:** ${errorMessage}\n\n**Common Issues:**\n- Invalid product ID\n- Product not found in marketplace\n- Insufficient permissions`,
-                    }],
-            };
+            return textResponse(`❌ **Error publishing to marketplace**\n\n**Error:** ${errorMessage}\n\n` +
+                `**Debug Info:**\n\`\`\`json\n${JSON.stringify(debugInfo, null, 2)}\n\`\`\`\n\n` +
+                `**Common Issues:**\n- Must be workspace administrator\n- Icon file must be uploaded first\n` +
+                `- App must be a production app (not dev/localhost)\n- Invalid version format`);
         }
     }
 };
 /** All app marketplace tools */
 exports.appMarketplaceTools = [
-    exports.listTemplatesTool,
-    exports.createTemplateTool,
-    exports.installTemplateTool,
-    exports.getTemplateTool,
-    exports.publishTemplateTool,
-    exports.getProductTool,
-    exports.getProductManifestTool,
-    exports.publishAppTool,
-    exports.installMarketplaceAppTool,
+    exports.browseMarketplaceTool,
+    exports.installMarketplaceTool,
+    exports.publishMarketplaceTool,
 ];
 //# sourceMappingURL=app-marketplace.js.map