update

Signed-off-by: raj-subhankar <subhankar.rj@gmail.com>

Author: raj-subhankar

crates/goose-server/src/routes/setup.rs

@@ -1,6 +1,6 @@
 use crate::routes::errors::ErrorResponse;
 use crate::state::AppState;
-use axum::{http::StatusCode, routing::post, Json, Router};
+use axum::{routing::post, Json, Router};
 use goose::config::signup_openrouter::OpenRouterAuth;
 use goose::config::signup_tetrate::{configure_tetrate, TetrateAuth};
 use goose::config::{configure_openrouter, Config};
@@ -72,7 +72,7 @@ async fn start_openrouter_setup() -> Result<Json<SetupResponse>, ErrorResponse>
 )]
 async fn verify_tetrate_setup(
     Json(request): Json<TetrateVerifyRequest>,
-) -> Result<Json<SetupResponse>, StatusCode> {
+) -> Result<Json<SetupResponse>, ErrorResponse> {
     let api_key =
         match TetrateAuth::exchange_code_with_verifier(request.code, request.code_verifier).await {
             Ok(api_key) => api_key,

ui/desktop/openapi.json

@@ -3236,6 +3236,36 @@
         }
       }
     },
+    "/tetrate/verify": {
+      "post": {
+        "tags": [
+          "super::routes::setup"
+        ],
+        "operationId": "verify_tetrate_setup",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/TetrateVerifyRequest"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SetupResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/tunnel/start": {
       "post": {
         "tags": [
@@ -6859,6 +6889,21 @@
           }
         }
       },
+      "TetrateVerifyRequest": {
+        "type": "object",
+        "required": [
+          "code",
+          "code_verifier"
+        ],
+        "properties": {
+          "code": {
+            "type": "string"
+          },
+          "code_verifier": {
+            "type": "string"
+          }
+        }
+      },
       "TextContent": {
         "type": "object",
         "required": [

ui/desktop/src/api/index.ts

@@ -2,7 +2,7 @@
 
 import type { Client, Options as Options2, TDataShape } from './client';
 import { client } from './client.gen';
-import type { AddExtensionData, AddExtensionErrors, AddExtensionResponses, AgentAddExtensionData, AgentAddExtensionErrors, AgentAddExtensionResponses, AgentRemoveExtensionData, AgentRemoveExtensionErrors, AgentRemoveExtensionResponses, BackupConfigData, BackupConfigErrors, BackupConfigResponses, CallToolData, CallToolErrors, CallToolResponses, CancelDownloadData, CancelDownloadErrors, CancelDownloadResponses, CheckProviderData, ConfigureProviderOauthData, ConfigureProviderOauthErrors, ConfigureProviderOauthResponses, ConfirmToolActionData, ConfirmToolActionErrors, ConfirmToolActionResponses, CreateCustomProviderData, CreateCustomProviderErrors, CreateCustomProviderResponses, CreateRecipeData, CreateRecipeErrors, CreateRecipeResponses, CreateScheduleData, CreateScheduleErrors, CreateScheduleResponses, DecodeRecipeData, DecodeRecipeErrors, DecodeRecipeResponses, DeleteModelData, DeleteModelErrors, DeleteModelResponses, DeleteRecipeData, DeleteRecipeErrors, DeleteRecipeResponses, DeleteScheduleData, DeleteScheduleErrors, DeleteScheduleResponses, DeleteSessionData, DeleteSessionErrors, DeleteSessionResponses, DetectProviderData, DetectProviderErrors, DetectProviderResponses, DiagnosticsData, DiagnosticsErrors, DiagnosticsResponses, DownloadModelData, DownloadModelErrors, DownloadModelResponses, EncodeRecipeData, EncodeRecipeErrors, EncodeRecipeResponses, ExportAppData, ExportAppErrors, ExportAppResponses, ExportSessionData, ExportSessionErrors, ExportSessionResponses, ForkSessionData, ForkSessionErrors, ForkSessionResponses, GetCustomProviderData, GetCustomProviderErrors, GetCustomProviderResponses, GetDictationConfigData, GetDictationConfigResponses, GetDownloadProgressData, GetDownloadProgressErrors, GetDownloadProgressResponses, GetExtensionsData, GetExtensionsErrors, GetExtensionsResponses, GetPricingData, GetPricingResponses, GetPromptData, GetPromptErrors, GetPromptResponses, GetPromptsData, GetPromptsResponses, GetProviderModelsData, GetProviderModelsErrors, GetProviderModelsResponses, GetSessionData, GetSessionErrors, GetSessionExtensionsData, GetSessionExtensionsErrors, GetSessionExtensionsResponses, GetSessionInsightsData, GetSessionInsightsErrors, GetSessionInsightsResponses, GetSessionResponses, GetSlashCommandsData, GetSlashCommandsResponses, GetToolsData, GetToolsErrors, GetToolsResponses, GetTunnelStatusData, GetTunnelStatusResponses, ImportAppData, ImportAppErrors, ImportAppResponses, ImportSessionData, ImportSessionErrors, ImportSessionResponses, InitConfigData, InitConfigErrors, InitConfigResponses, InspectRunningJobData, InspectRunningJobErrors, InspectRunningJobResponses, KillRunningJobData, KillRunningJobResponses, ListAppsData, ListAppsErrors, ListAppsResponses, ListModelsData, ListModelsResponses, ListRecipesData, ListRecipesErrors, ListRecipesResponses, ListSchedulesData, ListSchedulesErrors, ListSchedulesResponses, ListSessionsData, ListSessionsErrors, ListSessionsResponses, McpUiProxyData, McpUiProxyErrors, McpUiProxyResponses, ParseRecipeData, ParseRecipeErrors, ParseRecipeResponses, PauseScheduleData, PauseScheduleErrors, PauseScheduleResponses, ProvidersData, ProvidersResponses, ReadAllConfigData, ReadAllConfigResponses, ReadConfigData, ReadConfigErrors, ReadConfigResponses, ReadResourceData, ReadResourceErrors, ReadResourceResponses, RecipeToYamlData, RecipeToYamlErrors, RecipeToYamlResponses, RecoverConfigData, RecoverConfigErrors, RecoverConfigResponses, RemoveConfigData, RemoveConfigErrors, RemoveConfigResponses, RemoveCustomProviderData, RemoveCustomProviderErrors, RemoveCustomProviderResponses, RemoveExtensionData, RemoveExtensionErrors, RemoveExtensionResponses, ReplyData, ReplyErrors, ReplyResponses, ResetPromptData, ResetPromptErrors, ResetPromptResponses, RestartAgentData, RestartAgentErrors, RestartAgentResponses, ResumeAgentData, ResumeAgentErrors, ResumeAgentResponses, RunNowHandlerData, RunNowHandlerErrors, RunNowHandlerResponses, SavePromptData, SavePromptErrors, SavePromptResponses, SaveRecipeData, SaveRecipeErrors, SaveRecipeResponses, ScanRecipeData, ScanRecipeResponses, ScheduleRecipeData, ScheduleRecipeErrors, ScheduleRecipeResponses, SearchSessionsData, SearchSessionsErrors, SearchSessionsResponses, SendTelemetryEventData, SendTelemetryEventResponses, SessionsHandlerData, SessionsHandlerErrors, SessionsHandlerResponses, SetConfigProviderData, SetRecipeSlashCommandData, SetRecipeSlashCommandErrors, SetRecipeSlashCommandResponses, StartAgentData, StartAgentErrors, StartAgentResponses, StartOpenrouterSetupData, StartOpenrouterSetupResponses, StartTetrateSetupData, StartTetrateSetupResponses, StartTunnelData, StartTunnelErrors, StartTunnelResponses, StatusData, StatusResponses, StopAgentData, StopAgentErrors, StopAgentResponses, StopTunnelData, StopTunnelErrors, StopTunnelResponses, SystemInfoData, SystemInfoResponses, TranscribeDictationData, TranscribeDictationErrors, TranscribeDictationResponses, UnpauseScheduleData, UnpauseScheduleErrors, UnpauseScheduleResponses, UpdateAgentProviderData, UpdateAgentProviderErrors, UpdateAgentProviderResponses, UpdateCustomProviderData, UpdateCustomProviderErrors, UpdateCustomProviderResponses, UpdateFromSessionData, UpdateFromSessionErrors, UpdateFromSessionResponses, UpdateScheduleData, UpdateScheduleErrors, UpdateScheduleResponses, UpdateSessionNameData, UpdateSessionNameErrors, UpdateSessionNameResponses, UpdateSessionUserRecipeValuesData, UpdateSessionUserRecipeValuesErrors, UpdateSessionUserRecipeValuesResponses, UpdateWorkingDirData, UpdateWorkingDirErrors, UpdateWorkingDirResponses, UpsertConfigData, UpsertConfigErrors, UpsertConfigResponses, UpsertPermissionsData, UpsertPermissionsErrors, UpsertPermissionsResponses, ValidateConfigData, ValidateConfigErrors, ValidateConfigResponses } from './types.gen';
+import type { AddExtensionData, AddExtensionErrors, AddExtensionResponses, AgentAddExtensionData, AgentAddExtensionErrors, AgentAddExtensionResponses, AgentRemoveExtensionData, AgentRemoveExtensionErrors, AgentRemoveExtensionResponses, BackupConfigData, BackupConfigErrors, BackupConfigResponses, CallToolData, CallToolErrors, CallToolResponses, CancelDownloadData, CancelDownloadErrors, CancelDownloadResponses, CheckProviderData, ConfigureProviderOauthData, ConfigureProviderOauthErrors, ConfigureProviderOauthResponses, ConfirmToolActionData, ConfirmToolActionErrors, ConfirmToolActionResponses, CreateCustomProviderData, CreateCustomProviderErrors, CreateCustomProviderResponses, CreateRecipeData, CreateRecipeErrors, CreateRecipeResponses, CreateScheduleData, CreateScheduleErrors, CreateScheduleResponses, DecodeRecipeData, DecodeRecipeErrors, DecodeRecipeResponses, DeleteModelData, DeleteModelErrors, DeleteModelResponses, DeleteRecipeData, DeleteRecipeErrors, DeleteRecipeResponses, DeleteScheduleData, DeleteScheduleErrors, DeleteScheduleResponses, DeleteSessionData, DeleteSessionErrors, DeleteSessionResponses, DetectProviderData, DetectProviderErrors, DetectProviderResponses, DiagnosticsData, DiagnosticsErrors, DiagnosticsResponses, DownloadModelData, DownloadModelErrors, DownloadModelResponses, EncodeRecipeData, EncodeRecipeErrors, EncodeRecipeResponses, ExportAppData, ExportAppErrors, ExportAppResponses, ExportSessionData, ExportSessionErrors, ExportSessionResponses, ForkSessionData, ForkSessionErrors, ForkSessionResponses, GetCustomProviderData, GetCustomProviderErrors, GetCustomProviderResponses, GetDictationConfigData, GetDictationConfigResponses, GetDownloadProgressData, GetDownloadProgressErrors, GetDownloadProgressResponses, GetExtensionsData, GetExtensionsErrors, GetExtensionsResponses, GetPricingData, GetPricingResponses, GetPromptData, GetPromptErrors, GetPromptResponses, GetPromptsData, GetPromptsResponses, GetProviderModelsData, GetProviderModelsErrors, GetProviderModelsResponses, GetSessionData, GetSessionErrors, GetSessionExtensionsData, GetSessionExtensionsErrors, GetSessionExtensionsResponses, GetSessionInsightsData, GetSessionInsightsErrors, GetSessionInsightsResponses, GetSessionResponses, GetSlashCommandsData, GetSlashCommandsResponses, GetToolsData, GetToolsErrors, GetToolsResponses, GetTunnelStatusData, GetTunnelStatusResponses, ImportAppData, ImportAppErrors, ImportAppResponses, ImportSessionData, ImportSessionErrors, ImportSessionResponses, InitConfigData, InitConfigErrors, InitConfigResponses, InspectRunningJobData, InspectRunningJobErrors, InspectRunningJobResponses, KillRunningJobData, KillRunningJobResponses, ListAppsData, ListAppsErrors, ListAppsResponses, ListModelsData, ListModelsResponses, ListRecipesData, ListRecipesErrors, ListRecipesResponses, ListSchedulesData, ListSchedulesErrors, ListSchedulesResponses, ListSessionsData, ListSessionsErrors, ListSessionsResponses, McpUiProxyData, McpUiProxyErrors, McpUiProxyResponses, ParseRecipeData, ParseRecipeErrors, ParseRecipeResponses, PauseScheduleData, PauseScheduleErrors, PauseScheduleResponses, ProvidersData, ProvidersResponses, ReadAllConfigData, ReadAllConfigResponses, ReadConfigData, ReadConfigErrors, ReadConfigResponses, ReadResourceData, ReadResourceErrors, ReadResourceResponses, RecipeToYamlData, RecipeToYamlErrors, RecipeToYamlResponses, RecoverConfigData, RecoverConfigErrors, RecoverConfigResponses, RemoveConfigData, RemoveConfigErrors, RemoveConfigResponses, RemoveCustomProviderData, RemoveCustomProviderErrors, RemoveCustomProviderResponses, RemoveExtensionData, RemoveExtensionErrors, RemoveExtensionResponses, ReplyData, ReplyErrors, ReplyResponses, ResetPromptData, ResetPromptErrors, ResetPromptResponses, RestartAgentData, RestartAgentErrors, RestartAgentResponses, ResumeAgentData, ResumeAgentErrors, ResumeAgentResponses, RunNowHandlerData, RunNowHandlerErrors, RunNowHandlerResponses, SavePromptData, SavePromptErrors, SavePromptResponses, SaveRecipeData, SaveRecipeErrors, SaveRecipeResponses, ScanRecipeData, ScanRecipeResponses, ScheduleRecipeData, ScheduleRecipeErrors, ScheduleRecipeResponses, SearchSessionsData, SearchSessionsErrors, SearchSessionsResponses, SendTelemetryEventData, SendTelemetryEventResponses, SessionsHandlerData, SessionsHandlerErrors, SessionsHandlerResponses, SetConfigProviderData, SetRecipeSlashCommandData, SetRecipeSlashCommandErrors, SetRecipeSlashCommandResponses, StartAgentData, StartAgentErrors, StartAgentResponses, StartOpenrouterSetupData, StartOpenrouterSetupResponses, StartTetrateSetupData, StartTetrateSetupResponses, StartTunnelData, StartTunnelErrors, StartTunnelResponses, StatusData, StatusResponses, StopAgentData, StopAgentErrors, StopAgentResponses, StopTunnelData, StopTunnelErrors, StopTunnelResponses, SystemInfoData, SystemInfoResponses, TranscribeDictationData, TranscribeDictationErrors, TranscribeDictationResponses, UnpauseScheduleData, UnpauseScheduleErrors, UnpauseScheduleResponses, UpdateAgentProviderData, UpdateAgentProviderErrors, UpdateAgentProviderResponses, UpdateCustomProviderData, UpdateCustomProviderErrors, UpdateCustomProviderResponses, UpdateFromSessionData, UpdateFromSessionErrors, UpdateFromSessionResponses, UpdateScheduleData, UpdateScheduleErrors, UpdateScheduleResponses, UpdateSessionNameData, UpdateSessionNameErrors, UpdateSessionNameResponses, UpdateSessionUserRecipeValuesData, UpdateSessionUserRecipeValuesErrors, UpdateSessionUserRecipeValuesResponses, UpdateWorkingDirData, UpdateWorkingDirErrors, UpdateWorkingDirResponses, UpsertConfigData, UpsertConfigErrors, UpsertConfigResponses, UpsertPermissionsData, UpsertPermissionsErrors, UpsertPermissionsResponses, ValidateConfigData, ValidateConfigErrors, ValidateConfigResponses, VerifyTetrateSetupData, VerifyTetrateSetupResponses } from './types.gen';
 
 export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
     /**
@@ -508,6 +508,15 @@ export const sendTelemetryEvent = <ThrowOnError extends boolean = false>(options
     }
 });
 
+export const verifyTetrateSetup = <ThrowOnError extends boolean = false>(options: Options<VerifyTetrateSetupData, ThrowOnError>) => (options.client ?? client).post<VerifyTetrateSetupResponses, unknown, ThrowOnError>({
+    url: '/tetrate/verify',
+    ...options,
+    headers: {
+        'Content-Type': 'application/json',
+        ...options.headers
+    }
+});
+
 /**
  * Start the tunnel
  */

ui/desktop/src/api/sdk.gen.ts

@@ -1182,6 +1182,11 @@ export type Template = {
     user_content?: string | null;
 };
 
+export type TetrateVerifyRequest = {
+    code: string;
+    code_verifier: string;
+};
+
 export type TextContent = {
     _meta?: {
         [key: string]: unknown;
@@ -3907,6 +3912,19 @@ export type SendTelemetryEventResponses = {
     202: unknown;
 };
 
+export type VerifyTetrateSetupData = {
+    body: TetrateVerifyRequest;
+    path?: never;
+    query?: never;
+    url: '/tetrate/verify';
+};
+
+export type VerifyTetrateSetupResponses = {
+    200: SetupResponse;
+};
+
+export type VerifyTetrateSetupResponse = VerifyTetrateSetupResponses[keyof VerifyTetrateSetupResponses];
+
 export type StartTunnelData = {
     body?: never;
     path?: never;

ui/desktop/src/api/types.gen.ts

@@ -3,9 +3,8 @@ import { useNavigate } from 'react-router-dom';
 import { useConfig } from './ConfigContext';
 import { SetupModal } from './SetupModal';
 import { startOpenRouterSetup } from '../utils/openRouterSetup';
-import { startTetrateSetup } from '../utils/tetrateSetup';
+import { cancelTetrateSetup, startTetrateSetup } from '../utils/tetrateSetup';
 import { startChatGptCodexSetup } from '../utils/chatgptCodexSetup';
-import { cancelTetrateSetup } from '../utils/tetrateSetup';
 import WelcomeGooseLogo from './WelcomeGooseLogo';
 import { toastService } from '../toasts';
 import { OllamaSetup } from './OllamaSetup';

ui/desktop/src/components/ProviderGuard.tsx

@@ -54,16 +54,16 @@ describe('tetrateAuth', () => {
     expect(parsed.searchParams.get('client')).toBe('goose');
   });
 
-  it('parses valid callback URLs and rejects invalid ones', () => {
+  it('matches valid callback URLs and rejects invalid ones', () => {
     const url = 'goose://auth/tetrate?flow_id=flow&state=state&code=code';
-    expect(__test.parseTetrateCallbackUrl(url)).toEqual({
-      code: 'code',
+    expect(__test.matchTetrateCallbackUrl(url)).toEqual({
       flowId: 'flow',
       state: 'state',
+      code: 'code',
     });
 
-    expect(__test.parseTetrateCallbackUrl('goose://auth/other?flow_id=flow')).toBeNull();
-    expect(__test.parseTetrateCallbackUrl('https://example.com')).toBeNull();
+    expect(__test.matchTetrateCallbackUrl('goose://auth/other?flow_id=flow')).toBeNull();
+    expect(__test.matchTetrateCallbackUrl('https://example.com')).toBeNull();
   });
 
   it('resolves the waiting callback when a valid deep link arrives', async () => {

ui/desktop/src/tetrateAuth.test.ts

@@ -19,12 +19,6 @@ export type TetrateSetupResponse = {
   message: string;
 };
 
-type TetrateCallbackData = {
-  code: string;
-  flowId: string;
-  state: string;
-};
-
 type TetrateCallbackMatch = {
   flowId: string;
   state: string;
@@ -63,34 +57,6 @@ function buildTetrateAuthUrl(callbackUrl: string, codeChallenge: string): string
   return url.toString();
 }
 
-function parseTetrateCallbackUrl(callbackUrl: string): TetrateCallbackData | null {
-  let parsedUrl: URL;
-  try {
-    parsedUrl = new URL(callbackUrl);
-  } catch {
-    return null;
-  }
-
-  const normalizedPath = parsedUrl.pathname.replace(/\/$/, '');
-  if (
-    parsedUrl.protocol !== `${TETRATE_AUTH_CALLBACK_SCHEME}:` ||
-    parsedUrl.hostname !== 'auth' ||
-    normalizedPath !== '/tetrate'
-  ) {
-    return null;
-  }
-
-  const code = parsedUrl.searchParams.get('code');
-  const flowId = parsedUrl.searchParams.get('flow_id');
-  const state = parsedUrl.searchParams.get('state');
-
-  if (!code || !flowId || !state) {
-    return null;
-  }
-
-  return { code, flowId, state };
-}
-
 function matchTetrateCallbackUrl(callbackUrl: string): TetrateCallbackMatch | null {
   let parsedUrl: URL;
   try {
@@ -287,30 +253,22 @@ export async function runTetrateAuthFlow(client: Client): Promise<TetrateSetupRe
 
   try {
     const callbackUrl = await startTetrateAuthSession(flowId, authUrl);
-    const callback = parseTetrateCallbackUrl(callbackUrl);
+    const match = matchTetrateCallbackUrl(callbackUrl);
 
-    if (!callback) {
+    if (!match?.code) {
       throw new Error('Invalid authentication response');
     }
 
-    const flow = tetrateAuthFlows.get(callback.flowId);
+    const flow = tetrateAuthFlows.get(flowId);
     if (!flow) {
       throw new Error('Authentication expired');
     }
 
-    if (flow.state !== callback.state) {
-      throw new Error('Authentication state mismatch');
-    }
-
-    if (Date.now() > flow.expiresAt) {
-      throw new Error('Authentication timed out');
-    }
-
     const codeVerifier = flow.codeVerifier;
-    cleanupTetrateAuthFlow(callback.flowId);
+    cleanupTetrateAuthFlow(flowId);
 
     const response = await verifyTetrateSetup({
-      body: { code: callback.code, code_verifier: codeVerifier },
+      body: { code: match.code, code_verifier: codeVerifier },
       throwOnError: true,
       client,
     });
@@ -339,7 +297,6 @@ export const __test = {
   createTetrateAuthFlow,
   getTetrateAuthTtlMs: () => TETRATE_AUTH_TTL_MS,
   matchTetrateCallbackUrl,
-  parseTetrateCallbackUrl,
   resetForTests: () => {
     for (const flow of tetrateAuthFlows.values()) {
       if (flow.timeoutId) {

ui/desktop/src/tetrateAuth.ts

@@ -7,7 +7,7 @@ export async function startTetrateSetup(): Promise<{
   } catch (e) {
     return {
       success: false,
-      message: `Failed to start Tetrate setup ['${e}]`,
+      message: `Failed to start Tetrate setup: ${e}`,
     };
   }
 }