merge: resolve conflict with main in ci.yml

Author: betegon

.github/workflows/ci.yml

@@ -7,6 +7,7 @@ on:
       - 'src/**'
       - 'test/**'
       - 'script/**'
+      - 'patches/**'
       - 'package.json'
       - 'bun.lock'
       - '.github/workflows/ci.yml'
@@ -15,6 +16,7 @@ on:
       - 'src/**'
       - 'test/**'
       - 'script/**'
+      - 'patches/**'
       - 'package.json'
       - 'bun.lock'
       - '.github/workflows/ci.yml'
@@ -41,8 +43,8 @@ jobs:
       - run: bun run lint
       - run: bun run typecheck
 
-  test:
-    name: Test
+  test-unit:
+    name: Unit Tests
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -58,12 +60,8 @@ jobs:
           key: node-modules-${{ hashFiles('bun.lock') }}
       - if: steps.cache.outputs.cache-hit != 'true'
         run: bun install --frozen-lockfile
-      - name: Test
-        env:
-          SENTRY_TEST_AUTH_TOKEN: ${{ secrets.SENTRY_TEST_AUTH_TOKEN }}
-          SENTRY_TEST_ORG: ${{ secrets.SENTRY_TEST_ORG }}
-          SENTRY_TEST_PROJECT: ${{ secrets.SENTRY_TEST_PROJECT }}
-        run: bun test --coverage --coverage-reporter=lcov
+      - name: Unit Tests
+        run: bun run test:unit --coverage --coverage-reporter=lcov
       - name: Upload Coverage
         uses: getsentry/codecov-action@main
         with:
@@ -72,7 +70,7 @@ jobs:
 
   build-binary:
     name: Build Binary (${{ matrix.target }})
-    needs: [lint, test]
+    needs: [lint, test-unit]
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -124,9 +122,35 @@ jobs:
           name: sentry-${{ matrix.target }}
           path: dist-bin/sentry-*
 
+  test-e2e:
+    name: E2E Tests
+    needs: [build-binary]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: oven-sh/setup-bun@v2
+      - uses: actions/cache@v4
+        id: cache
+        with:
+          path: node_modules
+          key: node-modules-${{ hashFiles('bun.lock') }}
+      - if: steps.cache.outputs.cache-hit != 'true'
+        run: bun install --frozen-lockfile
+      - name: Download Linux binary
+        uses: actions/download-artifact@v4
+        with:
+          name: sentry-linux-x64
+          path: dist-bin
+      - name: Make binary executable
+        run: chmod +x dist-bin/sentry-linux-x64
+      - name: E2E Tests
+        env:
+          SENTRY_CLI_BINARY: ${{ github.workspace }}/dist-bin/sentry-linux-x64
+        run: bun run test:e2e
+
   build-npm:
     name: Build npm Package (Node ${{ matrix.node }})
-    needs: [lint, test]
+    needs: [lint, test-unit]
     runs-on: ubuntu-latest
     environment: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && 'production' || '' }}
     strategy:
@@ -163,7 +187,7 @@ jobs:
 
   build-docs:
     name: Build Docs
-    needs: [lint, test]
+    needs: [lint, test-unit]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -185,7 +209,7 @@ jobs:
 
   merge-artifacts:
     name: Merge Artifacts
-    needs: [build-binary, build-npm, build-docs]
+    needs: [build-binary, build-npm, build-docs, test-e2e]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v4

.gitignore

@@ -14,6 +14,9 @@ dist-bin
 coverage
 *.lcov
 
+# test artifacts
+.test-tmp
+
 # logs
 logs
 _.log

bun.lock

@@ -18,6 +18,7 @@
     "lint": "bunx ultracite check",
     "lint:fix": "bunx ultracite fix",
     "test": "bun test",
+    "test:unit": "bun test test/lib test/commands test/types",
     "test:e2e": "bun test test/e2e"
   },
   "devDependencies": {
@@ -48,6 +49,7 @@
   },
   "packageManager": "bun@1.3.3",
   "patchedDependencies": {
-    "@stricli/core@1.2.5": "patches/@stricli%2Fcore@1.2.5.patch"
+    "@stricli/core@1.2.5": "patches/@stricli%2Fcore@1.2.5.patch",
+    "@sentry/core@10.36.0": "patches/@sentry%2Fcore@10.36.0.patch"
   }
 }

package.json

@@ -0,0 +1,70 @@
+diff --git a/build/esm/client.js b/build/esm/client.js
+index 1111111111111111111111111111111111111111..2222222222222222222222222222222222222222 100644
+--- a/build/esm/client.js
++++ b/build/esm/client.js
+@@ -643,11 +643,16 @@ class Client {
+    * `false` otherwise
+    */
+    async _isClientDoneProcessing(timeout) {
++    // Check immediately first - no need to wait if nothing is processing
++    if (!this._numProcessing) {
++      return true;
++    }
++
+     let ticked = 0;
+ 
+     // if no timeout is provided, we wait "forever" until everything is processed
+     while (!timeout || ticked < timeout) {
+-      await new Promise(resolve => setTimeout(resolve, 1));
++      await new Promise(resolve => { const t = setTimeout(resolve, 1); if (typeof t !== 'number' && t.unref) t.unref(); });
+ 
+       if (!this._numProcessing) {
+         return true;
+diff --git a/build/cjs/client.js b/build/cjs/client.js
+index 3333333333333333333333333333333333333333..4444444444444444444444444444444444444444 100644
+--- a/build/cjs/client.js
++++ b/build/cjs/client.js
+@@ -645,11 +645,16 @@ class Client {
+    * `false` otherwise
+    */
+    async _isClientDoneProcessing(timeout) {
++    // Check immediately first - no need to wait if nothing is processing
++    if (!this._numProcessing) {
++      return true;
++    }
++
+     let ticked = 0;
+ 
+     // if no timeout is provided, we wait "forever" until everything is processed
+     while (!timeout || ticked < timeout) {
+-      await new Promise(resolve => setTimeout(resolve, 1));
++      await new Promise(resolve => { const t = setTimeout(resolve, 1); if (typeof t !== 'number' && t.unref) t.unref(); });
+ 
+       if (!this._numProcessing) {
+         return true;
+diff --git a/build/esm/utils/promisebuffer.js b/build/esm/utils/promisebuffer.js
+index 5555555555555555555555555555555555555555..6666666666666666666666666666666666666666 100644
+--- a/build/esm/utils/promisebuffer.js
++++ b/build/esm/utils/promisebuffer.js
+@@ -69,7 +69,7 @@ function makePromiseBuffer(limit = 100) {
+       return drainPromise;
+     }
+ 
+-    const promises = [drainPromise, new Promise(resolve => setTimeout(() => resolve(false), timeout))];
++    const promises = [drainPromise, new Promise(resolve => { const t = setTimeout(() => resolve(false), timeout); if (typeof t !== 'number' && t.unref) t.unref(); })];
+ 
+     // Promise.race will resolve to the first promise that resolves or rejects
+     // So if the drainPromise resolves, the timeout promise will be ignored
+diff --git a/build/cjs/utils/promisebuffer.js b/build/cjs/utils/promisebuffer.js
+index 7777777777777777777777777777777777777777..8888888888888888888888888888888888888888 100644
+--- a/build/cjs/utils/promisebuffer.js
++++ b/build/cjs/utils/promisebuffer.js
+@@ -71,7 +71,7 @@ function makePromiseBuffer(limit = 100) {
+       return drainPromise;
+     }
+ 
+-    const promises = [drainPromise, new Promise(resolve => setTimeout(() => resolve(false), timeout))];
++    const promises = [drainPromise, new Promise(resolve => { const t = setTimeout(() => resolve(false), timeout); if (typeof t !== 'number' && t.unref) t.unref(); })];
+ 
+     // Promise.race will resolve to the first promise that resolves or rejects
+     // So if the drainPromise resolves, the timeout promise will be ignored

patches/@sentry%2Fcore@10.36.0.patch

@@ -11,19 +11,25 @@ import {
   triggerRootCauseAnalysis,
 } from "../../lib/api-client.js";
 import { ApiError } from "../../lib/errors.js";
-import { writeJson } from "../../lib/formatters/index.js";
+import { writeFooter, writeJson } from "../../lib/formatters/index.js";
 import {
   formatAutofixError,
   formatRootCauseList,
 } from "../../lib/formatters/seer.js";
 import { extractRootCauses } from "../../types/seer.js";
-import { pollAutofixState, resolveOrgAndIssueId } from "./utils.js";
+import {
+  buildCommandHint,
+  type IssueIdFlags,
+  issueIdFlags,
+  issueIdPositional,
+  pollAutofixState,
+  resolveOrgAndIssueId,
+} from "./utils.js";
 
-type ExplainFlags = {
-  readonly org?: string;
+interface ExplainFlags extends IssueIdFlags {
   readonly json: boolean;
   readonly force: boolean;
-};
+}
 
 export const explainCommand = buildCommand({
   docs: {
@@ -39,27 +45,14 @@ export const explainCommand = buildCommand({
       "Examples:\n" +
       "  sentry issue explain 123456789\n" +
       "  sentry issue explain MYPROJECT-ABC --org my-org\n" +
+      "  sentry issue explain G --org my-org --project my-project\n" +
       "  sentry issue explain 123456789 --json\n" +
       "  sentry issue explain 123456789 --force",
   },
   parameters: {
-    positional: {
-      kind: "tuple",
-      parameters: [
-        {
-          brief: "Issue ID or short ID (e.g., MYPROJECT-ABC or 123456789)",
-          parse: String,
-        },
-      ],
-    },
+    positional: issueIdPositional,
     flags: {
-      org: {
-        kind: "parsed",
-        parse: String,
-        brief:
-          "Organization slug (required for short IDs if not auto-detected)",
-        optional: true,
-      },
+      ...issueIdFlags,
       json: {
         kind: "boolean",
         brief: "Output as JSON",
@@ -81,12 +74,13 @@ export const explainCommand = buildCommand({
 
     try {
       // Resolve org and issue ID
-      const { org, issueId: numericId } = await resolveOrgAndIssueId(
+      const { org, issueId: numericId } = await resolveOrgAndIssueId({
         issueId,
-        flags.org,
+        org: flags.org,
+        project: flags.project,
         cwd,
-        `sentry issue explain ${issueId} --org <org-slug>`
-      );
+        commandHint: buildCommandHint("explain", issueId),
+      });
 
       // 1. Check for existing analysis (skip if --force)
       let state = flags.force ? null : await getAutofixState(org, numericId);
@@ -135,8 +129,12 @@ export const explainCommand = buildCommand({
       }
 
       // Human-readable output
-      const lines = formatRootCauseList(causes, issueId);
+      const lines = formatRootCauseList(causes);
       stdout.write(`${lines.join("\n")}\n`);
+      writeFooter(
+        stdout,
+        `To create a plan, run: sentry issue plan ${issueId}`
+      );
     } catch (error) {
       // Handle API errors with friendly messages
       if (error instanceof ApiError) {

src/commands/issue/explain.ts

@@ -24,13 +24,19 @@ import {
   extractSolution,
   type RootCause,
 } from "../../types/seer.js";
-import { pollAutofixState, resolveOrgAndIssueId } from "./utils.js";
+import {
+  buildCommandHint,
+  type IssueIdFlags,
+  issueIdFlags,
+  issueIdPositional,
+  pollAutofixState,
+  resolveOrgAndIssueId,
+} from "./utils.js";
 
-type PlanFlags = {
-  readonly org?: string;
+interface PlanFlags extends IssueIdFlags {
   readonly cause?: number;
   readonly json: boolean;
-};
+}
 
 /**
  * Validate that an autofix run exists and has completed root cause analysis.
@@ -140,26 +146,13 @@ export const planCommand = buildCommand({
       "  - Code mappings set up for your project\n\n" +
       "Examples:\n" +
       "  sentry issue plan 123456789 --cause 0\n" +
-      "  sentry issue plan MYPROJECT-ABC --org my-org --cause 1",
+      "  sentry issue plan MYPROJECT-ABC --org my-org --cause 1\n" +
+      "  sentry issue plan G --org my-org --project my-project --cause 0",
   },
   parameters: {
-    positional: {
-      kind: "tuple",
-      parameters: [
-        {
-          brief: "Issue ID or short ID (e.g., MYPROJECT-ABC or 123456789)",
-          parse: String,
-        },
-      ],
-    },
+    positional: issueIdPositional,
     flags: {
-      org: {
-        kind: "parsed",
-        parse: String,
-        brief:
-          "Organization slug (required for short IDs if not auto-detected)",
-        optional: true,
-      },
+      ...issueIdFlags,
       cause: {
         kind: "parsed",
         parse: numberParser,
@@ -182,12 +175,13 @@ export const planCommand = buildCommand({
 
     try {
       // Resolve org and issue ID
-      const { org, issueId: numericId } = await resolveOrgAndIssueId(
+      const { org, issueId: numericId } = await resolveOrgAndIssueId({
         issueId,
-        flags.org,
+        org: flags.org,
+        project: flags.project,
         cwd,
-        `sentry issue plan ${issueId} --org <org-slug>`
-      );
+        commandHint: buildCommandHint("plan", issueId),
+      });
 
       // Get current autofix state
       const currentState = await getAutofixState(org, numericId);