@opengeni/api-router 0.21.11 → 0.22.2

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   createAppComposition,
   startSlackInteractionPump
-} from "./chunk-J4JS2F7L.js";
+} from "./chunk-HWXJW5C7.js";
 
 // src/index.ts
 import {

package/dist/integrations/slack-interactions.d.ts

@@ -13,7 +13,7 @@ export declare const SLACK_TASK_INSTRUCTIONS: string;
  * selection at session creation while keeping Slack mutations out of the model
  * surface; interaction delivery remains owned by the durable delivery pump.
  */
-export declare const SLACK_TASK_FIRST_PARTY_MCP_TOOLS: ("artifacts_create" | "artifacts_get_source" | "artifacts_list" | "artifacts_publish" | "artifacts_rollback" | "environment_list" | "environment_set_variable" | "github_connect_link" | "github_repositories_list" | "github_token" | "goal_complete" | "goal_pause" | "goal_set" | "goal_update" | "memory_correct" | "memory_save" | "memory_search" | "preference_registry_get" | "preference_registry_summary" | "rig_get" | "rig_list" | "rig_promote" | "rig_propose_change" | "rig_verify" | "run_on" | "sandbox_attach" | "sandbox_provision" | "sandbox_swap" | "sandboxes_list" | "scheduled_task_runs_list" | "scheduled_tasks_create" | "scheduled_tasks_delete" | "scheduled_tasks_get" | "scheduled_tasks_list" | "scheduled_tasks_pause" | "scheduled_tasks_resume" | "scheduled_tasks_trigger" | "scheduled_tasks_update" | "session_create" | "session_events" | "session_get" | "session_pause" | "session_resume" | "session_send_message" | "session_steer" | "sessions_list" | "set_other_session_title" | "set_session_title" | "slack_bot_channel_history" | "slack_bot_delete_message" | "slack_bot_file_content" | "slack_bot_file_info" | "slack_bot_list_channels" | "slack_bot_list_files" | "slack_bot_list_users" | "slack_bot_post_message" | "slack_bot_thread_replies" | "social_connections_list" | "social_daily_analysis_context" | "social_mentions_live" | "social_post_reply" | "social_posts_recent" | "social_posts_sync" | "social_search_live" | "social_thread_fetch" | "variable_set_list" | "variable_set_set_variable")[];
+export declare const SLACK_TASK_FIRST_PARTY_MCP_TOOLS: ("artifacts_create" | "artifacts_get_source" | "artifacts_list" | "artifacts_publish" | "artifacts_rollback" | "environment_list" | "environment_set_variable" | "github_connect_link" | "github_repositories_list" | "goal_complete" | "goal_pause" | "goal_set" | "goal_update" | "memory_correct" | "memory_save" | "memory_search" | "preference_registry_get" | "preference_registry_summary" | "rig_get" | "rig_list" | "rig_promote" | "rig_propose_change" | "rig_verify" | "run_on" | "sandbox_attach" | "sandbox_provision" | "sandbox_swap" | "sandboxes_list" | "scheduled_task_runs_list" | "scheduled_tasks_create" | "scheduled_tasks_delete" | "scheduled_tasks_get" | "scheduled_tasks_list" | "scheduled_tasks_pause" | "scheduled_tasks_resume" | "scheduled_tasks_trigger" | "scheduled_tasks_update" | "session_create" | "session_events" | "session_get" | "session_pause" | "session_resume" | "session_send_message" | "session_steer" | "sessions_list" | "set_other_session_title" | "set_session_title" | "slack_bot_channel_history" | "slack_bot_delete_message" | "slack_bot_file_content" | "slack_bot_file_info" | "slack_bot_list_channels" | "slack_bot_list_files" | "slack_bot_list_users" | "slack_bot_post_message" | "slack_bot_thread_replies" | "social_connections_list" | "social_daily_analysis_context" | "social_mentions_live" | "social_post_reply" | "social_posts_recent" | "social_posts_sync" | "social_search_live" | "social_thread_fetch" | "variable_set_list" | "variable_set_set_variable")[];
 export type NormalizedSlackInteraction = {
     providerEventId: string;
     providerMessageId: string;

package/dist/routes/transcription-recordings.d.ts

@@ -0,0 +1,3 @@
+import { type ApiRouteDeps } from "@opengeni/core";
+import type { Hono } from "hono";
+export declare function registerResumableTranscriptionRoutes(app: Hono, deps: ApiRouteDeps): void;

package/dist/transcription/segmenter.d.ts

@@ -0,0 +1,10 @@
+import type { TranscriptionSegmenter } from "@opengeni/core";
+export declare class TranscriptionSegmenterError extends Error {
+    readonly code: "unavailable" | "invalid_audio" | "cancelled" | "too_large" | "unknown";
+    readonly retryable: boolean;
+    readonly name = "TranscriptionSegmenterError";
+    constructor(message: string, code: "unavailable" | "invalid_audio" | "cancelled" | "too_large" | "unknown", retryable: boolean);
+}
+export declare function createFfmpegTranscriptionSegmenter(input: {
+    ffmpegPath: string;
+}): TranscriptionSegmenter;

package/dist/transcription/service.d.ts

@@ -7,4 +7,9 @@ export declare function createTranscriptionService(input: {
     fetch?: typeof fetch;
     codexFetch?: typeof fetch;
     probeCodex?: (context?: TranscriptionAvailabilityContext) => boolean | Promise<boolean>;
+    /** Test seam for exercising timeout and late-completion behavior quickly. */
+    providerRequestTimeoutMilliseconds?: number;
+    /** Test seam for evaluating persisted absolute deadlines after delayed setup. */
+    now?: () => Date;
 }): TranscriptionService;
+export declare function remainingTranscriptionProviderRequestMilliseconds(providerDeadlineAt: Date, now: Date): number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeni/api-router",
-  "version": "0.21.11",
+  "version": "0.22.2",
   "description": "OpenGeni HTTP surface: the Hono adapter/router (createApp), routes, MCP HTTP transport, and HTTP access adapters over @opengeni/core. An engine-distribution surface — its runtime closure includes engine-internal packages.",
   "license": "Apache-2.0",
   "repository": {
@@ -43,18 +43,18 @@
     "@hono/zod-validator": "^0.7.6",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@opengeni/agent-proto": "^0.3.0",
-    "@opengeni/codex": "^0.2.10",
-    "@opengeni/config": "^0.10.12",
-    "@opengeni/contracts": "^0.38.2",
-    "@opengeni/core": "^0.20.13",
-    "@opengeni/db": "^0.27.9",
-    "@opengeni/documents": "^0.5.5",
-    "@opengeni/events": "^0.3.75",
-    "@opengeni/github": "^0.4.28",
+    "@opengeni/codex": "^0.2.11",
+    "@opengeni/config": "^0.11.0",
+    "@opengeni/contracts": "^0.39.0",
+    "@opengeni/core": "^0.21.2",
+    "@opengeni/db": "^0.28.1",
+    "@opengeni/documents": "^0.5.10",
+    "@opengeni/events": "^0.3.80",
+    "@opengeni/github": "^0.4.31",
     "@opengeni/network": "^0.2.0",
-    "@opengeni/observability": "^0.4.15",
-    "@opengeni/runtime": "^0.18.12",
-    "@opengeni/storage": "^0.2.65",
+    "@opengeni/observability": "^0.5.0",
+    "@opengeni/runtime": "^0.18.17",
+    "@opengeni/storage": "^0.2.68",
     "@temporalio/client": "^1.17.0",
     "better-auth": "^1.6.14",
     "hono": "^4.12.18",

package/src/app.ts

@@ -13,6 +13,7 @@ import {
   OPENGENI_CORRELATION_HEADER,
   resolveWorkspaceMemoryEnabled,
   VOICE_INPUT_ACCEPTED_MIME_TYPES,
+  TRANSCRIPTION_RECORDING_PROVIDER_SEGMENT_SECONDS,
   type AccessGrant,
   type ErrorCode,
 } from "@opengeni/contracts";
@@ -77,6 +78,7 @@ import { registerInsightsRoutes } from "./routes/insights";
 import { registerTranscriptionRoutes } from "./routes/transcriptions";
 import { projectClientModel } from "./model-catalog";
 import { createTranscriptionService } from "./transcription/service";
+import { createFfmpegTranscriptionSegmenter } from "./transcription/segmenter";
 import { registerSlackInteractionRoutes } from "./integrations/slack-interactions";
 
 export type {
@@ -103,8 +105,15 @@ export { replaySessionEvents, sseSessionStream, sseWorkspaceControlStream } from
 export const API_MAX_REQUEST_BODY_BYTES = 8 * 1024 * 1024;
 
 /** Effective Hono bodyLimit — API JSON ceiling or voice multipart + multipart overhead. */
-export function apiRequestBodyLimitBytes(settings: { voiceInputMaxSizeBytes: number }): number {
-  return Math.max(API_MAX_REQUEST_BODY_BYTES, settings.voiceInputMaxSizeBytes + 64 * 1024);
+export function apiRequestBodyLimitBytes(settings: {
+  voiceInputMaxSizeBytes: number;
+  voiceInputResumableMaxChunkSizeBytes?: number;
+}): number {
+  return Math.max(
+    API_MAX_REQUEST_BODY_BYTES,
+    settings.voiceInputMaxSizeBytes + 64 * 1024,
+    (settings.voiceInputResumableMaxChunkSizeBytes ?? 0) + 64 * 1024,
+  );
 }
 const API_PUBLIC_ERROR_MESSAGE_MAX_BYTES = 512;
 
@@ -204,6 +213,12 @@ export function createAppComposition(deps: AppDependencies): {
           ...(deps.codexFetch ? { codexFetch: deps.codexFetch } : {}),
         })
       : deps.transcription;
+  const transcriptionSegmenter =
+    deps.transcriptionSegmenter === undefined
+      ? createFfmpegTranscriptionSegmenter({
+          ffmpegPath: deps.settings.voiceInputFfmpegPath,
+        })
+      : deps.transcriptionSegmenter;
   const routeDeps: ApiRouteDeps = {
     ...deps,
     observability,
@@ -214,6 +229,7 @@ export function createAppComposition(deps: AppDependencies): {
     documentIndexer,
     getDocumentServices,
     transcription,
+    transcriptionSegmenter,
     ...(sandboxClient ? { sandboxClient } : {}),
     resumeBoxById,
   };
@@ -440,6 +456,24 @@ export function createAppComposition(deps: AppDependencies): {
           maxDurationSeconds: deps.settings.voiceInputMaxDurationSeconds,
           maxSizeBytes: deps.settings.voiceInputMaxSizeBytes,
           acceptedMimeTypes: [...VOICE_INPUT_ACCEPTED_MIME_TYPES],
+          ...(deps.settings.voiceInputResumableEnabled &&
+          objectStorage &&
+          transcription &&
+          transcriptionSegmenter &&
+          (await transcription.available()) &&
+          (await transcriptionSegmenter.available())
+            ? {
+                resumable: {
+                  maxDurationSeconds: deps.settings.voiceInputResumableMaxDurationSeconds,
+                  maxSizeBytes: deps.settings.voiceInputResumableMaxSizeBytes,
+                  maxChunkSizeBytes: deps.settings.voiceInputResumableMaxChunkSizeBytes,
+                  providerSegmentSeconds: Math.min(
+                    TRANSCRIPTION_RECORDING_PROVIDER_SEGMENT_SECONDS,
+                    deps.settings.voiceInputMaxDurationSeconds,
+                  ),
+                },
+              }
+            : {}),
         },
         productAccessMode: deps.settings.productAccessMode,
         auth: clientAuthConfig(deps.settings),

package/src/mcp/server.ts

@@ -43,7 +43,6 @@ import {
   getPreferenceRegistryFullContent,
   getVariableSet,
   getVariableSetByName,
-  areGitHubRepositoriesAllowedForWorkspace,
   listScheduledTaskRuns,
   listScheduledTasks,
   listSessionEventPage,
@@ -84,7 +83,6 @@ import {
 import { appendAndPublishEvents, publishDurableSessionEvents } from "@opengeni/events";
 import {
   createSignedState,
-  createGitHubAppInstallationToken,
   GitHubAppConfigurationError,
   githubAppMissingSettings,
 } from "@opengeni/github";
@@ -233,7 +231,6 @@ const FIRST_PARTY_TOOL_AUTHORIZATION = {
   variable_set_set_variable: { allOf: ["variable-sets:manage"] },
   environment_set_variable: { allOf: ["variable-sets:manage"] },
   github_connect_link: { allOf: ["github:use"] },
-  github_token: { sessionRequired: true, allOf: ["github:use"] },
   github_repositories_list: { allOf: ["github:use"] },
   social_connections_list: { allOf: ["connections:read"] },
   social_posts_recent: { allOf: ["connections:read"] },
@@ -443,26 +440,21 @@ export function buildOpenGeniMcpServer(
     registerSlackBotTools(server, deps, grant, sessionId, json);
   }
 
-  // Orchestration, variableSet, and GitHub status/token tools are permission-gated
+  // Orchestration, variableSet, and GitHub status tools are permission-gated
   // at registration: a grant without the permission does not see the tool.
   // Sandboxed workers reach this server with the first-party delegated
   // permission set (firstPartyMcpPermissions in @opengeni/runtime), which is
   // POWERFUL BY DEFAULT — it carries sessions:*, variable sets:*, and github:use,
   // so agents can spawn/read sessions, manage variable set variables, inspect
-  // GitHub connection availability, and refresh scoped tokens for already-bound
-  // repositories out of the box. A user DEMOTES a specific
+  // GitHub connection availability, and use already-bound repository resources
+  // out of the box. GitHub installation credentials are refreshed host-side and
+  // never returned through a model-visible MCP tool. A user DEMOTES a specific
   // session by setting a narrower session.firstPartyMcpPermissions (capped to
   // the creator's own grant); operators still cap what any session can be given.
   registerWorkspaceOrchestrationTools(server, deps, grant, can, sessionId, toolspaceMode, json);
   registerVariableSetTools(server, deps, grant, can, json);
   if (can("github:use")) {
     registerGitHubConnectTool(server, deps, grant, options, json);
-    // TOKEN-BROKER (B1): the agent-refreshable git token. Session-scoped (keys off the
-    // worker-signed sessionId claim so it mints for THIS session's repos), gated on
-    // the same github:use capability as github_connect_link.
-    if (sessionId !== null) {
-      registerGitHubTokenTool(server, deps, grant, sessionId, json);
-    }
   }
 
   if (!toolspaceMode || can("github:use")) {
@@ -1936,7 +1928,7 @@ function registerFleetTools(
     "sandboxes_list",
     {
       description:
-        "List the sandboxes this session can run on: its own session sandbox plus enrolled selfhosted machines. `liveness` is conservative: online requires observed provider existence and verified workspace readiness. Provider, lease, route, archive, restore, workspace, lease epoch, and route epoch are also reported separately. Use an entry `id` as an attach/swap/run_on target.",
+        "List the sandboxes this session can run on: its own session sandbox plus enrolled selfhosted machines. `liveness` is conservative: online requires observed provider existence and verified workspace readiness. An idle session-home sandbox may report offline/cold/draining and still wake or restore on the next ordinary sandbox operation; never infer that shell/files are unavailable from list liveness alone—only a typed operation/attach failure proves that. Provider, lease, route, archive, restore, workspace, lease epoch, and route epoch are also reported separately. Use an entry `id` as an attach/swap/run_on target.",
       inputSchema: {},
     },
     async () => json(await listFleet(services, await fleetContext())),
@@ -2960,73 +2952,6 @@ function registerGitHubConnectTool(
   );
 }
 
-// TOKEN-BROKER (B1): mint a FRESH short-lived GitHub App installation token for the
-// session's repository resources. The agent calls this to refresh git auth before
-// the current token expires. The MCP server CANNOT write the box, so the tool RETURNS
-// the token as JSON; the agent writes it to the token file (via exec) to refresh
-// GIT_ASKPASS. Same github:use capability gate as github_connect_link.
-function registerGitHubTokenTool(
-  server: McpServer,
-  deps: ApiRouteDeps,
-  grant: AccessGrant,
-  sessionId: string,
-  json: JsonResult,
-): void {
-  server.registerTool(
-    "github_token",
-    {
-      description:
-        "Mint a fresh short-lived GitHub token for this session's repositories. Write it to $OPENGENI_GIT_TOKEN_FILE (default $HOME/.opengeni/git-token) to refresh git auth before the current token expires.",
-      inputSchema: {},
-    },
-    async () => {
-      const session = await requireSession(deps.db, grant.workspaceId, sessionId);
-      // Resolve the run-scoped installation + repository ids from THIS session's
-      // repository resources (same shape sandboxEnvironmentForRun mints against). Only
-      // private GitHub-App repos carry the installation/repository ids.
-      const selected = (session.resources ?? []).flatMap((resource) => {
-        if (resource.kind !== "repository") {
-          return [];
-        }
-        const installationId = resource.githubInstallationId;
-        const repositoryId = resource.githubRepositoryId;
-        return typeof installationId === "number" &&
-          installationId > 0 &&
-          typeof repositoryId === "number" &&
-          repositoryId > 0
-          ? [{ installationId, repositoryId }]
-          : [];
-      });
-      if (selected.length === 0) {
-        throw new Error("this session has no GitHub App repository resources to mint a token for");
-      }
-      const installationId = selected[0]!.installationId;
-      if (selected.some((item) => item.installationId !== installationId)) {
-        throw new Error("GitHub App repository resources must belong to one installation");
-      }
-      const repositoryIds = selected.map((item) => item.repositoryId);
-      if (
-        !(await areGitHubRepositoriesAllowedForWorkspace(
-          deps.db,
-          grant.workspaceId,
-          installationId,
-          repositoryIds,
-        ))
-      ) {
-        throw new Error("this workspace no longer authorizes the session's GitHub repositories");
-      }
-      const token = await createGitHubAppInstallationToken(deps.settings, {
-        installationId,
-        repositoryIds,
-      });
-      return json({
-        token,
-        tokenFile: "$OPENGENI_GIT_TOKEN_FILE (default $HOME/.opengeni/git-token)",
-      });
-    },
-  );
-}
-
 // Defense-in-depth for invariant "agents cannot self-attach": the worker's
 // first-party delegated token never carries variable-sets:use, so sandboxed
 // agents calling these MCP tools cannot attach a variable set.

package/src/mcp/toolspace.ts

@@ -45,7 +45,10 @@ import {
   boundedParallelMap,
   cancelMcpResponseBody,
   guardedMcpFetch,
+  mcpJsonRpcErrorPayloadForRequest,
+  mcpRequestReplayInfo,
   mcpSerializedSizeBytes,
+  type McpRequestReplayInfo,
 } from "@opengeni/runtime/mcp-network";
 import { Buffer } from "node:buffer";
 import { createHash } from "node:crypto";
@@ -85,13 +88,21 @@ const TOOLSPACE_AUTH_NEEDED_ERROR = {
   code: 40_101,
   message: "Authentication required - a connection link was posted to the session.",
 } as const;
+const TOOLSPACE_TOOL_OUTCOME_UNCERTAIN_ERROR = {
+  code: 40_102,
+  message:
+    "Tool outcome uncertain: the provider returned 401 after receiving the request. OpenGeni did not replay this call. Do not retry automatically; verify provider state before any new attempt.",
+} as const;
 const TOOLSPACE_NO_ACTIVE_TURN_MESSAGE =
   "no active turn - toolspace calls require an in-flight turn";
 // First-party OpenGeni MCP proxies (files/docs) route back through the same
 // /mcp mount. They are excluded from the toolspace surface by construction so a
 // toolspace principal can never re-enter /mcp as a first-party caller, even if
 // a future grant carried files:read / documents:search (see docs invariants).
-const FIRST_PARTY_PROXY_IDS = new Set(["files", "docs"]);
+// Codex Apps is also excluded: its dynamic designated-owner authorization and
+// wire sanitizer live on the model MCP path and must never degrade into static
+// Toolspace headers.
+const FIRST_PARTY_PROXY_IDS = new Set(["files", "docs", "codex_apps"]);
 // In-process cache of the per-session upstream tool listing. Keyed on the set of
 // proxyable server ids + their credential versions, so a credential rotation
 // busts the entry; a short TTL bounds staleness for everything else. This is
@@ -754,6 +765,9 @@ async function callRemoteTool(
     if (isToolspaceAuthNeededError(error)) {
       return mcpError(TOOLSPACE_AUTH_NEEDED_ERROR.message);
     }
+    if (isToolspaceOutcomeUncertainError(error)) {
+      return mcpError(TOOLSPACE_TOOL_OUTCOME_UNCERTAIN_ERROR.message);
+    }
     // The raw upstream error can carry provider-specific detail; log it
     // server-side and return only a generic result to the sandbox so no header
     // or credential material can ride the message back out.
@@ -840,9 +854,9 @@ function selectedMcpServerIds(tools: ToolRef[], sessionServerIds: string[]): Set
 }
 
 // Whether a selected server id may enter the toolspace proxy at all. The
-// first-party OpenGeni tool server and the files/docs proxies are excluded by
-// construction: they route back through /mcp, so admitting them would let a
-// toolspace principal re-enter as a first-party caller (recursion guard).
+// The first-party OpenGeni tool server and files/docs proxies are excluded by
+// construction because they route back through /mcp (recursion guard). Codex
+// Apps is excluded because Toolspace does not own its dynamic authorization.
 export function toolspaceCanProxyServerId(serverId: string): boolean {
   return serverId !== "opengeni" && !FIRST_PARTY_PROXY_IDS.has(serverId);
 }
@@ -891,12 +905,6 @@ function toolspaceRequestOptions(config: McpServerConfig): {
   return config.timeoutMs ? { timeout: config.timeoutMs, maxTotalTimeout: config.timeoutMs } : {};
 }
 
-type McpRequestInfo = {
-  method?: string;
-  id?: string | number | null;
-  toolName?: string;
-};
-
 function mcpRequestDestinationUrl(input: string | URL | Request): string {
   return new URL(input instanceof Request ? input.url : input.toString()).toString();
 }
@@ -950,7 +958,7 @@ export function connectionBrokerFetch(
     ownerHasWorkspaceMembership: delegatedOwnerHasMembership,
   });
   return async (requestInput, init) => {
-    const request = await mcpRequestInfo(requestInput, init);
+    const request = await mcpRequestReplayInfo(requestInput, init);
     const destinationUrl = mcpRequestDestinationUrl(requestInput);
     const resolverSubjectId =
       connectionRef.subjectScope !== "subject" && hostCredentialPort
@@ -978,10 +986,22 @@ export function connectionBrokerFetch(
     );
     if (response.status === 401) {
       await cancelMcpResponseBody(response);
-      const refreshed = await resolve(true);
+      let refreshed: ResolveConnectionCredentialResult;
+      try {
+        refreshed = await resolve(true);
+      } catch {
+        refreshed = authNeededFromStatus(input.config, first, "refresh_failed");
+      }
       if (refreshed.status === "auth_needed") {
+        if (!request.replaySafeAfter401) {
+          await publishToolspaceAuthNeeded(input, request, refreshed);
+          return toolspaceMcpOutcomeUncertainResponse(request);
+        }
         return await authNeededFetchResponse(input, request, refreshed);
       }
+      if (!request.replaySafeAfter401) {
+        return toolspaceMcpOutcomeUncertainResponse(request);
+      }
       const retry = await baseFetch(
         fetchInputForAttempt(requestInput),
         withConnectionHeaders(requestInput, init, refreshed.headers),
@@ -1044,9 +1064,27 @@ async function authNeededFetchResponse(
     sessionId: string;
     turn: SessionTurn;
   },
-  request: McpRequestInfo,
+  request: McpRequestReplayInfo,
   auth: Extract<ResolveConnectionCredentialResult, { status: "auth_needed" }>,
 ): Promise<Response> {
+  await publishToolspaceAuthNeeded(input, request, auth);
+  if (request.method === "tools/call") {
+    return toolspaceMcpErrorResponse(request.id, TOOLSPACE_AUTH_NEEDED_ERROR);
+  }
+  return new Response("Authentication required for MCP server connection", { status: 401 });
+}
+
+async function publishToolspaceAuthNeeded(
+  input: {
+    deps: ApiRouteDeps;
+    grant: AccessGrant;
+    config: McpServerConfig;
+    sessionId: string;
+    turn: SessionTurn;
+  },
+  request: McpRequestReplayInfo,
+  auth: Extract<ResolveConnectionCredentialResult, { status: "auth_needed" }>,
+): Promise<void> {
   await appendAndPublishEvents(
     input.deps.db,
     input.deps.bus,
@@ -1072,64 +1110,35 @@ async function authNeededFetchResponse(
       },
     ],
   ).catch(() => undefined);
-  if (request.method === "tools/call") {
-    return new Response(
-      JSON.stringify({
-        jsonrpc: "2.0",
-        id: request.id ?? null,
-        error: {
-          code: TOOLSPACE_AUTH_NEEDED_ERROR.code,
-          message: TOOLSPACE_AUTH_NEEDED_ERROR.message,
-        },
-      }),
-      {
-        status: 200,
-        headers: { "content-type": "application/json" },
-      },
-    );
-  }
-  return new Response("Authentication required for MCP server connection", { status: 401 });
 }
 
-async function mcpRequestInfo(
-  input: string | URL | Request,
-  init?: RequestInit,
-): Promise<McpRequestInfo> {
-  const body =
-    typeof init?.body === "string"
-      ? init.body
-      : input instanceof Request && (init?.method ?? input.method).toUpperCase() === "POST"
-        ? await input
-            .clone()
-            .text()
-            .catch(() => "")
-        : "";
-  if (!body) {
-    return {};
-  }
-  try {
-    const parsed = JSON.parse(body) as {
-      id?: unknown;
-      method?: unknown;
-      params?: { name?: unknown };
-    };
-    const method = typeof parsed.method === "string" ? parsed.method : undefined;
-    const id =
-      typeof parsed.id === "string" || typeof parsed.id === "number" || parsed.id === null
-        ? parsed.id
-        : undefined;
-    const toolName =
-      method === "tools/call" && typeof parsed.params?.name === "string"
-        ? parsed.params.name
-        : undefined;
-    return {
-      ...(method ? { method } : {}),
-      ...(id !== undefined ? { id } : {}),
-      ...(toolName ? { toolName } : {}),
-    };
-  } catch {
-    return {};
-  }
+function toolspaceMcpErrorResponse(
+  id: string | number | null | undefined,
+  error: { code: number; message: string },
+): Response {
+  return new Response(
+    JSON.stringify({
+      jsonrpc: "2.0",
+      id: id ?? null,
+      error,
+    }),
+    {
+      status: 200,
+      headers: { "content-type": "application/json" },
+    },
+  );
+}
+
+function toolspaceMcpOutcomeUncertainResponse(request: McpRequestReplayInfo): Response {
+  return new Response(
+    JSON.stringify(
+      mcpJsonRpcErrorPayloadForRequest(request, TOOLSPACE_TOOL_OUTCOME_UNCERTAIN_ERROR),
+    ),
+    {
+      status: 200,
+      headers: { "content-type": "application/json" },
+    },
+  );
 }
 
 function withConnectionHeaders(
@@ -1162,3 +1171,16 @@ function isToolspaceAuthNeededError(error: unknown): boolean {
         `MCP error ${TOOLSPACE_AUTH_NEEDED_ERROR.code}: ${TOOLSPACE_AUTH_NEEDED_ERROR.message}`)
   );
 }
+
+function isToolspaceOutcomeUncertainError(error: unknown): boolean {
+  if (!(error instanceof Error)) {
+    return false;
+  }
+  const code = (error as { code?: unknown }).code;
+  return (
+    code === TOOLSPACE_TOOL_OUTCOME_UNCERTAIN_ERROR.code &&
+    (error.message === TOOLSPACE_TOOL_OUTCOME_UNCERTAIN_ERROR.message ||
+      error.message ===
+        `MCP error ${TOOLSPACE_TOOL_OUTCOME_UNCERTAIN_ERROR.code}: ${TOOLSPACE_TOOL_OUTCOME_UNCERTAIN_ERROR.message}`)
+  );
+}