@hailer/mcp 1.1.12 → 1.1.13

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

@@ -142,7 +142,7 @@ exports.scaffoldHailerAppTool = {
         const path = await Promise.resolve().then(() => __importStar(require('path')));
         const fs = await Promise.resolve().then(() => __importStar(require('fs')));
         try {
-            const targetDir = args.targetDirectory || config_1.environment.DEV_APPS_PATH || process.cwd();
+            const targetDir = args.targetDirectory || config_1.environment.DEV_APPS_PATH || path.join(process.cwd(), 'apps');
             const projectPath = path.join(targetDir, args.projectName);
             // Check if directory already exists
             if (fs.existsSync(projectPath)) {
@@ -160,7 +160,7 @@ exports.scaffoldHailerAppTool = {
             // Step 1: Scaffold project
             responseText += `⏳ Step 1/8: Creating project from template...\n`;
             try {
-                const createCmd = `npm create @hailer/app@latest ${args.projectName} -- --template ${args.template}`;
+                const createCmd = `npm create @hailer/app@beta ${args.projectName} -- --template ${args.template}`;
                 execSync(createCmd, {
                     cwd: targetDir,
                     stdio: 'pipe',
@@ -250,63 +250,79 @@ exports.scaffoldHailerAppTool = {
             }
             let appId;
             let workspaceId;
-            // Step 4: Create dev app in Hailer (with auto-generated icon)
+            // Step 4: Find existing dev app or create new one
             if (args.autoCreateDevApp !== false) {
-                responseText += `⏳ Step 4/8: Creating dev app entry in Hailer...\n`;
+                responseText += `⏳ Step 4/8: Setting up dev app entry in Hailer...\n`;
                 try {
                     workspaceId = (0, tool_helpers_1.getResolvedWorkspaceId)({}, context);
                     if (!workspaceId) {
                         responseText += `⚠️ Workspace cache not available, skipping app creation\n\n`;
                     }
                     else {
-                        // Generate and upload app icon
-                        let imageId;
+                        // Check for existing dev app (localhost:3000) to reuse
                         try {
-                            responseText += `   📸 Generating app icon...\n`;
-                            const iconBuffer = await generateAppIcon(args.projectName);
-                            // Save to temp file and upload
-                            const os = await Promise.resolve().then(() => __importStar(require('os')));
-                            const tempPath = path.join(os.tmpdir(), `app-icon-${Date.now()}.jpg`);
-                            fs.writeFileSync(tempPath, iconBuffer);
-                            const uploadResult = await context.hailer.uploadFile({
-                                path: tempPath,
-                                filename: 'app-icon.jpg',
-                                isPublic: true
-                            });
-                            // Clean up temp file
-                            try {
-                                fs.unlinkSync(tempPath);
-                            }
-                            catch { /* ignore */ }
-                            if (uploadResult.success && uploadResult.fileId) {
-                                imageId = uploadResult.fileId;
-                                responseText += `   ✅ Icon uploaded: ${imageId}\n`;
+                            const apps = await context.hailer.request('v3.app.list', [workspaceId]);
+                            const existingDevApp = apps.find((app) => app.url === 'http://localhost:3000' || app.url === 'http://localhost:3000/');
+                            if (existingDevApp) {
+                                appId = existingDevApp._id;
+                                responseText += `✅ Reusing existing dev app: ${existingDevApp.name} (${appId})\n`;
+                                responseText += `   URL: http://localhost:3000\n\n`;
                             }
                         }
-                        catch (iconError) {
-                            logger.warn('Failed to generate/upload app icon', { error: iconError });
-                            responseText += `   ⚠️ Icon generation skipped\n`;
-                        }
-                        const appData = {
-                            cid: workspaceId,
-                            name: args.projectName,
-                            url: 'http://localhost:3000'
-                        };
-                        if (args.description) {
-                            appData.description = args.description;
+                        catch {
+                            // Non-fatal, will create new app below
                         }
-                        if (imageId) {
-                            appData.image = imageId;
+                        // Create new dev app only if no existing one found
+                        if (!appId) {
+                            // Generate and upload app icon
+                            let imageId;
+                            try {
+                                responseText += `   📸 Generating app icon...\n`;
+                                const iconBuffer = await generateAppIcon(args.projectName);
+                                // Save to temp file and upload
+                                const os = await Promise.resolve().then(() => __importStar(require('os')));
+                                const tempPath = path.join(os.tmpdir(), `app-icon-${Date.now()}.jpg`);
+                                fs.writeFileSync(tempPath, iconBuffer);
+                                const uploadResult = await context.hailer.uploadFile({
+                                    path: tempPath,
+                                    filename: 'app-icon.jpg',
+                                    isPublic: true
+                                });
+                                // Clean up temp file
+                                try {
+                                    fs.unlinkSync(tempPath);
+                                }
+                                catch { /* ignore */ }
+                                if (uploadResult.success && uploadResult.fileId) {
+                                    imageId = uploadResult.fileId;
+                                    responseText += `   ✅ Icon uploaded: ${imageId}\n`;
+                                }
+                            }
+                            catch (iconError) {
+                                logger.warn('Failed to generate/upload app icon', { error: iconError });
+                                responseText += `   ⚠️ Icon generation skipped\n`;
+                            }
+                            const appData = {
+                                cid: workspaceId,
+                                name: args.projectName,
+                                url: 'http://localhost:3000'
+                            };
+                            if (args.description) {
+                                appData.description = args.description;
+                            }
+                            if (imageId) {
+                                appData.image = imageId;
+                            }
+                            const result = await context.hailer.request('v3.app.create', [appData]);
+                            appId = result.appId || result._id;
+                            responseText += `✅ Dev app created: ${appId}\n`;
+                            responseText += `   URL: http://localhost:3000\n\n`;
                         }
-                        const result = await context.hailer.request('v3.app.create', [appData]);
-                        appId = result.appId || result._id;
-                        responseText += `✅ App created: ${appId}\n`;
-                        responseText += `   URL: http://localhost:3000\n\n`;
                     }
                 }
                 catch (error) {
                     const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
-                    responseText += `⚠️ Failed to create app in Hailer: ${errorMessage}\n\n`;
+                    responseText += `⚠️ Failed to set up app in Hailer: ${errorMessage}\n\n`;
                 }
             }
             else {
@@ -363,7 +379,7 @@ exports.scaffoldHailerAppTool = {
                         cwd: projectPath,
                         detached: true,
                         stdio: 'ignore',
-                        shell: true
+                        shell: '/bin/bash'
                     });
                     devServer.unref();
                     responseText += `✅ Dev server started in background\n`;
@@ -501,377 +517,329 @@ exports.publishHailerAppTool = {
     schema: zod_1.z.object({
         projectDirectory: zod_1.z.string().optional().describe("Path to app project (defaults to DEV_APPS_PATH or current directory)"),
         appId: zod_1.z.string().optional().describe("App ID to publish to (reads from manifest.json if not provided)"),
-        email: zod_1.z.string().email().optional().describe("Hailer account email (uses session credentials if not provided)"),
-        password: zod_1.z.string().min(1).optional().describe("Hailer account password (uses session credentials if not provided)"),
-        publishToMarket: zod_1.z.boolean().optional().default(false).describe("Set true to publish to marketplace and get targetId")
+        targetId: zod_1.z.string().optional().describe("Optional marketplace target ID for publishing to marketplace"),
     }),
     async execute(args, context) {
         const path = await Promise.resolve().then(() => __importStar(require('path')));
         const fs = await Promise.resolve().then(() => __importStar(require('fs')));
-        // Use provided credentials or fall back to session credentials
-        const email = args.email || context.email;
-        const password = args.password || context.password;
-        const { publishToMarket } = args;
-        if (!email || !password) {
+        const projectDir = args.projectDirectory || config_1.environment.DEV_APPS_PATH || path.join(process.cwd(), 'apps');
+        // Check if directory exists
+        if (!fs.existsSync(projectDir)) {
+            if (!request_logger_1.RequestLogger.getCurrent())
+                logger.error('Project directory does not exist', { projectDir });
             return {
                 content: [{
                         type: "text",
-                        text: `❌ **Credentials Required**\n\nNo credentials found in session or parameters.\n\n**Options:**\n1. Provide email/password parameters\n2. Configure CLIENT_CONFIGS in .env.local with credentials`,
+                        text: `❌ **Directory Not Found**\n\nThe directory \`${projectDir}\` does not exist.\n\n**Check:**\n- Project directory path is correct\n- You're in the right location`,
                     }],
             };
         }
+        // Check if package.json exists and has build script
+        const packageJsonPath = path.join(projectDir, 'package.json');
+        if (!fs.existsSync(packageJsonPath)) {
+            if (!request_logger_1.RequestLogger.getCurrent())
+                logger.error('package.json not found', { packageJsonPath });
+            return {
+                content: [{
+                        type: "text",
+                        text: `❌ **Not a Hailer App Project**\n\nNo package.json found in \`${projectDir}\`\n\n**This doesn't appear to be a Hailer app project.**\n\nMake sure you're in the correct directory.`,
+                    }],
+            };
+        }
+        let packageJson;
         try {
-            const { execSync } = await Promise.resolve().then(() => __importStar(require('child_process')));
-            // Check if expect is installed
-            try {
-                execSync('which expect', { encoding: 'utf-8', stdio: 'pipe' });
-            }
-            catch {
+            packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
+        }
+        catch (error) {
+            const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
+            if (!request_logger_1.RequestLogger.getCurrent())
+                logger.error('Failed to parse package.json', { error: errorMessage });
+            return {
+                content: [{ type: "text", text: `❌ **Invalid package.json**\n\n${errorMessage}` }],
+            };
+        }
+        if (!packageJson.scripts?.build) {
+            return {
+                content: [{ type: "text", text: '❌ **Missing Build Script**\n\npackage.json has no "build" script.' }],
+            };
+        }
+        // Read manifest.json to get/verify appId
+        const manifestPath = path.join(projectDir, 'public', 'manifest.json');
+        let appId = args.appId;
+        let appName = 'Unknown';
+        let manifest;
+        if (!fs.existsSync(manifestPath)) {
+            if (!appId) {
                 if (!request_logger_1.RequestLogger.getCurrent())
-                    logger.error('expect command not found');
+                    logger.error('Manifest not found and no appId provided');
                 return {
                     content: [{
                             type: "text",
-                            text: `❌ **\`expect\` Not Installed**\n\nThe \`expect\` command is required for automated app publishing.\n\n**How to fix:**\n\n**macOS:**\n\`\`\`bash\nbrew install expect\n\`\`\`\n\n**Ubuntu/Debian:**\n\`\`\`bash\nsudo apt-get install expect\n\`\`\`\n\n**RHEL/CentOS:**\n\`\`\`bash\nsudo yum install expect\n\`\`\`\n\n**After installation, try again.**`,
+                            text: `❌ **Manifest Not Found**\n\nNo \`public/manifest.json\` found and no appId provided.\n\n**Steps to fix:**\n1. Ensure \`public/manifest.json\` exists\n2. Set appId in manifest\n\nOr provide appId parameter when calling this tool.`,
                         }],
                 };
             }
-            // Determine project directory
-            const projectDir = args.projectDirectory || config_1.environment.DEV_APPS_PATH || process.cwd();
-            // Check if directory exists
-            if (!fs.existsSync(projectDir)) {
+            manifest = {};
+        }
+        else {
+            try {
+                manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf-8'));
+            }
+            catch (error) {
+                const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
                 if (!request_logger_1.RequestLogger.getCurrent())
-                    logger.error('Project directory does not exist', { projectDir });
+                    logger.error('Failed to parse manifest.json', { error: errorMessage });
                 return {
                     content: [{
                             type: "text",
-                            text: `❌ **Directory Not Found**\n\nThe directory \`${projectDir}\` does not exist.\n\n**Check:**\n- Project directory path is correct\n- You're in the right location`,
+                            text: `❌ **Invalid manifest.json**\n\nFailed to parse \`public/manifest.json\`: ${errorMessage}\n\n**Check:**\n- manifest.json is valid JSON\n- appId field is set correctly`,
                         }],
                 };
             }
-            // Check if package.json exists
-            const packageJsonPath = path.join(projectDir, 'package.json');
-            if (!fs.existsSync(packageJsonPath)) {
+            if (!appId) {
+                appId = manifest.appId;
+            }
+            appName = manifest.name || appName;
+            if (!appId) {
                 if (!request_logger_1.RequestLogger.getCurrent())
-                    logger.error('package.json not found', { packageJsonPath });
+                    logger.error('No appId found');
                 return {
                     content: [{
                             type: "text",
-                            text: `❌ **Not a Hailer App Project**\n\nNo package.json found in \`${projectDir}\`\n\n**This doesn't appear to be a Hailer app project.**\n\nMake sure you're in the correct directory.`,
+                            text: `❌ **App ID Not Configured**\n\nNo appId found in \`manifest.json\` and none provided.\n\n**Steps to fix:**\n1. Get your published app ID from Hailer\n2. Edit \`public/manifest.json\`\n3. Set \`"appId": "your-app-id-here"\`\n\nOr provide appId parameter when calling this tool.`,
                         }],
                 };
             }
-            // Read manifest.json to get/verify appId
-            const manifestPath = path.join(projectDir, 'public', 'manifest.json');
-            let appId = args.appId;
-            let appName = 'Unknown';
-            if (fs.existsSync(manifestPath)) {
-                try {
-                    const manifestContent = fs.readFileSync(manifestPath, 'utf-8');
-                    const manifest = JSON.parse(manifestContent);
-                    if (!appId) {
-                        appId = manifest.appId;
-                    }
-                    appName = manifest.name || appName;
-                    if (!appId) {
-                        if (!request_logger_1.RequestLogger.getCurrent())
-                            logger.error('No appId found');
-                        return {
-                            content: [{
-                                    type: "text",
-                                    text: `❌ **App ID Not Configured**\n\nNo appId found in \`manifest.json\` and none provided.\n\n**Steps to fix:**\n1. Get your published app ID from Hailer\n2. Edit \`public/manifest.json\`\n3. Set \`"appId": "your-app-id-here"\`\n\nOr provide appId parameter when calling this tool.`,
-                                }],
-                        };
-                    }
-                    // Validate version fields are present and not empty
-                    if (!manifest.version || manifest.version.trim() === '') {
-                        if (!request_logger_1.RequestLogger.getCurrent())
-                            logger.error('version field missing or empty');
-                        return {
-                            content: [{
-                                    type: "text",
-                                    text: `❌ **Version Not Set**\n\nThe \`version\` field in \`manifest.json\` is missing or empty.\n\n**Steps to fix:**\nEdit \`public/manifest.json\` and add:\n\`\`\`json\n"version": "1.0.0",\n"versionDescription": "Initial release"\n\`\`\`\n\nThe SDK requires version fields for publishing.`,
-                                }],
-                        };
-                    }
-                    if (!manifest.versionDescription || manifest.versionDescription.trim() === '') {
-                        if (!request_logger_1.RequestLogger.getCurrent())
-                            logger.error('versionDescription field missing or empty');
-                        return {
-                            content: [{
-                                    type: "text",
-                                    text: `❌ **Version Description Not Set**\n\nThe \`versionDescription\` field in \`manifest.json\` is missing or empty.\n\n**Steps to fix:**\nEdit \`public/manifest.json\` and add:\n\`\`\`json\n"version": "${manifest.version}",\n"versionDescription": "Description of this version"\n\`\`\`\n\nThe SDK requires version fields for publishing.`,
-                                }],
-                        };
-                    }
-                }
-                catch (error) {
-                    const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
-                    if (!request_logger_1.RequestLogger.getCurrent())
-                        logger.error('Failed to parse manifest.json', { error: errorMessage });
-                    return {
-                        content: [{
-                                type: "text",
-                                text: `❌ **Invalid manifest.json**\n\nFailed to parse \`public/manifest.json\`: ${errorMessage}\n\n**Check:**\n- manifest.json is valid JSON\n- appId field is set correctly`,
-                            }],
-                    };
-                }
-            }
-            else if (!appId) {
+            // Validate version fields
+            if (!manifest.version || manifest.version.trim() === '') {
                 if (!request_logger_1.RequestLogger.getCurrent())
-                    logger.error('Manifest not found and no appId provided');
+                    logger.error('version field missing or empty');
                 return {
                     content: [{
                             type: "text",
-                            text: `❌ **Manifest Not Found**\n\nNo \`public/manifest.json\` found and no appId provided.\n\n**Steps to fix:**\n1. Ensure \`public/manifest.json\` exists\n2. Set appId in manifest\n\nOr provide appId parameter when calling this tool.`,
+                            text: `❌ **Version Not Set**\n\nThe \`version\` field in \`manifest.json\` is missing or empty.\n\n**Steps to fix:**\nEdit \`public/manifest.json\` and add:\n\`\`\`json\n"version": "1.0.0",\n"versionDescription": "Initial release"\n\`\`\`\n\nThe SDK requires version fields for publishing.`,
                         }],
                 };
             }
-            // Check if publish-production script exists
-            try {
-                const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
-                if (!packageJson.scripts?.['publish-production']) {
-                    if (!request_logger_1.RequestLogger.getCurrent())
-                        logger.error('publish-production script not found');
-                    return {
-                        content: [{
-                                type: "text",
-                                text: `❌ **Publish Script Not Found**\n\nNo \`publish-production\` script found in package.json.\n\n**This may not be a Hailer app created with @hailer/create-app.**\n\nHailer apps should have:\n\`\`\`json\n"scripts": {\n  "publish-production": "...",\n  ...\n}\n\`\`\``,
-                            }],
-                    };
-                }
-            }
-            catch (error) {
-                const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
+            if (!manifest.versionDescription || manifest.versionDescription.trim() === '') {
                 if (!request_logger_1.RequestLogger.getCurrent())
-                    logger.error('Failed to parse package.json for scripts', { error: errorMessage });
+                    logger.error('versionDescription field missing or empty');
                 return {
                     content: [{
                             type: "text",
-                            text: `❌ **Invalid package.json**\n\n${errorMessage}`,
+                            text: `❌ **Version Description Not Set**\n\nThe \`versionDescription\` field in \`manifest.json\` is missing or empty.\n\n**Steps to fix:**\nEdit \`public/manifest.json\` and add:\n\`\`\`json\n"version": "${manifest.version}",\n"versionDescription": "Description of this version"\n\`\`\`\n\nThe SDK requires version fields for publishing.`,
                         }],
                 };
             }
-            // Log the start of publish
-            logger.debug('Publishing app...', { appId, appName, workspace: context.workspaceCache.currentWorkspace.name });
-            let responseText = `🚀 **Publishing Hailer App**\n\n`;
-            responseText += `**App Name:** ${appName}\n`;
-            responseText += `**App ID:** \`${appId}\`\n`;
-            responseText += `**Project:** ${projectDir}\n`;
-            responseText += `**Marketplace:** ${publishToMarket ? 'Yes (will get targetId)' : 'No'}\n\n`;
-            // Run the SDK publish script using `expect` for interactive automation
-            const os = await Promise.resolve().then(() => __importStar(require('os')));
-            const result = await new Promise((resolve) => {
-                // Create temp expect script file
-                const tmpDir = os.tmpdir();
-                const expectScriptPath = path.join(tmpDir, `hailer-publish-${Date.now()}.exp`);
-                // For Tcl, use braces {} for literal strings (no escaping needed except for braces)
-                const escapedPassword = password
-                    .replace(/\\/g, '\\\\')
-                    .replace(/\{/g, '\\{')
-                    .replace(/\}/g, '\\}');
-                const expectScript = `#!/usr/bin/expect -f
-set timeout 45
-log_user 1
-exp_internal 0
-set password {${escapedPassword}}
-puts "\\n>>> SPAWNING npm run publish-production..."
-spawn npm run publish-production
-puts "\\n>>> WAITING FOR PASSWORD PROMPT..."
-expect {
-  -nocase "password" {
-    puts "\\n>>> MATCHED PASSWORD PROMPT"
-  }
-  timeout {
-    puts "\\n>>> TIMEOUT waiting for password prompt (45s)"
-    puts "\\n>>> This usually means the SDK is not prompting for credentials"
-    exit 1
-  }
-  eof {
-    puts "\\n>>> EOF before password prompt - process ended unexpectedly"
-    exit 1
-  }
-}
-puts "\\n>>> MATCHED PASSWORD, SENDING..."
-sleep 0.5
-# Try human-like typing
-set send_human {.05 .15 1 .02 1}
-send -h -- "$password"
-sleep 0.2
-send "\\r"
-puts "\\n>>> SENT, WAITING..."
-expect {
-  -re "Invalid|invalid|wrong|Wrong" {
-    puts "\\n>>> INVALID PASSWORD"
-    exit 1
-  }
-  "Y/n" {
-    puts "\\n>>> MATCHED Y/n"
-    sleep 0.3
-    send "Y\\r"
-    exp_continue
-  }
-  "successfully" {
-    puts "\\n>>> SUCCESS! Exiting immediately..."
-    exit 0
-  }
-  timeout {
-    puts "\\n>>> TIMEOUT 30s"
-    exit 1
-  }
-  eof {
-    puts "\\n>>> EOF - process ended"
-    exit 0
-  }
-}
-`;
-                try {
-                    // Write expect script to temp file
-                    fs.writeFileSync(expectScriptPath, expectScript, { mode: 0o755 });
-                    // Build environment
-                    const envVars = {
-                        ...process.env,
-                        EMAIL: email
-                    };
-                    if (publishToMarket) {
-                        envVars.MARKET = 'true';
-                    }
-                    const output = execSync(`expect "${expectScriptPath}"`, {
-                        cwd: projectDir,
-                        encoding: 'utf-8',
-                        timeout: 60000,
-                        maxBuffer: 10 * 1024 * 1024,
-                        env: envVars
-                    });
-                    // Clean up temp file
+        }
+        // Check if appId points to a dev app (localhost) — if so, create a new production app
+        const workspaceId = context.workspaceCache.currentWorkspace._id;
+        let isNewProdApp = false;
+        try {
+            const apps = await context.hailer.request('v3.app.list', [workspaceId]);
+            const currentApp = apps.find((app) => app._id === appId);
+            if (currentApp && currentApp.url && (currentApp.url.includes('localhost') || currentApp.url.includes('127.0.0.1'))) {
+                // Dev app — create a new production app entry
+                logger.debug('Dev app detected, creating production app entry', { devAppId: appId });
+                const prodAppData = {
+                    cid: workspaceId,
+                    name: appName,
+                    url: `https://apps.hailer.com/${workspaceId}/placeholder/`
+                };
+                const prodResult = await context.hailer.request('v3.app.create', [prodAppData]);
+                const prodAppId = prodResult.appId || prodResult._id;
+                if (prodAppId) {
+                    // Share with workspace
                     try {
-                        fs.unlinkSync(expectScriptPath);
+                        await context.hailer.request('v3.app.member.add', [prodAppId, `network_${workspaceId}`]);
                     }
-                    catch { }
-                    // Check if manifest was updated with targetId
-                    let targetId;
-                    try {
+                    catch { /* non-fatal */ }
+                    logger.debug('Production app created', { devAppId: appId, prodAppId });
+                    appId = prodAppId;
+                    isNewProdApp = true;
+                    // Update manifest with new production appId
+                    if (fs.existsSync(manifestPath)) {
                         const updatedManifest = JSON.parse(fs.readFileSync(manifestPath, 'utf-8'));
-                        targetId = updatedManifest.targetId;
-                    }
-                    catch {
-                        // Ignore
-                    }
-                    if (output.includes('Published successfully')) {
-                        resolve({ success: true, output, targetId });
-                    }
-                    else {
-                        resolve({ success: false, output });
+                        updatedManifest.appId = appId;
+                        fs.writeFileSync(manifestPath, JSON.stringify(updatedManifest, null, 2));
                     }
                 }
-                catch (error) {
-                    if (!request_logger_1.RequestLogger.getCurrent())
-                        logger.error('Expect script execution failed', {
-                            errorCode: error.code,
-                            signal: error.signal
-                        });
-                    // Clean up temp file
-                    try {
-                        fs.unlinkSync(expectScriptPath);
-                    }
-                    catch { }
-                    const output = error.stdout || error.stderr || error.message || String(error);
-                    // Check for specific error messages
-                    if (output.includes('not found') || output.includes('command not found')) {
-                        resolve({
-                            success: false,
-                            output: `ERROR: expect command not found. Try: apt-get install expect (Ubuntu) or brew install expect (macOS)\n\n${output}`
-                        });
-                    }
-                    else if (output.includes('TIMEOUT')) {
-                        resolve({
-                            success: false,
-                            output: `ERROR: expect script timed out waiting for prompts. Check your internet connection and Hailer API status.\n\n${output}`
-                        });
-                    }
-                    else if (output.includes('INVALID PASSWORD')) {
+            }
+        }
+        catch (error) {
+            logger.warn('Failed to check dev app status, proceeding with provided appId', { error: (0, tool_helpers_1.extractErrorMessage)(error) });
+        }
+        // Log the start of publish
+        logger.debug('Publishing app via API key...', { appId, appName, isNewProdApp, workspace: context.workspaceCache.currentWorkspace.name });
+        // Step 1: Run npm run build
+        const { execSync } = await Promise.resolve().then(() => __importStar(require('child_process')));
+        try {
+            execSync('npm run build', { cwd: projectDir, stdio: 'pipe', timeout: 120000 });
+        }
+        catch (error) {
+            const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
+            if (!request_logger_1.RequestLogger.getCurrent())
+                logger.error('Build failed', { error: errorMessage });
+            return {
+                content: [{ type: "text", text: `❌ **Build Failed**\n\n\`\`\`\n${errorMessage}\n\`\`\`` }],
+            };
+        }
+        // Step 2: Verify dist/ exists
+        const distPath = path.join(projectDir, 'dist');
+        if (!fs.existsSync(distPath)) {
+            return {
+                content: [{ type: "text", text: `❌ **dist/ directory not found after build at ${distPath}**` }],
+            };
+        }
+        // Step 3: Copy manifest.json into dist/ (backend expects package/dist/manifest.json)
+        const distManifestPath = path.join(projectDir, 'dist', 'manifest.json');
+        try {
+            fs.copyFileSync(manifestPath, distManifestPath);
+        }
+        catch (error) {
+            const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
+            return {
+                content: [{ type: "text", text: `❌ **Failed to copy manifest.json to dist/:** ${errorMessage}` }],
+            };
+        }
+        // Step 4: Create .tgz archive with package/ prefix (matches npm pack format)
+        const tar = await Promise.resolve().then(() => __importStar(require('tar')));
+        const tgzFilename = `${appId}-${manifest.version || 'latest'}.tgz`;
+        const tgzPath = path.join(projectDir, tgzFilename);
+        try {
+            await tar.create({ gzip: true, file: tgzPath, cwd: projectDir, prefix: 'package' }, ['dist', 'package.json']);
+        }
+        catch (error) {
+            const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
+            return {
+                content: [{ type: "text", text: `❌ **Failed to create .tgz archive:** ${errorMessage}` }],
+            };
+        }
+        // Step 5: Upload to /app/publish using API key (following file-upload.ts pattern)
+        const FormData = (await Promise.resolve().then(() => __importStar(require('form-data')))).default;
+        const formData = new FormData();
+        formData.append('file', fs.createReadStream(tgzPath), {
+            filename: tgzFilename,
+            contentType: 'application/gzip',
+        });
+        formData.append('appId', appId);
+        if (args.targetId) {
+            formData.append('targetId', args.targetId);
+        }
+        const apiBaseUrl = context.client.socket.host;
+        const sessionKey = context.client.sessionKey;
+        const publishUrl = new URL(`${apiBaseUrl}/app/publish`);
+        const https = await Promise.resolve().then(() => __importStar(require('https')));
+        const http = await Promise.resolve().then(() => __importStar(require('http')));
+        try {
+            const uploadResponse = await new Promise((resolve, reject) => {
+                const options = {
+                    hostname: publishUrl.hostname,
+                    port: publishUrl.port || (publishUrl.protocol === 'https:' ? 443 : 80),
+                    path: publishUrl.pathname,
+                    method: 'POST',
+                    headers: {
+                        'hlrkey': sessionKey,
+                        ...formData.getHeaders(),
+                    },
+                };
+                const req = (publishUrl.protocol === 'https:' ? https : http).request(options, (res) => {
+                    const chunks = [];
+                    res.on('data', (chunk) => chunks.push(chunk));
+                    res.on('end', () => {
                         resolve({
-                            success: false,
-                            output: `ERROR: Invalid credentials provided. Check your email and password.\n\n${output}`
+                            statusCode: res.statusCode || 500,
+                            body: Buffer.concat(chunks).toString('utf-8'),
                         });
-                    }
-                    else if (output.includes('Published successfully')) {
-                        // Even if exit code is non-zero, check if it actually succeeded
-                        let targetId;
-                        try {
-                            const updatedManifest = JSON.parse(fs.readFileSync(manifestPath, 'utf-8'));
-                            targetId = updatedManifest.targetId;
-                        }
-                        catch {
-                            // Ignore
-                        }
-                        resolve({ success: true, output, targetId });
-                    }
-                    else {
-                        resolve({ success: false, output });
-                    }
-                }
+                    });
+                });
+                req.on('error', reject);
+                formData.pipe(req);
             });
-            if (!result.success) {
+            // Clean up .tgz file
+            try {
+                fs.unlinkSync(tgzPath);
+            }
+            catch { /* non-fatal */ }
+            if (uploadResponse.statusCode < 200 || uploadResponse.statusCode >= 300) {
                 if (!request_logger_1.RequestLogger.getCurrent())
-                    logger.error('Publish failed');
+                    logger.error('Publish failed', { status: uploadResponse.statusCode });
                 return {
                     content: [{
                             type: "text",
-                            text: `❌ **Publish Failed**\n\n\`\`\`\n${result.output}\n\`\`\`\n\n**Common Issues:**\n- Invalid credentials\n- App ID not found\n- Network issues`,
+                            text: `❌ **Publish Failed (${uploadResponse.statusCode})**\n\n\`\`\`\n${uploadResponse.body}\n\`\`\`\n\n**Common Issues:**\n- Invalid API key\n- App ID not found\n- Network issues`,
                         }],
                 };
             }
-            // Log success
+            let result;
+            try {
+                result = JSON.parse(uploadResponse.body);
+            }
+            catch {
+                result = { raw: uploadResponse.body };
+            }
             logger.debug('App published successfully', { appId, appName });
-            responseText += `✅ **App Published Successfully!**\n\n`;
-            if (result.targetId) {
-                responseText += `**Target ID:** \`${result.targetId}\`\n\n`;
-                responseText += `💡 **Marketplace Publishing:**\n`;
-                responseText += `Use this targetId to create a marketplace listing:\n`;
-                responseText += `\`\`\`javascript\n`;
-                responseText += `publish_app({\n`;
-                responseText += `  appId: "${appId}",\n`;
-                responseText += `  versionId: "${result.targetId}",\n`;
-                responseText += `  title: "App Name",\n`;
-                responseText += `  description: "Description",\n`;
-                responseText += `  version: "1.0.0",\n`;
-                responseText += `  versionDescription: "Release notes",\n`;
-                responseText += `  publisher: "Publisher Name",\n`;
-                responseText += `  iconFileId: "<upload-icon-first>"\n`;
-                responseText += `})\n`;
-                responseText += `\`\`\`\n\n`;
+            // Auto-update app URL to production after successful publish
+            const productionUrl = `https://apps.hailer.com/${workspaceId}/${appId}/`;
+            let urlUpdated = false;
+            try {
+                await context.hailer.request('v3.app.update', [appId, { name: appName, url: productionUrl }]);
+                urlUpdated = true;
+                logger.debug('App URL updated to production', { appId, productionUrl });
+            }
+            catch (urlError) {
+                const urlErrorMsg = (0, tool_helpers_1.extractErrorMessage)(urlError);
+                logger.warn('Failed to update app URL after publish', { appId, error: urlErrorMsg });
+            }
+            let responseText = `✅ **App Published Successfully!**\n\n`;
+            if (isNewProdApp) {
+                responseText += `🆕 **New production app created** (dev app kept at localhost)\n`;
+            }
+            responseText += `**App Name:** ${appName}\n`;
+            responseText += `**App ID:** \`${appId}\`\n`;
+            responseText += `**Version:** ${manifest.version || 'unknown'}\n`;
+            responseText += `**Description:** ${manifest.versionDescription || 'N/A'}\n`;
+            if (urlUpdated) {
+                responseText += `**URL:** ${productionUrl}\n`;
+            }
+            else {
+                responseText += `⚠️ **URL not updated** — manually call \`update_app\` to set production URL\n`;
+            }
+            if (typeof result.size === 'number') {
+                responseText += `**Size:** ${(result.size / 1024).toFixed(2)} KB\n`;
+            }
+            if (args.targetId) {
+                responseText += `**Marketplace Target:** ${args.targetId}\n`;
             }
-            else if (publishToMarket) {
-                responseText += `⚠️ **No targetId returned**\n`;
-                responseText += `The MARKET flag was set but no targetId was found in the response.\n`;
-                responseText += `Check if the manifest.json was updated.\n\n`;
+            if (result.manifest) {
+                responseText += `\n**Manifest:**\n\`\`\`json\n${JSON.stringify(result.manifest, null, 2)}\n\`\`\`\n`;
             }
-            responseText += `## 📋 Next Steps\n\n`;
-            responseText += `1. **Open published app in Hailer** (not the dev version)\n`;
-            responseText += `2. **Verify functionality** - test all features work\n`;
-            responseText += `3. **Share with users** - use \`add_app_member\` tool:\n`;
+            responseText += `\n## Next Steps\n\n`;
+            responseText += `1. **Open published app in Hailer** to verify\n`;
+            responseText += `2. **Share with users** - use \`add_app_member\` tool:\n`;
             responseText += `   \`\`\`javascript\n`;
             responseText += `   add_app_member({\n`;
             responseText += `     appId: "${appId}",\n`;
-            responseText += `     member: "network_<workspace-id>" // or team_*, user_*\n`;
+            responseText += `     member: "network_${workspaceId}" // or team_*, user_*\n`;
             responseText += `   })\n`;
             responseText += `   \`\`\`\n`;
             return {
-                content: [{
-                        type: "text",
-                        text: responseText,
-                    }],
+                content: [{ type: "text", text: responseText }],
             };
         }
         catch (error) {
+            // Clean up .tgz file on failure
+            try {
+                fs.unlinkSync(tgzPath);
+            }
+            catch { /* non-fatal */ }
             const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
             if (!request_logger_1.RequestLogger.getCurrent())
                 logger.error('Error publishing Hailer app', { error: errorMessage });
             return {
                 content: [{
                         type: "text",
-                        text: `❌ **Error publishing Hailer app**\n\n**Error:** ${errorMessage}\n\n**Common Issues:**\n- Not in a Hailer app directory\n- Missing package.json or manifest.json\n- Network connectivity issues\n- Build failures`,
+                        text: `❌ **Upload Failed**\n\n**Error:** ${errorMessage}\n\n**Common Issues:**\n- Network connectivity issues\n- Invalid API key\n- Hailer API unavailable`,
                     }],
             };
         }