fix(core): cnw sends correct selectedRepositoryName; prints instructions when user Ctrl+C (#33699)

jaysoo · claude · web-flow · commit aba0eb280d4d · 2025-12-04T14:27:49.000-05:00
This PR adds `SIGINT` handling when user kills the process via `Ctrl+C`
during CNW. This only prints when the workspace setup is complete, and
we also print the Cloud onboarding URL if it has been set up.

Also fixes an issue where `selectedRepositoryName` is never sent during
CNW.

---------

Co-authored-by: Claude &lt;noreply@anthropic.com&gt;
diff --git a/packages/create-nx-workspace/bin/create-nx-workspace.ts b/packages/create-nx-workspace/bin/create-nx-workspace.ts
@@ -6,7 +6,10 @@ import {
   CreateWorkspaceOptions,
   supportedAgents,
 } from '../src/create-workspace-options';
-import { createWorkspace } from '../src/create-workspace';
+import {
+  createWorkspace,
+  getInterruptedWorkspaceState,
+} from '../src/create-workspace';
 import { isKnownPreset, Preset } from '../src/utils/preset/preset';
 import { CLIErrorMessageConfig, output } from '../src/utils/output';
 import { nxVersion } from '../src/utils/nx/nx-version';
@@ -271,6 +274,29 @@ process.on('uncaughtException', (error: unknown) => {
   throw error;
 });
 
+// Handle Ctrl+C gracefully - show helpful message if workspace was already created
+process.on('SIGINT', () => {
+  const { directory, connectUrl } = getInterruptedWorkspaceState();
+
+  if (directory) {
+    console.log(''); // New line after ^C
+    output.log({
+      title: 'Workspace creation interrupted',
+      bodyLines: [
+        `Your workspace was created at: ${directory}`,
+        '',
+        'To complete the setup:',
+        '  1. Ensure your repo is pushed (e.g. https://github.com/new)',
+        connectUrl
+          ? `  2. Connect to Nx Cloud: ${connectUrl}`
+          : '  2. Connect to Nx Cloud: Run "nx connect"',
+      ],
+    });
+  }
+
+  process.exit(130); // Standard exit code for SIGINT
+});
+
 let rawArgs: Arguments;
 async function main(parsedArgs: yargs.Arguments<Arguments>) {
   output.log({
diff --git a/packages/create-nx-workspace/src/create-workspace.ts b/packages/create-nx-workspace/src/create-workspace.ts
@@ -23,6 +23,17 @@ import { Preset } from './utils/preset/preset';
 import { cloneTemplate } from './utils/template/clone-template';
 import { execAndWait } from './utils/child-process-utils';
 
+// State for SIGINT handler - only set after workspace is fully installed
+let workspaceDirectory: string | undefined;
+let cloudConnectUrl: string | undefined;
+
+export function getInterruptedWorkspaceState(): {
+  directory: string | undefined;
+  connectUrl: string | undefined;
+} {
+  return { directory: workspaceDirectory, connectUrl: cloudConnectUrl };
+}
+
 export async function createWorkspace<T extends CreateWorkspaceOptions>(
   preset: string,
   options: T,
@@ -67,6 +78,9 @@ export async function createWorkspace<T extends CreateWorkspaceOptions>(
       // Install dependencies (template flow always uses npm)
       await execAndWait('npm install --silent --ignore-scripts', directory);
 
+      // Mark workspace as ready for SIGINT handler
+      workspaceDirectory = directory;
+
       workspaceSetupSpinner.succeed(
         `Successfully created the workspace: ${directory}`
       );
@@ -95,6 +109,9 @@ export async function createWorkspace<T extends CreateWorkspaceOptions>(
       workspaceGlobs,
     });
 
+    // Mark workspace as ready for SIGINT handler
+    workspaceDirectory = directory;
+
     // If the preset is a third-party preset, we need to call createPreset to install it
     // For first-party presets, it will be created by createEmptyWorkspace instead.
     // In createEmptyWorkspace, it will call `nx new` -> `@nx/workspace newGenerator` -> `@nx/workspace generatePreset`.
@@ -111,29 +128,16 @@ export async function createWorkspace<T extends CreateWorkspaceOptions>(
 
   const isTemplate = !!options.template;
 
-  let connectUrl: string | undefined;
-  let nxCloudInfo: string | undefined;
-  if (nxCloud !== 'skip') {
-    const token = readNxCloudToken(directory) as string;
-
-    // Only generate CI for preset flow (not template)
-    if (!isTemplate && nxCloud !== 'yes') {
-      await setupCI(directory, nxCloud, packageManager);
-    }
-
-    connectUrl = await createNxCloudOnboardingUrl(
-      nxCloud,
-      token,
-      directory,
-      useGitHub
-    );
+  // Only generate CI for preset flow (not template)
+  if (nxCloud !== 'skip' && !isTemplate && nxCloud !== 'yes') {
+    await setupCI(directory, nxCloud, packageManager);
   }
 
   let pushedToVcs = VcsPushStatus.SkippedGit;
 
   if (!skipGit) {
     try {
-      await initializeGitRepo(directory, { defaultBase, commit, connectUrl });
+      await initializeGitRepo(directory, { defaultBase, commit });
 
       // Push to GitHub if commit was made, GitHub push is not skipped, and:
       // - CI provider is GitHub (preset flow), OR
@@ -162,7 +166,22 @@ export async function createWorkspace<T extends CreateWorkspaceOptions>(
     }
   }
 
-  if (connectUrl) {
+  // Create onboarding URL AFTER git operations so getVcsRemoteInfo() can detect the repo
+  let connectUrl: string | undefined;
+  let nxCloudInfo: string | undefined;
+  if (nxCloud !== 'skip') {
+    const token = readNxCloudToken(directory) as string;
+
+    connectUrl = await createNxCloudOnboardingUrl(
+      nxCloud,
+      token,
+      directory,
+      useGitHub
+    );
+
+    // Store for SIGINT handler
+    cloudConnectUrl = connectUrl;
+
     nxCloudInfo = await getNxCloudInfo(
       connectUrl,
       pushedToVcs,
diff --git a/packages/create-nx-workspace/src/utils/nx/nx-cloud.ts b/packages/create-nx-workspace/src/utils/nx/nx-cloud.ts
@@ -109,7 +109,8 @@ export async function createNxCloudOnboardingUrl(
     meta,
     false,
     useGitHub ??
-      (nxCloud === 'yes' || nxCloud === 'github' || nxCloud === 'circleci')
+      (nxCloud === 'yes' || nxCloud === 'github' || nxCloud === 'circleci'),
+    directory
   );
 }
 
diff --git a/packages/nx/src/nx-cloud/utilities/url-shorten.ts b/packages/nx/src/nx-cloud/utilities/url-shorten.ts
@@ -10,9 +10,10 @@ export async function createNxCloudOnboardingURL(
   accessToken?: string,
   meta?: string,
   forceManual = false,
-  forceGithub = false
+  forceGithub = false,
+  directory?: string
 ) {
-  const remoteInfo = getVcsRemoteInfo();
+  const remoteInfo = getVcsRemoteInfo(directory);
   const apiUrl = getCloudUrl();
 
   const installationSupportsGitHub = await getInstallationSupportsGitHub(
diff --git a/packages/nx/src/utils/git-utils.ts b/packages/nx/src/utils/git-utils.ts
@@ -289,11 +289,12 @@ export function parseVcsRemoteUrl(url: string): VcsRemoteInfo | null {
   return null;
 }
 
-export function getVcsRemoteInfo(): VcsRemoteInfo | null {
+export function getVcsRemoteInfo(directory?: string): VcsRemoteInfo | null {
   try {
     const gitRemote = execSync('git remote -v', {
       stdio: 'pipe',
       windowsHide: false,
+      cwd: directory,
     })
       .toString()
       .trim();

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,8 @@ export async function createNxCloudOnboardingUrl(`
`109`	`109`	`meta,`
`110`	`110`	`false,`
`111`	`111`	`useGitHub ??`
`112`		`- (nxCloud === 'yes' \|\| nxCloud === 'github' \|\| nxCloud === 'circleci')`
	`112`	`+ (nxCloud === 'yes' \|\| nxCloud === 'github' \|\| nxCloud === 'circleci'),`
	`113`	`+ directory`
`113`	`114`	`);`
`114`	`115`	`}`
`115`	`116`