@promptbook/cli 0.112.0-112 → 0.112.0-113

package/README.md

@@ -561,11 +561,11 @@ npx ts-node ./src/cli/test/ptbk.ts coder generate-boilerplates --template prompt
 
 npx ts-node ./src/cli/test/ptbk.ts coder generate-boilerplates --template prompts/templates/agents-server.md
 
-npx ts-node ./src/cli/test/ptbk.ts coder run --agent github-copilot --model gpt-5.4 --thinking-level xhigh --context AGENTS.md
+npx ts-node ./src/cli/test/ptbk.ts coder run --harness github-copilot --model gpt-5.4 --thinking-level xhigh --context AGENTS.md
 
-npx ts-node ./src/cli/test/ptbk.ts coder run --agent github-copilot --model gpt-5.4 --thinking-level xhigh --context AGENTS.md --auto-push
+npx ts-node ./src/cli/test/ptbk.ts coder run --harness github-copilot --model gpt-5.4 --thinking-level xhigh --context AGENTS.md --auto-push
 
-npx ts-node ./src/cli/test/ptbk.ts coder run --agent github-copilot --model gpt-5.4 --thinking-level xhigh --context AGENTS.md --ignore-git-changes --no-wait
+npx ts-node ./src/cli/test/ptbk.ts coder run --harness github-copilot --model gpt-5.4 --thinking-level xhigh --context AGENTS.md --ignore-git-changes --no-wait
 
 npx ts-node ./src/cli/test/ptbk.ts coder find-refactor-candidates
 
@@ -587,11 +587,11 @@ ptbk coder generate-boilerplates
 
 ptbk coder generate-boilerplates --template prompts/templates/common.md
 
-ptbk coder run --agent github-copilot --model gpt-5.4 --thinking-level xhigh --context AGENTS.md --test npm run test
+ptbk coder run --harness github-copilot --model gpt-5.4 --thinking-level xhigh --context AGENTS.md --test npm run test
 
-ptbk coder run --agent github-copilot --model gpt-5.4 --thinking-level xhigh --context AGENTS.md --auto-push
+ptbk coder run --harness github-copilot --model gpt-5.4 --thinking-level xhigh --context AGENTS.md --auto-push
 
-ptbk coder run --agent github-copilot --model gpt-5.4 --thinking-level xhigh --context AGENTS.md --test npm run test --ignore-git-changes --no-wait
+ptbk coder run --harness github-copilot --model gpt-5.4 --thinking-level xhigh --context AGENTS.md --test npm run test --ignore-git-changes --no-wait
 
 ptbk coder find-refactor-candidates
 
@@ -616,7 +616,7 @@ ptbk coder verify
 
 | Flag                       | Purpose                                                                                            |
 | -------------------------- | -------------------------------------------------------------------------------------------------- |
-| `--agent <name>`           | Selects the coding backend.                                                                        |
+| `--harness <name>`         | Selects the coding harness.                                                                        |
 | `--model <model>`          | Chooses the runner model; required for `openai-codex` and `gemini`, optional for `github-copilot`. |
 | `--context <text-or-file>` | Appends extra instructions inline or from a file like `AGENTS.md`.                                 |
 | `--test <command>`         | Runs a verification command after each prompt attempt and feeds failing output back for retries.   |

package/apps/agents-server/README.md

@@ -9,7 +9,7 @@ The installed CLI can initialize a local Agents Server project before it starts
 ```bash
 npm install ptbk
 ptbk agents-server init
-ptbk agents-server start --agent github-copilot --model gpt-5.4 --thinking-level xhigh
+ptbk agents-server start --harness github-copilot --model gpt-5.4 --thinking-level xhigh
 ```
 
 `ptbk agents-server init` adds missing placeholders to `.env` and local runtime exclusions to `.gitignore` without deleting existing configuration. Use `PTBK_AGENTS_SERVER_DATABASE=supabase` for a Supabase-backed server or `PTBK_AGENTS_SERVER_DATABASE=sqlite` for a standalone local database in `.promptbook`. When using Supabase, fill the initialized values from your project before starting the server. The Supabase project URL and API keys are available in the [Supabase project API settings](https://supabase.com/docs/guides/api/api-keys), and the PostgreSQL connection string is available from the [Supabase database connection guide](https://supabase.com/docs/guides/database/connecting-to-postgres).

package/apps/agents-server/next.config.ts

@@ -1,6 +1,8 @@
+import { withSentryConfig } from '@sentry/nextjs';
 import type { NextConfig } from 'next';
 import { readdirSync } from 'fs';
 import path from 'path';
+import { SENTRY_ORGANIZATION, SENTRY_PROJECT } from './src/utils/errorReporting/sentrySdkConfig';
 
 /**
  * Next.js build output directory.
@@ -20,6 +22,11 @@ const agentsServerNodeModulesPath = process.env.PTBK_AGENTS_SERVER_NODE_MODULES_
  */
 const isNextValidationIgnored = process.env.PTBK_AGENTS_SERVER_IGNORE_NEXT_VALIDATION === 'true';
 
+/**
+ * Whether Sentry source maps can be uploaded during production builds.
+ */
+const IS_SENTRY_SOURCE_MAP_UPLOAD_ENABLED = Boolean(process.env.SENTRY_AUTH_TOKEN);
+
 /**
  * Exact aliases for local generated Promptbook package entrypoints.
  */
@@ -122,7 +129,19 @@ const nextConfig: NextConfig = {
     },
 };
 
-export default nextConfig;
+export default withSentryConfig(nextConfig, {
+    org: SENTRY_ORGANIZATION,
+    project: SENTRY_PROJECT,
+    silent: true,
+    sourcemaps: {
+        disable: !IS_SENTRY_SOURCE_MAP_UPLOAD_ENABLED,
+    },
+    webpack: {
+        treeshake: {
+            removeDebugLogging: true,
+        },
+    },
+});
 
 /**
  * Creates webpack/Turbopack aliases from imports like `@promptbook-local/core` to generated local sources.

package/apps/agents-server/src/app/api/admin/code-runners/route.ts

@@ -52,7 +52,7 @@ export async function PATCH(request: Request) {
         }
 
         await updateVpsEnvironmentVariables({
-            PTBK_AGENT: body.agent || '',
+            PTBK_HARNESS: body.agent || '',
             PTBK_MODEL: body.model || '',
             PTBK_THINKING_LEVEL: body.thinkingLevel || '',
         });

package/apps/agents-server/src/app/api/internal/user-chat-jobs/run/route.ts

@@ -57,7 +57,7 @@ async function handleUserChatJobWorkerRequest(request: Request) {
 
         after(() =>
             triggerUserChatJobWorker({ origin }).catch((error) =>
-                console.error('[user-chat-job] requeue failed', error),
+                console.warn('[user-chat-job] requeue failed', error),
             ),
         );
 

package/apps/agents-server/src/instrumentation-client.ts

@@ -0,0 +1,28 @@
+import * as Sentry from '@sentry/nextjs';
+import {
+    createSentrySdkTags,
+    resolveBrowserSentryDsn,
+    resolveSentrySdkEnvironment,
+    resolveSentrySdkRelease,
+    SENTRY_TRACE_PROPAGATION_TARGETS,
+    SENTRY_TRACES_SAMPLE_RATE,
+} from './utils/errorReporting/sentrySdkConfig';
+
+Sentry.init({
+    dsn: resolveBrowserSentryDsn(),
+    tracesSampleRate: SENTRY_TRACES_SAMPLE_RATE,
+    environment: resolveSentrySdkEnvironment(),
+    release: resolveSentrySdkRelease(),
+    integrations: [Sentry.browserTracingIntegration()],
+    tracePropagationTargets: SENTRY_TRACE_PROPAGATION_TARGETS,
+    initialScope: {
+        tags: createSentrySdkTags(),
+    },
+});
+
+/**
+ * Reports app-router navigation spans to Sentry.
+ *
+ * @private Sentry hook for Next.js client navigation instrumentation
+ */
+export const onRouterTransitionStart = Sentry.captureRouterTransitionStart;

package/apps/agents-server/src/instrumentation.ts

@@ -1,3 +1,5 @@
+import * as Sentry from '@sentry/nextjs';
+
 /**
  * Registers startup hooks for the Agents Server runtime.
  *
@@ -5,11 +7,18 @@
  * @private internal startup hook for Agents Server runtime
  */
 export async function register(): Promise<void> {
+    if (process.env.NEXT_RUNTIME === 'edge') {
+        await import('./sentry.edge.config');
+        return;
+    }
+
     if (process.env.NEXT_RUNTIME !== 'nodejs') {
         return;
     }
 
     try {
+        await import('./sentry.server.config');
+
         const { registerServerErrorSentryLogging } = await import('./utils/errorReporting/registerServerErrorSentryLogging');
         registerServerErrorSentryLogging();
 
@@ -25,3 +34,10 @@ export async function register(): Promise<void> {
         });
     }
 }
+
+/**
+ * Reports request errors from the Next.js app router to Sentry.
+ *
+ * @private Sentry hook for Next.js request instrumentation
+ */
+export const onRequestError = Sentry.captureRequestError;

package/apps/agents-server/src/sentry.edge.config.ts

@@ -0,0 +1,18 @@
+import * as Sentry from '@sentry/nextjs';
+import {
+    createSentrySdkTags,
+    resolveBrowserSentryDsn,
+    resolveSentrySdkEnvironment,
+    resolveSentrySdkRelease,
+    SENTRY_TRACES_SAMPLE_RATE,
+} from './utils/errorReporting/sentrySdkConfig';
+
+Sentry.init({
+    dsn: resolveBrowserSentryDsn(),
+    tracesSampleRate: SENTRY_TRACES_SAMPLE_RATE,
+    environment: resolveSentrySdkEnvironment(),
+    release: resolveSentrySdkRelease(),
+    initialScope: {
+        tags: createSentrySdkTags(),
+    },
+});

package/apps/agents-server/src/sentry.server.config.ts

@@ -0,0 +1,19 @@
+import * as Sentry from '@sentry/nextjs';
+import { createAgentsServerSentryContext } from './utils/errorReporting/agentsServerSentryContext';
+import { resolveServerSentryDsn, SENTRY_TRACES_SAMPLE_RATE } from './utils/errorReporting/sentrySdkConfig';
+
+/**
+ * Shared diagnostic context applied to server-side SDK events at initialization time.
+ */
+const agentsServerSentryContext = createAgentsServerSentryContext();
+
+Sentry.init({
+    dsn: resolveServerSentryDsn(),
+    tracesSampleRate: SENTRY_TRACES_SAMPLE_RATE,
+    environment: agentsServerSentryContext.environment,
+    release: agentsServerSentryContext.release,
+    initialScope: {
+        tags: agentsServerSentryContext.tags,
+        extra: agentsServerSentryContext.extra,
+    },
+});

package/apps/agents-server/src/utils/codeRunnerConfiguration.ts

@@ -37,7 +37,7 @@ export async function readConfiguredCodeRunner(): Promise<ConfiguredCodeRunner>
     >;
 
     return {
-        agent: environmentByKey.PTBK_AGENT || process.env.PTBK_AGENT || 'github-copilot',
+        agent: environmentByKey.PTBK_HARNESS || process.env.PTBK_HARNESS || process.env.PTBK_AGENT || 'github-copilot',
         model: environmentByKey.PTBK_MODEL || process.env.PTBK_MODEL || 'gpt-5.4',
         thinkingLevel: environmentByKey.PTBK_THINKING_LEVEL || process.env.PTBK_THINKING_LEVEL || 'xhigh',
     };

package/apps/agents-server/src/utils/errorReporting/agentsServerSentryContext.ts

@@ -0,0 +1,203 @@
+import { BOOK_LANGUAGE_VERSION, PROMPTBOOK_ENGINE_VERSION } from '../../../../../src/version';
+import {
+    createSentrySdkTags,
+    resolveSentrySdkCommitHash,
+    resolveSentrySdkEnvironment,
+    resolveSentrySdkRelease,
+    resolveSentrySdkRepositoryBranch,
+} from './sentrySdkConfig';
+import type { SentryStorePayload } from './sentryStore';
+
+/**
+ * Shared deployment and runtime context added to every Agents Server Sentry event.
+ */
+type AgentsServerSentryContext = {
+    /**
+     * Sentry release identifier.
+     */
+    readonly release: string;
+
+    /**
+     * Sentry environment identifier.
+     */
+    readonly environment: string;
+
+    /**
+     * Filterable Sentry tags.
+     */
+    readonly tags: Record<string, string>;
+
+    /**
+     * Full non-secret diagnostic context.
+     */
+    readonly extra: Record<string, unknown>;
+};
+
+/**
+ * Adds shared Agents Server release, environment, version, deployment, git, and runtime details.
+ *
+ * @param payload - Event-specific Sentry payload.
+ * @returns Payload enriched with common Agents Server diagnostics.
+ *
+ * @private internal helper for Agents Server Sentry reporting
+ */
+export function enrichSentryStorePayloadWithAgentsServerContext(payload: SentryStorePayload): SentryStorePayload {
+    const context = createAgentsServerSentryContext();
+
+    return {
+        ...payload,
+        release: context.release,
+        environment: context.environment,
+        tags: {
+            ...context.tags,
+            ...payload.tags,
+        },
+        extra: {
+            ...context.extra,
+            ...payload.extra,
+        },
+    };
+}
+
+/**
+ * Creates a current Agents Server diagnostic context matching the admin About page metadata.
+ *
+ * @returns Common Sentry context for one event.
+ *
+ * @private internal helper for Agents Server Sentry reporting
+ */
+export function createAgentsServerSentryContext(): AgentsServerSentryContext {
+    const deploymentEnvironment = resolveSentrySdkEnvironment();
+    const appPackageVersion = normalizeOptionalString(process.env.npm_package_version) ?? PROMPTBOOK_ENGINE_VERSION;
+    const commitHash = resolveSentrySdkCommitHash();
+    const repositoryBranch = resolveSentrySdkRepositoryBranch();
+    const memoryUsage = process.memoryUsage();
+
+    return {
+        release: resolveSentrySdkRelease(),
+        environment: deploymentEnvironment,
+        tags: createSentrySdkTags(),
+        extra: {
+            agentsServer: {
+                versions: {
+                    promptbookEngineVersion: PROMPTBOOK_ENGINE_VERSION,
+                    bookLanguageVersion: BOOK_LANGUAGE_VERSION,
+                    appPackageVersion,
+                    appPackageName: normalizeOptionalString(process.env.npm_package_name),
+                    nextBuildId: normalizeOptionalString(process.env.NEXT_BUILD_ID),
+                    nextDistDirectory: normalizeOptionalString(process.env.NEXT_DIST_DIR),
+                    npmLifecycleEvent: normalizeOptionalString(process.env.npm_lifecycle_event),
+                    npmUserAgent: normalizeOptionalString(process.env.npm_config_user_agent),
+                },
+                deployment: {
+                    environment: deploymentEnvironment,
+                    vercelEnvironment: getFirstNonEmptyString(process.env.NEXT_PUBLIC_VERCEL_ENV, process.env.VERCEL_ENV),
+                    targetEnvironment: getFirstNonEmptyString(
+                        process.env.NEXT_PUBLIC_VERCEL_TARGET_ENV,
+                        process.env.VERCEL_TARGET_ENV,
+                    ),
+                    siteUrl: normalizeOptionalString(process.env.NEXT_PUBLIC_SITE_URL),
+                    vercelUrl: getFirstNonEmptyString(process.env.NEXT_PUBLIC_VERCEL_URL, process.env.VERCEL_URL),
+                    vercelBranchUrl: normalizeOptionalString(process.env.NEXT_PUBLIC_VERCEL_BRANCH_URL),
+                    vercelProductionUrl: normalizeOptionalString(process.env.NEXT_PUBLIC_VERCEL_PROJECT_PRODUCTION_URL),
+                    vercelRegion: normalizeOptionalString(process.env.VERCEL_REGION),
+                    repositoryRef: normalizeOptionalString(process.env.PROMPTBOOK_REPOSITORY_REF),
+                    supabaseTablePrefix: normalizeOptionalString(process.env.SUPABASE_TABLE_PREFIX),
+                    currentWorkingDirectory: process.cwd(),
+                },
+                git: {
+                    provider: getFirstNonEmptyString(
+                        process.env.NEXT_PUBLIC_VERCEL_GIT_PROVIDER,
+                        process.env.VERCEL_GIT_PROVIDER,
+                    ),
+                    repositoryOwner: getFirstNonEmptyString(
+                        process.env.NEXT_PUBLIC_VERCEL_GIT_REPO_OWNER,
+                        process.env.VERCEL_GIT_REPO_OWNER,
+                    ),
+                    repositorySlug: getFirstNonEmptyString(
+                        process.env.NEXT_PUBLIC_VERCEL_GIT_REPO_SLUG,
+                        process.env.VERCEL_GIT_REPO_SLUG,
+                    ),
+                    repositoryId: getFirstNonEmptyString(
+                        process.env.NEXT_PUBLIC_VERCEL_GIT_REPO_ID,
+                        process.env.VERCEL_GIT_REPO_ID,
+                    ),
+                    commitHash,
+                    previousCommitHash: getFirstNonEmptyString(
+                        process.env.NEXT_PUBLIC_VERCEL_GIT_PREVIOUS_SHA,
+                        process.env.VERCEL_GIT_PREVIOUS_SHA,
+                    ),
+                    branch: repositoryBranch,
+                    commitMessage: getFirstNonEmptyString(
+                        process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_MESSAGE,
+                        process.env.VERCEL_GIT_COMMIT_MESSAGE,
+                    ),
+                    authorName: getFirstNonEmptyString(
+                        process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_AUTHOR_NAME,
+                        process.env.VERCEL_GIT_COMMIT_AUTHOR_NAME,
+                    ),
+                    authorLogin: getFirstNonEmptyString(
+                        process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_AUTHOR_LOGIN,
+                        process.env.VERCEL_GIT_COMMIT_AUTHOR_LOGIN,
+                    ),
+                    pullRequestId: getFirstNonEmptyString(
+                        process.env.NEXT_PUBLIC_VERCEL_GIT_PULL_REQUEST_ID,
+                        process.env.VERCEL_GIT_PULL_REQUEST_ID,
+                    ),
+                },
+                runtime: {
+                    nodeVersion: process.version,
+                    nodeEnvironment: normalizeOptionalString(process.env.NODE_ENV),
+                    nextRuntime: normalizeOptionalString(process.env.NEXT_RUNTIME),
+                    processId: process.pid,
+                    processUptimeSeconds: process.uptime(),
+                    hostname: getFirstNonEmptyString(process.env.HOSTNAME, process.env.COMPUTERNAME),
+                    platform: process.platform,
+                    architecture: process.arch,
+                    timezone: Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC',
+                },
+                memory: {
+                    rssBytes: memoryUsage.rss,
+                    heapUsedBytes: memoryUsage.heapUsed,
+                    heapTotalBytes: memoryUsage.heapTotal,
+                    externalBytes: memoryUsage.external,
+                    arrayBuffersBytes: memoryUsage.arrayBuffers ?? 0,
+                },
+            },
+        },
+    };
+}
+
+/**
+ * Returns the first non-empty string from a list.
+ *
+ * @param values - Candidate values in priority order.
+ * @returns First trimmed string or null.
+ */
+function getFirstNonEmptyString(...values: Array<string | null | undefined>): string | null {
+    for (const value of values) {
+        const normalizedValue = normalizeOptionalString(value);
+
+        if (normalizedValue) {
+            return normalizedValue;
+        }
+    }
+
+    return null;
+}
+
+/**
+ * Trims one optional environment value.
+ *
+ * @param value - Raw optional value.
+ * @returns Trimmed string or null.
+ */
+function normalizeOptionalString(value: string | null | undefined): string | null {
+    if (typeof value !== 'string') {
+        return null;
+    }
+
+    const normalizedValue = value.trim();
+
+    return normalizedValue || null;
+}

package/apps/agents-server/src/utils/errorReporting/registerServerErrorSentryLogging.ts

@@ -1,5 +1,8 @@
 import { inspect } from 'node:util';
+import * as Sentry from '@sentry/nextjs';
 import { DEFAULT_APPLICATION_ERROR_SERVER_NAME } from './applicationErrorHandling';
+import { createAgentsServerSentryContext } from './agentsServerSentryContext';
+import { enrichSentryStorePayloadWithAgentsServerContext } from './agentsServerSentryContext';
 import {
     createSentryTimestamp,
     resolveOptionalSentryDsn,
@@ -81,13 +84,17 @@ export function registerServerErrorSentryLogging(): void {
     console.error = (...consoleArguments: unknown[]): void => {
         loggingState.originalConsoleError?.(...consoleArguments);
 
+        const sentryPayload = createServerErrorSentryStorePayload(consoleArguments);
+
+        if (captureServerErrorWithSentrySdk(sentryPayload)) {
+            return;
+        }
+
         const sentryDsn = resolveOptionalSentryDsn();
         if (!sentryDsn) {
             return;
         }
 
-        const sentryPayload = createServerErrorSentryStorePayload(consoleArguments);
-
         // Never log reporting failures through `console.error`, otherwise a broken Sentry configuration would recurse.
         void sendSentryStorePayload(sentryPayload, sentryDsn).catch(() => undefined);
     };
@@ -144,7 +151,7 @@ function getServerErrorSentryLoggingState(): ServerErrorSentryLoggingState {
 function createServerErrorSentryStorePayload(consoleArguments: readonly unknown[]): SentryStorePayload {
     const loggedError = findLoggedErrorInfo(consoleArguments);
 
-    return {
+    return enrichSentryStorePayloadWithAgentsServerContext({
         platform: 'javascript',
         level: 'error',
         logger: SENTRY_SERVER_ERROR_LOGGER,
@@ -153,8 +160,6 @@ function createServerErrorSentryStorePayload(consoleArguments: readonly unknown[
         server_name: process.env.NEXT_PUBLIC_SERVER_NAME ?? DEFAULT_APPLICATION_ERROR_SERVER_NAME,
         tags: {
             source: 'agents-server.console-error',
-            nextRuntime: process.env.NEXT_RUNTIME ?? 'nodejs',
-            nodeEnv: process.env.NODE_ENV ?? 'unknown',
         },
         exception: loggedError
             ? {
@@ -169,11 +174,56 @@ function createServerErrorSentryStorePayload(consoleArguments: readonly unknown[
         extra: {
             consoleArguments: consoleArguments.map(serializeConsoleArgument),
             errorStack: loggedError?.stack ?? null,
-            vercelEnv: process.env.VERCEL_ENV ?? null,
-            vercelRegion: process.env.VERCEL_REGION ?? null,
-            vercelUrl: process.env.VERCEL_URL ?? null,
         },
-    };
+    });
+}
+
+/**
+ * Captures a server-side console error through the official Sentry SDK when it is initialized.
+ *
+ * @param sentryPayload - Structured event payload created from the original `console.error` call.
+ * @returns True when the SDK accepted the event.
+ */
+function captureServerErrorWithSentrySdk(sentryPayload: SentryStorePayload): boolean {
+    if (!Sentry.getClient()) {
+        return false;
+    }
+
+    const agentsServerContext = createAgentsServerSentryContext();
+
+    Sentry.captureException(createServerErrorSdkException(sentryPayload), {
+        level: sentryPayload.level,
+        tags: {
+            ...agentsServerContext.tags,
+            ...sentryPayload.tags,
+        },
+        extra: {
+            ...agentsServerContext.extra,
+            ...sentryPayload.extra,
+        },
+    });
+
+    return true;
+}
+
+/**
+ * Rebuilds an `Error` object from the structured Sentry payload so the SDK can parse stack frames.
+ *
+ * @param sentryPayload - Structured event payload created from the original `console.error` call.
+ * @returns Error object with the original stack when one was logged.
+ */
+function createServerErrorSdkException(sentryPayload: SentryStorePayload): Error {
+    const error = new Error(sentryPayload.message);
+    const exceptionValue = sentryPayload.exception?.values.at(0);
+    const errorStack = sentryPayload.extra?.errorStack;
+
+    error.name = exceptionValue?.type ?? 'Error';
+
+    if (typeof errorStack === 'string' && errorStack.trim()) {
+        error.stack = errorStack;
+    }
+
+    return error;
 }
 
 /**

package/apps/agents-server/src/utils/errorReporting/sendApplicationErrorReportToSentry.ts

@@ -1,4 +1,6 @@
+import * as Sentry from '@sentry/nextjs';
 import type { ApplicationErrorReportPayload } from './applicationErrorHandling';
+import { enrichSentryStorePayloadWithAgentsServerContext } from './agentsServerSentryContext';
 import {
     createSentryTimestamp,
     resolveRequiredSentryDsn,
@@ -18,7 +20,7 @@ const SENTRY_APPLICATION_ERROR_LOGGER = 'agents-server.application-error';
  * @returns Sentry store payload.
  */
 function createSentryStorePayload(report: ApplicationErrorReportPayload): SentryStorePayload {
-    return {
+    return enrichSentryStorePayloadWithAgentsServerContext({
         platform: 'javascript',
         level: 'error',
         logger: SENTRY_APPLICATION_ERROR_LOGGER,
@@ -44,7 +46,7 @@ function createSentryStorePayload(report: ApplicationErrorReportPayload): Sentry
             pageUrl: report.pageUrl ?? null,
             reportedAt: report.reportedAt,
         },
-    };
+    });
 }
 
 /**
@@ -53,5 +55,39 @@ function createSentryStorePayload(report: ApplicationErrorReportPayload): Sentry
  * @param report - Structured browser report payload.
  */
 export async function sendApplicationErrorReportToSentry(report: ApplicationErrorReportPayload): Promise<void> {
-    await sendSentryStorePayload(createSentryStorePayload(report), resolveRequiredSentryDsn());
+    const sentryPayload = createSentryStorePayload(report);
+
+    if (Sentry.getClient()) {
+        Sentry.captureException(createApplicationErrorSdkException(report, sentryPayload), {
+            level: sentryPayload.level,
+            tags: sentryPayload.tags,
+            extra: sentryPayload.extra,
+        });
+        await Sentry.flush(2000);
+        return;
+    }
+
+    await sendSentryStorePayload(sentryPayload, resolveRequiredSentryDsn());
+}
+
+/**
+ * Rebuilds an `Error` object from a browser application report so the SDK can parse stack frames.
+ *
+ * @param report - Browser-generated application error report.
+ * @param sentryPayload - Structured Sentry payload created from the report.
+ * @returns Error object with the original browser stack when available.
+ */
+function createApplicationErrorSdkException(
+    report: ApplicationErrorReportPayload,
+    sentryPayload: SentryStorePayload,
+): Error {
+    const error = new Error(sentryPayload.message);
+
+    error.name = report.errorName || 'Error';
+
+    if (report.errorStack?.trim()) {
+        error.stack = report.errorStack;
+    }
+
+    return error;
 }