From 2fb52feb592f9aa53e29f88ba7e1cc124d28b163 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Mon, 28 Sep 2026 12:16:21 +0000
Subject: [PATCH] fix(context): stop crashing when the working directory was
 deleted (Sentry CLI-1XG)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

buildContext() called process.cwd() unguarded. When the directory the CLI
was started in has been removed (e.g. an agent's git worktree cleaned up
under it), Node throws ENOENT (uv_cwd) and every command, including
--version, crashed before running.

Fall back to the shell's logical PWD, which still names that directory,
when process.cwd() fails. Lookups under the missing path find nothing, so
commands with explicit targets work and auto-detection fails with the
normal ContextError. Without an absolute PWD the original error is
rethrown unchanged.

Fixes CLI-1XG

Co-authored-by: Miguel Betegón <miguelbetegongarcia@gmail.com>
---
 packages/cli/src/context.ts           | 28 +++++++++++++++-
 packages/cli/test/lib/context.test.ts | 46 +++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 packages/cli/test/lib/context.test.ts

diff --git a/packages/cli/src/context.ts b/packages/cli/src/context.ts
index 651376b5c0..59aaad3ffb 100644
--- a/packages/cli/src/context.ts
+++ b/packages/cli/src/context.ts
@@ -6,11 +6,15 @@
  */
 
 import { homedir } from "node:os";
+import { isAbsolute } from "node:path";
 import type { CommandContext } from "@stricli/core";
 import { getConfigDir } from "./lib/db/index.js";
+import { logger } from "./lib/logger.js";
 import { type Span, setCommandSpanName } from "./lib/telemetry.js";
 import type { Writer } from "./types/index.js";
 
+const log = logger.withTag("context");
+
 export interface SentryContext extends CommandContext {
   readonly process: NodeJS.Process;
   readonly env: NodeJS.ProcessEnv;
@@ -30,6 +34,28 @@ export interface SentryContext extends CommandContext {
   readonly commandPrefix?: readonly string[];
 }
 
+/**
+ * Resolve the working directory, tolerating one that has been deleted.
+ *
+ * `process.cwd()` throws ENOENT (`uv_cwd`) once the directory the CLI was
+ * started in is removed (e.g. an agent's git worktree cleaned up under it).
+ * The shell's logical `PWD` still names that directory, so use it instead:
+ * lookups under the missing path find nothing, and commands that don't need
+ * local files keep working.
+ */
+function resolveCwd(process: NodeJS.Process): string {
+  try {
+    return process.cwd();
+  } catch (error) {
+    const pwd = process.env.PWD;
+    if (!(pwd && isAbsolute(pwd))) {
+      throw error;
+    }
+    log.debug(`Working directory is unavailable, using PWD (${pwd})`, error);
+    return pwd;
+  }
+}
+
 /**
  * Build a dynamic context that uses forCommand to set telemetry tags.
  *
@@ -43,7 +69,7 @@ export function buildContext(process: NodeJS.Process, span?: Span) {
   const baseContext: SentryContext = {
     process,
     env: process.env,
-    cwd: process.cwd(),
+    cwd: resolveCwd(process),
     homeDir: homedir(),
     configDir: getConfigDir(),
     stdout: process.stdout,
diff --git a/packages/cli/test/lib/context.test.ts b/packages/cli/test/lib/context.test.ts
new file mode 100644
index 0000000000..2baf37202d
--- /dev/null
+++ b/packages/cli/test/lib/context.test.ts
@@ -0,0 +1,46 @@
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { buildContext } from "../../src/context.js";
+
+/** Mirrors the error Node throws when the working directory was removed. */
+function deletedCwdError(): NodeJS.ErrnoException {
+  return Object.assign(
+    new Error(
+      "ENOENT: process.cwd failed with error no such file or directory, the current working directory was likely removed without changing the working directory, uv_cwd"
+    ),
+    { code: "ENOENT", errno: -2, syscall: "uv_cwd" }
+  );
+}
+
+afterEach(() => {
+  vi.restoreAllMocks();
+  vi.unstubAllEnvs();
+});
+
+describe("buildContext cwd", () => {
+  test("falls back to PWD when the working directory was deleted", () => {
+    vi.spyOn(process, "cwd").mockImplementation(() => {
+      throw deletedCwdError();
+    });
+    vi.stubEnv("PWD", "/tmp/removed-worktree");
+
+    const context = buildContext(process);
+
+    expect(context.cwd).toBe("/tmp/removed-worktree");
+    expect(context.forCommand({ prefix: ["sentry"] }).cwd).toBe(
+      "/tmp/removed-worktree"
+    );
+  });
+
+  test("rethrows when PWD cannot stand in for the working directory", () => {
+    const error = deletedCwdError();
+    vi.spyOn(process, "cwd").mockImplementation(() => {
+      throw error;
+    });
+
+    vi.stubEnv("PWD", "");
+    expect(() => buildContext(process)).toThrow(error);
+
+    vi.stubEnv("PWD", "relative/dir");
+    expect(() => buildContext(process)).toThrow(error);
+  });
+});