@hailer/mcp 1.1.17-beta.2 → 1.2.0

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

@@ -42,12 +42,67 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.appScaffoldTools = exports.publishHailerAppTool = exports.scaffoldHailerAppTool = void 0;
 const zod_1 = require("zod");
+const child_process_1 = require("child_process");
+const util_1 = require("util");
 const tool_registry_1 = require("../tool-registry");
 const logger_1 = require("../../lib/logger");
 const request_logger_1 = require("../../lib/request-logger");
 const config_1 = require("../../config");
 const tool_helpers_1 = require("../utils/tool-helpers");
+const execAsync = (0, util_1.promisify)(child_process_1.exec);
 const logger = (0, logger_1.createLogger)({ component: 'app-scaffold' });
+/**
+ * Field resolver utility — injected into every scaffolded app at src/hailer/field-resolver.ts.
+ * Lets apps reference fields by key (e.g. 'matchDate') or hex ID interchangeably.
+ * The resolver checks the workflow schema at runtime: if keys exist, it maps key→ID;
+ * if the input is already a valid field ID, it passes through unchanged.
+ */
+const FIELD_RESOLVER_SOURCE = `import { Workflow } from '@hailer/app-sdk';
+
+/**
+ * Creates a resolver that maps field key-or-ID → fieldId.
+ *
+ * Usage:
+ *   const workflow = app.workflows.find(w => w._id === WORKFLOW_ID);
+ *   const f = createFieldResolver(workflow?.fields);
+ *   const value = activity.fields?.[f('matchDate')];
+ *
+ * - If input is already a field ID (exists in workflow.fields), returns it as-is.
+ * - If input matches a field's \`key\` property, returns that field's hex ID.
+ * - Falls back to the input unchanged (for workflows without keys).
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function createFieldResolver(workflowFields: Record<string, any> | undefined) {
+  const keyToId: Record<string, string> = {};
+
+  if (workflowFields) {
+    for (const [fieldId, fieldDef] of Object.entries(workflowFields)) {
+      if (fieldDef?.key) {
+        keyToId[fieldDef.key] = fieldId;
+      }
+    }
+  }
+
+  return (keyOrId: string): string => {
+    if (workflowFields && keyOrId in workflowFields) return keyOrId;
+    if (keyOrId in keyToId) return keyToId[keyOrId];
+    return keyOrId;
+  };
+}
+
+/**
+ * Hook-friendly wrapper: resolves fields for a specific workflow from the app state.
+ *
+ * Usage:
+ *   const { app } = useApp();
+ *   const f = useFieldResolver(app.workflows, WORKFLOW_ID);
+ *   const date = activity.fields?.[f('matchDate')];
+ */
+export function useFieldResolver(workflows: Workflow[], workflowId: string) {
+  const workflow = workflows.find(w => w._id === workflowId);
+  return createFieldResolver(workflow?.fields);
+}
+`;
 // Color palette for app icons (gradient pairs)
 const APP_ICON_COLORS = [
     { color1: '#3b82f6', color2: '#1d4ed8' }, // Blue
@@ -85,60 +140,82 @@ function getColorFromName(name) {
     let hash = 0;
     for (let i = 0; i < name.length; i++) {
         hash = ((hash << 5) - hash) + name.charCodeAt(i);
-        hash = hash & hash; // Convert to 32bit integer
+        hash |= 0; // Convert to 32-bit signed integer
     }
     const index = Math.abs(hash) % APP_ICON_COLORS.length;
     return APP_ICON_COLORS[index];
 }
+function hexToRgb(hex) {
+    return {
+        r: parseInt(hex.slice(1, 3), 16),
+        g: parseInt(hex.slice(3, 5), 16),
+        b: parseInt(hex.slice(5, 7), 16),
+    };
+}
 /**
- * Generate styled app icon as JPEG buffer
+ * Generate styled app icon as PNG buffer with solid background.
  */
 async function generateAppIcon(name) {
     const sharp = (await Promise.resolve().then(() => __importStar(require('sharp')))).default;
     const initials = getInitials(name);
     const colors = getColorFromName(name);
-    const svg = `<svg width="256" height="256" xmlns="http://www.w3.org/2000/svg">
-    <defs>
-      <linearGradient id="bgGrad" x1="0%" y1="0%" x2="100%" y2="100%">
-        <stop offset="0%" style="stop-color:${colors.color1}"/>
-        <stop offset="100%" style="stop-color:${colors.color2}"/>
-      </linearGradient>
-      <filter id="shadow" x="-20%" y="-20%" width="140%" height="140%">
-        <feDropShadow dx="2" dy="4" stdDeviation="3" flood-opacity="0.3"/>
-      </filter>
-    </defs>
-    <rect width="256" height="256" rx="50" fill="url(#bgGrad)"/>
-    <rect x="8" y="8" width="240" height="240" rx="42" fill="none" stroke="rgba(255,255,255,0.2)" stroke-width="2"/>
+    const rgb = hexToRgb(colors.color1);
+    // Solid background — no transparency, no SVG gradients
+    const bg = await sharp({
+        create: { width: 256, height: 256, channels: 3, background: rgb }
+    }).png().toBuffer();
+    // White text overlay
+    const textSvg = Buffer.from(`<svg width="256" height="256" xmlns="http://www.w3.org/2000/svg">
     <text x="128" y="168" text-anchor="middle"
           font-family="Arial Black, Arial, sans-serif"
           font-size="${initials.length > 2 ? 80 : 110}"
           font-weight="900"
-          fill="white"
-          filter="url(#shadow)">${initials}</text>
-  </svg>`;
-    return sharp(Buffer.from(svg))
-        .flatten({ background: colors.color1 })
-        .jpeg({ quality: 95 })
+          fill="white">${initials}</text>
+  </svg>`);
+    return sharp(bg)
+        .composite([{ input: textSvg, top: 0, left: 0 }])
+        .png()
         .toBuffer();
 }
-const scaffoldHailerAppDescription = `Scaffold a new Hailer app — creates Vite/React project, installs dependencies, creates dev app entry in Hailer, shares with workspace, starts dev server on port 3000. Use this for ALL new app development — never copy an existing app. Load \`hailer-app-builder\` skill for SDK patterns and component examples.`;
+/**
+ * Generate app icon, write to temp file, upload with isPublic, clean up.
+ * Returns the file ID on success, undefined on failure.
+ */
+async function uploadAppIcon(name, context) {
+    const os = await Promise.resolve().then(() => __importStar(require('os')));
+    const path = await Promise.resolve().then(() => __importStar(require('path')));
+    const fs = await Promise.resolve().then(() => __importStar(require('fs')));
+    const iconBuffer = await generateAppIcon(name);
+    const tempPath = path.join(os.tmpdir(), `app-icon-${Date.now()}.png`);
+    try {
+        fs.writeFileSync(tempPath, iconBuffer);
+        const result = await context.hailer.uploadFile({
+            path: tempPath,
+            filename: 'app-icon.png',
+            isPublic: true,
+        });
+        return result.success ? result.fileId : undefined;
+    }
+    finally {
+        try {
+            fs.unlinkSync(tempPath);
+        }
+        catch { /* ignore */ }
+    }
+}
+const scaffoldHailerAppDescription = `Scaffold a new Hailer app from template. Creates a Vite/React project, installs dependencies, injects field-resolver utility, and configures vite + index.html. Use this for ALL new app development — never copy an existing app. Load \`hailer-app-builder\` skill for SDK patterns and component examples.`;
 exports.scaffoldHailerAppTool = {
     name: 'scaffold_hailer_app',
     group: tool_registry_1.ToolGroup.PLAYGROUND,
     description: scaffoldHailerAppDescription,
     schema: zod_1.z.object({
-        projectName: zod_1.z.string().min(1).describe("Project folder name"),
-        template: zod_1.z.enum(['react-ts', 'react', 'preact-ts', 'preact', 'svelte-ts', 'svelte', 'vanilla', 'vanilla-ts']).default('react-ts').describe("Template to use (react-ts recommended - includes Hailer theme, icons, and design system)"),
-        description: zod_1.z.string().optional().describe("App description for Hailer"),
-        targetDirectory: zod_1.z.string().optional().describe("Target directory (defaults to DEV_APPS_PATH or current)"),
+        projectName: zod_1.z.string().describe("Project folder name"),
+        template: zod_1.z.enum(['react-ts', 'react', 'preact-ts', 'preact', 'svelte-ts', 'svelte', 'vanilla', 'vanilla-ts']).default('react-ts').describe("Template to use"),
+        targetDirectory: zod_1.z.string().optional().describe("Target directory — ALWAYS provide this. Use the project's apps/ folder (e.g., '/home/user/my-project/apps'). Falls back to DEV_APPS_PATH env var."),
+        description: zod_1.z.string().optional().describe("App description"),
         installDependencies: zod_1.z.coerce.boolean().optional().default(true).describe("Run npm install after scaffolding"),
-        autoCreateDevApp: zod_1.z.coerce.boolean().optional().default(true).describe("Automatically create dev app entry in Hailer"),
-        autoShareWithWorkspace: zod_1.z.coerce.boolean().optional().default(true).describe("Share app with entire workspace"),
-        autoStartDevServer: zod_1.z.coerce.boolean().optional().default(true).describe("Start dev server in background on port 3000"),
-        autoSpawnBuilder: zod_1.z.coerce.boolean().optional().default(false).describe("Return instruction for Claude to spawn a builder agent that will implement the app UI")
     }),
-    async execute(args, context) {
-        const { execSync, spawn } = await Promise.resolve().then(() => __importStar(require('child_process')));
+    async execute(args, _context) {
         const path = await Promise.resolve().then(() => __importStar(require('path')));
         const fs = await Promise.resolve().then(() => __importStar(require('fs')));
         try {
@@ -153,41 +230,21 @@ exports.scaffoldHailerAppTool = {
                         }],
                 };
             }
-            let responseText = `🚀 **ONE-SHOT HAILER APP SETUP**\n\n`;
+            let responseText = `🚀 **HAILER APP SCAFFOLD**\n\n`;
             responseText += `**Project:** ${args.projectName}\n`;
             responseText += `**Template:** ${args.template}\n`;
             responseText += `**Location:** ${projectPath}\n\n`;
-            // Step 1: Scaffold project
-            responseText += `⏳ Step 1/8: Creating project from template...\n`;
+            // Step 1: Scaffold project via CLI
+            responseText += `⏳ Step 1: Creating project from template...\n`;
             try {
-                // Ensure target directory exists (execSync throws misleading ENOENT if cwd doesn't exist)
                 if (!fs.existsSync(targetDir)) {
                     fs.mkdirSync(targetDir, { recursive: true });
                 }
-                const createCmd = `npm create @hailer/app@beta ${args.projectName} -- --template ${args.template}`;
-                execSync(createCmd, {
+                await execAsync(`npx @hailer/create-app ${args.projectName} --template ${args.template}`, {
                     cwd: targetDir,
-                    stdio: 'pipe'
+                    timeout: 60_000,
                 });
-                responseText += `✅ Project scaffolded\n`;
-                // Immediately update manifest.json with correct author (before Hailer reads it)
-                try {
-                    const manifestPath = path.join(projectPath, 'public', 'manifest.json');
-                    if (fs.existsSync(manifestPath)) {
-                        const manifestContent = fs.readFileSync(manifestPath, 'utf-8');
-                        const manifest = JSON.parse(manifestContent);
-                        manifest.author = 'Hailer Oy';
-                        if (context.email) {
-                            manifest.contributors = [context.email];
-                        }
-                        fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
-                        responseText += `   ✅ Set author: Hailer Oy\n`;
-                    }
-                }
-                catch {
-                    // Non-fatal, continue
-                }
-                responseText += `\n`;
+                responseText += `✅ Project scaffolded\n\n`;
             }
             catch (error) {
                 const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
@@ -200,11 +257,11 @@ exports.scaffoldHailerAppTool = {
             }
             // Step 2: Install dependencies
             if (args.installDependencies !== false) {
-                responseText += `⏳ Step 2/8: Installing dependencies...\n`;
+                responseText += `⏳ Step 2: Installing dependencies...\n`;
                 try {
-                    execSync('npm install', {
+                    await execAsync('npm install', {
                         cwd: projectPath,
-                        stdio: 'pipe'
+                        timeout: 180_000,
                     });
                     responseText += `✅ Dependencies installed\n\n`;
                 }
@@ -214,288 +271,107 @@ exports.scaffoldHailerAppTool = {
                 }
             }
             else {
-                responseText += `⏭️ Step 2/8: Skipped (installDependencies = false)\n\n`;
+                responseText += `⏭️ Step 2: Skipped (installDependencies = false)\n\n`;
+            }
+            // Step 3: Inject field resolver utility into src/hailer/
+            responseText += `⏳ Step 3: Injecting field-resolver utility...\n`;
+            try {
+                const resolverPath = path.join(projectPath, 'src', 'hailer', 'field-resolver.ts');
+                fs.writeFileSync(resolverPath, FIELD_RESOLVER_SOURCE);
+                responseText += `✅ field-resolver.ts written to src/hailer/\n\n`;
+            }
+            catch (error) {
+                const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
+                responseText += `⚠️ Failed to inject field-resolver: ${errorMessage}\n\n`;
             }
-            // Step 3: Configure CORS in vite.config.ts
-            responseText += `⏳ Step 3/8: Configuring CORS for Hailer access...\n`;
+            // Step 4: Fix base: './' in vite.config.ts
+            responseText += `⏳ Step 4: Fixing vite.config.ts base path...\n`;
             try {
                 const viteConfigPath = path.join(projectPath, 'vite.config.ts');
                 if (fs.existsSync(viteConfigPath)) {
                     let viteConfig = fs.readFileSync(viteConfigPath, 'utf-8');
-                    // Check if CORS is already configured
-                    if (!viteConfig.includes('cors:')) {
-                        // Add CORS configuration to the server block
-                        // Matches: server: { port: 3000 } or server: { port: 3000, } with optional whitespace
-                        viteConfig = viteConfig.replace(/server:\s*{\s*port:\s*3000\s*,?\s*}/, `server: {
-    port: 3000,
-    cors: {
-      origin: '*',
-      credentials: true
-    }
-  }`);
+                    if (viteConfig.includes("base: ''")) {
+                        viteConfig = viteConfig.replace("base: ''", "base: './'");
                         fs.writeFileSync(viteConfigPath, viteConfig);
-                        responseText += `✅ CORS configured in vite.config.ts\n\n`;
+                        responseText += `✅ Fixed base: './' in vite.config.ts\n\n`;
+                    }
+                    else if (viteConfig.includes("base: './'")) {
+                        responseText += `✅ base already set to './'\n\n`;
                     }
                     else {
-                        responseText += `✅ CORS already configured\n\n`;
+                        responseText += `⚠️ base not found in vite.config.ts, skipping\n\n`;
                     }
                 }
                 else {
-                    responseText += `⚠️ vite.config.ts not found, skipping CORS configuration\n\n`;
+                    responseText += `⚠️ vite.config.ts not found, skipping\n\n`;
                 }
             }
             catch (error) {
                 const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
-                responseText += `⚠️ Failed to configure CORS: ${errorMessage}\n\n`;
+                responseText += `⚠️ Failed to fix vite.config.ts: ${errorMessage}\n\n`;
             }
-            let appId;
-            let workspaceId;
-            // Step 4: Find existing dev app or create new one
-            if (args.autoCreateDevApp !== false) {
-                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`;
+            // Step 5: Add cache-busting meta tags to index.html
+            responseText += `⏳ Step 5: Adding cache-busting meta tags to index.html...\n`;
+            try {
+                const indexPath = path.join(projectPath, 'index.html');
+                if (fs.existsSync(indexPath)) {
+                    let indexHtml = fs.readFileSync(indexPath, 'utf-8');
+                    if (!indexHtml.includes('no-cache')) {
+                        const cacheMeta = [
+                            '    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />',
+                            '    <meta http-equiv="Pragma" content="no-cache" />',
+                            '    <meta http-equiv="Expires" content="0" />',
+                        ].join('\n');
+                        indexHtml = indexHtml.replace('<head>', `<head>\n${cacheMeta}`);
+                        fs.writeFileSync(indexPath, indexHtml);
+                        responseText += `✅ Cache-busting meta tags added to index.html\n\n`;
                     }
                     else {
-                        // Check for existing dev app (localhost:3000) to reuse
-                        try {
-                            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 {
-                            // Non-fatal, will create new app below
-                        }
-                        // 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`;
-                        }
+                        responseText += `✅ Cache-busting meta tags already present\n\n`;
                     }
                 }
-                catch (error) {
-                    const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
-                    responseText += `⚠️ Failed to set up app in Hailer: ${errorMessage}\n\n`;
-                }
-            }
-            else {
-                responseText += `⏭️ Step 4/8: Skipped (autoCreateDevApp = false)\n\n`;
-            }
-            // Step 5: Share with workspace
-            if (args.autoShareWithWorkspace !== false && appId && workspaceId) {
-                responseText += `⏳ Step 5/8: Sharing app with workspace...\n`;
-                try {
-                    await context.hailer.request('v3.app.member.add', [
-                        appId,
-                        `network_${workspaceId}`
-                    ]);
-                    responseText += `✅ App shared with entire workspace\n\n`;
-                }
-                catch (error) {
-                    const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
-                    responseText += `⚠️ Failed to share app: ${errorMessage}\n\n`;
+                else {
+                    responseText += `⚠️ index.html not found, skipping\n\n`;
                 }
             }
-            else {
-                responseText += `⏭️ Step 5/8: Skipped (no app ID or autoShareWithWorkspace = false)\n\n`;
+            catch (error) {
+                const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
+                responseText += `⚠️ Failed to update index.html: ${errorMessage}\n\n`;
             }
-            // Step 6: Update manifest.json with app ID
-            if (appId) {
-                responseText += `⏳ Step 6/8: Adding appId to manifest.json...\n`;
-                try {
-                    const manifestPath = path.join(projectPath, 'public', 'manifest.json');
-                    if (fs.existsSync(manifestPath)) {
-                        const manifestContent = fs.readFileSync(manifestPath, 'utf-8');
-                        const manifest = JSON.parse(manifestContent);
-                        manifest.appId = appId;
-                        fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
-                        responseText += `   ✅ appId: ${appId}\n\n`;
-                    }
-                    else {
-                        responseText += `⚠️ manifest.json not found\n\n`;
+            // Step 6: Update manifest.json author to "Hailer Oy"
+            responseText += `⏳ Step 6: Updating manifest.json...\n`;
+            try {
+                const manifestPath = path.join(projectPath, 'public', 'manifest.json');
+                if (fs.existsSync(manifestPath)) {
+                    const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf-8'));
+                    manifest.author = 'Hailer Oy';
+                    delete manifest.appId; // Clear template dummy — real appId assigned on first publish
+                    if (args.description) {
+                        manifest.description = args.description;
+                        manifest.versionDescription = args.description;
                     }
+                    if (!manifest.version)
+                        manifest.version = '1.0.0';
+                    fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
+                    responseText += `✅ manifest.json updated (author: Hailer Oy)\n\n`;
                 }
-                catch (error) {
-                    const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
-                    responseText += `⚠️ Failed to update manifest: ${errorMessage}\n\n`;
-                }
-            }
-            else {
-                responseText += `⏭️ Step 6/8: Skipped (no app ID)\n\n`;
-            }
-            // Step 7: Start dev server
-            if (args.autoStartDevServer !== false) {
-                responseText += `⏳ Step 7/8: Starting dev server on port 3000...\n`;
-                try {
-                    // Start dev server in background
-                    const devServer = spawn('npm', ['run', 'dev'], {
-                        cwd: projectPath,
-                        detached: true,
-                        stdio: 'ignore',
-                        shell: true
-                    });
-                    devServer.on('error', (err) => {
-                        logger.warn('Dev server spawn failed', { error: err.message });
-                    });
-                    devServer.unref();
-                    responseText += `✅ Dev server started in background\n`;
-                    responseText += `   PID: ${devServer.pid}\n`;
-                    responseText += `   URL: http://localhost:3000\n\n`;
-                }
-                catch (error) {
-                    const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
-                    responseText += `⚠️ Failed to start dev server: ${errorMessage}\n`;
-                    responseText += `   Start manually: cd ${args.projectName} && npm run dev\n\n`;
+                else {
+                    responseText += `⚠️ manifest.json not found, skipping\n\n`;
                 }
             }
-            else {
-                responseText += `⏭️ Step 7/8: Skipped (autoStartDevServer = false)\n\n`;
-            }
-            // Step 8: Complete
-            responseText += `✅ **Step 8/8: Setup Complete!**\n\n`;
-            // Final summary
-            responseText += `## 🎉 Your Hailer App is Ready!\n\n`;
-            responseText += `**What was done:**\n`;
-            responseText += `- ✅ Project scaffolded from ${args.template} template\n`;
-            if (args.installDependencies !== false)
-                responseText += `- ✅ Dependencies installed\n`;
-            responseText += `- ✅ CORS configured for Hailer access\n`;
-            if (appId)
-                responseText += `- ✅ Dev app entry created in Hailer (ID: \`${appId}\`)\n`;
-            if (args.autoShareWithWorkspace !== false && appId)
-                responseText += `- ✅ App shared with entire workspace\n`;
-            if (appId)
-                responseText += `- ✅ manifest.json configured with app ID\n`;
-            if (args.autoStartDevServer !== false)
-                responseText += `- ✅ Dev server started on http://localhost:3000\n`;
-            responseText += `\n## 🚀 Next Steps\n\n`;
-            responseText += `1. **Open the app in Hailer** - Look for "${args.projectName}" in your apps menu\n`;
-            responseText += `2. **Start coding** - Files in \`${projectPath}/src\` will hot-reload\n`;
-            responseText += `3. **View logs** - Check dev server output if needed\n\n`;
-            responseText += `## 📂 Project Location\n\n`;
-            responseText += `\`\`\`\n${projectPath}\n\`\`\`\n\n`;
-            if (appId) {
-                responseText += `## 🔗 App Info\n\n`;
-                responseText += `- **App ID:** \`${appId}\`\n`;
-                responseText += `- **Dev URL:** http://localhost:3000\n`;
-                responseText += `- **Shared with:** Entire workspace\n`;
-            }
-            // Add spawn builder instruction if requested
-            if (args.autoSpawnBuilder) {
-                // Note: Workflow list is not available in workspace cache
-                // The builder agent should call list_workflows_minimal to get workflows
-                const workflowList = '';
-                responseText += `\n---\n\n`;
-                responseText += `## 🤖 SPAWN BUILDER AGENT\n\n`;
-                responseText += `**IMPORTANT:** You MUST now spawn a builder agent to implement the app UI.\n\n`;
-                responseText += `Use the Task tool with these parameters:\n\n`;
-                responseText += `\`\`\`javascript\n`;
-                responseText += `Task({\n`;
-                responseText += `  subagent_type: "general-purpose",\n`;
-                responseText += `  description: "Build ${args.projectName} app",\n`;
-                responseText += `  prompt: \`You are building a Hailer app.\n`;
-                responseText += `\n`;
-                responseText += `PROJECT: ${projectPath}\n`;
-                responseText += `DESCRIPTION: ${args.description || args.projectName}\n`;
-                responseText += `\n`;
-                responseText += `## Available Workflows\n`;
-                responseText += `${workflowList}\n`;
-                responseText += `\n`;
-                responseText += `## MANDATORY: Load Skills First\n`;
-                responseText += `1. Skill("building-hailer-apps-skill")\n`;
-                responseText += `2. Skill("hailer-app-builder")\n`;
-                responseText += `\n`;
-                responseText += `## CRITICAL FIRST: Fix main.tsx\n`;
-                responseText += `The template is missing ChakraProvider! Fix src/main.tsx:\n`;
-                responseText += `\n`;
-                responseText += `import React from 'react'\n`;
-                responseText += `import ReactDOM from 'react-dom/client'\n`;
-                responseText += `import { ChakraProvider } from '@chakra-ui/react'\n`;
-                responseText += `import App from './App.tsx'\n`;
-                responseText += `import './index.css'\n`;
-                responseText += `\n`;
-                responseText += `ReactDOM.createRoot(document.getElementById('root')!).render(\n`;
-                responseText += `  <React.StrictMode>\n`;
-                responseText += `    <ChakraProvider>\n`;
-                responseText += `      <App />\n`;
-                responseText += `    </ChakraProvider>\n`;
-                responseText += `  </React.StrictMode>,\n`;
-                responseText += `)\n`;
-                responseText += `\n`;
-                responseText += `## Build the App\n`;
-                responseText += `After loading skills and fixing main.tsx:\n`;
-                responseText += `1. Get workflow schemas with get_workflow_schema for fields you need\n`;
-                responseText += `2. **CRITICAL: If using insights, call get_insight_data FIRST to get EXACT column structure**\n`;
-                responseText += `3. Create src/constants.ts with workflow/field IDs\n`;
-                responseText += `4. Create src/types/ with interfaces matching ACTUAL data structures\n`;
-                responseText += `5. Create src/hooks/ with data fetching (use inside boolean, NOT hailer in deps)\n`;
-                responseText += `6. Create src/components/ with Chakra UI\n`;
-                responseText += `7. Update src/App.tsx\n`;
-                responseText += `\n`;
-                responseText += `## INSIGHT DATA WARNING\n`;
-                responseText += `NEVER assume insight column names or structure. ALWAYS:\n`;
-                responseText += `1. Call get_insight_data({ insightId, update: true })\n`;
-                responseText += `2. Note exact column names (e.g., "total_value" not "totalValue")\n`;
-                responseText += `3. Note column indices (row[0], row[1], etc.)\n`;
-                responseText += `4. Build interfaces matching ACTUAL structure\n`;
-                responseText += `\n`;
-                responseText += `Report back confirming: styled UI works, no infinite loops, fields display correctly.\n`;
-                responseText += `\`\n`;
-                responseText += `})\n`;
-                responseText += `\`\`\`\n`;
-            }
+            catch (error) {
+                const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
+                responseText += `⚠️ Failed to update manifest.json: ${errorMessage}\n\n`;
+            }
+            // Summary
+            responseText += `## ✅ App Scaffolded\n\n`;
+            responseText += `**Location:** \`${projectPath}\`\n\n`;
+            responseText += `**Next steps:**\n`;
+            responseText += `1. \`cd ${projectPath} && npm run dev\` to start the dev server\n`;
+            responseText += `2. Build your app using \`hailer-app-builder\` skill patterns\n`;
+            responseText += `3. Run \`publish_hailer_app\` when ready to deploy\n`;
             return {
-                content: [{
-                        type: "text",
-                        text: responseText,
-                    }],
+                content: [{ type: "text", text: responseText }],
             };
         }
         catch (error) {
@@ -503,7 +379,7 @@ exports.scaffoldHailerAppTool = {
             return {
                 content: [{
                         type: "text",
-                        text: `❌ **Error in one-shot setup**\n\n**Error:** ${errorMessage}\n\n**Common Issues:**\n- Node.js not installed or version < 18\n- npm not available\n- Insufficient permissions\n- Hailer API connection issues`,
+                        text: `❌ **Error in scaffold**\n\n**Error:** ${errorMessage}\n\n**Common Issues:**\n- Node.js not installed or version < 18\n- npm not available\n- Insufficient permissions`,
                     }],
             };
         }
@@ -512,21 +388,20 @@ exports.scaffoldHailerAppTool = {
 // ============================================================================
 // PUBLISH HAILER APP TOOL
 // ============================================================================
-const publishHailerAppDescription = `Publish a Hailer app to production — builds the project, packages as tar (dist + manifest.json), uploads to Hailer CDN, updates app URL from localhost to production. Load \`publish-hailer-app\` skill for the full publishing workflow and manifest validation.`;
+const publishHailerAppDescription = `Publish a Hailer app to production — wraps \`npm run publish-production\` CLI. On first publish (no appId in manifest), creates the app entry, uploads icon, and shares with workspace. On subsequent publishes, updates the existing app. Load \`publish-hailer-app\` skill for the full publishing workflow and manifest validation.`;
 exports.publishHailerAppTool = {
     name: 'publish_hailer_app',
     group: tool_registry_1.ToolGroup.PLAYGROUND,
     description: publishHailerAppDescription,
     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)"),
-        targetId: zod_1.z.string().optional().describe("Optional marketplace target ID for publishing to marketplace"),
+        projectDirectory: zod_1.z.string().optional().describe("Path to the app project to publish — ALWAYS provide this (e.g., '/home/user/my-project/apps/my-app'). Falls back to DEV_APPS_PATH env var."),
+        targetId: zod_1.z.string().optional().describe("Optional marketplace target ID"),
     }),
     async execute(args, context) {
         const path = await Promise.resolve().then(() => __importStar(require('path')));
         const fs = await Promise.resolve().then(() => __importStar(require('fs')));
         const projectDir = args.projectDirectory || config_1.environment.DEV_APPS_PATH || path.join(process.cwd(), 'apps');
-        // Check if directory exists
+        // Validate directory exists
         if (!fs.existsSync(projectDir)) {
             if (!request_logger_1.RequestLogger.getCurrent())
                 logger.error('Project directory does not exist', { projectDir });
@@ -537,7 +412,7 @@ exports.publishHailerAppTool = {
                     }],
             };
         }
-        // Check if package.json exists and has build script
+        // Validate package.json exists with publish-production script
         const packageJsonPath = path.join(projectDir, 'package.json');
         if (!fs.existsSync(packageJsonPath)) {
             if (!request_logger_1.RequestLogger.getCurrent())
@@ -545,7 +420,7 @@ exports.publishHailerAppTool = {
             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: `❌ **Not a Hailer App Project**\n\nNo package.json found in \`${projectDir}\`\n\nMake sure you're in the correct directory.`,
                     }],
             };
         }
@@ -555,297 +430,147 @@ exports.publishHailerAppTool = {
         }
         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) {
+        if (!packageJson.scripts?.['publish-production']) {
             return {
-                content: [{ type: "text", text: '❌ **Missing Build Script**\n\npackage.json has no "build" script.' }],
+                content: [{ type: "text", text: '❌ **Missing publish-production Script**\n\npackage.json has no "publish-production" script.' }],
             };
         }
-        // Read manifest.json to get/verify appId
+        // Read manifest.json
         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('Manifest not found and no appId provided');
-                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.`,
-                        }],
-                };
-            }
-            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('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`,
-                        }],
-                };
-            }
-            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
-            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.`,
-                        }],
-                };
-            }
-        }
-        // 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 {
-                        await context.hailer.request('v3.app.member.add', [prodAppId, `network_${workspaceId}`]);
-                    }
-                    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'));
-                        updatedManifest.appId = appId;
-                        fs.writeFileSync(manifestPath, JSON.stringify(updatedManifest, null, 2));
-                    }
-                }
-            }
-        }
-        catch (error) {
-            logger.warn('Failed to check dev app status, proceeding with provided appId', { error: (0, tool_helpers_1.extractErrorMessage)(error) });
+            return {
+                content: [{
+                        type: "text",
+                        text: `❌ **Manifest Not Found**\n\nNo \`public/manifest.json\` found in \`${projectDir}\`.\n\nEnsure \`public/manifest.json\` exists.`,
+                    }],
+            };
         }
-        // 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')));
+        let manifest;
         try {
-            execSync('npm run build', { cwd: projectDir, stdio: 'pipe', timeout: 120000 });
+            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('Build failed', { error: errorMessage });
             return {
-                content: [{ type: "text", text: `❌ **Build Failed**\n\n\`\`\`\n${errorMessage}\n\`\`\`` }],
+                content: [{
+                        type: "text",
+                        text: `❌ **Invalid manifest.json**\n\nFailed to parse \`public/manifest.json\`: ${errorMessage}`,
+                    }],
             };
         }
-        // Step 2: Verify dist/ exists
-        const distPath = path.join(projectDir, 'dist');
-        if (!fs.existsSync(distPath)) {
+        // Validate version fields
+        if (!manifest.version || manifest.version.trim() === '') {
             return {
-                content: [{ type: "text", text: `❌ **dist/ directory not found after build at ${distPath}**` }],
+                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\`\`\``,
+                    }],
             };
         }
-        // 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);
+        if (!manifest.versionDescription || manifest.versionDescription.trim() === '') {
+            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\`\`\``,
+                    }],
+            };
         }
-        catch (error) {
-            const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
+        const workspaceId = (0, tool_helpers_1.getResolvedWorkspaceId)({}, context);
+        if (!workspaceId) {
+            return {
+                content: [{ type: "text", text: `❌ **No workspace** — workspace cache not available.` }],
+            };
+        }
+        // Use session key — the CLI publish script passes it as hlrkey header
+        const authKey = context.client.sessionKey || context.apiKey;
+        if (!authKey) {
             return {
-                content: [{ type: "text", text: `❌ **Failed to copy manifest.json to dist/:** ${errorMessage}` }],
+                content: [{ type: "text", text: `❌ **No auth key** — cannot authenticate with publish CLI.` }],
             };
         }
-        // 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);
+        const isFirstPublish = !manifest.appId;
+        // Derive human-readable app name from directory (e.g., "upcoming-matches" → "Upcoming Matches")
+        const appName = manifest.name || path.basename(projectDir).split(/[-_]+/).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(' ');
+        const targetId = args.targetId || manifest.targetId;
+        let publishCmd;
+        if (isFirstPublish) {
+            publishCmd = `npm run publish-production -- --create --app-name "${appName}" --workspace ${workspaceId} --user-api-key ${authKey} --force`;
+            if (targetId)
+                publishCmd += ' --market';
+        }
+        else {
+            publishCmd = `npm run publish-production -- --user-api-key ${authKey} --force`;
+            if (targetId)
+                publishCmd += ' --market';
+        }
+        logger.debug('Publishing app via CLI', { isFirstPublish, appName, workspaceId });
         try {
-            await tar.create({ gzip: true, file: tgzPath, cwd: projectDir, prefix: 'package' }, ['dist', 'package.json']);
+            await execAsync(publishCmd, { cwd: projectDir, timeout: 120_000 });
         }
         catch (error) {
             const errorMessage = (0, tool_helpers_1.extractErrorMessage)(error);
+            if (!request_logger_1.RequestLogger.getCurrent())
+                logger.error('Publish CLI failed', { error: errorMessage });
             return {
-                content: [{ type: "text", text: `❌ **Failed to create .tgz archive:** ${errorMessage}` }],
+                content: [{ type: "text", text: `❌ **Publish Failed**\n\n\`\`\`\n${errorMessage}\n\`\`\`` }],
             };
         }
-        // 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')));
+        // Re-read manifest to get appId written by CLI on first publish
+        let publishedAppId = manifest.appId;
         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({
-                            statusCode: res.statusCode || 500,
-                            body: Buffer.concat(chunks).toString('utf-8'),
-                        });
-                    });
-                });
-                req.on('error', reject);
-                formData.pipe(req);
-            });
-            // 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', { status: uploadResponse.statusCode });
-                return {
-                    content: [{
-                            type: "text",
-                            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`,
-                        }],
-                };
-            }
-            let result;
-            try {
-                result = JSON.parse(uploadResponse.body);
-            }
-            catch {
-                result = { raw: uploadResponse.body };
-            }
-            logger.debug('App published successfully', { appId, appName });
-            // 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`;
-            }
-            if (result.manifest) {
-                responseText += `\n**Manifest:**\n\`\`\`json\n${JSON.stringify(result.manifest, null, 2)}\n\`\`\`\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`;
+            const updatedManifest = JSON.parse(fs.readFileSync(manifestPath, 'utf-8'));
+            publishedAppId = updatedManifest.appId || publishedAppId;
+        }
+        catch { /* use existing */ }
+        // Post-first-publish: icon + name/description update and workspace share (parallel)
+        if (isFirstPublish && publishedAppId) {
+            const iconAndUpdate = async () => {
+                const imageId = await uploadAppIcon(appName, context);
+                const updateData = { name: appName };
+                if (manifest.versionDescription)
+                    updateData.description = manifest.versionDescription;
+                if (imageId)
+                    updateData.image = imageId;
+                await context.hailer.request('v3.app.update', [publishedAppId, updateData]);
+                logger.debug('App updated with icon/name/description', { publishedAppId, imageId });
+            };
+            const share = async () => {
+                await context.hailer.request('v3.app.member.add', [publishedAppId, `network_${workspaceId}`]);
+                logger.debug('App shared with workspace', { publishedAppId, workspaceId });
+            };
+            await Promise.allSettled([iconAndUpdate(), share()]);
+        }
+        const productionUrl = publishedAppId ? `https://apps.hailer.com/${workspaceId}/${publishedAppId}/` : undefined;
+        let responseText = `✅ **App Published Successfully!**\n\n`;
+        if (isFirstPublish)
+            responseText += `🆕 **First publish** — app created in Hailer, shared with workspace\n\n`;
+        responseText += `**App Name:** ${appName}\n`;
+        if (publishedAppId)
+            responseText += `**App ID:** \`${publishedAppId}\`\n`;
+        responseText += `**Version:** ${manifest.version}\n`;
+        responseText += `**Description:** ${manifest.versionDescription}\n`;
+        if (productionUrl)
+            responseText += `**URL:** ${productionUrl}\n`;
+        if (targetId)
+            responseText += `**Marketplace Target:** ${targetId}\n`;
+        responseText += `\n## Next Steps\n\n`;
+        responseText += `1. **Open published app in Hailer** to verify\n`;
+        if (publishedAppId) {
+            responseText += `2. **Share with specific users** - use \`add_app_member\` tool:\n`;
             responseText += `   \`\`\`javascript\n`;
             responseText += `   add_app_member({\n`;
-            responseText += `     appId: "${appId}",\n`;
+            responseText += `     appId: "${publishedAppId}",\n`;
             responseText += `     member: "network_${workspaceId}" // or team_*, user_*\n`;
             responseText += `   })\n`;
             responseText += `   \`\`\`\n`;
-            return {
-                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: `❌ **Upload Failed**\n\n**Error:** ${errorMessage}\n\n**Common Issues:**\n- Network connectivity issues\n- Invalid API key\n- Hailer API unavailable`,
-                    }],
-            };
         }
+        return {
+            content: [{ type: "text", text: responseText }],
+        };
     }
 };
 /** All app scaffold tools */