refactor

Author: sohail2721

src/actions/portal/quickstart.ts

@@ -166,7 +166,7 @@ export class PortalQuickstartAction {
       // selection aborts quickstart.
       const accountInfo = await this.apiService.getAccountInfo(this.configDir, this.commandMetadata.shell, null);
       if (accountInfo.isErr()) {
-        this.prompts.copilotKeyFetchFailed(accountInfo.error);
+        this.prompts.accountInfoFetchFailed(accountInfo.error);
         return ActionResult.failed();
       }
 

src/actions/portal/serve.ts

@@ -70,11 +70,7 @@ export class PortalServeAction {
 
     const liveReloadPort = await this.networkService.getServerPort([35729, 35730, 35731, 35732]);
     const liveReloadServer = createLiveReloadServer({ port: liveReloadPort });
-
-    // get-port only checks availability; a port can be taken between that check and the
-    // actual bind, so wait for each server to bind and fail cleanly instead of letting an
-    // unhandled "error" event crash the CLI. livereload surfaces its bind error only on
-    // its internal HTTP server (config.server), which isn't part of its public type.
+    // get error if the live reload server fails to start (e.g. EADDRINUSE)
     const liveReloadHttpServer = (liveReloadServer as unknown as { config: { server: Server } }).config.server;
     if ((await this.waitForServerListening(liveReloadHttpServer)).isErr()) {
       this.prompts.serverStartFailed(liveReloadPort);

src/prompts/portal/quickstart.ts

@@ -230,14 +230,14 @@ ${f.link(referenceDocumentationUrl)}`;
     log.error("No API Copilot key was selected.");
   }
 
-  public copilotKeyFetchFailed(serviceError: ServiceError) {
-    log.error(`Failed to fetch your API Copilot key. ${serviceError.errorMessage}`);
+  public accountInfoFetchFailed(serviceError: ServiceError) {
+    log.error(`Failed to fetch your account information. ${serviceError.errorMessage}`);
   }
 
   public copilotEnabled(key: string) {
     const message =
       `API Copilot is enabled with key ${f.var(key)}. ` +
-      `Any existing training data associated with this key will be overwritten when the portal is generated.`;
+      `Any existing AI context associated with this key will be overwritten when the portal is generated.`;
     log.warn(message);
   }
 

src/types/build/build.ts

@@ -90,30 +90,25 @@ const CODEGEN_TEMPLATE_ID_BY_LANGUAGE: Readonly<Record<string, string>> = {
 // languageSettings entry for http must exist or the portal widget fails to render.
 const HTTP_TEMPLATE_ID = "http_curl_v1" as const;
 
-// Deep clone used for copy-on-write transforms. The config is plain JSON, so a JSON
-// round-trip is an exact, dependency-free copy.
-function clone<T>(value: T): T {
-  return JSON.parse(JSON.stringify(value)) as T;
-}
-
 // Immutable per-language portal setting. Build new values via the static factory and
 // the with* transforms; the wrapped data is never mutated after construction.
 export class LanguageSetting {
   private constructor(private readonly data: LanguageSettingData) {}
 
   public static from(data: LanguageSettingData = {}): LanguageSetting {
-    return new LanguageSetting(clone(data));
+    return new LanguageSetting(data);
   }
 
   /** Returns a copy with all AI editor integrations (Cursor/Claude Code/VS Code) enabled. */
   public withAiIntegrationsEnabled(): LanguageSetting {
-    const data = clone(this.data);
-    data.aiIntegration = {
-      cursor: { isEnabled: true },
-      claudeCode: { isEnabled: true },
-      vscode: { isEnabled: true }
-    };
-    return new LanguageSetting(data);
+    return new LanguageSetting({
+      ...this.data,
+      aiIntegration: {
+        cursor: { isEnabled: true },
+        claudeCode: { isEnabled: true },
+        vscode: { isEnabled: true }
+      }
+    });
   }
 
   public toJSON(): LanguageSettingData {
@@ -127,22 +122,19 @@ export class PortalSettings {
   private constructor(private readonly data: PortalSettingsData) {}
 
   public static from(data: PortalSettingsData = {}): PortalSettings {
-    return new PortalSettings(clone(data));
+    return new PortalSettings(data);
   }
 
   /** Returns a copy with the API-call base URL set. */
   public withBaseUrl(baseUrl: UrlPath): PortalSettings {
-    const data = clone(this.data);
-    data.baseUrl = baseUrl.toString();
-    return new PortalSettings(data);
+    return new PortalSettings({ ...this.data, baseUrl: baseUrl.toString() });
   }
 
   // Returns a copy with AI editor integrations enabled for the given SDK languages
   // (friendly ids). Always adds the http entry the portal needs to render and opens the
   // portal on the first SDK language. Languages without a codegen template id are skipped.
   public withAiIntegrations(languages: string[]): PortalSettings {
-    const data = clone(this.data);
-    const languageSettings: { [language: string]: LanguageSettingData } = { ...data.languageSettings };
+    const languageSettings: { [language: string]: LanguageSettingData } = { ...this.data.languageSettings };
     languageSettings[HTTP_TEMPLATE_ID] = languageSettings[HTTP_TEMPLATE_ID] ?? {};
 
     let firstSdkTemplateId: string | undefined;
@@ -155,11 +147,11 @@ export class PortalSettings {
       languageSettings[templateId] = LanguageSetting.from(languageSettings[templateId]).withAiIntegrationsEnabled().toJSON();
     }
 
-    data.languageSettings = languageSettings;
-    if (firstSdkTemplateId) {
-      data.initialPlatform = firstSdkTemplateId;
-    }
-    return new PortalSettings(data);
+    return new PortalSettings({
+      ...this.data,
+      languageSettings,
+      ...(firstSdkTemplateId ? { initialPlatform: firstSdkTemplateId } : {})
+    });
   }
 
   public toJSON(): PortalSettingsData {
@@ -205,30 +197,34 @@ export class BuildConfig {
 
   /** Returns a copy with the portal's languageConfig set from the selected friendly language ids. */
   public withPortalLanguages(languages: string[]): BuildConfig {
-    const data = clone(this.data);
-    data.generatePortal!.languageConfig = getLanguagesConfig(languages);
-    return new BuildConfig(data);
+    const portal = this.data.generatePortal!;
+    return new BuildConfig({
+      ...this.data,
+      generatePortal: { ...portal, languageConfig: getLanguagesConfig(languages) }
+    });
   }
 
   /** Returns a copy with the API Copilot configuration set (or overwritten). */
   public withApiCopilotConfig(config: CopilotConfig): BuildConfig {
-    const data = clone(this.data);
-    data.apiCopilotConfig = { ...config };
-    return new BuildConfig(data);
+    return new BuildConfig({ ...this.data, apiCopilotConfig: { ...config } });
   }
 
   // Returns a copy with API Copilot enabled for a locally-served portal: stores the
   // Copilot config, points the portal base URL at the local serve URL, and turns on AI
   // editor integrations for the configured SDK languages.
   public withApiCopilotForPortal(key: string, welcomeMessage: string, baseUrl: string): BuildConfig {
-    const data = clone(this.data);
-    const portal = data.generatePortal!;
-    data.apiCopilotConfig = { isEnabled: true, key, welcomeMessage };
-    portal.baseUrl = baseUrl;
-    portal.portalSettings = PortalSettings.from(portal.portalSettings)
-      .withAiIntegrations(Object.keys(portal.languageConfig))
-      .toJSON();
-    return new BuildConfig(data);
+    const portal = this.data.generatePortal!;
+    return new BuildConfig({
+      ...this.data,
+      apiCopilotConfig: { isEnabled: true, key, welcomeMessage },
+      generatePortal: {
+        ...portal,
+        baseUrl,
+        portalSettings: PortalSettings.from(portal.portalSettings)
+          .withAiIntegrations(Object.keys(portal.languageConfig))
+          .toJSON()
+      }
+    });
   }
 
   public updateBuildConfigBaseUrl(serveUrl: UrlPath): Result<BuildConfig, "unchanged"> {
@@ -245,29 +241,22 @@ export class BuildConfig {
       return err("unchanged");
     }
 
-    const data = clone(this.data);
-    const portal = data.generatePortal!;
-    if (portal.portalSettings?.baseUrl) {
-      portal.portalSettings = PortalSettings.from(portal.portalSettings).withBaseUrl(serveUrl).toJSON();
-    } else {
-      portal.baseUrl = serveUrl.toString();
-    }
-    return ok(new BuildConfig(data));
+    const portal = this.data.generatePortal!;
+    const updatedPortal: PortalConfig = portal.portalSettings?.baseUrl
+      ? { ...portal, portalSettings: PortalSettings.from(portal.portalSettings).withBaseUrl(serveUrl).toJSON() }
+      : { ...portal, baseUrl: serveUrl.toString() };
+    return ok(new BuildConfig({ ...this.data, generatePortal: updatedPortal }));
   }
 
   // Returns a copy with a recipe workflow added (or replaced, matched by permalink).
   public withRecipeWorkflow(name: string, functionName: string, scriptPath: string): BuildConfig {
-    const data = clone(this.data);
-    const recipes = (data.recipes ??= {});
-    const workflows = (recipes.workflows ??= []);
+    const recipes = this.data.recipes ?? {};
+    const workflows = recipes.workflows ?? [];
     const permalink = `page:recipes/${functionName}`;
     const workflow: RecipeWorkflow = { name, permalink, functionName, scriptPath };
     const existingIndex = workflows.findIndex((w) => w.permalink === permalink);
-    if (existingIndex === -1) {
-      workflows.push(workflow);
-    } else {
-      workflows[existingIndex] = workflow;
-    }
-    return new BuildConfig(data);
+    const updatedWorkflows =
+      existingIndex === -1 ? [...workflows, workflow] : workflows.map((w, index) => (index === existingIndex ? workflow : w));
+    return new BuildConfig({ ...this.data, recipes: { ...recipes, workflows: updatedWorkflows } });
   }
 }