Some type fixes for the retrieve

Author: matt-aitken

packages/core/src/v3/apiClient/index.ts

@@ -12,14 +12,11 @@ import {
   CreateEnvironmentVariableRequestBody,
   CreateScheduleOptions,
   CreateUploadPayloadUrlResponseBody,
-  CreateWaitpointHttpCallbackResponseBody,
   CreateWaitpointTokenRequestBody,
   CreateWaitpointTokenResponseBody,
   DeletedScheduleObject,
   EnvironmentVariableResponseBody,
-  EnvironmentVariableValue,
   EnvironmentVariableWithSecret,
-  EnvironmentVariables,
   ListQueueOptions,
   ListRunResponseItem,
   ListScheduleOptions,
@@ -43,8 +40,10 @@ import {
   WaitpointRetrieveTokenResponse,
   WaitpointTokenItem,
 } from "../schemas/index.js";
+import { AsyncIterableStream } from "../streams/asyncIterableStream.js";
 import { taskContext } from "../task-context-api.js";
 import { AnyRunTypes, TriggerJwtOptions } from "../types/tasks.js";
+import { Prettify } from "../types/utils.js";
 import {
   AnyZodFetchOptions,
   ApiPromise,
@@ -64,9 +63,9 @@ import {
   RunShape,
   RunStreamCallback,
   RunSubscription,
+  SSEStreamSubscriptionFactory,
   TaskRunShape,
   runShapeStream,
-  SSEStreamSubscriptionFactory,
 } from "./runStream.js";
 import {
   CreateEnvironmentVariableParams,
@@ -77,8 +76,6 @@ import {
   SubscribeToRunsQueryParams,
   UpdateEnvironmentVariableParams,
 } from "./types.js";
-import { AsyncIterableStream } from "../streams/asyncIterableStream.js";
-import { Prettify } from "../types/utils.js";
 
 export type CreateWaitpointTokenResponse = Prettify<
   CreateWaitpointTokenResponseBody & {
@@ -791,24 +788,6 @@ export class ApiClient {
     );
   }
 
-  createWaitpointHttpCallback(
-    options: CreateWaitpointTokenRequestBody,
-    requestOptions?: ZodFetchOptions
-  ) {
-    return zodfetch(
-      CreateWaitpointHttpCallbackResponseBody,
-      `${this.baseUrl}/engine/v1/waitpoints/http-callback`,
-      {
-        method: "POST",
-        headers: this.#getHeaders(false),
-        body: JSON.stringify(options),
-      },
-      {
-        ...mergeRequestOptions(this.defaultRequestOptions, requestOptions),
-      }
-    ) as ApiPromise<CreateWaitpointHttpCallbackResponseBody>;
-  }
-
   async waitForDuration(
     runId: string,
     body: WaitForDurationRequestBody,

packages/trigger-sdk/src/v3/wait.ts

@@ -176,6 +176,8 @@ function listTokens(
  */
 export type WaitpointRetrievedToken<T> = {
   id: string;
+  /** A URL that you can make a POST request to in order to complete the waitpoint. */
+  url: string;
   status: WaitpointTokenStatus;
   completedAt?: Date;
   timeoutAt?: Date;
@@ -229,6 +231,7 @@ async function retrieveToken<T>(
       },
       onResponseBody: (body: WaitpointRetrieveTokenResponse, span) => {
         span.setAttribute("id", body.id);
+        span.setAttribute("url", body.url);
         span.setAttribute("status", body.status);
         if (body.completedAt) {
           span.setAttribute("completedAt", body.completedAt.toISOString());
@@ -269,6 +272,7 @@ async function retrieveToken<T>(
 
   return {
     id: result.id,
+    url: result.url,
     status: result.status,
     completedAt: result.completedAt,
     timeoutAt: result.timeoutAt,