modal 0.10.2-dev.6 → 0.10.2-dev.7

package/dist/index.cjs

@@ -75,6 +75,7 @@ __export(index_exports, {
   SandboxFilesystemNotFoundError: () => SandboxFilesystemNotFoundError,
   SandboxFilesystemPathAlreadyExistsError: () => SandboxFilesystemPathAlreadyExistsError,
   SandboxFilesystemPermissionError: () => SandboxFilesystemPermissionError,
+  SandboxLogsManager: () => SandboxLogsManager,
   SandboxService: () => SandboxService,
   SandboxSnapshot: () => SandboxSnapshot,
   SandboxSnapshotService: () => SandboxSnapshotService,
@@ -48067,6 +48068,108 @@ var SecretDeleteRequest = {
     return message;
   }
 };
+function createBaseSecretGetInfoRequest() {
+  return { secretId: "" };
+}
+var SecretGetInfoRequest = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.secretId !== "") {
+      writer.uint32(10).string(message.secretId);
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseSecretGetInfoRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.secretId = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return { secretId: isSet5(object.secretId) ? globalThis.String(object.secretId) : "" };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.secretId !== "") {
+      obj.secretId = message.secretId;
+    }
+    return obj;
+  },
+  create(base) {
+    return SecretGetInfoRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseSecretGetInfoRequest();
+    message.secretId = object.secretId ?? "";
+    return message;
+  }
+};
+function createBaseSecretGetInfoResponse() {
+  return { metadata: void 0 };
+}
+var SecretGetInfoResponse = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.metadata !== void 0) {
+      SecretMetadata.encode(message.metadata, writer.uint32(10).fork()).join();
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseSecretGetInfoResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.metadata = SecretMetadata.decode(reader, reader.uint32());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return { metadata: isSet5(object.metadata) ? SecretMetadata.fromJSON(object.metadata) : void 0 };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.metadata !== void 0) {
+      obj.metadata = SecretMetadata.toJSON(message.metadata);
+    }
+    return obj;
+  },
+  create(base) {
+    return SecretGetInfoResponse.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseSecretGetInfoResponse();
+    message.metadata = object.metadata !== void 0 && object.metadata !== null ? SecretMetadata.fromPartial(object.metadata) : void 0;
+    return message;
+  }
+};
 function createBaseSecretGetOrCreateRequest() {
   return { deploymentName: "", environmentName: "", objectCreationType: 0, envDict: {}, appId: "", requiredKeys: [] };
 }
@@ -48613,7 +48716,7 @@ var SecretListResponse = {
   }
 };
 function createBaseSecretMetadata() {
-  return { name: "", creationInfo: void 0, keys: [] };
+  return { name: "", creationInfo: void 0, keys: [], environmentName: "" };
 }
 var SecretMetadata = {
   encode(message, writer = new BinaryWriter()) {
@@ -48626,6 +48729,9 @@ var SecretMetadata = {
     for (const v of message.keys) {
       writer.uint32(26).string(v);
     }
+    if (message.environmentName !== "") {
+      writer.uint32(34).string(message.environmentName);
+    }
     return writer;
   },
   decode(input, length) {
@@ -48656,6 +48762,13 @@ var SecretMetadata = {
           message.keys.push(reader.string());
           continue;
         }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+          message.environmentName = reader.string();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -48668,7 +48781,8 @@ var SecretMetadata = {
     return {
       name: isSet5(object.name) ? globalThis.String(object.name) : "",
       creationInfo: isSet5(object.creationInfo) ? CreationInfo.fromJSON(object.creationInfo) : void 0,
-      keys: globalThis.Array.isArray(object?.keys) ? object.keys.map((e) => globalThis.String(e)) : []
+      keys: globalThis.Array.isArray(object?.keys) ? object.keys.map((e) => globalThis.String(e)) : [],
+      environmentName: isSet5(object.environmentName) ? globalThis.String(object.environmentName) : ""
     };
   },
   toJSON(message) {
@@ -48682,6 +48796,9 @@ var SecretMetadata = {
     if (message.keys?.length) {
       obj.keys = message.keys;
     }
+    if (message.environmentName !== "") {
+      obj.environmentName = message.environmentName;
+    }
     return obj;
   },
   create(base) {
@@ -48692,6 +48809,7 @@ var SecretMetadata = {
     message.name = object.name ?? "";
     message.creationInfo = object.creationInfo !== void 0 && object.creationInfo !== null ? CreationInfo.fromPartial(object.creationInfo) : void 0;
     message.keys = object.keys?.map((e) => e) || [];
+    message.environmentName = object.environmentName ?? "";
     return message;
   }
 };
@@ -62076,6 +62194,14 @@ var ModalClientDefinition = {
       responseStream: false,
       options: {}
     },
+    secretGetInfo: {
+      name: "SecretGetInfo",
+      requestType: SecretGetInfoRequest,
+      requestStream: false,
+      responseType: SecretGetInfoResponse,
+      responseStream: false,
+      options: {}
+    },
     secretGetOrCreate: {
       name: "SecretGetOrCreate",
       requestType: SecretGetOrCreateRequest,
@@ -71226,6 +71352,7 @@ var SandboxSnapshotService = class {
 var SB_LOGS_INITIAL_DELAY_MS = 10;
 var SB_LOGS_DELAY_FACTOR = 2;
 var SB_LOGS_MAX_RETRIES = 10;
+var SB_LOGS_TASK_ID_TIMEOUT_SECONDS = 0.5;
 var TTL_NO_EXPIRY_SENTINEL = -1;
 var CUSTOMER_SUPPLIED_ENCRYPTION_KEY_MIN_LENGTH = 16;
 var CUSTOMER_SUPPLIED_ENCRYPTION_KEY_MAX_LENGTH = 512;
@@ -72083,6 +72210,7 @@ function buildTaskSnapshotDirectoryRequestProto(taskId, path2, snapshotId, ttlSe
 var Sandbox2 = class _Sandbox {
   #client;
   sandboxId;
+  #appId;
   #stdin;
   #stdout;
   #stderr;
@@ -72129,6 +72257,25 @@ var Sandbox2 = class _Sandbox {
     }
     return this.#stderr;
   }
+  /**
+   * Access persisted entrypoint logs emitted by this Sandbox.
+   *
+   * Use {@link SandboxLogsManager#fetch fetch()} to read logs from a UTC time
+   * range and {@link SandboxLogsManager#tail tail()} to read the most recent
+   * logs.
+   *
+   * This is separate from {@link Sandbox#stdout stdout} and
+   * {@link Sandbox#stderr stderr}, which expose the Sandbox's live output
+   * streams.
+   */
+  get logs() {
+    return new SandboxLogsManager(
+      this.#client,
+      this.sandboxId,
+      () => this.#getAppId(),
+      () => this.#resolveTaskIdForLogs()
+    );
+  }
   #outputStream(fileDescriptor) {
     if (this.#isV2) {
       this.#ensureAttached();
@@ -72361,8 +72508,11 @@ var Sandbox2 = class _Sandbox {
     }
     return this.#client.cpClient.sandboxWait(req);
   }
-  #sandboxGetTaskId(signal) {
-    const req = { sandboxId: this.sandboxId };
+  #sandboxGetTaskId(signal, timeout) {
+    const req = SandboxGetTaskIdRequest.create({
+      sandboxId: this.sandboxId,
+      timeout
+    });
     if (this.#isV2) {
       return this.#client.cpClient.sandboxGetTaskIdV2(req, { signal });
     }
@@ -72392,6 +72542,42 @@ var Sandbox2 = class _Sandbox {
   }
   static #maxGetTaskIdAttempts = 600;
   // 5 minutes at 500ms intervals
+  async #getAppId() {
+    if (this.#appId !== void 0) {
+      return this.#appId;
+    }
+    const resp = await this.#sandboxWait(0);
+    const appId = resp.metadata?.appId;
+    if (!appId) {
+      throw new ExecutionError(
+        "Sandbox app ID should have been set during hydration"
+      );
+    }
+    this.#appId = appId;
+    return appId;
+  }
+  async #resolveTaskIdForLogs() {
+    if (this.#taskId !== void 0) {
+      return this.#taskId;
+    }
+    let resp;
+    try {
+      resp = await this.#sandboxGetTaskId(
+        void 0,
+        SB_LOGS_TASK_ID_TIMEOUT_SECONDS
+      );
+    } catch (error) {
+      if (error instanceof import_nice_grpc12.ClientError && error.code === import_nice_grpc12.Status.DEADLINE_EXCEEDED) {
+        throw new ExecutionError("Sandbox task ID is not available yet.");
+      }
+      throw error;
+    }
+    if (!resp.taskId) {
+      throw new ExecutionError("Sandbox task ID is not available.");
+    }
+    this.#taskId = resp.taskId;
+    return this.#taskId;
+  }
   async #getTaskId(signal) {
     if (this.#taskId !== void 0) {
       return this.#taskId;
@@ -73400,7 +73586,7 @@ var AuthTokenManager = class {
 };
 
 // src/version.ts
-var SDK_VERSION = "0.10.2-dev.6";
+var SDK_VERSION = "0.10.2-dev.7";
 function getSDKVersion() {
   return SDK_VERSION;
 }
@@ -74141,6 +74327,8 @@ function contextIds(batch, item, ObjectId) {
         item.inputId || batch.inputId,
         item.containerId || batch.taskId
       ].filter((id) => id);
+    case "sb":
+      return [item.containerId || batch.taskId].filter((id) => id);
     default:
       return [];
   }
@@ -74961,6 +75149,97 @@ var FunctionCallLogsManager = class extends LogsManager {
     );
   }
 };
+var SandboxLogsManager = class {
+  /** @ignore */
+  constructor(client, sandboxId, getAppId, getTaskId) {
+    this.client = client;
+    this.sandboxId = sandboxId;
+    this.getAppId = getAppId;
+    this.getTaskId = getTaskId;
+  }
+  /**
+   * Fetch Sandbox entrypoint logs corresponding to a UTC time range and
+   * optional filters.
+   *
+   * Entries are returned in chronological order.
+   *
+   * @returns An async iterable of {@link LogEntry} objects.
+   *
+   * @example
+   * ```typescript
+   * import { ModalClient } from "modal";
+   *
+   * const modal = new ModalClient();
+   * const sandbox = await modal.sandboxes.fromId("sb-...");
+   *
+   * for await (const entry of sandbox.logs.fetch({
+   *   since: new Date(Date.now() - 60 * 60 * 1_000),
+   *   source: "stdout",
+   * })) {
+   *   process.stdout.write(entry.message);
+   * }
+   * ```
+   */
+  async *fetch(params) {
+    const [appId, taskId] = await Promise.all([
+      this.getAppId(),
+      this.getTaskId()
+    ]);
+    if (!taskId) {
+      throw new ExecutionError(
+        "Cannot resolve Sandbox metadata needed for fetching logs. Wait for the Sandbox to be scheduled."
+      );
+    }
+    yield* fetchLogs(
+      this.client,
+      {
+        appId,
+        objectId: this.sandboxId,
+        taskId,
+        source: sourceToFileDescriptor(params.source),
+        searchText: params.searchText
+      },
+      params.since,
+      params.until
+    );
+  }
+  /**
+   * Fetch the most recent Sandbox entrypoint logs.
+   *
+   * Entries are returned in chronological order.
+   *
+   * @returns An async iterable of {@link LogEntry} objects.
+   *
+   * @example
+   * ```typescript
+   * import { ModalClient } from "modal";
+   *
+   * const modal = new ModalClient();
+   * const sandbox = await modal.sandboxes.fromId("sb-...");
+   *
+   * for await (const entry of sandbox.logs.tail({ entries: 20 })) {
+   *   process.stdout.write(entry.message);
+   * }
+   * ```
+   */
+  async *tail(params = {}) {
+    const [appId, taskId] = await Promise.all([
+      this.getAppId(),
+      this.getTaskId()
+    ]);
+    if (!taskId) {
+      throw new ExecutionError(
+        "Sandbox task ID cannot be empty when fetching logs. Wait for the Sandbox to be scheduled."
+      );
+    }
+    yield* tailLogs(this.client, params.entries ?? 100, {
+      appId,
+      objectId: this.sandboxId,
+      taskId,
+      source: sourceToFileDescriptor(params.source)
+    });
+  }
+};
 
 // src/function_call.ts
 var FunctionCallService = class {
@@ -75898,6 +76177,7 @@ var OutboundPolicy2 = class _OutboundPolicy {
   SandboxFilesystemNotFoundError,
   SandboxFilesystemPathAlreadyExistsError,
   SandboxFilesystemPermissionError,
+  SandboxLogsManager,
   SandboxService,
   SandboxSnapshot,
   SandboxSnapshotService,

package/dist/index.d.cts

@@ -4097,6 +4097,14 @@ interface SecretDeleteRequest {
     secretId: string;
 }
 declare const SecretDeleteRequest: MessageFns$1<SecretDeleteRequest>;
+interface SecretGetInfoRequest {
+    secretId: string;
+}
+declare const SecretGetInfoRequest: MessageFns$1<SecretGetInfoRequest>;
+interface SecretGetInfoResponse {
+    metadata: SecretMetadata | undefined;
+}
+declare const SecretGetInfoResponse: MessageFns$1<SecretGetInfoResponse>;
 interface SecretGetOrCreateRequest {
     deploymentName: string;
     environmentName: string;
@@ -4140,6 +4148,7 @@ interface SecretMetadata {
     name: string;
     creationInfo: CreationInfo | undefined;
     keys: string[];
+    environmentName: string;
 }
 declare const SecretMetadata: MessageFns$1<SecretMetadata>;
 interface SecretUpdateRequest {
@@ -6619,6 +6628,14 @@ declare const ModalClientDefinition: {
             readonly responseStream: false;
             readonly options: {};
         };
+        readonly secretGetInfo: {
+            readonly name: "SecretGetInfo";
+            readonly requestType: MessageFns$1<SecretGetInfoRequest>;
+            readonly requestStream: false;
+            readonly responseType: MessageFns$1<SecretGetInfoResponse>;
+            readonly responseStream: false;
+            readonly options: {};
+        };
         readonly secretGetOrCreate: {
             readonly name: "SecretGetOrCreate";
             readonly requestType: MessageFns$1<SecretGetOrCreateRequest>;
@@ -7319,6 +7336,8 @@ interface FunctionCallLogFetchParams {
     /** Filter by text contained in the log message. */
     searchText?: string;
 }
+type SandboxLogFetchParams = FunctionLogFetchParams;
+type SandboxLogTailParams = FunctionLogTailParams;
 interface FunctionLogs {
     fetch(params: FunctionLogFetchParams): AsyncIterable<LogEntry>;
     tail(params?: FunctionLogTailParams): AsyncIterable<LogEntry>;
@@ -7329,6 +7348,10 @@ interface FunctionCallLogs extends Omit<FunctionLogs, "fetch"> {
     tail(params?: FunctionCallLogTailParams): AsyncIterable<LogEntry>;
     stream(params?: FunctionCallLogStreamParams): AsyncIterable<LogEntry>;
 }
+interface SandboxLogs {
+    fetch(params: SandboxLogFetchParams): AsyncIterable<LogEntry>;
+    tail(params?: SandboxLogTailParams): AsyncIterable<LogEntry>;
+}
 interface LogQueryParams {
     client: ModalClient;
     objectId: string;
@@ -7481,6 +7504,59 @@ declare class FunctionCallLogsManager extends LogsManager implements FunctionCal
      */
     stream(params?: FunctionCallLogStreamParams): AsyncIterable<LogEntry>;
 }
+/** Namespace for Sandbox entrypoint log APIs. */
+declare class SandboxLogsManager implements SandboxLogs {
+    private readonly client;
+    private readonly sandboxId;
+    private readonly getAppId;
+    private readonly getTaskId;
+    /** @ignore */
+    constructor(client: ModalClient, sandboxId: string, getAppId: () => Promise<string>, getTaskId: () => Promise<string>);
+    /**
+     * Fetch Sandbox entrypoint logs corresponding to a UTC time range and
+     * optional filters.
+     *
+     * Entries are returned in chronological order.
+     *
+     * @returns An async iterable of {@link LogEntry} objects.
+     *
+     * @example
+     * ```typescript
+     * import { ModalClient } from "modal";
+     *
+     * const modal = new ModalClient();
+     * const sandbox = await modal.sandboxes.fromId("sb-...");
+     *
+     * for await (const entry of sandbox.logs.fetch({
+     *   since: new Date(Date.now() - 60 * 60 * 1_000),
+     *   source: "stdout",
+     * })) {
+     *   process.stdout.write(entry.message);
+     * }
+     * ```
+     */
+    fetch(params: SandboxLogFetchParams): AsyncIterable<LogEntry>;
+    /**
+     * Fetch the most recent Sandbox entrypoint logs.
+     *
+     * Entries are returned in chronological order.
+     *
+     * @returns An async iterable of {@link LogEntry} objects.
+     *
+     * @example
+     * ```typescript
+     * import { ModalClient } from "modal";
+     *
+     * const modal = new ModalClient();
+     * const sandbox = await modal.sandboxes.fromId("sb-...");
+     *
+     * for await (const entry of sandbox.logs.tail({ entries: 20 })) {
+     *   process.stdout.write(entry.message);
+     * }
+     * ```
+     */
+    tail(params?: SandboxLogTailParams): AsyncIterable<LogEntry>;
+}
 
 /**
  * Service for managing {@link FunctionCall}s.
@@ -9504,6 +9580,18 @@ declare class Sandbox {
     get stdin(): ModalWriteStream<string>;
     get stdout(): ModalReadStream<string>;
     get stderr(): ModalReadStream<string>;
+    /**
+     * Access persisted entrypoint logs emitted by this Sandbox.
+     *
+     * Use {@link SandboxLogsManager#fetch fetch()} to read logs from a UTC time
+     * range and {@link SandboxLogsManager#tail tail()} to read the most recent
+     * logs.
+     *
+     * This is separate from {@link Sandbox#stdout stdout} and
+     * {@link Sandbox#stderr stderr}, which expose the Sandbox's live output
+     * streams.
+     */
+    get logs(): SandboxLogsManager;
     get filesystem(): SandboxFilesystem;
     /**
      * Operations for managing sidecar containers that run alongside the
@@ -9972,4 +10060,4 @@ declare class ClientClosedError extends Error {
 
 declare function checkForRenamedParams(params: any, renames: Record<string, string>): void;
 
-export { AlreadyExistsError, App, type AppFromNameParams, AppService, ClientClosedError, CloudBucketMount, CloudBucketMountService, Cls, type ClsFromNameParams, ClsInstance, ClsService, type ClsWithBatchingParams, type ClsWithConcurrencyParams, type ClsWithOptionsParams, ConflictError, ContainerProcess, ExecutionError, type FileInfo, type FileType, type FileWatchEvent, type FileWatchEventType, type FunctionAutoscalerSettings, FunctionCall, type FunctionCallCancelParams, type FunctionCallGetParams, type FunctionCallLogFetchParams, type FunctionCallLogStreamParams, type FunctionCallLogTailParams, FunctionCallLogsManager, FunctionCallService, type FunctionFromNameParams, type FunctionLogFetchParams, type FunctionLogStreamParams, type FunctionLogTailParams, FunctionLogsManager, FunctionService, type FunctionStats, FunctionTimeoutError, type FunctionUpdateAutoscalerParams, type FunctionWithBatchingParams, type FunctionWithConcurrencyParams, type FunctionWithOptionsParams, Function_, Image, type ImageDeleteParams, type ImageDockerfileCommandsParams, type ImageFromNameParams, type ImagePublishParams, ImageService, InternalFailure, InvalidError, type LogEntry, type FunctionLogFetchParams as LogFetchParams, type LogLevel, type LogSource, type Logger, ModalClient, type ModalClientParams, type ModalReadStream, type ModalWriteStream, NotFoundError, OutboundPolicy, Probe, type ProbeParams, type Profile, Proxy, type ProxyFromNameParams, ProxyService, Queue, type QueueClearParams, type QueueDeleteParams, QueueEmptyError, type QueueEphemeralParams, type QueueFromNameParams, QueueFullError, type QueueGetParams, type QueueIterateParams, type QueueLenParams, type QueuePutParams, QueueService, RemoteError, Retries, Sandbox, type SandboxCreateConnectCredentials, type SandboxCreateConnectTokenParams, type SandboxCreateParams, type SandboxExecParams, type SandboxExperimentalFromNameParams, type SandboxExperimentalFromSnapshotParams, type SandboxExperimentalGetExitSnapshotParams, type SandboxExperimentalListParams, SandboxFilesystem, SandboxFilesystemDirectoryNotEmptyError, SandboxFilesystemError, SandboxFilesystemFileTooLargeError, SandboxFilesystemIsADirectoryError, SandboxFilesystemNotADirectoryError, SandboxFilesystemNotFoundError, SandboxFilesystemPathAlreadyExistsError, SandboxFilesystemPermissionError, type SandboxFromNameParams, type SandboxListParams, type SandboxMountImageParams, type SandboxReloadVolumesParams, SandboxService, SandboxSnapshot, type SandboxSnapshotDirectoryParams, type SandboxSnapshotFilesystemParams, SandboxSnapshotService, type SandboxTerminateParams, SandboxTimeoutError, type SandboxUpdateNetworkPolicyParams, Secret, type SecretDeleteParams, type SecretFromNameParams, type SecretFromObjectParams, SecretService, SidecarContainer, type SidecarCreateParams, type SidecarExecParams, type SidecarGetParams, type SidecarListParams, type SidecarMountImageParams, SidecarService, type SidecarSnapshotDirectoryParams, type SidecarSnapshotFilesystemParams, type SidecarTerminateParams, type SidecarUnmountImageParams, SnapshotCreationError, type StdioBehavior, type StreamMode, TimeoutError, Tunnel, Volume, type VolumeDeleteParams, type VolumeEphemeralParams, type VolumeFromNameParams, type VolumeMountOptionsParams, VolumeService, checkForRenamedParams };
+export { AlreadyExistsError, App, type AppFromNameParams, AppService, ClientClosedError, CloudBucketMount, CloudBucketMountService, Cls, type ClsFromNameParams, ClsInstance, ClsService, type ClsWithBatchingParams, type ClsWithConcurrencyParams, type ClsWithOptionsParams, ConflictError, ContainerProcess, ExecutionError, type FileInfo, type FileType, type FileWatchEvent, type FileWatchEventType, type FunctionAutoscalerSettings, FunctionCall, type FunctionCallCancelParams, type FunctionCallGetParams, type FunctionCallLogFetchParams, type FunctionCallLogStreamParams, type FunctionCallLogTailParams, FunctionCallLogsManager, FunctionCallService, type FunctionFromNameParams, type FunctionLogFetchParams, type FunctionLogStreamParams, type FunctionLogTailParams, FunctionLogsManager, FunctionService, type FunctionStats, FunctionTimeoutError, type FunctionUpdateAutoscalerParams, type FunctionWithBatchingParams, type FunctionWithConcurrencyParams, type FunctionWithOptionsParams, Function_, Image, type ImageDeleteParams, type ImageDockerfileCommandsParams, type ImageFromNameParams, type ImagePublishParams, ImageService, InternalFailure, InvalidError, type LogEntry, type FunctionLogFetchParams as LogFetchParams, type LogLevel, type LogSource, type Logger, ModalClient, type ModalClientParams, type ModalReadStream, type ModalWriteStream, NotFoundError, OutboundPolicy, Probe, type ProbeParams, type Profile, Proxy, type ProxyFromNameParams, ProxyService, Queue, type QueueClearParams, type QueueDeleteParams, QueueEmptyError, type QueueEphemeralParams, type QueueFromNameParams, QueueFullError, type QueueGetParams, type QueueIterateParams, type QueueLenParams, type QueuePutParams, QueueService, RemoteError, Retries, Sandbox, type SandboxCreateConnectCredentials, type SandboxCreateConnectTokenParams, type SandboxCreateParams, type SandboxExecParams, type SandboxExperimentalFromNameParams, type SandboxExperimentalFromSnapshotParams, type SandboxExperimentalGetExitSnapshotParams, type SandboxExperimentalListParams, SandboxFilesystem, SandboxFilesystemDirectoryNotEmptyError, SandboxFilesystemError, SandboxFilesystemFileTooLargeError, SandboxFilesystemIsADirectoryError, SandboxFilesystemNotADirectoryError, SandboxFilesystemNotFoundError, SandboxFilesystemPathAlreadyExistsError, SandboxFilesystemPermissionError, type SandboxFromNameParams, type SandboxListParams, type SandboxLogFetchParams, type SandboxLogTailParams, SandboxLogsManager, type SandboxMountImageParams, type SandboxReloadVolumesParams, SandboxService, SandboxSnapshot, type SandboxSnapshotDirectoryParams, type SandboxSnapshotFilesystemParams, SandboxSnapshotService, type SandboxTerminateParams, SandboxTimeoutError, type SandboxUpdateNetworkPolicyParams, Secret, type SecretDeleteParams, type SecretFromNameParams, type SecretFromObjectParams, SecretService, SidecarContainer, type SidecarCreateParams, type SidecarExecParams, type SidecarGetParams, type SidecarListParams, type SidecarMountImageParams, SidecarService, type SidecarSnapshotDirectoryParams, type SidecarSnapshotFilesystemParams, type SidecarTerminateParams, type SidecarUnmountImageParams, SnapshotCreationError, type StdioBehavior, type StreamMode, TimeoutError, Tunnel, Volume, type VolumeDeleteParams, type VolumeEphemeralParams, type VolumeFromNameParams, type VolumeMountOptionsParams, VolumeService, checkForRenamedParams };

package/dist/index.d.ts

@@ -4097,6 +4097,14 @@ interface SecretDeleteRequest {
     secretId: string;
 }
 declare const SecretDeleteRequest: MessageFns$1<SecretDeleteRequest>;
+interface SecretGetInfoRequest {
+    secretId: string;
+}
+declare const SecretGetInfoRequest: MessageFns$1<SecretGetInfoRequest>;
+interface SecretGetInfoResponse {
+    metadata: SecretMetadata | undefined;
+}
+declare const SecretGetInfoResponse: MessageFns$1<SecretGetInfoResponse>;
 interface SecretGetOrCreateRequest {
     deploymentName: string;
     environmentName: string;
@@ -4140,6 +4148,7 @@ interface SecretMetadata {
     name: string;
     creationInfo: CreationInfo | undefined;
     keys: string[];
+    environmentName: string;
 }
 declare const SecretMetadata: MessageFns$1<SecretMetadata>;
 interface SecretUpdateRequest {
@@ -6619,6 +6628,14 @@ declare const ModalClientDefinition: {
             readonly responseStream: false;
             readonly options: {};
         };
+        readonly secretGetInfo: {
+            readonly name: "SecretGetInfo";
+            readonly requestType: MessageFns$1<SecretGetInfoRequest>;
+            readonly requestStream: false;
+            readonly responseType: MessageFns$1<SecretGetInfoResponse>;
+            readonly responseStream: false;
+            readonly options: {};
+        };
         readonly secretGetOrCreate: {
             readonly name: "SecretGetOrCreate";
             readonly requestType: MessageFns$1<SecretGetOrCreateRequest>;
@@ -7319,6 +7336,8 @@ interface FunctionCallLogFetchParams {
     /** Filter by text contained in the log message. */
     searchText?: string;
 }
+type SandboxLogFetchParams = FunctionLogFetchParams;
+type SandboxLogTailParams = FunctionLogTailParams;
 interface FunctionLogs {
     fetch(params: FunctionLogFetchParams): AsyncIterable<LogEntry>;
     tail(params?: FunctionLogTailParams): AsyncIterable<LogEntry>;
@@ -7329,6 +7348,10 @@ interface FunctionCallLogs extends Omit<FunctionLogs, "fetch"> {
     tail(params?: FunctionCallLogTailParams): AsyncIterable<LogEntry>;
     stream(params?: FunctionCallLogStreamParams): AsyncIterable<LogEntry>;
 }
+interface SandboxLogs {
+    fetch(params: SandboxLogFetchParams): AsyncIterable<LogEntry>;
+    tail(params?: SandboxLogTailParams): AsyncIterable<LogEntry>;
+}
 interface LogQueryParams {
     client: ModalClient;
     objectId: string;
@@ -7481,6 +7504,59 @@ declare class FunctionCallLogsManager extends LogsManager implements FunctionCal
      */
     stream(params?: FunctionCallLogStreamParams): AsyncIterable<LogEntry>;
 }
+/** Namespace for Sandbox entrypoint log APIs. */
+declare class SandboxLogsManager implements SandboxLogs {
+    private readonly client;
+    private readonly sandboxId;
+    private readonly getAppId;
+    private readonly getTaskId;
+    /** @ignore */
+    constructor(client: ModalClient, sandboxId: string, getAppId: () => Promise<string>, getTaskId: () => Promise<string>);
+    /**
+     * Fetch Sandbox entrypoint logs corresponding to a UTC time range and
+     * optional filters.
+     *
+     * Entries are returned in chronological order.
+     *
+     * @returns An async iterable of {@link LogEntry} objects.
+     *
+     * @example
+     * ```typescript
+     * import { ModalClient } from "modal";
+     *
+     * const modal = new ModalClient();
+     * const sandbox = await modal.sandboxes.fromId("sb-...");
+     *
+     * for await (const entry of sandbox.logs.fetch({
+     *   since: new Date(Date.now() - 60 * 60 * 1_000),
+     *   source: "stdout",
+     * })) {
+     *   process.stdout.write(entry.message);
+     * }
+     * ```
+     */
+    fetch(params: SandboxLogFetchParams): AsyncIterable<LogEntry>;
+    /**
+     * Fetch the most recent Sandbox entrypoint logs.
+     *
+     * Entries are returned in chronological order.
+     *
+     * @returns An async iterable of {@link LogEntry} objects.
+     *
+     * @example
+     * ```typescript
+     * import { ModalClient } from "modal";
+     *
+     * const modal = new ModalClient();
+     * const sandbox = await modal.sandboxes.fromId("sb-...");
+     *
+     * for await (const entry of sandbox.logs.tail({ entries: 20 })) {
+     *   process.stdout.write(entry.message);
+     * }
+     * ```
+     */
+    tail(params?: SandboxLogTailParams): AsyncIterable<LogEntry>;
+}
 
 /**
  * Service for managing {@link FunctionCall}s.
@@ -9504,6 +9580,18 @@ declare class Sandbox {
     get stdin(): ModalWriteStream<string>;
     get stdout(): ModalReadStream<string>;
     get stderr(): ModalReadStream<string>;
+    /**
+     * Access persisted entrypoint logs emitted by this Sandbox.
+     *
+     * Use {@link SandboxLogsManager#fetch fetch()} to read logs from a UTC time
+     * range and {@link SandboxLogsManager#tail tail()} to read the most recent
+     * logs.
+     *
+     * This is separate from {@link Sandbox#stdout stdout} and
+     * {@link Sandbox#stderr stderr}, which expose the Sandbox's live output
+     * streams.
+     */
+    get logs(): SandboxLogsManager;
     get filesystem(): SandboxFilesystem;
     /**
      * Operations for managing sidecar containers that run alongside the
@@ -9972,4 +10060,4 @@ declare class ClientClosedError extends Error {
 
 declare function checkForRenamedParams(params: any, renames: Record<string, string>): void;
 
-export { AlreadyExistsError, App, type AppFromNameParams, AppService, ClientClosedError, CloudBucketMount, CloudBucketMountService, Cls, type ClsFromNameParams, ClsInstance, ClsService, type ClsWithBatchingParams, type ClsWithConcurrencyParams, type ClsWithOptionsParams, ConflictError, ContainerProcess, ExecutionError, type FileInfo, type FileType, type FileWatchEvent, type FileWatchEventType, type FunctionAutoscalerSettings, FunctionCall, type FunctionCallCancelParams, type FunctionCallGetParams, type FunctionCallLogFetchParams, type FunctionCallLogStreamParams, type FunctionCallLogTailParams, FunctionCallLogsManager, FunctionCallService, type FunctionFromNameParams, type FunctionLogFetchParams, type FunctionLogStreamParams, type FunctionLogTailParams, FunctionLogsManager, FunctionService, type FunctionStats, FunctionTimeoutError, type FunctionUpdateAutoscalerParams, type FunctionWithBatchingParams, type FunctionWithConcurrencyParams, type FunctionWithOptionsParams, Function_, Image, type ImageDeleteParams, type ImageDockerfileCommandsParams, type ImageFromNameParams, type ImagePublishParams, ImageService, InternalFailure, InvalidError, type LogEntry, type FunctionLogFetchParams as LogFetchParams, type LogLevel, type LogSource, type Logger, ModalClient, type ModalClientParams, type ModalReadStream, type ModalWriteStream, NotFoundError, OutboundPolicy, Probe, type ProbeParams, type Profile, Proxy, type ProxyFromNameParams, ProxyService, Queue, type QueueClearParams, type QueueDeleteParams, QueueEmptyError, type QueueEphemeralParams, type QueueFromNameParams, QueueFullError, type QueueGetParams, type QueueIterateParams, type QueueLenParams, type QueuePutParams, QueueService, RemoteError, Retries, Sandbox, type SandboxCreateConnectCredentials, type SandboxCreateConnectTokenParams, type SandboxCreateParams, type SandboxExecParams, type SandboxExperimentalFromNameParams, type SandboxExperimentalFromSnapshotParams, type SandboxExperimentalGetExitSnapshotParams, type SandboxExperimentalListParams, SandboxFilesystem, SandboxFilesystemDirectoryNotEmptyError, SandboxFilesystemError, SandboxFilesystemFileTooLargeError, SandboxFilesystemIsADirectoryError, SandboxFilesystemNotADirectoryError, SandboxFilesystemNotFoundError, SandboxFilesystemPathAlreadyExistsError, SandboxFilesystemPermissionError, type SandboxFromNameParams, type SandboxListParams, type SandboxMountImageParams, type SandboxReloadVolumesParams, SandboxService, SandboxSnapshot, type SandboxSnapshotDirectoryParams, type SandboxSnapshotFilesystemParams, SandboxSnapshotService, type SandboxTerminateParams, SandboxTimeoutError, type SandboxUpdateNetworkPolicyParams, Secret, type SecretDeleteParams, type SecretFromNameParams, type SecretFromObjectParams, SecretService, SidecarContainer, type SidecarCreateParams, type SidecarExecParams, type SidecarGetParams, type SidecarListParams, type SidecarMountImageParams, SidecarService, type SidecarSnapshotDirectoryParams, type SidecarSnapshotFilesystemParams, type SidecarTerminateParams, type SidecarUnmountImageParams, SnapshotCreationError, type StdioBehavior, type StreamMode, TimeoutError, Tunnel, Volume, type VolumeDeleteParams, type VolumeEphemeralParams, type VolumeFromNameParams, type VolumeMountOptionsParams, VolumeService, checkForRenamedParams };
+export { AlreadyExistsError, App, type AppFromNameParams, AppService, ClientClosedError, CloudBucketMount, CloudBucketMountService, Cls, type ClsFromNameParams, ClsInstance, ClsService, type ClsWithBatchingParams, type ClsWithConcurrencyParams, type ClsWithOptionsParams, ConflictError, ContainerProcess, ExecutionError, type FileInfo, type FileType, type FileWatchEvent, type FileWatchEventType, type FunctionAutoscalerSettings, FunctionCall, type FunctionCallCancelParams, type FunctionCallGetParams, type FunctionCallLogFetchParams, type FunctionCallLogStreamParams, type FunctionCallLogTailParams, FunctionCallLogsManager, FunctionCallService, type FunctionFromNameParams, type FunctionLogFetchParams, type FunctionLogStreamParams, type FunctionLogTailParams, FunctionLogsManager, FunctionService, type FunctionStats, FunctionTimeoutError, type FunctionUpdateAutoscalerParams, type FunctionWithBatchingParams, type FunctionWithConcurrencyParams, type FunctionWithOptionsParams, Function_, Image, type ImageDeleteParams, type ImageDockerfileCommandsParams, type ImageFromNameParams, type ImagePublishParams, ImageService, InternalFailure, InvalidError, type LogEntry, type FunctionLogFetchParams as LogFetchParams, type LogLevel, type LogSource, type Logger, ModalClient, type ModalClientParams, type ModalReadStream, type ModalWriteStream, NotFoundError, OutboundPolicy, Probe, type ProbeParams, type Profile, Proxy, type ProxyFromNameParams, ProxyService, Queue, type QueueClearParams, type QueueDeleteParams, QueueEmptyError, type QueueEphemeralParams, type QueueFromNameParams, QueueFullError, type QueueGetParams, type QueueIterateParams, type QueueLenParams, type QueuePutParams, QueueService, RemoteError, Retries, Sandbox, type SandboxCreateConnectCredentials, type SandboxCreateConnectTokenParams, type SandboxCreateParams, type SandboxExecParams, type SandboxExperimentalFromNameParams, type SandboxExperimentalFromSnapshotParams, type SandboxExperimentalGetExitSnapshotParams, type SandboxExperimentalListParams, SandboxFilesystem, SandboxFilesystemDirectoryNotEmptyError, SandboxFilesystemError, SandboxFilesystemFileTooLargeError, SandboxFilesystemIsADirectoryError, SandboxFilesystemNotADirectoryError, SandboxFilesystemNotFoundError, SandboxFilesystemPathAlreadyExistsError, SandboxFilesystemPermissionError, type SandboxFromNameParams, type SandboxListParams, type SandboxLogFetchParams, type SandboxLogTailParams, SandboxLogsManager, type SandboxMountImageParams, type SandboxReloadVolumesParams, SandboxService, SandboxSnapshot, type SandboxSnapshotDirectoryParams, type SandboxSnapshotFilesystemParams, SandboxSnapshotService, type SandboxTerminateParams, SandboxTimeoutError, type SandboxUpdateNetworkPolicyParams, Secret, type SecretDeleteParams, type SecretFromNameParams, type SecretFromObjectParams, SecretService, SidecarContainer, type SidecarCreateParams, type SidecarExecParams, type SidecarGetParams, type SidecarListParams, type SidecarMountImageParams, SidecarService, type SidecarSnapshotDirectoryParams, type SidecarSnapshotFilesystemParams, type SidecarTerminateParams, type SidecarUnmountImageParams, SnapshotCreationError, type StdioBehavior, type StreamMode, TimeoutError, Tunnel, Volume, type VolumeDeleteParams, type VolumeEphemeralParams, type VolumeFromNameParams, type VolumeMountOptionsParams, VolumeService, checkForRenamedParams };

package/dist/index.js

@@ -47974,6 +47974,108 @@ var SecretDeleteRequest = {
     return message;
   }
 };
+function createBaseSecretGetInfoRequest() {
+  return { secretId: "" };
+}
+var SecretGetInfoRequest = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.secretId !== "") {
+      writer.uint32(10).string(message.secretId);
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseSecretGetInfoRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.secretId = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return { secretId: isSet5(object.secretId) ? globalThis.String(object.secretId) : "" };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.secretId !== "") {
+      obj.secretId = message.secretId;
+    }
+    return obj;
+  },
+  create(base) {
+    return SecretGetInfoRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseSecretGetInfoRequest();
+    message.secretId = object.secretId ?? "";
+    return message;
+  }
+};
+function createBaseSecretGetInfoResponse() {
+  return { metadata: void 0 };
+}
+var SecretGetInfoResponse = {
+  encode(message, writer = new BinaryWriter()) {
+    if (message.metadata !== void 0) {
+      SecretMetadata.encode(message.metadata, writer.uint32(10).fork()).join();
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseSecretGetInfoResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.metadata = SecretMetadata.decode(reader, reader.uint32());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return { metadata: isSet5(object.metadata) ? SecretMetadata.fromJSON(object.metadata) : void 0 };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.metadata !== void 0) {
+      obj.metadata = SecretMetadata.toJSON(message.metadata);
+    }
+    return obj;
+  },
+  create(base) {
+    return SecretGetInfoResponse.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseSecretGetInfoResponse();
+    message.metadata = object.metadata !== void 0 && object.metadata !== null ? SecretMetadata.fromPartial(object.metadata) : void 0;
+    return message;
+  }
+};
 function createBaseSecretGetOrCreateRequest() {
   return { deploymentName: "", environmentName: "", objectCreationType: 0, envDict: {}, appId: "", requiredKeys: [] };
 }
@@ -48520,7 +48622,7 @@ var SecretListResponse = {
   }
 };
 function createBaseSecretMetadata() {
-  return { name: "", creationInfo: void 0, keys: [] };
+  return { name: "", creationInfo: void 0, keys: [], environmentName: "" };
 }
 var SecretMetadata = {
   encode(message, writer = new BinaryWriter()) {
@@ -48533,6 +48635,9 @@ var SecretMetadata = {
     for (const v of message.keys) {
       writer.uint32(26).string(v);
     }
+    if (message.environmentName !== "") {
+      writer.uint32(34).string(message.environmentName);
+    }
     return writer;
   },
   decode(input, length) {
@@ -48563,6 +48668,13 @@ var SecretMetadata = {
           message.keys.push(reader.string());
           continue;
         }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+          message.environmentName = reader.string();
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -48575,7 +48687,8 @@ var SecretMetadata = {
     return {
       name: isSet5(object.name) ? globalThis.String(object.name) : "",
       creationInfo: isSet5(object.creationInfo) ? CreationInfo.fromJSON(object.creationInfo) : void 0,
-      keys: globalThis.Array.isArray(object?.keys) ? object.keys.map((e) => globalThis.String(e)) : []
+      keys: globalThis.Array.isArray(object?.keys) ? object.keys.map((e) => globalThis.String(e)) : [],
+      environmentName: isSet5(object.environmentName) ? globalThis.String(object.environmentName) : ""
     };
   },
   toJSON(message) {
@@ -48589,6 +48702,9 @@ var SecretMetadata = {
     if (message.keys?.length) {
       obj.keys = message.keys;
     }
+    if (message.environmentName !== "") {
+      obj.environmentName = message.environmentName;
+    }
     return obj;
   },
   create(base) {
@@ -48599,6 +48715,7 @@ var SecretMetadata = {
     message.name = object.name ?? "";
     message.creationInfo = object.creationInfo !== void 0 && object.creationInfo !== null ? CreationInfo.fromPartial(object.creationInfo) : void 0;
     message.keys = object.keys?.map((e) => e) || [];
+    message.environmentName = object.environmentName ?? "";
     return message;
   }
 };
@@ -61983,6 +62100,14 @@ var ModalClientDefinition = {
       responseStream: false,
       options: {}
     },
+    secretGetInfo: {
+      name: "SecretGetInfo",
+      requestType: SecretGetInfoRequest,
+      requestStream: false,
+      responseType: SecretGetInfoResponse,
+      responseStream: false,
+      options: {}
+    },
     secretGetOrCreate: {
       name: "SecretGetOrCreate",
       requestType: SecretGetOrCreateRequest,
@@ -71146,6 +71271,7 @@ var SandboxSnapshotService = class {
 var SB_LOGS_INITIAL_DELAY_MS = 10;
 var SB_LOGS_DELAY_FACTOR = 2;
 var SB_LOGS_MAX_RETRIES = 10;
+var SB_LOGS_TASK_ID_TIMEOUT_SECONDS = 0.5;
 var TTL_NO_EXPIRY_SENTINEL = -1;
 var CUSTOMER_SUPPLIED_ENCRYPTION_KEY_MIN_LENGTH = 16;
 var CUSTOMER_SUPPLIED_ENCRYPTION_KEY_MAX_LENGTH = 512;
@@ -72003,6 +72129,7 @@ function buildTaskSnapshotDirectoryRequestProto(taskId, path2, snapshotId, ttlSe
 var Sandbox2 = class _Sandbox {
   #client;
   sandboxId;
+  #appId;
   #stdin;
   #stdout;
   #stderr;
@@ -72049,6 +72176,25 @@ var Sandbox2 = class _Sandbox {
     }
     return this.#stderr;
   }
+  /**
+   * Access persisted entrypoint logs emitted by this Sandbox.
+   *
+   * Use {@link SandboxLogsManager#fetch fetch()} to read logs from a UTC time
+   * range and {@link SandboxLogsManager#tail tail()} to read the most recent
+   * logs.
+   *
+   * This is separate from {@link Sandbox#stdout stdout} and
+   * {@link Sandbox#stderr stderr}, which expose the Sandbox's live output
+   * streams.
+   */
+  get logs() {
+    return new SandboxLogsManager(
+      this.#client,
+      this.sandboxId,
+      () => this.#getAppId(),
+      () => this.#resolveTaskIdForLogs()
+    );
+  }
   #outputStream(fileDescriptor) {
     if (this.#isV2) {
       this.#ensureAttached();
@@ -72281,8 +72427,11 @@ var Sandbox2 = class _Sandbox {
     }
     return this.#client.cpClient.sandboxWait(req);
   }
-  #sandboxGetTaskId(signal) {
-    const req = { sandboxId: this.sandboxId };
+  #sandboxGetTaskId(signal, timeout) {
+    const req = SandboxGetTaskIdRequest.create({
+      sandboxId: this.sandboxId,
+      timeout
+    });
     if (this.#isV2) {
       return this.#client.cpClient.sandboxGetTaskIdV2(req, { signal });
     }
@@ -72312,6 +72461,42 @@ var Sandbox2 = class _Sandbox {
   }
   static #maxGetTaskIdAttempts = 600;
   // 5 minutes at 500ms intervals
+  async #getAppId() {
+    if (this.#appId !== void 0) {
+      return this.#appId;
+    }
+    const resp = await this.#sandboxWait(0);
+    const appId = resp.metadata?.appId;
+    if (!appId) {
+      throw new ExecutionError(
+        "Sandbox app ID should have been set during hydration"
+      );
+    }
+    this.#appId = appId;
+    return appId;
+  }
+  async #resolveTaskIdForLogs() {
+    if (this.#taskId !== void 0) {
+      return this.#taskId;
+    }
+    let resp;
+    try {
+      resp = await this.#sandboxGetTaskId(
+        void 0,
+        SB_LOGS_TASK_ID_TIMEOUT_SECONDS
+      );
+    } catch (error) {
+      if (error instanceof ClientError11 && error.code === Status11.DEADLINE_EXCEEDED) {
+        throw new ExecutionError("Sandbox task ID is not available yet.");
+      }
+      throw error;
+    }
+    if (!resp.taskId) {
+      throw new ExecutionError("Sandbox task ID is not available.");
+    }
+    this.#taskId = resp.taskId;
+    return this.#taskId;
+  }
   async #getTaskId(signal) {
     if (this.#taskId !== void 0) {
       return this.#taskId;
@@ -73320,7 +73505,7 @@ var AuthTokenManager = class {
 };
 
 // src/version.ts
-var SDK_VERSION = "0.10.2-dev.6";
+var SDK_VERSION = "0.10.2-dev.7";
 function getSDKVersion() {
   return SDK_VERSION;
 }
@@ -74066,6 +74251,8 @@ function contextIds(batch, item, ObjectId) {
         item.inputId || batch.inputId,
         item.containerId || batch.taskId
       ].filter((id) => id);
+    case "sb":
+      return [item.containerId || batch.taskId].filter((id) => id);
     default:
       return [];
   }
@@ -74886,6 +75073,97 @@ var FunctionCallLogsManager = class extends LogsManager {
     );
   }
 };
+var SandboxLogsManager = class {
+  /** @ignore */
+  constructor(client, sandboxId, getAppId, getTaskId) {
+    this.client = client;
+    this.sandboxId = sandboxId;
+    this.getAppId = getAppId;
+    this.getTaskId = getTaskId;
+  }
+  /**
+   * Fetch Sandbox entrypoint logs corresponding to a UTC time range and
+   * optional filters.
+   *
+   * Entries are returned in chronological order.
+   *
+   * @returns An async iterable of {@link LogEntry} objects.
+   *
+   * @example
+   * ```typescript
+   * import { ModalClient } from "modal";
+   *
+   * const modal = new ModalClient();
+   * const sandbox = await modal.sandboxes.fromId("sb-...");
+   *
+   * for await (const entry of sandbox.logs.fetch({
+   *   since: new Date(Date.now() - 60 * 60 * 1_000),
+   *   source: "stdout",
+   * })) {
+   *   process.stdout.write(entry.message);
+   * }
+   * ```
+   */
+  async *fetch(params) {
+    const [appId, taskId] = await Promise.all([
+      this.getAppId(),
+      this.getTaskId()
+    ]);
+    if (!taskId) {
+      throw new ExecutionError(
+        "Cannot resolve Sandbox metadata needed for fetching logs. Wait for the Sandbox to be scheduled."
+      );
+    }
+    yield* fetchLogs(
+      this.client,
+      {
+        appId,
+        objectId: this.sandboxId,
+        taskId,
+        source: sourceToFileDescriptor(params.source),
+        searchText: params.searchText
+      },
+      params.since,
+      params.until
+    );
+  }
+  /**
+   * Fetch the most recent Sandbox entrypoint logs.
+   *
+   * Entries are returned in chronological order.
+   *
+   * @returns An async iterable of {@link LogEntry} objects.
+   *
+   * @example
+   * ```typescript
+   * import { ModalClient } from "modal";
+   *
+   * const modal = new ModalClient();
+   * const sandbox = await modal.sandboxes.fromId("sb-...");
+   *
+   * for await (const entry of sandbox.logs.tail({ entries: 20 })) {
+   *   process.stdout.write(entry.message);
+   * }
+   * ```
+   */
+  async *tail(params = {}) {
+    const [appId, taskId] = await Promise.all([
+      this.getAppId(),
+      this.getTaskId()
+    ]);
+    if (!taskId) {
+      throw new ExecutionError(
+        "Sandbox task ID cannot be empty when fetching logs. Wait for the Sandbox to be scheduled."
+      );
+    }
+    yield* tailLogs(this.client, params.entries ?? 100, {
+      appId,
+      objectId: this.sandboxId,
+      taskId,
+      source: sourceToFileDescriptor(params.source)
+    });
+  }
+};
 
 // src/function_call.ts
 var FunctionCallService = class {
@@ -75822,6 +76100,7 @@ export {
   SandboxFilesystemNotFoundError,
   SandboxFilesystemPathAlreadyExistsError,
   SandboxFilesystemPermissionError,
+  SandboxLogsManager,
   SandboxService,
   SandboxSnapshot,
   SandboxSnapshotService,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modal",
-  "version": "0.10.2-dev.6",
+  "version": "0.10.2-dev.7",
   "description": "Modal SDK for JavaScript/TypeScript",
   "license": "Apache-2.0",
   "homepage": "https://modal.com/docs/guide/sdk-javascript-go",