deepspace 0.15.0 → 0.16.0

package/dist/server.d.ts

@@ -219,28 +219,24 @@ declare const UPLOAD_PART_BYTES: number;
  */
 declare const MAX_UPLOAD_PARTS: number;
 /**
- * Per-tier storage schedule, in bytes. Product semantics, not a deployment
- * dial — the one table both storage allocations admit against:
+ * The customer-visible storage schedule, in bytes, PER ACCOUNT — the total an
+ * owner's uploaded files may occupy across every app they own, not a budget
+ * each app gets separately. This is the number the billing page advertises.
  *
- *   - the repo store (Git packs + retained bundles + deploy assets), admitted
- *     by the app's Repo DO (`platform/deploy-worker/src/vc/storage-quota.ts`)
- *   - the app-files allocation, admitted by the shared files handler
- *     (`server/utils/scoped-r2-files.ts`)
+ * Admitted by the shared files handler (`server/utils/scoped-r2-files.ts`),
+ * which sums the owner's apps rather than the one being written to.
  *
- * Each allocation gets the full amount independently; they are different
- * buckets with different writers (docs/platform/r2-storage.md). The
- * customer-visible "storage" number is the app-files allocation — the repo
- * store is platform bookkeeping that degrades (drops rollback retention)
- * rather than surfacing here.
+ * It deliberately does NOT govern the repo store — see
+ * `REPO_STORE_LIMIT_BYTES` below, and docs/platform/r2-storage.md.
  */
-declare const APP_STORAGE_LIMIT_BYTES: {
+declare const ACCOUNT_STORAGE_LIMIT_BYTES: {
     readonly test: 0;
     readonly free: number;
     readonly starter: number;
     readonly premium: number;
     readonly admin: number;
 };
-/** The storage limit for a billing tier; unknown or missing tiers get free. */
+/** The account storage limit for a billing tier; unknown or missing tiers get free. */
 declare function storageLimitForTier(tier: string | null | undefined): number;
 /** The one storage-quota refusal sentence. `usedBytes` is net of any object
  *  the upload replaces, so an upsert is charged only for its growth. */
@@ -323,15 +319,26 @@ interface ScopedR2Config {
  * applies.
  */
 interface StorageAdmission {
-    /** The WHOLE allocation the quota governs — the app prefix, not the
-     *  (possibly deeper) scope prefix a request resolved to. */
+    /** This app's own prefix — the one the incoming write lands under. */
     prefix: string;
     /**
      * Resolve the owner's limit in bytes. `null` means the lookup failed;
-     * writes then fail closed (503) rather than admitting unmetered storage,
-     * mirroring the repo store's `StorageBillingUnavailableError`.
+     * writes then fail closed (503) rather than admitting unmetered storage.
      */
     limitBytes: () => Promise<number | null>;
+    /**
+     * The OTHER app prefixes this owner's storage spans, if any.
+     *
+     * The limit is per ACCOUNT, not per app: an owner's allocation is the total
+     * across everything they own, so admission has to see the siblings too. `[]`
+     * for an owner with one app, which is the common case and costs exactly what
+     * it did when this was a per-app limit.
+     *
+     * Returning `null` means the owner's apps could not be enumerated. Like a
+     * failed limit lookup that fails the write closed rather than admitting a
+     * write against an allocation we cannot measure.
+     */
+    siblingPrefixes?: () => Promise<string[] | null>;
 }
 interface ScopedR2Auth {
     userId: string | null;
@@ -4659,4 +4666,4 @@ declare class RefundError extends Error {
     constructor(message: string, status: number);
 }
 
-export { AI_CHATS_SCHEMA, AI_MESSAGES_SCHEMA, ALLOWED_BINDING_TYPES, APP_ID_RE, APP_NAME_RULES, APP_STORAGE_LIMIT_BYTES, AUTO_PROVISIONABLE_TYPES, AUTO_PROVISION_SENTINEL, type ActionContext, type ActionHandler, type ActionResult, type ActionTools, type ApiWorkerEnv, type AppNameResolution, type AppNameValidation, type AuthWorkerEnv, BASE_USERS_SCHEMA, BUILT_IN_TOOLS, BaseRoom, CHANNELS_SCHEMA, CHANNEL_INVITATIONS_SCHEMA, CHANNEL_MEMBERS_SCHEMA, CONVERSATION_SCHEMAS, COST_RATES, CancelSubscriptionError, type CancelSubscriptionOpts, type CancelSubscriptionResult, CanvasRoom, type CanvasShape, type ChatContextConfig, type ChatMessageRow, type ChatRow, type ChatTurn, type CollectionPermissionSummary, type CollectionSchema, type ColumnDefinition, type ColumnInterpretation, type ComposioToolsOptions, type ConvMemberData, type ConvMessageData, type ConvReactionData, type ConvReadCursorData, type ConvVoteData, type ConversationStateData, type CronContext, type CronExecution, CronRoom, type CronRoomConfig, type CronTask, type CustomBinding, type CustomBindingManifest, DEFAULT_CONTEXT_CONFIG, DEFAULT_DO_MANIFEST, DEFAULT_QUERY_LIMIT, DEPLOYED_APPS_DEFAULTS, DIRECTORY_SCHEMAS, type DOBindings, type DOManifest, type DOManifestEntry, type DebugApiContext, type DeepSpaceAIEnv, type DeepSpaceAIOptions, type DeepSpaceAgentDiagnosticContext, DeepSpaceAgentModelError, DeepSpaceAgentProfileError, type DeepSpaceAgentStream, type DeepSpaceAgentStreamOptions, type DeepSpaceAuth, type DeepSpaceAuthConfig, type DirectoryCommunityData, type DirectoryConversationData, type DirectoryMembershipData, type DirectoryPostData, type DoMigrationDirective, type DoMigrationPlan, type ExistingDOBinding, GLOBAL_DO_TYPES, GLOBAL_DO_TYPE_NAMES, type GameInput, GameRoom, type GameRoomConfig, type GetActionData, type GlobalDOType, type Job, type JobContext, JobRoom, type JobRoomConfig, type JobStatus, type JwtClaims, type JwtVerifierConfig, MAX_APP_FILE_BYTES, MAX_DEPLOY_ASSET_FILE_BYTES, MAX_UPLOAD_PARTS, MAX_UPLOAD_REQUEST_BYTES, MESSAGES_SCHEMA, type MutateActionData, type PermissionAnalysis, type PermissionContext, type PermissionLevel, type PermissionSource, type PlanInfo, type PlatformWorkerEnv, type Player, type PrefixResult, type PresencePeer, PresenceRoom, type QueryActionData, REACTIONS_SCHEMA, READ_RECEIPTS_SCHEMA, REGISTRY_INSTANCE, RESERVED_BINDING_NAMES, RESERVED_COLLECTION_NAMES, RESOURCE_ID_RE, type RecordContext, RecordRoom, type RecordRoomConfig, RefundError, type RefundOpts, type RefundResult, RegistryClientError, type ResolvedColumn, type ResolvedPermission, type RolePermissions, type RunMigrationsResult, STRICT_APP_ID_RE, SYSTEM_COLLECTION_SCHEMAS, SYSTEM_MANAGED_COLUMNS, SchemaRegistry, type ScopeContext, type ScopedR2Auth, type ScopedR2Config, type ScopedR2Handler, type ScreenshotEnv, type ScreenshotResult, type SharedConnection, type StorageAdmission, type StoredRecord, SubscriptionAuthError, type SubscriptionContext, type SubscriptionRead, SubscriptionRequiredError, type SubscriptionStatus, type Summarizer, TEST_ACCOUNT_EMAIL_SUFFIX, type TokenDebugInfo, type ToolResult, type ToolSchema, type ToolsApiContext, UPLOAD_PART_BYTES, USERS_COLUMNS, type User, type UserAttachment, type UserContext, VOTING_SCHEMAS, type ValidationError, type VerifiedAuth, type VerifyOutcome, type VerifyResult, type Viewport, WORKSPACE_SCHEMAS, type YjsContext, YjsRoom, analyzePermissions, apiWorkerFetch, appendMessage, applyAiToolDefaults, applySlidingWindow, authWorkerFetch, bindingManifestFromOutputConfig, broadcastChange, broadcastYjsUpdate, buildCronContext, buildTableSelect, buildUiParts, callRegistry, canCreate, canDelete, canRead, canUpdate, cancelSubscription, capToolResultSize, captureScreenshot, checkFieldPermissions, coerceValue, collectionTableName, columnId, composioTools, computeDoMigration, computeHmacHex, createChat, createDeepSpaceAI, createDeepSpaceAuth, createScopedR2Handler, dataToColumnValues, decodeJwtPayload, deepSpaceAgentErrorSummary, deleteChatCascade, deleteRecord, enqueueJob, executeQuery, formatBytes, getAllUsers, getChat, getGlobalDOSchemas, getGlobalDOType, getOrCreateYjsDoc, getRecord, getRolePermissions, getSubscription, getUser, getYjsDocKey, handleApiRequest, handleDelete, handlePut, handleSetRole, handleSubscribe, handleToolsRequest, handleUnsubscribe, handleUserList, handleUserUpdate, handleYjsBinaryMessage, handleYjsJoin, handleYjsLeave, isAutoProvision, isFilesVerbPath, isOwner, isTestAccountClaims, isTestAccountEmail, isTestAccountTier, lintSchema, loadMessages, makeDefaultSummarizer, matchOrigin, meterAi, meterUsage, meterVectorize, noopPermissionContext, parseQuotaLimit, platformCorsPatterns, platformWorkerFetch, prepareMessagesWithCompaction, priceBindingUsageEvent, putRecord, readRecord, recordMatchesSubscription, refundInvoice, registerUser, registryErrorJson, registryStub, requireSubscription, resolveAppName, resolveColumn, rowToData, runMigrations, saveYjsDoc, storageLimitForTier, storageQuotaMessage, streamDeepSpaceAgent, timingSafeEqualHex, timingSafeEqualStrings, totalChars, truncateOldToolResults, turnsToCoreMessages, unwrapToolOutput, updateChat, validateAppName, validateBindingManifest, validateDoManifest, verifyJwt, workspaceAccountsSchema, workspaceContentSharesSchema, workspaceEmailHandlesSchema, workspaceFormResponsesSchema, workspacePeopleSchema, workspaceProjectsSchema, workspaceTagsSchema, workspaceTasksSchema, workspaceTeamMembersSchema, workspaceTeamsSchema, workspaceTransactionsSchema };
+export { ACCOUNT_STORAGE_LIMIT_BYTES, AI_CHATS_SCHEMA, AI_MESSAGES_SCHEMA, ALLOWED_BINDING_TYPES, APP_ID_RE, APP_NAME_RULES, AUTO_PROVISIONABLE_TYPES, AUTO_PROVISION_SENTINEL, type ActionContext, type ActionHandler, type ActionResult, type ActionTools, type ApiWorkerEnv, type AppNameResolution, type AppNameValidation, type AuthWorkerEnv, BASE_USERS_SCHEMA, BUILT_IN_TOOLS, BaseRoom, CHANNELS_SCHEMA, CHANNEL_INVITATIONS_SCHEMA, CHANNEL_MEMBERS_SCHEMA, CONVERSATION_SCHEMAS, COST_RATES, CancelSubscriptionError, type CancelSubscriptionOpts, type CancelSubscriptionResult, CanvasRoom, type CanvasShape, type ChatContextConfig, type ChatMessageRow, type ChatRow, type ChatTurn, type CollectionPermissionSummary, type CollectionSchema, type ColumnDefinition, type ColumnInterpretation, type ComposioToolsOptions, type ConvMemberData, type ConvMessageData, type ConvReactionData, type ConvReadCursorData, type ConvVoteData, type ConversationStateData, type CronContext, type CronExecution, CronRoom, type CronRoomConfig, type CronTask, type CustomBinding, type CustomBindingManifest, DEFAULT_CONTEXT_CONFIG, DEFAULT_DO_MANIFEST, DEFAULT_QUERY_LIMIT, DEPLOYED_APPS_DEFAULTS, DIRECTORY_SCHEMAS, type DOBindings, type DOManifest, type DOManifestEntry, type DebugApiContext, type DeepSpaceAIEnv, type DeepSpaceAIOptions, type DeepSpaceAgentDiagnosticContext, DeepSpaceAgentModelError, DeepSpaceAgentProfileError, type DeepSpaceAgentStream, type DeepSpaceAgentStreamOptions, type DeepSpaceAuth, type DeepSpaceAuthConfig, type DirectoryCommunityData, type DirectoryConversationData, type DirectoryMembershipData, type DirectoryPostData, type DoMigrationDirective, type DoMigrationPlan, type ExistingDOBinding, GLOBAL_DO_TYPES, GLOBAL_DO_TYPE_NAMES, type GameInput, GameRoom, type GameRoomConfig, type GetActionData, type GlobalDOType, type Job, type JobContext, JobRoom, type JobRoomConfig, type JobStatus, type JwtClaims, type JwtVerifierConfig, MAX_APP_FILE_BYTES, MAX_DEPLOY_ASSET_FILE_BYTES, MAX_UPLOAD_PARTS, MAX_UPLOAD_REQUEST_BYTES, MESSAGES_SCHEMA, type MutateActionData, type PermissionAnalysis, type PermissionContext, type PermissionLevel, type PermissionSource, type PlanInfo, type PlatformWorkerEnv, type Player, type PrefixResult, type PresencePeer, PresenceRoom, type QueryActionData, REACTIONS_SCHEMA, READ_RECEIPTS_SCHEMA, REGISTRY_INSTANCE, RESERVED_BINDING_NAMES, RESERVED_COLLECTION_NAMES, RESOURCE_ID_RE, type RecordContext, RecordRoom, type RecordRoomConfig, RefundError, type RefundOpts, type RefundResult, RegistryClientError, type ResolvedColumn, type ResolvedPermission, type RolePermissions, type RunMigrationsResult, STRICT_APP_ID_RE, SYSTEM_COLLECTION_SCHEMAS, SYSTEM_MANAGED_COLUMNS, SchemaRegistry, type ScopeContext, type ScopedR2Auth, type ScopedR2Config, type ScopedR2Handler, type ScreenshotEnv, type ScreenshotResult, type SharedConnection, type StorageAdmission, type StoredRecord, SubscriptionAuthError, type SubscriptionContext, type SubscriptionRead, SubscriptionRequiredError, type SubscriptionStatus, type Summarizer, TEST_ACCOUNT_EMAIL_SUFFIX, type TokenDebugInfo, type ToolResult, type ToolSchema, type ToolsApiContext, UPLOAD_PART_BYTES, USERS_COLUMNS, type User, type UserAttachment, type UserContext, VOTING_SCHEMAS, type ValidationError, type VerifiedAuth, type VerifyOutcome, type VerifyResult, type Viewport, WORKSPACE_SCHEMAS, type YjsContext, YjsRoom, analyzePermissions, apiWorkerFetch, appendMessage, applyAiToolDefaults, applySlidingWindow, authWorkerFetch, bindingManifestFromOutputConfig, broadcastChange, broadcastYjsUpdate, buildCronContext, buildTableSelect, buildUiParts, callRegistry, canCreate, canDelete, canRead, canUpdate, cancelSubscription, capToolResultSize, captureScreenshot, checkFieldPermissions, coerceValue, collectionTableName, columnId, composioTools, computeDoMigration, computeHmacHex, createChat, createDeepSpaceAI, createDeepSpaceAuth, createScopedR2Handler, dataToColumnValues, decodeJwtPayload, deepSpaceAgentErrorSummary, deleteChatCascade, deleteRecord, enqueueJob, executeQuery, formatBytes, getAllUsers, getChat, getGlobalDOSchemas, getGlobalDOType, getOrCreateYjsDoc, getRecord, getRolePermissions, getSubscription, getUser, getYjsDocKey, handleApiRequest, handleDelete, handlePut, handleSetRole, handleSubscribe, handleToolsRequest, handleUnsubscribe, handleUserList, handleUserUpdate, handleYjsBinaryMessage, handleYjsJoin, handleYjsLeave, isAutoProvision, isFilesVerbPath, isOwner, isTestAccountClaims, isTestAccountEmail, isTestAccountTier, lintSchema, loadMessages, makeDefaultSummarizer, matchOrigin, meterAi, meterUsage, meterVectorize, noopPermissionContext, parseQuotaLimit, platformCorsPatterns, platformWorkerFetch, prepareMessagesWithCompaction, priceBindingUsageEvent, putRecord, readRecord, recordMatchesSubscription, refundInvoice, registerUser, registryErrorJson, registryStub, requireSubscription, resolveAppName, resolveColumn, rowToData, runMigrations, saveYjsDoc, storageLimitForTier, storageQuotaMessage, streamDeepSpaceAgent, timingSafeEqualHex, timingSafeEqualStrings, totalChars, truncateOldToolResults, turnsToCoreMessages, unwrapToolOutput, updateChat, validateAppName, validateBindingManifest, validateDoManifest, verifyJwt, workspaceAccountsSchema, workspaceContentSharesSchema, workspaceEmailHandlesSchema, workspaceFormResponsesSchema, workspacePeopleSchema, workspaceProjectsSchema, workspaceTagsSchema, workspaceTasksSchema, workspaceTeamMembersSchema, workspaceTeamsSchema, workspaceTransactionsSchema };

package/dist/server.js

@@ -180,19 +180,21 @@ var MAX_UPLOAD_REQUEST_BYTES = 25 * 1024 * 1024;
 var UPLOAD_PART_BYTES = 20 * 1024 * 1024;
 var MAX_UPLOAD_PARTS = Math.ceil(MAX_APP_FILE_BYTES / UPLOAD_PART_BYTES);
 var MAX_BASE64_UPLOAD_BYTES = Math.floor(MAX_UPLOAD_REQUEST_BYTES * 3 / 4);
-var APP_STORAGE_LIMIT_BYTES = {
+var GIB = 1024 * 1024 * 1024;
+var ACCOUNT_STORAGE_LIMIT_BYTES = {
   test: 0,
-  free: 128 * 1024 * 1024,
-  starter: 512 * 1024 * 1024,
-  premium: 2 * 1024 * 1024 * 1024,
-  admin: 10 * 1024 * 1024 * 1024
+  free: 1 * GIB,
+  starter: 10 * GIB,
+  premium: 30 * GIB,
+  admin: 100 * GIB
 };
 function storageLimitForTier(tier) {
-  if (tier && Object.hasOwn(APP_STORAGE_LIMIT_BYTES, tier)) {
-    return APP_STORAGE_LIMIT_BYTES[tier];
+  if (tier && Object.hasOwn(ACCOUNT_STORAGE_LIMIT_BYTES, tier)) {
+    return ACCOUNT_STORAGE_LIMIT_BYTES[tier];
   }
-  return APP_STORAGE_LIMIT_BYTES.free;
+  return ACCOUNT_STORAGE_LIMIT_BYTES.free;
 }
+var REPO_STORE_LIMIT_BYTES = 256 * 1024 * 1024;
 function storageQuotaMessage(incomingBytes, usedBytes, limitBytes) {
   const free = Math.max(0, limitBytes - usedBytes);
   return `This upload needs ${formatBytes(incomingBytes)} but the app's file storage has ${formatBytes(free)} free (${formatBytes(usedBytes)} of ${formatBytes(limitBytes)} used). Delete files with \`deepspace app files rm <key>\`, or upgrade the owner's plan.`;
@@ -283,7 +285,7 @@ function declaredLength(request, what) {
 function isKeyWithinPrefix(key, prefix) {
   return key.startsWith(prefix);
 }
-async function allocationUsage(bucket, prefix) {
+async function prefixUsage(bucket, prefix) {
   let total = 0;
   let cursor;
   do {
@@ -293,6 +295,13 @@ async function allocationUsage(bucket, prefix) {
   } while (cursor !== void 0);
   return total;
 }
+async function allocationUsage(bucket, storage) {
+  const siblings = storage.siblingPrefixes ? await storage.siblingPrefixes() : [];
+  if (siblings === null) return null;
+  const prefixes = [storage.prefix, ...siblings.filter((p) => p !== storage.prefix)];
+  const totals = await Promise.all(prefixes.map((prefix) => prefixUsage(bucket, prefix)));
+  return totals.reduce((sum, bytes) => sum + bytes, 0);
+}
 async function admitStorage(bucket, storage, incomingBytes, replacesKey) {
   if (!storage) return null;
   const limit = await storage.limitBytes();
@@ -303,7 +312,14 @@ async function admitStorage(bucket, storage, incomingBytes, replacesKey) {
       "storage_limit_unavailable"
     );
   }
-  const stored = await allocationUsage(bucket, storage.prefix);
+  const stored = await allocationUsage(bucket, storage);
+  if (stored === null) {
+    return fail(
+      503,
+      "The storage already used by this account could not be measured; nothing was uploaded. Retry shortly.",
+      "storage_limit_unavailable"
+    );
+  }
   const replaced = replacesKey === null ? 0 : (await bucket.head(replacesKey))?.size ?? 0;
   const used = stored - replaced;
   if (used + incomingBytes <= limit) return null;
@@ -319,7 +335,11 @@ async function admitAssembledObject(bucket, storage, key, objectBytes) {
     console.error("[files:quota] limit unavailable at complete; keeping", key);
     return null;
   }
-  const stored = await allocationUsage(bucket, storage.prefix);
+  const stored = await allocationUsage(bucket, storage);
+  if (stored === null) {
+    console.error("[files:quota] account usage unmeasurable at complete; keeping", key);
+    return null;
+  }
   if (stored <= limit) return null;
   await bucket.delete(key).catch(() => void 0);
   return fail(
@@ -716,9 +736,10 @@ async function handleList(bucket, prefix, url, scope, auth) {
   });
   let storage;
   if (auth.storage) {
-    storage = { usedBytes: await allocationUsage(bucket, auth.storage.prefix) };
+    const usedBytes = await allocationUsage(bucket, auth.storage);
+    if (usedBytes !== null) storage = { usedBytes };
     const limitBytes = await auth.storage.limitBytes();
-    if (limitBytes !== null) storage.limitBytes = limitBytes;
+    if (storage && limitBytes !== null) storage.limitBytes = limitBytes;
   }
   return Response.json(
     { files, truncated: listed.truncated, ...storage ? { storage } : {} },
@@ -7984,12 +8005,12 @@ var RefundError = class extends Error {
   }
 };
 export {
+  ACCOUNT_STORAGE_LIMIT_BYTES,
   AI_CHATS_SCHEMA,
   AI_MESSAGES_SCHEMA,
   ALLOWED_BINDING_TYPES,
   APP_ID_RE,
   APP_NAME_RULES,
-  APP_STORAGE_LIMIT_BYTES,
   AUTO_PROVISIONABLE_TYPES,
   AUTO_PROVISION_SENTINEL,
   BASE_USERS_SCHEMA,