Sync from internal - version 8.1.0 (#1588)

Author: brandenrodgers

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,76 @@
+name: Bug Report
+description: Report a problem with the HubSpot CLI
+labels: ['bug']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to report a bug. Please fill out the information below so we can investigate.
+
+  - type: input
+    id: cli-version
+    attributes:
+      label: CLI Version
+      description: 'Which version of the HubSpot CLI are you using? (Run `hs --version` to find out)'
+      placeholder: '6.2.0'
+    validations:
+      required: true
+
+  - type: input
+    id: node-version
+    attributes:
+      label: Node.js Version
+      description: 'Which version of Node.js are you running? (Run `node --version` to find out)'
+      placeholder: '20.11.0'
+    validations:
+      required: true
+
+  - type: input
+    id: os
+    attributes:
+      label: Operating System
+      description: 'Which OS are you on?'
+      placeholder: 'macOS 15.3, Windows 11, Ubuntu 24.04, etc.'
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A clear description of the bug.
+      placeholder: 'Describe what went wrong.'
+    validations:
+      required: true
+
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to Reproduce
+      description: How can we reproduce this issue?
+      placeholder: |
+        1. Run `hs ...`
+        2. ...
+        3. See error
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected Behavior
+      description: What did you expect to happen?
+    validations:
+      required: true
+
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: If applicable, add screenshots to help explain the problem.
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Context
+      description: Any other context, error messages, or relevant log output.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,37 @@
+name: Feature Request
+description: Suggest an enhancement or new capability
+labels: ['enhancement']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for suggesting a feature! Please describe your idea so we can evaluate it.
+
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem or Motivation
+      description: What problem does this feature solve, or what workflow does it improve?
+      placeholder: "I'm always frustrated when..."
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: Proposed Solution
+      description: How would you like this to work?
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Alternatives Considered
+      description: Have you considered any workarounds or alternative approaches?
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Context
+      description: Any other context or screenshots.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -43,6 +43,7 @@ import mcpCommand from '../commands/mcp.js';
 import upgradeCommand from '../commands/upgrade.js';
 import { uiLogger } from '../lib/ui/logger.js';
 import { initializeSpinniesManager } from '../lib/middleware/spinniesMiddleware.js';
+import { addCommandSuggestions } from '../lib/commandSuggestion.js';
 
 function getTerminalWidth(): number {
   const width = yargs().terminalWidth();
@@ -131,23 +132,27 @@ const argv = yargs(process.argv.slice(2))
   .command(completionCommand)
   .command(doctorCommand)
   .command(mcpCommand)
-  .command(upgradeCommand)
+  .command(upgradeCommand);
 
+const argvWithSuggestions = addCommandSuggestions(argv)
   .help()
   .alias('h', 'help')
   .recommendCommands()
   .demandCommand(1, '')
   .wrap(getTerminalWidth())
   .strict().argv;
 
-if ('help' in argv && argv.help !== undefined) {
+if ('help' in argvWithSuggestions && argvWithSuggestions.help !== undefined) {
   (async () => {
-    await trackHelpUsage(getCommandName(argv));
+    await trackHelpUsage(getCommandName(argvWithSuggestions));
   })();
 }
 
-if ('convertFields' in argv && argv.convertFields !== undefined) {
+if (
+  'convertFields' in argvWithSuggestions &&
+  argvWithSuggestions.convertFields !== undefined
+) {
   (async () => {
-    await trackConvertFieldsUsage(getCommandName(argv));
+    await trackConvertFieldsUsage(getCommandName(argvWithSuggestions));
   })();
 }

bin/cli.ts

@@ -17,6 +17,8 @@ import {
 import { GET_STARTED_OPTIONS } from '../../lib/constants.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import open from 'open';
+import { renderInteractive } from '../../ui/render.js';
+import { getGetStartedFlow } from '../../ui/components/getStarted/GetStartedFlow.js';
 
 vi.mock('../../lib/prompts/promptUtils');
 vi.mock('../../lib/prompts/projectNameAndDestPrompt');
@@ -25,6 +27,8 @@ vi.mock('../../lib/errorHandlers');
 vi.mock('@hubspot/local-dev-lib/github');
 vi.mock('../../lib/dependencyManagement');
 vi.mock('@hubspot/local-dev-lib/config');
+vi.mock('../../ui/render');
+vi.mock('../../ui/components/getStarted/GetStartedFlow');
 
 vi.mock('open');
 vi.mock('fs-extra', () => ({
@@ -150,6 +154,21 @@ describe('commands/get-started', () => {
           { url: true }
         );
       });
+
+      it('should use Ink flow when v2 flag is enabled', async () => {
+        (
+          getGetStartedFlow as MockedFunction<typeof getGetStartedFlow>
+        ).mockImplementation(() => null);
+        (
+          renderInteractive as MockedFunction<typeof renderInteractive>
+        ).mockResolvedValue(undefined);
+
+        await getStartedCommand.handler({ ...mockArgs, v2: true });
+
+        expect(renderInteractive).toHaveBeenCalled();
+        expect(promptUser).not.toHaveBeenCalled();
+        expect(process.exit).toHaveBeenCalledWith(EXIT_CODES.SUCCESS);
+      });
     });
 
     describe('App flow', () => {

commands/__tests__/getStarted.test.ts

@@ -17,6 +17,9 @@ import validate from '../project/validate.js';
 import profileCommands from '../project/profile.js';
 import list from '../project/list.js';
 import projectCommand from '../project.js';
+import * as projectConfigLib from '../../lib/projects/config.js';
+import * as platformVersionLib from '../../lib/projects/platformVersion.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 
 vi.mock('../project/deploy');
 vi.mock('../project/create');
@@ -41,6 +44,8 @@ vi.mock('../project/installDeps');
 vi.mock('../project/lint');
 vi.mock('../project/profile');
 vi.mock('../../lib/commonOpts');
+vi.mock('../../lib/projects/config.js');
+vi.mock('../../lib/projects/platformVersion.js');
 
 const commandSpy = vi
   .spyOn(yargs as Argv, 'command')
@@ -49,7 +54,21 @@ const demandCommandSpy = vi
   .spyOn(yargs as Argv, 'demandCommand')
   .mockReturnValue(yargs as Argv);
 
+const getProjectConfigSpy = vi.spyOn(projectConfigLib, 'getProjectConfig');
+const isUnsupportedPlatformVersionSpy = vi.spyOn(
+  platformVersionLib,
+  'isUnsupportedPlatformVersion'
+);
+const processExitSpy = vi.spyOn(process, 'exit');
+const uiLoggerErrorSpy = vi.spyOn(uiLogger, 'error');
+
 describe('commands/project', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    // @ts-expect-error Mock implementation
+    processExitSpy.mockImplementation(() => {});
+  });
+
   describe('command', () => {
     it('should have the correct command structure', () => {
       expect(projectCommand.command).toEqual(['project', 'projects']);
@@ -101,4 +120,23 @@ describe('commands/project', () => {
       expect(commandSpy).toHaveBeenCalledWith(module);
     });
   });
+
+  describe('middleware - validatePlatformVersion', () => {
+    it('should have platform version validation functions available', () => {
+      // Verify the necessary functions are available for middleware
+      expect(getProjectConfigSpy).toBeDefined();
+      expect(isUnsupportedPlatformVersionSpy).toBeDefined();
+      expect(uiLoggerErrorSpy).toBeDefined();
+      expect(processExitSpy).toBeDefined();
+    });
+
+    it('should register middleware when building', async () => {
+      // Verify middleware is registered during builder execution
+      await projectCommand.builder(yargs as Argv);
+
+      // The middleware should be registered (we can't easily test async middleware execution)
+      // but we verify the builder completes successfully
+      expect(projectCommand.builder).toBeDefined();
+    });
+  });
 });