revert: drop merge-fix changes, keep only PR feedback

Keep only the messages change: 'Press Ctrl+C to stop the proxy server'.
Revert ErrorPageRenderer, ProxyServer, and test changes - will address separately.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: deepu-mungamuri94

src/proxy/ProxyServer.ts

@@ -412,8 +412,6 @@ export class ProxyServer extends EventEmitter {
   private initializeProxyHandler(): void {
     const manifest: WebAppManifest = this.config.manifest ?? {
       name: 'webapp',
-      label: 'Web App',
-      version: '1.0.0',
       outputDir: 'dist',
     };
 

src/templates/ErrorPageRenderer.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { getErrorPageTemplate } from '@salesforce/webapp-experimental/proxy';
 import type { DevServerError } from '../config/types.js';
-import { ERROR_PAGE_TEMPLATE } from './error-page-template.js';
 
 export type ErrorPageData = {
   status: string;
@@ -35,7 +35,7 @@ export class ErrorPageRenderer {
   private template: string;
 
   public constructor() {
-    this.template = ERROR_PAGE_TEMPLATE;
+    this.template = getErrorPageTemplate();
   }
 
   /**

test/commands/webapp/dev.test.ts

@@ -29,8 +29,6 @@ describe('webapp:dev command integration', () => {
     it('should have correct WebAppManifest structure', () => {
       const manifest: WebAppManifest = {
         name: 'testWebApp',
-        label: 'Test Web App',
-        version: '1.0.0',
         outputDir: 'dist',
         dev: {
           url: 'http://localhost:5173',
@@ -64,8 +62,6 @@ describe('webapp:dev command integration', () => {
     it('should use manifest dev.url when no explicit URL', () => {
       const manifest: WebAppManifest = {
         name: 'testWebApp',
-        label: 'Test Web App',
-        version: '1.0.0',
         outputDir: 'dist',
         dev: {
           url: 'http://localhost:5173',
@@ -78,8 +74,6 @@ describe('webapp:dev command integration', () => {
     it('should use dev.command when no URL provided', () => {
       const manifest: WebAppManifest = {
         name: 'testWebApp',
-        label: 'Test Web App',
-        version: '1.0.0',
         outputDir: 'dist',
         dev: {
           command: 'npm run dev',
@@ -94,8 +88,6 @@ describe('webapp:dev command integration', () => {
     it('should validate manifest with dev.url', () => {
       const manifest: WebAppManifest = {
         name: 'testWebApp',
-        label: 'Test Web App',
-        version: '1.0.0',
         outputDir: 'dist',
         dev: {
           url: 'http://localhost:5173',
@@ -110,8 +102,6 @@ describe('webapp:dev command integration', () => {
     it('should validate manifest with dev.command', () => {
       const manifest: WebAppManifest = {
         name: 'testWebApp',
-        label: 'Test Web App',
-        version: '1.0.0',
         outputDir: 'dist',
         dev: {
           command: 'npm run dev',

test/config/ManifestWatcher.test.ts

@@ -29,8 +29,6 @@ describe('ManifestWatcher', () => {
 
   const validManifest: WebAppManifest = {
     name: 'testApp',
-    label: 'Test App',
-    version: '1.0.0',
     outputDir: 'dist',
     dev: {
       command: 'npm run dev',

test/config/types.test.ts

@@ -21,8 +21,6 @@ describe('TypeScript Types', () => {
   it('should allow valid WebAppManifest', () => {
     const manifest: WebAppManifest = {
       name: 'testApp',
-      label: 'Test App',
-      version: '1.0.0',
       outputDir: 'dist',
     };
 
@@ -33,8 +31,6 @@ describe('TypeScript Types', () => {
   it('should allow WebAppManifest with dev config', () => {
     const manifest: WebAppManifest = {
       name: 'testApp',
-      label: 'Test App',
-      version: '1.0.0',
       outputDir: 'dist',
       dev: {
         command: 'npm run dev',
@@ -56,8 +52,6 @@ describe('TypeScript Types', () => {
 
     const manifest: WebAppManifest = {
       name: 'testApp',
-      label: 'Test App',
-      version: '1.0.0',
       outputDir: 'dist',
       routing,
     };

test/proxy/ProxyServer.test.ts

@@ -122,8 +122,6 @@ describe('ProxyServer', () => {
         salesforceInstanceUrl: 'https://test.salesforce.com',
         manifest: {
           name: 'test-app',
-          label: 'Test App',
-          version: '1.0.0',
           outputDir: 'dist',
         },
       });
@@ -227,17 +225,13 @@ describe('ProxyServer', () => {
         salesforceInstanceUrl: 'https://test.salesforce.com',
         manifest: {
           name: 'test-app',
-          label: 'Test App',
-          version: '1.0.0',
           outputDir: 'dist',
         },
       });
 
       // Update manifest with routing config
       proxy.updateManifest({
         name: 'test-app',
-        label: 'Test App',
-        version: '1.0.0',
         outputDir: 'dist',
         routing: {
           trailingSlash: 'always',