@scenario-labs/sdk 2.2.1 → 2.3.0

package/lib/scenario.mjs

@@ -16,23 +16,19 @@ import { EnhancedWorkflows } from "./workflow.mjs";
  * ```ts
  * import Scenario from '@scenario-labs/sdk';
  *
- * const client = new Scenario({ apiKey: '...' });
+ * // With API key — project is implied by the key.
+ * const client = new Scenario({ apiKey: '...', apiSecret: '...' });
  *
- * // All generated methods work as-is
- * const list = await client.assets.list({});
+ * // With bearer JWT — pin a default project for all requests.
+ * const client = new Scenario({ bearerAuth: jwt, projectId: 'proj_abc' });
  *
- * // Enhanced: response.job.wait()
+ * // Per-call override (one request only):
+ * await client.uploads.uploadFile(params, { query: { projectId: 'proj_other' } });
+ *
+ * // Enhanced: response.job.wait() — auto-reuses the scope of the call that produced the job
  * const run = await client.workflows.run(workflowId, { body });
  * const completed = await run.job.wait();
  *
- * // Enhanced: response.workflow.findNode()
- * const wf = await client.workflows.retrieve(workflowId);
- * wf.workflow.findNode('final_image');
- *
- * // Enhanced: generate job.wait()
- * const gen = await client.generate.runModel(modelId, { body });
- * const done = await gen.job.wait();
- *
  * // Enhanced: upload.wait()
  * const res = await client.uploads.retrieve(uploadId);
  * const imported = await res.upload.wait();
@@ -49,5 +45,28 @@ export class Scenario extends BaseScenario {
     uploads = new EnhancedUploads(this);
     assets = new EnhancedAssets(this);
     jobs = new EnhancedJobs(this);
+    /** The default project this client scopes every request to, or `null` if unset. */
+    projectId;
+    constructor(options = {}) {
+        const { projectId, defaultQuery, ...rest } = options;
+        // Strip any stale projectId from defaultQuery so the typed field is the
+        // single source of truth (matters when `withOptions` reconstructs the client).
+        const cleanedDefaultQuery = stripKey(defaultQuery, 'projectId');
+        super({
+            ...rest,
+            // Pass projectId through so it lands in `_options` and survives a
+            // `withOptions()` round-trip. The base ClientOptions doesn't declare
+            // this field, hence the cast.
+            projectId,
+            defaultQuery: projectId ? { ...cleanedDefaultQuery, projectId } : cleanedDefaultQuery,
+        });
+        this.projectId = projectId ?? null;
+    }
+}
+function stripKey(obj, key) {
+    if (!obj || !(key in obj))
+        return obj;
+    const { [key]: _omit, ...rest } = obj;
+    return rest;
 }
 //# sourceMappingURL=scenario.mjs.map

package/lib/scenario.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"scenario.mjs","sourceRoot":"","sources":["../src/lib/scenario.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,sBAAkB;AACrD,OAAO,EAAE,cAAc,EAAE,oBAAgB;AACzC,OAAO,EAAE,gBAAgB,EAAE,uBAAmB;AAC9C,OAAO,EAAE,YAAY,EAAE,kBAAc;AACrC,OAAO,EAAE,cAAc,EAAE,qBAAiB;AAC1C,OAAO,EAAE,eAAe,EAAE,qBAAiB;AAC3C,OAAO,EAAE,iBAAiB,EAAE,uBAAmB;AAE/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,MAAM,OAAO,QAAS,SAAQ,YAAY;IAC/B,SAAS,GAAsB,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC3D,QAAQ,GAAqB,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACxD,MAAM,GAAmB,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;IAClD,OAAO,GAAoB,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,GAAmB,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;IAClD,IAAI,GAAiB,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;CACtD"}
+{"version":3,"file":"scenario.mjs","sourceRoot":"","sources":["../src/lib/scenario.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,YAAY,EAA2C,sBAAkB;AAC9F,OAAO,EAAE,cAAc,EAAE,oBAAgB;AACzC,OAAO,EAAE,gBAAgB,EAAE,uBAAmB;AAC9C,OAAO,EAAE,YAAY,EAAE,kBAAc;AACrC,OAAO,EAAE,cAAc,EAAE,qBAAiB;AAC1C,OAAO,EAAE,eAAe,EAAE,qBAAiB;AAC3C,OAAO,EAAE,iBAAiB,EAAE,uBAAmB;AAmB/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,MAAM,OAAO,QAAS,SAAQ,YAAY;IAC/B,SAAS,GAAsB,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC3D,QAAQ,GAAqB,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACxD,MAAM,GAAmB,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;IAClD,OAAO,GAAoB,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,GAAmB,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;IAClD,IAAI,GAAiB,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;IAErD,mFAAmF;IAC1E,SAAS,CAAgB;IAElC,YAAY,UAAyB,EAAE;QACrC,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QACrD,wEAAwE;QACxE,+EAA+E;QAC/E,MAAM,mBAAmB,GAAG,QAAQ,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAChE,KAAK,CAAC;YACJ,GAAG,IAAI;YACP,kEAAkE;YAClE,qEAAqE;YACrE,8BAA8B;YAC9B,SAAS;YACT,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,mBAAmB,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,mBAAmB;SACjE,CAAC,CAAC;QACxB,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,IAAI,CAAC;IACrC,CAAC;CACF;AAED,SAAS,QAAQ,CAAmB,GAAkB,EAAE,GAAW;IACjE,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IACtC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,GAAG,GAA8B,CAAC;IACjE,OAAO,IAAkB,CAAC;AAC5B,CAAC"}

package/lib/scope.d.mts

@@ -0,0 +1,41 @@
+import type { RequestOptions } from "../internal/request-options.mjs";
+/**
+ * Per-request project scope.
+ *
+ * With API-key auth, the server resolves the project from the key. With
+ * bearer (JWT) auth a user can belong to multiple projects, so callers must
+ * specify which one to act on by passing `projectId` as a query param
+ * (the server derives `teamId` from it — no need to send it explicitly).
+ *
+ * SDK helpers like `Job.wait()` and `Upload.wait()` make follow-up calls
+ * internally — they capture the scope effective on the originating call and
+ * forward it on each retry, so an action created in project A always polls
+ * in project A even if the client default changes between calls.
+ */
+export interface Scope {
+    projectId?: string;
+}
+/** Extract `projectId` from a `RequestOptions.query`. Returns `undefined` if absent. */
+export declare function extractScope(options?: RequestOptions): Scope | undefined;
+/**
+ * Resolve the effective scope for an outgoing call:
+ *   1. If the per-call options carry a `projectId` query — use that (the explicit override wins).
+ *   2. Otherwise, fall back to the client's default `projectId`.
+ *   3. If neither is set (e.g. API-key auth with implicit scope), return `undefined`.
+ *
+ * Returns the snapshot we want to *capture on an enhanced entity* so that
+ * follow-up helper calls (`.wait()`, `entity.run()`, ...) reuse the same
+ * scope and stay in sync with the call that produced them.
+ */
+export declare function effectiveScope(options: RequestOptions | undefined, fallbackProjectId: string | null | undefined): Scope | undefined;
+/**
+ * Read the client's default `projectId` without repeating the structural
+ * cast at every call site. The base generated `Scenario` type doesn't
+ * declare `projectId` — only the enhanced one in `./scenario` does — so
+ * `lib/` modules that import `Scenario` from `'../client'` use this helper
+ * instead of duplicating the same cast inline.
+ */
+export declare function clientProjectId(client: unknown): string | null | undefined;
+/** Build a `RequestOptions` that adds the scope as a query param, merging into any existing query. */
+export declare function withScope(scope: Scope | undefined, options?: RequestOptions): RequestOptions | undefined;
+//# sourceMappingURL=scope.d.mts.map

package/lib/scope.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scope.d.mts","sourceRoot":"","sources":["../src/lib/scope.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,wCAAoC;AAElE;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,KAAK;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wFAAwF;AACxF,wBAAgB,YAAY,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS,CAMxE;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,cAAc,GAAG,SAAS,EACnC,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC3C,KAAK,GAAG,SAAS,CAKnB;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAE1E;AAED,sGAAsG;AACtG,wBAAgB,SAAS,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,cAAc,GAAG,SAAS,CAOxG"}

package/lib/scope.d.ts

@@ -0,0 +1,41 @@
+import type { RequestOptions } from "../internal/request-options.js";
+/**
+ * Per-request project scope.
+ *
+ * With API-key auth, the server resolves the project from the key. With
+ * bearer (JWT) auth a user can belong to multiple projects, so callers must
+ * specify which one to act on by passing `projectId` as a query param
+ * (the server derives `teamId` from it — no need to send it explicitly).
+ *
+ * SDK helpers like `Job.wait()` and `Upload.wait()` make follow-up calls
+ * internally — they capture the scope effective on the originating call and
+ * forward it on each retry, so an action created in project A always polls
+ * in project A even if the client default changes between calls.
+ */
+export interface Scope {
+    projectId?: string;
+}
+/** Extract `projectId` from a `RequestOptions.query`. Returns `undefined` if absent. */
+export declare function extractScope(options?: RequestOptions): Scope | undefined;
+/**
+ * Resolve the effective scope for an outgoing call:
+ *   1. If the per-call options carry a `projectId` query — use that (the explicit override wins).
+ *   2. Otherwise, fall back to the client's default `projectId`.
+ *   3. If neither is set (e.g. API-key auth with implicit scope), return `undefined`.
+ *
+ * Returns the snapshot we want to *capture on an enhanced entity* so that
+ * follow-up helper calls (`.wait()`, `entity.run()`, ...) reuse the same
+ * scope and stay in sync with the call that produced them.
+ */
+export declare function effectiveScope(options: RequestOptions | undefined, fallbackProjectId: string | null | undefined): Scope | undefined;
+/**
+ * Read the client's default `projectId` without repeating the structural
+ * cast at every call site. The base generated `Scenario` type doesn't
+ * declare `projectId` — only the enhanced one in `./scenario` does — so
+ * `lib/` modules that import `Scenario` from `'../client'` use this helper
+ * instead of duplicating the same cast inline.
+ */
+export declare function clientProjectId(client: unknown): string | null | undefined;
+/** Build a `RequestOptions` that adds the scope as a query param, merging into any existing query. */
+export declare function withScope(scope: Scope | undefined, options?: RequestOptions): RequestOptions | undefined;
+//# sourceMappingURL=scope.d.ts.map

package/lib/scope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scope.d.ts","sourceRoot":"","sources":["../src/lib/scope.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,uCAAoC;AAElE;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,KAAK;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wFAAwF;AACxF,wBAAgB,YAAY,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS,CAMxE;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,cAAc,GAAG,SAAS,EACnC,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC3C,KAAK,GAAG,SAAS,CAKnB;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAE1E;AAED,sGAAsG;AACtG,wBAAgB,SAAS,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,cAAc,GAAG,SAAS,CAOxG"}

package/lib/scope.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractScope = extractScope;
+exports.effectiveScope = effectiveScope;
+exports.clientProjectId = clientProjectId;
+exports.withScope = withScope;
+/** Extract `projectId` from a `RequestOptions.query`. Returns `undefined` if absent. */
+function extractScope(options) {
+    const query = options?.query;
+    if (!query)
+        return undefined;
+    const projectId = typeof query['projectId'] === 'string' ? query['projectId'] : undefined;
+    if (!projectId)
+        return undefined;
+    return { projectId };
+}
+/**
+ * Resolve the effective scope for an outgoing call:
+ *   1. If the per-call options carry a `projectId` query — use that (the explicit override wins).
+ *   2. Otherwise, fall back to the client's default `projectId`.
+ *   3. If neither is set (e.g. API-key auth with implicit scope), return `undefined`.
+ *
+ * Returns the snapshot we want to *capture on an enhanced entity* so that
+ * follow-up helper calls (`.wait()`, `entity.run()`, ...) reuse the same
+ * scope and stay in sync with the call that produced them.
+ */
+function effectiveScope(options, fallbackProjectId) {
+    const override = extractScope(options);
+    if (override)
+        return override;
+    if (fallbackProjectId)
+        return { projectId: fallbackProjectId };
+    return undefined;
+}
+/**
+ * Read the client's default `projectId` without repeating the structural
+ * cast at every call site. The base generated `Scenario` type doesn't
+ * declare `projectId` — only the enhanced one in `./scenario` does — so
+ * `lib/` modules that import `Scenario` from `'../client'` use this helper
+ * instead of duplicating the same cast inline.
+ */
+function clientProjectId(client) {
+    return client.projectId;
+}
+/** Build a `RequestOptions` that adds the scope as a query param, merging into any existing query. */
+function withScope(scope, options) {
+    if (!scope?.projectId)
+        return options;
+    const existingQuery = options?.query ?? {};
+    return {
+        ...options,
+        query: { ...existingQuery, projectId: scope.projectId },
+    };
+}
+//# sourceMappingURL=scope.js.map

package/lib/scope.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scope.js","sourceRoot":"","sources":["../src/lib/scope.ts"],"names":[],"mappings":";;AAoBA,oCAMC;AAYD,wCAQC;AASD,0CAEC;AAGD,8BAOC;AAhDD,wFAAwF;AACxF,SAAgB,YAAY,CAAC,OAAwB;IACnD,MAAM,KAAK,GAAG,OAAO,EAAE,KAA4C,CAAC;IACpE,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,MAAM,SAAS,GAAG,OAAO,KAAK,CAAC,WAAW,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1F,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IACjC,OAAO,EAAE,SAAS,EAAE,CAAC;AACvB,CAAC;AAED;;;;;;;;;GASG;AACH,SAAgB,cAAc,CAC5B,OAAmC,EACnC,iBAA4C;IAE5C,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACvC,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,IAAI,iBAAiB;QAAE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC;IAC/D,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,eAAe,CAAC,MAAe;IAC7C,OAAQ,MAAwC,CAAC,SAAS,CAAC;AAC7D,CAAC;AAED,sGAAsG;AACtG,SAAgB,SAAS,CAAC,KAAwB,EAAE,OAAwB;IAC1E,IAAI,CAAC,KAAK,EAAE,SAAS;QAAE,OAAO,OAAO,CAAC;IACtC,MAAM,aAAa,GAAI,OAAO,EAAE,KAA6C,IAAI,EAAE,CAAC;IACpF,OAAO;QACL,GAAG,OAAO;QACV,KAAK,EAAE,EAAE,GAAG,aAAa,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE;KACxD,CAAC;AACJ,CAAC"}

package/lib/scope.mjs

@@ -0,0 +1,49 @@
+/** Extract `projectId` from a `RequestOptions.query`. Returns `undefined` if absent. */
+export function extractScope(options) {
+    const query = options?.query;
+    if (!query)
+        return undefined;
+    const projectId = typeof query['projectId'] === 'string' ? query['projectId'] : undefined;
+    if (!projectId)
+        return undefined;
+    return { projectId };
+}
+/**
+ * Resolve the effective scope for an outgoing call:
+ *   1. If the per-call options carry a `projectId` query — use that (the explicit override wins).
+ *   2. Otherwise, fall back to the client's default `projectId`.
+ *   3. If neither is set (e.g. API-key auth with implicit scope), return `undefined`.
+ *
+ * Returns the snapshot we want to *capture on an enhanced entity* so that
+ * follow-up helper calls (`.wait()`, `entity.run()`, ...) reuse the same
+ * scope and stay in sync with the call that produced them.
+ */
+export function effectiveScope(options, fallbackProjectId) {
+    const override = extractScope(options);
+    if (override)
+        return override;
+    if (fallbackProjectId)
+        return { projectId: fallbackProjectId };
+    return undefined;
+}
+/**
+ * Read the client's default `projectId` without repeating the structural
+ * cast at every call site. The base generated `Scenario` type doesn't
+ * declare `projectId` — only the enhanced one in `./scenario` does — so
+ * `lib/` modules that import `Scenario` from `'../client'` use this helper
+ * instead of duplicating the same cast inline.
+ */
+export function clientProjectId(client) {
+    return client.projectId;
+}
+/** Build a `RequestOptions` that adds the scope as a query param, merging into any existing query. */
+export function withScope(scope, options) {
+    if (!scope?.projectId)
+        return options;
+    const existingQuery = options?.query ?? {};
+    return {
+        ...options,
+        query: { ...existingQuery, projectId: scope.projectId },
+    };
+}
+//# sourceMappingURL=scope.mjs.map

package/lib/scope.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"scope.mjs","sourceRoot":"","sources":["../src/lib/scope.ts"],"names":[],"mappings":"AAmBA,wFAAwF;AACxF,MAAM,UAAU,YAAY,CAAC,OAAwB;IACnD,MAAM,KAAK,GAAG,OAAO,EAAE,KAA4C,CAAC;IACpE,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,MAAM,SAAS,GAAG,OAAO,KAAK,CAAC,WAAW,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1F,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IACjC,OAAO,EAAE,SAAS,EAAE,CAAC;AACvB,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,cAAc,CAC5B,OAAmC,EACnC,iBAA4C;IAE5C,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACvC,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,IAAI,iBAAiB;QAAE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC;IAC/D,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAAC,MAAe;IAC7C,OAAQ,MAAwC,CAAC,SAAS,CAAC;AAC7D,CAAC;AAED,sGAAsG;AACtG,MAAM,UAAU,SAAS,CAAC,KAAwB,EAAE,OAAwB;IAC1E,IAAI,CAAC,KAAK,EAAE,SAAS;QAAE,OAAO,OAAO,CAAC;IACtC,MAAM,aAAa,GAAI,OAAO,EAAE,KAA6C,IAAI,EAAE,CAAC;IACpF,OAAO;QACL,GAAG,OAAO;QACV,KAAK,EAAE,EAAE,GAAG,aAAa,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE;KACxD,CAAC;AACJ,CAAC"}

package/lib/upload.d.mts

@@ -4,6 +4,7 @@ import type { RequestOptions } from "../internal/request-options.mjs";
 import { Uploads, type UploadCreateParams, type UploadCreateResponse, type UploadRetrieveResponse, type UploadTriggerActionParams, type UploadTriggerActionResponse } from "../resources/uploads.mjs";
 import type { AssetRetrieveResponse } from "../resources/assets/assets.mjs";
 import type { ModelRetrieveResponse } from "../resources/models/models.mjs";
+import { type Scope } from "./scope.mjs";
 type UploadKind = NonNullable<UploadCreateParams['kind']>;
 /** The resolved entity returned after a successful upload, narrowed by `kind`. */
 export type UploadResult<K extends UploadKind> = K extends 'model' ? ModelRetrieveResponse : AssetRetrieveResponse;
@@ -54,10 +55,18 @@ export interface UploadWaitOptions {
     intervalMs?: number;
     /** Maximum wait time in milliseconds. Default: 300000 */
     timeoutMs?: number;
+    /**
+     * Override the project scope used for the polling requests. Defaults to
+     * the scope captured on the upload (per-call override on the originating
+     * call, else the client's default project).
+     */
+    projectId?: string;
 }
 /** Upload methods added on top of the original upload fields. */
 export declare class UploadMethods {
     /** @internal */ readonly _client: Scenario;
+    /** @internal scope captured from the originating call — replayed on every `.wait()` poll. */
+    readonly _scope?: Scope;
     /**
      * Poll until the upload has been processed into an entity (asset or model),
      * or reaches a terminal state (`imported`, `complete`, `failed`). Resolves
@@ -73,8 +82,8 @@ export declare class UploadMethods {
      * ```
      */
     wait(this: Upload, options?: UploadWaitOptions): Promise<Upload>;
-    /** @internal Create an Upload from raw upload data. */
-    static from(client: Scenario, data: UploadRetrieveResponse['upload']): Upload;
+    /** @internal Create an Upload from raw upload data, optionally remembering the originating scope. */
+    static from(client: Scenario, data: UploadRetrieveResponse['upload'], scope?: Scope): Upload;
 }
 /** An upload with all original fields plus `.wait()`. */
 export type Upload = UploadRetrieveResponse.Upload & UploadMethods;
@@ -90,13 +99,16 @@ export type WithUpload<T extends {
 };
 /**
  * @internal Wrap `_thenUnwrap` to replace `response.upload` with an enhanced Upload.
+ * Captures the effective scope (per-call override or client default) so
+ * `.wait()` can replay it on every poll — keeping follow-up calls in sync
+ * with the project the upload was originally created in.
  */
 export declare function enhanceUpload<T extends {
     upload: {
         id: string;
         status: string;
     };
-}>(client: Scenario, promise: APIPromise<T>): APIPromise<WithUpload<T>>;
+}>(client: Scenario, promise: APIPromise<T>, options?: RequestOptions): APIPromise<WithUpload<T>>;
 /**
  * Enhanced Uploads resource.
  * All original methods (`create`, `retrieve`, `triggerAction`) are inherited,

package/lib/upload.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"upload.d.mts","sourceRoot":"","sources":["../src/lib/upload.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"upload.d.mts","sourceRoot":"","sources":["../src/lib/upload.ts"],"names":[],"mappings":"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"}

package/lib/upload.d.ts

@@ -4,6 +4,7 @@ import type { RequestOptions } from "../internal/request-options.js";
 import { Uploads, type UploadCreateParams, type UploadCreateResponse, type UploadRetrieveResponse, type UploadTriggerActionParams, type UploadTriggerActionResponse } from "../resources/uploads.js";
 import type { AssetRetrieveResponse } from "../resources/assets/assets.js";
 import type { ModelRetrieveResponse } from "../resources/models/models.js";
+import { type Scope } from "./scope.js";
 type UploadKind = NonNullable<UploadCreateParams['kind']>;
 /** The resolved entity returned after a successful upload, narrowed by `kind`. */
 export type UploadResult<K extends UploadKind> = K extends 'model' ? ModelRetrieveResponse : AssetRetrieveResponse;
@@ -54,10 +55,18 @@ export interface UploadWaitOptions {
     intervalMs?: number;
     /** Maximum wait time in milliseconds. Default: 300000 */
     timeoutMs?: number;
+    /**
+     * Override the project scope used for the polling requests. Defaults to
+     * the scope captured on the upload (per-call override on the originating
+     * call, else the client's default project).
+     */
+    projectId?: string;
 }
 /** Upload methods added on top of the original upload fields. */
 export declare class UploadMethods {
     /** @internal */ readonly _client: Scenario;
+    /** @internal scope captured from the originating call — replayed on every `.wait()` poll. */
+    readonly _scope?: Scope;
     /**
      * Poll until the upload has been processed into an entity (asset or model),
      * or reaches a terminal state (`imported`, `complete`, `failed`). Resolves
@@ -73,8 +82,8 @@ export declare class UploadMethods {
      * ```
      */
     wait(this: Upload, options?: UploadWaitOptions): Promise<Upload>;
-    /** @internal Create an Upload from raw upload data. */
-    static from(client: Scenario, data: UploadRetrieveResponse['upload']): Upload;
+    /** @internal Create an Upload from raw upload data, optionally remembering the originating scope. */
+    static from(client: Scenario, data: UploadRetrieveResponse['upload'], scope?: Scope): Upload;
 }
 /** An upload with all original fields plus `.wait()`. */
 export type Upload = UploadRetrieveResponse.Upload & UploadMethods;
@@ -90,13 +99,16 @@ export type WithUpload<T extends {
 };
 /**
  * @internal Wrap `_thenUnwrap` to replace `response.upload` with an enhanced Upload.
+ * Captures the effective scope (per-call override or client default) so
+ * `.wait()` can replay it on every poll — keeping follow-up calls in sync
+ * with the project the upload was originally created in.
  */
 export declare function enhanceUpload<T extends {
     upload: {
         id: string;
         status: string;
     };
-}>(client: Scenario, promise: APIPromise<T>): APIPromise<WithUpload<T>>;
+}>(client: Scenario, promise: APIPromise<T>, options?: RequestOptions): APIPromise<WithUpload<T>>;
 /**
  * Enhanced Uploads resource.
  * All original methods (`create`, `retrieve`, `triggerAction`) are inherited,

package/lib/upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../src/lib/upload.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../src/lib/upload.ts"],"names":[],"mappings":"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"}

package/lib/upload.js

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnhancedUploads = exports.Upload = exports.UploadMethods = void 0;
 exports.enhanceUpload = enhanceUpload;
 const uploads_1 = require("../resources/uploads.js");
+const scope_1 = require("./scope.js");
 // AWS S3 multipart upload limits.
 const MIN_PART_SIZE = 6_000_000; // 6 MB (spec minimum is 5 MiB; a bit over to be safe)
 const MAX_PART_SIZE = 5_368_709_120; // 5 GiB
@@ -63,13 +64,16 @@ class UploadMethods {
      * ```
      */
     async wait(options) {
-        const final = await pollUntilImported(() => this._client.uploads.retrieve(this.id), options?.intervalMs ?? 2_000, options?.timeoutMs ?? 300_000);
-        return UploadMethods.from(this._client, final.upload);
+        const scope = waitOverrideScope(options) ?? this._scope;
+        const final = await pollUntilImported(() => this._client.uploads.retrieve(this.id, (0, scope_1.withScope)(scope)), options?.intervalMs ?? 2_000, options?.timeoutMs ?? 300_000);
+        return UploadMethods.from(this._client, final.upload, scope);
     }
-    /** @internal Create an Upload from raw upload data. */
-    static from(client, data) {
+    /** @internal Create an Upload from raw upload data, optionally remembering the originating scope. */
+    static from(client, data, scope) {
         const upload = Object.assign(Object.create(UploadMethods.prototype), data);
         Object.defineProperty(upload, '_client', { value: client, enumerable: false });
+        if (scope)
+            Object.defineProperty(upload, '_scope', { value: scope, enumerable: false });
         return upload;
     }
 }
@@ -77,11 +81,15 @@ exports.UploadMethods = UploadMethods;
 exports.Upload = UploadMethods;
 /**
  * @internal Wrap `_thenUnwrap` to replace `response.upload` with an enhanced Upload.
+ * Captures the effective scope (per-call override or client default) so
+ * `.wait()` can replay it on every poll — keeping follow-up calls in sync
+ * with the project the upload was originally created in.
  */
-function enhanceUpload(client, promise) {
+function enhanceUpload(client, promise, options) {
+    const scope = (0, scope_1.effectiveScope)(options, (0, scope_1.clientProjectId)(client));
     return promise._thenUnwrap((data) => ({
         ...data,
-        upload: exports.Upload.from(client, data.upload),
+        upload: exports.Upload.from(client, data.upload, scope),
     }));
 }
 /**
@@ -93,13 +101,13 @@ function enhanceUpload(client, promise) {
  */
 class EnhancedUploads extends uploads_1.Uploads {
     create(body, options) {
-        return enhanceUpload(this._client, super.create(body, options));
+        return enhanceUpload(this._client, super.create(body, options), options);
     }
     retrieve(uploadID, options) {
-        return enhanceUpload(this._client, super.retrieve(uploadID, options));
+        return enhanceUpload(this._client, super.retrieve(uploadID, options), options);
     }
     triggerAction(uploadID, body, options) {
-        return enhanceUpload(this._client, super.triggerAction(uploadID, body, options));
+        return enhanceUpload(this._client, super.triggerAction(uploadID, body, options), options);
     }
     /**
      * Upload a file end-to-end. Computes an optimal part size (within AWS's
@@ -177,16 +185,25 @@ class EnhancedUploads extends uploads_1.Uploads {
         if (!entityId) {
             throw new Error(`Upload ${uploadId} reached status "${final.upload.status}" but has no entityId`);
         }
-        // Fetch and return the resolved entity (narrowed by kind).
+        // Fetch and return the resolved entity (narrowed by kind). Forward the
+        // original options so any per-call `projectId` query is passed through
+        // to the final retrieve (necessary under bearer auth with per-call
+        // scope overrides).
         if (params.kind === 'model') {
-            const model = await this._client.models.retrieve(entityId);
+            const model = await this._client.models.retrieve(entityId, undefined, options);
             return model;
         }
-        const asset = await this._client.assets.retrieve(entityId);
+        const asset = await this._client.assets.retrieve(entityId, undefined, options);
         return asset;
     }
 }
 exports.EnhancedUploads = EnhancedUploads;
+/** Resolve the scope override carried by an `UploadWaitOptions`, if any. */
+function waitOverrideScope(options) {
+    if (!options?.projectId)
+        return undefined;
+    return { projectId: options.projectId };
+}
 // ─────────────────────── helpers ───────────────────────
 async function normalizeToBytes(input) {
     if (typeof input === 'string') {

package/lib/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../src/lib/upload.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../src/lib/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmJA,sCAUC;AA1JD,qDAO8B;AAG9B,sCAAiF;AAoDjF,kCAAkC;AAClC,MAAM,aAAa,GAAG,SAAS,CAAC,CAAC,sDAAsD;AACvF,MAAM,aAAa,GAAG,aAAa,CAAC,CAAC,QAAQ;AAC7C,MAAM,SAAS,GAAG,MAAM,CAAC;AACzB,MAAM,aAAa,GAAG,iBAAiB,CAAC,CAAC,QAAQ;AAIjD,wEAAwE;AACxE,qEAAqE;AACrE,uEAAuE;AACvE,kDAAkD;AAClD,MAAM,iBAAiB,GAAsB,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;AAezF,iEAAiE;AACjE,MAAa,aAAa;IAKxB;;;;;;;;;;;;;OAaG;IACH,KAAK,CAAC,IAAI,CAAe,OAA2B;QAClD,MAAM,KAAK,GAAG,iBAAiB,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC;QACxD,MAAM,KAAK,GAAG,MAAM,iBAAiB,CACnC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,IAAA,iBAAS,EAAC,KAAK,CAAC,CAAC,EAC9D,OAAO,EAAE,UAAU,IAAI,KAAK,EAC5B,OAAO,EAAE,SAAS,IAAI,OAAO,CAC9B,CAAC;QACF,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC/D,CAAC;IAED,qGAAqG;IACrG,MAAM,CAAC,IAAI,CAAC,MAAgB,EAAE,IAAsC,EAAE,KAAa;QACjF,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,IAAI,CAAW,CAAC;QACrF,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;QAC/E,IAAI,KAAK;YAAE,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;QACxF,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AApCD,sCAoCC;AAIY,QAAA,MAAM,GAAG,aAAa,CAAC;AAQpC;;;;;GAKG;AACH,SAAgB,aAAa,CAC3B,MAAgB,EAChB,OAAsB,EACtB,OAAwB;IAExB,MAAM,KAAK,GAAG,IAAA,sBAAc,EAAC,OAAO,EAAE,IAAA,uBAAe,EAAC,MAAM,CAAC,CAAC,CAAC;IAC/D,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACpC,GAAG,IAAI;QACP,MAAM,EAAE,cAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAA0C,EAAE,KAAK,CAAC;KACpF,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;;;;;GAMG;AACH,MAAa,eAAgB,SAAQ,iBAAO;IACjC,MAAM,CACb,IAAwB,EACxB,OAAwB;QAExB,OAAO,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;IAC3E,CAAC;IAEQ,QAAQ,CACf,QAAgB,EAChB,OAAwB;QAExB,OAAO,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;IACjF,CAAC;IAEQ,aAAa,CACpB,QAAgB,EAChB,IAA+B,EAC/B,OAAwB;QAExB,OAAO,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;IAC5F,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACH,KAAK,CAAC,UAAU,CACd,MAA2B,EAC3B,OAAwB;QAExB,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC;QAElC,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,QAAQ,GAAG,aAAa,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CACb,cAAc,QAAQ,+CAA+C,aAAa,gBAAgB,CACnG,CAAC;QACJ,CAAC;QAED,gEAAgE;QAChE,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;QAC3D,IAAI,QAAQ,GAAG,aAAa,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CACb,cAAc,QAAQ,mCAAmC,QAAQ,UAAU;gBACzE,0CAA0C,aAAa,gBAAgB,CAC1E,CAAC;QACJ,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC;QAE/D,8DAA8D;QAC9D,MAAM,UAAU,GAAuB;YACrC,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,QAAQ;YACR,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,KAAK,EAAE,UAAU;YACjB,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACjG,CAAC;QACF,MAAM,SAAS,GAAyB,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC/E,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC;QACjC,MAAM,QAAQ,GAAG,OAAO,CAAC,EAAE,CAAC;QAC5B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC5B,IAAI,KAAK,EAAE,MAAM,KAAK,UAAU,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,YAAY,UAAU,+BAA+B,KAAK,EAAE,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7F,CAAC;QAED,2EAA2E;QAC3E,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,eAAe,IAAI,CAAC,CAAC,CAAC;QAC7D,MAAM,0BAA0B,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAEtE,mDAAmD;QACnD,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,OAAO,CAAC,CAAC;QAEpE,oEAAoE;QACpE,MAAM,KAAK,GAAG,MAAM,iBAAiB,CACnC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,EACtC,MAAM,CAAC,cAAc,IAAI,KAAK,EAC9B,MAAM,CAAC,aAAa,IAAI,OAAO,CAChC,CAAC;QAEF,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,UAAU,QAAQ,YAAY,KAAK,CAAC,MAAM,CAAC,YAAY,IAAI,oBAAoB,EAAE,CAAC,CAAC;QACrG,CAAC;QACD,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;QACvC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,UAAU,QAAQ,oBAAoB,KAAK,CAAC,MAAM,CAAC,MAAM,uBAAuB,CAAC,CAAC;QACpG,CAAC;QAED,uEAAuE;QACvE,uEAAuE;QACvE,mEAAmE;QACnE,oBAAoB;QACpB,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC5B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;YAC/E,OAAO,KAAwB,CAAC;QAClC,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/E,OAAO,KAAwB,CAAC;IAClC,CAAC;CACF;AAjID,0CAiIC;AAED,4EAA4E;AAC5E,SAAS,iBAAiB,CAAC,OAA2B;IACpD,IAAI,CAAC,OAAO,EAAE,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;AAC1C,CAAC;AAED,0DAA0D;AAE1D,KAAK,UAAU,gBAAgB,CAAC,KAAsB;IACpD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,4DAA4D;QAC5D,MAAM,EAAE,QAAQ,EAAE,GAAG,wDAAa,kBAAkB,GAAC,CAAC;QACtD,OAAO,IAAI,UAAU,CAAC,MAAM,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;QAChC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,OAAO,IAAI,KAAK,WAAW,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;QACzD,OAAO,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;IACnD,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,kFAAkF,CAAC,CAAC;AACtG,CAAC;AAED,KAAK,UAAU,0BAA0B,CACvC,KAAiB,EACjB,KAA8D,EAC9D,QAAgB,EAChB,WAAmB;IAEnB,wEAAwE;IACxE,MAAM,MAAM,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;IAE9D,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;IACpE,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAE3B,KAAK,UAAU,MAAM;QACnB,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,CAAC,GAAG,SAAS,EAAE,CAAC;YACtB,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM;gBAAE,OAAO;YAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACvB,IAAI,CAAC,IAAI;gBAAE,SAAS;YACpB,MAAM,KAAK,GAAG,CAAC,GAAG,QAAQ,CAAC;YAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,GAAG,QAAQ,CAAC,CAAC;YACzD,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACzC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAClE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CACb,yBAAyB,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,UAAU,EAAE,CACzF,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,QAA+C,EAC/C,UAAkB,EAClB,SAAiB;IAEjB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;IACxC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,MAAM,QAAQ,EAAE,CAAC;QAC7B,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC9B,gFAAgF;QAChF,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACzD,OAAO,GAAG,CAAC;QACb,CAAC;QACD,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;IACtD,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,iDAAiD,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC;AACxF,CAAC"}

package/lib/upload.mjs

@@ -1,4 +1,5 @@
 import { Uploads, } from "../resources/uploads.mjs";
+import { clientProjectId, effectiveScope, withScope } from "./scope.mjs";
 // AWS S3 multipart upload limits.
 const MIN_PART_SIZE = 6_000_000; // 6 MB (spec minimum is 5 MiB; a bit over to be safe)
 const MAX_PART_SIZE = 5_368_709_120; // 5 GiB
@@ -26,24 +27,31 @@ export class UploadMethods {
      * ```
      */
     async wait(options) {
-        const final = await pollUntilImported(() => this._client.uploads.retrieve(this.id), options?.intervalMs ?? 2_000, options?.timeoutMs ?? 300_000);
-        return UploadMethods.from(this._client, final.upload);
+        const scope = waitOverrideScope(options) ?? this._scope;
+        const final = await pollUntilImported(() => this._client.uploads.retrieve(this.id, withScope(scope)), options?.intervalMs ?? 2_000, options?.timeoutMs ?? 300_000);
+        return UploadMethods.from(this._client, final.upload, scope);
     }
-    /** @internal Create an Upload from raw upload data. */
-    static from(client, data) {
+    /** @internal Create an Upload from raw upload data, optionally remembering the originating scope. */
+    static from(client, data, scope) {
         const upload = Object.assign(Object.create(UploadMethods.prototype), data);
         Object.defineProperty(upload, '_client', { value: client, enumerable: false });
+        if (scope)
+            Object.defineProperty(upload, '_scope', { value: scope, enumerable: false });
         return upload;
     }
 }
 export const Upload = UploadMethods;
 /**
  * @internal Wrap `_thenUnwrap` to replace `response.upload` with an enhanced Upload.
+ * Captures the effective scope (per-call override or client default) so
+ * `.wait()` can replay it on every poll — keeping follow-up calls in sync
+ * with the project the upload was originally created in.
  */
-export function enhanceUpload(client, promise) {
+export function enhanceUpload(client, promise, options) {
+    const scope = effectiveScope(options, clientProjectId(client));
     return promise._thenUnwrap((data) => ({
         ...data,
-        upload: Upload.from(client, data.upload),
+        upload: Upload.from(client, data.upload, scope),
     }));
 }
 /**
@@ -55,13 +63,13 @@ export function enhanceUpload(client, promise) {
  */
 export class EnhancedUploads extends Uploads {
     create(body, options) {
-        return enhanceUpload(this._client, super.create(body, options));
+        return enhanceUpload(this._client, super.create(body, options), options);
     }
     retrieve(uploadID, options) {
-        return enhanceUpload(this._client, super.retrieve(uploadID, options));
+        return enhanceUpload(this._client, super.retrieve(uploadID, options), options);
     }
     triggerAction(uploadID, body, options) {
-        return enhanceUpload(this._client, super.triggerAction(uploadID, body, options));
+        return enhanceUpload(this._client, super.triggerAction(uploadID, body, options), options);
     }
     /**
      * Upload a file end-to-end. Computes an optimal part size (within AWS's
@@ -139,15 +147,24 @@ export class EnhancedUploads extends Uploads {
         if (!entityId) {
             throw new Error(`Upload ${uploadId} reached status "${final.upload.status}" but has no entityId`);
         }
-        // Fetch and return the resolved entity (narrowed by kind).
+        // Fetch and return the resolved entity (narrowed by kind). Forward the
+        // original options so any per-call `projectId` query is passed through
+        // to the final retrieve (necessary under bearer auth with per-call
+        // scope overrides).
         if (params.kind === 'model') {
-            const model = await this._client.models.retrieve(entityId);
+            const model = await this._client.models.retrieve(entityId, undefined, options);
             return model;
         }
-        const asset = await this._client.assets.retrieve(entityId);
+        const asset = await this._client.assets.retrieve(entityId, undefined, options);
         return asset;
     }
 }
+/** Resolve the scope override carried by an `UploadWaitOptions`, if any. */
+function waitOverrideScope(options) {
+    if (!options?.projectId)
+        return undefined;
+    return { projectId: options.projectId };
+}
 // ─────────────────────── helpers ───────────────────────
 async function normalizeToBytes(input) {
     if (typeof input === 'string') {